[gentoo-commits] gentoo-x86 commit in net-fs/samba/files: samba-init 3.0.x-libdirsymlink.patch digest-samba-3.0.25c 3.0.25c-py_smp.patch 3.0.25c-lazyldflags.patch samba-xinetd

[Tiziano Mueller (dev-zero)]

dev-zero    07/09/07 21:07:40

  Modified:             samba-init
  Added:                3.0.x-libdirsymlink.patch digest-samba-3.0.25c
                        3.0.25c-py_smp.patch 3.0.25c-lazyldflags.patch
                        samba-xinetd
  Log:
  Version bump (bug #178639, thanks to Johan Andersson for the py_smb-patch). Added ipv6 support (bug #187905). Replaced 'kerberos' with 'ads' USE flag (bug #181558). Added possibility to start daemons seperately (bug #112188). Fixed python-handling (bug #177545).
  (Portage version: 2.1.3.7)

Revision  Changes    Path
1.15                 net-fs/samba/files/samba-init

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/samba/files/samba-init?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/samba/files/samba-init?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/samba/files/samba-init?r1=1.14&r2=1.15

Index: samba-init
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-fs/samba/files/samba-init,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- samba-init	9 Apr 2007 09:40:15 -0000	1.14
+++ samba-init	7 Sep 2007 21:07:39 -0000	1.15
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/samba-init,v 1.14 2007/04/09 09:40:15 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/samba-init,v 1.15 2007/09/07 21:07:39 dev-zero Exp $
 
 opts="reload"
 
@@ -11,6 +11,11 @@
 	use cupsd
 }
 
