diff options
author | Benedikt Boehm <hollow@gentoo.org> | 2007-11-25 15:16:58 +0000 |
---|---|---|
committer | Benedikt Boehm <hollow@gentoo.org> | 2007-11-25 15:16:58 +0000 |
commit | e13b5fe51988facde8315fa6ae85d4bd2cf181d4 (patch) | |
tree | 40d4f05327d207731309585880174ba8f9e0acc3 /www-apache/mod_watch | |
parent | Marking fastutil-5.0.9 ppc for bug 199246 (diff) | |
download | gentoo-2-e13b5fe51988facde8315fa6ae85d4bd2cf181d4.tar.gz gentoo-2-e13b5fe51988facde8315fa6ae85d4bd2cf181d4.tar.bz2 gentoo-2-e13b5fe51988facde8315fa6ae85d4bd2cf181d4.zip |
fix #194644
(Portage version: 2.1.3.19)
Diffstat (limited to 'www-apache/mod_watch')
-rw-r--r-- | www-apache/mod_watch/ChangeLog | 8 | ||||
-rw-r--r-- | www-apache/mod_watch/files/digest-mod_watch-4.03-r3 | 3 | ||||
-rw-r--r-- | www-apache/mod_watch/files/mod_watch-4.03-apache22.patch | 54 | ||||
-rw-r--r-- | www-apache/mod_watch/mod_watch-4.03-r3.ebuild | 50 |
4 files changed, 114 insertions, 1 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/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} +} |