diff options
| author |   Benedikt Boehm <hollow@gentoo.org> | 2008-01-19 09:47:05 +0000 |
|---|---|---|
| committer | Benedikt Boehm <hollow@gentoo.org> | 2008-01-19 09:47:05 +0000 |
| commit | 09872081221574fd452c3d18f732823edf8a9b7c (patch) | |
| tree | 4734179d96c229ea1310b8a25f7f446834ae3858 /2.2/patches/03_all_gentoo_apache-tools.patch | |
| parent | remove obsolete CVE patches; bump SNI patch; bump ITK patch (diff) | |
| download | apache-09872081221574fd452c3d18f732823edf8a9b7c.tar.gz apache-09872081221574fd452c3d18f732823edf8a9b7c.tar.bz2 apache-09872081221574fd452c3d18f732823edf8a9b7c.zip | |
fix WebDAV on OS X Leopard; cleanup
Diffstat (limited to '2.2/patches/03_all_gentoo_apache-tools.patch')
| -rw-r--r-- | 2.2/patches/03_all_gentoo_apache-tools.patch | 81 |
1 files changed, 81 insertions, 0 deletions
diff --git a/2.2/patches/03_all_gentoo_apache-tools.patch b/2.2/patches/03_all_gentoo_apache-tools.patch new file mode 100644 index 0000000..f4b6612 --- /dev/null +++ b/2.2/patches/03_all_gentoo_apache-tools.patch @@ -0,0 +1,81 @@ +--- + Makefile.in | 10 ++++++++-- + support/Makefile.in | 18 ++++-------------- + 2 files changed, 12 insertions(+), 16 deletions(-) + +Index: httpd-2.2.6/Makefile.in +=================================================================== +--- httpd-2.2.6.orig/Makefile.in ++++ httpd-2.2.6/Makefile.in +@@ -198,14 +198,20 @@ install-include: + $(INSTALL_DATA) $$hdr $(DESTDIR)$(includedir); \ + done + ++MAN1= ++MAN8=apxs.8 httpd.8 suexec.8 + install-man: + @echo Installing man pages and online manual + @test -d $(DESTDIR)$(mandir) || $(MKINSTALLDIRS) $(DESTDIR)$(mandir) + @test -d $(DESTDIR)$(mandir)/man1 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man1 + @test -d $(DESTDIR)$(mandir)/man8 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man8 + @test -d $(DESTDIR)$(manualdir) || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir) +- @cp -p $(top_srcdir)/docs/man/*.1 $(DESTDIR)$(mandir)/man1 +- @cp -p $(top_srcdir)/docs/man/*.8 $(DESTDIR)$(mandir)/man8 ++ @for i in $(MAN1) ; do \ ++ cp -p $(top_srcdir)/docs/man/$$i $(DESTDIR)$(mandir)/man1; \ ++ done ++ @for i in $(MAN8) ; do \ ++ cp -p $(top_srcdir)/docs/man/$$i $(DESTDIR)$(mandir)/man8; \ ++ done + @if test "x$(RSYNC)" != "x" && test -x $(RSYNC) ; then \ + $(RSYNC) --exclude .svn -rlpt --numeric-ids $(top_srcdir)/docs/manual/ $(DESTDIR)$(manualdir)/; \ + else \ +Index: httpd-2.2.6/support/Makefile.in +=================================================================== +--- httpd-2.2.6.orig/support/Makefile.in ++++ httpd-2.2.6/support/Makefile.in +@@ -1,9 +1,8 @@ +-DISTCLEAN_TARGETS = apxs apachectl dbmmanage log_server_status \ +- logresolve.pl phf_abuse_log.cgi split-logfile envvars-std ++DISTCLEAN_TARGETS = apxs + + CLEAN_TARGETS = suexec + +-PROGRAMS = htpasswd htdigest rotatelogs logresolve ab checkgid htdbm htcacheclean httxt2dbm ++PROGRAMS = apxs + TARGETS = $(PROGRAMS) + + PROGRAM_LDADD = $(UTIL_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS) $(AP_LIBS) +@@ -12,22 +11,13 @@ PROGRAM_DEPENDENCIES = + include $(top_builddir)/build/rules.mk + + install: +- @test -d $(DESTDIR)$(bindir) || $(MKINSTALLDIRS) $(DESTDIR)$(bindir) + @test -d $(DESTDIR)$(sbindir) || $(MKINSTALLDIRS) $(DESTDIR)$(sbindir) +- @test -d $(DESTDIR)$(libexecdir) || $(MKINSTALLDIRS) $(DESTDIR)$(libexecdir) +- @cp -p $(top_builddir)/server/httpd.exp $(DESTDIR)$(libexecdir) +- @for i in apxs apachectl dbmmanage; do \ ++ @for i in $(PROGRAMS) ; do \ + if test -f "$(builddir)/$$i"; then \ + cp -p $$i $(DESTDIR)$(sbindir); \ + chmod 755 $(DESTDIR)$(sbindir)/$$i; \ + fi ; \ + done +- @if test -f "$(builddir)/envvars-std"; then \ +- cp -p envvars-std $(DESTDIR)$(sbindir); \ +- if test ! -f $(DESTDIR)$(sbindir)/envvars; then \ +- cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \ +- fi ; \ +- fi + + htpasswd_OBJECTS = htpasswd.lo + htpasswd: $(htpasswd_OBJECTS) +@@ -60,7 +50,7 @@ checkgid: $(checkgid_OBJECTS) + + suexec_OBJECTS = suexec.lo + suexec: $(suexec_OBJECTS) +- $(LINK) $(suexec_OBJECTS) ++ $(LINK) -Wl,-z,now $(suexec_OBJECTS) + + htcacheclean_OBJECTS = htcacheclean.lo + htcacheclean: $(htcacheclean_OBJECTS) |