pghmcfc pushed to GeoIP (el5). "Also remove deprecated patches."

[notifications at fedoraproject.org]

>From 8524901ce9342706e314d9a885c017f9dc9de4b8 Mon Sep 17 00:00:00 2001
From: "Philip A. Prindeville" <philipp at redfish-solutions.com>
Date: Tue, 20 Jan 2015 17:59:47 -0700
Subject: Also remove deprecated patches.


diff --git a/GeoIP-1.5.0-exitcode.patch b/GeoIP-1.5.0-exitcode.patch
deleted file mode 100644
index 315e06e..0000000
--- a/GeoIP-1.5.0-exitcode.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- 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-1.5.1-UTF8.patch b/GeoIP-1.5.1-UTF8.patch
deleted file mode 100644
index e72f48d..0000000
--- a/GeoIP-1.5.1-UTF8.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -U0 ./ChangeLog.utf8 ./ChangeLog
---- ./ChangeLog.utf8	2013-03-23 02:26:09.000000000 +0000
-+++ ./ChangeLog	2013-06-13 09:11:18.640720014 +0100
-@@ -185,2 +185,2 @@
--	* Fixed a typo in the geoipupdate(1) manpage and also an non-existent path on Debian (Patrick Matth�i)
--	* Fixes two little format errors (hyphen used as minus sign) in both manpages (Patrick Matth�i)
-+	* Fixed a typo in the geoipupdate(1) manpage and also an non-existent path on Debian (Patrick Matthäi)
-+	* Fixes two little format errors (hyphen used as minus sign) in both manpages (Patrick Matthäi)
-@@ -297 +297 @@
--	* Fixed build issue when using --as-needed flag (Diego 'Flameeyes' Petten�)
-+	* Fixed build issue when using --as-needed flag (Diego 'Flameeyes' Pettenò)
-@@ -443,7 +443,7 @@
--		�1) Use a single buf ptr inside the loops.
--		��� Set to the stack buffer or the cached memory the start of the function.
--		�2) Unroll the i=0,1 loop to allow constant folding.
--		�3) Unroll the j loop for the common case of j = STANDARD_RECORD_LENGTH
--		��� (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
-+		 1) Use a single buf ptr inside the loops.
-+		    Set to the stack buffer or the cached memory the start of the function.
-+		 2) Unroll the i=0,1 loop to allow constant folding.
-+		 3) Unroll the j loop for the common case of j = STANDARD_RECORD_LENGTH
-+		    (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 -up ./TODO.utf8 ./TODO
---- ./TODO.utf8	2013-03-23 02:26:09.000000000 +0000
-+++ ./TODO	2013-06-13 09:16:19.274926385 +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
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/GeoIP.git/commit/?h=el5&id=8524901ce9342706e314d9a885c017f9dc9de4b8