Non-maintainer-commit: Version bump (bug #181683), build properly on Kernels

  >=2.6.18 (bug #190842) and fix insecure temporary file creation in expn (bug
  #210158).
Package-Manager: portage-2.1.4.4

5 files changed, 102 insertions, 3 deletions

diff --git a/net-fs/am-utils/ChangeLog b/net-fs/am-utils/ChangeLog
index 06eb024e4c30..53ae582bc99b 100644
--- a/net-fs/am-utils/ChangeLog
+++ b/net-fs/am-utils/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-fs/am-utils
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/am-utils/ChangeLog,v 1.27 2007/04/06 22:23:39 betelgeuse Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/am-utils/ChangeLog,v 1.28 2008/04/01 17:54:22 rbu Exp $
+
+*am-utils-6.1.5 (01 Apr 2008)
+
+  01 Apr 2008; Robert Buchholz <rbu@gentoo.org>
+  +files/am-utils-6.1.5-CVE-2008-1078.patch,
+  +files/am-utils-6.1.5-uts_release.patch, +am-utils-6.1.5.ebuild:
+  Non-maintainer-commit: Version bump (bug #181683), build properly on Kernels
+  >=2.6.18 (bug #190842) and fix insecure temporary file creation in expn (bug
+  #210158).
 
   06 Apr 2007; Petteri Räty <betelgeuse@gentoo.org>
   -am-utils-6.0.9-r1.ebuild, -am-utils-6.0.10.ebuild:
diff --git a/net-fs/am-utils/Manifest b/net-fs/am-utils/Manifest
index 462ee827396c..1ce2c8d44583 100644
--- a/net-fs/am-utils/Manifest
+++ b/net-fs/am-utils/Manifest
@@ -1,12 +1,16 @@
 AUX am-utils-6.0.10-parallel-build.patch 2323 RMD160 4c84b291c744749e9c135ab27fa3ae36a8d34660 SHA1 1ffb7b08ffff20c695e5b921a5fca4b33ff5eaa5 SHA256 c65ba75087864dc70e6d2e0b0003007797a7331d40ed2eb5de4611fe24efa7b0
 AUX am-utils-6.1.4-dbm_open-libc.patch 770 RMD160 10bc734e649b2b444e2a43927f2ed812fa684125 SHA1 9a6c03fc79c0bb62e34d0136a45a78038df5cd68 SHA256 2b3f16e2a085522c66758b360642a50094f6862571e33d7ed2bc239aab7fb718
+AUX am-utils-6.1.5-CVE-2008-1078.patch 671 RMD160 7f1e8a2437c2018349ee2abb289e726fafde3f5b SHA1 4d169ba99ab1c05d2cac04c300cc18b39e5300d0 SHA256 456dc68a40252877fc9dd900da7fcaf37e6c199bf265d26156b2408a7bdc13fd
+AUX am-utils-6.1.5-uts_release.patch 572 RMD160 7126a8ce0b1feb10957971b86f5ee00c8af6df4d SHA1 e9e0ccec3c30b69b25c51038f401a7514b24b91c SHA256 540f8b49205d2c897ceaf3c272f39ebb8f83615738e5ad32ee8a3aaa9b1a247b
 AUX am-utils-gdbm.patch 1578 RMD160 df425a625864963c1036f8d0d693c558de71a5ab SHA1 9b36eab205a68f8e2642763e2f9263f1f27e67f4 SHA256 3f834d4fa559b35f032f6d7a9f16e917de182d6cff2b830a7bfcfc7477bf67f2
 AUX amd.conf 770 RMD160 95b48941df60c5714ea3320207811d15a0280c16 SHA1 6848dec9858e902e48afd6b8a263f92fd016f274 SHA256 c8af5183d0d237fb7b2e2a8373a6f8a3880714833841ab79fdf79931b3fa077a
 AUX amd.net 160 RMD160 b886406a2271d39c9749868214fed9e3bec4005f SHA1 7e5330928123e2bfc4f6794b458ccdadaf4a08b2 SHA256 bf61a76090f992cda19788aceca9248be5451167ea92a9ac4a4cdb6fc1cf75d9
 AUX amd.rc 544 RMD160 f734749c7d6ed58da47daed1a9943e2572e946ba SHA1 0a841995badf6908cd456f948d88b54d5cce016b SHA256 e2d20553f51deca7d05a475d20e008351cf4f6075a8f99e3e0b78c5d3a806bad
 DIST am-utils-6.1.3.tar.gz 1892542 RMD160 f8ddc9a51feb6ade2871e77c01d62d1fbf6b2c8b SHA1 6e2245510a79568eda0773eb60bed740ea5abb42 SHA256 a7af65520079ec87ed127a3356bb089bb3b1454d20269b430b0cce33fbfabe00
 DIST am-utils-6.1.4.tar.gz 1913151 RMD160 1dcd526ebdcb0cd08731e1da0846323a9690fcdc SHA1 2da88936e04eb6b4216d3d8766e11ec923b81389 SHA256 62c44a9635ffa0bedbf03692358102c84f72fb2cab49f5599133e3056ba415f5
+DIST am-utils-6.1.5.tar.gz 1922684 RMD160 ab1485aaa65c522cc5db7c7917ec59d3b47e0803 SHA1 21185e86a3de1c6fb8bfe922899391b1f46ed899 SHA256 d070682af75effd6b49ed3e893603039ecd0a013a49d8d09375187676d645178
 EBUILD am-utils-6.1.3.ebuild 810 RMD160 5c69b2703e4d8323778126446b243a225cbe454a SHA1 e06423dcc5fef5f005f6d351f81848e80736dbd6 SHA256 1c080f9f5fbc0ca2f04d16256bf47bc38d14630b1f9e3555bff07f7bbdd0aa52
 EBUILD am-utils-6.1.4.ebuild 982 RMD160 0c7a1aab747580861774dd473f8a0259942397d7 SHA1 ee47b30e79c2d0bc3100e36c92d110a33652eba8 SHA256 4f667e289c7e83ad5663476068b651b0b28b253ea686443f94a2280ade673e38
-MISC ChangeLog 3648 RMD160 b9b91e1dc93163b54c6db7a9e9b46fb52603e156 SHA1 3d5a92eeb00468e2fe7828d7a2b5e54ed3e24c77 SHA256 6f68f51e12498e54124e5c4b5b1365835119402d5297b2bd6a13e847a808d520
+EBUILD am-utils-6.1.5.ebuild 1095 RMD160 8496506125e682a5a313b80606e33b88c4308074 SHA1 25bb92ac0252422d91d51a0b356148361aa14aad SHA256 a391b52f7021502494b4985cc522ffac002368c16b3549a16e7bdfa952f6cade
+MISC ChangeLog 4003 RMD160 c535b58c23ab4c94cce79681e6cd701bfee5104b SHA1 9944912c51b407d4701d5a402f38750cb4858583 SHA256 9d2937e183f4dc850a075e82fcc92bd88d421aae300df5991a4cf0fc26472195
 MISC metadata.xml 159 RMD160 8e0977b9abd90afe9e1d5c1326823a5726f6e2a4 SHA1 33f35324ce730e28838be228d9ee4e4dd1bab1e5 SHA256 562c59615c028ffa088de789b3a792fd4cbbbfe71628ddd6a55d3b176becbc6b
diff --git a/net-fs/am-utils/am-utils-6.1.5.ebuild b/net-fs/am-utils/am-utils-6.1.5.ebuild
new file mode 100644
index 000000000000..241a00e3f9bf
--- /dev/null
+++ b/net-fs/am-utils/am-utils-6.1.5.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/am-utils/am-utils-6.1.5.ebuild,v 1.1 2008/04/01 17:54:22 rbu Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+
+inherit eutils autotools
+
+DESCRIPTION="amd automounter and utilities"
+HOMEPAGE="http://www.am-utils.org/"
+SRC_URI="ftp://ftp.am-utils.org/pub/am-utils/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86 ~x86-fbsd"
+IUSE="ldap"
+
+RDEPEND="ldap? ( >=net-nds/openldap-1.2 )"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PN}-6.1.4-dbm_open-libc.patch"
+	epatch "${FILESDIR}/${P}-uts_release.patch" #190842
+	epatch "${FILESDIR}/${P}-CVE-2008-1078.patch" #210158
+	eautoreconf
+}
+
+src_compile() {
+	econf \
+		$(use_with ldap) \
+		--sysconfdir=/etc/amd \
+		|| die "configure failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	insinto /etc/amd
+	doins "${FILESDIR}"/amd.{conf,net}
+	newinitd "${FILESDIR}/amd.rc" amd
+}
diff --git a/net-fs/am-utils/files/am-utils-6.1.5-CVE-2008-1078.patch b/net-fs/am-utils/files/am-utils-6.1.5-CVE-2008-1078.patch
new file mode 100644
index 000000000000..f0965b4a855a
--- /dev/null
+++ b/net-fs/am-utils/files/am-utils-6.1.5-CVE-2008-1078.patch
@@ -0,0 +1,21 @@
+Index: am-utils-6.1.5/scripts/expn.in
+===================================================================
+--- am-utils-6.1.5.orig/scripts/expn.in
++++ am-utils-6.1.5/scripts/expn.in
+@@ -9,6 +9,7 @@
+ # hardcoded constants, should work fine for BSD-based systems
+ #require 'sys/socket.ph';	# perl 4
+ use Socket;			# perl 5
++use Fcntl;
+ $AF_INET = &AF_INET;
+ $SOCK_STREAM = &SOCK_STREAM;
+ 
+@@ -1009,7 +1010,7 @@ sub mxlookup
+ 	}
+ 
+ 	$0 = "$av0 - nslookup of $server";
+-	open(T,">/tmp/expn$$") || die "open > /tmp/expn$$: $!\n";
++	sysopen(T,"/tmp/expn$$", O_EXCL | O_CREAT) || die "open > /tmp/expn$$: $!\n";
+ 	print T "set querytype=MX\n";
+ 	print T "$server\n";
+ 	close(T);
diff --git a/net-fs/am-utils/files/am-utils-6.1.5-uts_release.patch b/net-fs/am-utils/files/am-utils-6.1.5-uts_release.patch
new file mode 100644
index 000000000000..64b3342e0666
--- /dev/null
+++ b/net-fs/am-utils/files/am-utils-6.1.5-uts_release.patch
@@ -0,0 +1,19 @@
+Index: am-utils-6.1.5/acinclude.m4
+===================================================================
+--- am-utils-6.1.5.orig/acinclude.m4
++++ am-utils-6.1.5/acinclude.m4
+@@ -10161,7 +10161,14 @@ AC_DEFUN([AMU_LINUX_HEADERS],
+ ],
+ [
+ if (argc > 1)
++#ifdef UTS_RELEASE
+   printf("%s", UTS_RELEASE);
++#else
++# define AMU_MA(a) ((a) >> 16)
++# define AMU_MI(a) (((a) & 0xffff) >> 8)
++# define AMU_PL(a) ((a) & 0xff)
++ printf("%d.%d.%d", AMU_MA(LINUX_VERSION_CODE), AMU_MI(LINUX_VERSION_CODE), AMU_PL(LINUX_VERSION_CODE));
++#endif
+ ],
+ [ host_header_version=$value ],
+ [ echo