rpms/samba/FC-5 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.27, 1.28 filter-requires-samba.sh, 1.3, 1.4 samba.spec, 1.62, 1.63 smb.init, 1.5, 1.6 sources, 1.30, 1.31
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Jul 12 18:57:11 UTC 2006
Author: fenlason
Update of /cvs/dist/rpms/samba/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv18857
Modified Files:
.cvsignore filter-requires-samba.sh samba.spec smb.init
sources
Added Files:
samba-3.0.23-logfiles.patch samba-3.0.23-smb.conf.patch
samba-3.0.23rc3-passwd.patch
Log Message:
3.0.23
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-5/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore 13 Feb 2006 16:26:38 -0000 1.27
+++ .cvsignore 12 Jul 2006 18:57:09 -0000 1.28
@@ -1 +1 @@
-samba-3.0.21b.tar.gz
+samba-3.0.23.tar.gz
Index: filter-requires-samba.sh
===================================================================
RCS file: /cvs/dist/rpms/samba/FC-5/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 12 Jul 2006 18:57:09 -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-5/samba.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- samba.spec 30 Mar 2006 22:22:47 -0000 1.62
+++ samba.spec 12 Jul 2006 18:57:09 -0000 1.63
@@ -2,7 +2,7 @@
Summary: The Samba SMB server.
Name: samba
-Version: 3.0.22
+Version: 3.0.23
Release: 1.fc5
Epoch: 0
License: GNU GPL Version 2
@@ -33,13 +33,12 @@
# generic patches
Patch101: samba-2.2.0-smbw.patch
Patch102: samba-3.0.0beta1-pipedir.patch
-Patch103: samba-3.0.21b-logfiles.patch
+Patch103: samba-3.0.23-logfiles.patch
Patch104: samba-3.0.0rc3-nmbd-netbiosname.patch
-Patch105: samba-3.0.21b-smb.conf.patch
+Patch105: samba-3.0.23-smb.conf.patch
Patch106: samba-3.0.20pre1-man.patch
-Patch107: samba-3.0.20pre1-passwd.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
@@ -51,7 +50,7 @@
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 gnutls-devel
-
+BuildRequires: autoconf, libtool
# Working around perl dependency problem from docs
%define __perl_requires %{SOURCE999}
@@ -122,7 +121,6 @@
%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
@@ -236,11 +234,9 @@
# 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
# 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
@@ -275,6 +271,12 @@
rm -f $RPM_BUILD_ROOT%{_mandir}/man8/smbmnt.8*
rm -f $RPM_BUILD_ROOT%{_mandir}/man8/smbumount.8*
+# 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
@@ -443,7 +445,15 @@
%{_mandir}/man7/libsmbclient.7*
%changelog
-* Thu Mar 30 2006 Jay Fenlason <fenlason at redhat.com> 2.0.21c-1.fc5
+* Wed Jul 12 2006 Jay Fenlason <fenlason at redhat.com> 3.0.23-1.fc5
+- Upgrade 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.
+- include the fixed smb.init file from rawhide, closing
+ bz#182560 Wrong retval for initscript when smbd is dead
+
+* Thu Mar 30 2006 Jay Fenlason <fenlason at redhat.com> 3.0.21c-1.fc5
- New upstream version, fixing
bz#187170 CVE-2005-1059 Samba clear text password exposure
- include gnutls-devel in BuildRequires
Index: smb.init
===================================================================
RCS file: /cvs/dist/rpms/samba/FC-5/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 12 Jul 2006 18:57:09 -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-5/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources 30 Mar 2006 22:22:47 -0000 1.30
+++ sources 12 Jul 2006 18:57:09 -0000 1.31
@@ -1 +1 @@
-5c39505af17cf5caf3d6ed8bab135036 samba-3.0.22.tar.gz
+f2f8722248021ca0e8f31b1853d3bf66 samba-3.0.23.tar.gz
More information about the fedora-cvs-commits
mailing list