[Pkg-samba-maint] r4208 - trunk/samba/debian/patches

idd-guest at alioth.debian.org idd-guest at alioth.debian.org
Mon Mar 18 19:43:18 UTC 2013 

Author: idd-guest
Date: 2013-03-18 19:43:17 +0000 (Mon, 18 Mar 2013)
New Revision: 4208

Modified:
   trunk/samba/debian/patches/autoconf.patch
   trunk/samba/debian/patches/bug_387266_upstream_4104_mention-kerberos-in-smbspool-manpage.patch
   trunk/samba/debian/patches/documentation.patch
   trunk/samba/debian/patches/documentation2.patch
   trunk/samba/debian/patches/fhs-filespaths.patch
   trunk/samba/debian/patches/smbclient-pager.patch
   trunk/samba/debian/patches/undefined-symbols.patch
   trunk/samba/debian/patches/usershare.patch
Log:
refresh patches for new upstream


Modified: trunk/samba/debian/patches/autoconf.patch
===================================================================
--- trunk/samba/debian/patches/autoconf.patch	2013-03-18 18:46:34 UTC (rev 4207)
+++ trunk/samba/debian/patches/autoconf.patch	2013-03-18 19:43:17 UTC (rev 4208)
@@ -25,11 +25,11 @@
  quilt refresh
  find . -name '*.rej' | xargs rm
 
-Index: experimental/source3/configure
+Index: samba/source3/configure
 ===================================================================
---- experimental.orig/source3/configure
-+++ experimental/source3/configure
-@@ -3087,6 +3087,27 @@
+--- samba.orig/source3/configure
++++ samba/source3/configure
+@@ -3147,6 +3147,27 @@
  
  
  
@@ -57,7 +57,7 @@
  echo "LIBREPLACE_LOCATION_CHECKS: END"
  
  
-@@ -5715,7 +5736,6 @@
+@@ -5772,7 +5793,6 @@
  
  
  
@@ -65,7 +65,7 @@
   cat >>confdefs.h <<\EOF
  #ifndef _XOPEN_SOURCE_EXTENDED
  #define _XOPEN_SOURCE_EXTENDED 1
-@@ -5960,7 +5980,6 @@
+@@ -6019,7 +6039,6 @@
  		# this brings in socklen_t
  
  
@@ -73,7 +73,7 @@
   cat >>confdefs.h <<\EOF
  #ifndef _XOPEN_SOURCE
  #define _XOPEN_SOURCE 600
-@@ -5969,7 +5988,6 @@
+@@ -6028,7 +6047,6 @@
  
  
  

Modified: trunk/samba/debian/patches/bug_387266_upstream_4104_mention-kerberos-in-smbspool-manpage.patch
===================================================================
--- trunk/samba/debian/patches/bug_387266_upstream_4104_mention-kerberos-in-smbspool-manpage.patch	2013-03-18 18:46:34 UTC (rev 4207)
+++ trunk/samba/debian/patches/bug_387266_upstream_4104_mention-kerberos-in-smbspool-manpage.patch	2013-03-18 19:43:17 UTC (rev 4208)
@@ -23,12 +23,12 @@
 ===================================================================
 --- samba.orig/docs/manpages/smbspool.8
 +++ samba/docs/manpages/smbspool.8
-@@ -114,7 +114,7 @@
+@@ -123,7 +123,7 @@
  .sp -1
  .IP \(bu 2.3
  .\}
