Version bump. Removed old.

Package-Manager: portage-2.1.4_rc14

7 files changed, 32 insertions, 101 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/Manifest b/dev-libs/geoip/Manifest
index 4e9c3dba9367..eaa15772229d 100644
--- a/dev-libs/geoip/Manifest
+++ b/dev-libs/geoip/Manifest
@@ -1,18 +1,6 @@
-AUX geoip-1.4.0-asneeded.patch 384 RMD160 da2fb05224f143d038d3fde38eb973b3da256cdb SHA1 36e84c8ac0d4ae520493c14d387a643120e7cffc SHA256 df53a339a22ead667f837b3c5fbe873636bf435edf81841e698ac16513b2b333
-MD5 9f8abe9bd17af73a96cd12e2cf11091f files/geoip-1.4.0-asneeded.patch 384
-RMD160 da2fb05224f143d038d3fde38eb973b3da256cdb files/geoip-1.4.0-asneeded.patch 384
-SHA256 df53a339a22ead667f837b3c5fbe873636bf435edf81841e698ac16513b2b333 files/geoip-1.4.0-asneeded.patch 384
-AUX geoip-1.4.0-update-vulnerability.patch 2160 RMD160 183aafff19b1d16bb221021cd367460d6e431eb7 SHA1 883c546ec8e3833e05adca24b522aec11ac74f1a SHA256 06b9f0e4b305b5274194cc9d1b0fe9df097efc1fcb5806665b2bbfaeb9ea832c
-MD5 6654fbb366bf16fcc17e6885430f9bcd files/geoip-1.4.0-update-vulnerability.patch 2160
-RMD160 183aafff19b1d16bb221021cd367460d6e431eb7 files/geoip-1.4.0-update-vulnerability.patch 2160
-SHA256 06b9f0e4b305b5274194cc9d1b0fe9df097efc1fcb5806665b2bbfaeb9ea832c files/geoip-1.4.0-update-vulnerability.patch 2160
-DIST GeoIP-1.4.0.tar.gz 808314 RMD160 54779bae497d6032a35c1c1de8c97461db9b7075 SHA1 a108e33661db98a43a9c7334816c1dce6d759c46 SHA256 166782a73f6552a5faea525193a62d273abd8d43556ab88a09efedb597fd6be9
 DIST GeoIP-1.4.2.tar.gz 736086 RMD160 2b8a9b3827ea3bf2e1e290e2421751bc0cce61da SHA1 fa76aaae5a939eb716947348f43d3109a46a1a76 SHA256 51926c5f44ab7230ed7c5d1f0a97711638877defcfe25f959bb59981b83227e6
 DIST GeoIP-1.4.3.tar.gz 917062 RMD160 c815b34a218f6e19fe83f7cab814a342d5a65c15 SHA1 a363899448eb75813c17415a3aa6c6c8e0617bbf SHA256 c104f84a11b69057977a51d9c969bf765e09e5c4a5fc3e77ea4b1677a3a42e97
-EBUILD geoip-1.4.0-r1.ebuild 976 RMD160 3ab96776642150c545b9e83791a81dd70fff4046 SHA1 ea7db427f586ab4245b332cbff807b835c9c3fbe SHA256 49e2fc854dc1ce2747226edecbe864316b6731bdefa9c10ab88d20e392746a99
-MD5 f986b9a594c781d20ccebae5a087713d geoip-1.4.0-r1.ebuild 976
-RMD160 3ab96776642150c545b9e83791a81dd70fff4046 geoip-1.4.0-r1.ebuild 976
-SHA256 49e2fc854dc1ce2747226edecbe864316b6731bdefa9c10ab88d20e392746a99 geoip-1.4.0-r1.ebuild 976
+DIST GeoIP-1.4.4.tar.gz 944698 RMD160 4aa31840ec6496647551c6e12c9c5e32dceed426 SHA1 4a2937e7a8fc7c26aa88c0678791246b58d81d02 SHA256 a5b2ee9298eaf8c160ccab5b3e2ecc1c38cf67d9dd4e97419427f89d08cfb78e
 EBUILD geoip-1.4.2.ebuild 955 RMD160 0cde8c2b1b58359d1666c0e12409816943d21858 SHA1 6f22194575e22bb0a3e9846db276257b395b73ca SHA256 db9596bbd1d9afbfa5ad074c3d2bcd86fcb35e893e8363d4c483e078a1c2c91b
 MD5 4cc2329a47a1aeeb90144754d4f2aae4 geoip-1.4.2.ebuild 955
 RMD160 0cde8c2b1b58359d1666c0e12409816943d21858 geoip-1.4.2.ebuild 955
