Revision: 22879
http://sourceforge.net/p/gar/code/22879
Author: dmichelsen
Date: 2014-01-25 10:24:09 +0000 (Sat, 25 Jan 2014)
Log Message:
-----------
mirrorbrain/trunk: Add some more adustments
Modified Paths:
--------------
csw/mgar/pkg/mirrorbrain/trunk/Makefile
Added Paths:
-----------
csw/mgar/pkg/mirrorbrain/trunk/files/0001-Change-default-for-getaddrinfo.patch
Modified: csw/mgar/pkg/mirrorbrain/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mirrorbrain/trunk/Makefile 2014-01-24 22:43:26 UTC (rev
22878)
+++ csw/mgar/pkg/mirrorbrain/trunk/Makefile 2014-01-25 10:24:09 UTC (rev
22879)
@@ -5,13 +5,19 @@
VERSION = 2.17.0
GARTYPE = v2
-DESCRIPTION = Brief description
+DESCRIPTION = Content distribution tool
MASTER_SITES = http://mirrorbrain.org/files/releases/
DISTFILES = $(DISTNAME).tar.gz
+# Use patch until this is fixed:
+# http://mirrorbrain.org/issues/issue130
PATCHFILES += 0001-Make-geoip-database-position-adjustable.patch
+# Use patch until this is fixed:
+# http://mirrorbrain.org/issues/issue135
+PATCHFILES += 0001-Change-default-for-getaddrinfo.patch
+
VENDOR_URL = http://mirrorbrain.org
# Apache paths
@@ -52,12 +58,15 @@
RUNTIME_DEP_PKGS_CSWmirrorbrain-tools += CSWpy-psycopg2
RUNTIME_DEP_PKGS_CSWmirrorbrain-tools += CSWlibgeoip1
RUNTIME_DEP_PKGS_CSWmirrorbrain-tools += CSWperl
+# This is needed for /opt/csw/bin/scanner
+RUNTIME_DEP_PKGS_CSWmirrorbrain-tools += CSWpm-dbi
# I know these are needed
CHECKPKG_OVERRIDES_CSWmirrorbrain-tools += surplus-dependency|CSWpy-cmdln
CHECKPKG_OVERRIDES_CSWmirrorbrain-tools += surplus-dependency|CSWpy-mb
CHECKPKG_OVERRIDES_CSWmirrorbrain-tools += surplus-dependency|CSWpy-sqlobject
CHECKPKG_OVERRIDES_CSWmirrorbrain-tools += surplus-dependency|CSWpy-psycopg2
CHECKPKG_OVERRIDES_CSWmirrorbrain-tools += surplus-dependency|CSWperl
+CHECKPKG_OVERRIDES_CSWmirrorbrain-tools += surplus-dependency|CSWpm-dbi
# The Python CSWpy-mb module "mb" and the "mb" binary are in lang-py/mb
@@ -76,6 +85,12 @@
REINPLACE_WITH_mbconf = $(sysconfdir)/mirrorbrain.conf
REINPLACE_FILES_mbconf += tools/scanner.pl
+# The language must be in lower case
+REINPLACEMENTS += sql
+REINPLACE_MATCH_sql = 'SQL'
+REINPLACE_WITH_sql = 'sql'
+REINPLACE_FILES_sql += sql/schema-postgresql.sql
+
GEOIPCITYFILE = $(sharedstatedir)/GeoIP/GeoIPCity.dat
GEOIPFILE = $(sharedstatedir)/GeoIP/GeoIP.dat
@@ -110,6 +125,7 @@
ginstall -m 0755 $(WORKSRC)/tools/scanner.pl $(DESTDIR)$(bindir)/scanner
ginstall -d $(DESTDIR)$(sharedstatedir)/mirrorbrain/sql
ginstall -m 0644 $(WORKSRC)/sql/initialdata-postgresql.sql
$(DESTDIR)$(sharedstatedir)/mirrorbrain/sql/initialdata-postgresql.sql
+ @# LANG SQL must in fact be LANG sql (lowercase!) or the creation faills
ginstall -m 0644 $(WORKSRC)/sql/schema-postgresql.sql
$(DESTDIR)$(sharedstatedir)/mirrorbrain/sql/schema-postgresql.sql
@$(MAKECOOKIE)
Added:
csw/mgar/pkg/mirrorbrain/trunk/files/0001-Change-default-for-getaddrinfo.patch
===================================================================
---
csw/mgar/pkg/mirrorbrain/trunk/files/0001-Change-default-for-getaddrinfo.patch
(rev 0)
+++
csw/mgar/pkg/mirrorbrain/trunk/files/0001-Change-default-for-getaddrinfo.patch
2014-01-25 10:24:09 UTC (rev 22879)
@@ -0,0 +1,25 @@
+From 3f59a009b2997cfe2f79ad020613a4a1dbf1ae14 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <d...@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
+
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
