162246 – Re: [PATCH] www/apache20,www/apache22 Strip Binaries

Bug 162246 - Re: [PATCH] www/apache20,www/apache22 Strip Binaries

Summary: Re: [PATCH] www/apache20,www/apache22 Strip Binaries

Status:	Closed FIXED

Alias:	None

Product:	Ports & Packages
Classification:	Unclassified
Component:	Individual Port(s) (show other bugs)
Version:	Latest
Hardware:	Any Any

Importance:	Normal Affects Only Me
Assignee:	freebsd-apache (Nobody)

URL:
Keywords:

Depends on:
Blocks:

Reported:	2011-11-02 09:50 UTC by takefu
Modified:	2011-11-02 10:56 UTC (History)
CC List:	1 user (show)

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.

Description takefu 2011-11-02 09:50:06 UTC

 I attached a toggle.
 By default, not STRIP.
 
 
 Common items
   add options WITH_STRIP
 
 apache20 Only.
   fix Security ADVISORY CVE-2011-3192
   http://httpd.apache.org/security/CVE-2011-3192.txt
 
 
 --- apache20.patch begins here ---
 diff -ruN /usr/ports/www/apache20/Makefile www/apache20/Makefile
 --- /usr/ports/www/apache20/Makefile	2011-09-29 14:04:37.000000000 +0900
 +++ www/apache20/Makefile	2011-11-02 16:54:04.000000000 +0900
 @@ -64,6 +64,16 @@
 
  MPM_ITK_VERSION?=	20061030-01
 
 +PATCH_SITES+=	${MASTER_SITE_APACHE_HTTPD:S!$!patches/apply_to_2.0.64/!}
 +PATCHFILES+=	CVE-2011-3192-2.0.64-byterange-fixes.patch
 +
 +.if defined(WITH_STRIP)
 +EXTRA_PATCHES+=	${FILESDIR}/extra-patch-build__instdso.sh\
 +		${FILESDIR}/extra-STRIP-patch-build__rules.mk.in
 +.else
 +EXTRA_PATCHES+=	${FILESDIR}/extra-NOSTRIP-patch-build__rules.mk.in
 +.endif
 +
  .if defined(WITH_SUEXEC_RSRCLIMIT)
  EXTRA_PATCHES+=	${FILESDIR}/extra-patch-suexec_rsrclimit
  .if !defined(WITH_SUEXEC)
 diff -ruN /usr/ports/www/apache20/distinfo www/apache20/distinfo
 --- /usr/ports/www/apache20/distinfo	2011-03-21 14:19:27.000000000 +0900
 +++ www/apache20/distinfo	2011-11-02 11:46:01.000000000 +0900
 @@ -2,3 +2,5 @@
  SIZE (apache2/httpd-2.0.64.tar.bz2) = 4954766
  SHA256 (apache2/powerlogo.gif) = 0144675a80761b9660bdb652d331d9ba3bebdff89c0fa35a56aa463662a53254
  SIZE (apache2/powerlogo.gif) = 5279
 +SHA256 (apache2/CVE-2011-3192-2.0.64-byterange-fixes.patch) = 055d48f6fd3e57223a88fe3e63e081171b490400e91d7951af1f6371f73d96cb
 +SIZE (apache2/CVE-2011-3192-2.0.64-byterange-fixes.patch) = 19920
 diff -ruN /usr/ports/www/apache20/files/extra-NOSTRIP-patch-build__rules.mk.in www/apache20/files/extra-NOSTRIP-patch-build__rules.mk.in
 --- /usr/ports/www/apache20/files/extra-NOSTRIP-patch-build__rules.mk.in	1970-01-01 09:00:00.000000000 +0900
 +++ www/apache20/files/extra-NOSTRIP-patch-build__rules.mk.in	2010-05-07 08:10:19.000000000 +0900
 @@ -0,0 +1,11 @@
 +--- ./build/rules.mk.in.orig	2006-07-12 03:40:55.000000000 -0400
 ++++ ./build/rules.mk.in	2010-05-06 16:06:03.734831750 -0400
 +@@ -45,7 +45,7 @@
 +
 + LINK     = $(LIBTOOL) --mode=link $(COMPILE) $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@
 + SH_LINK  = $(SH_LIBTOOL) --mode=link $(COMPILE) $(LT_LDFLAGS) $(ALL_LDFLAGS) $(SH_LDFLAGS) $(CORE_IMPLIB) $(SH_LIBS) -o $@
 +-MOD_LINK = $(LIBTOOL) --mode=link $(COMPILE) -module $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@
 ++MOD_LINK = $(LIBTOOL) --mode=link $(COMPILE) -static $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@
 +
 + # Cross compile commands
 +
 diff -ruN /usr/ports/www/apache20/files/extra-STRIP-patch-build__rules.mk.in www/apache20/files/extra-STRIP-patch-build__rules.mk.in
 --- /usr/ports/www/apache20/files/extra-STRIP-patch-build__rules.mk.in	1970-01-01 09:00:00.000000000 +0900
 +++ www/apache20/files/extra-STRIP-patch-build__rules.mk.in	2011-08-16 17:04:02.000000000 +0900
 @@ -0,0 +1,21 @@
 +--- build/rules.mk.in.orig	2006-07-12 16:40:55.000000000 +0900
 ++++ build/rules.mk.in	2011-08-16 17:03:28.000000000 +0900
 +@@ -45,7 +45,7 @@
 +
 + LINK     = $(LIBTOOL) --mode=link $(COMPILE) $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@
 + SH_LINK  = $(SH_LIBTOOL) --mode=link $(COMPILE) $(LT_LDFLAGS) $(ALL_LDFLAGS) $(SH_LDFLAGS) $(CORE_IMPLIB) $(SH_LIBS) -o $@
 +-MOD_LINK = $(LIBTOOL) --mode=link $(COMPILE) -module $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@
 ++MOD_LINK = $(LIBTOOL) --mode=link $(COMPILE) -static $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@
 +
 + # Cross compile commands
 +
 +@@ -54,7 +54,8 @@
 + MKINSTALLDIRS = $(abs_srcdir)/build/mkdir.sh
 + INSTALL = $(LIBTOOL) --mode=install $(abs_srcdir)/build/install.sh -c
 + INSTALL_DATA = $(INSTALL) -m 644
 +-INSTALL_PROGRAM = $(INSTALL) -m 755 $(INSTALL_PROG_FLAGS)
 ++INSTALL_PROGRAM = $(INSTALL) -s -m 755 $(INSTALL_PROG_FLAGS)
 ++INSTALL_SCRIPT = $(INSTALL) -m 755 $(INSTALL_PROG_FLAGS)
 +
 + #
 + # Standard build rules
 diff -ruN /usr/ports/www/apache20/files/extra-patch-build__instdso.sh www/apache20/files/extra-patch-build__instdso.sh
 --- /usr/ports/www/apache20/files/extra-patch-build__instdso.sh	1970-01-01 09:00:00.000000000 +0900
 +++ www/apache20/files/extra-patch-build__instdso.sh	2011-08-16 17:04:24.000000000 +0900
 @@ -0,0 +1,11 @@
 +--- build/instdso.sh.orig	2006-07-12 16:40:55.000000000 +0900
 ++++ build/instdso.sh	2011-08-16 17:02:40.000000000 +0900
 +@@ -49,7 +49,7 @@
 +     $CMD || exit $?
 + fi
 +
 +-CMD="$SH_LIBTOOL --mode=install cp $DSOARCHIVE $TARGETDIR/"
 ++CMD="$SH_LIBTOOL --mode=install install -s $DSOARCHIVE $TARGETDIR/"
 + echo $CMD
 + $CMD || exit $?
 +
 diff -ruN /usr/ports/www/apache20/files/patch-build__rules.mk.in www/apache20/files/patch-build__rules.mk.in
 --- /usr/ports/www/apache20/files/patch-build__rules.mk.in	2010-05-07 08:10:19.000000000 +0900
 +++ www/apache20/files/patch-build__rules.mk.in	1970-01-01 09:00:00.000000000 +0900
 @@ -1,11 +0,0 @@
 ---- ./build/rules.mk.in.orig	2006-07-12 03:40:55.000000000 -0400
 -+++ ./build/rules.mk.in	2010-05-06 16:06:03.734831750 -0400
 -@@ -45,7 +45,7 @@
 -
 - LINK     = $(LIBTOOL) --mode=link $(COMPILE) $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@
 - SH_LINK  = $(SH_LIBTOOL) --mode=link $(COMPILE) $(LT_LDFLAGS) $(ALL_LDFLAGS) $(SH_LDFLAGS) $(CORE_IMPLIB) $(SH_LIBS) -o $@
 --MOD_LINK = $(LIBTOOL) --mode=link $(COMPILE) -module $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@
 -+MOD_LINK = $(LIBTOOL) --mode=link $(COMPILE) -static $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@
 -
 - # Cross compile commands
 -
 --- apache20.patch ends here ---
 
 --- apache22.patch begins here ---
 diff -ruN /usr/ports/www/apache22/Makefile www/apache22/Makefile
 --- /usr/ports/www/apache22/Makefile	2011-09-29 14:04:37.000000000 +0900
 +++ www/apache22/Makefile	2011-11-02 14:34:01.000000000 +0900
 @@ -63,6 +63,14 @@
  .include "${APACHEDIR}/Makefile.options"
  .endif
 
 +.if defined(WITH_STRIP)
 +EXTRA_PATCHES+=	${FILESDIR}/extra-patch-build__instdso.sh\
 +		${FILESDIR}/extra-patch-build__rules.mk.in\
 +		${FILESDIR}/extra-STRIP-patch-Makefile.in
 +.else
 +EXTRA_PATCHES+=	${FILESDIR}/extra-NOSTRIP-patch-Makefile.in
 +.endif
 +
  .if defined(WITH_SUEXEC_RSRCLIMIT)
  EXTRA_PATCHES+= ${FILESDIR}/extra-patch-suexec_rsrclimit
  .if !defined(WITH_SUEXEC)
 diff -ruN /usr/ports/www/apache22/files/extra-NOSTRIP-patch-Makefile.in www/apache22/files/extra-NOSTRIP-patch-Makefile.in
 --- /usr/ports/www/apache22/files/extra-NOSTRIP-patch-Makefile.in	1970-01-01 09:00:00.000000000 +0900
 +++ www/apache22/files/extra-NOSTRIP-patch-Makefile.in	2010-05-07 12:15:44.000000000 +0900
 @@ -0,0 +1,115 @@
 +--- ./Makefile.in.orig	2008-11-25 15:24:49.000000000 -0500
 ++++ ./Makefile.in	2010-05-06 19:37:54.211730130 -0400
 +@@ -31,9 +31,11 @@
 + install-conf:
 + 	@echo Installing configuration files
 + 	@$(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir) $(DESTDIR)$(sysconfdir)/extra
 +-	@$(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir)/original/extra
 ++	@$(MKINSTALLDIRS) $(DESTDIR)$(EXAMPLESDIR) $(DESTDIR)$(EXAMPLESDIR)/extra
 ++
 + 	@cd $(top_srcdir)/docs/conf; \
 + 	for i in mime.types magic; do \
 ++	    $(INSTALL_DATA) $$i $(DESTDIR)$(EXAMPLESDIR); \
 + 	    if test ! -f $(DESTDIR)$(sysconfdir)/$$i; then \
 + 	        $(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir); \
 + 	    fi; \
 +@@ -69,14 +71,14 @@
 + 	    				-e 's#@@SSLPort@@#$(SSLPORT)#g' \
 + 	    				< $$i; \
 + 	    		fi \
 +-	    	) > $(DESTDIR)$(sysconfdir)/original/$$i; \
 +-	    	chmod 0644 $(DESTDIR)$(sysconfdir)/original/$$i; \
 ++	    	) > $(DESTDIR)$(EXAMPLESDIR)/$$i; \
 ++	    	chmod 0644 $(DESTDIR)$(EXAMPLESDIR)/$$i; \
 + 	    	file=$$i; \
 + 	    	if [ "$$i" = "httpd.conf" ]; then \
 + 	    		file=`echo $$i|sed s/.*.conf/$(PROGRAM_NAME).conf/`; \
 + 	    	fi; \
 + 	    	if test ! -f $(DESTDIR)$(sysconfdir)/$$file; then \
 +-	    		$(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/original/$$i $(DESTDIR)$(sysconfdir)/$$file; \
 ++	    		$(INSTALL_DATA) $(DESTDIR)$(EXAMPLESDIR)/$$i $(DESTDIR)$(sysconfdir)/$$file; \
 + 	    	fi; \
 + 	    	fi; \
 + 	    done ; \
 +@@ -120,48 +122,29 @@
 + 	doxygen $(top_srcdir)/docs/doxygen.conf
 +
 + install-htdocs:
 +-	-@if [ -d $(DESTDIR)$(htdocsdir) ]; then \
 +-           echo "[PRESERVING EXISTING HTDOCS SUBDIR: $(DESTDIR)$(htdocsdir)]"; \
 +-        else \
 +-	    echo Installing HTML documents ; \
 ++	    @echo Installing HTML documents ; \
 + 	    $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir) ; \
 +-	    if test -d $(htdocs-srcdir) && test "x$(RSYNC)" != "x" && test -x $(RSYNC) ; then \
 +-		$(RSYNC) --exclude .svn -rlpt --numeric-ids $(htdocs-srcdir)/ $(DESTDIR)$(htdocsdir)/; \
 +-	    else \
 +-		test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir)) ; \
 +-		cd $(DESTDIR)$(htdocsdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
 +-	    fi; \
 +-	fi
 ++	    $(MKINSTALLDIRS) $(DESTDIR)$(EXAMPLESDIR) ; \
 ++		test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp index.html $(DESTDIR)$(EXAMPLESDIR)) && \
 ++		( [ ! -f $(DESTDIR)$(htdocsdir)/index.html ] && cp -p $(DESTDIR)$(EXAMPLESDIR)/index.html $(DESTDIR)$(htdocsdir)/index.html) || true
 +
 + install-error:
 +-	-@if [ -d $(DESTDIR)$(errordir) ]; then \
 +-           echo "[PRESERVING EXISTING ERROR SUBDIR: $(DESTDIR)$(errordir)]"; \
 +-        else \
 +-	    echo Installing error documents ; \
 ++	    @echo Installing error documents ; \
 + 	    $(MKINSTALLDIRS) $(DESTDIR)$(errordir) ; \
 + 	    cd $(top_srcdir)/docs/error && cp -rp * $(DESTDIR)$(errordir) ; \
 +-	    test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
 +-	fi
 ++	    test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true;
 +
 + install-icons:
 +-	-@if [ -d $(DESTDIR)$(iconsdir) ]; then \
 +-           echo "[PRESERVING EXISTING ICONS SUBDIR: $(DESTDIR)$(iconsdir)]"; \
 +-        else \
 +-	    echo Installing icons ; \
 ++	    @echo Installing icons ; \
 + 	    $(MKINSTALLDIRS) $(DESTDIR)$(iconsdir) ; \
 + 	    cd $(top_srcdir)/docs/icons && cp -rp * $(DESTDIR)$(iconsdir) ; \
 +-	    test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
 +-	fi
 ++	    test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true;
 +
 + install-cgi:
 +-	-@if [ -d $(DESTDIR)$(cgidir) ];then \
 +-	    echo "[PRESERVING EXISTING CGI SUBDIR: $(DESTDIR)$(cgidir)]"; \
 +-	else \
 +-	   echo Installing CGIs ; \
 ++	   @echo Installing CGIs ; \
 + 	   $(MKINSTALLDIRS) $(DESTDIR)$(cgidir) ; \
 + 	   cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir) ; \
 +-	   test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
 +-	fi
 ++	   test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true;
 +
 + install-other:
 + 	@test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir)
 +@@ -208,14 +191,20 @@
 + 	@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 dbmmanage htdbm htdigest htpasswd; do \
 ++	  ${INSTALL_MAN} $(top_srcdir)/docs/man/$$i.1 $(DESTDIR)$(mandir)/man1; \
 ++	done
 ++	for i in ab apachectl apxs htcacheclean httpd logresolve rotatelogs suexec; do \
 ++	  ${INSTALL_MAN} $(top_srcdir)/docs/man/$$i.8 $(DESTDIR)$(mandir)/man8; \
 ++	done
 ++.if !defined(NOPORTDOCS)
 + 	@if test "x$(RSYNC)" != "x" && test -x $(RSYNC) ; then \
 + 	  $(RSYNC) --exclude .svn -rlpt --numeric-ids $(top_srcdir)/docs/manual/ $(DESTDIR)$(manualdir)/; \
 + 	else \
 + 	  cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir); \
 + 	  cd $(DESTDIR)$(manualdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
 + 	fi
 ++.endif
 +
 + install-suexec:
 + 	@if test -f $(builddir)/support/suexec; then \
 diff -ruN /usr/ports/www/apache22/files/extra-STRIP-patch-Makefile.in www/apache22/files/extra-STRIP-patch-Makefile.in
 --- /usr/ports/www/apache22/files/extra-STRIP-patch-Makefile.in	1970-01-01 09:00:00.000000000 +0900
 +++ www/apache22/files/extra-STRIP-patch-Makefile.in	2011-08-16 16:26:21.000000000 +0900
 @@ -0,0 +1,124 @@
 +--- Makefile.in.orig	2008-11-26 05:24:49.000000000 +0900
 ++++ Makefile.in	2011-08-16 16:25:58.000000000 +0900
 +@@ -31,9 +31,11 @@
 + install-conf:
 + 	@echo Installing configuration files
 + 	@$(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir) $(DESTDIR)$(sysconfdir)/extra
 +-	@$(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir)/original/extra
 ++	@$(MKINSTALLDIRS) $(DESTDIR)$(EXAMPLESDIR) $(DESTDIR)$(EXAMPLESDIR)/extra
 ++
 + 	@cd $(top_srcdir)/docs/conf; \
 + 	for i in mime.types magic; do \
 ++	    $(INSTALL_DATA) $$i $(DESTDIR)$(EXAMPLESDIR); \
 + 	    if test ! -f $(DESTDIR)$(sysconfdir)/$$i; then \
 + 	        $(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir); \
 + 	    fi; \
 +@@ -69,14 +71,14 @@
 + 	    				-e 's#@@SSLPort@@#$(SSLPORT)#g' \
 + 	    				< $$i; \
 + 	    		fi \
 +-	    	) > $(DESTDIR)$(sysconfdir)/original/$$i; \
 +-	    	chmod 0644 $(DESTDIR)$(sysconfdir)/original/$$i; \
 ++	    	) > $(DESTDIR)$(EXAMPLESDIR)/$$i; \
 ++	    	chmod 0644 $(DESTDIR)$(EXAMPLESDIR)/$$i; \
 + 	    	file=$$i; \
 + 	    	if [ "$$i" = "httpd.conf" ]; then \
 + 	    		file=`echo $$i|sed s/.*.conf/$(PROGRAM_NAME).conf/`; \
 + 	    	fi; \
 + 	    	if test ! -f $(DESTDIR)$(sysconfdir)/$$file; then \
 +-	    		$(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/original/$$i $(DESTDIR)$(sysconfdir)/$$file; \
 ++	    		$(INSTALL_DATA) $(DESTDIR)$(EXAMPLESDIR)/$$i $(DESTDIR)$(sysconfdir)/$$file; \
 + 	    	fi; \
 + 	    	fi; \
 + 	    done ; \
 +@@ -101,7 +103,7 @@
 + 	@for f in $(top_builddir)/config.nice \
 + 		  $(top_srcdir)/build/mkdir.sh \
 + 		  $(top_srcdir)/build/instdso.sh; do \
 +-	 $(INSTALL_PROGRAM) $$f $(DESTDIR)$(installbuilddir); \
 ++	 $(INSTALL_SCRIPT) $$f $(DESTDIR)$(installbuilddir); \
 + 	done
 + 	@$(INSTALL_DATA) build/config_vars.out $(DESTDIR)$(installbuilddir)/config_vars.mk
 + 	@rm build/config_vars.out
 +@@ -120,48 +122,29 @@
 + 	doxygen $(top_srcdir)/docs/doxygen.conf
 +
 + install-htdocs:
 +-	-@if [ -d $(DESTDIR)$(htdocsdir) ]; then \
 +-           echo "[PRESERVING EXISTING HTDOCS SUBDIR: $(DESTDIR)$(htdocsdir)]"; \
 +-        else \
 +-	    echo Installing HTML documents ; \
 ++	    @echo Installing HTML documents ; \
 + 	    $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir) ; \
 +-	    if test -d $(htdocs-srcdir) && test "x$(RSYNC)" != "x" && test -x $(RSYNC) ; then \
 +-		$(RSYNC) --exclude .svn -rlpt --numeric-ids $(htdocs-srcdir)/ $(DESTDIR)$(htdocsdir)/; \
 +-	    else \
 +-		test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir)) ; \
 +-		cd $(DESTDIR)$(htdocsdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
 +-	    fi; \
 +-	fi
 ++	    $(MKINSTALLDIRS) $(DESTDIR)$(EXAMPLESDIR) ; \
 ++		test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp index.html $(DESTDIR)$(EXAMPLESDIR)) && \
 ++		( [ ! -f $(DESTDIR)$(htdocsdir)/index.html ] && cp -p $(DESTDIR)$(EXAMPLESDIR)/index.html $(DESTDIR)$(htdocsdir)/index.html) || true
 +
 + install-error:
 +-	-@if [ -d $(DESTDIR)$(errordir) ]; then \
 +-           echo "[PRESERVING EXISTING ERROR SUBDIR: $(DESTDIR)$(errordir)]"; \
 +-        else \
 +-	    echo Installing error documents ; \
 ++	    @echo Installing error documents ; \
 + 	    $(MKINSTALLDIRS) $(DESTDIR)$(errordir) ; \
 + 	    cd $(top_srcdir)/docs/error && cp -rp * $(DESTDIR)$(errordir) ; \
 +-	    test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
 +-	fi
 ++	    test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true;
 +
 + install-icons:
 +-	-@if [ -d $(DESTDIR)$(iconsdir) ]; then \
 +-           echo "[PRESERVING EXISTING ICONS SUBDIR: $(DESTDIR)$(iconsdir)]"; \
 +-        else \
 +-	    echo Installing icons ; \
 ++	    @echo Installing icons ; \
 + 	    $(MKINSTALLDIRS) $(DESTDIR)$(iconsdir) ; \
 + 	    cd $(top_srcdir)/docs/icons && cp -rp * $(DESTDIR)$(iconsdir) ; \
 +-	    test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
 +-	fi
 ++	    test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true;
 +
 + install-cgi:
 +-	-@if [ -d $(DESTDIR)$(cgidir) ];then \
 +-	    echo "[PRESERVING EXISTING CGI SUBDIR: $(DESTDIR)$(cgidir)]"; \
 +-	else \
 +-	   echo Installing CGIs ; \
 ++	   @echo Installing CGIs ; \
 + 	   $(MKINSTALLDIRS) $(DESTDIR)$(cgidir) ; \
 + 	   cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir) ; \
 +-	   test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
 +-	fi
 ++	   test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true;
 +
 + install-other:
 + 	@test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir)
 +@@ -208,14 +191,20 @@
 + 	@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 dbmmanage htdbm htdigest htpasswd; do \
 ++	  ${INSTALL_MAN} $(top_srcdir)/docs/man/$$i.1 $(DESTDIR)$(mandir)/man1; \
 ++	done
 ++	for i in ab apachectl apxs htcacheclean httpd logresolve rotatelogs suexec; do \
 ++	  ${INSTALL_MAN} $(top_srcdir)/docs/man/$$i.8 $(DESTDIR)$(mandir)/man8; \
 ++	done
 ++.if !defined(NOPORTDOCS)
 + 	@if test "x$(RSYNC)" != "x" && test -x $(RSYNC) ; then \
 + 	  $(RSYNC) --exclude .svn -rlpt --numeric-ids $(top_srcdir)/docs/manual/ $(DESTDIR)$(manualdir)/; \
 + 	else \
 + 	  cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir); \
 + 	  cd $(DESTDIR)$(manualdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
 + 	fi
 ++.endif
 +
 + install-suexec:
 + 	@if test -f $(builddir)/support/suexec; then \
 diff -ruN /usr/ports/www/apache22/files/extra-patch-build__instdso.sh www/apache22/files/extra-patch-build__instdso.sh
 --- /usr/ports/www/apache22/files/extra-patch-build__instdso.sh	1970-01-01 09:00:00.000000000 +0900
 +++ www/apache22/files/extra-patch-build__instdso.sh	2011-08-16 16:57:40.000000000 +0900
 @@ -0,0 +1,11 @@
 +--- build/instdso.sh.orig	2006-07-12 12:38:44.000000000 +0900
 ++++ build/instdso.sh	2011-08-16 16:57:13.000000000 +0900
 +@@ -49,7 +49,7 @@
 +     $CMD || exit $?
 + fi
 +
 +-CMD="$SH_LIBTOOL --mode=install cp $DSOARCHIVE $TARGETDIR/"
 ++CMD="$SH_LIBTOOL --mode=install install -s $DSOARCHIVE $TARGETDIR/"
 + echo $CMD
 + $CMD || exit $?
 +
 diff -ruN /usr/ports/www/apache22/files/extra-patch-build__rules.mk.in www/apache22/files/extra-patch-build__rules.mk.in
 --- /usr/ports/www/apache22/files/extra-patch-build__rules.mk.in	1970-01-01 09:00:00.000000000 +0900
 +++ www/apache22/files/extra-patch-build__rules.mk.in	2011-08-16 16:09:05.000000000 +0900
 @@ -0,0 +1,12 @@
 +--- build/rules.mk.in.orig	2006-07-12 12:38:44.000000000 +0900
 ++++ build/rules.mk.in	2011-08-16 16:09:01.000000000 +0900
 +@@ -55,7 +55,8 @@
 + # Helper programs
 +
 + INSTALL_DATA = $(INSTALL) -m 644
 +-INSTALL_PROGRAM = $(INSTALL) -m 755 $(INSTALL_PROG_FLAGS)
 ++INSTALL_PROGRAM = $(INSTALL) -s -m 755 $(INSTALL_PROG_FLAGS)
 ++INSTALL_SCRIPT = $(INSTALL) -m 755 $(INSTALL_PROG_FLAGS)
 +
 + #
 + # Standard build rules
 diff -ruN /usr/ports/www/apache22/files/patch-Makefile.in www/apache22/files/patch-Makefile.in
 --- /usr/ports/www/apache22/files/patch-Makefile.in	2010-05-07 12:15:44.000000000 +0900
 +++ www/apache22/files/patch-Makefile.in	1970-01-01 09:00:00.000000000 +0900
 @@ -1,115 +0,0 @@
 ---- ./Makefile.in.orig	2008-11-25 15:24:49.000000000 -0500
 -+++ ./Makefile.in	2010-05-06 19:37:54.211730130 -0400
 -@@ -31,9 +31,11 @@
 - install-conf:
 - 	@echo Installing configuration files
 - 	@$(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir) $(DESTDIR)$(sysconfdir)/extra
 --	@$(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir)/original/extra
 -+	@$(MKINSTALLDIRS) $(DESTDIR)$(EXAMPLESDIR) $(DESTDIR)$(EXAMPLESDIR)/extra
 -+
 - 	@cd $(top_srcdir)/docs/conf; \
 - 	for i in mime.types magic; do \
 -+	    $(INSTALL_DATA) $$i $(DESTDIR)$(EXAMPLESDIR); \
 - 	    if test ! -f $(DESTDIR)$(sysconfdir)/$$i; then \
 - 	        $(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir); \
 - 	    fi; \
 -@@ -69,14 +71,14 @@
 - 	    				-e 's#@@SSLPort@@#$(SSLPORT)#g' \
 - 	    				< $$i; \
 - 	    		fi \
 --	    	) > $(DESTDIR)$(sysconfdir)/original/$$i; \
 --	    	chmod 0644 $(DESTDIR)$(sysconfdir)/original/$$i; \
 -+	    	) > $(DESTDIR)$(EXAMPLESDIR)/$$i; \
 -+	    	chmod 0644 $(DESTDIR)$(EXAMPLESDIR)/$$i; \
 - 	    	file=$$i; \
 - 	    	if [ "$$i" = "httpd.conf" ]; then \
 - 	    		file=`echo $$i|sed s/.*.conf/$(PROGRAM_NAME).conf/`; \
 - 	    	fi; \
 - 	    	if test ! -f $(DESTDIR)$(sysconfdir)/$$file; then \
 --	    		$(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/original/$$i $(DESTDIR)$(sysconfdir)/$$file; \
 -+	    		$(INSTALL_DATA) $(DESTDIR)$(EXAMPLESDIR)/$$i $(DESTDIR)$(sysconfdir)/$$file; \
 - 	    	fi; \
 - 	    	fi; \
 - 	    done ; \
 -@@ -120,48 +122,29 @@
 - 	doxygen $(top_srcdir)/docs/doxygen.conf
 -
 - install-htdocs:
 --	-@if [ -d $(DESTDIR)$(htdocsdir) ]; then \
 --           echo "[PRESERVING EXISTING HTDOCS SUBDIR: $(DESTDIR)$(htdocsdir)]"; \
 --        else \
 --	    echo Installing HTML documents ; \
 -+	    @echo Installing HTML documents ; \
 - 	    $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir) ; \
 --	    if test -d $(htdocs-srcdir) && test "x$(RSYNC)" != "x" && test -x $(RSYNC) ; then \
 --		$(RSYNC) --exclude .svn -rlpt --numeric-ids $(htdocs-srcdir)/ $(DESTDIR)$(htdocsdir)/; \
 --	    else \
 --		test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir)) ; \
 --		cd $(DESTDIR)$(htdocsdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
 --	    fi; \
 --	fi
 -+	    $(MKINSTALLDIRS) $(DESTDIR)$(EXAMPLESDIR) ; \
 -+		test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp index.html $(DESTDIR)$(EXAMPLESDIR)) && \
 -+		( [ ! -f $(DESTDIR)$(htdocsdir)/index.html ] && cp -p $(DESTDIR)$(EXAMPLESDIR)/index.html $(DESTDIR)$(htdocsdir)/index.html) || true
 -
 - install-error:
 --	-@if [ -d $(DESTDIR)$(errordir) ]; then \
 --           echo "[PRESERVING EXISTING ERROR SUBDIR: $(DESTDIR)$(errordir)]"; \
 --        else \
 --	    echo Installing error documents ; \
 -+	    @echo Installing error documents ; \
 - 	    $(MKINSTALLDIRS) $(DESTDIR)$(errordir) ; \
 - 	    cd $(top_srcdir)/docs/error && cp -rp * $(DESTDIR)$(errordir) ; \
 --	    test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
 --	fi
 -+	    test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true;
 -
 - install-icons:
 --	-@if [ -d $(DESTDIR)$(iconsdir) ]; then \
 --           echo "[PRESERVING EXISTING ICONS SUBDIR: $(DESTDIR)$(iconsdir)]"; \
 --        else \
 --	    echo Installing icons ; \
 -+	    @echo Installing icons ; \
 - 	    $(MKINSTALLDIRS) $(DESTDIR)$(iconsdir) ; \
 - 	    cd $(top_srcdir)/docs/icons && cp -rp * $(DESTDIR)$(iconsdir) ; \
 --	    test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
 --	fi
 -+	    test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true;
 -
 - install-cgi:
 --	-@if [ -d $(DESTDIR)$(cgidir) ];then \
 --	    echo "[PRESERVING EXISTING CGI SUBDIR: $(DESTDIR)$(cgidir)]"; \
 --	else \
 --	   echo Installing CGIs ; \
 -+	   @echo Installing CGIs ; \
 - 	   $(MKINSTALLDIRS) $(DESTDIR)$(cgidir) ; \
 - 	   cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir) ; \
 --	   test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
 --	fi
 -+	   test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true;
 -
 - install-other:
 - 	@test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir)
 -@@ -208,14 +191,20 @@
 - 	@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 dbmmanage htdbm htdigest htpasswd; do \
 -+	  ${INSTALL_MAN} $(top_srcdir)/docs/man/$$i.1 $(DESTDIR)$(mandir)/man1; \
 -+	done
 -+	for i in ab apachectl apxs htcacheclean httpd logresolve rotatelogs suexec; do \
 -+	  ${INSTALL_MAN} $(top_srcdir)/docs/man/$$i.8 $(DESTDIR)$(mandir)/man8; \
 -+	done
 -+.if !defined(NOPORTDOCS)
 - 	@if test "x$(RSYNC)" != "x" && test -x $(RSYNC) ; then \
 - 	  $(RSYNC) --exclude .svn -rlpt --numeric-ids $(top_srcdir)/docs/manual/ $(DESTDIR)$(manualdir)/; \
 - 	else \
 - 	  cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir); \
 - 	  cd $(DESTDIR)$(manualdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
 - 	fi
 -+.endif
 -
 - install-suexec:
 - 	@if test -f $(builddir)/support/suexec; then \
 --- apache22.patch ends here ---

Comment 1 Mark Linimon freebsd_committer

2011-11-02 10:55:32 UTC

State Changed
From-To: open->closed

Misfiled followup to ports/159812; content migrated.

Comment 2 Mark Linimon freebsd_committer

2011-11-02 10:55:32 UTC

Responsible Changed
From-To: gnats-admin->apache