Revision: 22722 http://sourceforge.net/p/gar/code/22722 Author: dmichelsen Date: 2013-12-20 13:07:29 +0000 (Fri, 20 Dec 2013) Log Message: ----------- lang-python/mb: Initial commit
Added Paths: ----------- csw/mgar/pkg/lang-python/mb/ csw/mgar/pkg/lang-python/mb/Makefile csw/mgar/pkg/lang-python/mb/branches/ csw/mgar/pkg/lang-python/mb/tags/ csw/mgar/pkg/lang-python/mb/trunk/ csw/mgar/pkg/lang-python/mb/trunk/Makefile csw/mgar/pkg/lang-python/mb/trunk/checksums csw/mgar/pkg/lang-python/mb/trunk/files/ csw/mgar/pkg/lang-python/mb/trunk/files/0001-New-locations-for-GeoIP-databases.patch Added: csw/mgar/pkg/lang-python/mb/Makefile =================================================================== --- csw/mgar/pkg/lang-python/mb/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/mb/Makefile 2013-12-20 13:07:29 UTC (rev 22722) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Index: csw/mgar/pkg/lang-python/mb/trunk =================================================================== --- csw/mgar/pkg/lang-python/mb/trunk 2013-12-20 12:06:10 UTC (rev 22721) +++ csw/mgar/pkg/lang-python/mb/trunk 2013-12-20 13:07:29 UTC (rev 22722) Property changes on: csw/mgar/pkg/lang-python/mb/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/lang-python/mb/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/mb/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/mb/trunk/Makefile 2013-12-20 13:07:29 UTC (rev 22722) @@ -0,0 +1,37 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = mirrorbrain +VERSION = 2.17.0 +CATEGORIES = python +GARTYPE = v2 + +DESCRIPTION = Brief description + +MASTER_SITES = http://mirrorbrain.org/files/releases/ +DISTFILES = $(DISTNAME).tar.gz + +PATCHFILES += 0001-New-locations-for-GeoIP-databases.patch + +WORKSRC = $(WORKDIR)/$(DISTNAME)/mb + +LICENSE = COPYING + +PACKAGES += CSWpy-mb +SPKG_DESC_CSWpy-mb = Python module used by the MirrorBrain commandline tools +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWpy-mb += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWpy-mb += CSWlibpython2-6-1-0 +RUNTIME_DEP_PKGS_CSWpy-mb += CSWlibpython2-7-1-0 +RUNTIME_DEP_PKGS_CSWpy-mb += CSWpy-cmdln +RUNTIME_DEP_PKGS_CSWpy-mb += CSWgeolitedb +# checkpkg cannot detect these deps +CHECKPKG_OVERRIDES_CSWpy-mb += surplus-dependency|CSWpy-cmdln +CHECKPKG_OVERRIDES_CSWpy-mb += surplus-dependency|CSWgeolitedb + +# There is no testsuite +SKIPTEST ?= 1 + +include gar/category.mk + + Property changes on: csw/mgar/pkg/lang-python/mb/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/lang-python/mb/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/mb/trunk/checksums (rev 0) +++ csw/mgar/pkg/lang-python/mb/trunk/checksums 2013-12-20 13:07:29 UTC (rev 22722) @@ -0,0 +1 @@ +c0556adb5c5eef8983b517f938375abc mirrorbrain-2.17.0.tar.gz Added: csw/mgar/pkg/lang-python/mb/trunk/files/0001-New-locations-for-GeoIP-databases.patch =================================================================== --- csw/mgar/pkg/lang-python/mb/trunk/files/0001-New-locations-for-GeoIP-databases.patch (rev 0) +++ csw/mgar/pkg/lang-python/mb/trunk/files/0001-New-locations-for-GeoIP-databases.patch 2013-12-20 13:07:29 UTC (rev 22722) @@ -0,0 +1,44 @@ +From 2f8223de7837825fb1838686b75a46796b85e15c Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen <d...@opencsw.org> +Date: Fri, 20 Dec 2013 13:51:33 +0100 +Subject: [PATCH] New locations for GeoIP databases + +--- + mb/mb/geoip.py | 16 ++++------------ + 1 file changed, 4 insertions(+), 12 deletions(-) + +diff --git a/mb/mb/geoip.py b/mb/mb/geoip.py +index bcfda33..7b52e2f 100644 +--- a/mb/mb/geoip.py ++++ b/mb/mb/geoip.py +@@ -4,23 +4,15 @@ from subprocess import Popen, PIPE + import errno + + # try different databases and different locations +-databases = ['/var/lib/GeoIP/GeoLiteCity.dat.updated', +- '/var/lib/GeoIP/GeoLiteCity.dat', +- '/var/lib/GeoIP/GeoIP.dat.updated', +- '/var/lib/GeoIP/GeoIP.dat', +- '/usr/share/GeoIP/GeoLiteCity.dat.updated', +- '/usr/share/GeoIP/GeoLiteCity.dat', +- '/usr/share/GeoIP/GeoIP.dat.updated', +- '/usr/share/GeoIP/GeoIP.dat', ++databases = ['/opt/csw/share/GeoIP/GeoIPCity.dat', ++ '/opt/csw/share/GeoIP/GeoIP.dat', + ] + for i in databases: + if os.path.exists(i): + database = i + break +-databases6 = ['/var/lib/GeoIP/GeoIPv6.dat.updated', +- '/var/lib/GeoIP/GeoIPv6.dat', +- '/usr/share/GeoIP/GeoIPv6.dat.updated', +- '/usr/share/GeoIP/GeoIPv6.dat', ++databases6 = ['/opt/csw/share/GeoIP/GeoIPCityv6.dat', ++ '/opt/csw/share/GeoIP/GeoIPv6.dat', + ] + for i in databases6: + if os.path.exists(i): +-- +1.8.3.4 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.