diff --git a/Bustle/Loader/Pcap.hs b/Bustle/Loader/Pcap.hs --- a/Bustle/Loader/Pcap.hs +++ b/Bustle/Loader/Pcap.hs @@ -261,8 +261,7 @@ => FilePath -> m (Either IOError ([String], [B.DetailedEvent])) readPcap path = liftIO $ try $ do - p_ <- tryJust matchSnaplenBug $ openOffline path - p <- either ioError return p_ + p <- openOffline path dlt <- datalink p -- DLT_NULL for extremely old logs. -- DLT_DBUS is missing: https://github.com/bos/pcap/pull/8 @@ -271,15 +270,3 @@ ioError $ mkIOError userErrorType message Nothing (Just path) partitionEithers <$> evalStateT (mapBodies p convert) Map.empty - where - snaplenErrorString = "invalid file capture length 134217728, bigger than maximum of 262144" - snaplenBugReference = __ "libpcap 1.8.0 and 1.8.1 are incompatible with Bustle. See \ - \https://bugs.freedesktop.org/show_bug.cgi?id=100220#c7 for \ - \details. Distributions should apply downstream patches until \ - \until a new upstream release is made; users should install \ - \Bustle from Flathub, which already includes the necessary \ - \patches: https://flathub.org/apps/details/org.freedesktop.Bustle" - matchSnaplenBug e = - if isUserError e && (snaplenErrorString `isSuffixOf` ioeGetErrorString e) - then Just $ ioeSetErrorString e snaplenBugReference - else Nothing diff --git a/Makefile b/Makefile --- a/Makefile +++ b/Makefile @@ -16,11 +16,13 @@ DESKTOP_FILE = org.freedesktop.Bustle.desktop APPDATA_FILE = org.freedesktop.Bustle.appdata.xml ICON_SIZES = 16x16 22x22 32x32 48x48 256x256 -ICONS = \ +SCALABLE_ICONS = \ data/icons/hicolor/scalable/apps/org.freedesktop.Bustle.svg \ data/icons/hicolor/scalable/apps/org.freedesktop.Bustle-symbolic.svg \ - $(foreach size,$(ICON_SIZES),data/icons/hicolor/$(size)/apps/org.freedesktop.Bustle.png) \ $(NULL) +ICONS = \ + $(SCALABLE_ICONS) \ + $(foreach size,$(ICON_SIZES),data/icons/hicolor/$(size)/apps/org.freedesktop.Bustle.png) \ all: $(BINARIES) $(MANPAGE) $(DESKTOP_FILE) $(APPDATA_FILE) $(ICONS) @@ -71,7 +73,7 @@ $(foreach size,$(ICON_SIZES),mkdir -p $(DATADIR)/icons/hicolor/$(size)/apps; ) $(foreach size,$(ICON_SIZES),cp data/icons/hicolor/$(size)/apps/org.freedesktop.Bustle.png $(DATADIR)/icons/hicolor/$(size)/apps; ) mkdir -p $(DATADIR)/icons/hicolor/scalable/apps - cp data/icons/hicolor/scalable/apps/org.freedesktop.Bustle-symbolic.svg $(DATADIR)/icons/hicolor/scalable/apps + cp $(SCALABLE_ICONS) $(DATADIR)/icons/hicolor/scalable/apps $(MAKE) update-icon-cache uninstall: diff --git a/NEWS.md b/NEWS.md --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,22 @@ +Bustle 0.7.3 (2018-11-15) +------------------------- + +User-facing changes: + +* Bustle now handles the application/vnd.tcpdump.pcap MIME type, which + in practice means that your file manager will offer to open pcap files + with Bustle. + +Internal changes: + +* Scalable non-symbolic icon is now installed. +* Packagers should add a dependency on libpcap >= 1.9.0. This is not + checked during build or at runtime (`pcap-config` does not accept a + version check; libpcap does not provide a `.pc` file; and + `pcap_lib_version()` returns a human-readable string of unspecified + format) but is recommended to avoid running Bustle against libpcap + 1.8.x, with which it is incompatible. + Bustle 0.7.2 (2018-07-24) ------------------------- diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -8,6 +8,8 @@ [![pipeline status](https://gitlab.freedesktop.org/bustle/bustle/badges/master/pipeline.svg)](https://gitlab.freedesktop.org/bustle/bustle/commits/master) +Download on Flathub + Using Bustle ============ diff --git a/bustle.cabal b/bustle.cabal --- a/bustle.cabal +++ b/bustle.cabal @@ -1,6 +1,6 @@ Name: bustle Category: Network, Desktop -Version: 0.7.2 +Version: 0.7.3 Cabal-Version: 2.0 Tested-With: GHC == 8.4.3 Synopsis: Draw sequence diagrams of D-Bus traffic diff --git a/c-sources/pcap-monitor.c b/c-sources/pcap-monitor.c --- a/c-sources/pcap-monitor.c +++ b/c-sources/pcap-monitor.c @@ -27,10 +27,6 @@ #include #include -#ifndef DLT_DBUS -# define DLT_DBUS 231 -#endif - /* Prefix of name claimed by the connection that collects name owners. */ const char *BUSTLE_MONITOR_NAME_PREFIX = "org.freedesktop.Bustle.Monitor."; diff --git a/data/org.freedesktop.Bustle.appdata.xml.in b/data/org.freedesktop.Bustle.appdata.xml.in --- a/data/org.freedesktop.Bustle.appdata.xml.in +++ b/data/org.freedesktop.Bustle.appdata.xml.in @@ -1,5 +1,6 @@ + org.freedesktop.Bustle.desktop CC-BY-SA-3.0 @@ -38,6 +39,11 @@ bustle.desktop + + +

