fix patches

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@2538 ec354946-7b23-47d6-9f5a-488ba84defc7

n/net-snmp/net-snmp-vl.spec

@@ -5,37 +5,29 @@ Summary: A collection of SNMP protocol tools and libraries.
 Summary(ja): SNMP プロトコルツールとライブラリのコレクション
 Name: net-snmp
 Version: 5.6.1
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 License: BSDish
 Group: System Environment/Daemons
+URL: http://net-snmp.sourceforge.net/
+
 Source0: http://dl.sourceforge.net/net-snmp/net-snmp-%{version}.tar.gz
 Source1: net-snmp.redhat.conf
 Source2: net-snmpd.init
 Source3: net-snmptrapd.init
-Source4: net-snmpd.logrotate
-Source5: ucd5820stat
-Source6: net-snmp-config.h
-Source7: net-snmp-config
-Source8: net-snmp-trapd.redhat.conf
-
-## Patch1: ucd-snmp-4.2.4.pre3-mnttab.patch
-Patch1: net-snmp-5.6.1-mnttab.patch
-Patch2: net-snmp-5.0.8-ipv6-sock-close.patch
-Patch3: net-snmp-5.0.8-readonly.patch
-Patch4: net-snmp-5.6.1-pie.patch
-# Patch5: net-snmp-5.4-64bit.patch
-Patch6: net-snmp-5.1.2-dir-fix.patch
-Patch7: net-snmp-5.2.1-file_offset.patch
-Patch8: net-snmp-5.3.1-multilib.patch
-Patch9: net-snmp-5.6.1-config_libdir.patch
-# Patch10: net-snmp-5.4.1-ethtool-config.patch
-Patch11: net-snmp-5.6.1-strange_libpath.patch
-# Patch12: net-snmp-5.4.1-hostname.patch
-Patch13: net-snmp-5.4.3-shared-ip.patch
-# Patch14: net-snmp-5.4-exec-crash.patch
-Patch15: net-snmp-5.1.2-snmpconf-selinux.patch
-Patch16: net-snmp-5.4.1-sensors3.patch
-Patch17: net-snmp-5.4.1-xen-crash.patch
+Source4: net-snmp-config.h
+Source5: net-snmp-config
+Source6: net-snmp-trapd.redhat.conf
+Source7: net-snmpd.sysconfig
+Source8: net-snmptrapd.sysconfig
+Source9: net-snmp-tmpfs.conf
+Source10:  net-snmpd.logrotate
+Patch1: net-snmp-5.6.1-pie.patch
+Patch2: net-snmp-5.5-dir-fix.patch
+Patch3: net-snmp-5.6-multilib.patch
+Patch4: net-snmp-5.5-include-struct.patch
+Patch5: net-snmp-5.5-apsl-copying.patch
+Patch6: net-snmp-5.5-perl-linking.patch
+Patch7: net-snmp-5.6-test-debug.patch
 
 Requires(pre): /sbin/chkconfig
 Obsoletes: cmu-snmp ucd-snmp
@@ -142,27 +134,17 @@ perl から mib2c や SNMP を使用したいならば, net-snmp-perl パッケ
 
 %prep
 %setup -q
-%patch1 -p1 -b .mnttab
-%patch2 -p1 -b .ipv6-sock-close
-%patch3 -p1 -b .readonly
 
 %ifnarch ia64
-%patch4 -p1 -b .pie
+%patch1 -p1 -b .pie
 %endif
 
-# %patch5  -p1 -b .64bit
-# %patch6 -p1 -b .dir-fix
-%patch7 -p1 -b .file_offset
-# %patch8 -p1 -b .multilib
-%patch9 -p1 -b .libdir
-# %patch10 -p1 -b .ethtool
-%patch11 -p1 -b .libpath
-# %patch12 -p1 -b .hostname
-# %patch13 -p1 -b .shared-ip
-# %patch14 -p1 -b .exec
-%patch15 -p1 -b .selinux
-# %patch16 -p0 -b .sensors
-# %patch17 -p0 -b .xen-crash
+%patch2 -p1 -b .dir-fix
+%patch3 -p1 -b .multilib
+%patch4 -p1 -b .include-struct
+%patch5 -p1 -b .apsl
+%patch6 -p1 -b .perl-linking
+%patch7 -p1
 
 perl -pi -e "s|'\\\$install_libdir'|'%{_libdir}'|" ltmain.sh
 
@@ -216,14 +198,14 @@ basearch=i386
 %endif
 
 mv ${RPM_BUILD_ROOT}/%{_bindir}/net-snmp-config ${RPM_BUILD_ROOT}/%{_bindir}/net-snmp-config-${basearch}
