rpms/lldpad/devel .cvsignore, 1.4, 1.5 lldpad-0.9.19-init-lsb.patch, 1.2, 1.3 lldpad-0.9.7-init.patch, 1.1, 1.2 lldpad.spec, 1.5, 1.6 sources, 1.4, 1.5

Mon Jun 28 13:07:47 UTC 2010

Author: jzeleny

Update of /cvs/extras/rpms/lldpad/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv14553

Modified Files:
	.cvsignore lldpad-0.9.19-init-lsb.patch 
	lldpad-0.9.7-init.patch lldpad.spec sources 
Log Message:
rebased to 0.9.38


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lldpad/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5

--- .cvsignore	12 Apr 2010 13:15:36 -0000	1.4
+++ .cvsignore	28 Jun 2010 13:07:47 -0000	1.5
@@ -1 +1 @@
-lldpad-0.9.32.tar.gz
+lldpad-0.9.38.tar.gz

lldpad-0.9.19-init-lsb.patch:
 lldpad.init |   21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

Index: lldpad-0.9.19-init-lsb.patch
===================================================================
RCS file: /cvs/extras/rpms/lldpad/devel/lldpad-0.9.19-init-lsb.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- lldpad-0.9.19-init-lsb.patch	12 Apr 2010 13:15:36 -0000	1.2
+++ lldpad-0.9.19-init-lsb.patch	28 Jun 2010 13:07:47 -0000	1.3
@@ -1,12 +1,12 @@
---- lldpad-0.9.26/lldpad.init.orig	2010-02-25 10:32:30.000000000 +0100
-+++ lldpad-0.9.26/lldpad.init	2010-02-25 10:52:52.000000000 +0100
+--- lldpad-0.9.38/lldpad.init.orig	2010-06-23 10:52:43.000000000 +0200
++++ lldpad-0.9.38/lldpad.init	2010-06-23 11:01:02.000000000 +0200
 @@ -151,6 +151,7 @@
  # See how we were called.
  case "$1" in
  	start)
 +		[ "$EUID" = "0" ] || exit 4
  		echo -n $"Starting $LLDPAD: "
-		$LLDPAD_BIN -k
+ 		$LLDPAD_BIN -k
  		start_daemon $LLDPAD_BIN -d $OPTIONS
 @@ -158,6 +159,7 @@
  		[ $? -eq 0 ] && touch /var/lock/subsys/lldpad
@@ -16,22 +16,27 @@
  		echo -n $"Shutting down $LLDPAD: "
  		killproc $LLDPAD
  		rc_status -v
-@@ -177,6 +179,14 @@
- 		
- 		# NOTE: checkproc returns LSB compliant status values.
- 		checkproc $LLDPAD_BIN
+@@ -166,6 +168,19 @@
+ 	status)
+ 		echo -n "Checking for service $LLDPAD: "
+ 		p=`pidof $LLDPAD`
 +		RC=$?
-+		if [ "$RC" = "3" -a -f /var/lock/subsys/lldpad ]; then
-+			rc_failed 2
-+		elif [ "$RC" = "3" ]; then
-+			rc_failed 3
-+		elif [ "$RC" = "1" ]; then
-+			rc_failed 1
++		if [ "$RC" = "1" ]; then
++			echo "stopped"
++			if [ -f /var/lock/subsys/lldpad ]; then
++				rc_failed 2
++			elif [ -f /var/run/lldpad.pid ]; then
++				rc_failed 1
++			else
++				rc_failed 3
++			fi
++		else
++			echo "running"
 +		fi
- 		# NOTE: rc_status knows that we called this init script with
- 		# "status" option and adapts its messages accordingly.
  		rc_status -v
-@@ -236,9 +246,13 @@
+ 		;;
+ 	try-restart|condrestart)
+@@ -226,9 +238,13 @@
  		rc_failed 3
  		rc_status -v
  		;;

lldpad-0.9.7-init.patch:
 lldpad.init |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Index: lldpad-0.9.7-init.patch
===================================================================
RCS file: /cvs/extras/rpms/lldpad/devel/lldpad-0.9.7-init.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lldpad-0.9.7-init.patch	1 Mar 2010 12:46:47 -0000	1.1
+++ lldpad-0.9.7-init.patch	28 Jun 2010 13:07:47 -0000	1.2
@@ -7,7 +7,7 @@ diff -Nurp dcbd-0.9.7-current/dcbd.init 
  #
 -# chkconfig: 345 20 80
 +# chkconfig: - 20 80
- # description: Data Center Bridging Exchange protocol daemon
+ # description: Link Layer Discovery Protocol Agent Daemon
  #
  ### BEGIN INIT INFO
  # Provides: lldpad
@@ -16,7 +16,7 @@ diff -Nurp dcbd-0.9.7-current/dcbd.init 
 -# Default-Start: 3 5
 +# Default-Start:
  # Default-Stop:
-+# Short-Description: Data Center Bridging Exchange protocol daemon
- # Description: Data Center Bridging Exchange protocol daemon
++# Short-Description: Link Layer Discovery Protocol Agent Daemon
+ # Description: Link Layer Discovery Protocol Agent Daemon
  ### END INIT INFO
  


Index: lldpad.spec
===================================================================
RCS file: /cvs/extras/rpms/lldpad/devel/lldpad.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- lldpad.spec	10 May 2010 06:23:52 -0000	1.5
+++ lldpad.spec	28 Jun 2010 13:07:47 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           lldpad
-Version:        0.9.32
-Release:        2%{?dist}
+Version:        0.9.38
+Release:        1%{?dist}
 Summary:        Intel LLDP Agent
 
 Group:          System Environment/Daemons
@@ -105,6 +105,10 @@ test -e %{_includedir}/dcbd && `rm -f %{
 
 
 %changelog
+* Mon Jun 28 2010 Jan Zeleny <jzeleny at redhat.com> - 0.9.38-1
+- rebased to 0.9.38 (various enhancements and bugfixes, see 
+  lldpad-0.9.38-relnotes.txt on http://e1000.sf.net for complete list)
+
 * Mon May 10 2010 Jan Zeleny <jzeleny at redhat.com> - 0.9.32-2
 - rebuild to match new libconfig
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lldpad/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	12 Apr 2010 13:15:37 -0000	1.4
+++ sources	28 Jun 2010 13:07:47 -0000	1.5
@@ -1 +1 @@
-72cb15898847b76ae8d2aaf5da00c7ad  lldpad-0.9.32.tar.gz
+a55178979b523c02d0bb90bb36f3a693  lldpad-0.9.38.tar.gz

