1 |
commit: 8efc5d79172a5337ec56ddcff487a277dbf88886 |
2 |
Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com> |
3 |
AuthorDate: Tue Nov 5 02:52:19 2019 +0000 |
4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Nov 5 02:52:59 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8efc5d79 |
7 |
|
8 |
sys-libs/libxcrypt: Version bump to 4.4.10 (bug #686478) |
9 |
|
10 |
This installs to an alternate `xcrypt` subdirectory as suggested by |
11 |
Michał Górny at https://bugs.gentoo.org/686478#c9 to avoid the issues |
12 |
mentioned at https://bugs.gentoo.org/686478#c1 |
13 |
|
14 |
Since this installs a pkgconfig, any reverse dependency using pkgconfig |
15 |
should pick up the path change automatically. Otherwise they will have |
16 |
to be updated. |
17 |
|
18 |
Closes: https://bugs.gentoo.org/686478 |
19 |
Copyright: Sony Interactive Entertainment Inc. |
20 |
Package-Manager: Portage-2.3.78, Repoman-2.3.17 |
21 |
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> |
22 |
|
23 |
sys-libs/libxcrypt/Manifest | 1 + |
24 |
.../files/libxcrypt-4.4.10-pythonver.patch | 17 +++++++ |
25 |
sys-libs/libxcrypt/libxcrypt-4.4.10.ebuild | 57 ++++++++++++++++++++++ |
26 |
sys-libs/libxcrypt/metadata.xml | 21 ++++---- |
27 |
4 files changed, 87 insertions(+), 9 deletions(-) |
28 |
|
29 |
diff --git a/sys-libs/libxcrypt/Manifest b/sys-libs/libxcrypt/Manifest |
30 |
index 707e4d36b80..0bdde211d72 100644 |
31 |
--- a/sys-libs/libxcrypt/Manifest |
32 |
+++ b/sys-libs/libxcrypt/Manifest |
33 |
@@ -1 +1,2 @@ |
34 |
+DIST libxcrypt-4.4.10.tar.gz 499736 BLAKE2B 32da99488c21a21c3310a735a08a70002a3a56d7d9d4a9fd0c16436ef2b42ee8a9b877c5b5dcbf1bc9a38fbef3370d5ff4585167ff25025f854ccd020014dcd4 SHA512 fd714542dad40db721c03270b5a03e2c068b0750e887dcac4c651433d5905d08bd5c5db3762cc2e4ceee0103bd62810559ea197d164126169e0b253675415ca2 |
35 |
DIST libxcrypt_2.4.orig.tar.gz 361503 BLAKE2B 6347bea4b22ae7742cb516a0a8673bbd7c37f645b2dbb383f4c4a6bbcc95a12897068ab7354fa015bbb65f6dc331b95ce24b48aa4bdd7a57433d8f5bc245392d SHA512 7171ce1b5b7f949232c4db94cf98bdd6396c3e2a8f2f483c041cab92d752e3a2fa93d564ede7efece57c069df129e6cc03049cf3e3f07bd3556031a7c4197cbf |
36 |
|
37 |
diff --git a/sys-libs/libxcrypt/files/libxcrypt-4.4.10-pythonver.patch b/sys-libs/libxcrypt/files/libxcrypt-4.4.10-pythonver.patch |
38 |
new file mode 100644 |
39 |
index 00000000000..0ca1563995b |
40 |
--- /dev/null |
41 |
+++ b/sys-libs/libxcrypt/files/libxcrypt-4.4.10-pythonver.patch |
42 |
@@ -0,0 +1,17 @@ |
43 |
+diff --git a/configure.ac b/configure.ac |
44 |
+index 16885c8..fd8c8e3 100644 |
45 |
+--- a/configure.ac |
46 |
++++ b/configure.ac |
47 |
+@@ -247,11 +247,7 @@ ENABLE_CRYPT_KAT_GEN="no" |
48 |
+ # This way we just need one call to AC_PATH_PROGS to likely get a |
49 |
+ # suitable version of Python. The version check afterwards is for |
50 |
+ # the case just a generic 'python3' or 'python' executable was found. |
51 |
+-PYTHON_CANDIDATE_VERSIONS="python3 python" |
52 |
+- |
53 |
+-for ver in `seq 6 1 10`; do |
54 |
+- PYTHON_CANDIDATE_VERSIONS="python3.$ver $PYTHON_CANDIDATE_VERSIONS" |
55 |
+-done |
56 |
++PYTHON_CANDIDATE_VERSIONS="${EPYTHON}" |
57 |
+ |
58 |
+ AC_PATH_PROGS([PYTHON], [$PYTHON_CANDIDATE_VERSIONS], []) |
59 |
+ |
60 |
|
61 |
diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.10.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.10.ebuild |
62 |
new file mode 100644 |
63 |
index 00000000000..c656e73548c |
64 |
--- /dev/null |
65 |
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.10.ebuild |
66 |
@@ -0,0 +1,57 @@ |
67 |
+# Copyright 1999-2019 Gentoo Authors |
68 |
+# Distributed under the terms of the GNU General Public License v2 |
69 |
+ |
70 |
+EAPI=7 |
71 |
+PYTHON_COMPAT=( python3_{6,7} ) |
72 |
+inherit python-any-r1 autotools |
73 |
+ |
74 |
+DESCRIPTION="Extended crypt library for descrypt, md5crypt, bcrypt, and others " |
75 |
+SRC_URI="https://github.com/besser82/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
76 |
+HOMEPAGE="https://github.com/besser82/libxcrypt" |
77 |
+ |
78 |
+LICENSE="LGPL-2.1+ public-domain BSD BSD-2" |
79 |
+SLOT="0/2" |
80 |
+KEYWORDS="~amd64 ~x86" |
81 |
+IUSE="split-usr test" |
82 |
+ |
83 |
+BDEPEND="sys-apps/findutils |
84 |
+ test? ( ${PYTHON_DEPS} )" |
85 |
+ |
86 |
+PATCHES=( |
87 |
+ "${FILESDIR}/libxcrypt-4.4.10-pythonver.patch" |
88 |
+) |
89 |
+ |
90 |
+pkg_setup() { |
91 |
+ use test && python-any-r1_pkg_setup |
92 |
+} |
93 |
+ |
94 |
+src_prepare() { |
95 |
+ default |
96 |
+ eautoreconf |
97 |
+} |
98 |
+ |
99 |
+src_configure() { |
100 |
+ econf \ |
101 |
+ --disable-static \ |
102 |
+ --enable-obsolete-api=no \ |
103 |
+ --libdir=$(usex split-usr '/usr' '')/$(get_libdir)/xcrypt \ |
104 |
+ --with-pkgconfigdir=/usr/$(get_libdir)/pkgconfig \ |
105 |
+ --includedir="${EPREFIX}/usr/include/xcrypt" |
106 |
+} |
107 |
+ |
108 |
+src_test() { |
109 |
+ emake check |
110 |
+} |
111 |
+ |
112 |
+src_install() { |
113 |
+ default |
114 |
+ |
115 |
+ # make sure out man pages don't collide with glibc or man-pages |
116 |
+ ( |
117 |
+ shopt -s failglob || die "failglob failed" |
118 |
+ for manpage in "${ED}"/usr/share/man/man*/*.?*; do |
119 |
+ mv -n "${manpage}" "$(dirname "${manpage}")/xcrypt_$(basename "${manpage}")" \ |
120 |
+ || die "mv failed" |
121 |
+ done |
122 |
+ ) || die "no man pages to rename" |
123 |
+} |
124 |
|
125 |
diff --git a/sys-libs/libxcrypt/metadata.xml b/sys-libs/libxcrypt/metadata.xml |
126 |
index 3f12685cdb1..8ce970ea7f3 100644 |
127 |
--- a/sys-libs/libxcrypt/metadata.xml |
128 |
+++ b/sys-libs/libxcrypt/metadata.xml |
129 |
@@ -1,13 +1,16 @@ |
130 |
<?xml version="1.0" encoding="UTF-8"?> |
131 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
132 |
<pkgmetadata> |
133 |
- <maintainer type="project"> |
134 |
- <email>hardened@g.o</email> |
135 |
- <name>Gentoo Hardened</name> |
136 |
- </maintainer> |
137 |
- <longdescription> |
138 |
- Crypt library for DES, MD5, and blowfish. Libxcrypt is a replacement for |
139 |
- libcrypt, which comes with the GNU C Library. It supports DES crypt, |
140 |
- MD5, and passwords with blowfish encryption. |
141 |
- </longdescription> |
142 |
+ <maintainer type="project"> |
143 |
+ <email>hardened@g.o</email> |
144 |
+ <name>Gentoo Hardened</name> |
145 |
+ </maintainer> |
146 |
+ <longdescription> |
147 |
+ Crypt library for DES, MD5, and blowfish. Libxcrypt is a replacement for |
148 |
+ libcrypt, which comes with the GNU C Library. It supports DES crypt, |
149 |
+ MD5, and passwords with blowfish encryption. |
150 |
+ </longdescription> |
151 |
+ <upstream> |
152 |
+ <remote-id type="github">besser82/libxcrypt</remote-id> |
153 |
+ </upstream> |
154 |
</pkgmetadata> |