-install -m 755 %SOURCE7 ${RPM_BUILD_ROOT}/%{_bindir}/net-snmp-config
+install -m 755 %SOURCE5 ${RPM_BUILD_ROOT}/%{_bindir}/net-snmp-config
 
 %ifarch %{multilib_arches}
 # Do an net-snmp-config.h switcheroo to avoid file conflicts on systems where you
 # can have both a 32- and 64-bit version of the library, and they each need
 # their own correct-but-different versions of net-snmp-config.h to be usable.
 mv ${RPM_BUILD_ROOT}/%{_includedir}/net-snmp-config.h ${RPM_BUILD_ROOT}/%{_includedir}/net-snmp-config-${basearch}.h
-install -m644 %SOURCE6 ${RPM_BUILD_ROOT}/%{_includedir}/net-snmp-config.h
+install -m644 %SOURCE4 ${RPM_BUILD_ROOT}/%{_includedir}/net-snmp-config.h
 %endif
 
 # remove .la files
@@ -231,17 +213,22 @@ rm  ${RPM_BUILD_ROOT}%{_libdir}/*.la
 
 install -d ${RPM_BUILD_ROOT}%{_sysconfdir}/snmp
 install -m 644 %SOURCE1 ${RPM_BUILD_ROOT}%{_sysconfdir}/snmp/snmpd.conf
-install -m 644 %SOURCE8 ${RPM_BUILD_ROOT}%{_sysconfdir}/snmp/snmptrapd.conf
+install -m 644 %SOURCE6 ${RPM_BUILD_ROOT}%{_sysconfdir}/snmp/snmptrapd.conf
 
 install -d ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d
 install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d/snmpd
 install -m 755 %SOURCE3 ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d/snmptrapd
 
+install -d ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
+install -m 644 %SOURCE7 ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/snmpd
+install -m 644 %SOURCE8 ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/snmptrapd
+
 install -d ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d
-install -m 644 %{SOURCE4} ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/snmpd
+install -m 644 %{SOURCE10} ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/snmpd
 
-install -d ${RPM_BUILD_ROOT}%{_bindir}
-install -m 755 %SOURCE5 ${RPM_BUILD_ROOT}%{_bindir}/ucd5820stat
+# prepare /var/lib/net-snmp
+install -d ${RPM_BUILD_ROOT}%{_localstatedir}/lib/net-snmp
+install -d ${RPM_BUILD_ROOT}%{_localstatedir}/run/net-snmp
 
 rm -f ${RPM_BUILD_ROOT}%{_bindir}/snmpinform
 rm -f ${RPM_BUILD_ROOT}%{_bindir}/tkmib
@@ -269,6 +256,16 @@ find $RPM_BUILD_ROOT/$installvendorlib -type f -print \
 popd
 find $RPM_BUILD_ROOT -name '*.so' | xargs chmod 0755
 
+# remove executable bit from documentation samples
+chmod 644 local/passtest local/ipf-mod.pl
+
+# dirty hack for #603243, until it's fixed properly upstream
+install -m 755 -d $RPM_BUILD_ROOT/usr/include/net-snmp/agent/util_funcs
+install -m 644  agent/mibgroup/util_funcs/*.h $RPM_BUILD_ROOT/usr/include/net-snmp/agent/util_funcs
+
+mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/tmpfiles.d/
+install -m 644 %SOURCE9 $RPM_BUILD_ROOT/%{_sysconfdir}/tmpfiles.d/net-snmp.conf
+
 
 %post
 /sbin/ldconfig
@@ -304,14 +301,17 @@ rm -rf ${RPM_BUILD_ROOT}
 %doc AGENT.txt COPYING ChangeLog EXAMPLE.conf FAQ NEWS PORTING README* TODO
 %doc local/passtest local/README.mib2c local/ipf-mod.pl
 %dir %{_sysconfdir}/snmp
+%config(noreplace,missingok) %{_sysconfdir}/sysconfig/snmpd
+%config(noreplace,missingok) %{_sysconfdir}/sysconfig/snmptrapd
 %config(noreplace,missingok) %{_sysconfdir}/snmp/snmpd.conf
 %config(noreplace,missingok) %{_sysconfdir}/snmp/snmptrapd.conf
 %config(noreplace) %{_sysconfdir}/rc.d/init.d/snmpd
 %config(noreplace) %{_sysconfdir}/rc.d/init.d/snmptrapd
 %config(noreplace) %{_sysconfdir}/logrotate.d/snmpd
+%config(noreplace) %{_sysconfdir}/tmpfiles.d/net-snmp.conf
+%config(noreplace) %{_sysconfdir}/logrotate.d/snmpd
 %{_datadir}/snmp
 %{_libdir}/lib*.so.*
-%{_bindir}/ucd5820stat
 %{_sbindir}/*
 %attr(0644,root,root)	%{_mandir}/man[58]/*
 
@@ -355,6 +355,9 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %changelog
+* Tue Jan 18 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 5.6.1-2
+- merge spec, patch, source from FC package
+
 * Mon Jan 10 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 5.6.1-1
 - new upstream release
 - add configure option: --with-mnttab="/etc/mnttab"