Update debian-sarge for 3.0.23
authoridra <idra@0c0555d6-39d7-0310-84fc-f1cc0bd64818>
Sat, 15 Jul 2006 16:51:23 +0000 (16:51 +0000)
committeridra <idra@0c0555d6-39d7-0310-84fc-f1cc0bd64818>
Sat, 15 Jul 2006 16:51:23 +0000 (16:51 +0000)
git-svn-id: svn+ssh://svn.samba.org/data/svn/samba/branches/SAMBA_3_0@17063 0c0555d6-39d7-0310-84fc-f1cc0bd64818

packaging/Debian/debian-sarge/changelog
packaging/Debian/debian-sarge/patches/fhs.patch
packaging/Debian/debian-sarge/patches/make-distclean.patch
packaging/Debian/debian-sarge/patches/samba.patch
packaging/Debian/debian-sarge/rules
packaging/Debian/debian-sarge/samba-common.files

index 9164a73..bd66900 100644 (file)
@@ -1,3 +1,15 @@
+samba (3.0.23-1) stable; urgency=low
+
+  * samba 3.0.23 Samba Team Release
+
+ -- Simo Sorce <idra@samba.org>  Sat, 15 Jul 2006 10:01:30 -0400
+
+samba (3.0.22-1) stable; urgency=high
+
+  * samba 3.0.22 Samba Team Release
+
+ -- Simo Sorce <idra@samba.org>  Fri, 07 Apr 2006 15:45:30 -0400
+
 samba (3.0.21b-1) stable; urgency=high
 
   * samba 3.0.21b Samba Team Release
index 957ce7f..e152ec8 100644 (file)
@@ -28,11 +28,11 @@ diff -uNr samba-3.0.10.orig/source/Makefile.in samba-3.0.10/source/Makefile.in
        @$(SHELL) $(srcdir)/script/installscripts.sh $(INSTALLPERMS) $(DESTDIR)$(BINDIR) $(SCRIPTS)
  
  installdat: installdirs
--      @$(SHELL) $(srcdir)/script/installdat.sh $(DESTDIR)$(LIBDIR) $(srcdir)
-+      @$(SHELL) $(srcdir)/script/installdat.sh $(DESTDIR)$(CODEPAGEDIR) $(srcdir)
+-      @$(SHELL) $(srcdir)/script/installdat.sh $(DESTDIR) $(LIBDIR) $(srcdir)
++      @$(SHELL) $(srcdir)/script/installdat.sh $(DESTDIR) $(CODEPAGEDIR) $(srcdir)
  
  installmsg: installdirs
-       @$(SHELL) $(srcdir)/script/installmsg.sh $(DESTDIR)$(LIBDIR) $(srcdir)
+       @$(SHELL) $(srcdir)/script/installmsg.sh $(DESTDIR) $(LIBDIR) $(srcdir)
 diff -uNr samba-3.0.10.orig/source/configure.in samba-3.0.10/source/configure.in
 --- samba-3.0.10.orig/source/configure.in      2004-12-17 03:50:08.000000000 -0800
 +++ samba-3.0.10/source/configure.in   2004-12-17 03:55:29.000000000 -0800
@@ -57,9 +57,9 @@ diff -uNr samba-3.0.10.orig/source/configure.in samba-3.0.10/source/configure.in
    esac])
  
 @@ -201,6 +205,9 @@
- AC_SUBST(swatdir)
- AC_SUBST(bindir)
  AC_SUBST(sbindir)
+ AC_SUBST(rootsbindir)
+ AC_SUBST(pammodulesdir)
 +AC_SUBST(codepagedir)
 +AC_SUBST(statedir)
 +AC_SUBST(cachedir)
@@ -85,8 +85,8 @@ diff -uNr samba-3.0.10.orig/source/dynconfig.c samba-3.0.10/source/dynconfig.c
   * @sa lib_path() to get the path to a file inside the LIBDIR.
 @@ -70,3 +77,27 @@
  
