Development July 2023

development@lists.ipfire.org

8 participants
63 discussions

[PATCH] kernel: fix rootfile
by Arne Fitzenreiter 21 Jul '23

21 Jul '23

Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> --- config/rootfiles/common/aarch64/linux | 2 ++ config/rootfiles/common/x86_64/linux | 2 ++ 2 files changed, 4 insertions(+) diff --git a/config/rootfiles/common/aarch64/linux b/config/rootfiles/common/aarch64/linux index 49bbc7c57..230e419d3 100644 --- a/config/rootfiles/common/aarch64/linux +++ b/config/rootfiles/common/aarch64/linux @@ -7229,6 +7229,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/BTRFS_FS #lib/modules/KVER-ipfire/build/include/config/BTRFS_FS_POSIX_ACL #lib/modules/KVER-ipfire/build/include/config/BUG +#lib/modules/KVER-ipfire/build/include/config/BUG_ON_DATA_CORRUPTION #lib/modules/KVER-ipfire/build/include/config/BUILDTIME_TABLE_SORT #lib/modules/KVER-ipfire/build/include/config/BUILD_SALT #lib/modules/KVER-ipfire/build/include/config/CACHEFILES @@ -7624,6 +7625,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/DEBUG_BUGVERBOSE #lib/modules/KVER-ipfire/build/include/config/DEBUG_INFO_NONE #lib/modules/KVER-ipfire/build/include/config/DEBUG_KERNEL +#lib/modules/KVER-ipfire/build/include/config/DEBUG_LIST #lib/modules/KVER-ipfire/build/include/config/DEBUG_MISC #lib/modules/KVER-ipfire/build/include/config/DEBUG_PREEMPT #lib/modules/KVER-ipfire/build/include/config/DEBUG_SHIRQ diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x86_64/linux index 512246b73..3db69b01c 100644 --- a/config/rootfiles/common/x86_64/linux +++ b/config/rootfiles/common/x86_64/linux @@ -6985,6 +6985,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/BTRFS_FS_POSIX_ACL #lib/modules/KVER-ipfire/build/include/config/BTT #lib/modules/KVER-ipfire/build/include/config/BUG +#lib/modules/KVER-ipfire/build/include/config/BUG_ON_DATA_CORRUPTION #lib/modules/KVER-ipfire/build/include/config/BUILDTIME_MCOUNT_SORT #lib/modules/KVER-ipfire/build/include/config/BUILDTIME_TABLE_SORT #lib/modules/KVER-ipfire/build/include/config/BUILD_SALT @@ -7328,6 +7329,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/DEBUG_BUGVERBOSE #lib/modules/KVER-ipfire/build/include/config/DEBUG_INFO_NONE #lib/modules/KVER-ipfire/build/include/config/DEBUG_KERNEL +#lib/modules/KVER-ipfire/build/include/config/DEBUG_LIST #lib/modules/KVER-ipfire/build/include/config/DEBUG_MISC #lib/modules/KVER-ipfire/build/include/config/DEBUG_PREEMPT #lib/modules/KVER-ipfire/build/include/config/DEBUG_WX -- 2.34.1

1 0

[PATCH] openssh: Update to version 9.3p2 - Fixes CVE-2023-38408
by Adolf Belka 20 Jul '23

20 Jul '23

- Update from version 9.3p1 to 9.3p2 - Update of rootfile not required - Changelog 9.3p2 (2023-07-19) This release fixes a security bug. Security Fix CVE-2023-38408 - a condition where specific libaries loaded via ssh-agent(1)'s PKCS#11 support could be abused to achieve remote code execution via a forwarded agent socket if the following conditions are met: * Exploitation requires the presence of specific libraries on the victim system. * Remote exploitation requires that the agent was forwarded to an attacker-controlled system. Exploitation can also be prevented by starting ssh-agent(1) with an empty PKCS#11/FIDO allowlist (ssh-agent -P '') or by configuring an allowlist that contains only specific provider libraries. This vulnerability was discovered and demonstrated to be exploitable by the Qualys Security Advisory team. In addition to removing the main precondition for exploitation, this release removes the ability for remote ssh-agent(1) clients to load PKCS#11 modules by default (see below). Potentially-incompatible changes * ssh-agent(8): the agent will now refuse requests to load PKCS#11 modules issued by remote clients by default. A flag has been added to restore the previous behaviour "-Oallow-remote-pkcs11". Note that ssh-agent(8) depends on the SSH client to identify requests that are remote. The OpenSSH >=8.9 ssh(1) client does this, but forwarding access to an agent socket using other tools may circumvent this restriction. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- lfs/openssh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lfs/openssh b/lfs/openssh index 5a18edd70..83c94ffdc 100644 --- a/lfs/openssh +++ b/lfs/openssh @@ -24,7 +24,7 @@ include Config -VER = 9.3p1 +VER = 9.3p2 THISAPP = openssh-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 45578edf98bba3d23c7cefe60d8a7d3079e7c6676459f7422ace7a2461ab96943fbcadb478633a80f40bc098f2435722850b563714adb78b14922be53cb5753d +$(DL_FILE)_BLAKE2 = 38f8d4ada263112b318fafccabf0a33a004d8290a867434004eb3d37127c9bdabe6e0225fca9d6d68fb54338fec81dcc9313ca7c91d3a033311db44174dc9f6f install : $(TARGET) -- 2.41.0

1 0

[PATCH 0/2] zabbix_agentd: Update to 6.0.19 + new ovpn metrics
by Robin Roevens 19 Jul '23

19 Jul '23

Hi all A new version of the zabbix_agentd LTS, containing a few bug fixes. As an additional patch I have added 2 new metrics (items) to the agent for the user to check if they want: - ipfire.ovpn.clients.discovery which returns a JSON string with all configured ovpn clients from /var/ipfire/ovpn/ovpnconfig. This can be used by Zabbix to automatically discover any configured openvpn clients and start monitoring them. - ipfire.ovpn.statusreport.gget which returns a JSON string with the parsed content of /var/run/ovpnserver.log. This can be used by Zabbix to effectively monitor discovered configured clients: bytes in/out, connection state, last activity, remote IP, VPN IP. This will of course be documented on the wiki when the patch is merged. For reference, the download link for the zabbix_agentd source used in this patch: https://cdn.zabbix.com/zabbix/sources/stable/6.0/zabbix-6.0.19.tar.gz Regards Robin -- Dit bericht is gescanned op virussen en andere gevaarlijke inhoud door MailScanner en lijkt schoon te zijn.

1 2

[PATCH] ebtables: Update to version 2.0.11
by Adolf Belka 18 Jul '23

