Update to 3.4.8

Guenther

.cvsignore

@@ -1 +1 @@
-samba-3.3.3.tar.gz
+samba-3.4.8.tar.gz

Makefile

@@ -4,7 +4,7 @@ NAME := samba
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
 endef
 
 MAKEFILE_COMMON := $(shell $(find-makefile-common))

branch

@@ -0,0 +1 @@
+F-11

pam_winbind.conf

@@ -7,20 +7,32 @@
 [global]
 
 # turn on debugging
-;debug = yes
+;debug = no
+
+# turn on extended PAM state debugging
+;debug_state = no
 
 # request a cached login if possible
 # (needs "winbind offline logon = yes" in smb.conf)
-;cached_login = yes
+;cached_login = no
 
 # authenticate using kerberos
-;krb5_auth = yes
+;krb5_auth = no
 
 # when using kerberos, request a "FILE" krb5 credential cache type
 # (leave empty to just do krb5 authentication but not have a ticket
 # afterwards)
-;krb5_ccache_type = FILE
+;krb5_ccache_type =
 
 # make successful authentication dependend on membership of one SID
 # (can also take a name)
 ;require_membership_of =
+
+# password expiry warning period in days
+;warn_pwd_expire = 14
+
+# omit pam conversations
+;silent = no
+
+# create homedirectory on the fly
+;mkhomedir = no

samba-3.2.0pre1-grouppwd.patch

@@ -1,5 +1,5 @@
---- 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
+--- samba-3.2.0pre1/source3/winbindd/winbindd_group.c.star	2007-10-03 17:40:31.000000000 -0400
++++ samba-3.2.0pre1/source3/winbindd/winbindd_group.c	2007-10-03 17:40:46.000000000 -0400
 @@ -215,7 +215,7 @@
  	/* Group name and password */
  

samba-3.2.0pre1-pipedir.patch

@@ -1,5 +1,5 @@
---- 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
+--- samba-3.2.0pre1/nsswitch/winbind_struct_protocol.h.pipedir	2007-10-03 15:32:23.000000000 -0400
++++ samba-3.2.0pre1/nsswitch/winbind_struct_protocol.h	2007-10-03 15:33:13.000000000 -0400
 @@ -24,7 +24,7 @@
   * is needed for launchd support -- jpeach.
   */

samba-3.2.4-build.patch

@@ -1,21 +0,0 @@
-commit 1f44b4aaa5f700827ee2ab272ae4b59e559b094b
-Author: Günther Deschner <gd@samba.org>
-Date:   Fri Sep 5 14:01:45 2008 +0200
-
-    build: don't install the cifs.upcall binary twice.
-    
-    Guenther
-
-diff --git a/source/Makefile.in b/source/Makefile.in
-index 8b46ab6..b67cfe8 100644
---- a/source/Makefile.in
-+++ b/source/Makefile.in
-@@ -178,7 +178,7 @@ PATH_FLAGS = -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" \
- 
- # Note that all executable programs now provide for an optional executable suffix.
- 
--SBIN_PROGS = bin/smbd@EXEEXT@ bin/nmbd@EXEEXT@ @SWAT_SBIN_TARGETS@ @EXTRA_SBIN_PROGS@ @CIFSUPCALL_PROGS@
-+SBIN_PROGS = bin/smbd@EXEEXT@ bin/nmbd@EXEEXT@ @SWAT_SBIN_TARGETS@ @EXTRA_SBIN_PROGS@
- 
- ROOT_SBIN_PROGS = @CIFSMOUNT_PROGS@
- 

samba-3.2.5-inotify.patch

@@ -1,6 +1,6 @@
 === modified file 'source/smbd/notify_inotify.c'
---- source/smbd/notify_inotify.c	2007-03-09 12:07:58 +0000
-+++ source/smbd/notify_inotify.c	2007-04-10 16:27:47 +0000
+--- source3/smbd/notify_inotify.c	2007-03-09 12:07:58 +0000
++++ source3/smbd/notify_inotify.c	2007-04-10 16:27:47 +0000
 @@ -66,6 +66,7 @@
  	struct sys_notify_context *ctx;
  	int fd;

samba.spec

