Attachment 72920 Details for Bug 105857 – samba3.patch

[patch] samba3.patch

samba3.patch (text/plain), 8.37 KB, created by Marcus Alves Grando on 2006-11-26 03:50:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcus Alves Grando

Created: 2006-11-26 03:50:01 UTC

Size: 8.37 KB

patch

obsolete

>Index: samba3/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/net/samba3/Makefile,v
>retrieving revision 1.155
>diff -u -r1.155 Makefile
>--- samba3/Makefile	11 Oct 2006 20:40:34 -0000	1.155
>+++ samba3/Makefile	26 Nov 2006 03:40:12 -0000
>@@ -6,8 +6,8 @@
> #
> 
> PORTNAME=		samba
>-PORTVERSION?=		3.0.23c
>-PORTREVISION?=		2
>+PORTVERSION?=		3.0.23d
>+PORTREVISION?=		0
> PORTEPOCH?=		1
> CATEGORIES?=		net
> MASTER_SITES=		${MASTER_SITE_SAMBA}
>Index: samba3/distinfo
>===================================================================
>RCS file: /home/pcvs/ports/net/samba3/distinfo,v
>retrieving revision 1.72
>diff -u -r1.72 distinfo
>--- samba3/distinfo	4 Sep 2006 19:00:17 -0000	1.72
>+++ samba3/distinfo	26 Nov 2006 03:40:12 -0000
>@@ -1,3 +1,3 @@
>-MD5 (samba-3.0.23c.tar.gz) = 9e06d5e10f4ae84f7fafad75d1b4184c
>-SHA256 (samba-3.0.23c.tar.gz) = f333051eadf6ae88c30bd3d62eb94e9d6cf4a21912c4923d6ffddb029a42631c
>-SIZE (samba-3.0.23c.tar.gz) = 17690045
>+MD5 (samba-3.0.23d.tar.gz) = afe6923d05fed5b5ccab593c7a407cd1
>+SHA256 (samba-3.0.23d.tar.gz) = 0af21d6cfeb8186987cc5b59e41034f663124859ce30b5b98f3abed501f2cd46
>+SIZE (samba-3.0.23d.tar.gz) = 17704221
>Index: samba3/files/patch-configure.in
>===================================================================
>RCS file: samba3/files/patch-configure.in
>diff -N samba3/files/patch-configure.in
>--- samba3/files/patch-configure.in	4 Sep 2006 19:00:17 -0000	1.18
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,98 +0,0 @@
>---- configure.in.orig	Fri Jul 21 18:22:57 2006
>-+++ configure.in	Thu Aug 24 01:30:57 2006
>-@@ -242,7 +242,6 @@
>- AC_SUBST(SHELL)
>- AC_SUBST(LDSHFLAGS)
>- AC_SUBST(SONAMEFLAG)
>--AC_SUBST(NSSSONAMEVERSIONSUFFIX)
>- AC_SUBST(SHLD)
>- AC_SUBST(HOST_OS)
>- AC_SUBST(PICFLAGS)
>-@@ -1089,6 +1088,21 @@
>-    AC_DEFINE(HAVE_SIG_ATOMIC_T_TYPE,1,[Whether we have the atomic_t variable type])
>- fi
>- 
>-+AC_CACHE_CHECK([for struct sigevent type],samba_cv_struct_sigevent, [
>-+    AC_TRY_COMPILE([
>-+#include <sys/types.h>
>-+#if STDC_HEADERS
>-+#include <stdlib.h>
>-+#include <stddef.h>
>-+#endif
>-+#include <signal.h>],[struct sigevent s;],
>-+	samba_cv_struct_sigevent=yes,samba_cv_struct_sigevent=no)])
>-+if test x"$samba_cv_struct_sigevent" = x"yes"; then
>-+   AC_DEFINE(HAVE_STRUCT_SIGEVENT,1,[Whether we have the struct sigevent])
>-+   AC_CHECK_MEMBERS([struct sigevent.sigev_value.sival_ptr,struct sigevent.sigev_value.sigval_ptr], , ,
>-+	[#include <signal.h>])
>-+fi
>-+
>- AC_CACHE_CHECK([for struct timespec type],samba_cv_struct_timespec, [
>-     AC_TRY_COMPILE([
>- #include <sys/types.h>
>-@@ -1639,7 +1653,6 @@
>- HOST_OS="$host_os"
>- LDSHFLAGS="-shared"
>- SONAMEFLAG="#"
>--NSSSONAMEVERSIONSUFFIX=""
>- SHLD="\${CC} \${CFLAGS}"
>- PICFLAGS=""
>- PICSUFFIX="po"
>-@@ -1664,7 +1677,6 @@
>- 			DYNEXP="-Wl,--export-dynamic"
>- 			PICFLAGS="-fPIC"
>- 			SONAMEFLAG="-Wl,-soname="
>--			NSSSONAMEVERSIONSUFFIX=".2"
>- 			AC_DEFINE(STAT_ST_BLOCKSIZE,512)
>- 			;;
>- 		*solaris*) AC_DEFINE(SUNOS5,1,[Whether the host os is solaris])
>-@@ -1674,7 +1686,6 @@
>- 			if test "${GCC}" = "yes"; then
>- 				PICFLAGS="-fPIC"
>- 				SONAMEFLAG="-Wl,-soname="
>--				NSSSONAMEVERSIONSUFFIX=".1"
>- 				if test "${ac_cv_prog_gnu_ld}" = "yes"; then
>- 					DYNEXP="-Wl,-E"
>- 				fi
>-@@ -4882,6 +4893,7 @@
>- 	AC_MSG_RESULT(yes)
>- 	case "$host_os" in
>- 	*)
>-+		AIO_LIBS=$LIBS
>- 		AC_CHECK_LIB(rt,aio_read,[AIO_LIBS="$LIBS -lrt"])
>- 		AC_CHECK_LIB(aio,aio_read,[AIO_LIBS="$LIBS -laio"])
>- 		AC_CACHE_CHECK([for asynchronous io support],samba_cv_HAVE_AIO,[
>-@@ -5282,14 +5294,17 @@
>- WINBIND_NSS="nsswitch/libnss_winbind.$SHLIBEXT"
>- WINBIND_WINS_NSS="nsswitch/libnss_wins.$SHLIBEXT"
>- WINBIND_NSS_LDSHFLAGS=$LDSHFLAGS
>-+NSSSONAMEVERSIONSUFFIX=""
>- 
>- case "$host_os" in
>- 	*linux*)
>-+		NSSSONAMEVERSIONSUFFIX=".2"
>- 		WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_linux.o"
>- 		;;
>- 	*freebsd[[5-9]]*)
>- 		# FreeBSD winbind client is implemented as a wrapper around
>- 		# the Linux version.
>-+		NSSSONAMEVERSIONSUFFIX=".1"
>- 		WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_freebsd.o \
>- 		    nsswitch/winbind_nss_linux.o"
>- 		WINBIND_NSS="nsswitch/nss_winbind.$SHLIBEXT"
>-@@ -5304,6 +5319,7 @@
>- 	*solaris*)
>- 		# Solaris winbind client is implemented as a wrapper around
>- 		# the Linux version.
>-+		NSSSONAMEVERSIONSUFFIX=".1"
>- 		WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_solaris.o \
>- 		    nsswitch/winbind_nss_linux.o"
>- 		WINBIND_NSS_EXTRA_LIBS="-lsocket"
>-@@ -5330,6 +5346,7 @@
>- AC_SUBST(WINBIND_NSS_LDSHFLAGS)
>- AC_SUBST(WINBIND_NSS_EXTRA_OBJS)
>- AC_SUBST(WINBIND_NSS_EXTRA_LIBS)
>-+AC_SUBST(NSSSONAMEVERSIONSUFFIX)
>- 
>- # Check the setting of --with-winbind
>- 
>Index: samba3/files/patch-za
>===================================================================
>RCS file: samba3/files/patch-za
>diff -N samba3/files/patch-za
>--- samba3/files/patch-za	11 Oct 2006 20:40:35 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,129 +0,0 @@
>---- nsswitch/wb_common.c.orig	Thu Apr 20 04:29:21 2006
>-+++ nsswitch/wb_common.c	Mon Sep 25 12:49:04 2006
>-@@ -525,15 +525,11 @@
>- NSS_STATUS winbindd_send_request(int req_type, struct winbindd_request *request)
>- {
>- 	struct winbindd_request lrequest;
>--	char *env;
>--	int  value;
>--	
>-+
>- 	/* Check for our tricky environment variable */
>- 
>--	if ( (env = getenv(WINBINDD_DONT_ENV)) != NULL ) {
>--		value = atoi(env);
>--		if ( value == 1 )
>--			return NSS_STATUS_NOTFOUND;
>-+	if (winbind_env_set()) {
>-+		return NSS_STATUS_NOTFOUND;
>- 	}
>- 
>- 	if (!request) {
>-@@ -632,3 +628,14 @@
>- 	return putenv(s) != -1;
>- }
>- 
>-+BOOL winbind_env_set( void )
>-+{
>-+	char *env;
>-+	
>-+	if ((env=getenv(WINBINDD_DONT_ENV)) != NULL) {
>-+		if(strcmp(env, "1")) {
>-+			return True;
>-+		}
>-+	}
>-+	return False;
>-+}
>---- passdb/pdb_interface.c.orig	Wed Aug 23 18:16:38 2006
>-+++ passdb/pdb_interface.c	Mon Sep 25 13:10:15 2006
>-@@ -1321,27 +1321,25 @@
>- 	struct group *grp;
>- 	char **gr;
>- 	struct passwd *pwd;
>--	char *winbindd_env;
>-+	BOOL winbind_env;
>-  
>- 	*pp_uids = NULL;
>- 	*p_num = 0;
>- 
>- 	/* We only look at our own sam, so don't care about imported stuff */
>--
>--	winbindd_env = getenv(WINBINDD_DONT_ENV);
>-+	winbind_env = winbind_env_set();
>- 	winbind_off();
>- 
>- 	if ((grp = getgrgid(gid)) == NULL) {
>- 		/* allow winbindd lookups, but only if they weren't already disabled */
>--		if ( !(winbindd_env && strequal(winbindd_env, "1")) ) {
>-+		if (!winbind_env) {
>- 			winbind_on();
>- 		}
>--
>-+		
>- 		return False;
>- 	}
>- 
>- 	/* Primary group members */
>--
>- 	setpwent();
>- 	while ((pwd = getpwent()) != NULL) {
>- 		if (pwd->pw_gid == gid) {
>-@@ -1352,7 +1350,6 @@
>- 	endpwent();
>- 
>- 	/* Secondary group members */
>--
>- 	for (gr = grp->gr_mem; (*gr != NULL) && ((*gr)[0] != '\0'); gr += 1) {
>- 		struct passwd *pw = getpwnam(*gr);
>- 
>-@@ -1362,11 +1359,10 @@
>- 	}
>- 
>- 	/* allow winbindd lookups, but only if they weren't already disabled */
>--
>--	if ( !(winbindd_env && strequal(winbindd_env, "1")) ) {
>-+	if (!winbind_env) {
>- 		winbind_on();
>- 	}
>--
>-+	
>- 	return True;
>- }
>- 
>---- lib/system_smbd.c.orig	Thu Apr 20 04:29:23 2006
>-+++ lib/system_smbd.c	Mon Sep 25 12:53:54 2006
>-@@ -120,19 +120,15 @@
>- static int sys_getgrouplist(const char *user, gid_t gid, gid_t *groups, int *grpcnt)
>- {
>- 	int retval;
>--	char *winbindd_env;
>-+	BOOL winbind_env;
>- 
>- 	DEBUG(10,("sys_getgrouplist: user [%s]\n", user));
>- 
>--	/* Save the winbindd state and not just blindly turn it back on */
>--
>--	winbindd_env = getenv(WINBINDD_DONT_ENV);
>--	
>- 	/* This is only ever called for Unix users, remote memberships are
>- 	 * always determined by the info3 coming back from auth3 or the
>- 	 * PAC. */
>--
>--	winbind_off() ;
>-+	winbind_env = winbind_env_set();
>-+	winbind_off();
>- 
>- #ifdef HAVE_GETGROUPLIST
>- 	retval = getgrouplist(user, gid, groups, grpcnt);
>-@@ -142,9 +138,8 @@
>- 	unbecome_root();
>- #endif
>- 
>--	/* allow winbindd lookups , but only if they were not already disabled */
>--
>--	if ( !(winbindd_env && strequal(winbindd_env, "1")) ) {
>-+	/* allow winbindd lookups, but only if they were not already disabled */
>-+	if (!winbind_env) {
>- 		winbind_on();
>- 	}
>- 
>Index: samba-nmblookup/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/net/samba-nmblookup/Makefile,v
>retrieving revision 1.1
>diff -u -r1.1 Makefile
>--- samba-nmblookup/Makefile	20 Dec 2005 20:46:38 -0000	1.1
>+++ samba-nmblookup/Makefile	26 Nov 2006 03:40:12 -0000
>@@ -5,7 +5,7 @@
> # $FreeBSD: ports/net/samba-nmblookup/Makefile,v 1.1 2005/12/20 20:46:38 edwin Exp $
> #
> 
>-PORTREVISION=		1
>+PORTREVISION=		0
> PORTEPOCH=		0
> PKGNAMESUFFIX=		-nmblookup

Actions: View | Diff

Attachments on bug 105857: 72920 | 72921