@@ -21,20 +9,24 @@ EBUILD geoip-1.4.3.ebuild 1000 RMD160 eb0677f91c384281e8051789330aa6c2b23e9fb3 S
 MD5 d019c60c400b36431ad823edc0e0b353 geoip-1.4.3.ebuild 1000
 RMD160 eb0677f91c384281e8051789330aa6c2b23e9fb3 geoip-1.4.3.ebuild 1000
 SHA256 032342fa29bd300450660881f1e70141564027dd17e8f7eba789cdffa83e59d9 geoip-1.4.3.ebuild 1000
-MISC ChangeLog 9740 RMD160 d677b519d205e93906c7567538dc9af4a19f5ece SHA1 4c19a018145562dac096301f6d8284d0d05cd822 SHA256 e5007deb5fa19a6470e314e7ae92f5693839221d2d796f60112860d1c35edd2d
-MD5 b6503e9e44256f8fe4536afae9866873 ChangeLog 9740
-RMD160 d677b519d205e93906c7567538dc9af4a19f5ece ChangeLog 9740
-SHA256 e5007deb5fa19a6470e314e7ae92f5693839221d2d796f60112860d1c35edd2d ChangeLog 9740
+EBUILD geoip-1.4.4.ebuild 1000 RMD160 2407093abdc868afa08a82169496efb07d2ae9f9 SHA1 0bd26159620d83f21dc6b35fc2a55a128cb30eb2 SHA256 9afa3e5625d37434bc86bd9936bb0d43b222f9302e2a0bc2e680ac65afca8fba
+MD5 95936735fe9b05d1cc7c33c503c76a12 geoip-1.4.4.ebuild 1000
+RMD160 2407093abdc868afa08a82169496efb07d2ae9f9 geoip-1.4.4.ebuild 1000
+SHA256 9afa3e5625d37434bc86bd9936bb0d43b222f9302e2a0bc2e680ac65afca8fba geoip-1.4.4.ebuild 1000
+MISC ChangeLog 9961 RMD160 8883f18dc18e65299c0b172cc87894fd8dc0c2d9 SHA1 2e2b4a5ec73eb316499d66b37b0d153dfcce781d SHA256 8a303b671ac1a61412cfec136601801060d920d98180dfe135c087dbbe4bde75
+MD5 71c01f4a40cead05fff979da668a079d ChangeLog 9961
+RMD160 8883f18dc18e65299c0b172cc87894fd8dc0c2d9 ChangeLog 9961
+SHA256 8a303b671ac1a61412cfec136601801060d920d98180dfe135c087dbbe4bde75 ChangeLog 9961
 MISC metadata.xml 277 RMD160 a6bd0a35777e017f79890c0e0947cba8435b40ea SHA1 fed8c3fe1e00a1388e3df0430d59a75d8721395e SHA256 18a7e85115c3f66c1686d6dca5efed20d16700a57bdd738222976f174d46a508
 MD5 c22e66ec9842f9bce82cbc63ffce3ec1 metadata.xml 277
 RMD160 a6bd0a35777e017f79890c0e0947cba8435b40ea metadata.xml 277
 SHA256 18a7e85115c3f66c1686d6dca5efed20d16700a57bdd738222976f174d46a508 metadata.xml 277
-MD5 815c5521c0dbf34718da8fb797ff48f2 files/digest-geoip-1.4.0-r1 235
-RMD160 5e891b0a9efefb5a33c6558b3dbe6576b34d5e16 files/digest-geoip-1.4.0-r1 235
-SHA256 52e7a3487e7f2f37e5bf44b7df716b594dbf3c98b095975f0f87e2e55b48d1ff files/digest-geoip-1.4.0-r1 235
 MD5 1dd66e285e4ecc12affd1e03f31374ac files/digest-geoip-1.4.2 235
 RMD160 2a5fd09983f3db4926f66966fbb4d8ad988e51e6 files/digest-geoip-1.4.2 235
 SHA256 571059a4127b9dcfae3b72a803f51aa8e2112100c93fe79b3dd6ecd5b8d04d8f files/digest-geoip-1.4.2 235
 MD5 a17fdb1a0e3ffff8a2aed56ee0f3183e files/digest-geoip-1.4.3 235
 RMD160 0ca56c8b8ac49f27c27f0527015b57053bd36a6b files/digest-geoip-1.4.3 235
 SHA256 1d9a0833484299595ecec7233645d4cb532cce2fe8d1f9cc9e1afe9459849008 files/digest-geoip-1.4.3 235
+MD5 8dd20d30656efe275480593d226717eb files/digest-geoip-1.4.4 235
+RMD160 038003763e7ae7505dc44b8a7274c3b5c8698e33 files/digest-geoip-1.4.4 235
+SHA256 77590209413785640d4f8a3833163ace5624a7f5f4de73d57517b97d8e862523 files/digest-geoip-1.4.4 235
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
 }