Author: arekm Date: Sat Jul 4 20:40:32 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- start update to 3.4.0 (3.3 on SAMBA_3_3)
---- Files affected:
packages/samba:
samba-c++-nofail.patch (1.2 -> 1.3) , samba-link.patch (1.1 -> 1.2) ,
samba-lprng-no-dot-printers.patch (1.2 -> 1.3) , samba-nscd.patch (1.1 -> 1.2)
, samba-pthread.patch (1.1 -> 1.2) , samba-smbwrapper.patch (1.7 -> 1.8) ,
samba.spec (1.450 -> 1.451)
---- Diffs:
================================================================
Index: packages/samba/samba-c++-nofail.patch
diff -u packages/samba/samba-c++-nofail.patch:1.2
packages/samba/samba-c++-nofail.patch:1.3
--- packages/samba/samba-c++-nofail.patch:1.2 Sun Dec 25 19:44:27 2005
+++ packages/samba/samba-c++-nofail.patch Sat Jul 4 22:40:25 2009
@@ -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
================================================================
Index: packages/samba/samba-link.patch
diff -u packages/samba/samba-link.patch:1.1 packages/samba/samba-link.patch:1.2
--- packages/samba/samba-link.patch:1.1 Fri Oct 10 00:13:09 2008
+++ packages/samba/samba-link.patch Sat Jul 4 22:40:25 2009
@@ -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.upc...@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.upc...@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)
================================================================
Index: packages/samba/samba-lprng-no-dot-printers.patch
diff -u packages/samba/samba-lprng-no-dot-printers.patch:1.2
packages/samba/samba-lprng-no-dot-printers.patch:1.3
--- packages/samba/samba-lprng-no-dot-printers.patch:1.2 Tue Oct 9
17:49:30 2007
+++ packages/samba/samba-lprng-no-dot-printers.patch Sat Jul 4 22:40:25 2009
@@ -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 @@
/*******************************************************************
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;
================================================================
Index: packages/samba/samba-nscd.patch
diff -u packages/samba/samba-nscd.patch:1.1 packages/samba/samba-nscd.patch:1.2
--- packages/samba/samba-nscd.patch:1.1 Thu Oct 9 20:00:36 2008
+++ packages/samba/samba-nscd.patch Sat Jul 4 22:40:25 2009
@@ -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/smbcli...@exeext@: $(BINARY_PREREQS) $(CLIENT_OBJ) @BUILD_POPT@
@LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
+ bin/smbcli...@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 $@
+
================================================================
Index: packages/samba/samba-pthread.patch
diff -u packages/samba/samba-pthread.patch:1.1
packages/samba/samba-pthread.patch:1.2
--- packages/samba/samba-pthread.patch:1.1 Sat Oct 1 15:03:20 2005
+++ packages/samba/samba-pthread.patch Sat Jul 4 22:40:25 2009
@@ -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"*)
================================================================
Index: packages/samba/samba-smbwrapper.patch
diff -u packages/samba/samba-smbwrapper.patch:1.7
packages/samba/samba-smbwrapper.patch:1.8
--- packages/samba/samba-smbwrapper.patch:1.7 Sat Jan 31 00:05:23 2009
+++ packages/samba/samba-smbwrapper.patch Sat Jul 4 22:40:25 2009
@@ -5,8 +5,8 @@
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)
================================================================
Index: packages/samba/samba.spec
diff -u packages/samba/samba.spec:1.450 packages/samba/samba.spec:1.451
--- packages/samba/samba.spec:1.450 Thu Jul 2 23:15:49 2009
+++ packages/samba/samba.spec Sat Jul 4 22:40:25 2009
@@ -31,13 +31,13 @@
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
@@ -67,6 +67,7 @@
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
@@ -950,14 +951,15 @@
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 \
@@ -971,6 +973,11 @@
--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 \
@@ -1507,6 +1514,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.451 2009/07/04 20:40:25 arekm
+- start update to 3.4.0 (3.3 on SAMBA_3_3)
+
Revision 1.450 2009/07/02 21:15:49 hawk
- release 2
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/samba/samba-c++-nofail.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/samba/samba-link.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/samba/samba-lprng-no-dot-printers.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/samba/samba-nscd.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/samba/samba-pthread.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/samba/samba-smbwrapper.patch?r1=1.7&r2=1.8&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/samba/samba.spec?r1=1.450&r2=1.451&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
