commit: 03e7f7f97bce6504b0043c000b9e13a3f11dfeed
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun May 29 01:05:55 2016 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun May 29 01:05:55 2016 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=03e7f7f9
net-fs/samba: fixed to build on musl
net-fs/samba/Manifest | 4 +-
.../files/samba-4.3.9-remove-getpwent_r.patch | 101 +++++++++++++++++++++
.../files/samba-4.3.9-remove-rep_strtoull.patch | 47 ++++++++++
net-fs/samba/samba-4.3.9-r99.ebuild | 3 +
4 files changed, 154 insertions(+), 1 deletion(-)
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 7f77a4a..bc95999 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -3,6 +3,8 @@ AUX 4.3/samba4.initd-r1 1110 SHA256
44b53a5d5f516cb944a308613579b3e8e27166519612
AUX nmbd.service 224 SHA256
a5e25c11714206c4fb129333dd45152c5753716c6445cbe78c28275df1a1cb77 SHA512
098dfb270c5a5c29f59b4fd8d51b17931771e25e481124832f1a086677825527e2afa7276e8614e5007fbf044d253ce2eaf3a7caf7461ad5d90d0b1c7f157f9d
WHIRLPOOL
2f7c342a60c09d5e40e968a026aa17d8c2fe3fd032331c7bb26599bb0f8ec8a77c2a3e329498ed16b1602451fd85a8ef076c436e8a092740cfbd01a82ca52e30
AUX samba-4.2.3-heimdal_compilefix.patch 819 SHA256
6cf93d127aa900c1e9a4fb8a3bdff6054d78a7adb798c6f409feffc13c714ee9 SHA512
0f6ddbf58e5d5b83e3fb9738dd10c2ab0f1ed96fb62f9b4389a40729b3fe2d4af1a5c5bd2d44fa7d568136072b787b6358aeca3026f1acec4f5a6869e74f2536
WHIRLPOOL
882a52598013a40165d87616eaa016139fa89ff218dc43a6e6518123ccc18ca84e4ba275731e10ec762b22f26576eac56ad6b257cfae2e1cbc45f518a0d37007
AUX samba-4.2.7-pam.patch 1273 SHA256
e1abd99fcf4ff721dafa64c77a60b07962e3e818eaf5d10fecead61a2af81e07 SHA512
5f900ebfdfb15af38814864f7ec8cd52d3525098d6f2017ab2f29d301e6a0e622d2ab37976fbd97180cbfe23c7853e91ab7966655eb46ebd9bdd2951205e46bc
WHIRLPOOL
91e1fc2e49944d1ded93d902fc50437763388a12b8c2eab70e2dcd8124860746c71fa8b4c26e7b43e5ebc2c0fc94c4c005a2c1eb8b9af68e77c9c6cc1d92927c
+AUX samba-4.3.9-remove-getpwent_r.patch 2509 SHA256
67cb2991602fb8e7ac24c8ff74840a310c95fac79554792195fd6974d7a5acc6 SHA512
833d7633b1946b7e4a0157cdf781fbba429a9b98e641f48de779fb4a4daccbc10cb9cb4bb09d9e050a27a91e749317dad3bec53a5102ba7787fc222037211c73
WHIRLPOOL
c64797ba00e4f57a5c8d5e4a61583f33eee5505b12ba8dee34487a3d2549d8565388d955ee1d73362421c3dee3d4badb9b9afd8b512308c7745371eeaf8c9d57
+AUX samba-4.3.9-remove-rep_strtoull.patch 1391 SHA256
668841dc9f9b18ac7bc9b186bf2f800382fe1073101c8ea45630706e9821540e SHA512
7c4d666673dcc2958773b95edd357f984cfb260be1e9d270d8fd4f7e42ef16697af9e3cc58d534cbc67e37cd4b4fe4bb9e8b24be41201d3fb225eb0eec093c9a
WHIRLPOOL
0a7c6e7619a12b8468da9a6449914916232d8ce2cbc66779dc7a590acaf62f8a1196c08b846dbc20c58d6dd145eea36a7d087eaf0a596fbfb82d20d4b22ada0a
AUX samba.conf 61 SHA256
e4fc68bc14a44e3c452e767d996ff693d131da317eb513de10d752dd96cb6f12 SHA512
4a75185762c90d110c399215fbfc939d30804b558ffdb11cc68dee6f87a94c86cadbcd63935884db1266cf40fe24fefb75f9067fe4751ad9838d7a43e8973b9e
WHIRLPOOL
ad21bc3738c2ec721ad3be746c66719385390835c7f4da881fc0cc1c982bb6821a56300157b1169d1a35264e44dab1a0c29cd9919455a02a8f4c53c665a4bed3
AUX samba.service 199 SHA256
0ae738fa2a15b476dbca016dfa4e1cf4b8c4a575e13edf518eb70b615c02a059 SHA512
eb277917f15de958f4a0404b66c6d2cc82ae4319b85f2f442489988d523bf92e2a9d23a6051ee693cd4bcfbc67947e8028c59906ad3e537578daf5caee8a6f16
WHIRLPOOL
1132081b63b1e0e1a9342d59493ebfe1d918133a4091e48c42dae7845dcaa24a0b8e7a1183d5a41b0173c3f6dbc17838a9b7a6297fc8ea0775ab150a22ae3151
AUX smbd.service 250 SHA256
e1f5da902cd97891852f6463b2c7eddbc61e7fbd3e3c281028a806319627fc68 SHA512
a54e3c337f7c27766a81f68ad6d8f4eb6ddb1d1aec3303f274e419a49114755bc5dd711701d5e64954ae7153a8be4a7063371af286696c0b81d543b9276703c3
WHIRLPOOL
18b6a57603a41303d207249fdb46cb4f6e887f8b9bd4921dca6b4f28a59951368d6abead2dc9d3be2c09cb2c9f295087ef5f20d121a309791b9031e3fad28b13
@@ -11,5 +13,5 @@ AUX smbd_at.service 145 SHA256
909dddfd80982035739081d86d2c524f6a25440d9c10b8a80
AUX winbindd.service 240 SHA256
755036bc419cce90200ac3c04986fbb7cf718c128c2a1288c634658bb779bf3a SHA512
f1ce6d035e8e0fcdc73f14e3b60c9647043777ff6b2a982a81ed07eb4df5ff245a9511e3e4a9d8163f9c8f3fb86d2a39a67621ace68392eb7c2f2e2a55d587f7
WHIRLPOOL
eb4d7f30b4ce3341e3d24a6c05965bdce9ded78a7327b44d3d04d00837d6e8109857b1fb1b78c8325680588cf9abe94158755a962fb8f7e8dac04b336308c268
DIST samba-4.3.9.tar.gz 20570849 SHA256
1f22c61a7f24c5357a9ef4d10833a2cd161f40f3db03bcbe586d7cd3a56139f3 SHA512
bc90c88d8defd3acec7c671e8ceacec31e3111540aabee7ec6f11cdeaf61bbd993525e2b765e3b50801c8079e1168cf496b3e5e6a56118d6493ae5da60d34c41
WHIRLPOOL
e33efba4bfbaab5278ec62cbadb5f14fe2220d4b4ad1e57a4d26233d8b6bdf4318ad86d839b2638a490a195c04aabb02dafff67bb1e2999fab4f116b3c6367cc
DIST samba-disable-python-patches-4.3.9.tar.xz 6116 SHA256
83206112e04c375e170e86ea6b29d6dc2c172b55ba9fb89130be14708d758cf5 SHA512
ca8b62337afd1cc6059b9aefc0a3972d18ba90fba3f043d9730f6967e1b80c40bc918b0445b8ae8a1f3df74d3551f90c721df3c0514edccb881ed0b4fc54e1b5
WHIRLPOOL
3aebd6758e5e7dc2920b1e8f8825d2b7b7efac7c5f2d91d5ed6fed75597bfdced1b27d9e2a00385af5df19e5462a4e014df6a7274c0b25a660702268235ef746
-EBUILD samba-4.3.9-r99.ebuild 6684 SHA256
9cc9763e58a0b6cf537287eefd98b1ad0ef33106ab3f61e4398141f4fe644d0f SHA512
00764d3a3ec15f0e47e4d3ed9e83fdc665ffc685b93ab58798c0eb920d7f067cdec99037b7641b4a7d28ffd4b9d6e6ea1a07df83f9f2f479456327ac18c4f9a9
WHIRLPOOL
70e120156cd09100b1c930f94d89aa09a53b256e04641d0ee089abd31cb64cf6fd9b86c1a08f270e1196eb82fb9d4597bc75d64277a695f43564d3e1bdd03970
+EBUILD samba-4.3.9-r99.ebuild 6775 SHA256
625f16e16a0883b1f1d0808c909767432e831895ae708598219529840c287a67 SHA512
331b2ea18101aae2416caef82c2be925bbb1eb316bf0ed9b7c67fb683399f59c795d25edbba8d0ada26ce643033a74a2cde1ac9461b01775e8a8a19b82ed116b
WHIRLPOOL
a8e1d42cc92ffa6ce1d3615af367d3765020f05997e118af701b19064d7f18dfdaac626d355f3b1cdf0dcd45ec642e77f40ba4e1ec5a81f7f1980ff969da5dc7
MISC metadata.xml 1714 SHA256
94b726fc2c6f741402a9a6139fd507a9b7b56d0920ae83a095e0e5c416250f3d SHA512
ccf8143ca9c586a5313f8e4d82ae9114ad9685def8b12729804ebd5279ce53e58685cf21257a7fe11f0a40227df5b3987550d4d8f3fde1752310eec3da27ba4f
WHIRLPOOL
7c35b3a07535c0e3e9e716a394f06535c343a44dcd4ec49c28460ef337e9d920fc91210f083bf6ca098774369bec065e280ef11f296372242ea94b72b70a9fc2
diff --git a/net-fs/samba/files/samba-4.3.9-remove-getpwent_r.patch
b/net-fs/samba/files/samba-4.3.9-remove-getpwent_r.patch
new file mode 100644
index 0000000..0b42cbf
--- /dev/null
+++ b/net-fs/samba/files/samba-4.3.9-remove-getpwent_r.patch
@@ -0,0 +1,101 @@
+diff -Naur samba-4.3.9.orig/source4/torture/local/nss_tests.c
samba-4.3.9/source4/torture/local/nss_tests.c
+--- samba-4.3.9.orig/source4/torture/local/nss_tests.c 2015-12-01
08:42:55.000000000 +0000
++++ samba-4.3.9/source4/torture/local/nss_tests.c 2016-05-29
00:52:30.412002243 +0000
+@@ -337,48 +337,6 @@
+ struct passwd **pwd_array_p,
+ size_t *num_pwd_p)
+ {
+- struct passwd pwd, *pwdp;
+- struct passwd *pwd_array = NULL;
+- size_t num_pwd = 0;
+- char buffer[4096];
+- int ret;
+-
+- torture_comment(tctx, "Testing setpwent\n");
+- setpwent();
+-
+- while (1) {
+- torture_comment(tctx, "Testing getpwent_r\n");
+-
+-#ifdef SOLARIS_GETPWENT_R
+- ret = getpwent_r(&pwd, buffer, sizeof(buffer));
+-#else /* SOLARIS_GETPWENT_R */
+- ret = getpwent_r(&pwd, buffer, sizeof(buffer), &pwdp);
+-#endif /* SOLARIS_GETPWENT_R */
+- if (ret != 0) {
+- if (ret != ENOENT) {
+- torture_comment(tctx, "got %d return code\n",
ret);
+- }
+- break;
+- }
+- print_passwd(&pwd);
+- if (pwd_array_p && num_pwd_p) {
+- pwd_array = talloc_realloc(tctx, pwd_array, struct
passwd, num_pwd+1);
+- torture_assert(tctx, pwd_array, "out of memory");
+- copy_passwd(tctx, &pwd, &pwd_array[num_pwd]);
+- num_pwd++;
+- }
+- }
+-
+- torture_comment(tctx, "Testing endpwent\n");
+- endpwent();
+-
+- if (pwd_array_p) {
+- *pwd_array_p = pwd_array;
+- }
+- if (num_pwd_p) {
+- *num_pwd_p = num_pwd;
+- }
+-
+ return true;
+ }
+
+@@ -535,48 +493,6 @@
+ struct group **grp_array_p,
+ size_t *num_grp_p)
+ {
+- struct group grp, *grpp;
+- struct group *grp_array = NULL;
+- size_t num_grp = 0;
+- char buffer[4096];
+- int ret;
+-
+- torture_comment(tctx, "Testing setgrent\n");
+- setgrent();
+-
+- while (1) {
+- torture_comment(tctx, "Testing getgrent_r\n");
+-
+-#ifdef SOLARIS_GETGRENT_R
+- ret = getgrent_r(&grp, buffer, sizeof(buffer));
+-#else /* SOLARIS_GETGRENT_R */
+- ret = getgrent_r(&grp, buffer, sizeof(buffer), &grpp);
+-#endif /* SOLARIS_GETGRENT_R */
+- if (ret != 0) {
+- if (ret != ENOENT) {
+- torture_comment(tctx, "got %d return code\n",
ret);
+- }
+- break;
+- }
+- print_group(&grp);
+- if (grp_array_p && num_grp_p) {
+- grp_array = talloc_realloc(tctx, grp_array, struct
group, num_grp+1);
+- torture_assert(tctx, grp_array, "out of memory");
+- copy_group(tctx, &grp, &grp_array[num_grp]);
+- num_grp++;
+- }
+- }
+-
+- torture_comment(tctx, "Testing endgrent\n");
+- endgrent();
+-
+- if (grp_array_p) {
+- *grp_array_p = grp_array;
+- }
+- if (num_grp_p) {
+- *num_grp_p = num_grp;
+- }
+-
+ return true;
+ }
+
diff --git a/net-fs/samba/files/samba-4.3.9-remove-rep_strtoull.patch
b/net-fs/samba/files/samba-4.3.9-remove-rep_strtoull.patch
new file mode 100644
index 0000000..36efd57
--- /dev/null
+++ b/net-fs/samba/files/samba-4.3.9-remove-rep_strtoull.patch
@@ -0,0 +1,47 @@
+diff -Naur samba-4.3.9.orig/lib/replace/replace.c
samba-4.3.9/lib/replace/replace.c
+--- samba-4.3.9.orig/lib/replace/replace.c 2015-09-08 13:45:25.000000000
+0000
++++ samba-4.3.9/lib/replace/replace.c 2016-05-29 00:50:43.794008282 +0000
+@@ -558,43 +558,6 @@
+ #endif /* HAVE_STRTOLL */
+
+
+-#ifndef HAVE_STRTOULL
+-unsigned long long int rep_strtoull(const char *str, char **endptr, int base)
+-{
+-#ifdef HAVE_STRTOUQ
+- return strtouq(str, endptr, base);
+-#elif defined(HAVE___STRTOULL)
+- return __strtoull(str, endptr, base);
+-#elif SIZEOF_LONG == SIZEOF_LONG_LONG
+- return (unsigned long long int) strtoul(str, endptr, base);
+-#else
+-# error "You need a strtoull function"
+-#endif
+-}
+-#else
+-#ifdef HAVE_BSD_STRTOLL
+-#ifdef HAVE_STRTOUQ
+-unsigned long long int rep_strtoull(const char *str, char **endptr, int base)
+-{
+- unsigned long long int nb = strtouq(str, endptr, base);
+- /* In linux EINVAL is only returned if base is not ok */
+- if (errno == EINVAL) {
+- if (base == 0 || (base >1 && base <37)) {
+- /* Base was ok so it's because we were not
+- * able to make the convertion.
+- * Let's reset errno.
+- */
+- errno = 0;
+- }
+- }
+- return nb;
+-}
+-#else
+-#error "You need the strtouq function"
+-#endif /* HAVE_STRTOUQ */
+-#endif /* HAVE_BSD_STRTOLL */
+-#endif /* HAVE_STRTOULL */
+-
+ #ifndef HAVE_SETENV
+ int rep_setenv(const char *name, const char *value, int overwrite)
+ {
diff --git a/net-fs/samba/samba-4.3.9-r99.ebuild
b/net-fs/samba/samba-4.3.9-r99.ebuild
index f58f54d..081c540 100644
--- a/net-fs/samba/samba-4.3.9-r99.ebuild
+++ b/net-fs/samba/samba-4.3.9-r99.ebuild
@@ -88,6 +88,9 @@ S="${WORKDIR}/${MY_P}"
PATCHES=(
"${FILESDIR}/${PN}-4.2.3-heimdal_compilefix.patch"
"${FILESDIR}/${PN}-4.2.7-pam.patch"
+ "${FILESDIR}/${P}-remove-getpwent_r.patch"
+ "${FILESDIR}/${P}-remove-rep_strtoull.patch"
+
)
CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
