remove ucd-snmp-4.2.4.pre3-mnttab.patch, the configure check in current

code should catch /etc/mtab automatically
This commit is contained in:
Jan Šafránek 2009-07-01 12:59:46 +00:00
parent d0afd78088
commit f251033341
2 changed files with 6 additions and 23 deletions

View File

@ -8,7 +8,7 @@
Summary: A collection of SNMP protocol tools and libraries
Name: net-snmp
Version: %{major_ver}
Release: 12%{?dist}
Release: 13%{?dist}
Epoch: 1
License: BSD and MIT
@ -24,7 +24,6 @@ Source6: net-snmp-config.h
Source7: net-snmp-config
Source8: net-snmp-trapd.redhat.conf
Source9: net-snmpd.sysconfig
Patch1: ucd-snmp-4.2.4.pre3-mnttab.patch
Patch4: net-snmp-5.4.1-pie.patch
Patch5: net-snmp-5.1.2-dir-fix.patch
Patch6: net-snmp-5.2.1-file_offset.patch
@ -159,7 +158,8 @@ Net-SNMP toolkit library.
%prep
%setup -q -n %{name}-%{major_ver}
%patch1 -p1 -b .mnttab
# TODO: check, there is /etc/mtab in net-snmp-config.h on all architectures
# %patch1 -p1 -b .mnttab
%ifnarch ia64
%patch4 -p1 -b .pie
@ -423,6 +423,9 @@ rm -rf ${RPM_BUILD_ROOT}
%{_datadir}/snmp/mibs
%changelog
* Wed Jul 1 2009 Jan Safranek <jsafranek@redhat.com> 5.4.2.1-13
- package cleanup, remove unnecessary patches
* Wed Jul 1 2009 Jan Safranek <jsafranek@redhat.com> 5.4.2.1-12
- make the default configuration less noisy, i.e. do not print "Connection from
UDP:" and "Received SNMP packet(s) from UDP:" messages on each connection.

View File

@ -1,20 +0,0 @@
diff -up net-snmp-5.4.1/configure.backup_patch_1 net-snmp-5.4.1/configure
--- net-snmp-5.4.1/configure.backup_patch_1 2007-07-27 19:04:19.000000000 +0200
+++ net-snmp-5.4.1/configure 2008-07-25 12:52:01.000000000 +0200
@@ -26579,15 +26579,7 @@ echo $ECHO_N "checking for mount table l
if test "${ac_cv_ETC_MNTTAB+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_cv_ETC_MNTTAB="unknown"
-for i in /etc/mnttab /etc/mtab /etc/filesystems
- do
- if test -f $i; then
- ac_cv_ETC_MNTTAB="$i"
- break;
- fi
-done
-
+ ac_cv_ETC_MNTTAB="/etc/mtab"
fi
echo "$as_me:$LINENO: result: $ac_cv_ETC_MNTTAB" >&5
echo "${ECHO_T}$ac_cv_ETC_MNTTAB" >&6