- start update to 3.4.0 (3.3 on SAMBA_3_3)

Changed files:
    samba-c++-nofail.patch -> 1.3
    samba-link.patch -> 1.2
    samba-lprng-no-dot-printers.patch -> 1.3
    samba-nscd.patch -> 1.2
    samba-pthread.patch -> 1.2
    samba-smbwrapper.patch -> 1.8
    samba.spec -> 1.451

diff --git a/samba-c++-nofail.patch b/samba-c++-nofail.patch
index c6c8f54b9ece0c33157d17c0040839c4c770036f..198bf967215f444c1f6e93cbbb8d5e41673988de 100644 (file)
--- a/samba-c++-nofail.patch
+++ b/samba-c++-nofail.patch
@@ -1,5 +1,5 @@
---- samba-3.0.21/source/include/includes.h.orig        2005-12-25 18:08:07.204427000 +0100
-+++ samba-3.0.21/source/include/includes.h     2005-12-25 18:11:14.004427000 +0100
+--- samba-3.0.21/source3/include/includes.h.orig       2005-12-25 18:08:07.204427000 +0100
++++ samba-3.0.21/source3/include/includes.h    2005-12-25 18:11:14.004427000 +0100
 @@ -33,7 +33,7 @@
  #define protected #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
  #define template #error DONT_USE_CPLUSPLUS_RESERVED_NAMES

diff --git a/samba-link.patch b/samba-link.patch
index e79bad71bf9d7979c3198555223046b63c83ea68..8cec044f50ef445c038e858016338443b175bdf7 100644 (file)
--- a/samba-link.patch
+++ b/samba-link.patch
@@ -1,11 +1,11 @@
---- samba-3.2.4/source/Makefile.in.orig        2008-10-09 23:09:56.133256245 +0200
-+++ samba-3.2.4/source/Makefile.in     2008-10-09 23:10:15.631916148 +0200
-@@ -1322,7 +1322,7 @@
- bin/cifs.upcall@EXEEXT@: $(BINARY_PREREQS) $(CIFS_UPCALL_OBJ) $(LIBSMBCLIENT_OBJ1) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
+--- samba-3.2.4/source3/Makefile.in.orig       2008-10-09 23:09:56.133256245 +0200
++++ samba-3.2.4/source3/Makefile.in    2008-10-09 23:10:15.631916148 +0200
+@@ -1468,7 +1468,7 @@
+ bin/cifs.upcall@EXEEXT@: $(BINARY_PREREQS) $(CIFS_UPCALL_OBJ) $(LIBSMBCLIENT_OBJ1) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_TARGET@
        @echo Linking $@
-       @$(CC) $(FLAGS) -o $@ $(CIFS_UPCALL_OBJ) $(DYNEXP) $(LDFLAGS) \
+       @$(CC) -o $@ $(CIFS_UPCALL_OBJ) $(DYNEXP) $(LDFLAGS) \
 -              -lkeyutils $(LIBS) $(LIBSMBCLIENT_OBJ1) $(KRB5LIBS) \
 +              -lkeyutils $(LIBSMBCLIENT_OBJ1) $(LIBS) $(KRB5LIBS) \
-               $(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(WINBIND_LIBS) \
+               $(LDAP_LIBS) $(LIBTALLOC_LIBS) $(LIBWBCLIENT_LIBS) \
                $(LIBTDB_LIBS) $(NSCD_LIBS)
  

diff --git a/samba-lprng-no-dot-printers.patch b/samba-lprng-no-dot-printers.patch
index fd9642e5e74c7ab619221804499dd1ebb49f0919..23d7b77004ffdd50170d02d52d1d3aa520f4659f 100644 (file)
--- a/samba-lprng-no-dot-printers.patch
+++ b/samba-lprng-no-dot-printers.patch
@@ -1,6 +1,6 @@
-diff -ur samba-3.0.26a/source/param/loadparm.c samba-3.0.26a-lprng/source/param/loadparm.c
---- samba-3.0.26a/source/param/loadparm.c      2007-09-11 16:21:57.000000000 +0200
-+++ samba-3.0.26a-lprng/source/param/loadparm.c        2007-10-09 17:22:57.000000000 +0200
+diff -ur samba-3.0.26a/source3/param/loadparm.c samba-3.0.26a-lprng/source3/param/loadparm.c
+--- samba-3.0.26a/source3/param/loadparm.c     2007-09-11 16:21:57.000000000 +0200
++++ samba-3.0.26a-lprng/source3/param/loadparm.c       2007-10-09 17:22:57.000000000 +0200
 @@ -5548,6 +5548,11 @@
        return PRINTCAP_NAME;
  }
