diff --git a/.cvsignore b/.cvsignore index 1749347..e750815 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -samba-3.0.26a.tar.gz +samba-3.2.0pre1.tar.gz diff --git a/samba-3.0.0beta1-pipedir.patch b/samba-3.0.0beta1-pipedir.patch deleted file mode 100644 index 7bbd122..0000000 --- a/samba-3.0.0beta1-pipedir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- samba-3.0.0beta1/source/nsswitch/winbindd_nss.h.pipedir 2003-06-07 13:57:35.000000000 -0400 -+++ samba-3.0.0beta1/source/nsswitch/winbindd_nss.h 2003-06-30 21:34:46.000000000 -0400 -@@ -29,7 +29,7 @@ - #define _WINBINDD_NTDOM_H - - #define WINBINDD_SOCKET_NAME "pipe" /* Name of PF_UNIX socket */ --#define WINBINDD_SOCKET_DIR "/tmp/.winbindd" /* Name of PF_UNIX dir */ -+#define WINBINDD_SOCKET_DIR "/var/run/winbindd" /* Name of PF_UNIX dir */ - #define WINBINDD_PRIV_SOCKET_SUBDIR "winbindd_privileged" /* name of subdirectory of lp_lockdir() to hold the 'privileged' pipe */ - #define WINBINDD_DOMAIN_ENV "WINBINDD_DOMAIN" /* Environment variables */ - #define WINBINDD_DONT_ENV "_NO_WINBINDD" diff --git a/samba-3.0.23rc3-passwd.patch b/samba-3.0.23rc3-passwd.patch deleted file mode 100644 index c72f78b..0000000 --- a/samba-3.0.23rc3-passwd.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- samba-3.0.20pre1/source/nsswitch/#winbindd_group.c~ 2005-06-22 15:08:05.000000000 -0400 -+++ samba-3.0.20pre1/source/nsswitch/winbindd_group.c 2005-06-22 15:08:05.000000000 -0400 -@@ -49,7 +49,7 @@ - /* Group name and password */ - - safe_strcpy(gr->gr_name, full_group_name, sizeof(gr->gr_name) - 1); -- safe_strcpy(gr->gr_passwd, "x", sizeof(gr->gr_passwd) - 1); -+ safe_strcpy(gr->gr_passwd, "*", sizeof(gr->gr_passwd) - 1); - - return True; - } diff --git a/samba-3.2.0pre1-grouppwd.patch b/samba-3.2.0pre1-grouppwd.patch new file mode 100644 index 0000000..a3534db --- /dev/null +++ b/samba-3.2.0pre1-grouppwd.patch @@ -0,0 +1,11 @@ +--- samba-3.2.0pre1/source/winbindd/winbindd_group.c.star 2007-10-03 17:40:31.000000000 -0400 ++++ samba-3.2.0pre1/source/winbindd/winbindd_group.c 2007-10-03 17:40:46.000000000 -0400 +@@ -189,7 +189,7 @@ + /* Group name and password */ + + safe_strcpy(gr->gr_name, full_group_name, sizeof(gr->gr_name) - 1); +- safe_strcpy(gr->gr_passwd, "x", sizeof(gr->gr_passwd) - 1); ++ safe_strcpy(gr->gr_passwd, "*", sizeof(gr->gr_passwd) - 1); + + return True; + } diff --git a/samba-3.2.0pre1-pipedir.patch b/samba-3.2.0pre1-pipedir.patch new file mode 100644 index 0000000..00ea3b6 --- /dev/null +++ b/samba-3.2.0pre1-pipedir.patch @@ -0,0 +1,11 @@ +--- samba-3.2.0pre1/source/nsswitch/winbind_struct_protocol.h.pipedir 2007-10-03 15:32:23.000000000 -0400 ++++ samba-3.2.0pre1/source/nsswitch/winbind_struct_protocol.h 2007-10-03 15:33:13.000000000 -0400 +@@ -24,7 +24,7 @@ + * is needed for launchd support -- jpeach. + */ + #ifndef WINBINDD_SOCKET_DIR +-#define WINBINDD_SOCKET_DIR "/tmp/.winbindd" /* Name of PF_UNIX dir */ ++#define WINBINDD_SOCKET_DIR "/var/run/winbindd" /* Name of PF_UNIX dir */ + #endif + + /* diff --git a/samba.log b/samba.log index 6415f0e..6ccd04d 100644 --- a/samba.log +++ b/samba.log @@ -1,5 +1,6 @@ -/var/log/samba/log.* { +/var/log/samba/* { notifempty + olddir /var/log/samba/old missingok sharedscripts copytruncate diff --git a/samba.spec b/samba.spec index 07459ca..e96d763 100644 --- a/samba.spec +++ b/samba.spec @@ -1,15 +1,15 @@ Summary: The Samba Suite of programs Name: samba Epoch: 0 -Version: 3.0.26a -Release: 1%{?dist} -License: GPLv2+ and LGPLv2+ +Version: 3.2.0 +Release: 0.pre1%{?dist} +License: GPLv3+ and LGPLv3+ Group: System Environment/Daemons URL: http://www.samba.org/ #TAG: change for non-pre -#Source: http://www.samba.org/samba/ftp/rc/%{name}-%{version}rc3.tar.gz -Source: http://www.samba.org/samba/ftp/samba/%{name}-%{version}.tar.gz +Source: http://download.samba.org/samba/ftp/pre/%{name}-%{version}pre1.tar.gz +#Source: http://www.samba.org/samba/ftp/samba/%{name}-%{version}.tar.gz # Red Hat specific replacement-files Source1: samba.log @@ -32,11 +32,11 @@ Source999: filter-requires-samba.sh # (none right now) # generic patches -Patch102: samba-3.0.0beta1-pipedir.patch +Patch102: samba-3.2.0pre1-pipedir.patch #Patch103: samba-3.0.23-logfiles.patch Patch104: samba-3.0.0rc3-nmbd-netbiosname.patch # The passwd part has been applied, but not the group part -Patch107: samba-3.0.23rc3-passwd.patch +Patch107: samba-3.2.0pre1-grouppwd.patch #Patch108: samba-3.0.8-non-ascii-domain.patch Patch110: samba-3.0.21pre1-smbspool.patch Patch111: samba-3.0.13-smbclient.patch @@ -133,8 +133,8 @@ develop programs that link against the SMB client library in the Samba suite. %prep # TAG: change for non-pre -#%setup -q -n samba-3.0.25rc3 -%setup -q +%setup -q -n samba-3.2.0pre1 +#%setup -q # copy Red Hat specific scripts mkdir packaging/Fedora @@ -153,20 +153,21 @@ cp %{SOURCE11} packaging/Fedora/ %patch102 -p1 -b .pipedir #%patch103 -p1 -b .logfiles %patch104 -p1 -b .nmbd-netbiosname -%patch107 -p1 -b .passwd +%patch107 -p1 -b .grouppwd #%patch108 -p1 -b .non-ascii-domain %patch110 -p1 -b .smbspool %patch111 -p1 -b .smbclient %patch200 -p0 -b .inotify -# crap -rm -f examples/VFS/.cvsignore mv source/VERSION source/VERSION.orig sed -e 's/SAMBA_VERSION_VENDOR_SUFFIX=$/&\"%{release}\"/' < source/VERSION.orig > source/VERSION cd source script/mkversion.sh cd .. +#Remove smbldap-tools, they are already packaged separately in Fedora +rm -fr examples/LDAP/smbldap-tools-*/ + %build cd source @@ -185,6 +186,7 @@ CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -DLDAP_DEPRECATED" %configure \ --with-acl-support \ --with-automount \ --with-libsmbclient \ + --with-libsmbsharemodes \ --with-mmap \ --with-pam \ --with-pam_smbpass \ @@ -192,6 +194,7 @@ CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -DLDAP_DEPRECATED" %configure \ --with-syslog \ --with-utmp \ --with-vfs \ + --with-sendfile-support \ --without-smbwrapper \ --with-lockdir=/var/lib/samba \ --with-piddir=/var/run \ @@ -202,7 +205,10 @@ CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -DLDAP_DEPRECATED" %configure \ --with-configdir=%{_sysconfdir}/samba \ --with-pammodulesdir=%{_lib}/security \ --with-swatdir=%{_datadir}/swat \ - --with-shared-modules=idmap_ad,idmap_rid \ + --with-shared-modules=idmap_ad,idmap_rid + +# --with-cluster-support \ +# --with-aio-support \ make CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -DLDAP_DEPRECATED" \ @@ -230,11 +236,12 @@ mkdir -p $RPM_BUILD_ROOT/usr/{sbin,bin} mkdir -p $RPM_BUILD_ROOT/%{_initrddir} mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/{pam.d,logrotate.d,security} mkdir -p $RPM_BUILD_ROOT/%{_lib}/security -mkdir -p $RPM_BUILD_ROOT/var/{log,spool}/samba mkdir -p $RPM_BUILD_ROOT/var/lib/samba mkdir -p $RPM_BUILD_ROOT/var/lib/samba/private mkdir -p $RPM_BUILD_ROOT/var/lib/samba/winbindd_privileged mkdir -p $RPM_BUILD_ROOT/var/lib/samba/scripts +mkdir -p $RPM_BUILD_ROOT/var/log/samba/old +mkdir -p $RPM_BUILD_ROOT/var/spool/samba mkdir -p $RPM_BUILD_ROOT/%{_datadir}/swat/using_samba mkdir -p $RPM_BUILD_ROOT/%{_datadir}/samba/codepages mkdir -p $RPM_BUILD_ROOT/var/run/winbindd @@ -283,16 +290,23 @@ ln -sf /%{_lib}/libnss_winbind.so.2 $RPM_BUILD_ROOT%{_libdir}/libnss_winbind.so install -m 755 source/nsswitch/libnss_wins.so $RPM_BUILD_ROOT/%{_lib}/libnss_wins.so.2 ln -sf /%{_lib}/libnss_wins.so.2 $RPM_BUILD_ROOT%{_libdir}/libnss_wins.so -# libsmbclient - -# make install puts libsmbclient.so in the wrong place on x86_64 -rm -f $RPM_BUILD_ROOT%{_libdir}/samba/libsmbclient.so $RPM_BUILD_ROOT%{_libdir}/samba/libsmbclient.a $RPM_BUILD_ROOT/usr/lib || true +# libraries { mkdir -p $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_includedir} + +# make install puts libraries in the wrong place +rm -f $RPM_BUILD_ROOT%{_libdir}/samba/libsmbclient.so $RPM_BUILD_ROOT%{_libdir}/samba/libsmbclient.a || true +rm -f $RPM_BUILD_ROOT%{_libdir}/samba/libsmbsharemodes.so || true + install -m 755 source/bin/libsmbclient.so $RPM_BUILD_ROOT%{_libdir}/libsmbclient.so.0 -/sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir}/ +install -m 755 source/bin/libsmbsharemodes.so $RPM_BUILD_ROOT%{_libdir}/libsmbsharemodes.so.0 ln -s libsmbclient.so.0 $RPM_BUILD_ROOT%{_libdir}/libsmbclient.so +ln -s libsmbsharemodes.so.0 $RPM_BUILD_ROOT%{_libdir}/libsmbsharemodes.so #install -m 644 source/bin/libsmbclient.a $RPM_BUILD_ROOT%{_libdir}/libsmbclient.a -install -m 644 source/include/libsmbclient.h $RPM_BUILD_ROOT%{_includedir} +#install -m 644 source/include/libsmbclient.h $RPM_BUILD_ROOT%{_includedir} + +/sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir}/ + +# } # various libs we currently remove # TODO: evaluate how to make them back by extracting the correct .h files @@ -302,8 +316,6 @@ install -m 644 source/include/libsmbclient.h $RPM_BUILD_ROOT%{_includedir} rm -f $RPM_BUILD_ROOT%{_libdir}/samba/libmsrpc.so rm -f $RPM_BUILD_ROOT%{_includedir}/libmsrpc.h -rm -f $RPM_BUILD_ROOT%{_libdir}/samba/libsmbsharemodes.so - mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d install -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/swat @@ -584,6 +596,11 @@ exit 0 %{_bindir}/tdbbackup %{_bindir}/tdbdump %{_bindir}/tdbtool +%{_bindir}/ldbadd +%{_bindir}/ldbdel +%{_bindir}/ldbedit +%{_bindir}/ldbmodify +%{_bindir}/ldbsearch %{_sbindir}/winbindd %{_libdir}/samba/idmap %{_libdir}/samba/nss_info @@ -600,6 +617,7 @@ exit 0 #%dir %{_datadir}/samba/codepages %dir %{_sysconfdir}/samba %attr(0700,root,root) %dir /var/log/samba +%attr(0700,root,root) %dir /var/log/samba/old %{_initrddir}/winbind %{_mandir}/man1/ntlm_auth.1* %{_mandir}/man1/profiles.1* @@ -633,14 +651,26 @@ exit 0 %doc docs/htmldocs %files -n libsmbclient +%{_libdir}/libsmbclient.so %{_libdir}/libsmbclient.so.0 +%{_libdir}/libsmbsharemodes.so +%{_libdir}/libsmbsharemodes.so.0 %files -n libsmbclient-devel -%{_libdir}/libsmbclient.so %{_includedir}/libsmbclient.h +%{_includedir}/smb_share_modes.h + #%{_includedir}/libmsrpc.h %changelog +* Wed Oct 8 2007 Simo Sorce 3.2.0-0.pre1.fc9 +- New major relase, minor switched from 0 to 2 +- License change, the code is now GPLv3+ +- Numerous improvements and bugfixes included +- package libsmbsharemodes too +- remove smbldap-tools as they are already packaged separately in Fedora +- Fix bug 245506 + * Tue Oct 2 2007 Simo Sorce 3.0.26a-1.fc8 - rebuild with AD DNS Update support diff --git a/sources b/sources index 468a676..9c2bbb6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6511ff23d9b1d4858744778bba543c5d samba-3.0.26a.tar.gz +146baf1484d7d45fc397b7d5da01e9ec samba-3.2.0pre1.tar.gz