summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2023-02-20Merge branch 'master' into 'master'HEADmasterWill Thompson1-1/+1
Makefile: fix pcap-config call See merge request bustle/bustle!21
2023-01-08Makefile: fix pcap-config callFabrice Fontaine1-1/+1
Fix the following build failure raised since libpcap version 1.10.2 and https://github.com/the-tcpdump-group/libpcap/commit/d0cba780dc2b2bb4f3ca9427d1a0f03479f45707: pcap-config: Invalid command-line option pcap-config specified Usage: pcap-config [ --help ] [ --static | --static-pcap-only ] [ --libs | --additional-libs ] perl -nle 'm/^Version:\s+(.*)$/ and print $1' \ bustle.cabal > dist/build/autogen/version.txt echo '#define BUSTLE_VERSION "'`cat dist/build/autogen/version.txt`'"' > dist/build/autogen/version.h /home/buildroot/autobuild/run/instance-2/output-1/host/bin/arm-linux-gcc -Idist/build/autogen -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 \ -o dist/build/bustle-pcap c-sources/pcap-reader.c c-sources/pcap-monitor.c c-sources/bustle-pcap.c \ -I/home/buildroot/autobuild/run/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/glib-2.0 -I/home/buildroot/autobuild/run/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/glib-2.0/include -I/home/buildroot/autobuild/run/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/libmount -I/home/buildroot/autobuild/run/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/blkid -I/home/buildroot/autobuild/run/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/gio-unix-2.0 -pthread -L/home/buildroot/autobuild/run/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib -lgio-2.0 -lgobject-2.0 -lglib-2.0 /home/buildroot/autobuild/run/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /tmp/cc5SQkTV.o: in function `bustle_pcap_reader_finalize': pcap-reader.c:(.text+0x254): undefined reference to `pcap_close' Fixes: - http://autobuild.buildroot.org/results/f3dcb617488e4172e639e3bd51a93bc9822ea186 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
2020-08-10Update appdata screenshotsWill Thompson3-0/+0
2020-08-07cabal: fix Data-files syntaxWill Thompson1-1/+1
36b1d769683818900ea079880c5c82122c2e19da removed the last entry from this list but did not remove the trailing comma from the previous line. When I am king, all file formats will support trailing commas in lists.
2020-08-06Replace LICENSE with COPYINGWill Thompson2-44/+31
And stop explicitly installing it as a Cabal data file. It was previously used by the about dialogue, but since the license is now boring LGPL 2.1 (or later) we use GtkAboutDialog's built-in support for that license instead.
2020-08-06AboutDialog: bump copyright dateWill Thompson1-1/+1
2020-08-06AboutDialog: use :license-type propertyWill Thompson1-6/+5
Now that Bustle's license is a straightforward LGPL 2.1 or later, we can use GtkAboutDialog:license-type rather than showing the full license text in the dialogue. Unfortunately this property and the corresponding GtkLicenseType enum has no gtk2hs binding, but that's never stopped us before.
2020-07-31NEWS for 0.8.0bustle-0.8.0Will Thompson3-1/+25
2020-07-31appdata: Use spaces throughoutWill Thompson1-69/+69
2020-07-31Makefile: simplify validating appstreamWill Thompson1-4/+1
2020-07-31Makefile: simplify install targetWill Thompson1-11/+7
Maybe it would be nice to do this as part of the Cabal build…
2020-07-30Merge branch 'reduce-dependencies'Will Thompson18-472/+1164
2020-07-29Revert "Simplify Cabal file"Will Thompson2-33/+85
This reverts commit ba56a44aac4585071e4ac09a66401939c3032424. $ cabal new-build --dry-run --disable-tests --disable-benchmarks Resolving dependencies... Error: Internal libraries only supported with per-component builds. Per-component builds were disabled because build-type is Custom In the inplace package 'bustle-0.7.5.1'
2020-07-29Simplify Cabal fileWill Thompson2-85/+33
At some point in the past 12 years, Cabal has gaine support for both internal libraries, and common stanzas. Using an internal library for everything except Bustle's entrypoint means tests don't need to list (and build!) all modules they use, and all the necessary dependencies and flags again.
2020-07-29cabal: Bump Cabal-VersionWill Thompson1-1/+1
This squashes a warning about the License field. As documented at https://cabal.readthedocs.io/en/stable/developing-packages.html#pkg-field-license, before 2.2 the license identifiers were a small list which did not include LGPL-2.1-or-later.
2020-07-29DetailsView: reintroduce special case for error messagesWill Thompson2-11/+12
2020-07-06flatpak: Remove pcap and dbus dependenciesWill Thompson1-45/+0
2020-07-06Remove unsafePerformIO from GDBusMessage bindingWill Thompson3-70/+76
This application doesn't expose any setters, but in principle GDBusMessage is mutable so these functions are impure.
2020-07-02Use GDBusMessage rather than 'dbus' libraryWill Thompson11-286/+530
This avoids needing two separate implementations of the DBus protocol in the application, at the cost of writing a hand-written binding for parts of the GDBusMessage and GVariant API.
2020-06-05Use BustlePcapReader rather than 'pcap' bindingWill Thompson3-35/+134
2020-06-05Test: Patch DLT_DBUS into old log fileWill Thompson1-0/+0
This was collected before DLT_DBUS was assigned. BustlePcapReader doesn't contain the workaround to allow DLT_NULL.
2020-06-05reader: Check link typeWill Thompson1-0/+11
2020-06-05reader: Encapsulate libpcapWill Thompson3-25/+38
2020-06-05monitor: Use tee to save pcap streamWill Thompson1-43/+34
Previously, Bustle read directly from dbus-monitor, parsed the pcap stream, then reserialized it back to a file. dbus-monitor → bustle → UI ↓ file Instead, use tee between dbus-monitor and Bustle to write the raw pcap stream to disk: dbus-monitor → tee → bustle ↓ file This makes the code in Bustle quite a bit simpler.
2020-06-05Factor out BustlePcapReaderWill Thompson5-49/+365
2020-06-05monitor: include GDBusMessage in ::message-loggedWill Thompson5-16/+72
Not used on the Haskell side yet.
2020-05-15Merge branch '17-new-icon' into 'master'Will Thompson13-396/+295
Add new icon Closes #17 See merge request bustle/bustle!19
2020-05-15Disable Zenhaskell CI jobsWill Thompson1-23/+0
These have an old version of Stack which is not compatible with the latest lts resolver. https://hub.docker.com/u/zenhaskell has them all marked as "DEPRECATED". OK!
2020-05-15Add new iconWill Thompson11-372/+294
Fixes #17
2020-05-15stack: Update resolver to lts-15.12Will Thompson1-1/+1
2020-02-04Merge branch '15-no-close-confirmation' into 'master'Will Thompson2-39/+12
Drop close-without-saving confirmation dialog Closes #15 See merge request bustle/bustle!18
2020-02-04Drop close-without-saving confirmation dialogWill Thompson1-36/+0
Anecdotally, most users (including me) rarely want to save their logs, they just want to record them and read them. In any case, all the temporary logs are actually kept (forever) in $XDG_CACHE_DIR. Fixes #15.
2020-02-04stack: update to lts-14.22Will Thompson1-3/+12
2020-02-03Merge branch 'license-fix' into 'master'Will Thompson3-684/+3
Update license See merge request bustle/bustle!17
2020-02-03Merge branch 'pcap-monitor-fix' into 'master'Will Thompson1-2/+2
pcap-monitor: Fix build error See merge request bustle/bustle!16
2020-01-27Update licenseJan Tojnar3-684/+3
Since we no longer depend on any GPL library, we can proclaim just LGPL. Specifying a valid SPDX license string will also make it easier for distros to automatically check if the project is redistributable.
2020-01-26pcap-monitor: Fix build errorJan Tojnar1-2/+2
g_clear_handle_id was introduced in GLib 2.56 so it was not available in our target (GLIB_VERSION_MAX_ALLOWED), leading to the following error: c-sources/pcap-monitor.c: In function ‘handle_error’: c-sources/pcap-monitor.c:415:13: error: warning: Not available before 415 | g_clear_handle_id (&self->await_both_errors_id, g_source_remove); | ^~~~~~~~~~~~~~~~~~~~~~~ | 415 | g_clear_handle_id (&self->await_both_errors_id, g_source_remove); | ^ Weirdly, it did not seem to affect the build status.
2020-01-09Merge branch 'pcap-config-variable' into 'master'Will Thompson1-1/+2
Makefile: allow passing a custom path to pcap-config See merge request bustle/bustle!15
2020-01-08Makefile: allow passing a custom path to pcap-configThomas Petazzoni1-1/+2
Some build systems need to pass a custom location for the pcap-config script, so let's provide a PCAP_CONFIG variable that allows such customization. Its default value is pcap-config, which preserves the backward compatibility. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2019-10-18Merge branch 'no-hgettext' into 'master'Will Thompson3-2/+16
Setup.hs: Don’t import Gettext.hs without hgettext See merge request bustle/bustle!14
2019-10-18cabal: Disable hgettext by defaultJan Tojnar1-1/+1
It is broken and there are no translations anyway.
2019-10-18UI: Fix buildJan Tojnar1-1/+2
Bustle/UI.hs:490:3: error: • No instance for (Control.Monad.Fail.MonadFail (Bustle BConfig BState)) arising from a do statement with the failable pattern ‘[openItem, openTwoItem]’ • In a stmt of a 'do' block: [openItem, openTwoItem] <- mapM (getW castToMenuItem) ["open", "openTwo"] In the expression: do builder <- io builderNew io $ builderAddFromFile builder =<< getDataFileName "data/bustle.ui" let getW cast name = io $ builderGetObject builder cast name window <- getW castToWindow "diagramWindow" .... In an equation for ‘emptyWindow’: emptyWindow = do builder <- io builderNew io $ builderAddFromFile builder =<< getDataFileName "data/bustle.ui" let getW cast name = ... .... | 490 | [openItem, openTwoItem] <- mapM (getW castToMenuItem) ["open", "openTwo"] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2019-10-18Setup.hs: Don’t import Gettext.hs without hgettextJan Tojnar1-0/+13
Gettext.hs is broken with Cabal ≥ 2.4 so until we fix it, I made importing it conditional on the value of `hgettext` flag, so that the builds still work.
2019-03-13Add DOAP fileWill Thompson2-0/+24
This is used by tools like GNOME Builder to show some project metadata.
2019-03-08Bump version to 0.7.5.1Will Thompson1-1/+1
2019-03-08News for 0.7.5bustle-0.7.5Will Thompson3-2/+21
2019-03-08Don't check in messages.potWill Thompson4-328/+1
It's traditional not to do this because of the likelihood that it will drift out of date. This does make life a little harder for translators, but we've never seen one in half a decade...
2019-03-07Renderer: build fake names more quietlyWill Thompson1-15/+7
This is expected, not an error. We can also just track the next available fake name, rather than scanning the map each time.
2019-03-07Renderer: use Data.Map.StrictWill Thompson1-2/+2
We don't need any of these maps to be lazy; they will all be fully-evaluated.
2019-03-07Pcap: drop unused importsWill Thompson1-6/+1
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-14 05:41:03 +0000