net-fs/samba: use alpine patch for getpwent_r() and getgrent_r()

4 files changed, 94 insertions, 101 deletions

diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 9f1b416f..6c09bf8d 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -3,8 +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-4.3.9-remove-getpwent_r.patch 2680 SHA256 7956274b412a268339abb63f8e1bd63b5049cd4ab7c6270235d9d0b9bcf6c81a SHA512 0d4fd9862191554dc9c724cec0b94fd19afbfd0c4ed619e4c620c075e849cb3f3d44db1e5f119d890da23a3dd0068d9873703f3d86c47b91310521f37356208b WHIRLPOOL a42c91049872ca29dfeb80755b7f99fc3ad81b59395fb2d9a77210f18de402a4ef3a0409edfe9339b3b3e7ee7d3c85fed55f90ce50392c5e3ec2fce8c9f3f498
+AUX samba-4.3.9-remove-rep_strtoull.patch 2088 SHA256 a5a6493252f99d89b9c108a51073e777096e82e22f57c3444dc2cd7df36fe152 SHA512 9f264e300e453466e9be86d44dc90eea69ace58c4c1a4f9d6374bffe99dae3f56b529c19509efa39cffebb7e3aaf1edf1a1828d36e3d412d0b9de7d70e71e3e0 WHIRLPOOL a33481e663bcddcf7bc0a936d8e67d84850009cbdccf6c14949a244f939d0ea159502915a2ec2f2ee6e357d2dc4a0856a11796e44f22bbde71ff002597337aa4
 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
@@ -14,4 +14,4 @@ AUX winbindd.service 240 SHA256 755036bc419cce90200ac3c04986fbb7cf718c128c2a1288
 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 6784 SHA256 0ced519f1d177f9c82c5c2dca1ebfcdb124d32fb24c1f7f1b8c36af92bb29090 SHA512 4e3723d82ff7e819eb65e0dd32081479cd3e2f75a64977bc7d337aa9d424234cf77a20988415145254c398faa7dd5ce854628ff27a94fc810599271dc1f546df WHIRLPOOL 1565704f0e0b05d0c8a71fb437e03b62789e74f6d4350ef93dc2f5d54060726fef1af818ce920b90c54fd5abe99a1d54ea950e997e51c4d89fa8958bf72c3b0f
