net-nds/adtool: Version Bump, buffer overflow fix

Package-Manager: portage-2.2.0_alpha116/cvs/Linux x86_64

7 files changed, 104 insertions, 34 deletions

diff --git a/net-nds/adtool/ChangeLog b/net-nds/adtool/ChangeLog
index 57e1424e515d..e293ede439e4 100644
--- a/net-nds/adtool/ChangeLog
+++ b/net-nds/adtool/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-nds/adtool
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/adtool/ChangeLog,v 1.15 2012/02/09 10:48:23 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/adtool/ChangeLog,v 1.16 2012/07/11 13:08:58 jlec Exp $
+
+*adtool-1.3.3 (11 Jul 2012)
+
+  11 Jul 2012; Justin Lecher <jlec@gentoo.org>
+  -files/adtool-1.3-10-asneeded.patch, adtool-1.3.2.ebuild,
+  +files/adtool-1.3.2-asneeded.patch, +adtool-1.3.3.ebuild,
+  +files/adtool-1.3.3-bfr-overflow.patch, metadata.xml:
+  Version Bump, buffer overflow fix
 
   09 Feb 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Drop maintainer due retirement, bug #85926
diff --git a/net-nds/adtool/Manifest b/net-nds/adtool/Manifest
index e1b2274f4607..d3c5b39d496b 100644
--- a/net-nds/adtool/Manifest
+++ b/net-nds/adtool/Manifest
@@ -1,15 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
-AUX adtool-1.3-10-asneeded.patch 510 RMD160 7349909b40661fd31dc1bd986af0180be5c8d18b SHA1 35864ffc44753de6d9bf7849f65431973525cb90 SHA256 0c3222780b2e48ed1da83c13764ff30075934b46b7008e009ed87ad8952145f3
-DIST adtool-1.3.2.tar.gz 334370 RMD160 27a9899f11615a490972e3aee99508ba1c8deacf SHA1 f2aef0c55d8951c94e91f1f01a1e0942edc9ea38 SHA256 cc9d0adbacac4cac94ab970702382746c8b0ed96074580ef79d2e9adac203b8e
-EBUILD adtool-1.3.2.ebuild 708 RMD160 5f2d170eae8e8063d91eadffc37fb042e67ceaed SHA1 77bfbde8521ae07839440bda9fcd6183f44439f0 SHA256 3b06456590877ea953bb30a000ae1886bb9cf812d4711e111e0c21f96805a604
-MISC ChangeLog 2308 RMD160 8fe9167d8f14684e13dfa3d60f86f93bfc570a42 SHA1 d85cd904f922414cb177528b76c997f3f0a7a621 SHA256 24fb56f75c5bd3a62df03a6abb7de24a0a65748744564c9e56fa917d42663f6f
-MISC metadata.xml 359 RMD160 c31fc7961f9c52f6c43617536b6c3c304fe5525b SHA1 02a72ad0545eec4565e8a64709d02138d549877c SHA256 0154d4b6e050ce67a5296b1f63aadd5fa46f052bee7161180fc1be8cab3e633f
+AUX adtool-1.3.2-asneeded.patch 514 SHA256 bf0093b3eaed1e2464be0d2fcb7189b2632000df9d5b747a85d54fb187d0b699 SHA512 4c93086c919bcedbb86c7a9a6fdb4a444a71ef0b68b4676b2587575940dca15155a87005fcb314f5f998824b585e51b09dcfa31f26a49ceb7a682f128cf082be WHIRLPOOL f605be123c6581f30d774044eaca6e06d12cf425e61a44e658a7907c9c8cf5c14650187018a7b9f3abf9dca4f29ce4428bc19bb2edd9fe1556fd76aa4064073f
+AUX adtool-1.3.3-bfr-overflow.patch 587 SHA256 1032fd84b90c8cf7e8a5de4e684e22c7e50015eb21576d2fc528c8601bd9c3e0 SHA512 4ac3772f261f5a6e57a982d3985830083b227b87246bdc0909e5c75d47eee3cf62572b1de67b296368124e5007181988466832ff2333dcf74dcfae54e2db0ad4 WHIRLPOOL d9eb000e4e3fa7dc880e8e01e6cbb912b130c6569adb3059a7f33ab3b2c24dcf7fed522e1fcafa2f96355e8aff2486785339ef7713d57f8985bd63b4ac99c0c0
+DIST adtool-1.3.2.tar.gz 334370 SHA256 cc9d0adbacac4cac94ab970702382746c8b0ed96074580ef79d2e9adac203b8e SHA512 5a460e48bb222eeb1fb7e2c370910326aa06d94b08c84aa0ba2c98ad21853514f8581e53256ba6ffd4f5baf5344b6132a645a7ef3439b20d49f431bdb0994808 WHIRLPOOL 9deb19e820d7e1d6db7f22c165415021446ebe0e2848ada2990491ad0ed76139601a95875756e3e8ca582cfd461ec7de2cc7332f7cba82fcb0264a957388c4bb
+DIST adtool-1.3.3.tar.gz 334767 SHA256 9658ed2a4869304a094b0dc73d994940271f7ff64e481093893bf25c95bc95ab SHA512 800a9fd19481b2c986991c27674e24b40bd6f4d58d7cbcf94532acb88f6c36de1f18d4165d6a2dcffd7d5baeac86aaf6f0ff1ef1b46d93ffc28b826b3d857251 WHIRLPOOL f5d36bf4cd62abfe2488b27b9cc08d439d199d3b9e81693c517334ef9937de362f235c9d0c1604bbcc08c54d223de24282ef508d7e615f47be3f3508e1ae1e59
+EBUILD adtool-1.3.2.ebuild 846 SHA256 ef1fffe7f3285cd54820fabf2cde94829e5cfc38a694fd4e8f3201f08faa3886 SHA512 4341eeef083dca3e0d5bae8bc02070a246049528ba9b80d4d78c646ec632b87ab5e95641ad8ae071afac2bd6b68e2d0bb00570764cdc4ec59a9b177ff656c43c WHIRLPOOL eb7acee918eca3685699043c167bfd4a67a29070f30d6084ba737adb703e3a1d6002c85e25e52d23b049b1ca479190b60632fc862850eeb0f4ab0370416c341a
+EBUILD adtool-1.3.3.ebuild 803 SHA256 5c1c1b767293ee0beebfa7c114953b01b6c3465bb0da64f0884f69bb03167199 SHA512 30cead1e75e38bc9f7375b5763ce6031b9989b5d4df9a1fe7e2f4e7bd94ed74ef7c1fc35ac36f2109a59aa2fddd352265c20f68ca6e42053bdac304fe893d8fa WHIRLPOOL aa21137cfa30eecf17aa018ff8d423c848a6f2d4ecdcc0bd42f978c6866960854adbba61ce04b0d3fdf9c3180cb838b6ea7f531e7a3e8119cd4cd5d0d9886ba8
+MISC ChangeLog 2596 SHA256 1f3e9043b1df9bda807917fa20774b19802482187603a1b9cae7e5eb933028ba SHA512 611881935edcd24452870c69df3e820de15652c29a82e56fb761d60d75360cd62558472b4ba088151577e2dc2e4da143e9cba33c960648e52e61e84dfc7fc609 WHIRLPOOL ee16e15e230f28434e7fdca3d4b7186b264a5f7569b9886ca54ee91789a138c6d33b8583e9ce87832c14ffb925618bcbdd45d33ffe96e15de04f33183353ac85
+MISC metadata.xml 363 SHA256 90ad9dd8304c375936d1cd7bc6e04f0d0079ef8cc4eae3419ab1b99a4107e222 SHA512 43ca0896d35f3155762d038be3d874b7a983577d0316ffaca93fb1990eac9d11d0058df6e8f78baf136cfbc4789119b9c5e970922c94814e7f0e4b89ea9f8e34 WHIRLPOOL 5059e0b4820a6caa9189eeaf1fadcac1a1cf7a624a638d517c59328e9959146b57bc0af3c74a6ebefd63878eb694f9d0477043c79c95c3e00faa96cbc243b768
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
 
