← Back to branch summary

~ubuntu-branches/ubuntu/precise/net-snmp/precise

« back to all changes in this revision

Viewing changes to debian/patches/32_mnttab_path.patch

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2010-06-28 14:59:36 UTC
  • mfrom: (1.2.3 upstream) (1.1.12 sid)
  • Revision ID: james.westby@ubuntu.com-20100628145936-cbiallic69pn044g
Tags: 5.4.3~dfsg-1ubuntu1
https://launchpad.net/bugs/104738
https://launchpad.net/bugs/254261
https://launchpad.net/bugs/250459
https://launchpad.net/bugs/589056
https://launchpad.net/bugs/573391
https://launchpad.net/bugs/533603
* Merge from debian unstable.  Remaining changes:
  - Set Ubuntu maintainer address.
  - net-snmp-config: Use bash. (LP: #104738)
  - Removed multiuser option when calling update-rc.d. (LP: #254261)
  - debian/snmpd.init: LSBify the init script.
  - debian/patches/52_fix_snmpcmd_1_typo.patch: Adjust a typo in snmpcmd.1
    (LP: #250459)
  - debian/snmpd.postinst: source debconf before doing work, LP: #589056
  - debian/snmp.preinst, debian/snmp.prerm: kill any/all processes owned by
    snmp user before install/uninstall, LP: #573391
  - Add apport hook (LP: #533603):
  - debian/{snmp,snmpd}.apport: Added.
  - debian/control: Build-depends on dh-apport.
  - debian/rules: 
    + Add --with apport.
    + override_dh_apport to install hook on snmpd package only.
 * Dropped patches:
   - debian/patches/99-fix-ubuntu-div0.patch: Fix dvision by zero.. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/32_mnttab_path.patch
1
 
--- net-snmp-5.2.3.orig/configure.in    2006-07-14 01:29:49.000000000 +0200
2
 
+++ net-snmp-5.2.3/configure.in 2006-12-28 16:07:34.000000000 +0100
3
 
@@ -2102,13 +2102,19 @@
 
1
Index: net-snmp-5.4.3/configure.in
 
2
===================================================================
 
3
--- net-snmp-5.4.3.orig/configure.in    2010-05-23 22:39:44.000000000 +0200
 
4
+++ net-snmp-5.4.3/configure.in 2010-06-04 17:27:58.000000000 +0200
 
5
@@ -2609,13 +2609,19 @@
4
6
 
5
7
 AC_CACHE_CHECK(for mount table location,ac_cv_ETC_MNTTAB,
6
8
 [ac_cv_ETC_MNTTAB="unknown"
7
 
-for i in /etc/mnttab /etc/mtab /etc/filesystems
 
9
-for i in /etc/mnttab /etc/mtab /etc/filesystems /dev/mnttab
8
10
-  do
9
 
-  if test -f $i; then
 
11
-  if test -f $i -o -c $i; then
10
12
-    ac_cv_ETC_MNTTAB="$i"
11
13
-    break;
12
14
-  fi
16
18
+                                 The default is to autodetect this.],
17
19
+       [ac_cv_ETC_MNTTAB="$with_mnttab"])
18
20
+if test "$ac_cv_ETC_MNTTAB" = "unknown"; then
19
 
+  for i in /etc/mnttab /etc/mtab /etc/filesystems
 
21
+  for i in /etc/mnttab /etc/mtab /etc/filesystems /dev/mnttab
20
22
+    do
21
 
+    if test -f $i; then
 
23
+    if test -f $i -o -c $i; then
22
24
+      ac_cv_ETC_MNTTAB="$i"
23
25
+      break;
24
26
+    fi