18 Jul '23

- Update from version 2.0.10-4 (Sep 2014) to 2.0.11 (Dec 2019) - Update of rootfile - Deletion of patch to prevent installing in usr/local as new tarball now has a ./configure file that enables setting prefix to /usr and sysconfdir to /etc Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/rootfiles/packages/ebtables | 36 +++++-------------- lfs/ebtables | 14 ++++---- ...-should-install-nothing-in-usr-local.patch | 28 --------------- 3 files changed, 17 insertions(+), 61 deletions(-) delete mode 100644 src/patches/ebtables/0001-ebtables-should-install-nothing-in-usr-local.patch diff --git a/config/rootfiles/packages/ebtables b/config/rootfiles/packages/ebtables index 8eab1f62a..fac1cecaa 100644 --- a/config/rootfiles/packages/ebtables +++ b/config/rootfiles/packages/ebtables @@ -1,29 +1,11 @@ etc/ethertypes -#etc/rc.d/init.d/ebtables -#etc/sysconfig/ebtables-config -usr/lib/libebt_802_3.so -usr/lib/libebt_among.so -usr/lib/libebt_arp.so -usr/lib/libebt_arpreply.so -usr/lib/libebt_ip.so -usr/lib/libebt_ip6.so -usr/lib/libebt_limit.so -usr/lib/libebt_log.so -usr/lib/libebt_mark.so -usr/lib/libebt_mark_m.so -usr/lib/libebt_nat.so -usr/lib/libebt_nflog.so -usr/lib/libebt_pkttype.so -usr/lib/libebt_redirect.so -usr/lib/libebt_standard.so -usr/lib/libebt_stp.so -usr/lib/libebt_ulog.so -usr/lib/libebt_vlan.so -usr/lib/libebtable_broute.so -usr/lib/libebtable_filter.so -usr/lib/libebtable_nat.so +usr/lib/libebtc.la usr/lib/libebtc.so -#usr/man/man8/ebtables.8 -usr/sbin/ebtables -usr/sbin/ebtables-restore -usr/sbin/ebtables-save +usr/lib/libebtc.so.0 +usr/lib/libebtc.so.0.0.0 +usr/sbin/ebtables-legacy +usr/sbin/ebtables-legacy-restore +usr/sbin/ebtables-legacy-save +usr/sbin/ebtablesd +usr/sbin/ebtablesu +#usr/share/man/man8/ebtables-legacy.8 diff --git a/lfs/ebtables b/lfs/ebtables index fae20359f..35f158032 100644 --- a/lfs/ebtables +++ b/lfs/ebtables @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> # # # # 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 # @@ -26,15 +26,15 @@ include Config SUMMARY = Ethernet Bridge Tables -VER = 2.0.10-4 +VER = 2.0.11 -THISAPP = ebtables-v$(VER) +THISAPP = ebtables-$(VER) DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = ebtables -PAK_VER = 3 +PAK_VER = 4 DEPS = @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 01995c701c6dbc7495bdf1f0fce61dce51a379dd1a304d2a5174e0190c040ee958833c65be9fd9d6a7601a2f81461ce1f2e9db989081b4fe7dabc5bfcecd57d6 +$(DL_FILE)_BLAKE2 = 62af4c38ad21498e43f41ef96c8abb5704e8d8a48f1327c587b664f36fdfa9849a9a37e59958db56d38019465d8bf1775914f7387fde99a441615913702cf504 install : $(TARGET) @@ -81,7 +81,9 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ebtables/0001-ebtables-should-install-nothing-in-usr-local.patch + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --sysconfdir=/etc cd $(DIR_APP) && make $(MAKETUNING) CFLAGS="$(CFLAGS)" cd $(DIR_APP) && make install @rm -rf $(DIR_APP) diff --git a/src/patches/ebtables/0001-ebtables-should-install-nothing-in-usr-local.patch b/src/patches/ebtables/0001-ebtables-should-install-nothing-in-usr-local.patch deleted file mode 100644 index 2cccb9073..000000000 --- a/src/patches/ebtables/0001-ebtables-should-install-nothing-in-usr-local.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 373fb7d2d22fcf3328702e719793526e215822ca Mon Sep 17 00:00:00 2001 -From: Jonatan Schlag <jonatan.schlag(a)ipfire.org> -Date: Thu, 24 Mar 2016 18:35:51 +0100 -Subject: [PATCH] ebtables should install nothing in usr local - -Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> ---- - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index c1106a4..b5f4447 100644 ---- a/Makefile -+++ b/Makefile -@@ -10,8 +10,8 @@ LOCKDIR:=$(shell echo $(LOCKFILE) | sed 's/$.*$\/.*/\1/')/ - - # default paths - LIBDIR:=/usr/lib --MANDIR:=/usr/local/man --BINDIR:=/usr/local/sbin -+MANDIR:=/usr/man -+BINDIR:=/usr/sbin - ETCDIR:=/etc - INITDIR:=/etc/rc.d/init.d - SYSCONFIGDIR:=/etc/sysconfig --- -2.1.4 - -- 2.41.0

1 0

[PATCH v2] sudo: Update to version 1.9.14p2
by Adolf Belka 18 Jul '23

18 Jul '23

- Update from version 1.9.14 to 1.9.14p2 - Update of rootfile not required - Changelog 1.9.14p2 * Fixed a crash on Linux systems introduced in version 1.9.14 when running a command with a NULL argv[0] if "log_subcmds" or "intercept" is enabled in sudoers. * Fixed a problem with "stair-stepped" output when piping or redirecting the output of a sudo command that takes user input. * Fixed a bug introduced in sudo 1.9.14 that affects matching sudoers rules containing a Runas_Spec with an empty Runas user. These rules should only match when sudo's -g option is used but were matching even without the -g option. GitHub issue #290. 1.9.14p1 * Fixed an invalid free bug in sudo_logsrvd that was introduced in version 1.9.14 which could cause sudo_logsrvd to crash. * The sudoers plugin no longer tries to send the terminal name to the log server when no terminal is present. This bug was introduced in version 1.9.14. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- lfs/sudo | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lfs/sudo b/lfs/sudo index 3a55174d3..cf68bf923 100644 --- a/lfs/sudo +++ b/lfs/sudo @@ -24,7 +24,7 @@ include Config -VER = 1.9.14 +VER = 1.9.14p2 THISAPP = sudo-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 5731eda1cabb23dd3b77851ce1fcde8e1b7efc1b4fa27fe65522c7b8e23c0330003eb2d4ebb47d63416fb3a52db478b2f60ca22da6a2d66cb27c52ea5264749e +$(DL_FILE)_BLAKE2 = a350136731c1c6eca1317a852ce243b270df61ba275608bd0d0ec11760babdb2f9f489b818529484c15a43345fa53c96efd1aa47ab7cc0591c45928ba75c4c85 install : $(TARGET) -- 2.41.0

