fix #194644

Package-Manager: portage-2.1.3.19

5 files changed, 132 insertions, 8 deletions

diff --git a/www-apache/mod_watch/ChangeLog b/www-apache/mod_watch/ChangeLog
index df983f29f210..cb919b0999ab 100644
--- a/www-apache/mod_watch/ChangeLog
+++ b/www-apache/mod_watch/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apache/mod_watch
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_watch/ChangeLog,v 1.3 2007/11/25 13:37:21 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_watch/ChangeLog,v 1.4 2007/11/25 15:16:57 hollow Exp $
+
+*mod_watch-4.03-r3 (25 Nov 2007)
+
+  25 Nov 2007; Benedikt Böhm <hollow@gentoo.org>
+  +files/mod_watch-4.03-apache22.patch, +mod_watch-4.03-r3.ebuild:
+  fix #194644
 
   25 Nov 2007; Benedikt Böhm <hollow@gentoo.org> mod_watch-4.03-r2.ebuild:
   fix apache-module eclass usage
diff --git a/www-apache/mod_watch/Manifest b/www-apache/mod_watch/Manifest
index 7a43f05745dc..234f7d8839eb 100644
--- a/www-apache/mod_watch/Manifest
+++ b/www-apache/mod_watch/Manifest
@@ -5,15 +5,23 @@ AUX 77_mod_watch.conf 748 RMD160 8b2153f9be135969aaac1b448fbea77f50b6d1b1 SHA1 d
 MD5 cc285f0ff6418e9efb599e45fe4c695c files/77_mod_watch.conf 748
 RMD160 8b2153f9be135969aaac1b448fbea77f50b6d1b1 files/77_mod_watch.conf 748
 SHA256 d5b48bc32ecac033f9ce355302df98303c5592f440d068e73b24a893b5db0777 files/77_mod_watch.conf 748
+AUX mod_watch-4.03-apache22.patch 1702 RMD160 b27ec24290405c5738588e90211ae7f4a5ca940e SHA1 6c424cc762e48f5f46a2ce79dea3e43892586669 SHA256 265fe42ac8010b058e19c78557b92de764885b7a67cf706cf226676927eb3738
+MD5 f52d02d0838cf63f44bc275a2d060f77 files/mod_watch-4.03-apache22.patch 1702
+RMD160 b27ec24290405c5738588e90211ae7f4a5ca940e files/mod_watch-4.03-apache22.patch 1702
+SHA256 265fe42ac8010b058e19c78557b92de764885b7a67cf706cf226676927eb3738 files/mod_watch-4.03-apache22.patch 1702
 DIST mod_watch403.tgz 99583 RMD160 016bfdf8c98aa4a9275080a564f842f29f48bd94 SHA1 ea3114b260e1741db200a9323836082610e455d9 SHA256 65c62c6fa0a94bbde5c3453f9827b80ed922f8450527d2e75417a78094aedc40
 EBUILD mod_watch-4.03-r2.ebuild 1119 RMD160 d8b39a2d01328ef9aa89513097d2309e49456385 SHA1 2bd23afda4135577362c0eb5eb1bc77230ca13e7 SHA256 addedf206143e5b8b808aaad32eaad8cd32f0f70b61640fe5924b686edaa39f8
 MD5 96c8e7fae0eee93b6e07ac9722b21a47 mod_watch-4.03-r2.ebuild 1119
 RMD160 d8b39a2d01328ef9aa89513097d2309e49456385 mod_watch-4.03-r2.ebuild 1119
 SHA256 addedf206143e5b8b808aaad32eaad8cd32f0f70b61640fe5924b686edaa39f8 mod_watch-4.03-r2.ebuild 1119
