summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Bidulock2014-05-08 17:13:35 -0600
committerBrian Bidulock2016-05-23 22:25:32 -0600
commit0574883dfc1056190f42ae729add5eb3ce66ae6f (patch)
treea950cc9cea8e5a5a00c9089469734d0beb91f407
parentea3ad105326a83ce09288a356b6385671e72d524 (diff)
downloadaur-0574883dfc1056190f42ae729add5eb3ce66ae6f.tar.gz
version v1.4.8.119.gea0dc0f-1
-rw-r--r--.SRCINFO14
-rw-r--r--0001-Don-t-install-GeoIP.dat.-It-does-not-exist.patch94
-rw-r--r--PKGBUILD34
3 files changed, 126 insertions, 16 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9684b236ef9..27d6b18d3a6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,9 @@
# Generated by mksrcinfo v8
-# Tue May 24 04:25:28 UTC 2016
+# Tue May 24 04:25:30 UTC 2016
pkgbase = geoip-git
pkgdesc = Non-DNS IP-to-country resolver C library & utils
- pkgver = 1.6.9.r8.g6e18deb
+ pkgver = v1.4.8.119.gea0dc0f
pkgrel = 1
- epoch = 1
url = http://www.maxmind.com/app/c
arch = i686
arch = x86_64
@@ -12,9 +11,16 @@ pkgbase = geoip-git
depends = zlib
depends = geoip-database
provides = geoip
+ provides = geoip=1.5.2
conflicts = geoip
- source = geoip-git::git://github.com/maxmind/geoip-api-c.git
+ replaces = geoip
+ options = !libtool
+ options = !emptydirs
+ backup = etc/geoip/GeoIP.conf
+ source = git://github.com/maxmind/geoip-api-c.git#branch=bz/pre-1.5.2
+ source = 0001-Don-t-install-GeoIP.dat.-It-does-not-exist.patch
sha256sums = SKIP
+ sha256sums = 004984ce2b015acedec03a0fd54f309fa546903994dc7a0585471ff18c2bebc1
pkgname = geoip-git
diff --git a/0001-Don-t-install-GeoIP.dat.-It-does-not-exist.patch b/0001-Don-t-install-GeoIP.dat.-It-does-not-exist.patch
new file mode 100644
index 00000000000..7aff128e603
--- /dev/null
+++ b/0001-Don-t-install-GeoIP.dat.-It-does-not-exist.patch
@@ -0,0 +1,94 @@
+From 9d4357892eec53606c58778dbf5d4a62bbb84cbe Mon Sep 17 00:00:00 2001
+From: Yosef Or Boczko <yosefor3@walla.com>
+Date: Mon, 25 Mar 2013 15:29:46 +0200
+Subject: [PATCH] Don't install GeoIP.dat. It does not exist.
+
+---
+ data/Makefile.am | 2 +-
+ man/geoiplookup.1 | 2 +-
+ man/geoiplookup6.1 | 2 +-
+ man/geoipupdate.1 | 11 ++++++-----
+ 4 files changed, 9 insertions(+), 8 deletions(-)
+
+diff --git a/data/Makefile.am b/data/Makefile.am
+index cf36bc1..3fc2560 100644
+--- a/data/Makefile.am
++++ b/data/Makefile.am
+@@ -18,4 +18,4 @@ uninstall-hook:
+ $(INSTALL_DATA) GeoIP.dat $(DESTDIR)$(DEFAULT_DB_FILE); \
+ fi
+
+-.PHONY: GeoIP.dat
++.PHONY:
+diff --git a/man/geoiplookup.1 b/man/geoiplookup.1
+index ede2e51..7656a9c 100644
+--- a/man/geoiplookup.1
++++ b/man/geoiplookup.1
+@@ -20,7 +20,7 @@ will find the Country that 80.60.233.195 originates from, in the following forma
+ .IP "\-f"
+ Specify a custom path to a single GeoIP datafile.
+ .IP "\-d"
+-Specify a custom directory containing GeoIP datafile(s). By default geoiplookup looks in DATADIR
++Specify a custom directory containing GeoIP datafile(s). By default geoiplookup looks in /usr/share/GeoIP
+ .IP "\-v"
+ Lists the date and build number for the GeoIP datafile(s).
+ .SH AUTHOR
+diff --git a/man/geoiplookup6.1 b/man/geoiplookup6.1
+index 2a49ee1..80cceda 100644
+--- a/man/geoiplookup6.1
++++ b/man/geoiplookup6.1
+@@ -25,7 +25,7 @@ will find the Country that 2001:4860:0:1001::68 originates from, in the followin
+ .IP "\-f"
+ Specify a custom path to a single GeoIP datafile.
+ .IP "\-d"
+-Specify a custom directory containing GeoIP datafile(s). By default geouplookup6 looks in DATADIR
++Specify a custom directory containing GeoIP datafile(s). By default geouplookup6 looks in /usr/share/GeoIP
+ .IP "\-v"
+ Lists the date and build number for the GeoIP datafile(s).
+ .SH AUTHOR
+diff --git a/man/geoipupdate.1 b/man/geoipupdate.1
+index 57df97d..266b41e 100644
+--- a/man/geoipupdate.1
++++ b/man/geoipupdate.1
+@@ -22,10 +22,10 @@ Performs the update in verbose mode.
+ .IP "\-v"
+ Verbose mode, prints out the steps that geoipupdate takes.
+ .IP "\-d"
+-Specify a custom directory target to install the GeoIP datafile(s). By default geoipupdate installs to DATADIR
++Specify a custom directory target to install the GeoIP datafile(s). By default geoipupdate installs to /usr/share/GeoIP
+ .IP "\-f"
+ Specifies the configuration file that contains the license key.
+-Defaults to CONF_DIR/GeoIP.conf
++Defaults to /etc/geoip/GeoIP.conf
+ .SH USAGE
+ Typically you'll want to write a weekly crontab that will run geoipupdate.
+ Below is a sample crontab that runs geoipupdate on each Wednesday at noon:
+@@ -38,7 +38,6 @@ MAILTO=your@email.com
+ 0 12 * * 3 BIN_DIR/geoipupdate
+ .PP
+ # end of crontab
+-
+ .RE
+ To use with a proxy server, set the http_proxy environment variable.
+ E.g.
+@@ -49,13 +48,15 @@ export http_proxy="http://proxy-hostname:port"
+ geoipupdate returns 0 on success, 1 on error.
+ .SH FILES
+ .PP
+-.I CONF_DIR/GeoIP.conf
++.I /etc/geoip/GeoIP.conf
+ .PP
+ Configuration file for GeoIP, should contain license key.
++.SH AUTHOR
++Written by T.J. Mather
+ .SH "REPORTING BUGS"
+ Report bugs to <support@maxmind.com>
+ .SH COPYRIGHT
+-Copyright 2010 MaxMind Inc
++Copyright 2011 MaxMind LLC
+
+ This is free software; see the source for copying conditions.
+ There is NO warranty; not even for MERCHANTABILITY
+--
+1.8.2
+
diff --git a/PKGBUILD b/PKGBUILD
index 1e8da68983e..45778aa230d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,37 @@
# Contributor: Yosef Or Boczko <yoseforb@gmail.com>
-pkgname=geoip-git
-pkgver=1.6.9.r8.g6e18deb
+_pkgname=geoip
+pkgname=$_pkgname-git
+pkgver=v1.4.8.119.gea0dc0f
pkgrel=1
pkgdesc="Non-DNS IP-to-country resolver C library & utils"
-epoch=1
arch=('i686' 'x86_64')
url="http://www.maxmind.com/app/c"
license=('GPL')
depends=('zlib' 'geoip-database')
-source=("$pkgname::git://github.com/maxmind/geoip-api-c.git")
-sha256sums=('SKIP')
+backup=('etc/geoip/GeoIP.conf')
+options=('!libtool' '!emptydirs')
+source=('git://github.com/maxmind/geoip-api-c.git#branch=bz/pre-1.5.2'
+ '0001-Don-t-install-GeoIP.dat.-It-does-not-exist.patch')
+sha256sums=('SKIP'
+ '004984ce2b015acedec03a0fd54f309fa546903994dc7a0585471ff18c2bebc1')
conflicts=('geoip')
-provides=('geoip')
+replaces=('geoip')
+provides=('geoip' 'geoip=1.5.2')
-pkgver() {
- cd $pkgname
- git describe --long --tags | sed -r 's/^v//;s/([^-]*-g)/r\1/;s/-/./g'
+ pkgver() {
+ cd "$srcdir/geoip-api-c"
+ git describe --always | sed 's/-/./g'
+}
+
+prepare() {
+ cd "$srcdir/geoip-api-c"
+ patch -Np1 -i "$srcdir/0001-Don-t-install-GeoIP.dat.-It-does-not-exist.patch"
}
build() {
- cd $pkgname
- autoreconf -fiv
+ cd "$srcdir/geoip-api-c"
+ autoreconf -vi
./configure \
--prefix=/usr \
--mandir=/usr/share/man \
@@ -31,6 +41,6 @@ build() {
}
package() {
- cd $pkgname
+ cd "$srcdir/geoip-api-c"
make DESTDIR="$pkgdir" install
}