X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=net-snmp.spec;h=8e5dbb9f4d8e6fac455c535873f38111873cbdf8;hb=d7f413400b402a4b465d8e91157341034474e941;hp=0148b3f5e2d4898ac070572aaf1013703413a077;hpb=108aee975aeff535fb0bbf4c72c1a198fb83ef3d;p=packages%2Fnet-snmp.git

diff --git a/net-snmp.spec b/net-snmp.spec
index 0148b3f..8e5dbb9 100644
--- a/net-snmp.spec
+++ b/net-snmp.spec
@@ -12,7 +12,7 @@
 %bcond_without	python		# don't include Python modules
 %bcond_without	static_libs	# don't build static library
 
-%ifnarch %{ix86} %{x8664}
+%ifnarch %{ix86} %{x8664} x32
 %undefine	with_lm_sensors
 %endif
 
@@ -25,12 +25,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.7
-Release:	1
+Version:	5.7.3
+Release:	6
 License:	BSD-like
 Group:		Networking/Daemons
 Source0:	http://downloads.sourceforge.net/net-snmp/%{name}-%{version}.tar.gz
-# Source0-md5:	1038e960d6d616c64c0979180daf0e19
+# Source0-md5:	d4a3459e1577d0efa8d96ca70a885e53
 Source1:	%{name}d.init
 Source2:	%{name}d.conf
 Source3:	%{name}d.sysconfig
@@ -39,7 +39,7 @@ 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
 Patch2:		%{name}-config-noflags.patch
@@ -48,19 +48,20 @@ Patch4:		%{name}-link.patch
 Patch5:		%{name}-llinterfaces.patch
 Patch6:		%{name}-kernel_headers.patch
 Patch7:		%{name}-rpmpath.patch
-Patch8:		%{name}-snmpksm.patch
+
 Patch9:		%{name}-python.patch
 Patch10:	%{name}-lvalue.patch
 Patch11:	%{name}-defaultconfig.patch
 Patch12:	%{name}-use-rpm-hrmib.patch
 Patch13:	%{name}-TCP_STATS_CACHE_TIMEOUT.patch
-Patch14:	%{name}-libnl.patch
+
+Patch17:	%{name}-logging.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:3.0
+BuildRequires:	libnl-devel >= 1:3.2
 BuildRequires:	libssh2-devel
 BuildRequires:	libtool >= 1.4
 BuildRequires:	libwrap-devel
@@ -89,6 +90,7 @@ Provides:	snmpd
 Obsoletes:	cmu-snmp
 Obsoletes:	snmpd
 Obsoletes:	ucd-snmp
+Conflicts:	pciutils < 3.1.7-5
 Conflicts:	rpm < 4.4.9-43.11
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -167,10 +169,11 @@ Group:		Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	elfutils-devel
 %{?with_kerberos5:Requires:	heimdal-devel}
-Requires:	libnl-devel >= 1:1.1
+Requires:	libnl-devel >= 1:3.2
 Requires:	libwrap-devel
 %{?with_lm_sensors:Requires:	lm_sensors-devel >= 3.0.1}
 Requires:	openssl-devel >= 0.9.7c
+Requires:	pciutils-devel
 Obsoletes:	ucd-snmp-devel
 
 %description devel
@@ -285,6 +288,9 @@ Group:		Applications/System
 Requires:	mibs-dirs
 Obsoletes:	net-snmp-mibs
 Conflicts:	ucd-snmp-libs
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
 
 %description -n mibs-net-snmp
 Net-SNMP provided MIBs (Management Information Base).
@@ -425,13 +431,14 @@ SNMP dla trzech wersji tego protokołu (SNMPv3, SNMPv2c, SNMPv1).
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p1
+
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
-%patch14 -p1
+
+%patch17 -p1
 
 %build
 %{__libtoolize}
@@ -456,7 +463,7 @@ MIBS="$MIBS ucd-snmp/lmsensorsMib"
 # ksm must be first in --with-security-modules
 # usm is always enabled
 %configure \
