OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web openpkg$ Date: 30-Dec-2002 09:16:30
Branch: HEAD Handle: 2002123008162802
Modified files:
openpkg-re/vcheck vc.geoip
openpkg-src/geoip geoip.patch geoip.spec
openpkg-web news.txt
Log:
upgrading package: geoip 1.1.1 -> 1.1.3
Summary:
Revision Changes Path
1.22 +1 -2 openpkg-re/vcheck/vc.geoip
1.8 +56 -19 openpkg-src/geoip/geoip.patch
1.21 +4 -2 openpkg-src/geoip/geoip.spec
1.2418 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/vcheck/vc.geoip
============================================================================
$ cvs diff -u -r1.21 -r1.22 vc.geoip
--- openpkg-re/vcheck/vc.geoip 24 Dec 2002 07:58:44 -0000 1.21
+++ openpkg-re/vcheck/vc.geoip 30 Dec 2002 08:16:28 -0000 1.22
@@ -2,8 +2,7 @@
}
prog geoip = {
- version = 1.1.1
- comment = "rse: 1.1.3 has a broken Makefile.am (lib order incorrect)"
+ version = 1.1.3
url = http://maxmind.com/download/geoip/api/c/
regex = GeoIP-(__VER__)\.tar\.gz
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/geoip/geoip.patch
============================================================================
$ cvs diff -u -r1.7 -r1.8 geoip.patch
--- openpkg-src/geoip/geoip.patch 29 Oct 2002 07:58:48 -0000 1.7
+++ openpkg-src/geoip/geoip.patch 30 Dec 2002 08:16:29 -0000 1.8
@@ -1,20 +1,57 @@
---- libGeoIP/GeoIPUpdate.c.orig Mon Oct 28 06:06:13 2002
-+++ libGeoIP/GeoIPUpdate.c Tue Oct 29 08:57:03 2002
-@@ -28,6 +28,7 @@
- #include "zlib.h"
- #include "time.h"
- #include <netdb.h>
-+#include <stdio.h>
- #include <sys/file.h>
+--- libGeoIP/GeoIPBitReader.c.orig 2002-12-17 22:32:37.000000000 +0100
++++ libGeoIP/GeoIPBitReader.c 2002-12-24 08:46:11.000000000 +0100
+@@ -32,7 +32,7 @@
+ }
- /*
-@@ -73,7 +74,8 @@
- char *uncompr = NULL, *compr;
- unsigned long comprLen;
- FILE * comp_fh, * cur_db_fh;
-- gzFile gz_fh, gi_fh;
-+ gzFile gz_fh;
-+ FILE *gi_fh;
- char * file_path_gz;
- MD5_CTX context;
- unsigned char buffer[1024], digest[16];
+ unsigned long GeoIPBitReader_read(GeoIPBitReader * gibr, short int numBits) {
+- ulong num = 0;
++ unsigned long num = 0;
+ int i, bit;
+ int bytes_read;
+
+--- apps/Makefile.in.orig 2002-12-30 09:08:32.000000000 +0100
++++ apps/Makefile.in 2002-12-30 09:08:54.000000000 +0100
+@@ -105,12 +105,12 @@
+ geoipupdate_SOURCES = geoipupdate.c
+ geoipupdate_LDFLAGS =
+ geoipupdate_DEPENDENCIES = $(top_builddir)/libGeoIP/libGeoIP.la
$(top_builddir)/libGeoIP/libGeoIPUpdate.la
+-geoipupdate_LDADD = $(top_builddir)/libGeoIP/libGeoIP.la
$(top_builddir)/libGeoIP/libGeoIPUpdate.la
++geoipupdate_LDADD = $(top_builddir)/libGeoIP/libGeoIPUpdate.la
$(top_builddir)/libGeoIP/libGeoIP.la
+
+ geoipexport_SOURCES = geoipexport.c
+ geoipexport_LDFLAGS =
+ geoipexport_DEPENDENCIES = $(top_builddir)/libGeoIP/libGeoIP.la
$(top_builddir)/libGeoIP/libGeoIPBitReader.la
+-geoipexport_LDADD = $(top_builddir)/libGeoIP/libGeoIP.la
$(top_builddir)/libGeoIP/libGeoIPBitReader.la -lm
++geoipexport_LDADD = $(top_builddir)/libGeoIP/libGeoIPBitReader.la -lm
$(top_builddir)/libGeoIP/libGeoIP.la
+ subdir = apps
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_CLEAN_FILES =
+--- apps/geoipexport.c.orig 2002-12-17 22:35:21.000000000 +0100
++++ apps/geoipexport.c 2002-12-30 09:14:29.000000000 +0100
+@@ -41,7 +41,7 @@
+ (int)floor(num/16777216),
+ ((int)floor(num/65536)) % 256,
+ ((int)floor(num/256)) % 256,
+- num % 256);
++ (int)(num % 256));
+ return addr;
+ }
+
+@@ -78,7 +78,7 @@
+ GeoIPBitReader *gibr;
+ int databaseType, record, val;
+ int exportType;
+- ulong beginIp = 0, endIp = 0;
++ unsigned long beginIp = 0, endIp = 0;
+
+ if (argc < 4) {
+ usage();
+@@ -127,7 +127,7 @@
+ full_csv_export(databaseType, beginIp, endIp - 1, val,
f);
+ }
+ beginIp = endIp;
+- printf("setting beginIp to %d\n",beginIp);
++ printf("setting beginIp to %ld\n",beginIp);
+ } else {
+ /* record = netmask - 1 */
+ endIp += (1 << (31 - record));
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/geoip/geoip.spec
============================================================================
$ cvs diff -u -r1.20 -r1.21 geoip.spec
--- openpkg-src/geoip/geoip.spec 20 Dec 2002 19:31:12 -0000 1.20
+++ openpkg-src/geoip/geoip.spec 30 Dec 2002 08:16:30 -0000 1.21
@@ -32,11 +32,12 @@
Distribution: OpenPKG [EVAL]
Group: Network
License: GPL
-Version: 1.1.1
-Release: 20021108
+Version: 1.1.3
+Release: 20021230
# list of sources
Source0: http://www.maxmind.com/download/geoip/api/c/GeoIP-%{version}.tar.gz
+Patch0: geoip.patch
# build information
Prefix: %{l_prefix}
@@ -56,6 +57,7 @@
%prep
%setup -q -n GeoIP-%{version}
+ %patch -p0
%build
CC="%{l_cc}" \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.2417 -r1.2418 news.txt
--- openpkg-web/news.txt 30 Dec 2002 08:04:14 -0000 1.2417
+++ openpkg-web/news.txt 30 Dec 2002 08:16:29 -0000 1.2418
@@ -1,3 +1,4 @@
+30-Dec-2002: Upgraded package: P<geoip-1.1.3-20021230>
30-Dec-2002: Upgraded package: P<openldap-2.1.10-20021230>
30-Dec-2002: Upgraded package: P<sendmail-8.12.7-20021230>
30-Dec-2002: Upgraded package: P<gup-0.5.9-20021230>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