Bustle now handles the application/vnd.tcpdump.pcap MIME type, which in practice means that your file manager will offer to open pcap files with Bustle.

+ +

You can now explore messages while they're being recorded. (Filtering, statistics and exporting are still only available once you stop recording.)

diff --git a/data/org.freedesktop.Bustle.desktop.in b/data/org.freedesktop.Bustle.desktop.in --- a/data/org.freedesktop.Bustle.desktop.in +++ b/data/org.freedesktop.Bustle.desktop.in @@ -1,10 +1,11 @@ [Desktop Entry] Name=Bustle Comment=Draw sequence diagrams of D-Bus activity -Exec=bustle +Exec=bustle %F Icon=org.freedesktop.Bustle Terminal=false Type=Application Categories=GTK;Development;Debugger;Profiling; StartupNotify=true Keywords=debug;profile;d-bus;dbus;sequence;monitor; +MimeType=application/vnd.tcpdump.pcap; diff --git a/po/messages.pot b/po/messages.pot --- a/po/messages.pot +++ b/po/messages.pot @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-07-24 22:05+0100\n" +"POT-Creation-Date: 2018-11-15 08:51+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -135,15 +135,6 @@ "You might want to manually recover the log from the temporary file at \"%s\"." msgstr "" -#: Bustle/Loader/Pcap.hs:276 -msgid "" -"libpcap 1.8.0 and 1.8.1 are incompatible with Bustle. See https://bugs." -"freedesktop.org/show_bug.cgi?id=100220#c7 for details. Distributions should " -"apply downstream patches until until a new upstream release is made; users " -"should install Bustle from Flathub, which already includes the necessary " -"patches: https://flathub.org/apps/details/org.freedesktop.Bustle" -msgstr "" - #: data/bustle.ui:14 msgid "_Filter Visible Services…" msgstr "" @@ -198,14 +189,6 @@ msgid "Save" msgstr "" -#: data/bustle.ui:408 -msgid "Oh no" -msgstr "" - -#: data/bustle.ui:424 -msgid "very sad" -msgstr "" - #: data/bustle.ui:493 msgid "" "Start recording D-Bus activity with the Record button above\n" @@ -290,4 +273,42 @@ #: data/org.freedesktop.Bustle.appdata.xml.in:31 msgid "Relax with this soothing greyscale welcome page" +msgstr "" + +#: data/org.freedesktop.Bustle.appdata.xml.in:43 +msgid "" +"Bustle now handles the application/vnd.tcpdump.pcap MIME type, which in " +"practice means that your file manager will offer to open pcap files with " +"Bustle." +msgstr "" + +#: data/org.freedesktop.Bustle.appdata.xml.in:48 +msgid "" +"You can now explore messages while they're being recorded. (Filtering, " +"statistics and exporting are still only available once you stop recording.)" +msgstr "" + +#: data/org.freedesktop.Bustle.appdata.xml.in:49 +msgid "" +"The raw sender and destination for each message is now shown in the details " +"pane." +msgstr "" + +#: data/org.freedesktop.Bustle.appdata.xml.in:50 +msgid "" +"Bytestrings with embedded NULs which are otherwise ASCII are now shown as " +"ASCII strings." +msgstr "" + +#: data/org.freedesktop.Bustle.appdata.xml.in:55 +msgid "" +"It's now possible to monitor the system bus (from the user interface and " +"with the bustle-pcap command-line tool), with no need to reconfigure the " +"system bus. It's also possible to monitor an arbitrary bus by address." +msgstr "" + +#: data/org.freedesktop.Bustle.appdata.xml.in:56 +msgid "" +"Bustle now requires that dbus-monitor (≥ 1.9.10) and pkexec are installed on " +"your system." msgstr ""