commit: a71db50a58a04e906dec11fef3d8dab342b463d4 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Sat Aug 29 12:30:14 2020 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sat Aug 29 12:30:14 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a71db50a
net-nds/adtool: Port to EAPI 7 Closes: https://bugs.gentoo.org/708032 Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: David Seifert <soap <AT> gentoo.org> net-nds/adtool/adtool-1.3.3-r1.ebuild | 29 +++++++++++++++++++ net-nds/adtool/adtool-1.3.3.ebuild | 33 ---------------------- net-nds/adtool/files/adtool-1.3.3-automake.patch | 9 ++++++ net-nds/adtool/files/adtool-1.3.3-fno-common.patch | 19 +++++++++++++ 4 files changed, 57 insertions(+), 33 deletions(-) diff --git a/net-nds/adtool/adtool-1.3.3-r1.ebuild b/net-nds/adtool/adtool-1.3.3-r1.ebuild new file mode 100644 index 00000000000..014b4436dca --- /dev/null +++ b/net-nds/adtool/adtool-1.3.3-r1.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools out-of-source + +DESCRIPTION="Utility for Active Directory administration" +HOMEPAGE="http://gp2x.org/adtool/"; +SRC_URI="http://gp2x.org/adtool/${P}.tar.gz"; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" + +RDEPEND="net-nds/openldap" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-bfr-overflow.patch + "${FILESDIR}"/${P}-fno-common.patch + "${FILESDIR}"/${P}-automake.patch +) + +src_prepare() { + default + mv configure.{in,ac} || die + eautoreconf +} diff --git a/net-nds/adtool/adtool-1.3.3.ebuild b/net-nds/adtool/adtool-1.3.3.ebuild deleted file mode 100644 index 851fdd24deb..00000000000 --- a/net-nds/adtool/adtool-1.3.3.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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.3-automake.patch b/net-nds/adtool/files/adtool-1.3.3-automake.patch new file mode 100644 index 00000000000..df8f99edc46 --- /dev/null +++ b/net-nds/adtool/files/adtool-1.3.3-automake.patch @@ -0,0 +1,9 @@ +--- a/src/tools/Makefile.am ++++ b/src/tools/Makefile.am +@@ -4,5 +4,5 @@ + + bin_PROGRAMS = adtool + +-adtool_LDADD = @top_srcdir@/src/lib/libactive_directory.a -lldap -llber -lldap_r -lpthread -lresolv ++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-fno-common.patch b/net-nds/adtool/files/adtool-1.3.3-fno-common.patch new file mode 100644 index 00000000000..49391a79920 --- /dev/null +++ b/net-nds/adtool/files/adtool-1.3.3-fno-common.patch @@ -0,0 +1,19 @@ +--- a/src/lib/active_directory.h ++++ b/src/lib/active_directory.h +@@ -28,11 +28,11 @@ + | if there is a problem reading the config file, or + | AD_SERVER_CONNECT_FAILURE if a connection can't be made. + */ +-char *system_config_file; +-char *uri; +-char *binddn; +-char *bindpw; +-char *search_base; ++extern char *system_config_file; ++extern char *uri; ++extern char *binddn; ++extern char *bindpw; ++extern char *search_base; + + /* ad_get_error() returns a pointer to a string containing an + | explanation of the last error that occured.
