6 files changed, 90 insertions, 24 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/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>