1 |
commit: 98505d73047f3a7703cd171b1f4f5d8c9e0db4e5 |
2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jan 20 17:57:48 2021 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jan 20 17:58:25 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98505d73 |
7 |
|
8 |
sys-libs/musl: update getent to support 'shadow' database |
9 |
|
10 |
Closes: https://bugs.gentoo.org/764755 |
11 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
12 |
|
13 |
sys-libs/musl/Manifest | 1 + |
14 |
.../{musl-1.2.2.ebuild => musl-1.2.2-r1.ebuild} | 31 +++++++++++++------- |
15 |
sys-libs/musl/musl-9999.ebuild | 33 ++++++++++++++-------- |
16 |
3 files changed, 44 insertions(+), 21 deletions(-) |
17 |
|
18 |
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest |
19 |
index c2ab036a470..3178375edc4 100644 |
20 |
--- a/sys-libs/musl/Manifest |
21 |
+++ b/sys-libs/musl/Manifest |
22 |
@@ -5,3 +5,4 @@ DIST musl-1.1.24.tar.gz 1024988 BLAKE2B 5fa26746eed0f2334b740adf94a8400568d56d9b |
23 |
DIST musl-1.2.0.tar.gz 1035265 BLAKE2B 0a47e0f438cca0f3ce31ae024c19358160214842115b560efc48e66228055c9147d9550957a79425322d510ba773f197d0944bb844bf6addbbf698088a3358a9 SHA512 58bd88189a6002356728cea1c6f6605a893fe54f7687595879add4eab283c8692c3b031eb9457ad00d1edd082cfe62fcc0eb5eb1d3bf4f1d749c0efa2a95fec1 |
24 |
DIST musl-1.2.1.tar.gz 1047481 BLAKE2B 5ccdee248d4caa1b433ab9c56cce3842fb46a269fd6a53d0880ba5eaad208997306e6b56fd345917e5076714fbfac0804ea226e6dc3f0f2e75f8c824a7155535 SHA512 455464ef47108a78457291bda2b1ea574987a1787f6001e9376956f20521593a4816bc215dab41c1a80292ae7ebd315accb4d4fa6a1210ff77d9a4d68239e960 |
25 |
DIST musl-1.2.2.tar.gz 1055220 BLAKE2B a000357ed52e417d8cebe5537df658dc0f8f02f2da3efcd79125544ad63e11e05fa96136551d0bfeb09a3f6c9a2260bffcfbd329ea92e6a7b62aa690f48968aa SHA512 5344b581bd6463d71af8c13e91792fa51f25a96a1ecbea81e42664b63d90b325aeb421dfbc8c22e187397ca08e84d9296a0c0c299ba04fa2b751d6864914bd82 |
26 |
+DIST musl-getent-79d453a0cd3be7dfa4a2e941816e0a820bac085c.c 11656 BLAKE2B 1b7bf7102a1eb91a8cb881ed8ca65eb8eed911dd50238e97dc2952d89d4c6ebed6bfd046a2b38776c550b2872ab54ced8cb452fcc2ad56e5616f722debda761f SHA512 7f5b9d934d82deb5f8b23e16169a5d9b99ccab3a4708df06a95d685e1b24a3a3e69b3dcf4942f2f66c12a3d4bf0c5827e2ee2e8c4d7b1997359fccc2ac212dee |
27 |
|
28 |
diff --git a/sys-libs/musl/musl-1.2.2.ebuild b/sys-libs/musl/musl-1.2.2-r1.ebuild |
29 |
similarity index 82% |
30 |
rename from sys-libs/musl/musl-1.2.2.ebuild |
31 |
rename to sys-libs/musl/musl-1.2.2-r1.ebuild |
32 |
index c94f8c8198c..c7ffebe049b 100644 |
33 |
--- a/sys-libs/musl/musl-1.2.2.ebuild |
34 |
+++ b/sys-libs/musl/musl-1.2.2-r1.ebuild |
35 |
@@ -7,18 +7,17 @@ inherit eutils flag-o-matic multilib toolchain-funcs |
36 |
if [[ ${PV} == "9999" ]] ; then |
37 |
EGIT_REPO_URI="git://git.musl-libc.org/musl" |
38 |
inherit git-r3 |
39 |
- SRC_URI=" |
40 |
- https://dev.gentoo.org/~blueness/musl-misc/getconf.c |
41 |
- https://dev.gentoo.org/~blueness/musl-misc/getent.c |
42 |
- https://dev.gentoo.org/~blueness/musl-misc/iconv.c" |
43 |
- KEYWORDS="" |
44 |
else |
45 |
- SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz |
46 |
- https://dev.gentoo.org/~blueness/musl-misc/getconf.c |
47 |
- https://dev.gentoo.org/~blueness/musl-misc/getent.c |
48 |
- https://dev.gentoo.org/~blueness/musl-misc/iconv.c" |
49 |
+ SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz" |
50 |
KEYWORDS="-* ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86" |
51 |
fi |
52 |
+GETENT_COMMIT="79d453a0cd3be7dfa4a2e941816e0a820bac085c" |
53 |
+GETENT_FILE="musl-getent-${GETENT_COMMIT}.c" |
54 |
+SRC_URI+=" |
55 |
+ https://dev.gentoo.org/~blueness/musl-misc/getconf.c |
56 |
+ https://raw.githubusercontent.com/floppym/aports/${GETENT_COMMIT}/main/musl/getent.c -> ${GETENT_FILE} |
57 |
+ https://dev.gentoo.org/~blueness/musl-misc/iconv.c |
58 |
+" |
59 |
|
60 |
export CBUILD=${CBUILD:-${CHOST}} |
61 |
export CTARGET=${CTARGET:-${CHOST}} |
62 |
@@ -60,6 +59,18 @@ pkg_setup() { |
63 |
fi |
64 |
} |
65 |
|
66 |
+src_unpack() { |
67 |
+ if [[ ${PV} == 9999 ]]; then |
68 |
+ git-r3_src_unpack |
69 |
+ else |
70 |
+ unpack "${P}.tar.gz" |
71 |
+ fi |
72 |
+ mkdir misc || die |
73 |
+ cp "${DISTDIR}"/getconf.c misc/getconf.c || die |
74 |
+ cp "${DISTDIR}/${GETENT_FILE}" misc/getent.c || die |
75 |
+ cp "${DISTDIR}"/iconv.c misc/iconv.c || die |
76 |
+} |
77 |
+ |
78 |
src_configure() { |
79 |
tc-getCC ${CTARGET} |
80 |
just_headers && export CC=true |
81 |
@@ -84,7 +95,7 @@ src_compile() { |
82 |
CFLAGS="${CFLAGS}" \ |
83 |
CPPFLAGS="${CPPFLAGS}" \ |
84 |
LDFLAGS="${LDFLAGS}" \ |
85 |
- VPATH="${DISTDIR}" |
86 |
+ VPATH="${WORKDIR}/misc" |
87 |
fi |
88 |
} |
89 |
|
90 |
|
91 |
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild |
92 |
index a4f0d0fe5f8..c7ffebe049b 100644 |
93 |
--- a/sys-libs/musl/musl-9999.ebuild |
94 |
+++ b/sys-libs/musl/musl-9999.ebuild |
95 |
@@ -1,24 +1,23 @@ |
96 |
# Copyright 1999-2021 Gentoo Authors |
97 |
# Distributed under the terms of the GNU General Public License v2 |
98 |
|
99 |
-EAPI=6 |
100 |
+EAPI=7 |
101 |
|
102 |
inherit eutils flag-o-matic multilib toolchain-funcs |
103 |
if [[ ${PV} == "9999" ]] ; then |
104 |
EGIT_REPO_URI="git://git.musl-libc.org/musl" |
105 |
inherit git-r3 |
106 |
- SRC_URI=" |
107 |
- https://dev.gentoo.org/~blueness/musl-misc/getconf.c |
108 |
- https://dev.gentoo.org/~blueness/musl-misc/getent.c |
109 |
- https://dev.gentoo.org/~blueness/musl-misc/iconv.c" |
110 |
- KEYWORDS="" |
111 |
else |
112 |
- SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz |
113 |
- https://dev.gentoo.org/~blueness/musl-misc/getconf.c |
114 |
- https://dev.gentoo.org/~blueness/musl-misc/getent.c |
115 |
- https://dev.gentoo.org/~blueness/musl-misc/iconv.c" |
116 |
+ SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz" |
117 |
KEYWORDS="-* ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86" |
118 |
fi |
119 |
+GETENT_COMMIT="79d453a0cd3be7dfa4a2e941816e0a820bac085c" |
120 |
+GETENT_FILE="musl-getent-${GETENT_COMMIT}.c" |
121 |
+SRC_URI+=" |
122 |
+ https://dev.gentoo.org/~blueness/musl-misc/getconf.c |
123 |
+ https://raw.githubusercontent.com/floppym/aports/${GETENT_COMMIT}/main/musl/getent.c -> ${GETENT_FILE} |
124 |
+ https://dev.gentoo.org/~blueness/musl-misc/iconv.c |
125 |
+" |
126 |
|
127 |
export CBUILD=${CBUILD:-${CHOST}} |
128 |
export CTARGET=${CTARGET:-${CHOST}} |
129 |
@@ -60,6 +59,18 @@ pkg_setup() { |
130 |
fi |
131 |
} |
132 |
|
133 |
+src_unpack() { |
134 |
+ if [[ ${PV} == 9999 ]]; then |
135 |
+ git-r3_src_unpack |
136 |
+ else |
137 |
+ unpack "${P}.tar.gz" |
138 |
+ fi |
139 |
+ mkdir misc || die |
140 |
+ cp "${DISTDIR}"/getconf.c misc/getconf.c || die |
141 |
+ cp "${DISTDIR}/${GETENT_FILE}" misc/getent.c || die |
142 |
+ cp "${DISTDIR}"/iconv.c misc/iconv.c || die |
143 |
+} |
144 |
+ |
145 |
src_configure() { |
146 |
tc-getCC ${CTARGET} |
147 |
just_headers && export CC=true |
148 |
@@ -84,7 +95,7 @@ src_compile() { |
149 |
CFLAGS="${CFLAGS}" \ |
150 |
CPPFLAGS="${CPPFLAGS}" \ |
151 |
LDFLAGS="${LDFLAGS}" \ |
152 |
- VPATH="${DISTDIR}" |
153 |
+ VPATH="${WORKDIR}/misc" |
154 |
fi |
155 |
} |