-MISC ChangeLog 3117 RMD160 79340fb4a78cafed643cf7e8acf30f548c672f5d SHA1 8a65131adf9e1ecd5a6c355990415abbe756f7b4 SHA256 f19405765d74c764365e3844035690b156e3554ddbaa9f73013c21e9c6e1728b
-MD5 0ded535fddcce4ec73f8aea6cf9ebc9c ChangeLog 3117
-RMD160 79340fb4a78cafed643cf7e8acf30f548c672f5d ChangeLog 3117
-SHA256 f19405765d74c764365e3844035690b156e3554ddbaa9f73013c21e9c6e1728b ChangeLog 3117
+EBUILD mod_watch-4.03-r3.ebuild 1212 RMD160 1619c7cf60ec2c367e0a42ce548bab7941ebb383 SHA1 ca75ddb9411dc6286634029bd5ec7b480f49c64b SHA256 15283045e4d252c2b5f6d927abb9f567ccd3f546a4b8a67f889f36d6a5bdcea7
+MD5 302978aba2e36f66251a3948a4b45baf mod_watch-4.03-r3.ebuild 1212
+RMD160 1619c7cf60ec2c367e0a42ce548bab7941ebb383 mod_watch-4.03-r3.ebuild 1212
+SHA256 15283045e4d252c2b5f6d927abb9f567ccd3f546a4b8a67f889f36d6a5bdcea7 mod_watch-4.03-r3.ebuild 1212
+MISC ChangeLog 3283 RMD160 4b9e59ec8ca2b78711301903003477062689a60f SHA1 753c643406e19eef8a419aa272650969d37025c4 SHA256 8952f62608ceb25e980b85dad7cfd489ca5a32f8be963f597517e486e53ac992
+MD5 31437076031ad283dfc3969bc3b2abdb ChangeLog 3283
+RMD160 4b9e59ec8ca2b78711301903003477062689a60f ChangeLog 3283
+SHA256 8952f62608ceb25e980b85dad7cfd489ca5a32f8be963f597517e486e53ac992 ChangeLog 3283
 MISC metadata.xml 229 RMD160 bb816bd761846ad578f8c1521a1f1ec6297410f4 SHA1 92fdbcb6a85ece96506733ad67a5e4e74a58a529 SHA256 8e1aafc5385805d45759406a60df79f0ce88aa1df1a58d44b596405d64c9226d
 MD5 17bfbf436c6d4afc4dea019597d048d1 metadata.xml 229
 RMD160 bb816bd761846ad578f8c1521a1f1ec6297410f4 metadata.xml 229
@@ -21,10 +29,13 @@ SHA256 8e1aafc5385805d45759406a60df79f0ce88aa1df1a58d44b596405d64c9226d metadata
 MD5 29ddf1c298a708f14a8f8e3884d0a2b5 files/digest-mod_watch-4.03-r2 226
 RMD160 1fdf114c7b7c4123cab00e99bc58c35f71995688 files/digest-mod_watch-4.03-r2 226
 SHA256 5716af43c309f384df8200978ad344d78259dc73968ae1f5c3bead68954a2d37 files/digest-mod_watch-4.03-r2 226
+MD5 29ddf1c298a708f14a8f8e3884d0a2b5 files/digest-mod_watch-4.03-r3 226
+RMD160 1fdf114c7b7c4123cab00e99bc58c35f71995688 files/digest-mod_watch-4.03-r3 226
+SHA256 5716af43c309f384df8200978ad344d78259dc73968ae1f5c3bead68954a2d37 files/digest-mod_watch-4.03-r3 226
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHSXqWmPFBzbX68WERAsbIAKCQfEClYdUngyF2RLUFzONNSYlDxQCfU2ua
-GXYk2zVp2NiOOJv33g+UOlg=
-=GAXh
+iD8DBQFHSZHymPFBzbX68WERAph6AJ0SE1FlHcqiu1+xFW833nTj77FbEACfafJm
+hlI5BxBozHbQ/b+WU4o3G/4=
+=L7Tl
 -----END PGP SIGNATURE-----
