SF.net SVN: gar:[22971] csw/mgar/pkg/lang-python/mb/trunk

[dmichelsen at users.sourceforge.net]

Revision: 22971
          http://sourceforge.net/p/gar/code/22971
Author:   dmichelsen
Date:     2014-02-08 10:32:26 +0000 (Sat, 08 Feb 2014)
Log Message:
-----------
lang-python/mb/trunk: Update to 2.19.0

Modified Paths:
--------------
    csw/mgar/pkg/lang-python/mb/trunk/Makefile
    csw/mgar/pkg/lang-python/mb/trunk/checksums
    csw/mgar/pkg/lang-python/mb/trunk/files/0001-New-locations-for-GeoIP-databases.patch

Removed Paths:
-------------
    csw/mgar/pkg/lang-python/mb/trunk/files/0001-Change-default-for-getaddrinfo.patch

Modified: csw/mgar/pkg/lang-python/mb/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/mb/trunk/Makefile	2014-02-08 10:20:49 UTC (rev 22970)
+++ csw/mgar/pkg/lang-python/mb/trunk/Makefile	2014-02-08 10:32:26 UTC (rev 22971)
@@ -2,7 +2,7 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
 NAME = mirrorbrain
-VERSION = 2.17.0
+VERSION = 2.19.0
 CATEGORIES = python
 GARTYPE = v2
 
@@ -14,10 +14,6 @@
 
 PATCHFILES += 0001-New-locations-for-GeoIP-databases.patch
 
-# Use patch until this is fixed:
-#   http://mirrorbrain.org/issues/issue135
-PATCHFILES += 0001-Change-default-for-getaddrinfo.patch
-
 # We really do only care for MirrorBrain on Solaris 10
 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
 
@@ -55,10 +51,14 @@
 CHECKPKG_OVERRIDES_CSWpy-mb += surplus-dependency|CSWpython27
 CHECKPKG_OVERRIDES_CSWpy-mb += surplus-dependency|CSWpy-sqlobject
 
+# PATH gets an additionally /usr/share/mirrorbrain, what for? Overwrite for now.
+CHECKPKG_OVERRIDES_CSWpy-mb += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.6/site-packages/mb/geoip.py
+CHECKPKG_OVERRIDES_CSWpy-mb += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/mb/geoip.py
+
 PRESERVECONF += $(sysconfdir)/mirrorbrain.conf
 
 # There is no testsuite
-SKIPTEST ?= 1
+TEST_SCRIPTS =
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/lang-python/mb/trunk/checksums
===================================================================
--- csw/mgar/pkg/lang-python/mb/trunk/checksums	2014-02-08 10:20:49 UTC (rev 22970)
+++ csw/mgar/pkg/lang-python/mb/trunk/checksums	2014-02-08 10:32:26 UTC (rev 22971)
@@ -1 +1 @@
-c0556adb5c5eef8983b517f938375abc  mirrorbrain-2.17.0.tar.gz
+e4a22a5fafba2283c58f5f7b288625c5  mirrorbrain-2.19.0.tar.gz

Deleted: csw/mgar/pkg/lang-python/mb/trunk/files/0001-Change-default-for-getaddrinfo.patch
===================================================================
--- csw/mgar/pkg/lang-python/mb/trunk/files/0001-Change-default-for-getaddrinfo.patch	2014-02-08 10:20:49 UTC (rev 22970)
+++ csw/mgar/pkg/lang-python/mb/trunk/files/0001-Change-default-for-getaddrinfo.patch	2014-02-08 10:32:26 UTC (rev 22971)
@@ -1,25 +0,0 @@
-From 3f59a009b2997cfe2f79ad020613a4a1dbf1ae14 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Sat, 25 Jan 2014 11:17:09 +0100
-Subject: [PATCH] Change default for getaddrinfo
-
----
- mb/mb/asn.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mb/mb/asn.py b/mb/mb/asn.py
-index 0b6d602..3a5c2c4 100644
---- a/mb/mb/asn.py
-+++ b/mb/mb/asn.py
-@@ -17,7 +17,7 @@ def iplookup(conn, s):
-         ips = []
-         ip6s = []
-         try:
--            for res in socket.getaddrinfo(s, 0):
-+            for res in socket.getaddrinfo(s, None):
-                 af, socktype, proto, canonname, sa = res
-                 if ':' in sa[0]:
-                     if sa[0] not in ip6s:
--- 
-1.8.4.1
-

Modified: 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	2014-02-08 10:20:49 UTC (rev 22970)
+++ csw/mgar/pkg/lang-python/mb/trunk/files/0001-New-locations-for-GeoIP-databases.patch	2014-02-08 10:32:26 UTC (rev 22971)
@@ -1,6 +1,6 @@
-From 2f8223de7837825fb1838686b75a46796b85e15c Mon Sep 17 00:00:00 2001
+From a2610945b9b47a3ee029c6e6efbc349a73679d43 Mon Sep 17 00:00:00 2001
 From: Dagobert Michelsen <dam at opencsw.org>
-Date: Fri, 20 Dec 2013 13:51:33 +0100
+Date: Sat, 8 Feb 2014 11:27:12 +0100
 Subject: [PATCH] New locations for GeoIP databases
 
 ---
@@ -8,11 +8,11 @@
  1 file changed, 4 insertions(+), 12 deletions(-)
 
 diff --git a/mb/mb/geoip.py b/mb/mb/geoip.py
-index bcfda33..7b52e2f 100644
+index 681ef67..dd489ca 100644
 --- a/mb/mb/geoip.py
 +++ b/mb/mb/geoip.py
-@@ -4,23 +4,15 @@ from subprocess import Popen, PIPE
- import errno
+@@ -6,23 +6,15 @@ import errno
+ ENV = {'PATH': ':'.join([os.getenv('PATH'), '/usr/share/mirrorbrain'])}
  
  # try different databases and different locations
 -databases = ['/var/lib/GeoIP/GeoLiteCity.dat.updated', 
@@ -40,5 +40,5 @@
  for i in databases6:
      if os.path.exists(i):
 -- 
-1.8.3.4
+1.8.4.1
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.