Revision bump, including all those tools and scripts from support/ (excluding suexec, which is being packaged w/ net-www/apache.

Package-Manager: portage-2.1.2.7

4 files changed, 50 insertions, 3 deletions

diff --git a/app-admin/apache-tools/files/apache-tools-Makefile.patch b/app-admin/apache-tools/files/apache-tools-Makefile.patch
new file mode 100644
index 000000000000..8181a16b7059
--- /dev/null
+++ b/app-admin/apache-tools/files/apache-tools-Makefile.patch
@@ -0,0 +1,39 @@
+--- a/support/Makefile.in
++++ b/support/Makefile.in
+@@ -1,9 +1,10 @@
+ DISTCLEAN_TARGETS = apxs apachectl dbmmanage log_server_status \
+-	logresolve.pl phf_abuse_log.cgi split-logfile envvars-std
++	logresolve.pl phf_abuse_log.cgi split-logfile
+ 
+ CLEAN_TARGETS = suexec
+ 
+-PROGRAMS = htpasswd htdigest rotatelogs logresolve ab checkgid htdbm htcacheclean httxt2dbm
++PROGRAMS = htpasswd htdigest rotatelogs logresolve ab checkgid htdbm \
++	htcacheclean httxt2dbm log_server_status split-logfile
+ TARGETS  = $(PROGRAMS)
+ 
+ PROGRAM_LDADD        = $(UTIL_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS) $(AP_LIBS)
+@@ -12,22 +13,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)
diff --git a/app-admin/apache-tools/files/apache-tools-ab-ssl.patch b/app-admin/apache-tools/files/apache-tools-ab-ssl.patch
new file mode 100644
index 000000000000..e99ebe869350
--- /dev/null
+++ b/app-admin/apache-tools/files/apache-tools-ab-ssl.patch
@@ -0,0 +1,11 @@
+--- a/support/Makefile.in
++++ b/support/Makefile.in
+@@ -43,7 +43,7 @@ htdbm: $(htdbm_OBJECTS)
+ 	$(LINK) $(htdbm_LTFLAGS) $(htdbm_OBJECTS) $(PROGRAM_LDADD)
+ 
+ ab_OBJECTS = ab.lo
+-ab_LDADD = $(PROGRAM_LDADD) $(SSL_LIBS)
++ab_LDADD = $(PROGRAM_LDADD) $(SSL_LIBS) -DUSE_SSL -lssl -I/usr/include/openssl
+ ab: $(ab_OBJECTS)
+ 	$(LINK) $(ab_LTFLAGS) $(ab_OBJECTS) $(ab_LDADD)
+ 
diff --git a/app-admin/apache-tools/files/digest-apache-tools-2.2.4-r1 b/app-admin/apache-tools/files/digest-apache-tools-2.2.4-r1
deleted file mode 100644
index 1e007f41e88e..000000000000
--- a/app-admin/apache-tools/files/digest-apache-tools-2.2.4-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 536c86c7041515a25dd8bad3611da9a3 httpd-2.2.4.tar.bz2 4930375
-RMD160 bb6e8a7447fa8e8f629010f30b548068de518523 httpd-2.2.4.tar.bz2 4930375
-SHA256 08ab82eae6418e265d361730e7eadc7d6966dffdb66ee07bd4d9af3f2b28dfc8 httpd-2.2.4.tar.bz2 4930375
diff --git a/app-admin/apache-tools/files/digest-apache-tools-2.2.4 b/app-admin/apache-tools/files/digest-apache-tools-2.2.4-r2
index 1e007f41e88e..1e007f41e88e 100644
--- a/app-admin/apache-tools/files/digest-apache-tools-2.2.4
+++ b/app-admin/apache-tools/files/digest-apache-tools-2.2.4-r2