diff options
| author |   Jeremy Olexa <darkside@gentoo.org> | 2011-10-17 20:05:33 +0000 |
|---|---|---|
| committer | Jeremy Olexa <darkside@gentoo.org> | 2011-10-17 20:05:33 +0000 |
| commit | 373cc8ff146938f39ac3a83532c17abcabeb8f6f (patch) | |
| tree | 99823263b45ad210b16bba91270bdd981212cb6f | |
| parent | rm www-apache/mod_geoip2, in tree (diff) | |
| download | darkside-373cc8ff146938f39ac3a83532c17abcabeb8f6f.tar.gz darkside-373cc8ff146938f39ac3a83532c17abcabeb8f6f.tar.bz2 darkside-373cc8ff146938f39ac3a83532c17abcabeb8f6f.zip | |
[www-misc/mirrorbrain] Fix upstream python issue
| -rw-r--r-- | www-misc/mirrorbrain/Manifest | 3 | ||||
| -rw-r--r-- | www-misc/mirrorbrain/files/0001-mirrorprobe-fix-str-int-issue.patch | 26 | ||||
| -rw-r--r-- | www-misc/mirrorbrain/mirrorbrain-2.15.1.ebuild | 11 |
3 files changed, 35 insertions, 5 deletions
diff --git a/www-misc/mirrorbrain/Manifest b/www-misc/mirrorbrain/Manifest index be37b35..90ff838 100644 --- a/www-misc/mirrorbrain/Manifest +++ b/www-misc/mirrorbrain/Manifest @@ -1,5 +1,6 @@ +AUX 0001-mirrorprobe-fix-str-int-issue.patch 987 RMD160 6e05b3f5ac3821dd1da5a372aae410081b826d5e SHA1 b161f8985753cde25c0a893dbea456c331484d74 SHA256 da407a211c9dbbce9810991e8e3bd414585a666f16a5e103bed161ce995ff3c3 AUX mirrorbrain.conf.dist 283 RMD160 75e1d9b143df9d65b280ae6033d5421c03f64720 SHA1 fe724636efcfc6be74a583d159925ba99670d874 SHA256 f0128c5596b37b92b08b1ddde850f7aa68a29cccee7265bfa4d0beb2beb1c142 DIST mirrorbrain-2.15.1.tar.gz 406558 RMD160 a85df3731780b5d76fa89eff0f1112b7163ee0ed SHA1 53feeb62407965fe9672cb2600a43cc3620d0971 SHA256 40ffceab04ef109f3e48d3760265595ed02100198768660e002322927739d462 -EBUILD mirrorbrain-2.15.1.ebuild 1929 RMD160 980311bce25fab8ba565c5ff17d6c59ed342a5cf SHA1 e54537fe69b32bd9866850b213e61424f15a2a8f SHA256 e6fb3da86aff9972e3b1a6bd364e3360e99dab3581a805f7c00495413aa2acde +EBUILD mirrorbrain-2.15.1.ebuild 1998 RMD160 356b2c31b3148736ad53cf7d2e7f73d1aaf10f84 SHA1 acf9a59b09005b7c3fa1c44f498a2c5aacc741e0 SHA256 0f34aa5f584bbcca8f646ab37428b31cef405520c26ee80b6347fbc219c689e2 MISC ChangeLog 684 RMD160 b19fe5f184e8c13d38c09643d4875c549178d805 SHA1 1e71151c72721e816915b51bc548f169236a66ae SHA256 9f1a8d34facba936c11a1bad5d31d6076936d36563014ffa1359ee2ba265dc87 MISC metadata.xml 572 RMD160 5b7aa04b3fb08e0fbb6a09cc9afff20d71665fc7 SHA1 2eb146a7c8554a0559c2e034ee6f14efe357e65e SHA256 bd97a6cb6d478f88d4b367bb7f5dd8de0f1d53b7a4dcca1bc484c9fabdb25308 diff --git a/www-misc/mirrorbrain/files/0001-mirrorprobe-fix-str-int-issue.patch b/www-misc/mirrorbrain/files/0001-mirrorprobe-fix-str-int-issue.patch new file mode 100644 index 0000000..1caad5d --- /dev/null +++ b/www-misc/mirrorbrain/files/0001-mirrorprobe-fix-str-int-issue.patch @@ -0,0 +1,26 @@ +From 2834ba64a6eb9ae25ee8eaae4587e6e88755e145 Mon Sep 17 00:00:00 2001 +From: Jeremy Olexa <darkside@gentoo.org> +Date: Mon, 17 Oct 2011 20:01:38 +0000 +Subject: [PATCH] mirrorprobe: fix str->int issue + +http://mirrorbrain.org/issues/issue88 +--- + mirrorprobe/mirrorprobe.py | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/mirrorprobe/mirrorprobe.py b/mirrorprobe/mirrorprobe.py +index fd7ac68..7f42bed 100755 +--- a/mirrorprobe/mirrorprobe.py ++++ b/mirrorprobe/mirrorprobe.py +@@ -262,7 +262,7 @@ def main(): + # + # ignore wildcard mirrors, assuming that they can't be checked by normal means (i.e., baseurl itself may + # not give a 200. Just some files are served maybe... +- result = conn.Server.select(AND(conn.Server.q.enabled == '1', conn.Server.q.country != '**')) ++ result = conn.Server.select(AND(conn.Server.q.enabled, conn.Server.q.country != '**')) + for i in result: + mirrors.append(i) + +-- +1.7.3.4 + diff --git a/www-misc/mirrorbrain/mirrorbrain-2.15.1.ebuild b/www-misc/mirrorbrain/mirrorbrain-2.15.1.ebuild index 6625855..b3c02de 100644 --- a/www-misc/mirrorbrain/mirrorbrain-2.15.1.ebuild +++ b/www-misc/mirrorbrain/mirrorbrain-2.15.1.ebuild @@ -35,14 +35,17 @@ RDEPEND="${DEPEND}" S="${WORKDIR}/${MY_P}" pkg_setup() { - enewgroup mirrorbrain - enewuser mirrorbrain -1 -1 /dev/null mirrorbrain + #enewgroup mirrorbrain + #enewuser mirrorbrain -1 -1 /dev/null mirrorbrain + : } src_prepare() { - sed -i -e 's:/var/lib/GeoIP/GeoLiteCity.dat:/usr/share/GeoIP/GeoIP.dat:' ${S}/tools/geoiplookup_city.c || die - sed -i -e 's:/var/lib/GeoIP/GeoIP.dat:/usr/share/GeoIP/GeoIP.dat:' ${S}/tools/geoiplookup_continent.c || die + sed -i -e 's:/var/lib/GeoIP/GeoLiteCity.dat:/usr/share/GeoIP/GeoIP.dat:' ${S}/tools/geoiplookup_city.c || die + sed -i -e 's:/var/lib/GeoIP/GeoIP.dat:/usr/share/GeoIP/GeoIP.dat:' ${S}/tools/geoiplookup_continent.c || die + epatch "${FILESDIR}"/0001-mirrorprobe-fix-str-int-issue.patch } + src_compile() { tc-export CC cd tools |