@@ -1,7 +1,7 @@
-%define main_release 34
-%define samba_version 3.3.3
-%define tdb_version 1.1.2
-%define talloc_version 1.2.0
+%define main_release 51
+%define samba_version 3.4.8
+%define tdb_version 1.1.3
+%define talloc_version 1.3.0
 %define pre_release %nil
 
 %define samba_release 0%{pre_release}.%{main_release}%{?dist}
@@ -9,6 +9,7 @@
 %define enable_talloc 0
 %define enable_tdb    0
 
+%define samba_source source3
 Summary: Server and Client software to interoperate with Windows machines
 Name: samba
 Epoch: 0
@@ -55,6 +56,12 @@ Requires(post): /sbin/chkconfig, /sbin/service
 Requires(preun): /sbin/chkconfig, /sbin/service
 BuildRequires: pam-devel, readline-devel, ncurses-devel, libacl-devel, krb5-devel, openldap-devel, openssl-devel, cups-devel, ctdb-devel
 BuildRequires: autoconf, gawk, popt-devel, gtk2-devel, libcap-devel
+%if ! %enable_talloc
+BuildRequires: libtalloc-devel >= %{talloc_version}
+%endif
+%if ! %enable_tdb
+BuildRequires: libtdb-devel >= %{tdb_version}
+%endif
 
 # Working around perl dependency problem from docs
 %define __perl_requires %{SOURCE999}
@@ -251,9 +258,9 @@ cp %{SOURCE11} packaging/Fedora/
 %patch107 -p1 -b .grouppwd
 %patch200 -p0 -b .inotify
 
-mv source/VERSION source/VERSION.orig
-sed -e 's/SAMBA_VERSION_VENDOR_SUFFIX=$/&\"%{samba_release}\"/' < source/VERSION.orig > source/VERSION
-cd source
+mv %samba_source/VERSION %samba_source/VERSION.orig
+sed -e 's/SAMBA_VERSION_VENDOR_SUFFIX=$/&\"%{samba_release}\"/' < %samba_source/VERSION.orig > %samba_source/VERSION
+cd %samba_source
 script/mkversion.sh
 cd ..
 
@@ -262,7 +269,7 @@ rm -fr examples/LDAP/smbldap-tools-*/
 
 
 %build
-cd source
+cd %samba_source
 sh autogen.sh
 %ifarch i386 sparc
 RPM_OPT_FLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64"
@@ -301,26 +308,23 @@ 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,idmap_adex,idmap_hash \
+	--with-shared-modules=idmap_ad,idmap_rid,idmap_adex,idmap_hash,idmap_tdb2 \
 	--with-cifsupcall \
 	--with-cluster-support
-
 #	--with-aio-support \
 
 
-make  CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -DLDAP_DEPRECATED" \
-	pch
+make  pch
 
-make  LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{samba_version}/source/bin \
-	CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -DLDAP_DEPRECATED" %{?_smp_mflags} \
-	all nsswitch/libnss_wins.so modules test_pam_modules test_nss_modules test_shlibs
+make  LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{samba_version}%{pre_release}/%samba_source/bin \
+	%{?_smp_mflags} \
+	all ../nsswitch/libnss_wins.so modules test_pam_modules test_nss_modules test_shlibs
 
-make  LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{samba_version}/source/bin \
-	CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -DLDAP_DEPRECATED" %{?_smp_mflags} \
+make  LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{samba_version}%{pre_release}/%samba_source/bin \
+	%{?_smp_mflags} \
 	-C lib/netapi/examples
 
-make  CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" \
-	debug2html smbfilter bin/cifs.upcall
+make  debug2html smbfilter bin/cifs.upcall
 
 
 %install
@@ -342,7 +346,7 @@ mkdir -p $RPM_BUILD_ROOT/var/run/winbindd
 mkdir -p $RPM_BUILD_ROOT/%{_libdir}/samba
 mkdir -p $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
 
-cd source
+cd %samba_source
 
 %makeinstall \
 	BINDIR=$RPM_BUILD_ROOT%{_bindir} \
@@ -366,7 +370,7 @@ cd ..
 
 # Install other stuff
 install -m644 packaging/Fedora/smb.conf.default $RPM_BUILD_ROOT%{_sysconfdir}/samba/smb.conf