+DAEMONNAME="${SVCNAME##samba.}"
+if [[ -n ${DAEMONNAME} ]] ; then
+	daemon_list=${DAEMONNAME}
+fi
+
 signal_do() {
 	local signal="$1"
 	[ -z "${signal}" ] && return 0



1.1                  net-fs/samba/files/3.0.x-libdirsymlink.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/samba/files/3.0.x-libdirsymlink.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/samba/files/3.0.x-libdirsymlink.patch?rev=1.1&content-type=text/plain

Index: 3.0.x-libdirsymlink.patch
===================================================================
--- source/configure.in.old	2005-08-19 19:16:29.000000000 +0200
+++ source/configure.in	2005-08-31 16:19:41.000000000 +0200
@@ -1911,8 +1911,8 @@
 dnl library directory is there and check the ABI directory first (which
 dnl should be harmless on other systems.
 dnl For IA64 HPUX systems, the libs are located in lib/hpux32 instead of lib.
-    for l in "lib32" "lib" "lib/hpux32"; do
-        if test -d "$i/$l" ; then
+    for l in "lib" "lib/hpux32"; do
+        if test -d "$i/$l" -o -L "$i/$l"; then
                 LDFLAGS="$save_LDFLAGS -L$i/$l"
                 LIBS=
                 export LDFLAGS LIBS CPPFLAGS



1.1                  net-fs/samba/files/digest-samba-3.0.25c

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/samba/files/digest-samba-3.0.25c?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/samba/files/digest-samba-3.0.25c?rev=1.1&content-type=text/plain

Index: digest-samba-3.0.25c
===================================================================
MD5 87950694270b86cbc1b2074cb53dd1aa samba-3.0.25c.tar.gz 18178029
RMD160 7c8de2c27144b2b23e7c3f4a8fceb35bddfd571b samba-3.0.25c.tar.gz 18178029
SHA256 113144b8a035b1be289eaed3a12a3e8138e47f21fd79c9cc7bbf4f7eabc2870c samba-3.0.25c.tar.gz 18178029



1.1                  net-fs/samba/files/3.0.25c-py_smp.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/samba/files/3.0.25c-py_smp.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/samba/files/3.0.25c-py_smp.patch?rev=1.1&content-type=text/plain

Index: 3.0.25c-py_smp.patch
===================================================================
diff -ruN samba-3.0.25c.orig/source/python/py_smb.c samba-3.0.25c/source/python/py_smb.c
--- samba-3.0.25c.orig/source/python/py_smb.c	2007-03-01 05:53:57.000000000 +0100
+++ samba-3.0.25c/source/python/py_smb.c	2007-08-26 13:32:11.000000000 +0200
@@ -39,6 +39,7 @@
 	struct cli_state *cli;
 	char *server;
 	struct in_addr ip;
+	NTSTATUS status;
 
 	if (!PyArg_ParseTupleAndKeywords(args, kw, "s", kwlist, &server))
 		return NULL;
@@ -48,7 +49,8 @@
 
 	ZERO_STRUCT(ip);
 
-	if (!cli_connect(cli, server, &ip))
+	status = cli_connect(cli, server, &ip);
+	if (!NT_STATUS_IS_OK(status))
 		return NULL;
 
 	return new_cli_state_object(cli);
@@ -59,7 +61,7 @@
 {
 	cli_state_object *cli = (cli_state_object *)self;
 	static char *kwlist[] = { "called", "calling", NULL };
-	char *calling_name = NULL, *called_name;
+	const char *calling_name = NULL, *called_name;
 	struct nmb_name calling, called;
 	BOOL result;
 



1.1                  net-fs/samba/files/3.0.25c-lazyldflags.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/samba/files/3.0.25c-lazyldflags.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/samba/files/3.0.25c-lazyldflags.patch?rev=1.1&content-type=text/plain

Index: 3.0.25c-lazyldflags.patch
===================================================================
diff -Naur samba-3.0.25c.orig/source/Makefile.in samba-3.0.25c/source/Makefile.in
--- samba-3.0.25c.orig/source/Makefile.in	2007-09-01 09:14:54.000000000 +0200
+++ samba-3.0.25c/source/Makefile.in	2007-09-01 09:17:08.000000000 +0200
@@ -87,6 +87,8 @@
 # The permissions to give the executables
 INSTALLPERMS = 0755
 
+LAZYLDFLAGS=-Wl,-z,now
+
 # set these to where to find various files
 # These can be overridden by command line switches (see smbd(8))
 # or in smb.conf (see smb.conf(5))
@@ -1008,19 +1010,19 @@
 
 bin/smbmnt@EXEEXT@: proto_exists $(MNT_OBJ) bin/.dummy
 	@echo Linking $@
-	@$(CC) $(FLAGS) -o $@ $(MNT_OBJ) $(DYNEXP) $(LDFLAGS)
+	@$(CC) $(FLAGS) -o $@ $(MNT_OBJ) $(DYNEXP) $(LDFLAGS) $(LAZYLDFLAGS)
 
 bin/smbumount@EXEEXT@: proto_exists $(UMOUNT_OBJ) bin/.dummy
 	@echo Linking $@
-	@$(CC) $(FLAGS) -o $@ $(UMOUNT_OBJ) $(DYNEXP) $(LDFLAGS)
+	@$(CC) $(FLAGS) -o $@ $(UMOUNT_OBJ) $(DYNEXP) $(LDFLAGS) $(LAZYLDFLAGS)
 
 bin/mount.cifs@EXEEXT@: $(CIFS_MOUNT_OBJ) bin/.dummy
 	@echo Linking $@
-	@$(CC) $(FLAGS) -o $@ $(CIFS_MOUNT_OBJ) $(DYNEXP) $(LDFLAGS)
+	@$(CC) $(FLAGS) -o $@ $(CIFS_MOUNT_OBJ) $(DYNEXP) $(LDFLAGS) $(LAZYLDFLAGS)
 
 bin/umount.cifs@EXEEXT@: $(CIFS_UMOUNT_OBJ) bin/.dummy
 	@echo Linking $@
-	@$(CC) $(FLAGS) -o $@ $(CIFS_UMOUNT_OBJ) $(DYNEXP) $(LDFLAGS)
+	@$(CC) $(FLAGS) -o $@ $(CIFS_UMOUNT_OBJ) $(DYNEXP) $(LDFLAGS) $(LAZYLDFLAGS)
 
 bin/testparm@EXEEXT@: proto_exists $(TESTPARM_OBJ) @BUILD_POPT@ bin/.dummy
 	@echo Linking $@



1.1                  net-fs/samba/files/samba-xinetd

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/samba/files/samba-xinetd?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/samba/files/samba-xinetd?rev=1.1&content-type=text/plain

Index: samba-xinetd
===================================================================
# Samba smb service with ipv6 support (for samba3)
# Remember to stop samba service starting smbd before you activate this.
service microsoft-ds
{
	flags		= REUSE IPV6
	socket_type	= stream
	wait		= no
	user		= root
	server		= /usr/sbin/smbd
	log_on_failure	+= USERID
	disable		= yes
}



-- 
gentoo-commits@g.o mailing list