Adding vuln fix wrt bug #161288

Package-Manager: portage-2.1.2_rc4-r8

diff --git a/dev-libs/geoip/Manifest b/dev-libs/geoip/Manifest
index 52757aa4aacd5eea234a45403c2f4b16cfcb34f6..a8b147cec433c4269efc582a0413d55da1eb598e 100644 (file)
--- a/dev-libs/geoip/Manifest
+++ b/dev-libs/geoip/Manifest
@@ -1,44 +1,42 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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
-DIST GeoIP-1.3.12.tar.gz 749129 RMD160 ef9ed1e4871f92900d9ac81abe71a6ed70079139 SHA1 85ccf608482f6d0b3f867fadee9376a5935cdb20 SHA256 196d11fdb5a539b9b92f632106feb99ee2038dc212c07c13d303908924ae745c
+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.3.14.tar.gz 677526 RMD160 9ada38e4b825dc4262a97a8c308eec3d077c1071 SHA1 dfba645d525c681c92df1bea715e70cac6045b2e SHA256 b10a1b7635e0ce834e398f6c20085519f99b2a51f97a557a498cc3e1a447fafa
-DIST GeoIP-1.3.17.tar.gz 778217 RMD160 fe6cb2408b02fbe82f83cfcaf5b2362772b4a079 SHA1 a6406e6204e9ac1d09a69c1a1bae540d9d2d0533 SHA256 6b2c11bf47db2dff75f222d4b700efc7befcce121fb8a491d22b172671c0cf23
 DIST GeoIP-1.4.0.tar.gz 808314 RMD160 54779bae497d6032a35c1c1de8c97461db9b7075 SHA1 a108e33661db98a43a9c7334816c1dce6d759c46 SHA256 166782a73f6552a5faea525193a62d273abd8d43556ab88a09efedb597fd6be9
-EBUILD geoip-1.3.12.ebuild 745 RMD160 ba89c8bd2323a89df0c21a2c3d9988e74cf88652 SHA1 159f9dd24991d3e73cc658f1dd363182074f371c SHA256 0991cf036303b8d2832758cacb12891c98b06edc9dac7f9c659e1648991ce664
-MD5 1249b7fb841c7a6108cb6da4cd2c0381 geoip-1.3.12.ebuild 745
-RMD160 ba89c8bd2323a89df0c21a2c3d9988e74cf88652 geoip-1.3.12.ebuild 745
-SHA256 0991cf036303b8d2832758cacb12891c98b06edc9dac7f9c659e1648991ce664 geoip-1.3.12.ebuild 745
 EBUILD geoip-1.3.14.ebuild 885 RMD160 0f0b19896025ec885d178cbe9da4a798deddf80d SHA1 50dc15ad02d796c91fc77272c62364988e848fa5 SHA256 8084e2d0785d3916fdd801a312ef92d26bde998ba5617adeda1d3d2270169f4e
 MD5 776c307cc274843f640ac9748201ca88 geoip-1.3.14.ebuild 885
 RMD160 0f0b19896025ec885d178cbe9da4a798deddf80d geoip-1.3.14.ebuild 885
 SHA256 8084e2d0785d3916fdd801a312ef92d26bde998ba5617adeda1d3d2270169f4e geoip-1.3.14.ebuild 885
