← Back to branch summary

~ubuntu-branches/ubuntu/wily/net-snmp/wily-proposed

« back to all changes in this revision

Viewing changes to debian/patches/02_statistics.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/02_statistics.patch
1
 
--- net-snmp-5.1.2.orig/agent/mibgroup/mibII/interfaces.c
2
 
+++ net-snmp-5.1.2/agent/mibgroup/mibII/interfaces.c
3
 
@@ -1598,6 +1612,10 @@
 
1
Index: net-snmp-5.4.3/agent/mibgroup/mibII/interfaces.c
 
2
===================================================================
 
3
--- net-snmp-5.4.3.orig/agent/mibgroup/mibII/interfaces.c       2010-06-04 17:10:29.000000000 +0200
 
4
+++ net-snmp-5.4.3/agent/mibgroup/mibII/interfaces.c    2010-06-04 17:10:33.000000000 +0200
 
5
@@ -1551,6 +1551,10 @@
4
6
         struct ifnet   *nnew;
5
7
         char           *stats, *ifstart = line;
6
8
 
11
13
         if (line[strlen(line) - 1] == '\n')
12
14
             line[strlen(line) - 1] = '\0';
13
15
 
14
 
@@ -1631,7 +1649,7 @@
 
16
@@ -1584,7 +1588,7 @@
15
17
                                                &coll) != 5)) {
16
18
             if ((scan_line_to_use == scan_line_2_2)
17
19
                 && !strstr(line, "No statistics available"))