-MISC metadata.xml 1714 SHA256 94b726fc2c6f741402a9a6139fd507a9b7b56d0920ae83a095e0e5c416250f3d SHA512 ccf8143ca9c586a5313f8e4d82ae9114ad9685def8b12729804ebd5279ce53e58685cf21257a7fe11f0a40227df5b3987550d4d8f3fde1752310eec3da27ba4f WHIRLPOOL 7c35b3a07535c0e3e9e716a394f06535c343a44dcd4ec49c28460ef337e9d920fc91210f083bf6ca098774369bec065e280ef11f296372242ea94b72b70a9fc2
+MISC metadata.xml 1340 SHA256 7e1194c34c9027273c83730261a6216ebed071fd6d43035fb53d1f4181db4686 SHA512 1c339824f2fcbe5573041699a973fd31355cae24c8d6c8e7779b82da3aef96fba3ed4f8a08e2867ef6a7b77e025253e0f762eadb2b96331e7c57cf3b25a64da4 WHIRLPOOL 5163bf739900fa9fe9b05ddcee07829911cf9b704d42bf246e38111aa90a09f5435fbd4d8058f29e171fa91e64110bb49834af1677ea55b1d2f2789a20740e58
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
index 0b42cbf4..99ebedac 100644
--- 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
@@ -1,101 +1,80 @@
-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 @@
+diff --git a/source4/torture/local/nss_tests.c b/source4/torture/local/nss_tests.c
+index 2cd6122..04f13c6 100644
+--- a/source4/torture/local/nss_tests.c
++++ b/source4/torture/local/nss_tests.c
+@@ -247,7 +247,6 @@ static bool test_getgrnam_r(struct torture_context *tctx,
+ 	return true;
+ }
+ 
+-
+ static bool test_getgrgid(struct torture_context *tctx,
+ 			  gid_t gid,
+ 			  struct group *grp_p)
+@@ -333,6 +332,7 @@ static bool test_enum_passwd(struct torture_context *tctx,
+ 	return true;
+ }
+ 
++#if HAVE_GETPWENT_R
+ static bool test_enum_r_passwd(struct torture_context *tctx,
  			       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;
--	}
--
+@@ -381,6 +381,7 @@ static bool test_enum_r_passwd(struct torture_context *tctx,
+ 
+ 	return true;
+ }
++#endif
+ 
+ static bool torture_assert_passwd_equal(struct torture_context *tctx,
+ 					const struct passwd *p1,
+@@ -432,7 +433,7 @@ static bool test_passwd_r(struct torture_context *tctx)
+ 	struct passwd *pwd, pwd1, pwd2;
+ 	size_t num_pwd;
+ 
+-	torture_assert(tctx, test_enum_r_passwd(tctx, &pwd, &num_pwd),
++	torture_assert(tctx, test_enum_passwd(tctx, &pwd, &num_pwd),
+ 						"failed to enumerate passwd");
+ 
+ 	for (i=0; i < num_pwd; i++) {
+@@ -460,7 +461,7 @@ static bool test_passwd_r_cross(struct torture_context *tctx)
+ 	struct passwd *pwd, pwd1, pwd2, pwd3, pwd4;
+ 	size_t num_pwd;
+ 
+-	torture_assert(tctx, test_enum_r_passwd(tctx, &pwd, &num_pwd),
++	torture_assert(tctx, test_enum_passwd(tctx, &pwd, &num_pwd),
+ 						"failed to enumerate passwd");
+ 
+ 	for (i=0; i < num_pwd; i++) {
+@@ -531,6 +532,7 @@ static bool test_enum_group(struct torture_context *tctx,
  	return true;
  }
  
-@@ -535,48 +493,6 @@
++#if HAVE_GETGRENT_R
+ static bool test_enum_r_group(struct torture_context *tctx,
  			      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;
--	}
--
+@@ -579,6 +581,7 @@ static bool test_enum_r_group(struct torture_context *tctx,
+ 
  	return true;
  }
++#endif
+ 
+ static bool torture_assert_group_equal(struct torture_context *tctx,
+ 				       const struct group *g1,
+@@ -635,7 +638,7 @@ static bool test_group_r(struct torture_context *tctx)
+ 	struct group *grp, grp1, grp2;
+ 	size_t num_grp;
+ 
+-	torture_assert(tctx, test_enum_r_group(tctx, &grp, &num_grp),
++	torture_assert(tctx, test_enum_group(tctx, &grp, &num_grp),
+ 					       "failed to enumerate group");
+ 
+ 	for (i=0; i < num_grp; i++) {
+@@ -663,7 +666,7 @@ static bool test_group_r_cross(struct torture_context *tctx)
+ 	struct group *grp, grp1, grp2, grp3, grp4;
+ 	size_t num_grp;
+ 
+-	torture_assert(tctx, test_enum_r_group(tctx, &grp, &num_grp),
++	torture_assert(tctx, test_enum_group(tctx, &grp, &num_grp),
+ 					       "failed to enumerate group");
  
+ 	for (i=0; i < num_grp; i++) {
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
index 36efd576..9c414545 100644
--- 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
@@ -1,6 +1,6 @@
 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
++++ samba-4.3.9/lib/replace/replace.c	2016-05-29 06:47:07.529796925 +0000
 @@ -558,43 +558,6 @@
  #endif /* HAVE_STRTOLL */
  
@@ -45,3 +45,23 @@ diff -Naur samba-4.3.9.orig/lib/replace/replace.c samba-4.3.9/lib/replace/replac
  #ifndef HAVE_SETENV
  int rep_setenv(const char *name, const char *value, int overwrite) 
  {
+diff -Naur samba-4.3.9.orig/lib/replace/replace.h samba-4.3.9/lib/replace/replace.h
+--- samba-4.3.9.orig/lib/replace/replace.h	2015-09-08 13:45:25.000000000 +0000
++++ samba-4.3.9/lib/replace/replace.h	2016-05-29 06:47:28.886795715 +0000
+@@ -371,16 +371,6 @@
+ #endif
+ #endif
+ 
+-#ifndef HAVE_STRTOULL
+-#define strtoull rep_strtoull
+-unsigned long long int rep_strtoull(const char *str, char **endptr, int base);
+-#else
+-#ifdef HAVE_BSD_STRTOLL /* yes, it's not HAVE_BSD_STRTOULL */
+-#define strtoull rep_strtoull
+-unsigned long long int rep_strtoull(const char *str, char **endptr, int base);
+-#endif
+-#endif
+-
+ #ifndef HAVE_FTRUNCATE
+ #define ftruncate rep_ftruncate
+ int rep_ftruncate(int,off_t);
diff --git a/net-fs/samba/metadata.xml b/net-fs/samba/metadata.xml
index 73d475c5..0028eeff 100644
--- a/net-fs/samba/metadata.xml
+++ b/net-fs/samba/metadata.xml
@@ -11,20 +11,14 @@
 	<use>
 		<flag name="addc">Enable Active Directory Domain Controller support</flag>
 		<flag name="ads">Enable Active Directory support</flag>
-		<flag name="swat">Enables support for swat configuration gui</flag>
 		<flag name="winbind">Enables support for the winbind auth daemon</flag>
 		<flag name="client">Enables the client part</flag>
 		<flag name="server">Enables the server part</flag>
-		<flag name="netapi">Enable building of netapi bits</flag>
 		<flag name="addns">Enable AD DNS integration</flag>
 		<flag name="aio">Enable asynchronous IO support</flag>
 		<flag name="cluster">Enable support for clustering</flag>
 		<flag name="dmapi">Enable support for DMAPI. This currently works only in combination with XFS.</flag>
-		<flag name="ldb">Enable the ldb tools</flag>
 		<flag name="quota">Enables support for user quotas</flag>
-		<flag name="smbclient">Enable smbclient tool</flag>
-		<flag name="smbsharemodes">Enable special smb share modes (?) </flag>
-		<flag name="smbtav2">Enable Samba Traffic Analyzer version 2 </flag>
 		<flag name="system-mitkrb5">Use <pkg>app-crypt/mit-krb5</pkg> instead of
 			<pkg>app-crypt/heimdal</pkg>.</flag>
 		<flag name="iprint">Enabling iPrint technology by Novell</flag>