From ca25528ad3d30c0209cf692dd4755d731f7c624d Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Mon, 7 Nov 2022 16:28:24 +0800 Subject: ulogd2: upgrade 2.0.7 -> 2.0.8 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../recipes-filter/ulogd2/ulogd2_2.0.7.bb | 80 ---------------------- .../recipes-filter/ulogd2/ulogd2_2.0.8.bb | 80 ++++++++++++++++++++++ 2 files changed, 80 insertions(+), 80 deletions(-) delete mode 100644 meta-networking/recipes-filter/ulogd2/ulogd2_2.0.7.bb create mode 100644 meta-networking/recipes-filter/ulogd2/ulogd2_2.0.8.bb (limited to 'meta-networking') diff --git a/meta-networking/recipes-filter/ulogd2/ulogd2_2.0.7.bb b/meta-networking/recipes-filter/ulogd2/ulogd2_2.0.7.bb deleted file mode 100644 index 7a307dc292..0000000000 --- a/meta-networking/recipes-filter/ulogd2/ulogd2_2.0.7.bb +++ /dev/null @@ -1,80 +0,0 @@ -SUMMARY = "Userspace logging daemon for netfilter/iptables" -DESCRIPTION = "ulogd-2.x provides a flexible, almost universal logging daemon for \ -netfilter logging. This encompasses both packet-based logging (logging of \ -policy violations) and flow-based logging, e.g. for accounting purpose." -HOMEPAGE = "https://www.netfilter.org/projects/ulogd/index.html" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b" - -DEPENDS = "libnfnetlink" -PROVIDES = "ulogd" - -PV .= "+git${SRCPV}" - -SRC_URI = "git://git.netfilter.org/ulogd2;branch=master \ - file://ulogd.init \ - file://ulogd.service \ -" -SRCREV = "5f9628c9273815b6e560603427fe86118e7cb5bb" - -S = "${WORKDIR}/git" - -inherit autotools manpages pkgconfig systemd update-rc.d - -PACKAGECONFIG ?= "dbi json nfacct nfct nflog pcap sqlite3 ulog" -PACKAGECONFIG[dbi] = "--enable-dbi,--disable-dbi,libdbi" -PACKAGECONFIG[json] = "--enable-json,--disable-json,jansson" -PACKAGECONFIG[manpages] = "" -PACKAGECONFIG[mysql] = "--enable-mysql,--disable-mysql,mysql5" -PACKAGECONFIG[nfacct] = "--enable-nfacct,--disable-nfacct,libnetfilter-acct" -PACKAGECONFIG[nfct] = "--enable-nfct,--disable-nfct,libnetfilter-conntrack" -PACKAGECONFIG[nflog] = "--enable-nflog,--disable-nflog,libnetfilter-log" -PACKAGECONFIG[pcap] = "--enable-pcap,--disable-pcap,libpcap" -PACKAGECONFIG[pgsql] = "--enable-pgsql,--disable-pgsql,postgresql" -PACKAGECONFIG[sqlite3] = "--enable-sqlite3,--disable-sqlite3,sqlite3" -PACKAGECONFIG[ulog] = "--enable-ulog,--disable-ulog" - -do_install:append () { - install -d ${D}${sysconfdir} - install -m 0644 ${B}/ulogd.conf ${D}${sysconfdir}/ulogd.conf - - install -d ${D}${mandir}/man8 - install -m 0644 ${S}/ulogd.8 ${D}${mandir}/man8/ulogd.8 - - install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/ulogd.service ${D}${systemd_system_unitdir} - sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_system_unitdir}/ulogd.service - - install -d ${D}${sysconfdir}/init.d - install -m 755 ${WORKDIR}/ulogd.init ${D}${sysconfdir}/init.d/ulogd -} - -PACKAGES += "${PN}-plugins" -ALLOW_EMPTY:${PN}-plugins = "1" - -PACKAGES_DYNAMIC += "^${PN}-plugin-.*$" -NOAUTOPACKAGEDEBUG = "1" - -CONFFILES:${PN} = "${sysconfdir}/ulogd.conf" -RRECOMMENDS:${PN} += "${PN}-plugins" - -FILES:${PN}-dbg += "${sbindir}/.debug" - -python split_ulogd_libs () { - libdir = d.expand('${libdir}/ulogd') - dbglibdir = os.path.join(libdir, '.debug') - - split_packages = do_split_packages(d, libdir, r'^ulogd_.*\_([A-Z0-9]*).so', '${PN}-plugin-%s', 'ulogd2 %s plugin', prepend=True) - split_dbg_packages = do_split_packages(d, dbglibdir, r'^ulogd_.*\_([A-Z0-9]*).so', '${PN}-plugin-%s-dbg', 'ulogd2 %s plugin - Debugging files', prepend=True, extra_depends='${PN}-dbg') - - if split_packages: - pn = d.getVar('PN') - d.setVar('RRECOMMENDS:' + pn + '-plugins', ' '.join(split_packages)) - d.appendVar('RRECOMMENDS:' + pn + '-dbg', ' ' + ' '.join(split_dbg_packages)) -} -PACKAGESPLITFUNCS:prepend = "split_ulogd_libs " - -SYSTEMD_SERVICE:${PN} = "ulogd.service" - -INITSCRIPT_NAME = "ulogd" -INITSCRIPT_PARAMS = "defaults" diff --git a/meta-networking/recipes-filter/ulogd2/ulogd2_2.0.8.bb b/meta-networking/recipes-filter/ulogd2/ulogd2_2.0.8.bb new file mode 100644 index 0000000000..19bd32ccd4 --- /dev/null +++ b/meta-networking/recipes-filter/ulogd2/ulogd2_2.0.8.bb @@ -0,0 +1,80 @@ +SUMMARY = "Userspace logging daemon for netfilter/iptables" +DESCRIPTION = "ulogd-2.x provides a flexible, almost universal logging daemon for \ +netfilter logging. This encompasses both packet-based logging (logging of \ +policy violations) and flow-based logging, e.g. for accounting purpose." +HOMEPAGE = "https://www.netfilter.org/projects/ulogd/index.html" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b" + +DEPENDS = "libnfnetlink" +PROVIDES = "ulogd" + +PV .= "+git${SRCPV}" + +SRC_URI = "git://git.netfilter.org/ulogd2;branch=master \ + file://ulogd.init \ + file://ulogd.service \ +" +SRCREV = "79aa980f2df9dda0c097e8f883a62f414b9e5138" + +S = "${WORKDIR}/git" + +inherit autotools manpages pkgconfig systemd update-rc.d + +PACKAGECONFIG ?= "dbi json nfacct nfct nflog pcap sqlite3 ulog" +PACKAGECONFIG[dbi] = "--enable-dbi,--disable-dbi,libdbi" +PACKAGECONFIG[json] = "--enable-json,--disable-json,jansson" +PACKAGECONFIG[manpages] = "" +PACKAGECONFIG[mysql] = "--enable-mysql,--disable-mysql,mysql5" +PACKAGECONFIG[nfacct] = "--enable-nfacct,--disable-nfacct,libnetfilter-acct" +PACKAGECONFIG[nfct] = "--enable-nfct,--disable-nfct,libnetfilter-conntrack" +PACKAGECONFIG[nflog] = "--enable-nflog,--disable-nflog,libnetfilter-log" +PACKAGECONFIG[pcap] = "--enable-pcap,--disable-pcap,libpcap" +PACKAGECONFIG[pgsql] = "--enable-pgsql,--disable-pgsql,postgresql" +PACKAGECONFIG[sqlite3] = "--enable-sqlite3,--disable-sqlite3,sqlite3" +PACKAGECONFIG[ulog] = "--enable-ulog,--disable-ulog" + +do_install:append () { + install -d ${D}${sysconfdir} + install -m 0644 ${B}/ulogd.conf ${D}${sysconfdir}/ulogd.conf + + install -d ${D}${mandir}/man8 + install -m 0644 ${S}/ulogd.8 ${D}${mandir}/man8/ulogd.8 + + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/ulogd.service ${D}${systemd_system_unitdir} + sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_system_unitdir}/ulogd.service + + install -d ${D}${sysconfdir}/init.d + install -m 755 ${WORKDIR}/ulogd.init ${D}${sysconfdir}/init.d/ulogd +} + +PACKAGES += "${PN}-plugins" +ALLOW_EMPTY:${PN}-plugins = "1" + +PACKAGES_DYNAMIC += "^${PN}-plugin-.*$" +NOAUTOPACKAGEDEBUG = "1" + +CONFFILES:${PN} = "${sysconfdir}/ulogd.conf" +RRECOMMENDS:${PN} += "${PN}-plugins" + +FILES:${PN}-dbg += "${sbindir}/.debug" + +python split_ulogd_libs () { + libdir = d.expand('${libdir}/ulogd') + dbglibdir = os.path.join(libdir, '.debug') + + split_packages = do_split_packages(d, libdir, r'^ulogd_.*\_([A-Z0-9]*).so', '${PN}-plugin-%s', 'ulogd2 %s plugin', prepend=True) + split_dbg_packages = do_split_packages(d, dbglibdir, r'^ulogd_.*\_([A-Z0-9]*).so', '${PN}-plugin-%s-dbg', 'ulogd2 %s plugin - Debugging files', prepend=True, extra_depends='${PN}-dbg') + + if split_packages: + pn = d.getVar('PN') + d.setVar('RRECOMMENDS:' + pn + '-plugins', ' '.join(split_packages)) + d.appendVar('RRECOMMENDS:' + pn + '-dbg', ' ' + ' '.join(split_dbg_packages)) +} +PACKAGESPLITFUNCS:prepend = "split_ulogd_libs " + +SYSTEMD_SERVICE:${PN} = "ulogd.service" + +INITSCRIPT_NAME = "ulogd" +INITSCRIPT_PARAMS = "defaults" -- cgit v1.2.3-54-g00ecf