-	--disable-debugging \
+	ac_cv_path_DPKG_QUERY_PATH= \
 	--enable-as-needed \
 	%{__disable static_libs static} \
 	--with-cflags="%{rpmcflags} %{rpmcppflags} -I/usr/include/et" \
@@ -473,7 +480,7 @@ MIBS="$MIBS ucd-snmp/lmsensorsMib"
 	%{__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-mibdirs='$HOME/.snmp/mibs:/usr/share/mibs' \
 	--with-mib-modules="$MIBS" \
 	--with-security-modules="%{?with_kerberos5:ksm }tsm" \
 	--with-sys-contact="root@localhost" \
@@ -497,12 +504,13 @@ cd perl
 # avoid rpaths generated by MakeMaker
 perl -pi -e 's@LD_RUN_PATH="\$\(LD_RUN_PATH\)" @@' */Makefile */*/Makefile
 
+bd=$(cd ..; pwd)
 %{__make} \
-	LDFLAGS="%{rpmldflags}"
+	LDFLAGS="%{rpmldflags} -L$bd/snmplib/.libs/ -L$bd/agent/.libs/"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,sysconfig,snmp},/var/log,/var/lib/net-snmp,%{_libdir}/snmp/dlmod}
+install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,logrotate.d,sysconfig,snmp},/var/log,/var/lib/net-snmp,%{_libdir}/snmp/dlmod}
 
 %{__make} -j1 install \
 	mibdir=%{_datadir}/mibs \
@@ -521,8 +529,7 @@ install -p %{SOURCE4} $RPM_BUILD_ROOT/etc/rc.d/init.d/snmptrapd
 cp -p %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/snmp/snmptrapd.conf
 cp -p %{SOURCE6} $RPM_BUILD_ROOT/etc/sysconfig/snmptrapd
 
-install -d $RPM_BUILD_ROOT/etc/init
-cp -p %{SOURCE8} $RPM_BUILD_ROOT/etc/init/snmpd.conf
+cp -p %{SOURCE9} $RPM_BUILD_ROOT/etc/logrotate.d/snmpd
 
 cd perl
 %{__make} -j1 install \
@@ -536,7 +543,6 @@ cd ..
 %{__rm} $RPM_BUILD_ROOT%{_bindir}/ipf-mod.pl
 
 %{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/Bundle/Makefile.subs.pl
-%{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Bundle/NetSNMP/NetSNMP.{bs,so}
 rm -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
 rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Bundle/NetSNMP/.packlist
 
@@ -604,7 +610,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) /etc/logrotate.d/snmpd
 
 %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
@@ -757,16 +763,13 @@ fi
 %{perl_vendorarch}/NetSNMP
 %dir %{perl_vendorarch}/auto/SNMP
 %{perl_vendorarch}/auto/SNMP/autosplit.ix
-%{perl_vendorarch}/auto/SNMP/SNMP.bs
 %attr(755,root,root) %{perl_vendorarch}/auto/SNMP/SNMP.so
 %dir %{perl_vendorarch}/auto/NetSNMP
 %dir %{perl_vendorarch}/auto/NetSNMP/*
 %{perl_vendorarch}/auto/NetSNMP/*/autosplit.ix
-%{perl_vendorarch}/auto/NetSNMP/*/*.bs
 %attr(755,root,root) %{perl_vendorarch}/auto/NetSNMP/*/*.so
 %dir %{perl_vendorarch}/auto/NetSNMP/agent/default_store
 %{perl_vendorarch}/auto/NetSNMP/agent/default_store/autosplit.ix
-%{perl_vendorarch}/auto/NetSNMP/agent/default_store/default_store.bs
 %attr(755,root,root) %{perl_vendorarch}/auto/NetSNMP/agent/default_store/default_store.so
 %{_mandir}/man3/NetSNMP::*.3*
 %{_mandir}/man3/SNMP.3*