rpms/ser2net/devel ser2net-2.5-initfixes.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 ser2net.spec, 1.4, 1.5 sources, 1.3, 1.4 ser2net-2.3-initaddreload.patch, 1.1, NONE

[Tom Callaway]

Author: spot

Update of /cvs/extras/rpms/ser2net/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19015

Modified Files:
	.cvsignore ser2net.spec sources 
Added Files:
	ser2net-2.5-initfixes.patch 
Removed Files:
	ser2net-2.3-initaddreload.patch 
Log Message:
update to 2.5

ser2net-2.5-initfixes.patch:

--- NEW FILE ser2net-2.5-initfixes.patch ---
diff -up ser2net-2.5/ser2net.init.addreload ser2net-2.5/ser2net.init
--- ser2net-2.5/ser2net.init.addreload	2001-10-05 20:42:01.000000000 -0400
+++ ser2net-2.5/ser2net.init	2008-08-25 15:53:50.000000000 -0400
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Startup script for ser2ner
 #
-# chkconfig: 2345 95 20
+# chkconfig: - 95 20
 # description: Make serial ports available to network via TCP/IP.
 
 # Source function library.
@@ -33,6 +33,17 @@ stop() {
     return 0
 }
 
+reload() {
+        echo -n $"Reloading ser2net: "
+        if [ -n "`pidfileofproc ser2net`" ] ; then
+            killproc ser2net -HUP
+        else
+            failure $"Reloading ser2net"
+        fi
+        RETVAL=$?
+        echo
+}
+
 case "$1" in
 	start)
 	    start
@@ -49,7 +60,10 @@ case "$1" in
 	    stop
 	    start
 	    ;;
-	condrestart)
+	reload)
+	    reload
+	    ;;
+	condrestart|try-restart)
 	    if test "x`pidof ser2net`" != x; then
 		stop
 		start
@@ -57,7 +71,7 @@ case "$1" in
 	    ;;
 	
 	*)
-	    echo "Usage: ser2net {start|stop|restart|condrestart|status}"
+	    echo "Usage: ser2net {start|stop|restart|reload|condrestart|try-restart|status}"
 	    exit 1
 
 esac


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ser2net/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Aug 2007 14:38:40 -0000	1.3
+++ .cvsignore	25 Aug 2008 20:02:00 -0000	1.4
@@ -1,2 +1 @@
-ser2net-2.3.tar.gz
-ser2net-2.4.tar.gz
+ser2net-2.5.tar.gz


Index: ser2net.spec
===================================================================
RCS file: /cvs/extras/rpms/ser2net/devel/ser2net.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ser2net.spec	20 Feb 2008 01:50:23 -0000	1.4
+++ ser2net.spec	25 Aug 2008 20:02:00 -0000	1.5
@@ -1,11 +1,13 @@
 Name:		ser2net
 Summary: 	Proxy that allows tcp connections to serial ports
-Version:	2.4
-Release:	2%{?dist}.1
+Version:	2.5
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/System
 Source0:	http://download.sourceforge.net/ser2net/%{name}-%{version}.tar.gz
-Patch0:		ser2net-2.3-initaddreload.patch
+# Filed upstream:
+# http://sourceforge.net/tracker/index.php?func=detail&aid=2074265&group_id=28625&atid=393783
+Patch0:		ser2net-2.5-initfixes.patch
 URL:		http://ser2net.sourceforge.net/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): chkconfig
@@ -21,7 +23,7 @@
 
 %prep
 %setup -q
-%patch0 -p1
+%patch0 -p1 -b .initfixes
 
 %build
 %configure
@@ -60,6 +62,11 @@
 %{_mandir}/man8/ser2net*
 
 %changelog
+* Mon Aug 25 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.5-1
+- update to 2.5
+- fix initscript to not be on by default
+- add try-restart
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.4-2.1
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ser2net/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Aug 2007 14:38:40 -0000	1.3
+++ sources	25 Aug 2008 20:02:00 -0000	1.4
@@ -1 +1 @@
-cca7ab6d67463ece72ed9ca71bedd0e7  ser2net-2.4.tar.gz
+c11f36ff2e4c523be7b282f2f6d03638  ser2net-2.5.tar.gz


--- ser2net-2.3-initaddreload.patch DELETED ---