From fce886a8b3ee118e2a1122a4cad90885c69423ec Mon Sep 17 00:00:00 2001 From: jake Date: Sat, 31 May 2008 16:44:02 +0000 Subject: [PATCH] Update Debian packaging files for Wireshark 1.0. These files build the package with all features and minimum changes from the released sources. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25406 f5534014-38df-0310-8fa8-9805f1628bb7 --- debian/README.debian | 11 - debian/changelog | 1301 +---------------- debian/compat | 2 +- debian/control | 61 +- debian/docs | 1 - debian/headers-check.c | 4 + debian/menu | 2 - debian/patches/00list | 22 +- debian/patches/01_idl2deb.dpatch | 424 ------ debian/patches/02_asn2deb.dpatch | 392 ----- debian/patches/03_preferences.dpatch | 33 +- debian/patches/04_drop-capabilities.dpatch | 170 --- debian/patches/05_plugin-libdir.dpatch | 28 - debian/patches/06_giop-buffer.dpatch | 19 - debian/patches/07_gcc4.dpatch | 20 - .../patches/08_wireshark-desktop-menu.dpatch | 24 - debian/patches/09_idl2wrs.dpatch | 51 - debian/patches/10_wireshark_gen.dpatch | 19 - debian/prerm | 4 - debian/rules | 91 +- debian/tshark.manpages | 2 +- debian/wireshark-common.files | 4 +- debian/wireshark-common.manpages | 4 +- debian/wireshark-common.shlibs | 2 + debian/wireshark-dev.docs | 11 +- debian/wireshark-dev.files | 2 - debian/wireshark-dev.header-files | 6 +- debian/wireshark-dev.manpages | 2 - debian/wireshark-dev.postinst | 5 - debian/wireshark-dev.prerm | 1 + debian/wireshark-root.desktop | 6 +- debian/wireshark.desktop | 82 ++ debian/wireshark.files | 2 +- debian/wireshark.manpages | 2 +- debian/wireshark.menu | 4 +- 35 files changed, 198 insertions(+), 2616 deletions(-) delete mode 100644 debian/README.debian delete mode 100644 debian/docs create mode 100644 debian/headers-check.c delete mode 100644 debian/menu delete mode 100644 debian/patches/01_idl2deb.dpatch delete mode 100644 debian/patches/02_asn2deb.dpatch delete mode 100644 debian/patches/04_drop-capabilities.dpatch delete mode 100644 debian/patches/05_plugin-libdir.dpatch delete mode 100644 debian/patches/06_giop-buffer.dpatch delete mode 100644 debian/patches/07_gcc4.dpatch delete mode 100644 debian/patches/08_wireshark-desktop-menu.dpatch delete mode 100644 debian/patches/09_idl2wrs.dpatch delete mode 100644 debian/patches/10_wireshark_gen.dpatch delete mode 100644 debian/prerm create mode 100644 debian/wireshark-common.shlibs delete mode 100644 debian/wireshark-dev.postinst create mode 100644 debian/wireshark.desktop diff --git a/debian/README.debian b/debian/README.debian deleted file mode 100644 index a4726e59a1..0000000000 --- a/debian/README.debian +++ /dev/null @@ -1,11 +0,0 @@ -Ethereal for Debian -------------------- - -Q. Why isn't wireshark linked against libssl ? -A. Because it can't be linked against libssl. - See http://www.openssl.org/support/faq.html#LEGAL2 - -Q. Why isn't wireshark linked against libsnmp ? -A. Because it would also need to be linked against libssl - -Frederic Peters , Tue, 21 May 2002 08:37:52 +0200 diff --git a/debian/changelog b/debian/changelog index 58f62bdc7e..58ee9487b3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,1300 +1,5 @@ -wireshark (0.99.6pre1-1) unstable; urgency=high +wireshark (1.0.0) unstable; urgency=low - * New upstream pre-release, with security fixes: - * could crash when dissecting an HTTP chunked response - * could crash while reading iSeries capture files - * could exhaust system memory while reading a malformed DCP ETSI packet - * could loop excessively while reading a malformed SSL packet - * DHCP/BOOTP dissector was susceptible to an off-by-one error - * could loop excessively while reading a malformed MMS packet - * debian/control: added libkrb5-dev to build-deps so Kerberos support is - built. - * debian/control: replaced {Source-Version} with appropriate {binary:Version} - * debian/wireshark-dev.header-files: use wildcards to get all headers - (closes: #423000) - * debian/patches/14_disable-cmip.dpatch: disable CMIP dissector which - doesn't build at the moment. - * debian/rules: don't ignore all errors on make distclean - - -- Frederic Peters Mon, 25 Jun 2007 13:33:43 +0200 - -wireshark (0.99.5-1) unstable; urgency=low - - * New upstream release. - * debian/patches/09_idl2wrs.dpatch: updated to patch idl2wrs.sh.in. - - -- Frederic Peters Sun, 01 Apr 2007 08:58:40 +0000 - -wireshark (0.99.4-5) unstable; urgency=high - - * debian/patches/00list: really include backported security fixes, stupid me. - - -- Frederic Peters Mon, 26 Feb 2007 09:30:29 +0000 - -wireshark (0.99.4-4) unstable; urgency=high - - * Backported security fixes from 0.99.5pre1 - * The TCP dissector could hang or crash while reassembling HTTP packets. - * The HTTP dissector could crash. - * On some systems, the IEEE 802.11 dissector could crash. - * On some systems, the LLT dissector could crash. - - -- Frederic Peters Fri, 19 Jan 2007 21:49:04 +0100 - -wireshark (0.99.4-3) unstable; urgency=low - - * debian/control: added build dependency on libportaudio-dev so sniffed voip - G.711 calls are listenable. (closes: #398673) - * debian/patches/08_wireshark-desktop-menu.dpatch: removed extraneous .rej - file from patch. - - -- Frederic Peters Sun, 19 Nov 2006 16:39:26 +0000 - -wireshark (0.99.4-2) unstable; urgency=low - - * debian/wireshark-dev.files: added more headers, so that dissectors for - DCE/RPC interfaces can be build externally. (closes: #397292) - - -- Frederic Peters Mon, 6 Nov 2006 12:48:20 +0100 - -wireshark (0.99.4-1) unstable; urgency=high - - * Backported security patches from yet unreleased 0.99.4 (closes: #396258) - * http://www.wireshark.org/security/wnpa-sec-2006-03.html has details - * HTTP dissector could crash (CVE-2006-5468) - * LDAP dissector (and others) could crash (CVE-2006-5740) - * XOT dissector could attempt to allocate a large amount of memory and - crash (CVE-2006-4805) - * WBXML dissector could crash (CVE-2006-5469) - * MIME Multipart dissectar was susceptible to an off-by-one error - (CVE-2006-4574) - * Parsing a WEP key could cause a crash - * debian/control: disabled libcap-dev for kfreebsd and hurd - (closes: #375022) - - -- Frederic Peters Wed, 1 Nov 2006 10:05:05 +0100 - -wireshark (0.99.3a-2) unstable; urgency=low - - * debian/ethereal-common.NEWS: added a note about ethereal -> wireshark name - change. - - -- Frederic Peters Thu, 12 Oct 2006 15:42:48 +0200 - -wireshark (0.99.3a-1) unstable; urgency=low - - * New upstream release. - * debian/patches/11_iscsi_dissector.dpatch, 12_ipsec_dissector.dpatch, - 13_q2931_security_fix.dpatch: security patches that were backported. - * debian/patches/11_typo_packet-dap: fixed a typo s/diwsect/dissect/ - - -- Frederic Peters Mon, 18 Sep 2006 18:56:12 +0200 - -wireshark (0.99.2-6) unstable; urgency=low - - * Acknowledge NMU, thank Steinar. - * debian/wireshark-dev.postinst: removed rests of old Python module - compilation, it is not needed by new policy. (closes: #385357) - - -- Frederic Peters Wed, 6 Sep 2006 23:34:36 +0200 - -wireshark (0.99.2-5.1) unstable; urgency=medium - - * Non-maintainer upload. - * Backport security fixes from 0.99.3a (via Subversion); fixes - CVE-2006-4331, CVE-2006-4333 (CVE-2006-4330 was fixed in last upload, - and CVE-2006-4332 is not relevant for Debian). (Closes: #384529) - - -- Steinar H. Gunderson Tue, 5 Sep 2006 02:15:53 +0200 - -wireshark (0.99.2-5) unstable; urgency=low - - * debian/patches/11_iscsi_dissector.dpatch: new patch, fixing bug reported - against iSCSI dissector, taken from upstream (r18832) (closes: #381860) - - -- Frederic Peters Mon, 7 Aug 2006 16:59:50 +0200 - -wireshark (0.99.2-4) unstable; urgency=low - - * debian/control: set ethereal-dev section to devel, it was lost in copy - pasting. - * debian/control, debian/rules, debian/pyversions: updated to new Python - policy. (closes: #380986) - - -- Frederic Peters Tue, 1 Aug 2006 13:05:21 +0200 - -wireshark (0.99.2-3) unstable; urgency=low - - * debian/control: added dummy transitional packages to provide an upgrade - path from ethereal. (closes: #380647) - - -- Frederic Peters Mon, 31 Jul 2006 18:21:27 +0200 - -wireshark (0.99.2-2) unstable; urgency=low - - * debian/rules: set --datadir so that DATAFILE_DIR is correct (it was - wrongly set to "${prefix}/share/wireshark" and not expanded. - * AUTHORS-SHORT is now displayed correclty in about dialog - * colofilters is now found and used properly - - -- Frederic Peters Wed, 26 Jul 2006 13:27:54 +0200 - -wireshark (0.99.2-1) unstable; urgency=high - - * New upstream release. (closes: #378745) - * The project changed name, ethereal is now wireshark. (closes: #351941) - See http://www.wireshark.org/news/20060607.html - * tethereal has been renamed to tshark - * idl2eth has been renamed to idl2wrs - * Urgency high since it fixes security issues - * http://www.wireshark.org/security/wnpa-sec-2006-01.html has details - * crash in GSM BSSMAP dissector (CVE-2006-3627) - * format string overflow in ANSI MAP dissector (CVE-2006-3628) - * format string overflow in Checkpoint FW-1 dissector (CVE-2006-3628) - * format string overflow in MQ dissector (CVE-2006-3628) - * format string overflow in XML dissector (CVE-2006-3628) - * large memory allocation in MOUNT dissector (CVE-2006-3629) - * off-by-one errors in NCP NMAS and NDPS dissectors (CVE-2006-3630) - * format string overflow in NTP dissector (CVE-2006-3628) - * infinite loop in SSH dissector (CVE-2006-3631) - * buffer overflow in NFS dissector (CVE-2006-3632) - * debian/wireshark-dev.header-files: includes missing files - (closes: #376522, #368860) - * debian/copyright: list source files that are under a license different - than Wireshark. - - -- Frederic Peters Mon, 24 Jul 2006 19:29:26 +0200 - -ethereal (0.99.0-1) unstable; urgency=high - - * New upstream release (urgency high since it fixes security issues; - see http://www.ethereal.com/appnotes/enpa-sa-00023.html advisory) - * crash in H.248 dissector (CVE-2006-1937) - * infinite loop in UMA dissector (CVE-2006-1933) - * crash in X.509if dissector (CVE-2006-1937) - * crash in SRVLOC dissector (CVE-2006-1937) - * crash in H.245 dissector (CVE-2006-1937) - * off-by-one error in OID printing routine (CVE-2006-1932) - * buffer overflow in COPS dissector (CVE-2006-1935) - * buffer overflow in ALCAP dissector (CVE-2006-1934) - * crash in statistics counter (CVE-2006-1937) - * crash with malformed capture (CVE-2006-1938) - * crash with invalid display filter (CVE-2006-1939) - * crash in general packet dissector (CVE-2006-1937) - * crash in AIM dissector (CVE-2006-1937) - * crash in RPC dissector (CVE-2006-1939) - * crash in DCERPC dissector (CVE-2006-1939) - * crash in ASN.1 dissector (CVE-2006-1939) - * crash in SMB PIPE dissector (CVE-2006-1938) - * excessive loop in BER dissector (CVE-2006-1933) - * abort in SNDCP dissector (CVE-2006-1940) - * buffer overrun in Network Instruments file code (CVE-2006-1934) - * buffer overrun in NetXray/Windows Sniffer file code (CVE-2006-1934) - * crash in GSM SMS dissector (CVE-2006-1939) - * buffer overrun in ALCAP dissector (CVE-2006-1934) - * buffer overrun in telnet dissector (CVE-2006-1936) - * crash in ASN.1 based dissectors (CVE-2006-1939) - * crash in DCERPC NT dissector (CVE-2006-1939) - * crash in PER dissector (CVE-2006-1939) - * debian/patches/04_drop-capabilities.dpatch: updated. - * debian/control: added build-depends on libgnutls-dev since libgnutls can - now be used for SSL support. - - -- Frederic Peters Mon, 1 May 2006 14:50:42 +0200 - -ethereal (0.10.14-2) unstable; urgency=low - - * debian/watch: added watch file. - - -- Frederic Peters Mon, 6 Mar 2006 00:03:13 +0100 - -ethereal (0.10.14-1) unstable; urgency=low - - * New upstream release. - * Acknowledge NMU, thanks for the support while I was away. - * debian/patches/11-security-CVE-2005-3651.dpatch: removed since included - upstream. - * debian/patches/07_gcc4.dpatch: removed part about packet-cms since it now - causes the build to fail. - - -- Frederic Peters Thu, 23 Feb 2006 11:04:11 +0100 - -ethereal (0.10.13-1.3) unstable; urgency=low - - * Non-maintainer upload. - * Build-conflict with libsnmp-dev, not just libsnmp5-dev, to prevent - accidental linkage with openssl. Closes: #353613. - - -- Steve Langasek Sun, 19 Feb 2006 18:03:20 -0800 - -ethereal (0.10.13-1.2) unstable; urgency=high - - * Non-maintainer upload. - * High-urgency upload for RC bugfix. - * Add missing epan/gnuc_format_check.h, epan/ipv6-utils.h headers to - ethereal-dev. Closes: #344011. - * Build-depend on automake1.9 instead of automake; the latter points to - the ancient automake1.4 package, which was not what's used upstream. - - -- Steve Langasek Fri, 17 Feb 2006 17:47:37 -0800 - -ethereal (0.10.13-1.1) unstable; urgency=high - - * Non-maintainer upload. - * Fix buffer overflow in OSPF dissector (CVE-2005-3651) - - -- Moritz Muehlenhoff Sun, 25 Dec 2005 11:15:28 +0100 - -ethereal (0.10.13-1) unstable; urgency=high - - * New upstream release (urgency high since it fixes security issues; - see http://www.ethereal.com/appnotes/enpa-sa-00021.html advisory) - * memory exhaustion by ISAKMP, FC-FCS, RSVP, ISIS LSP dissectors - (CAN-2005-3241) - * crash in IrDA dissector and SMB transaction payload reassembly - (CAN-2005-3242) - * buffer overflow in AgentX and SLIMP3 dissectors (CAN-2005-3243) - * infinite loop in BER dissector (CAN-2005-3244) - * memory exhaustion by ONC RPC dissector with option "Dissect unknown RPC - program numbers" (CAN-2005-3245) - * NULL pointer in sFlow, RTnet, SCSI dissectors (CAN-2005-3246) - * infinite loop and crash in SigComp UDVM (CAN-2005-3247) - * division by zero in X11 dissector (CAN-2005-3248) - * invalid pointer freed in WSP dissecto (CAN-2005-3249) - * buffer overflow in SRVLOC dissector (CAN-2005-3184) - * debian/patches/04_drop-capabilities.dpatch: updated - * debian/patches/08_ethereal-desktop-menu.dpatch: updated - * debian/patches/09_idl2eth.dpatch: updated - - -- Frederic Peters Thu, 8 Dec 2005 14:18:07 +0100 - -ethereal (0.10.12-6) unstable; urgency=low - - * Rebuilt with gtk/atk from unstable. (closes: #329889) - - -- Frederic Peters Sat, 24 Sep 2005 11:11:40 +0200 - -ethereal (0.10.12-5) unstable; urgency=low - - * debian/ethereal-dev.header-files: added missing epan/range.h - (closes: #306426) - - -- Frederic Peters Fri, 23 Sep 2005 18:28:04 +0200 - -ethereal (0.10.12-4) unstable; urgency=low - - * debian/control: upgraded automake dependency of ethereal-dev to 1.8. - * debian/patches/11_diameter_vendors.dpatch: removed, wrong. - * debian/ethereal-common.files: add capinfos. - * debian/ethereal-common.manpages: add capinfos man page. - * debian/changelog: fixed 0.6.3-2 header line since lintian now complains - about the old way of closing bugs from changelogs. - - -- Frederic Peters Fri, 12 Aug 2005 00:43:39 +0200 - -ethereal (0.10.12-3) unstable; urgency=low - - * debian/patches/04_drop-capabilities.dpatch: don't exit on failure, simply - skip the capabilities part; use g_warning to output messages. - (closes: #321204) - - -- Frederic Peters Thu, 4 Aug 2005 09:41:24 +0200 - -ethereal (0.10.12-2) unstable; urgency=low - - * debian/patches/04_drop-capabilities.dpatch: preserves CAP_DAC_READ_SEARCH - which seems necessary for sudo usage (closes: #320453) - - -- Frederic Peters Sun, 31 Jul 2005 12:56:50 +0200 - -ethereal (0.10.12-1) unstable; urgency=high - - * New upstream release; urgency high since it fixes security issues in many - dissectors; see http://www.ethereal.com/appnotes/enpa-sa-00020.html - - -- Frederic Peters Wed, 27 Jul 2005 09:57:17 +0200 - -ethereal (0.10.11-5) unstable; urgency=low - - * debian/patches/11_diameter_vendors.dpatch: correctly add diameter vendors - (patch by Joost Yervante Damad) (closes: #316082) - - -- Frederic Peters Mon, 18 Jul 2005 20:18:43 +0200 - -ethereal (0.10.11-4) unstable; urgency=low - - * debian/: now using dpatch, started from Ubuntu patch, merged with current - package patches. - - -- Frederic Peters Sun, 17 Jul 2005 18:58:05 +0200 - -ethereal (0.10.11-3) unstable; urgency=low - - * Modified capabilities patch so it doesn't try to keep CAP_NET_RAW if it - doesn't have it. (closes: #318689) - - -- Frederic Peters Sun, 17 Jul 2005 10:29:31 +0200 - -ethereal (0.10.11-2) unstable; urgency=low - - * Use capabilities to mitigate security risk, patch from J.H.M. Dassen (Ray) - (closes: #315670) - * debian/control: build-depends on libcap-dev - * epan/dissectors/packet-cmip.c: fixed dissect_cmip_InvokeIDType declaration - mismatch. - - -- Frederic Peters Sat, 16 Jul 2005 10:58:03 +0200 - -ethereal (0.10.11-1) unstable; urgency=high - - * New upstream release; urgency high since it fixes security issues in the - following dissectors: - * format string vulnerabilities: ANSI A, DHCP - * segmentation faults: GSM MAP, AIM, TZSP, Bittorrent, SMB, GSM, SMB - NETLOGON - * buffer overflows: DISTCC, FCELS, SIP, ISIS, CMIP, CMP, CMS, CRMF, ESS, - OCSP, PKIX1Explitit, PKIX Qualified, X.509, NCP, ISUP, TCAP, - Presentation - * null pointer exception: KINK, WSP, SMB Mailslot, H.245, MGCP, RPC - * infinite loops: LMP, EIGRP, MEGACO, L2TP - * uncaught assertions: Telnet, 802.3, BER, IAX2, RADIUS, SMB PIPE, MRDISC - * memory exhaustion: DICOM - * unclassified: Fibre Channel, LDAP, NTLMSSP - - -- Frederic Peters Thu, 5 May 2005 08:43:00 +0200 - -ethereal (0.10.10-2) unstable; urgency=high - - * Several security fixes from upstream subversion tree for the following - dissectors: - * DLSw (infinite loop) - * ICEP (double free) - * NDPS (memory exhaustion) - * Q931 (buffer overflow) - * RSVP (infinite loop) (CAN-2005-1281) - * SRVLOC (infinite loop) - - -- Frederic Peters Mon, 25 Apr 2005 15:30:55 +0200 - -ethereal (0.10.10-1) unstable; urgency=high - - * New upstream release; urgency high since it fixes security issues. - * Fixes buffer overflow in Etheric dissector. (CAN-2005-0704) - * Fixes crash in GPRS-LLC dissector. (CAN-2005-0705) - * Fixes buffer overflow in 3G-A11 dissector. (CAN-2005-0699) - (was already fixed in Debian package) - * debian/ethereal-dev.header-files: some files moved to epan/ - - -- Frederic Peters Mon, 14 Mar 2005 10:16:03 +0100 - -ethereal (0.10.9-2) unstable; urgency=high - - * Backported packet-3g-a11.c from upstream subversion trunk. - (fixes buffer overflows in 3G-A11 dissector) - (CAN-2005-0699 (under review)) (closes: #298771) - - -- Frederic Peters Thu, 10 Mar 2005 10:25:08 +0100 - -ethereal (0.10.9-1) unstable; urgency=high - - * New upstream release; urgency high since it fixes security issues. - * Fixes infinite loop in COPS dissector. (CAN-2005-0006) - * Fixes assertion in DLSw dissector. (CAN-2005-0007) - * Fixes memory corruption in DNP dissector. (CAN-2005-0008) - * Fixes assertion in Gnutella dissector. (CAN-2005-0009) - * Fixes memory corruption in MMSE dissector. (CAN-2005-0010) - * Fixes buffer overflow in X11 dissector. (CAN-2005-0084) - * asn2deb and idl2deb manpages relicensed by W. Borgert from GFDL to GPL - - -- Frederic Peters Thu, 20 Jan 2005 23:03:19 +0100 - -ethereal (0.10.8-4) unstable; urgency=low - - * Updated libtool version in wiretap/ directory. (closes: #289962) - - -- Frederic Peters Wed, 12 Jan 2005 10:14:41 +0100 - -ethereal (0.10.8-3) unstable; urgency=low - - * Fixed dissect_cmip_InvokeIDType declaration (FTBFS with gcc-4.0) - (closes: #288990) - * epan/dissectors/packet-giop.c: fixed segfault with some GIOP packets - (closes: #288746) - - -- Frederic Peters Fri, 7 Jan 2005 14:43:03 +0100 - -ethereal (0.10.8-2) unstable; urgency=low - - * Restored lost patch to idl2eth; sorry. (closes: #288740) - * ethereal_gen.py: fixed some includes. - * epan/prefs.c: Use sensible-brower as default browser. - * debian/control: build-depends on libpcap0.8-dev. - * debian/control: lower-case first letter of descriptions. - - -- Frederic Peters Wed, 5 Jan 2005 14:34:57 +0100 - -ethereal (0.10.8-1) unstable; urgency=high - - * New upstream release. - * Now parses Auth option in DHCPv6 (closes: #283534) - * Urgency high since it fixes security issues with DICOM, RTP, HTTP - and SMB - (CAN-2004-1139, CAN-2004-1140, CAN-2004-1141 and CAN-2004-1142) - - -- Frederic Peters Wed, 15 Dec 2004 22:13:41 +0100 - -ethereal (0.10.7-3) unstable; urgency=low - - * epan/prefs.c: changed default font to "monospace 10" (closes: #232408) - - -- Frederic Peters Fri, 19 Nov 2004 18:31:22 +0100 - -ethereal (0.10.7-2) unstable; urgency=low - - * plugins/opsi/packet-opsi.c: backported resource exhaustion fix - (closes: #280556) - - -- Frederic Peters Thu, 18 Nov 2004 21:50:28 +0100 - -ethereal (0.10.7-1) unstable; urgency=low - - * New upstream release. (closes: #277923) - - -- Frederic Peters Mon, 1 Nov 2004 14:11:35 +0100 - -ethereal (0.10.6-4) unstable; urgency=low - - * Build in clean chroot; stupid me. (closes: #276560) - * debian/rules: remove config.log on clean. - - -- Frederic Peters Fri, 15 Oct 2004 00:12:58 +0200 - -ethereal (0.10.6-3) unstable; urgency=medium - - * Upgrades libtool (closes: #276515) - - -- Frederic Peters Thu, 14 Oct 2004 18:40:03 +0200 - -ethereal (0.10.6-2) unstable; urgency=medium - - * debian/ethereal-dev.header-files: added missing header files - (closes: #270581) - - -- Frederic Peters Wed, 8 Sep 2004 10:34:12 +0200 - -ethereal (0.10.6-1) unstable; urgency=high - - * New upstream realease. - * Gtk-Critical messages are fixed (closes: #260341, #263118) - * debian/rules: run libtoolize to fix sonames; fix a FTBFS bug - (closes: #265379) - - -- Frederic Peters Sun, 15 Aug 2004 11:58:03 +0200 - -ethereal (0.10.5-4) unstable; urgency=low - - * link libethereal.so to libadns and libm (closes: #262015) - (since this is a private shared library I don't think it was required) - - -- Frederic Peters Thu, 29 Jul 2004 15:41:02 +0200 - -ethereal (0.10.5-3) unstable; urgency=low - - * debian/ethereal-dev.header-files: install packet-rpc.h, crc16.h and crc32.h - (closes: #259375) - - -- Frederic Peters Wed, 14 Jul 2004 12:50:34 +0200 - -ethereal (0.10.5-2) unstable; urgency=low - - * Compile and install plugins (closes: #259199) - - -- Frederic Peters Tue, 13 Jul 2004 13:40:41 +0000 - -ethereal (0.10.5-1) unstable; urgency=low - - * New upstream release with security fixes. - + - + Fixed the crash in protocol hierarchy (closes: #244743) - + Ethereal can be configured not to bug you about unsaved captures - (closes: #235721) - * Updated omniorb URL (closes: #257512) - - -- Frederic Peters Tue, 13 Jul 2004 10:16:55 +0200 - -ethereal (0.10.4-3) unstable; urgency=low - - * debian/rules: install libethereal in /usr/lib/ethereal, not /usr/lib/ - * debian/ethereal-dev.header-files: added packet-ber.h - * idl2deb: ETH_VER_IMPORT and non-versioned autotools (closes: #255570) - * debian/control: updated depends to libpcap0.7-dev, no more libpcap-dev - - -- Frederic Peters Tue, 22 Jun 2004 09:02:39 +0200 - -ethereal (0.10.4-2) unstable; urgency=low - - * Rebuilt against GTK+ 2.4; now in unstable. - - -- Frederic Peters Tue, 25 May 2004 22:28:37 +0200 - -ethereal (0.10.4-1) unstable; urgency=high - - * New upstream release with security fixes. - - * (sorry about the delay; I was away and forgot about this release) - - -- Frederic Peters Sun, 16 May 2004 00:02:53 +0200 - -ethereal (0.10.3-3) unstable; urgency=low - - * debian/control: removed dependency on gksu; moved to recommends - * debian/EtherealAsRoot.desktop: added TryExec=gksu so that the menu is - only shown when gksu is installed - * debian/ethereal.menu: removed entry for "ethereal as root" since - """running ethereal itself requires some wits, and user possesing - such skills would be able to launch it from xterm.""" - * "Our Priorities are Our Users (...)", but ignore them if they ask - about gksu support; it's against the holy Debian Policy Manual and - a """300kB dependency *is* a big dependency""". - * This closes the bug and everybody is happy (closes: #240682) - - -- Frederic Peters Sat, 10 Apr 2004 21:16:30 +0200 - -ethereal (0.10.3-2) unstable; urgency=high - - * Acknowledge NMU. (sorry) (urgency high, security fixes) - * debian/control: added Build-Conflicts on libsnmp-dev - - -- Frederic Peters Sun, 28 Mar 2004 23:14:51 +0200 - -ethereal (0.10.3-1.0.1) unstable; urgency=low - - * Recompile-only NMU. - * i386 package was uploaded with dependencies on GNOME libs from - experimental; rebuild using only dependencies from unstable. - - -- Steve Langasek Sat, 27 Mar 2004 21:27:01 -0600 - -ethereal (0.10.3-1) unstable; urgency=high - - * New upstream release with security fixes. (hence urgency high) - http://www.ethereal.com/appnotes/enpa-sa-00013.html - * debian/rules: remove upstream debian/menu on build - * debian/control: added dependency on gksu - * debian/menu: added an entry to start ethereal with gksu - (closes: #71994) - * added another .desktop entry to start ethereal with gksu from Gnome menu - * Upstream changes; libethereal and libwiretap handled differently; they may - end up in new packages (but go in ethereal-common for now) - - -- Frederic Peters Sat, 27 Mar 2004 14:09:49 +0100 - -ethereal (0.10.2-2) unstable; urgency=low - - * New files in ethereal-dev (closes: #236702) - - -- Frederic Peters Sun, 7 Mar 2004 21:43:17 +0100 - -ethereal (0.10.2-1) unstable; urgency=low - - * New upstream release. - * debian/control: added libpcre3-dev to Build-Depends - - -- Frederic Peters Fri, 5 Mar 2004 15:56:50 +0100 - -ethereal (0.10.1-1) unstable; urgency=low - - * New upstream release. - * Include W. Bogert asn2deb (closes: #233603) - - -- Frederic Peters Thu, 19 Feb 2004 18:02:08 +0100 - -ethereal (0.10.0-6) unstable; urgency=low - - * debian/ethereal-common.manpages: added ethereal-filter.4 - (closes: #230256) - * debian/control: updated build-depends on docbook-xsl since docbook.xsl - moved. - - -- Frederic Peters Thu, 29 Jan 2004 18:11:43 +0100 - -ethereal (0.10.0-5) unstable; urgency=low - - * debian/rules: quotes around CFLAGS. (closes: #228492) - - -- Frederic Peters Mon, 19 Jan 2004 12:14:02 +0100 - -ethereal (0.10.0-4) unstable; urgency=low - - * Backported hexdump summary fix from CVS (closes: #226248) - http://www.ethereal.com/lists/ethereal-cvs/200312/msg00257.html - - -- Frederic Peters Mon, 5 Jan 2004 15:27:06 +0100 - -ethereal (0.10.0-3) unstable; urgency=low - - * ethereal_gen.py: patched to handle ushort/ulong union discriminators. - - -- Frederic Peters Thu, 18 Dec 2003 23:27:51 +0100 - -ethereal (0.10.0-2) unstable; urgency=low - - * debian/ethereal-dev.header-files: added missing header files. - (closes: #224246) - - -- Frederic Peters Wed, 17 Dec 2003 13:24:21 +0100 - -ethereal (0.10.0-1) unstable; urgency=low - - * New upstream release. (closes: #223857) - * correct fonts with GTK2. (closes: #197571) - * Includes missing help/ directory from CVS. - * Acknowledge NMU, thanks Ray. - * Security issues. (closes: #219590) - * idl2deb permissions. (closes: #211506) - * New idl2deb version, thanks. (closes: #213962) - * debian/ethereal-dev.header-files: include some missing header files - (closes the remaining of #211506) - * debian/control: versioned build-depends on debhelper. - - -- Frederic Peters Sat, 13 Dec 2003 17:11:09 +0100 - -ethereal (0.9.16-0.1) unstable; urgency=high - - * NMU. - * New upstream release (addresses #219590 for sid). - Fixes potential security issues with several dissectors: - * GTP (http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2003-0925) - * ISAKMP and MEGACO - (http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2003-0926) - * SOCKS (http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2003-0927) - The upstream security advisory is enpa-sa-00011, available at - http://www.ethereal.com/appnotes/enpa-sa-00011.html - * [debian/rules] - * Don't remove doc/ethereal.pod and doc/tethereal.pod so the package - builds with pbuilder. - * Install idl2deb with execute permissions. - - -- J.H.M. Dassen (Ray) Mon, 10 Nov 2003 12:11:55 +0100 - -ethereal (0.9.15-1) unstable; urgency=low - - * New upstream release. (closes: #210272) - - -- Frederic Peters Wed, 10 Sep 2003 16:13:17 +0200 - -ethereal (0.9.14-5) unstable; urgency=low - - * debian/control: versioned build-depends on docbook-xsl (closes: #208734) - * debian/rules: compiles with -mieee on alpha - - -- Frederic Peters Sun, 7 Sep 2003 09:57:25 +0200 - -ethereal (0.9.14-4) unstable; urgency=low - - * debian/rules: install .desktop and images for menu. - (closes: #207271) - * debian/control: updated policy to 3.6.1.0 (no changes needed) - - -- Frederic Peters Sat, 30 Aug 2003 23:27:00 +0200 - -ethereal (0.9.14-3) unstable; urgency=low - - * Add manpage for idl2deb - * Include missing header files. (closes: #197181) - - from same bug: remove dependency of ethereal-dev against ethereal-common - - from same bug: added dependency to libglib2.0-dev - - -- Frederic Peters Tue, 19 Aug 2003 11:55:27 +0200 - -ethereal (0.9.14-2) unstable; urgency=low - - * Built for Python 2.3 since omniidl4 has been updated quickly. - - -- Frederic Peters Thu, 14 Aug 2003 10:19:18 +0200 - -ethereal (0.9.14-1) unstable; urgency=low - - * The "I'm so happy to be alive I'll fix plenty of bugs" release - * New upstream release. (closes: #204345) - * Include W. Bogert idl2deb script - * debian/control: depends on current versions of omniidl or omniidl4 since - they only exist for Python 2.2 and I don't want ethereal-dev to break when - they will switch to Python 2.3. I'll then release a new version. - * Several UI issues resolved upstream (closes: #199763) - * ethereal can now decode Jabber protocol (closes: #133099) - * debian/control: build-depends on libadns1-dev so that it now use the GNU - ADNS library for name resolution (closes: #197505) - - -- Frederic Peters Wed, 13 Aug 2003 00:06:27 +0200 - -ethereal (0.9.13-1) unstable; urgency=low - - * New upstream release. Fixing several security issues. - (closes: #197107) - - -- Frederic Peters Thu, 12 Jun 2003 10:00:57 +0200 - -ethereal (0.9.12-3) unstable; urgency=low - - * Rebuilt with new libpcap. (closes: #196831) - * Built with GTK+ 2.2 (instead of GTK+ 1.2). (closes: #193450) - - -- Frederic Peters Wed, 11 Jun 2003 17:45:07 +0200 - -ethereal (0.9.12-2) unstable; urgency=low - - * Forgot to update version-depends and it didn't use ${source-version}. - Fixed. (closes: #192213) - - -- Frederic Peters Wed, 7 May 2003 01:16:45 +0200 - -ethereal (0.9.12-1) unstable; urgency=high - - * New upstream release. Fixing several security issues. - (closes: #192107) - - -- Frederic Peters Tue, 6 May 2003 22:03:10 +0200 - -ethereal (0.9.9-2) unstable; urgency=low - - * Updated config.guess and config.sub to work on mips and mipsel - architectures (manually then through the patch provided by - Martin Godisch). (closes: #178701) - * Update to packet-socks.c - * debian/control: ethereal-dev now depends upon omniidl | omniidl4 - (closes: #182620) - * idl2eth no longer needs PYTHONPATH to be set explicitely. - (closes: #182621) - * debian/ethereal-dev.header-files: included config.h and reassemble.h since - they seem necessary. (closes: #183625) - * Thanks to W. Borgert for bug reporting. - - -- Frederic Peters Fri, 7 Mar 2003 22:52:27 +0000 - -ethereal (0.9.9-1) unstable; urgency=low - - * New upstream release. - * debian/control: Tightened ethereal-common dependencies. - (closes: #172861, #176236, #178027) - - -- Frederic Peters Fri, 24 Jan 2003 14:38:53 +0100 - -ethereal (0.9.8-3) unstable; urgency=low - - * debian/control: added versioned dependency between (t)ethereal and - ethereal-common to get the plug-ins. (closes: #172861) - - -- Frederic Peters Fri, 13 Dec 2002 10:39:27 +0100 - -ethereal (0.9.8-2) unstable; urgency=low - - * Updated config.sub and config.guess with the ones from autotools-dev - (closes: #172407) - - -- Frederic Peters Tue, 10 Dec 2002 09:52:45 +0100 - -ethereal (0.9.8-1) unstable; urgency=low - - * New upstream release. - * This added (some) support for counting IPv6 packets during capture. - (closes: #164472) - * 0.9.7 fixed the LMP dissector. (closes: #163513) - - -- Frederic Peters Mon, 9 Dec 2002 10:00:51 +0100 - -ethereal (0.9.7-2) unstable; urgency=low - - * debian/control: added libgtk2.0-dev to build depends. - * debian/control: removed libsnmp-dev from build depends (ethereal is - compiled without SNMP support since it would link against libssl) - (the build-dep caused failure to build on architectures where perl 5.8 - wasn't ready (dependency on libsnmp-perl)) - * debian/control: added python, automake and autoconf to build depends. - * debian/rules: creating aclocal-missing directory on build. - (those bugs closes: #163443) (patch by LaMont Jones) - * debian/rules: install Python files to 2.2 directory, not 2.1 - * debian/ethereal-dev.postinst: fixed Python version (closes: #163153) - - -- Frederic Peters Mon, 7 Oct 2002 15:06:06 +0200 - -ethereal (0.9.7-1) unstable; urgency=low - - * New upstream release. (closes: #162972) - * debian/copyright: include upstream author name. (closes: #151015) - - -- Frederic Peters Tue, 1 Oct 2002 16:20:45 +0200 - -ethereal (0.9.6-2) unstable; urgency=low - - * debian/control: changed Python dep to >= 2.2 and << 2.3 since 2.2 is now - the default version in sid. - - -- Frederic Peters Sat, 14 Sep 2002 23:29:23 +0200 - -ethereal (0.9.6-1) unstable; urgency=low - - * New upstream release. - * Fixes security issue in the ISIS protocol dissector (susceptible to - buffer overflow). - (see http://www.ethereal.com/appnotes/enpa-sa-00006.html) - * Add missing header files (packet-tcp.h and packet-tpkt.h) to ethereal-dev - (closes: #158808) - * Add default PYTHONPATH to idl2eth (closes: #158909) - - -- Frederic Peters Mon, 2 Sep 2002 10:13:06 +0200 - -ethereal (0.9.5-3) unstable; urgency=low - - * Rebuilt with new libpcap0.7. (closes: #156206) - - -- Frederic Peters Sat, 10 Aug 2002 19:25:29 +0200 - -ethereal (0.9.5-2) unstable; urgency=low - - * Do not run libtoolize since it creates a bogus libtool file. - - -- Frederic Peters Mon, 8 Jul 2002 16:07:00 +0200 - -ethereal (0.9.5-1) unstable; urgency=low - - * New upstream release. - * Fixes several security issues. - (http://www.ethereal.com/appnotes/enpa-sa-00005.html) - - -- Frederic Peters Sat, 29 Jun 2002 19:13:30 +0200 - -ethereal (0.9.4-1) unstable; urgency=medium - - * New upstream release. - * Fixes four security issues. (closes: #147595) - (http://www.ethereal.com/appnotes/enpa-sa-00004.html) - - -- Frederic Peters Mon, 20 May 2002 01:10:21 +0200 - -ethereal (0.9.3-1) unstable; urgency=medium - - * New upstream release - * Fixes ASN.1 zero-length g_malloc that could lead to security problems. - (see http://www.ethereal.com/appnotes/enpa-sa-00003.html) - - -- Frederic Peters Sun, 31 Mar 2002 21:45:11 +0200 - -ethereal (0.9.2-3) unstable; urgency=low - - * debian/rules: fixed typo that could have caused snmp not to be built. - (closes: #140147) This would happen if 1) built from the CVS tree and 2) - built on a system without libsnmp-dev ("impossible" since we build-depend - on it). Anyway it is fixed for correctness. - - -- Frederic Peters Wed, 27 Mar 2002 14:00:31 +0100 - -ethereal (0.9.2-2) unstable; urgency=low - - * Added libwiretap.a to ethereal-dev (closes: #137971) - - -- Frederic Peters Tue, 12 Mar 2002 11:59:04 +0100 - -ethereal (0.9.2-1) unstable; urgency=low - - * New upstream release. - - -- Frederic Peters Tue, 5 Mar 2002 10:30:24 +0100 - -ethereal (0.9.1-8) unstable; urgency=low - - * debian/control: changed ethereal-dev section to devel. - - -- Frederic Peters Mon, 25 Feb 2002 14:50:49 +0100 - -ethereal (0.9.1-7) unstable; urgency=low - - * debian/control: changed ethereal-dev Depends line to use omniidl-python - and no omniorb. - - -- Frederic Peters Mon, 25 Feb 2002 13:47:42 +0100 - -ethereal (0.9.1-6) unstable; urgency=low - - * debian/control: fix Depends line for ethereal-dev (added libpcap-dev) - * idl2eth: added PYTHONPATH so that it runs. - - -- Frederic Peters Mon, 18 Feb 2002 11:48:01 +0100 - -ethereal (0.9.1-5) unstable; urgency=low - - * debian/rules: added --disable-ssl so that ethereal is not built with - ssl support and may be uploaded to main. (closes: #134273) - - -- Frederic Peters Mon, 18 Feb 2002 09:33:30 +0100 - -ethereal (0.9.1-4) unstable; urgency=low - - * debian/rules: added forgotten header files to ethereal-dev. - (really closes: #105916) - - -- Frederic Peters Fri, 15 Feb 2002 10:12:15 +0100 - -ethereal (0.9.1-3) unstable; urgency=low - - * debian/rules: after the quick and dirty repackaging of 0.9.1-1 this one - should be much better: 4 packages: ethereal-common, ethereal, tethereal - and etherel-dev (last three depending on ethereal-common). - This should address Christian Kurz remarks. - (closes: #133798, #133796, #133806) - This should also please W. Borgert. (closes: #105916) - - -- Frederic Peters Wed, 13 Feb 2002 20:36:12 +0100 - -ethereal (0.9.1-2) unstable; urgency=low - - * debian/control: fixed typo in tethereal description (closes: #133019) - - -- Frederic Peters Fri, 8 Feb 2002 23:55:49 +0100 - -ethereal (0.9.1-1) unstable; urgency=low - - * New upstream release. - * Fixed protocol hierarchy display (closes: #131676) - * It is possible to see TOS fields instead of DS fields in IP header. - (option in preferences dialog) (closes: #121046) - * debian/rules: totally revamped build process: create an additional - tethereal package that doesn't depend on GTK+ (closes: #103488) - It is not yet perfect but I'm working on it... - - -- Frederic Peters Mon, 28 Jan 2002 18:25:25 +0100 - -ethereal (0.9.0-1) unstable; urgency=low - - * New upstream release. - * Upstream fixed SNMP bugs (closes: #114361, #119580) - * Upstream fixed Sender->Receiver bug (closes: #112327) - * debian/copyright: fixed 'license' spelling. - * debian/rules: fixed 'clean' target to remove temporary files. - * debian/rules: moved $sysconfdir to /usr/share/ethereal since $sysconfdir - is not used here to store config files. (closes: #127638) - - -- Frederic Peters Thu, 3 Jan 2002 19:43:18 +0100 - -ethereal (0.8.20-1) unstable; urgency=low - - * New upstream release. - - -- Frederic Peters Fri, 19 Oct 2001 10:49:35 +0200 - -ethereal (0.8.19-2) unstable; urgency=low - - * debian/rules: added call to libtoolize so that it compiles on hppa. - (closes: #108662) - - -- Frederic Peters Mon, 17 Sep 2001 14:23:34 +0200 - -ethereal (0.8.19-1) unstable; urgency=low - - * New upstream release. - * debian/control: improved description of package. (closes: #104744) - - -- Frederic Peters Sat, 14 Jul 2001 11:57:12 +0200 - -ethereal (0.8.17-1) unstable; urgency=low - - * New upstream release. - - -- Frederic Peters Fri, 13 Apr 2001 13:33:35 +0200 - -ethereal (0.8.16-1) unstable; urgency=low - - * New upstream release. - - -- Frederic Peters Thu, 8 Mar 2001 09:07:34 +0100 - -ethereal (0.8.15-2) unstable; urgency=low - - * Rebuilt against libsnmp4.2 (closes: #83720) - * It is possible to not go in promiscuous mode (-p) (actually it was for - some time...) (closes: #34376) - - -- Frederic Peters Sat, 27 Jan 2001 13:39:05 +0100 - -ethereal (0.8.15-1) unstable; urgency=low - - * New upstream release. - - -- Frederic Peters Sat, 13 Jan 2001 19:36:26 +0100 - -ethereal (0.8.14-2) unstable; urgency=low - - * Fix for the socks dissector. (closes: #81164) - (patch by Jeff Foster ) - - -- Frederic Peters Thu, 11 Jan 2001 00:27:02 +0100 - -ethereal (0.8.14-1) unstable; urgency=low - - * New upstream release. - * Officially fixes the buffer overflow exploit mentioned below (as well - as other possible ones) - - -- Frederic Peters Tue, 21 Nov 2000 22:48:16 +0100 - -ethereal (0.8.13-3) unstable; urgency=low - - * Fixed possible buffer overflow exploit in packet-afs.c (I could not - reproduce it so I don't know if my fix really works, please test it) - (exploit is on http://www.hacksware.com) - - -- Frederic Peters Tue, 21 Nov 2000 22:47:59 +0100 - -ethereal (0.8.13-2) unstable; urgency=low - - * Rebuilt against XFree86 4.0 libs (now that I'm allowed to...) - * Rebuilt against zlibg1 1.1.13-1 that has a correct shlibs file - (closes: #76533, #76552) - - -- Frederic Peters Fri, 10 Nov 2000 17:39:40 +0100 - -ethereal (0.8.13-1) unstable; urgency=low - - * New upstream release. - - -- Frederic Peters Sun, 29 Oct 2000 23:58:38 +0100 - -ethereal (0.8.12-1) unstable; urgency=low - - * New upstream release. - * Patch for SRVLOC frames has been applied upstrem. - - -- Frederic Peters Mon, 18 Sep 2000 10:22:27 +0200 - -ethereal (0.8.11-1) unstable; urgency=low - - * New upstream release. - * Applied patch to fix hang on some SRVLOC frames (closes: #68024) - - -- Frederic Peters Thu, 10 Aug 2000 21:06:52 +0200 - -ethereal (0.8.10-1) unstable; urgency=low - - * New upstream release. - * Added debhelper to Build-depends (closes: #66391) - - -- Frederic Peters Tue, 11 Jul 2000 22:36:45 +0200 - -ethereal (0.8.9-2) unstable; urgency=low - - * Updated Build-depends to match libsnmp (closes: #66018) (it's the same - entry as for 0.8.7-2; I need some sleep) - - -- Frederic Peters Thu, 22 Jun 2000 23:59:29 +0200 - -ethereal (0.8.9-1) unstable; urgency=low - - * New upstream release. - - -- Frederic Peters Tue, 20 Jun 2000 14:17:00 +0200 - -ethereal (0.8.8-1) unstable; urgency=low - - * New upstream release. - - -- Frederic Peters Wed, 10 May 2000 17:20:36 +0200 - -ethereal (0.8.7-2) unstable; urgency=low - - * Updated Build-depends to match libsnmp (closes: #63753) - - -- Frederic Peters Mon, 8 May 2000 19:02:29 +0200 - -ethereal (0.8.7-1) unstable; urgency=low - - * New upstream release. - - -- Frederic Peters Mon, 17 Apr 2000 18:41:21 +0200 - -ethereal (0.8.6-1) unstable; urgency=low - - * New upstream release. - * Linked against libsnmp4.1 (closes: #62324) - - -- Frederic Peters Fri, 14 Apr 2000 19:45:53 +0200 - -ethereal (0.8.4-1) unstable; urgency=low - - * New upstream release. - * Applied fix for correct decapsulation of PPP frames (closes: #59663) - (patch provided by Thomas Quinot ) - - -- Frederic Peters Sun, 5 Mar 2000 20:04:11 +0100 - -ethereal (0.8.3-1) unstable; urgency=low - - * New upstream release. - * Checked PPTP problems (fix was introduced in 0.8.2) (closes: #55347) - - -- Frederic Peters Sat, 5 Feb 2000 23:51:26 +0100 - -ethereal (0.8.2-2) unstable; urgency=low - - * debian/control: fixed Build-Depends line (closes: #56707) - - -- Frederic Peters Mon, 31 Jan 2000 19:29:21 +0100 - -ethereal (0.8.2-1) unstable; urgency=low - - * New upstream release. - - -- Frederic Peters Sat, 29 Jan 2000 01:53:50 +0100 - -ethereal (0.8.1-2) unstable; urgency=low - - * debian/control: added Build-Depends - * debian/control: modified description to match the README file - * debian/rules: added --disable-static to ./configure - * compiled with SNMP support (through libsnmp) - - -- Frederic Peters Thu, 20 Jan 2000 18:30:40 +0100 - -ethereal (0.8.1-1) unstable; urgency=low - - * New upstream release. - * Fixed duplicate manpage installation. (closes: #55438) - - -- Frederic Peters Wed, 19 Jan 2000 09:29:56 +0100 - -ethereal (0.8.0-1) unstable; urgency=low - - * New upstream release. - - -- Frederic Peters Sat, 1 Jan 2000 23:50:44 +0100 - -ethereal (0.7.9-1) unstable; urgency=low - - * New upstream release. - - -- Frederic Peters Sat, 25 Dec 1999 00:55:00 +0100 - -ethereal (0.7.7-1) unstable; urgency=low - - * New upstream release. - - -- Frederic Peters Fri, 29 Oct 1999 14:09:01 +0200 - -ethereal (0.7.3-2) unstable; urgency=low - - * Fixed debian/rules to work with the new debhelper that create FHS compliant - packages. (Fixes: #44613) - - -- Frederic Peters Thu, 9 Sep 1999 18:29:12 +0200 - -ethereal (0.7.3-1) unstable; urgency=low - - * New upstream release. - - -- Frederic Peters Sun, 5 Sep 1999 20:06:10 +0200 - -ethereal (0.7.2-1) unstable; urgency=low - - * New upstream release. - - -- Frederic Peters Sat, 14 Aug 1999 18:32:28 +0200 - -ethereal (0.7.1-1) unstable; urgency=low - - * New upstream release. - - -- Frederic Peters Sat, 7 Aug 1999 16:29:03 +0200 - -ethereal (0.6.3-2) unstable; urgency=low - - * Renamed NEWS to changelog since this is the upstream ChangeLog - (fixes bug #41908) - - -- Frederic Peters Tue, 27 Jul 1999 20:19:28 +0200 - -ethereal (0.6.3-1) unstable; urgency=low - - * New upstream release. - * Moved directories to comply with FHS (and Standards 3.0.0) - - -- Frederic Peters Sat, 24 Jul 1999 00:36:46 +0200 - -ethereal (0.6.2-1) unstable; urgency=low - - * New upstream release. - - -- Frederic Peters Tue, 25 May 1999 16:47:08 +0200 - -ethereal (0.6.1-1) unstable; urgency=low - - * New upstream release. - - -- Frederic Peters Sun, 2 May 1999 23:30:38 +0200 - -ethereal (0.5.1-3) unstable; urgency=low - - * Fixed package building (Bug#35657 (report and patch from bartw@xs4all.nl) - - -- Frederic Peters Sat, 10 Apr 1999 19:20:29 +0200 - -ethereal (0.5.1-2) unstable; urgency=low - - * Compiled against libgtk1.2 - * Moved /usr/etc/manuf to /etc/manuf (it's now lintian clean) - - -- Frederic Peters Mon, 8 Mar 1999 22:33:04 +0100 - -ethereal (0.5.1-1) unstable; urgency=low - - * New upstream release. - - -- Frederic Peters Sat, 9 Jan 1999 16:51:28 +0100 - -ethereal (0.5.0-2) unstable; urgency=low - - * Fixed package building (Bug#30110) - - -- Frederic Peters Thu, 3 Dec 1998 13:15:53 +0100 - -ethereal (0.5.0-1) unstable; urgency=low - - * New upstream release. - - -- Frederic Peters Tue, 24 Nov 1998 16:04:15 +0100 - -ethereal (0.4.0-1) unstable; urgency=low - - * New upstream release. - - -- Frederic Peters Sat, 17 Oct 1998 17:20:01 +0200 - -ethereal (0.3.17-1) unstable; urgency=low - - * New upstream release. - - -- Frederic Peters Tue, 29 Sep 1998 20:01:11 +0200 - -ethereal (0.3.16-2) unstable; urgency=low - - * New versions aren't just for Alpha people :) (fixes #26914) - - -- Frederic Peters Fri, 25 Sep 1998 17:03:39 +0200 - -ethereal (0.3.16-1) unstable; urgency=low - - * New upstream version - - -- Frederic Peters Sat, 19 Sep 1998 10:55:48 +0200 - -ethereal (0.3.15-1.1) unstable; urgency=low - - * non-maintainer upload for Alpha - * GTK cflags ans library flags were not passed to the compiler. - - -- Paul Slootman Mon, 21 Sep 1998 22:49:32 +0200 - -ethereal (0.3.15-1) unstable; urgency=low - - * Initial Release. - - -- Frederic Peters Sun, 13 Sep 1998 23:05:47 +0200 + * Self-made package + -- Wireshark Self-made package Mon, 31 Mar 2008 00:00:00 +0000 diff --git a/debian/compat b/debian/compat index b8626c4cff..1e8b314962 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -4 +6 diff --git a/debian/control b/debian/control index d1221d9fbb..99353c3364 100644 --- a/debian/control +++ b/debian/control @@ -1,9 +1,11 @@ Source: wireshark Section: net Priority: optional -Maintainer: Frederic Peters -Standards-Version: 3.7.2.0 -Build-Depends: libgtk2.0-dev (>=2.4.0-0), libpcap0.8-dev, flex, libz-dev, dpatch, debhelper (>= 5.0.37.2), libtool, python, automake1.9, autoconf, autotools-dev, libadns1-dev, xsltproc, docbook-xsl (>= 1.64.1.0-0), libpcre3-dev, libcap-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], bison, libgnutls-dev, python-support (>= 0.3), libportaudio-dev | portaudio19-dev, libkrb5-dev +Maintainer: Wireshark Self-made package +X-Orig-Maintainer: Frederic Peters +X-Orig-Uploaders: Joost Yervante Damad +Standards-Version: 3.7.3.0 +Build-Depends: libgtk2.0-dev (>=2.4.0-0), libpcap0.8-dev, flex, libz-dev, dpatch, debhelper (>= 6), libtool, python, automake1.9, autoconf, autotools-dev, libadns1-dev, xsltproc, docbook-xsl (>= 1.64.1.0-0), libpcre3-dev, libcap-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], bison, libgnutls-dev, python-support (>= 0.3), portaudio19-dev, libkrb5-dev, liblua5.1-0-dev, libsmi2-dev Build-Conflicts: libsnmp4.2-dev, libsnmp-dev XS-Python-Version: all @@ -66,56 +68,3 @@ Description: network traffic analyser (development tools) This package provides idl2wrs and other necessary files to develop new packet dissectors. -Package: ethereal-common -Architecture: any -Depends: wireshark-common (= ${binary:Version}) -Description: dummy upgrade package for ethereal -> wireshark - Wireshark is a network traffic analyzer, or "sniffer", for Unix and - Unix-like operating systems. A sniffer is a tool used to capture - packets off the wire. Wireshark decodes numerous protocols (too many - to list). - . - It was previously named ethereal. This is a transitional package - so ethereal users get wireshark on upgrades. This package handles - ethereal-common -> wireshark-common. It can be safely removed. - -Package: ethereal-dev -Architecture: any -Section: devel -Depends: wireshark-dev (= ${binary:Version}) -Description: dummy upgrade package for ethereal -> wireshark - Wireshark is a network traffic analyzer, or "sniffer", for Unix and - Unix-like operating systems. A sniffer is a tool used to capture - packets off the wire. Wireshark decodes numerous protocols (too many - to list). - . - It was previously named ethereal. This is a transitional package - so ethereal users get wireshark on upgrades. This package handles - ethereal-dev -> wireshark-dev. It can be safely removed. - -Package: ethereal -Architecture: any -Depends: wireshark (= ${binary:Version}) -Description: dummy upgrade package for ethereal -> wireshark - Wireshark is a network traffic analyzer, or "sniffer", for Unix and - Unix-like operating systems. A sniffer is a tool used to capture - packets off the wire. Wireshark decodes numerous protocols (too many - to list). - . - It was previously named ethereal. This is a transitional package - so ethereal users get wireshark on upgrades. This package handles - ethereal -> wireshark. It can be safely removed. - -Package: tethereal -Architecture: any -Depends: tshark (= ${binary:Version}) -Description: dummy upgrade package for ethereal -> wireshark - Wireshark is a network traffic analyzer, or "sniffer", for Unix and - Unix-like operating systems. A sniffer is a tool used to capture - packets off the wire. Wireshark decodes numerous protocols (too many - to list). - . - It was previously named ethereal. This is a transitional package - so ethereal users get wireshark on upgrades. This package handles - tethereal -> tshark. It can be safely removed. - diff --git a/debian/docs b/debian/docs deleted file mode 100644 index b51189f9cd..0000000000 --- a/debian/docs +++ /dev/null @@ -1 +0,0 @@ -README AUTHORS README.linux diff --git a/debian/headers-check.c b/debian/headers-check.c new file mode 100644 index 0000000000..2ebaeae98b --- /dev/null +++ b/debian/headers-check.c @@ -0,0 +1,4 @@ +#include +#include +#include + diff --git a/debian/menu b/debian/menu deleted file mode 100644 index a48756da28..0000000000 --- a/debian/menu +++ /dev/null @@ -1,2 +0,0 @@ -?package(ethereal):needs=X11 section=Apps/Net title="Ethereal" \ - command="/usr/bin/ethereal" diff --git a/debian/patches/00list b/debian/patches/00list index 8e133f2046..9149b587b8 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1,10 +1,14 @@ -01_idl2deb -02_asn2deb +#01_idl2deb +#02_asn2deb 03_preferences -04_drop-capabilities -05_plugin-libdir -06_giop-buffer -07_gcc4 -08_wireshark-desktop-menu -09_idl2wrs -10_wireshark_gen +#04_drop-capabilities +#05_plugin-libdir +#06_giop-buffer +#07_gcc4 +#08_wireshark-desktop-menu +#09_idl2wrs +#10_wireshark_gen +#14_disable-cmip +#15_sensitive_open +#16_licence_about_location +#17_clique_rm_support diff --git a/debian/patches/01_idl2deb.dpatch b/debian/patches/01_idl2deb.dpatch deleted file mode 100644 index ed9931c4c7..0000000000 --- a/debian/patches/01_idl2deb.dpatch +++ /dev/null @@ -1,424 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 01_idl2deb.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: idl2deb - create Debian packages from idl2wrs modules - -@DPATCH@ -diff -urNad --exclude=CVS --exclude=.svn ./idl2deb /tmp/dpep-work.K2bQz4/wireshark-0.10.11/idl2deb ---- ./idl2deb 1970-01-01 01:00:00.000000000 +0100 -+++ /tmp/dpep-work.K2bQz4/wireshark-0.10.11/idl2deb 2005-07-17 19:35:08.000000000 +0200 -@@ -0,0 +1,252 @@ -+#!/usr/bin/env python -+ -+# idl2deb - quick hack by W. Borgert to create -+# Debian GNU/Linux packages from idl2wrs modules for Wireshark. -+# Copyright 2003, W. Borgert -+ -+# Makefile.am and configure.ac code by: -+# Copyright 2001, Ericsson Inc. -+# Frank Singleton -+# -+# Wireshark - Network traffic analyzer -+# By Gerald Combs -+# Copyright 1998 Gerald Combs -+ -+# This program is free software; you can redistribute it and/or -+# modify it under the terms of the GNU General Public License -+# as published by the Free Software Foundation; either version 2 -+# of the License, or (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ -+import getopt, os, string, sys, time -+ -+scriptinfo = """idl2deb version 2003-10-03 -+Copyright 2003, W. Borgert -+Free software, released under the terms of the GPL.""" -+ -+options = {'dbopts': "", -+ 'email': "invalid@invalid.invalid", -+ 'help': 0, -+ 'idl': None, -+ 'name': "No Name", -+ 'preserve': 0, -+ 'version': 0} -+ -+def bootstrap(): -+ """Generate Makefile.in and configure script.""" -+ os.system("aclocal") -+ os.system("autoconf") -+ os.system("libtoolize --automake --copy --force") -+ os.system("automake --add-missing --copy --foreign") -+ -+def create_file(filename, content, mode = None): -+ """Create a file with given content.""" -+ global options -+ if options['preserve'] and os.path.isfile(filename): -+ return -+ f = open(filename, 'w') -+ f.write(content) -+ f.close() -+ if mode: -+ os.chmod(filename, mode) -+ -+def create_files(version, deb, email, idl, name, iso, rfc): -+ """Create all files for the .deb build process.""" -+ base = idl.lower()[:-4] -+ create_file("Makefile.am", """# -+ -+plugindir = @plugindir@ -+ -+plugin_LTLIBRARIES = %s.la -+%s_la_SOURCES = packet-%s.c -+%s_la_LDFLAGS = -module -avoid-version -+ -+GLIB_CFLAGS = `pkg-config --cflags glib-2.0` -+GLIB_LIBS = `pkg-config --libs glib-2.0` -+BUILT_SOURCES = packet-%s.c -+INCLUDES = -DHAVE_CONFIG -DHAVE_SYS_TYPES_H -DHAVE_SYS_TIME_H \\ -+ -DHAVE_STDARG_H -D_U_=\"__attribute__((unused))\" \\ -+ -I/usr/include/wireshark -DWS_VAR_IMPORT=extern $(GLIB_CFLAGS) -+LDADD = $(GLIB_LIBS) -+ -+# Libs must be cleared, or else libtool won't create a shared module. -+# If your module needs to be linked against any particular libraries, -+# add them here. -+LIBS = -+ -+%s_la_DEPENDENCIES = packet-%s-static.o -+ -+packet-%s-static.o: packet-%s.c -+ $(LTCOMPILE) -c -o packet-%s-static.o \\ -+ -D__WIRESHARK_STATIC__ packet-%s.c -+ -+packet-%s.c: """ % ((base,) * 12) + idl + """ -+ $(IDL2WRS) $< > $@ -+""") -+ -+ create_file("configure.ac", """AC_INIT(%s, 1.0) -+AC_PROG_LIBTOOL -+AM_INIT_AUTOMAKE -+AM_MAINTAINER_MODE -+AC_PROG_CC -+AC_STDC_HEADERS -+AC_PROG_INSTALL -+AC_SUBST(CFLAGS) -+AC_SUBST(CPPFLAGS) -+AC_SUBST(LDFLAGS) -+PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.2.2) -+AC_SUBST(GLIB_CFLAGS) -+AC_SUBST(GLIB_LIBS) -+IDL2WRS=\"`type -p idl2wrs`\" -+AC_SUBST(IDL2WRS) -+WIRESHARK_VERSION=\"%s\" -+plugindir=\"$libdir/wireshark/plugins/$WIRESHARK_VERSION\" -+AC_SUBST(plugindir) -+AC_OUTPUT([Makefile]) -+""" % (base, version)) -+ -+ if not os.path.isdir("debian"): -+ os.mkdir("debian") -+ -+ create_file("debian/rules", """#!/usr/bin/make -f -+ -+include /usr/share/cdbs/1/rules/debhelper.mk -+include /usr/share/cdbs/1/class/autotools.mk -+ -+PREFIX=`pwd`/debian/wireshark-giop-%s -+ -+binary-post-install/wireshark-giop-%s:: -+ rm -f $(PREFIX)/usr/lib/wireshark/plugins/%s/*.a -+""" % (base, base, version), 0755) -+ -+ create_file("debian/control", """Source: wireshark-giop-%s -+Section: net -+Priority: optional -+Maintainer: %s <%s> -+Standards-Version: 3.6.1.0 -+Build-Depends: wireshark-dev, autotools-dev, debhelper, cdbs -+ -+Package: wireshark-giop-%s -+Architecture: any -+Depends: wireshark (= %s), ${shlibs:Depends} -+Description: GIOP dissector for CORBA interface %s -+ This package provides a dissector for GIOP (General Inter-ORB -+ Protocol) for the Wireshark protocol analyser. It decodes the CORBA -+ (Common Object Request Broker Architecture) interfaces described -+ in the IDL (Interface Definition Language) file '%s.idl'. -+""" % (base, name, email, base, deb, base, base)) -+ -+ create_file("debian/changelog", -+ """wireshark-giop-%s (0.0.1-1) unstable; urgency=low -+ -+ * Automatically created package. -+ -+ -- %s <%s> %s -+""" % (base, name, email, rfc + "\n (" + iso + ")")) -+ -+ create_file("debian/copyright", -+ """This package has been created automatically by idl2deb on -+%s for Debian GNU/Linux. -+ -+Wireshark: http://www.wireshark.org/ -+ -+Copyright: -+ -+GPL, as evidenced by existence of GPL license file \"COPYING\". -+(the GNU GPL may be viewed on Debian systems in -+/usr/share/common-licenses/GPL) -+""" % (iso)) -+ -+def get_wrs_version(): -+ """Detect version of wireshark-dev package.""" -+ deb = os.popen( -+ "dpkg-query -W --showformat='${Version}' wireshark-dev").read() -+ debv = string.find(deb, "-") -+ if debv == -1: debv = len(deb) -+ version = deb[string.find(deb, ":")+1:debv] -+ return version, deb -+ -+def get_time(): -+ """Detect current time and return ISO and RFC time string.""" -+ currenttime = time.gmtime() -+ return time.strftime("%Y-%m-%d %H:%M:%S +0000", currenttime), \ -+ time.strftime("%a, %d %b %Y %H:%M:%S +0000", currenttime) -+ -+def main(): -+ global options -+ process_opts(sys.argv) -+ iso, rfc = get_time() -+ version, deb = get_wrs_version() -+ create_files(version, deb, -+ options['email'], options['idl'], options['name'], -+ iso, rfc) -+ bootstrap() -+ os.system("dpkg-buildpackage " + options['dbopts']) -+ -+def process_opts(argv): -+ """Process command line options.""" -+ global options -+ try: -+ opts, args = getopt.getopt(argv[1:], "d:e:hi:n:pv", -+ ["dbopts=", -+ "email=", -+ "help", -+ "idl=", -+ "name=", -+ "preserve", -+ "version"]) -+ except getopt.GetoptError: -+ usage(argv[0]) -+ sys.exit(1) -+ for o, a in opts: -+ if o in ("-d", "--dbopts"): -+ options['dbopts'] = a -+ if o in ("-e", "--email"): -+ options['email'] = a -+ if o in ("-h", "--help"): -+ options['help'] = 1 -+ if o in ("-i", "--idl"): -+ options['idl'] = a -+ if o in ("-n", "--name"): -+ options['name'] = a -+ if o in ("-p", "--preserve"): -+ options['preserve'] = 1 -+ if o in ("-v", "--version"): -+ options['version'] = 1 -+ if options['help']: -+ usage(argv[0]) -+ sys.exit(0) -+ if options['version']: -+ print scriptinfo -+ sys.exit(0) -+ if not options['idl']: -+ print "mandatory IDL file parameter missing" -+ sys.exit(1) -+ if not os.access(options['idl'], os.R_OK): -+ print "IDL file not accessible" -+ sys.exit(1) -+ -+def usage(name): -+ """Print usage help.""" -+ print "Usage: " + name + " \n" + \ -+ "Parameters are\n" + \ -+ " --dbopts -d opts, options for dpkg-buildpackage\n" + \ -+ " --email -e address, use e-mail address\n" + \ -+ " --idl -i idlfile, IDL file to use (mandatory)\n" + \ -+ " --help -h, print help and exit\n" + \ -+ " --name -n name, use user name\n" + \ -+ " --preserve -p, do not overwrite files\n" + \ -+ " --version -v, print version and exit\n" + \ -+ "Example:\n" + \ -+ name + " -e me@foo.net -i bar.idl -n \"My Name\" " + \ -+ "-d \"-rfakeroot -uc -us\"" -+if __name__ == '__main__': -+ main() -diff -urNad --exclude=CVS --exclude=.svn ./idl2deb.dbk /tmp/dpep-work.K2bQz4/wireshark-0.10.11/idl2deb.dbk ---- ./idl2deb.dbk 1970-01-01 01:00:00.000000000 +0100 -+++ /tmp/dpep-work.K2bQz4/wireshark-0.10.11/idl2deb.dbk 2005-07-17 19:35:08.000000000 +0200 -@@ -0,0 +1,157 @@ -+ -+idl2deb"> -+ debacle@debian.org"> -+ -+ Debian GNU/Linux"> -+]> -+ -+ -+ -+
-+ &email; -+
-+ -+ W. -+ Borgert -+ -+ -+ 2003 -+ 2005 -+ &author; -+ -+ 2003-08-17 -+ -+ CORBA -+ IDL -+ Wireshark -+ -+ -+ -+ 2003-08-17 -+ 2003-08-17 -+ debacle -+ First version. -+ -+ -+ -+ -+ idl2deb -+ -+ 1 -+ -+ -+ idl2deb -+ -+ create a Debian package for CORBA monitoring from IDL -+ -+ -+ -+ &command; -+ -+ -+ -+ -+ -i idlfile -+ --idl=idlfile -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ Description -+ -+ This manual page documents briefly the -+ idl2deb command. -+ -+ &command; takes an CORBA IDL file as input and creates a -+ Debian package from it. The package contains a loadable module -+ for the wireshark network analyser. -+ -+ -+ Options -+ -+ -+ -+ -+ -+ -+ options for dpkg-buildpackage. -+ -+ -+ -+ -+ -+ -+ use e-mail address. -+ -+ -+ -+ -+ -+ -+ IDL file to use (mandatory). -+ -+ -+ -+ -+ -+ -+ -+ print help and exit. -+ -+ -+ -+ -+ -+ -+ use user name. -+ -+ -+ -+ -+ -+ -+ do not overwrite files. -+ -+ -+ -+ -+ -+ -+ print version and exit. -+ -+ -+ -+ -+ Example: -+ -+ /usr/bin/idl2deb -e me@foo.net -i bar.idl \ -+-n "My Name" -d "-rfakeroot -uc -us" -+ -+ -+ -+ See Also -+ -+ A lot of tools are used, which you have to -+ apt-get install: wireshark-dev, python, -+ cdbs, autotools-dev, debhelper, dpkg-dev. -+ -+ -+ -+ Copying -+ -+ This manual page was written by &author; &email; for -+ &debian; (but may be used by others). Permission is granted to -+ copy, distribute and/or modify this document under the terms of -+ the GNU General Public License, Version 2 or any later -+ version published by the Free Software Foundation. -+ -+ diff --git a/debian/patches/02_asn2deb.dpatch b/debian/patches/02_asn2deb.dpatch deleted file mode 100644 index 6ceff257ef..0000000000 --- a/debian/patches/02_asn2deb.dpatch +++ /dev/null @@ -1,392 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 02_asn2deb.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: asn2deb - create Debian packages from ASN.1 files - -@DPATCH@ -diff -urNad --exclude=CVS --exclude=.svn ./asn2deb /tmp/dpep-work.5BSR7A/wireshark-0.10.11/asn2deb ---- ./asn2deb 1970-01-01 01:00:00.000000000 +0100 -+++ /tmp/dpep-work.5BSR7A/wireshark-0.10.11/asn2deb 2005-07-17 19:37:02.000000000 +0200 -@@ -0,0 +1,219 @@ -+#!/usr/bin/env python -+ -+# asn2deb - quick hack by W. Borgert to create -+# Debian GNU/Linux packages from ASN.1 files for Wireshark. -+# Copyright 2004, W. Borgert -+ -+# ASN.1 module for Wireshark, use of snacc type table: -+# Copyright 2003, Matthijs Melchior -+# -+# Wireshark - Network traffic analyzer -+# By Gerald Combs -+# Copyright 1998 Gerald Combs -+ -+# This program is free software; you can redistribute it and/or -+# modify it under the terms of the GNU General Public License -+# as published by the Free Software Foundation; either version 2 -+# of the License, or (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ -+import getopt, os, string, sys, time -+ -+scriptinfo = """asn2deb version 2004-02-17 -+Copyright 2004, W. Borgert -+Free software, released under the terms of the GPL.""" -+ -+options = {'asn': None, -+ 'dbopts': "", -+ 'email': "invalid@invalid.invalid", -+ 'help': 0, -+ 'name': "No Name", -+ 'preserve': 0, -+ 'version': 0} -+ -+def bootstrap(): -+ """Generate Makefile.in and configure script.""" -+ os.system("aclocal-1.7") -+ os.system("autoconf") -+ os.system("automake-1.7 --add-missing --copy --foreign") -+ -+def create_file(filename, content, mode = None): -+ """Create a file with given content.""" -+ global options -+ if options['preserve'] and os.path.isfile(filename): -+ return -+ f = open(filename, 'w') -+ f.write(content) -+ f.close() -+ if mode: -+ os.chmod(filename, mode) -+ -+def create_files(version, deb, email, asn, name, iso, rfc): -+ """Create all files for the .deb build process.""" -+ base = asn.lower()[:-5] -+ create_file("Makefile.am", """# -+ -+BUILT_SOURCES = %s.tt -+asn1ttdir = $(datadir)/wireshark/asn1 -+asn1tt_DATA = %s.tt -+ -+%s.tt: """ % ((base,) * 3) + asn + """ -+ snacc -u /usr/include/snacc/asn1/asn-useful.asn1 -T $@ $< -+""") -+ -+ create_file("configure.ac", """AC_INIT(%s, 1.0) -+AM_INIT_AUTOMAKE -+AM_MAINTAINER_MODE -+AC_PROG_INSTALL -+SNACC=\"`type -p snacc`\" -+AC_SUBST(SNACC) -+dnl WIRESHARK_VERSION=\"%s\" -+dnl plugindir=\"$prefix/share/wireshark/asn.1\" -+dnl AC_SUBST(plugindir) -+AC_OUTPUT([Makefile]) -+""" % (base, version)) -+ -+ if not os.path.isdir("debian"): -+ os.mkdir("debian") -+ -+ create_file("debian/rules", """#!/usr/bin/make -f -+ -+include /usr/share/cdbs/1/rules/debhelper.mk -+include /usr/share/cdbs/1/class/autotools.mk -+ -+PREFIX=`pwd`/debian/wireshark-asn1-%s -+ -+binary-post-install/wireshark-asn1-%s:: -+ rm -f $(PREFIX)/usr/lib/wireshark/plugins/%s/*.a -+""" % (base, base, version), 0755) -+ -+ create_file("debian/control", """Source: wireshark-asn1-%s -+Section: net -+Priority: optional -+Maintainer: %s <%s> -+Standards-Version: 3.6.1.0 -+Build-Depends: snacc, autotools-dev, debhelper, cdbs -+ -+Package: wireshark-asn1-%s -+Architecture: all -+Depends: wireshark (= %s) -+Description: ASN.1/BER dissector for %s -+ This package provides a type table for decoding BER (Basic Encoding -+ Rules) data over TCP or UDP, described by an ASN.1 (Abstract Syntax -+ Notation 1) file '%s.asn1'. -+""" % (base, name, email, base, deb, base, base)) -+ -+ create_file("debian/changelog", -+ """wireshark-asn1-%s (0.0.1-1) unstable; urgency=low -+ -+ * Automatically created package. -+ -+ -- %s <%s> %s -+""" % (base, name, email, rfc + "\n (" + iso + ")")) -+ -+ create_file("debian/copyright", -+ """This package has been created automatically be asn2deb on -+%s for Debian GNU/Linux. -+ -+Wireshark: http://www.wireshark.com/ -+ -+Copyright: -+ -+GPL, as evidenced by existence of GPL license file \"COPYING\". -+(the GNU GPL may be viewed on Debian systems in -+/usr/share/common-licenses/GPL) -+""" % (iso)) -+ -+def get_wrs_version(): -+ """Detect version of wireshark-dev package.""" -+ deb = os.popen( -+ "dpkg-query -W --showformat='${Version}' wireshark-dev").read() -+ debv = string.find(deb, "-") -+ if debv == -1: debv = len(deb) -+ version = deb[string.find(deb, ":")+1:debv] -+ return version, deb -+ -+def get_time(): -+ """Detect current time and return ISO and RFC time string.""" -+ currenttime = time.gmtime() -+ return time.strftime("%Y-%m-%d %H:%M:%S +0000", currenttime), \ -+ time.strftime("%a, %d %b %Y %H:%M:%S +0000", currenttime) -+ -+def main(): -+ global options -+ process_opts(sys.argv) -+ iso, rfc = get_time() -+ version, deb = get_wrs_version() -+ create_files(version, deb, -+ options['email'], options['asn'], options['name'], -+ iso, rfc) -+ bootstrap() -+ os.system("dpkg-buildpackage " + options['dbopts']) -+ -+def process_opts(argv): -+ """Process command line options.""" -+ global options -+ try: -+ opts, args = getopt.getopt(argv[1:], "a:d:e:hn:pv", -+ ["asn=", -+ "dbopts=", -+ "email=", -+ "help", -+ "name=", -+ "preserve", -+ "version"]) -+ except getopt.GetoptError: -+ usage(argv[0]) -+ sys.exit(1) -+ for o, a in opts: -+ if o in ("-a", "--asn"): -+ options['asn'] = a -+ if o in ("-d", "--dbopts"): -+ options['dbopts'] = a -+ if o in ("-e", "--email"): -+ options['email'] = a -+ if o in ("-h", "--help"): -+ options['help'] = 1 -+ if o in ("-n", "--name"): -+ options['name'] = a -+ if o in ("-p", "--preserve"): -+ options['preserve'] = 1 -+ if o in ("-v", "--version"): -+ options['version'] = 1 -+ if options['help']: -+ usage(argv[0]) -+ sys.exit(0) -+ if options['version']: -+ print scriptinfo -+ sys.exit(0) -+ if not options['asn']: -+ print "mandatory ASN.1 file parameter missing" -+ sys.exit(1) -+ if not os.access(options['asn'], os.R_OK): -+ print "ASN.1 file not accessible" -+ sys.exit(1) -+ -+def usage(name): -+ """Print usage help.""" -+ print "Usage: " + name + " \n" + \ -+ "Parameters are\n" + \ -+ " --asn -a asn1file, ASN.1 file to use (mandatory)\n" + \ -+ " --dbopts -d opts, options for dpkg-buildpackage\n" + \ -+ " --email -e address, use e-mail address\n" + \ -+ " --help -h, print help and exit\n" + \ -+ " --name -n name, use user name\n" + \ -+ " --preserve -p, do not overwrite files\n" + \ -+ " --version -v, print version and exit\n" + \ -+ "Example:\n" + \ -+ name + " -e me@foo.net -a bar.asn1 -n \"My Name\" " + \ -+ "-d \"-rfakeroot -uc -us\"" -+if __name__ == '__main__': -+ main() -diff -urNad --exclude=CVS --exclude=.svn ./asn2deb.dbk /tmp/dpep-work.5BSR7A/wireshark-0.10.11/asn2deb.dbk ---- ./asn2deb.dbk 1970-01-01 01:00:00.000000000 +0100 -+++ /tmp/dpep-work.5BSR7A/wireshark-0.10.11/asn2deb.dbk 2005-07-17 19:37:02.000000000 +0200 -@@ -0,0 +1,158 @@ -+ -+asn2deb"> -+ debacle@debian.org"> -+ -+ Debian GNU/Linux"> -+]> -+ -+ -+ -+
-+ &email; -+
-+ -+ W. -+ Borgert -+ -+ -+ 2003 -+ 2005 -+ &author; -+ -+ 2004-02-18 -+ -+ ASN.1 -+ BER -+ Wireshark -+ -+ -+ -+ 1 -+ 2004-02-18 -+ debacle -+ First version. -+ -+ -+ -+ -+ asn2deb -+ -+ 1 -+ -+ -+ asn2deb -+ -+ create a Debian package for BER monitoring from ASN.1 -+ -+ -+ -+ &command; -+ -a ASN.1 file -+ --asn=ASN.1 file -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ Description -+ -+ This manual page documents briefly the -+ asn2deb command. -+ -+ &command; takes an ASN.1 file as input and creates a Debian -+ package from it. The package contains a loadable type table file -+ for the wireshark network analyser. The type table is generated by -+ the ASN.1 compiler snacc. -+ -+ -+ Options -+ -+ -+ -+ -+ -+ -+ ASN.1 file to use (mandatory). -+ -+ -+ -+ -+ -+ -+ options for dpkg-buildpackage. -+ -+ -+ -+ -+ -+ -+ use e-mail address. -+ -+ -+ -+ -+ -+ -+ -+ print help and exit. -+ -+ -+ -+ -+ -+ -+ use user name. -+ -+ -+ -+ -+ -+ -+ do not overwrite files. -+ -+ -+ -+ -+ -+ -+ print version and exit. -+ -+ -+ -+ -+ Example: -+ -+ /usr/bin/asn2deb -e me@foo.net -a bar.asn1 \ -+-n "My Name" -d "-rfakeroot -uc -us" -+ -+ -+ -+ See Also -+ -+ A lot of tools are used, which you have to -+ apt-get install: wireshark-dev, python, -+ cdbs, autotools-dev, debhelper, dpkg-dev, snacc. -+ -+ -+ -+ Copying -+ -+ This manual page was written by &author; &email; for -+ &debian; (but may be used by others). Permission is granted to -+ copy, distribute and/or modify this document under the terms of -+ the GNU General Public License, Version 2 or any later -+ version published by the Free Software Foundation. -+ -+ diff --git a/debian/patches/03_preferences.dpatch b/debian/patches/03_preferences.dpatch index 43efafc5a9..6cc0183ff6 100644 --- a/debian/patches/03_preferences.dpatch +++ b/debian/patches/03_preferences.dpatch @@ -1,26 +1,19 @@ #! /bin/sh /usr/share/dpatch/dpatch-run -## 03_preferences.dpatch by +## 03_preferences.dpatch by ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: use Debian sensible-browser @DPATCH@ -diff -urNad wireshark-0.10.13~/configure.in wireshark-0.10.13/configure.in ---- wireshark-0.10.13~/configure.in 2005-12-08 12:47:00.000000000 +0100 -+++ wireshark-0.10.13/configure.in 2005-12-08 12:53:33.000000000 +0100 -@@ -38,12 +38,12 @@ - # - AC_MSG_ERROR(I couldn't find pod2html; make sure it's installed and in your path) - fi --AC_PATH_PROG(HTML_VIEWER, htmlview) -+AC_PATH_PROG(HTML_VIEWER, sensible-browser) - if test "x$HTML_VIEWER" = x - then -- AC_DEFINE_UNQUOTED(HTML_VIEWER, "mozilla", [HTML viewer, e.g. mozilla]) -+ AC_DEFINE_UNQUOTED(HTML_VIEWER, "sensible-browser", [HTML viewer, e.g. sensible-browser]) - else -- AC_DEFINE_UNQUOTED(HTML_VIEWER, "htmlview", [HTML viewer, e.g. mozilla]) -+ AC_DEFINE_UNQUOTED(HTML_VIEWER, "sensible-browser", [HTML viewer, e.g. mozilla]) - fi - - AC_PATH_PROG(LEX, flex) +diff -urNad wireshark-0.99.7~pre1~/epan/prefs.c wireshark-0.99.7~pre1/epan/prefs.c +--- wireshark-0.99.7~pre1~/epan/prefs.c 2007-11-22 17:57:25.000000000 +0100 ++++ wireshark-0.99.7~pre1/epan/prefs.c 2007-11-22 18:04:50.555226510 +0100 +@@ -1198,7 +1198,7 @@ + prefs.gui_ask_unsaved = TRUE; + prefs.gui_find_wrap = TRUE; + prefs.gui_use_pref_save = FALSE; +- prefs.gui_webbrowser = g_strdup(HTML_VIEWER " %s"); ++ prefs.gui_webbrowser = g_strdup("sensible-browser %s"); + prefs.gui_window_title = g_strdup(""); + prefs.gui_layout_type = layout_type_5; + prefs.gui_layout_content_1 = layout_pane_content_plist; diff --git a/debian/patches/04_drop-capabilities.dpatch b/debian/patches/04_drop-capabilities.dpatch deleted file mode 100644 index b11f6fea9e..0000000000 --- a/debian/patches/04_drop-capabilities.dpatch +++ /dev/null @@ -1,170 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 04_drop-capabilities.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Drop all capabilities but CAP_NET_RAW - -@DPATCH@ -diff -urNad wireshark-0.99.4/configure.in /tmp/dpep.4XA51P/wireshark-0.99.4/configure.in ---- wireshark-0.99.4/configure.in 2006-11-01 10:29:08.241544023 +0100 -+++ /tmp/dpep.4XA51P/wireshark-0.99.4/configure.in 2006-11-01 10:29:56.756554526 +0100 -@@ -869,6 +869,47 @@ - fi - - -+dnl libcap check -+AC_MSG_CHECKING(whether to use libcap to improve security) -+ -+AC_ARG_WITH(cap, -+[ --with-cap[[=DIR]] use libcap (located in directory DIR, if supplied) to improve security. [[default=yes, if available]]], -+[ -+ if test $withval = no -+ then -+ want_cap=no -+ elif test $withval = yes -+ then -+ want_cap=yes -+ else -+ want_cap=yes -+ cap_dir=$withval -+ fi -+],[ -+ # -+ # Use libcap if it's present, otherwise don't. -+ # -+ want_cap=ifavailable -+ cap_dir= -+]) -+if test "x$want_cap" = "xno" ; then -+ AC_MSG_RESULT(no) -+ cap_message="no (disabled by explicit request)" -+else -+ AC_MSG_RESULT(yes) -+ AC_CHECK_LIB(cap, cap_init, [ -+ AC_DEFINE(HAVE_LIBCAP, 1, [ -+ Define if libcap is available to restrict process capabilities -+ ]) -+ LIBS="$LIBS -lcap" -+ cap_message="yes" -+ ], [ -+ AC_MSG_WARN([libcap check failed]) -+ cap_message="no (check failed)" -+ ]) -+fi -+ -+ - dnl Check if wireshark should be installed setuid - AC_ARG_ENABLE(setuid-install, - [ --enable-setuid-install install wireshark as setuid. DANGEROUS!!! [default=no]],enable_setuid_install=$enableval,enable_setuid_install=no) -@@ -1480,3 +1521,4 @@ - echo " Use IPv6 name resolution : $enable_ipv6" - echo " Use UCD SNMP/Net-SNMP library : $snmp_libs_message" - echo " Use gnutls library : $tls_message" -+echo " Use cap library : $cap_message" -diff -urNad wireshark-0.99.4/gtk/main.c /tmp/dpep.4XA51P/wireshark-0.99.4/gtk/main.c ---- wireshark-0.99.4/gtk/main.c 2006-11-01 10:28:14.113375310 +0100 -+++ /tmp/dpep.4XA51P/wireshark-0.99.4/gtk/main.c 2006-11-01 10:29:11.095132827 +0100 -@@ -1775,6 +1775,9 @@ - { - gchar *capture_msg; - -+#ifdef HAVE_LIBCAP -+ dropexcesscapabilities(); -+#endif - - gtk_statusbar_pop(GTK_STATUSBAR(packets_bar), packets_ctx); - -diff -urNad wireshark-0.99.4/tshark.c /tmp/dpep.4XA51P/wireshark-0.99.4/tshark.c ---- wireshark-0.99.4/tshark.c 2006-11-01 10:28:14.115375722 +0100 -+++ /tmp/dpep.4XA51P/wireshark-0.99.4/tshark.c 2006-11-01 10:29:11.097133240 +0100 -@@ -751,6 +751,10 @@ - capture_opts_init(&capture_opts, NULL /* cfile */); - #endif - -+#ifdef HAVE_LIBCAP -+ dropexcesscapabilities(); -+#endif -+ - timestamp_set_type(TS_RELATIVE); - timestamp_set_precision(TS_PREC_AUTO); - -diff -urNad wireshark-0.99.4/util.c /tmp/dpep.4XA51P/wireshark-0.99.4/util.c ---- wireshark-0.99.4/util.c 2006-11-01 10:28:14.116375929 +0100 -+++ /tmp/dpep.4XA51P/wireshark-0.99.4/util.c 2006-11-01 10:29:11.098133446 +0100 -@@ -40,6 +40,10 @@ - #include - #include - -+#ifdef HAVE_LIBCAP -+#include -+#endif -+ - #include "util.h" - - /* -@@ -192,3 +196,46 @@ - } - return ""; - } -+ -+ -+#ifdef HAVE_LIBCAP -+void dropexcesscapabilities(void) -+{ -+ cap_t cap_d; -+ cap_value_t cap_values[] = { -+ /* capabilities we need to keep */ -+ CAP_NET_RAW, -+ CAP_DAC_READ_SEARCH -+ }; -+ cap_flag_value_t current_cap; -+ -+ cap_d = cap_get_proc(); -+ if (!cap_d) { -+ g_warning("Could not get capabilities\n"); -+ return; -+ } -+ -+ cap_get_flag(cap_d, CAP_NET_RAW, CAP_EFFECTIVE, ¤t_cap); -+ cap_free(&cap_d); -+ if (current_cap == CAP_CLEAR) { -+ return; -+ } -+ -+ cap_d = cap_init(); -+ if (!cap_d) { -+ g_warning("Could not alloc cap struct\n"); -+ return; -+ } -+ -+ cap_clear(cap_d); -+ cap_set_flag(cap_d, CAP_PERMITTED, 2, cap_values, CAP_SET); -+ cap_set_flag(cap_d, CAP_EFFECTIVE, 2, cap_values, CAP_SET); -+ -+ if (cap_set_proc(cap_d) != 0) { -+ g_warning("Could not set capabilities: %s\n", strerror(errno)); -+ cap_free(&cap_d); -+ return; -+ } -+ cap_free(&cap_d); -+} -+#endif /* HAVE_LIBCAP */ -diff -urNad wireshark-0.99.4/util.h /tmp/dpep.4XA51P/wireshark-0.99.4/util.h ---- wireshark-0.99.4/util.h 2006-11-01 10:28:14.116375929 +0100 -+++ /tmp/dpep.4XA51P/wireshark-0.99.4/util.h 2006-11-01 10:29:11.098133446 +0100 -@@ -53,6 +53,15 @@ - const char *get_conn_cfilter(void); - - -+#ifdef HAVE_LIBCAP -+/* -+ * Limit the potential impact of undiscovered security vulnerabilities by -+ * dropping all capabilities except the sniffer capability we need to do our -+ * job. -+ */ -+void dropexcesscapabilities(void); -+#endif /* HAVE_LIBCAP */ -+ - #ifdef __cplusplus - } - #endif /* __cplusplus */ diff --git a/debian/patches/05_plugin-libdir.dpatch b/debian/patches/05_plugin-libdir.dpatch deleted file mode 100644 index e17ed9c169..0000000000 --- a/debian/patches/05_plugin-libdir.dpatch +++ /dev/null @@ -1,28 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 05_plugin-libdir.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad --exclude=CVS --exclude=.svn ./configure.in /tmp/dpep-work.avwGQ1/wireshark-0.10.11/configure.in ---- ./configure.in 2005-05-02 23:28:53.000000000 +0200 -+++ /tmp/dpep-work.avwGQ1/wireshark-0.10.11/configure.in 2005-07-17 18:46:26.000000000 +0200 -@@ -1130,7 +1130,7 @@ - dnl check whether plugins should be enabled and, if they should be, - dnl check for plugins directory - stolen from Amanda's configure.in - dnl --plugindir="$libdir/wireshark/plugins/$VERSION" -+plugindir="$libdir/plugins/$VERSION" - AC_ARG_WITH(plugins, - [ --with-plugins[[=DIR]] support plugins (installed in DIR, if supplied).], - [ -@@ -1172,7 +1172,7 @@ - # - # The plugin dissectors reside in ./plugins/PROTO/ - # --PLUGIN_LIBS="-L../../epan -lwireshark $GLIB_LIBS" -+PLUGIN_LIBS="-L../../epan $GLIB_LIBS" - AC_SUBST(PLUGIN_LIBS) - - dnl libtool defs diff --git a/debian/patches/06_giop-buffer.dpatch b/debian/patches/06_giop-buffer.dpatch deleted file mode 100644 index 4c3cc6a799..0000000000 --- a/debian/patches/06_giop-buffer.dpatch +++ /dev/null @@ -1,19 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 06_giop-buffer.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad --exclude=CVS --exclude=.svn ./epan/dissectors/packet-giop.c /tmp/dpep-work.7N90PO/wireshark-0.10.11/epan/dissectors/packet-giop.c ---- ./epan/dissectors/packet-giop.c 2005-07-17 18:52:08.000000000 +0200 -+++ /tmp/dpep-work.7N90PO/wireshark-0.10.11/epan/dissectors/packet-giop.c 2005-07-17 18:55:32.000000000 +0200 -@@ -1760,6 +1760,8 @@ - - if (len == 0) - return FALSE; -+ if (*offset > header->message_size) -+ return FALSE; - - saved_proto = pinfo->current_proto; - for (i=0; i -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad --exclude=CVS --exclude=.svn ./epan/dissectors/packet-cmip.c /tmp/dpep-work.5KBC28/wireshark-0.10.11/epan/dissectors/packet-cmip.c ---- ./epan/dissectors/packet-cmip.c 2005-07-17 18:52:24.000000000 +0200 -+++ /tmp/dpep-work.5KBC28/wireshark-0.10.11/epan/dissectors/packet-cmip.c 2005-07-17 18:53:53.000000000 +0200 -@@ -1895,7 +1895,8 @@ - return offset; - } - -- -+int -+dissect_cmip_InvokeIDType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_); - - static int - dissect_cmip_Argument(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { diff --git a/debian/patches/08_wireshark-desktop-menu.dpatch b/debian/patches/08_wireshark-desktop-menu.dpatch deleted file mode 100644 index d15d6a53cc..0000000000 --- a/debian/patches/08_wireshark-desktop-menu.dpatch +++ /dev/null @@ -1,24 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 08_wireshark-desktop-menu.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad wireshark-0.99.4/wireshark.desktop /tmp/dpep.1jXNTW/wireshark-0.99.4/wireshark.desktop ---- wireshark-0.99.4/wireshark.desktop 2006-11-01 10:31:40.011860048 +0100 -+++ /tmp/dpep.1jXNTW/wireshark-0.99.4/wireshark.desktop 2006-11-01 10:32:13.727816940 +0100 -@@ -68,11 +68,11 @@ - Comment[fi]=Verkkoliikenne analysaattori - Comment[fr]=Analyseur de trafic réseau - Comment[sv]=Nätverkstrafikanalysator --Icon=wireshark.png -+Icon=hi48-app-wireshark.png - TryExec=wireshark - Exec=wireshark - Path= - Terminal=false - MimeType= --Categories=Application;GTK;Network;X-Red-Hat-Extra; -+Categories=GNOME;Application;Network; - X-KDE-SubstituteUID=true diff --git a/debian/patches/09_idl2wrs.dpatch b/debian/patches/09_idl2wrs.dpatch deleted file mode 100644 index 398f9f35df..0000000000 --- a/debian/patches/09_idl2wrs.dpatch +++ /dev/null @@ -1,51 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 09_idl2wrs.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad wireshark-0.99.5~/tools/idl2wrs.sh.in wireshark-0.99.5/tools/idl2wrs.sh.in ---- wireshark-0.99.5~/tools/idl2wrs.sh.in 2007-02-01 22:53:43.000000000 +0000 -+++ wireshark-0.99.5/tools/idl2wrs.sh.in 2007-04-01 08:56:28.000000000 +0000 -@@ -48,40 +48,6 @@ - exit 1; - fi - --# --# Run wireshark backend, looking for wireshark_be.py and wireshark_gen.py --# in pythons's "site-packages" directory. If cannot find that, then --# try looking in current directory. If still cannot, then exit with --# error. -- --if [ -f $PYTHONPATH/site-packages/wireshark_be.py ] && [ -f $PYTHONPATH/site-packages/wireshark_gen.py ]; then -- exec omniidl -p $PYTHONPATH/site-packages -b wireshark_be $@ -- /* not reached */ --fi -- --# Try current directory. -- --if [ -f ./wireshark_be.py ] && [ -f ./wireshark_gen.py ]; then -- exec omniidl -p ./ -b wireshark_be $@ -- /* not reached */ --fi -- --# Could not find both wireshark_be.py AND wireshark_gen.py --# So let's just try to run it without -p, hoping that the installation --# set up a valid path. - - exec omniidl -b wireshark_be $@ - --old code: not reached -- --echo "idl2wrs Error: Could not find both wireshark_be.py AND wireshark_gen.py." --echo "Please ensure you have the PYTHONPATH variable set, or that wireshark_be.py " --echo "and wireshark_gen.py exist in the current directory. " --echo --echo "On this system, PYTHONPATH is : $PYTHONPATH" --echo -- --exit 2 -- -- -- diff --git a/debian/patches/10_wireshark_gen.dpatch b/debian/patches/10_wireshark_gen.dpatch deleted file mode 100644 index eb19419490..0000000000 --- a/debian/patches/10_wireshark_gen.dpatch +++ /dev/null @@ -1,19 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 10_wireshark_gen.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad --exclude=CVS --exclude=.svn ./wireshark_gen.py /tmp/dpep-work.vCo5MH/wireshark-0.10.11/wireshark_gen.py ---- ./tools/wireshark_gen.py 2005-07-17 19:42:15.000000000 +0200 -+++ /tmp/dpep-work.vCo5MH/wireshark-0.10.11/ools/wireshark_gen.py 2005-07-17 19:42:34.000000000 +0200 -@@ -2188,7 +2188,8 @@ - #include - #include - #include - #include -+#include - - #ifndef ENABLE_STATIC - G_MODULE_EXPORT const gchar version[] = "0.0.1"; diff --git a/debian/prerm b/debian/prerm deleted file mode 100644 index 4e0be2d72d..0000000000 --- a/debian/prerm +++ /dev/null @@ -1,4 +0,0 @@ -#! /bin/sh - -#DEBHELPER# - diff --git a/debian/rules b/debian/rules index 1169776c11..d0e6b4f7f6 100755 --- a/debian/rules +++ b/debian/rules @@ -13,21 +13,16 @@ DB2MAN=/usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -PYTHON_VERSION=python2.3 +PYTHON_VERSION=python2.4 + +CFLAGS=-g -O2 # Enable IEEE-conformant floating point math on alphas (not the default) ifeq (alpha-linux,$(DEB_HOST_GNU_TYPE)) CFLAGS += -mieee endif -idl2deb.1: idl2deb.dbk - xsltproc --nonet --novalid $(DB2MAN) $< - -asn2deb.1: asn2deb.dbk - xsltproc --nonet --novalid $(DB2MAN) $< - - -CONFIGURE_FLAGS=--prefix=/usr --sysconfdir=/usr/share/wireshark --datadir=/usr/share/wireshark --disable-static --disable-ssl --without-ucdsnmp --enable-gtk2 --libdir=/usr/lib/wireshark CFLAGS="$(CFLAGS)"; +CONFIGURE_FLAGS=--prefix=/usr --sysconfdir=/usr/share --datadir=/usr/share --libdir=/usr/lib/wireshark --disable-static --enable-gtk2 --enable-warnings-as-errors=no --enable-setuid-install --with-plugins=/usr/lib/wireshark/plugins --with-lua=/usr/ configure: configure-stamp configure-stamp: patch @@ -35,18 +30,13 @@ configure-stamp: patch cp /usr/share/misc/config.guess /usr/share/misc/config.sub . libtoolize --force --copy - autoheader - autoconf -mkdir aclocal-missing - (if [ ! -x ./configure ]; then \ - ./autogen.sh $(CONFIGURE_FLAGS) CFLAGS="$(CFLAGS)"; \ - fi) - - ./configure $(CONFIGURE_FLAGS) CFLAGS="$(CFLAGS)" + ./autogen.sh + CFLAGS="$(CFLAGS)" ./configure $(CONFIGURE_FLAGS) touch configure-stamp -build: build-stamp idl2deb.1 asn2deb.1 +build: build-stamp build-stamp: configure-stamp $(MAKE) @@ -63,7 +53,7 @@ clean: unpatch-stamp rm -f build-stamp configure-stamp [ ! -f Makefile ] || $(MAKE) distclean - rm -f rdps wireshark.1 tshark.1 idl2deb.1 wireshark-filter.4 asn2deb.1 + rm -f rdps wireshark.1 tshark.1 wireshark-filter.4 rm -f conftest conftest.c rm -f config.guess config.sub config.log rm -f config.h.in config.h configure @@ -75,59 +65,64 @@ unpatch-stamp: dpatch deapply-all rm -rf patch-stamp debian/patched -# Build architecture-independent files here. -binary-indep: build -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build +install: build dh_testdir dh_testroot dh_clean -k dh_installdirs # Add here commands to install the files into debian/tmp - $(MAKE) install DESTDIR=`pwd`/debian/tmp - mkdir -p `pwd`/debian/tmp/usr/share/applications/ - cp wireshark.desktop `pwd`/debian/tmp/usr/share/applications/ - cp tools/idl2wrs.sh `pwd`/debian/tmp/usr/bin/ - cp debian/wireshark-root.desktop `pwd`/debian/tmp/usr/share/applications/ - mkdir -p `pwd`/debian/tmp/usr/share/pixmaps/ - cp image/hi48-app-wireshark.png `pwd`/debian/tmp/usr/share/pixmaps/ - cp image/wsicon32.xpm `pwd`/debian/tmp/usr/share/pixmaps/ - mkdir -p `pwd`/debian/tmp/usr/lib/$(PYTHON_VERSION)/site-packages/ - install -m 755 `pwd`/idl2deb `pwd`/debian/tmp/usr/bin/ - install -m 755 `pwd`/asn2deb `pwd`/debian/tmp/usr/bin/ - cp `pwd`/tools/wireshark_be.py `pwd`/tools/wireshark_gen.py \ - `pwd`/debian/tmp/usr/lib/$(PYTHON_VERSION)/site-packages/ - mkdir -p `pwd`/debian/tmp/usr/include/wireshark/ + $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp + mkdir -p $(CURDIR)/debian/tmp/usr/share/applications/ + cp debian/wireshark.desktop $(CURDIR)/debian/tmp/usr/share/applications/ + cp tools/idl2wrs.sh $(CURDIR)/debian/tmp/usr/bin/ + #cp debian/wireshark-root.desktop $(CURDIR)/debian/tmp/usr/share/applications/ + mkdir -p $(CURDIR)/debian/tmp/usr/share/pixmaps/ + cp image/hi48-app-wireshark.png $(CURDIR)/debian/tmp/usr/share/pixmaps/ + cp image/wsicon32.xpm $(CURDIR)/debian/tmp/usr/share/pixmaps/ + mkdir -p $(CURDIR)/debian/tmp/etc/wireshark/ + mv $(CURDIR)/debian/tmp/usr/share/wireshark/init.lua \ + $(CURDIR)/debian/tmp/etc/wireshark/ + ln -s /etc/wireshark/init.lua \ + $(CURDIR)/debian/tmp/usr/share/wireshark/init.lua + mkdir -p $(CURDIR)/debian/tmp/usr/lib/$(PYTHON_VERSION)/site-packages/ + cp $(CURDIR)/tools/wireshark_be.py $(CURDIR)/tools/wireshark_gen.py \ + $(CURDIR)/debian/tmp/usr/lib/$(PYTHON_VERSION)/site-packages/ + mkdir -p $(CURDIR)/debian/tmp/usr/include/wireshark/ for F in `cat debian/wireshark-dev.header-files`; do \ - cp --parents $$F `pwd`/debian/tmp/usr/include/wireshark; \ + cp --parents $$F $(CURDIR)/debian/tmp/usr/include/wireshark; \ done - # .a is no longer built; why was is used ? - #cp `pwd`/wiretap/libwiretap.a `pwd`/debian/tmp/usr/lib/ - -rm -rf `pwd`/debian/tmp/usr/man + -rm -rf $(CURDIR)/debian/tmp/usr/man dh_installman dh_movefiles dh_pysupport - dh_python dh_installdocs - -rm debian/menu # from upstream debian/ package dh_installmenu dh_installchangelogs NEWS + +# Build architecture-independent files here. +binary-indep: install +# We have nothing to do by default. + +check: install + # check all necessary headers are included + gcc -c debian/headers-check.c `pkg-config --cflags glib-2.0` -Idebian/wireshark-dev/usr/include/ -Idebian/wireshark-dev/usr/include/wireshark/ -o /dev/null + +# Build architecture-dependent files here. +binary-arch: install check dh_strip dh_compress - dh_fixperms + dh_fixperms -Xdumpcap dh_installdeb - dh_shlibdeps + LD_LIBRARY_PATH=/usr/lib/wireshark/ dh_shlibdeps dh_gencontrol dh_md5sums dh_builddeb -source diff: +source diff: @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary +.PHONY: build clean install check binary-indep binary-arch binary diff --git a/debian/tshark.manpages b/debian/tshark.manpages index be60459534..b870ac65fe 100644 --- a/debian/tshark.manpages +++ b/debian/tshark.manpages @@ -1 +1 @@ -tshark.1 \ No newline at end of file +tshark.1 diff --git a/debian/wireshark-common.files b/debian/wireshark-common.files index 851a736b25..4e62ed9f36 100644 --- a/debian/wireshark-common.files +++ b/debian/wireshark-common.files @@ -3,9 +3,11 @@ /usr/bin/editcap /usr/bin/mergecap /usr/bin/text2pcap +/usr/bin/rawshark /usr/lib/wireshark/libwireshark.so.0 /usr/lib/wireshark/libwireshark.so.0.0.1 /usr/lib/wireshark/libwiretap.so.0 /usr/lib/wireshark/libwiretap.so.0.0.1 /usr/lib/wireshark/plugins/* -/usr/share/wireshark/* \ No newline at end of file +/usr/share/wireshark/* +/etc/wireshark/init.lua diff --git a/debian/wireshark-common.manpages b/debian/wireshark-common.manpages index 56b1491ae4..82b483aecf 100644 --- a/debian/wireshark-common.manpages +++ b/debian/wireshark-common.manpages @@ -1,5 +1,7 @@ +dumpcap.1 editcap.1 mergecap.1 text2pcap.1 wireshark-filter.4 -capinfos.1 \ No newline at end of file +capinfos.1 +rawshark.1 diff --git a/debian/wireshark-common.shlibs b/debian/wireshark-common.shlibs new file mode 100644 index 0000000000..b21c04d67c --- /dev/null +++ b/debian/wireshark-common.shlibs @@ -0,0 +1,2 @@ +libwireshark 0 wireshark-common +libwiretap 0 wireshark-common diff --git a/debian/wireshark-dev.docs b/debian/wireshark-dev.docs index 3cd95439c2..58947a03f1 100644 --- a/debian/wireshark-dev.docs +++ b/debian/wireshark-dev.docs @@ -1,5 +1,14 @@ +doc/README.binarytrees +doc/README.capture doc/README.design doc/README.developer +doc/README.display_filter doc/README.idl2wrs +doc/README.malloc +doc/README.packaging doc/README.plugins -doc/README.xml-output \ No newline at end of file +doc/README.regression +doc/README.request_response_tracking +doc/README.stats_tree +doc/README.tapping +doc/README.xml-output diff --git a/debian/wireshark-dev.files b/debian/wireshark-dev.files index d616965a69..c70c05ef5d 100644 --- a/debian/wireshark-dev.files +++ b/debian/wireshark-dev.files @@ -1,6 +1,4 @@ /usr/bin/idl2wrs -/usr/bin/idl2deb -/usr/bin/asn2deb /usr/lib/wireshark/libwireshark.so /usr/lib/wireshark/libwireshark.la /usr/lib/wireshark/libwiretap.so diff --git a/debian/wireshark-dev.header-files b/debian/wireshark-dev.header-files index aab6d48ce8..c284cd45aa 100644 --- a/debian/wireshark-dev.header-files +++ b/debian/wireshark-dev.header-files @@ -1,5 +1,9 @@ color.h config.h +register.h epan/*.h +epan/crypt/*.h +epan/dfilter/*.h epan/dissectors/*.h -wiretap/*.h \ No newline at end of file +epan/ftypes/*.h +wiretap/*.h diff --git a/debian/wireshark-dev.manpages b/debian/wireshark-dev.manpages index 2a373ca0c2..291085768c 100644 --- a/debian/wireshark-dev.manpages +++ b/debian/wireshark-dev.manpages @@ -1,3 +1 @@ idl2wrs.1 -idl2deb.1 -asn2deb.1 \ No newline at end of file diff --git a/debian/wireshark-dev.postinst b/debian/wireshark-dev.postinst deleted file mode 100644 index 6f37362fbd..0000000000 --- a/debian/wireshark-dev.postinst +++ /dev/null @@ -1,5 +0,0 @@ -#! /bin/sh -e - -#DEBHELPER# - -exit 0 diff --git a/debian/wireshark-dev.prerm b/debian/wireshark-dev.prerm index c78af5c85f..5a07967065 100644 --- a/debian/wireshark-dev.prerm +++ b/debian/wireshark-dev.prerm @@ -12,3 +12,4 @@ dpkg --listfiles $PACKAGE | xargs rm -f >&2 #DEBHELPER# + diff --git a/debian/wireshark-root.desktop b/debian/wireshark-root.desktop index e90f96292a..ab91b8e2f6 100644 --- a/debian/wireshark-root.desktop +++ b/debian/wireshark-root.desktop @@ -68,9 +68,11 @@ Comment[fr]=Analyseur de trafic réseau Comment[fi]=Verkkoliikenne analysaattori Comment[sv]=Nätverkstrafikanalysator Icon=hi48-app-wireshark.png -TryExec=gksu -Exec=gksu -u root /usr/bin/wireshark +TryExec=su-to-root +Exec=su-to-root -X -c /usr/bin/wireshark +Path= Terminal=false +MimeType= Categories=GNOME;Network; # Found in Suse 9.1: X-KDE-SubstituteUID=true diff --git a/debian/wireshark.desktop b/debian/wireshark.desktop new file mode 100644 index 0000000000..e5053a3855 --- /dev/null +++ b/debian/wireshark.desktop @@ -0,0 +1,82 @@ +[Desktop Entry] +# $Id$ +# The format of this file is specified at +# http://freedesktop.org/Standards/desktop-entry-spec/ +# The entries are in the order they are listed in version 0.9.4 +Type=Application +Version=1.0 +Name=Wireshark +GenericName=Network Analyzer +GenericName[af]=Netwerk Analiseerder +GenericName[az]=Şəbəkə Analiz Proqramı +GenericName[bg]=Анализатор на мрежови трафик +GenericName[bs]=Mrežni analizer +GenericName[ca]=Analitzador de xarxa +GenericName[cs]=Analyzátor sítě +GenericName[da]=Netværksanalyse +GenericName[de]=Programm für die Netzwerk-Analyse +GenericName[el]=Αναλυτής Δικτύων +GenericName[en_GB]=Network Analyser +GenericName[eo]=Retanalizilo +GenericName[es]=Analizador de redes +GenericName[et]=Võrguliikluse analüsaator +GenericName[eu]=Sare ikerketaria +GenericName[fa]=تحلیل‌گر شبکه +GenericName[fi]=Verkkoanalysaattori +GenericName[fr]=Analyseur réseau +GenericName[he]=מאבחן רשת +GenericName[hr]=Program za analiziranje mreža +GenericName[hu]=hálózatanalizáló +GenericName[id]=Analisis jaringan +GenericName[is]=Netskoðunartól +GenericName[it]=Analizzatore di rete +GenericName[ja]=ネットワークアナライザ +GenericName[ko]=네트웍 분석기 +GenericName[lo]=ເຄື່ອງມືວິເຄາະເຄືອຂ່າຍ +GenericName[lt]=Tinklo analizatorius +GenericName[lv]=TÄ«kla Analizators +GenericName[mk]=Анализатор на мрежи +GenericName[mn]=Сүлжээ-шинжлэлийн програм +GenericName[mt]=Analizzatur tan-network +GenericName[nb]=Nettverksanalyse +GenericName[nl]=netwerkanalyseprogramma +GenericName[nn]=Nettverksanalyse +GenericName[nso]=Moahlaahli wa Kgokagano +GenericName[pl]=Analizator sieci +GenericName[pt]=Analisador de Redes +GenericName[pt_BR]=Analisador de rede +GenericName[ro]=Analizor de reÅ£ea +GenericName[ru]=Анализатор сетевого трафика +GenericName[se]=Fierbmeanalysa +GenericName[sk]=Analyzátor siete +GenericName[sl]=Analizator omrežij +GenericName[sr]=Analizatror mreže +GenericName[ss]=Sihlatiyi seluchungechunge +GenericName[sv]=Nätverksanalyserare +GenericName[ta]=ŨÄ ¬öÅ¡Ç÷ +GenericName[th]=เครื่องมือวิเคราะห์เครือข่าย +GenericName[tr]=Ağ Analiz Programı +GenericName[uk]=Аналізатор мережі +GenericName[ven]=Musengulusi wa Vhukwamani +GenericName[vi]=Trình phân tích mạng +GenericName[xh]=Umcukucezi Womsebenzi womnatha +GenericName[zh_CN]=网络分析程序 +GenericName[zh_TW]=網路分析程式 +GenericName[zu]=Umhloli Woxhumano olusakazekile +Comment=Network traffic analyzer +Comment[fr]=Analyseur de trafic réseau +Comment[fi]=Verkkoliikenne analysaattori +Comment[sv]=Nätverkstrafikanalysator +Icon=hi48-app-wireshark.png +Exec=/usr/bin/wireshark +Path= +Terminal=false +MimeType= +Categories=GNOME;Network; +# Found in Suse 9.1: +# X-KDE-SubstituteUID=true +# Deprecated: +# TerminalOptions= +# BinaryPattern=wireshark +# MapNotify=true +# Protocols= diff --git a/debian/wireshark.files b/debian/wireshark.files index ff5fa9b0ce..475aa845f8 100644 --- a/debian/wireshark.files +++ b/debian/wireshark.files @@ -1,3 +1,3 @@ /usr/bin/wireshark /usr/share/applications/ -/usr/share/pixmaps/ \ No newline at end of file +/usr/share/pixmaps/ diff --git a/debian/wireshark.manpages b/debian/wireshark.manpages index fef11e2467..3503db840f 100644 --- a/debian/wireshark.manpages +++ b/debian/wireshark.manpages @@ -1 +1 @@ -wireshark.1 \ No newline at end of file +wireshark.1 diff --git a/debian/wireshark.menu b/debian/wireshark.menu index f0658f0ce8..4cd16e67a4 100644 --- a/debian/wireshark.menu +++ b/debian/wireshark.menu @@ -1,3 +1,5 @@ -?package(wireshark):needs="X11" section="Apps/Net" title="Wireshark" \ +?package(wireshark):needs="X11" section="Applications/Network/Monitoring" \ + title="Wireshark" \ command="/usr/bin/wireshark" \ icon="/usr/share/pixmaps/wsicon32.xpm" + -- 2.34.1