rpms/ss5/devel import.log, NONE, 1.1 ss5_init.patch, NONE, 1.1 ss5.spec, 1.8, 1.9

Wed Jan 28 04:19:43 UTC 2009

Author: itamarjp

Update of /cvs/pkgs/rpms/ss5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10028/devel

Modified Files:
	ss5.spec 
Added Files:
	import.log ss5_init.patch 
Log Message:
fix for BZ #478702

--- NEW FILE import.log ---
ss5-3_6_4-2_fc9:HEAD:ss5-3.6.4-2.fc9.src.rpm:1233115244

ss5_init.patch:

--- NEW FILE ss5_init.patch ---
diff -ruNp ss5-3.6.4.old/conf/ss5.init ss5-3.6.4.new/conf/ss5.init
--- ss5-3.6.4.old/conf/ss5.init	2007-04-17 11:40:43.000000000 -0300
+++ ss5-3.6.4.new/conf/ss5.init	2009-01-28 01:08:43.000000000 -0200
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# chkconfig: 345 20 80
+# chkconfig: - 20 80
 # description: This script takes care of starting \
 #              and stopping ss5
 #
@@ -31,7 +31,7 @@ case "$1" in
 	if [ $OS = "Linux" ]; then
             daemon /usr/sbin/ss5 -t $SS5_OPTS
             touch /var/lock/subsys/ss5
-	if [ $OS = "SunOS" ]; then
+	elif [ $OS = "SunOS" ]; then
             /usr/sbin/ss5 -t 
             touch /var/lock/subsys/ss5
 	else


Index: ss5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ss5/devel/ss5.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ss5.spec	5 Sep 2008 20:17:59 -0000	1.8
+++ ss5.spec	28 Jan 2009 04:19:12 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: Socks Server 5 
 Name: ss5
 Version: 3.6.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 URL: http://sourceforge.net/projects/ss5
@@ -11,12 +11,15 @@
 Requires(post): chkconfig
 Requires(preun): chkconfig, initscripts
 
+Patch0: ss5_init.patch
+
 %description
 ss5 is a socks server, which supports both SOCKS4 and SOCKS5 protocols,
 that runs on Linux/Solaris platforms. 
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --with-libpath=%{_libdir} 
@@ -42,12 +45,11 @@
 fi
 
 %files
-%defattr(755,root,root,-)
+%defattr(-,root,root,-)
 %{_sbindir}/ss5
 %{_initrddir}/ss5
 %{_libdir}/ss5/
 
-%defattr(644,root,root,-)
 %dir %{_docdir}/ss5
 %{_docdir}/ss5/License
 %{_docdir}/ss5/README.pam
@@ -65,17 +67,20 @@
 %{_mandir}/man5/ss5.pam.5.gz
 %{_mandir}/man5/ss5.ha.5.gz
 
-%defattr(755,root,root)
 %{_localstatedir}/log/ss5
 
 %dir %{_sysconfdir}/opt/ss5
-%defattr(0640,root,root)
 %config(noreplace) %{_sysconfdir}/opt/ss5/ss5.conf
 %config(noreplace) %{_sysconfdir}/opt/ss5/ss5.passwd
 %config(noreplace) %{_sysconfdir}/pam.d/ss5
 %doc ChangeLog
 
 %changelog
+* Wed Jan 28 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 3.6.4-2
+- fix init script BZ #478702
+- replace some tabs with spaces in changelog
+- fix wrong permissions in spec file
+
 * Fri Sep  5 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 3.6.4-1
 - fix license tag
 - update to 3.6.4
@@ -106,7 +111,7 @@
         * Fix DNS buffer as RFC
 
 *Fri May  05 2006 Matteo Ricchetti <matteo.ricchetti at libero.it>
-	* SS5-v3.5.8-2 released
+        * SS5-v3.5.8-2 released
         * Fix startup script
 
 *Wed Apr  26 2006 Matteo Ricchetti <matteo.ricchetti at libero.it>
@@ -114,13 +119,13 @@
         * Fix EAP (thx to Jakob Perz)
 
 *Mon Apr  24 2006 Matteo Ricchetti <matteo.ricchetti at libero.it>
-	* SS5-v3.5.7-1 released
-	* Fix replica feature
+        * SS5-v3.5.7-1 released
+        * Fix replica feature
         * Fix configure file
         * Fix man file for ss5.peers
 
 *Mon Apr  10 2006 Matteo Ricchetti <matteo.ricchetti at libero.it>
-	* SS5-v3.5.6-1 released
+        * SS5-v3.5.6-1 released
         * Fix startup script 
 
 *Thu Apr  06 2006 Matteo Ricchetti <matteo.ricchetti at libero.it>
@@ -136,11 +141,11 @@
         * Fix external authentication program 
 
 *Sun Mar  19 2006 Matteo Ricchetti <matteo.ricchetti at libero.it>
