From 035c67cee235803b1515d7e57bdd8115c8097841 Mon Sep 17 00:00:00 2001 From: fenlason Date: Tue, 11 Jul 2006 16:02:58 +0000 Subject: [PATCH] 3.0.23 --- .cvsignore | 2 +- filter-requires-samba.sh | 2 +- samba-3.0.23-logfiles.patch | 52 +++++++++++++++++++++++++++++++++++++ samba-3.0.23-smb.conf.patch | 12 +++++++++ samba.spec | 20 +++++++++----- sources | 2 +- 6 files changed, 80 insertions(+), 10 deletions(-) create mode 100644 samba-3.0.23-logfiles.patch create mode 100644 samba-3.0.23-smb.conf.patch diff --git a/.cvsignore b/.cvsignore index 281e359..ef96068 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -samba-3.0.23rc3.tar.gz +samba-3.0.23.tar.gz diff --git a/filter-requires-samba.sh b/filter-requires-samba.sh index 5545cf6..f90085c 100755 --- a/filter-requires-samba.sh +++ b/filter-requires-samba.sh @@ -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)' diff --git a/samba-3.0.23-logfiles.patch b/samba-3.0.23-logfiles.patch new file mode 100644 index 0000000..771de03 --- /dev/null +++ b/samba-3.0.23-logfiles.patch @@ -0,0 +1,52 @@ +--- 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 diff --git a/samba-3.0.23-smb.conf.patch b/samba-3.0.23-smb.conf.patch new file mode 100644 index 0000000..f088f9d --- /dev/null +++ b/samba-3.0.23-smb.conf.patch @@ -0,0 +1,12 @@ +--- 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 diff --git a/samba.spec b/samba.spec index bd94f16..f289c9b 100644 --- a/samba.spec +++ b/samba.spec @@ -3,15 +3,15 @@ Summary: The Samba SMB server. Name: samba Version: 3.0.23 -Release: 0.RC3 +Release: 2 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}rc3.tar.gz -#Source: ftp://us2.samba.org/pub/samba/%{name}-%{version}.tar.gz +#Source: ftp://us2.samba.org/pub/samba/%{name}-%{version}rc3.tar.gz +Source: ftp://us2.samba.org/pub/samba/%{name}-%{version}.tar.gz # Red Hat specific replacement-files Source1: samba.log @@ -33,9 +33,9 @@ Source999: filter-requires-samba.sh # generic patches Patch101: samba-2.2.0-smbw.patch Patch102: samba-3.0.0beta1-pipedir.patch -Patch103: samba-3.0.23rc2-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 # The passwd part has been applied, but not the group part Patch107: samba-3.0.23rc3-passwd.patch @@ -100,8 +100,8 @@ Web browser. %prep # TAG: change for non-pre -%setup -q -n samba-3.0.23rc3 -# % setup -q +# % setup -q -n samba-3.0.23rc3 +%setup -q # copy Red Hat specific scripts mkdir packaging/Fedora @@ -446,6 +446,12 @@ fi %{_mandir}/man7/libsmbclient.7* %changelog +* Tue Jul 11 2006 Jay Fenlason 3.0.23-2 +- New upstream release. +- Use modified filter-requires-samba.sh from packaging/RHEL/setup/ + to get rid of bogus dependency on perl(Unicode::MapUTF8) +- Update the -logfiles and -smb.conf patches to work with 3.0.23 + * Thu Jul 6 2006 Jay Fenlason 3.0.23-0.RC3 - New upstream RC release. - Update the -logfiles, and -passwd patches for diff --git a/sources b/sources index 8427233..a5b0d2c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b60d5aa92fed3cc06f71ff24a0a81704 samba-3.0.23rc3.tar.gz +f2f8722248021ca0e8f31b1853d3bf66 samba-3.0.23.tar.gz