From 9276a57350b8f60cf93e9cb39261969481974a89 Mon Sep 17 00:00:00 2001 From: Guenther Deschner Date: Thu, 30 Apr 2009 12:51:27 +0000 Subject: [PATCH] Update to 3.4.0pre1. Guenther --- .cvsignore | 2 +- samba-3.2.0pre1-grouppwd.patch | 4 +- samba-3.2.0pre1-pipedir.patch | 4 +- samba-3.2.5-inotify.patch | 4 +- samba-3.4.0pre1-nss_wins.patch | 28 ++++++++++++++ samba.spec | 67 ++++++++++++++++++---------------- sources | 2 +- 7 files changed, 72 insertions(+), 39 deletions(-) create mode 100644 samba-3.4.0pre1-nss_wins.patch diff --git a/.cvsignore b/.cvsignore index 8483b03..d12cf2c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -samba-3.3.4.tar.gz +samba-3.4.0pre1.tar.gz diff --git a/samba-3.2.0pre1-grouppwd.patch b/samba-3.2.0pre1-grouppwd.patch index be0dd0a..12c9e80 100644 --- a/samba-3.2.0pre1-grouppwd.patch +++ b/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 */ diff --git a/samba-3.2.0pre1-pipedir.patch b/samba-3.2.0pre1-pipedir.patch index 00ea3b6..9fa13ea 100644 --- a/samba-3.2.0pre1-pipedir.patch +++ b/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. */ diff --git a/samba-3.2.5-inotify.patch b/samba-3.2.5-inotify.patch index 2448479..8e6ebb2 100644 --- a/samba-3.2.5-inotify.patch +++ b/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; diff --git a/samba-3.4.0pre1-nss_wins.patch b/samba-3.4.0pre1-nss_wins.patch new file mode 100644 index 0000000..4c76523 --- /dev/null +++ b/samba-3.4.0pre1-nss_wins.patch @@ -0,0 +1,28 @@ +commit eee446a94841a5df97b3a47c7076ef52fb5ccdcf +Author: Günther Deschner +AuthorDate: Thu Apr 30 14:16:01 2009 +0200 +Commit: Günther Deschner +CommitDate: Thu Apr 30 14:18:09 2009 +0200 + + s3-nss_wins: Fix unresolved ldb symbols in libnss_wins.so. + + The objects for this module should probably be cleaned up once. + + Guenther +--- + source3/Makefile.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/source3/Makefile.in b/source3/Makefile.in +index f765818..8bf29dd 100644 +--- a/source3/Makefile.in ++++ b/source3/Makefile.in +@@ -1063,7 +1063,7 @@ SMBFILTER_OBJ = utils/smbfilter.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(LDB_OBJ) \ + + WINBIND_WINS_NSS_OBJ = ../nsswitch/wins.o $(PARAM_OBJ) \ + $(LIBSMB_OBJ) $(LIB_NONSMBD_OBJ) $(NSSWINS_OBJ) $(KRBCLIENT_OBJ) \ +- $(LIBNDR_GEN_OBJ0) ++ $(LIBNDR_GEN_OBJ0) $(LDB_OBJ) + + PAM_SMBPASS_OBJ_0 = pam_smbpass/pam_smb_auth.o pam_smbpass/pam_smb_passwd.o \ + pam_smbpass/pam_smb_acct.o pam_smbpass/support.o diff --git a/samba.spec b/samba.spec index 9134726..d896bd2 100644 --- a/samba.spec +++ b/samba.spec @@ -1,14 +1,16 @@ -%define main_release 36 -%define samba_version 3.3.4 +%define main_release 37 +%define samba_version 3.4.0 %define tdb_version 1.1.2 %define talloc_version 1.2.0 -%define pre_release %nil +#%define pre_release %nil +%define pre_release pre1 %define samba_release 0%{pre_release}.%{main_release}%{?dist} %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 @@ -46,6 +48,7 @@ Patch104: samba-3.0.0rc3-nmbd-netbiosname.patch # The passwd part has been applied, but not the group part Patch107: samba-3.2.0pre1-grouppwd.patch Patch200: samba-3.2.5-inotify.patch +Patch201: samba-3.4.0pre1-nss_wins.patch Requires(pre): samba-common = %{epoch}:%{samba_version}-%{release} Requires: pam >= 0:0.64 @@ -250,10 +253,11 @@ cp %{SOURCE11} packaging/Fedora/ #%patch104 -p1 -b .nmbd-netbiosname # FIXME: does not apply %patch107 -p1 -b .grouppwd %patch200 -p0 -b .inotify +%patch201 -p1 -b .nss_wins -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 +266,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" @@ -308,19 +312,17 @@ CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -DLDAP_DEPRECATED" %configure \ # --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 +344,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 +368,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,9 +384,9 @@ 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 { @@ -392,20 +394,20 @@ mkdir -p $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_includedir} %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 @@ -414,7 +416,7 @@ install -m 644 source/lib/tdb/tdb.pc $build_libdir/pkgconfig/ 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 +432,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* @@ -879,6 +881,9 @@ exit 0 %{_datadir}/pixmaps/samba/logo-small.png %changelog +* Thu Apr 30 2009 Guenther Deschner - 3.4.0pre1-0.36 +- Update to 3.4.0pre1 + * Wed Apr 29 2009 Guenther Deschner - 3.3.4-0.36 - Update to 3.3.4 diff --git a/sources b/sources index 63e6ea0..7ed9849 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1443165edb7cb3f56f1e77aec1ee3266 samba-3.3.4.tar.gz +144f28202edef96b87f31db9cdd0cf5b samba-3.4.0pre1.tar.gz