@@ -13,9 +13,9 @@ diff -ur samba-3.0.26a/source/param/loadparm.c samba-3.0.26a-lprng/source/param/
  /*******************************************************************
   Ensure we don't use sendfile if server smb signing is active.
  ********************************************************************/
-diff -ur samba-3.0.26a/source/printing/pcap.c samba-3.0.26a-lprng/source/printing/pcap.c
---- samba-3.0.26a/source/printing/pcap.c       2005-10-18 04:44:57.000000000 +0200
-+++ samba-3.0.26a-lprng/source/printing/pcap.c 2007-10-09 17:27:18.000000000 +0200
+diff -ur samba-3.0.26a/source3/printing/pcap.c samba-3.0.26a-lprng/source3/printing/pcap.c
+--- samba-3.0.26a/source3/printing/pcap.c      2005-10-18 04:44:57.000000000 +0200
++++ samba-3.0.26a-lprng/source3/printing/pcap.c        2007-10-09 17:27:18.000000000 +0200
 @@ -113,6 +113,7 @@
        pcap_cache_t *tmp_cache = NULL;
        XFILE *pcap_file;

diff --git a/samba-nscd.patch b/samba-nscd.patch
index 84b80bb452bd89b416cdec82595a3f29e5185bf0..d71224a597e01ec40e9332ba8acd0b67bad444e0 100644 (file)
--- a/samba-nscd.patch
+++ b/samba-nscd.patch
@@ -1,21 +1,22 @@
-diff -urN samba-3.2.1.org/source/Makefile.in samba-3.2.1/source/Makefile.in
---- samba-3.2.1.org/source/Makefile.in 2008-08-05 08:22:33.000000000 +0200
-+++ samba-3.2.1/source/Makefile.in     2008-08-17 23:24:32.085914644 +0200
-@@ -1356,7 +1356,7 @@
-       @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(PASSDB_LIBS) $(RPCCLIENT_OBJ) \
+diff -urN samba-3.2.1.org/source3/Makefile.in samba-3.2.1/source3/Makefile.in
+--- samba-3.2.1.org/source3/Makefile.in        2008-08-05 08:22:33.000000000 +0200
++++ samba-3.2.1/source3/Makefile.in    2008-08-17 23:24:32.085914644 +0200
+@@ -1430,7 +1430,7 @@
+       @$(CC) -o $@ $(LDFLAGS) $(PASSDB_LIBS) $(RPCCLIENT_OBJ) \
                $(DYNEXP) $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) $(POPT_LIBS) \
                $(KRB5LIBS) $(LDAP_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \
--              $(WINBIND_LIBS)
-+              $(WINBIND_LIBS) $(NSCD_LIBS)
+-              $(LIBWBCLIENT_LIBS) $(ZLIB_LIBS)
++              $(LIBWBCLIENT_LIBS) $(ZLIB_LIBS) $(NSCD_LIBS)
  
- bin/smbclient@EXEEXT@: $(BINARY_PREREQS) $(CLIENT_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
+ bin/smbclient@EXEEXT@: $(BINARY_PREREQS) $(CLIENT_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_TARGET@
        @echo Linking $@
-@@ -1563,7 +1563,7 @@
+@@ -1633,7 +1633,7 @@
        @echo Linking $@
-       @$(CC) $(FLAGS) -o $@ $(LDBEDIT_OBJ) $(DYNEXP) $(LDFLAGS) \
+       @$(CC) -o $@ $(LDBEDIT_OBJ) $(DYNEXP) $(LDFLAGS) \
                $(LIBS) $(POPT_LIBS) $(LDAP_LIBS) \
--              $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
-+              $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS) $(NSCD_LIBS)
+-              $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
++              $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(NSCD_LIBS)
  
- bin/ldbsearch: $(BINARY_PREREQS) $(LDBSEARCH_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
+ bin/ldbsearch: $(BINARY_PREREQS) $(LDBSEARCH_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_TARGET@
        @echo Linking $@
+

diff --git a/samba-pthread.patch b/samba-pthread.patch
index 96e824da7ec21d9777793a2db8bbcb858c5423e5..3c580cd87f2f73062c7f0bdd9ecb30927a7775ef 100644 (file)
--- a/samba-pthread.patch
+++ b/samba-pthread.patch
@@ -1,6 +1,6 @@
-diff -uNr samba-3.0.20a.orig/source/configure.in samba-3.0.20a/source/configure.in
---- samba-3.0.20a.orig/source/configure.in     2005-10-01 15:00:01.000000000 +0200
-+++ samba-3.0.20a/source/configure.in  2005-10-01 15:00:59.000000000 +0200
+diff -uNr samba-3.0.20a.orig/source3/configure.in samba-3.0.20a/source3/configure.in
+--- samba-3.0.20a.orig/source3/configure.in    2005-10-01 15:00:01.000000000 +0200
++++ samba-3.0.20a/source3/configure.in 2005-10-01 15:00:59.000000000 +0200
 @@ -549,19 +549,19 @@
                                case "$ac_cv_gcc_compiler_version_number" in
                                        *"gcc version 2.6"*|*"gcc version 2.7"*)

diff --git a/samba-smbwrapper.patch b/samba-smbwrapper.patch
index 1868636990d8c43e4c211112aa195427ea128ab6..0a7095a8846825d47bf0e5eae96dd39740fbf6e6 100644 (file)
--- a/samba-smbwrapper.patch
+++ b/samba-smbwrapper.patch
@@ -5,8 +5,8 @@ diff -urN samba-3.0.25a.org/examples/libsmbclient/smbwrapper/Makefile samba-3.0.
  
  CFLAGS = -I$(SAMBA_INCL) $(EXTLIB_INCL)
  
--LDFLAGS = -L/usr/local/samba/lib -L../../../source/bin
-+LDFLAGS = -L../../../source/bin
+-LDFLAGS = -L/usr/local/samba/lib -L../../../source3/bin
++LDFLAGS = -L../../../source3/bin
  
  SMBINCLUDE = -I../../../source/include
  CFLAGS= -fpic -g -O0 $(DEFS) $(SMBINCLUDE)

diff --git a/samba.spec b/samba.spec
index a61b78471f3c82df80f9f1730cb30c869281c7b9..d61c5fecc4fc41073c4a3f93682108d0cafdca67 100644 (file)
--- a/samba.spec
+++ b/samba.spec
@@ -30,13 +30,13 @@ Summary(tr.UTF-8):  SMB sunucusu
 Summary(uk.UTF-8):     SMB клієнт та сервер
 Summary(zh_CN.UTF-8):  Samba 客户端和服务器
 Name:          samba
-Version:       3.3.6
-Release:       2
+Version:       3.4.0
+Release:       0.1
 Epoch:         1
 License:       GPL v3
 Group:         Networking/Daemons
 Source0:       http://www.samba.org/samba/ftp/stable/%{name}-%{version}.tar.gz
-# Source0-md5: 858cb6c640358be0e81297c5de615a3c
+# Source0-md5: a7137736379daf9855814ae14c2c5e22
 Source1:       smb.init
 Source2:       %{name}.pamd
 Source3:       swat.inetd
@@ -66,6 +66,7 @@ BuildRequires:        iconv
 BuildRequires: libmagic-devel
 BuildRequires: libnscd-devel
 BuildRequires: libtool >= 2:1.4d
+BuildRequires: make >= 3.81
 BuildRequires: ncurses-devel >= 5.2
 %{?with_ldap:BuildRequires:    openldap-devel >= 2.3.0}
 BuildRequires: openssl-devel >= 0.9.7d
@@ -949,14 +950,15 @@ mv README{,.vfs}
 cd ../..
 
 %build
-cd source
+cd source3
 %{__libtoolize}
-%{__autoconf} -Im4 -Ilib/replace
+%{__autoconf} -Im4 -I../m4 -I../lib/replace -Ilib/replace -I../source4
 %configure \
        --with-modulesdir=%{_sambalibdir} \
        --with-rootsbindir=/sbin \
        --with-pammodulesdir=/%{_lib}/security \
        --with-acl-support \
+       --with-aio-support \
        --with-automount \
        --with-libsmbclient \
        --with-lockdir=/var/lib/samba \
@@ -970,6 +972,11 @@ cd source
        --with-syslog \
        --with-utmp \
        --with-fhs \
+       --with-vfs-afsacl \
+       --without-included-popt \
+       --enable-merged-build \
+       --enable-automatic-dependencies \
+       --enable-dso \
        --enable-avahi \
        --disable-dnssd \
        --with%{!?with_ldap:out}-ldap \