lp:~logan/ubuntu/quantal/tcpdump/debian-merge

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu/quantal/tcpdump at revision 30

Jamie Strandboge: Approve on 2012-08-20

Ubuntu branches: Pending requested 2012-08-09

Diff: 16960 lines (+1638/-13853)

57 files modified

.pc/10_man_install.diff/Makefile.in (+0/-448)
.pc/15_install.diff/Makefile.in (+0/-448)
.pc/20_man_fixes.diff/tcpdump.1.in (+0/-1744)
.pc/40_openssl.diff/configure.in (+0/-1111)
.pc/50_autotools-dev.diff/config.guess (+0/-1502)
.pc/50_autotools-dev.diff/config.sub (+0/-1708)
.pc/50_hurd.diff/tcpdump-stdinc.h (+0/-226)
.pc/50_kfreebsd.diff/configure.in (+0/-1056)
.pc/90_man_apparmor.diff/tcpdump.1.in (+0/-1744)
.pc/applied-patches (+0/-8)
CHANGES (+16/-0)
CREDITS (+3/-0)
Makefile.in (+12/-8)
VERSION (+1/-1)
aclocal.m4 (+8/-1)
config.guess (+0/-5)
config.sub (+0/-5)
configure (+18/-4)
configure.in (+58/-4)
debian/changelog (+31/-0)
debian/control (+1/-1)
debian/patches/40_openssl.diff (+3/-1)
debian/patches/50_kfreebsd.diff (+0/-16)
debian/patches/series (+0/-1)
decode_prefix.h (+2/-2)
ethertype.h (+3/-0)
forces.h (+1/-1)
netdissect.h (+1/-0)
print-802_11.c (+1/-1)
print-bgp.c (+319/-198)
print-ether.c (+5/-1)
print-forces.c (+16/-16)
print-icmp6.c (+1/-1)
print-igmp.c (+5/-1)
print-ip.c (+13/-13)
print-ip6opts.c (+4/-1)
print-ldp.c (+71/-18)
print-lldp.c (+2/-2)
print-lwapp.c (+1/-2)
print-ospf6.c (+131/-76)
print-pim.c (+2/-2)
print-pppoe.c (+2/-0)
print-rrcp.c (+2/-2)
print-tipc.c (+392/-0)
tcpdump-stdinc.h (+0/-4)
tcpdump.1.in (+58/-16)
tcpdump.c (+10/-4)
tests/TESTLIST (+8/-2)
tests/TESTrun.sh (+4/-4)
tests/forces1vvv.out (+3/-3)
tests/forces1vvvv.out (+3/-3)
tests/forces2.out (+0/-491)
tests/forces2v.out (+0/-982)
tests/forces2vv.out (+377/-1965)
tests/icmpv6.out (+13/-0)
tests/lmp.new (+36/-0)
tests/pppoe.out (+1/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

30. By Logan Rosen on 2012-08-09

* Merge from Debian unstable. Remaining changes:
  - Add enforcing AppArmor profile.
  - debian/control: Build-Depends on dh-apparmor.
* New upstream release.
* Re-enable test suite.
* Fix CPPFLAGS handling in upstream configure.in to avoid losing
  hardening flags, patch by Simon Ruderich <email address hidden>
  (closes: #662016).
* Fix some misspellings pointed out by lintian.
* debian/control: Set Standards-Version to 3.9.3.
* Drop debian/patches/50_kfreebsd.diff (closes: #658848).

29. By Jamie Strandboge on 2012-03-06

debian/control: Build-Depends on dh-apparmor (LP: #948095)

28. By Stéphane Graber on 2012-01-04

* Resynchronise with Debian. Remaining changes (LP: #892285):
  - Add enforcing AppArmor profile.
* Refreshed manpage patch to apply to new upstream.

27. By Jamie Strandboge on 2011-06-22

* debian/usr.sbin.tcpdump:
  - allow gzip and bzip2 (LP: #722856)
  - allow read and write to .pcap files
  - allow read of /var/log/snort/*log* files
* debian/patches/90_man_apparmor.diff: update man page to reference AppArmor
  confinement

26. By Colin Watson on 2011-05-26

releasing version 4.1.1-2ubuntu1

25. By Colin Watson on 2011-05-26

Remove unnecessary debian/postinst and debian/postrm files;
dh_installdeb will generate these itself.

24. By Colin Watson on 2011-05-26

modernise Maintainer

23. By Colin Watson on 2011-05-26

clean up crufty merge delta

22. By Colin Watson on 2011-05-26

merge from Debian 4.1.1-2

21. By Colin Watson on 2011-05-25

Rebuild for OpenSSL 1.0.0.