rpms/samba/FC-4 samba-3.0.21pre1-smbspool.patch, NONE, 1.1 samba-3.0.23-logfiles.patch, NONE, 1.1 samba-3.0.23-smb.conf.patch, NONE, 1.1 samba-3.0.23rc3-passwd.patch, NONE, 1.1 .cvsignore, 1.24, 1.25 filter-requires-samba.sh, 1.3, 1.4 samba.spec, 1.51, 1.52 smb.init, 1.5, 1.6 sources, 1.26, 1.27 samba-3.0.12pre1-logfiles.patch, 1.1, NONE samba-3.0.4-smb.conf.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Jul 13 00:30:13 UTC 2006
Author: fenlason
Update of /cvs/dist/rpms/samba/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv13975
Modified Files:
.cvsignore filter-requires-samba.sh samba.spec smb.init
sources
Added Files:
samba-3.0.21pre1-smbspool.patch samba-3.0.23-logfiles.patch
samba-3.0.23-smb.conf.patch samba-3.0.23rc3-passwd.patch
Removed Files:
samba-3.0.12pre1-logfiles.patch samba-3.0.4-smb.conf.patch
Log Message:
3.0.23
samba-3.0.21pre1-smbspool.patch:
smbspool.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE samba-3.0.21pre1-smbspool.patch ---
--- samba-3.0.21pre1/source/client/smbspool.c.smbspool 2005-10-17 22:45:07.000000000 -0400
+++ samba-3.0.21pre1/source/client/smbspool.c 2005-10-18 23:46:53.000000000 -0400
@@ -165,7 +165,7 @@
}
else
{
- username = null_str;
+ username = "dummy";
password = null_str;
server = uri + 6;
}
samba-3.0.23-logfiles.patch:
samba-3.0.11/packaging/Fedora/samba.log | 2 +-
samba-3.0.23/packaging/Fedora/smb.conf | 2 +-
samba-3.0.23rc2/source/lib/popt_common.c | 2 +-
samba-3.0.8pre1/source/nmbd/nmbd.c | 2 +-
samba-3.0.8pre1/source/nsswitch/winbindd.c | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
--- NEW FILE samba-3.0.23-logfiles.patch ---
--- samba-3.0.23rc2/source/lib/popt_common.c.logfiles 2006-06-09 15:30:31.000000000 -0400
+++ samba-3.0.23rc2/source/lib/popt_common.c 2006-06-14 12:20:02.000000000 -0400
@@ -54,7 +54,7 @@
else
pname++;
- pstr_sprintf(logfile, "%s/log.%s", arg, pname);
+ pstr_sprintf(logfile, "%s/%s.log", arg, pname);
lp_set_logfile(logfile);
}
--- samba-3.0.8pre1/source/nmbd/nmbd.c.logfiles 2004-09-22 08:42:14.000000000 -0400
+++ samba-3.0.8pre1/source/nmbd/nmbd.c 2004-09-27 14:16:59.000000000 -0400
@@ -626,7 +626,7 @@
sys_srandom(time(NULL) ^ sys_getpid());
if (!override_logfile) {
- slprintf(logfile, sizeof(logfile)-1, "%s/log.nmbd", dyn_LOGFILEBASE);
+ slprintf(logfile, sizeof(logfile)-1, "%s/nmbd.log", dyn_LOGFILEBASE);
lp_set_logfile(logfile);
}
--- samba-3.0.8pre1/source/nsswitch/winbindd.c.logfiles 2004-09-22 08:42:13.000000000 -0400
+++ samba-3.0.8pre1/source/nsswitch/winbindd.c 2004-09-27 14:17:35.000000000 -0400
@@ -856,7 +856,7 @@
}
if (!override_logfile) {
- pstr_sprintf(logfile, "%s/log.winbindd", dyn_LOGFILEBASE);
+ pstr_sprintf(logfile, "%s/winbindd.log", dyn_LOGFILEBASE);
lp_set_logfile(logfile);
}
setup_logging("winbindd", log_stdout);
--- samba-3.0.11/packaging/Fedora/samba.log.logfiles 2005-02-03 22:07:48.000000000 -0500
+++ samba-3.0.11/packaging/Fedora/samba.log 2005-02-04 16:17:00.000000000 -0500
@@ -1,4 +1,4 @@
-/var/log/samba/*.log /var/log/samba/log.smbd /var/log/samba/log.nmbd {
+/var/log/samba/*.log {
notifempty
missingok
sharedscripts
--- samba-3.0.23/packaging/Fedora/smb.conf.logfiles 2006-07-11 11:23:52.000000000 -0400
+++ samba-3.0.23/packaging/Fedora/smb.conf 2006-07-11 11:27:00.000000000 -0400
@@ -63,7 +63,7 @@
# this tells Samba to use a separate log file for each machine
# that connects
- log file = /usr/local/samba/var/log.%m
+ log file = /usr/local/samba/var/%m.log
# Put a capping on the size of the log files (in Kb).
max log size = 50
samba-3.0.23-smb.conf.patch:
smb.conf | 3 +++
1 files changed, 3 insertions(+)
--- NEW FILE samba-3.0.23-smb.conf.patch ---
--- samba-3.0.23/packaging/Fedora/smb.conf.upstream 2006-07-11 11:29:05.000000000 -0400
+++ samba-3.0.23/packaging/Fedora/smb.conf 2006-07-11 11:30:45.000000000 -0400
@@ -57,6 +57,9 @@
# bsd, cups, sysv, plp, lprng, aix, hpux, qnx
; printing = cups
+# This option tells cups that the data has already been rasterized
+cups options = raw
+
# Uncomment this if you want a guest account, you must add this to /etc/passwd
# otherwise the user "nobody" is used
; guest account = pcguest
samba-3.0.23rc3-passwd.patch:
winbindd_group.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE samba-3.0.23rc3-passwd.patch ---
--- 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;
}
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/samba/FC-4/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore 2 May 2005 19:36:01 -0000 1.24
+++ .cvsignore 13 Jul 2006 00:30:01 -0000 1.25
@@ -1 +1 @@
-samba-3.0.14a.tar.gz
+samba-3.0.23.tar.gz
Index: filter-requires-samba.sh
===================================================================
RCS file: /cvs/dist/rpms/samba/FC-4/filter-requires-samba.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- filter-requires-samba.sh 24 Feb 2005 19:14:18 -0000 1.3
+++ filter-requires-samba.sh 13 Jul 2006 00:30:01 -0000 1.4
@@ -1,4 +1,4 @@
#!/bin/sh
-/usr/lib/rpm/perl.req $* | grep -E -v '(Net::LDAP|Crypt::SmbHash|CGI)'
+/usr/lib/rpm/perl.req $* | grep -E -v '(Net::LDAP|Crypt::SmbHash|CGI|Unicode::MapUTF8)'
Index: samba.spec
===================================================================
RCS file: /cvs/dist/rpms/samba/FC-4/samba.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- samba.spec 2 May 2005 19:36:01 -0000 1.51
+++ samba.spec 13 Jul 2006 00:30:01 -0000 1.52
@@ -2,15 +2,15 @@
Summary: The Samba SMB server.
Name: samba
-Version: 3.0.14a
-Release: 2
+Version: 3.0.23
+Release: 1.fc4
Epoch: 0
License: GNU GPL Version 2
Group: System Environment/Daemons
URL: http://www.samba.org/
#TAG: change for non-pre
-#Source: ftp://us2.samba.org/pub/samba/%{name}-%{version}pre2.tar.gz
+#Source: ftp://us2.samba.org/pub/samba/%{name}-%{version}rc2.tar.gz
Source: ftp://us2.samba.org/pub/samba/%{name}-%{version}.tar.gz
# Red Hat specific replacement-files
@@ -26,31 +26,31 @@
# Don't depend on Net::LDAP
Source999: filter-requires-samba.sh
+# upstream patches. Applied first so that they'll break our patches rather
+# than the other way around
+# (none at the moment)
+
# generic patches
-Patch1: samba-2.2.0-smbw.patch
-Patch2: samba-3.0.0beta1-pipedir.patch
-Patch3: samba-3.0.12pre1-logfiles.patch
-Patch4: samba-3.0.11rc1-pie.patch
-Patch5: samba-3.0.0rc3-nmbd-netbiosname.patch
-Patch6: samba-3.0.4-smb.conf.patch
-Patch7: samba-3.0.13-man.patch
-Patch8: samba-3.0.4-warning.patch
-Patch9: samba-3.0.5rc1-passwd.patch
-#Patch11: samba-3.0.8-non-ascii-domain.patch
-Patch12: samba-3.0.4-install.mount.smbfs.patch
-Patch13: samba-3.0.10-delim.patch
-Patch14: samba-3.0.9-smbspool.patch
-Patch15: samba-3.0.12rc1-gcc4.patch
-Patch16: samba-3.0.12pre1-quoting.patch
-Patch17: samba-3.0.13-smbclient.patch
+Patch101: samba-2.2.0-smbw.patch
+Patch102: samba-3.0.0beta1-pipedir.patch
+Patch103: samba-3.0.23-logfiles.patch
+Patch104: samba-3.0.0rc3-nmbd-netbiosname.patch
+Patch105: samba-3.0.23-smb.conf.patch
+Patch106: samba-3.0.20pre1-man.patch
+Patch107: samba-3.0.23rc3-passwd.patch
+#Patch108: samba-3.0.8-non-ascii-domain.patch
+#Patch109: samba-3.0.4-install.mount.smbfs.patch
+Patch110: samba-3.0.21pre1-smbspool.patch
+Patch111: samba-3.0.13-smbclient.patch
+Patch112: samba-3.0.15pre2-bug106483.patch
-Requires: pam >= 0:0.64 %{auth} samba-common = %{epoch}:%{version}
+Requires: pam >= 0:0.64 %{auth} samba-common = %{epoch}:%{version}-%{release}
Requires: logrotate >= 0:3.4 initscripts >= 0:5.54-1
BuildRoot: %{_tmppath}/%{name}-%{version}-root
Prereq: /sbin/chkconfig /bin/mktemp /usr/bin/killall
Prereq: fileutils sed /etc/init.d
-BuildRequires: pam-devel, readline-devel, ncurses-devel, fileutils, libacl-devel krb5-devel openldap-devel openssl-devel cups-devel
-
+BuildRequires: pam-devel, readline-devel, ncurses-devel, fileutils, libacl-devel krb5-devel openldap-devel openssl-devel cups-devel gnutls-devel
+BuildRequires: autoconf, libtool
# Working around perl dependency problem from docs
%define __perl_requires %{SOURCE999}
@@ -70,7 +70,7 @@
%package client
Summary: Samba (SMB) client programs.
Group: Applications/System
-Requires: samba-common = %{epoch}:%{version}
+Requires: samba-common = %{epoch}:%{version}-%{release}
Obsoletes: smbfs
%description client
@@ -89,7 +89,7 @@
%package swat
Summary: The Samba SMB server configuration program.
Group: Applications/System
-Requires: samba = %{epoch}:%{version} xinetd
+Requires: samba = %{epoch}:%{version}-%{release} xinetd
%description swat
The samba-swat package includes the new SWAT (Samba Web Administration
@@ -98,31 +98,33 @@
%prep
# TAG: change for non-pre
-#% setup -q -n samba-3.0.15pre2
+# % setup -q -n samba-3.0.20rc2
%setup -q
# copy Red Hat specific scripts
-cp %{SOURCE5} packaging/RedHat/
-cp %{SOURCE6} packaging/RedHat/
-cp %{SOURCE7} packaging/RedHat/
-cp %{SOURCE8} packaging/RedHat/winbind.init
-
-%patch1 -p1 -b .smbw
-%patch2 -p1 -b .pipedir
-%patch3 -p1 -b .logfiles
-%patch4 -p1 -b .pie
-%patch5 -p1 -b .nmbd-netbiosname
-%patch6 -p1 -b .upstream
-%patch7 -p1 -b .man
-%patch8 -p1 -b .warning
-%patch9 -p1 -b .passwd
-#%patch11 -p1 -b .non-ascii-domain
-%patch12 -p1 -b .install.mount.smbfs
-%patch13 -p1 -b .delim
-%patch14 -p1 -b .smbspool
-%patch15 -p1 -b .gcc4
-%patch16 -p1 -b .quoting
-%patch17 -p1 -b .smbclient
+mkdir packaging/Fedora
+cp packaging/RedHat-9/{samba.log,smb.conf,smbusers,samba.pamd.stack} packaging/Fedora/
+cp %{SOURCE5} packaging/Fedora/
+cp %{SOURCE6} packaging/Fedora/
+cp %{SOURCE7} packaging/Fedora/
+cp %{SOURCE8} packaging/Fedora/winbind.init
+
+# Upstream patches
+#(none)
+
+# generic patches
+%patch101 -p1 -b .smbw
+%patch102 -p1 -b .pipedir
+%patch103 -p1 -b .logfiles
+%patch104 -p1 -b .nmbd-netbiosname
+%patch105 -p1 -b .upstream
+%patch106 -p1 -b .man
+%patch107 -p1 -b .passwd
+#%patch108 -p1 -b .non-ascii-domain
+#%patch109 -p1 -b .install.mount.smbfs
+%patch110 -p1 -b .smbspool
+%patch111 -p1 -b .smbclient
+%patch112 -p1 -b .bug106483
# crap
rm -f examples/VFS/.cvsignore
@@ -133,8 +135,8 @@
cd ..
%build
-
cd source
+sh autogen.sh
%ifarch i386 sparc
RPM_OPT_FLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64"
%endif
@@ -144,7 +146,7 @@
autoconf
EXTRA="-D_LARGEFILE64_SOURCE"
%endif
-CFLAGS=-D_GNU_SOURCE %configure \
+CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -DLDAP_DEPRECATED" %configure \
--with-acl-support \
--with-automount \
--with-libsmbclient \
@@ -165,12 +167,13 @@
--with-libdir=%{_libdir}/samba \
--with-configdir=%{_sysconfdir}/samba \
--with-swatdir=%{_datadir}/swat \
+ --with-shared-modules=idmap_ad,idmap_rid \
-make CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" \
+make CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -DLDAP_DEPRECATED" \
proto
-make CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" %{?_smp_mflags} \
+make CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -DLDAP_DEPRECATED" %{?_smp_mflags} \
all nsswitch/libnss_wins.so modules
make CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" \
@@ -180,6 +183,9 @@
smbfilter
( cd client ; gcc -o mount.cifs $RPM_OPT_FLAGS -Wall -O -D_GNU_SOURCE -D_LARGEFILE64_SOURCE mount.cifs.c )
+( cd client ; gcc -o umount.cifs $RPM_OPT_FLAGS -Wall -O -D_GNU_SOURCE -D_LARGEFILE64_SOURCE umount.cifs.c )
+
+
%install
rm -rf $RPM_BUILD_ROOT
@@ -216,14 +222,14 @@
cd ..
# Install other stuff
-install -m644 packaging/RedHat/smb.conf $RPM_BUILD_ROOT%{_sysconfdir}/samba/smb.conf
+install -m644 packaging/Fedora/smb.conf $RPM_BUILD_ROOT%{_sysconfdir}/samba/smb.conf
install -m755 source/script/mksmbpasswd.sh $RPM_BUILD_ROOT%{_bindir}
-install -m644 packaging/RedHat/smbusers $RPM_BUILD_ROOT/etc/samba/smbusers
-install -m755 packaging/RedHat/smbprint $RPM_BUILD_ROOT%{_bindir}
-install -m755 packaging/RedHat/smb.init $RPM_BUILD_ROOT%{_initrddir}/smb
-install -m755 packaging/RedHat/winbind.init $RPM_BUILD_ROOT%{_initrddir}/winbind
-ln -s ../..%{_initrddir}/smb $RPM_BUILD_ROOT%{_sbindir}/samba
-install -m644 packaging/RedHat/samba.pamd.stack $RPM_BUILD_ROOT/etc/pam.d/samba
+install -m644 packaging/Fedora/smbusers $RPM_BUILD_ROOT/etc/samba/smbusers
+install -m755 packaging/Fedora/smbprint $RPM_BUILD_ROOT%{_bindir}
+install -m755 packaging/Fedora/smb.init $RPM_BUILD_ROOT%{_initrddir}/smb
+install -m755 packaging/Fedora/winbind.init $RPM_BUILD_ROOT%{_initrddir}/winbind
+#ln -s ../..%{_initrddir}/smb $RPM_BUILD_ROOT%{_sbindir}/samba
+install -m644 packaging/Fedora/samba.pamd.stack $RPM_BUILD_ROOT/etc/pam.d/samba
install -m644 %{SOURCE1} $RPM_BUILD_ROOT/etc/logrotate.d/samba
ln -s ../usr/bin/smbmount $RPM_BUILD_ROOT/sbin/mount.smb
ln -s ../usr/bin/smbmount $RPM_BUILD_ROOT/sbin/mount.smbfs
@@ -231,11 +237,10 @@
# pam_smbpass
mkdir -p $RPM_BUILD_ROOT/%{_lib}/security
-mv source/bin/pam_smbpass.so $RPM_BUILD_ROOT/%{_lib}/security/pam_smbpass.so
+install -m 755 source/bin/pam_smbpass.so $RPM_BUILD_ROOT/%{_lib}/security/pam_smbpass.so
+install -m 755 source/bin/pam_winbind.so $RPM_BUILD_ROOT/%{_lib}/security/pam_winbind.so
# winbind
-mkdir -p $RPM_BUILD_ROOT/%{_lib}/security
-install -m 755 source/nsswitch/pam_winbind.so $RPM_BUILD_ROOT/%{_lib}/security/pam_winbind.so
mkdir -p $RPM_BUILD_ROOT%{_libdir}
install -m 755 source/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
@@ -258,13 +263,17 @@
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
install -m644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/samba
install -m755 source/client/mount.cifs $RPM_BUILD_ROOT/sbin/mount.cifs
+install -m755 source/client/umount.cifs $RPM_BUILD_ROOT/sbin/umount.cifs
rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/editreg.1*
rm -f $RPM_BUILD_ROOT%{_mandir}/man1/log2pcap.1*
rm -f $RPM_BUILD_ROOT%{_mandir}/man1/smbsh.1*
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/smbget.1*
rm -f $RPM_BUILD_ROOT%{_mandir}/man5/smbgetrc.5*
-#rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/mount.cifs.8*
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/testprns.1*
+
+# why are these getting installed in the wrong place?
+rm -f $RPM_BUILD_ROOT%{_libdir}/samba/security/pam_{smbpass,winbind}.so
+rm -f $RPM_BUILD_ROOT%{_sbindir}/{u,}mount.cifs
%clean
rm -rf $RPM_BUILD_ROOT
@@ -307,8 +316,8 @@
%defattr(-,root,root)
%doc README COPYING Manifest
%doc WHATSNEW.txt Roadmap
-%doc docs/REVISION docs/Samba-Developers-Guide.pdf docs/Samba-Guide.pdf
-%doc docs/Samba-HOWTO-Collection.pdf docs/THANKS docs/history
+%doc docs/REVISION docs/Samba3-Developers-Guide.pdf docs/Samba3-ByExample.pdf
+%doc docs/Samba3-HOWTO.pdf docs/THANKS docs/history
%doc docs/htmldocs
%doc docs/registry
%doc examples/autofs examples/LDAP examples/libsmbclient examples/misc examples/printer-accounting
@@ -316,11 +325,9 @@
%{_sbindir}/smbd
%{_sbindir}/nmbd
-# %{_bindir}/make_unicodemap
%{_bindir}/mksmbpasswd.sh
%{_bindir}/smbcontrol
%{_bindir}/smbstatus
-# %{_bindir}/smbadduser
%{_bindir}/tdbbackup
%{_bindir}/tdbdump
%{_bindir}/tdbtool
@@ -329,7 +336,6 @@
%attr(755,root,root) %config %{_initrddir}/smb
%config(noreplace) %{_sysconfdir}/logrotate.d/samba
%config(noreplace) %{_sysconfdir}/pam.d/samba
-# %{_mandir}/man1/make_unicodemap.1*
%{_mandir}/man1/smbcontrol.1*
%{_mandir}/man1/smbstatus.1*
%{_mandir}/man5/smbpasswd.5*
@@ -339,11 +345,6 @@
%{_mandir}/man8/smbd.8*
%{_mandir}/man8/tdbbackup.8*
%{_mandir}/man8/tdbdump.8*
-#%{_mandir}/ja/man1/smbstatus.1*
-#%{_mandir}/ja/man5/smbpasswd.5*
-#%{_mandir}/ja/man7/samba.7*
-#%{_mandir}/ja/man8/smbd.8*
-#%{_mandir}/ja/man8/nmbd.8*
%{_libdir}/samba/vfs
%attr(1777,root,root) %dir /var/spool/samba
@@ -354,7 +355,6 @@
%{_datadir}/swat
%{_sbindir}/swat
%{_mandir}/man8/swat.8*
-#%{_mandir}/ja/man8/swat.8*
%attr(755,root,root) %{_libdir}/samba/*.msg
%files client
@@ -362,17 +362,21 @@
/sbin/mount.smb
/sbin/mount.smbfs
/sbin/mount.cifs
+/sbin/umount.cifs
%{_bindir}/rpcclient
%{_bindir}/smbcacls
%{_bindir}/smbmount
%{_bindir}/smbmnt
%{_bindir}/smbumount
%{_bindir}/findsmb
+%{_bindir}/smbget
+%{_bindir}/eventlogadm
%{_mandir}/man8/smbmnt.8*
%{_mandir}/man8/smbmount.8*
%{_mandir}/man8/smbumount.8*
%{_mandir}/man8/smbspool.8*
%{_mandir}/man8/mount.cifs.8*
+%{_mandir}/man8/umount.cifs.8*
%{_bindir}/nmblookup
%{_bindir}/smbclient
%{_bindir}/smbprint
@@ -386,18 +390,21 @@
%{_mandir}/man1/smbclient.1*
%{_mandir}/man1/smbtar.1*
%{_mandir}/man1/smbtree.1*
-#%{_mandir}/ja/man1/smbtar.1*
-#%{_mandir}/ja/man1/smbclient.1*
-#%{_mandir}/ja/man1/nmblookup.1*
+%{_mandir}/man1/smbget.1*
%files common
%defattr(-,root,root)
%attr(755,root,root) /%{_lib}/security/pam_smbpass.so
%dir %{_libdir}/samba
%dir %{_libdir}/samba/charset
+%dir %{_libdir}/samba/idmap
%{_libdir}/samba/lowcase.dat
%{_libdir}/samba/upcase.dat
%{_libdir}/samba/valid.dat
+%{_libdir}/samba/idmap/ad.so
+%{_libdir}/samba/idmap/rid.so
+%{_libdir}/samba/auth/script.so
+%{_libdir}/samba/libmsrpc.so
%{_libdir}/libnss_wins.so
/%{_lib}/libnss_wins.so.2
%{_libdir}/libnss_winbind.so
@@ -405,20 +412,19 @@
/%{_lib}/security/pam_winbind.so
%{_libdir}/libsmbclient.a
%{_libdir}/libsmbclient.so
+%{_libdir}/libsmbclient.so.0
%{_libdir}/samba/charset/CP*.so
%{_includedir}/libsmbclient.h
+%{_includedir}/libmsrpc.h
+
%{_bindir}/net
%{_bindir}/testparm
-%{_bindir}/testprns
%{_bindir}/smbpasswd
-# %{_bindir}/make_printerdef
%{_bindir}/wbinfo
-# %{_bindir}/editreg
%{_bindir}/ntlm_auth
%{_bindir}/pdbedit
%{_bindir}/profiles
%{_bindir}/smbcquotas
-#%{_bindir}/vfstest
%{_sbindir}/winbindd
%dir /var/cache/samba
%dir /var/run/winbindd
@@ -430,13 +436,10 @@
%dir %{_sysconfdir}/samba
%attr(0700,root,root) %dir /var/log/samba
%{_initrddir}/winbind
-# %{_datadir}/samba/codepages/*
-# %{_mandir}/man1/make_smbcodepage.1*
%{_mandir}/man1/ntlm_auth.1*
%{_mandir}/man1/profiles.1*
%{_mandir}/man1/smbcquotas.1*
%{_mandir}/man1/testparm.1*
-%{_mandir}/man1/testprns.1*
%{_mandir}/man5/smb.conf.5*
%{_mandir}/man5/lmhosts.5*
%{_mandir}/man8/smbpasswd.8*
@@ -444,16 +447,47 @@
%{_mandir}/man8/winbindd.8*
%{_mandir}/man8/net.8*
%{_mandir}/man1/vfstest.1*
-%{_mandir}/man8/pam_winbind.8*
-
-# #%lang(ja) %{_mandir}/ja/man1/make_smbcodepage.1*
-#%lang(ja) %{_mandir}/ja/man1/testparm.1*
-#%lang(ja) %{_mandir}/ja/man1/testprns.1*
-#%lang(ja) %{_mandir}/ja/man5/smb.conf.5*
-#%lang(ja) %{_mandir}/ja/man5/lmhosts.5*
-#%lang(ja) %{_mandir}/ja/man8/smbpasswd.8*
+%{_mandir}/man7/pam_winbind.7*
+%{_mandir}/man7/libsmbclient.7*
%changelog
+* Wed Jul 12 2006 Jay Fenlason <fenlason at redhat.com> 3.0.23-1.fc4
+- Update to 3.0.23 to close
+ bz#197836 CVE-2006-3403 Samba denial of service
+- include related spec file, filter-requires-samba.sh and patch changes
+ from rawhide. -winbind, and -access patches are obsolete.
+- include the fixed smb.init file from rawhide, closing
+ bz#182560 Wrong retval for initscript when smbd is dead
+
+* Mon Oct 10 2005 Jay Fenlason <fenlason at redhat.com>
+- Upgrade to 3.0.20a, which includes all the previous upstream patches.
+- Include the -winbind patch from Jeremy Allison <jra at samba.org> to fix
+ a problem with winbind crashing.
+- Include the -access patch from Jeremy Allison <jra at samba.org> to fix
+ a problem with MS Access lock files.
+- Updated the -warnings patch for 3.0.20a.
+- Include --with-shared-modules=idmap_ad,idmap_rid to close
+ bz#156810 ? --with-shared-modules=idmap_ad,idmap_rid
+- Include the new samba.pamd from Tomas Mraz (tmraz at redhat.com) to close
+ bz#170259 ? pam_stack is deprecated
+
+* Mon Aug 22 2005 Jay Fenlason <fenlason at redhat.com>
+- New upstream release
+ Includes five upstream patches -bug3010_v1, -groupname_enumeration_v3,
+ -regcreatekey_winxp_v1, -usrmgr_groups_v1, and -winbindd_v1
+ This obsoletes the -pie and -delim patches
+ the -warning and -gcc4 patches are obsolete too
+ The -man, -passwd, and -smbspool patches were updated to match 3.0.20pre1
+ Also, the -quoting patch was implemented differently upstream
+ There is now a umount.cifs executable and manpage
+ We run autogen.sh as part of the build phase
+ The testprns command is now gone
+ libsmbclient now has a man page
+- Include -bug106483 patch to close
+ bz#106483 smbclient: -N negates the provided password, despite documentation
+- Added the -warnings patch to quiet some compiler warnings.
+- Removed many obsolete patches from CVS.
+
* Mon May 2 2005 Jay Fenlason <fenlason at redhat.com> 3.0.14a-2
- New upstream release.
- the -64bit-timestamps, -clitar, -establish_trust, user_rights_v1,
Index: smb.init
===================================================================
RCS file: /cvs/dist/rpms/samba/FC-4/smb.init,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- smb.init 9 Sep 2004 12:12:38 -0000 1.5
+++ smb.init 13 Jul 2006 00:30:01 -0000 1.6
@@ -83,7 +83,11 @@
rhstatus() {
status smbd
+ RETVAL=$?
status nmbd
+ if [ $? -ne 0 -o $RETVAL -ne 0 ] ; then
+ return 1
+ fi
}
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/samba/FC-4/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources 2 May 2005 19:36:01 -0000 1.26
+++ sources 13 Jul 2006 00:30:01 -0000 1.27
@@ -1 +1 @@
-ebee37e66a8b5f6fd328967dc09088e8 samba-3.0.14a.tar.gz
+f2f8722248021ca0e8f31b1853d3bf66 samba-3.0.23.tar.gz
--- samba-3.0.12pre1-logfiles.patch DELETED ---
--- samba-3.0.4-smb.conf.patch DELETED ---
More information about the fedora-cvs-commits
mailing list