From ccfabc7ef13a9a15b4d722732416e08ea3a0f4af Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Wed, 12 Feb 2014 15:45:50 -0800 Subject: [PATCH 1/2] chore(net-analyzer/wireshark): Drop old wireshark package --- .../net-analyzer/wireshark/ChangeLog | 885 ------------------ .../net-analyzer/wireshark/Manifest | 1 - .../files/wireshark-0.99.7-asneeded.patch | 10 - .../files/wireshark-0.99.8-as-needed.patch | 11 - .../files/wireshark-1.0-sigpipe.patch | 31 - .../wireshark-1.0.5-text2pcap-protos.patch | 18 - .../files/wireshark-1.2.8--as-needed.patch | 18 - .../files/wireshark-1.2.8-no-pton.patch | 29 - .../files/wireshark-except-double-free.diff | 16 - .../net-analyzer/wireshark/metadata.xml | 37 - .../wireshark/wireshark-1.2.8.ebuild | 159 ---- 11 files changed, 1215 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/ChangeLog delete mode 100644 sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/Manifest delete mode 100644 sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/files/wireshark-0.99.7-asneeded.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/files/wireshark-0.99.8-as-needed.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/files/wireshark-1.0-sigpipe.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/files/wireshark-1.0.5-text2pcap-protos.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/files/wireshark-1.2.8--as-needed.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/files/wireshark-1.2.8-no-pton.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/files/wireshark-except-double-free.diff delete mode 100644 sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/metadata.xml delete mode 100644 sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/wireshark-1.2.8.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/ChangeLog b/sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/ChangeLog deleted file mode 100644 index 573216de2d..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/ChangeLog +++ /dev/null @@ -1,885 +0,0 @@ -# ChangeLog for net-analyzer/wireshark -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.215 2010/01/30 15:07:41 pva Exp $ - - 30 Jan 2010; Peter Volkov -wireshark-1.2.5.ebuild, - wireshark-1.2.6.ebuild: - amd64 stable, bug #302665. Drop vulnerable. - - 30 Jan 2010; Raúl Porcel wireshark-1.2.6.ebuild: - alpha/ia64/sparc/x86 stable wrt #302665 - - 28 Jan 2010; Jeroen Roovers wireshark-1.2.6.ebuild: - Stable for HPPA (bug #302665). - - 28 Jan 2010; Brent Baude wireshark-1.2.6.ebuild: - Marking wireshark-1.2.6 ppc for bug 302665 - - 28 Jan 2010; Brent Baude wireshark-1.2.6.ebuild: - Marking wireshark-1.2.6 ppc64 for bug 302665 - -*wireshark-1.2.6 (28 Jan 2010) - - 28 Jan 2010; Peter Volkov -wireshark-1.2.3.ebuild, - -wireshark-1.2.4.ebuild, +wireshark-1.2.6.ebuild: - Version bump, fixes security issue #302665. Remove old. - - 11 Jan 2010; Mike Frysinger wireshark-1.2.3.ebuild, - wireshark-1.2.4.ebuild, wireshark-1.2.5.ebuild: - Drop -fomit-frame-pointer filter for USE=profile. - - 22 Dec 2009; Jeroen Roovers wireshark-1.2.5.ebuild: - Stable for PPC (bug #297388). - - 21 Dec 2009; Raúl Porcel wireshark-1.2.5.ebuild: - alpha/ia64/sparc stable wrt #297388 - - 20 Dec 2009; Brent Baude wireshark-1.2.5.ebuild: - Marking wireshark-1.2.5 ppc64 for bug 297388 - - 19 Dec 2009; Jeroen Roovers wireshark-1.2.5.ebuild: - Stable for HPPA (bug #297388). - - 19 Dec 2009; Richard Freeman wireshark-1.2.5.ebuild: - amd64 stable - 297388 - - 18 Dec 2009; Christian Faulhammer - wireshark-1.2.5.ebuild: - stable x86, security bug 297388 - -*wireshark-1.2.5 (18 Dec 2009) - - 18 Dec 2009; Peter Volkov +wireshark-1.2.5.ebuild: - Version bump. Fixes security bug #297388. - -*wireshark-1.2.4 (17 Nov 2009) - - 17 Nov 2009; Peter Volkov +wireshark-1.2.4.ebuild: - Version bump. - - 14 Nov 2009; Peter Volkov wireshark-1.2.3.ebuild: - USE='profile' and PIE are incompatible, bug 292991, thank Radoslaw Madej - for report. - - 04 Nov 2009; Peter Volkov -wireshark-1.2.1.ebuild, - -wireshark-1.2.2.ebuild: - Revert ChangeLog, thank PSYCHO___ for report. Remove vulnerable versions. - - 01 Nov 2009; nixnut wireshark-1.2.3.ebuild: - ppc stable #290710 - - 31 Oct 2009; Brent Baude wireshark-1.2.3.ebuild: - Marking wireshark-1.2.3 ppc64 for bug 290710 - - 30 Oct 2009; Raúl Porcel wireshark-1.2.3.ebuild: - alpha/ia64/sparc stable wrt #290710 - - 29 Oct 2009; Jeroen Roovers wireshark-1.2.3.ebuild: - Stable for HPPA (bug #290710). - - 29 Oct 2009; wireshark-1.2.3.ebuild: - Marked stable on AMD64 as requested by Alex "a3li" Legler in security bug - #290710. Tested capture on a Marvell "sky2" 88E8055 Gig-copper NIC. - - 28 Oct 2009; Christian Faulhammer - wireshark-1.2.3.ebuild: - stable x86, security bug 290710 - -*wireshark-1.2.3 (28 Oct 2009) - - 28 Oct 2009; Peter Volkov +wireshark-1.2.3.ebuild: - Version bump, fixes number of security issues, bug #290710, thank Alex - Legler for report. - - 26 Oct 2009; Mounir Lamouri wireshark-1.2.2.ebuild: - Stable for ppc, bug 285280 - - 18 Oct 2009; Brent Baude wireshark-1.2.2.ebuild: - Marking wireshark-1.2.2 ppc64 for bug 285280 - - 12 Oct 2009; Raúl Porcel wireshark-1.2.2.ebuild: - ia64/sparc stable wrt #285280 - - 11 Oct 2009; Jeroen Roovers wireshark-1.2.2.ebuild: - Stable for HPPA (bug #285280). - - 11 Oct 2009; Tobias Klausmann - wireshark-1.2.2.ebuild: - Stable on alpha, bug #285280 - - 09 Oct 2009; Markus Meier wireshark-1.2.2.ebuild: - x86 stable, bug #285280 - - 09 Oct 2009; Richard Freeman wireshark-1.2.2.ebuild: - amd64 stable - 285280 - -*wireshark-1.2.2 (08 Oct 2009) - - 08 Oct 2009; Peter Volkov -wireshark-1.0.8.ebuild, - +wireshark-1.2.2.ebuild: - Version bump, fixes security issue bug #285280, thank Alex Legler for - report. Dropped gtk IUSE default, bug #279849. - - 09 Aug 2009; nixnut wireshark-1.2.1.ebuild: - ppc stable #278564 - - 02 Aug 2009; Raúl Porcel wireshark-1.2.1.ebuild: - ia64 stable wrt #278564 - - 31 Jul 2009; Tiago Cunha wireshark-1.2.1.ebuild: - stable sparc, security bug 278564 - - 26 Jul 2009; Brent Baude wireshark-1.2.1.ebuild: - Marking wireshark-1.2.1 ppc64 for bug 278564 - - 21 Jul 2009; Jeroen Roovers wireshark-1.2.1.ebuild: - Stable for HPPA (bug #278564). - - 21 Jul 2009; Christian Faulhammer - wireshark-1.2.1.ebuild: - stable x86, security bug 278564 - - 21 Jul 2009; Tobias Klausmann - wireshark-1.2.1.ebuild: - Stable on alpha, bug #278564 - - 21 Jul 2009; wireshark-1.2.1.ebuild: - Marked stable on AMD64 for security bug #278564. Tested on a Core2 Duo - with a Marvell "Sky2" 88E8055 NIC. - -*wireshark-1.2.1 (21 Jul 2009) - - 21 Jul 2009; Peter Volkov -wireshark-1.2.0.ebuild, - +wireshark-1.2.1.ebuild: - Version bump, bug #278564, thank Alex Legler for report. Remove vulnerable - version. - -*wireshark-1.2.0 (17 Jun 2009) - - 17 Jun 2009; Peter Volkov - -files/wireshark-1.1.2-misc-warnings.patch, - -files/wireshark-1.1.3-misc-warnings.patch, -wireshark-1.2.0_rc1.ebuild, - +wireshark-1.2.0.ebuild: - Version bump. Dropped unused patches. - -*wireshark-1.2.0_rc1 (29 May 2009) - - 29 May 2009; Peter Volkov -wireshark-1.0.7.ebuild, - -wireshark-1.1.3.ebuild, +wireshark-1.2.0_rc1.ebuild: - Version bump. Remove old/unused. - - 27 May 2009; Raúl Porcel wireshark-1.0.8.ebuild: - alpha/ia64 stable wrt #271062 - - 26 May 2009; Tiago Cunha wireshark-1.0.8.ebuild: - stable sparc, security bug 271062 - - 25 May 2009; Brent Baude wireshark-1.0.8.ebuild: - Marking wireshark-1.0.8 ppc64 and ppc for bug 271062 - - 24 May 2009; Jeroen Roovers wireshark-1.0.8.ebuild: - Stable for HPPA (bug #271062). - - 24 May 2009; Markus Meier wireshark-1.0.8.ebuild: - amd64/x86 stable, bug #271062 - -*wireshark-1.0.8 (24 May 2009) - - 24 May 2009; Peter Volkov +wireshark-1.0.8.ebuild: - Version bump, fixes security issue #271062. - - 04 May 2009; Peter Volkov -wireshark-1.0.6-r1.ebuild, - wireshark-1.0.7, wireshark-1.1.3: - tshark should not be suid, bug #268324, thank Wolfgang Goetz for report. - Remove old. - - 11 Apr 2009; Jeroen Roovers wireshark-1.0.7.ebuild: - Stable for HPPA (bug #264571). - - 10 Apr 2009; Raúl Porcel wireshark-1.0.7.ebuild: - alpha/ia64/sparc/x86 stable wrt #264571 - - 10 Apr 2009; Tobias Heinlein - wireshark-1.0.7.ebuild: - amd64 stable wrt security bug #264571 - - 09 Apr 2009; Brent Baude wireshark-1.0.7.ebuild: - Marking wireshark-1.0.7 ppc64 and ppc for bug 264571 - -*wireshark-1.0.7 (09 Apr 2009) - - 09 Apr 2009; Peter Volkov -wireshark-1.0.6.ebuild, - +wireshark-1.0.7.ebuild, -wireshark-1.1.2.ebuild: - Version bump, fixes security bug #264571, thank Robert Buchholz for report. - - 02 Apr 2009; Raúl Porcel wireshark-1.0.6-r1.ebuild: - alpha/ia64 stable wrt #263443 - - 27 Mar 2009; Jeroen Roovers wireshark-1.0.6-r1.ebuild: - Stable for HPPA (bug #263443). - - 25 Mar 2009; Joseph Jezak wireshark-1.0.6-r1.ebuild: - Marked ppc/ppc64 stable for bug #263443. - - 24 Mar 2009; Tiago Cunha wireshark-1.0.6-r1.ebuild: - stable sparc, bug 263443 - -*wireshark-1.1.3 (24 Mar 2009) - - 24 Mar 2009; Peter Volkov - +files/wireshark-1.1.3-misc-warnings.patch, +wireshark-1.1.3.ebuild: - Version bump. - - 23 Mar 2009; Markus Meier wireshark-1.0.6-r1.ebuild: - amd64/x86 stable, bug #263443 - - 08 Mar 2009; Peter Volkov - +files/wireshark-1.1.2-misc-warnings.patch, wireshark-1.1.2.ebuild: - Fixed build failure in function 'dissect_sflow_sample_rawheaderdata' - -*wireshark-1.0.6-r1 (05 Mar 2009) - - 05 Mar 2009; Peter Volkov - -files/wireshark-1.0.5-glib-1-build.patch, - +files/wireshark-1.0-sigpipe.patch, -wireshark-1.0.5.ebuild, - +wireshark-1.0.6-r1.ebuild: - Fixed freeze on start issue, bug #260457, thank haarp for report. - - 11 Feb 2009; Tobias Scherbaum - wireshark-1.0.6.ebuild: - ppc stable, bug #258013 - - 10 Feb 2009; Brent Baude wireshark-1.0.6.ebuild: - Marking wireshark-1.0.6 ppc64 for bug 258013 - - 09 Feb 2009; Raúl Porcel wireshark-1.0.6.ebuild: - ia64/sparc stable wrt #258013 - - 08 Feb 2009; Markus Meier wireshark-1.0.6.ebuild: - amd64/x86 stable, bug #258013 - - 07 Feb 2009; Jeroen Roovers wireshark-1.0.6.ebuild: - Stable for HPPA (bug #258013). - - 07 Feb 2009; Tobias Klausmann - wireshark-1.0.6.ebuild: - Stable on alpha, bug #258013 - -*wireshark-1.0.6 (07 Feb 2009) - - 07 Feb 2009; Peter Volkov +wireshark-1.0.6.ebuild: - Version bump. - -*wireshark-1.1.2 (19 Jan 2009) - - 19 Jan 2009; Peter Volkov - -files/wireshark-1.0.4-zlib-build.patch, - -files/wireshark-1.1.1--as-needed.patch, - -files/wireshark-1.1.1-misc-warnings.patch, - +files/wireshark-1.1.2--as-needed.patch, -wireshark-1.0.4.ebuild, - -wireshark-1.1.1.ebuild, +wireshark-1.1.2.ebuild: - Version bump of development version, remove old. - - 26 Dec 2008; Mike Frysinger - +files/wireshark-1.0.5-text2pcap-protos.patch, wireshark-1.0.5.ebuild: - Fix building on 64bit systems due to implicit string prototypes. - - 18 Dec 2008; Tobias Scherbaum - wireshark-1.0.5.ebuild: - ppc stable, bug #248425 - - 16 Dec 2008; Brent Baude wireshark-1.0.5.ebuild: - Marking wireshark-1.0.5 ppc64 for bug 248425 - - 16 Dec 2008; Raúl Porcel wireshark-1.0.5.ebuild: - ia64 stable wrt #248425 - - 15 Dec 2008; Jeroen Roovers wireshark-1.0.5.ebuild: - Stable for HPPA (bug #248425). - - 14 Dec 2008; Peter Volkov wireshark-1.0.5.ebuild: - Fixed dodoc on nonexistent files, bug #248425, thank Markus Meier for report. - - 14 Dec 2008; Tobias Klausmann - wireshark-1.0.5.ebuild: - Stable on alpha, bug #248425 - - 14 Dec 2008; Markus Meier wireshark-1.0.5.ebuild: - amd64/x86 stable, bug #248425 - - 14 Dec 2008; Friedrich Oslage - wireshark-1.0.5.ebuild: - Stable on sparc, security bug #248425 - -*wireshark-1.0.5 (13 Dec 2008) - - 13 Dec 2008; Peter Volkov - +files/wireshark-1.0.5-glib-1-build.patch, +wireshark-1.0.5.ebuild: - Version bump, fixes security issue #248425, thank Steven Susbauer for report. - - 22 Nov 2008; Peter Volkov - files/wireshark-1.1.1-misc-warnings.patch, -wireshark-1.0.3.ebuild: - Updated patch to handle more points of failure. Remove old. - - 15 Nov 2008; Tobias Scherbaum - wireshark-1.0.4.ebuild: - ppc stable, bug #242996 - - 30 Oct 2008; Peter Volkov - +files/wireshark-1.0.4-zlib-build.patch, wireshark-1.0.4.ebuild: - Build fails without zlib, this patch fixes it, bug #244931, thank emos696 - AT hotmail.com for this work. - - 22 Oct 2008; Guy Martin wireshark-1.0.4.ebuild: - hppa stable, #242996 - - 22 Oct 2008; Raúl Porcel wireshark-1.0.4.ebuild: - alpha/ia64/x86 stable wrt #242996 - - 21 Oct 2008; Markus Rothe wireshark-1.0.4.ebuild: - Stable on ppc64; bug #242996 - - 21 Oct 2008; Ferris McCormick wireshark-1.0.4.ebuild: - Sparc stable --- Security Bug #242996 --- appears to work fine. - - 21 Oct 2008; Jeremy Olexa wireshark-1.0.4.ebuild: - amd64 stable, accelerated due to security. bug #242996 - -*wireshark-1.0.4 (21 Oct 2008) - - 21 Oct 2008; Peter Volkov +wireshark-1.0.4.ebuild, - wireshark-1.1.1.ebuild: - Version bump. - - 17 Oct 2008; Peter Volkov - +files/wireshark-1.1.1--as-needed.patch, - +files/wireshark-1.1.1-misc-warnings.patch, wireshark-1.1.1.ebuild: - Fixed build issue with --as-needed and lua enabled. Fixed build issues with - -ftracer, bug #239941, thank Thomas Pegeot for report. - -*wireshark-1.1.1 (10 Oct 2008) - - 10 Oct 2008; Peter Volkov - -files/wireshark-1.1.0-as-needed.patch, -wireshark-1.1.0.ebuild, - +wireshark-1.1.1.ebuild: - Version bump. Some cleanups in ebuild. - - 04 Oct 2008; Peter Volkov metadata.xml, - wireshark-1.1.0.ebuild: - Change c-ares USE flag to ares, as other packages already USE ares. - - 18 Sep 2008; Peter Volkov wireshark-1.1.0.ebuild: - Fixed dependency on c-ares and configuration. - -*wireshark-1.1.0 (17 Sep 2008) - - 17 Sep 2008; Peter Volkov - +files/wireshark-1.1.0-as-needed.patch, metadata.xml, - -wireshark-1.0.2.ebuild, +wireshark-1.1.0.ebuild: - Bump development version. - - 10 Sep 2008; Olivier Crête wireshark-1.0.3.ebuild: - amd64 stable, bug #236515 - - 10 Sep 2008; Brent Baude wireshark-1.0.3.ebuild: - Marking wireshark-1.0.3 ppc64 and ppc for bug 236515 - - 10 Sep 2008; Raúl Porcel wireshark-1.0.3.ebuild: - alpha/ia64/sparc/x86 stable wrt #236515 - - 10 Sep 2008; Jeroen Roovers wireshark-1.0.3.ebuild: - Stable for HPPA (bug #236515). - -*wireshark-1.0.3 (10 Sep 2008) - - 10 Sep 2008; Peter Volkov +wireshark-1.0.3.ebuild: - Version bump, fixes security issues #236515, thank Robert Buchholz for - report. - - 04 Aug 2008; Jeroen Roovers metadata.xml: - Describe local USE flags for GLEP 56. - - 03 Aug 2008; Cédric Krier wireshark-1.0.2.ebuild: - Add gtk m4 for bug #233158 - - 20 Jul 2008; Peter Volkov -wireshark-1.0.0.ebuild, - -wireshark-1.0.1.ebuild: - Removing vulnerable versions. - - 17 Jul 2008; Kenneth Prugh wireshark-1.0.2.ebuild: - amd64 stable, bug #231587 - - 15 Jul 2008; Tobias Scherbaum - wireshark-1.0.2.ebuild: - ppc stable, bug #231587 - - 15 Jul 2008; Markus Rothe wireshark-1.0.2.ebuild: - Stable on ppc64; bug #231587 - - 14 Jul 2008; Jeroen Roovers wireshark-1.0.2.ebuild: - Stable for HPPA (bug #231587). - - 13 Jul 2008; Raúl Porcel wireshark-1.0.2.ebuild: - alpha/ia64/sparc/x86 stable wrt #231587 - -*wireshark-1.0.2 (12 Jul 2008) - - 12 Jul 2008; Marcelo Goes +wireshark-1.0.2.ebuild: - 1.0.2 version bump for security bug 231587. Thanks to 7v5w7go9ub0o - <7v5w7go9ub0o at gmail dot com>. - - 05 Jul 2008; Markus Meier wireshark-1.0.1.ebuild: - amd64 stable, bug #230411 - - 05 Jul 2008; Brent Baude wireshark-1.0.1.ebuild: - Marking wireshark-1.0.1 ppc64 for bug 230411 - - 05 Jul 2008; Tobias Scherbaum - wireshark-1.0.1.ebuild: - ppc stable, bug #230411 - - 04 Jul 2008; Jeroen Roovers wireshark-1.0.1.ebuild: - Stable for HPPA (bug #230411). - - 03 Jul 2008; Raúl Porcel wireshark-1.0.1.ebuild: - alpha/ia64/sparc/x86 stable wrt #230411 - -*wireshark-1.0.1 (03 Jul 2008) - - 03 Jul 2008; Peter Volkov - -files/wireshark-0.99.8-libpcap-compile.patch, -wireshark-0.99.8.ebuild, - +wireshark-1.0.1.ebuild: - Version bump, bug #230411, thank 7v5w7go9ub0o for report. - - 10 Apr 2008; Peter Volkov wireshark-1.0.0.ebuild: - cap_kill is not required in wireshark-1.0.0, bug #217061, thank Justin - Bronder for report. - - 03 Apr 2008; Tobias Scherbaum - wireshark-1.0.0.ebuild: - ppc stable, bug #215276 - - 03 Apr 2008; Peter Volkov wireshark-1.0.0.ebuild: - Fixed build with profile USE flag and -fomit-frame-pointer, bug #215806, - thank Joel Thompson for report and Mikael Magnusson for solution. - - 02 Apr 2008; Markus Rothe wireshark-1.0.0.ebuild: - Stable on ppc64; bug #215276 - - 02 Apr 2008; Jeroen Roovers wireshark-1.0.0.ebuild: - Stable for HPPA (bug #215276). - - 02 Apr 2008; Raúl Porcel wireshark-1.0.0.ebuild: - alpha/ia64/sparc stable wrt security #215276 - - 02 Apr 2008; Christian Faulhammer - wireshark-1.0.0.ebuild: - stable x86, security bug 215276 - - 02 Apr 2008; Richard Freeman wireshark-1.0.0.ebuild: - amd64 stable - 215276 - -*wireshark-1.0.0 (01 Apr 2008) - - 01 Apr 2008; Peter Volkov - -files/wireshark-1.0.0_rc1-fix-setcap-EPERM.patch, - -files/wireshark-1.0.0_rc1-fix-stop-capture.patch, - -wireshark-1.0.0_rc1.ebuild, -wireshark-1.0.0_rc1-r1.ebuild, - +wireshark-1.0.0.ebuild: - Version bump, as usual security fixes, bug #215276, thank Robert Buchholz - and Christian Faulhammer for report. - -*wireshark-1.0.0_rc1-r1 (23 Mar 2008) - - 23 Mar 2008; Peter Volkov - +files/wireshark-1.0.0_rc1-fix-setcap-EPERM.patch, - +files/wireshark-1.0.0_rc1-fix-stop-capture.patch, - +wireshark-1.0.0_rc1-r1.ebuild: - Fix wireshark stop when built with caps. - -*wireshark-1.0.0_rc1 (19 Mar 2008) - - 19 Mar 2008; Peter Volkov - -files/wireshark-0.99.7-libgcrypt.patch, -wireshark-0.99.7.ebuild, - +wireshark-1.0.0_rc1.ebuild: - Bump to 1.0.0pre1. Removed old vulnerable. - - 19 Mar 2008; Markus Rothe wireshark-0.99.8.ebuild: - Stable on ppc64; bug #212149 - - 18 Mar 2008; Peter Volkov - -files/wireshark-0.99.7-crash-emem.c.patch, - -files/wireshark-0.99.7-exit.patch, - -files/wireshark-0.99.7-glib-1.2-compile-fix.patch, - -wireshark-0.99.7-r1.ebuild, -wireshark-0.99.7-r2.ebuild, - -wireshark-0.99.8_rc1.ebuild, wireshark-0.99.8.ebuild: - Removed unused ebuilds. Made pcap USE flag enabled by default to avoid - further questions why wireshark is unable to capture packets. - - 18 Mar 2008; Tobias Scherbaum - wireshark-0.99.8.ebuild: - ppc stable, bug #212149 - - 18 Mar 2008; Raúl Porcel wireshark-0.99.8.ebuild: - alpha/ia64/sparc stable wrt security #212149 - - 17 Mar 2008; Jeroen Roovers wireshark-0.99.8.ebuild: - Stable for HPPA (bug #212149). - - 17 Mar 2008; Peter Volkov wireshark-0.99.8.ebuild: - Fixed build problem with heimdal, bug #213705, thank Doug Goldstein for - report. - - 17 Mar 2008; Dawid Węgliński wireshark-0.99.8.ebuild: - Stable on x86 (bug #212149) - - 17 Mar 2008; Olivier Crête wireshark-0.99.8.ebuild: - Stable on amd64, bug #212149 - - 17 Mar 2008; Peter Volkov - +files/wireshark-0.99.8-libpcap-compile.patch: - Missed patch added, thank steev for IRC notification. - -*wireshark-0.99.8 (16 Mar 2008) - - 16 Mar 2008; Peter Volkov +wireshark-0.99.8.ebuild: - Finally version bump, fixes security bug #212149, reported by Robert - Buchholz. Fixes libsmi autodep, bug #211324, reported by Fabio Erculiani. - Many other fixes here and there... Dropped check for minimal USE flag in perl. - - 21 Feb 2008; +files/wireshark-0.99.8-as-needed.patch, - wireshark-0.99.8_rc1.ebuild: - Fixed regression: compilation failure with --as-needed, bug 210998, reported - by Mike Auty and Hanno Böck. - -*wireshark-0.99.8_rc1 (20 Feb 2008) - - 20 Feb 2008; metadata.xml, +wireshark-0.99.8_rc1.ebuild: - Version bump to pre-release. Took maintainance. - -*wireshark-0.99.7-r2 (27 Jan 2008) - - 27 Jan 2008; - +files/wireshark-0.99.7-glib-1.2-compile-fix.patch, - +wireshark-0.99.7-r2.ebuild: - Enable lua support, bug 206151, thank you Jaroslaw Niec . - -*wireshark-0.99.7-r1 (10 Jan 2008) - - 10 Jan 2008; -files/wireshark-0.99.6-asneeded.patch, - -files/wireshark-0.99.6-asneeded-r1.patch, - -files/wireshark-0.99.6-gint64-warnings.patch, - -files/wireshark-0.99.6-libgcrypt.patch, -files/wireshark-0.99.6-lm.patch, - +files/wireshark-0.99.7-crash-emem.c.patch, - +files/wireshark-0.99.7-exit.patch, - -files/wireshark-epan_dissectors_packet-diameter.diff, - -wireshark-0.99.6.ebuild, -wireshark-0.99.6-r1.ebuild, - +wireshark-0.99.7-r1.ebuild: - Fixed crash on bad bLength. Fixed crash if user is not in wireshark group, - thank you M. Edward Borasky for report and Kevin Pyle - for investigation and work with upstream to - make this fixed. Removed old and vulnerable. - - 26 Dec 2007; Peter Weller wireshark-0.99.7.ebuild: - Stable on amd64; bug 199958 - - 24 Dec 2007; Raúl Porcel wireshark-0.99.7.ebuild: - alpha/ia64/sparc stable wrt #199958 - - 24 Dec 2007; Jeroen Roovers wireshark-0.99.7.ebuild: - Stable for HPPA (bug #199958). - - 23 Dec 2007; Markus Meier wireshark-0.99.7.ebuild: - x86 stable, security bug #199958 - - 23 Dec 2007; Brent Baude wireshark-0.99.7.ebuild: - Marking wireshark-0.99.7 ppc and ppc64 stable for bug 199958 - - 20 Dec 2007; +files/wireshark-0.99.7-asneeded.patch, - +files/wireshark-0.99.7-libgcrypt.patch: - Missed patches added, bug 202866 reported by - -*wireshark-0.99.7 (20 Dec 2007) - - 20 Dec 2007; +wireshark-0.99.7.ebuild: - New release. Fixes security issues, bug #199958. Thank Robert Buchholz for lots of usefull suggestions on how to improve ebuild. - - 02 Aug 2007; Raphael Marichez wireshark-0.99.6.ebuild, - wireshark-0.99.6-r1.ebuild: - Remove redundant econf lines, reported by steev - - 26 Jul 2007; Chris Gianelloni - wireshark-0.99.6.ebuild, wireshark-0.99.6-r1.ebuild: - Cosmetic changes only... rearranged some of the post-merge output so it fits - properly on 80 columns. - - 24 Jul 2007; Markus Ullmann - -files/wireshark-0.99.5-sizet.patch, -wireshark-0.99.5.ebuild: - Clean out old stuff - -*wireshark-0.99.6-r1 (24 Jul 2007) - - 24 Jul 2007; +files/wireshark-0.99.6-asneeded-r1.patch, - +files/wireshark-0.99.6-gint64-warnings.patch, - +files/wireshark-0.99.6-libgcrypt.patch, +files/wireshark-0.99.6-lm.patch, - +wireshark-0.99.6-r1.ebuild: - Fixed -lm problem with ulibc (bug #186424; thank Natanael Copa - for report. Commited fix for bug #184529 and - enabled warnings treated as errors for gtk-2.0 build like upstream wants us. - Fix for libgcrypt problem reported by armin76 and fixed by drac. - - 20 Jul 2007; Tobias Scherbaum - wireshark-0.99.6.ebuild: - ppc stable, bug #183520 - - 16 Jul 2007; Jeroen Roovers wireshark-0.99.6.ebuild: - Stable for HPPA (bug #183520). - - 16 Jul 2007; Markus Rothe wireshark-0.99.6.ebuild: - Stable on ppc64; bug #183520 - - 16 Jul 2007; Marcus D. Hanwell wireshark-0.99.6.ebuild: - Marked stable on amd64, bug 183520. - - 16 Jul 2007; Raúl Porcel wireshark-0.99.6.ebuild: - alpha/ia64/x86 stable wrt security #183520 - - 16 Jul 2007; Gustavo Zacarias - wireshark-0.99.6.ebuild: - Stable on sparc wrt security #183520 - - 15 Jul 2007; Samuli Suominen - +files/wireshark-0.99.6-asneeded.patch, wireshark-0.99.6.ebuild: - Fix building with asneeded for bug 184668. - - 09 Jul 2007; Raúl Porcel wireshark-0.99.6.ebuild: - Fix bug #184529, blame Jokey - -*wireshark-0.99.6 (06 Jul 2007) - - 06 Jul 2007; Markus Ullmann +wireshark-0.99.6.ebuild: - Security version bump wrt bug #183520 - - 18 Apr 2007; Markus Ullmann -wireshark-0.99.4.ebuild, - -wireshark-0.99.4-r1.ebuild, wireshark-0.99.5.ebuild: - Fix gcc 3.4 bug #165340 thanks to Guenther Brunthaler for the solution, do - some cleanup as well - - 17 Apr 2007; Gustavo Zacarias - wireshark-0.99.5.ebuild: - Stable on sparc wrt #174625 - - 17 Apr 2007; Bryan Østergaard - wireshark-0.99.5.ebuild: - Stable on Alpha, bug 174625. - - 16 Apr 2007; Raúl Porcel wireshark-0.99.5.ebuild: - ia64 stable wrt bug 174625 - - 15 Apr 2007; Andrej Kacian wireshark-0.99.5.ebuild: - Stable on x86, bug #174625. - - 15 Apr 2007; Markus Rothe wireshark-0.99.5.ebuild: - Stable on ppc64; bug #174625 - - 15 Apr 2007; Olivier Crête wireshark-0.99.5.ebuild: - Stable on amd64, bug #174625 - - 14 Apr 2007; Jeroen Roovers wireshark-0.99.5.ebuild: - Stable for HPPA (bug #174625). - - 24 Feb 2007; Daniel Black - wireshark-0.99.4.ebuild, wireshark-0.99.4-r1.ebuild, - wireshark-0.99.5.ebuild: - removed unused autotools import thanks to Flameeyes - - 16 Feb 2007; Daniel Black - +files/wireshark-0.99.5-sizet.patch, wireshark-0.99.5.ebuild: - upstream patch to fix bug #165896 - hopefully - - 10 Feb 2007; Martin Jackson - +files/wireshark-epan_dissectors_packet-diameter.diff, - wireshark-0.99.5.ebuild: - Add patch from FC3/FreeBSD to fix GCC 3.4 link error (#165340) - -*wireshark-0.99.5 (03 Feb 2007) - - 03 Feb 2007; Marcelo Goes - +wireshark-0.99.5.ebuild: - 0.99.5 version bump for bug 165077, reported by Executioner . - - 16 Nov 2006; Roy Marples wireshark-0.99.4.ebuild, - wireshark-0.99.4-r1.ebuild: - Added ~x86-fbsd keyword. - -*wireshark-0.99.4-r1 (12 Nov 2006) - - 12 Nov 2006; Daniel Black - +files/wireshark-except-double-free.diff, -wireshark-0.99.3.ebuild, - +wireshark-0.99.4-r1.ebuild: - Thanks a7x, didier who made great efforts with upstream to prove it was a - Gentoo compiler bug. bug #145974 and bug #133092. removed sec vulnerable - version - - 05 Nov 2006; Brent Baude wireshark-0.99.4.ebuild: - Marking wireshark-0.99.4 ppc64 stable for bug #152951 - - 02 Nov 2006; Olivier Crête wireshark-0.99.4.ebuild: - Stable on amd64 for security bug #152951 - - 02 Nov 2006; Jeroen Roovers wireshark-0.99.4.ebuild: - Stable for HPPA (bug #152951). - - 01 Nov 2006; Bryan Østergaard - wireshark-0.99.4.ebuild: - Stable on ia64, bug 152951. - - 01 Nov 2006; Bryan Østergaard - wireshark-0.99.4.ebuild: - Stable on Alpha, bug 152951. - - 01 Nov 2006; Andrej Kacian wireshark-0.99.4.ebuild: - Stable on x86, security bug #152951. - - 01 Nov 2006; Gustavo Zacarias - wireshark-0.99.4.ebuild: - Stable on sparc wrt security #152951 - - 01 Nov 2006; Tobias Scherbaum - wireshark-0.99.4.ebuild: - ppc stable, bug #152951 - -*wireshark-0.99.4 (01 Nov 2006) - - 01 Nov 2006; Daniel Black - +wireshark-0.99.4.ebuild: - version bump as per security bug #152951. Also fixes dead symlink - bug - #145067, wifiscanner & wireshark: File collision /usr/lib/libwiretap.la bug - #146286 - - 18 Sep 2006; Benjamin Smee wireshark-0.99.3.ebuild: - Small change for bug #147814 - - 12 Sep 2006; Markus Ullmann wireshark-0.99.3.ebuild: - Fixing built_with_use check for non-existant IUSE ( bug #146839 ) - - 30 Aug 2006; Daniel Black - wireshark-0.99.3.ebuild: - changed description to emerge -s ethereal will find it - - 29 Aug 2006; Bryan Østergaard - wireshark-0.99.3.ebuild: - Stable on ia64. - - 27 Aug 2006; Daniel Black - -files/wireshark-0.99.2-libgcrypt-asneeded.patch, - -wireshark-0.99.2.ebuild: - purge vulnerable version - - 27 Aug 2006; Rene Nussbaumer - wireshark-0.99.3.ebuild: - Stable on hppa. See bug #144946. - - 25 Aug 2006; Daniel Black - wireshark-0.99.3.ebuild: - seemed to have dropped hppa - re-added - - 25 Aug 2006; Bryan Østergaard - wireshark-0.99.3.ebuild: - Stable on alpha, bug 144946. - - 25 Aug 2006; Olivier Crête wireshark-0.99.3.ebuild: - Stable on amd64 per security bug #144946 - - 25 Aug 2006; wireshark-0.99.3.ebuild: - Stable on x86, security bug #144946. - - 25 Aug 2006; Jason Wever wireshark-0.99.3.ebuild: - Stable on SPARC wrt security bug #144946. - - 24 Aug 2006; Tobias Scherbaum - wireshark-0.99.3.ebuild: - ppc stable, bug #144946 - - 24 Aug 2006; Markus Rothe wireshark-0.99.3.ebuild: - Stable on ppc64; bug #144946 - -*wireshark-0.99.3 (24 Aug 2006) - - 24 Aug 2006; Daniel Black - +wireshark-0.99.3.ebuild: - version bump - security bug #144946 - - 19 Aug 2006; Jeroen Roovers wireshark-0.99.2.ebuild: - Stable for HPPA. - - 30 Jul 2006; Daniel Black - wireshark-0.99.2.ebuild: - added filter-flags -fstack-protector thanks to Richard Hansen and Kevin F. - Quinn see bug #133092 - - 25 Jul 2006; Daniel Black - wireshark-0.99.2.ebuild: - added RDEPEND on selinux-wireshark for USE=selinux. Thanks to Petre bug #141156 - removed RDEPEND=!net-analyzer in preparation for ethereal->wireshark move. - added ethereal -> wireshark and tethereal -> tshark symlinks thanks to - suggestion from solar - - 20 Jul 2006; Gustavo Zacarias - wireshark-0.99.2.ebuild: - Stable on sparc wrt security #140856 - - 20 Jul 2006; Joshua Jackson wireshark-0.99.2.ebuild: - Stable x86; bug #140856 - - 19 Jul 2006; Daniel Black - +files/wireshark-0.99.2-libgcrypt-asneeded.patch, wireshark-0.99.2.ebuild: - added patch to include gcrypt libraries to solve bug #141021. Thanks to - Alberto Ornaghi for the bug report - - 19 Jul 2006; Simon Stelling wireshark-0.99.2.ebuild: - stable wrt bug 140856 - - 19 Jul 2006; Tobias Scherbaum - wireshark-0.99.2.ebuild: - ppc stable, bug #140856 - - 19 Jul 2006; wireshark-0.99.2.ebuild: - Stable on alpha wrt security Bug #140856. - - 19 Jul 2006; Markus Rothe wireshark-0.99.2.ebuild: - Stable on ppc64; bug #140856 - -*wireshark-0.99.2 (18 Jul 2006) - - 18 Jul 2006; Markus Ullmann - -files/wireshark-0.99.1_pre1-as-needed.patch, - -wireshark-0.99.1_pre1.ebuild, +wireshark-0.99.2.ebuild: - Security version bump wrt bug #140856 - - 17 Jul 2006; Daniel Black - wireshark-0.99.1_pre1.ebuild: - added keywords (~alpha ~ia64 ~ppc64) as this is off the same codebase as - ethereal - bug #136729 - - 16 Jul 2006; Daniel Gryniewicz - wireshark-0.99.1_pre1.ebuild: - Marked ~amd64 per bug #136729 - - 15 Jul 2006; Stephanie Lockwood-Childs - wireshark-0.99.1_pre1.ebuild: - mark ~ppc (Bug #136729) - - 01 Jul 2006; Jason Wever wireshark-0.99.1_pre1.ebuild: - Added ~sparc keyword. - -*wireshark-0.99.1_pre1 (30 Jun 2006) - - 30 Jun 2006; Markus Ullmann - +files/wireshark-0.99.1_pre1-as-needed.patch, +metadata.xml, - +wireshark-0.99.1_pre1.ebuild: - Initial import, fixes bug #136729 , thanks to gentooperson@yahoo.com for - providing an ebuild - diff --git a/sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/Manifest b/sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/Manifest deleted file mode 100644 index 5c827709c2..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST wireshark-1.2.8.tar.gz 19434341 SHA256 d83158be1cdad86f95fc6ddf513f673ea928de5cc796fa21306b99778a6dfb97 SHA512 9480d0261d503835a0657bb0658b9da265632a48f750f962992e9b908e7dd42b86001eefc2fd4180ec1e5ac4bd3e37a2c5619f36cd5bb5532fd1f7199341352b WHIRLPOOL 5cfcceebc324599c0a9b8d9a75b93e554ff14d7b300dc6eef903cd385356eec02e2bdb7ca861393288a33d342142dd6a88536fc48125ab33030f79d7913bdb7d diff --git a/sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/files/wireshark-0.99.7-asneeded.patch b/sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/files/wireshark-0.99.7-asneeded.patch deleted file mode 100644 index 36069368e1..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/files/wireshark-0.99.7-asneeded.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ./epan/dissectors/Makefile.am.orig 2007-12-11 16:38:03.000000000 +0300 -+++ ./epan/dissectors/Makefile.am 2007-12-11 16:38:37.000000000 +0300 -@@ -32,6 +32,7 @@ - - libasndissectors_la_SOURCES = \ - $(ASN_DISSECTOR_SRC) -+libasndissectors_la_LIBADD = ../../wiretap/libwiretap.la - - libpidldissectors_la_SOURCES = \ - $(PIDL_DISSECTOR_SRC) diff --git a/sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/files/wireshark-0.99.8-as-needed.patch b/sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/files/wireshark-0.99.8-as-needed.patch deleted file mode 100644 index df495f8cf7..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/files/wireshark-0.99.8-as-needed.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- wiretap/Makefile.am.orig 2008-02-21 23:11:41.000000000 +0300 -+++ wiretap/Makefile.am 2008-02-21 23:12:08.000000000 +0300 -@@ -67,7 +67,7 @@ - $(GENERATOR_FILES) \ - $(GENERATED_FILES) - --libwiretap_la_LIBADD = libwiretap_generated.la -+libwiretap_la_LIBADD = libwiretap_generated.la $(GLIB_LIBS) - libwiretap_la_DEPENDENCIES = libwiretap_generated.la - - RUNLEX = $(top_srcdir)/tools/runlex.sh diff --git a/sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/files/wireshark-1.0-sigpipe.patch b/sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/files/wireshark-1.0-sigpipe.patch deleted file mode 100644 index ad81e382e2..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/files/wireshark-1.0-sigpipe.patch +++ /dev/null @@ -1,31 +0,0 @@ -https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1740 -https://bugs.gentoo.org/show_bug.cgi?id=260457 - -=== modified file 'capture_opts.c' ---- capture_opts.c 2009-03-05 16:59:51 +0000 -+++ capture_opts.c 2009-03-05 17:06:49 +0000 -@@ -59,6 +59,7 @@ - # include "inet_v6defs.h" - #endif - -+#include - #include - - #include -@@ -759,6 +760,15 @@ - "Dropped"); - } - -+#ifndef _WIN32 -+ /* handle SIGPIPE signal to default action */ -+ struct sigaction act; -+ act.sa_handler = SIG_DFL; -+ sigemptyset(&act.sa_mask); -+ act.sa_flags = SA_RESTART; -+ sigaction(SIGPIPE,&act,NULL); -+#endif -+ - while (1) { /* XXX - Add signal handling? */ - for (stat_entry = g_list_first(stat_list); stat_entry != NULL; stat_entry = g_list_next(stat_entry)) { - if_stat = stat_entry->data; - diff --git a/sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/files/wireshark-1.0.5-text2pcap-protos.patch b/sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/files/wireshark-1.0.5-text2pcap-protos.patch deleted file mode 100644 index eed2df16a7..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/files/wireshark-1.0.5-text2pcap-protos.patch +++ /dev/null @@ -1,18 +0,0 @@ -defining _XOPEN_SOURCE to nothing means the oldest version which means glibc -will not provide the strdup() prototype. this leads to an implicit decl which -leads to a return type of "int" -- 32bits of a ptr on a 64bit arch leads to -kaboom. - -https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3161 - ---- text2pcap.c -+++ text2pcap.c -@@ -90,7 +90,7 @@ - # define __USE_XOPEN - #endif - #ifndef _XOPEN_SOURCE --# define _XOPEN_SOURCE -+# define _XOPEN_SOURCE 600 - #endif - - #include diff --git a/sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/files/wireshark-1.2.8--as-needed.patch b/sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/files/wireshark-1.2.8--as-needed.patch deleted file mode 100644 index 75b07e894b..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/files/wireshark-1.2.8--as-needed.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/epan/Makefile.am 2010-05-05 10:13:00.000000000 -0700 -+++ b/epan/Makefile.am 2010-05-21 09:11:20.000000000 -0700 -@@ -130,6 +130,7 @@ - dissectors/libdirtydissectors.la $(wslua_lib) @SOCKET_LIBS@ @NSL_LIBS@ \ - @C_ARES_LIBS@ @ADNS_LIBS@ @LIBGCRYPT_LIBS@ @LIBGNUTLS_LIBS@ \ - @KRB5_LIBS@ @SSL_LIBS@ @LIBSMI_LDFLAGS@ @GEOIP_LIBS@ \ -+ ${top_builddir}/wiretap/libwiretap.la \ - ${top_builddir}/wsutil/libwsutil.la -lm - - libwireshark_la_DEPENDENCIES = \ -@@ -137,6 +138,7 @@ - libwireshark_asmopt.la crc/libcrc.la crypt/libairpdcap.la \ - ftypes/libftypes.la dfilter/libdfilter.la dissectors/libdissectors.la \ - dissectors/libdirtydissectors.la $(wslua_lib) \ -+ ${top_builddir}/wiretap/libwiretap.la \ - ${top_builddir}/wsutil/libwsutil.la - - #EXTRA_PROGRAMS = reassemble_test diff --git a/sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/files/wireshark-1.2.8-no-pton.patch b/sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/files/wireshark-1.2.8-no-pton.patch deleted file mode 100644 index fbdddd7049..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/files/wireshark-1.2.8-no-pton.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- Makefile.am.orig 2010-05-24 11:26:37.000000000 -0700 -+++ Makefile.am 2010-05-24 11:31:05.000000000 -0700 -@@ -299,6 +299,8 @@ - # @SOCKET_LIBS@ or @NSL_LIBS@, as those should also be included in - # @GTK_LIBS@ (as those are also needed for X applications, and GTK+ - # applications are X applications). -+wireshark_DEPENDENCIES = \ -+ @INET_PTON_LO@ - wireshark_LDADD = \ - $(wireshark_optional_objects) \ - gtk/libui.a \ -@@ -330,6 +332,8 @@ - endif - - # Libraries and plugin flags with which to link tshark. -+tshark_DEPENDENCIES = \ -+ @INET_PTON_LO@ - tshark_LDADD = \ - $(wireshark_optional_objects) \ - wiretap/libwiretap.la \ -@@ -360,6 +364,8 @@ - endif - - # Libraries and plugin flags with which to link tshark. -+rawshark_DEPENDENCIES = \ -+ @INET_PTON_LO@ - rawshark_LDADD = \ - $(wireshark_optional_objects) \ - wiretap/libwiretap.la \ diff --git a/sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/files/wireshark-except-double-free.diff b/sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/files/wireshark-except-double-free.diff deleted file mode 100644 index a7ca896a49..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/files/wireshark-except-double-free.diff +++ /dev/null @@ -1,16 +0,0 @@ -Index: except.c -=================================================================== ---- except.c (revision 19876) -+++ except.c (working copy) -@@ -192,6 +192,11 @@ - - assert (top->except_type == XCEPT_CATCHER); - except_free(catcher->except_obj.except_dyndata); -+ /* make sure no else can free this pointer again -+ See http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1001 -+ http://bugs.gentoo.org/show_bug.cgi?id=133092 -+ http://bugs.gentoo.org/show_bug.cgi?id=145974 */ -+ catcher->except_obj.except_dyndata = NULL; - - for (i = 0; i < catcher->except_size; pi++, i++) { - if (match(&except->except_id, pi)) { diff --git a/sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/metadata.xml b/sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/metadata.xml deleted file mode 100644 index 059e62c806..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/metadata.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - -netmon - - pva@gentoo.org - Peter Volkov - - - Wireshark is the world's foremost network protocol analyzer, and is the de - facto (and often de jure) standard across many industries and educational - institutions. Wireshark has a rich feature set which includes 1) deep - inspection of hundreds of protocols, with more being added all the time, 2) - live capture and offline analysis, 3) standard three-pane packet browser, 4) - captured network data can be browsed via a GUI, or via the TTY-mode TShark - utility, 5) the most powerful display filters in the industry, 6) rich VoIP - analysis, 7) read/write many different capture file formats: tcpdump - (libpcap), Catapult DCT2000, Cisco Secure IDS iplog, Microsoft Network - Monitor, Network General Sniffer® (compressed and uncompressed), Sniffer® - Pro, and NetXray®, Network Instruments Observer, Novell LANalyzer, RADCOM - WAN/LAN Analyzer, Shomiti/Finisar Surveyor, Tektronix K12xx, Visual Networks - Visual UpTime, WildPackets EtherPeek/TokenPeek/AiroPeek, and many others, 8) - capture files compressed with gzip can be decompressed on the fly, 9) live - data can be read from Ethernet, IEEE 802.11, PPP/HDLC, ATM, Bluetooth, USB, - Token Ring, Frame Relay, FDDI, and others, 10) decryption support for many - protocols, including IPsec, ISAKMP, Kerberos, SNMPv3, SSL/TLS, WEP, and - WPA/WPA2, 11) coloring rules can be applied to the packet list for quick, - intuitive analysis, 12) output can be exported to XML, PostScript®, CSV, or - plain text - - -Use GNU crypto library (dev-libs/libgcrypt) to decrypt SSL traffic -Use GNU net-dns/c-ares library to resolve DNS names -Use net-libs/libpcap for network packet capturing (build dumpcap, rawshark) -Use net-libs/libsmi to resolve numeric OIDs into human readable format - - diff --git a/sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/wireshark-1.2.8.ebuild b/sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/wireshark-1.2.8.ebuild deleted file mode 100644 index 568465ea1f..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-analyzer/wireshark/wireshark-1.2.8.ebuild +++ /dev/null @@ -1,159 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.2.6.ebuild,v 1.6 2010/01/30 15:07:41 pva Exp $ - -EAPI=2 -inherit autotools libtool flag-o-matic eutils toolchain-funcs - -DESCRIPTION="A network protocol analyzer formerly known as ethereal" -HOMEPAGE="http://www.wireshark.org/" - -# _rc versions has different download location. -[[ -n ${PV#*_rc} && ${PV#*_rc} != ${PV} ]] && { -SRC_URI="http://www.wireshark.org/download/prerelease/${PN}-${PV/_rc/pre}.tar.gz"; -S=${WORKDIR}/${PN}-${PV/_rc/pre} ; } || \ -SRC_URI="http://www.wireshark.org/download/src/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="adns ares gtk ipv6 lua portaudio gnutls gcrypt geoip zlib kerberos threads profile smi +pcap pcre +caps selinux" - -RDEPEND=">=dev-libs/glib-2.4.0:2 - zlib? ( sys-libs/zlib ) - smi? ( net-libs/libsmi ) - gtk? ( >=x11-libs/gtk+-2.4.0:2 - x11-libs/pango - dev-libs/atk ) - gnutls? ( net-libs/gnutls ) - gcrypt? ( dev-libs/libgcrypt ) - pcap? ( net-libs/libpcap ) - pcre? ( dev-libs/libpcre ) - caps? ( sys-libs/libcap ) - kerberos? ( virtual/krb5 ) - portaudio? ( media-libs/portaudio ) - ares? ( >=net-dns/c-ares-1.5 ) - !ares? ( adns? ( net-libs/adns ) ) - geoip? ( dev-libs/geoip ) - lua? ( >=dev-lang/lua-5.1 ) - selinux? ( sec-policy/selinux-wireshark )" - -DEPEND="${RDEPEND} - >=dev-util/pkgconfig-0.15.0 - dev-lang/perl - sys-devel/bison - sys-devel/flex" - -pkg_setup() { - if ! use gtk; then - ewarn "USE=-gtk will means no gui called wireshark will be created and" - ewarn "only command line utils are available" - fi - - # Add group for users allowed to sniff. - enewgroup wireshark -} - -src_prepare() { - cd "${S}"/epan # our hardened toolchain bug... - epatch "${FILESDIR}/wireshark-except-double-free.diff" - - cd "${S}" - epatch "${FILESDIR}/${PN}-1.2.8--as-needed.patch" - - cd "${S}" - epatch "${FILESDIR}/${PN}-1.2.8-no-pton.patch" - - eautoreconf -} - -src_configure() { - local myconf - - # optimization bug, see bug #165340, bug #40660 - if [[ $(gcc-version) == 3.4 ]] ; then - elog "Found gcc 3.4, forcing -O3 into CFLAGS" - replace-flags -O? -O3 - elif [[ $(gcc-version) == 3.3 || $(gcc-version) == 3.2 ]] ; then - elog "Found <=gcc-3.3, forcing -O into CFLAGS" - replace-flags -O? -O - fi - - if use ares && use adns; then - einfo "You asked for both, ares and adns, but we can use only one of them." - einfo "c-ares supersedes adns resolver thus using c-ares (ares USE flag)." - myconf="$(use_with ares c-ares) --without-adns" - else - myconf="$(use_with adns) $(use_with ares c-ares)" - fi - - # see bug #133092; bugs.wireshark.org/bugzilla/show_bug.cgi?id=1001 - # our hardened toolchain bug - filter-flags -fstack-protector - - # profile and pie are incompatible #215806, #292991 - if use profile; then - ewarn "You've enabled the 'profile' USE flag, building PIE binaries is disabled." - append-flags $(test-flags-CC -nopie) - fi - - # Workaround bug #213705. If krb5-config --libs has -lcrypto then pass - # --with-ssl to ./configure. (Mimics code from acinclude.m4). - if use kerberos; then - case `krb5-config --libs` in - *-lcrypto*) myconf="${myconf} --with-ssl" ;; - esac - fi - - # dumpcap requires libcap, setuid-install requires dumpcap - econf $(use_enable gtk wireshark) \ - $(use_enable profile profile-build) \ - $(use_with gnutls) \ - $(use_with gcrypt) \ - $(use_enable ipv6) \ - $(use_enable threads) \ - $(use_with lua) \ - $(use_with kerberos krb5) \ - $(use_with smi libsmi) \ - $(use_with pcap) \ - $(use_with zlib) \ - $(use_with pcre) \ - $(use_with geoip) \ - $(use_with portaudio) \ - $(use_with caps libcap) \ - $(use_enable pcap setuid-install) \ - --sysconfdir=/etc/wireshark \ - ${myconf} -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - use pcap && fowners 0:wireshark /usr/bin/dumpcap - use pcap && fperms 6550 /usr/bin/dumpcap - - insinto /usr/include/wiretap - doins wiretap/wtap.h - - # FAQ is not required as is installed from help/faq.txt - dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} doc/randpkt.txt - - if use gtk; then - for c in hi lo; do - for d in 16 32 48; do - insinto /usr/share/icons/${c}color/${d}x${d}/apps - newins image/${c}${d}-app-wireshark.png wireshark.png - done - done - insinto /usr/share/applications - doins wireshark.desktop - fi -} - -pkg_postinst() { - echo - ewarn "NOTE: To run wireshark as normal user you have to add yourself into" - ewarn "wireshark group. This security measure ensures that only trusted" - ewarn "users allowed to sniff your traffic." - echo -} From b1d0361b14dde58a6123197436d332df0e3dcae6 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Wed, 12 Feb 2014 17:28:51 -0800 Subject: [PATCH 2/2] add(net-analyzer/nmap): Add ncat to production builds. Nmap itself is excluded, just want the basic network tools. ncat is a netcat implementation with support for fun things like SSL. In the future we could add nping but since we already include iputils that is not quite as important as ncat. The nmap ebuild includes a compile fix posted here: https://bugs.gentoo.org/show_bug.cgi?id=501136 --- ...1-r217.ebuild => coreos-0.0.1-r218.ebuild} | 0 .../coreos-base/coreos/coreos-0.0.1.ebuild | 3 +- .../coreos-overlay/net-analyzer/nmap/Manifest | 2 + .../nmap/files/nmap-4.75-nolua.patch | 10 ++ .../nmap/files/nmap-5.10_beta1-string.patch | 11 ++ .../nmap/files/nmap-5.21-python.patch | 21 +++ .../nmap/files/nmap-6.01-make.patch | 20 +++ .../nmap/files/nmap-6.25-liblua-ar.patch | 20 +++ .../nmap/files/nmap-6.40-ncat-no-lua.patch | 13 ++ .../nmap/files/nmap-6.40-uninstaller.patch | 18 +++ .../net-analyzer/nmap/nmap-6.40-r1.ebuild | 141 ++++++++++++++++++ .../coreos/base/package.accept_keywords | 3 + .../profiles/coreos/base/package.unmask | 2 + .../profiles/coreos/base/package.use | 2 + .../coreos/targets/generic/make.defaults | 8 + 15 files changed, 273 insertions(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/{coreos-0.0.1-r217.ebuild => coreos-0.0.1-r218.ebuild} (100%) create mode 100644 sdk_container/src/third_party/coreos-overlay/net-analyzer/nmap/Manifest create mode 100644 sdk_container/src/third_party/coreos-overlay/net-analyzer/nmap/files/nmap-4.75-nolua.patch create mode 100644 sdk_container/src/third_party/coreos-overlay/net-analyzer/nmap/files/nmap-5.10_beta1-string.patch create mode 100644 sdk_container/src/third_party/coreos-overlay/net-analyzer/nmap/files/nmap-5.21-python.patch create mode 100644 sdk_container/src/third_party/coreos-overlay/net-analyzer/nmap/files/nmap-6.01-make.patch create mode 100644 sdk_container/src/third_party/coreos-overlay/net-analyzer/nmap/files/nmap-6.25-liblua-ar.patch create mode 100644 sdk_container/src/third_party/coreos-overlay/net-analyzer/nmap/files/nmap-6.40-ncat-no-lua.patch create mode 100644 sdk_container/src/third_party/coreos-overlay/net-analyzer/nmap/files/nmap-6.40-uninstaller.patch create mode 100644 sdk_container/src/third_party/coreos-overlay/net-analyzer/nmap/nmap-6.40-r1.ebuild create mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.unmask diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r217.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r218.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r217.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r218.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild index d63587f993..525d57ed97 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild @@ -108,8 +108,9 @@ RDEPEND="${RDEPEND} coreos-base/coreos-installer coreos-base/coreos-init coreos-base/coretest - net-misc/dhcpcd + net-analyzer/nmap net-firewall/iptables + net-misc/dhcpcd net-misc/rsync net-misc/tlsdate net-misc/wget diff --git a/sdk_container/src/third_party/coreos-overlay/net-analyzer/nmap/Manifest b/sdk_container/src/third_party/coreos-overlay/net-analyzer/nmap/Manifest new file mode 100644 index 0000000000..dc92020178 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-analyzer/nmap/Manifest @@ -0,0 +1,2 @@ +DIST nmap-6.40.tar.bz2 7871636 SHA256 491f77d8b3fb3bb38ba4e3850011fe6fb43bbe197f9382b88cb59fa4e8f7a401 SHA512 b0ccb7634838e814dc0e36a0dbfc8c74853ef9dc6a119b73ffc90caab8875cbae893e0d24371ea568f9fff969440ed2a2e89953a6dbb6eb26313a4ea25b02b3b WHIRLPOOL 18424b67a8ace959c129e00e4b0d8a8e893aa08cfabb1b47b4fe9fc4316c29f713a2f83b789db28b4158c18bf80aea0bee071751187c0eb7e1a4b6693c3f4f98 +DIST nmap-logo-64.png 3289 SHA256 4c72ff1eeffeeaa1039b251d9f2d675936e65db686fe3b57a35c2183ce67a8aa SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3 WHIRLPOOL 6093aadcb9880587e17d39d45fcbe57bb62777f220655e6ed5b5f900ce49cb8c5a53e24d7db0de6f8909eb0f8981f7565e6ae9b9bf9283a4ccccb0526eab5313 diff --git a/sdk_container/src/third_party/coreos-overlay/net-analyzer/nmap/files/nmap-4.75-nolua.patch b/sdk_container/src/third_party/coreos-overlay/net-analyzer/nmap/files/nmap-4.75-nolua.patch new file mode 100644 index 0000000000..30bb1e0c86 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-analyzer/nmap/files/nmap-4.75-nolua.patch @@ -0,0 +1,10 @@ +diff -Naur nmap-4.75-orig/Makefile.in nmap-4.75/Makefile.in +--- nmap-4.75-orig/Makefile.in 2008-09-05 07:32:06.000000000 +0200 ++++ nmap-4.75/Makefile.in 2008-09-09 16:34:38.000000000 +0200 +@@ -258,5 +258,5 @@ + ./config.status --recheck + + makefile.dep: +- $(CXX) -MM $(CPPFLAGS) $(SRCS) > $@ ++ $(CXX) -MM $(CPPFLAGS) $(CXXFLAGS) $(SRCS) > $@ + include makefile.dep diff --git a/sdk_container/src/third_party/coreos-overlay/net-analyzer/nmap/files/nmap-5.10_beta1-string.patch b/sdk_container/src/third_party/coreos-overlay/net-analyzer/nmap/files/nmap-5.10_beta1-string.patch new file mode 100644 index 0000000000..df29db3782 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-analyzer/nmap/files/nmap-5.10_beta1-string.patch @@ -0,0 +1,11 @@ +--- nmap-5.10BETA1/Target.h.org 2009-12-08 08:21:59.000000000 +0100 ++++ nmap-5.10BETA1/Target.h 2009-12-08 08:22:02.000000000 +0100 +@@ -99,6 +99,8 @@ + + #ifndef NOLUA + #include "nse_main.h" ++#else ++#include + #endif + + #include "portreasons.h" diff --git a/sdk_container/src/third_party/coreos-overlay/net-analyzer/nmap/files/nmap-5.21-python.patch b/sdk_container/src/third_party/coreos-overlay/net-analyzer/nmap/files/nmap-5.21-python.patch new file mode 100644 index 0000000000..aa0d4f9db9 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-analyzer/nmap/files/nmap-5.21-python.patch @@ -0,0 +1,21 @@ +diff -Naurp nmap-5.21-orig/Makefile.in nmap-5.21/Makefile.in +--- nmap-5.21-orig/Makefile.in 2010-01-31 09:53:53.000000000 +0100 ++++ nmap-5.21/Makefile.in 2010-01-31 09:54:48.000000000 +0100 +@@ -253,7 +253,7 @@ build-zenmap: $(ZENMAPDIR)/setup.py $(ZE + + install-zenmap: $(ZENMAPDIR)/setup.py + $(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 +- cd $(ZENMAPDIR) && $(PYTHON) setup.py --quiet install --prefix "$(prefix)" --force $(if $(DESTDIR),--root "$(DESTDIR)") ++ cd $(ZENMAPDIR) && $(PYTHON) setup.py --quiet install --prefix "$(prefix)" --force $(if $(DESTDIR),--root "$(DESTDIR)") --no-compile + $(INSTALL) -c -m 644 docs/zenmap.1 $(DESTDIR)$(mandir)/man1/ + # Create a symlink from nmapfe to zenmap if nmapfe doesn't exist or is + # already a link. +@@ -267,7 +267,7 @@ build-ndiff: + cd $(NDIFFDIR) && $(PYTHON) setup.py build $(if $(DESTDIR),--executable "$(DEFAULT_PYTHON_PATH)") + + install-ndiff: +- cd $(NDIFFDIR) && $(PYTHON) setup.py install --prefix "$(prefix)" $(if $(DESTDIR),--root "$(DESTDIR)") ++ cd $(NDIFFDIR) && $(PYTHON) setup.py install --prefix "$(prefix)" $(if $(DESTDIR),--root "$(DESTDIR)") --no-compile + + NSE_FILES = scripts/script.db scripts/*.nse + NSE_LIB_LUA_FILES = nselib/*.lua diff --git a/sdk_container/src/third_party/coreos-overlay/net-analyzer/nmap/files/nmap-6.01-make.patch b/sdk_container/src/third_party/coreos-overlay/net-analyzer/nmap/files/nmap-6.01-make.patch new file mode 100644 index 0000000000..2711b3168b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-analyzer/nmap/files/nmap-6.01-make.patch @@ -0,0 +1,20 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -119,6 +119,8 @@ + rm -f $@ + $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) + ++$(NBASEDIR)/libnbase.a: nbase_build ++ + build-%: %/Makefile + cd $* && $(MAKE) + +@@ -152,7 +154,7 @@ + liblinear_build: $(LIBLINEARDIR)/Makefile + @echo Compiling liblinear; cd $(LIBLINEARDIR) && $(MAKE) liblinear.a CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" + +-build-nmap-update: nmap-update/default_channel.h ++build-nmap-update: nbase_build nmap-update/default_channel.h + + #$(LIBPCAPDIR)/Makefile: + # @echo Configuring libpcap; cd $(LIBPCAPDIR); ./configure diff --git a/sdk_container/src/third_party/coreos-overlay/net-analyzer/nmap/files/nmap-6.25-liblua-ar.patch b/sdk_container/src/third_party/coreos-overlay/net-analyzer/nmap/files/nmap-6.25-liblua-ar.patch new file mode 100644 index 0000000000..5aa9fa7f63 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-analyzer/nmap/files/nmap-6.25-liblua-ar.patch @@ -0,0 +1,20 @@ +--- a/liblua/Makefile ++++ b/liblua/Makefile +@@ -11,7 +11,7 @@ + LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS) + LIBS= -lm $(SYSLIBS) $(MYLIBS) + +-AR= ar rcu ++AR= ar + RANLIB= ranlib + RM= rm -f + +@@ -56,7 +56,7 @@ + a: $(ALL_A) + + $(LUA_A): $(BASE_O) +- $(AR) $@ $(BASE_O) ++ $(AR) rcu $@ $(BASE_O) + $(RANLIB) $@ + + $(LUA_T): $(LUA_O) $(LUA_A) diff --git a/sdk_container/src/third_party/coreos-overlay/net-analyzer/nmap/files/nmap-6.40-ncat-no-lua.patch b/sdk_container/src/third_party/coreos-overlay/net-analyzer/nmap/files/nmap-6.40-ncat-no-lua.patch new file mode 100644 index 0000000000..2be19a83a0 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-analyzer/nmap/files/nmap-6.40-ncat-no-lua.patch @@ -0,0 +1,13 @@ +--- nmap-6.40/ncat/ncat_posix.c.orig 2014-02-12 17:09:12.970777567 -0800 ++++ nmap-6.40/ncat/ncat_posix.c 2014-02-12 17:10:06.135387292 -0800 +@@ -122,7 +122,10 @@ + /* $Id$ */ + + #include "ncat.h" ++ ++#ifdef HAVE_LUA + #include "ncat_lua.h" ++#endif + + char **cmdline_split(const char *cmdexec); + diff --git a/sdk_container/src/third_party/coreos-overlay/net-analyzer/nmap/files/nmap-6.40-uninstaller.patch b/sdk_container/src/third_party/coreos-overlay/net-analyzer/nmap/files/nmap-6.40-uninstaller.patch new file mode 100644 index 0000000000..10bc67b14a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-analyzer/nmap/files/nmap-6.40-uninstaller.patch @@ -0,0 +1,18 @@ +--- a/zenmap/setup.py ++++ b/zenmap/setup.py +@@ -238,7 +238,6 @@ + self.set_perms() + self.set_modules_path() + self.fix_paths() +- self.create_uninstaller() + self.write_installed_files() + + def get_installed_files(self): +@@ -255,7 +254,6 @@ + for dirpath, dirs, files in os.walk(os.path.join(self.install_data, data_dir)): + for dir in dirs: + installed_files.append(os.path.join(dirpath, dir)) +- installed_files.append(os.path.join(self.install_scripts, "uninstall_" + APP_NAME)) + return installed_files + + def create_uninstaller(self): diff --git a/sdk_container/src/third_party/coreos-overlay/net-analyzer/nmap/nmap-6.40-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/net-analyzer/nmap/nmap-6.40-r1.ebuild new file mode 100644 index 0000000000..88f9013905 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-analyzer/nmap/nmap-6.40-r1.ebuild @@ -0,0 +1,141 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.40-r1.ebuild,v 1.3 2013/12/01 20:36:20 zerochaos Exp $ + +EAPI=5 + +PYTHON_COMPAT=( python2_{6,7} ) +PYTHON_REQ_USE="sqlite" +inherit eutils flag-o-matic python-single-r1 toolchain-funcs + +MY_P=${P/_beta/BETA} + +DESCRIPTION="A utility for network exploration or security auditing" +HOMEPAGE="http://nmap.org/" +SRC_URI=" + http://nmap.org/dist/${MY_P}.tar.bz2 + http://dev.gentoo.org/~jer/nmap-logo-64.png +" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" + +IUSE="ipv6 +lua ncat ndiff nls nmap-update nping ssl zenmap" +NMAP_LINGUAS=( de es fr hr hu id it ja pl pt_BR pt_PT ro ru sk zh ) +IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}" + +NMAP_PYTHON_DEPEND=" + || ( ${PYTHON_DEPS} ) +" +RDEPEND=" + dev-libs/libpcre + net-libs/libpcap[ipv6?] + zenmap? ( + dev-python/pygtk:2 + ${NMAP_PYTHON_DEPEND} + ) + lua? ( >=dev-lang/lua-5.2[deprecated] ) + ndiff? ( ${NMAP_PYTHON_DEPEND} ) + nls? ( virtual/libintl ) + nmap-update? ( dev-libs/apr dev-vcs/subversion ) + ssl? ( dev-libs/openssl ) +" +DEPEND=" + ${RDEPEND} + nls? ( sys-devel/gettext ) +" + +S="${WORKDIR}/${MY_P}" + +src_unpack() { + # prevent unpacking the logo + unpack ${MY_P}.tar.bz2 +} + +src_prepare() { + epatch \ + "${FILESDIR}"/${PN}-4.75-nolua.patch \ + "${FILESDIR}"/${PN}-5.10_beta1-string.patch \ + "${FILESDIR}"/${PN}-5.21-python.patch \ + "${FILESDIR}"/${PN}-6.01-make.patch \ + "${FILESDIR}"/${PN}-6.25-liblua-ar.patch \ + "${FILESDIR}"/${P}-ncat-no-lua.patch \ + "${FILESDIR}"/${P}-uninstaller.patch + + sed -i \ + -e 's/-m 755 -s ncat/-m 755 ncat/' \ + ncat/Makefile.in || die + + if use nls; then + local lingua='' + for lingua in ${NMAP_LINGUAS}; do + if ! use linguas_${lingua}; then + rm -rf zenmap/share/zenmap/locale/${lingua} + rm -f zenmap/share/zenmap/locale/${lingua}.po + fi + done + else + # configure/make ignores --disable-nls + for lingua in ${NMAP_LINGUAS}; do + rm -rf zenmap/share/zenmap/locale/${lingua} + rm -f zenmap/share/zenmap/locale/${lingua}.po + done + fi + + sed -i \ + -e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \ + Makefile.in || die + + # Fix desktop files wrt bug #432714 + sed -i \ + -e '/^Encoding/d' \ + -e 's|^Categories=.*|Categories=Network;System;Security;|g' \ + zenmap/install_scripts/unix/zenmap-root.desktop \ + zenmap/install_scripts/unix/zenmap.desktop || die + + epatch_user +} + +src_configure() { + # The bundled libdnet is incompatible with the version available in the + # tree, so we cannot use the system library here. + econf \ + $(use_enable ipv6) \ + $(use_enable nls) \ + $(use_with zenmap) \ + $(usex lua --with-liblua=/usr --without-liblua) \ + $(use_with ncat) \ + $(use_with ndiff) \ + $(use_with nmap-update) \ + $(use_with nping) \ + $(use_with ssl openssl) \ + --with-libdnet=included \ + --with-pcre=/usr +} + +src_compile() { + emake \ + AR=$(tc-getAR) \ + RANLIB=$(tc-getRANLIB ) +} + +src_install() { + LC_ALL=C emake -j1 \ + DESTDIR="${D}" \ + STRIP=: \ + nmapdatadir="${EPREFIX}"/usr/share/nmap \ + install + if use nmap-update;then + LC_ALL=C emake -j1 \ + -C nmap-update \ + DESTDIR="${D}" \ + STRIP=: \ + nmapdatadir="${EPREFIX}"/usr/share/nmap \ + install + fi + + dodoc CHANGELOG HACKING docs/README docs/*.txt + + use zenmap && doicon "${DISTDIR}/nmap-logo-64.png" +} diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords index 74590dfb0e..98a3216c36 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords @@ -88,3 +88,6 @@ # no version marked stable upstream dev-util/checkbashisms + +# masked upstream due to lua dep, but we don't enable lua support +=net-analyzer/nmap-6.40-r1 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.unmask b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.unmask new file mode 100644 index 0000000000..b4ca8272c7 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.unmask @@ -0,0 +1,2 @@ +# masked upstream due to lua dep, but we don't enable lua support +~net-analyzer/nmap-6.40 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use index b0c80d308f..85242b6b56 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use @@ -73,3 +73,5 @@ sys-libs/gdbm berkdb sys-libs/zlib static-libs dev-vcs/git -perl -iconv + +net-analyzer/nmap ncat -lua diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults index 2f1fb8758c..b0734a30e1 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults @@ -37,5 +37,13 @@ PROD_INSTALL_MASK="${INSTALL_MASK} /usr/src " +# Exclude nmap from prod image, we just want ncat/nping in there +# Also remove ncat's second ca-bundle.crt, just use the system's +PROD_INSTALL_MASK="${PROD_INSTALL_MASK} + /usr/bin/nmap + /usr/share/ncat + /usr/share/nmap +" + # No suffix for 'generic' (use base, not base-usr) COREOS_DISK_LAYOUT_SUFFIX=""