diff --git a/www-apache/mod_watch/files/digest-mod_watch-4.03-r3 b/www-apache/mod_watch/files/digest-mod_watch-4.03-r3
new file mode 100644
index 000000000000..cd02ba95b682
--- /dev/null
+++ b/www-apache/mod_watch/files/digest-mod_watch-4.03-r3
@@ -0,0 +1,3 @@
+MD5 06d57713adb935f16596d22256bca913 mod_watch403.tgz 99583
+RMD160 016bfdf8c98aa4a9275080a564f842f29f48bd94 mod_watch403.tgz 99583
+SHA256 65c62c6fa0a94bbde5c3453f9827b80ed922f8450527d2e75417a78094aedc40 mod_watch403.tgz 99583
diff --git a/www-apache/mod_watch/files/mod_watch-4.03-apache22.patch b/www-apache/mod_watch/files/mod_watch-4.03-apache22.patch
new file mode 100644
index 000000000000..a0498cbe7995
--- /dev/null
+++ b/www-apache/mod_watch/files/mod_watch-4.03-apache22.patch
@@ -0,0 +1,54 @@
+Common subdirectories: mod_watch-4.3/Contrib and mod_watch-4.3_apache22_mod/Contrib
+Common subdirectories: mod_watch-4.3/Img and mod_watch-4.3_apache22_mod/Img
+diff -u mod_watch-4.3/Makefile.dso mod_watch-4.3_apache22_mod/Makefile.dso
+--- mod_watch-4.3/Makefile.dso	2003-03-14 10:50:15.000000000 +0100
++++ mod_watch-4.3_apache22_mod/Makefile.dso	2007-04-19 13:49:22.000000000 +0200
+@@ -13,7 +13,8 @@
+ #
+ # The location of apxs utility.
+ #
+-APXS=/home/apache2/bin/apxs
++#APXS=/home/apache2/bin/apxs
++APXS=/usr/local/sbin/apxs
+ 
+ #
+ # The location of apachectl utility to stop/start/restart targets.
+diff -u mod_watch-4.3/mod_watch.c mod_watch-4.3_apache22_mod/mod_watch.c
+--- mod_watch-4.3/mod_watch.c	2003-03-13 22:44:27.000000000 +0100
++++ mod_watch-4.3_apache22_mod/mod_watch.c	2007-11-25 16:12:05.785948411 +0100
+@@ -258,7 +258,7 @@
+ {
+ 	char *username;
+ 
+-	if (apr_get_username(&username, uid, p) == APR_SUCCESS)
++	if (apr_uid_name_get(&username, uid, p) == APR_SUCCESS)
+ 		return username;
+ 
+ 	return "unknown-user";
+@@ -278,7 +278,7 @@
+ {
+ 	char *groupname;
+ 
+-	if (apr_get_groupname(&groupname, gid, p) == APR_SUCCESS)
++	if (apr_gid_name_get(&groupname, gid, p) == APR_SUCCESS)
+ 		return groupname;
+ 
+ 	return "unknown-group";
+@@ -355,7 +355,7 @@
+ 
+ 	nbytes = sizeof word;
+ 	rc = fileReadWord(fp, word, &nbytes);
+-	if (!APR_STATUS_IS_SUCCESS(rc))
++	if (rc != APR_SUCCESS)
+ 		return rc;
+ 
+ 	return sscanf(word, format, number) == 1 ? APR_SUCCESS : APR_EGENERAL;
+@@ -370,7 +370,7 @@
+ 
+ 	nbytes = sizeof word;
+ 	rc = fileReadWord(fp, word, &nbytes);
+-	if (!APR_STATUS_IS_SUCCESS(rc))
++	if (rc != APR_SUCCESS )
+ 		return rc;
+ 
+ 	return sscanf(word, "%lf", number) == 1 ? APR_SUCCESS : APR_EGENERAL;
diff --git a/www-apache/mod_watch/mod_watch-4.03-r3.ebuild b/www-apache/mod_watch/mod_watch-4.03-r3.ebuild
new file mode 100644
index 000000000000..29e164beb750
--- /dev/null
+++ b/www-apache/mod_watch/mod_watch-4.03-r3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_watch/mod_watch-4.03-r3.ebuild,v 1.1 2007/11/25 15:16:57 hollow Exp $
+
+inherit apache-module eutils
+
+KEYWORDS="~ppc ~x86"
+
+DESCRIPTION="Bandwidth graphing module for Apache2 with MRTG."
+HOMEPAGE="http://www.snert.com/Software/mod_watch/"
+SRC_URI="http://www.snert.com/Software/download/${PN}${PV/./}.tgz"
+LICENSE="as-is"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/${PN}-4.3"
+
+APACHE2_MOD_CONF="77_mod_watch"
+APACHE2_MOD_DEFINE="WATCH"
+
+DOCFILES="*.shtml CHANGES.TXT LICENSE.TXT Contrib/*.txt"
+
+need_apache2
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-apache22.patch
+}
+
+src_compile() {
+	sed -i \
+		-e "s:APXS=\\(.*\\):APXS=${APXS2} # \\1:" \
+		-e "s:APACHECTL=\\(.*\\):APACHECTL=${APACHECTL2} # \\1:" \
+		Makefile.dso || die "Path fixing failed"
+
+	sed -i -e "s:/usr/local/sbin:/usr/sbin:" \
+		apache2mrtg.pl || die "Path fixing failed"
+
+	emake -f Makefile.dso build || die "emake failed"
+}
+
+src_install() {
+	apache-module_src_install
+	dosbin apache2mrtg.pl mod_watch.pl Contrib/mod_watch_list.pl
+	keepdir /var/lib/${PN}
+}