1 |
commit: daa2d5a00ef05ee38ce089bb56cb658500b250e0 |
2 |
Author: Eray Aslan <eras <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Nov 28 11:49:02 2022 +0000 |
4 |
Commit: Eray Aslan <eras <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Nov 28 11:49:02 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=daa2d5a0 |
7 |
|
8 |
app-crypt/heimdal: drop 7.7.0-r5 |
9 |
|
10 |
Bug: https://bugs.gentoo.org/881429 |
11 |
Signed-off-by: Eray Aslan <eras <AT> gentoo.org> |
12 |
|
13 |
app-crypt/heimdal/Manifest | 1 - |
14 |
.../heimdal/files/heimdal_fix-autoconf-2.70.patch | 29 ---- |
15 |
app-crypt/heimdal/heimdal-7.7.0-r5.ebuild | 188 --------------------- |
16 |
3 files changed, 218 deletions(-) |
17 |
|
18 |
diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest |
19 |
index 7394a567ab21..cd10e37e09e4 100644 |
20 |
--- a/app-crypt/heimdal/Manifest |
21 |
+++ b/app-crypt/heimdal/Manifest |
22 |
@@ -1,2 +1 @@ |
23 |
-DIST heimdal-7.7.0.tar.gz 10189293 BLAKE2B db9cdd1861dc9214a7f76b3d8b9656cfc0bad11cb6eadffa4fa29ea7f9aabd4c3d1b628c510644ec9abe1b3bf27a413ccf8cd590d602c4a4ac54ba3deb4cedc4 SHA512 6660939b5a36ce36310721a08a089fb671d1e3d2e8ac74ea4775bfa5f8f772d32de805551456200fe96cc486c092c44beb84f5dd877008bc305490ee971bbf99 |
24 |
DIST heimdal-7.7.1.tar.gz 10009851 BLAKE2B 2d2b6cef4aea1dfab97106cc6be5f3f68736c93f153b650ba349ee32be2a415de8a550c462c6d0978628ac18403838145198e07b4710ebe21570878e2b44f595 SHA512 c77def1d32301caa8675297152a534919459a65bd1c5353cdc8795c07aa7a94fd319b697b98e02233ef25eaeedb36420edd139c1e22d68d54bb991343a11a369 |
25 |
|
26 |
diff --git a/app-crypt/heimdal/files/heimdal_fix-autoconf-2.70.patch b/app-crypt/heimdal/files/heimdal_fix-autoconf-2.70.patch |
27 |
deleted file mode 100644 |
28 |
index 0dcc31026203..000000000000 |
29 |
--- a/app-crypt/heimdal/files/heimdal_fix-autoconf-2.70.patch |
30 |
+++ /dev/null |
31 |
@@ -1,29 +0,0 @@ |
32 |
-From 22352b90e78e2d162b98b5ef6c84672c397be40a Mon Sep 17 00:00:00 2001 |
33 |
-From: Lars Wendler <polynomial-c@g.o> |
34 |
-Date: Wed, 17 Mar 2021 17:49:18 +0100 |
35 |
-Subject: [PATCH] autoconf-2.70 fix |
36 |
- |
37 |
-autoconf-2.70 and newer are more strict with quoting etc. and thus generate |
38 |
-a broken configure file: |
39 |
- |
40 |
- configure: 20855: Syntax error: ")" unexpected (expecting "fi") |
41 |
- |
42 |
-Gentoo-bug: https://bugs.gentoo.org/776241 |
43 |
-Signed-off-by: Lars Wendler <polynomial-c@g.o> |
44 |
---- |
45 |
- cf/check-var.m4 | 2 +- |
46 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
47 |
- |
48 |
-diff --git a/cf/check-var.m4 b/cf/check-var.m4 |
49 |
-index 2fd7bca6f0..71d6f70ca8 100644 |
50 |
---- a/cf/check-var.m4 |
51 |
-+++ b/cf/check-var.m4 |
52 |
-@@ -20,7 +20,7 @@ AC_MSG_RESULT($ac_foo) |
53 |
- if test "$ac_foo" = yes; then |
54 |
- AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_[]$1), 1, |
55 |
- [Define if you have the `]$1[' variable.]) |
56 |
-- m4_ifval([$2], AC_CHECK_DECLS([$1],[],[],[$2])) |
57 |
-+ m4_ifval([$2], [AC_CHECK_DECLS([$1],[],[],[$2])]) |
58 |
- fi |
59 |
- ]) |
60 |
- |
61 |
|
62 |
diff --git a/app-crypt/heimdal/heimdal-7.7.0-r5.ebuild b/app-crypt/heimdal/heimdal-7.7.0-r5.ebuild |
63 |
deleted file mode 100644 |
64 |
index 447430e284ee..000000000000 |
65 |
--- a/app-crypt/heimdal/heimdal-7.7.0-r5.ebuild |
66 |
+++ /dev/null |
67 |
@@ -1,188 +0,0 @@ |
68 |
-# Copyright 1999-2022 Gentoo Authors |
69 |
-# Distributed under the terms of the GNU General Public License v2 |
70 |
- |
71 |
-EAPI=7 |
72 |
- |
73 |
-PYTHON_COMPAT=( python3_{8..10} ) |
74 |
-VIRTUALX_REQUIRED="manual" |
75 |
- |
76 |
-inherit autotools db-use multilib multilib-minimal python-any-r1 virtualx flag-o-matic |
77 |
- |
78 |
-MY_P="${P}" |
79 |
-DESCRIPTION="Kerberos 5 implementation from KTH" |
80 |
-HOMEPAGE="https://www.heimdal.software/" |
81 |
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz" |
82 |
- |
83 |
-LICENSE="BSD" |
84 |
-SLOT="0" |
85 |
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 sparc x86" |
86 |
-IUSE="afs +berkdb caps gdbm hdb-ldap +lmdb otp selinux ssl static-libs test X" |
87 |
-RESTRICT="!test? ( test )" |
88 |
- |
89 |
-CDEPEND=" |
90 |
- virtual/libcrypt:=[${MULTILIB_USEDEP}] |
91 |
- ssl? ( |
92 |
- >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] |
93 |
- ) |
94 |
- berkdb? ( >=sys-libs/db-4.8.30-r1:*[${MULTILIB_USEDEP}] ) |
95 |
- gdbm? ( >=sys-libs/gdbm-1.10-r1:=[${MULTILIB_USEDEP}] ) |
96 |
- lmdb? ( dev-db/lmdb:= ) |
97 |
- caps? ( sys-libs/libcap-ng ) |
98 |
- >=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}] |
99 |
- >=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}] |
100 |
- sys-libs/ncurses:0= |
101 |
- >=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}] |
102 |
- afs? ( net-fs/openafs ) |
103 |
- hdb-ldap? ( >=net-nds/openldap-2.3.0:= ) |
104 |
- X? ( |
105 |
- x11-libs/libX11 |
106 |
- x11-libs/libXau |
107 |
- x11-libs/libXt |
108 |
- ) |
109 |
- !!app-crypt/mit-krb5 |
110 |
- !!app-crypt/mit-krb5-appl" |
111 |
- |
112 |
-DEPEND="${CDEPEND} |
113 |
- ${PYTHON_DEPS} |
114 |
- dev-perl/JSON |
115 |
- virtual/pkgconfig |
116 |
- sys-apps/texinfo |
117 |
- >=sys-devel/autoconf-2.62 |
118 |
- test? ( X? ( ${VIRTUALX_DEPEND} ) )" |
119 |
- |
120 |
-RDEPEND="${CDEPEND} |
121 |
- selinux? ( sec-policy/selinux-kerberos )" |
122 |
- |
123 |
-MULTILIB_WRAPPED_HEADERS=( |
124 |
- /usr/include/krb5-types.h |
125 |
- /usr/include/cms_asn1.h |
126 |
- /usr/include/digest_asn1.h |
127 |
- /usr/include/hdb_asn1.h |
128 |
- /usr/include/krb5_asn1.h |
129 |
- /usr/include/pkcs12_asn1.h |
130 |
- /usr/include/pkinit_asn1.h |
131 |
- /usr/include/rfc2459_asn1.h |
132 |
-) |
133 |
- |
134 |
-MULTILIB_CHOST_TOOLS=( |
135 |
- /usr/bin/krb5-config |
136 |
-) |
137 |
- |
138 |
-PATCHES=( |
139 |
- "${FILESDIR}/heimdal_disable-check-iprop.patch" |
140 |
- "${FILESDIR}/heimdal_tinfo.patch" |
141 |
- "${FILESDIR}/heimdal_hcrypto.patch" |
142 |
- "${FILESDIR}/heimdal_build-headers-before-use.patch" |
143 |
- "${FILESDIR}/heimdal_fix-db60.patch" |
144 |
- "${FILESDIR}/heimdal_fix-autoconf-2.70.patch" |
145 |
-) |
146 |
- |
147 |
-src_prepare() { |
148 |
- default |
149 |
- eautoreconf |
150 |
-} |
151 |
- |
152 |
-src_configure() { |
153 |
- # QA |
154 |
- append-flags -fno-strict-aliasing |
155 |
- |
156 |
- multilib-minimal_src_configure |
157 |
-} |
158 |
- |
159 |
-multilib_src_configure() { |
160 |
- local myeconfargs=( |
161 |
- --enable-kcm |
162 |
- --disable-osfc2 |
163 |
- --enable-shared |
164 |
- --with-libintl="${EPREFIX}"/usr |
165 |
- --with-readline="${EPREFIX}"/usr |
166 |
- --with-sqlite3="${EPREFIX}"/usr |
167 |
- --libexecdir="${EPREFIX}"/usr/sbin |
168 |
- --enable-pthread-support |
169 |
- --enable-kx509 |
170 |
- --enable-pk-init |
171 |
- --with-ipv6 |
172 |
- $(use_enable afs afs-support) |
173 |
- $(use_enable gdbm ndbm-db) |
174 |
- $(use_enable lmdb mdb-db) |
175 |
- $(use_enable otp) |
176 |
- $(use_enable static-libs static) |
177 |
- $(multilib_native_use_with caps capng) |
178 |
- $(multilib_native_use_with hdb-ldap openldap "${EPREFIX}"/usr) |
179 |
- $(use_with ssl openssl "${EPREFIX}"/usr) |
180 |
- $(multilib_native_use_with X x) |
181 |
- ) |
182 |
- if use berkdb; then |
183 |
- myeconfargs+=( |
184 |
- --with-berkeley-db |
185 |
- --with-berkeley-db-include="$(db_includedir)" |
186 |
- ) |
187 |
- else |
188 |
- myeconfargs+=( |
189 |
- --without-berkeley-db |
190 |
- ) |
191 |
- fi |
192 |
- |
193 |
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" |
194 |
-} |
195 |
- |
196 |
-multilib_src_compile() { |
197 |
- if multilib_is_native_abi; then |
198 |
- emake |
199 |
- else |
200 |
- emake -C include |
201 |
- emake -C lib |
202 |
- emake -C kdc |
203 |
- emake -C tools |
204 |
- emake -C tests/plugin |
205 |
- fi |
206 |
-} |
207 |
- |
208 |
-multilib_src_test() { |
209 |
- multilib_is_native_abi && emake -j1 check |
210 |
-} |
211 |
- |
212 |
-multilib_src_install() { |
213 |
- if multilib_is_native_abi; then |
214 |
- INSTALL_CATPAGES="no" emake DESTDIR="${D}" install |
215 |
- else |
216 |
- emake -C include DESTDIR="${D}" install |
217 |
- emake -C lib DESTDIR="${D}" install |
218 |
- emake -C kdc DESTDIR="${D}" install |
219 |
- emake -C tools DESTDIR="${D}" install |
220 |
- emake -C tests/plugin DESTDIR="${D}" install |
221 |
- fi |
222 |
-} |
223 |
- |
224 |
-multilib_src_install_all() { |
225 |
- dodoc ChangeLog* README NEWS TODO |
226 |
- |
227 |
- # client rename |
228 |
- mv "${ED}"/usr/share/man/man1/{,k}su.1 |
229 |
- mv "${ED}"/usr/bin/{,k}su |
230 |
- |
231 |
- newinitd "${FILESDIR}"/heimdal-kdc.initd-r2 heimdal-kdc |
232 |
- newinitd "${FILESDIR}"/heimdal-kadmind.initd-r2 heimdal-kadmind |
233 |
- newinitd "${FILESDIR}"/heimdal-kpasswdd.initd-r2 heimdal-kpasswdd |
234 |
- newinitd "${FILESDIR}"/heimdal-kcm.initd-r1 heimdal-kcm |
235 |
- |
236 |
- newconfd "${FILESDIR}"/heimdal-kdc.confd heimdal-kdc |
237 |
- newconfd "${FILESDIR}"/heimdal-kadmind.confd heimdal-kadmind |
238 |
- newconfd "${FILESDIR}"/heimdal-kpasswdd.confd heimdal-kpasswdd |
239 |
- newconfd "${FILESDIR}"/heimdal-kcm.confd heimdal-kcm |
240 |
- |
241 |
- insinto /etc |
242 |
- newins "${S}"/krb5.conf krb5.conf.example |
243 |
- |
244 |
- if use hdb-ldap; then |
245 |
- insinto /etc/openldap/schema |
246 |
- doins "${S}/lib/hdb/hdb.schema" |
247 |
- fi |
248 |
- |
249 |
- if ! use static-libs ; then |
250 |
- find "${ED}" -name "*.la" -delete || die |
251 |
- fi |
252 |
- |
253 |
- # default database dir |
254 |
- keepdir /var/heimdal |
255 |
-} |