-EBUILD geoip-1.3.17.ebuild 902 RMD160 eb18ae580dfd9af794113f3c3e3effce0eb9e3ab SHA1 5109b1e9f54fd076dea520c3a53fa52c9555492f SHA256 a9a0534fbaedff8398613defaa92ae5550bb9cf0997ca96fd540cf8eb2093d4d
-MD5 11381509682ff1a6b7fa579e5da2995a geoip-1.3.17.ebuild 902
-RMD160 eb18ae580dfd9af794113f3c3e3effce0eb9e3ab geoip-1.3.17.ebuild 902
-SHA256 a9a0534fbaedff8398613defaa92ae5550bb9cf0997ca96fd540cf8eb2093d4d geoip-1.3.17.ebuild 902
-EBUILD geoip-1.4.0.ebuild 924 RMD160 16ffffd73d87b50e1dd08f804a4f3a92aeb3bfb7 SHA1 88b02040025313374382cc86ebc01e99cd52ee9c SHA256 eef782e8bda0926e0de6c7e4e7f72bfefe4c7b09290dcee4aef555ae2a3438bc
-MD5 54f3ec843421254a187dd82bbec093d5 geoip-1.4.0.ebuild 924
-RMD160 16ffffd73d87b50e1dd08f804a4f3a92aeb3bfb7 geoip-1.4.0.ebuild 924
-SHA256 eef782e8bda0926e0de6c7e4e7f72bfefe4c7b09290dcee4aef555ae2a3438bc geoip-1.4.0.ebuild 924
-MISC ChangeLog 7328 RMD160 b3544b99c618c80be4f9203a09f486d871a3a613 SHA1 8876b96bab6b92829d83c42a6262ddb407f67cb8 SHA256 64c4bffde9d4afc757cb344c8a908499b9b522b44266a30c4022a189cfe67c17
-MD5 50e579565e088aedea81d936400dc8a7 ChangeLog 7328
-RMD160 b3544b99c618c80be4f9203a09f486d871a3a613 ChangeLog 7328
-SHA256 64c4bffde9d4afc757cb344c8a908499b9b522b44266a30c4022a189cfe67c17 ChangeLog 7328
+EBUILD geoip-1.4.0-r1.ebuild 979 RMD160 b3595de369ebb6454d130e4d76a7ee409b61473d SHA1 20f0411daab8547a9ed7bdc5369662011dec2b88 SHA256 530b3520d65e50f27feba33ea374d729e9d9d9496156035392e4f03d875467aa
+MD5 30a1a913c1f64649351686523dc66c03 geoip-1.4.0-r1.ebuild 979
+RMD160 b3595de369ebb6454d130e4d76a7ee409b61473d geoip-1.4.0-r1.ebuild 979
+SHA256 530b3520d65e50f27feba33ea374d729e9d9d9496156035392e4f03d875467aa geoip-1.4.0-r1.ebuild 979
+MISC ChangeLog 7582 RMD160 949e2a6a7b3cf12ae731c91e6b5b94b6bcfc2ccb SHA1 99f95534fab209bd2f58e0ffede2eb292e11c46b SHA256 99766b6a563e095c20121af5528155236536d61c858c6a1dc29de33eb5429816
+MD5 1b37d4903f5e2a47969508403ee9cedd ChangeLog 7582
+RMD160 949e2a6a7b3cf12ae731c91e6b5b94b6bcfc2ccb ChangeLog 7582
+SHA256 99766b6a563e095c20121af5528155236536d61c858c6a1dc29de33eb5429816 ChangeLog 7582
 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 c54d2f09a1b1c4478888d0b14959e8df files/digest-geoip-1.3.12 238
-RMD160 989752bacfadccf78ac95c56e0fbbfc1f234944a files/digest-geoip-1.3.12 238
-SHA256 be72afab4cf2551af7201db8ff67e2e487e1a1624b96f1553c55421b264d8d2f files/digest-geoip-1.3.12 238
 MD5 2514adb8ca49ba4fcc5dbd715b2c26fb files/digest-geoip-1.3.14 238
 RMD160 0e16c3d228d60fad7f7e67d6fb32e022d92019ca files/digest-geoip-1.3.14 238
 SHA256 4ec20e96877d5b18ef32e6c092af961ea0df5a8151d2ab11179f16503666be5e files/digest-geoip-1.3.14 238
-MD5 afd04436c905689fcf552af0869af6ef files/digest-geoip-1.3.17 238
-RMD160 4cc0a5f3a29dd6f61928aaf339667756bec177b7 files/digest-geoip-1.3.17 238
-SHA256 70fb2558d000279b73814e6bc4bb8abb3c39e5650151265ae3d234734cbed300 files/digest-geoip-1.3.17 238
-MD5 815c5521c0dbf34718da8fb797ff48f2 files/digest-geoip-1.4.0 235
-RMD160 5e891b0a9efefb5a33c6558b3dbe6576b34d5e16 files/digest-geoip-1.4.0 235
-SHA256 52e7a3487e7f2f37e5bf44b7df716b594dbf3c98b095975f0f87e2e55b48d1ff files/digest-geoip-1.4.0 235
+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
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.1 (GNU/Linux)
+
+iD8DBQFFrW3Mz974XjDVpbkRAv0kAKC0LH2umCkhqLpvW29TfosRX70rEwCeJrSp
+ItPO1rXUwtee/Jg2T4CwvtE=
+=Q4Qg
+-----END PGP SIGNATURE-----

