1 |
commit: b9483e34ff5c787d7bd68f26e8d04412dfcb28af |
2 |
Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com> |
3 |
AuthorDate: Thu Feb 6 22:55:39 2020 +0000 |
4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Feb 6 23:06:33 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9483e34 |
7 |
|
8 |
sys-libs/libxcrypt-4.4.12: Version bump, fix USE=system |
9 |
|
10 |
Copyright: Sony Interactive Entertainment Inc. |
11 |
Package-Manager: Portage-2.3.87, Repoman-2.3.20 |
12 |
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> |
13 |
|
14 |
sys-libs/libxcrypt/Manifest | 2 +- |
15 |
.../files/libxcrypt-4.4.12-multibuild.patch | 25 ++++++++++ |
16 |
.../files/libxcrypt-4.4.12-pythonver.patch | 17 +++++++ |
17 |
...crypt-4.4.11.ebuild => libxcrypt-4.4.12.ebuild} | 54 ++++++++++++---------- |
18 |
4 files changed, 72 insertions(+), 26 deletions(-) |
19 |
|
20 |
diff --git a/sys-libs/libxcrypt/Manifest b/sys-libs/libxcrypt/Manifest |
21 |
index 7d6f6263be7..ee51b237512 100644 |
22 |
--- a/sys-libs/libxcrypt/Manifest |
23 |
+++ b/sys-libs/libxcrypt/Manifest |
24 |
@@ -1,3 +1,3 @@ |
25 |
DIST libxcrypt-4.4.10.tar.gz 499736 BLAKE2B 32da99488c21a21c3310a735a08a70002a3a56d7d9d4a9fd0c16436ef2b42ee8a9b877c5b5dcbf1bc9a38fbef3370d5ff4585167ff25025f854ccd020014dcd4 SHA512 fd714542dad40db721c03270b5a03e2c068b0750e887dcac4c651433d5905d08bd5c5db3762cc2e4ceee0103bd62810559ea197d164126169e0b253675415ca2 |
26 |
-DIST libxcrypt-4.4.11.tar.gz 493509 BLAKE2B a2cd425194fa28fdde25def1f7c7cfc58af76ac228540e5d645f36295fb8fe21316393067d0a81764d7981e85003abeebd590b979e64191dd449f14bcbb613a0 SHA512 907802cf9979704888ec947a2dc57aebb9d1317184948a9e771f6ba59deb9434d93f962185c186e66bb891f1b9f92405b6884e85d2a1d99f55bac367cca12ef2 |
27 |
+DIST libxcrypt-4.4.12.tar.gz 493620 BLAKE2B 185cc9a0b9f573801e75bf2ffb3eaa578016804d175443a53b2cef01334acb6f8fa5a0fe72e346ff368e3db355338b1f1dbd00e93828dde2594f0adee3753f69 SHA512 945dfd307ebd3d1b3dd9f22057b23b651c0ffaab55bf4151950565a3f0fea8b0e2bc2886318ceea707985d720e83e8663e4590bc72e91f470bae3a98f41ab30f |
28 |
DIST libxcrypt_2.4.orig.tar.gz 361503 BLAKE2B 6347bea4b22ae7742cb516a0a8673bbd7c37f645b2dbb383f4c4a6bbcc95a12897068ab7354fa015bbb65f6dc331b95ce24b48aa4bdd7a57433d8f5bc245392d SHA512 7171ce1b5b7f949232c4db94cf98bdd6396c3e2a8f2f483c041cab92d752e3a2fa93d564ede7efece57c069df129e6cc03049cf3e3f07bd3556031a7c4197cbf |
29 |
|
30 |
diff --git a/sys-libs/libxcrypt/files/libxcrypt-4.4.12-multibuild.patch b/sys-libs/libxcrypt/files/libxcrypt-4.4.12-multibuild.patch |
31 |
new file mode 100644 |
32 |
index 00000000000..80621303688 |
33 |
--- /dev/null |
34 |
+++ b/sys-libs/libxcrypt/files/libxcrypt-4.4.12-multibuild.patch |
35 |
@@ -0,0 +1,25 @@ |
36 |
+diff --git a/Makefile.am b/Makefile.am |
37 |
+index 26db1c1..597c3f4 100644 |
38 |
+--- a/Makefile.am |
39 |
++++ b/Makefile.am |
40 |
+@@ -84,11 +84,7 @@ noinst_HEADERS = \ |
41 |
+ test/des-cases.h \ |
42 |
+ test/ka-table.inc |
43 |
+ |
44 |
+-if ENABLE_XCRYPT_COMPAT_FILES |
45 |
+ nodist_include_HEADERS += xcrypt.h |
46 |
+-else |
47 |
+-nodist_noinst_HEADERS += xcrypt.h |
48 |
+-endif |
49 |
+ |
50 |
+ noinst_PROGRAMS = \ |
51 |
+ lib/gen-des-tables |
52 |
+@@ -137,7 +133,7 @@ uninstall_hook_targets = \ |
53 |
+ uninstall-hook-pkgconfig |
54 |
+ install-data-hook-pkgconfig: |
55 |
+ cd $(DESTDIR)$(pkgconfigdir) && \ |
56 |
+- $(LN_S) libxcrypt.pc libcrypt.pc |
57 |
++ $(LN_S) -f libxcrypt.pc libcrypt.pc |
58 |
+ uninstall-hook-pkgconfig: |
59 |
+ -rm -f $(DESTDIR)$(pkgconfigdir)/libcrypt.pc |
60 |
+ |
61 |
|
62 |
diff --git a/sys-libs/libxcrypt/files/libxcrypt-4.4.12-pythonver.patch b/sys-libs/libxcrypt/files/libxcrypt-4.4.12-pythonver.patch |
63 |
new file mode 100644 |
64 |
index 00000000000..048a8ebe0a7 |
65 |
--- /dev/null |
66 |
+++ b/sys-libs/libxcrypt/files/libxcrypt-4.4.12-pythonver.patch |
67 |
@@ -0,0 +1,17 @@ |
68 |
+diff --git a/configure.ac b/configure.ac |
69 |
+index 1e74bb1..4249fb5 100644 |
70 |
+--- a/configure.ac |
71 |
++++ b/configure.ac |
72 |
+@@ -241,11 +241,7 @@ ENABLE_KA_TABLE_GEN="no" |
73 |
+ # This way we just need one call to AC_PATH_PROGS to likely get a |
74 |
+ # suitable version of Python. The version check afterwards is for |
75 |
+ # the case just a generic 'python3' or 'python' executable was found. |
76 |
+-PYTHON_CANDIDATE_VERSIONS="python3 python" |
77 |
+- |
78 |
+-for ver in `seq 6 1 10`; do |
79 |
+- PYTHON_CANDIDATE_VERSIONS="python3.$ver $PYTHON_CANDIDATE_VERSIONS" |
80 |
+-done |
81 |
++PYTHON_CANDIDATE_VERSIONS="${EPYTHON}" |
82 |
+ |
83 |
+ AC_PATH_PROGS([PYTHON], [$PYTHON_CANDIDATE_VERSIONS], []) |
84 |
+ |
85 |
|
86 |
diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.11.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.12.ebuild |
87 |
similarity index 76% |
88 |
rename from sys-libs/libxcrypt/libxcrypt-4.4.11.ebuild |
89 |
rename to sys-libs/libxcrypt/libxcrypt-4.4.12.ebuild |
90 |
index c48e1369c1c..269587522a8 100644 |
91 |
--- a/sys-libs/libxcrypt/libxcrypt-4.4.11.ebuild |
92 |
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.12.ebuild |
93 |
@@ -3,7 +3,7 @@ |
94 |
|
95 |
EAPI=7 |
96 |
PYTHON_COMPAT=( python3_{6,7,8} ) |
97 |
-inherit autotools multibuild python-any-r1 multilib-minimal |
98 |
+inherit autotools usr-ldscript multibuild python-any-r1 multilib-minimal |
99 |
|
100 |
DESCRIPTION="Extended crypt library for descrypt, md5crypt, bcrypt, and others " |
101 |
SRC_URI="https://github.com/besser82/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
102 |
@@ -25,12 +25,11 @@ BDEPEND="sys-apps/findutils |
103 |
$(python_gen_any_dep 'dev-python/passlib[${PYTHON_USEDEP}]') |
104 |
)" |
105 |
|
106 |
-# Gentoo CI complained about not having this |
107 |
RESTRICT="!test? ( test )" |
108 |
|
109 |
PATCHES=( |
110 |
- "${FILESDIR}/libxcrypt-4.4.10-pythonver.patch" |
111 |
- "${FILESDIR}/libxcrypt-4.4.10-multibuild.patch" |
112 |
+ "${FILESDIR}/libxcrypt-4.4.12-pythonver.patch" |
113 |
+ "${FILESDIR}/libxcrypt-4.4.12-multibuild.patch" |
114 |
) |
115 |
|
116 |
pkg_setup() { |
117 |
@@ -52,7 +51,10 @@ src_configure() { |
118 |
} |
119 |
|
120 |
get_xclibdir() { |
121 |
- printf -- "%s\n" "$(usex split-usr '' '/usr')/$(get_libdir)/$(usex system '' 'xcrypt')" |
122 |
+ printf -- "%s/%s/%s\n" \ |
123 |
+ "$(usex split-usr '' '/usr')" \ |
124 |
+ "$(get_libdir)" \ |
125 |
+ "$(usex system '' 'xcrypt')" |
126 |
} |
127 |
|
128 |
multilib_src_configure() { |
129 |
@@ -75,7 +77,7 @@ multilib_src_configure() { |
130 |
--enable-obsolete-api=no |
131 |
$(use_enable static-libs static) |
132 |
) |
133 |
- ;; |
134 |
+ ;; |
135 |
*) die "Unexpected MULTIBUILD_ID: ${MULTIBUILD_ID}";; |
136 |
esac |
137 |
|
138 |
@@ -107,33 +109,21 @@ src_install() { |
139 |
done |
140 |
) || die "failglob error" |
141 |
|
142 |
+ gen_usr_ldscript libxcrypt.so $(usex system 'libcrypt.so' '') |
143 |
+ |
144 |
# remove useless stuff from installation |
145 |
find "${D}"/usr/share/doc/${PF} -type l -delete || die |
146 |
find "${D}" -name '*.la' -delete || die |
147 |
} |
148 |
|
149 |
-multilib_install() { |
150 |
- local install_target |
151 |
- |
152 |
- case "${MULTIBUILD_ID}" in |
153 |
- xcrypt_compat-*) install_target="install-libLTLIBRARIES";; |
154 |
- xcrypt_nocompat-*) |
155 |
- if is_final_abi; then |
156 |
- install_target="install" |
157 |
- else |
158 |
- install_target="install-libLTLIBRARIES" |
159 |
- fi |
160 |
- ;; |
161 |
- *) die "Unexpected MULTIBUILD_ID: ${MULTIBUILD_ID}";; |
162 |
- esac |
163 |
- |
164 |
- emake DESTDIR="${D}" ${install_target} |
165 |
+multilib_src_install() { |
166 |
+ emake DESTDIR="${D}" install |
167 |
|
168 |
# don't install the libcrypt.so symlink for the "compat" version |
169 |
case "${MULTIBUILD_ID}" in |
170 |
xcrypt_compat-*) |
171 |
rm "${D}"$(get_xclibdir)/libcrypt$(get_libname) \ |
172 |
- "${D}"/usr/include/$(usex system '' 'xcrypt/')xcrypt.h || die |
173 |
+ || die "failed to remove extra compat libraries" |
174 |
;; |
175 |
xcrypt_nocompat-*) |
176 |
if use split-usr; then |
177 |
@@ -143,11 +133,25 @@ multilib_install() { |
178 |
for so_file in "${D}"$(get_xclibdir)/*$(get_libname)*; do |
179 |
so_file=$(basename "${so_file}") || die |
180 |
|
181 |
- dosym ../../$(usex system '' '../')$(get_libdir)/$(usex system '' 'xcrypt')/${so_file} \ |
182 |
+ dosym ../../$(usex system '' '../')$(get_libdir)$(usex system '' '/xcrypt')/${so_file} \ |
183 |
/usr/$(get_libdir)/$(usex system '' 'xcrypt/')${so_file} |
184 |
done |
185 |
) || die "symlinking library failure" |
186 |
fi |
187 |
- ;; |
188 |
+ ;; |
189 |
+ *) die "Unexpected MULTIBUILD_ID: ${MULTIBUILD_ID}";; |
190 |
esac |
191 |
+ |
192 |
+ # .a files are installed to /$(get_libdir) by default |
193 |
+ if use static-libs; then |
194 |
+ ( |
195 |
+ shopt -s nullglob || die "nullglob failed" |
196 |
+ static_libs=( "${D}"/$(get_xclibdir)/*.a ) |
197 |
+ |
198 |
+ if [[ -n ${static_libs[*]} ]]; then |
199 |
+ mv "${static_libs[@]}" "${D}/usr/$(get_xclibdir)" \ |
200 |
+ || die "moving static libs failed" |
201 |
+ fi |
202 |
+ ) |
203 |
+ fi |
204 |
} |