From d45335a57f31307121b4be9e39aabf03eaf58c21b30c86f32de74d98d9c2f512 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Sun, 6 Apr 2008 06:10:12 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/samba?expand=0&rev=5 --- build-source-timestamp | 2 +- patches.tar.bz2 | 4 +- samba-doc.spec | 4 +- samba.changes | 6 +++ samba.spec | 111 ++++++++++++++++++++++++++++------------- vendor-files.tar.bz2 | 4 +- 6 files changed, 90 insertions(+), 41 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index f38c7c7..fed2de0 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -1670 +1673 Branch : 3.0.28a diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 83b4ad0..2a7fcd6 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:42f7cb0d5fe81dfb739cb97698c2a0af56a2d6757def036e7045636745a9ad84 -size 107218 +oid sha256:b0f57476d0e5e25af4afd3ec4698720c506f25808c510d0b48b7831adc0430cb +size 107068 diff --git a/samba-doc.spec b/samba-doc.spec index adb71ed..ecb1f9e 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -19,7 +19,7 @@ BuildRequires: ccache cracklib-devel cups-devel e2fsprogs-devel gdbm-devel krb5 License: GPL v2 or later Url: http://www.samba.org/ Version: 3.0.28a -Release: 1 +Release: 4 Summary: Samba Documentation Group: Documentation/Other AutoReqProv: on @@ -305,7 +305,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1670 +Source Timestamp: 1673 Branch : 3.0.28a %changelog diff --git a/samba.changes b/samba.changes index a76424f..3c2c954 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Apr 1 16:21:16 CEST 2008 - mkoenig@suse.de + +- Remove dir /usr/share/omc/svcinfo.d as it is provided now + by filesystem. + ------------------------------------------------------------------- Tue Mar 11 14:45:11 CET 2008 - lmuelle@suse.de diff --git a/samba.spec b/samba.spec index a5486e3..e5ca3dc 100644 --- a/samba.spec +++ b/samba.spec @@ -23,7 +23,7 @@ Group: Productivity/Networking/Samba Url: http://www.samba.org/ AutoReqProv: on Version: 3.0.28a -Release: 1 +Release: 4 Provides: samba3 = %{version}-%{release} Obsoletes: samba3 < %{version} Requires: samba-client >= %{version} @@ -75,6 +75,7 @@ Source11: http://www.hhrm.de/~gd/ldapsmb/ldapsmb-%{ldapsmb_ver}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %package client +License: GPL v2 or later Summary: Samba Client Utilities Group: Productivity/Networking/Samba AutoReqProv: on @@ -87,6 +88,7 @@ Requires: cifs-mount %if %{suse_version} > 1020 %package devel +License: GPL v2 or later Summary: Libraries and Header Files to Develop Programs with Samba Support Group: Development/Libraries/C and C++ AutoReqProv: on @@ -94,6 +96,7 @@ AutoReqProv: on %if %{suse_version} < 1001 %package doc +License: GPL v2 or later Summary: Samba Documentation Group: Documentation/Other AutoReqProv: on @@ -103,6 +106,7 @@ PreReq: /bin/rm /usr/bin/find /usr/bin/xargs %endif %package krb-printing +License: GPL v2 or later Summary: Wrapper binary for kerberized printing Group: Productivity/Networking/Samba AutoReqProv: on @@ -115,6 +119,7 @@ Requires: samba-client >= %{version} %if %{make_pdb} %package pdb +License: GPL v2 or later Summary: PDB-Modules Group: Productivity/Networking/Samba AutoReqProv: on @@ -124,6 +129,7 @@ Obsoletes: samba3-pdb %if %{make_python} %package python +License: GPL v2 or later Summary: Samba Python Modules Group: Productivity/Networking/Samba AutoReqProv: on @@ -135,6 +141,7 @@ Requires: python >= %pyver, python < %pyver.99 %if %{make_utils} %package utils + Summary: debug tools Group: Productivity/Networking/Samba AutoReqProv: on @@ -143,6 +150,7 @@ Obsoletes: samba3-utils %endif %package winbind +License: GPL v2 or later Summary: Winbind Daemon and Tool Group: Productivity/Networking/Samba AutoReqProv: on @@ -153,11 +161,13 @@ PreReq: /bin/ln /sbin/ldconfig /sbin/insserv %if %{suse_version} < 1031 %package -n libsmbclient +License: GPL v2 or later Provides: libsmbclient3 = %{version}-%{release} Obsoletes: libsmbclient3 %else %package -n libsmbclient0 +License: GPL v2 or later Provides: libsmbclient = %{version}-%{release} Obsoletes: libsmbclient %endif @@ -167,6 +177,7 @@ AutoReqProv: on PreReq: /sbin/ldconfig %package -n libsmbclient-devel +License: GPL v2 or later Summary: Libraries and Header Files to Develop Programs with smbclient Support Group: Development/Libraries/C and C++ AutoReqProv: on @@ -177,24 +188,28 @@ Requires: libsmbclient0 = %{version} krb5-devel %endif %package -n libmsrpc +License: GPL v2 or later Summary: Samba msrpc Library Group: System/Libraries AutoReqProv: on PreReq: /sbin/ldconfig %package -n libmsrpc-devel +License: GPL v2 or later Summary: Libraries and Header Files to Develop Programs with msrpc Support Group: Development/Libraries/C and C++ AutoReqProv: on Requires: libmsrpc = %{version} %package -n libsmbsharemodes +License: GPL v2 or later Summary: Samba smbsharemodes Library Group: System/Libraries AutoReqProv: on PreReq: /sbin/ldconfig %package -n libsmbsharemodes-devel +License: GPL v2 or later Summary: Samba smbsharemodes Library Group: System/Libraries AutoReqProv: on @@ -202,16 +217,18 @@ Requires: libsmbsharemodes = %{version} %if %{make_ldapsmb} %package -n ldapsmb +License: GPL v2 or later Summary: Tool to administer Samba's LDAP backend Group: Productivity/Networking/Samba AutoReqProv: on Version: 1.34b -Release: 163 +Release: 166 Requires: perl-ldap %endif %if %{suse_version} > 920 %package -n cifs-mount +License: GPL v2 or later Summary: Mount using the Common Internet File System (CIFS) Group: System/Filesystems AutoReqProv: on @@ -219,11 +236,12 @@ AutoReqProv: on %if %{make_vscan} %package vscan +License: GPL v2 or later Summary: On-Access Virus Scanning with Samba Group: Productivity/Networking/Samba AutoReqProv: on Version: 0.3.6b -Release: 234 +Release: 237 Provides: samba3-vscan = 0.3.6b Obsoletes: samba3-vscan Requires: samba = %{samba_ver} @@ -804,8 +822,10 @@ fi %{_sbindir}/rcsmb %{_sbindir}/smbd %{_sbindir}/swat +%if %{suse_version} < 1100 %dir %{_datadir}/omc %dir %{_datadir}/omc/svcinfo.d +%endif %attr(0644,root,root) %{_datadir}/omc/svcinfo.d/nmb.xml %attr(0644,root,root) %{_datadir}/omc/svcinfo.d/smb.xml %dir %{_datadir}/samba @@ -924,8 +944,10 @@ fi %doc %{_mandir}/man8/tdbbackup.8.gz %doc %{_mandir}/man8/tdbdump.8.gz %doc %{_mandir}/man8/tdbtool.8.gz +%if %{suse_version} < 1100 %dir %{_datadir}/omc %dir %{_datadir}/omc/svcinfo.d +%endif %attr(0644,root,root) %{_datadir}/omc/svcinfo.d/smbfs.xml %dir %{_datadir}/samba %dir %{_datadir}/samba/LDAP @@ -969,8 +991,10 @@ fi %doc %{_mandir}/man8/idmap_nss.8.gz %doc %{_mandir}/man8/idmap_rid.8.gz %doc %{_mandir}/man8/idmap_tdb.8.gz +%if %{suse_version} < 1100 %dir %{_datadir}/omc %dir %{_datadir}/omc/svcinfo.d +%endif %attr(0644,root,root) %{_datadir}/omc/svcinfo.d/winbind.xml %if %{make_utils} @@ -1115,7 +1139,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1670 +Source Timestamp: 1673 Branch : 3.0.28a %if %{suse_version} > 1020 @@ -1130,7 +1154,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1670 +Source Timestamp: 1673 Branch : 3.0.28a %endif @@ -1157,7 +1181,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1670 +Source Timestamp: 1673 Branch : 3.0.28a %description winbind @@ -1169,7 +1193,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1670 +Source Timestamp: 1673 Branch : 3.0.28a %if %{make_utils} @@ -1201,7 +1225,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1670 +Source Timestamp: 1673 Branch : 3.0.28a %endif @@ -1215,7 +1239,7 @@ Authors: -------- Jeremy Allison -Source Timestamp: 1670 +Source Timestamp: 1673 Branch : 3.0.28a %if %{make_pdb} @@ -1229,7 +1253,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1670 +Source Timestamp: 1673 Branch : 3.0.28a %endif @@ -1247,7 +1271,7 @@ Authors: -------- Rainer Link -Source Timestamp: 1670 +Source Timestamp: 1673 Branch : 3.0.28a %endif @@ -1262,7 +1286,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1670 +Source Timestamp: 1673 Branch : 3.0.28a %endif @@ -1271,18 +1295,34 @@ Branch : 3.0.28a %description -n libsmbclient This package includes the libsmbclient library. +libsmbclient is provided by the libsmbclient0 package. + +This entry is required to allow a samba.spec file providing +libsmbclient for SUSE version < 11.0 while versions > 10.0 will have +libsmbclient0. + Authors: -------- The Samba Team -Source Timestamp: 1670 +Source Timestamp: 1673 Branch : 3.0.28a %else %description -n libsmbclient0 +This package includes the libsmbclient library. + + + +Authors: +-------- + The Samba Team + +Source Timestamp: 1673 +Branch : 3.0.28a %endif This package includes the libsmbclient library. @@ -1300,7 +1340,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1670 +Source Timestamp: 1673 Branch : 3.0.28a %description -n libmsrpc @@ -1312,7 +1352,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1670 +Source Timestamp: 1673 Branch : 3.0.28a %description -n libmsrpc-devel @@ -1325,7 +1365,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1670 +Source Timestamp: 1673 Branch : 3.0.28a %description -n libsmbsharemodes @@ -1337,7 +1377,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1670 +Source Timestamp: 1673 Branch : 3.0.28a %description -n libsmbsharemodes-devel @@ -1351,7 +1391,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1670 +Source Timestamp: 1673 Branch : 3.0.28a %if %{make_ldapsmb} @@ -1366,7 +1406,7 @@ Authors: -------- Guenther Deschner -Source Timestamp: 1670 +Source Timestamp: 1673 Branch : 3.0.28a %endif @@ -1382,12 +1422,15 @@ Authors: -------- Steve French -Source Timestamp: 1670 +Source Timestamp: 1673 Branch : 3.0.28a %endif %changelog +* Tue Apr 01 2008 mkoenig@suse.de +- Remove dir /usr/share/omc/svcinfo.d as it is provided now + by filesystem. * Tue Mar 11 2008 lmuelle@suse.de - Prevent tdb lock call getting interrupted by sig alarm; [bnc#364200]. * Mon Mar 10 2008 lmuelle@suse.de @@ -1421,7 +1464,7 @@ Branch : 3.0.28a * Wed Dec 12 2007 jmcdonough@suse.de - Update to 3.0.28 + Fix send_mailslot overflow: CVE-2007-6015; [#343702]. -* Wed Nov 28 2007 jmcdonough@suse.de +* Thu Nov 29 2007 jmcdonough@suse.de - Additional cases and problems caused by fix for CVE-2007-4572; [#337823]. * Mon Nov 26 2007 jmcdonough@suse.de @@ -1466,7 +1509,7 @@ Branch : 3.0.28a - Handle smb child crash; [#294895]. * Wed Sep 26 2007 lmuelle@suse.de - Add a global lock inside nss_winbind as workaround; [#293907]. -* Thu Sep 20 2007 lmuelle@suse.de +* Fri Sep 21 2007 lmuelle@suse.de - Merge ranged retrieval optimization to winbindd. * Wed Sep 19 2007 lmuelle@suse.de - Update to 3.0.26a. @@ -1631,7 +1674,7 @@ Branch : 3.0.28a * Fri Apr 20 2007 lmuelle@suse.de - Let idmap_ad search in the Global Catalog in case dce funnel directory is set; [#266049]. -* Tue Apr 17 2007 lmuelle@suse.de +* Wed Apr 18 2007 lmuelle@suse.de - Allow share names with a lengths greater than 32 chars; bso [#4512]. * Tue Apr 17 2007 lmuelle@suse.de - Check the euid and call become_root() to get write access to dump a core. @@ -1781,7 +1824,7 @@ Branch : 3.0.28a - Fix winbind failure mode for trusted domains. * Fri Oct 20 2006 jeallison@novell.com - Add realm to username if missing in net ads join; [#211706]. -* Thu Oct 19 2006 lmuelle@suse.de +* Fri Oct 20 2006 lmuelle@suse.de - Move the LOCKDIR to the client sub package. * Thu Oct 12 2006 lmuelle@suse.de - Activate the libaddns. @@ -1797,7 +1840,7 @@ Branch : 3.0.28a - Fix time value reporting in libsmbclient; [#195285]. * Tue Aug 15 2006 ro@suse.de - Remove update-messages. -* Tue Aug 08 2006 jeallison@novell.com +* Wed Aug 09 2006 jeallison@novell.com - Store and restore NT hashes as string compatible values; [#185053]. * Tue Aug 08 2006 jeallison@novell.com - Added winbindd null sid fix; [#185053]. @@ -1827,7 +1870,7 @@ Branch : 3.0.28a - Replace vendor-files/tools/dlopen.sh by test_pam_modules make rule. * Tue Jul 18 2006 lmuelle@suse.de - Fix pam config file parsing in pam_winbind; bso [#3916]. -* Mon Jul 10 2006 lmuelle@suse.de +* Tue Jul 11 2006 lmuelle@suse.de - Update to 3.0.23. + Improved 'make test' + New offline mode in winbindd. @@ -2097,7 +2140,7 @@ Branch : 3.0.28a - Update to 3.0.21. * Mon Dec 19 2005 gd@suse.de - Add extended pam_winbind work from trunk. -* Wed Dec 14 2005 lmuelle@suse.de +* Thu Dec 15 2005 lmuelle@suse.de - Return NT_STATUS_ACCOUNT_DISABLED if eDirectory returns LDAP_UNWILLING_TO_PERFORM; [#138491]. * Sun Dec 04 2005 lmuelle@suse.de @@ -2301,7 +2344,7 @@ Branch : 3.0.28a - Add max fd count for select call in smbd/server.c. * Mon Nov 15 2004 kukuk@suse.de - Use common-* PAM configuration. -* Fri Nov 12 2004 lmuelle@suse.de +* Sat Nov 13 2004 lmuelle@suse.de - Remove check for uid and gib mapping from winbind init script as winbind nowadays works fine as a proxy only. - Add -t 10 to all killproc calls in the init scripts; [#47227]. @@ -2350,7 +2393,7 @@ Branch : 3.0.28a - make it possible to build the package as user * Thu Oct 21 2004 mc@suse.de - disable samba3-account_pol_ldap.diff; breaks libsmbclient -* Tue Oct 19 2004 lmuelle@suse.de +* Wed Oct 20 2004 lmuelle@suse.de - Add showacls option to smbclient. * Mon Oct 18 2004 mc@suse.de - Update pdb_ldap.c.diff from Vince Brimhall . @@ -2397,7 +2440,7 @@ Branch : 3.0.28a - Remove letters from the version string of autoconf and autoheader. - Add --mode=MODE to libtool calls. - Add logrotate settings for nmbd and smbd only on systems newer than 8.1. -* Wed Sep 01 2004 lmuelle@suse.de +* Thu Sep 02 2004 lmuelle@suse.de - Disable filetype support in vscan for version older than 9.2 where file was built without -fPIC. - Use new update message mechanism, [#44359]. @@ -2458,7 +2501,7 @@ Branch : 3.0.28a - Use samba.css in htmldocs.html and manpages.html. - Add X-DOC-* lines to enable search index creation and some translations to the Samba.desktop file. -* Sun May 30 2004 lmuelle@suse.de +* Mon May 31 2004 lmuelle@suse.de - Remove backtrace file from vendor-files as our version it's now in upstream. - Add Samba.desktop file for SuSEhelp system to the doc package. - Move smbpasswd, smbcontrol binaries and man pages to the client package. @@ -2573,7 +2616,7 @@ Branch : 3.0.28a * Wed Feb 18 2004 coolo@suse.de - readding my fix for libsmbclient. without it surfing windows networks is pure luck ;( -* Mon Feb 16 2004 adrian@suse.de +* Tue Feb 17 2004 adrian@suse.de - register samba and swat via slp.reg.d * Wed Feb 11 2004 kukuk@suse.de - Remove self Conflicts @@ -2594,7 +2637,7 @@ Branch : 3.0.28a - Added -fPIC to libmksd build. * Fri Jan 16 2004 kukuk@suse.de - added pam-devel to neededforbuild -* Fri Oct 17 2003 kukuk@suse.de +* Sat Oct 18 2003 kukuk@suse.de - Remove unused des from neededforbuild * Mon Sep 15 2003 kukuk@suse.de - Add requires to libsmbclient-devel [Bug #30718] @@ -2673,7 +2716,7 @@ Branch : 3.0.28a - move README to client package and inform about the new doc package, #23838 - fix %%post in case of update - fix nmb init script, #23854 -* Mon Feb 17 2003 lmuelle@suse.de +* Tue Feb 18 2003 lmuelle@suse.de - add appropriate suffix to example smb.conf of documentation - add example to auto mount or umount CD drive to smb.conf - add -s ${SMB_CONF} to all startproc calls in init scripts diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index bf22333..d67f6e7 100644 --- a/vendor-files.tar.bz2 +++ b/vendor-files.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ec024946806a2359f7c04d4e74f57285348dd183f64ad7da8f75539a3a0630a3 -size 21836 +oid sha256:970e4daa73cb3d00e9931d2fa5d123d0ebc9fc33017c0f7d6c83fc4820de6951 +size 21857