-install -m755 source/script/mksmbpasswd.sh $RPM_BUILD_ROOT%{_bindir}
+install -m755 %samba_source/script/mksmbpasswd.sh $RPM_BUILD_ROOT%{_bindir}
 install -m644 packaging/Fedora/smbusers $RPM_BUILD_ROOT%{_sysconfdir}/samba/smbusers
 install -m755 packaging/Fedora/smbprint $RPM_BUILD_ROOT%{_bindir}
 install -m755 packaging/Fedora/smb.init $RPM_BUILD_ROOT%{_initrddir}/smb
@@ -382,39 +386,39 @@ install -m644 examples/LDAP/samba.schema $RPM_BUILD_ROOT%{_sysconfdir}/openldap/
 
 # winbind
 mkdir -p $RPM_BUILD_ROOT%{_libdir}
-install -m 755 source/nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/%{_lib}/libnss_winbind.so.2
+install -m 755 nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/%{_lib}/libnss_winbind.so.2
 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
+install -m 755 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
 
 # libraries {
 mkdir -p $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_includedir}
+build_libdir="$RPM_BUILD_ROOT%{_libdir}"
 
 %if %enable_talloc
 # talloc
-cd source/lib/talloc
+cd lib/talloc
 # just to get the correct .pc file generated
 ./autogen.sh && ./configure --prefix=%{_prefix} --libdir=%{_libdir}
-cd ../../..
-install -m 644 source/lib/talloc/talloc.pc $build_libdir/pkgconfig/
+cd ../..
+install -m 644 lib/talloc/talloc.pc $build_libdir/pkgconfig/
 %endif
 
 %if %enable_tdb
 # tdb
-cd source/lib/tdb
+cd lib/tdb
 # just to get the correct .pc file generated
 ./autogen.sh && ./configure --prefix=%{_prefix} --libdir=%{_libdir}
-cd ../../..
-install -m 644 source/lib/tdb/tdb.pc $build_libdir/pkgconfig/
+cd ../..
+install -m 644 lib/tdb/tdb.pc $build_libdir/pkgconfig/
 %endif
 
 # make install puts libraries in the wrong place
 # (but at least gets the versioning right now)
 
 list="smbclient smbsharemodes netapi talloc tdb wbclient"
-build_libdir="$RPM_BUILD_ROOT%{_libdir}"
 for i in $list; do
-	install -m 644 source/pkgconfig/$i.pc $build_libdir/pkgconfig/ || true
+	install -m 644 %samba_source/pkgconfig/$i.pc $build_libdir/pkgconfig/ || true
 done
 
 
@@ -430,11 +434,11 @@ install -m644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/samba
 install -m755 $RPM_BUILD_ROOT/usr/sbin/mount.cifs $RPM_BUILD_ROOT/sbin/mount.cifs
 install -m755 $RPM_BUILD_ROOT/usr/sbin/umount.cifs $RPM_BUILD_ROOT/sbin/umount.cifs
 
-install -m 755 source/lib/netapi/examples/bin/netdomjoin-gui $RPM_BUILD_ROOT/%{_sbindir}/netdomjoin-gui
+install -m 755 %samba_source/lib/netapi/examples/bin/netdomjoin-gui $RPM_BUILD_ROOT/%{_sbindir}/netdomjoin-gui
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}
-install -m 644 source/lib/netapi/examples/netdomjoin-gui/samba.ico $RPM_BUILD_ROOT/%{_datadir}/pixmaps/%{name}/samba.ico
-install -m 644 source/lib/netapi/examples/netdomjoin-gui/logo.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/%{name}/logo.png
-install -m 644 source/lib/netapi/examples/netdomjoin-gui/logo-small.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/%{name}/logo-small.png
+install -m 644 %samba_source/lib/netapi/examples/netdomjoin-gui/samba.ico $RPM_BUILD_ROOT/%{_datadir}/pixmaps/%{name}/samba.ico
+install -m 644 %samba_source/lib/netapi/examples/netdomjoin-gui/logo.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/%{name}/logo.png
+install -m 644 %samba_source/lib/netapi/examples/netdomjoin-gui/logo-small.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/%{name}/logo-small.png
 
 rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/editreg.1*
 rm -f $RPM_BUILD_ROOT%{_mandir}/man1/log2pcap.1*