-iEYEARECAAYFAk8zpHwACgkQCaWpQKGI+9QvGgCfY1HrDgiil6Gjv+l3XfOjlu68
-5CYAoIB2zs+BhAKAcXHj37MDrk9+Bqe6
-=hwpM
+iEYEAREKAAYFAk/9evAACgkQgAnW8HDreRa94QCgn2uSYw1My07MKSmDi/+sL03s
+DxMAn2m+QwQLdMpVefKdxFXeznXAZFcy
+=ct01
 -----END PGP SIGNATURE-----
diff --git a/net-nds/adtool/adtool-1.3.2.ebuild b/net-nds/adtool/adtool-1.3.2.ebuild
index d4739446ab41..bba9482b4d30 100644
--- a/net-nds/adtool/adtool-1.3.2.ebuild
+++ b/net-nds/adtool/adtool-1.3.2.ebuild
@@ -1,30 +1,36 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/adtool/adtool-1.3.2.ebuild,v 1.2 2010/12/03 01:01:39 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/adtool/adtool-1.3.2.ebuild,v 1.3 2012/07/11 13:08:58 jlec Exp $
 
-inherit eutils autotools
+EAPI=4
 
-DESCRIPTION="adtool is a Unix command line utility for Active Directory administration"
-SRC_URI="http://gp2x.org/adtool/${P}.tar.gz"
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils
+
+DESCRIPTION="Utility for Active Directory administration"
 HOMEPAGE="http://gp2x.org/adtool/"
