rpms/samba/devel samba-3.0.21b-logfiles.patch, NONE, 1.1 samba-3.0.21b-smb.conf.patch, NONE, 1.1 samba-3.0.21pre1-smbspool.patch, NONE, 1.1 .cvsignore, 1.26, 1.27 samba.spec, 1.59, 1.60 sources, 1.28, 1.29 samba-3.0.12pre1-logfiles.patch, 1.1, NONE samba-3.0.20pre1-smbspool.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
Mon Feb 13 16:26:42 UTC 2006
- Previous message (by thread): rpms/pykickstart/devel .cvsignore, 1.19, 1.20 pykickstart.spec, 1.19, 1.20 sources, 1.20, 1.21
- Next message (by thread): rpms/gnome-mount/devel .cvsignore, 1.4, 1.5 gnome-mount.spec, 1.6, 1.7 sources, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: fenlason
Update of /cvs/dist/rpms/samba/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2784
Modified Files:
.cvsignore samba.spec sources
Added Files:
samba-3.0.21b-logfiles.patch samba-3.0.21b-smb.conf.patch
samba-3.0.21pre1-smbspool.patch
Removed Files:
samba-3.0.12pre1-logfiles.patch
samba-3.0.20pre1-smbspool.patch samba-3.0.4-smb.conf.patch
Log Message:
3.0.21b
samba-3.0.21b-logfiles.patch:
samba-3.0.0beta3/source/lib/popt_common.c | 4 ++--
samba-3.0.11/packaging/Fedora/samba.log | 2 +-
samba-3.0.11/packaging/Fedora/smb.conf | 4 ++--
samba-3.0.8pre1/source/nmbd/nmbd.c | 2 +-
samba-3.0.8pre1/source/nsswitch/winbindd.c | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
--- NEW FILE samba-3.0.21b-logfiles.patch ---
diff -u -r samba-3.0.0beta3.orig/source/lib/popt_common.c samba-3.0.0beta3/source/lib/popt_common.c
--- samba-3.0.0beta3.orig/source/lib/popt_common.c 2003-07-28 17:27:07.000000000 -0400
+++ samba-3.0.0beta3/source/lib/popt_common.c 2003-07-28 17:56:28.000000000 -0400
@@ -55,7 +55,7 @@
pname++;
if (reason == POPT_CALLBACK_REASON_PRE) {
- pstr_sprintf(logfile, "%s/log.%s", dyn_LOGFILEBASE, pname);
+ pstr_sprintf(logfile, "%s/%s.log", dyn_LOGFILEBASE, pname);
lp_set_logfile(logfile);
return;
}
@@ -93,7 +93,7 @@
case 'l':
if (arg) {
- pstr_sprintf(logfile, "%s/log.%s", arg, pname);
+ pstr_sprintf(logfile, "%s/%s.log", arg, pname);
lp_set_logfile(logfile);
}
break;
--- 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.11/packaging/Fedora/smb.conf.logfiles 2005-02-03 22:07:48.000000000 -0500
+++ samba-3.0.11/packaging/Fedora/smb.conf 2005-02-04 16:17:48.000000000 -0500
@@ -43,9 +43,9 @@
# this tells Samba to use a separate log file for each machine
# that connects
- # log file = /var/log/samba/%m.log
+ log file = /var/log/samba/%m.log
# all log information in one file
- log file = /var/log/samba/log.smbd
+# log file = /var/log/samba/log.smbd
# Put a capping on the size of the log files (in Kb).
max log size = 50
samba-3.0.21b-smb.conf.patch:
smb.conf | 5 ++++-
1 files changed, 4 insertions(+), 1 deletion(-)
--- NEW FILE samba-3.0.21b-smb.conf.patch ---
--- samba-3.0.4/packaging/Fedora/smb.conf.upstream 2004-04-04 03:37:44.000000000 -0400
+++ samba-3.0.4/packaging/Fedora/smb.conf 2004-05-10 15:24:45.000000000 -0400
@@ -35,7 +35,10 @@
# It should not be necessary to spell out the print system type unless
# yours is non-standard. Currently supported print systems include:
# bsd, sysv, plp, lprng, aix, hpux, qnx
-; printing = bsd
+; 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
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;
}
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/samba/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore 14 Nov 2005 16:17:56 -0000 1.26
+++ .cvsignore 13 Feb 2006 16:26:38 -0000 1.27
@@ -1 +1 @@
-samba-3.0.20b.tar.gz
+samba-3.0.21b.tar.gz
Index: samba.spec
===================================================================
RCS file: /cvs/dist/rpms/samba/devel/samba.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- samba.spec 11 Feb 2006 05:38:05 -0000 1.59
+++ samba.spec 13 Feb 2006 16:26:39 -0000 1.60
@@ -2,8 +2,8 @@
Summary: The Samba SMB server.
Name: samba
-Version: 3.0.20b
-Release: 2.1.1
+Version: 3.0.21b
+Release: 2
Epoch: 0
License: GNU GPL Version 2
Group: System Environment/Daemons
@@ -33,17 +33,17 @@
# generic patches
Patch101: samba-2.2.0-smbw.patch
Patch102: samba-3.0.0beta1-pipedir.patch
-Patch103: samba-3.0.12pre1-logfiles.patch
+Patch103: samba-3.0.21b-logfiles.patch
Patch104: samba-3.0.0rc3-nmbd-netbiosname.patch
-Patch105: samba-3.0.4-smb.conf.patch
+Patch105: samba-3.0.21b-smb.conf.patch
Patch106: samba-3.0.20pre1-man.patch
Patch107: samba-3.0.20pre1-passwd.patch
#Patch108: samba-3.0.8-non-ascii-domain.patch
Patch109: samba-3.0.4-install.mount.smbfs.patch
-Patch110: samba-3.0.20pre1-smbspool.patch
+Patch110: samba-3.0.21pre1-smbspool.patch
Patch111: samba-3.0.13-smbclient.patch
Patch112: samba-3.0.15pre2-bug106483.patch
-Patch113: samba-3.0.20a-warnings.patch
+#Patch113: samba-3.0.21-warnings.patch
Requires: pam >= 0:0.64 %{auth} samba-common = %{epoch}:%{version}-%{release}
Requires: logrotate >= 0:3.4 initscripts >= 0:5.54-1
@@ -103,10 +103,12 @@
%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
+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)
@@ -124,7 +126,7 @@
%patch110 -p1 -b .smbspool
%patch111 -p1 -b .smbclient
%patch112 -p1 -b .bug106483
-%patch113 -p1 -b .warnings
+#%patch113 -p1 -b .warnings
# crap
rm -f examples/VFS/.cvsignore
@@ -154,7 +156,6 @@
--with-pam \
--with-pam_smbpass \
--with-quotas \
- --with-smbmount \
--with-syslog \
--with-utmp \
--with-vfs \
@@ -222,17 +223,15 @@
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
+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/RedHat/samba.pamd.stack $RPM_BUILD_ROOT/etc/pam.d/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
echo 127.0.0.1 localhost > $RPM_BUILD_ROOT%{_sysconfdir}/samba/lmhosts
# pam_smbpass
@@ -269,9 +268,12 @@
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}/man1/smbget.1*
rm -f $RPM_BUILD_ROOT%{_mandir}/man5/smbgetrc.5*
rm -f $RPM_BUILD_ROOT%{_mandir}/man1/testprns.1*
+rm -f $RPM_BUILD_ROOT%{_mandir}/man8/smbmount.8*
+rm -f $RPM_BUILD_ROOT%{_mandir}/man8/smbmnt.8*
+rm -f $RPM_BUILD_ROOT%{_mandir}/man8/smbumount.8*
%clean
rm -rf $RPM_BUILD_ROOT
@@ -357,19 +359,13 @@
%files client
%defattr(-,root,root)
-/sbin/mount.smb
-/sbin/mount.smbfs
/sbin/mount.cifs
/sbin/umount.cifs
%{_bindir}/rpcclient
%{_bindir}/smbcacls
-%{_bindir}/smbmount
-%{_bindir}/smbmnt
-%{_bindir}/smbumount
%{_bindir}/findsmb
-%{_mandir}/man8/smbmnt.8*
-%{_mandir}/man8/smbmount.8*
-%{_mandir}/man8/smbumount.8*
+%{_bindir}/smbget
+%{_bindir}/eventlogadm
%{_mandir}/man8/smbspool.8*
%{_mandir}/man8/mount.cifs.8*
%{_mandir}/man8/umount.cifs.8*
@@ -386,6 +382,7 @@
%{_mandir}/man1/smbclient.1*
%{_mandir}/man1/smbtar.1*
%{_mandir}/man1/smbtree.1*
+%{_mandir}/man1/smbget.1*
%files common
%defattr(-,root,root)
@@ -396,8 +393,10 @@
%{_libdir}/samba/lowcase.dat
%{_libdir}/samba/upcase.dat
%{_libdir}/samba/valid.dat
-%{_libdir}/samba/idmap/idmap_ad.so
-%{_libdir}/samba/idmap/idmap_rid.so
+%{_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
@@ -408,6 +407,8 @@
%{_libdir}/libsmbclient.so.0
%{_libdir}/samba/charset/CP*.so
%{_includedir}/libsmbclient.h
+%{_includedir}/libmsrpc.h
+
%{_bindir}/net
%{_bindir}/testparm
%{_bindir}/smbpasswd
@@ -438,10 +439,16 @@
%{_mandir}/man8/winbindd.8*
%{_mandir}/man8/net.8*
%{_mandir}/man1/vfstest.1*
-%{_mandir}/man8/pam_winbind.8*
-%{_mandir}/man8/libsmbclient.8*
+%{_mandir}/man7/pam_winbind.7*
+%{_mandir}/man7/libsmbclient.7*
%changelog
+* Wed Jan 4 2006 Jay Fenlason <fenlason at redhat.com> 3.0.21b-2
+- New upstream version.
+- Since the rawhide kernel has dropped support for smbfs, remove smbmount
+ and smbumount. Users should use mount.cifs instead.
+- Upgrade to 3.0.21b
+
* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0:3.0.20b-2.1.1
- bump again for double-long bug on ppc(64)
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/samba/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources 14 Nov 2005 16:17:56 -0000 1.28
+++ sources 13 Feb 2006 16:26:39 -0000 1.29
@@ -1 +1 @@
-39c0cae08fe0224cb003aa0af97d3050 samba-3.0.20b.tar.gz
+bb73dffb33f4a39386ef9f3e07ae28ff samba-3.0.21b.tar.gz
--- samba-3.0.12pre1-logfiles.patch DELETED ---
--- samba-3.0.20pre1-smbspool.patch DELETED ---
--- samba-3.0.4-smb.conf.patch DELETED ---
- Previous message (by thread): rpms/pykickstart/devel .cvsignore, 1.19, 1.20 pykickstart.spec, 1.19, 1.20 sources, 1.20, 1.21
- Next message (by thread): rpms/gnome-mount/devel .cvsignore, 1.4, 1.5 gnome-mount.spec, 1.6, 1.7 sources, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list