OpenPKG CVS Repository
http://www.openpkg.org/cvsweb/cvsweb.cgi
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-re, openpkg-web, openpkg-src Date: 19-Jul-2002 10:05:22
Branch: HEAD Handle: 2002071909052002
Added files:
openpkg-src/geoip geoip.patch
Modified files:
openpkg-re/vcheck vc.geoip
openpkg-src/geoip geoip.spec
openpkg-web news.txt
Log:
upgrading package: geoip 0.2.1 -> 0.2.2
Summary:
Revision Changes Path
1.3 +1 -1 openpkg-re/vcheck/vc.geoip
1.1 +61 -0 openpkg-src/geoip/geoip.patch
1.3 +9 -4 openpkg-src/geoip/geoip.spec
1.993 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
Index: openpkg-re/vcheck/vc.geoip
============================================================
$ cvs diff -u -r1.2 -r1.3 vc.geoip
--- openpkg-re/vcheck/vc.geoip 4 Jul 2002 07:28:20 -0000 1.2
+++ openpkg-re/vcheck/vc.geoip 19 Jul 2002 08:05:20 -0000 1.3
@@ -2,7 +2,7 @@
}
prog geoip = {
- version = 0.2.1
+ version = 0.2.2
url = http://maxmind.com/download/geoip/api/c/
regex = GeoIP-(__VER__)\.tar\.gz
}
Index: openpkg-src/geoip/geoip.patch
============================================================
$ cvs update -p -r1.1 geoip.patch
--- libGeoIP/GeoIP.c.orig Thu Jul 18 09:40:29 2002
+++ libGeoIP/GeoIP.c Fri Jul 19 09:51:30 2002
@@ -28,10 +28,12 @@
#include <assert.h>
#include <sys/types.h> /* for fstat */
#include <sys/stat.h> /* for fstat */
+#include <unistd.h>
#include "zlib.h"
#include "time.h"
#include <arpa/inet.h>
+#include <netinet/in.h>
#include <sys/socket.h>
#define COUNTRY_BEGIN 16776960;
@@ -236,7 +238,7 @@
int block_size = 1024;
char * request_uri;
char *uncompr = NULL, *compr;
- ulong comprLen, uncomprLen = 1000000;
+ unsigned long comprLen;
FILE * comp_fh;
gzFile gz_fh, gi_fh;
char * file_path_gz;
@@ -358,7 +360,7 @@
int i, j;
unsigned int x[2];
unsigned char buf[2][3];
- unsigned char *cache_buf;
+ unsigned char *cache_buf = NULL;
if (depth == -1) {
fprintf(stderr,"Error Traversing Database - Perhaps database is corrupt?\n");
--- apps/geoipupdate.c.orig Thu Jul 18 09:42:03 2002
+++ apps/geoipupdate.c Fri Jul 19 10:00:22 2002
@@ -21,7 +21,10 @@
#include "GeoIP.h"
#include <unistd.h>
#include <stdio.h>
+#include <stdlib.h>
+#ifdef __linux__
#include <getopt.h>
+#endif
#include <ctype.h>
#define LICENSE_KEY "LicenseKey"
@@ -39,7 +42,7 @@
int line_index = 0;
unsigned char *lineptr = malloc(sizeof(char) * n);
char *a_license_key_str, *a_ptr;
- char *the_license_key_str;
+ char *the_license_key_str = "";
char c;
int err;
@@ -128,4 +131,5 @@
free(the_license_key_str);
GeoIP_delete(gi);
+ return 0;
}
Index: openpkg-src/geoip/geoip.spec
============================================================
$ cvs diff -u -r1.2 -r1.3 geoip.spec
--- openpkg-src/geoip/geoip.spec 4 Jul 2002 07:28:21 -0000 1.2
+++ openpkg-src/geoip/geoip.spec 19 Jul 2002 08:05:22 -0000 1.3
@@ -32,17 +32,18 @@
Distribution: OpenPKG [EXP]
Group: Network
License: GPL
-Version: 0.2.1
-Release: 20020704
+Version: 0.2.2
+Release: 20020719
# list of sources
Source0: http://maxmind.com/download/geoip/api/c/GeoIP-%{version}.tar.gz
+Patch0: geoip.patch
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20020206
-PreReq: OpenPKG, openpkg >= 20020206
+BuildPreReq: OpenPKG, openpkg >= 20020206, zlib
+PreReq: OpenPKG, openpkg >= 20020206, zlib
AutoReq: no
AutoReqProv: no
@@ -54,10 +55,14 @@
%prep
%setup -q -n GeoIP-%{version}
+ %patch -p0
%build
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
+ CPPFLAGS="-I%{l_prefix}/include -D_XOPEN_SOURCE" \
+ LDFLAGS="-L%{l_prefix}/lib" \
+ LIBS="-lz" \
./configure \
--prefix=%{l_prefix} \
--disable-shared
Index: openpkg-web/news.txt
============================================================
$ cvs diff -u -r1.992 -r1.993 news.txt
--- openpkg-web/news.txt 19 Jul 2002 07:45:13 -0000 1.992
+++ openpkg-web/news.txt 19 Jul 2002 08:05:21 -0000 1.993
@@ -1,3 +1,4 @@
+19-Jul-2002: Upgraded package: P<geoip-0.2.2-20020719>
19-Jul-2002: Upgraded package: P<perl-www-20020719-20020719>
19-Jul-2002: Upgraded package: P<perl-dbi-20020719-20020719>
19-Jul-2002: Upgraded package: P<rfc-3.2.3-20020719>
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