diff --git a/dev-libs/geoip/files/digest-geoip-1.3.12 b/dev-libs/geoip/files/digest-geoip-1.3.12
deleted file mode 100644 (file)
index 37ee4b1..0000000
--- a/dev-libs/geoip/files/digest-geoip-1.3.12
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a22ae6197c3bbe280dbc4055cc29ec1f GeoIP-1.3.12.tar.gz 749129
-RMD160 ef9ed1e4871f92900d9ac81abe71a6ed70079139 GeoIP-1.3.12.tar.gz 749129
-SHA256 196d11fdb5a539b9b92f632106feb99ee2038dc212c07c13d303908924ae745c GeoIP-1.3.12.tar.gz 749129

diff --git a/dev-libs/geoip/files/digest-geoip-1.3.17 b/dev-libs/geoip/files/digest-geoip-1.3.17
deleted file mode 100644 (file)
index 7167c4a..0000000
--- a/dev-libs/geoip/files/digest-geoip-1.3.17
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 36ee129b4dce5990cea1cfda122dae93 GeoIP-1.3.17.tar.gz 778217
-RMD160 fe6cb2408b02fbe82f83cfcaf5b2362772b4a079 GeoIP-1.3.17.tar.gz 778217
-SHA256 6b2c11bf47db2dff75f222d4b700efc7befcce121fb8a491d22b172671c0cf23 GeoIP-1.3.17.tar.gz 778217

diff --git a/dev-libs/geoip/files/digest-geoip-1.4.0 b/dev-libs/geoip/files/digest-geoip-1.4.0
deleted file mode 100644 (file)
index f72b725..0000000
--- a/dev-libs/geoip/files/digest-geoip-1.4.0
+++ /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/geoip-1.3.12.ebuild b/dev-libs/geoip/geoip-1.3.12.ebuild
deleted file mode 100644 (file)
index 2e242ca..0000000
--- a/dev-libs/geoip/geoip-1.3.12.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/geoip-1.3.12.ebuild,v 1.8 2006/02/06 19:44:21 blubb Exp $
-
-MY_P=${P/geoip/GeoIP}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="easily lookup countries by IP addresses, even when Reverse DNS entries don't exist"
-HOMEPAGE="http://www.maxmind.com/geoip/api/c.shtml"
-SRC_URI="http://www.maxmind.com/download/geoip/api/c/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND="virtual/libc
-       sys-libs/zlib"
-
-src_compile() {
-       econf --enable-shared || die "econf failed"
-       emake || die "emake failed"
-}
-
-src_install() {
-       einstall || die "einstall failed"
-}

diff --git a/dev-libs/geoip/geoip-1.3.17.ebuild b/dev-libs/geoip/geoip-1.3.17.ebuild
deleted file mode 100644 (file)
index 1c0be48..0000000
--- a/dev-libs/geoip/geoip-1.3.17.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/geoip-1.3.17.ebuild,v 1.1 2006/07/23 21:22:58 vanquirius Exp $
-
-inherit flag-o-matic libtool
-
-MY_P="${P/geoip/GeoIP}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="easily lookup countries by IP addresses, even when Reverse DNS entries don't exist"
-HOMEPAGE="http://www.maxmind.com/geoip/api/c.shtml"
-SRC_URI="http://www.maxmind.com/download/geoip/api/c/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="virtual/libc
-       sys-libs/zlib"
-
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-
-       elibtoolize
-}
-
-src_compile() {
-       append-flags -fPIC
-       econf --enable-shared || die "econf failed"
-       emake || die "emake failed"
-}
-
-src_install() {
-       make DESTDIR="${D}" install || die "einstall failed"
-}

diff --git a/dev-libs/geoip/geoip-1.4.0.ebuild b/dev-libs/geoip/geoip-1.4.0.ebuild
deleted file mode 100644 (file)
index 89ea98e..0000000
--- a/dev-libs/geoip/geoip-1.4.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2006 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.ebuild,v 1.1 2006/09/02 18:22:36 jokey Exp $
-
-inherit libtool eutils autotools
-
-MY_P="${P/geoip/GeoIP}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="easily lookup countries by IP addresses, even when Reverse DNS entries don't exist"
-HOMEPAGE="http://www.maxmind.com/geoip/api/c.shtml"
-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"
-IUSE=""
-
-DEPEND="sys-libs/zlib"
-
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-
-       epatch "${FILESDIR}/${P}-asneeded.patch"
-       eautomake
-
-       elibtoolize
-}
-
-src_compile() {
-       econf --enable-shared || die "econf failed"
-       emake || die "emake failed"
-}
-
-src_install() {
-       emake DESTDIR="${D}" install || die "einstall failed"
-}