[csw-devel] SF.net SVN: gar:[21519] csw/mgar/pkg/netsnmp/trunk

[cgrzemba at users.sourceforge.net]

Revision: 21519
          http://gar.svn.sourceforge.net/gar/?rev=21519&view=rev
Author:   cgrzemba
Date:     2013-07-18 09:18:11 +0000 (Thu, 18 Jul 2013)
Log Message:
-----------
netsnmp/trunk: fix init scripts: Mantis 0005094

Modified Paths:
--------------
    csw/mgar/pkg/netsnmp/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/netsnmp/trunk/files/0001-remove-linux-specials-2nd.patch
    csw/mgar/pkg/netsnmp/trunk/files/0001-remove-linux-specials.patch

Modified: csw/mgar/pkg/netsnmp/trunk/Makefile
===================================================================
--- csw/mgar/pkg/netsnmp/trunk/Makefile	2013-07-17 19:19:48 UTC (rev 21518)
+++ csw/mgar/pkg/netsnmp/trunk/Makefile	2013-07-18 09:18:11 UTC (rev 21519)
@@ -21,7 +21,6 @@
 DISTNAME = $(SF_PROJECT)-$(VERSION)
 DISTFILES = $(DISTNAME).tar.gz
 
-REINPLACE_USRLOCAL = dist/snmp*init.d
 REINPLACE_USRLOCAL += perl/TrapReceiver/TrapReceiver.pm
 REINPLACE_USRLOCAL += local/ipf-mod.pl
 REINPLACE_USRLOCAL += local/traptoemail
@@ -31,6 +30,8 @@
 # Patch for python module
 PATCHFILES += Makefile.in.diff
 PATCHFILES += setup-py.patch
+PATCHFILES += 0001-remove-linux-specials.patch
+PATCHFILES += 0001-remove-linux-specials-2nd.patch
 
 VENDOR_URL = http://www.net-snmp.org/
 
@@ -200,7 +201,7 @@
 	ginstall -d $(DESTDIR)/$(sysconfdir)/snmp
 	ginstall -m 755	$(WORKSRC)/dist/snmpd-init.d $(DESTDIR)/$(sysconfdir)/init.d/snmpd
 	ginstall -m 755	$(WORKSRC)/dist/snmptrapd-init.d $(DESTDIR)/$(sysconfdir)/init.d/snmptrapd
-	ginstall -m 755	$(WORKSRC)/EXAMPLE.conf $(DESTDIR)/$(sysconfdir)/snmp/snmpd
+	ginstall -m 755	$(WORKSRC)/EXAMPLE.conf $(DESTDIR)/$(sysconfdir)/snmp/snmpd.conf
 	@$(MAKECOOKIE)
 
 #post-install-isa-sparcv8:

Added: csw/mgar/pkg/netsnmp/trunk/files/0001-remove-linux-specials-2nd.patch
===================================================================
--- csw/mgar/pkg/netsnmp/trunk/files/0001-remove-linux-specials-2nd.patch	                        (rev 0)
+++ csw/mgar/pkg/netsnmp/trunk/files/0001-remove-linux-specials-2nd.patch	2013-07-18 09:18:11 UTC (rev 21519)
@@ -0,0 +1,36 @@
+From bfb169f465df815ce2858acfd9d813b42606aea0 Mon Sep 17 00:00:00 2001
+From: Carsten Grzemba <cgrzemba at opencsw.org>
+Date: Thu, 18 Jul 2013 11:00:52 +0200
+Subject: [PATCH] remove linux specials 2nd
+
+---
+ dist/snmptrapd-init.d | 11 +----------
+ 1 file changed, 1 insertion(+), 10 deletions(-)
+
+diff --git a/dist/snmptrapd-init.d b/dist/snmptrapd-init.d
+index 8225242..7e3c98c 100644
+--- a/dist/snmptrapd-init.d
++++ b/dist/snmptrapd-init.d
+@@ -6,18 +6,9 @@
+ # chkconfig: - 25 75
+ # description: snmptrapd is net-snmp SNMPTRAP daemon.
+ 
+-# Source function library.
+-. /etc/rc.d/init.d/functions
+-
+-# Source networking configuration.
+-. /etc/sysconfig/network
+-
+-# Check that networking is up.
+-[ "${NETWORKING}" = "no" ] && exit 0
+-
+ RETVAL=0
+ name="snmptrapd"
+-prog="/usr/local/sbin/snmptrapd"
++prog="/opt/csw/sbin/snmptrapd"
+ 
+ [ -x $prog ] || exit 0
+ 
+-- 
+1.8.3.1
+

Added: csw/mgar/pkg/netsnmp/trunk/files/0001-remove-linux-specials.patch
===================================================================
--- csw/mgar/pkg/netsnmp/trunk/files/0001-remove-linux-specials.patch	                        (rev 0)
+++ csw/mgar/pkg/netsnmp/trunk/files/0001-remove-linux-specials.patch	2013-07-18 09:18:11 UTC (rev 21519)
@@ -0,0 +1,39 @@
+From c45b6c9eafe714fb4f2fbaf2ebeecd1e2213dc0f Mon Sep 17 00:00:00 2001
+From: Carsten Grzemba <cgrzemba at opencsw.org>
+Date: Thu, 18 Jul 2013 10:58:52 +0200
+Subject: [PATCH] remove linux specials
+
+---
+ dist/snmpd-init.d | 13 ++-----------
+ 1 file changed, 2 insertions(+), 11 deletions(-)
+
+diff --git a/dist/snmpd-init.d b/dist/snmpd-init.d
+index bd15b00..2ea583f 100755
+--- a/dist/snmpd-init.d
++++ b/dist/snmpd-init.d
+@@ -6,20 +6,11 @@
+ # chkconfig: - 26 74
+ # description: snmpd is net-snmp SNMP daemon.
+ 
+-# Source function library.
+-. /etc/rc.d/init.d/functions
+-
+-# Source networking configuration.
+-. /etc/sysconfig/network
+-
+-# Check that networking is up.
+-[ "${NETWORKING}" = "no" ] && exit 0
+-
+ RETVAL=0
+ name="snmpd"
+-prog="/usr/local/sbin/snmpd"
++prog="/opt/csw/sbin/snmpd"
+ 
+-[ -x $prog -a -f /usr/local/share/snmp/snmpd.conf ] || exit 0
++[ -x $prog -a -f /etc/opt/csw/snmp/snmpd.conf ] || exit 0
+ 
+ start() {
+         # Start daemons.
+-- 
+1.8.3.1
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.