Version bump. Removed old.

(Portage version: 2.1.4_rc14)

6 files changed, 20 insertions, 81 deletions

diff --git a/dev-libs/geoip/ChangeLog b/dev-libs/geoip/ChangeLog
index fc52ef0c3e0c..4f068afc5522 100644
--- a/dev-libs/geoip/ChangeLog
+++ b/dev-libs/geoip/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/geoip
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/ChangeLog,v 1.78 2007/12/26 17:47:07 pva Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/ChangeLog,v 1.79 2008/01/30 08:43:55 pva Exp $
+
+*geoip-1.4.4 (30 Jan 2008)
+
+  30 Jan 2008; <pva@gentoo.org> -files/geoip-1.4.0-asneeded.patch,
+  -files/geoip-1.4.0-update-vulnerability.patch, -geoip-1.4.0-r1.ebuild,
+  +geoip-1.4.4.ebuild:
+  Version bump. Removed old.
 
 *geoip-1.4.3 (26 Dec 2007)
 
diff --git a/dev-libs/geoip/files/digest-geoip-1.4.0-r1 b/dev-libs/geoip/files/digest-geoip-1.4.0-r1
deleted file mode 100644
index f72b725309f3..000000000000
--- a/dev-libs/geoip/files/digest-geoip-1.4.0-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 da09a3d9a1a91e3d16c0a29e6b056c15 GeoIP-1.4.0.tar.gz 808314
-RMD160 54779bae497d6032a35c1c1de8c97461db9b7075 GeoIP-1.4.0.tar.gz 808314
-SHA256 166782a73f6552a5faea525193a62d273abd8d43556ab88a09efedb597fd6be9 GeoIP-1.4.0.tar.gz 808314
diff --git a/dev-libs/geoip/files/digest-geoip-1.4.4 b/dev-libs/geoip/files/digest-geoip-1.4.4
new file mode 100644
index 000000000000..3bb639d3be78
--- /dev/null
+++ b/dev-libs/geoip/files/digest-geoip-1.4.4
@@ -0,0 +1,3 @@
+MD5 27c1320e41e67b9ddcf4118e4eaccd1d GeoIP-1.4.4.tar.gz 944698
+RMD160 4aa31840ec6496647551c6e12c9c5e32dceed426 GeoIP-1.4.4.tar.gz 944698
+SHA256 a5b2ee9298eaf8c160ccab5b3e2ecc1c38cf67d9dd4e97419427f89d08cfb78e GeoIP-1.4.4.tar.gz 944698
diff --git a/dev-libs/geoip/files/geoip-1.4.0-asneeded.patch b/dev-libs/geoip/files/geoip-1.4.0-asneeded.patch
deleted file mode 100644
index 9d7bdb3669f8..000000000000
--- a/dev-libs/geoip/files/geoip-1.4.0-asneeded.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Index: GeoIP-1.4.0/libGeoIP/Makefile.am
-===================================================================
---- GeoIP-1.4.0.orig/libGeoIP/Makefile.am
-+++ GeoIP-1.4.0/libGeoIP/Makefile.am
-@@ -16,4 +16,4 @@ libGeoIPUpdate_la_SOURCES = GeoIPUpdate.
- 
- libGeoIP_la_LDFLAGS = -version-info @GEOIP_VERSION_INFO@
- 
--libGeoIPUpdate_la_LIBADD = -lz
-+libGeoIPUpdate_la_LIBADD = -lz libGeoIP.la
diff --git a/dev-libs/geoip/files/geoip-1.4.0-update-vulnerability.patch b/dev-libs/geoip/files/geoip-1.4.0-update-vulnerability.patch
deleted file mode 100644
index d2a2c9dea8dc..000000000000
--- a/dev-libs/geoip/files/geoip-1.4.0-update-vulnerability.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From dean-maxmind.com@arctic.org Mon Sep  4 18:50:28 2006
-Date: Mon, 4 Sep 2006 18:50:28 -0700 (PDT)
-From: dean gaudet <dean-maxmind.com@arctic.org>
-To: support@maxmind.com
-Subject: serious geoipupdate vulnerability
-
-i'm looking at the GeoIP-1.4.0.tar.gz source ... and it does no sanity 
-checking on the filename returned by "GET 
-/app/update_getfilename?product_id=%s".
-
-for example suppose your webserver were compromised and returned 
-../../../../../../etc/passwd as the filename.
-
-please consider something like the patch below...
-
--dean
-
-Index: GeoIP-1.4.0/libGeoIP/GeoIPUpdate.c
-===================================================================
---- GeoIP-1.4.0.orig/libGeoIP/GeoIPUpdate.c	2006-09-04 18:41:21.810722758 -0700
-+++ GeoIP-1.4.0/libGeoIP/GeoIPUpdate.c	2006-09-04 18:45:10.771752943 -0700
-@@ -92,6 +92,8 @@
-     return "Invalid userID";
-   case GEOIP_PRODUCT_ID_INVALID_ERR:
-     return "Invalid product ID or subscription expired";
-+  case GEOIP_INVALID_SERVER_RESPONSE:
-+    return "Server returned something unexpected";
-   default:
-     return "no error";
-   }  
-@@ -420,6 +422,10 @@
- 	buf[offset] = 0;
- 	offset = 0;
- 	tmpstr = strstr(buf, "\r\n\r\n") + 4;
-+	if (tmpstr[0] == '.' || strchr(tmpstr, '/') != NULL) {
-+		free(buf);
-+		return GEOIP_INVALID_SERVER_RESPONSE;
-+	}
- 	geoipfilename = _GeoIP_full_path_to(tmpstr);
- 	free(buf);
- 
-Index: GeoIP-1.4.0/libGeoIP/GeoIPUpdate.h
-===================================================================
---- GeoIP-1.4.0.orig/libGeoIP/GeoIPUpdate.h	2006-09-04 18:43:41.265969814 -0700
-+++ GeoIP-1.4.0/libGeoIP/GeoIPUpdate.h	2006-09-04 18:43:56.475632408 -0700
-@@ -43,7 +43,8 @@
- 	GEOIP_SANITY_LOOKUP_FAIL      = -22, /* Sanity check ip address lookup failed */
- 	GEOIP_RENAME_ERR              = -23, /* Rename error while installing db, check errno */
- 	GEOIP_USER_ID_INVALID_ERR     = -24, /* Invalid userID */
--	GEOIP_PRODUCT_ID_INVALID_ERR  = -25  /* Invalid product ID or subscription expired */
-+	GEOIP_PRODUCT_ID_INVALID_ERR  = -25, /* Invalid product ID or subscription expired */
-+	GEOIP_INVALID_SERVER_RESPONSE = -26
- } GeoIPUpdateCode;
- 
- const char * GeoIP_get_error_message(int i);
-
-
diff --git a/dev-libs/geoip/geoip-1.4.0-r1.ebuild b/dev-libs/geoip/geoip-1.4.4.ebuild
index ec66d9e0f0f1..f688ee83039b 100644
--- a/dev-libs/geoip/geoip-1.4.0-r1.ebuild
+++ b/dev-libs/geoip/geoip-1.4.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/geoip-1.4.0-r1.ebuild,v 1.10 2007/06/05 22:11:56 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/geoip-1.4.4.ebuild,v 1.1 2008/01/30 08:43:55 pva Exp $
 
 inherit autotools eutils libtool
 
@@ -11,30 +11,29 @@ SRC_URI="http://www.maxmind.com/download/geoip/api/c/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND=""
 RDEPEND=""
 
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}/${P}-asneeded.patch"
-	epatch "${FILESDIR}/${P}-update-vulnerability.patch"
-	eautomake
-
+	# FreeBSD requires this
 	elibtoolize
 }
 
 src_compile() {
 	econf --enable-shared || die "econf failed"
+	# both parallel make and parallel make install explodes atm
 	emake -j1 || die "emake failed"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "einstall failed"
+	emake -j1 DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog README TODO
 }