const pstring dyn_SMB_PASSWD_FILE = SMB_PASSWD_FILE;
const pstring dyn_PRIVATE_DIR = PRIVATE_DIR;
+ pstring dyn_SMB_PASSWD_FILE = SMB_PASSWD_FILE;
+ pstring dyn_PRIVATE_DIR = PRIVATE_DIR;
 +
 +
 +/* In non-FHS mode, these should be configurable using 'lock dir =';
@@ -114,10 +114,11 @@ diff -uNr samba-3.0.10.orig/source/dynconfig.c samba-3.0.10/source/dynconfig.c
 diff -uNr samba-3.0.10.orig/source/groupdb/mapping.c samba-3.0.10/source/groupdb/mapping.c
 --- samba-3.0.10.orig/source/groupdb/mapping.c 2004-12-17 03:50:08.000000000 -0800
 +++ samba-3.0.10/source/groupdb/mapping.c      2004-12-17 03:55:29.000000000 -0800
-@@ -140,7 +140,7 @@
+@@ -140,8 +140,8 @@
        
        if (tdb)
                return True;
+               
 -      tdb = tdb_open_log(lock_path("group_mapping.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
 +      tdb = tdb_open_log(state_path("group_mapping.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
        if (!tdb) {
@@ -131,11 +132,11 @@ diff -uNr samba-3.0.10.orig/source/include/dynconfig.h samba-3.0.10/source/inclu
  extern pstring dyn_LOGFILEBASE, dyn_LMHOSTSFILE;
  extern pstring dyn_LIBDIR;
 +extern pstring dyn_CODEPAGEDIR;
- extern const fstring dyn_SHLIBEXT;
- extern const pstring dyn_LOCKDIR; 
- extern const pstring dyn_PIDDIR;
- extern const pstring dyn_SMB_PASSWD_FILE;
- extern const pstring dyn_PRIVATE_DIR;
+ extern fstring dyn_SHLIBEXT;
+ extern pstring dyn_LOCKDIR;
+ extern pstring dyn_PIDDIR;
+ extern pstring dyn_SMB_PASSWD_FILE;
+ extern pstring dyn_PRIVATE_DIR;
 +
 +char *dyn_STATEDIR(void);
 +char *dyn_CACHEDIR(void);
@@ -231,17 +232,20 @@ diff -uNr samba-3.0.10.orig/source/lib/util.c samba-3.0.10/source/lib/util.c
 diff -uNr samba-3.0.10.orig/source/lib/util_unistr.c samba-3.0.10/source/lib/util_unistr.c
 --- samba-3.0.10.orig/source/lib/util_unistr.c 2004-12-17 03:50:08.000000000 -0800
 +++ samba-3.0.10/source/lib/util_unistr.c      2004-12-17 03:55:29.000000000 -0800
-@@ -54,8 +54,8 @@
-       if (initialised) return;
+@@ -54,11 +54,11 @@
+       }
        initialised = 1;
  
 -      upcase_table = map_file(lib_path("upcase.dat"), 0x20000);
--      lowcase_table = map_file(lib_path("lowcase.dat"), 0x20000);
 +      upcase_table = map_file(data_path("upcase.dat"), 0x20000);
+       upcase_table_use_unmap = ( upcase_table != NULL );
+-      lowcase_table = map_file(lib_path("lowcase.dat"), 0x20000);
 +      lowcase_table = map_file(data_path("lowcase.dat"), 0x20000);
+       lowcase_table_use_unmap = ( lowcase_table != NULL );
  
-       /* we would like Samba to limp along even if these tables are
-          not available */
+ #ifdef HAVE_SETLOCALE
+       /* Get the name of the current locale.  */
 @@ -161,7 +161,7 @@
                return;
        }
@@ -305,18 +309,18 @@ diff -uNr samba-3.0.10.orig/source/nmbd/nmbd_winsserver.c samba-3.0.10/source/nm
        all_string_sub(fname,"//", "/", 0);
        slprintf(fnamenew,sizeof(fnamenew)-1,"%s.%u", fname, (unsigned int)sys_getpid());
  