1 0

[PATCH] harfbuzz: Update to version 8.0.1
by Adolf Belka 18 Jul '23

18 Jul '23

- Update from version 7.3.0 to 8.0.1 - Update of rootfile - Changelog Overview of changes leading to 8.0.1 - Build fix on 32-bit arm. - More speed optimizations: - 60% speedup in retaingids subsetting SourceHanSans-VF. - 38% speed up in subsetting (beyond-64k) mega-merged Noto. - 16% speed up in retain-gid (used for IFT) subsetting of NotoSansCJKkr. Overview of changes leading to 8.0.0 - New, experimental, WebAssembly (WASM) shaper, that provides greater flexibility over OpenType/AAT/Graphite shaping, using WebAssembly embedded inside the font file. Currently WASM shaper is disabled by default and needs to be enabled at build time. For details, see: https://github.com/harfbuzz/harfbuzz/blob/main/docs/wasm-shaper.md For example fonts making use of the WASM shaper, see: https://github.com/simoncozens/wasm-examples - Improvements to Experimental features introduced in earlier releases: - Support for subsetting beyond-64k and VarComposites fonts. - Support for instancing variable fonts with cubic “glyf” table. - Many big speed optimizations: - Up to 89% speedup loading variable fonts for shaping. - Up to 88% speedup in small subsets of large (eg. CJK) fonts (both TTF and OTF), essential for Incremental Font Transfer (IFT). - Over 50% speedup in loading Roboto font for shaping. - Up to 40% speed up in loading (sanitizing) complex fonts. - 30% speed up in shaping Gulzar font. - Over 25% speedup in glyph loading Roboto font. - 10% speed up loading glyph shapes in VarComposite Hangul font. - hb-hashmap optimizations & hashing improvements. - New macro HB_ALWAYS_INLINE. HarfBuzz now inlines functions more aggressively, which results in some speedup at the expense of bigger code size. To disable this feature define the macro to just inline. - New API: +HB_CODEPOINT_INVALID +hb_ot_layout_get_baseline2() +hb_ot_layout_get_baseline_with_fallback2() +hb_ot_layout_get_font_extents() +hb_ot_layout_get_font_extents2() +hb_subset_input_set_axis_range() Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/rootfiles/common/harfbuzz | 8 +++++--- lfs/harfbuzz | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/config/rootfiles/common/harfbuzz b/config/rootfiles/common/harfbuzz index a03367254..882d8b907 100644 --- a/config/rootfiles/common/harfbuzz +++ b/config/rootfiles/common/harfbuzz @@ -44,15 +44,15 @@ #usr/lib/libharfbuzz-cairo.la #usr/lib/libharfbuzz-cairo.so usr/lib/libharfbuzz-cairo.so.0 -usr/lib/libharfbuzz-cairo.so.0.60730.0 +usr/lib/libharfbuzz-cairo.so.0.60801.0 #usr/lib/libharfbuzz-subset.la #usr/lib/libharfbuzz-subset.so usr/lib/libharfbuzz-subset.so.0 -usr/lib/libharfbuzz-subset.so.0.60730.0 +usr/lib/libharfbuzz-subset.so.0.60801.0 #usr/lib/libharfbuzz.la #usr/lib/libharfbuzz.so usr/lib/libharfbuzz.so.0 -usr/lib/libharfbuzz.so.0.60730.0 +usr/lib/libharfbuzz.so.0.60801.0 #usr/lib/pkgconfig/harfbuzz-cairo.pc #usr/lib/pkgconfig/harfbuzz-subset.pc #usr/lib/pkgconfig/harfbuzz.pc @@ -129,6 +129,7 @@ usr/lib/libharfbuzz.so.0.60730.0 #usr/share/gtk-doc/html/harfbuzz/api-index-7-0-0.html #usr/share/gtk-doc/html/harfbuzz/api-index-7-1-0.html #usr/share/gtk-doc/html/harfbuzz/api-index-7-3-0.html +#usr/share/gtk-doc/html/harfbuzz/api-index-8-0-0.html #usr/share/gtk-doc/html/harfbuzz/api-index-full.html #usr/share/gtk-doc/html/harfbuzz/apple-advanced-typography-api.html #usr/share/gtk-doc/html/harfbuzz/buffers-language-script-and-direction.html @@ -232,3 +233,4 @@ usr/lib/libharfbuzz.so.0.60730.0 #usr/share/gtk-doc/html/harfbuzz/why-do-i-need-a-shaping-engine.html #usr/share/gtk-doc/html/harfbuzz/why-is-it-called-harfbuzz.html #usr/share/gtk-doc/html/harfbuzz/working-with-harfbuzz-clusters.html + diff --git a/lfs/harfbuzz b/lfs/harfbuzz index bfc40dba3..9c706f61e 100644 --- a/lfs/harfbuzz +++ b/lfs/harfbuzz @@ -24,7 +24,7 @@ include Config -VER = 7.3.0 +VER = 8.0.1 THISAPP = harfbuzz-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 7b1f6fb0c4c7483ff7a7c27f613b8579af30a304432e1a4e157aec4344449aed93e68443df1f2bc741be6780a6b2214d54804e2df9a20d83c8256b5f98c7fcda +$(DL_FILE)_BLAKE2 = e69305e5cddee2f9a928ab38b6904cc3e6fbafb319ad268047178667639a2a361576051a9a6443352b51adca47bb8998ca5c533afe12eac456c3170e171c1839 install : $(TARGET) -- 2.41.0

1 3

[PATCH] ghostscript: Update to 10.01.2
by Matthias Fischer 16 Jul '23

16 Jul '23

