Last commit made on 2014-06-30
Get this branch:
git clone -b ubuntu/vivid https://git.launchpad.net/ubuntu/+source/net-tools
Members of Ubuntu Server Dev import team can upload to this branch. Log in for directions.

Branch merges

Branch information


Recent commits

d877a0e... by James Page on 2014-06-30

Import patches-unapplied version 1.60-26ubuntu1 to ubuntu/utopic-proposed

Imported using git-ubuntu import.

Changelog parent: ab0e264c05b635fc8d1a9716c758a7a338dceeda

New changelog entries:
  * Merge from Debian unstable (LP: #1251563). Remaining changes:
    - Ubuntu_unit_conversion.patch:
      + Ubuntu Policy: output using standard SI unit multiples:
        KB (10^3), MB (10^6), GB (10^9), TB (10^12) and PB (10^15).
        Includes manpage update to remove comment about IEC units.
    - Update Bug#254243-netstat.c-wide-opt.patch:
      + Increase size of remote and local address buffers 64->128.
    - Make the package Multi-Arch: foreign.
  * Dropped overlapping changes in Bug#254243-netstat.c-wide-opt.patch with:
    - Bug#508110-inet6.c-initialize_fields.patch
    - Bug#632660-netstat.c-long_udp6_addr.patch

ab0e264... by Martín Ferrari on 2014-05-12

Import patches-unapplied version 1.60-26 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 126860294aa53762cd78ab0c8cac1a110650cd5e

New changelog entries:
  * Fix wrong exit codes in netstat.c, closes: #541172.
  * Add patch to stop buffer overflows in route -6. Closes: #747006.
  * Add patch to fix wide display for long udp and raw addresses.
    Closes: #632660.
  * Add patch to fix mishandling of 64bit integers in netstat -s.
    Closes: #561161.
  * Add patch to fix printing of uninitialised ipv6 data in netstat.
    Closes: #508110.
  * debian/control: Add ${misc:Depends}, remove 'the' from description.
  * debian/rules: Add missing build-arch and build-indep targets.

1268602... by Luk Claes on 2013-05-11

Import patches-unapplied version 1.60-25 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 6f13b94d4c47fb239aaaf1708c0bcdf4a7278c3f

New changelog entries:
  * Fix FTBFS by not setting HWSTRIP and HWTR (Closes: #700008).

6f13b94... by "Andrew O. Shadura" <email address hidden> on 2012-09-04

Import patches-unapplied version 1.60-24.2 to debian/sid

Imported using git-ubuntu import.

Changelog parent: a5b86e6f2a0f4813dc1410fddd0faf86aad38de6

New changelog entries:
  * Non-maintainer upload.
  * Parse Linux version correctly (Closes: #680204).
  * Build with hardening flags (Closes: #656130):
    - Fix improper format function usage: use fputs instead of fprintf or pass
      "%s" format string where necessary (-Werror=format-security treats those
      as errors).

a5b86e6... by Steve McIntyre on 2011-07-15

Import patches-unapplied version 1.60-24.1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 4ba43b51ef17453a0d7501d019b749373c83fd96

New changelog entries:
  * Non-maintainer upload.
  * Add cross-build support, based on patch from Neil Williams. Closes: #451281
  * debian/control: Add Homepage. Closes: #530712.

4ba43b5... by Luk Claes on 2011-05-22

Import patches-unapplied version 1.60-24 to debian/sid

Imported using git-ubuntu import.

Changelog parent: f6fd9a78b7a9ed83603bc3710e4756f1cd657ad3

New changelog entries:
  * debian/patches/Add_missing_headers.patch: Fix FTBFS (Closes: #625157).
  * debian/patches/Bug#569509-iface_overflow.patch: Fix crash
    (Closes: #569509).

f6fd9a7... by Martín Ferrari on 2009-03-16

Import patches-unapplied version 1.60-23 to debian/sid

Imported using git-ubuntu import.

Changelog parent: e2cb9a0728815fdad6e2b4399d01d09b49d3ffc5

New changelog entries:
  * debian/patches/Bug#254243-netstat.c-wide-opt.patch: Converted last patch
    from Luar Roji to a quilt patch.
  * Many changes done in diff.gz that are also present in upstream's CVS:
    - debian/patches/CVS-20020730-route.c_opts_64.patch
    - debian/patches/CVS-20061011-ipmaddr.c_buffer_overflow.patch
    - debian/patches/CVS-20081003-statistics.c_sync.patch
    - debian/patches/CVS-20071202-rarp.c_sync.patch
    - debian/patches/CVS-20070316-netstat.c_sync.patch
    - debian/patches/CVS-20060927-mii-tool.c_sync.patch
    - debian/patches/CVS-20051204-arp.c_sync.patch
    - debian/patches/CVS-20030911-nameif.c_sync.patch
    - debian/patches/CVS-20081002-ifconfig.c_sync.patch
    - debian/patches/CVS-20031011-hostname.c_sync.patch
    - debian/patches/CVS-20051204-slttach.c_sync.patch
    - debian/patches/CVS-20061011-includes_sync.patch
    - debian/patches/CVS-lib_sync.patch
    - debian/patches/CVS-20081003-config.in_sync.patch
    - debian/patches/CVS-20081002-manpages_sync.patch
  * Some unsyncable patches converted from diff.gz:
    - debian/patches/netstat.c-assorted_changes.patch
    - debian/patches/translations.patch
    - debian/patches/local-manpages.patch
    - debian/patches/lib_local_changes.patch
    - debian/patches/netstat.c-local_changes.patch
  * Reverted changes to Makefile and README.
  * debian/watch: added watchfile.
  * debian/control, debian/compat: Added versioned dependency on debhelper (it
    was version 1!)
  * debian/rules: made from scratch. Closes: #443063.
  * Added quilt dependencies and hooks.
  * debian/control: updated Standards-Version.
  * debian/README.source: added to comply with S-V 3.8.1.
  * debian/patches/local-manpages.patch: more manpage fixes.
  * debian/patches/translations.patch: fix encoding for .po files.
  * debia/rules: supercede Makefile install with custom commands.
  * debian/copyright: new format, and attempt to provide a real copyright
    file. Still, the attribution is a mess.
  * debian/patches/Bug#345331-socket_overflow.patch: patch from Antonio Galea
    that solves an issue when the socket number exceeds 2^31. Closes: #345331.

e2cb9a0... by Luk Claes on 2008-11-16

Import patches-unapplied version 1.60-22 to debian/sid

Imported using git-ubuntu import.

Changelog parent: e376369d383d55b78392534ba55e28aedc703d8b

New changelog entries:
  * Add new command line option -W/--wide to netstat which prevents
    truncation of IPv6 addresses (Closes: #254243). Thanks Luar Roji.

e376369... by Luk Claes on 2008-09-27

Import patches-unapplied version 1.60-21 to debian/lenny

Imported using git-ubuntu import.