--The user argument (argv[2]) contains the print user\'s name and is presently not used by smbspool\&.
-+The user argument (argv[2]) contains the print user\'s name and is presently not used by smbspool except in Kerberos environments to access the user\'s ticket cache\&.
+-The user argument (argv[2]) contains the print user\*(Aqs name and is presently not used by smbspool\&.
++The user argument (argv[2]) contains the print user\*(Aqs name and is presently not used by smbspool except in Kerberos environments to access the user\*(Aqs ticket cache\&.
  .RE
  .sp
  .RS 4

Modified: trunk/samba/debian/patches/documentation.patch
===================================================================
--- trunk/samba/debian/patches/documentation.patch	2013-03-18 18:46:34 UTC (rev 4207)
+++ trunk/samba/debian/patches/documentation.patch	2013-03-18 19:43:17 UTC (rev 4208)
@@ -2,11 +2,11 @@
 Author: Christian Perrier <bubulle at debian.org>
 Forwarded: not-needed
 
-Index: experimental/docs/manpages/swat.8
+Index: samba/docs/manpages/swat.8
 ===================================================================
---- experimental.orig/docs/manpages/swat.8
-+++ experimental/docs/manpages/swat.8
-@@ -111,86 +111,6 @@
+--- samba.orig/docs/manpages/swat.8
++++ samba/docs/manpages/swat.8
+@@ -120,86 +120,6 @@
  .RS 4
  Print a summary of command line options\&.
  .RE
@@ -73,7 +73,7 @@
 -/etc/services
 -file\&.
 -.PP
--the choice of port number isn\'t really important except that it should be less than 1024 and not currently used (using a number above 1024 presents an obscure security hole depending on the implementation details of your
+-the choice of port number isn\*(Aqt really important except that it should be less than 1024 and not currently used (using a number above 1024 presents an obscure security hole depending on the implementation details of your
 -inetd
 -daemon)\&.
 -.PP
@@ -93,7 +93,7 @@
  .SH "LAUNCHING"
  .PP
  To launch SWAT just run your favorite web browser and point it at "http://localhost:901/"\&.
-@@ -208,14 +128,11 @@
+@@ -217,14 +137,11 @@
  This file must contain a mapping of service name (e\&.g\&., swat) to service port (e\&.g\&., 901) and protocol type (e\&.g\&., tcp)\&.
  .RE
  .PP
@@ -110,11 +110,11 @@
  .RE
  .SH "WARNINGS"
  .PP
-Index: experimental/docs/manpages/nmbd.8
+Index: samba/docs/manpages/nmbd.8
 ===================================================================
---- experimental.orig/docs/manpages/nmbd.8
-+++ experimental/docs/manpages/nmbd.8
-@@ -115,10 +115,7 @@
+--- samba.orig/docs/manpages/nmbd.8
++++ samba/docs/manpages/nmbd.8
+@@ -124,10 +124,7 @@
  to answer any name queries\&. Adding a line to this file affects name NetBIOS resolution from this host
  \fIONLY\fR\&.
  .sp
@@ -126,7 +126,7 @@
  /etc/samba/lmhosts\&. See the
  \fBlmhosts\fR(5)
  man page for details on the contents of this file\&.
-@@ -187,14 +184,11 @@
+@@ -196,14 +193,11 @@
  inetd, this file must contain a mapping of service name (e\&.g\&., netbios\-ssn) to service port (e\&.g\&., 139) and protocol type (e\&.g\&., tcp)\&.
  .RE
  .PP
@@ -143,7 +143,7 @@
  .sp
  When run as a WINS server (see the
  \m[blue]\fBwins support\fR\m[]
-@@ -238,10 +232,8 @@
+@@ -247,10 +241,8 @@
  will accept SIGHUP, which will cause it to dump out its namelists into the file
  namelist\&.debug
  in the
@@ -156,11 +156,11 @@
  nmbd
  to dump out its server database in the
  log\&.nmb
-Index: experimental/docs/manpages/smbd.8
+Index: samba/docs/manpages/smbd.8
 ===================================================================
---- experimental.orig/docs/manpages/smbd.8
-+++ experimental/docs/manpages/smbd.8
-@@ -169,14 +169,11 @@
+--- samba.orig/docs/manpages/smbd.8
++++ samba/docs/manpages/smbd.8
+@@ -178,14 +178,11 @@
  inetd, this file must contain a mapping of service name (e\&.g\&., netbios\-ssn) to service port (e\&.g\&., 139) and protocol type (e\&.g\&., tcp)\&.
  .RE
  .PP
@@ -177,11 +177,11 @@
  .sp
  This file describes all the services the server is to make available to clients\&. See
  \fBsmb.conf\fR(5)
-Index: experimental/docs/manpages/lmhosts.5
+Index: samba/docs/manpages/lmhosts.5
 ===================================================================
---- experimental.orig/docs/manpages/lmhosts.5
-+++ experimental/docs/manpages/lmhosts.5
-@@ -96,10 +96,8 @@
+--- samba.orig/docs/manpages/lmhosts.5
++++ samba/docs/manpages/lmhosts.5
+@@ -105,10 +105,8 @@
  file\&.
  .SH "FILES"
  .PP
@@ -194,11 +194,11 @@
  .SH "VERSION"
  .PP
  This man page is correct for version 3 of the Samba suite\&.
-Index: experimental/docs/manpages/ntlm_auth.1
+Index: samba/docs/manpages/ntlm_auth.1
 ===================================================================
---- experimental.orig/docs/manpages/ntlm_auth.1
-+++ experimental/docs/manpages/ntlm_auth.1
-@@ -43,7 +43,7 @@
+--- samba.orig/docs/manpages/ntlm_auth.1
++++ samba/docs/manpages/ntlm_auth.1
+@@ -52,7 +52,7 @@
  Some of these commands also require access to the directory
  winbindd_privileged
  in
@@ -207,7 +207,7 @@
  winbindd_privileged
  directory\&. For security reasons, this directory should not be world\-accessable\&.
  .SH "OPTIONS"
-@@ -69,7 +69,7 @@
+@@ -78,7 +78,7 @@
  Requires access to the directory
  winbindd_privileged
  in
@@ -216,7 +216,7 @@
  http://devel\&.squid\-cache\&.org/ntlm/squid_helper_protocol\&.html\&. This protocol has been extended to allow the NTLMSSP Negotiate packet to be included as an argument to the
  YR
  command\&. (Thus avoiding loss of information in the protocol exchange)\&.
-@@ -92,7 +92,7 @@
+@@ -101,7 +101,7 @@
  Requires access to the directory
  winbindd_privileged
  in
@@ -225,11 +225,11 @@
  .RE
  .PP
  gss\-spnego\-client
-Index: experimental/docs/manpages/tdbbackup.8
+Index: samba/docs/manpages/tdbbackup.8
 ===================================================================
---- experimental.orig/docs/manpages/tdbbackup.8
-+++ experimental/docs/manpages/tdbbackup.8
-@@ -77,7 +77,7 @@
+--- samba.orig/docs/manpages/tdbbackup.8
++++ samba/docs/manpages/tdbbackup.8
+@@ -86,7 +86,7 @@
  .\}
  
  secrets\&.tdb
@@ -238,7 +238,7 @@
  .RE
  .sp
  .RS 4
-@@ -90,7 +90,7 @@
+@@ -99,7 +99,7 @@
  .\}
  
  passdb\&.tdb
@@ -247,7 +247,7 @@
  .RE
  .sp
  .RS 4
-@@ -103,7 +103,7 @@
+@@ -112,7 +112,7 @@
  .\}
  
  *\&.tdb
@@ -256,24 +256,24 @@
  .RE
  .SH "VERSION"
  .PP
-Index: experimental/docs/manpages/winbindd.8
+Index: samba/docs/manpages/winbindd.8
 ===================================================================
---- experimental.orig/docs/manpages/winbindd.8
-+++ experimental/docs/manpages/winbindd.8
-@@ -550,16 +550,16 @@
+--- samba.orig/docs/manpages/winbindd.8
++++ samba/docs/manpages/winbindd.8
+@@ -539,16 +539,16 @@
  file are owned by root\&.
  .RE
  .PP
 -$LOCKDIR/winbindd_privileged/pipe
 +/var/run/samba/winbindd_privileged/pipe
  .RS 4
- The UNIX pipe over which \'privileged\' clients communicate with the
+ The UNIX pipe over which \*(Aqprivileged\*(Aq clients communicate with the
  winbindd
  program\&. For security reasons, access to some winbindd functions \- like those needed by the
  ntlm_auth
--utility \- is restricted\&. By default, only users in the \'root\' group will get this access, however the administrator may change the group permissions on $LOCKDIR/winbindd_privileged to allow programs like \'squid\' to use ntlm_auth\&. Note that the winbind client will only attempt to connect to the winbindd daemon if both the
+-utility \- is restricted\&. By default, only users in the \*(Aqroot\*(Aq group will get this access, however the administrator may change the group permissions on $LOCKDIR/winbindd_privileged to allow programs like \*(Aqsquid\*(Aq to use ntlm_auth\&. Note that the winbind client will only attempt to connect to the winbindd daemon if both the
 -$LOCKDIR/winbindd_privileged
-+utility \- is restricted\&. By default, only users in the \'root\' group will get this access, however the administrator may change the group permissions on /var/run/samba/winbindd_privileged to allow programs like \'squid\' to use ntlm_auth\&. Note that the winbind client will only attempt to connect to the winbindd daemon if both the
++utility \- is restricted\&. By default, only users in the \*(Aqroot\*(Aq group will get this access, however the administrator may change the group permissions on /var/run/samba/winbindd_privileged to allow programs like \*(Aqsquid\*(Aq to use ntlm_auth\&. Note that the winbind client will only attempt to connect to the winbindd daemon if both the
 +/var/run/samba/winbindd_privileged
  directory and
 -$LOCKDIR/winbindd_privileged/pipe
@@ -281,7 +281,7 @@
  file are owned by root\&.
  .RE
  .PP
-@@ -568,15 +568,12 @@
+@@ -557,15 +557,12 @@
  Implementation of name service switch library\&.
  .RE
  .PP

Modified: trunk/samba/debian/patches/documentation2.patch
===================================================================
--- trunk/samba/debian/patches/documentation2.patch	2013-03-18 18:46:34 UTC (rev 4207)
+++ trunk/samba/debian/patches/documentation2.patch	2013-03-18 19:43:17 UTC (rev 4208)
@@ -207,13 +207,13 @@
 ===================================================================
 --- samba.orig/docs/manpages/nmbd.8
 +++ samba/docs/manpages/nmbd.8
-@@ -252,8 +252,7 @@
+@@ -261,8 +261,7 @@
  \fBsmbd\fR(8),
  \fBsmb.conf\fR(5),
  \fBsmbclient\fR(1),
 -\fBtestparm\fR(1),
--\fBtestprns\fR(1), and the Internet RFC\'s
-+\fBtestparm\fR(1), and the Internet RFC\'s
+-\fBtestprns\fR(1), and the Internet RFC\*(Aqs
++\fBtestparm\fR(1), and the Internet RFC\*(Aqs
  rfc1001\&.txt,
  rfc1002\&.txt\&. In addition the CIFS (formerly SMB) specification is available as a link from the Web page
  http://samba\&.org/cifs/\&.
@@ -221,7 +221,7 @@
 ===================================================================
 --- samba.orig/docs/manpages/samba.7
 +++ samba/docs/manpages/samba.7
-@@ -60,15 +60,6 @@
+@@ -69,15 +69,6 @@
  configuration file\&.
  .RE
  .PP
@@ -237,7 +237,7 @@
  \fBsmbstatus\fR(1)
  .RS 4
  The
-@@ -102,7 +93,7 @@
+@@ -111,7 +102,7 @@
  .RS 4
  The
  smbsh
@@ -250,7 +250,7 @@
 ===================================================================
 --- samba.orig/docs/manpages/smb.conf.5
 +++ samba/docs/manpages/smb.conf.5
-@@ -11021,8 +11021,7 @@
+@@ -11036,8 +11036,7 @@
  \fBnmbd\fR(8),
  \fBsmbclient\fR(1),
  \fBnmblookup\fR(1),
@@ -264,13 +264,13 @@
 ===================================================================
 --- samba.orig/docs/manpages/smbd.8
 +++ samba/docs/manpages/smbd.8
-@@ -370,8 +370,7 @@
+@@ -379,8 +379,7 @@
  \fBnmbd\fR(8),
  \fBsmb.conf\fR(5),
  \fBsmbclient\fR(1),
 -\fBtestparm\fR(1),
--\fBtestprns\fR(1), and the Internet RFC\'s
-+\fBtestparm\fR(1), and the Internet RFC\'s
+-\fBtestprns\fR(1), and the Internet RFC\*(Aqs
++\fBtestparm\fR(1), and the Internet RFC\*(Aqs
  rfc1001\&.txt,
  rfc1002\&.txt\&. In addition the CIFS (formerly SMB) specification is available as a link from the Web page
  http://samba\&.org/cifs/\&.

Modified: trunk/samba/debian/patches/fhs-filespaths.patch
===================================================================
--- trunk/samba/debian/patches/fhs-filespaths.patch	2013-03-18 18:46:34 UTC (rev 4207)
+++ trunk/samba/debian/patches/fhs-filespaths.patch	2013-03-18 19:43:17 UTC (rev 4208)
@@ -43,7 +43,7 @@
 ===================================================================
 --- samba.orig/docs/manpages/smb.conf.5
 +++ samba/docs/manpages/smb.conf.5
-@@ -7167,7 +7167,7 @@
+@@ -7176,7 +7176,7 @@
  .\}
  tdbsam
  \- The TDB based password storage backend\&. Takes a path to the TDB as an optional argument (defaults to passdb\&.tdb in the
@@ -52,7 +52,7 @@
  directory\&.
  .RE
  .sp
-@@ -8038,9 +8038,7 @@
+@@ -8047,9 +8047,7 @@
  .PP
  .RS 4
  This parameters defines the directory smbd will use for storing such files as

Modified: trunk/samba/debian/patches/smbclient-pager.patch
===================================================================
--- trunk/samba/debian/patches/smbclient-pager.patch	2013-03-18 18:46:34 UTC (rev 4207)
+++ trunk/samba/debian/patches/smbclient-pager.patch	2013-03-18 19:43:17 UTC (rev 4208)
@@ -3,11 +3,11 @@
 Bug-Debian: http://bugs.debian.org/135603
 Forwarded: not-needed
 
-Index: experimental/source3/include/local.h
+Index: samba/source3/include/local.h
 ===================================================================
---- experimental.orig/source3/include/local.h
-+++ experimental/source3/include/local.h
-@@ -127,7 +127,7 @@
+--- samba.orig/source3/include/local.h
++++ samba/source3/include/local.h
+@@ -113,7 +113,7 @@
  /* the default pager to use for the client "more" command. Users can
     override this with the PAGER environment variable */
  #ifndef PAGER

Modified: trunk/samba/debian/patches/undefined-symbols.patch
===================================================================
--- trunk/samba/debian/patches/undefined-symbols.patch	2013-03-18 18:46:34 UTC (rev 4207)
+++ trunk/samba/debian/patches/undefined-symbols.patch	2013-03-18 19:43:17 UTC (rev 4208)
@@ -9,11 +9,11 @@
 Bug-Debian: http://bugs.debian.org/281181
 Forwarded: no
 
-Index: experimental/source3/Makefile.in
+Index: samba/source3/Makefile.in
 ===================================================================
---- experimental.orig/source3/Makefile.in
-+++ experimental/source3/Makefile.in
-@@ -2281,7 +2281,7 @@
+--- samba.orig/source3/Makefile.in
++++ samba/source3/Makefile.in
+@@ -2501,7 +2501,7 @@
  
  $(LIBSMBCLIENT_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ) $(LIBSMBCLIENT_THREAD_OBJ) $(LIBSMBCLIENT_SYMS) $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
  	@echo Linking shared library $@

Modified: trunk/samba/debian/patches/usershare.patch
===================================================================
--- trunk/samba/debian/patches/usershare.patch	2013-03-18 18:46:34 UTC (rev 4207)
+++ trunk/samba/debian/patches/usershare.patch	2013-03-18 19:43:17 UTC (rev 4208)
@@ -7,11 +7,11 @@
 Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/samba/+bug/128548
 Forwarded: not-needed
 
-Index: experimental/docs/manpages/net.8
+Index: samba/docs/manpages/net.8
 ===================================================================
---- experimental.orig/docs/manpages/net.8
-+++ experimental/docs/manpages/net.8
-@@ -800,9 +800,9 @@
+--- samba.orig/docs/manpages/net.8
++++ samba/docs/manpages/net.8
+@@ -947,9 +947,9 @@
  .RE
  .SS "USERSHARE"
  .PP
@@ -23,11 +23,11 @@
  .PP
  The usershare commands are:
  .RS 4
-Index: experimental/source3/param/loadparm.c
+Index: samba/source3/param/loadparm.c
 ===================================================================
---- experimental.orig/source3/param/loadparm.c
-+++ experimental/source3/param/loadparm.c
-@@ -5461,7 +5461,7 @@
+--- samba.orig/source3/param/loadparm.c
++++ samba/source3/param/loadparm.c
+@@ -5472,7 +5472,7 @@
  	string_set(&Globals.szUsersharePath, s);
  	SAFE_FREE(s);
  	string_set(&Globals.szUsershareTemplateShare, "");

More information about the Pkg-samba-maint mailing list