lp:~yolanda.robla/ubuntu/saucy/net-snmp/debian_merge

Created by Yolanda Robla and last modified
Get this branch:
bzr branch lp:~yolanda.robla/ubuntu/saucy/net-snmp/debian_merge
Only Yolanda Robla can upload to this branch. If you are Yolanda Robla please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Yolanda Robla
Status:
Development

Recent revisions

63. By Yolanda Robla

restored dh_installinit

62. By Yolanda Robla

Call dh_installinit correctly to avoid installing links in rc[06].d

61. By Yolanda Robla

removed dh_installinit override

60. By Yolanda Robla

* Merge from Debian unstable (LP: #1200516). Remaining changes:
  + Add apport hook (LP: #533603):
    - debian/source.apport: apport hook
    - debian/control: Build-depends on dh-apport.
    - debian/rules:
      + Add --with apport.
      + override_dh_apport to install hook on snmpd package only.
* add libsnmp-perl.preinst to deal with empty directory by libsnmp15
  package removal (Closes: #709761)
* {snmp,snmpd}.postinst: deal with "copyright file missing after upgrade
  (policy 12.5)" (Closes: #709087)
* debian/control
  - libsnmp-base: update to more policy polite (Breaks/Replaces: libsnmp15
    (<<5.7.2~dfsg-5)), thanks to James McCoy
* debian/snmp.preinst
  - fix incomplete script.
* debian/rules
  - Fix Hurd build issue, thanks Pino Toscano <email address hidden> for
    the patch (Closes: #708951)
* debian/snmpd.init
  - patch from Ubuntu, LSBified
* debian/snmp.pre{inst,rm}
  - patch from Ubuntu, Kill any/all processes owned by snmp user before
    install/uninstall.
* debian/control
  - add "Conflicts: libsnmp15" to libsnmp-base since moving net-snmp-config
    in previous version cause trouble (Closes: #708983)
* debian/control
  - fix typo and improve description, thanks to Martin Eberhard Schauer
    <email address hidden> for the patch (Closes: #708519)
  - libsnmp-base: add "Conflicts: libsnmp30 (<< 5.7.2~dfsg-5)" since
    net-snmp-config file moves from libsnmp30 to libsnmp-base
    (Closes: #708298)
  - update descriptions
* debian/{libsnmp-base,libsnmp30}.install: update

59. By Andres Rodriguez

* Merge from Debian unstable. Remaining changes:
  - debian/rules: Don't stop service in runlevels 0 and 6.
  - debian/snmpd.init: LSBify the init script.
  - debian/snmp.preinst, debian/snmp.prerm: Kill any/all processes owned
    by snmp user before install/uninstall.
  - Add apport hook.
* debian/patches/ubuntu-fix-lp-587828.patch: Drop. Fixed upstream.

58. By Logan Rosen

* Merge from Debian unstable. Remaining changes:
  - debian/rules: Don't stop service in runlevels 0 and 6.
  - debian/snmpd.init: LSBify the init script.
  - debian/snmp.preinst, debian/snmp.prerm: Kill any/all processes owned
    by snmp user before install/uninstall.
  - Add apport hook.
  - debian/patches/ubuntu-fix-lp-587828.patch: Fix row creation for 64bit
    arches
  - debian/{control,rules}: Use dh_python2

57. By Marc Deslauriers

* Merge from Debian unstable. Remaining changes:
  - debian/rules: Don't stop service in runlevels 0 and 6.
  - debian/snmpd.init: LSBify the init script.
  - debian/snmp.preinst, debian/snmp.prerm: Kill any/all processes owned
    by snmp user before install/uninstall.
  - Add apport hook.
  - debian/patches/ubuntu-fix-lp-587828.patch: Fix row creation for 64bit
    arches
  - debian/{control,rules}: Use dh_python2
* Dropped changes:
  - debian/patches/50_use_bash.patch: Patch wasn't actually being
    applied, and upstream apparently fixed this in 5.4.2.
  - debian/patches/52_fix_snmpcmd_1_typo.patch: Patch wasn't actually
    being applied, and fix is included in 56_manpage.patch.
  - debian/snmpd.postinst: Source debconf before doing work: included in
    debian package now.
  - debian/patches/99-fix-ubuntu-div0.patch: wasn't applied.
  - debian/patches/CVE-2008-6123.*: wasn't applied.
  - debian/patches/CVE-2012-2141.patch: use debian's patch.
  - debian/README.Debian-source: this change is irrelevant since we
    use the debian tarball as-is.
  - debian/rules: removed misc irrelevant and undocumented changes.
  - debian/snmpd.postinst: no longer need to remove shutdown and reboot
    links since this is from Maverick-era.

56. By Marc Deslauriers

* SECURITY UPDATE: denial of service via SNMP GET with non-existent
  extension table entry
  - debian/patches/CVE-2012-2141.patch: validate line_idx in
    agent/mibgroup/agent/extend.c.
  - CVE-2012-2141

55. By Chuck Short

* Merge from Debian testing. Remaining changes:
  - net-snmp-config: Use bash.
  - Removed multiuser option when calling update-rc.d.
  - debian/snmpd.init: LSBify the init script.
  - debian/patches/52_fix_snmpcmd_1_typo.patch: Adjust a typo in
    snmpcmd.1.
  - debian/snmpd.postinst: Source debconf before doing work.
  - debian/snmp.preinst, debian/snmp.prerm: Kill any/all processes owned
    by snmp user before install/uninstall.
  - Add apport hook.
  - debian/patches/ubuntu-fix-lp-587828.patch: Fix row creation for 64bit
    arches
  - debian/rules: Use dh_python2

54. By Matthias Klose

Build using dh_python2.

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
lp:ubuntu/saucy/net-snmp
This branch contains Public information 
Everyone can see this information.

Subscribers