For details see: https://git.ghostscript.com/?p=ghostpdl.git;a=shortlog;h=refs/tags/ghostpdl… Fixes CVE-2023-36664: => https://www.cvedetails.com/cve/CVE-2023-36664/ => https://www.kroll.com/en/insights/publications/cyber/ghostscript-cve-2023-3… Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- config/rootfiles/packages/ghostscript | 326 +++++++++++++------------- lfs/ghostscript | 6 +- 2 files changed, 166 insertions(+), 166 deletions(-) diff --git a/config/rootfiles/packages/ghostscript b/config/rootfiles/packages/ghostscript index 4a5d74d16..fc0d64832 100644 --- a/config/rootfiles/packages/ghostscript +++ b/config/rootfiles/packages/ghostscript @@ -25,170 +25,170 @@ usr/bin/ps2ps usr/bin/ps2ps2 usr/bin/unix-lpr.sh #usr/share/doc/ghostscript -#usr/share/doc/ghostscript/10.01.1 -#usr/share/doc/ghostscript/10.01.1/COPYING -#usr/share/doc/ghostscript/10.01.1/GS9_Color_Management.pdf -#usr/share/doc/ghostscript/10.01.1/Ghostscript.pdf -#usr/share/doc/ghostscript/10.01.1/News.htm +#usr/share/doc/ghostscript/10.01.2 +#usr/share/doc/ghostscript/10.01.2/COPYING +#usr/share/doc/ghostscript/10.01.2/GS9_Color_Management.pdf +#usr/share/doc/ghostscript/10.01.2/Ghostscript.pdf +#usr/share/doc/ghostscript/10.01.2/News.htm #usr/share/ghostscript -#usr/share/ghostscript/10.01.1 -#usr/share/ghostscript/10.01.1/lib -#usr/share/ghostscript/10.01.1/lib/PDFA_def.ps -#usr/share/ghostscript/10.01.1/lib/PDFX_def.ps -#usr/share/ghostscript/10.01.1/lib/PM760p.upp -#usr/share/ghostscript/10.01.1/lib/PM760pl.upp -#usr/share/ghostscript/10.01.1/lib/PM820p.upp -#usr/share/ghostscript/10.01.1/lib/PM820pl.upp -#usr/share/ghostscript/10.01.1/lib/Stc670p.upp -#usr/share/ghostscript/10.01.1/lib/Stc670pl.upp -#usr/share/ghostscript/10.01.1/lib/Stc680p.upp -#usr/share/ghostscript/10.01.1/lib/Stc680pl.upp -#usr/share/ghostscript/10.01.1/lib/Stc740p.upp -#usr/share/ghostscript/10.01.1/lib/Stc740pl.upp -#usr/share/ghostscript/10.01.1/lib/Stc760p.upp -#usr/share/ghostscript/10.01.1/lib/Stc760pl.upp -#usr/share/ghostscript/10.01.1/lib/Stc777p.upp -#usr/share/ghostscript/10.01.1/lib/Stc777pl.upp -#usr/share/ghostscript/10.01.1/lib/Stp720p.upp -#usr/share/ghostscript/10.01.1/lib/Stp720pl.upp -#usr/share/ghostscript/10.01.1/lib/Stp870p.upp -#usr/share/ghostscript/10.01.1/lib/Stp870pl.upp -#usr/share/ghostscript/10.01.1/lib/acctest.ps -#usr/share/ghostscript/10.01.1/lib/align.ps -#usr/share/ghostscript/10.01.1/lib/bj8.rpd -#usr/share/ghostscript/10.01.1/lib/bj8gc12f.upp -#usr/share/ghostscript/10.01.1/lib/bj8hg12f.upp -#usr/share/ghostscript/10.01.1/lib/bj8oh06n.upp -#usr/share/ghostscript/10.01.1/lib/bj8pa06n.upp -#usr/share/ghostscript/10.01.1/lib/bj8pp12f.upp -#usr/share/ghostscript/10.01.1/lib/bj8ts06n.upp -#usr/share/ghostscript/10.01.1/lib/bjc6000a1.upp -#usr/share/ghostscript/10.01.1/lib/bjc6000b1.upp -#usr/share/ghostscript/10.01.1/lib/bjc610a0.upp -#usr/share/ghostscript/10.01.1/lib/bjc610a1.upp -#usr/share/ghostscript/10.01.1/lib/bjc610a2.upp -#usr/share/ghostscript/10.01.1/lib/bjc610a3.upp -#usr/share/ghostscript/10.01.1/lib/bjc610a4.upp -#usr/share/ghostscript/10.01.1/lib/bjc610a5.upp -#usr/share/ghostscript/10.01.1/lib/bjc610a6.upp -#usr/share/ghostscript/10.01.1/lib/bjc610a7.upp -#usr/share/ghostscript/10.01.1/lib/bjc610a8.upp -#usr/share/ghostscript/10.01.1/lib/bjc610b1.upp -#usr/share/ghostscript/10.01.1/lib/bjc610b2.upp -#usr/share/ghostscript/10.01.1/lib/bjc610b3.upp -#usr/share/ghostscript/10.01.1/lib/bjc610b4.upp -#usr/share/ghostscript/10.01.1/lib/bjc610b6.upp -#usr/share/ghostscript/10.01.1/lib/bjc610b7.upp -#usr/share/ghostscript/10.01.1/lib/bjc610b8.upp -#usr/share/ghostscript/10.01.1/lib/caption.ps -#usr/share/ghostscript/10.01.1/lib/cbjc600.ppd -#usr/share/ghostscript/10.01.1/lib/cbjc800.ppd -#usr/share/ghostscript/10.01.1/lib/cdj550.upp -#usr/share/ghostscript/10.01.1/lib/cdj690.upp -#usr/share/ghostscript/10.01.1/lib/cdj690ec.upp -#usr/share/ghostscript/10.01.1/lib/cid2code.ps -#usr/share/ghostscript/10.01.1/lib/dnj750c.upp -#usr/share/ghostscript/10.01.1/lib/dnj750m.upp -#usr/share/ghostscript/10.01.1/lib/docie.ps -#usr/share/ghostscript/10.01.1/lib/font2pcl.ps -#usr/share/ghostscript/10.01.1/lib/ghostpdf.ppd -#usr/share/ghostscript/10.01.1/lib/gs_ce_e.ps -#usr/share/ghostscript/10.01.1/lib/gs_css_e.ps -#usr/share/ghostscript/10.01.1/lib/gs_il2_e.ps -#usr/share/ghostscript/10.01.1/lib/gs_kanji.ps -#usr/share/ghostscript/10.01.1/lib/gs_ksb_e.ps -#usr/share/ghostscript/10.01.1/lib/gs_l.xbm -#usr/share/ghostscript/10.01.1/lib/gs_l.xpm -#usr/share/ghostscript/10.01.1/lib/gs_l_m.xbm -#usr/share/ghostscript/10.01.1/lib/gs_lgo_e.ps -#usr/share/ghostscript/10.01.1/lib/gs_lgx_e.ps -#usr/share/ghostscript/10.01.1/lib/gs_m.xbm -#usr/share/ghostscript/10.01.1/lib/gs_m.xpm -#usr/share/ghostscript/10.01.1/lib/gs_m_m.xbm -#usr/share/ghostscript/10.01.1/lib/gs_s.xbm -#usr/share/ghostscript/10.01.1/lib/gs_s.xpm -#usr/share/ghostscript/10.01.1/lib/gs_s_m.xbm -#usr/share/ghostscript/10.01.1/lib/gs_t.xbm -#usr/share/ghostscript/10.01.1/lib/gs_t.xpm -#usr/share/ghostscript/10.01.1/lib/gs_t_m.xbm -#usr/share/ghostscript/10.01.1/lib/gs_wl1_e.ps -#usr/share/ghostscript/10.01.1/lib/gs_wl2_e.ps -#usr/share/ghostscript/10.01.1/lib/gs_wl5_e.ps -#usr/share/ghostscript/10.01.1/lib/gslp.ps -#usr/share/ghostscript/10.01.1/lib/gsnup.ps -#usr/share/ghostscript/10.01.1/lib/ht_ccsto.ps -#usr/share/ghostscript/10.01.1/lib/image-qa.ps -#usr/share/ghostscript/10.01.1/lib/jispaper.ps -#usr/share/ghostscript/10.01.1/lib/landscap.ps -#usr/share/ghostscript/10.01.1/lib/lines.ps -#usr/share/ghostscript/10.01.1/lib/mkcidfm.ps -#usr/share/ghostscript/10.01.1/lib/necp2x.upp -#usr/share/ghostscript/10.01.1/lib/necp2x6.upp -#usr/share/ghostscript/10.01.1/lib/pdf2dsc.ps -#usr/share/ghostscript/10.01.1/lib/pdf_info.ps -#usr/share/ghostscript/10.01.1/lib/pf2afm.ps -#usr/share/ghostscript/10.01.1/lib/pfbtopfa.ps -#usr/share/ghostscript/10.01.1/lib/ppath.ps -#usr/share/ghostscript/10.01.1/lib/pphs.ps -#usr/share/ghostscript/10.01.1/lib/prfont.ps -#usr/share/ghostscript/10.01.1/lib/printafm.ps -#usr/share/ghostscript/10.01.1/lib/ps2ai.ps -#usr/share/ghostscript/10.01.1/lib/ps2epsi.ps -#usr/share/ghostscript/10.01.1/lib/ras1.upp -#usr/share/ghostscript/10.01.1/lib/ras24.upp -#usr/share/ghostscript/10.01.1/lib/ras3.upp -#usr/share/ghostscript/10.01.1/lib/ras32.upp -#usr/share/ghostscript/10.01.1/lib/ras4.upp -#usr/share/ghostscript/10.01.1/lib/ras8m.upp -#usr/share/ghostscript/10.01.1/lib/rollconv.ps -#usr/share/ghostscript/10.01.1/lib/s400a1.upp -#usr/share/ghostscript/10.01.1/lib/s400b1.upp -#usr/share/ghostscript/10.01.1/lib/sharp.upp -#usr/share/ghostscript/10.01.1/lib/sipixa6.upp -#usr/share/ghostscript/10.01.1/lib/st640ih.upp -#usr/share/ghostscript/10.01.1/lib/st640ihg.upp -#usr/share/ghostscript/10.01.1/lib/st640p.upp -#usr/share/ghostscript/10.01.1/lib/st640pg.upp -#usr/share/ghostscript/10.01.1/lib/st640pl.upp -#usr/share/ghostscript/10.01.1/lib/st640plg.upp -#usr/share/ghostscript/10.01.1/lib/stc.upp -#usr/share/ghostscript/10.01.1/lib/stc1520h.upp -#usr/share/ghostscript/10.01.1/lib/stc2.upp -#usr/share/ghostscript/10.01.1/lib/stc200_h.upp -#usr/share/ghostscript/10.01.1/lib/stc2_h.upp -#usr/share/ghostscript/10.01.1/lib/stc2s_h.upp -#usr/share/ghostscript/10.01.1/lib/stc300.upp -#usr/share/ghostscript/10.01.1/lib/stc300bl.upp -#usr/share/ghostscript/10.01.1/lib/stc300bm.upp -#usr/share/ghostscript/10.01.1/lib/stc500p.upp -#usr/share/ghostscript/10.01.1/lib/stc500ph.upp -#usr/share/ghostscript/10.01.1/lib/stc600ih.upp -#usr/share/ghostscript/10.01.1/lib/stc600p.upp -#usr/share/ghostscript/10.01.1/lib/stc600pl.upp -#usr/share/ghostscript/10.01.1/lib/stc640p.upp -#usr/share/ghostscript/10.01.1/lib/stc740ih.upp -#usr/share/ghostscript/10.01.1/lib/stc800ih.upp -#usr/share/ghostscript/10.01.1/lib/stc800p.upp -#usr/share/ghostscript/10.01.1/lib/stc800pl.upp -#usr/share/ghostscript/10.01.1/lib/stc_h.upp -#usr/share/ghostscript/10.01.1/lib/stc_l.upp -#usr/share/ghostscript/10.01.1/lib/stcany.upp -#usr/share/ghostscript/10.01.1/lib/stcany_h.upp -#usr/share/ghostscript/10.01.1/lib/stcinfo.ps -#usr/share/ghostscript/10.01.1/lib/stcolor.ps -#usr/share/ghostscript/10.01.1/lib/stocht.ps -#usr/share/ghostscript/10.01.1/lib/traceimg.ps -#usr/share/ghostscript/10.01.1/lib/traceop.ps -#usr/share/ghostscript/10.01.1/lib/uninfo.ps -#usr/share/ghostscript/10.01.1/lib/viewcmyk.ps -#usr/share/ghostscript/10.01.1/lib/viewgif.ps -#usr/share/ghostscript/10.01.1/lib/viewjpeg.ps -#usr/share/ghostscript/10.01.1/lib/viewmiff.ps -#usr/share/ghostscript/10.01.1/lib/viewpbm.ps -#usr/share/ghostscript/10.01.1/lib/viewpcx.ps -#usr/share/ghostscript/10.01.1/lib/viewps2a.ps -#usr/share/ghostscript/10.01.1/lib/winmaps.ps -#usr/share/ghostscript/10.01.1/lib/zeroline.ps +#usr/share/ghostscript/10.01.2 +#usr/share/ghostscript/10.01.2/lib +#usr/share/ghostscript/10.01.2/lib/PDFA_def.ps +#usr/share/ghostscript/10.01.2/lib/PDFX_def.ps +#usr/share/ghostscript/10.01.2/lib/PM760p.upp +#usr/share/ghostscript/10.01.2/lib/PM760pl.upp +#usr/share/ghostscript/10.01.2/lib/PM820p.upp +#usr/share/ghostscript/10.01.2/lib/PM820pl.upp +#usr/share/ghostscript/10.01.2/lib/Stc670p.upp +#usr/share/ghostscript/10.01.2/lib/Stc670pl.upp +#usr/share/ghostscript/10.01.2/lib/Stc680p.upp +#usr/share/ghostscript/10.01.2/lib/Stc680pl.upp +#usr/share/ghostscript/10.01.2/lib/Stc740p.upp +#usr/share/ghostscript/10.01.2/lib/Stc740pl.upp +#usr/share/ghostscript/10.01.2/lib/Stc760p.upp +#usr/share/ghostscript/10.01.2/lib/Stc760pl.upp +#usr/share/ghostscript/10.01.2/lib/Stc777p.upp +#usr/share/ghostscript/10.01.2/lib/Stc777pl.upp +#usr/share/ghostscript/10.01.2/lib/Stp720p.upp +#usr/share/ghostscript/10.01.2/lib/Stp720pl.upp +#usr/share/ghostscript/10.01.2/lib/Stp870p.upp +#usr/share/ghostscript/10.01.2/lib/Stp870pl.upp +#usr/share/ghostscript/10.01.2/lib/acctest.ps +#usr/share/ghostscript/10.01.2/lib/align.ps +#usr/share/ghostscript/10.01.2/lib/bj8.rpd +#usr/share/ghostscript/10.01.2/lib/bj8gc12f.upp +#usr/share/ghostscript/10.01.2/lib/bj8hg12f.upp +#usr/share/ghostscript/10.01.2/lib/bj8oh06n.upp +#usr/share/ghostscript/10.01.2/lib/bj8pa06n.upp +#usr/share/ghostscript/10.01.2/lib/bj8pp12f.upp +#usr/share/ghostscript/10.01.2/lib/bj8ts06n.upp +#usr/share/ghostscript/10.01.2/lib/bjc6000a1.upp +#usr/share/ghostscript/10.01.2/lib/bjc6000b1.upp +#usr/share/ghostscript/10.01.2/lib/bjc610a0.upp +#usr/share/ghostscript/10.01.2/lib/bjc610a1.upp +#usr/share/ghostscript/10.01.2/lib/bjc610a2.upp +#usr/share/ghostscript/10.01.2/lib/bjc610a3.upp +#usr/share/ghostscript/10.01.2/lib/bjc610a4.upp +#usr/share/ghostscript/10.01.2/lib/bjc610a5.upp +#usr/share/ghostscript/10.01.2/lib/bjc610a6.upp +#usr/share/ghostscript/10.01.2/lib/bjc610a7.upp +#usr/share/ghostscript/10.01.2/lib/bjc610a8.upp +#usr/share/ghostscript/10.01.2/lib/bjc610b1.upp +#usr/share/ghostscript/10.01.2/lib/bjc610b2.upp +#usr/share/ghostscript/10.01.2/lib/bjc610b3.upp +#usr/share/ghostscript/10.01.2/lib/bjc610b4.upp +#usr/share/ghostscript/10.01.2/lib/bjc610b6.upp +#usr/share/ghostscript/10.01.2/lib/bjc610b7.upp +#usr/share/ghostscript/10.01.2/lib/bjc610b8.upp +#usr/share/ghostscript/10.01.2/lib/caption.ps +#usr/share/ghostscript/10.01.2/lib/cbjc600.ppd +#usr/share/ghostscript/10.01.2/lib/cbjc800.ppd +#usr/share/ghostscript/10.01.2/lib/cdj550.upp +#usr/share/ghostscript/10.01.2/lib/cdj690.upp +#usr/share/ghostscript/10.01.2/lib/cdj690ec.upp +#usr/share/ghostscript/10.01.2/lib/cid2code.ps +#usr/share/ghostscript/10.01.2/lib/dnj750c.upp +#usr/share/ghostscript/10.01.2/lib/dnj750m.upp +#usr/share/ghostscript/10.01.2/lib/docie.ps +#usr/share/ghostscript/10.01.2/lib/font2pcl.ps +#usr/share/ghostscript/10.01.2/lib/ghostpdf.ppd +#usr/share/ghostscript/10.01.2/lib/gs_ce_e.ps +#usr/share/ghostscript/10.01.2/lib/gs_css_e.ps +#usr/share/ghostscript/10.01.2/lib/gs_il2_e.ps +#usr/share/ghostscript/10.01.2/lib/gs_kanji.ps +#usr/share/ghostscript/10.01.2/lib/gs_ksb_e.ps +#usr/share/ghostscript/10.01.2/lib/gs_l.xbm +#usr/share/ghostscript/10.01.2/lib/gs_l.xpm +#usr/share/ghostscript/10.01.2/lib/gs_l_m.xbm +#usr/share/ghostscript/10.01.2/lib/gs_lgo_e.ps +#usr/share/ghostscript/10.01.2/lib/gs_lgx_e.ps +#usr/share/ghostscript/10.01.2/lib/gs_m.xbm +#usr/share/ghostscript/10.01.2/lib/gs_m.xpm +#usr/share/ghostscript/10.01.2/lib/gs_m_m.xbm +#usr/share/ghostscript/10.01.2/lib/gs_s.xbm +#usr/share/ghostscript/10.01.2/lib/gs_s.xpm +#usr/share/ghostscript/10.01.2/lib/gs_s_m.xbm +#usr/share/ghostscript/10.01.2/lib/gs_t.xbm +#usr/share/ghostscript/10.01.2/lib/gs_t.xpm +#usr/share/ghostscript/10.01.2/lib/gs_t_m.xbm +#usr/share/ghostscript/10.01.2/lib/gs_wl1_e.ps +#usr/share/ghostscript/10.01.2/lib/gs_wl2_e.ps +#usr/share/ghostscript/10.01.2/lib/gs_wl5_e.ps +#usr/share/ghostscript/10.01.2/lib/gslp.ps +#usr/share/ghostscript/10.01.2/lib/gsnup.ps +#usr/share/ghostscript/10.01.2/lib/ht_ccsto.ps +#usr/share/ghostscript/10.01.2/lib/image-qa.ps +#usr/share/ghostscript/10.01.2/lib/jispaper.ps +#usr/share/ghostscript/10.01.2/lib/landscap.ps +#usr/share/ghostscript/10.01.2/lib/lines.ps +#usr/share/ghostscript/10.01.2/lib/mkcidfm.ps +#usr/share/ghostscript/10.01.2/lib/necp2x.upp +#usr/share/ghostscript/10.01.2/lib/necp2x6.upp +#usr/share/ghostscript/10.01.2/lib/pdf2dsc.ps +#usr/share/ghostscript/10.01.2/lib/pdf_info.ps +#usr/share/ghostscript/10.01.2/lib/pf2afm.ps +#usr/share/ghostscript/10.01.2/lib/pfbtopfa.ps +#usr/share/ghostscript/10.01.2/lib/ppath.ps +#usr/share/ghostscript/10.01.2/lib/pphs.ps +#usr/share/ghostscript/10.01.2/lib/prfont.ps +#usr/share/ghostscript/10.01.2/lib/printafm.ps +#usr/share/ghostscript/10.01.2/lib/ps2ai.ps +#usr/share/ghostscript/10.01.2/lib/ps2epsi.ps +#usr/share/ghostscript/10.01.2/lib/ras1.upp +#usr/share/ghostscript/10.01.2/lib/ras24.upp +#usr/share/ghostscript/10.01.2/lib/ras3.upp +#usr/share/ghostscript/10.01.2/lib/ras32.upp +#usr/share/ghostscript/10.01.2/lib/ras4.upp +#usr/share/ghostscript/10.01.2/lib/ras8m.upp +#usr/share/ghostscript/10.01.2/lib/rollconv.ps +#usr/share/ghostscript/10.01.2/lib/s400a1.upp +#usr/share/ghostscript/10.01.2/lib/s400b1.upp +#usr/share/ghostscript/10.01.2/lib/sharp.upp +#usr/share/ghostscript/10.01.2/lib/sipixa6.upp +#usr/share/ghostscript/10.01.2/lib/st640ih.upp +#usr/share/ghostscript/10.01.2/lib/st640ihg.upp +#usr/share/ghostscript/10.01.2/lib/st640p.upp +#usr/share/ghostscript/10.01.2/lib/st640pg.upp +#usr/share/ghostscript/10.01.2/lib/st640pl.upp +#usr/share/ghostscript/10.01.2/lib/st640plg.upp +#usr/share/ghostscript/10.01.2/lib/stc.upp +#usr/share/ghostscript/10.01.2/lib/stc1520h.upp +#usr/share/ghostscript/10.01.2/lib/stc2.upp +#usr/share/ghostscript/10.01.2/lib/stc200_h.upp +#usr/share/ghostscript/10.01.2/lib/stc2_h.upp +#usr/share/ghostscript/10.01.2/lib/stc2s_h.upp +#usr/share/ghostscript/10.01.2/lib/stc300.upp +#usr/share/ghostscript/10.01.2/lib/stc300bl.upp +#usr/share/ghostscript/10.01.2/lib/stc300bm.upp +#usr/share/ghostscript/10.01.2/lib/stc500p.upp +#usr/share/ghostscript/10.01.2/lib/stc500ph.upp +#usr/share/ghostscript/10.01.2/lib/stc600ih.upp +#usr/share/ghostscript/10.01.2/lib/stc600p.upp +#usr/share/ghostscript/10.01.2/lib/stc600pl.upp +#usr/share/ghostscript/10.01.2/lib/stc640p.upp +#usr/share/ghostscript/10.01.2/lib/stc740ih.upp +#usr/share/ghostscript/10.01.2/lib/stc800ih.upp +#usr/share/ghostscript/10.01.2/lib/stc800p.upp +#usr/share/ghostscript/10.01.2/lib/stc800pl.upp +#usr/share/ghostscript/10.01.2/lib/stc_h.upp +#usr/share/ghostscript/10.01.2/lib/stc_l.upp +#usr/share/ghostscript/10.01.2/lib/stcany.upp +#usr/share/ghostscript/10.01.2/lib/stcany_h.upp +#usr/share/ghostscript/10.01.2/lib/stcinfo.ps +#usr/share/ghostscript/10.01.2/lib/stcolor.ps +#usr/share/ghostscript/10.01.2/lib/stocht.ps +#usr/share/ghostscript/10.01.2/lib/traceimg.ps +#usr/share/ghostscript/10.01.2/lib/traceop.ps +#usr/share/ghostscript/10.01.2/lib/uninfo.ps +#usr/share/ghostscript/10.01.2/lib/viewcmyk.ps +#usr/share/ghostscript/10.01.2/lib/viewgif.ps +#usr/share/ghostscript/10.01.2/lib/viewjpeg.ps +#usr/share/ghostscript/10.01.2/lib/viewmiff.ps +#usr/share/ghostscript/10.01.2/lib/viewpbm.ps +#usr/share/ghostscript/10.01.2/lib/viewpcx.ps +#usr/share/ghostscript/10.01.2/lib/viewps2a.ps +#usr/share/ghostscript/10.01.2/lib/winmaps.ps +#usr/share/ghostscript/10.01.2/lib/zeroline.ps #usr/share/ghostscript/fonts #usr/share/ghostscript/fonts/COPYING #usr/share/ghostscript/fonts/ChangeLog diff --git a/lfs/ghostscript b/lfs/ghostscript index a0c8350c8..a41375fce 100644 --- a/lfs/ghostscript +++ b/lfs/ghostscript @@ -26,7 +26,7 @@ include Config SUMMARY = The Ghostscript interpreter for PostScript and PDF -VER = 10.01.1 +VER = 10.01.2 THISAPP = ghostscript-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = ghostscript -PAK_VER = 14 +PAK_VER = 15 DEPS = cups dbus @@ -52,7 +52,7 @@ $(DL_FILE) = $(DL_FROM)/$(DL_FILE) ghostscript-fonts-std-8.11.tar.gz = $(URL_IPFIRE)/ghostscript-fonts-std-8.11.tar.gz gnu-gs-fonts-other-6.0.tar.gz = $(URL_IPFIRE)/gnu-gs-fonts-other-6.0.tar.gz -$(DL_FILE)_BLAKE2 = 26f14f11362c7cd6e129044b8e094ad421fc607a702e1f5d10ae03b8ebfb1e76fc094281df739d6ebfa815c6080f1b2223036268474c41d795e2a1e5fc66bab2 +$(DL_FILE)_BLAKE2 = d5bedfe058a9b982da3a5a9935617add8d963291f135e047369439eeb0b1587e697511fe4a2a9633cfb49594d3a36467d1df7904125f53c70d8161dc9825ff32 ghostscript-fonts-std-8.11.tar.gz_BLAKE2 = 1d8ae8f7813623a36e160bdd0ca9ccf33c67b945dd96952eb0e37e9bb5bb4ba5daf7df4da5ba53c1d25d6598a0576990ba7e094b8c395778cb9cdfd32761454c gnu-gs-fonts-other-6.0.tar.gz_BLAKE2 = 001709983161519365bcef23fef3705071b67253ff3b557c45d2ec892987815444d8dd1d213e94bc02e361917c061c723043bf04c98b0a1e38c9cd1f265d1312 -- 2.34.1