@@ -814,7 +818,7 @@ exit 0
 %{_initrddir}/winbind
 %{_mandir}/man1/ntlm_auth.1*
 %{_mandir}/man1/wbinfo.1*
-%{_mandir}/man7/pam_winbind.7*
+%{_mandir}/man8/pam_winbind.8*
 %{_mandir}/man7/winbind_krb5_locator.7*
 %{_mandir}/man8/winbindd.8*
 %{_mandir}/man8/idmap_*.8*
@@ -879,6 +883,66 @@ exit 0
 %{_datadir}/pixmaps/samba/logo-small.png
 
 %changelog
+* Wed May 12 2010 Guenther Deschner <gdeschner@redhat.com> - 3.4.8-0.51
+- Update to 3.4.8
+
+* Mon Mar 08 2010 Simo Sorce <ssorce@redhat.com> - 3.4.7-50
+- Security update to 3.4.7
+- Fixes CVE-2010-0728
+
+* Wed Feb 24 2010 Guenther Deschner <gdeschner@redhat.com> - 3.4.6-0.49
+- Update to 3.4.6
+
+* Wed Feb 17 2010 Guenther Deschner <gdeschner@redhat.com> - 3.4.5-0.48
+- Fix crash in cifs.upcall
+- resolves: #565446
+- Fix crash in pdbedit
+- resolves: #541267
+
+* Wed Jan 26 2010 Guenther Deschner <gdeschner@redhat.com> - 3.4.5-0.47
+- Security Release, fixes CVE-2009-3297
+- resolves: #532940
+
+* Tue Jan 19 2010 Guenther Deschner <gdeschner@redhat.com> - 3.4.5-0.46
+- Update to 3.4.5
+
+* Thu Jan 07 2010 Guenther Deschner <gdeschner@redhat.com> - 3.4.4-0.45
+- Update to 3.4.4
+
+* Thu Oct 29 2009 Guenther Deschner <gdeschner@redhat.com> - 3.4.3-0.44
+- Update to 3.4.3
+
+* Wed Oct 07 2009 Guenther Deschner <gdeschner@redhat.com> - 3.4.2-0.43
+- Fix required talloc version
+- resolves: #527806
+
+* Thu Oct 01 2009 Guenther Deschner <gdeschner@redhat.com> - 3.4.2-0.42
+- Update to 3.4.2
+- Security Release, fixes CVE-2009-2813, CVE-2009-2948 and CVE-2009-2906
+
+* Wed Sep 09 2009 Guenther Deschner <gdeschner@redhat.com> - 3.4.1.0-41
+- Update to 3.4.1
+
+* Fri Jul 17 2009 Guenther Deschner <gdeschner@redhat.com> - 3.4.0-0.40
+- Fix Bug #6551 (vuid and tid not set in sessionsetupX and tconX)
+- Specify required talloc and tdb version for BuildRequires
+
+* Wed Jul 15 2009 Guenther Deschner <gdeschner@redhat.com> - 3.4.0-0.39
+- Update to 3.4.0
+- resolves: #510558
+
+* Fri Jun 19 2009 Guenther Deschner <gdeschner@redhat.com> - 3.3.5-0.38
+- Fix password expiry calculation in pam_winbind
+
+* Tue Jun 16 2009 Guenther Deschner <gdeschner@redhat.com> - 3.3.5-0.37
+- Update to 3.3.5
+
+* Wed Apr 29 2009 Guenther Deschner <gdeschner@redhat.com> - 3.3.4-0.36
+- Update to 3.3.4
+
+* Mon Apr 20 2009 Guenther Deschner <gdeschner@redhat.com> - 3.3.3-0.35
+- Enable build of idmap_tdb2 for clustered setups
+
 * Wed Apr  1 2009 Guenther Deschner <gdeschner@redhat.com> - 3.3.3-0.34
 - Update to 3.3.3
 

sources

@@ -1 +1 @@
-4d5835817416d1ffa30783af45c5a9ed  samba-3.3.3.tar.gz
+fe1f6c77be289fd65e19419c1bcaa42c  samba-3.4.8.tar.gz