Author: arekm Date: Wed Oct 19 08:24:04 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 3.6.0
---- Files affected:
packages/samba:
samba-lprng-no-dot-printers.patch (1.4 -> 1.5) , samba-nscd.patch (1.5 ->
1.6) , samba-pthread.patch (1.2 -> 1.3) , samba.spec (1.509 -> 1.510)
---- Diffs:
================================================================
Index: packages/samba/samba-lprng-no-dot-printers.patch
diff -u packages/samba/samba-lprng-no-dot-printers.patch:1.4
packages/samba/samba-lprng-no-dot-printers.patch:1.5
--- packages/samba/samba-lprng-no-dot-printers.patch:1.4 Fri Jun 17
21:10:18 2011
+++ packages/samba/samba-lprng-no-dot-printers.patch Wed Oct 19 10:23:58 2011
@@ -13,25 +13,25 @@
/*******************************************************************
Ensure we don't use sendfile if server smb signing is active.
********************************************************************/
-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 @@
+--- samba-3.6.0/source3/printing/print_standard.c~ 2011-08-09
13:17:47.000000000 +0200
++++ samba-3.6.0/source3/printing/print_standard.c 2011-10-17
21:15:15.693523176 +0200
+@@ -63,6 +64,7 @@
+ {
XFILE *pcap_file;
char *pcap_line;
- bool post_cache_fill_fn_handled = false;
+ enum printing_types printing = lp_defaultprinting();
- DEBUG(3, ("reloading printcap cache\n"));
-
-@@ -210,6 +211,10 @@
- comment[60] = 0;
- name[MAXPRINTERLEN] = 0;
+ if ((pcap_file = x_fopen(pcap_name, O_RDONLY, 0)) == NULL) {
+ DEBUG(0, ("Unable to open printcap file %s for read!\n",
pcap_name));
+@@ -77,6 +79,10 @@
+ if (*pcap_line == '#' || *pcap_line == 0)
+ continue;
+ /* skip .name in case of LPRng */
+ if (printing == PRINT_LPRNG && *name == '.')
+ continue;
+
- if (*name && !pcap_cache_add(name, comment)) {
- x_fclose(pcap_file);
- goto done;
+ /* now we have a real printer line - cut at the first : */
+ if ((p = strchr_m(pcap_line, ':')) != NULL)
+ *p = 0;
+
================================================================
Index: packages/samba/samba-nscd.patch
diff -u packages/samba/samba-nscd.patch:1.5 packages/samba/samba-nscd.patch:1.6
--- packages/samba/samba-nscd.patch:1.5 Mon Nov 9 01:20:28 2009
+++ packages/samba/samba-nscd.patch Wed Oct 19 10:23:58 2011
@@ -10,13 +10,4 @@
bin/smbclient@EXEEXT@: $(BINARY_PREREQS) $(CLIENT_OBJ) @BUILD_POPT@
@LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_TARGET@
@echo Linking $@
-@@ -1633,7 +1633,7 @@
- @echo Linking $@
- @$(CC) -o $@ $(LDBEDIT_OBJ) $(DYNEXP) $(LDFLAGS) \
- $(LIBS) $(POPT_LIBS) $(LDAP_LIBS) \
-- $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
-+ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(NSCD_LIBS)
-
- 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.2
packages/samba/samba-pthread.patch:1.3
--- packages/samba/samba-pthread.patch:1.2 Sat Jul 4 22:40:25 2009
+++ packages/samba/samba-pthread.patch Wed Oct 19 10:23:58 2011
@@ -1,26 +1,11 @@
-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"*)
- CPPFLAGS="$CPPFLAGS
-D_LARGEFILE64_SOURCE -D_REENTRANT"
-- LDFLAGS="$LDFLAGS -lthread"
-+ LDFLAGS="$LDFLAGS -lpthread"
- AC_DEFINE(_LARGEFILE64_SOURCE,
1, [Whether to enable large file support])
- ;;
- *)
- CPPFLAGS="$CPPFLAGS
-D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64"
-- LDFLAGS="$LDFLAGS -lthread"
-+ LDFLAGS="$LDFLAGS -lpthread"
- AC_DEFINE(_LARGEFILE64_SOURCE,
1, [Whether to enable large file support])
- AC_DEFINE(_FILE_OFFSET_BITS,
64, [File offset bits])
- ;;
- esac
- else
- CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE
-D_REENTRANT -D_FILE_OFFSET_BITS=64"
-- LDFLAGS="$LDFLAGS -lthread"
-+ LDFLAGS="$LDFLAGS -lpthread"
- AC_DEFINE(_LARGEFILE64_SOURCE, 1, [Whether to
enable large file support])
- AC_DEFINE(_FILE_OFFSET_BITS, 64, [File offset
bits])
- fi
+--- samba-3.6.0/source3/configure.in~ 2011-08-09 13:17:47.000000000 +0200
++++ samba-3.6.0/source3/configure.in 2011-10-17 21:10:03.939564051 +0200
+@@ -526,7 +526,7 @@
+ AC_MSG_RESULT([no large file support])
+ ;;
+ 5.*)
+- LDFLAGS="$LDFLAGS -lthread"
++ LDFLAGS="$LDFLAGS -lpthread"
+ CPPFLAGS="$CPPFLAGS -D_REENTRANT"
+ AC_MSG_RESULT([enabling large file support])
+ if test "$ac_cv_prog_gcc" = yes; then
================================================================
Index: packages/samba/samba.spec
diff -u packages/samba/samba.spec:1.509 packages/samba/samba.spec:1.510
--- packages/samba/samba.spec:1.509 Sun Oct 2 00:11:44 2011
+++ packages/samba/samba.spec Wed Oct 19 10:23:58 2011
@@ -65,13 +65,13 @@
Summary(uk.UTF-8): SMB клієнт та сервер
Summary(zh_CN.UTF-8): Samba 客户端和服务器
Name: samba
-Version: 3.5.11
-Release: 2
+Version: 3.6.0
+Release: 1
Epoch: 1
License: GPL v3
Group: Networking/Daemons
Source0: http://www.samba.org/samba/ftp/stable/%{name}-%{version}.tar.gz
-# Source0-md5: 81bbd16048c6ca40baea8c59126ee385
+# Source0-md5: e297e0ea7923c7de8d7c1d8fd0ec0a05
Source1: smb.init
Source2: %{name}.pamd
Source3: swat.inetd
@@ -344,7 +344,6 @@
Requires: %{name}-common = %{epoch}:%{version}-%{release}
%{?with_kerberos5:Requires: heimdal-libs}
Requires: libsmbclient = %{epoch}:%{version}-%{release}
-Obsoletes: mount-cifs
Obsoletes: smbfs
%description client
@@ -855,6 +854,10 @@
%{__sed} -i 's#%SAMBAVERSION%#%{version}#' docs/htmldocs/index.html
+# deprecated in gnutls 3.0
+%{__sed} -i -e "s/gnutls_transport_set_lowat(tls->session, 0);//"
source4/lib/tls/tls.c
+%{__sed} -i -e "s/gnutls_transport_set_lowat(tlss->tls_session, 0);//"
source4/lib/tls/tls_tstream.c
+
#cd examples/VFS
#mv README{,.vfs}
#cd ../..
@@ -862,6 +865,12 @@
install %{SOURCE9} source4/heimdal/lib/wind/rfc3454.txt
%build
+# use ld.bfd because gold doesn't understand linker script
+install -d our-ld
+ln -s %{_bindir}/ld.bfd our-ld/ld
+export PATH=$(pwd)/our-ld:$PATH
+
+
cd source3
%{__libtoolize}
%{__autoconf} -Im4 -I../m4 -I../lib/replace -Ilib/replace -I../source4
@@ -872,9 +881,6 @@
--with-acl-support \
--with-aio-support \
--with-automount \
- --with-cifsmount \
- --with-cifsumount \
- --with-cifsupcall \
--with-libsmbclient \
--with-lockdir=/var/lib/samba \
--with-pam \
@@ -896,15 +902,13 @@
--enable-external-libtdb=yes \
%endif
--without-included-popt \
- --%{?with_merged_build:en}%{!?with_merged_build:dis}able-merged-build \
- --enable-automatic-dependencies \
--enable-dso \
--%{?with_avahi:en}%{!?with_avahi:dis}able-avahi \
--disable-dnssd \
--with%{!?with_ldap:out}-ldap \
--with%{!?with_kerberos5:out}-krb5
-%{__make} -j1 everything pam_smbpass bin/smbget bin/mount.cifs bin/vfstest \
+%{__make} -j1 everything pam_smbpass bin/smbget bin/vfstest \
LD=ld
cd ../examples
@@ -1082,27 +1086,34 @@
# "This utility disabled until rewritten"
#%attr(755,root,root) %{_bindir}/setnttoken4
%endif
-%attr(755,root,root) %{_bindir}/ldb*
%attr(755,root,root) %{_bindir}/smbstatus
%attr(755,root,root) %{_bindir}/smbpasswd
+%attr(755,root,root) %{_bindir}/smbta-util
%attr(755,root,root) %{_bindir}/smbcontrol
+%dir %{_libdir}/%{name}/idmap
+%attr(755,root,root) %{_libdir}/%{name}/idmap/autorid.so
+%{_mandir}/man8/idmap_autorid.8*
%dir %{_libdir}/%{name}/pdb
%dir %{_vfsdir}
%attr(755,root,root) %{_vfsdir}/acl_tdb.so
%attr(755,root,root) %{_vfsdir}/acl_xattr.so
%attr(755,root,root) %{_vfsdir}/aio_fork.so
+%attr(755,root,root) %{_vfsdir}/crossrename.so
%attr(755,root,root) %{_vfsdir}/dirsort.so
%attr(755,root,root) %{_vfsdir}/fileid.so
+%attr(755,root,root) %{_vfsdir}/linux_xfs_sgid.so
%attr(755,root,root) %{_vfsdir}/preopen.so
%attr(755,root,root) %{_vfsdir}/shadow_copy2.so
%attr(755,root,root) %{_vfsdir}/smb_traffic_analyzer.so
%attr(755,root,root) %{_vfsdir}/streams_depot.so
%attr(755,root,root) %{_vfsdir}/streams_xattr.so
%attr(755,root,root) %{_vfsdir}/syncops.so
+%attr(755,root,root) %{_vfsdir}/time_audit.so
%attr(755,root,root) %{_vfsdir}/xattr_tdb.so
%{_mandir}/man8/vfs_acl_tdb.8*
%{_mandir}/man8/vfs_acl_xattr.8*
+%{_mandir}/man8/vfs_crossrename.8*
%{_mandir}/man8/vfs_dirsort.8*
%{_mandir}/man8/vfs_fileid.8*
%{_mandir}/man8/vfs_preopen.8*
@@ -1110,6 +1121,7 @@
%{_mandir}/man8/vfs_smb_traffic_analyzer.8*
%{_mandir}/man8/vfs_streams_xattr.8*
%{_mandir}/man8/vfs_streams_depot.8*
+%{_mandir}/man8/vfs_time_audit.8*
%{_mandir}/man8/vfs_xattr_tdb.8*
@@ -1171,13 +1183,9 @@
%attr(755,root,root) %{_bindir}/net4
%attr(755,root,root) %{_bindir}/nmblookup4
%attr(755,root,root) %{_bindir}/smbclient4
-%attr(755,root,root) %{_bindir}/mount.cifs4
-%attr(755,root,root) %{_bindir}/umount.cifs4
%attr(755,root,root) %{_bindir}/setnttoken4
%attr(755,root,root) %{_bindir}/smbtorture4
%endif
-%attr(755,root,root) /sbin/mount.cifs
-%attr(755,root,root) /sbin/umount.cifs
%attr(755,root,root) %{_bindir}/findsmb
%attr(755,root,root) %{_bindir}/net
%attr(755,root,root) %{_bindir}/nmblookup
@@ -1188,7 +1196,6 @@
%attr(755,root,root) %{_bindir}/smbsh
%attr(755,root,root) %{_bindir}/smbtar
%attr(755,root,root) %{_bindir}/smbtree
-%attr(755,root,root) %{_sbindir}/cifs.upcall
%attr(755,root,root) %{_libdir}/smbwrapper.so
%{_mandir}/man1/findsmb.1*
%{_mandir}/man1/nmblookup.1*
@@ -1200,8 +1207,6 @@
%{_mandir}/man1/smbtar.1*
%{_mandir}/man1/smbtree.1*
%{_mandir}/man8/net.8*
-%{_mandir}/man8/*mount.cifs.8*
-%{_mandir}/man8/cifs.upcall.8*
%files common
%defattr(644,root,root,755)
@@ -1454,6 +1459,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.510 2011/10/19 08:23:58 arekm
+- up to 3.6.0
+
Revision 1.509 2011/10/01 22:11:44 glen
- add system libtdb bcond, enable it; preserve timestamps while installing
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/samba/samba-lprng-no-dot-printers.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/samba/samba-nscd.patch?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/samba/samba-pthread.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/samba/samba.spec?r1=1.509&r2=1.510&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