1 0

[PATCH] pmacct: Fix for Bug#13163 - no such column: vlan_in [CU 175]
by Adolf Belka 13 Jul '23

13 Jul '23

- This problem occurred with pmacct-1.7.8 and was raised with upstream. They identified a bug and provided a commit with a fix. - Unfortunately the commit can not be used on version 1.7.8 from Dec 2022 as it depends on other commits applied in the period from Dec 2022 to July 2023. - The next version release is likely to come out around Dec 2023 to Mar 2024 based on the previous release frequency (6 to 9 months) - The only alternative was to make a release from the commit stage of the fix. In Github this only provides a zip file. So I extracted the zip file and then re-archived it as a .tar.gz file - Build went successfully and the .ipfire package file was tested successfully by @Jon Fixes: Bug#13163 Tested-by: Jon Murphy <jon.murphy(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- lfs/pmacct | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/lfs/pmacct b/lfs/pmacct index 7c8b32772..bb1079d62 100644 --- a/lfs/pmacct +++ b/lfs/pmacct @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2019-2023 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2019-2023 IPFire Team <info(a)ipfire.org> # # # # 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 # @@ -26,7 +26,7 @@ include Config SUMMARY = Accounting and aggregation toolsuite for IPv4 and IPv6 -VER = 1.7.8 +VER = 5a5e272 THISAPP = pmacct-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = pmacct -PAK_VER = 5 +PAK_VER = 6 DEPS = libcdada @@ -49,7 +49,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 1b95d48c479d59f2d4a7654e870e6f61c984c57c31aebbfb9fbf86f2d1027cde6a0f334489f33186bbb19ee7bdf94726f0053faa4829273de2d1975f58dff97f +$(DL_FILE)_BLAKE2 = 7b86189cde0bcfd1756a03dbcdccde17a5780b3c3f2616a917609ba617de2ad6e08e16ae00f81c90233944157f19ec995bd43c06030ab70da869bb523f0433a7 install : $(TARGET) @@ -82,11 +82,12 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure \ - --prefix=/usr \ - --sysconfdir=/etc/pmacct \ - --enable-sqlite3 \ - --enable-l2 \ + cd $(DIR_APP) && ./autogen.sh + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --sysconfdir=/etc/pmacct \ + --enable-sqlite3 \ + --enable-l2 \ --enable-jansson # Add directory for plugins and pipes -mkdir -v /var/spool/pmacct -- 2.41.0

