-r1 for security patch, fixes bug # 161882

Package-Manager: portage-5870-svn

5 files changed, 30 insertions, 19 deletions

diff --git a/app-admin/ulogd/ChangeLog b/app-admin/ulogd/ChangeLog
index 06439f622908..90439e3c2e5b 100644
--- a/app-admin/ulogd/ChangeLog
+++ b/app-admin/ulogd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/ulogd
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ChangeLog,v 1.41 2007/01/23 19:26:20 masterdriverz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ChangeLog,v 1.42 2007/02/06 16:13:30 antarus Exp $
+
+*ulogd-1.23-r1 (06 Feb 2007)
+
+  06 Feb 2007; Alec Warner <antarus@gentoo.org> -ulogd-1.23.ebuild,
+  +ulogd-1.23-r1.ebuild, ulogd-1.24.ebuild:
+  -r1 for security patch, fixes bug # 161882
 
   23 Jan 2007; Charlie Shepherd <masterdriverz@gentoo.org>
   -ulogd-1.01.ebuild, -ulogd-1.02.ebuild, -ulogd-1.02-r1.ebuild:
diff --git a/app-admin/ulogd/Manifest b/app-admin/ulogd/Manifest
index bdbb9d01e2ba..827f7c41b791 100644
--- a/app-admin/ulogd/Manifest
+++ b/app-admin/ulogd/Manifest
@@ -16,25 +16,25 @@ RMD160 40c38db24ef5917794b4994f8b86db344c6f9eb9 files/ulogd-1.23-gcc41.patch 848
 SHA256 9453360a7c1e189df892e87f0f553a156eaea462641ade3e5db328c5fd208819 files/ulogd-1.23-gcc41.patch 848
 DIST ulogd-1.23.tar.bz2 143608 RMD160 c4b95caeffab03afa192d165e4b6432b348537c6 SHA1 aef1789ed960128e0dc08684b0260baf5c73882e SHA256 78fda62a39e5ebccbd3277d723eb0a0087a6972c6350d987e454f8fa17546341
 DIST ulogd-1.24.tar.bz2 177398 RMD160 e46c886af5bcec96775ec3516ae5a45d77e9bdb9 SHA1 2d767d71a6a96bd40caa0020bbca2ddb09301ae3 SHA256 63a6069d9b537d8a6d6a4d99beeb4ccc0a853717414da3a6e0ce230a34d0e057
-EBUILD ulogd-1.23.ebuild 1398 RMD160 9b4f6bb099d07e0d3e4e1deeb0d62e79f4de18a7 SHA1 8f840af2137fc6607184f95e5bcf3af2f09abbff SHA256 bc991aa566d701cde3f104fd71344aae690b8e7be4d5c4d9152569733d86dd96
-MD5 e2da87c0b2f303d7be3dcce44c76a46e ulogd-1.23.ebuild 1398
-RMD160 9b4f6bb099d07e0d3e4e1deeb0d62e79f4de18a7 ulogd-1.23.ebuild 1398
-SHA256 bc991aa566d701cde3f104fd71344aae690b8e7be4d5c4d9152569733d86dd96 ulogd-1.23.ebuild 1398
-EBUILD ulogd-1.24.ebuild 1590 RMD160 3280e376f79877473d89e9bb5a72abccefe84ab7 SHA1 55ee4e66bd7fbe078d29d1b5e5f08133bf254c57 SHA256 88fe82ba1c844ca0f88d7315a32afe143d751a51699f4bb27d00c471da77c8b2
-MD5 852752e204cac7f5320136721a41d098 ulogd-1.24.ebuild 1590
-RMD160 3280e376f79877473d89e9bb5a72abccefe84ab7 ulogd-1.24.ebuild 1590
-SHA256 88fe82ba1c844ca0f88d7315a32afe143d751a51699f4bb27d00c471da77c8b2 ulogd-1.24.ebuild 1590
-MISC ChangeLog 5182 RMD160 3978ddefe5b69a3d8f4ed4c7f3c4d9eba784cce5 SHA1 4aa1728b440a5b32fba3c07c415d1657000d7b0b SHA256 a5e8c8a55c8a98a251ceba6eca25f2a21b27d427da5c73442e37a4d1ddd3b189
-MD5 db308539c83955f2b56103c12af0b7b6 ChangeLog 5182
-RMD160 3978ddefe5b69a3d8f4ed4c7f3c4d9eba784cce5 ChangeLog 5182
-SHA256 a5e8c8a55c8a98a251ceba6eca25f2a21b27d427da5c73442e37a4d1ddd3b189 ChangeLog 5182
+EBUILD ulogd-1.23-r1.ebuild 1466 RMD160 53325181e496b3c041b34abb3dd18803ac891f1a SHA1 e599b4d348a2de860dd99fe51bef97ca1d90a54a SHA256 278e4a6b03186eb0c200778591be20b287c13872f571ed04657f0f27f42ca8f4
+MD5 0a348c7d7ba57d90bac853339cfaaa38 ulogd-1.23-r1.ebuild 1466
+RMD160 53325181e496b3c041b34abb3dd18803ac891f1a ulogd-1.23-r1.ebuild 1466
+SHA256 278e4a6b03186eb0c200778591be20b287c13872f571ed04657f0f27f42ca8f4 ulogd-1.23-r1.ebuild 1466
+EBUILD ulogd-1.24.ebuild 1653 RMD160 08d2fad1c01218fd39061206715ad704cd9bd8de SHA1 96e0210e12a6bd7b75c9567db0d0dbc538d6c7e9 SHA256 9b0730565e6c3207dd68f14ac7768b581f2bc44008a15efde7d438031c82554c
+MD5 c07da99c48c4f2d2bb3640fc6906623f ulogd-1.24.ebuild 1653
+RMD160 08d2fad1c01218fd39061206715ad704cd9bd8de ulogd-1.24.ebuild 1653
+SHA256 9b0730565e6c3207dd68f14ac7768b581f2bc44008a15efde7d438031c82554c ulogd-1.24.ebuild 1653
+MISC ChangeLog 5364 RMD160 b91f8726b121730320ad269e786ebd37e870d645 SHA1 0d2039dc38eea9a8e8a2b1c4e81f83e46e9b7be5 SHA256 17e7ffc9413a308762d3dfe2c7592a40df4a66a8da9151ba9eed185b60dc6229
+MD5 9e01f4d2abe07aa149492dfec57565b1 ChangeLog 5364
+RMD160 b91f8726b121730320ad269e786ebd37e870d645 ChangeLog 5364
+SHA256 17e7ffc9413a308762d3dfe2c7592a40df4a66a8da9151ba9eed185b60dc6229 ChangeLog 5364
 MISC metadata.xml 160 RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 SHA1 d6147d00f16e8cfeef893d0764b0675a93d62849 SHA256 56fca1e06f6dcbe3bc12e7d3962998c7cb79d74f218ce8a17b07771b3e06f49e
 MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
 RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 metadata.xml 160
 SHA256 56fca1e06f6dcbe3bc12e7d3962998c7cb79d74f218ce8a17b07771b3e06f49e metadata.xml 160
