From de24f52d0aad6122a0609c14c644d41e5e2f9b8f4f0f278bafcd3676c1e4cb0e Mon Sep 17 00:00:00 2001 From: Andreas Stieger Date: Fri, 20 Apr 2018 07:40:51 +0000 Subject: [PATCH] Accepting request 599121 from home:AndreasStieger:branches:network:utilities - Fix permissions on unit files wrt bsc#1087977 - Remove executable flags from systemd service files (bsc#1089295). - Use %license (boo#1082318) OBS-URL: https://build.opensuse.org/request/show/599121 OBS-URL: https://build.opensuse.org/package/show/network:utilities/net-snmp?expand=0&rev=10 --- net-snmp.changes | 11 +++++++++++ net-snmp.spec | 19 ++++++++++--------- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/net-snmp.changes b/net-snmp.changes index b2c8dd5..7668a8e 100644 --- a/net-snmp.changes +++ b/net-snmp.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Apr 18 12:04:14 UTC 2018 - tchvatal@suse.com + +- Fix permissions on unit files wrt bsc#1087977 +- Use %license (boo#1082318) + +------------------------------------------------------------------- +Mon Apr 16 15:03:50 UTC 2018 - abergmann@suse.com + +- Remove executable flags from systemd service files (bsc#1089295). + ------------------------------------------------------------------- Thu Feb 1 23:15:44 UTC 2018 - jengelh@inai.de diff --git a/net-snmp.spec b/net-snmp.spec index a2d6a2c..0652532 100644 --- a/net-snmp.spec +++ b/net-snmp.spec @@ -78,11 +78,11 @@ BuildRequires: tcpd-devel Requires: logrotate Requires: perl-SNMP = %{version} Requires: perl-TermReadKey -Requires(post): %fillup_prereq +Requires(post): %fillup_prereq +%{?systemd_requires} %if 0%{?netsnmp_with_sensors} BuildRequires: libsensors4-devel %endif -%{?systemd_requires} %description Net-SNMP is a suite of applications used to implement SNMP v1, SNMP v2c @@ -173,7 +173,7 @@ This package holds the MIB files from the net-snmp package. %package -n perl-SNMP Summary: Perl5 SNMP Extension Module -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Development/Libraries/Perl Requires: %{name} = %{version} Requires: perl-base = %{perl_version} @@ -229,7 +229,7 @@ autoreconf -fvi --with-ldflags="-Wl,-z,relro -Wl,-z,now" \ --with-persistent-directory="%{_localstatedir}/lib/net-snmp" \ --with-agentx-socket="%{netsnmp_agentx_socket_dir_fhs}/master" \ - --with-temp-file-pattern=/var/run/net-snmp/snmp-tmp-XXXXXX \ + --with-temp-file-pattern=%{_localstatedir}/run/net-snmp/snmp-tmp-XXXXXX \ --with-logfile="%{netsnmp_logfile}" \ --with-libwrap="%{_prefix}" \ --with-perl-modules="INSTALLDIRS=vendor" \ @@ -255,8 +255,8 @@ popd %install %make_install INSTALL_PREFIX=%{buildroot} install -Dd %{buildroot}%{_localstatedir}/log %{buildroot}%{_localstatedir}/lib/net-snmp %{buildroot}%{_libexecdir}/net-snmp/agents %{buildroot}%{netsnmp_agentx_socket_dir_fhs} -install -D -m 0755 %{SOURCE1} %{buildroot}%{_unitdir}/snmpd.service -install -D -m 0755 %{SOURCE4} %{buildroot}%{_unitdir}/snmptrapd.service +install -D -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/snmpd.service +install -D -m 0644 %{SOURCE4} %{buildroot}%{_unitdir}/snmptrapd.service install -D -m 0600 %{SOURCE2} %{buildroot}%{_sysconfdir}/snmp/snmpd.conf install -m 0644 %{SOURCE3} . install -m 0644 %{SOURCE4} . @@ -279,8 +279,8 @@ mv %{buildroot}%{_includedir}/net-snmp/net-snmp-config.h{.new,} install -D -m 0644 %{SOURCE10} %{buildroot}%{_fillupdir}/sysconfig.snmpd install -D -m 0644 %{SOURCE11} %{buildroot}%{_fillupdir}/sysconfig.snmptrapd # tmpfiles -install -m 755 -d $RPM_BUILD_ROOT/%{_tmpfilesdir} -install -m 644 %SOURCE20 $RPM_BUILD_ROOT/%{_tmpfilesdir}/net-snmp.conf +install -m 755 -d %{buildroot}/%{_tmpfilesdir} +install -m 644 %SOURCE20 %{buildroot}/%{_tmpfilesdir}/net-snmp.conf # ln -s -f %{netsnmp_agentx_socket_dir_fhs} %{buildroot}%{netsnmp_agentx_socket_dir_rfc} # @@ -306,7 +306,8 @@ find %{buildroot} -type f -name "*.la" -delete -print %postun -n %{libname} -p /sbin/ldconfig %files -%doc AGENT.txt COPYING EXAMPLE.conf EXAMPLE.conf.def +%license COPYING +%doc AGENT.txt EXAMPLE.conf EXAMPLE.conf.def %doc FAQ NEWS TODO CHANGES %doc README README.agent-mibs README.agentx README.krb5 README.snmpv3 README.thread %dir %{_sysconfdir}/snmp