-diff -uNr samba-3.0.10.orig/source/nsswitch/winbindd_cache.c samba-3.0.10/source/nsswitch/winbindd_cache.c
---- samba-3.0.10.orig/source/nsswitch/winbindd_cache.c 2004-12-17 03:50:09.000000000 -0800
-+++ samba-3.0.10/source/nsswitch/winbindd_cache.c      2004-12-17 03:55:30.000000000 -0800
+diff -uNr samba-3.0.23.orig/source/nsswitch/winbindd_cache.c samba-3.0.23/source/nsswitch/winbindd_cache.c
+--- samba-3.0.23.orig/source/nsswitch/winbindd_cache.c 2006-07-15 09:50:09.000000000 -0400
++++ samba-3.0.23/source/nsswitch/winbindd_cache.c      2006-07-15 09:55:30.000000000 -0400
 @@ -57,7 +57,7 @@
-       if (opt_nocache)
-               return;
+               return True;
  
--      wcache->tdb = tdb_open_log(lock_path("winbindd_cache.tdb"), 5000, 
-+      wcache->tdb = tdb_open_log(cache_path("winbindd_cache.tdb"), 5000, 
-                                  TDB_CLEAR_IF_FIRST, O_RDWR|O_CREAT, 0600);
+       /* when working offline we must not clear the cache on restart */
+-      wcache->tdb = tdb_open_log(lock_path("winbindd_cache.tdb"),
++      wcache->tdb = tdb_open_log(cache_path("winbindd_cache.tdb"),
+                               WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE, 
+                               TDB_DEFAULT /*TDB_CLEAR_IF_FIRST*/, O_RDWR|O_CREAT, 0600);
  
-       if (!wcache->tdb) {
 diff -uNr samba-3.0.10.orig/source/nsswitch/winbindd_util.c samba-3.0.10/source/nsswitch/winbindd_util.c
 --- samba-3.0.10.orig/source/nsswitch/winbindd_util.c  2004-12-17 03:50:09.000000000 -0800
 +++ samba-3.0.10/source/nsswitch/winbindd_util.c       2004-12-17 03:55:30.000000000 -0800
@@ -356,21 +360,18 @@ diff -uNr samba-3.0.10.orig/source/param/loadparm.c samba-3.0.10/source/param/lo
        {"pid directory", P_STRING, P_GLOBAL, &Globals.szPidDir, NULL, NULL, FLAG_ADVANCED}, 
  #ifdef WITH_UTMP
        {"utmp directory", P_STRING, P_GLOBAL, &Globals.szUtmpDir, NULL, NULL, FLAG_ADVANCED}, 
-diff -uNr samba-3.0.10.orig/source/passdb/pdb_tdb.c samba-3.0.10/source/passdb/pdb_tdb.c
---- samba-3.0.10.orig/source/passdb/pdb_tdb.c  2004-12-17 03:50:09.000000000 -0800
-+++ samba-3.0.10/source/passdb/pdb_tdb.c       2004-12-17 03:55:30.000000000 -0800
-@@ -734,10 +734,7 @@
-       if (location) {
-               tdb_state->tdbsam_location = talloc_strdup(pdb_context->mem_ctx, location);
-       } else {
--              pstring tdbfile;
--              get_private_directory(tdbfile);
--              pstrcat(tdbfile, "/");
--              pstrcat(tdbfile, PASSDB_FILE_NAME);
-+              char *tdbfile = state_path(PASSDB_FILE_NAME);
-               tdb_state->tdbsam_location = talloc_strdup(pdb_context->mem_ctx, tdbfile);
+diff -uNr samba-3.0.23.orig/source/passdb/pdb_tdb.c samba-3.0.23/source/passdb/pdb_tdb.c
+--- samba-3.0.23.orig/source/passdb/pdb_tdb.c  2006-07-15 09:50:09.000000000 -0400
++++ samba-3.0.23/source/passdb/pdb_tdb.c       2006-07-15 09:55:30.000000000 -0400
+@@ -1598,7 +1598,7 @@
+       /* save the path for later */
+                          
+       if ( !location ) {
+-              pstr_sprintf( tdbfile, "%s/%s", lp_private_dir(), PASSDB_FILE_NAME );
++              pstr_sprintf( tdbfile, "%s", state_path(PASSDB_FILE_NAME) );
+               pfile = tdbfile;
        }
+       pstrcpy( tdbsam_filename, pfile );
 diff -uNr samba-3.0.10.orig/source/passdb/secrets.c samba-3.0.10/source/passdb/secrets.c
 --- samba-3.0.10.orig/source/passdb/secrets.c  2004-12-17 03:50:09.000000000 -0800
 +++ samba-3.0.10/source/passdb/secrets.c       2004-12-17 03:55:30.000000000 -0800
@@ -481,13 +482,13 @@ diff -uNr samba-3.0.21.orig/source/registry/reg_db.c samba-3.0.21/source/registr
        }
  
        unbecome_root();
-diff -uNr samba-3.0.10.orig/source/rpc_server/srv_srvsvc_nt.c samba-3.0.10/source/rpc_server/srv_srvsvc_nt.c
---- samba-3.0.10.orig/source/rpc_server/srv_srvsvc_nt.c        2004-12-17 03:50:09.000000000 -0800
-+++ samba-3.0.10/source/rpc_server/srv_srvsvc_nt.c     2004-12-17 03:55:31.000000000 -0800
-@@ -133,10 +133,10 @@
-  
-       if (share_tdb && local_pid == sys_getpid())
+diff -uNr samba-3.0.23.orig/source/lib/sharesec.c samba-3.0.23/source/lib/sharesec.c
+--- samba-3.0.23.orig/source/lib/sharesec.c    2006-07-15 09:50:09.000000000 -0400
++++ samba-3.0.23/source/lib/sharesec.c 2006-07-15 09:55:31.000000000 -0400
+@@ -47,10 +47,10 @@
                return True;
+       }
 -      share_tdb = tdb_open_log(lock_path("share_info.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
 +      share_tdb = tdb_open_log(state_path("share_info.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
        if (!share_tdb) {
@@ -509,21 +510,21 @@ diff -uNr samba-3.0.10.orig/source/sam/idmap_tdb.c samba-3.0.10/source/sam/idmap
        if (!tdbfile) {
                DEBUG(0, ("idmap_init: out of memory!\n"));
                return NT_STATUS_NO_MEMORY;
-diff -uNr samba-3.0.10.orig/source/smbd/lanman.c samba-3.0.10/source/smbd/lanman.c
---- samba-3.0.10.orig/source/smbd/lanman.c     2004-12-17 03:50:10.000000000 -0800
-+++ samba-3.0.10/source/smbd/lanman.c  2004-12-17 03:55:31.000000000 -0800
-@@ -969,9 +969,9 @@
-   BOOL local_list_only;
-   int i;
--  lines = file_lines_load(lock_path(SERVER_LIST), NULL);
-+  lines = file_lines_load(cache_path(SERVER_LIST), NULL);
-   if (!lines) {
--    DEBUG(4,("Can't open %s - %s\n",lock_path(SERVER_LIST),strerror(errno)));
-+    DEBUG(4,("Can't open %s - %s\n",cache_path(SERVER_LIST),strerror(errno)));
-     return(0);
-   }
+diff -uNr samba-3.0.23.orig/source/smbd/lanman.c samba-3.0.23/source/smbd/lanman.c
+--- samba-3.0.23.orig/source/smbd/lanman.c     2006-07-15 09:50:10.000000000 -0400
++++ samba-3.0.23/source/smbd/lanman.c  2006-07-15 09:55:31.000000000 -0400
+@@ -1052,9 +1052,9 @@
+       BOOL local_list_only;
+       int i;
+-      lines = file_lines_load(lock_path(SERVER_LIST), NULL, 0);
++      lines = file_lines_load(cache_path(SERVER_LIST), NULL, 0);
+       if (!lines) {
+-              DEBUG(4,("Can't open %s - %s\n",lock_path(SERVER_LIST),strerror(errno)));
++              DEBUG(4,("Can't open %s - %s\n",cache_path(SERVER_LIST),strerror(errno)));
+               return 0;
+       }
+
 diff -uNr samba-3.0.10.orig/source/utils/net_idmap.c samba-3.0.10/source/utils/net_idmap.c
 --- samba-3.0.10.orig/source/utils/net_idmap.c 2004-12-17 03:50:10.000000000 -0800
 +++ samba-3.0.10/source/utils/net_idmap.c      2004-12-17 03:55:32.000000000 -0800
@@ -536,27 +537,6 @@ diff -uNr samba-3.0.10.orig/source/utils/net_idmap.c samba-3.0.10/source/utils/n
        if (!tdbfile) {
                DEBUG(0, ("idmap_init: out of memory!\n"));
                return NT_STATUS_NO_MEMORY;
-diff -uNr samba-3.0.10.orig/source/wrepld/process.c samba-3.0.10/source/wrepld/process.c
---- samba-3.0.10.orig/source/wrepld/process.c  2004-12-17 03:50:10.000000000 -0800
-+++ samba-3.0.10/source/wrepld/process.c       2004-12-17 03:55:32.000000000 -0800
-@@ -197,7 +197,7 @@
- {
-       TDB_CONTEXT *tdb;
--      tdb = tdb_open_log(lock_path(WINS_LIST), 0, TDB_DEFAULT, O_RDONLY, 0600);
-+      tdb = tdb_open_log(state_path(WINS_LIST), 0, TDB_DEFAULT, O_RDONLY, 0600);
-       if (!tdb) {
-               DEBUG(2,("get_our_last_id: Can't open wins database file %s. Error was %s\n", WINS_LIST, strerror(errno) ));
-               return;
-@@ -489,7 +489,7 @@
-               }
--      tdb = tdb_open_log(lock_path(WINS_LIST), 0, TDB_DEFAULT, O_RDONLY, 0600);
-+      tdb = tdb_open_log(state_path(WINS_LIST), 0, TDB_DEFAULT, O_RDONLY, 0600);
-       if (!tdb) {
-               DEBUG(2,("send_entry_request: Can't open wins database file %s. Error was %s\n", WINS_LIST, strerror(errno) ));
-               return;
 diff -uNr samba-3.0.11.orig/source/printing/nt_printing.c samba-3.0.11/source/printing/nt_printing.c
 --- samba-3.0.11.orig/source/printing/nt_printing.c    2005-03-23 02:51:08.000000000 -0800
 +++ samba-3.0.11/source/printing/nt_printing.c 2005-03-23 02:54:33.000000000 -0800
index e859575..9c9eb6c 100644 (file)
@@ -9,14 +9,6 @@ diff -uNr samba-3.0.7.orig/source/Makefile.in samba-3.0.7/source/Makefile.in
  
  # revert to the previously installed version
  revert:
-@@ -1437,6 +1438,7 @@
-       @rm -f include/proto.h include/build_env.h  include/wrepld_proto.h \
-               nsswitch/winbindd_proto.h web/swat_proto.h \
-               client/client_proto.h utils/net_proto.h \
-+              utils/ntlm_auth_proto.h \
-               smbd/build_options.c
- MKPROTO_SH = $(srcdir)/script/mkproto.sh
 @@ -1512,6 +1514,7 @@
  
  distclean: realclean
index f4c8ca8..8e77cfb 100644 (file)
@@ -39,17 +39,18 @@ diff -uNr samba-3.0.0beta1.orig/source/web/diagnose.c samba-3.0.0beta1/source/we
        if (!cli_initialise(&cli))
                return False;
  
---- samba-3.0.1/source/script/installbin.sh.orig       2003-10-10 14:08:36.000000000 -0400
-+++ samba-3.0.1/source/script/installbin.sh    2003-12-17 10:51:45.000000000 -0500
-@@ -24,12 +24,14 @@
-  chmod $INSTALLPERMS $BINDIR/$p2
+--- samba-3.0.23/source/script/installbin.sh.in.orig   2006-07-15 09:08:36.000000000 -0400
++++ samba-3.0.23/source/script/installbin.sh.in        2006-07-15 09:51:45.000000000 -0400
+@@ -21,13 +21,14 @@
+  chmod $INSTALLPERMS $DESTDIR/$BINDIR/$p2
  
   # this is a special case, mount needs this in a specific location
 - if [ $p2 = smbmount ]; then
--   if [ ! -d $DESTDIR/sbin ]; then
--      mkdir $DESTDIR/sbin
--   fi 
--   ln -sf $BINDIR/$p2 $DESTDIR/sbin/mount.smbfs
+-   if [ ! -d $DESTDIR/@rootsbindir@ ]; then
+-      mkdir $DESTDIR/@rootsbindir@
+-   fi
+-   echo "Creating sym link $DESTDIR/@rootsbindir@/mount.smbfs to $BINDIR/$p2 "
+-   ln -sf $BINDIR/$p2 $DESTDIR/@rootsbindir@/mount.smbfs
 - fi
 +# Commented out for the Debian Samba package. We take care of this
 +# important symlink in debian/rules. (peloy@debian.org)
index eb6e71c..5a0f5e6 100755 (executable)
@@ -76,7 +76,8 @@ ifeq ($(DEB_HOST_GNU_SYSTEM),linux)
   conf_args += \
                --with-smbmount \
                --with-acl-support \
-               --with-quotas
+               --with-quotas \
+               --with-cifsmount
   mount_cifs   = yes
   smbfs                = yes
 else
@@ -120,9 +121,6 @@ build-stamp:
 
        $(MAKE) -C source headers
        $(MAKE) -C source all nsswitch/libnss_wins.so python_ext
-ifeq ($(mount_cifs),yes)
-       $(MAKE) -C source client/mount.cifs
-endif
 
        touch build-stamp
 
@@ -138,7 +136,7 @@ clean: unpatch
 
        # Delete stuff left after a build that is not deleted by 'make clean'
        rm -f source/bin/wbinfo source/bin/winbindd source/bin/debug2html \
-               source/bin/libsmbclient.a source/client/mount.cifs \
+               source/bin/libsmbclient.a source/bin/mount.cifs \
                source/include/stamp-h
 
        sed -e "s/@libacl@/`type-handling any linux-gnu`/g" \
@@ -179,14 +177,11 @@ install: build
        install -m 0755 debian/mksmbpasswd.awk $(DESTDIR)/usr/sbin/mksmbpasswd
 
        # Install winbind stuff not installed by 'make install'
-       install -m 0644 source/nsswitch/libnss_winbind.so \
-               $(DESTDIR)/lib/libnss_winbind.so.2
-       install -m 0644 source/bin/pam_winbind.so \
-               $(DESTDIR)/lib/security/
+       install -m 0644 source/bin/pam_winbind.so $(DESTDIR)/lib/security/
+       install -m 0644 source/nsswitch/libnss_winbind.so $(DESTDIR)/lib/libnss_winbind.so.2
 
        # Install libnss_wins.so, which is not installed by 'make install' either.
-       install -m 0644 source/nsswitch/libnss_wins.so \
-               $(DESTDIR)/lib/libnss_wins.so.2
+       install -m 0644 source/nsswitch/libnss_wins.so  $(DESTDIR)/lib/libnss_wins.so.2
 
        # pam_smbpass.so isn't being installed by 'make install'.
        #       We'll move it here to $(DESTDIR)/lib/security/ and then
@@ -208,7 +203,7 @@ endif
 
 ifeq ($(mount_cifs),yes)
        # Install mount.cifs and its man page
-       install -m 04755 source/client/mount.cifs $(DESTDIR)/sbin/
+       install -m 04755 source/bin/mount.cifs $(DESTDIR)/sbin/
        install -m 0644 docs/manpages/mount.cifs.8 $(DESTDIR)/usr/share/man/man8/
 endif
 
index f5779fa..3cc7ed9 100644 (file)
@@ -5,8 +5,10 @@ usr/bin/net
 usr/bin/nmblookup
 usr/bin/smbpasswd
 usr/bin/testparm
+usr/bin/profiles
 usr/share/man/man1/nmblookup.1
 usr/share/man/man1/testparm.1
+usr/share/man/man1/profiles.1
 usr/share/man/man5/lmhosts.5
 usr/share/man/man5/smb.conf.5
 usr/share/man/man7/samba.7