SF.net SVN: gar:[22779] csw/mgar/pkg
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Sat Jan 4 21:57:55 CET 2014
Revision: 22779
http://sourceforge.net/p/gar/code/22779
Author: dmichelsen
Date: 2014-01-04 20:57:55 +0000 (Sat, 04 Jan 2014)
Log Message:
-----------
mirrorbrain/trunk: Initial commit, work in progress
Added Paths:
-----------
csw/mgar/pkg/mirrorbrain/
csw/mgar/pkg/mirrorbrain/Makefile
csw/mgar/pkg/mirrorbrain/branches/
csw/mgar/pkg/mirrorbrain/tags/
csw/mgar/pkg/mirrorbrain/trunk/
csw/mgar/pkg/mirrorbrain/trunk/Makefile
csw/mgar/pkg/mirrorbrain/trunk/checksums
csw/mgar/pkg/mirrorbrain/trunk/files/
csw/mgar/pkg/mirrorbrain/trunk/files/0001-Make-geoip-database-position-adjustable.patch
Added: csw/mgar/pkg/mirrorbrain/Makefile
===================================================================
--- csw/mgar/pkg/mirrorbrain/Makefile (rev 0)
+++ csw/mgar/pkg/mirrorbrain/Makefile 2014-01-04 20:57:55 UTC (rev 22779)
@@ -0,0 +1,2 @@
+%:
+ $(MAKE) -C trunk $*
Index: csw/mgar/pkg/mirrorbrain/trunk
===================================================================
--- csw/mgar/pkg/mirrorbrain/trunk 2014-01-04 13:51:50 UTC (rev 22778)
+++ csw/mgar/pkg/mirrorbrain/trunk 2014-01-04 20:57:55 UTC (rev 22779)
Property changes on: csw/mgar/pkg/mirrorbrain/trunk
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+work
Added: csw/mgar/pkg/mirrorbrain/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mirrorbrain/trunk/Makefile (rev 0)
+++ csw/mgar/pkg/mirrorbrain/trunk/Makefile 2014-01-04 20:57:55 UTC (rev 22779)
@@ -0,0 +1,74 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = mirrorbrain
+VERSION = 2.17.0
+GARTYPE = v2
+
+DESCRIPTION = Brief description
+
+MASTER_SITES = http://mirrorbrain.org/files/releases/
+DISTFILES = $(DISTNAME).tar.gz
+
+PATCHFILES += 0001-Make-geoip-database-position-adjustable.patch
+
+VENDOR_URL = http://mirrorbrain.org
+
+# Apache paths
+AP2_ROOT = $(prefix)/apache2
+AP2_LIBEXEC = $(DESTDIR)$(AP2_ROOT)/libexec
+AP2_EXTRACONF = $(DESTDIR)$(AP2_ROOT)/etc/extra
+AP2_SBIN = $(AP2_ROOT)/sbin
+APXS = $(AP2_SBIN)/apxs
+
+BUILD_DEP_PKGS += CSWapache2-dev
+BUILD_DEP_PKGS += CSWap2-mod-form
+
+PACKAGES = CSWap2-mod-mirrorbrain
+SPKG_DESC_CSWap2-mod-mirrorbrain = MirrorBrain redirector Apache module
+PKGFILES_CSWap2-mod-mirrorbrain += $(AP2_LIBEXEC)/mod_mirrorbrain.so
+PKGFILES_CSWap2-mod-mirrorbrain += $(AP2_EXTRACONF)/mod_mirrorbrain.conf.CSW
+RUNTIME_DEP_PKGS_CSWap2-mod-mirrorbrain += CSWapache2
+RUNTIME_DEP_PKGS_CSWap2-mod-mirrorbrain += CSWap2-mod-form
+RUNTIME_DEP_PKGS_CSWap2-mod-mirrorbrain += CSWap2modgeoip
+RUNTIME_DEP_PKGS_CSWap2-mod-mirrorbrain += CSWlibaprutil1-dbd-pgsql
+# I know these are needed
+CHECKPKG_OVERRIDES_CSWap2-mod-mirrorbrain += surplus-dependency|CSWapache2
+CHECKPKG_OVERRIDES_CSWap2-mod-mirrorbrain += surplus-dependency|CSWap2-mod-form
+CHECKPKG_OVERRIDES_CSWap2-mod-mirrorbrain += surplus-dependency|CSWap2modgeoip
+CHECKPKG_OVERRIDES_CSWap2-mod-mirrorbrain += surplus-dependency|CSWlibaprutil1-dbd-pgsql
+
+# The Python CSWpy-mb module "mb" and the "mb" binary are in lang-py/mb
+
+GEOIPCITYFILE = $(sharedstatedir)/GeoIP/GeoIPCity.dat
+GEOIPFILE = $(sharedstatedir)/GeoIP/GeoIP.dat
+
+CONFIGURE_SCRIPTS =
+BUILD_SCRIPTS = custom
+TEST_SCRIPTS =
+INSTALL_SCRIPTS = custom
+
+PRESERVECONF += $(AP2_EXTRACONF)/mod_mirrorbrain.conf
+
+STRIP_DIRS = $(DESTDIR)$(prefix)/apache2/libexec
+
+include gar/category.mk
+
+build-custom:
+ cd $(WORKSRC)/mod_mirrorbrain && $(APXS) -c mod_mirrorbrain.c
+ cd $(WORKSRC)/mod_autoindex_mb && $(APXS) -c mod_autoindex_mb.c
+ cd $(WORKSRC)/tools && $(CC) $(CPPFLAGS) $(CFLAGS) $(LINKER_FLAGS) -DDEFAULT_GEOIPCITYFILE=\"$(GEOIPCITYFILE)\" -lGeoIP geoiplookup_city.c -o geoiplookup_city
+ cd $(WORKSRC)/tools && $(CC) $(CPPFLAGS) $(CFLAGS) $(LINKER_FLAGS) -DDEFAULT_GEOIPFILE=\"$(GEOIPFILE)\" -lGeoIP geoiplookup_continent.c -o geoiplookup_continent
+ @$(MAKECOOKIE)
+
+install-custom:
+ mkdir -p $(AP2_LIBEXEC)
+ cd $(WORKSRC)/mod_mirrorbrain && $(APXS) -lm -S LIBEXECDIR=$(AP2_LIBEXEC) -i mod_mirrorbrain.la
+ cd $(WORKSRC)/mod_autoindex_mb && $(APXS) -lm -S LIBEXECDIR=$(AP2_LIBEXEC) -i mod_autoindex_mb.la
+ ginstall -d $(DESTDIR)$(prefix)/apache2/etc/extra
+ ginstall -m 0644 $(WORKSRC)/mod_mirrorbrain/mod_mirrorbrain.conf $(DESTDIR)$(prefix)/apache2/etc/extra/mod_mirrorbrain.conf.CSW
+ ginstall -d $(DESTDIR)$(bindir)
+ ginstall -m 0755 $(WORKSRC)/tools/geoiplookup_city $(DESTDIR)$(bindir)/geoiplookup_city
+ ginstall -m 0755 $(WORKSRC)/tools/geoiplookup_continent $(DESTDIR)$(bindir)/geoiplookup_continent
+ @$(MAKECOOKIE)
+
Property changes on: csw/mgar/pkg/mirrorbrain/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: csw/mgar/pkg/mirrorbrain/trunk/checksums
===================================================================
--- csw/mgar/pkg/mirrorbrain/trunk/checksums (rev 0)
+++ csw/mgar/pkg/mirrorbrain/trunk/checksums 2014-01-04 20:57:55 UTC (rev 22779)
@@ -0,0 +1 @@
+c0556adb5c5eef8983b517f938375abc mirrorbrain-2.17.0.tar.gz
Added: csw/mgar/pkg/mirrorbrain/trunk/files/0001-Make-geoip-database-position-adjustable.patch
===================================================================
--- csw/mgar/pkg/mirrorbrain/trunk/files/0001-Make-geoip-database-position-adjustable.patch (rev 0)
+++ csw/mgar/pkg/mirrorbrain/trunk/files/0001-Make-geoip-database-position-adjustable.patch 2014-01-04 20:57:55 UTC (rev 22779)
@@ -0,0 +1,46 @@
+From 8fc9dd041d6c86b62ef81c69f9a121941799be02 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 19 Dec 2013 23:14:38 +0100
+Subject: [PATCH] Make geoip database position adjustable
+
+---
+ tools/geoiplookup_city.c | 6 ++++--
+ tools/geoiplookup_continent.c | 2 ++
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/tools/geoiplookup_city.c b/tools/geoiplookup_city.c
+index 9c1c24e..2b33c1d 100644
+--- a/tools/geoiplookup_city.c
++++ b/tools/geoiplookup_city.c
+@@ -27,10 +27,12 @@
+ #include <GeoIP.h>
+ #include <GeoIPCity.h>
+
+-#define DEFAULT_GEOIPFILE "/var/lib/GeoIP/GeoLiteCity.dat"
++#ifndef DEFAULT_GEOIPCITYFILE
++#define DEFAULT_GEOIPCITYFILE "/var/lib/GeoIP/GeoLiteCity.dat"
++#endif
+
+ int main(int argc, char **argv) {
+- const char *geoipfilename = DEFAULT_GEOIPFILE;
++ const char *geoipfilename = DEFAULT_GEOIPCITYFILE;
+ GeoIP *gip = NULL;
+ GeoIPRecord *gir = NULL;
+ char *name;
+diff --git a/tools/geoiplookup_continent.c b/tools/geoiplookup_continent.c
+index 1691e8a..983afe2 100644
+--- a/tools/geoiplookup_continent.c
++++ b/tools/geoiplookup_continent.c
+@@ -25,7 +25,9 @@
+ #include <GeoIP.h>
+ #include <GeoIPCity.h>
+
++#ifndef DEFAULT_GEOIPFILE
+ #define DEFAULT_GEOIPFILE "/var/lib/GeoIP/GeoIP.dat"
++#endif
+
+ int main(int argc, char **argv) {
+ const char *geoipfilename = DEFAULT_GEOIPFILE;
+--
+1.8.3.4
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list