pghmcfc pushed to GeoIP (el5). "Bump to version 1.5.1."
notifications at fedoraproject.org
notifications at fedoraproject.org
Tue Apr 14 07:39:32 UTC 2015
>From df2039ecf8b2e4fcc07f795fba594e2e027b1e2b Mon Sep 17 00:00:00 2001
From: "Philip A. Prindeville" <philipp at redfish-solutions.com>
Date: Wed, 12 Jun 2013 23:48:37 -0600
Subject: Bump to version 1.5.1.
diff --git a/.gitignore b/.gitignore
index 79983ef..db8103b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
GeoIP-1.4.6.tar.gz
/GeoIP-1.4.8.tar.gz
/GeoIP-1.5.0.tar.gz
+/GeoIP-1.5.1.tar.gz
diff --git a/GeoIP-1.5.0-UTF8.patch b/GeoIP-1.5.0-UTF8.patch
index 4403fb3..dcc9c38 100644
--- a/GeoIP-1.5.0-UTF8.patch
+++ b/GeoIP-1.5.0-UTF8.patch
@@ -24,46 +24,3 @@ diff -U0 GeoIP-1.5.0/ChangeLog.orig GeoIP-1.5.0/ChangeLog
+ (I've already done the above changes see attached function.)
+ With gcc -O2 calculating x[0] and x[1] for STANDARD_RECORD_LENGTH now
+ only takes 15 (was > 100) i80x86 instructions with 6 byte accesses of RAM. 4) only calculate x[0], x[1] when needed, may be a bigger win
-diff -U0 GeoIP-1.5.0/man/geoiplookup.1.in.orig GeoIP-1.5.0/man/geoiplookup.1.in
---- GeoIP-1.5.0/man/geoiplookup.1.in.orig 2013-02-27 14:13:11.000000000 -0700
-+++ GeoIP-1.5.0/man/geoiplookup.1.in 2013-04-02 12:01:22.500882994 -0600
-@@ -31,1 +31,1 @@
--Copyright � 2006 MaxMind, Inc.
-+Copyright \[co] 2006 MaxMind, Inc.
-diff -U0 GeoIP-1.5.0/man/geoiplookup6.1.in.orig GeoIP-1.5.0/man/geoiplookup6.1.in
---- GeoIP-1.5.0/man/geoiplookup6.1.in.orig 2013-02-27 14:13:11.000000000 -0700
-+++ GeoIP-1.5.0/man/geoiplookup6.1.in 2013-04-02 12:02:11.595886598 -0600
-@@ -36,1 +36,1 @@
--Copyright � 2008 MaxMind, Inc.
-+Copyright \[co] 2008 MaxMind, Inc.
-diff -U0 GeoIP-1.5.0/man/geoipupdate.1.in.orig GeoIP-1.5.0/man/geoipupdate.1.in
---- GeoIP-1.5.0/man/geoipupdate.1.in.orig 2013-02-27 14:13:11.000000000 -0700
-+++ GeoIP-1.5.0/man/geoipupdate.1.in 2013-04-02 12:02:36.402889004 -0600
-@@ -59,1 +59,1 @@
--Copyright � 2011 MaxMind, Inc.
-+Copyright \[co] 2011 MaxMind, Inc.
-diff -U0 GeoIP-1.5.0/README.orig GeoIP-1.5.0/README
---- GeoIP-1.5.0/README.orig 2013-02-27 14:27:51.000000000 -0700
-+++ GeoIP-1.5.0/README 2013-04-02 12:04:45.400883174 -0600
-@@ -209,1 +209,1 @@
--4.2(.0). Thanks to Kai Sch�tzl for the report.
-+4.2(.0). Thanks to Kai Schätzl for the report.
-diff -up GeoIP-1.4.8/TODO.orig GeoIP-1.4.8/TODO
---- GeoIP-1.4.8/TODO.orig 2011-03-27 22:00:37.000000000 +0100
-+++ GeoIP-1.4.8/TODO 2011-06-27 09:06:16.214029320 +0100
-@@ -9,12 +9,12 @@ Maurice Cinquini
-
- *** ifndef WIN32 on netdb.h ? ***
- In GeoIPCity.c you don't "#ifndef WIN32" the netdb.h include,
--but in GeoIP.c you do.� Which one is right?
-+but in GeoIP.c you do. Which one is right?
-
- *** Warnings in GeoIP-1.2.1 before I made changes ***
- GeoIPUpdate.c:73: warning: implicit declaration of function `_setup_dbfilename'
--��� I suggest a GeoIP_private.h file to include prototypes for
--��� _setup_dbfilename and other private functions also used by GeoIPCity.c
-+ I suggest a GeoIP_private.h file to include prototypes for
-+ _setup_dbfilename and other private functions also used by GeoIPCity.c
-
- *** Drop the GeoIP_*_by_addr API calls ***
- And now that I think of it, why do you need a seperate
diff --git a/GeoIP-1.5.0-exitcode.patch b/GeoIP-1.5.0-exitcode.patch
new file mode 100644
index 0000000..315e06e
--- /dev/null
+++ b/GeoIP-1.5.0-exitcode.patch
@@ -0,0 +1,38 @@
+--- GeoIP-1.5.0/apps/geoipupdate.c.orig 2013-02-27 14:13:11.000000000 -0700
++++ GeoIP-1.5.0/apps/geoipupdate.c 2013-06-10 10:37:08.542133407 -0600
+@@ -40,7 +40,7 @@ static void * realloc_or_die( void * ptr
+ if ( !new ) {
+ free(ptr);
+ fprintf(stderr, "Out of memory\n");
+- exit(1);
++ exit(-GEOIP_OUT_OF_MEMORY_ERR);
+ }
+ return new;
+ }
+@@ -121,7 +121,7 @@ int main (int argc, char *argv[]) {
+ "Unknown option character `\\x%x'.\n",
+ optopt);
+ usage();
+- exit(1);
++ exit(1); // need unambiguous exit code
+ default:
+ abort();
+ }
+@@ -140,7 +140,7 @@ int main (int argc, char *argv[]) {
+ license_fh = fopen(license_file,"r");
+ if (license_fh == NULL) {
+ fprintf(stderr,"Error opening GeoIP Configuration file %s\n",license_file);
+- exit(1);
++ exit(1); // need unambiguous exit code
+ }
+
+ if (verbose == 1)
+@@ -292,5 +292,7 @@ int main (int argc, char *argv[]) {
+ if (client_ipaddr) {
+ free(client_ipaddr);
+ }
+- exit(err);
++ exit((err >= 0) ? 0 : -err); // use GeoIPUpdateCode as exit code
+ }
++
++// vim:ts=2
diff --git a/GeoIP.spec b/GeoIP.spec
index 914e66b..658aa99 100644
--- a/GeoIP.spec
+++ b/GeoIP.spec
@@ -2,8 +2,8 @@
%global noarch_subpkgs 0%{?fedora} > 9 || 0%{?rhel} > 5
Name: GeoIP
-Version: 1.5.0
-Release: 6%{?dist}
+Version: 1.5.1
+Release: 1%{?dist}
Summary: Library for country/city/organization to IP address or hostname mapping
Group: Development/Libraries
License: LGPLv2+ and GPLv2+
@@ -13,11 +13,13 @@ Source1: LICENSE.txt
Source2: fetch-geoipdata-city.pl
Source3: fetch-geoipdata.pl
Source5: geoipupdate.cron
+Patch1: GeoIP-1.5.0-exitcode.patch
Patch10: GeoIP-1.5.0-UTF8.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
BuildRequires: zlib-devel
Obsoletes: geoip < %{version}-%{release}
Provides: geoip = %{version}-%{release}
+Obsoletes: geoip-geolite
%description
GeoIP is a C library that enables the user to find the country that any IP
@@ -52,8 +54,9 @@ Development headers and static libraries for building GeoIP-based applications.
%prep
%setup -q
+%patch1 -p1 -b .exitcode
# Recode docs as UTF-8
-%patch10 -p1
+%patch10 -p1 -b .utf8
install -D -m644 %{SOURCE1} LICENSE.txt
install -D -m644 %{SOURCE2} fetch-geoipdata-city.pl
@@ -149,6 +152,12 @@ geoipupdate > /dev/null && \
%{_libdir}/libGeoIPUpdate.so
%changelog
+* Wed Jun 12 2013 Philip Prindeville <philipp at fedoraproject.org> - 1.5.1-1
+- Bump to version 1.5.1.
+
+* Mon Jun 10 2013 Philip Prindeville <philipp at fedoraproject.org> - 1.5.0-7
+- Annotate conflict with geoip-lite package.
+
* Mon Jun 10 2013 Paul Howarth <paul at city-fan.org> - 1.5.0-6
- Update sub-package requires main package for geoipupdate script
diff --git a/sources b/sources
index 112fd0d..df83d77 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-57bc400b5c11057a4cab00e1c5cf3f00 GeoIP-1.5.0.tar.gz
+36b82f3558e6e2ebdd11a56c5db21dbc GeoIP-1.5.1.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/GeoIP.git/commit/?h=el5&id=df2039ecf8b2e4fcc07f795fba594e2e027b1e2b
More information about the scm-commits
mailing list