Add patch for #22256

5 files changed, 107 insertions, 2 deletions

diff --git a/net-www/mod_gzip/Manifest b/net-www/mod_gzip/Manifest
index 21eca19038f9..022d352790ce 100644
--- a/net-www/mod_gzip/Manifest
+++ b/net-www/mod_gzip/Manifest
@@ -1,7 +1,7 @@
 MD5 529c8f999cf2353971c0f501404502ef mod_gzip-1.3.26.1a.ebuild 1292
-MD5 7c97753ff4e0701567d1c5b9ca6db8f6 mod_gzip-1.3.26.1a-r1.ebuild 1398
+MD5 adb1a773a2e6c640d40716947a9ffc68 mod_gzip-1.3.26.1a-r1.ebuild 1405
 MD5 567c706b1ab4e8479a86547ad0852e66 mod_gzip-1.3.19.1a-r1.ebuild 1426
-MD5 c2c626eb5ba5ba823b9c1eee8509a143 ChangeLog 1490
+MD5 bafa4da9dbd124785a9a003323282b54 ChangeLog 1492
 MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161
 MD5 67b10b917047747e0f209ae0317e8099 files/commands.txt 8231
 MD5 46ef064afd4e7499a51bbebe4836c1b1 files/mod_gzip.conf 1239
diff --git a/net-www/mod_gzip/files/digest-mod_gzip-1.3.26.1a-r1 b/net-www/mod_gzip/files/digest-mod_gzip-1.3.26.1a-r1
new file mode 100644
index 000000000000..2e5c711c6990
--- /dev/null
+++ b/net-www/mod_gzip/files/digest-mod_gzip-1.3.26.1a-r1
@@ -0,0 +1 @@
+MD5 080ccc5d789ed5efa0c0a7625e4fa02d mod_gzip-1.3.26.1a.tgz 137394
diff --git a/net-www/mod_gzip/files/mod-gzip-debug.patch b/net-www/mod_gzip/files/mod-gzip-debug.patch
new file mode 100644
index 000000000000..b1b6d330a4c2
--- /dev/null
+++ b/net-www/mod_gzip/files/mod-gzip-debug.patch
@@ -0,0 +1,49 @@
+--- mod_gzip_debug.c	2003-10-06 18:10:47.000000000 +0200
++++ mod_gzip_debug.patch	2003-10-06 18:13:53.000000000 +0200
+@@ -94,6 +94,7 @@
+ #include "httpd.h"
+ #include "http_config.h"
+ #include "http_log.h"
++#include <stdlib.h>
+ 
+ #include "mod_gzip.h"
+ #include "mod_gzip_debug.h"
+@@ -125,7 +126,7 @@ void mod_gzip_printf( const char *fmt, .
+ 
+  va_start( ap, fmt );
+ 
+- l = vsprintf( log_line, fmt, ap );
++ l = vsnprintf( log_line, sizeof(log_line), "%s", fmt, ap );
+ 
+  va_end(ap);
+ 
+@@ -138,6 +139,8 @@ void mod_gzip_printf( const char *fmt, .
+ 
+ void mod_gzip_printf( const char *fmt, ... )
+ {
++ long rndNum;
++ time_t seed = time(NULL);
+  int   l;
+  char *p1;
+  FILE *log;
+@@ -153,6 +156,11 @@ void mod_gzip_printf( const char *fmt, .
+  long pid = (long) getpid();
+  #endif
+ 
++ srand(seed);
++
++ rndNum = 1+ (int)(1000.0*rand()/(RAND_MAX+1.0));
++ rndNum *= pid; 
++
+  #ifdef WIN32
+  sprintf( logname, "c:\\temp\\t%ld.log",(long)pid);
+  #else
+@@ -168,7 +176,7 @@ void mod_gzip_printf( const char *fmt, .
+ 
+  va_start( ap, fmt );
+ 
+- l = vsprintf(log_line, fmt, ap);
++ l = vsnprintf(log_line, sizeof(log_line), "%s",fmt, ap);
+ 
+  p1=log_line;
+  while((*p1!=0)&&(*p1!=13)&&(*p1!=10)) p1++;
diff --git a/net-www/mod_gzip/metadata.xml b/net-www/mod_gzip/metadata.xml
new file mode 100644
index 000000000000..95c06f0095bb
--- /dev/null
+++ b/net-www/mod_gzip/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>web-apps</herd>
+</pkgmetadata>
diff --git a/net-www/mod_gzip/mod_gzip-1.3.26.1a-r1.ebuild b/net-www/mod_gzip/mod_gzip-1.3.26.1a-r1.ebuild
new file mode 100644
index 000000000000..690cf1fe42ad
--- /dev/null
+++ b/net-www/mod_gzip/mod_gzip-1.3.26.1a-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_gzip/mod_gzip-1.3.26.1a-r1.ebuild,v 1.1 2003/10/08 00:57:51 woodchip Exp $
+
+DESCRIPTION="Apache module which acts as an Internet Content Accelerator"
+HOMEPAGE="http://sourceforge.net/projects/mod-gzip/"
+KEYWORDS="x86 ~sparc ~alpha"
+
+S=${WORKDIR}/${P}
+SRC_URI="http://unc.dl.sourceforge.net/sourceforge/mod-gzip/mod_gzip-${PV}.tgz"
+
+DEPEND="=net-www/apache-1* >=sys-libs/zlib-1.1.4"
+LICENSE="Apache-1.1"
+SLOT="0"
+
+src_unpack() {
+	unpack ${A} || die
+	cd ${S} || die
+	patch -p0 <${FILESDIR}/mod-gzip-debug.patch || die
+}
+
+src_compile() {
+	APXS="/usr/sbin/apxs" make || die "Make failed"
+}
+
+src_install() {
+	exeinto /usr/lib/apache-extramodules
+	doexe mod_gzip.so
+
+	insinto /etc/apache/conf/addon-modules
+	newins ${FILESDIR}/mod_gzip.conf-new mod_gzip.conf
+
+	dohtml -r docs/manual/english
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Execute \"ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config\""
+	einfo "to have your apache.conf auto-updated for use with this module."
+	einfo "You should then edit your /etc/conf.d/apache file to suit."
+	einfo
+}
+
+pkg_config() {
+	${ROOT}/usr/sbin/apacheaddmod \
+		${ROOT}/etc/apache/conf/apache.conf \
+		extramodules/mod_gzip.so mod_gzip.c gzip_module \
+		define=GZIP addconf=conf/addon-modules/mod_gzip.conf
+	:;
+}