-MD5 f07a3b563c092ad4a4c13ed4b7f6a1e2 files/digest-ulogd-1.23 235
-RMD160 47828ba0230d80528ec5f90665b2f6c9dc270f32 files/digest-ulogd-1.23 235
-SHA256 c2afb3f01bf602f86c27a1618de7e2afea2a825c2ccbc53ae96a5317460029ac files/digest-ulogd-1.23 235
+MD5 f07a3b563c092ad4a4c13ed4b7f6a1e2 files/digest-ulogd-1.23-r1 235
+RMD160 47828ba0230d80528ec5f90665b2f6c9dc270f32 files/digest-ulogd-1.23-r1 235
+SHA256 c2afb3f01bf602f86c27a1618de7e2afea2a825c2ccbc53ae96a5317460029ac files/digest-ulogd-1.23-r1 235
 MD5 070acc4f66d59da70dcf1ba76d96d435 files/digest-ulogd-1.24 235
 RMD160 9c02348c3b699afa07b1c172c1cf3b8f85d6c3c5 files/digest-ulogd-1.24 235
 SHA256 dc1493b9bfc85441932b5d39ccec186432aaba7664253ea6556640c130419f34 files/digest-ulogd-1.24 235
diff --git a/app-admin/ulogd/files/digest-ulogd-1.23 b/app-admin/ulogd/files/digest-ulogd-1.23-r1
index 2474aa99cecb..2474aa99cecb 100644
--- a/app-admin/ulogd/files/digest-ulogd-1.23
+++ b/app-admin/ulogd/files/digest-ulogd-1.23-r1
diff --git a/app-admin/ulogd/ulogd-1.23.ebuild b/app-admin/ulogd/ulogd-1.23-r1.ebuild
index c7772e9534b1..f5380f2d7a8d 100644
--- a/app-admin/ulogd/ulogd-1.23.ebuild
+++ b/app-admin/ulogd/ulogd-1.23-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-1.23.ebuild,v 1.7 2006/11/23 15:12:29 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-1.23-r1.ebuild,v 1.1 2007/02/06 16:13:30 antarus Exp $
 
 inherit eutils flag-o-matic
 
@@ -22,6 +22,8 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}/${P}-gcc41.patch"
+	EPATCH_OPTS="-F3" \
+		epatch "${FILESDIR}/glsa-200701.patch"
 }
 
 src_compile() {
diff --git a/app-admin/ulogd/ulogd-1.24.ebuild b/app-admin/ulogd/ulogd-1.24.ebuild
index 4ed0ec249614..460417d5729e 100644
--- a/app-admin/ulogd/ulogd-1.24.ebuild
+++ b/app-admin/ulogd/ulogd-1.24.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-1.24.ebuild,v 1.2 2007/01/23 03:03:22 antarus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-1.24.ebuild,v 1.3 2007/02/06 16:13:30 antarus Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -34,6 +34,9 @@ src_compile() {
 	# Configure uses incorrect syntax for ld
 	use mysql && sed -i -e "s:-Wl,::g" Rules.make
 
+	EPATCH_OPTS="-F3" \
+		epatch "${FILESDIR}/glsa-200701.patch"
+
 	# not parallel make safe: bug #128976
 	emake -j1 || die "make failed"
 }