|
 |
4bb07d |
diff -U0 GeoIP-1.5.0/ChangeLog.orig GeoIP-1.5.0/ChangeLog
|
|
|
4bb07d |
--- GeoIP-1.5.0/ChangeLog.orig 2011-06-24 14:44:56.000000000 +0100
|
|
|
4bb07d |
+++ GeoIP-1.5.0/ChangeLog 2011-06-27 09:06:16.190029375 +0100
|
|
|
4bb07d |
@@ -137,2 +137,2 @@
|
|
|
4bb07d |
- * Fixed a typo in the geoipupdate(1) manpage and also an non-existent path on Debian (Patrick Matthäi)
|
|
|
4bb07d |
- * Fixes two little format errors (hyphen used as minus sign) in both manpages (Patrick Matthäi)
|
|
|
4bb07d |
+ * Fixed a typo in the geoipupdate(1) manpage and also an non-existent path on Debian (Patrick Matthäi)
|
|
|
4bb07d |
+ * Fixes two little format errors (hyphen used as minus sign) in both manpages (Patrick Matthäi)
|
|
|
4bb07d |
@@ -249 +249 @@
|
|
|
4bb07d |
- * Fixed build issue when using --as-needed flag (Diego 'Flameeyes' Pettenò)
|
|
|
4bb07d |
+ * Fixed build issue when using --as-needed flag (Diego 'Flameeyes' Pettenò)
|
|
|
4bb07d |
@@ -395,7 +395,7 @@
|
|
|
4bb07d |
- 1) Use a single buf ptr inside the loops.
|
|
|
4bb07d |
- Set to the stack buffer or the cached memory the start of the function.
|
|
|
4bb07d |
- 2) Unroll the i=0,1 loop to allow constant folding.
|
|
|
4bb07d |
- 3) Unroll the j loop for the common case of j = STANDARD_RECORD_LENGTH
|
|
|
4bb07d |
- (I've already done the above changes see attached function.)
|
|
|
4bb07d |
- With gcc -O2 calculating x[0] and x[1] for STANDARD_RECORD_LENGTH now
|
|
|
4bb07d |
- 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
|
|
|
4bb07d |
+ Â 1) Use a single buf ptr inside the loops.
|
|
|
4bb07d |
+ Â Â Â Set to the stack buffer or the cached memory the start of the function.
|
|
|
4bb07d |
+ Â 2) Unroll the i=0,1 loop to allow constant folding.
|
|
|
4bb07d |
+ Â 3) Unroll the j loop for the common case of j = STANDARD_RECORD_LENGTH
|
|
|
4bb07d |
+ Â Â Â (I've already done the above changes see attached function.)
|
|
|
4bb07d |
+ Â Â Â With gcc -O2 calculating x[0] and x[1] for STANDARD_RECORD_LENGTH now
|
|
|
4bb07d |
+ Â Â Â 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
|
|
|
4bb07d |
diff -U0 GeoIP-1.5.0/man/geoiplookup.1.in.orig GeoIP-1.5.0/man/geoiplookup.1.in
|
|
|
4bb07d |
--- GeoIP-1.5.0/man/geoiplookup.1.in.orig 2013-02-27 14:13:11.000000000 -0700
|
|
|
4bb07d |
+++ GeoIP-1.5.0/man/geoiplookup.1.in 2013-04-02 12:01:22.500882994 -0600
|
|
|
4bb07d |
@@ -31,1 +31,1 @@
|
|
|
4bb07d |
-Copyright © 2006 MaxMind, Inc.
|
|
|
4bb07d |
+Copyright \[co] 2006 MaxMind, Inc.
|
|
|
4bb07d |
diff -U0 GeoIP-1.5.0/man/geoiplookup6.1.in.orig GeoIP-1.5.0/man/geoiplookup6.1.in
|
|
|
4bb07d |
--- GeoIP-1.5.0/man/geoiplookup6.1.in.orig 2013-02-27 14:13:11.000000000 -0700
|
|
|
4bb07d |
+++ GeoIP-1.5.0/man/geoiplookup6.1.in 2013-04-02 12:02:11.595886598 -0600
|
|
|
4bb07d |
@@ -36,1 +36,1 @@
|
|
|
4bb07d |
-Copyright © 2008 MaxMind, Inc.
|
|
|
4bb07d |
+Copyright \[co] 2008 MaxMind, Inc.
|
|
|
4bb07d |
diff -U0 GeoIP-1.5.0/man/geoipupdate.1.in.orig GeoIP-1.5.0/man/geoipupdate.1.in
|
|
|
4bb07d |
--- GeoIP-1.5.0/man/geoipupdate.1.in.orig 2013-02-27 14:13:11.000000000 -0700
|
|
|
4bb07d |
+++ GeoIP-1.5.0/man/geoipupdate.1.in 2013-04-02 12:02:36.402889004 -0600
|
|
|
4bb07d |
@@ -59,1 +59,1 @@
|
|
|
4bb07d |
-Copyright © 2011 MaxMind, Inc.
|
|
|
4bb07d |
+Copyright \[co] 2011 MaxMind, Inc.
|
|
|
4bb07d |
diff -U0 GeoIP-1.5.0/README.orig GeoIP-1.5.0/README
|
|
|
4bb07d |
--- GeoIP-1.5.0/README.orig 2013-02-27 14:27:51.000000000 -0700
|
|
|
4bb07d |
+++ GeoIP-1.5.0/README 2013-04-02 12:04:45.400883174 -0600
|
|
|
4bb07d |
@@ -209,1 +209,1 @@
|
|
|
4bb07d |
-4.2(.0). Thanks to Kai Schätzl for the report.
|
|
|
4bb07d |
+4.2(.0). Thanks to Kai Schätzl for the report.
|
|
|
4bb07d |
diff -up GeoIP-1.4.8/TODO.orig GeoIP-1.4.8/TODO
|
|
|
4bb07d |
--- GeoIP-1.4.8/TODO.orig 2011-03-27 22:00:37.000000000 +0100
|
|
|
4bb07d |
+++ GeoIP-1.4.8/TODO 2011-06-27 09:06:16.214029320 +0100
|
|
|
4bb07d |
@@ -9,12 +9,12 @@ Maurice Cinquini
|
|
|
4bb07d |
|
|
|
4bb07d |
*** ifndef WIN32 on netdb.h ? ***
|
|
|
4bb07d |
In GeoIPCity.c you don't "#ifndef WIN32" the netdb.h include,
|
|
|
4bb07d |
-but in GeoIP.c you do. Which one is right?
|
|
|
4bb07d |
+but in GeoIP.c you do. Which one is right?
|
|
|
4bb07d |
|
|
|
4bb07d |
*** Warnings in GeoIP-1.2.1 before I made changes ***
|
|
|
4bb07d |
GeoIPUpdate.c:73: warning: implicit declaration of function `_setup_dbfilename'
|
|
|
4bb07d |
- I suggest a GeoIP_private.h file to include prototypes for
|
|
|
4bb07d |
- _setup_dbfilename and other private functions also used by GeoIPCity.c
|
|
|
4bb07d |
+Â Â Â I suggest a GeoIP_private.h file to include prototypes for
|
|
|
4bb07d |
+Â Â Â _setup_dbfilename and other private functions also used by GeoIPCity.c
|
|
|
4bb07d |
|
|
|
4bb07d |
*** Drop the GeoIP_*_by_addr API calls ***
|
|
|
4bb07d |
And now that I think of it, why do you need a seperate
|