Tue Jun 26 18:13:59 UTC 2007

Author: simo

Update of /cvs/pkgs/rpms/samba/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12155

Modified Files:
	.cvsignore nmb.init samba.spec smb.init sources winbind.init 
Removed Files:
	samba-2.2.0-smbw.patch samba-3.0.15pre2-bug106483.patch 
	samba-3.0.20-bug3010_v1.patch 
	samba-3.0.20-groupname_enumeration_v3.patch 
	samba-3.0.20-regcreatekey_winxp_v1.patch 
	samba-3.0.20-usrmgr_groups_v1.patch 
	samba-3.0.20-winbindd_v1.patch samba-3.0.20a-warnings.patch 
	samba-3.0.23-smb.conf.patch samba-3.0.23d-man.patch 
	samba-3.0.24-arch_macro.patch 
	samba-3.0.24-enable_pam_nss_tests.patch 
	samba-3.0.24-fhs-compliance.patch 
	samba-3.0.24-msdfs-root-no.patch samba-3.0.24-nss_wins.patch 
	samba-3.0.24-pam_winbind-fixes.patch 
	samba-3.0.24-tar_options.patch samba-3.0.25a-misc-fix.patch 
	samba-3.0.25a-pam_smbpass.patch 
Log Message:

Upgrade to 3.0.25b, this release contains a number of necessary fixes over
the 3.0.25a release.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-7/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41

--- .cvsignore	25 May 2007 17:31:57 -0000	1.40
+++ .cvsignore	26 Jun 2007 18:13:23 -0000	1.41
@@ -1,2 +1 @@
-samba-3.0.25.tar.gz
-samba-3.0.25a.tar.gz
+samba-3.0.25b.tar.gz


Index: nmb.init
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-7/nmb.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nmb.init	26 Mar 2007 16:30:02 -0000	1.1
+++ nmb.init	26 Jun 2007 18:13:23 -0000	1.2
@@ -14,7 +14,7 @@
 elif [ -f /etc/rc.d/init.d/functions ] ; then
   . /etc/rc.d/init.d/functions
 else
-  exit 0
+  exit 1
 fi
 
 # Avoid using root's TMPDIR
@@ -28,10 +28,10 @@
 fi
 
 # Check that networking is up.
-[ ${NETWORKING} = "no" ] && exit 0
+[ ${NETWORKING} = "no" ] && exit 1
 
 # Check that smb.conf exists.
-[ -f /etc/samba/smb.conf ] || exit 0
+[ -f /etc/samba/smb.conf ] || exit 6
 
 RETVAL=0
 
@@ -72,9 +72,7 @@
 
 rhstatus() {
 	status nmbd
-	if [ $? -ne 0 ] ; then
-		return 1
-	fi
+	return $?
 }	
 
 
@@ -85,7 +83,7 @@
 fi
 
 # Check that we can write to it... so non-root users stop here
-[ -w /etc/samba/smb.conf ] || exit 0
+[ -w /etc/samba/smb.conf ] || exit 4
 
 
 
@@ -110,7 +108,7 @@
 	;;
   *)
 	echo $"Usage: $0 {start|stop|restart|reload|status|condrestart}"
-	exit 1
+	exit 2
 esac
 
 exit $?


Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-7/samba.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- samba.spec	18 Jun 2007 15:56:42 -0000	1.124
+++ samba.spec	26 Jun 2007 18:13:23 -0000	1.125
@@ -1,8 +1,8 @@
 Summary: The Samba Suite of programs
 Name: samba
 Epoch: 0
-Version: 3.0.25a
-Release: 3%{?dist}
+Version: 3.0.25b
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.samba.org/
@@ -32,22 +32,15 @@
 # (none right now)
 
 # generic patches
-#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.23d-man.patch
 # The passwd part has been applied, but not the group part
 Patch107: samba-3.0.23rc3-passwd.patch
 #Patch108: samba-3.0.8-non-ascii-domain.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.21-warnings.patch
 Patch200: samba-3.0.25rc1-inotifiy.patch
-Patch201: samba-3.0.25a-pam_smbpass.patch
-Patch202: samba-3.0.25a-misc-fix.patch
 
 Requires(pre): samba-common = %{epoch}:%{version}-%{release}
 Requires: pam >= 0:0.64
@@ -156,21 +149,14 @@
 # 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
 %patch110 -p1 -b .smbspool
 %patch111 -p1 -b .smbclient
-#%patch112 -p1 -b .bug106483
-#%patch113 -p1 -b .warnings
 %patch200 -p0 -b .inotify
-%patch201 -p0 -b .pam_smbpass
-%patch202 -p0 -b .misc_fix
 
 # crap
 rm -f examples/VFS/.cvsignore
@@ -653,6 +639,10 @@
 #%{_includedir}/libmsrpc.h
 
 %changelog
