- up to 5.6.1.1

[packages/net-snmp.git] / net-snmp.spec

diff --git a/net-snmp.spec b/net-snmp.spec
index 09533c0d5dbfbd2153c94a1e0d77ed976fcf306c..b9f503c556527844ee5e9453023978977319f335 100644 (file)
--- a/net-snmp.spec
+++ b/net-snmp.spec
@@ -27,12 +27,12 @@ Summary(pt_BR.UTF-8):       Agente SNMP da UCD
 Summary(ru.UTF-8):     Набор утилит для протокола SNMP от UC-Davis
 Summary(uk.UTF-8):     Набір утиліт для протоколу SNMP від UC-Davis
 Name:          net-snmp
-Version:       5.6
-Release:       4
+Version:       5.6.1.1
+Release:       1
 License:       BSD-like
 Group:         Networking/Daemons
 Source0:       http://downloads.sourceforge.net/net-snmp/%{name}-%{version}.tar.gz
-# Source0-md5: 89b3a7a77e68daef925abee43a3f7018
+# Source0-md5: 79e2b9cac947567a01ae2cc67ad8fe53
 Source1:       %{name}d.init
 Source2:       %{name}d.conf
 Source3:       %{name}d.sysconfig
@@ -41,6 +41,7 @@ Source5:      %{name}trapd.conf
 Source6:       %{name}trapd.sysconfig
 Source7:       ucd-ipchains.tar.gz
 # Source7-md5: 29949f1008f1a04d6efefd5b3ea607da
+Source8:       snmpd.upstart
 Patch0:                %{name}-acfix.patch
 Patch1:                %{name}-rpm-implicit-libs.patch
 Patch2:                %{name}-config-noflags.patch
@@ -55,13 +56,13 @@ Patch10:    %{name}-lvalue.patch
 Patch11:       %{name}-defaultconfig.patch
 Patch12:       %{name}-use-rpm-hrmib.patch
 Patch13:       %{name}-TCP_STATS_CACHE_TIMEOUT.patch
-Patch14:       %{name}-nodebug.patch
+Patch14:       %{name}-libnl.patch
 URL:           http://www.net-snmp.org/
 BuildRequires: autoconf >= 2.63
 BuildRequires: automake
 BuildRequires: elfutils-devel
 %{?with_kerberos5:BuildRequires:       heimdal-devel}
-BuildRequires: libnl-devel >= 1:1.1
+BuildRequires: libnl-devel >= 1:3.0
 BuildRequires: libtool >= 1.4
 BuildRequires: libwrap-devel
 %{?with_lm_sensors:BuildRequires:      lm_sensors-devel >= 3.0.1}
@@ -78,7 +79,7 @@ BuildRequires:        rpm-pythonprov
 BuildRequires: rpm
 BuildRequires: rpm-perlprov >= 3.0.3-16
 %endif
-BuildRequires: rpmbuild(macros) >= 1.268
+BuildRequires: rpmbuild(macros) >= 1.527
 Requires(post,preun):  /sbin/chkconfig
 Requires:      %{name}-libs = %{version}-%{release}
 Requires:      /usr/bin/setsid
@@ -452,34 +453,37 @@ misc/ipfwacc \
 MIBS="$MIBS ucd-snmp/lmsensorsMib"
 %endif
 
+# ksm must be first in --with-security-modules
+# usm is always enabled
 %configure \
        --disable-debugging \
        --enable-as-needed \
-       %{!?with_static_libs:--disable-static} \
+       %{__disable static_libs static} \
        --with-cflags="%{rpmcflags} %{rpmcppflags} -I/usr/include/et" \
        --with-ldflags="%{rpmldflags}" \
        --with-defaults \
        --with-default-snmp-version=3 \
-       %{?with_kerberos5:--with-krb5=%{_prefix}} \
-       %{!?with_kerberos5:--without-krb5} \
-       --with-openssl=%{_prefix} \
-       --with-libwrap=%{_prefix} \
+       %{__with_without kerberos5 krb5} \
+       --with-openssl \
+       --with-libwrap \
        --with-logfile=%{logfile} \
-       --with-zlib=%{_prefix} \
-       --with-bzip2=%{_prefix} \
-       --with%{!?with_perl:out}-perl-modules \
-       --with%{!?with_python:out}-python-modules \
+       --with-zlib\
+       --with-bzip2 \
+       --with-nl \
+       %{__with_without perl perl-modules} \
+       %{__with_without python python-modules} \
        --enable-local-smux \
        --with-mibdirs='$HOME/.snmp/mibs:/usr/share/mibs:%{_datadir}/snmp/mibs' \
        --with-mib-modules="$MIBS" \
-       %{?with_kerberos5:--with-security-modules="ksm"} \
+       --with-security-modules="%{?with_kerberos5:ksm }tsm" \
        --with-sys-contact="root@localhost" \
        --with-sys-location="Unknown" \
-       --with-transports="UDP UDPIPv6 TCP TCPIPv6 Unix Callback" \
+       --with-transports="UDP UDPIPv6 TCP TCPIPv6 Unix Callback Alias DTLSUDP TLSTCP" \
        --with-persistent-directory="/var/lib/net-snmp" \
        --enable-ucd-snmp-compatibility \
        --enable-ipv6 \
-       --with%{!?with_rpm:out}-rpm
+       %{!?debug:--disable-debugging} \
+       %{__with_without rpm}
 
 %{__make} -j1
 
@@ -517,6 +521,9 @@ install -p %{SOURCE4} $RPM_BUILD_ROOT/etc/rc.d/init.d/snmptrapd
 cp -a %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/snmp/snmptrapd.conf
 cp -a %{SOURCE6} $RPM_BUILD_ROOT/etc/sysconfig/snmptrapd
 
+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
@@ -598,6 +605,7 @@ 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
+%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
@@ -711,6 +719,7 @@ fi
 %attr(755,root,root) %{_bindir}/snmpstatus
 %attr(755,root,root) %{_bindir}/snmptable
 %attr(755,root,root) %{_bindir}/snmptest
+%attr(755,root,root) %{_bindir}/snmptls
 %attr(755,root,root) %{_bindir}/snmptranslate
 %attr(755,root,root) %{_bindir}/snmptrap
 %attr(755,root,root) %{_bindir}/snmpusm