aboutsummaryrefslogtreecommitdiff
path: root/net/GeoIP
diff options
context:
space:
mode:
authorSean Chittenden <seanc@FreeBSD.org>2002-11-19 21:19:49 +0000
committerSean Chittenden <seanc@FreeBSD.org>2002-11-19 21:19:49 +0000
commit0fd1ef52bf66227a6718b79d9f544a5eb44bc98b (patch)
tree76b137ab0af6ef88d248d6f20319763c33dfdda5 /net/GeoIP
parentbc6672dcfb74ea6733837554c4b93fef8d878334 (diff)
downloadports-0fd1ef52bf66227a6718b79d9f544a5eb44bc98b.tar.gz
ports-0fd1ef52bf66227a6718b79d9f544a5eb44bc98b.zip
Notes
Diffstat (limited to 'net/GeoIP')
-rw-r--r--net/GeoIP/files/patch-libGeoIP::GeoIPUpdate.c42
-rw-r--r--net/GeoIP/pkg-plist2
2 files changed, 43 insertions, 1 deletions
diff --git a/net/GeoIP/files/patch-libGeoIP::GeoIPUpdate.c b/net/GeoIP/files/patch-libGeoIP::GeoIPUpdate.c
new file mode 100644
index 000000000000..301e751ecd98
--- /dev/null
+++ b/net/GeoIP/files/patch-libGeoIP::GeoIPUpdate.c
@@ -0,0 +1,42 @@
+--- libGeoIP/GeoIPUpdate.c.orig Tue Nov 19 13:03:24 2002
++++ libGeoIP/GeoIPUpdate.c Tue Nov 19 13:05:44 2002
+@@ -45,7 +45,8 @@
+ char * f_str;
+ f_str = malloc(strlen(str)+1);
+ strcpy(f_str,str);
+- (*f)(f_str);
++ if (f != NULL)
++ (*f)(f_str);
+ }
+
+ short int GeoIP_update_database (char * license_key, int verbose, void (*f)( char *)) {
+@@ -73,7 +74,8 @@
+ if ((cur_db_fh = fopen (GeoIPDBFileName, "rb")) == NULL) {
+ f_str = malloc(strlen(NoCurrentDB) + strlen(GeoIPDBFileName) - 1);
+ sprintf(f_str,NoCurrentDB, GeoIPDBFileName);
+- (*f)(f_str);
++ if (f != NULL)
++ (*f)(f_str);
+ } else {
+ MD5Init(&context);
+ while ((len = fread (buffer, 1, 1024, cur_db_fh)) > 0)
+@@ -84,7 +86,8 @@
+ sprintf (&hex_digest[2*i], "%02x", digest[i]);
+ f_str = malloc(strlen(MD5Info) + strlen(hex_digest) - 1);
+ sprintf(f_str, MD5Info, hex_digest);
+- (*f)(f_str);
++ if (f != NULL)
++ (*f)(f_str);
+ }
+
+ hostlist = gethostbyname(GeoIPUpdateHost);
+@@ -165,7 +168,8 @@
+ if (verbose == 1) {
+ f_str = malloc(strlen(SavingGzip) + strlen(file_path_gz) - 1);
+ sprintf(f_str,SavingGzip,file_path_gz);
+- (*f)(f_str);
++ if (f != NULL)
++ (*f)(f_str);
+ }
+ comp_fh = fopen(file_path_gz, "wb");
+
diff --git a/net/GeoIP/pkg-plist b/net/GeoIP/pkg-plist
index 405c91ee3ac5..7b2570c3f690 100644
--- a/net/GeoIP/pkg-plist
+++ b/net/GeoIP/pkg-plist
@@ -6,6 +6,6 @@ include/GeoIPUpdate.h
lib/libGeoIP.a
lib/libGeoIP.la
lib/libGeoIP.so
-lib/libGeoIP.so.1
+lib/libGeoIP.so.2
share/GeoIP/GeoIP.dat
@unexec rmdir %D/share/GeoIP 2>/dev/null || true