+SRC_URI="http://gp2x.org/adtool/${P}.tar.gz"
 
 KEYWORDS="~amd64 ~ppc ~x86"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE="ssl"
 
-DEPEND="net-nds/openldap
-	ssl?    ( dev-libs/openssl )"
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/adtool-1.3-10-asneeded.patch"
+DEPEND="
+	net-nds/openldap
+	ssl? ( dev-libs/openssl )"
+RDEPEND="${DEPEND}"
 
-	eautoreconf
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-asneeded.patch
+	"${FILESDIR}"/${PN}-1.3.3-bfr-overflow.patch )
 
-src_install() {
-	einstall || die "einstall failed"
+src_prepare() {
+	# automake-1.13
+	mv configure.{in,ac} || die
+	sed \
+		-e '/libactive_directory.a/s:@top_srcdir@:@top_builddir@:' \
+		-i src/tools/Makefile.am || die
+	autotools-utils_src_prepare
 }
diff --git a/net-nds/adtool/adtool-1.3.3.ebuild b/net-nds/adtool/adtool-1.3.3.ebuild
new file mode 100644
index 000000000000..2d29fc402232
--- /dev/null
+++ b/net-nds/adtool/adtool-1.3.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/adtool/adtool-1.3.3.ebuild,v 1.1 2012/07/11 13:08:58 jlec Exp $
+
+EAPI=4
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils
+
+DESCRIPTION="Utility for Active Directory administration"
+HOMEPAGE="http://gp2x.org/adtool/"
+SRC_URI="http://gp2x.org/adtool/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="ssl"
+
+DEPEND="
+	net-nds/openldap
+	ssl? ( dev-libs/openssl )"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-bfr-overflow.patch )
+
+src_prepare() {
+	# automake-1.13
+	mv configure.{in,ac} || die
+	sed \
+		-e '/libactive_directory.a/s:@top_srcdir@:@top_builddir@:' \
+		-i src/tools/Makefile.am || die
+	autotools-utils_src_prepare
+}
diff --git a/net-nds/adtool/files/adtool-1.3-10-asneeded.patch b/net-nds/adtool/files/adtool-1.3.2-asneeded.patch
index 8ff7334e3173..38880b1170e0 100644
--- a/net-nds/adtool/files/adtool-1.3-10-asneeded.patch
+++ b/net-nds/adtool/files/adtool-1.3.2-asneeded.patch
@@ -10,6 +10,6 @@ Index: adtool-1.3/src/tools/Makefile.am
  
  bin_PROGRAMS = adtool
  
--LDADD = @top_srcdir@/src/lib/libactive_directory.a
-+adtool_LDADD = @top_srcdir@/src/lib/libactive_directory.a -lldap -llber -lldap_r -lpthread -lresolv
+-LDADD = @top_builddir@/src/lib/libactive_directory.a
++adtool_LDADD = @top_builddir@/src/lib/libactive_directory.a -lldap -llber -lldap_r -lpthread -lresolv
  
diff --git a/net-nds/adtool/files/adtool-1.3.3-bfr-overflow.patch b/net-nds/adtool/files/adtool-1.3.3-bfr-overflow.patch
new file mode 100644
index 000000000000..f4e7ef0be88b
--- /dev/null
+++ b/net-nds/adtool/files/adtool-1.3.3-bfr-overflow.patch
@@ -0,0 +1,18 @@
+ src/lib/active_directory.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/lib/active_directory.c b/src/lib/active_directory.c
+index 1eacf5f..d4e1ca6 100644
+--- a/src/lib/active_directory.c
++++ b/src/lib/active_directory.c
+@@ -172,8 +172,8 @@ char *dn2domain(char *dn) {
+ 	exp_dn=ldap_explode_dn(dn, 0);
+ 	for(i=0; exp_dn[i]!=NULL; i++) {
+ 		if(!strncasecmp("dc=", exp_dn[i], 3)) {
+-			strncat(dc, exp_dn[i]+3, 1024);
+-			strncat(dc, ".", 1024);
++			strncat(dc, exp_dn[i]+3, 1024 - 1);
++			strncat(dc, ".", 1024 - 1);
+ 		}
+ 	}
+ 	ldap_value_free(exp_dn);
diff --git a/net-nds/adtool/metadata.xml b/net-nds/adtool/metadata.xml
index c85a66418186..25e348aacfc8 100644
--- a/net-nds/adtool/metadata.xml
+++ b/net-nds/adtool/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-</maintainer>
-<longdescription>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<longdescription>
 adtool is a unix command line utility for Active Directory administration, through ldap repository management.
 </longdescription>
 </pkgmetadata>