1 |
commit: a71db50a58a04e906dec11fef3d8dab342b463d4 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Aug 29 12:30:14 2020 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Aug 29 12:30:14 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a71db50a |
7 |
|
8 |
net-nds/adtool: Port to EAPI 7 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/708032 |
11 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
12 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
13 |
|
14 |
net-nds/adtool/adtool-1.3.3-r1.ebuild | 29 +++++++++++++++++++ |
15 |
net-nds/adtool/adtool-1.3.3.ebuild | 33 ---------------------- |
16 |
net-nds/adtool/files/adtool-1.3.3-automake.patch | 9 ++++++ |
17 |
net-nds/adtool/files/adtool-1.3.3-fno-common.patch | 19 +++++++++++++ |
18 |
4 files changed, 57 insertions(+), 33 deletions(-) |
19 |
|
20 |
diff --git a/net-nds/adtool/adtool-1.3.3-r1.ebuild b/net-nds/adtool/adtool-1.3.3-r1.ebuild |
21 |
new file mode 100644 |
22 |
index 00000000000..014b4436dca |
23 |
--- /dev/null |
24 |
+++ b/net-nds/adtool/adtool-1.3.3-r1.ebuild |
25 |
@@ -0,0 +1,29 @@ |
26 |
+# Copyright 1999-2020 Gentoo Authors |
27 |
+# Distributed under the terms of the GNU General Public License v2 |
28 |
+ |
29 |
+EAPI=7 |
30 |
+ |
31 |
+inherit autotools out-of-source |
32 |
+ |
33 |
+DESCRIPTION="Utility for Active Directory administration" |
34 |
+HOMEPAGE="http://gp2x.org/adtool/" |
35 |
+SRC_URI="http://gp2x.org/adtool/${P}.tar.gz" |
36 |
+ |
37 |
+LICENSE="GPL-2" |
38 |
+SLOT="0" |
39 |
+KEYWORDS="~amd64 ~ppc ~x86" |
40 |
+ |
41 |
+RDEPEND="net-nds/openldap" |
42 |
+DEPEND="${RDEPEND}" |
43 |
+ |
44 |
+PATCHES=( |
45 |
+ "${FILESDIR}"/${P}-bfr-overflow.patch |
46 |
+ "${FILESDIR}"/${P}-fno-common.patch |
47 |
+ "${FILESDIR}"/${P}-automake.patch |
48 |
+) |
49 |
+ |
50 |
+src_prepare() { |
51 |
+ default |
52 |
+ mv configure.{in,ac} || die |
53 |
+ eautoreconf |
54 |
+} |
55 |
|
56 |
diff --git a/net-nds/adtool/adtool-1.3.3.ebuild b/net-nds/adtool/adtool-1.3.3.ebuild |
57 |
deleted file mode 100644 |
58 |
index 851fdd24deb..00000000000 |
59 |
--- a/net-nds/adtool/adtool-1.3.3.ebuild |
60 |
+++ /dev/null |
61 |
@@ -1,33 +0,0 @@ |
62 |
-# Copyright 1999-2012 Gentoo Foundation |
63 |
-# Distributed under the terms of the GNU General Public License v2 |
64 |
- |
65 |
-EAPI=4 |
66 |
- |
67 |
-AUTOTOOLS_AUTORECONF=true |
68 |
- |
69 |
-inherit autotools-utils |
70 |
- |
71 |
-DESCRIPTION="Utility for Active Directory administration" |
72 |
-HOMEPAGE="http://gp2x.org/adtool/" |
73 |
-SRC_URI="http://gp2x.org/adtool/${P}.tar.gz" |
74 |
- |
75 |
-SLOT="0" |
76 |
-LICENSE="GPL-2" |
77 |
-KEYWORDS="~amd64 ~ppc ~x86" |
78 |
-IUSE="ssl" |
79 |
- |
80 |
-DEPEND=" |
81 |
- net-nds/openldap |
82 |
- ssl? ( dev-libs/openssl )" |
83 |
-RDEPEND="${DEPEND}" |
84 |
- |
85 |
-PATCHES=( "${FILESDIR}"/${P}-bfr-overflow.patch ) |
86 |
- |
87 |
-src_prepare() { |
88 |
- # automake-1.13 |
89 |
- mv configure.{in,ac} || die |
90 |
- sed \ |
91 |
- -e '/libactive_directory.a/s:@top_srcdir@:@top_builddir@:' \ |
92 |
- -i src/tools/Makefile.am || die |
93 |
- autotools-utils_src_prepare |
94 |
-} |
95 |
|
96 |
diff --git a/net-nds/adtool/files/adtool-1.3.3-automake.patch b/net-nds/adtool/files/adtool-1.3.3-automake.patch |
97 |
new file mode 100644 |
98 |
index 00000000000..df8f99edc46 |
99 |
--- /dev/null |
100 |
+++ b/net-nds/adtool/files/adtool-1.3.3-automake.patch |
101 |
@@ -0,0 +1,9 @@ |
102 |
+--- a/src/tools/Makefile.am |
103 |
++++ b/src/tools/Makefile.am |
104 |
+@@ -4,5 +4,5 @@ |
105 |
+ |
106 |
+ bin_PROGRAMS = adtool |
107 |
+ |
108 |
+-adtool_LDADD = @top_srcdir@/src/lib/libactive_directory.a -lldap -llber -lldap_r -lpthread -lresolv |
109 |
++adtool_LDADD = @top_builddir@/src/lib/libactive_directory.a -lldap -llber -lldap_r -lpthread -lresolv |
110 |
+ |
111 |
|
112 |
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 |
113 |
new file mode 100644 |
114 |
index 00000000000..49391a79920 |
115 |
--- /dev/null |
116 |
+++ b/net-nds/adtool/files/adtool-1.3.3-fno-common.patch |
117 |
@@ -0,0 +1,19 @@ |
118 |
+--- a/src/lib/active_directory.h |
119 |
++++ b/src/lib/active_directory.h |
120 |
+@@ -28,11 +28,11 @@ |
121 |
+ | if there is a problem reading the config file, or |
122 |
+ | AD_SERVER_CONNECT_FAILURE if a connection can't be made. |
123 |
+ */ |
124 |
+-char *system_config_file; |
125 |
+-char *uri; |
126 |
+-char *binddn; |
127 |
+-char *bindpw; |
128 |
+-char *search_base; |
129 |
++extern char *system_config_file; |
130 |
++extern char *uri; |
131 |
++extern char *binddn; |
132 |
++extern char *bindpw; |
133 |
++extern char *search_base; |
134 |
+ |
135 |
+ /* ad_get_error() returns a pointer to a string containing an |
136 |
+ | explanation of the last error that occured. |