-	* SS5-v3.5.3-2 released
+        * SS5-v3.5.3-2 released
         * Fix package for Fedora naming guidelines
 
 *Thu Mar  09 2006 Matteo Ricchetti <matteo.ricchetti at libero.it>
-	* SS5-v3.5.3-1 released
+        * SS5-v3.5.3-1 released
         * Add security feature to centralized management
 
 *Thu Mar  09 2006 Matteo Ricchetti <matteo.ricchetti at libero.it>
@@ -180,14 +185,14 @@
         * New configure file (thx to Walter Franzini)
 
 *Tue Feb  07 2006 Matteo Ricchetti <matteo.ricchetti at libero.it>
-	* SS5-v3.3r5 released
+        * SS5-v3.3r5 released
         * Fix Solaris 10 compatibility with ctime_r() call
         * Fix netbios default domain
 
 *Mon Feb  06 2006 Matteo Ricchetti <matteo.ricchetti at libero.it>
         * SS5-v3.3r4 released
         * Add default netbios domain
-	* Fix externalprogram
+        * Fix externalprogram
 
 *Sat Feb  04 2006 Matteo Ricchetti <matteo.ricchetti at libero.it>
         * SS5-v3.3r3 released
@@ -201,7 +206,7 @@
 
 *Mon Jan  20 2006 Matteo Ricchetti <matteo.ricchetti at libero.it>
         * SS5-v3.3r1 released
-	* Add multiple directory store support
+        * Add multiple directory store support
         * Add netbios compatibility in authorization module
         * Add noproxy rule in mod_socks5
 
@@ -215,7 +220,7 @@
         * Fix module authentication (pam)
 
 *Mon Dec  16 2005 Matteo Ricchetti <matteo.ricchetti at libero.it>
-	* SS5-v3.2r5 released
+        * SS5-v3.2r5 released
         * Fix makefile for gcc old version
 
 *Mon Dec  04 2005 Matteo Ricchetti <matteo.ricchetti at libero.it>
@@ -257,7 +262,7 @@
         * Fix recv call
 
 *Mon Aug  22 2005 Matteo Ricchetti <matteo.ricchetti at libero.it>
-	* SS5-v3.0r9 released
+        * SS5-v3.0r9 released
         * Fix SS5_AUTHCACHEAGE option
 
 *Thu Aug  18 2005 Matteo Ricchetti <matteo.ricchetti at libero.it>
@@ -274,15 +279,15 @@
 
 *Thu May  10 2005 Matteo Ricchetti <matteo.ricchetti at libero.it>
         * SS5-v3.0r5 released
-	* Fix connect response using dns
+        * Fix connect response using dns
         * Increase authentication buffer
-	* Fix profiling bug
+        * Fix profiling bug
         * Modify package structure
 
 *Thu Apr  10 2005 Matteo Ricchetti <matteo.ricchetti at libero.it>
         * SS5-v3.0r4 released
         * Added comment into group file
-	
+
 *Thu Mar  10 2005 Matteo Ricchetti <matteo.ricchetti at libero.it>
         * SS5-v3.0r3 released
         * Pam module fix
@@ -323,7 +328,7 @@
 *Thu Dec  30 2003 Matteo Ricchetti <matteo.ricchetti at libero.it>
         * SS5-v2.4r5 released
         * Fix Solaris documentation
-	* Fix admin access check
+        * Fix admin access check
         * Add statistics information
 
 *Thu Dec  24 2003 Matteo Ricchetti <matteo.ricchetti at libero.it>
@@ -337,10 +342,10 @@
 *Thu Nov  15 2003 Matteo Ricchetti <matteo.ricchetti at libero.it>
         * SS5-v2.4r2 released
         * Fix some potential buffer overflow 
-	* Fix udp bind problem
+        * Fix udp bind problem
 
 *Thu Oct  29 2003 Matteo Ricchetti <matteo.ricchetti at libero.it>
-	* SS5-v2.4r1 released
+        * SS5-v2.4r1 released
         * Add session affinity in balanced connections
         * Add socks statistics about connections
         * Add fake authentication
@@ -369,8 +374,8 @@
         * SS5-v2.3r1 released
         * Add source-if feature for connect operation
         * Add better control in ldap base configuration
-	* Add better detail on log messages
-	* Threads creation improvement
+        * Add better detail on log messages
+        * Threads creation improvement
         * Fix automatic configuration reload (every 30 seconds)
 
 *Thu Aug  14  2003 Matteo Ricchetti <matteo.ricchetti at libero.it>
@@ -378,7 +383,7 @@
         * Add ldap profile feature
         * Add PAM authentication
         * Add username for ss5 execution
-	* Add server balancing feature !!!
+        * Add server balancing feature !!!
         * Add ssl fixup
         * Add pop3 fixup
         * Add imap fixup


