[packages/net-snmp] - drop upstart support - rel 5
baggins
baggins at pld-linux.org
Tue Aug 18 16:05:04 CEST 2015
commit 7f36123592411f03157c2a7524ba36950909cb74
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Tue Aug 18 23:04:40 2015 +0900
- drop upstart support
- rel 5
net-snmp.spec | 7 +------
snmpd.upstart | 16 ----------------
2 files changed, 1 insertion(+), 22 deletions(-)
---
diff --git a/net-snmp.spec b/net-snmp.spec
index 6dfc6fb..860e5d5 100644
--- a/net-snmp.spec
+++ b/net-snmp.spec
@@ -26,7 +26,7 @@ Summary(ru.UTF-8): Набор утилит для протокола SNMP от U
Summary(uk.UTF-8): Набір утиліт для протоколу SNMP від UC-Davis
Name: net-snmp
Version: 5.7.3
-Release: 4
+Release: 5
License: BSD-like
Group: Networking/Daemons
Source0: http://downloads.sourceforge.net/net-snmp/%{name}-%{version}.tar.gz
@@ -39,7 +39,6 @@ Source5: %{name}trapd.conf
Source6: %{name}trapd.sysconfig
Source7: ucd-ipchains.tar.gz
# Source7-md5: 29949f1008f1a04d6efefd5b3ea607da
-Source8: snmpd.upstart
Source9: snmpd.logrotate
Patch0: %{name}-acfix.patch
Patch1: %{name}-rpm-implicit-libs.patch
@@ -532,9 +531,6 @@ cp -p %{SOURCE6} $RPM_BUILD_ROOT/etc/sysconfig/snmptrapd
cp -p %{SOURCE9} $RPM_BUILD_ROOT/etc/logrotate.d/snmpd
-install -d $RPM_BUILD_ROOT/etc/init
-cp -p %{SOURCE8} $RPM_BUILD_ROOT/etc/init/snmpd.conf
-
cd perl
%{__make} -j1 install \
DESTDIR=$RPM_BUILD_ROOT
@@ -615,7 +611,6 @@ fi
%attr(754,root,root) /etc/rc.d/init.d/snmpd
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/snmpd
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/snmpd
-%config(noreplace) %verify(not md5 mtime size) /etc/init/snmpd.conf
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/snmp/snmpd.conf
%attr(640,root,root) %config(missingok,noreplace) %verify(not md5 mtime size) %{_sysconfdir}/snmp/snmpd.local.conf
diff --git a/snmpd.upstart b/snmpd.upstart
deleted file mode 100644
index e312501..0000000
--- a/snmpd.upstart
+++ /dev/null
@@ -1,16 +0,0 @@
-description "SNMP Daemon"
-
-start on local-filesystems and pld.network-started and started SERVICE_syslog=y
-stop on pld.shutdown-started
-
-env SNMPD_LISTEN_ADDRS=
-
-respawn
-
-script
- # Source old-style snmpd service configuration
- [ -f /etc/sysconfig/snmpd ] && . /etc/sysconfig/snmpd
-
- SNMPD_LISTEN_ADDRS=""
- exec /usr/sbin/snmpd -f -p /var/run/snmpd.pid $SNMPD_LISTEN_ADDRS
-end script
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/net-snmp.git/commitdiff/7f36123592411f03157c2a7524ba36950909cb74
More information about the pld-cvs-commit
mailing list