1 0

[PATCH] fireinfo: Fix SEGV in detect_hypervisor()
by Michael Tremer 13 Jul '23

13 Jul '23

Fixes: #13155 - _fireinfo.detect_hypervisor() rises Segmentation fault Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> --- lfs/fireinfo | 1 + ...-one-error-when-detecting-hypervisor.patch | 38 +++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 src/patches/fireinfo-virt-fix-off-by-one-error-when-detecting-hypervisor.patch diff --git a/lfs/fireinfo b/lfs/fireinfo index 8b38885d6..629626d1e 100644 --- a/lfs/fireinfo +++ b/lfs/fireinfo @@ -75,6 +75,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/fireinfo/fireinfo-2.2.0-python-3.8.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/fireinfo/fireinfo-system-blacklist-jetways-product-uuid.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/fireinfo/fireinfo-system-ignore-when-the-serial-number-is-ssn.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/fireinfo-virt-fix-off-by-one-error-when-detecting-hypervisor.patch cd $(DIR_APP) && [ -x "configure" ] || sh ./autogen.sh cd $(DIR_APP) && ./configure --prefix=/usr diff --git a/src/patches/fireinfo-virt-fix-off-by-one-error-when-detecting-hypervisor.patch b/src/patches/fireinfo-virt-fix-off-by-one-error-when-detecting-hypervisor.patch new file mode 100644 index 000000000..0799ecce5 --- /dev/null +++ b/src/patches/fireinfo-virt-fix-off-by-one-error-when-detecting-hypervisor.patch @@ -0,0 +1,38 @@ +From e3e68b9baa9723916b1999394432e9ad260cfaa2 Mon Sep 17 00:00:00 2001 +From: Michael Tremer <michael.tremer(a)ipfire.org> +Date: Sat, 1 Jul 2023 09:08:48 +0000 +Subject: [PATCH] virt: Fix off-by-one error when detecting hypervisor + +Reported-by: Mauro Condarelli <mc5686(a)mclink.it> +Fixes: #13155 - _fireinfo.detect_hypervisor() rises Segmentation fault +Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> +--- + src/_fireinfo/fireinfo.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/_fireinfo/fireinfo.c b/src/_fireinfo/fireinfo.c +index 1d3f424..18edf34 100644 +--- a/src/_fireinfo/fireinfo.c ++++ b/src/_fireinfo/fireinfo.c +@@ -32,8 +32,8 @@ enum hypervisors { + HYPER_KVM, + HYPER_MSHV, + HYPER_VMWARE, ++ // Must always be last + HYPER_OTHER, +- HYPER_LAST /* for loop - must be last*/ + }; + + const char *hypervisor_ids[] = { +@@ -157,7 +157,7 @@ int detect_hypervisor(int *hypervisor) { + *hypervisor = HYPER_OTHER; + + if (*sig.text) { +- for (int id = HYPER_NONE + 1; id < HYPER_LAST; id++) { ++ for (int id = HYPER_NONE + 1; id < HYPER_OTHER; id++) { + if (strcmp(hypervisor_ids[id], sig.text) == 0) { + *hypervisor = id; + break; +-- +2.39.2 + -- 2.39.2

2 1

[PATCH] dehydrated: Keep going if re-issuing one certificate fails
by Michael Tremer 13 Jul '23

13 Jul '23

This change will make sure that dehydrated will continue if (re-)issuing one or more certificate fails. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> --- config/dehydrated/cron.sh | 2 +- lfs/dehydrated | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/dehydrated/cron.sh b/config/dehydrated/cron.sh index 0aa778a38..f2f842527 100644 --- a/config/dehydrated/cron.sh +++ b/config/dehydrated/cron.sh @@ -1,3 +1,3 @@ #!/bin/bash -exec /usr/bin/dehydrated --cron +exec /usr/bin/dehydrated --cron --keep-going diff --git a/lfs/dehydrated b/lfs/dehydrated index 7cd92076b..821c1433b 100644 --- a/lfs/dehydrated +++ b/lfs/dehydrated @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = dehydrated -PAK_VER = 5 +PAK_VER = 6 DEPS = -- 2.39.2

2 1

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development July 2023