+* Tue Jun 26 2007 Simo Sorce <ssorce at redhat.com> 3.0.25b-1.fc7
+- update to 3.0.25b
+- better error codes for init scripts: #244823
+
 * Tue Jun 5 2007 Simo Sorce <ssorce at redhat.com> 3.0.25a-3.fc7
 - fix offline support with XP/Vista from jra at samba.org
 - fix bug in one of the recent security patches


Index: smb.init
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-7/smb.init,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- smb.init	26 Mar 2007 16:30:02 -0000	1.7
+++ smb.init	26 Jun 2007 18:13:23 -0000	1.8
@@ -14,7 +14,7 @@
 elif [ -f /etc/rc.d/init.d/functions ] ; then
   . /etc/rc.d/init.d/functions
 else
-  exit 0
+  exit 1
 fi
 
 # Avoid using root's TMPDIR
@@ -28,10 +28,10 @@
 fi
 
 # Check that networking is up.
-[ ${NETWORKING} = "no" ] && exit 0
+[ ${NETWORKING} = "no" ] && exit 1
 
 # Check that smb.conf exists.
-[ -f /etc/samba/smb.conf ] || exit 0
+[ -f /etc/samba/smb.conf ] || exit 6
 
 RETVAL=0
 
@@ -72,9 +72,7 @@
 
 rhstatus() {
 	status smbd
-	if [ $? -ne 0 ] ; then
-		return 1
-	fi
+	return $?
 }	
 
 
@@ -85,7 +83,7 @@
 fi
 
 # Check that we can write to it... so non-root users stop here
-[ -w /etc/samba/smb.conf ] || exit 0
+[ -w /etc/samba/smb.conf ] || exit 4
 
 
 
@@ -110,7 +108,7 @@
 	;;
   *)
 	echo $"Usage: $0 {start|stop|restart|reload|status|condrestart}"
-	exit 1
+	exit 2
 esac
 
 exit $?


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-7/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources	25 May 2007 17:31:58 -0000	1.43
+++ sources	26 Jun 2007 18:13:23 -0000	1.44
@@ -1 +1 @@
-cbd33bb5d904ccd8a294a4019743745d  samba-3.0.25a.tar.gz
+69d3d6661f37f2525486cc834c4e24e7  samba-3.0.25b.tar.gz


Index: winbind.init
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-7/winbind.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- winbind.init	19 Apr 2007 14:28:00 -0000	1.4
+++ winbind.init	26 Jun 2007 18:13:23 -0000	1.5
@@ -17,10 +17,10 @@
 . /etc/sysconfig/network
 
 # Check that networking is up.
-[ ${NETWORKING} = "no" ] && exit 0
+[ ${NETWORKING} = "no" ] && exit 1
 
 # Check that smb.conf exists.
-[ -f /etc/samba/smb.conf ] || exit 0
+[ -f /etc/samba/smb.conf ] || exit 6
 
 [ -f /etc/sysconfig/samba ] && . /etc/sysconfig/samba
 
@@ -63,8 +63,18 @@
 
 rhstatus() {
 	status winbindd
+	return $?
 }	
 
+# Allow status as non-root.
+if [ "$1" = status ]; then
+       rhstatus
+       exit $?
+fi
+
+# Check that we can write to it... so non-root users stop here
+[ -w /etc/samba/smb.conf ] || exit 4
+
 case "$1" in
   start)
   	start
@@ -86,7 +96,7 @@
 	;;
   *)
 	echo $"Usage: $0 {start|stop|restart|reload|status|condrestart}"
-	exit 1
+	exit 2
 esac
 
 exit $?


--- samba-2.2.0-smbw.patch DELETED ---


--- samba-3.0.15pre2-bug106483.patch DELETED ---


--- samba-3.0.20-bug3010_v1.patch DELETED ---


--- samba-3.0.20-groupname_enumeration_v3.patch DELETED ---


--- samba-3.0.20-regcreatekey_winxp_v1.patch DELETED ---


--- samba-3.0.20-usrmgr_groups_v1.patch DELETED ---


--- samba-3.0.20-winbindd_v1.patch DELETED ---


--- samba-3.0.20a-warnings.patch DELETED ---


--- samba-3.0.23-smb.conf.patch DELETED ---


--- samba-3.0.23d-man.patch DELETED ---


--- samba-3.0.24-arch_macro.patch DELETED ---


--- samba-3.0.24-enable_pam_nss_tests.patch DELETED ---


--- samba-3.0.24-fhs-compliance.patch DELETED ---


--- samba-3.0.24-msdfs-root-no.patch DELETED ---


--- samba-3.0.24-nss_wins.patch DELETED ---


--- samba-3.0.24-pam_winbind-fixes.patch DELETED ---


--- samba-3.0.24-tar_options.patch DELETED ---


--- samba-3.0.25a-misc-fix.patch DELETED ---


--- samba-3.0.25a-pam_smbpass.patch DELETED ---


