[-- Attachment #1: Type: text/plain, Size: 1609 bytes --] There is a new pull request by ailiop-git against master on the void-packages repository https://github.com/ailiop-git/void-packages ulogd https://github.com/void-linux/void-packages/pull/31331 ulogd: enable pcap output as a build option <!-- Mark items with [x] where applicable --> #### General - [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements) #### Have the results of the proposed changes been tested? - [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me - [ ] I generally don't use the affected packages but briefly tested this PR <!-- If GitHub CI cannot be used to validate the build result (for example, if the build is likely to take several hours), make sure to [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration). When skipping CI, uncomment and fill out the following section. Note: for builds that are likely to complete in less than 2 hours, it is not acceptable to skip CI. --> <!-- #### Does it build and run successfully? (Please choose at least one native build and, if supported, at least one cross build. More are better.) - [ ] I built this PR locally for my native architecture, (ARCH-LIBC) - [ ] I built this PR locally for these architectures (if supported. mark crossbuilds): - [ ] aarch64-musl - [ ] armv7l - [ ] armv6l-musl --> A patch file from https://github.com/void-linux/void-packages/pull/31331.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-ulogd-31331.patch --] [-- Type: text/x-diff, Size: 1613 bytes --] From 8e62caad68a73208053a53ed67dbc199dfd770db Mon Sep 17 00:00:00 2001 From: Anthony Iliopoulos <ailiop@altatus.com> Date: Mon, 7 Jun 2021 01:11:45 +0200 Subject: [PATCH] ulogd: enable pcap output as a build option --- srcpkgs/ulogd/template | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/srcpkgs/ulogd/template b/srcpkgs/ulogd/template index d656fbe7a3d5..424d13220cd9 100644 --- a/srcpkgs/ulogd/template +++ b/srcpkgs/ulogd/template @@ -1,21 +1,25 @@ # Template file for 'ulogd' pkgname=ulogd version=2.0.7 -revision=1 +revision=2 build_style=gnu-configure -maintainer="Cameron Nemo <cnemo@tutanota.com>" +configure_args="--sbindir=/usr/bin" hostmakedepends="pkg-config automake" makedepends="libnfnetlink-devel libmnl-devel libnetfilter_log-devel - libnetfilter_conntrack-devel libnetfilter_acct-devel" + libnetfilter_conntrack-devel libnetfilter_acct-devel + $(vopt_if pcap libpcap-devel)" +short_desc="Userspace logging daemon for netfilter/iptables related logging" +maintainer="Cameron Nemo <cnemo@tutanota.com>" license="GPL-2.0-only" homepage="http://www.netfilter.org/projects/ulogd/" -short_desc="A userspace logging daemon for netfilter/iptables related logging" distfiles="${homepage}/files/${pkgname}-${version}.tar.bz2" checksum=990a05494d9c16029ba0a83f3b7294fc05c756546b8d60d1c1572dc25249a92b -configure_args="--sbindir=/usr/bin" CFLAGS="-D_GNU_SOURCE" system_accounts="_ulogd" +build_options="pcap" +build_options_default="pcap" + post_install() { vinstall ulogd.conf 644 etc vinstall ${FILESDIR}/ulogd.logrotate 644 etc/logrotate.d ulogd
[-- Attachment #1: Type: text/plain, Size: 189 bytes --] New comment by ahesford on void-packages repository https://github.com/void-linux/void-packages/pull/31331#issuecomment-855953448 Comment: What's the point of making this a build option?
[-- Attachment #1: Type: text/plain, Size: 653 bytes --] New comment by ailiop-git on void-packages repository https://github.com/void-linux/void-packages/pull/31331#issuecomment-855958358 Comment: > What's the point of making this a build option? There are a whole lot of optional output plugins apart from pcap (pgsql, mysql, sqlite, etc), and it doesn't always makes sense to support everything. It is conceivable that some people may not even want to have pcap as a dependency in their systems. So irrespective of what the default build options may be, it's always good to give more flexibility to the build files so that people that care about having packages with minimal dependencies can do so.
[-- Attachment #1: Type: text/plain, Size: 1023 bytes --] New comment by ericonr on void-packages repository https://github.com/void-linux/void-packages/pull/31331#issuecomment-858199760 Comment: It doesn't seem to have created any additional dependency in the binary package, I assume because it dlopens things? In this case I agree with ahesford that a build option isn't truly necessary, but it doesn't hurt either. In any case, if you can confirm the new plugin is working, I'd feel comfortable merging as is. ``` => ulogd-2.0.7_2: running pre-pkg hook: 04-generate-runtime-deps ... SONAME: libc.so.6 <-> glibc>=2.32_1 SONAME: ld-linux-armhf.so.3 <-> glibc>=2.32_1 SONAME: libnetfilter_log.so.1 <-> libnetfilter_log>=1.0.1_1 SONAME: libnfnetlink.so.0 <-> libnfnetlink>=1.0.1_1 SONAME: libmnl.so.0 <-> libmnl>=1.0.3_1 SONAME: libnetfilter_acct.so.1 <-> libnetfilter_acct>=1.0.2_1 SONAME: libnetfilter_conntrack.so.3 <-> libnetfilter_conntrack>=1.0.4_1 SONAME: libdl.so.2 <-> glibc>=2.32_1 SONAME: libpthread.so.0 <-> glibc>=2.32_1 ```
[-- Attachment #1: Type: text/plain, Size: 2219 bytes --] New comment by ailiop-git on void-packages repository https://github.com/void-linux/void-packages/pull/31331#issuecomment-858473922 Comment: > It doesn't seem to have created any additional dependency in the binary package, I assume because it dlopens things? Good catch. Yes, ulogd dlopens all the plugins, but that's not all. Wouldn't 04-generate-runtime-deps.sh scan all the shared objects anyway and pick up the deps? I think the issue is that the particular plugin doesn't actually depend on libpcap at runtime: ``` $ ldd ulogd_output_PCAP.so linux-vdso.so.1 (0x00007ffd0b919000) libc.so.6 => /usr/lib/libc.so.6 (0x00007f68d00bc000) /usr/lib64/ld-linux-x86-64.so.2 (0x00007f68d028e000) ``` despite the plugin being compiled with the intention of linking against libpcap: `libtool: link: cc -shared -Wl,--as-needed -fPIC -DPIC .libs/ulogd_output_PCAP.o -lpcap -mtune=generic -O2 -g -Wl,-z -Wl,relro -Wl,-z -Wl,now -Wl,--as-needed -Wl,-soname -Wl,ulogd_output_PCAP.so -o .libs/ulogd_output_PCAP.so ` That's because from what is seems there's really no actual code dependency to libpcap (the ulog plugin output doesn't use any functionality), so it only needs pcap.h during compilation for some structs. So we really don't need the build option (not for the pcap output plugin at least), so I'll push again making it unconditional. I suppose also a patch is needed for upstream to remove linking against pcap since this is not really needed.
[-- Attachment #1: Type: text/plain, Size: 1614 bytes --] There is an updated pull request by ailiop-git against master on the void-packages repository https://github.com/ailiop-git/void-packages ulogd https://github.com/void-linux/void-packages/pull/31331 ulogd: enable pcap output as a build option <!-- Mark items with [x] where applicable --> #### General - [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements) #### Have the results of the proposed changes been tested? - [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me - [ ] I generally don't use the affected packages but briefly tested this PR <!-- If GitHub CI cannot be used to validate the build result (for example, if the build is likely to take several hours), make sure to [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration). When skipping CI, uncomment and fill out the following section. Note: for builds that are likely to complete in less than 2 hours, it is not acceptable to skip CI. --> <!-- #### Does it build and run successfully? (Please choose at least one native build and, if supported, at least one cross build. More are better.) - [ ] I built this PR locally for my native architecture, (ARCH-LIBC) - [ ] I built this PR locally for these architectures (if supported. mark crossbuilds): - [ ] aarch64-musl - [ ] armv7l - [ ] armv6l-musl --> A patch file from https://github.com/void-linux/void-packages/pull/31331.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-ulogd-31331.patch --] [-- Type: text/x-diff, Size: 1417 bytes --] From 31e5d86e0924c5291fe43471258c128a301e2c17 Mon Sep 17 00:00:00 2001 From: Anthony Iliopoulos <ailiop@altatus.com> Date: Mon, 7 Jun 2021 01:11:45 +0200 Subject: [PATCH] ulogd: enable the pcap output plugin --- srcpkgs/ulogd/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/ulogd/template b/srcpkgs/ulogd/template index d656fbe7a3d5..55e9ae34a0e1 100644 --- a/srcpkgs/ulogd/template +++ b/srcpkgs/ulogd/template @@ -1,18 +1,18 @@ # Template file for 'ulogd' pkgname=ulogd version=2.0.7 -revision=1 +revision=2 build_style=gnu-configure -maintainer="Cameron Nemo <cnemo@tutanota.com>" +configure_args="--sbindir=/usr/bin" hostmakedepends="pkg-config automake" makedepends="libnfnetlink-devel libmnl-devel libnetfilter_log-devel - libnetfilter_conntrack-devel libnetfilter_acct-devel" + libnetfilter_conntrack-devel libnetfilter_acct-devel libpcap-devel" +short_desc="Userspace logging daemon for netfilter/iptables related logging" +maintainer="Cameron Nemo <cnemo@tutanota.com>" license="GPL-2.0-only" homepage="http://www.netfilter.org/projects/ulogd/" -short_desc="A userspace logging daemon for netfilter/iptables related logging" distfiles="${homepage}/files/${pkgname}-${version}.tar.bz2" checksum=990a05494d9c16029ba0a83f3b7294fc05c756546b8d60d1c1572dc25249a92b -configure_args="--sbindir=/usr/bin" CFLAGS="-D_GNU_SOURCE" system_accounts="_ulogd"
[-- Attachment #1: Type: text/plain, Size: 1454 bytes --] There's a merged pull request on the void-packages repository ulogd: enable pcap output as a build option https://github.com/void-linux/void-packages/pull/31331 Description: <!-- Mark items with [x] where applicable --> #### General - [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements) #### Have the results of the proposed changes been tested? - [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me - [ ] I generally don't use the affected packages but briefly tested this PR <!-- If GitHub CI cannot be used to validate the build result (for example, if the build is likely to take several hours), make sure to [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration). When skipping CI, uncomment and fill out the following section. Note: for builds that are likely to complete in less than 2 hours, it is not acceptable to skip CI. --> <!-- #### Does it build and run successfully? (Please choose at least one native build and, if supported, at least one cross build. More are better.) - [ ] I built this PR locally for my native architecture, (ARCH-LIBC) - [ ] I built this PR locally for these architectures (if supported. mark crossbuilds): - [ ] aarch64-musl - [ ] armv7l - [ ] armv6l-musl -->
[-- Attachment #1: Type: text/plain, Size: 157 bytes --] New comment by ericonr on void-packages repository https://github.com/void-linux/void-packages/pull/31331#issuecomment-858684993 Comment: Great, thanks :)