IPFire-SCM February 2021

ipfire-scm@lists.ipfire.org

1 participants
37 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. fe74afee4c3d7f3c6a26b543d9f385a502b5fbbe
by Michael Tremer 08 Feb '21

08 Feb '21

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via fe74afee4c3d7f3c6a26b543d9f385a502b5fbbe (commit) via b8cd517a8dec85a0e334f87a53b52ed07497c3a8 (commit) from 4e4ea96428eb061ad55fd3c40e4404f2bf7940cd (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit fe74afee4c3d7f3c6a26b543d9f385a502b5fbbe Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Feb 8 13:54:49 2021 +0000 core155: Ship net-tools Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b8cd517a8dec85a0e334f87a53b52ed07497c3a8 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Sun Feb 7 19:00:36 2021 +0100 net-tools: Update to 2.10 - Update net-tools from 1.60 to 2.10 - Based on guidance from Michael Tremer - new no-hostname patch created to remove all hostname references from makefile - all other patch files removed from lfs as no longer needed - version 2.10 places ifconfig and route tools in bin instead of sbin those tools moved to sbin to keep in line with previous approach - make update replaced by make install as there is no longer a make rule for make update - Updated rootfiles Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/net-tools | 10 ++- .../{oldcore/77 => core/155}/filelists/net-tools | 0 lfs/net-tools | 22 +++--- src/patches/net-tools-1.60-gcc34-3.patch | 86 ---------------------- src/patches/net-tools-1.60-iphdr-redef.patch | 12 --- src/patches/net-tools-1.60-kernel_headers-3.patch | 55 -------------- src/patches/net-tools-1.60-mii_ioctl-1.patch | 27 ------- src/patches/net-tools-1.60-no-hostname.patch | 52 ------------- src/patches/net-tools-2.10-no-hostname.patch | 41 +++++++++++ 9 files changed, 61 insertions(+), 244 deletions(-) copy config/rootfiles/{oldcore/77 => core/155}/filelists/net-tools (100%) delete mode 100644 src/patches/net-tools-1.60-gcc34-3.patch delete mode 100644 src/patches/net-tools-1.60-iphdr-redef.patch delete mode 100644 src/patches/net-tools-1.60-kernel_headers-3.patch delete mode 100644 src/patches/net-tools-1.60-mii_ioctl-1.patch delete mode 100644 src/patches/net-tools-1.60-no-hostname.patch create mode 100644 src/patches/net-tools-2.10-no-hostname.patch Difference in files: diff --git a/config/rootfiles/common/net-tools b/config/rootfiles/common/net-tools index 4860b2f0a..0578c1bc0 100644 --- a/config/rootfiles/common/net-tools +++ b/config/rootfiles/common/net-tools @@ -1,17 +1,23 @@ +sbin/ifconfig bin/netstat +sbin/route sbin/arp -sbin/ifconfig #sbin/ipmaddr #sbin/iptunnel sbin/mii-tool sbin/nameif #sbin/plipconfig sbin/rarp -sbin/route sbin/slattach +#usr/share/man/man1/dnsdomainname.1 +#usr/share/man/man1/domainname.1 +#usr/share/man/man1/nisdomainname.1 +#usr/share/man/man1/ypdomainname.1 #usr/share/man/man5/ethers.5 #usr/share/man/man8/arp.8 #usr/share/man/man8/ifconfig.8 +#usr/share/man/man8/ipmaddr.8 +#usr/share/man/man8/iptunnel.8 #usr/share/man/man8/mii-tool.8 #usr/share/man/man8/nameif.8 #usr/share/man/man8/netstat.8 diff --git a/config/rootfiles/core/155/filelists/net-tools b/config/rootfiles/core/155/filelists/net-tools new file mode 120000 index 000000000..bac6b00be --- /dev/null +++ b/config/rootfiles/core/155/filelists/net-tools @@ -0,0 +1 @@ +../../../common/net-tools \ No newline at end of file diff --git a/lfs/net-tools b/lfs/net-tools index 3fde55e2d..7a568a260 100644 --- a/lfs/net-tools +++ b/lfs/net-tools @@ -24,10 +24,10 @@ include Config -VER = 1.60 +VER = 2.10 THISAPP = net-tools-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -39,7 +39,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 888774accab40217dde927e21979c165 +$(DL_FILE)_MD5 = 78aae762c95e2d731faf88d482e4cde5 install : $(TARGET) @@ -68,12 +68,8 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/net-tools-1.60-no-hostname.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/$(THISAPP)-gcc34-3.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/$(THISAPP)-kernel_headers-3.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/$(THISAPP)-iphdr-redef.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/$(THISAPP)-mii_ioctl-1.patch + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/net-tools-2.10-no-hostname.patch cd $(DIR_APP) && yes "" | make config cd $(DIR_APP) && sed -i -e 's|HAVE_IP_TOOLS 0|HAVE_IP_TOOLS 1|g' \ -e 's|HAVE_HWSTRIP 1|HAVE_HWSTRIP 0|g' \ @@ -82,6 +78,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) -e 's|HAVE_HWSTRIP 1|HAVE_HWSTRIP 0|g' \ -e 's|# HAVE_MII=0|HAVE_MII=1|g' config.make cd $(DIR_APP) && make - cd $(DIR_APP) && make update + cd $(DIR_APP) && make install + + # Version 2.10 has moved ifconfig and route from sbin to bin + # Move these tools back to sbin to align with previous status in case anyone has + # scripts using these tools with the full pathname defined. + mv -v /bin/{ifconfig,route} /sbin + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/src/patches/net-tools-1.60-gcc34-3.patch b/src/patches/net-tools-1.60-gcc34-3.patch deleted file mode 100644 index e6ec25329..000000000 --- a/src/patches/net-tools-1.60-gcc34-3.patch +++ /dev/null @@ -1,86 +0,0 @@ -Originaly By: Zack Winkles <winkie AT linuxfromscratch DOT org> -Submitted By: Jim Gifford <jim AT linuxfromscratch DOT org> -Date: 2004-06-23 -Initial Package Version: 1.60 -Origin: N/A -Upstream Status: N/A -Description: Fix some occurrences of syntax that GCC 3.4 doesn't like. - -diff -Naur net-tools-1.60.orig/hostname.c net-tools-1.60/hostname.c ---- net-tools-1.60.orig/hostname.c 2001-04-08 17:04:23.000000000 +0000 -+++ net-tools-1.60/hostname.c 2004-06-24 06:22:16.913258663 +0000 -@@ -78,6 +78,7 @@ - fprintf(stderr, _("%s: name too long\n"), program_name); - break; - default: -+ ((void)0); - } - exit(1); - } -@@ -98,6 +99,7 @@ - fprintf(stderr, _("%s: name too long\n"), program_name); - break; - default: -+ ((void)0); - } - exit(1); - }; -@@ -117,6 +119,7 @@ - fprintf(stderr, _("%s: name too long\n"), program_name); - break; - default: -+ ((void)0); - } - exit(1); - }; -@@ -174,6 +177,7 @@ - printf("%s\n", hp->h_name); - break; - default: -+ ((void)0); - } - } - -diff -Naur net-tools-1.60.orig/lib/inet_sr.c net-tools-1.60/lib/inet_sr.c ---- net-tools-1.60.orig/lib/inet_sr.c 2000-02-20 21:46:45.000000000 +0000 -+++ net-tools-1.60/lib/inet_sr.c 2004-06-24 06:22:01.967840446 +0000 -@@ -105,6 +105,7 @@ - case 2: - isnet = 0; break; - default: -+ ((void)0); - } - - /* Fill in the other fields. */ -diff -Naur net-tools-1.60.orig/mii-tool.c net-tools-1.60/mii-tool.c ---- net-tools-1.60.orig/mii-tool.c 2000-05-21 14:31:17.000000000 +0000 -+++ net-tools-1.60/mii-tool.c 2004-06-24 06:22:01.971839755 +0000 -@@ -379,17 +379,17 @@ - /*--------------------------------------------------------------------*/ - - const char *usage = --"usage: %s [-VvRrwl] [-A media,... | -F media] [interface ...] -- -V, --version display version information -- -v, --verbose more verbose output -- -R, --reset reset MII to poweron state -- -r, --restart restart autonegotiation -- -w, --watch monitor for link status changes -- -l, --log with -w, write events to syslog -- -A, --advertise=media,... advertise only specified media -- -F, --force=media force specified media technology --media: 100baseT4, 100baseTx-FD, 100baseTx-HD, 10baseT-FD, 10baseT-HD, -- (to advertise both HD and FD) 100baseTx, 10baseT\n"; -+"usage: %s [-VvRrwl] [-A media,... | -F media] [interface ...]\n" -+" -V, --version display version information\n" -+" -v, --verbose more verbose output\n" -+" -R, --reset reset MII to poweron state\n" -+" -r, --restart restart autonegotiation\n" -+" -w, --watch monitor for link status changes\n" -+" -l, --log with -w, write events to syslog\n" -+" -A, --advertise=media,... advertise only specified media\n" -+" -F, --force=media force specified media technology\n" -+"media: 100baseT4, 100baseTx-FD, 100baseTx-HD, 10baseT-FD, 10baseT-HD,\n" -+" (to advertise both HD and FD) 100baseTx, 10baseT\n"; - - int main(int argc, char **argv) - { diff --git a/src/patches/net-tools-1.60-iphdr-redef.patch b/src/patches/net-tools-1.60-iphdr-redef.patch deleted file mode 100644 index 23b6dfe01..000000000 --- a/src/patches/net-tools-1.60-iphdr-redef.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur net-tools-1.60.org/iptunnel.c net-tools-1.60/iptunnel.c ---- net-tools-1.60.org/iptunnel.c 2001-04-08 19:04:23.000000000 +0200 -+++ net-tools-1.60/iptunnel.c 2017-02-07 17:37:17.956405434 +0100 -@@ -26,7 +26,7 @@ - #include <sys/socket.h> - #include <sys/ioctl.h> - #include <netinet/in.h> --#include <netinet/ip.h> -+#include <linux/ip.h> - #include <arpa/inet.h> - #if defined(__GLIBC__) && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1)) - #include <net/if.h> diff --git a/src/patches/net-tools-1.60-kernel_headers-3.patch b/src/patches/net-tools-1.60-kernel_headers-3.patch deleted file mode 100644 index 89988f0e7..000000000 --- a/src/patches/net-tools-1.60-kernel_headers-3.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff -Naur net-tools-1.60.org/hostname.c net-tools-1.60/hostname.c ---- net-tools-1.60.org/hostname.c 2001-04-08 19:04:23.000000000 +0200 -+++ net-tools-1.60/hostname.c 2013-08-26 11:56:50.131844273 +0200 -@@ -42,10 +42,16 @@ - #include "config.h" - #include "version.h" - #include "../intl.h" -+#include <linux/version.h> - - #if HAVE_AFDECnet -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 0) - #include <netdnet/dn.h> - #endif -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) -+#include <linux/dn.h> -+#endif -+#endif - - char *Release = RELEASE, *Version = "hostname 1.100 (2001-04-14)"; - -diff -Naur net-tools-1.60.org/lib/tr.c net-tools-1.60/lib/tr.c ---- net-tools-1.60.org/lib/tr.c 2000-02-20 22:46:45.000000000 +0100 -+++ net-tools-1.60/lib/tr.c 2013-08-26 11:57:33.675175033 +0200 -@@ -20,7 +20,7 @@ - #include <sys/types.h> - #include <sys/socket.h> - #include <net/if_arp.h> --#include <linux/if_tr.h> -+#include <netinet/if_tr.h> - #include <stdlib.h> - #include <stdio.h> - #include <errno.h> -diff -Naur net-tools-1.60.org/lib/x25_sr.c net-tools-1.60/lib/x25_sr.c ---- net-tools-1.60.org/lib/x25_sr.c 2000-05-20 15:38:10.000000000 +0200 -+++ net-tools-1.60/lib/x25_sr.c 2013-08-26 11:56:50.131844273 +0200 -@@ -22,6 +22,7 @@ - #include <sys/socket.h> - #include <sys/ioctl.h> - #include <linux/x25.h> -+#include <linux/version.h> - #include <ctype.h> - #include <errno.h> - #include <netdb.h> -@@ -77,7 +78,11 @@ - rt.sigdigits=sigdigits; - - /* x25_route_struct.address isn't type struct sockaddr_x25, Why? */ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) - memcpy(&rt.address, &sx25.sx25_addr, sizeof(x25_address)); -+#else -+ memcpy(&rt.address, &sx25.sx25_addr, sizeof(struct x25_address)); -+#endif - - while (*args) { - if (!strcmp(*args,"device") || !strcmp(*args,"dev")) { diff --git a/src/patches/net-tools-1.60-mii_ioctl-1.patch b/src/patches/net-tools-1.60-mii_ioctl-1.patch deleted file mode 100644 index ca8582d51..000000000 --- a/src/patches/net-tools-1.60-mii_ioctl-1.patch +++ /dev/null @@ -1,27 +0,0 @@ -Submitted By: Randy McMurchy <randy_at_linuxfromscratch_dot_org> -Date: 2004-08-27 -Initial Package Version: 1.60 -Upstream Status: N/A (package is unmaintained) -Origin: From Fedora Core (submitted to LFS-Hackers by Kevin White) -Description: Fixes mii-tool when compiled using Linux-2.6.x - -$LastChangedBy: randy $ -$Date: 2004-08-27 21:04:05 -0600 (Fri, 27 Aug 2004) $ - ---- net-tools-1.60/include/mii.h.bar Tue Jul 31 11:49:39 2001 -+++ net-tools-1.60/include/mii.h Tue Jul 31 11:49:33 2001 -@@ -11,11 +11,9 @@ - - /* network interface ioctl's for MII commands */ - #ifndef SIOCGMIIPHY --#define SIOCGMIIPHY (SIOCDEVPRIVATE) /* Read from current PHY */ --#define SIOCGMIIREG (SIOCDEVPRIVATE+1) /* Read any PHY register */ --#define SIOCSMIIREG (SIOCDEVPRIVATE+2) /* Write any PHY register */ --#define SIOCGPARAMS (SIOCDEVPRIVATE+3) /* Read operational parameters */ --#define SIOCSPARAMS (SIOCDEVPRIVATE+4) /* Set operational parameters */ -+#define SIOCGMIIPHY 0x8947 /* Read from current PHY */ -+#define SIOCGMIIREG 0x8948 /* Read any PHY register */ -+#define SIOCSMIIREG 0x8949 /* Write any PHY register */ - #endif - - #include <linux/types.h> diff --git a/src/patches/net-tools-1.60-no-hostname.patch b/src/patches/net-tools-1.60-no-hostname.patch deleted file mode 100644 index e2e34a173..000000000 --- a/src/patches/net-tools-1.60-no-hostname.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- a/Makefile.bak 2014-06-03 19:01:39.758845492 +0000 -+++ b/Makefile 2014-06-03 19:02:34.119171419 +0000 -@@ -76,7 +76,7 @@ - NET_LIB_PATH = lib - NET_LIB_NAME = net-tools - --PROGS := ifconfig hostname arp netstat route rarp slattach plipconfig nameif -+PROGS := ifconfig arp netstat route rarp slattach plipconfig nameif - - -include config.make - ifeq ($(HAVE_IP_TOOLS),1) -@@ -190,9 +190,6 @@ - nameif: nameif.o - $(CC) $(LDFLAGS) -o nameif nameif.o - --hostname: hostname.o -- $(CC) $(LDFLAGS) -o hostname hostname.o $(DNLIB) -- - route: $(NET_LIB) route.o - $(CC) $(LDFLAGS) -o route route.o $(NLIB) $(RESLIB) - -@@ -224,7 +221,6 @@ - install -m 0755 -d ${BASEDIR}/sbin - install -m 0755 -d ${BASEDIR}/bin - install -m 0755 arp ${BASEDIR}/sbin -- install -m 0755 hostname ${BASEDIR}/bin - install -m 0755 ifconfig ${BASEDIR}/sbin - install -m 0755 nameif ${BASEDIR}/sbin - install -m 0755 netstat ${BASEDIR}/bin -@@ -239,21 +235,11 @@ - ifeq ($(HAVE_MII),1) - install -m 0755 mii-tool $(BASEDIR)/sbin - endif -- ln -fs hostname $(BASEDIR)/bin/dnsdomainname -- ln -fs hostname $(BASEDIR)/bin/ypdomainname -- ln -fs hostname $(BASEDIR)/bin/nisdomainname -- ln -fs hostname $(BASEDIR)/bin/domainname --ifeq ($(HAVE_AFDECnet),1) -- ln -fs hostname $(BASEDIR)/bin/nodename --endif - - savebin: - @for i in ${BASEDIR}/sbin/arp ${BASEDIR}/sbin/ifconfig \ - ${BASEDIR}/bin/netstat \ -- ${BASEDIR}/sbin/rarp ${BASEDIR}/sbin/route \ -- ${BASEDIR}/bin/hostname ${BASEDIR}/bin/ypdomainname \ -- ${BASEDIR}/bin/dnsdomainname ${BASEDIR}/bin/nisdomainname \ -- ${BASEDIR}/bin/domainname ; do \ -+ ${BASEDIR}/sbin/rarp ${BASEDIR}/sbin/route; do \ - [ -f $$i ] && cp -f $$i $$i.old ; done ; echo Saved. - - installdata: diff --git a/src/patches/net-tools-2.10-no-hostname.patch b/src/patches/net-tools-2.10-no-hostname.patch new file mode 100644 index 000000000..c96c798ac --- /dev/null +++ b/src/patches/net-tools-2.10-no-hostname.patch @@ -0,0 +1,41 @@ +--- net-tools-2.10/Makefile.orig 2021-01-07 00:22:35.000000000 +0100 ++++ net-tools-2.10/Makefile 2021-02-06 19:30:07.104393812 +0100 +@@ -39,9 +39,6 @@ + ifeq ($(HAVE_ARP_TOOLS),1) + PROGS += arp rarp + endif +-ifeq ($(HAVE_HOSTNAME_TOOLS),1) +-PROGS += hostname +-endif + ifeq ($(HAVE_IP_TOOLS),1) + PROGS += iptunnel ipmaddr + endif +@@ -173,9 +170,6 @@ + nameif: $(NET_LIB) nameif.o + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ nameif.o $(NLIB) $(LDLIBS) + +-hostname: hostname.o +- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ hostname.o $(DNLIB) $(LDLIBS) +- + route: $(NET_LIB) route.o + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ route.o $(NLIB) $(LDLIBS) + +@@ -219,18 +213,6 @@ + install -m 0755 arp ${BASEDIR}${SBINDIR} + install -m 0755 rarp ${BASEDIR}${SBINDIR} + endif +-ifeq ($(HAVE_HOSTNAME_TOOLS),1) +- install -m 0755 hostname ${BASEDIR}${BINDIR} +- ln -fs hostname $(BASEDIR)${BINDIR}/dnsdomainname +-ifeq ($(HAVE_HOSTNAME_SYMLINKS),1) +- ln -fs hostname $(BASEDIR)${BINDIR}/ypdomainname +- ln -fs hostname $(BASEDIR)${BINDIR}/nisdomainname +- ln -fs hostname $(BASEDIR)${BINDIR}/domainname +-endif +-ifeq ($(HAVE_AFDECnet),1) +- ln -fs hostname $(BASEDIR)${BINDIR}/nodename +-endif +-endif + ifeq ($(HAVE_IP_TOOLS),1) + install -m 0755 ipmaddr $(BASEDIR)${SBINDIR} + install -m 0755 iptunnel $(BASEDIR)${SBINDIR} hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4e4ea96428eb061ad55fd3c40e4404f2bf7940cd
by Michael Tremer 08 Feb '21

08 Feb '21

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 4e4ea96428eb061ad55fd3c40e4404f2bf7940cd (commit) via 15bf15f5616b5c6727343f86156a84e1ae6caca5 (commit) via 192f1d8eec065d14a3b5243aa78132adacb25496 (commit) via cfdfffd4387b660fb697d5a0eab574308ace9229 (commit) via f40ae5867167b3d2bb050b053f428dc9786f0f28 (commit) from 23f280b5e6d12bfde411a227656985b021de5883 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 4e4ea96428eb061ad55fd3c40e4404f2bf7940cd Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Feb 8 13:38:54 2021 +0000 core155: Ship squid Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 15bf15f5616b5c6727343f86156a84e1ae6caca5 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Feb 8 13:38:28 2021 +0000 core155: Ship tcl Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 192f1d8eec065d14a3b5243aa78132adacb25496 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Mon Feb 8 14:15:10 2021 +0100 squid: Update to 4.14 For details see: http://www.squid-cache.org/Versions/v4/changesets/ Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit cfdfffd4387b660fb697d5a0eab574308ace9229 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Thu Feb 4 17:17:07 2021 +0100 krb5: Update to 1.19 For details (complete list) see: https://web.mit.edu/kerberos/krb5-1.19/krb5-1.19.html Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit f40ae5867167b3d2bb050b053f428dc9786f0f28 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sat Feb 6 00:40:24 2021 +0100 tcl: Update to 8.6.11 For details see: https://sourceforge.net/projects/tcl/files/Tcl/8.6.11/tcltk-release-notes-8… Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/tcl | 88 ++++++++++++---------- .../{oldcore/100 => core/155}/filelists/squid | 0 .../{oldcore/44 => core/155}/filelists/tcl | 0 config/rootfiles/core/155/update.sh | 1 + config/rootfiles/packages/krb5 | 2 + lfs/krb5 | 8 +- lfs/squid | 6 +- lfs/tcl | 6 +- 8 files changed, 63 insertions(+), 48 deletions(-) copy config/rootfiles/{oldcore/100 => core/155}/filelists/squid (100%) copy config/rootfiles/{oldcore/44 => core/155}/filelists/tcl (100%) Difference in files: diff --git a/config/rootfiles/common/tcl b/config/rootfiles/common/tcl index c4232d244..5ad0d658a 100644 --- a/config/rootfiles/common/tcl +++ b/config/rootfiles/common/tcl @@ -25,20 +25,20 @@ usr/bin/tclsh8.6 #usr/include/tdbc.h #usr/include/tdbcDecls.h #usr/include/tdbcInt.h -#usr/lib/itcl4.0.5 -usr/lib/itcl4.0.5/itcl.tcl -usr/lib/itcl4.0.5/itclConfig.sh -usr/lib/itcl4.0.5/itclHullCmds.tcl -usr/lib/itcl4.0.5/itclWidget.tcl -usr/lib/itcl4.0.5/libitcl4.0.5.so -usr/lib/itcl4.0.5/libitclstub4.0.5.a -usr/lib/itcl4.0.5/pkgIndex.tcl +#usr/lib/itcl4.2.1 +usr/lib/itcl4.2.1/itcl.tcl +usr/lib/itcl4.2.1/itclConfig.sh +usr/lib/itcl4.2.1/itclHullCmds.tcl +usr/lib/itcl4.2.1/itclWidget.tcl +usr/lib/itcl4.2.1/libitcl4.2.1.so +usr/lib/itcl4.2.1/libitclstub4.2.1.a +usr/lib/itcl4.2.1/pkgIndex.tcl usr/lib/libtcl8.6.so #usr/lib/libtclstub8.6.a #usr/lib/pkgconfig/tcl.pc -#usr/lib/sqlite3.13.0 -usr/lib/sqlite3.13.0/libsqlite3.13.0.so -usr/lib/sqlite3.13.0/pkgIndex.tcl +#usr/lib/sqlite3.34.0 +usr/lib/sqlite3.34.0/libsqlite3.34.0.so +usr/lib/sqlite3.34.0/pkgIndex.tcl #usr/lib/tcl8 #usr/lib/tcl8.6 usr/lib/tcl8.6/auto.tcl @@ -267,40 +267,43 @@ usr/lib/tcl8.6/tm.tcl usr/lib/tcl8.6/word.tcl #usr/lib/tcl8/8.4 usr/lib/tcl8/8.4/platform -usr/lib/tcl8/8.4/platform-1.0.14.tm +usr/lib/tcl8/8.4/platform-1.0.15.tm usr/lib/tcl8/8.4/platform/shell-1.1.4.tm #usr/lib/tcl8/8.5 -usr/lib/tcl8/8.5/msgcat-1.6.0.tm -usr/lib/tcl8/8.5/tcltest-2.4.0.tm +usr/lib/tcl8/8.5/msgcat-1.6.1.tm +usr/lib/tcl8/8.5/tcltest-2.5.3.tm #usr/lib/tcl8/8.6 -usr/lib/tcl8/8.6/http-2.8.9.tm +usr/lib/tcl8/8.6/http-2.9.5.tm usr/lib/tcl8/8.6/tdbc -usr/lib/tcl8/8.6/tdbc/sqlite3-1.0.4.tm +usr/lib/tcl8/8.6/tdbc/sqlite3-1.1.2.tm usr/lib/tclConfig.sh usr/lib/tclooConfig.sh -#usr/lib/tdbc1.0.4 -usr/lib/tdbc1.0.4/libtdbc1.0.4.so -usr/lib/tdbc1.0.4/libtdbcstub1.0.4.a -usr/lib/tdbc1.0.4/pkgIndex.tcl -usr/lib/tdbc1.0.4/tdbc.tcl -usr/lib/tdbc1.0.4/tdbcConfig.sh -#usr/lib/tdbcmysql1.0.4 -usr/lib/tdbcmysql1.0.4/libtdbcmysql1.0.4.so -usr/lib/tdbcmysql1.0.4/pkgIndex.tcl -usr/lib/tdbcmysql1.0.4/tdbcmysql.tcl -#usr/lib/tdbcodbc1.0.4 -usr/lib/tdbcodbc1.0.4/libtdbcodbc1.0.4.so -usr/lib/tdbcodbc1.0.4/pkgIndex.tcl -usr/lib/tdbcodbc1.0.4/tdbcodbc.tcl -#usr/lib/tdbcpostgres1.0.4 -usr/lib/tdbcpostgres1.0.4/libtdbcpostgres1.0.4.so -usr/lib/tdbcpostgres1.0.4/pkgIndex.tcl -usr/lib/tdbcpostgres1.0.4/tdbcpostgres.tcl -#usr/lib/thread2.8.0 -usr/lib/thread2.8.0/libthread2.8.0.so -usr/lib/thread2.8.0/pkgIndex.tcl -usr/lib/thread2.8.0/ttrace.tcl +#usr/lib/tdbc1.1.2 +usr/lib/tdbc1.1.2/libtdbc1.1.2.so +usr/lib/tdbc1.1.2/libtdbcstub1.1.2.a +usr/lib/tdbc1.1.2/pkgIndex.tcl +usr/lib/tdbc1.1.2/tdbc.tcl +usr/lib/tdbc1.1.2/tdbcConfig.sh +#usr/lib/tdbcmysql1.1.2 +usr/lib/tdbcmysql1.1.2/libtdbcmysql1.1.2.so +usr/lib/tdbcmysql1.1.2/pkgIndex.tcl +usr/lib/tdbcmysql1.1.2/tdbcmysql.tcl +#usr/lib/tdbcodbc1.1.2 +usr/lib/tdbcodbc1.1.2/libtdbcodbc1.1.2.so +usr/lib/tdbcodbc1.1.2/pkgIndex.tcl +usr/lib/tdbcodbc1.1.2/tdbcodbc.tcl +#usr/lib/tdbcpostgres1.1.2 +usr/lib/tdbcpostgres1.1.2/libtdbcpostgres1.1.2.so +usr/lib/tdbcpostgres1.1.2/pkgIndex.tcl +usr/lib/tdbcpostgres1.1.2/tdbcpostgres.tcl +#usr/lib/thread2.8.6 +usr/lib/thread2.8.6/libthread2.8.6.so +usr/lib/thread2.8.6/pkgIndex.tcl +usr/lib/thread2.8.6/ttrace.tcl #usr/man/man1/tclsh.1 +#usr/man/man3/DString.3 +#usr/man/man3/Notifier.3 +#usr/man/man3/RegExp.3 #usr/man/man3/TCL_MEM_DEBUG.3 #usr/man/man3/Tcl_Access.3 #usr/man/man3/Tcl_AddErrorInfo.3 @@ -380,6 +383,7 @@ usr/lib/thread2.8.0/ttrace.tcl #usr/man/man3/Tcl_CreateAliasObj.3 #usr/man/man3/Tcl_CreateChannel.3 #usr/man/man3/Tcl_CreateChannelHandler.3 +#usr/man/man3/Tcl_CreateChild.3 #usr/man/man3/Tcl_CreateCloseHandler.3 #usr/man/man3/Tcl_CreateCommand.3 #usr/man/man3/Tcl_CreateEncoding.3 @@ -555,6 +559,7 @@ usr/lib/thread2.8.0/ttrace.tcl #usr/man/man3/Tcl_GetChannelThread.3 #usr/man/man3/Tcl_GetChannelType.3 #usr/man/man3/Tcl_GetCharLength.3 +#usr/man/man3/Tcl_GetChild.3 #usr/man/man3/Tcl_GetClassAsObject.3 #usr/man/man3/Tcl_GetCommandFromObj.3 #usr/man/man3/Tcl_GetCommandFullName.3 @@ -610,6 +615,7 @@ usr/lib/thread2.8.0/ttrace.tcl #usr/man/man3/Tcl_GetObjectName.3 #usr/man/man3/Tcl_GetObjectNamespace.3 #usr/man/man3/Tcl_GetOpenFile.3 +#usr/man/man3/Tcl_GetParent.3 #usr/man/man3/Tcl_GetPathType.3 #usr/man/man3/Tcl_GetRange.3 #usr/man/man3/Tcl_GetRegExpFromObj.3 @@ -948,6 +954,7 @@ usr/lib/thread2.8.0/ttrace.tcl #usr/man/man3/Tcl_ZlibStreamGetCommandName.3 #usr/man/man3/Tcl_ZlibStreamInit.3 #usr/man/man3/Tcl_ZlibStreamPut.3 +#usr/man/man3/Thread.3 #usr/man/man3/attemptckalloc.3 #usr/man/man3/attemptckrealloc.3 #usr/man/man3/ckalloc.3 @@ -1015,6 +1022,7 @@ usr/lib/thread2.8.0/ttrace.tcl #usr/man/mann/join.n #usr/man/mann/lappend.n #usr/man/mann/lassign.n +#usr/man/mann/library.n #usr/man/mann/lindex.n #usr/man/mann/linsert.n #usr/man/mann/list.n @@ -1043,8 +1051,10 @@ usr/lib/thread2.8.0/ttrace.tcl #usr/man/mann/oo_object.n #usr/man/mann/open.n #usr/man/mann/package.n +#usr/man/mann/packagens.n #usr/man/mann/parray.n #usr/man/mann/pid.n +#usr/man/mann/pkgMkIndex.n #usr/man/mann/pkg_create.n #usr/man/mann/pkg_mkIndex.n #usr/man/mann/platform.n @@ -1095,6 +1105,7 @@ usr/lib/thread2.8.0/ttrace.tcl #usr/man/mann/tell.n #usr/man/mann/throw.n #usr/man/mann/time.n +#usr/man/mann/timerate.n #usr/man/mann/tm.n #usr/man/mann/trace.n #usr/man/mann/transchan.n @@ -1136,6 +1147,7 @@ usr/lib/thread2.8.0/ttrace.tcl #usr/share/man/mann/tdbc_mapSqlState.n #usr/share/man/mann/tdbc_mysql.n #usr/share/man/mann/tdbc_odbc.n +#usr/share/man/mann/tdbc_postgres.n #usr/share/man/mann/tdbc_resultset.n #usr/share/man/mann/tdbc_sqlite3.n #usr/share/man/mann/tdbc_statement.n diff --git a/config/rootfiles/core/155/filelists/squid b/config/rootfiles/core/155/filelists/squid new file mode 120000 index 000000000..2dc8372a0 --- /dev/null +++ b/config/rootfiles/core/155/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/155/filelists/tcl b/config/rootfiles/core/155/filelists/tcl new file mode 120000 index 000000000..7f620c687 --- /dev/null +++ b/config/rootfiles/core/155/filelists/tcl @@ -0,0 +1 @@ +../../../common/tcl \ No newline at end of file diff --git a/config/rootfiles/core/155/update.sh b/config/rootfiles/core/155/update.sh index c2d92fd21..975cf0508 100644 --- a/config/rootfiles/core/155/update.sh +++ b/config/rootfiles/core/155/update.sh @@ -48,6 +48,7 @@ ldconfig /usr/local/bin/filesystem-cleanup # Start services +/etc/init.d/squid restart # This update needs a reboot... #touch /var/run/need_reboot diff --git a/config/rootfiles/packages/krb5 b/config/rootfiles/packages/krb5 index 9a68f1b87..2e6e0285e 100644 --- a/config/rootfiles/packages/krb5 +++ b/config/rootfiles/packages/krb5 @@ -171,3 +171,5 @@ usr/lib/libverto.so.0.0 #usr/share/man/man8/krb5kdc.8 #usr/share/man/man8/sserver.8 var/lib/krb5kdc +#var/lib/run +#var/lib/run/krb5kdc diff --git a/lfs/krb5 b/lfs/krb5 index 766dc8d05..c77e4fdfd 100644 --- a/lfs/krb5 +++ b/lfs/krb5 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2021 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 # @@ -24,7 +24,7 @@ include Config -VER = 1.18.3 +VER = 1.19 THISAPP = krb5-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP)/src TARGET = $(DIR_INFO)/$(THISAPP) PROG = krb5 -PAK_VER = 4 +PAK_VER = 5 DEPS = @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = a64e8018a7572e0b4bd477c745129ffc +$(DL_FILE)_MD5 = aaf18447a5a014aa3b7e81814923f4c9 install : $(TARGET) diff --git a/lfs/squid b/lfs/squid index 3a53315d7..d1e91b8ae 100644 --- a/lfs/squid +++ b/lfs/squid @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2021 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 # @@ -24,7 +24,7 @@ include Config -VER = 4.13 +VER = 4.14 THISAPP = squid-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -46,7 +46,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 492e54afc15821141ff1d1d9903854d6 +$(DL_FILE)_MD5 = 7d9ba82703cd770b2ede169a0c1de94a install : $(TARGET) diff --git a/lfs/tcl b/lfs/tcl index bb2e3cdad..e4b15c7fb 100644 --- a/lfs/tcl +++ b/lfs/tcl @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2021 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 # @@ -24,7 +24,7 @@ include Config -VER = 8.6.6 +VER = 8.6.11 THISAPP = tcl$(VER) DL_FILE = $(THISAPP)-src.tar.gz @@ -45,7 +45,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 5193aea8107839a79df8ac709552ecb7 +$(DL_FILE)_MD5 = 8a4c004f48984a03a7747e9ba06e4da4 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 0d58fcd2aa1240e96754aaf24665d4d1650e301a
by Michael Tremer 07 Feb '21

07 Feb '21

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via 0d58fcd2aa1240e96754aaf24665d4d1650e301a (commit) from fbbf44c62f509cdcc2e97e624137e6e64ad33dd9 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 0d58fcd2aa1240e96754aaf24665d4d1650e301a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Feb 7 16:46:55 2021 +0000 misc-progs: Call unpriv_system commands in a shell Reported-by: Arne Fitzenreiter <arne_f(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: src/misc-progs/setuid.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) Difference in files: diff --git a/src/misc-progs/setuid.c b/src/misc-progs/setuid.c index efd181ad8..8044742f2 100644 --- a/src/misc-progs/setuid.c +++ b/src/misc-progs/setuid.c @@ -144,7 +144,14 @@ int safe_system(char* command) { /* Much like safe_system but lets you specify a non-root uid and gid to run * the command as */ int unpriv_system(char* command, uid_t uid, gid_t gid) { - return system_core(command, NULL, uid, gid, "unpriv_system"); + char* argv[4] = { + "/bin/sh", + "-c", + command, + NULL, + }; + + return system_core(argv[0], argv, uid, gid, "unpriv_system"); } /* General routine to initialise a setuid root program, and put the hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 23f280b5e6d12bfde411a227656985b021de5883
by Michael Tremer 07 Feb '21

07 Feb '21

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 23f280b5e6d12bfde411a227656985b021de5883 (commit) from 8234ae26425e4f968740434aaa4b9896eb8812c9 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 23f280b5e6d12bfde411a227656985b021de5883 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Feb 7 16:46:55 2021 +0000 misc-progs: Call unpriv_system commands in a shell Reported-by: Arne Fitzenreiter <arne_f(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: src/misc-progs/setuid.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) Difference in files: diff --git a/src/misc-progs/setuid.c b/src/misc-progs/setuid.c index efd181ad8..8044742f2 100644 --- a/src/misc-progs/setuid.c +++ b/src/misc-progs/setuid.c @@ -144,7 +144,14 @@ int safe_system(char* command) { /* Much like safe_system but lets you specify a non-root uid and gid to run * the command as */ int unpriv_system(char* command, uid_t uid, gid_t gid) { - return system_core(command, NULL, uid, gid, "unpriv_system"); + char* argv[4] = { + "/bin/sh", + "-c", + command, + NULL, + }; + + return system_core(argv[0], argv, uid, gid, "unpriv_system"); } /* General routine to initialise a setuid root program, and put the hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 8234ae26425e4f968740434aaa4b9896eb8812c9
by Michael Tremer 07 Feb '21

07 Feb '21

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 8234ae26425e4f968740434aaa4b9896eb8812c9 (commit) via fbbf44c62f509cdcc2e97e624137e6e64ad33dd9 (commit) via c1b356d20da2ebb162072787927b5babbafebfa4 (commit) from 93b0b7a9ed687f1ab296a62f2f4181e14f681c79 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 8234ae26425e4f968740434aaa4b9896eb8812c9 Merge: 93b0b7a9e fbbf44c62 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Feb 7 13:46:17 2021 +0000 Merge branch 'master' into next ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/fireperf | 1 + 1 file changed, 1 insertion(+) Difference in files: diff --git a/config/rootfiles/packages/fireperf b/config/rootfiles/packages/fireperf index e69de29bb..bf6e51e71 100644 --- a/config/rootfiles/packages/fireperf +++ b/config/rootfiles/packages/fireperf @@ -0,0 +1 @@ +usr/bin/fireperf hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 93b0b7a9ed687f1ab296a62f2f4181e14f681c79
by Michael Tremer 07 Feb '21

07 Feb '21

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 93b0b7a9ed687f1ab296a62f2f4181e14f681c79 (commit) via a12507ba48bbc8249d3606b49283890613be53cf (commit) via cf6c8e67fbbcbd465748055992d4c0af83697884 (commit) via 83e6fa56a56e729390b50b6a339df40b2e365440 (commit) via c1dd8d251103c3a4839e48ee6761921191ab6410 (commit) via 5b5785e23a108f1b6af283ad8aec4e29958621d4 (commit) via f70fa093ec1e3b8da945dfbd74a636e896821929 (commit) via 68b5e6b1bb65c70f76899dc9fae7cdcde0645cd3 (commit) via eb53b56d3a61be12f474c5d426e6fe70ca3a1515 (commit) from 8e308e4eb2534c260a29a17bd66700f894a84cb9 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 93b0b7a9ed687f1ab296a62f2f4181e14f681c79 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Feb 7 13:45:23 2021 +0000 core155: Ship libxcrypt Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit a12507ba48bbc8249d3606b49283890613be53cf Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Feb 6 16:18:00 2021 +0000 sysvinit: Fix check for static version of libcrypt Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit cf6c8e67fbbcbd465748055992d4c0af83697884 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Feb 5 09:51:26 2021 -0500 glibc: Disable libcrypt and ship libxcrypt instead libcrypt is deprecated in glibc, and is now explicitely disabled. Instead we ship libxcrypt which is an alternative implemenation and can be used as a drop-in replacement. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 83e6fa56a56e729390b50b6a339df40b2e365440 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Feb 5 17:08:21 2021 +0000 rootfiles: Fix any files that lack a newline at the end Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit c1dd8d251103c3a4839e48ee6761921191ab6410 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Feb 5 17:01:29 2021 +0000 Revert "dhcpcd: Update to 9.4.0" This reverts commit 15194c7c52c2438611832cecf4dad24fec304322. This version still fails to run on i586 without this patch. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 5b5785e23a108f1b6af283ad8aec4e29958621d4 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Feb 5 16:54:03 2021 +0000 core155: Ship freetype Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit f70fa093ec1e3b8da945dfbd74a636e896821929 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Thu Feb 4 13:55:41 2021 +0100 ghostscript: Addition of patch to fix freetype problem -Addition of patch to ghoscript as freetype version 2.10.3 and later have withdrawn a macro that ghostscript used. Confirmed that without the patch ghostscript failed to build due to the lack of the FT_CALLBACK_DEF() macro. The fix is to explicitly declare the callbacks file static. - Update lfs to apply patch - Add patch to src/patches Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 68b5e6b1bb65c70f76899dc9fae7cdcde0645cd3 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Thu Feb 4 13:55:27 2021 +0100 freetype: Update to 2.10.4 - Update freetype from 2.10.2 to 2.10.4 - A heap buffer overflow has been found in the handling of embedded PNG bitmaps, introduced in FreeType version 2.6. https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-15999 If you use option FT_CONFIG_OPTION_USE_PNG you should upgrade immediately. - Version 2.10.3 and later breaks the build of ghostscript, due to ghostscripts use of a withdrawn freetype macro that wasn't for external usage. A patch has been created to fix this and is included in the connected ghostcript patch. - Updated rootfile - Changelog for version 2.10.3 release is too long to add here. This can be found in the changelog file in the tarball Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit eb53b56d3a61be12f474c5d426e6fe70ca3a1515 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Feb 5 16:48:59 2021 +0000 Start Core Update 155 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/aarch64/glibc | 5 --- config/rootfiles/common/armv5tel/glibc | 5 --- config/rootfiles/common/freetype | 10 ++--- config/rootfiles/common/i586/glibc | 5 --- config/rootfiles/common/libxcrypt | 20 +++++++++ config/rootfiles/common/x86_64/glibc | 5 --- config/rootfiles/core/{154 => 155}/exclude | 0 .../lcdproc => rootfiles/core/155/filelists/files} | 0 .../{oldcore/110 => core/155}/filelists/freetype | 0 config/rootfiles/core/155/filelists/libxcrypt | 1 + .../files => core/155/filelists/release-files} | 3 +- .../rootfiles/{oldcore/152 => core/155}/update.sh | 4 +- config/rootfiles/{core => oldcore}/154/exclude | 0 .../rootfiles/{core => oldcore}/154/filelists/acl | 0 .../{core => oldcore}/154/filelists/arping | 0 .../rootfiles/{core => oldcore}/154/filelists/bind | 0 .../154/filelists/ca-certificates | 0 .../rootfiles/{core => oldcore}/154/filelists/curl | 0 .../rootfiles/{core => oldcore}/154/filelists/ddns | 0 .../{core => oldcore}/154/filelists/dhcpcd | 0 .../rootfiles/{core => oldcore}/154/filelists/dma | 0 .../{core => oldcore}/154/filelists/etherwake | 0 .../{core => oldcore}/154/filelists/fcron | 0 .../{core => oldcore}/154/filelists/files | 0 .../{core => oldcore}/154/filelists/findutils | 0 .../rootfiles/{core => oldcore}/154/filelists/fuse | 0 .../{core => oldcore}/154/filelists/i586/hyperscan | 0 .../{core => oldcore}/154/filelists/iproute2 | 0 .../{core => oldcore}/154/filelists/ipset | 0 .../{core => oldcore}/154/filelists/iptables | 0 .../rootfiles/{core => oldcore}/154/filelists/iw | 0 .../rootfiles/{core => oldcore}/154/filelists/kmod | 0 .../rootfiles/{core => oldcore}/154/filelists/knot | 0 .../rootfiles/{core => oldcore}/154/filelists/less | 0 .../{core => oldcore}/154/filelists/libgcrypt | 0 .../{core => oldcore}/154/filelists/libgpg-error | 0 .../{core => oldcore}/154/filelists/libhtp | 0 .../{core => oldcore}/154/filelists/libloc | 0 .../{core => oldcore}/154/filelists/logrotate | 0 .../{core => oldcore}/154/filelists/logwatch | 0 .../rootfiles/{core => oldcore}/154/filelists/lvm2 | 0 .../rootfiles/{core => oldcore}/154/filelists/lzip | 0 .../rootfiles/{core => oldcore}/154/filelists/newt | 0 .../rootfiles/{core => oldcore}/154/filelists/pam | 0 .../rootfiles/{core => oldcore}/154/filelists/pptp | 0 .../{core => oldcore}/154/filelists/procps | 0 .../rootfiles/{core => oldcore}/154/filelists/sed | 0 .../{core => oldcore}/154/filelists/setup | 0 .../{core => oldcore}/154/filelists/sqlite | 0 .../rootfiles/{core => oldcore}/154/filelists/sudo | 0 .../rootfiles/{core => oldcore}/154/filelists/tar | 0 .../{core => oldcore}/154/filelists/tzdata | 0 .../{core => oldcore}/154/filelists/unbound | 0 .../{core => oldcore}/154/filelists/wpa_supplicant | 0 .../154/filelists/x86_64/hyperscan | 0 config/rootfiles/{core => oldcore}/154/update.sh | 0 config/rootfiles/oldcore/27/update.sh | 2 +- config/rootfiles/oldcore/45/exclude | 2 +- config/rootfiles/packages/7zip | 2 +- config/rootfiles/packages/dpfhack | 2 +- config/rootfiles/packages/elfutils | 2 +- config/rootfiles/packages/netsnmpd | 2 +- config/rootfiles/packages/squidclamav | 2 +- config/rootfiles/packages/stress | 2 +- lfs/dhcpcd | 7 ++- lfs/freetype | 4 +- lfs/ghostscript | 3 +- lfs/glibc | 2 +- lfs/{bison => libxcrypt} | 20 ++++++--- lfs/sysvinit | 1 + make.sh | 10 +++-- ...86_for_SECCOMP_as_it_just_uses_socketcall.patch | 36 ++++++++++++++++ ...LLBACK_DEF-with-Freetype-2.10.3-and-later.patch | 50 ++++++++++++++++++++++ 73 files changed, 151 insertions(+), 56 deletions(-) create mode 100644 config/rootfiles/common/libxcrypt copy config/rootfiles/core/{154 => 155}/exclude (100%) copy config/{backup/includes/lcdproc => rootfiles/core/155/filelists/files} (100%) copy config/rootfiles/{oldcore/110 => core/155}/filelists/freetype (100%) create mode 120000 config/rootfiles/core/155/filelists/libxcrypt copy config/rootfiles/{oldcore/113/filelists/files => core/155/filelists/release-files} (51%) copy config/rootfiles/{oldcore/152 => core/155}/update.sh (97%) rename config/rootfiles/{core => oldcore}/154/exclude (100%) rename config/rootfiles/{core => oldcore}/154/filelists/acl (100%) rename config/rootfiles/{core => oldcore}/154/filelists/arping (100%) rename config/rootfiles/{core => oldcore}/154/filelists/bind (100%) rename config/rootfiles/{core => oldcore}/154/filelists/ca-certificates (100%) rename config/rootfiles/{core => oldcore}/154/filelists/curl (100%) rename config/rootfiles/{core => oldcore}/154/filelists/ddns (100%) rename config/rootfiles/{core => oldcore}/154/filelists/dhcpcd (100%) rename config/rootfiles/{core => oldcore}/154/filelists/dma (100%) rename config/rootfiles/{core => oldcore}/154/filelists/etherwake (100%) rename config/rootfiles/{core => oldcore}/154/filelists/fcron (100%) rename config/rootfiles/{core => oldcore}/154/filelists/files (100%) rename config/rootfiles/{core => oldcore}/154/filelists/findutils (100%) rename config/rootfiles/{core => oldcore}/154/filelists/fuse (100%) rename config/rootfiles/{core => oldcore}/154/filelists/i586/hyperscan (100%) rename config/rootfiles/{core => oldcore}/154/filelists/iproute2 (100%) rename config/rootfiles/{core => oldcore}/154/filelists/ipset (100%) rename config/rootfiles/{core => oldcore}/154/filelists/iptables (100%) rename config/rootfiles/{core => oldcore}/154/filelists/iw (100%) rename config/rootfiles/{core => oldcore}/154/filelists/kmod (100%) rename config/rootfiles/{core => oldcore}/154/filelists/knot (100%) rename config/rootfiles/{core => oldcore}/154/filelists/less (100%) rename config/rootfiles/{core => oldcore}/154/filelists/libgcrypt (100%) rename config/rootfiles/{core => oldcore}/154/filelists/libgpg-error (100%) rename config/rootfiles/{core => oldcore}/154/filelists/libhtp (100%) rename config/rootfiles/{core => oldcore}/154/filelists/libloc (100%) rename config/rootfiles/{core => oldcore}/154/filelists/logrotate (100%) rename config/rootfiles/{core => oldcore}/154/filelists/logwatch (100%) rename config/rootfiles/{core => oldcore}/154/filelists/lvm2 (100%) rename config/rootfiles/{core => oldcore}/154/filelists/lzip (100%) rename config/rootfiles/{core => oldcore}/154/filelists/newt (100%) rename config/rootfiles/{core => oldcore}/154/filelists/pam (100%) rename config/rootfiles/{core => oldcore}/154/filelists/pptp (100%) rename config/rootfiles/{core => oldcore}/154/filelists/procps (100%) rename config/rootfiles/{core => oldcore}/154/filelists/sed (100%) rename config/rootfiles/{core => oldcore}/154/filelists/setup (100%) rename config/rootfiles/{core => oldcore}/154/filelists/sqlite (100%) rename config/rootfiles/{core => oldcore}/154/filelists/sudo (100%) rename config/rootfiles/{core => oldcore}/154/filelists/tar (100%) rename config/rootfiles/{core => oldcore}/154/filelists/tzdata (100%) rename config/rootfiles/{core => oldcore}/154/filelists/unbound (100%) rename config/rootfiles/{core => oldcore}/154/filelists/wpa_supplicant (100%) rename config/rootfiles/{core => oldcore}/154/filelists/x86_64/hyperscan (100%) rename config/rootfiles/{core => oldcore}/154/update.sh (100%) copy lfs/{bison => libxcrypt} (89%) create mode 100644 src/patches/dhcpcd/01_Fix_Linux_i386_for_SECCOMP_as_it_just_uses_socketcall.patch create mode 100644 src/patches/ghostscript-drop-use-of-FT_CALLBACK_DEF-with-Freetype-2.10.3-and-later.patch Difference in files: diff --git a/config/rootfiles/common/aarch64/glibc b/config/rootfiles/common/aarch64/glibc index 6a01217e0..9f2957866 100644 --- a/config/rootfiles/common/aarch64/glibc +++ b/config/rootfiles/common/aarch64/glibc @@ -9,8 +9,6 @@ lib/libanl-2.32.so lib/libanl.so.1 lib/libc-2.32.so lib/libc.so.6 -lib/libcrypt-2.32.so -lib/libcrypt.so.1 lib/libdl-2.32.so lib/libdl.so.2 lib/libm-2.32.so @@ -279,7 +277,6 @@ usr/bin/locale #usr/include/byteswap.h #usr/include/complex.h #usr/include/cpio.h -#usr/include/crypt.h #usr/include/ctype.h #usr/include/dirent.h #usr/include/dlfcn.h @@ -794,8 +791,6 @@ usr/lib/gconv #usr/lib/libc.a #usr/lib/libc.so #usr/lib/libc_nonshared.a -#usr/lib/libcrypt.a -#usr/lib/libcrypt.so #usr/lib/libdl.a #usr/lib/libdl.so #usr/lib/libg.a diff --git a/config/rootfiles/common/armv5tel/glibc b/config/rootfiles/common/armv5tel/glibc index dce188845..27607f496 100644 --- a/config/rootfiles/common/armv5tel/glibc +++ b/config/rootfiles/common/armv5tel/glibc @@ -9,8 +9,6 @@ lib/libanl-2.32.so lib/libanl.so.1 lib/libc-2.32.so lib/libc.so.6 -lib/libcrypt-2.32.so -lib/libcrypt.so.1 lib/libdl-2.32.so lib/libdl.so.2 lib/libm-2.32.so @@ -279,7 +277,6 @@ usr/bin/locale #usr/include/byteswap.h #usr/include/complex.h #usr/include/cpio.h -#usr/include/crypt.h #usr/include/ctype.h #usr/include/dirent.h #usr/include/dlfcn.h @@ -796,8 +793,6 @@ usr/lib/gconv #usr/lib/libc.a #usr/lib/libc.so #usr/lib/libc_nonshared.a -#usr/lib/libcrypt.a -#usr/lib/libcrypt.so #usr/lib/libdl.a #usr/lib/libdl.so #usr/lib/libg.a diff --git a/config/rootfiles/common/freetype b/config/rootfiles/common/freetype index 4d72ec357..194253601 100644 --- a/config/rootfiles/common/freetype +++ b/config/rootfiles/common/freetype @@ -7,15 +7,16 @@ #usr/include/freetype2/freetype/config/ftmodule.h #usr/include/freetype2/freetype/config/ftoption.h #usr/include/freetype2/freetype/config/ftstdlib.h +#usr/include/freetype2/freetype/config/integer-types.h +#usr/include/freetype2/freetype/config/mac-support.h +#usr/include/freetype2/freetype/config/public-macros.h #usr/include/freetype2/freetype/freetype.h #usr/include/freetype2/freetype/ftadvanc.h -#usr/include/freetype2/freetype/ftautoh.h #usr/include/freetype2/freetype/ftbbox.h #usr/include/freetype2/freetype/ftbdf.h #usr/include/freetype2/freetype/ftbitmap.h #usr/include/freetype2/freetype/ftbzip2.h #usr/include/freetype2/freetype/ftcache.h -#usr/include/freetype2/freetype/ftcffdrv.h #usr/include/freetype2/freetype/ftchapters.h #usr/include/freetype2/freetype/ftcid.h #usr/include/freetype2/freetype/ftcolor.h @@ -47,20 +48,17 @@ #usr/include/freetype2/freetype/ftsynth.h #usr/include/freetype2/freetype/ftsystem.h #usr/include/freetype2/freetype/fttrigon.h -#usr/include/freetype2/freetype/ftttdrv.h #usr/include/freetype2/freetype/fttypes.h #usr/include/freetype2/freetype/ftwinfnt.h #usr/include/freetype2/freetype/t1tables.h #usr/include/freetype2/freetype/ttnameid.h #usr/include/freetype2/freetype/tttables.h #usr/include/freetype2/freetype/tttags.h -#usr/include/freetype2/freetype/ttunpat.h #usr/include/freetype2/ft2build.h -#usr/lib/libfreetype.a #usr/lib/libfreetype.la #usr/lib/libfreetype.so usr/lib/libfreetype.so.6 -usr/lib/libfreetype.so.6.17.2 +usr/lib/libfreetype.so.6.17.4 #usr/lib/pkgconfig/freetype2.pc #usr/share/aclocal/freetype2.m4 #usr/share/man/man1/freetype-config.1 diff --git a/config/rootfiles/common/i586/glibc b/config/rootfiles/common/i586/glibc index a397b906e..256e9eefe 100644 --- a/config/rootfiles/common/i586/glibc +++ b/config/rootfiles/common/i586/glibc @@ -9,8 +9,6 @@ lib/libanl-2.32.so lib/libanl.so.1 lib/libc-2.32.so lib/libc.so.6 -lib/libcrypt-2.32.so -lib/libcrypt.so.1 lib/libdl-2.32.so lib/libdl.so.2 lib/libm-2.32.so @@ -280,7 +278,6 @@ usr/bin/locale #usr/include/byteswap.h #usr/include/complex.h #usr/include/cpio.h -#usr/include/crypt.h #usr/include/ctype.h #usr/include/dirent.h #usr/include/dlfcn.h @@ -802,8 +799,6 @@ usr/lib/gconv #usr/lib/libc.a #usr/lib/libc.so #usr/lib/libc_nonshared.a -#usr/lib/libcrypt.a -#usr/lib/libcrypt.so #usr/lib/libdl.a #usr/lib/libdl.so #usr/lib/libg.a diff --git a/config/rootfiles/common/libxcrypt b/config/rootfiles/common/libxcrypt new file mode 100644 index 000000000..c866c2ddb --- /dev/null +++ b/config/rootfiles/common/libxcrypt @@ -0,0 +1,20 @@ +#usr/include/crypt.h +#usr/include/xcrypt.h +#usr/lib/libcrypt.la +#usr/lib/libcrypt.so +usr/lib/libcrypt.so.1 +usr/lib/libcrypt.so.1.1.0 +#usr/lib/libowcrypt.so +#usr/lib/libowcrypt.so.1 +#usr/lib/libxcrypt.so +#usr/lib/pkgconfig/libcrypt.pc +#usr/lib/pkgconfig/libxcrypt.pc +#usr/share/man/man3/crypt_checksalt.3 +#usr/share/man/man3/crypt_gensalt.3 +#usr/share/man/man3/crypt_gensalt_ra.3 +#usr/share/man/man3/crypt_gensalt_rn.3 +#usr/share/man/man3/crypt_preferred_method.3 +#usr/share/man/man3/crypt_r.3 +#usr/share/man/man3/crypt_ra.3 +#usr/share/man/man3/crypt_rn.3 +#usr/share/man/man5/crypt.5 diff --git a/config/rootfiles/common/x86_64/glibc b/config/rootfiles/common/x86_64/glibc index b99f52212..43f9afb87 100644 --- a/config/rootfiles/common/x86_64/glibc +++ b/config/rootfiles/common/x86_64/glibc @@ -9,8 +9,6 @@ lib/libanl-2.32.so lib/libanl.so.1 lib/libc-2.32.so lib/libc.so.6 -lib/libcrypt-2.32.so -lib/libcrypt.so.1 lib/libdl-2.32.so lib/libdl.so.2 lib/libm-2.32.so @@ -281,7 +279,6 @@ usr/bin/locale #usr/include/byteswap.h #usr/include/complex.h #usr/include/cpio.h -#usr/include/crypt.h #usr/include/ctype.h #usr/include/dirent.h #usr/include/dlfcn.h @@ -800,8 +797,6 @@ usr/lib/gconv #usr/lib/libc.a #usr/lib/libc.so #usr/lib/libc_nonshared.a -#usr/lib/libcrypt.a -#usr/lib/libcrypt.so #usr/lib/libdl.a #usr/lib/libdl.so #usr/lib/libg.a diff --git a/config/rootfiles/core/154/exclude b/config/rootfiles/core/155/exclude similarity index 100% rename from config/rootfiles/core/154/exclude rename to config/rootfiles/core/155/exclude diff --git a/config/rootfiles/core/155/filelists/files b/config/rootfiles/core/155/filelists/files new file mode 100644 index 000000000..e69de29bb diff --git a/config/rootfiles/core/155/filelists/freetype b/config/rootfiles/core/155/filelists/freetype new file mode 120000 index 000000000..79ec5c42e --- /dev/null +++ b/config/rootfiles/core/155/filelists/freetype @@ -0,0 +1 @@ +../../../common/freetype \ No newline at end of file diff --git a/config/rootfiles/core/155/filelists/libxcrypt b/config/rootfiles/core/155/filelists/libxcrypt new file mode 120000 index 000000000..ad93616b5 --- /dev/null +++ b/config/rootfiles/core/155/filelists/libxcrypt @@ -0,0 +1 @@ +../../../common/libxcrypt \ No newline at end of file diff --git a/config/rootfiles/core/155/filelists/release-files b/config/rootfiles/core/155/filelists/release-files new file mode 100644 index 000000000..3a700fab4 --- /dev/null +++ b/config/rootfiles/core/155/filelists/release-files @@ -0,0 +1,4 @@ +etc/system-release +etc/issue +etc/os-release +var/ipfire/langs diff --git a/config/rootfiles/core/155/update.sh b/config/rootfiles/core/155/update.sh new file mode 100644 index 000000000..c2d92fd21 --- /dev/null +++ b/config/rootfiles/core/155/update.sh @@ -0,0 +1,67 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 3 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2020 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=155 + +# Remove old core updates from pakfire cache to save space... +for (( i=1; i<=$core; i++ )); do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# Remove files + +# Stop services + +# Extract files +extract_files + +# update linker config +ldconfig + +# Update Language cache +/usr/local/bin/update-lang-cache + +# Filesytem cleanup +/usr/local/bin/filesystem-cleanup + +# Start services + +# This update needs a reboot... +#touch /var/run/need_reboot + +# Finish +/etc/init.d/fireinfo start +sendprofile + +# Update grub config to display new core version +if [ -e /boot/grub/grub.cfg ]; then + grub-mkconfig -o /boot/grub/grub.cfg +fi + +sync + +# Don't report the exitcode last command +exit 0 diff --git a/config/rootfiles/oldcore/154/exclude b/config/rootfiles/oldcore/154/exclude new file mode 100644 index 000000000..818039f4a --- /dev/null +++ b/config/rootfiles/oldcore/154/exclude @@ -0,0 +1,34 @@ +boot/config.txt +boot/grub/grub.cfg +boot/grub/grubenv +etc/alternatives +etc/collectd.custom +etc/default/grub +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/shadow +etc/snort/snort.conf +etc/ssl/openssl.cnf +etc/sudoers +etc/sysconfig/firewall.local +etc/sysconfig/rc.local +etc/udev/rules.d/30-persistent-network.rules +srv/web/ipfire/html/proxy.pac +usr/share/xt_geoip +var/ipfire/dma +var/ipfire/time +var/ipfire/firewall/locationblock +var/ipfire/fwhosts/customlocationgrp +var/ipfire/ovpn +var/ipfire/urlfilter/blacklist +var/ipfire/urlfilter/settings +var/lib/alternatives +var/lib/location/database.db +var/log/cache +var/log/dhcpcd.log +var/log/messages +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/core/154/filelists/acl b/config/rootfiles/oldcore/154/filelists/acl similarity index 100% rename from config/rootfiles/core/154/filelists/acl rename to config/rootfiles/oldcore/154/filelists/acl diff --git a/config/rootfiles/core/154/filelists/arping b/config/rootfiles/oldcore/154/filelists/arping similarity index 100% rename from config/rootfiles/core/154/filelists/arping rename to config/rootfiles/oldcore/154/filelists/arping diff --git a/config/rootfiles/core/154/filelists/bind b/config/rootfiles/oldcore/154/filelists/bind similarity index 100% rename from config/rootfiles/core/154/filelists/bind rename to config/rootfiles/oldcore/154/filelists/bind diff --git a/config/rootfiles/core/154/filelists/ca-certificates b/config/rootfiles/oldcore/154/filelists/ca-certificates similarity index 100% rename from config/rootfiles/core/154/filelists/ca-certificates rename to config/rootfiles/oldcore/154/filelists/ca-certificates diff --git a/config/rootfiles/core/154/filelists/curl b/config/rootfiles/oldcore/154/filelists/curl similarity index 100% rename from config/rootfiles/core/154/filelists/curl rename to config/rootfiles/oldcore/154/filelists/curl diff --git a/config/rootfiles/core/154/filelists/ddns b/config/rootfiles/oldcore/154/filelists/ddns similarity index 100% rename from config/rootfiles/core/154/filelists/ddns rename to config/rootfiles/oldcore/154/filelists/ddns diff --git a/config/rootfiles/core/154/filelists/dhcpcd b/config/rootfiles/oldcore/154/filelists/dhcpcd similarity index 100% rename from config/rootfiles/core/154/filelists/dhcpcd rename to config/rootfiles/oldcore/154/filelists/dhcpcd diff --git a/config/rootfiles/core/154/filelists/dma b/config/rootfiles/oldcore/154/filelists/dma similarity index 100% rename from config/rootfiles/core/154/filelists/dma rename to config/rootfiles/oldcore/154/filelists/dma diff --git a/config/rootfiles/core/154/filelists/etherwake b/config/rootfiles/oldcore/154/filelists/etherwake similarity index 100% rename from config/rootfiles/core/154/filelists/etherwake rename to config/rootfiles/oldcore/154/filelists/etherwake diff --git a/config/rootfiles/core/154/filelists/fcron b/config/rootfiles/oldcore/154/filelists/fcron similarity index 100% rename from config/rootfiles/core/154/filelists/fcron rename to config/rootfiles/oldcore/154/filelists/fcron diff --git a/config/rootfiles/core/154/filelists/files b/config/rootfiles/oldcore/154/filelists/files similarity index 100% rename from config/rootfiles/core/154/filelists/files rename to config/rootfiles/oldcore/154/filelists/files diff --git a/config/rootfiles/core/154/filelists/findutils b/config/rootfiles/oldcore/154/filelists/findutils similarity index 100% rename from config/rootfiles/core/154/filelists/findutils rename to config/rootfiles/oldcore/154/filelists/findutils diff --git a/config/rootfiles/core/154/filelists/fuse b/config/rootfiles/oldcore/154/filelists/fuse similarity index 100% rename from config/rootfiles/core/154/filelists/fuse rename to config/rootfiles/oldcore/154/filelists/fuse diff --git a/config/rootfiles/core/154/filelists/i586/hyperscan b/config/rootfiles/oldcore/154/filelists/i586/hyperscan similarity index 100% rename from config/rootfiles/core/154/filelists/i586/hyperscan rename to config/rootfiles/oldcore/154/filelists/i586/hyperscan diff --git a/config/rootfiles/core/154/filelists/iproute2 b/config/rootfiles/oldcore/154/filelists/iproute2 similarity index 100% rename from config/rootfiles/core/154/filelists/iproute2 rename to config/rootfiles/oldcore/154/filelists/iproute2 diff --git a/config/rootfiles/core/154/filelists/ipset b/config/rootfiles/oldcore/154/filelists/ipset similarity index 100% rename from config/rootfiles/core/154/filelists/ipset rename to config/rootfiles/oldcore/154/filelists/ipset diff --git a/config/rootfiles/core/154/filelists/iptables b/config/rootfiles/oldcore/154/filelists/iptables similarity index 100% rename from config/rootfiles/core/154/filelists/iptables rename to config/rootfiles/oldcore/154/filelists/iptables diff --git a/config/rootfiles/core/154/filelists/iw b/config/rootfiles/oldcore/154/filelists/iw similarity index 100% rename from config/rootfiles/core/154/filelists/iw rename to config/rootfiles/oldcore/154/filelists/iw diff --git a/config/rootfiles/core/154/filelists/kmod b/config/rootfiles/oldcore/154/filelists/kmod similarity index 100% rename from config/rootfiles/core/154/filelists/kmod rename to config/rootfiles/oldcore/154/filelists/kmod diff --git a/config/rootfiles/core/154/filelists/knot b/config/rootfiles/oldcore/154/filelists/knot similarity index 100% rename from config/rootfiles/core/154/filelists/knot rename to config/rootfiles/oldcore/154/filelists/knot diff --git a/config/rootfiles/core/154/filelists/less b/config/rootfiles/oldcore/154/filelists/less similarity index 100% rename from config/rootfiles/core/154/filelists/less rename to config/rootfiles/oldcore/154/filelists/less diff --git a/config/rootfiles/core/154/filelists/libgcrypt b/config/rootfiles/oldcore/154/filelists/libgcrypt similarity index 100% rename from config/rootfiles/core/154/filelists/libgcrypt rename to config/rootfiles/oldcore/154/filelists/libgcrypt diff --git a/config/rootfiles/core/154/filelists/libgpg-error b/config/rootfiles/oldcore/154/filelists/libgpg-error similarity index 100% rename from config/rootfiles/core/154/filelists/libgpg-error rename to config/rootfiles/oldcore/154/filelists/libgpg-error diff --git a/config/rootfiles/core/154/filelists/libhtp b/config/rootfiles/oldcore/154/filelists/libhtp similarity index 100% rename from config/rootfiles/core/154/filelists/libhtp rename to config/rootfiles/oldcore/154/filelists/libhtp diff --git a/config/rootfiles/core/154/filelists/libloc b/config/rootfiles/oldcore/154/filelists/libloc similarity index 100% rename from config/rootfiles/core/154/filelists/libloc rename to config/rootfiles/oldcore/154/filelists/libloc diff --git a/config/rootfiles/core/154/filelists/logrotate b/config/rootfiles/oldcore/154/filelists/logrotate similarity index 100% rename from config/rootfiles/core/154/filelists/logrotate rename to config/rootfiles/oldcore/154/filelists/logrotate diff --git a/config/rootfiles/core/154/filelists/logwatch b/config/rootfiles/oldcore/154/filelists/logwatch similarity index 100% rename from config/rootfiles/core/154/filelists/logwatch rename to config/rootfiles/oldcore/154/filelists/logwatch diff --git a/config/rootfiles/core/154/filelists/lvm2 b/config/rootfiles/oldcore/154/filelists/lvm2 similarity index 100% rename from config/rootfiles/core/154/filelists/lvm2 rename to config/rootfiles/oldcore/154/filelists/lvm2 diff --git a/config/rootfiles/core/154/filelists/lzip b/config/rootfiles/oldcore/154/filelists/lzip similarity index 100% rename from config/rootfiles/core/154/filelists/lzip rename to config/rootfiles/oldcore/154/filelists/lzip diff --git a/config/rootfiles/core/154/filelists/newt b/config/rootfiles/oldcore/154/filelists/newt similarity index 100% rename from config/rootfiles/core/154/filelists/newt rename to config/rootfiles/oldcore/154/filelists/newt diff --git a/config/rootfiles/core/154/filelists/pam b/config/rootfiles/oldcore/154/filelists/pam similarity index 100% rename from config/rootfiles/core/154/filelists/pam rename to config/rootfiles/oldcore/154/filelists/pam diff --git a/config/rootfiles/core/154/filelists/pptp b/config/rootfiles/oldcore/154/filelists/pptp similarity index 100% rename from config/rootfiles/core/154/filelists/pptp rename to config/rootfiles/oldcore/154/filelists/pptp diff --git a/config/rootfiles/core/154/filelists/procps b/config/rootfiles/oldcore/154/filelists/procps similarity index 100% rename from config/rootfiles/core/154/filelists/procps rename to config/rootfiles/oldcore/154/filelists/procps diff --git a/config/rootfiles/core/154/filelists/sed b/config/rootfiles/oldcore/154/filelists/sed similarity index 100% rename from config/rootfiles/core/154/filelists/sed rename to config/rootfiles/oldcore/154/filelists/sed diff --git a/config/rootfiles/core/154/filelists/setup b/config/rootfiles/oldcore/154/filelists/setup similarity index 100% rename from config/rootfiles/core/154/filelists/setup rename to config/rootfiles/oldcore/154/filelists/setup diff --git a/config/rootfiles/core/154/filelists/sqlite b/config/rootfiles/oldcore/154/filelists/sqlite similarity index 100% rename from config/rootfiles/core/154/filelists/sqlite rename to config/rootfiles/oldcore/154/filelists/sqlite diff --git a/config/rootfiles/core/154/filelists/sudo b/config/rootfiles/oldcore/154/filelists/sudo similarity index 100% rename from config/rootfiles/core/154/filelists/sudo rename to config/rootfiles/oldcore/154/filelists/sudo diff --git a/config/rootfiles/core/154/filelists/tar b/config/rootfiles/oldcore/154/filelists/tar similarity index 100% rename from config/rootfiles/core/154/filelists/tar rename to config/rootfiles/oldcore/154/filelists/tar diff --git a/config/rootfiles/core/154/filelists/tzdata b/config/rootfiles/oldcore/154/filelists/tzdata similarity index 100% rename from config/rootfiles/core/154/filelists/tzdata rename to config/rootfiles/oldcore/154/filelists/tzdata diff --git a/config/rootfiles/core/154/filelists/unbound b/config/rootfiles/oldcore/154/filelists/unbound similarity index 100% rename from config/rootfiles/core/154/filelists/unbound rename to config/rootfiles/oldcore/154/filelists/unbound diff --git a/config/rootfiles/core/154/filelists/wpa_supplicant b/config/rootfiles/oldcore/154/filelists/wpa_supplicant similarity index 100% rename from config/rootfiles/core/154/filelists/wpa_supplicant rename to config/rootfiles/oldcore/154/filelists/wpa_supplicant diff --git a/config/rootfiles/core/154/filelists/x86_64/hyperscan b/config/rootfiles/oldcore/154/filelists/x86_64/hyperscan similarity index 100% rename from config/rootfiles/core/154/filelists/x86_64/hyperscan rename to config/rootfiles/oldcore/154/filelists/x86_64/hyperscan diff --git a/config/rootfiles/core/154/update.sh b/config/rootfiles/oldcore/154/update.sh similarity index 100% rename from config/rootfiles/core/154/update.sh rename to config/rootfiles/oldcore/154/update.sh diff --git a/config/rootfiles/oldcore/27/update.sh b/config/rootfiles/oldcore/27/update.sh index 609edf32c..fd32d49e6 100644 --- a/config/rootfiles/oldcore/27/update.sh +++ b/config/rootfiles/oldcore/27/update.sh @@ -11,4 +11,4 @@ sysctl -p mv /etc/squid/cachemgr.conf /var/ipfire/proxy/cachemgr.conf ln -sf /var/ipfire/proxy/cachemgr.conf /etc/squid/cachemgr.conf chown nobody.nobody /var/ipfire/proxy/cachemgr.conf -/etc/init.d/squid start \ No newline at end of file +/etc/init.d/squid start diff --git a/config/rootfiles/oldcore/45/exclude b/config/rootfiles/oldcore/45/exclude index 2cb97983d..c38a12ce4 100644 --- a/config/rootfiles/oldcore/45/exclude +++ b/config/rootfiles/oldcore/45/exclude @@ -1 +1 @@ -etc/snort/snort.conf \ No newline at end of file +etc/snort/snort.conf diff --git a/config/rootfiles/packages/7zip b/config/rootfiles/packages/7zip index a5d5ed607..a0e8a80d1 100644 --- a/config/rootfiles/packages/7zip +++ b/config/rootfiles/packages/7zip @@ -110,4 +110,4 @@ usr/lib/p7zip/Codecs/Rar.so #usr/share/doc/p7zip-17.03/README #usr/share/man/man1/7z.1.gz #usr/share/man/man1/7za.1.gz -#usr/share/man/man1/7zr.1.gz \ No newline at end of file +#usr/share/man/man1/7zr.1.gz diff --git a/config/rootfiles/packages/dpfhack b/config/rootfiles/packages/dpfhack index 27319b4cf..b79791c90 100644 --- a/config/rootfiles/packages/dpfhack +++ b/config/rootfiles/packages/dpfhack @@ -1,3 +1,3 @@ #usr/include/dpf.h #usr/include/usbuser.h -usr/lib/libdpf.so \ No newline at end of file +usr/lib/libdpf.so diff --git a/config/rootfiles/packages/elfutils b/config/rootfiles/packages/elfutils index 05cb542ac..f7826ec11 100644 --- a/config/rootfiles/packages/elfutils +++ b/config/rootfiles/packages/elfutils @@ -53,4 +53,4 @@ usr/lib/libelf.so.1 #usr/share/man/man3/elf_begin.3 #usr/share/man/man3/elf_clone.3 #usr/share/man/man3/elf_getdata.3 -#usr/share/man/man3/elf_update.3 \ No newline at end of file +#usr/share/man/man3/elf_update.3 diff --git a/config/rootfiles/packages/netsnmpd b/config/rootfiles/packages/netsnmpd index 89b46c89b..716d41638 100644 --- a/config/rootfiles/packages/netsnmpd +++ b/config/rootfiles/packages/netsnmpd @@ -636,4 +636,4 @@ usr/share/snmp/snmpconf-data/snmptrapd-data/logging usr/share/snmp/snmpconf-data/snmptrapd-data/runtime usr/share/snmp/snmpconf-data/snmptrapd-data/snmpconf-config usr/share/snmp/snmpconf-data/snmptrapd-data/traphandle -var/ipfire/backup/addons/includes/netsnmpd \ No newline at end of file +var/ipfire/backup/addons/includes/netsnmpd diff --git a/config/rootfiles/packages/squidclamav b/config/rootfiles/packages/squidclamav index 7538749fa..5976a0c47 100644 --- a/config/rootfiles/packages/squidclamav +++ b/config/rootfiles/packages/squidclamav @@ -11,4 +11,4 @@ usr/bin/squidclamav #usr/share/squidclamav #usr/share/squidclamav/README var/ipfire/backup/addons/includes/squidclamav -srv/web/ipfire/html/clwarn.cgi \ No newline at end of file +srv/web/ipfire/html/clwarn.cgi diff --git a/config/rootfiles/packages/stress b/config/rootfiles/packages/stress index 2b0a0003a..0f7224919 100644 --- a/config/rootfiles/packages/stress +++ b/config/rootfiles/packages/stress @@ -1,3 +1,3 @@ usr/bin/stress #usr/share/info/stress.info -#usr/share/man/man1/stress.1 \ No newline at end of file +#usr/share/man/man1/stress.1 diff --git a/lfs/dhcpcd b/lfs/dhcpcd index 352308692..4e34e19d5 100644 --- a/lfs/dhcpcd +++ b/lfs/dhcpcd @@ -24,7 +24,7 @@ include Config -VER = 9.4.0 +VER = 9.3.4 THISAPP = dhcpcd-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = c36715fc629bc40aa94aae06fa1724c2 +$(DL_FILE)_MD5 = badb02dfc69fe9bbeec35a02efcdb4db install : $(TARGET) @@ -70,6 +70,9 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dhcpcd/01_Fix_Linux_i386_for_SECCOMP_as_it_just_uses_socketcall.patch + cd $(DIR_APP) && ./configure --prefix="" --sysconfdir=/var/ipfire/dhcpc \ --dbdir=/var/ipfire/dhcpc \ --libexecdir=/var/ipfire/dhcpc \ diff --git a/lfs/freetype b/lfs/freetype index 4106d22ee..8a93ad0e9 100644 --- a/lfs/freetype +++ b/lfs/freetype @@ -24,7 +24,7 @@ include Config -VER = 2.10.2 +VER = 2.10.4 THISAPP = freetype-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 7c0d5a39f232d7eb9f9d7da76bf08074 +$(DL_FILE)_MD5 = 0e6c0e9b218be3ba3e26e1d23b1c80dd install : $(TARGET) diff --git a/lfs/ghostscript b/lfs/ghostscript index edf019f5d..696f95b29 100644 --- a/lfs/ghostscript +++ b/lfs/ghostscript @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = ghostscript -PAK_VER = 6 +PAK_VER = 7 DEPS = cups dbus libtiff @@ -83,6 +83,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ghostscript-drop-use-of-FT_CALLBACK_DEF-with-Freetype-2.10.3-and-later.patch cd $(DIR_APP) && rm -rf expat freetype icclib jasper jpeg jpegxr \ lcms lcms2 libpng openjpeg zlib cups/libs cd $(DIR_APP) && \ diff --git a/lfs/glibc b/lfs/glibc index 281c290dc..50217fab6 100644 --- a/lfs/glibc +++ b/lfs/glibc @@ -69,7 +69,7 @@ EXTRA_CONFIG += \ --without-selinux \ --enable-experimental-malloc \ --enable-bind-now \ - --disable-nss-crypt + --disable-crypt ############################################################################### # Top-level Rules diff --git a/lfs/libxcrypt b/lfs/libxcrypt new file mode 100644 index 000000000..8fb937c9b --- /dev/null +++ b/lfs/libxcrypt @@ -0,0 +1,89 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2018 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 # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 4.4.17 + +THISAPP = libxcrypt-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) + +ifeq "$(TOOLCHAIN)" "1" + TARGET = $(DIR_INFO)/$(THISAPP)-tools +else + TARGET = $(DIR_INFO)/$(THISAPP) +endif + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 12118d098ead971f9a8377cacfdd0da7 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && autoreconf -vfi + cd $(DIR_APP) && \ + ./configure \ + --prefix=$(PREFIX) \ + --disable-static \ + --enable-hashes=strong,glibc \ + --enable-obsolete-api \ + --disable-failure-tokens + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/sysvinit b/lfs/sysvinit index d85a3659b..0306b5518 100644 --- a/lfs/sysvinit +++ b/lfs/sysvinit @@ -74,6 +74,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) # https://lists.gnu.org/archive/html/bug-gnulib/2016-03/msg00018.html cd $(DIR_APP) && sed -i src/mountpoint.c src/bootlogd.c \ -e "/include.*sys\/stat.h/a#include <sys/sysmacros.h>\n" + cd $(DIR_APP) && sed -e "s/libcrypt.a/libcrypt.so/g" -i src/Makefile cd $(DIR_APP) && make $(MAKETUNING) -C src cd $(DIR_APP) && make -C src install @rm -rf $(DIR_APP) diff --git a/make.sh b/make.sh index 94bb86d5b..164fd7c72 100755 --- a/make.sh +++ b/make.sh @@ -26,7 +26,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name # If you update the version don't forget to update backupiso and add it to core update VERSION="2.25" # Version number -CORE="154" # Core Level (Filename) +CORE="155" # Core Level (Filename) SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir MAX_RETRIES=1 # prefetch/check loop @@ -1031,6 +1031,7 @@ buildtoolchain() { lfsmake1 binutils PASS=2 lfsmake1 gcc PASS=2 lfsmake1 zlib + lfsmake1 libxcrypt lfsmake1 ccache PASS=2 lfsmake1 tcl lfsmake1 expect @@ -1074,16 +1075,18 @@ buildbase() { lfsmake2 cleanup-toolchain lfsmake2 zlib lfsmake2 zstd + lfsmake2 autoconf + lfsmake2 automake + lfsmake2 libtool lfsmake2 binutils lfsmake2 gmp lfsmake2 gmp-compat lfsmake2 mpfr lfsmake2 libmpc + lfsmake2 libxcrypt lfsmake2 file lfsmake2 gcc lfsmake2 sed - lfsmake2 autoconf - lfsmake2 automake lfsmake2 berkeley lfsmake2 berkeley-compat lfsmake2 coreutils @@ -1091,7 +1094,6 @@ buildbase() { lfsmake2 m4 lfsmake2 bison lfsmake2 ncurses - lfsmake2 libtool lfsmake2 perl lfsmake2 readline lfsmake2 readline-compat diff --git a/src/patches/dhcpcd/01_Fix_Linux_i386_for_SECCOMP_as_it_just_uses_socketcall.patch b/src/patches/dhcpcd/01_Fix_Linux_i386_for_SECCOMP_as_it_just_uses_socketcall.patch new file mode 100644 index 000000000..9efcde219 --- /dev/null +++ b/src/patches/dhcpcd/01_Fix_Linux_i386_for_SECCOMP_as_it_just_uses_socketcall.patch @@ -0,0 +1,36 @@ +diff --git a/src/privsep-linux.c b/src/privsep-linux.c +index 050a30cf..d31d720d 100644 +--- a/src/privsep-linux.c ++++ b/src/privsep-linux.c +@@ -32,6 +32,7 @@ + + #include <linux/audit.h> + #include <linux/filter.h> ++#include <linux/net.h> + #include <linux/seccomp.h> + #include <linux/sockios.h> + +@@ -304,6 +305,23 @@ static struct sock_filter ps_seccomp_filter[] = { + #ifdef __NR_sendto + SECCOMP_ALLOW(__NR_sendto), + #endif ++#ifdef __NR_socketcall ++ /* i386 needs this and demonstrates why SECCOMP ++ * is poor compared to OpenBSD pledge(2) and FreeBSD capsicum(4) ++ * as this is soooo tied to the kernel API which changes per arch ++ * and likely libc as well. */ ++ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_ACCEPT), ++ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_ACCEPT4), ++ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_LISTEN), ++ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_GETSOCKOPT), /* overflow */ ++ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_RECV), ++ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_RECVFROM), ++ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_RECVMSG), ++ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_SEND), ++ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_SENDMSG), ++ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_SENDTO), ++ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_SHUTDOWN), ++#endif + #ifdef __NR_shutdown + SECCOMP_ALLOW(__NR_shutdown), + #endif diff --git a/src/patches/ghostscript-drop-use-of-FT_CALLBACK_DEF-with-Freetype-2.10.3-and-later.patch b/src/patches/ghostscript-drop-use-of-FT_CALLBACK_DEF-with-Freetype-2.10.3-and-later.patch new file mode 100644 index 000000000..78014667d --- /dev/null +++ b/src/patches/ghostscript-drop-use-of-FT_CALLBACK_DEF-with-Freetype-2.10.3-and-later.patch @@ -0,0 +1,50 @@ +From 41ef9a0bc36b9db7115fbe9623f989bfb47bbade Mon Sep 17 00:00:00 2001 +From: Chris Liddell <chris.liddell(a)artifex.com> +Date: Tue, 20 Oct 2020 09:49:45 +0100 +Subject: [PATCH] Bug 702985: drop use of FT_CALLBACK_DEF() def + +From 2.10.3, Freetype disappeared the FT_CALLBACK_DEF() macro, which is what +we used when defining our callbacks from Freetype. + +No guidance forthcoming from the Freetype developer who made those changes, +so change to explicitly declaring the callbacks file static. + +Should fix the reported build failures. +--- + base/fapi_ft.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/base/fapi_ft.c b/base/fapi_ft.c +index 65fa6dcf4..21aef2f06 100644 +--- a/base/fapi_ft.c ++++ b/base/fapi_ft.c +@@ -125,7 +125,7 @@ static void + delete_inc_int_info(gs_fapi_server * a_server, + FT_IncrementalRec * a_inc_int_info); + +-FT_CALLBACK_DEF(void *) ++static void * + FF_alloc(FT_Memory memory, long size) + { + gs_memory_t *mem = (gs_memory_t *) memory->user; +@@ -133,7 +133,7 @@ FF_alloc(FT_Memory memory, long size) + return (gs_malloc(mem, size, 1, "FF_alloc")); + } + +-FT_CALLBACK_DEF(void *) ++static void * + FF_realloc(FT_Memory memory, long cur_size, long new_size, void *block) + { + gs_memory_t *mem = (gs_memory_t *) memory->user; +@@ -153,7 +153,7 @@ FT_CALLBACK_DEF(void *) + return (tmp); + } + +-FT_CALLBACK_DEF(void) ++static void + FF_free(FT_Memory memory, void *block) + { + gs_memory_t *mem = (gs_memory_t *) memory->user; +-- +2.17.1 + hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. fbbf44c62f509cdcc2e97e624137e6e64ad33dd9
by Michael Tremer 05 Feb '21

05 Feb '21

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via fbbf44c62f509cdcc2e97e624137e6e64ad33dd9 (commit) from c1b356d20da2ebb162072787927b5babbafebfa4 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit fbbf44c62f509cdcc2e97e624137e6e64ad33dd9 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Feb 5 17:13:56 2021 +0000 fireperf: I accidentially committed an empty rootfile Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/fireperf | 1 + 1 file changed, 1 insertion(+) Difference in files: diff --git a/config/rootfiles/packages/fireperf b/config/rootfiles/packages/fireperf index e69de29bb..bf6e51e71 100644 --- a/config/rootfiles/packages/fireperf +++ b/config/rootfiles/packages/fireperf @@ -0,0 +1 @@ +usr/bin/fireperf hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. c1b356d20da2ebb162072787927b5babbafebfa4
by Michael Tremer 05 Feb '21

05 Feb '21

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via c1b356d20da2ebb162072787927b5babbafebfa4 (commit) via 8e308e4eb2534c260a29a17bd66700f894a84cb9 (commit) via ed900d153ef5452779f8eae0320c424b4216d9b4 (commit) via f407f05a6f0b4a85e7852ac01d71f4d9373940ae (commit) via ece62d250091d962f12cbfb8de92ebfc26a0856e (commit) via 446b9291f9773ba462da8a561c966e59e48f19cb (commit) via 2e4321c1f49dc3a8b4c5b0357a8b60889d9da89c (commit) via 8474dc4a7743fc9da0cf1496c76c74c4aaf7cc36 (commit) via 8e07deb9839e341bf9841fd08e82c55cd5ab6017 (commit) via fe2c0e0fa0729589488e60eda4aa6dd6f70ee01f (commit) via 74e28f29f8cfe2ab8df905cee1b29cbfe00f81fb (commit) via 1116930315418a0dbc410a0c49de22134d68205d (commit) via 304f647749912c429cee7791d6da8ccd70692868 (commit) via 4306f30b6f80de3c7c0d7b398e42616abdc4d006 (commit) via 5de33a38d801a1fb0420efa20d108b9f5312d913 (commit) via 1a4e9c9db4857d0a578bcd5f4d4a60edc5129834 (commit) via 67fbd255d1f9b609bcdf241b3bc6d30eba46f1d5 (commit) via e514d67f8e6fd3364b3bfa19d68e39435e103a9a (commit) via d086a16619c89cd2420a0f6ed80aa93ecb696f73 (commit) via 51605e1b52bac244e3ab8d938010988efa82c232 (commit) via 20918d700a49187cbdc4066a978b6c8853802097 (commit) via 8928b738d7bbc324cd288fcef2abf7f2bab305d7 (commit) via be184f040f4f18ccb3eca6f0ec38e2d84b350424 (commit) via fb87d2756e8bb1fee1156b554943c7f25019544c (commit) via 0610914f7b12b5be128dfba90dc4d3460f7350c3 (commit) via b84005daaaaa7d0e82d34485c56b0546cc4942d0 (commit) via 5ac4578d2e1ab03a170f31f16ae1b4c46b422aa3 (commit) via dae10ab8c51f677860a877b4ab4385227afbe93c (commit) via a87abffc9e2d9fd4ca038ed17bcb582c979663bc (commit) via 8ace58e8ac0491aa72f1213841824d284377db0d (commit) via b51d19ece203ecfd20e89f72abf49953e7a4c2ac (commit) via 278b53e96f8a64585078fac20639bf3444e2e4f5 (commit) via 10ad593d83c492f1e5ecab61604c2af14715d859 (commit) via 2e2170bfb541ea1238f1dcc9f026fab1c3f28d51 (commit) via 7b476adef33171763c1e764c013c98055d3965b5 (commit) via f1f2a8dbefd8a90622a1de641adb61f6cffc7a5f (commit) via e36cd564317a3223192c16aa3b17d42b0aac9fe7 (commit) via 89b044918573826c2b52b27293a81d66ac0504e1 (commit) via 710b6ef1e828a93e48052adc79f400ac243e63c7 (commit) via 7a3f7634cc10674b2b9610e19995c6bbab36611a (commit) via d5eb0e3906782acffd0b6081fbee8a1fe9415254 (commit) via f453ff84159f2ab28b9f32aaaa299df7ce5683e4 (commit) via b815ec45d55953a1c89007ba4aef8bc46fc29f9d (commit) via d06693b487cc80a3d8ed654edde76f407b13fc78 (commit) via ae94f85b0210b5e2daf7f1ccdbcc7cf3b25388d9 (commit) via 68fbf256e26c6c3b65bff31dbf13235db087aab4 (commit) via aadf0a01e3837fb874748ebb0e32d37c64632605 (commit) via 9ab74511dacc7ccc9b1e090552174f06c1b18c1a (commit) via 69d90c36cc17a6b475253c29d98f02e26f1adb5e (commit) via dd401c4d8a666aa57fe6be71cae0e1062dbcebc1 (commit) via 84371e42dfc6fc7b0c6775cff80c45e869e073a3 (commit) via d3d50399244c969adff6cb71fd847bcbf77814c9 (commit) via f4abc0221fe7968fa49f9b1694ac97ca759455bb (commit) via 47cf62d3b74190c08ec002b6b27d0734ad309925 (commit) via f90fd27a70f1acb6304cf3b8a4253f47ef1a8edf (commit) via bf2ff65e6cd9a7550dec48f214eac310ca24585b (commit) via 6106a465d774b9bb983fc4d06104877af1c08e49 (commit) via b3a4ea2817abaadfab5012d36e2e4a382124f269 (commit) via b1f51038991423a9ff0d00a78175cedda1818c1b (commit) via 5bc11f39e38b29afe6690e010ceb23e92980b611 (commit) via d1efdea0d3ba1a184752181d9c7ac5f470b7cf3a (commit) via fa82a2156ae837b91304a190e10e10d8314d2ece (commit) via 52bf6075d080ae7e1aea21b805378d4bc4efd5fa (commit) via 9a0e00209806949435105610ad8cb63e9e9ff3db (commit) via bc19698555838a849c1bf9c5231610899ff9007d (commit) via 45063142bed6287d29d21170873d3f67eff2aa50 (commit) via 5653a45f813f57368bf2a32f9468ba6bd496274a (commit) via 968ad8ba8d4f730d52da90641539cc38bc92e27f (commit) via ecf0ba6d127ea594aa02cb8eefe47cbc5f499c93 (commit) via ff5aef9d30241ee170cb42922b9ebbf052376f6a (commit) via d52d7073815a5576215ebcc3a5fc6ae765574ddc (commit) via 6b22a5d2fdce2c440e7620f25b414a7173597f1a (commit) via e2bf0fa529d93ac8172bda53b85c50c4b45432fa (commit) via ffe6303b2bfc0feebf60604d41bc9428ba567764 (commit) via 922d881312482049dc67c2c1f4435ae7f7a266bd (commit) via 273708295b5553f174b27101a33c7d1402e4eb78 (commit) via 157d64250a170b905cb440dd6968f7ba6cbaf988 (commit) via 37fe3658a04f200732651ae997ff408efd7a92f6 (commit) via 354c3e2b45d9b3e51a29c8632bd18deb603a811f (commit) via 64883513d5940c17afe2fcf1d876feae61921ea9 (commit) via 8e4b2125ccfd005c30adb9c568f2103bbc36bdb7 (commit) via 84de1f087c8a3bb0b5ca58503101f95117a69cf0 (commit) via 14dc1c68f75b2ea70c0acfc55c1c168cc1ba8dff (commit) via 5efedb5487fa6fcc771c03bb9f15b5cb2412416c (commit) via c651dd9b6b2e00fb10d1ca1a99cf9efaec42df19 (commit) via cf9efe511a403f9dba38340bf9c89bc1d30776f5 (commit) via db984059b22a4680046df31579b44fa05c8264d5 (commit) via 6733d973d663968e1d642c18b3a0fe6526f07252 (commit) via c33f477f5bf1942f70dfaeff793e3d553afe4960 (commit) via ca060524a79e6d9d874b82f081e8c98d1abe4ff1 (commit) via 5d482a74faf4732db7c77ee693a2bc65e0b81a7a (commit) via d9f9f16366d6a8332d5fd8e864d1a9c552db1387 (commit) via 29156d15f637faa7b5a23c797f0b0cd858a300ff (commit) via 1035570fb0ab8b62ed8511f27261fbe609dc3178 (commit) via 85f5656aca91992d8cf135da603d729cc8ac8e0d (commit) via 53f04366ed8eff56b11cc4d070fe36ed5ddb376b (commit) via adc2aa5f67dfcc537bb0c0acc4136b69cd62b8e0 (commit) via eea288bc1a55ac99cac868b00367999455cecde5 (commit) via abffcc99adab8311e9421c8203a82d65b7c5ea1c (commit) via f1d98a1c3fb2459cf481e9330d113a958be35e58 (commit) via 502f6c63a3120a85ca855ec9aaec9c6cb90cbefd (commit) via bb859c27f08b67d05c204455849f173df29cfdf1 (commit) via 387d4b5e43fb602c3be6078ce3a2284f07be55ba (commit) via 9f2779d71c9289e0c01da191666eef77062eb91d (commit) via bcc66365764642ffa529a5bd6623110fa78c44b6 (commit) via 597e584f3dcbec0488f7471f7f657a0d092df627 (commit) via 0de7cc50ac420b3a635a342197a0174d5eeb4e1d (commit) via 37ff8e005db883c8e476dedd1b73e6623e271cc9 (commit) via 161613165a64dffeef9a0d5bc545c698dfdda002 (commit) via 93d540832a2077e276c8c5d8eec14f3aa9fe47a4 (commit) via 5b2fc5d65f85917e906af70f63c2fc238b266420 (commit) via 50f75f88068420c66a64661120ab24f32feda22a (commit) via 5c21f1a0784c73aa9c1cdf387f2940efb11ddf67 (commit) via b14c24ca90e048cf65bd32b5d431c435e24d5610 (commit) via 5c3f3da55921a8f027d06d69df8bde19fef0c478 (commit) via 675c9ca558f3d354127c4746fed187b3ff4380cd (commit) via 0b58804370ce8ee1350b85d30e1577e7dfaec90f (commit) via ad594123b6dd1115138a70ed15e59f3d43a91021 (commit) via 56d37c8dbfe5793212163814e6ca34b9ee6d34e2 (commit) via 7fd195938f0e4f48168148e2ca3f16e91d895241 (commit) via 80b1dc64f2020c2771fd43460e6a07f348f0b4d9 (commit) via baa97123726d5e9d58af27595e7c9ad9bafa2a46 (commit) via 611c2b7103f6921a2cb11be26c799d7613793cfb (commit) via a4cfeae49b531035c17463d2f4ea3db5010bc50a (commit) via 0eec4bbe46752aa732132436cf3aaff58be2e855 (commit) via 3403eb308c7220cde9c08c555c2d263a1f1501d7 (commit) via 5addf347804340cef0808d6fb119b6092244dec6 (commit) via 0c2be650b04ba40a38e51188bce1821808d2e197 (commit) via 14cb18a5395cee2c9ff0ed13afdc5feca8d45514 (commit) via f0b53518e5b74ef7e7b432f1c627772253a5ea3a (commit) via acc82ade06f1bf68e3d47630699d9f9745088311 (commit) via 2b113aebc482389692c9843a289ca489364a0c6f (commit) via f8e0e85d2ef1231aec962604ea5a9d5814cba293 (commit) via cc62cff43fc8bfba762fce51e48c18a0ceca3e0d (commit) via 1deb76d7fba31f1a547cd83a5ef99862a02f9f6c (commit) via d701756a83e3fcf2fda0b85accc601b9799f7a0a (commit) via eb2cf5d0f3971431d60c0d2e8b5807f8f112a983 (commit) via 0562cdb360b28802427fc9f51d2e467788222109 (commit) via f6557ced12d4e6137c8d2fa6d1a376aefb2a0052 (commit) via 7d425e7cfa9767fedc460cf5e452a736163e738a (commit) via 211b6bc16e3d1c383e63835572c21d8f7ed63822 (commit) via 02037c964fade3d58b0e4d9a05d3034955e8f5bc (commit) via 6f20cb9688535efaf22cc490ffdcbed99088e67a (commit) via 35b8dc552ddf08bd3d2290621076e323859b23cd (commit) via 8468f164abec32309e7c09bf044face0a153c56a (commit) via 34866cace5ffbd587bab91a00d763fa18853746b (commit) via 6ae847429ed258ce3f7f50317bec3d4ed3efe6cc (commit) via 84e4274e59912b854363597c97602432a9a5f615 (commit) via 248902f8c9a9ea1a8b549aff87344e024e1a1d8d (commit) via 1a886f57d865e6cb568bb6bfe3e043cdd7c2dd0f (commit) via 36f253d2911c56715b435acee2c14dd14a7cc828 (commit) via 81790c8a002363bd4bddf46c3621e051c549f702 (commit) via 1a79ef8e43a4e406a79344341055dd9fa79ce57d (commit) via f0c39f17390ce71960cf3c6fb06498a20634b263 (commit) via 7908de2a952edc91b1effa6245dbb6dc80b7dafc (commit) via 5cef36ccb14424270a451c11d235ece4dc3be946 (commit) via b37678e92231a7497820b2f39f040cccacfd808e (commit) via 241bf919fc2d056124c1082a0488bfa4c3fe8298 (commit) via d0a16dba2835fc1c27c1d12765d7461a9d48c04c (commit) via 5b4e33bc3b754dd14ecc279bc421ec232a489507 (commit) via 888a21f928d1eb79ae7049bdde394f54ebc39e2c (commit) via 21970dd75f4f5a00b89f4cec4a56bb5c959c9407 (commit) via 3d725ebbec589c137f40c59296662b21583225e1 (commit) via 86bd9ccc951473f4e9ec3df7748a89b954beda1c (commit) via edd2710520fb2b762b1b4a05a0a34180ad30b7ae (commit) via 2b4110cd64721eb591a75e7bc0856afff4b4ff93 (commit) via 1d55fccdc58f56c7cea81b9c7c6a96aec89458ae (commit) via 15194c7c52c2438611832cecf4dad24fec304322 (commit) via da310b22465c5147fa5d63bb763d9b1963726eb8 (commit) via e49289c9ea0d1ccd1462aa0012d00f434e8ac259 (commit) via 2127c97b8f738a1d2b75d817a42d73145bde257c (commit) via ed7f8152662d2371b7624fd4f26499f4236c35c2 (commit) via 438fce1f19d6e01058dfa04b0d7fa308d574121a (commit) via 2abcb7ee5f25becda8056c01c1e98faf80c57807 (commit) via 2b4353a436af758876a043b8cbaa5819ebde3c6a (commit) via 382f92fa5b9f2064ccfd204c5fa7aa3b9a4b69a3 (commit) via 3a4d52603d6af0c239da3a3ab18c7ed3055cbfa1 (commit) via 50992c73210f05384a976dbe21843c37734b4a3f (commit) via 986a116beb92399d9574e1552e0e2a0d6fc614f3 (commit) via e1616eb4509bda0f4c892f992c3324980c796ebb (commit) via 9c51467d05d765fad1788be478b41412192af8d9 (commit) via 814a33ff4d5032e641c673973c66f31c8ebe77eb (commit) via 630e8601f839c2a0e93900000c10363057b2fe7d (commit) via f8c5644dc5facad5a1b3a0265ff4ff3bf9f6fe49 (commit) via 73a92c604cf27df8b31c3ae15f0d6981e88b504d (commit) via 642316370f9cfa65175ae1cbed462a3b6c59622c (commit) via 6666b93d11b3add035baaf5a41a1ef16f4da9e19 (commit) via 0b1d45849f9df9ac145359a02cd383c7baff6c5b (commit) via f65629dd479a2846e9e4b1af910bf879d133e186 (commit) via 4ed49291c2eb23e7043721ed55f07c0135440dcb (commit) via d96d979e2a0bb199b5ae7bec75964f4091996268 (commit) via 631b7056acfd21f03b21f446eb6b26e5bd86f699 (commit) via 03bebd2303f560626ed2e465967a6b7846f21644 (commit) via f31c8d2adec2f629aedcd7c3db5d15a6bdf42e94 (commit) via 5189d54a2f3eb30feea999beb42e753b592c0671 (commit) via 05f68686a0c4259ad2fcb96e2ea3d2fa71e40a77 (commit) via 79feb120a0827f47df14e6fbb6b32970bc36d04a (commit) via e9fbd9293a8732e8be47eed8d5da85e4a257c897 (commit) via 6f56c219deda7feb97220dccd525187c0e7151ba (commit) via 9f87208cd77722c2588822b6a7df028e10fc4a39 (commit) via fe0984e07bb48922acae5a4993503455df9dec0d (commit) via 7d8a116a41354743de76e989d67fd79f7de8abfe (commit) via 96adf682bcb7640a9ef8e5caab9f93a887bd0271 (commit) via 4af97be3029bfd4e857d1c5a7d764528e7fbdd5e (commit) via 9dbf3c4936395bebc5db124382209b8cd3fcb241 (commit) via fef289cef78c9041615eda22180b56294b6354e2 (commit) via 9cea690a93be0373a01163caf2848e5e526813ae (commit) via 9ee802c508e56415f9150a450affb649b7951cdf (commit) via 34081d2f239df9481da9f614dcdbf582f4f44a01 (commit) via 60aab42a632b36d01e9fa1c85a910462dd0e1273 (commit) via 8e3c15e687fa892c8ca167c3242ff1f51747ada7 (commit) via f6ede20a629fc1b56bf4910729819ff4c7716f23 (commit) via 471407756443b33d82e6d52559399c995aa624fa (commit) via ce26b2a364fbf884e2d715349fb6a8d329f99633 (commit) via d7f3843d67b2e913effa57ce19e50e85dbbfeeee (commit) via 58303fb9f0e7a02ebf1a5f15cef5387f1945e3e0 (commit) via 7e09bcbc45695026592ac4169f9aa18bb8fb811e (commit) via e6575e1a58cce7aeef56b142560890a384eecd2d (commit) via b954ae2750e4d36323cc497563fa7c12420df5e4 (commit) via ea7a9a4b2fccaa7320702588cd31c919d08f1160 (commit) via a410004c610f8b21f9372056523a419085dbb3b7 (commit) via c84046215309c2c5dec62f4a87fd86d9e5bf8fb0 (commit) via 904b8b625966c05324e39e5e2d9081555978f92e (commit) via babe22939080474f8285eea24d2abc7ce1b1addc (commit) via 5fd8c3e1f5e3a470f283485e562a9a41242265bd (commit) via ebbda8ed863ac1eb29c549c015a363dea83fa580 (commit) via 64dfe751428c2cac0c1d700fb71054166973e567 (commit) via 8d3135455f05de92c6b1f22a4b8b2020903f80a6 (commit) via fde5772fde4f47b923493c558280a70716bd6116 (commit) via d7f93218b154f30a3b603956ebfa0d41aa48fa15 (commit) via d978558809285afcee56b2120b10d9107b1b260b (commit) via 50752f1b61997b60e7850d41d5c633a688ab1353 (commit) via 14baf8472a74b18ff1779a9caf534a8af91e0134 (commit) via d44ce7d4c25e9a1d0a8a358c0f16a17d1d417cf1 (commit) via ca4ce968000125f237da77da6bcf88738ec6b060 (commit) via 0f4d1a8e6b37a4ac1b9cb64bc34f9d4b31423099 (commit) via c2f02d9d5977d7ead634760bc8987bafbfc62370 (commit) via 86a7c165a1a3afdf21734aad5291403440d04d08 (commit) from c4f1f56157955c018510f7cd20f3d4c21cb294bd (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit c1b356d20da2ebb162072787927b5babbafebfa4 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Feb 5 17:01:29 2021 +0000 Revert "dhcpcd: Update to 9.4.0" This reverts commit 15194c7c52c2438611832cecf4dad24fec304322. This version still fails to run on i586 without this patch. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/ca-certificates/certdata.txt | 3864 +++++++------------- config/cfgroot/general-functions.pl | 51 +- config/cfgroot/header.pl | 22 +- config/cfgroot/ids-functions.pl | 39 +- config/cfgroot/network-functions.pl | 67 + config/hostapd/config | 59 +- config/menu/EX-asterisk.menu | 15 - config/rootfiles/common/aarch64/linux | 1 + config/rootfiles/common/acl | 14 +- config/rootfiles/common/armv5tel/linux-multi | 1 + config/rootfiles/common/bind | 9 +- config/rootfiles/common/configroot | 4 +- config/rootfiles/common/curl | 7 + config/rootfiles/common/fcron | 122 +- config/rootfiles/common/findutils | 3 - config/rootfiles/common/fuse | 68 +- config/rootfiles/common/i586/hyperscan | 4 +- config/rootfiles/common/i586/linux | 1 + config/rootfiles/common/ipset | 2 +- config/rootfiles/common/iptables | 3 +- config/rootfiles/common/kmod | 2 +- config/rootfiles/common/libgcrypt | 2 +- config/rootfiles/common/libgpg-error | 2 +- config/rootfiles/common/lzip | 3 + config/rootfiles/common/meson | 178 + config/rootfiles/common/misc-progs | 3 - config/rootfiles/common/newt | 15 +- config/rootfiles/common/ninja | 1 + config/rootfiles/common/pam | 31 +- config/rootfiles/common/procps | 45 +- config/rootfiles/common/screen | 9 +- config/rootfiles/common/sshfs | 2 + config/rootfiles/common/sudo | 58 +- config/rootfiles/common/unbound | 2 +- config/rootfiles/common/web-user-interface | 7 - config/rootfiles/common/x86_64/hyperscan | 4 +- config/rootfiles/common/x86_64/linux | 1 + config/rootfiles/core/{153 => 154}/exclude | 0 .../{oldcore/104 => core/154}/filelists/acl | 0 config/rootfiles/core/154/filelists/arping | 1 + .../{oldcore/100 => core/154}/filelists/bind | 0 .../121 => core/154}/filelists/ca-certificates | 0 config/rootfiles/core/{153 => 154}/filelists/curl | 0 config/rootfiles/core/{153 => 154}/filelists/ddns | 0 .../{oldcore/125 => core/154}/filelists/dhcpcd | 0 .../{oldcore/101 => core/154}/filelists/dma | 0 config/rootfiles/core/154/filelists/etherwake | 1 + .../{oldcore/29 => core/154}/filelists/fcron | 0 config/rootfiles/core/154/filelists/files | 33 + .../{oldcore/103 => core/154}/filelists/findutils | 0 .../{oldcore/112 => core/154}/filelists/fuse | 0 .../133 => core/154}/filelists/i586/hyperscan | 0 .../{oldcore/106 => core/154}/filelists/iproute2 | 0 .../{oldcore/106 => core/154}/filelists/ipset | 0 .../{oldcore/123 => core/154}/filelists/iptables | 0 .../{oldcore/121 => core/154}/filelists/iw | 0 .../{oldcore/125 => core/154}/filelists/kmod | 0 config/rootfiles/core/{153 => 154}/filelists/knot | 0 .../{oldcore/103 => core/154}/filelists/less | 0 .../{oldcore/105 => core/154}/filelists/libgcrypt | 0 .../106 => core/154}/filelists/libgpg-error | 0 .../rootfiles/core/{153 => 154}/filelists/libhtp | 0 .../rootfiles/core/{153 => 154}/filelists/libloc | 0 .../{oldcore/111 => core/154}/filelists/logrotate | 0 .../rootfiles/core/{153 => 154}/filelists/logwatch | 0 .../{oldcore/125 => core/154}/filelists/lvm2 | 0 config/rootfiles/core/154/filelists/lzip | 1 + .../{oldcore/66 => core/154}/filelists/newt | 0 .../{oldcore/119 => core/154}/filelists/pam | 0 .../{oldcore/66 => core/154}/filelists/pptp | 0 .../{oldcore/103 => core/154}/filelists/procps | 0 .../{oldcore/100 => core/154}/filelists/sed | 0 .../{oldcore/119 => core/154}/filelists/setup | 0 .../{oldcore/125 => core/154}/filelists/sqlite | 0 .../{oldcore/112 => core/154}/filelists/sudo | 0 .../{oldcore/121 => core/154}/filelists/tar | 0 .../rootfiles/core/{153 => 154}/filelists/tzdata | 0 .../{oldcore/106 => core/154}/filelists/unbound | 0 .../103 => core/154}/filelists/wpa_supplicant | 0 .../133 => core/154}/filelists/x86_64/hyperscan | 0 .../rootfiles/{oldcore/152 => core/154}/update.sh | 9 +- config/rootfiles/{core => oldcore}/153/exclude | 0 .../{core => oldcore}/153/filelists/aarch64/linux | 0 .../153/filelists/aarch64/linux-initrd | 0 .../153/filelists/armv5tel/linux-initrd-multi | 0 .../153/filelists/armv5tel/linux-multi | 0 .../rootfiles/{core => oldcore}/153/filelists/bash | 0 .../rootfiles/{core => oldcore}/153/filelists/curl | 0 .../rootfiles/{core => oldcore}/153/filelists/ddns | 0 .../rootfiles/{core => oldcore}/153/filelists/file | 0 .../{core => oldcore}/153/filelists/files | 0 .../{core => oldcore}/153/filelists/hwdata | 0 .../153/filelists/i586/intel-microcode | 0 .../{core => oldcore}/153/filelists/i586/linux | 0 .../153/filelists/i586/linux-initrd | 0 .../153/filelists/i586/openssl-sse2 | 0 .../153/filelists/ids-ruleset-sources | 0 .../rootfiles/{core => oldcore}/153/filelists/knot | 0 .../{core => oldcore}/153/filelists/libarchive | 0 .../{core => oldcore}/153/filelists/libhtp | 0 .../{core => oldcore}/153/filelists/libloc | 0 .../{core => oldcore}/153/filelists/logwatch | 0 .../{core => oldcore}/153/filelists/openssl | 0 .../{core => oldcore}/153/filelists/openvpn | 0 .../{core => oldcore}/153/filelists/strongswan | 0 .../{core => oldcore}/153/filelists/suricata | 0 .../{core => oldcore}/153/filelists/tzdata | 0 .../{core => oldcore}/153/filelists/usb_modeswitch | 0 .../153/filelists/usb_modeswitch_data | 0 .../153/filelists/x86_64/intel-microcode | 0 .../{core => oldcore}/153/filelists/x86_64/linux | 0 .../153/filelists/x86_64/linux-initrd | 0 config/rootfiles/{core => oldcore}/153/update.sh | 0 config/rootfiles/packages/7zip | 201 +- config/rootfiles/packages/aarch64/samba | 3 + config/rootfiles/packages/armv5tel/samba | 3 + config/rootfiles/packages/bacula | 8 +- config/rootfiles/packages/c-ares | 68 + config/rootfiles/packages/cifs-utils | 6 + config/rootfiles/packages/cups-filters | 3 + config/rootfiles/packages/dbus | 2 +- config/rootfiles/packages/ddrescue | 2 + config/rootfiles/packages/elfutils | 46 +- .../lcdproc => rootfiles/packages/fireperf} | 0 config/rootfiles/packages/hplip | 208 +- config/rootfiles/packages/htop | 6 +- config/rootfiles/packages/i586/samba | 3 + config/rootfiles/packages/krb5 | 30 +- config/rootfiles/packages/libassuan | 2 +- config/rootfiles/packages/libseccomp | 8 +- config/rootfiles/packages/lynis | 12 +- config/rootfiles/packages/minicom | 2 + config/rootfiles/packages/qemu | 16 +- config/rootfiles/packages/tshark | 68 +- config/rootfiles/packages/x86_64/samba | 3 + .../samba/samba-change-password | 23 +- config/suricata/convert-snort | 3 +- config/udev/network-hotplug-bridges | 4 +- config/unbound/unbound.conf | 9 +- config/wpa_supplicant/config | 475 ++- doc/language_issues.de | 6 +- doc/language_issues.en | 14 +- doc/language_issues.es | 10 +- doc/language_issues.fr | 20 +- doc/language_issues.it | 11 +- doc/language_issues.nl | 8 +- doc/language_issues.pl | 10 +- doc/language_issues.ru | 10 +- doc/language_issues.tr | 10 +- doc/language_missings | 44 +- html/cgi-bin/asterisk/calls.cgi | 132 - html/cgi-bin/asterisk/conf.cgi | 161 - html/cgi-bin/asterisk/conf/telbook.conf | 1 - html/cgi-bin/asterisk/status.cgi | 119 - html/cgi-bin/country.cgi | 17 +- html/cgi-bin/credits.cgi | 5 +- html/cgi-bin/ddns.cgi | 112 +- html/cgi-bin/dhcp.cgi | 19 +- html/cgi-bin/extrahd.cgi | 4 +- html/cgi-bin/gpl.cgi | 2 +- html/cgi-bin/hardwaregraphs.cgi | 2 +- html/cgi-bin/ids.cgi | 3 +- html/cgi-bin/optionsfw.cgi | 4 +- html/cgi-bin/pakfire.cgi | 17 +- html/cgi-bin/remote.cgi | 8 +- html/cgi-bin/samba.cgi | 14 +- html/cgi-bin/services.cgi | 9 +- html/cgi-bin/upnp.cgi | 228 -- html/cgi-bin/wakeonlan.cgi | 2 +- html/cgi-bin/wirelessclient.cgi | 5 +- html/cgi-bin/wlanap.cgi | 3 +- langs/de/cgi-bin/de.pl | 8 +- langs/en/cgi-bin/en.pl | 12 +- langs/es/cgi-bin/es.pl | 4 +- langs/fr/cgi-bin/fr.pl | 14 +- langs/it/cgi-bin/it.pl | 7 +- langs/nl/cgi-bin/nl.pl | 8 +- langs/pl/cgi-bin/pl.pl | 6 +- langs/ru/cgi-bin/ru.pl | 6 +- langs/tr/cgi-bin/tr.pl | 6 +- lfs/7zip | 15 +- lfs/Config | 5 +- lfs/acl | 12 +- lfs/acpid | 4 +- lfs/arping | 4 +- lfs/automake | 4 +- lfs/bacula | 12 +- lfs/bind | 4 +- lfs/bird | 6 +- lfs/{fping => c-ares} | 15 +- lfs/ca-certificates | 2 +- lfs/ccache | 4 +- lfs/cdrom | 12 +- lfs/cifs-utils | 6 +- lfs/clamav | 6 +- lfs/configroot | 3 + lfs/core-updates | 7 +- lfs/cups-filters | 6 +- lfs/curl | 6 +- lfs/dbus | 6 +- lfs/ddns | 2 + lfs/ddrescue | 10 +- lfs/dehydrated | 6 +- lfs/dhcpcd | 7 +- lfs/dma | 4 +- lfs/dracut | 2 +- lfs/elfutils | 11 +- lfs/etherwake | 4 + lfs/fcron | 4 +- lfs/findutils | 15 +- lfs/{libhtp => fireperf} | 19 +- lfs/firmware-update | 6 +- lfs/flash-images | 4 +- lfs/flashrom | 7 +- lfs/fuse | 20 +- lfs/hostapd | 10 +- lfs/hplip | 6 +- lfs/htop | 6 +- lfs/hyperscan | 7 +- lfs/iperf | 6 +- lfs/iperf3 | 8 +- lfs/iproute2 | 4 +- lfs/ipset | 4 +- lfs/iptables | 4 +- lfs/iw | 4 +- lfs/kmod | 7 +- lfs/knot | 18 +- lfs/krb5 | 14 +- lfs/less | 4 +- lfs/libassuan | 6 +- lfs/libgcrypt | 4 +- lfs/libgpg-error | 4 +- lfs/libloc | 16 +- lfs/libseccomp | 8 +- lfs/logrotate | 4 +- lfs/logwatch | 5 +- lfs/lvm2 | 4 +- lfs/lynis | 14 +- lfs/{xz => lzip} | 8 +- lfs/{python3-yaml => meson} | 19 +- lfs/minicom | 6 +- lfs/monit | 10 +- lfs/nano | 6 +- lfs/newt | 4 +- lfs/{mdns-repeater => ninja} | 35 +- lfs/pam | 6 +- lfs/postfix | 8 +- lfs/pptp | 5 +- lfs/procps | 16 +- lfs/qemu | 9 +- lfs/samba | 9 +- lfs/screen | 6 +- lfs/sed | 4 +- lfs/shairport-sync | 6 +- lfs/sqlite | 4 +- lfs/sshfs | 14 +- lfs/strace | 8 +- lfs/stunnel | 6 +- lfs/sudo | 4 +- lfs/texinfo | 8 +- lfs/tor | 8 +- lfs/tshark | 8 +- lfs/tzdata | 8 +- lfs/unbound | 4 +- lfs/wget | 6 +- lfs/wpa_supplicant | 13 +- make.sh | 28 +- src/initscripts/packages/bacula | 28 + src/initscripts/system/functions | 10 +- src/initscripts/system/sshd | 2 +- src/initscripts/system/unbound | 2 +- src/initscripts/system/wlanclient | 21 +- src/installer/main.c | 2 +- src/misc-progs/Makefile | 7 +- src/misc-progs/addonctrl.c | 40 +- src/misc-progs/applejuicectrl.c | 44 - src/misc-progs/backupctrl.c | 35 +- src/misc-progs/extrahdctrl.c | 16 +- src/misc-progs/ipfiredeath.c | 25 - src/misc-progs/ipfirerebirth.c | 25 - src/misc-progs/ipfirereboot.c | 49 - src/misc-progs/launch-ether-wake.c | 37 - src/misc-progs/mpfirectrl.c | 30 +- src/misc-progs/pakfire.c | 21 +- src/misc-progs/sambactrl.c | 40 +- src/misc-progs/setuid.c | 123 +- src/misc-progs/setuid.h | 13 +- src/misc-progs/smartctrl.c | 5 + src/misc-progs/sshctrl.c | 11 +- src/misc-progs/updxsetperms.c | 28 - src/misc-progs/upnpctrl.c | 54 - src/pakfire/lib/functions.sh | 3 +- ...dns-013-add-option-to-list-token-provider.patch | 292 ++ src/patches/ddns-013-proper-encode-string.patch | 24 + ...86_for_SECCOMP_as_it_just_uses_socketcall.patch | 36 + ...ut-038_add_hyperv-keyboard_and_sdhci-pci.patch} | 2 +- src/patches/findutils-4.6.0-glibc2.28.patch | 335 -- .../fuse-2.9.2-namespace-conflict-fix.patch | 21 - src/patches/hostapd/hostapd-2.9-noscan.patch | 42 +- ...g-flag.patch => iperf-3.9-remove-pg-flag.patch} | 14 +- .../krb5-1.18.3_prevent_spurious_text.patch | 18 + .../krb5-1.18.3_remove_known_failed_test.patch | 18 + src/patches/libloc-0.9.4-upstream.patch | 3850 ------------------- ...oc-0.9.5-location-Fix-list-networks-by-as.patch | 27 + .../logwatch-7.5.4-dhcpd_reuse_lease_entries.patch | 15 - src/patches/p7zip-16.02-consolidated_fixes-1.patch | 466 --- src/patches/p7zip/CVE-2016-2334.patch | 24 - src/patches/p7zip/CVE-2016-2335.patch | 17 - src/patches/pptp-1.7.2-compat.patch | 71 - .../procps-3.2.8-fix_unknown_HZ_value.patch | 35 - src/patches/qemu-4.1.0-build-fix-glibc-2.31.patch | 65 - src/patches/screen-4.2.1-altscreen.patch | 16 - src/patches/screen-4.2.1-cpation-hardstatus.patch | 16 - src/scripts/ipsec-interfaces | 5 + src/setup/netstuff.c | 39 +- src/setup/networking.c | 85 - 316 files changed, 4057 insertions(+), 9911 deletions(-) delete mode 100644 config/menu/EX-asterisk.menu create mode 100644 config/rootfiles/common/lzip create mode 100644 config/rootfiles/common/meson create mode 100644 config/rootfiles/common/ninja copy config/rootfiles/core/{153 => 154}/exclude (100%) copy config/rootfiles/{oldcore/104 => core/154}/filelists/acl (100%) create mode 120000 config/rootfiles/core/154/filelists/arping copy config/rootfiles/{oldcore/100 => core/154}/filelists/bind (100%) copy config/rootfiles/{oldcore/121 => core/154}/filelists/ca-certificates (100%) copy config/rootfiles/core/{153 => 154}/filelists/curl (100%) copy config/rootfiles/core/{153 => 154}/filelists/ddns (100%) copy config/rootfiles/{oldcore/125 => core/154}/filelists/dhcpcd (100%) copy config/rootfiles/{oldcore/101 => core/154}/filelists/dma (100%) create mode 120000 config/rootfiles/core/154/filelists/etherwake copy config/rootfiles/{oldcore/29 => core/154}/filelists/fcron (100%) create mode 100644 config/rootfiles/core/154/filelists/files copy config/rootfiles/{oldcore/103 => core/154}/filelists/findutils (100%) copy config/rootfiles/{oldcore/112 => core/154}/filelists/fuse (100%) copy config/rootfiles/{oldcore/133 => core/154}/filelists/i586/hyperscan (100%) copy config/rootfiles/{oldcore/106 => core/154}/filelists/iproute2 (100%) copy config/rootfiles/{oldcore/106 => core/154}/filelists/ipset (100%) copy config/rootfiles/{oldcore/123 => core/154}/filelists/iptables (100%) copy config/rootfiles/{oldcore/121 => core/154}/filelists/iw (100%) copy config/rootfiles/{oldcore/125 => core/154}/filelists/kmod (100%) copy config/rootfiles/core/{153 => 154}/filelists/knot (100%) copy config/rootfiles/{oldcore/103 => core/154}/filelists/less (100%) copy config/rootfiles/{oldcore/105 => core/154}/filelists/libgcrypt (100%) copy config/rootfiles/{oldcore/106 => core/154}/filelists/libgpg-error (100%) copy config/rootfiles/core/{153 => 154}/filelists/libhtp (100%) copy config/rootfiles/core/{153 => 154}/filelists/libloc (100%) copy config/rootfiles/{oldcore/111 => core/154}/filelists/logrotate (100%) copy config/rootfiles/core/{153 => 154}/filelists/logwatch (100%) copy config/rootfiles/{oldcore/125 => core/154}/filelists/lvm2 (100%) create mode 120000 config/rootfiles/core/154/filelists/lzip copy config/rootfiles/{oldcore/66 => core/154}/filelists/newt (100%) copy config/rootfiles/{oldcore/119 => core/154}/filelists/pam (100%) copy config/rootfiles/{oldcore/66 => core/154}/filelists/pptp (100%) copy config/rootfiles/{oldcore/103 => core/154}/filelists/procps (100%) copy config/rootfiles/{oldcore/100 => core/154}/filelists/sed (100%) copy config/rootfiles/{oldcore/119 => core/154}/filelists/setup (100%) copy config/rootfiles/{oldcore/125 => core/154}/filelists/sqlite (100%) copy config/rootfiles/{oldcore/112 => core/154}/filelists/sudo (100%) copy config/rootfiles/{oldcore/121 => core/154}/filelists/tar (100%) copy config/rootfiles/core/{153 => 154}/filelists/tzdata (100%) copy config/rootfiles/{oldcore/106 => core/154}/filelists/unbound (100%) copy config/rootfiles/{oldcore/103 => core/154}/filelists/wpa_supplicant (100%) copy config/rootfiles/{oldcore/133 => core/154}/filelists/x86_64/hyperscan (100%) copy config/rootfiles/{oldcore/152 => core/154}/update.sh (94%) rename config/rootfiles/{core => oldcore}/153/exclude (100%) rename config/rootfiles/{core => oldcore}/153/filelists/aarch64/linux (100%) rename config/rootfiles/{core => oldcore}/153/filelists/aarch64/linux-initrd (100%) rename config/rootfiles/{core => oldcore}/153/filelists/armv5tel/linux-initrd-multi (100%) rename config/rootfiles/{core => oldcore}/153/filelists/armv5tel/linux-multi (100%) rename config/rootfiles/{core => oldcore}/153/filelists/bash (100%) rename config/rootfiles/{core => oldcore}/153/filelists/curl (100%) rename config/rootfiles/{core => oldcore}/153/filelists/ddns (100%) rename config/rootfiles/{core => oldcore}/153/filelists/file (100%) rename config/rootfiles/{core => oldcore}/153/filelists/files (100%) rename config/rootfiles/{core => oldcore}/153/filelists/hwdata (100%) rename config/rootfiles/{core => oldcore}/153/filelists/i586/intel-microcode (100%) rename config/rootfiles/{core => oldcore}/153/filelists/i586/linux (100%) rename config/rootfiles/{core => oldcore}/153/filelists/i586/linux-initrd (100%) rename config/rootfiles/{core => oldcore}/153/filelists/i586/openssl-sse2 (100%) rename config/rootfiles/{core => oldcore}/153/filelists/ids-ruleset-sources (100%) rename config/rootfiles/{core => oldcore}/153/filelists/knot (100%) rename config/rootfiles/{core => oldcore}/153/filelists/libarchive (100%) rename config/rootfiles/{core => oldcore}/153/filelists/libhtp (100%) rename config/rootfiles/{core => oldcore}/153/filelists/libloc (100%) rename config/rootfiles/{core => oldcore}/153/filelists/logwatch (100%) rename config/rootfiles/{core => oldcore}/153/filelists/openssl (100%) rename config/rootfiles/{core => oldcore}/153/filelists/openvpn (100%) rename config/rootfiles/{core => oldcore}/153/filelists/strongswan (100%) rename config/rootfiles/{core => oldcore}/153/filelists/suricata (100%) rename config/rootfiles/{core => oldcore}/153/filelists/tzdata (100%) rename config/rootfiles/{core => oldcore}/153/filelists/usb_modeswitch (100%) rename config/rootfiles/{core => oldcore}/153/filelists/usb_modeswitch_data (100%) rename config/rootfiles/{core => oldcore}/153/filelists/x86_64/intel-microcode (100%) rename config/rootfiles/{core => oldcore}/153/filelists/x86_64/linux (100%) rename config/rootfiles/{core => oldcore}/153/filelists/x86_64/linux-initrd (100%) rename config/rootfiles/{core => oldcore}/153/update.sh (100%) create mode 100644 config/rootfiles/packages/c-ares copy config/{backup/includes/lcdproc => rootfiles/packages/fireperf} (100%) copy src/paks/netatalk/uninstall.sh => config/samba/samba-change-password (82%) delete mode 100644 html/cgi-bin/asterisk/calls.cgi delete mode 100644 html/cgi-bin/asterisk/conf.cgi delete mode 100644 html/cgi-bin/asterisk/conf/telbook.conf delete mode 100644 html/cgi-bin/asterisk/status.cgi delete mode 100644 html/cgi-bin/upnp.cgi copy lfs/{fping => c-ares} (94%) copy lfs/{libhtp => fireperf} (87%) copy lfs/{xz => lzip} (96%) copy lfs/{python3-yaml => meson} (93%) copy lfs/{mdns-repeater => ninja} (83%) create mode 100644 src/initscripts/packages/bacula delete mode 100644 src/misc-progs/applejuicectrl.c delete mode 100644 src/misc-progs/ipfiredeath.c delete mode 100644 src/misc-progs/ipfirerebirth.c delete mode 100644 src/misc-progs/launch-ether-wake.c delete mode 100644 src/misc-progs/updxsetperms.c delete mode 100644 src/misc-progs/upnpctrl.c create mode 100644 src/patches/ddns-013-add-option-to-list-token-provider.patch create mode 100644 src/patches/ddns-013-proper-encode-string.patch create mode 100644 src/patches/dhcpcd/01_Fix_Linux_i386_for_SECCOMP_as_it_just_uses_socketcall.patch rename src/patches/{dracut-038_add_sdhci-pci.patch => dracut-038_add_hyperv-keyboard_and_sdhci-pci.patch} (92%) delete mode 100644 src/patches/findutils-4.6.0-glibc2.28.patch delete mode 100644 src/patches/fuse-2.9.2-namespace-conflict-fix.patch rename src/patches/iperf3/{iperf-3.7-remove-pg-flag.patch => iperf-3.9-remove-pg-flag.patch} (68%) create mode 100644 src/patches/krb5-1.18.3_prevent_spurious_text.patch create mode 100644 src/patches/krb5-1.18.3_remove_known_failed_test.patch delete mode 100644 src/patches/libloc-0.9.4-upstream.patch create mode 100644 src/patches/libloc-0.9.5-location-Fix-list-networks-by-as.patch delete mode 100644 src/patches/logwatch/logwatch-7.5.4-dhcpd_reuse_lease_entries.patch delete mode 100644 src/patches/p7zip-16.02-consolidated_fixes-1.patch delete mode 100644 src/patches/p7zip/CVE-2016-2334.patch delete mode 100644 src/patches/p7zip/CVE-2016-2335.patch delete mode 100644 src/patches/pptp-1.7.2-compat.patch delete mode 100644 src/patches/procps-3.2.8-fix_unknown_HZ_value.patch delete mode 100644 src/patches/qemu-4.1.0-build-fix-glibc-2.31.patch delete mode 100644 src/patches/screen-4.2.1-altscreen.patch delete mode 100644 src/patches/screen-4.2.1-cpation-hardstatus.patch Difference in files: diff --git a/config/ca-certificates/certdata.txt b/config/ca-certificates/certdata.txt index be29966dc..478ab0895 100644 --- a/config/ca-certificates/certdata.txt +++ b/config/ca-certificates/certdata.txt @@ -1141,468 +1141,6 @@ CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE -# -# Certificate "GeoTrust Global CA" -# -# Issuer: CN=GeoTrust Global CA,O=GeoTrust Inc.,C=US -# Serial Number: 144470 (0x23456) -# Subject: CN=GeoTrust Global CA,O=GeoTrust Inc.,C=US -# Not Valid Before: Tue May 21 04:00:00 2002 -# Not Valid After : Sat May 21 04:00:00 2022 -# Fingerprint (MD5): F7:75:AB:29:FB:51:4E:B7:77:5E:FF:05:3C:99:8E:F5 -# Fingerprint (SHA1): DE:28:F4:A4:FF:E5:B9:2F:A3:C5:03:D1:A3:49:A7:F9:96:2A:82:12 -CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE -CKA_TOKEN CK_BBOOL CK_TRUE -CKA_PRIVATE CK_BBOOL CK_FALSE -CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GeoTrust Global CA" -CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 -CKA_SUBJECT MULTILINE_OCTAL -\060\102\061\013\060\011\006\003\125\004\006\023\002\125\123\061 -\026\060\024\006\003\125\004\012\023\015\107\145\157\124\162\165 -\163\164\040\111\156\143\056\061\033\060\031\006\003\125\004\003 -\023\022\107\145\157\124\162\165\163\164\040\107\154\157\142\141 -\154\040\103\101 -END -CKA_ID UTF8 "0" -CKA_ISSUER MULTILINE_OCTAL -\060\102\061\013\060\011\006\003\125\004\006\023\002\125\123\061 -\026\060\024\006\003\125\004\012\023\015\107\145\157\124\162\165 -\163\164\040\111\156\143\056\061\033\060\031\006\003\125\004\003 -\023\022\107\145\157\124\162\165\163\164\040\107\154\157\142\141 -\154\040\103\101 -END -CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\003\002\064\126 -END -CKA_VALUE MULTILINE_OCTAL -\060\202\003\124\060\202\002\074\240\003\002\001\002\002\003\002 -\064\126\060\015\006\011\052\206\110\206\367\015\001\001\005\005 -\000\060\102\061\013\060\011\006\003\125\004\006\023\002\125\123 -\061\026\060\024\006\003\125\004\012\023\015\107\145\157\124\162 -\165\163\164\040\111\156\143\056\061\033\060\031\006\003\125\004 -\003\023\022\107\145\157\124\162\165\163\164\040\107\154\157\142 -\141\154\040\103\101\060\036\027\015\060\062\060\065\062\061\060 -\064\060\060\060\060\132\027\015\062\062\060\065\062\061\060\064 -\060\060\060\060\132\060\102\061\013\060\011\006\003\125\004\006 -\023\002\125\123\061\026\060\024\006\003\125\004\012\023\015\107 -\145\157\124\162\165\163\164\040\111\156\143\056\061\033\060\031 -\006\003\125\004\003\023\022\107\145\157\124\162\165\163\164\040 -\107\154\157\142\141\154\040\103\101\060\202\001\042\060\015\006 -\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001\017 -\000\060\202\001\012\002\202\001\001\000\332\314\030\143\060\375 -\364\027\043\032\126\176\133\337\074\154\070\344\161\267\170\221 -\324\274\241\330\114\370\250\103\266\003\351\115\041\007\010\210 -\332\130\057\146\071\051\275\005\170\213\235\070\350\005\267\152 -\176\161\244\346\304\140\246\260\357\200\344\211\050\017\236\045 -\326\355\203\363\255\246\221\307\230\311\102\030\065\024\235\255 -\230\106\222\056\117\312\361\207\103\301\026\225\127\055\120\357 -\211\055\200\172\127\255\362\356\137\153\322\000\215\271\024\370 -\024\025\065\331\300\106\243\173\162\310\221\277\311\125\053\315 -\320\227\076\234\046\144\314\337\316\203\031\161\312\116\346\324 -\325\173\251\031\315\125\336\310\354\322\136\070\123\345\134\117 -\214\055\376\120\043\066\374\146\346\313\216\244\071\031\000\267 -\225\002\071\221\013\016\376\070\056\321\035\005\232\366\115\076 -\157\017\007\035\257\054\036\217\140\071\342\372\066\123\023\071 -\324\136\046\053\333\075\250\024\275\062\353\030\003\050\122\004 -\161\345\253\063\075\341\070\273\007\066\204\142\234\171\352\026 -\060\364\137\300\053\350\161\153\344\371\002\003\001\000\001\243 -\123\060\121\060\017\006\003\125\035\023\001\001\377\004\005\060 -\003\001\001\377\060\035\006\003\125\035\016\004\026\004\024\300 -\172\230\150\215\211\373\253\005\144\014\021\175\252\175\145\270 -\312\314\116\060\037\006\003\125\035\043\004\030\060\026\200\024 -\300\172\230\150\215\211\373\253\005\144\014\021\175\252\175\145 -\270\312\314\116\060\015\006\011\052\206\110\206\367\015\001\001 -\005\005\000\003\202\001\001\000\065\343\051\152\345\057\135\124 -\216\051\120\224\237\231\032\024\344\217\170\052\142\224\242\047 -\147\236\320\317\032\136\107\351\301\262\244\317\335\101\032\005 -\116\233\113\356\112\157\125\122\263\044\241\067\012\353\144\166 -\052\056\054\363\375\073\165\220\277\372\161\330\307\075\067\322 -\265\005\225\142\271\246\336\211\075\066\173\070\167\110\227\254 -\246\040\217\056\246\311\014\302\262\231\105\000\307\316\021\121 -\042\042\340\245\352\266\025\110\011\144\352\136\117\164\367\005 -\076\307\212\122\014\333\025\264\275\155\233\345\306\261\124\150 -\251\343\151\220\266\232\245\017\270\271\077\040\175\256\112\265 -\270\234\344\035\266\253\346\224\245\301\307\203\255\333\365\047 -\207\016\004\154\325\377\335\240\135\355\207\122\267\053\025\002 -\256\071\246\152\164\351\332\304\347\274\115\064\036\251\134\115 -\063\137\222\011\057\210\146\135\167\227\307\035\166\023\251\325 -\345\361\026\011\021\065\325\254\333\044\161\160\054\230\126\013 -\331\027\264\321\343\121\053\136\165\350\325\320\334\117\064\355 -\302\005\146\200\241\313\346\063 -END -CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE -# For Server Distrust After: Wed Jan 01 00:00:00 2020 -CKA_NSS_SERVER_DISTRUST_AFTER MULTILINE_OCTAL -\062\060\060\061\060\061\060\060\060\060\060\060\132 -END -CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE - -# Trust for Certificate "GeoTrust Global CA" -# Issuer: CN=GeoTrust Global CA,O=GeoTrust Inc.,C=US -# Serial Number: 144470 (0x23456) -# Subject: CN=GeoTrust Global CA,O=GeoTrust Inc.,C=US -# Not Valid Before: Tue May 21 04:00:00 2002 -# Not Valid After : Sat May 21 04:00:00 2022 -# Fingerprint (MD5): F7:75:AB:29:FB:51:4E:B7:77:5E:FF:05:3C:99:8E:F5 -# Fingerprint (SHA1): DE:28:F4:A4:FF:E5:B9:2F:A3:C5:03:D1:A3:49:A7:F9:96:2A:82:12 -CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST -CKA_TOKEN CK_BBOOL CK_TRUE -CKA_PRIVATE CK_BBOOL CK_FALSE -CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GeoTrust Global CA" -CKA_CERT_SHA1_HASH MULTILINE_OCTAL -\336\050\364\244\377\345\271\057\243\305\003\321\243\111\247\371 -\226\052\202\022 -END -CKA_CERT_MD5_HASH MULTILINE_OCTAL -\367\165\253\051\373\121\116\267\167\136\377\005\074\231\216\365 -END -CKA_ISSUER MULTILINE_OCTAL -\060\102\061\013\060\011\006\003\125\004\006\023\002\125\123\061 -\026\060\024\006\003\125\004\012\023\015\107\145\157\124\162\165 -\163\164\040\111\156\143\056\061\033\060\031\006\003\125\004\003 -\023\022\107\145\157\124\162\165\163\164\040\107\154\157\142\141 -\154\040\103\101 -END -CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\003\002\064\126 -END -CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST -CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST -CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - -# -# Certificate "GeoTrust Universal CA" -# -# Issuer: CN=GeoTrust Universal CA,O=GeoTrust Inc.,C=US -# Serial Number: 1 (0x1) -# Subject: CN=GeoTrust Universal CA,O=GeoTrust Inc.,C=US -# Not Valid Before: Thu Mar 04 05:00:00 2004 -# Not Valid After : Sun Mar 04 05:00:00 2029 -# Fingerprint (MD5): 92:65:58:8B:A2:1A:31:72:73:68:5C:B4:A5:7A:07:48 -# Fingerprint (SHA1): E6:21:F3:35:43:79:05:9A:4B:68:30:9D:8A:2F:74:22:15:87:EC:79 -CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE -CKA_TOKEN CK_BBOOL CK_TRUE -CKA_PRIVATE CK_BBOOL CK_FALSE -CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GeoTrust Universal CA" -CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 -CKA_SUBJECT MULTILINE_OCTAL -\060\105\061\013\060\011\006\003\125\004\006\023\002\125\123\061 -\026\060\024\006\003\125\004\012\023\015\107\145\157\124\162\165 -\163\164\040\111\156\143\056\061\036\060\034\006\003\125\004\003 -\023\025\107\145\157\124\162\165\163\164\040\125\156\151\166\145 -\162\163\141\154\040\103\101 -END -CKA_ID UTF8 "0" -CKA_ISSUER MULTILINE_OCTAL -\060\105\061\013\060\011\006\003\125\004\006\023\002\125\123\061 -\026\060\024\006\003\125\004\012\023\015\107\145\157\124\162\165 -\163\164\040\111\156\143\056\061\036\060\034\006\003\125\004\003 -\023\025\107\145\157\124\162\165\163\164\040\125\156\151\166\145 -\162\163\141\154\040\103\101 -END -CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\001\001 -END -CKA_VALUE MULTILINE_OCTAL -\060\202\005\150\060\202\003\120\240\003\002\001\002\002\001\001 -\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060 -\105\061\013\060\011\006\003\125\004\006\023\002\125\123\061\026 -\060\024\006\003\125\004\012\023\015\107\145\157\124\162\165\163 -\164\040\111\156\143\056\061\036\060\034\006\003\125\004\003\023 -\025\107\145\157\124\162\165\163\164\040\125\156\151\166\145\162 -\163\141\154\040\103\101\060\036\027\015\060\064\060\063\060\064 -\060\065\060\060\060\060\132\027\015\062\071\060\063\060\064\060 -\065\060\060\060\060\132\060\105\061\013\060\011\006\003\125\004 -\006\023\002\125\123\061\026\060\024\006\003\125\004\012\023\015 -\107\145\157\124\162\165\163\164\040\111\156\143\056\061\036\060 -\034\006\003\125\004\003\023\025\107\145\157\124\162\165\163\164 -\040\125\156\151\166\145\162\163\141\154\040\103\101\060\202\002 -\042\060\015\006\011\052\206\110\206\367\015\001\001\001\005\000 -\003\202\002\017\000\060\202\002\012\002\202\002\001\000\246\025 -\125\240\243\306\340\037\214\235\041\120\327\301\276\053\133\265 -\244\236\241\331\162\130\275\000\033\114\277\141\311\024\035\105 -\202\253\306\035\200\326\075\353\020\234\072\257\155\044\370\274 -\161\001\236\006\365\174\137\036\301\016\125\312\203\232\131\060 -\256\031\313\060\110\225\355\042\067\215\364\112\232\162\146\076 -\255\225\300\340\026\000\340\020\037\053\061\016\327\224\124\323 -\102\063\240\064\035\036\105\166\335\117\312\030\067\354\205\025 -\172\031\010\374\325\307\234\360\362\251\056\020\251\222\346\075 -\130\075\251\026\150\074\057\165\041\030\177\050\167\245\341\141 -\027\267\246\351\370\036\231\333\163\156\364\012\242\041\154\356 -\332\252\205\222\146\257\366\172\153\202\332\272\042\010\065\017 -\317\102\361\065\372\152\356\176\053\045\314\072\021\344\155\257 -\163\262\166\035\255\320\262\170\147\032\244\071\034\121\013\147 -\126\203\375\070\135\015\316\335\360\273\053\226\037\336\173\062 -\122\375\035\273\265\006\241\262\041\136\245\326\225\150\177\360 -\231\236\334\105\010\076\347\322\011\015\065\224\335\200\116\123 -\227\327\265\011\104\040\144\026\027\003\002\114\123\015\150\336 -\325\252\162\115\223\155\202\016\333\234\275\317\264\363\134\135 -\124\172\151\011\226\326\333\021\301\215\165\250\264\317\071\310 -\316\074\274\044\174\346\142\312\341\275\175\247\275\127\145\013 -\344\376\045\355\266\151\020\334\050\032\106\275\001\035\320\227 -\265\341\230\073\300\067\144\326\075\224\356\013\341\365\050\256 -\013\126\277\161\213\043\051\101\216\206\305\113\122\173\330\161 -\253\037\212\025\246\073\203\132\327\130\001\121\306\114\101\331 -\177\330\101\147\162\242\050\337\140\203\251\236\310\173\374\123 -\163\162\131\365\223\172\027\166\016\316\367\345\134\331\013\125 -\064\242\252\133\265\152\124\347\023\312\127\354\227\155\364\136 -\006\057\105\213\130\324\043\026\222\344\026\156\050\143\131\060 -\337\120\001\234\143\211\032\237\333\027\224\202\160\067\303\044 -\236\232\107\326\132\312\116\250\151\211\162\037\221\154\333\176 -\236\033\255\307\037\163\335\054\117\031\145\375\177\223\100\020 -\056\322\360\355\074\236\056\050\076\151\046\063\305\173\002\003 -\001\000\001\243\143\060\141\060\017\006\003\125\035\023\001\001 -\377\004\005\060\003\001\001\377\060\035\006\003\125\035\016\004 -\026\004\024\332\273\056\252\260\014\270\210\046\121\164\134\155 -\003\323\300\330\217\172\326\060\037\006\003\125\035\043\004\030 -\060\026\200\024\332\273\056\252\260\014\270\210\046\121\164\134 -\155\003\323\300\330\217\172\326\060\016\006\003\125\035\017\001 -\001\377\004\004\003\002\001\206\060\015\006\011\052\206\110\206 -\367\015\001\001\005\005\000\003\202\002\001\000\061\170\346\307 -\265\337\270\224\100\311\161\304\250\065\354\106\035\302\205\363 -\050\130\206\260\013\374\216\262\071\217\104\125\253\144\204\134 -\151\251\320\232\070\074\372\345\037\065\345\104\343\200\171\224 -\150\244\273\304\237\075\341\064\315\060\106\213\124\053\225\245 -\357\367\077\231\204\375\065\346\317\061\306\334\152\277\247\327 -\043\010\341\230\136\303\132\010\166\251\246\257\167\057\267\140 -\275\104\106\152\357\227\377\163\225\301\216\350\223\373\375\061 -\267\354\127\021\021\105\233\060\361\032\210\071\301\117\074\247 -\000\325\307\374\253\155\200\042\160\245\014\340\135\004\051\002 -\373\313\240\221\321\174\326\303\176\120\325\235\130\276\101\070 -\353\271\165\074\025\331\233\311\112\203\131\300\332\123\375\063 -\273\066\030\233\205\017\025\335\356\055\254\166\223\271\331\001 -\215\110\020\250\373\365\070\206\361\333\012\306\275\204\243\043 -\101\336\326\167\157\205\324\205\034\120\340\256\121\212\272\215 -\076\166\342\271\312\047\362\137\237\357\156\131\015\006\330\053 -\027\244\322\174\153\273\137\024\032\110\217\032\114\347\263\107 -\034\216\114\105\053\040\356\110\337\347\335\011\216\030\250\332 -\100\215\222\046\021\123\141\163\135\353\275\347\304\115\051\067 -\141\353\254\071\055\147\056\026\326\365\000\203\205\241\314\177 -\166\304\175\344\267\113\146\357\003\105\140\151\266\014\122\226 -\222\204\136\246\243\265\244\076\053\331\314\330\033\107\252\362 -\104\332\117\371\003\350\360\024\313\077\363\203\336\320\301\124 -\343\267\350\012\067\115\213\040\131\003\060\031\241\054\310\275 -\021\037\337\256\311\112\305\363\047\146\146\206\254\150\221\377 -\331\346\123\034\017\213\134\151\145\012\046\310\036\064\303\135 -\121\173\327\251\234\006\241\066\335\325\211\224\274\331\344\055 -\014\136\011\154\010\227\174\243\075\174\223\377\077\241\024\247 -\317\265\135\353\333\333\034\304\166\337\210\271\275\105\005\225 -\033\256\374\106\152\114\257\110\343\316\256\017\322\176\353\346 -\154\234\117\201\152\172\144\254\273\076\325\347\313\166\056\305 -\247\110\301\134\220\017\313\310\077\372\346\062\341\215\033\157 -\244\346\216\330\371\051\110\212\316\163\376\054 -END -CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE -# For Server Distrust After: Sun Sep 30 00:00:00 2018 -CKA_NSS_SERVER_DISTRUST_AFTER MULTILINE_OCTAL -\061\070\060\071\063\060\060\060\060\060\060\060\132 -END -CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE - -# Trust for Certificate "GeoTrust Universal CA" -# Issuer: CN=GeoTrust Universal CA,O=GeoTrust Inc.,C=US -# Serial Number: 1 (0x1) -# Subject: CN=GeoTrust Universal CA,O=GeoTrust Inc.,C=US -# Not Valid Before: Thu Mar 04 05:00:00 2004 -# Not Valid After : Sun Mar 04 05:00:00 2029 -# Fingerprint (MD5): 92:65:58:8B:A2:1A:31:72:73:68:5C:B4:A5:7A:07:48 -# Fingerprint (SHA1): E6:21:F3:35:43:79:05:9A:4B:68:30:9D:8A:2F:74:22:15:87:EC:79 -CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST -CKA_TOKEN CK_BBOOL CK_TRUE -CKA_PRIVATE CK_BBOOL CK_FALSE -CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GeoTrust Universal CA" -CKA_CERT_SHA1_HASH MULTILINE_OCTAL -\346\041\363\065\103\171\005\232\113\150\060\235\212\057\164\042 -\025\207\354\171 -END -CKA_CERT_MD5_HASH MULTILINE_OCTAL -\222\145\130\213\242\032\061\162\163\150\134\264\245\172\007\110 -END -CKA_ISSUER MULTILINE_OCTAL -\060\105\061\013\060\011\006\003\125\004\006\023\002\125\123\061 -\026\060\024\006\003\125\004\012\023\015\107\145\157\124\162\165 -\163\164\040\111\156\143\056\061\036\060\034\006\003\125\004\003 -\023\025\107\145\157\124\162\165\163\164\040\125\156\151\166\145 -\162\163\141\154\040\103\101 -END -CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\001\001 -END -CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST -CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST -CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - -# -# Certificate "GeoTrust Universal CA 2" -# -# Issuer: CN=GeoTrust Universal CA 2,O=GeoTrust Inc.,C=US -# Serial Number: 1 (0x1) -# Subject: CN=GeoTrust Universal CA 2,O=GeoTrust Inc.,C=US -# Not Valid Before: Thu Mar 04 05:00:00 2004 -# Not Valid After : Sun Mar 04 05:00:00 2029 -# Fingerprint (MD5): 34:FC:B8:D0:36:DB:9E:14:B3:C2:F2:DB:8F:E4:94:C7 -# Fingerprint (SHA1): 37:9A:19:7B:41:85:45:35:0C:A6:03:69:F3:3C:2E:AF:47:4F:20:79 -CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE -CKA_TOKEN CK_BBOOL CK_TRUE -CKA_PRIVATE CK_BBOOL CK_FALSE -CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GeoTrust Universal CA 2" -CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 -CKA_SUBJECT MULTILINE_OCTAL -\060\107\061\013\060\011\006\003\125\004\006\023\002\125\123\061 -\026\060\024\006\003\125\004\012\023\015\107\145\157\124\162\165 -\163\164\040\111\156\143\056\061\040\060\036\006\003\125\004\003 -\023\027\107\145\157\124\162\165\163\164\040\125\156\151\166\145 -\162\163\141\154\040\103\101\040\062 -END -CKA_ID UTF8 "0" -CKA_ISSUER MULTILINE_OCTAL -\060\107\061\013\060\011\006\003\125\004\006\023\002\125\123\061 -\026\060\024\006\003\125\004\012\023\015\107\145\157\124\162\165 -\163\164\040\111\156\143\056\061\040\060\036\006\003\125\004\003 -\023\027\107\145\157\124\162\165\163\164\040\125\156\151\166\145 -\162\163\141\154\040\103\101\040\062 -END -CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\001\001 -END -CKA_VALUE MULTILINE_OCTAL -\060\202\005\154\060\202\003\124\240\003\002\001\002\002\001\001 -\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060 -\107\061\013\060\011\006\003\125\004\006\023\002\125\123\061\026 -\060\024\006\003\125\004\012\023\015\107\145\157\124\162\165\163 -\164\040\111\156\143\056\061\040\060\036\006\003\125\004\003\023 -\027\107\145\157\124\162\165\163\164\040\125\156\151\166\145\162 -\163\141\154\040\103\101\040\062\060\036\027\015\060\064\060\063 -\060\064\060\065\060\060\060\060\132\027\015\062\071\060\063\060 -\064\060\065\060\060\060\060\132\060\107\061\013\060\011\006\003 -\125\004\006\023\002\125\123\061\026\060\024\006\003\125\004\012 -\023\015\107\145\157\124\162\165\163\164\040\111\156\143\056\061 -\040\060\036\006\003\125\004\003\023\027\107\145\157\124\162\165 -\163\164\040\125\156\151\166\145\162\163\141\154\040\103\101\040 -\062\060\202\002\042\060\015\006\011\052\206\110\206\367\015\001 -\001\001\005\000\003\202\002\017\000\060\202\002\012\002\202\002 -\001\000\263\124\122\301\311\076\362\331\334\261\123\032\131\051 -\347\261\303\105\050\345\327\321\355\305\305\113\241\252\164\173 -\127\257\112\046\374\330\365\136\247\156\031\333\164\014\117\065 -\133\062\013\001\343\333\353\172\167\065\352\252\132\340\326\350 -\241\127\224\360\220\243\164\126\224\104\060\003\036\134\116\053 -\205\046\164\202\172\014\166\240\157\115\316\101\055\240\025\006 -\024\137\267\102\315\173\217\130\141\064\334\052\010\371\056\303 -\001\246\042\104\034\114\007\202\346\133\316\320\112\174\004\323 -\031\163\047\360\252\230\177\056\257\116\353\207\036\044\167\152 -\135\266\350\133\105\272\334\303\241\005\157\126\216\217\020\046 -\245\111\303\056\327\101\207\042\340\117\206\312\140\265\352\241 -\143\300\001\227\020\171\275\000\074\022\155\053\025\261\254\113 -\261\356\030\271\116\226\334\334\166\377\073\276\317\137\003\300 -\374\073\350\276\106\033\377\332\100\302\122\367\376\343\072\367 -\152\167\065\320\332\215\353\136\030\152\061\307\036\272\074\033 -\050\326\153\124\306\252\133\327\242\054\033\031\314\242\002\366 -\233\131\275\067\153\206\265\155\202\272\330\352\311\126\274\251 -\066\130\375\076\031\363\355\014\046\251\223\070\370\117\301\135 -\042\006\320\227\352\341\255\306\125\340\201\053\050\203\072\372 -\364\173\041\121\000\276\122\070\316\315\146\171\250\364\201\126 -\342\320\203\011\107\121\133\120\152\317\333\110\032\135\076\367 -\313\366\145\367\154\361\225\370\002\073\062\126\202\071\172\133 -\275\057\211\033\277\241\264\350\377\177\215\214\337\003\361\140 -\116\130\021\114\353\243\077\020\053\203\232\001\163\331\224\155 -\204\000\047\146\254\360\160\100\011\102\222\255\117\223\015\141 -\011\121\044\330\222\325\013\224\141\262\207\262\355\377\232\065 -\377\205\124\312\355\104\103\254\033\074\026\153\110\112\012\034 -\100\210\037\222\302\013\000\005\377\362\310\002\112\244\252\251 -\314\231\226\234\057\130\340\175\341\276\273\007\334\137\004\162 -\134\061\064\303\354\137\055\340\075\144\220\042\346\321\354\270 -\056\335\131\256\331\241\067\277\124\065\334\163\062\117\214\004 -\036\063\262\311\106\361\330\134\310\125\120\311\150\275\250\272 -\066\011\002\003\001\000\001\243\143\060\141\060\017\006\003\125 -\035\023\001\001\377\004\005\060\003\001\001\377\060\035\006\003 -\125\035\016\004\026\004\024\166\363\125\341\372\244\066\373\360 -\237\134\142\161\355\074\364\107\070\020\053\060\037\006\003\125 -\035\043\004\030\060\026\200\024\166\363\125\341\372\244\066\373 -\360\237\134\142\161\355\074\364\107\070\020\053\060\016\006\003 -\125\035\017\001\001\377\004\004\003\002\001\206\060\015\006\011 -\052\206\110\206\367\015\001\001\005\005\000\003\202\002\001\000 -\146\301\306\043\363\331\340\056\156\137\350\317\256\260\260\045 -\115\053\370\073\130\233\100\044\067\132\313\253\026\111\377\263 -\165\171\063\241\057\155\160\027\064\221\376\147\176\217\354\233 -\345\136\202\251\125\037\057\334\324\121\007\022\376\254\026\076 -\054\065\306\143\374\334\020\353\015\243\252\320\174\314\321\320 -\057\121\056\304\024\132\336\350\031\341\076\306\314\244\051\347 -\056\204\252\006\060\170\166\124\163\050\230\131\070\340\000\015 -\142\323\102\175\041\237\256\075\072\214\325\372\167\015\030\053 -\026\016\137\066\341\374\052\265\060\044\317\340\143\014\173\130 -\032\376\231\272\102\022\261\221\364\174\150\342\310\350\257\054 -\352\311\176\256\273\052\075\015\025\334\064\225\266\030\164\250 -\152\017\307\264\364\023\304\344\133\355\012\322\244\227\114\052 -\355\057\154\022\211\075\361\047\160\252\152\003\122\041\237\100 -\250\147\120\362\363\132\037\337\337\043\366\334\170\116\346\230 -\117\125\072\123\343\357\362\364\237\307\174\330\130\257\051\042 -\227\270\340\275\221\056\260\166\354\127\021\317\357\051\104\363 -\351\205\172\140\143\344\135\063\211\027\331\061\252\332\326\363 -\030\065\162\317\207\053\057\143\043\204\135\204\214\077\127\240 -\210\374\231\221\050\046\151\231\324\217\227\104\276\216\325\110 -\261\244\050\051\361\025\264\341\345\236\335\370\217\246\157\046 -\327\011\074\072\034\021\016\246\154\067\367\255\104\207\054\050 -\307\330\164\202\263\320\157\112\127\273\065\051\047\240\213\350 -\041\247\207\144\066\135\314\330\026\254\307\262\047\100\222\125 -\070\050\215\121\156\335\024\147\123\154\161\134\046\204\115\165 -\132\266\176\140\126\251\115\255\373\233\036\227\363\015\331\322 -\227\124\167\332\075\022\267\340\036\357\010\006\254\371\205\207 -\351\242\334\257\176\030\022\203\375\126\027\101\056\325\051\202 -\175\231\364\061\366\161\251\317\054\001\047\245\005\271\252\262 -\110\116\052\357\237\223\122\121\225\074\122\163\216\126\114\027 -\100\300\011\050\344\213\152\110\123\333\354\315\125\125\361\306 -\370\351\242\054\114\246\321\046\137\176\257\132\114\332\037\246 -\362\034\054\176\256\002\026\322\126\320\057\127\123\107\350\222 -END -CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE -# For Server Distrust After: Wed Jan 01 00:00:00 2020 -CKA_NSS_SERVER_DISTRUST_AFTER MULTILINE_OCTAL -\062\060\060\061\060\061\060\060\060\060\060\060\132 -END -CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE - -# Trust for Certificate "GeoTrust Universal CA 2" -# Issuer: CN=GeoTrust Universal CA 2,O=GeoTrust Inc.,C=US -# Serial Number: 1 (0x1) -# Subject: CN=GeoTrust Universal CA 2,O=GeoTrust Inc.,C=US -# Not Valid Before: Thu Mar 04 05:00:00 2004 -# Not Valid After : Sun Mar 04 05:00:00 2029 -# Fingerprint (MD5): 34:FC:B8:D0:36:DB:9E:14:B3:C2:F2:DB:8F:E4:94:C7 -# Fingerprint (SHA1): 37:9A:19:7B:41:85:45:35:0C:A6:03:69:F3:3C:2E:AF:47:4F:20:79 -CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST -CKA_TOKEN CK_BBOOL CK_TRUE -CKA_PRIVATE CK_BBOOL CK_FALSE -CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GeoTrust Universal CA 2" -CKA_CERT_SHA1_HASH MULTILINE_OCTAL -\067\232\031\173\101\205\105\065\014\246\003\151\363\074\056\257 -\107\117\040\171 -END -CKA_CERT_MD5_HASH MULTILINE_OCTAL -\064\374\270\320\066\333\236\024\263\302\362\333\217\344\224\307 -END -CKA_ISSUER MULTILINE_OCTAL -\060\107\061\013\060\011\006\003\125\004\006\023\002\125\123\061 -\026\060\024\006\003\125\004\012\023\015\107\145\157\124\162\165 -\163\164\040\111\156\143\056\061\040\060\036\006\003\125\004\003 -\023\027\107\145\157\124\162\165\163\164\040\125\156\151\166\145 -\162\163\141\154\040\103\101\040\062 -END -CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\001\001 -END -CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST -CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST -CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - # # Certificate "Certum Root CA" # @@ -4500,138 +4038,136 @@ CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "GeoTrust Primary Certification Authority" +# Certificate "SecureTrust CA" # -# Issuer: CN=GeoTrust Primary Certification Authority,O=GeoTrust Inc.,C=US -# Serial Number:18:ac:b5:6a:fd:69:b6:15:3a:63:6c:af:da:fa:c4:a1 -# Subject: CN=GeoTrust Primary Certification Authority,O=GeoTrust Inc.,C=US -# Not Valid Before: Mon Nov 27 00:00:00 2006 -# Not Valid After : Wed Jul 16 23:59:59 2036 -# Fingerprint (MD5): 02:26:C3:01:5E:08:30:37:43:A9:D0:7D:CF:37:E6:BF -# Fingerprint (SHA1): 32:3C:11:8E:1B:F7:B8:B6:52:54:E2:E2:10:0D:D6:02:90:37:F0:96 +# Issuer: CN=SecureTrust CA,O=SecureTrust Corporation,C=US +# Serial Number:0c:f0:8e:5c:08:16:a5:ad:42:7f:f0:eb:27:18:59:d0 +# Subject: CN=SecureTrust CA,O=SecureTrust Corporation,C=US +# Not Valid Before: Tue Nov 07 19:31:18 2006 +# Not Valid After : Mon Dec 31 19:40:55 2029 +# Fingerprint (MD5): DC:32:C3:A7:6D:25:57:C7:68:09:9D:EA:2D:A9:A2:D1 +# Fingerprint (SHA1): 87:82:C6:C3:04:35:3B:CF:D2:96:92:D2:59:3E:7D:44:D9:34:FF:11 CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GeoTrust Primary Certification Authority" +CKA_LABEL UTF8 "SecureTrust CA" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL -\060\130\061\013\060\011\006\003\125\004\006\023\002\125\123\061 -\026\060\024\006\003\125\004\012\023\015\107\145\157\124\162\165 -\163\164\040\111\156\143\056\061\061\060\057\006\003\125\004\003 -\023\050\107\145\157\124\162\165\163\164\040\120\162\151\155\141 -\162\171\040\103\145\162\164\151\146\151\143\141\164\151\157\156 -\040\101\165\164\150\157\162\151\164\171 +\060\110\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +\040\060\036\006\003\125\004\012\023\027\123\145\143\165\162\145 +\124\162\165\163\164\040\103\157\162\160\157\162\141\164\151\157 +\156\061\027\060\025\006\003\125\004\003\023\016\123\145\143\165 +\162\145\124\162\165\163\164\040\103\101 END CKA_ID UTF8 "0" CKA_ISSUER MULTILINE_OCTAL -\060\130\061\013\060\011\006\003\125\004\006\023\002\125\123\061 -\026\060\024\006\003\125\004\012\023\015\107\145\157\124\162\165 -\163\164\040\111\156\143\056\061\061\060\057\006\003\125\004\003 -\023\050\107\145\157\124\162\165\163\164\040\120\162\151\155\141 -\162\171\040\103\145\162\164\151\146\151\143\141\164\151\157\156 -\040\101\165\164\150\157\162\151\164\171 +\060\110\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +\040\060\036\006\003\125\004\012\023\027\123\145\143\165\162\145 +\124\162\165\163\164\040\103\157\162\160\157\162\141\164\151\157 +\156\061\027\060\025\006\003\125\004\003\023\016\123\145\143\165 +\162\145\124\162\165\163\164\040\103\101 END CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\020\030\254\265\152\375\151\266\025\072\143\154\257\332\372 -\304\241 +\002\020\014\360\216\134\010\026\245\255\102\177\360\353\047\030 +\131\320 END CKA_VALUE MULTILINE_OCTAL -\060\202\003\174\060\202\002\144\240\003\002\001\002\002\020\030 -\254\265\152\375\151\266\025\072\143\154\257\332\372\304\241\060 -\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\130 -\061\013\060\011\006\003\125\004\006\023\002\125\123\061\026\060 -\024\006\003\125\004\012\023\015\107\145\157\124\162\165\163\164 -\040\111\156\143\056\061\061\060\057\006\003\125\004\003\023\050 -\107\145\157\124\162\165\163\164\040\120\162\151\155\141\162\171 -\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101 -\165\164\150\157\162\151\164\171\060\036\027\015\060\066\061\061 -\062\067\060\060\060\060\060\060\132\027\015\063\066\060\067\061 -\066\062\063\065\071\065\071\132\060\130\061\013\060\011\006\003 -\125\004\006\023\002\125\123\061\026\060\024\006\003\125\004\012 -\023\015\107\145\157\124\162\165\163\164\040\111\156\143\056\061 -\061\060\057\006\003\125\004\003\023\050\107\145\157\124\162\165 -\163\164\040\120\162\151\155\141\162\171\040\103\145\162\164\151 -\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151 -\164\171\060\202\001\042\060\015\006\011\052\206\110\206\367\015 +\060\202\003\270\060\202\002\240\240\003\002\001\002\002\020\014 +\360\216\134\010\026\245\255\102\177\360\353\047\030\131\320\060 +\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\110 +\061\013\060\011\006\003\125\004\006\023\002\125\123\061\040\060 +\036\006\003\125\004\012\023\027\123\145\143\165\162\145\124\162 +\165\163\164\040\103\157\162\160\157\162\141\164\151\157\156\061 +\027\060\025\006\003\125\004\003\023\016\123\145\143\165\162\145 +\124\162\165\163\164\040\103\101\060\036\027\015\060\066\061\061 +\060\067\061\071\063\061\061\070\132\027\015\062\071\061\062\063 +\061\061\071\064\060\065\065\132\060\110\061\013\060\011\006\003 +\125\004\006\023\002\125\123\061\040\060\036\006\003\125\004\012 +\023\027\123\145\143\165\162\145\124\162\165\163\164\040\103\157 +\162\160\157\162\141\164\151\157\156\061\027\060\025\006\003\125 +\004\003\023\016\123\145\143\165\162\145\124\162\165\163\164\040 +\103\101\060\202\001\042\060\015\006\011\052\206\110\206\367\015 \001\001\001\005\000\003\202\001\017\000\060\202\001\012\002\202 -\001\001\000\276\270\025\173\377\324\174\175\147\255\203\144\173 -\310\102\123\055\337\366\204\010\040\141\326\001\131\152\234\104 -\021\257\357\166\375\225\176\316\141\060\273\172\203\137\002\275 -\001\146\312\356\025\215\157\241\060\234\275\241\205\236\224\072 -\363\126\210\000\061\317\330\356\152\226\002\331\355\003\214\373 -\165\155\347\352\270\125\026\005\026\232\364\340\136\261\210\300 -\144\205\134\025\115\210\307\267\272\340\165\351\255\005\075\235 -\307\211\110\340\273\050\310\003\341\060\223\144\136\122\300\131 -\160\042\065\127\210\212\361\225\012\203\327\274\061\163\001\064 -\355\357\106\161\340\153\002\250\065\162\153\227\233\146\340\313 -\034\171\137\330\032\004\150\036\107\002\346\235\140\342\066\227 -\001\337\316\065\222\337\276\147\307\155\167\131\073\217\235\326 -\220\025\224\274\102\064\020\301\071\371\261\047\076\176\326\212 -\165\305\262\257\226\323\242\336\233\344\230\276\175\341\351\201 -\255\266\157\374\327\016\332\340\064\260\015\032\167\347\343\010 -\230\357\130\372\234\204\267\066\257\302\337\254\322\364\020\006 -\160\161\065\002\003\001\000\001\243\102\060\100\060\017\006\003 -\125\035\023\001\001\377\004\005\060\003\001\001\377\060\016\006 -\003\125\035\017\001\001\377\004\004\003\002\001\006\060\035\006 -\003\125\035\016\004\026\004\024\054\325\120\101\227\025\213\360 -\217\066\141\133\112\373\153\331\231\311\063\222\060\015\006\011 -\052\206\110\206\367\015\001\001\005\005\000\003\202\001\001\000 -\132\160\177\054\335\267\064\117\365\206\121\251\046\276\113\270 -\252\361\161\015\334\141\307\240\352\064\036\172\167\017\004\065 -\350\047\217\154\220\277\221\026\044\106\076\112\116\316\053\026 -\325\013\122\035\374\037\147\242\002\105\061\117\316\363\372\003 -\247\171\235\123\152\331\332\143\072\370\200\327\323\231\341\245 -\341\276\324\125\161\230\065\072\276\223\352\256\255\102\262\220 -\157\340\374\041\115\065\143\063\211\111\326\233\116\312\307\347 -\116\011\000\367\332\307\357\231\142\231\167\266\225\042\136\212 -\240\253\364\270\170\230\312\070\031\231\311\162\236\170\315\113 -\254\257\031\240\163\022\055\374\302\101\272\201\221\332\026\132 -\061\267\371\264\161\200\022\110\231\162\163\132\131\123\301\143 -\122\063\355\247\311\322\071\002\160\372\340\261\102\146\051\252 -\233\121\355\060\124\042\024\137\331\253\035\301\344\224\360\370 -\365\053\367\352\312\170\106\326\270\221\375\246\015\053\032\024 -\001\076\200\360\102\240\225\007\136\155\315\314\113\244\105\215 -\253\022\350\263\336\132\345\240\174\350\017\042\035\132\351\131 +\001\001\000\253\244\201\345\225\315\365\366\024\216\302\117\312 +\324\342\170\225\130\234\101\341\015\231\100\044\027\071\221\063 +\146\351\276\341\203\257\142\134\211\321\374\044\133\141\263\340 +\021\021\101\034\035\156\360\270\273\370\336\247\201\272\246\110 +\306\237\035\275\276\216\251\101\076\270\224\355\051\032\324\216 +\322\003\035\003\357\155\015\147\034\127\327\006\255\312\310\365 +\376\016\257\146\045\110\004\226\013\135\243\272\026\303\010\117 +\321\106\370\024\134\362\310\136\001\231\155\375\210\314\206\250 +\301\157\061\102\154\122\076\150\313\363\031\064\337\273\207\030 +\126\200\046\304\320\334\300\157\337\336\240\302\221\026\240\144 +\021\113\104\274\036\366\347\372\143\336\146\254\166\244\161\243 +\354\066\224\150\172\167\244\261\347\016\057\201\172\342\265\162 +\206\357\242\153\213\360\017\333\323\131\077\272\162\274\104\044 +\234\343\163\263\367\257\127\057\102\046\235\251\164\272\000\122 +\362\113\315\123\174\107\013\066\205\016\146\251\010\227\026\064 +\127\301\146\367\200\343\355\160\124\307\223\340\056\050\025\131 +\207\272\273\002\003\001\000\001\243\201\235\060\201\232\060\023 +\006\011\053\006\001\004\001\202\067\024\002\004\006\036\004\000 +\103\000\101\060\013\006\003\125\035\017\004\004\003\002\001\206 +\060\017\006\003\125\035\023\001\001\377\004\005\060\003\001\001 +\377\060\035\006\003\125\035\016\004\026\004\024\102\062\266\026 +\372\004\375\376\135\113\172\303\375\367\114\100\035\132\103\257 +\060\064\006\003\125\035\037\004\055\060\053\060\051\240\047\240 +\045\206\043\150\164\164\160\072\057\057\143\162\154\056\163\145 +\143\165\162\145\164\162\165\163\164\056\143\157\155\057\123\124 +\103\101\056\143\162\154\060\020\006\011\053\006\001\004\001\202 +\067\025\001\004\003\002\001\000\060\015\006\011\052\206\110\206 +\367\015\001\001\005\005\000\003\202\001\001\000\060\355\117\112 +\341\130\072\122\162\133\265\246\243\145\030\246\273\121\073\167 +\351\235\352\323\237\134\340\105\145\173\015\312\133\342\160\120 +\262\224\005\024\256\111\307\215\101\007\022\163\224\176\014\043 +\041\375\274\020\177\140\020\132\162\365\230\016\254\354\271\177 +\335\172\157\135\323\034\364\377\210\005\151\102\251\005\161\310 +\267\254\046\350\056\264\214\152\377\161\334\270\261\337\231\274 +\174\041\124\053\344\130\242\273\127\051\256\236\251\243\031\046 +\017\231\056\010\260\357\375\151\317\231\032\011\215\343\247\237 +\053\311\066\064\173\044\263\170\114\225\027\244\006\046\036\266 +\144\122\066\137\140\147\331\234\305\005\164\013\347\147\043\322 +\010\374\210\351\256\213\177\341\060\364\067\176\375\306\062\332 +\055\236\104\060\060\154\356\007\336\322\064\374\322\377\100\366 +\113\364\146\106\006\124\246\362\062\012\143\046\060\153\233\321 +\334\213\107\272\341\271\325\142\320\242\240\364\147\005\170\051 +\143\032\157\004\326\370\306\114\243\232\261\067\264\215\345\050 +\113\035\236\054\302\270\150\274\355\002\356\061 END CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE -# For Server Distrust After: Tue Apr 30 00:00:00 2019 -CKA_NSS_SERVER_DISTRUST_AFTER MULTILINE_OCTAL -\061\071\060\064\063\060\060\060\060\060\060\060\132 -END +CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for Certificate "GeoTrust Primary Certification Authority" -# Issuer: CN=GeoTrust Primary Certification Authority,O=GeoTrust Inc.,C=US -# Serial Number:18:ac:b5:6a:fd:69:b6:15:3a:63:6c:af:da:fa:c4:a1 -# Subject: CN=GeoTrust Primary Certification Authority,O=GeoTrust Inc.,C=US -# Not Valid Before: Mon Nov 27 00:00:00 2006 -# Not Valid After : Wed Jul 16 23:59:59 2036 -# Fingerprint (MD5): 02:26:C3:01:5E:08:30:37:43:A9:D0:7D:CF:37:E6:BF -# Fingerprint (SHA1): 32:3C:11:8E:1B:F7:B8:B6:52:54:E2:E2:10:0D:D6:02:90:37:F0:96 +# Trust for Certificate "SecureTrust CA" +# Issuer: CN=SecureTrust CA,O=SecureTrust Corporation,C=US +# Serial Number:0c:f0:8e:5c:08:16:a5:ad:42:7f:f0:eb:27:18:59:d0 +# Subject: CN=SecureTrust CA,O=SecureTrust Corporation,C=US +# Not Valid Before: Tue Nov 07 19:31:18 2006 +# Not Valid After : Mon Dec 31 19:40:55 2029 +# Fingerprint (MD5): DC:32:C3:A7:6D:25:57:C7:68:09:9D:EA:2D:A9:A2:D1 +# Fingerprint (SHA1): 87:82:C6:C3:04:35:3B:CF:D2:96:92:D2:59:3E:7D:44:D9:34:FF:11 CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GeoTrust Primary Certification Authority" +CKA_LABEL UTF8 "SecureTrust CA" CKA_CERT_SHA1_HASH MULTILINE_OCTAL -\062\074\021\216\033\367\270\266\122\124\342\342\020\015\326\002 -\220\067\360\226 +\207\202\306\303\004\065\073\317\322\226\222\322\131\076\175\104 +\331\064\377\021 END CKA_CERT_MD5_HASH MULTILINE_OCTAL -\002\046\303\001\136\010\060\067\103\251\320\175\317\067\346\277 +\334\062\303\247\155\045\127\307\150\011\235\352\055\251\242\321 END CKA_ISSUER MULTILINE_OCTAL -\060\130\061\013\060\011\006\003\125\004\006\023\002\125\123\061 -\026\060\024\006\003\125\004\012\023\015\107\145\157\124\162\165 -\163\164\040\111\156\143\056\061\061\060\057\006\003\125\004\003 -\023\050\107\145\157\124\162\165\163\164\040\120\162\151\155\141 -\162\171\040\103\145\162\164\151\146\151\143\141\164\151\157\156 -\040\101\165\164\150\157\162\151\164\171 +\060\110\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +\040\060\036\006\003\125\004\012\023\027\123\145\143\165\162\145 +\124\162\165\163\164\040\103\157\162\160\157\162\141\164\151\157 +\156\061\027\060\025\006\003\125\004\003\023\016\123\145\143\165 +\162\145\124\162\165\163\164\040\103\101 END CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\020\030\254\265\152\375\151\266\025\072\143\154\257\332\372 -\304\241 +\002\020\014\360\216\134\010\026\245\255\102\177\360\353\047\030 +\131\320 END CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST @@ -4639,483 +4175,438 @@ CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "thawte Primary Root CA" +# Certificate "Secure Global CA" # -# Issuer: CN=thawte Primary Root CA,OU="(c) 2006 thawte, Inc. - For authorized use only",OU=Certification Services Division,O="thawte, Inc.",C=US -# Serial Number:34:4e:d5:57:20:d5:ed:ec:49:f4:2f:ce:37:db:2b:6d -# Subject: CN=thawte Primary Root CA,OU="(c) 2006 thawte, Inc. - For authorized use only",OU=Certification Services Division,O="thawte, Inc.",C=US -# Not Valid Before: Fri Nov 17 00:00:00 2006 -# Not Valid After : Wed Jul 16 23:59:59 2036 -# Fingerprint (MD5): 8C:CA:DC:0B:22:CE:F5:BE:72:AC:41:1A:11:A8:D8:12 -# Fingerprint (SHA1): 91:C6:D6:EE:3E:8A:C8:63:84:E5:48:C2:99:29:5C:75:6C:81:7B:81 +# Issuer: CN=Secure Global CA,O=SecureTrust Corporation,C=US +# Serial Number:07:56:22:a4:e8:d4:8a:89:4d:f4:13:c8:f0:f8:ea:a5 +# Subject: CN=Secure Global CA,O=SecureTrust Corporation,C=US +# Not Valid Before: Tue Nov 07 19:42:28 2006 +# Not Valid After : Mon Dec 31 19:52:06 2029 +# Fingerprint (MD5): CF:F4:27:0D:D4:ED:DC:65:16:49:6D:3D:DA:BF:6E:DE +# Fingerprint (SHA1): 3A:44:73:5A:E5:81:90:1F:24:86:61:46:1E:3B:9C:C4:5F:F5:3A:1B CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "thawte Primary Root CA" +CKA_LABEL UTF8 "Secure Global CA" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL -\060\201\251\061\013\060\011\006\003\125\004\006\023\002\125\123 -\061\025\060\023\006\003\125\004\012\023\014\164\150\141\167\164 -\145\054\040\111\156\143\056\061\050\060\046\006\003\125\004\013 -\023\037\103\145\162\164\151\146\151\143\141\164\151\157\156\040 -\123\145\162\166\151\143\145\163\040\104\151\166\151\163\151\157 -\156\061\070\060\066\006\003\125\004\013\023\057\050\143\051\040 -\062\060\060\066\040\164\150\141\167\164\145\054\040\111\156\143 -\056\040\055\040\106\157\162\040\141\165\164\150\157\162\151\172 -\145\144\040\165\163\145\040\157\156\154\171\061\037\060\035\006 -\003\125\004\003\023\026\164\150\141\167\164\145\040\120\162\151 -\155\141\162\171\040\122\157\157\164\040\103\101 +\060\112\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +\040\060\036\006\003\125\004\012\023\027\123\145\143\165\162\145 +\124\162\165\163\164\040\103\157\162\160\157\162\141\164\151\157 +\156\061\031\060\027\006\003\125\004\003\023\020\123\145\143\165 +\162\145\040\107\154\157\142\141\154\040\103\101 END CKA_ID UTF8 "0" CKA_ISSUER MULTILINE_OCTAL -\060\201\251\061\013\060\011\006\003\125\004\006\023\002\125\123 -\061\025\060\023\006\003\125\004\012\023\014\164\150\141\167\164 -\145\054\040\111\156\143\056\061\050\060\046\006\003\125\004\013 -\023\037\103\145\162\164\151\146\151\143\141\164\151\157\156\040 -\123\145\162\166\151\143\145\163\040\104\151\166\151\163\151\157 -\156\061\070\060\066\006\003\125\004\013\023\057\050\143\051\040 -\062\060\060\066\040\164\150\141\167\164\145\054\040\111\156\143 -\056\040\055\040\106\157\162\040\141\165\164\150\157\162\151\172 -\145\144\040\165\163\145\040\157\156\154\171\061\037\060\035\006 -\003\125\004\003\023\026\164\150\141\167\164\145\040\120\162\151 -\155\141\162\171\040\122\157\157\164\040\103\101 +\060\112\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +\040\060\036\006\003\125\004\012\023\027\123\145\143\165\162\145 +\124\162\165\163\164\040\103\157\162\160\157\162\141\164\151\157 +\156\061\031\060\027\006\003\125\004\003\023\020\123\145\143\165 +\162\145\040\107\154\157\142\141\154\040\103\101 END CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\020\064\116\325\127\040\325\355\354\111\364\057\316\067\333 -\053\155 +\002\020\007\126\042\244\350\324\212\211\115\364\023\310\360\370 +\352\245 END CKA_VALUE MULTILINE_OCTAL -\060\202\004\040\060\202\003\010\240\003\002\001\002\002\020\064 -\116\325\127\040\325\355\354\111\364\057\316\067\333\053\155\060 -\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\201 -\251\061\013\060\011\006\003\125\004\006\023\002\125\123\061\025 -\060\023\006\003\125\004\012\023\014\164\150\141\167\164\145\054 -\040\111\156\143\056\061\050\060\046\006\003\125\004\013\023\037 -\103\145\162\164\151\146\151\143\141\164\151\157\156\040\123\145 -\162\166\151\143\145\163\040\104\151\166\151\163\151\157\156\061 -\070\060\066\006\003\125\004\013\023\057\050\143\051\040\062\060 -\060\066\040\164\150\141\167\164\145\054\040\111\156\143\056\040 -\055\040\106\157\162\040\141\165\164\150\157\162\151\172\145\144 -\040\165\163\145\040\157\156\154\171\061\037\060\035\006\003\125 -\004\003\023\026\164\150\141\167\164\145\040\120\162\151\155\141 -\162\171\040\122\157\157\164\040\103\101\060\036\027\015\060\066 -\061\061\061\067\060\060\060\060\060\060\132\027\015\063\066\060 -\067\061\066\062\063\065\071\065\071\132\060\201\251\061\013\060 -\011\006\003\125\004\006\023\002\125\123\061\025\060\023\006\003 -\125\004\012\023\014\164\150\141\167\164\145\054\040\111\156\143 -\056\061\050\060\046\006\003\125\004\013\023\037\103\145\162\164 -\151\146\151\143\141\164\151\157\156\040\123\145\162\166\151\143 -\145\163\040\104\151\166\151\163\151\157\156\061\070\060\066\006 -\003\125\004\013\023\057\050\143\051\040\062\060\060\066\040\164 -\150\141\167\164\145\054\040\111\156\143\056\040\055\040\106\157 -\162\040\141\165\164\150\157\162\151\172\145\144\040\165\163\145 -\040\157\156\154\171\061\037\060\035\006\003\125\004\003\023\026 -\164\150\141\167\164\145\040\120\162\151\155\141\162\171\040\122 -\157\157\164\040\103\101\060\202\001\042\060\015\006\011\052\206 +\060\202\003\274\060\202\002\244\240\003\002\001\002\002\020\007 +\126\042\244\350\324\212\211\115\364\023\310\360\370\352\245\060 +\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\112 +\061\013\060\011\006\003\125\004\006\023\002\125\123\061\040\060 +\036\006\003\125\004\012\023\027\123\145\143\165\162\145\124\162 +\165\163\164\040\103\157\162\160\157\162\141\164\151\157\156\061 +\031\060\027\006\003\125\004\003\023\020\123\145\143\165\162\145 +\040\107\154\157\142\141\154\040\103\101\060\036\027\015\060\066 +\061\061\060\067\061\071\064\062\062\070\132\027\015\062\071\061 +\062\063\061\061\071\065\062\060\066\132\060\112\061\013\060\011 +\006\003\125\004\006\023\002\125\123\061\040\060\036\006\003\125 +\004\012\023\027\123\145\143\165\162\145\124\162\165\163\164\040 +\103\157\162\160\157\162\141\164\151\157\156\061\031\060\027\006 +\003\125\004\003\023\020\123\145\143\165\162\145\040\107\154\157 +\142\141\154\040\103\101\060\202\001\042\060\015\006\011\052\206 \110\206\367\015\001\001\001\005\000\003\202\001\017\000\060\202 -\001\012\002\202\001\001\000\254\240\360\373\200\131\324\234\307 -\244\317\235\241\131\163\011\020\105\014\015\054\156\150\361\154 -\133\110\150\111\131\067\374\013\063\031\302\167\177\314\020\055 -\225\064\034\346\353\115\011\247\034\322\270\311\227\066\002\267 -\211\324\044\137\006\300\314\104\224\224\215\002\142\157\353\132 -\335\021\215\050\232\134\204\220\020\172\015\275\164\146\057\152 -\070\240\342\325\124\104\353\035\007\237\007\272\157\356\351\375 -\116\013\051\365\076\204\240\001\361\234\253\370\034\176\211\244 -\350\241\330\161\145\015\243\121\173\356\274\322\042\140\015\271 -\133\235\337\272\374\121\133\013\257\230\262\351\056\351\004\350 -\142\207\336\053\310\327\116\301\114\144\036\335\317\207\130\272 -\112\117\312\150\007\035\034\235\112\306\325\057\221\314\174\161 -\162\034\305\300\147\353\062\375\311\222\134\224\332\205\300\233 -\277\123\175\053\011\364\214\235\221\037\227\152\122\313\336\011 -\066\244\167\330\173\207\120\104\325\076\156\051\151\373\071\111 -\046\036\011\245\200\173\100\055\353\350\047\205\311\376\141\375 -\176\346\174\227\035\325\235\002\003\001\000\001\243\102\060\100 -\060\017\006\003\125\035\023\001\001\377\004\005\060\003\001\001 -\377\060\016\006\003\125\035\017\001\001\377\004\004\003\002\001 -\006\060\035\006\003\125\035\016\004\026\004\024\173\133\105\317 -\257\316\313\172\375\061\222\032\152\266\363\106\353\127\110\120 -\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\003 -\202\001\001\000\171\021\300\113\263\221\266\374\360\351\147\324 -\015\156\105\276\125\350\223\322\316\003\077\355\332\045\260\035 -\127\313\036\072\166\240\114\354\120\166\350\144\162\014\244\251 -\361\270\213\326\326\207\204\273\062\345\101\021\300\167\331\263 -\140\235\353\033\325\321\156\104\104\251\246\001\354\125\142\035 -\167\270\134\216\110\111\174\234\073\127\021\254\255\163\067\216 -\057\170\134\220\150\107\331\140\140\346\374\007\075\042\040\027 -\304\367\026\351\304\330\162\371\310\163\174\337\026\057\025\251 -\076\375\152\047\266\241\353\132\272\230\037\325\343\115\144\012 -\235\023\310\141\272\365\071\034\207\272\270\275\173\042\177\366 -\376\254\100\171\345\254\020\157\075\217\033\171\166\213\304\067 -\263\041\030\204\345\066\000\353\143\040\231\271\351\376\063\004 -\273\101\310\301\002\371\104\143\040\236\201\316\102\323\326\077 -\054\166\323\143\234\131\335\217\246\341\016\240\056\101\367\056 -\225\107\317\274\375\063\363\366\013\141\176\176\221\053\201\107 -\302\047\060\356\247\020\135\067\217\134\071\053\344\004\360\173 -\215\126\214\150 +\001\012\002\202\001\001\000\257\065\056\330\254\154\125\151\006 +\161\345\023\150\044\263\117\330\314\041\107\370\361\140\070\211 +\211\003\351\275\352\136\106\123\011\334\134\365\132\350\367\105 +\052\002\353\061\141\327\051\063\114\316\307\174\012\067\176\017 +\272\062\230\341\035\227\257\217\307\334\311\070\226\363\333\032 +\374\121\355\150\306\320\156\244\174\044\321\256\102\310\226\120 +\143\056\340\376\165\376\230\247\137\111\056\225\343\071\063\144 +\216\036\244\137\220\322\147\074\262\331\376\101\271\125\247\011 +\216\162\005\036\213\335\104\205\202\102\320\111\300\035\140\360 +\321\027\054\225\353\366\245\301\222\243\305\302\247\010\140\015 +\140\004\020\226\171\236\026\064\346\251\266\372\045\105\071\310 +\036\145\371\223\365\252\361\122\334\231\230\075\245\206\032\014 +\065\063\372\113\245\004\006\025\034\061\200\357\252\030\153\302 +\173\327\332\316\371\063\040\325\365\275\152\063\055\201\004\373 +\260\134\324\234\243\342\134\035\343\251\102\165\136\173\324\167 +\357\071\124\272\311\012\030\033\022\231\111\057\210\113\375\120 +\142\321\163\347\217\172\103\002\003\001\000\001\243\201\235\060 +\201\232\060\023\006\011\053\006\001\004\001\202\067\024\002\004 +\006\036\004\000\103\000\101\060\013\006\003\125\035\017\004\004 +\003\002\001\206\060\017\006\003\125\035\023\001\001\377\004\005 +\060\003\001\001\377\060\035\006\003\125\035\016\004\026\004\024 +\257\104\004\302\101\176\110\203\333\116\071\002\354\354\204\172 +\346\316\311\244\060\064\006\003\125\035\037\004\055\060\053\060 +\051\240\047\240\045\206\043\150\164\164\160\072\057\057\143\162 +\154\056\163\145\143\165\162\145\164\162\165\163\164\056\143\157 +\155\057\123\107\103\101\056\143\162\154\060\020\006\011\053\006 +\001\004\001\202\067\025\001\004\003\002\001\000\060\015\006\011 +\052\206\110\206\367\015\001\001\005\005\000\003\202\001\001\000 +\143\032\010\100\175\244\136\123\015\167\330\172\256\037\015\013 +\121\026\003\357\030\174\310\343\257\152\130\223\024\140\221\262 +\204\334\210\116\276\071\212\072\363\346\202\211\135\001\067\263 +\253\044\244\025\016\222\065\132\112\104\136\116\127\372\165\316 +\037\110\316\146\364\074\100\046\222\230\154\033\356\044\106\014 +\027\263\122\245\333\245\221\221\317\067\323\157\347\047\010\072 +\116\031\037\072\247\130\134\027\317\171\077\213\344\247\323\046 +\043\235\046\017\130\151\374\107\176\262\320\215\213\223\277\051 +\117\103\151\164\166\147\113\317\007\214\346\002\367\265\341\264 +\103\265\113\055\024\237\371\334\046\015\277\246\107\164\006\330 +\210\321\072\051\060\204\316\322\071\200\142\033\250\307\127\111 +\274\152\125\121\147\025\112\276\065\007\344\325\165\230\067\171 +\060\024\333\051\235\154\305\151\314\107\125\242\060\367\314\134 +\177\302\303\230\034\153\116\026\200\353\172\170\145\105\242\000 +\032\257\014\015\125\144\064\110\270\222\271\361\264\120\051\362 +\117\043\037\332\154\254\037\104\341\335\043\170\121\133\307\026 END CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE -# For Server Distrust After: Tue Apr 30 00:00:00 2019 -CKA_NSS_SERVER_DISTRUST_AFTER MULTILINE_OCTAL -\061\071\060\064\063\060\060\060\060\060\060\060\132 -END +CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for Certificate "thawte Primary Root CA" -# Issuer: CN=thawte Primary Root CA,OU="(c) 2006 thawte, Inc. - For authorized use only",OU=Certification Services Division,O="thawte, Inc.",C=US -# Serial Number:34:4e:d5:57:20:d5:ed:ec:49:f4:2f:ce:37:db:2b:6d -# Subject: CN=thawte Primary Root CA,OU="(c) 2006 thawte, Inc. - For authorized use only",OU=Certification Services Division,O="thawte, Inc.",C=US -# Not Valid Before: Fri Nov 17 00:00:00 2006 -# Not Valid After : Wed Jul 16 23:59:59 2036 -# Fingerprint (MD5): 8C:CA:DC:0B:22:CE:F5:BE:72:AC:41:1A:11:A8:D8:12 -# Fingerprint (SHA1): 91:C6:D6:EE:3E:8A:C8:63:84:E5:48:C2:99:29:5C:75:6C:81:7B:81 +# Trust for Certificate "Secure Global CA" +# Issuer: CN=Secure Global CA,O=SecureTrust Corporation,C=US +# Serial Number:07:56:22:a4:e8:d4:8a:89:4d:f4:13:c8:f0:f8:ea:a5 +# Subject: CN=Secure Global CA,O=SecureTrust Corporation,C=US +# Not Valid Before: Tue Nov 07 19:42:28 2006 +# Not Valid After : Mon Dec 31 19:52:06 2029 +# Fingerprint (MD5): CF:F4:27:0D:D4:ED:DC:65:16:49:6D:3D:DA:BF:6E:DE +# Fingerprint (SHA1): 3A:44:73:5A:E5:81:90:1F:24:86:61:46:1E:3B:9C:C4:5F:F5:3A:1B CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "thawte Primary Root CA" +CKA_LABEL UTF8 "Secure Global CA" CKA_CERT_SHA1_HASH MULTILINE_OCTAL -\221\306\326\356\076\212\310\143\204\345\110\302\231\051\134\165 -\154\201\173\201 +\072\104\163\132\345\201\220\037\044\206\141\106\036\073\234\304 +\137\365\072\033 END CKA_CERT_MD5_HASH MULTILINE_OCTAL -\214\312\334\013\042\316\365\276\162\254\101\032\021\250\330\022 +\317\364\047\015\324\355\334\145\026\111\155\075\332\277\156\336 END CKA_ISSUER MULTILINE_OCTAL -\060\201\251\061\013\060\011\006\003\125\004\006\023\002\125\123 -\061\025\060\023\006\003\125\004\012\023\014\164\150\141\167\164 -\145\054\040\111\156\143\056\061\050\060\046\006\003\125\004\013 -\023\037\103\145\162\164\151\146\151\143\141\164\151\157\156\040 -\123\145\162\166\151\143\145\163\040\104\151\166\151\163\151\157 -\156\061\070\060\066\006\003\125\004\013\023\057\050\143\051\040 -\062\060\060\066\040\164\150\141\167\164\145\054\040\111\156\143 -\056\040\055\040\106\157\162\040\141\165\164\150\157\162\151\172 -\145\144\040\165\163\145\040\157\156\154\171\061\037\060\035\006 -\003\125\004\003\023\026\164\150\141\167\164\145\040\120\162\151 -\155\141\162\171\040\122\157\157\164\040\103\101 +\060\112\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +\040\060\036\006\003\125\004\012\023\027\123\145\143\165\162\145 +\124\162\165\163\164\040\103\157\162\160\157\162\141\164\151\157 +\156\061\031\060\027\006\003\125\004\003\023\020\123\145\143\165 +\162\145\040\107\154\157\142\141\154\040\103\101 END CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\020\064\116\325\127\040\325\355\354\111\364\057\316\067\333 -\053\155 +\002\020\007\126\042\244\350\324\212\211\115\364\023\310\360\370 +\352\245 END CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST +CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "VeriSign Class 3 Public Primary Certification Authority - G5" +# Certificate "COMODO Certification Authority" # -# Issuer: CN=VeriSign Class 3 Public Primary Certification Authority - G5,OU="(c) 2006 VeriSign, Inc. - For authorized use only",OU=VeriSign Trust Network,O="VeriSign, Inc.",C=US -# Serial Number:18:da:d1:9e:26:7d:e8:bb:4a:21:58:cd:cc:6b:3b:4a -# Subject: CN=VeriSign Class 3 Public Primary Certification Authority - G5,OU="(c) 2006 VeriSign, Inc. - For authorized use only",OU=VeriSign Trust Network,O="VeriSign, Inc.",C=US -# Not Valid Before: Wed Nov 08 00:00:00 2006 -# Not Valid After : Wed Jul 16 23:59:59 2036 -# Fingerprint (MD5): CB:17:E4:31:67:3E:E2:09:FE:45:57:93:F3:0A:FA:1C -# Fingerprint (SHA1): 4E:B6:D5:78:49:9B:1C:CF:5F:58:1E:AD:56:BE:3D:9B:67:44:A5:E5 +# Issuer: CN=COMODO Certification Authority,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB +# Serial Number:4e:81:2d:8a:82:65:e0:0b:02:ee:3e:35:02:46:e5:3d +# Subject: CN=COMODO Certification Authority,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB +# Not Valid Before: Fri Dec 01 00:00:00 2006 +# Not Valid After : Mon Dec 31 23:59:59 2029 +# Fingerprint (MD5): 5C:48:DC:F7:42:72:EC:56:94:6D:1C:CC:71:35:80:75 +# Fingerprint (SHA1): 66:31:BF:9E:F7:4F:9E:B6:C9:D5:A6:0C:BA:6A:BE:D1:F7:BD:EF:7B CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "VeriSign Class 3 Public Primary Certification Authority - G5" +CKA_LABEL UTF8 "COMODO Certification Authority" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL -\060\201\312\061\013\060\011\006\003\125\004\006\023\002\125\123 -\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123 -\151\147\156\054\040\111\156\143\056\061\037\060\035\006\003\125 -\004\013\023\026\126\145\162\151\123\151\147\156\040\124\162\165 -\163\164\040\116\145\164\167\157\162\153\061\072\060\070\006\003 -\125\004\013\023\061\050\143\051\040\062\060\060\066\040\126\145 -\162\151\123\151\147\156\054\040\111\156\143\056\040\055\040\106 -\157\162\040\141\165\164\150\157\162\151\172\145\144\040\165\163 -\145\040\157\156\154\171\061\105\060\103\006\003\125\004\003\023 -\074\126\145\162\151\123\151\147\156\040\103\154\141\163\163\040 -\063\040\120\165\142\154\151\143\040\120\162\151\155\141\162\171 -\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101 -\165\164\150\157\162\151\164\171\040\055\040\107\065 +\060\201\201\061\013\060\011\006\003\125\004\006\023\002\107\102 +\061\033\060\031\006\003\125\004\010\023\022\107\162\145\141\164 +\145\162\040\115\141\156\143\150\145\163\164\145\162\061\020\060 +\016\006\003\125\004\007\023\007\123\141\154\146\157\162\144\061 +\032\060\030\006\003\125\004\012\023\021\103\117\115\117\104\117 +\040\103\101\040\114\151\155\151\164\145\144\061\047\060\045\006 +\003\125\004\003\023\036\103\117\115\117\104\117\040\103\145\162 +\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157 +\162\151\164\171 END CKA_ID UTF8 "0" CKA_ISSUER MULTILINE_OCTAL -\060\201\312\061\013\060\011\006\003\125\004\006\023\002\125\123 -\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123 -\151\147\156\054\040\111\156\143\056\061\037\060\035\006\003\125 -\004\013\023\026\126\145\162\151\123\151\147\156\040\124\162\165 -\163\164\040\116\145\164\167\157\162\153\061\072\060\070\006\003 -\125\004\013\023\061\050\143\051\040\062\060\060\066\040\126\145 -\162\151\123\151\147\156\054\040\111\156\143\056\040\055\040\106 -\157\162\040\141\165\164\150\157\162\151\172\145\144\040\165\163 -\145\040\157\156\154\171\061\105\060\103\006\003\125\004\003\023 -\074\126\145\162\151\123\151\147\156\040\103\154\141\163\163\040 -\063\040\120\165\142\154\151\143\040\120\162\151\155\141\162\171 -\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101 -\165\164\150\157\162\151\164\171\040\055\040\107\065 +\060\201\201\061\013\060\011\006\003\125\004\006\023\002\107\102 +\061\033\060\031\006\003\125\004\010\023\022\107\162\145\141\164 +\145\162\040\115\141\156\143\150\145\163\164\145\162\061\020\060 +\016\006\003\125\004\007\023\007\123\141\154\146\157\162\144\061 +\032\060\030\006\003\125\004\012\023\021\103\117\115\117\104\117 +\040\103\101\040\114\151\155\151\164\145\144\061\047\060\045\006 +\003\125\004\003\023\036\103\117\115\117\104\117\040\103\145\162 +\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157 +\162\151\164\171 END CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\020\030\332\321\236\046\175\350\273\112\041\130\315\314\153 -\073\112 +\002\020\116\201\055\212\202\145\340\013\002\356\076\065\002\106 +\345\075 END CKA_VALUE MULTILINE_OCTAL -\060\202\004\323\060\202\003\273\240\003\002\001\002\002\020\030 -\332\321\236\046\175\350\273\112\041\130\315\314\153\073\112\060 +\060\202\004\035\060\202\003\005\240\003\002\001\002\002\020\116 +\201\055\212\202\145\340\013\002\356\076\065\002\106\345\075\060 \015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\201 -\312\061\013\060\011\006\003\125\004\006\023\002\125\123\061\027 -\060\025\006\003\125\004\012\023\016\126\145\162\151\123\151\147 -\156\054\040\111\156\143\056\061\037\060\035\006\003\125\004\013 -\023\026\126\145\162\151\123\151\147\156\040\124\162\165\163\164 -\040\116\145\164\167\157\162\153\061\072\060\070\006\003\125\004 -\013\023\061\050\143\051\040\062\060\060\066\040\126\145\162\151 -\123\151\147\156\054\040\111\156\143\056\040\055\040\106\157\162 -\040\141\165\164\150\157\162\151\172\145\144\040\165\163\145\040 -\157\156\154\171\061\105\060\103\006\003\125\004\003\023\074\126 -\145\162\151\123\151\147\156\040\103\154\141\163\163\040\063\040 -\120\165\142\154\151\143\040\120\162\151\155\141\162\171\040\103 +\201\061\013\060\011\006\003\125\004\006\023\002\107\102\061\033 +\060\031\006\003\125\004\010\023\022\107\162\145\141\164\145\162 +\040\115\141\156\143\150\145\163\164\145\162\061\020\060\016\006 +\003\125\004\007\023\007\123\141\154\146\157\162\144\061\032\060 +\030\006\003\125\004\012\023\021\103\117\115\117\104\117\040\103 +\101\040\114\151\155\151\164\145\144\061\047\060\045\006\003\125 +\004\003\023\036\103\117\115\117\104\117\040\103\145\162\164\151 +\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151 +\164\171\060\036\027\015\060\066\061\062\060\061\060\060\060\060 +\060\060\132\027\015\062\071\061\062\063\061\062\063\065\071\065 +\071\132\060\201\201\061\013\060\011\006\003\125\004\006\023\002 +\107\102\061\033\060\031\006\003\125\004\010\023\022\107\162\145 +\141\164\145\162\040\115\141\156\143\150\145\163\164\145\162\061 +\020\060\016\006\003\125\004\007\023\007\123\141\154\146\157\162 +\144\061\032\060\030\006\003\125\004\012\023\021\103\117\115\117 +\104\117\040\103\101\040\114\151\155\151\164\145\144\061\047\060 +\045\006\003\125\004\003\023\036\103\117\115\117\104\117\040\103 \145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164 -\150\157\162\151\164\171\040\055\040\107\065\060\036\027\015\060 -\066\061\061\060\070\060\060\060\060\060\060\132\027\015\063\066 -\060\067\061\066\062\063\065\071\065\071\132\060\201\312\061\013 -\060\011\006\003\125\004\006\023\002\125\123\061\027\060\025\006 -\003\125\004\012\023\016\126\145\162\151\123\151\147\156\054\040 -\111\156\143\056\061\037\060\035\006\003\125\004\013\023\026\126 -\145\162\151\123\151\147\156\040\124\162\165\163\164\040\116\145 -\164\167\157\162\153\061\072\060\070\006\003\125\004\013\023\061 -\050\143\051\040\062\060\060\066\040\126\145\162\151\123\151\147 -\156\054\040\111\156\143\056\040\055\040\106\157\162\040\141\165 -\164\150\157\162\151\172\145\144\040\165\163\145\040\157\156\154 -\171\061\105\060\103\006\003\125\004\003\023\074\126\145\162\151 -\123\151\147\156\040\103\154\141\163\163\040\063\040\120\165\142 -\154\151\143\040\120\162\151\155\141\162\171\040\103\145\162\164 -\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162 -\151\164\171\040\055\040\107\065\060\202\001\042\060\015\006\011 -\052\206\110\206\367\015\001\001\001\005\000\003\202\001\017\000 -\060\202\001\012\002\202\001\001\000\257\044\010\010\051\172\065 -\236\140\014\252\347\113\073\116\334\174\274\074\105\034\273\053 -\340\376\051\002\371\127\010\243\144\205\025\047\365\361\255\310 -\061\211\135\042\350\052\252\246\102\263\217\370\271\125\267\261 -\267\113\263\376\217\176\007\127\354\357\103\333\146\142\025\141 -\317\140\015\244\330\336\370\340\303\142\010\075\124\023\353\111 -\312\131\124\205\046\345\053\217\033\237\353\365\241\221\302\063 -\111\330\103\143\152\122\113\322\217\350\160\121\115\321\211\151 -\173\307\160\366\263\334\022\164\333\173\135\113\126\323\226\277 -\025\167\241\260\364\242\045\362\257\034\222\147\030\345\364\006 -\004\357\220\271\344\000\344\335\072\265\031\377\002\272\364\074 -\356\340\213\353\067\213\354\364\327\254\362\366\360\075\257\335 -\165\221\063\031\035\034\100\313\164\044\031\041\223\331\024\376 -\254\052\122\307\217\325\004\111\344\215\143\107\210\074\151\203 -\313\376\107\275\053\176\117\305\225\256\016\235\324\321\103\300 -\147\163\343\024\010\176\345\077\237\163\270\063\012\317\135\077 -\064\207\226\212\356\123\350\045\025\002\003\001\000\001\243\201 -\262\060\201\257\060\017\006\003\125\035\023\001\001\377\004\005 -\060\003\001\001\377\060\016\006\003\125\035\017\001\001\377\004 -\004\003\002\001\006\060\155\006\010\053\006\001\005\005\007\001 -\014\004\141\060\137\241\135\240\133\060\131\060\127\060\125\026 -\011\151\155\141\147\145\057\147\151\146\060\041\060\037\060\007 -\006\005\053\016\003\002\032\004\024\217\345\323\032\206\254\215 -\216\153\303\317\200\152\324\110\030\054\173\031\056\060\045\026 -\043\150\164\164\160\072\057\057\154\157\147\157\056\166\145\162 -\151\163\151\147\156\056\143\157\155\057\166\163\154\157\147\157 -\056\147\151\146\060\035\006\003\125\035\016\004\026\004\024\177 -\323\145\247\302\335\354\273\360\060\011\363\103\071\372\002\257 -\063\061\063\060\015\006\011\052\206\110\206\367\015\001\001\005 -\005\000\003\202\001\001\000\223\044\112\060\137\142\317\330\032 -\230\057\075\352\334\231\055\275\167\366\245\171\042\070\354\304 -\247\240\170\022\255\142\016\105\160\144\305\347\227\146\055\230 -\011\176\137\257\326\314\050\145\362\001\252\010\032\107\336\371 -\371\174\222\132\010\151\040\015\331\076\155\156\074\015\156\330 -\346\006\221\100\030\271\370\301\355\337\333\101\252\340\226\040 -\311\315\144\025\070\201\311\224\356\242\204\051\013\023\157\216 -\333\014\335\045\002\333\244\213\031\104\322\101\172\005\151\112 -\130\117\140\312\176\202\152\013\002\252\045\027\071\265\333\177 -\347\204\145\052\225\212\275\206\336\136\201\026\203\055\020\314 -\336\375\250\202\052\155\050\037\015\013\304\345\347\032\046\031 -\341\364\021\157\020\265\225\374\347\102\005\062\333\316\235\121 -\136\050\266\236\205\323\133\357\245\175\105\100\162\216\267\016 -\153\016\006\373\063\065\110\161\270\235\047\213\304\145\137\015 -\206\166\234\104\172\366\225\134\366\135\062\010\063\244\124\266 -\030\077\150\134\362\102\112\205\070\124\203\137\321\350\054\362 -\254\021\326\250\355\143\152 +\150\157\162\151\164\171\060\202\001\042\060\015\006\011\052\206 +\110\206\367\015\001\001\001\005\000\003\202\001\017\000\060\202 +\001\012\002\202\001\001\000\320\100\213\213\162\343\221\033\367 +\121\301\033\124\004\230\323\251\277\301\346\212\135\073\207\373 +\273\210\316\015\343\057\077\006\226\360\242\051\120\231\256\333 +\073\241\127\260\164\121\161\315\355\102\221\115\101\376\251\310 +\330\152\206\167\104\273\131\146\227\120\136\264\324\054\160\104 +\317\332\067\225\102\151\074\060\304\161\263\122\360\041\115\241 +\330\272\071\174\034\236\243\044\235\362\203\026\230\252\026\174 +\103\233\025\133\267\256\064\221\376\324\142\046\030\106\232\077 +\353\301\371\361\220\127\353\254\172\015\213\333\162\060\152\146 +\325\340\106\243\160\334\150\331\377\004\110\211\167\336\265\351 +\373\147\155\101\351\274\071\275\062\331\142\002\361\261\250\075 +\156\067\234\342\057\342\323\242\046\213\306\270\125\103\210\341 +\043\076\245\322\044\071\152\107\253\000\324\241\263\251\045\376 +\015\077\247\035\272\323\121\301\013\244\332\254\070\357\125\120 +\044\005\145\106\223\064\117\055\215\255\306\324\041\031\322\216 +\312\005\141\161\007\163\107\345\212\031\022\275\004\115\316\116 +\234\245\110\254\273\046\367\002\003\001\000\001\243\201\216\060 +\201\213\060\035\006\003\125\035\016\004\026\004\024\013\130\345 +\213\306\114\025\067\244\100\251\060\251\041\276\107\066\132\126 +\377\060\016\006\003\125\035\017\001\001\377\004\004\003\002\001 +\006\060\017\006\003\125\035\023\001\001\377\004\005\060\003\001 +\001\377\060\111\006\003\125\035\037\004\102\060\100\060\076\240 +\074\240\072\206\070\150\164\164\160\072\057\057\143\162\154\056 +\143\157\155\157\144\157\143\141\056\143\157\155\057\103\117\115 +\117\104\117\103\145\162\164\151\146\151\143\141\164\151\157\156 +\101\165\164\150\157\162\151\164\171\056\143\162\154\060\015\006 +\011\052\206\110\206\367\015\001\001\005\005\000\003\202\001\001 +\000\076\230\236\233\366\033\351\327\071\267\170\256\035\162\030 +\111\323\207\344\103\202\353\077\311\252\365\250\265\357\125\174 +\041\122\145\371\325\015\341\154\364\076\214\223\163\221\056\002 +\304\116\007\161\157\300\217\070\141\010\250\036\201\012\300\057 +\040\057\101\213\221\334\110\105\274\361\306\336\272\166\153\063 +\310\000\055\061\106\114\355\347\235\317\210\224\377\063\300\126 +\350\044\206\046\270\330\070\070\337\052\153\335\022\314\307\077 +\107\027\114\242\302\006\226\011\326\333\376\077\074\106\101\337 +\130\342\126\017\074\073\301\034\223\065\331\070\122\254\356\310 +\354\056\060\116\224\065\264\044\037\113\170\151\332\362\002\070 +\314\225\122\223\360\160\045\131\234\040\147\304\356\371\213\127 +\141\364\222\166\175\077\204\215\125\267\350\345\254\325\361\365 +\031\126\246\132\373\220\034\257\223\353\345\034\324\147\227\135 +\004\016\276\013\203\246\027\203\271\060\022\240\305\063\025\005 +\271\015\373\307\005\166\343\330\112\215\374\064\027\243\306\041 +\050\276\060\105\061\036\307\170\276\130\141\070\254\073\342\001 +\145 END CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE -# For Server Distrust After: Tue Apr 30 00:00:00 2019 -CKA_NSS_SERVER_DISTRUST_AFTER MULTILINE_OCTAL -\061\071\060\064\063\060\060\060\060\060\060\060\132 -END +CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for Certificate "VeriSign Class 3 Public Primary Certification Authority - G5" -# Issuer: CN=VeriSign Class 3 Public Primary Certification Authority - G5,OU="(c) 2006 VeriSign, Inc. - For authorized use only",OU=VeriSign Trust Network,O="VeriSign, Inc.",C=US -# Serial Number:18:da:d1:9e:26:7d:e8:bb:4a:21:58:cd:cc:6b:3b:4a -# Subject: CN=VeriSign Class 3 Public Primary Certification Authority - G5,OU="(c) 2006 VeriSign, Inc. - For authorized use only",OU=VeriSign Trust Network,O="VeriSign, Inc.",C=US -# Not Valid Before: Wed Nov 08 00:00:00 2006 -# Not Valid After : Wed Jul 16 23:59:59 2036 -# Fingerprint (MD5): CB:17:E4:31:67:3E:E2:09:FE:45:57:93:F3:0A:FA:1C -# Fingerprint (SHA1): 4E:B6:D5:78:49:9B:1C:CF:5F:58:1E:AD:56:BE:3D:9B:67:44:A5:E5 +# Trust for Certificate "COMODO Certification Authority" +# Issuer: CN=COMODO Certification Authority,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB +# Serial Number:4e:81:2d:8a:82:65:e0:0b:02:ee:3e:35:02:46:e5:3d +# Subject: CN=COMODO Certification Authority,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB +# Not Valid Before: Fri Dec 01 00:00:00 2006 +# Not Valid After : Mon Dec 31 23:59:59 2029 +# Fingerprint (MD5): 5C:48:DC:F7:42:72:EC:56:94:6D:1C:CC:71:35:80:75 +# Fingerprint (SHA1): 66:31:BF:9E:F7:4F:9E:B6:C9:D5:A6:0C:BA:6A:BE:D1:F7:BD:EF:7B CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "VeriSign Class 3 Public Primary Certification Authority - G5" +CKA_LABEL UTF8 "COMODO Certification Authority" CKA_CERT_SHA1_HASH MULTILINE_OCTAL -\116\266\325\170\111\233\034\317\137\130\036\255\126\276\075\233 -\147\104\245\345 +\146\061\277\236\367\117\236\266\311\325\246\014\272\152\276\321 +\367\275\357\173 END CKA_CERT_MD5_HASH MULTILINE_OCTAL -\313\027\344\061\147\076\342\011\376\105\127\223\363\012\372\034 +\134\110\334\367\102\162\354\126\224\155\034\314\161\065\200\165 END CKA_ISSUER MULTILINE_OCTAL -\060\201\312\061\013\060\011\006\003\125\004\006\023\002\125\123 -\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123 -\151\147\156\054\040\111\156\143\056\061\037\060\035\006\003\125 -\004\013\023\026\126\145\162\151\123\151\147\156\040\124\162\165 -\163\164\040\116\145\164\167\157\162\153\061\072\060\070\006\003 -\125\004\013\023\061\050\143\051\040\062\060\060\066\040\126\145 -\162\151\123\151\147\156\054\040\111\156\143\056\040\055\040\106 -\157\162\040\141\165\164\150\157\162\151\172\145\144\040\165\163 -\145\040\157\156\154\171\061\105\060\103\006\003\125\004\003\023 -\074\126\145\162\151\123\151\147\156\040\103\154\141\163\163\040 -\063\040\120\165\142\154\151\143\040\120\162\151\155\141\162\171 -\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101 -\165\164\150\157\162\151\164\171\040\055\040\107\065 +\060\201\201\061\013\060\011\006\003\125\004\006\023\002\107\102 +\061\033\060\031\006\003\125\004\010\023\022\107\162\145\141\164 +\145\162\040\115\141\156\143\150\145\163\164\145\162\061\020\060 +\016\006\003\125\004\007\023\007\123\141\154\146\157\162\144\061 +\032\060\030\006\003\125\004\012\023\021\103\117\115\117\104\117 +\040\103\101\040\114\151\155\151\164\145\144\061\047\060\045\006 +\003\125\004\003\023\036\103\117\115\117\104\117\040\103\145\162 +\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157 +\162\151\164\171 END CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\020\030\332\321\236\046\175\350\273\112\041\130\315\314\153 -\073\112 +\002\020\116\201\055\212\202\145\340\013\002\356\076\065\002\106 +\345\075 END CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST +CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "SecureTrust CA" +# Certificate "Network Solutions Certificate Authority" # -# Issuer: CN=SecureTrust CA,O=SecureTrust Corporation,C=US -# Serial Number:0c:f0:8e:5c:08:16:a5:ad:42:7f:f0:eb:27:18:59:d0 -# Subject: CN=SecureTrust CA,O=SecureTrust Corporation,C=US -# Not Valid Before: Tue Nov 07 19:31:18 2006 -# Not Valid After : Mon Dec 31 19:40:55 2029 -# Fingerprint (MD5): DC:32:C3:A7:6D:25:57:C7:68:09:9D:EA:2D:A9:A2:D1 -# Fingerprint (SHA1): 87:82:C6:C3:04:35:3B:CF:D2:96:92:D2:59:3E:7D:44:D9:34:FF:11 +# Issuer: CN=Network Solutions Certificate Authority,O=Network Solutions L.L.C.,C=US +# Serial Number:57:cb:33:6f:c2:5c:16:e6:47:16:17:e3:90:31:68:e0 +# Subject: CN=Network Solutions Certificate Authority,O=Network Solutions L.L.C.,C=US +# Not Valid Before: Fri Dec 01 00:00:00 2006 +# Not Valid After : Mon Dec 31 23:59:59 2029 +# Fingerprint (MD5): D3:F3:A6:16:C0:FA:6B:1D:59:B1:2D:96:4D:0E:11:2E +# Fingerprint (SHA1): 74:F8:A3:C3:EF:E7:B3:90:06:4B:83:90:3C:21:64:60:20:E5:DF:CE CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "SecureTrust CA" +CKA_LABEL UTF8 "Network Solutions Certificate Authority" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL -\060\110\061\013\060\011\006\003\125\004\006\023\002\125\123\061 -\040\060\036\006\003\125\004\012\023\027\123\145\143\165\162\145 -\124\162\165\163\164\040\103\157\162\160\157\162\141\164\151\157 -\156\061\027\060\025\006\003\125\004\003\023\016\123\145\143\165 -\162\145\124\162\165\163\164\040\103\101 +\060\142\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +\041\060\037\006\003\125\004\012\023\030\116\145\164\167\157\162 +\153\040\123\157\154\165\164\151\157\156\163\040\114\056\114\056 +\103\056\061\060\060\056\006\003\125\004\003\023\047\116\145\164 +\167\157\162\153\040\123\157\154\165\164\151\157\156\163\040\103 +\145\162\164\151\146\151\143\141\164\145\040\101\165\164\150\157 +\162\151\164\171 END CKA_ID UTF8 "0" CKA_ISSUER MULTILINE_OCTAL -\060\110\061\013\060\011\006\003\125\004\006\023\002\125\123\061 -\040\060\036\006\003\125\004\012\023\027\123\145\143\165\162\145 -\124\162\165\163\164\040\103\157\162\160\157\162\141\164\151\157 -\156\061\027\060\025\006\003\125\004\003\023\016\123\145\143\165 -\162\145\124\162\165\163\164\040\103\101 +\060\142\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +\041\060\037\006\003\125\004\012\023\030\116\145\164\167\157\162 +\153\040\123\157\154\165\164\151\157\156\163\040\114\056\114\056 +\103\056\061\060\060\056\006\003\125\004\003\023\047\116\145\164 +\167\157\162\153\040\123\157\154\165\164\151\157\156\163\040\103 +\145\162\164\151\146\151\143\141\164\145\040\101\165\164\150\157 +\162\151\164\171 END CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\020\014\360\216\134\010\026\245\255\102\177\360\353\047\030 -\131\320 +\002\020\127\313\063\157\302\134\026\346\107\026\027\343\220\061 +\150\340 END CKA_VALUE MULTILINE_OCTAL -\060\202\003\270\060\202\002\240\240\003\002\001\002\002\020\014 -\360\216\134\010\026\245\255\102\177\360\353\047\030\131\320\060 -\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\110 -\061\013\060\011\006\003\125\004\006\023\002\125\123\061\040\060 -\036\006\003\125\004\012\023\027\123\145\143\165\162\145\124\162 -\165\163\164\040\103\157\162\160\157\162\141\164\151\157\156\061 -\027\060\025\006\003\125\004\003\023\016\123\145\143\165\162\145 -\124\162\165\163\164\040\103\101\060\036\027\015\060\066\061\061 -\060\067\061\071\063\061\061\070\132\027\015\062\071\061\062\063 -\061\061\071\064\060\065\065\132\060\110\061\013\060\011\006\003 -\125\004\006\023\002\125\123\061\040\060\036\006\003\125\004\012 -\023\027\123\145\143\165\162\145\124\162\165\163\164\040\103\157 -\162\160\157\162\141\164\151\157\156\061\027\060\025\006\003\125 -\004\003\023\016\123\145\143\165\162\145\124\162\165\163\164\040 -\103\101\060\202\001\042\060\015\006\011\052\206\110\206\367\015 -\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002\202 -\001\001\000\253\244\201\345\225\315\365\366\024\216\302\117\312 -\324\342\170\225\130\234\101\341\015\231\100\044\027\071\221\063 -\146\351\276\341\203\257\142\134\211\321\374\044\133\141\263\340 -\021\021\101\034\035\156\360\270\273\370\336\247\201\272\246\110 -\306\237\035\275\276\216\251\101\076\270\224\355\051\032\324\216 -\322\003\035\003\357\155\015\147\034\127\327\006\255\312\310\365 -\376\016\257\146\045\110\004\226\013\135\243\272\026\303\010\117 -\321\106\370\024\134\362\310\136\001\231\155\375\210\314\206\250 -\301\157\061\102\154\122\076\150\313\363\031\064\337\273\207\030 -\126\200\046\304\320\334\300\157\337\336\240\302\221\026\240\144 -\021\113\104\274\036\366\347\372\143\336\146\254\166\244\161\243 -\354\066\224\150\172\167\244\261\347\016\057\201\172\342\265\162 -\206\357\242\153\213\360\017\333\323\131\077\272\162\274\104\044 -\234\343\163\263\367\257\127\057\102\046\235\251\164\272\000\122 -\362\113\315\123\174\107\013\066\205\016\146\251\010\227\026\064 -\127\301\146\367\200\343\355\160\124\307\223\340\056\050\025\131 -\207\272\273\002\003\001\000\001\243\201\235\060\201\232\060\023 -\006\011\053\006\001\004\001\202\067\024\002\004\006\036\004\000 -\103\000\101\060\013\006\003\125\035\017\004\004\003\002\001\206 -\060\017\006\003\125\035\023\001\001\377\004\005\060\003\001\001 -\377\060\035\006\003\125\035\016\004\026\004\024\102\062\266\026 -\372\004\375\376\135\113\172\303\375\367\114\100\035\132\103\257 -\060\064\006\003\125\035\037\004\055\060\053\060\051\240\047\240 -\045\206\043\150\164\164\160\072\057\057\143\162\154\056\163\145 -\143\165\162\145\164\162\165\163\164\056\143\157\155\057\123\124 -\103\101\056\143\162\154\060\020\006\011\053\006\001\004\001\202 -\067\025\001\004\003\002\001\000\060\015\006\011\052\206\110\206 -\367\015\001\001\005\005\000\003\202\001\001\000\060\355\117\112 -\341\130\072\122\162\133\265\246\243\145\030\246\273\121\073\167 -\351\235\352\323\237\134\340\105\145\173\015\312\133\342\160\120 -\262\224\005\024\256\111\307\215\101\007\022\163\224\176\014\043 -\041\375\274\020\177\140\020\132\162\365\230\016\254\354\271\177 -\335\172\157\135\323\034\364\377\210\005\151\102\251\005\161\310 -\267\254\046\350\056\264\214\152\377\161\334\270\261\337\231\274 -\174\041\124\053\344\130\242\273\127\051\256\236\251\243\031\046 -\017\231\056\010\260\357\375\151\317\231\032\011\215\343\247\237 -\053\311\066\064\173\044\263\170\114\225\027\244\006\046\036\266 -\144\122\066\137\140\147\331\234\305\005\164\013\347\147\043\322 -\010\374\210\351\256\213\177\341\060\364\067\176\375\306\062\332 -\055\236\104\060\060\154\356\007\336\322\064\374\322\377\100\366 -\113\364\146\106\006\124\246\362\062\012\143\046\060\153\233\321 -\334\213\107\272\341\271\325\142\320\242\240\364\147\005\170\051 -\143\032\157\004\326\370\306\114\243\232\261\067\264\215\345\050 -\113\035\236\054\302\270\150\274\355\002\356\061 +\060\202\003\346\060\202\002\316\240\003\002\001\002\002\020\127 +\313\063\157\302\134\026\346\107\026\027\343\220\061\150\340\060 +\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\142 +\061\013\060\011\006\003\125\004\006\023\002\125\123\061\041\060 +\037\006\003\125\004\012\023\030\116\145\164\167\157\162\153\040 +\123\157\154\165\164\151\157\156\163\040\114\056\114\056\103\056 +\061\060\060\056\006\003\125\004\003\023\047\116\145\164\167\157 +\162\153\040\123\157\154\165\164\151\157\156\163\040\103\145\162 +\164\151\146\151\143\141\164\145\040\101\165\164\150\157\162\151 +\164\171\060\036\027\015\060\066\061\062\060\061\060\060\060\060 +\060\060\132\027\015\062\071\061\062\063\061\062\063\065\071\065 +\071\132\060\142\061\013\060\011\006\003\125\004\006\023\002\125 +\123\061\041\060\037\006\003\125\004\012\023\030\116\145\164\167 +\157\162\153\040\123\157\154\165\164\151\157\156\163\040\114\056 +\114\056\103\056\061\060\060\056\006\003\125\004\003\023\047\116 +\145\164\167\157\162\153\040\123\157\154\165\164\151\157\156\163 +\040\103\145\162\164\151\146\151\143\141\164\145\040\101\165\164 +\150\157\162\151\164\171\060\202\001\042\060\015\006\011\052\206 +\110\206\367\015\001\001\001\005\000\003\202\001\017\000\060\202 +\001\012\002\202\001\001\000\344\274\176\222\060\155\306\330\216 +\053\013\274\106\316\340\047\226\336\336\371\372\022\323\074\063 +\163\263\004\057\274\161\214\345\237\266\042\140\076\137\135\316 +\011\377\202\014\033\232\121\120\032\046\211\335\325\141\135\031 +\334\022\017\055\012\242\103\135\027\320\064\222\040\352\163\317 +\070\054\006\046\011\172\162\367\372\120\062\370\302\223\323\151 +\242\043\316\101\261\314\344\325\037\066\321\212\072\370\214\143 +\342\024\131\151\355\015\323\177\153\350\270\003\345\117\152\345 +\230\143\151\110\005\276\056\377\063\266\351\227\131\151\370\147 +\031\256\223\141\226\104\025\323\162\260\077\274\152\175\354\110 +\177\215\303\253\252\161\053\123\151\101\123\064\265\260\271\305 +\006\012\304\260\105\365\101\135\156\211\105\173\075\073\046\214 +\164\302\345\322\321\175\262\021\324\373\130\062\042\232\200\311 +\334\375\014\351\177\136\003\227\316\073\000\024\207\047\160\070 +\251\216\156\263\047\166\230\121\340\005\343\041\253\032\325\205 +\042\074\051\265\232\026\305\200\250\364\273\153\060\217\057\106 +\002\242\261\014\042\340\323\002\003\001\000\001\243\201\227\060 +\201\224\060\035\006\003\125\035\016\004\026\004\024\041\060\311 +\373\000\327\116\230\332\207\252\052\320\247\056\261\100\061\247 +\114\060\016\006\003\125\035\017\001\001\377\004\004\003\002\001 +\006\060\017\006\003\125\035\023\001\001\377\004\005\060\003\001 +\001\377\060\122\006\003\125\035\037\004\113\060\111\060\107\240 +\105\240\103\206\101\150\164\164\160\072\057\057\143\162\154\056 +\156\145\164\163\157\154\163\163\154\056\143\157\155\057\116\145 +\164\167\157\162\153\123\157\154\165\164\151\157\156\163\103\145 +\162\164\151\146\151\143\141\164\145\101\165\164\150\157\162\151 +\164\171\056\143\162\154\060\015\006\011\052\206\110\206\367\015 +\001\001\005\005\000\003\202\001\001\000\273\256\113\347\267\127 +\353\177\252\055\267\163\107\205\152\301\344\245\035\344\347\074 +\351\364\131\145\167\265\172\133\132\215\045\066\340\172\227\056 +\070\300\127\140\203\230\006\203\237\271\166\172\156\120\340\272 +\210\054\374\105\314\030\260\231\225\121\016\354\035\270\210\377 +\207\120\034\202\302\343\340\062\200\277\240\013\107\310\303\061 +\357\231\147\062\200\117\027\041\171\014\151\134\336\136\064\256 +\002\265\046\352\120\337\177\030\145\054\311\362\143\341\251\007 +\376\174\161\037\153\063\044\152\036\005\367\005\150\300\152\022 +\313\056\136\141\313\256\050\323\176\302\264\146\221\046\137\074 +\056\044\137\313\130\017\353\050\354\257\021\226\363\334\173\157 +\300\247\210\362\123\167\263\140\136\256\256\050\332\065\054\157 +\064\105\323\046\341\336\354\133\117\047\153\026\174\275\104\004 +\030\202\263\211\171\027\020\161\075\172\242\026\116\365\001\315 +\244\154\145\150\241\111\166\134\103\311\330\274\066\147\154\245 +\224\265\324\314\271\275\152\065\126\041\336\330\303\353\373\313 +\244\140\114\260\125\240\240\173\127\262 END CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for Certificate "SecureTrust CA" -# Issuer: CN=SecureTrust CA,O=SecureTrust Corporation,C=US -# Serial Number:0c:f0:8e:5c:08:16:a5:ad:42:7f:f0:eb:27:18:59:d0 -# Subject: CN=SecureTrust CA,O=SecureTrust Corporation,C=US -# Not Valid Before: Tue Nov 07 19:31:18 2006 -# Not Valid After : Mon Dec 31 19:40:55 2029 -# Fingerprint (MD5): DC:32:C3:A7:6D:25:57:C7:68:09:9D:EA:2D:A9:A2:D1 -# Fingerprint (SHA1): 87:82:C6:C3:04:35:3B:CF:D2:96:92:D2:59:3E:7D:44:D9:34:FF:11 +# Trust for Certificate "Network Solutions Certificate Authority" +# Issuer: CN=Network Solutions Certificate Authority,O=Network Solutions L.L.C.,C=US +# Serial Number:57:cb:33:6f:c2:5c:16:e6:47:16:17:e3:90:31:68:e0 +# Subject: CN=Network Solutions Certificate Authority,O=Network Solutions L.L.C.,C=US +# Not Valid Before: Fri Dec 01 00:00:00 2006 +# Not Valid After : Mon Dec 31 23:59:59 2029 +# Fingerprint (MD5): D3:F3:A6:16:C0:FA:6B:1D:59:B1:2D:96:4D:0E:11:2E +# Fingerprint (SHA1): 74:F8:A3:C3:EF:E7:B3:90:06:4B:83:90:3C:21:64:60:20:E5:DF:CE CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "SecureTrust CA" +CKA_LABEL UTF8 "Network Solutions Certificate Authority" CKA_CERT_SHA1_HASH MULTILINE_OCTAL -\207\202\306\303\004\065\073\317\322\226\222\322\131\076\175\104 -\331\064\377\021 +\164\370\243\303\357\347\263\220\006\113\203\220\074\041\144\140 +\040\345\337\316 END CKA_CERT_MD5_HASH MULTILINE_OCTAL -\334\062\303\247\155\045\127\307\150\011\235\352\055\251\242\321 +\323\363\246\026\300\372\153\035\131\261\055\226\115\016\021\056 END CKA_ISSUER MULTILINE_OCTAL -\060\110\061\013\060\011\006\003\125\004\006\023\002\125\123\061 -\040\060\036\006\003\125\004\012\023\027\123\145\143\165\162\145 -\124\162\165\163\164\040\103\157\162\160\157\162\141\164\151\157 -\156\061\027\060\025\006\003\125\004\003\023\016\123\145\143\165 -\162\145\124\162\165\163\164\040\103\101 +\060\142\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +\041\060\037\006\003\125\004\012\023\030\116\145\164\167\157\162 +\153\040\123\157\154\165\164\151\157\156\163\040\114\056\114\056 +\103\056\061\060\060\056\006\003\125\004\003\023\047\116\145\164 +\167\157\162\153\040\123\157\154\165\164\151\157\156\163\040\103 +\145\162\164\151\146\151\143\141\164\145\040\101\165\164\150\157 +\162\151\164\171 END CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\020\014\360\216\134\010\026\245\255\102\177\360\353\047\030 -\131\320 +\002\020\127\313\063\157\302\134\026\346\107\026\027\343\220\061 +\150\340 END CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST @@ -5123,136 +4614,129 @@ CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Secure Global CA" +# Certificate "COMODO ECC Certification Authority" # -# Issuer: CN=Secure Global CA,O=SecureTrust Corporation,C=US -# Serial Number:07:56:22:a4:e8:d4:8a:89:4d:f4:13:c8:f0:f8:ea:a5 -# Subject: CN=Secure Global CA,O=SecureTrust Corporation,C=US -# Not Valid Before: Tue Nov 07 19:42:28 2006 -# Not Valid After : Mon Dec 31 19:52:06 2029 -# Fingerprint (MD5): CF:F4:27:0D:D4:ED:DC:65:16:49:6D:3D:DA:BF:6E:DE -# Fingerprint (SHA1): 3A:44:73:5A:E5:81:90:1F:24:86:61:46:1E:3B:9C:C4:5F:F5:3A:1B +# Issuer: CN=COMODO ECC Certification Authority,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB +# Serial Number:1f:47:af:aa:62:00:70:50:54:4c:01:9e:9b:63:99:2a +# Subject: CN=COMODO ECC Certification Authority,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB +# Not Valid Before: Thu Mar 06 00:00:00 2008 +# Not Valid After : Mon Jan 18 23:59:59 2038 +# Fingerprint (MD5): 7C:62:FF:74:9D:31:53:5E:68:4A:D5:78:AA:1E:BF:23 +# Fingerprint (SHA1): 9F:74:4E:9F:2B:4D:BA:EC:0F:31:2C:50:B6:56:3B:8E:2D:93:C3:11 CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Secure Global CA" +CKA_LABEL UTF8 "COMODO ECC Certification Authority" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL -\060\112\061\013\060\011\006\003\125\004\006\023\002\125\123\061 -\040\060\036\006\003\125\004\012\023\027\123\145\143\165\162\145 -\124\162\165\163\164\040\103\157\162\160\157\162\141\164\151\157 -\156\061\031\060\027\006\003\125\004\003\023\020\123\145\143\165 -\162\145\040\107\154\157\142\141\154\040\103\101 +\060\201\205\061\013\060\011\006\003\125\004\006\023\002\107\102 +\061\033\060\031\006\003\125\004\010\023\022\107\162\145\141\164 +\145\162\040\115\141\156\143\150\145\163\164\145\162\061\020\060 +\016\006\003\125\004\007\023\007\123\141\154\146\157\162\144\061 +\032\060\030\006\003\125\004\012\023\021\103\117\115\117\104\117 +\040\103\101\040\114\151\155\151\164\145\144\061\053\060\051\006 +\003\125\004\003\023\042\103\117\115\117\104\117\040\105\103\103 +\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101 +\165\164\150\157\162\151\164\171 END CKA_ID UTF8 "0" CKA_ISSUER MULTILINE_OCTAL -\060\112\061\013\060\011\006\003\125\004\006\023\002\125\123\061 -\040\060\036\006\003\125\004\012\023\027\123\145\143\165\162\145 -\124\162\165\163\164\040\103\157\162\160\157\162\141\164\151\157 -\156\061\031\060\027\006\003\125\004\003\023\020\123\145\143\165 -\162\145\040\107\154\157\142\141\154\040\103\101 +\060\201\205\061\013\060\011\006\003\125\004\006\023\002\107\102 +\061\033\060\031\006\003\125\004\010\023\022\107\162\145\141\164 +\145\162\040\115\141\156\143\150\145\163\164\145\162\061\020\060 +\016\006\003\125\004\007\023\007\123\141\154\146\157\162\144\061 +\032\060\030\006\003\125\004\012\023\021\103\117\115\117\104\117 +\040\103\101\040\114\151\155\151\164\145\144\061\053\060\051\006 +\003\125\004\003\023\042\103\117\115\117\104\117\040\105\103\103 +\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101 +\165\164\150\157\162\151\164\171 END CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\020\007\126\042\244\350\324\212\211\115\364\023\310\360\370 -\352\245 +\002\020\037\107\257\252\142\000\160\120\124\114\001\236\233\143 +\231\052 END CKA_VALUE MULTILINE_OCTAL -\060\202\003\274\060\202\002\244\240\003\002\001\002\002\020\007 -\126\042\244\350\324\212\211\115\364\023\310\360\370\352\245\060 -\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\112 -\061\013\060\011\006\003\125\004\006\023\002\125\123\061\040\060 -\036\006\003\125\004\012\023\027\123\145\143\165\162\145\124\162 -\165\163\164\040\103\157\162\160\157\162\141\164\151\157\156\061 -\031\060\027\006\003\125\004\003\023\020\123\145\143\165\162\145 -\040\107\154\157\142\141\154\040\103\101\060\036\027\015\060\066 -\061\061\060\067\061\071\064\062\062\070\132\027\015\062\071\061 -\062\063\061\061\071\065\062\060\066\132\060\112\061\013\060\011 -\006\003\125\004\006\023\002\125\123\061\040\060\036\006\003\125 -\004\012\023\027\123\145\143\165\162\145\124\162\165\163\164\040 -\103\157\162\160\157\162\141\164\151\157\156\061\031\060\027\006 -\003\125\004\003\023\020\123\145\143\165\162\145\040\107\154\157 -\142\141\154\040\103\101\060\202\001\042\060\015\006\011\052\206 -\110\206\367\015\001\001\001\005\000\003\202\001\017\000\060\202 -\001\012\002\202\001\001\000\257\065\056\330\254\154\125\151\006 -\161\345\023\150\044\263\117\330\314\041\107\370\361\140\070\211 -\211\003\351\275\352\136\106\123\011\334\134\365\132\350\367\105 -\052\002\353\061\141\327\051\063\114\316\307\174\012\067\176\017 -\272\062\230\341\035\227\257\217\307\334\311\070\226\363\333\032 -\374\121\355\150\306\320\156\244\174\044\321\256\102\310\226\120 -\143\056\340\376\165\376\230\247\137\111\056\225\343\071\063\144 -\216\036\244\137\220\322\147\074\262\331\376\101\271\125\247\011 -\216\162\005\036\213\335\104\205\202\102\320\111\300\035\140\360 -\321\027\054\225\353\366\245\301\222\243\305\302\247\010\140\015 -\140\004\020\226\171\236\026\064\346\251\266\372\045\105\071\310 -\036\145\371\223\365\252\361\122\334\231\230\075\245\206\032\014 -\065\063\372\113\245\004\006\025\034\061\200\357\252\030\153\302 -\173\327\332\316\371\063\040\325\365\275\152\063\055\201\004\373 -\260\134\324\234\243\342\134\035\343\251\102\165\136\173\324\167 -\357\071\124\272\311\012\030\033\022\231\111\057\210\113\375\120 -\142\321\163\347\217\172\103\002\003\001\000\001\243\201\235\060 -\201\232\060\023\006\011\053\006\001\004\001\202\067\024\002\004 -\006\036\004\000\103\000\101\060\013\006\003\125\035\017\004\004 -\003\002\001\206\060\017\006\003\125\035\023\001\001\377\004\005 -\060\003\001\001\377\060\035\006\003\125\035\016\004\026\004\024 -\257\104\004\302\101\176\110\203\333\116\071\002\354\354\204\172 -\346\316\311\244\060\064\006\003\125\035\037\004\055\060\053\060 -\051\240\047\240\045\206\043\150\164\164\160\072\057\057\143\162 -\154\056\163\145\143\165\162\145\164\162\165\163\164\056\143\157 -\155\057\123\107\103\101\056\143\162\154\060\020\006\011\053\006 -\001\004\001\202\067\025\001\004\003\002\001\000\060\015\006\011 -\052\206\110\206\367\015\001\001\005\005\000\003\202\001\001\000 -\143\032\010\100\175\244\136\123\015\167\330\172\256\037\015\013 -\121\026\003\357\030\174\310\343\257\152\130\223\024\140\221\262 -\204\334\210\116\276\071\212\072\363\346\202\211\135\001\067\263 -\253\044\244\025\016\222\065\132\112\104\136\116\127\372\165\316 -\037\110\316\146\364\074\100\046\222\230\154\033\356\044\106\014 -\027\263\122\245\333\245\221\221\317\067\323\157\347\047\010\072 -\116\031\037\072\247\130\134\027\317\171\077\213\344\247\323\046 -\043\235\046\017\130\151\374\107\176\262\320\215\213\223\277\051 -\117\103\151\164\166\147\113\317\007\214\346\002\367\265\341\264 -\103\265\113\055\024\237\371\334\046\015\277\246\107\164\006\330 -\210\321\072\051\060\204\316\322\071\200\142\033\250\307\127\111 -\274\152\125\121\147\025\112\276\065\007\344\325\165\230\067\171 -\060\024\333\051\235\154\305\151\314\107\125\242\060\367\314\134 -\177\302\303\230\034\153\116\026\200\353\172\170\145\105\242\000 -\032\257\014\015\125\144\064\110\270\222\271\361\264\120\051\362 -\117\043\037\332\154\254\037\104\341\335\043\170\121\133\307\026 +\060\202\002\211\060\202\002\017\240\003\002\001\002\002\020\037 +\107\257\252\142\000\160\120\124\114\001\236\233\143\231\052\060 +\012\006\010\052\206\110\316\075\004\003\003\060\201\205\061\013 +\060\011\006\003\125\004\006\023\002\107\102\061\033\060\031\006 +\003\125\004\010\023\022\107\162\145\141\164\145\162\040\115\141 +\156\143\150\145\163\164\145\162\061\020\060\016\006\003\125\004 +\007\023\007\123\141\154\146\157\162\144\061\032\060\030\006\003 +\125\004\012\023\021\103\117\115\117\104\117\040\103\101\040\114 +\151\155\151\164\145\144\061\053\060\051\006\003\125\004\003\023 +\042\103\117\115\117\104\117\040\105\103\103\040\103\145\162\164 +\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162 +\151\164\171\060\036\027\015\060\070\060\063\060\066\060\060\060 +\060\060\060\132\027\015\063\070\060\061\061\070\062\063\065\071 +\065\071\132\060\201\205\061\013\060\011\006\003\125\004\006\023 +\002\107\102\061\033\060\031\006\003\125\004\010\023\022\107\162 +\145\141\164\145\162\040\115\141\156\143\150\145\163\164\145\162 +\061\020\060\016\006\003\125\004\007\023\007\123\141\154\146\157 +\162\144\061\032\060\030\006\003\125\004\012\023\021\103\117\115 +\117\104\117\040\103\101\040\114\151\155\151\164\145\144\061\053 +\060\051\006\003\125\004\003\023\042\103\117\115\117\104\117\040 +\105\103\103\040\103\145\162\164\151\146\151\143\141\164\151\157 +\156\040\101\165\164\150\157\162\151\164\171\060\166\060\020\006 +\007\052\206\110\316\075\002\001\006\005\053\201\004\000\042\003 +\142\000\004\003\107\173\057\165\311\202\025\205\373\165\344\221 +\026\324\253\142\231\365\076\122\013\006\316\101\000\177\227\341 +\012\044\074\035\001\004\356\075\322\215\011\227\014\340\165\344 +\372\373\167\212\052\365\003\140\113\066\213\026\043\026\255\011 +\161\364\112\364\050\120\264\376\210\034\156\077\154\057\057\011 +\131\133\245\133\013\063\231\342\303\075\211\371\152\054\357\262 +\323\006\351\243\102\060\100\060\035\006\003\125\035\016\004\026 +\004\024\165\161\247\031\110\031\274\235\235\352\101\107\337\224 +\304\110\167\231\323\171\060\016\006\003\125\035\017\001\001\377 +\004\004\003\002\001\006\060\017\006\003\125\035\023\001\001\377 +\004\005\060\003\001\001\377\060\012\006\010\052\206\110\316\075 +\004\003\003\003\150\000\060\145\002\061\000\357\003\133\172\254 +\267\170\012\162\267\210\337\377\265\106\024\011\012\372\240\346 +\175\010\306\032\207\275\030\250\163\275\046\312\140\014\235\316 +\231\237\317\134\017\060\341\276\024\061\352\002\060\024\364\223 +\074\111\247\063\172\220\106\107\263\143\175\023\233\116\267\157 +\030\067\200\123\376\335\040\340\065\232\066\321\307\001\271\346 +\334\335\363\377\035\054\072\026\127\331\222\071\326 END CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for Certificate "Secure Global CA" -# Issuer: CN=Secure Global CA,O=SecureTrust Corporation,C=US -# Serial Number:07:56:22:a4:e8:d4:8a:89:4d:f4:13:c8:f0:f8:ea:a5 -# Subject: CN=Secure Global CA,O=SecureTrust Corporation,C=US -# Not Valid Before: Tue Nov 07 19:42:28 2006 -# Not Valid After : Mon Dec 31 19:52:06 2029 -# Fingerprint (MD5): CF:F4:27:0D:D4:ED:DC:65:16:49:6D:3D:DA:BF:6E:DE -# Fingerprint (SHA1): 3A:44:73:5A:E5:81:90:1F:24:86:61:46:1E:3B:9C:C4:5F:F5:3A:1B +# Trust for Certificate "COMODO ECC Certification Authority" +# Issuer: CN=COMODO ECC Certification Authority,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB +# Serial Number:1f:47:af:aa:62:00:70:50:54:4c:01:9e:9b:63:99:2a +# Subject: CN=COMODO ECC Certification Authority,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB +# Not Valid Before: Thu Mar 06 00:00:00 2008 +# Not Valid After : Mon Jan 18 23:59:59 2038 +# Fingerprint (MD5): 7C:62:FF:74:9D:31:53:5E:68:4A:D5:78:AA:1E:BF:23 +# Fingerprint (SHA1): 9F:74:4E:9F:2B:4D:BA:EC:0F:31:2C:50:B6:56:3B:8E:2D:93:C3:11 CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Secure Global CA" +CKA_LABEL UTF8 "COMODO ECC Certification Authority" CKA_CERT_SHA1_HASH MULTILINE_OCTAL -\072\104\163\132\345\201\220\037\044\206\141\106\036\073\234\304 -\137\365\072\033 +\237\164\116\237\053\115\272\354\017\061\054\120\266\126\073\216 +\055\223\303\021 END CKA_CERT_MD5_HASH MULTILINE_OCTAL -\317\364\047\015\324\355\334\145\026\111\155\075\332\277\156\336 +\174\142\377\164\235\061\123\136\150\112\325\170\252\036\277\043 END CKA_ISSUER MULTILINE_OCTAL -\060\112\061\013\060\011\006\003\125\004\006\023\002\125\123\061 -\040\060\036\006\003\125\004\012\023\027\123\145\143\165\162\145 -\124\162\165\163\164\040\103\157\162\160\157\162\141\164\151\157 -\156\061\031\060\027\006\003\125\004\003\023\020\123\145\143\165 -\162\145\040\107\154\157\142\141\154\040\103\101 +\060\201\205\061\013\060\011\006\003\125\004\006\023\002\107\102 +\061\033\060\031\006\003\125\004\010\023\022\107\162\145\141\164 +\145\162\040\115\141\156\143\150\145\163\164\145\162\061\020\060 +\016\006\003\125\004\007\023\007\123\141\154\146\157\162\144\061 +\032\060\030\006\003\125\004\012\023\021\103\117\115\117\104\117 +\040\103\101\040\114\151\155\151\164\145\144\061\053\060\051\006 +\003\125\004\003\023\042\103\117\115\117\104\117\040\105\103\103 +\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101 +\165\164\150\157\162\151\164\171 END CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\020\007\126\042\244\350\324\212\211\115\364\023\310\360\370 -\352\245 +\002\020\037\107\257\252\142\000\160\120\124\114\001\236\233\143 +\231\052 END CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR @@ -5260,1142 +4744,283 @@ CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "COMODO Certification Authority" +# Certificate "OISTE WISeKey Global Root GA CA" # -# Issuer: CN=COMODO Certification Authority,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB -# Serial Number:4e:81:2d:8a:82:65:e0:0b:02:ee:3e:35:02:46:e5:3d -# Subject: CN=COMODO Certification Authority,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB -# Not Valid Before: Fri Dec 01 00:00:00 2006 -# Not Valid After : Mon Dec 31 23:59:59 2029 -# Fingerprint (MD5): 5C:48:DC:F7:42:72:EC:56:94:6D:1C:CC:71:35:80:75 -# Fingerprint (SHA1): 66:31:BF:9E:F7:4F:9E:B6:C9:D5:A6:0C:BA:6A:BE:D1:F7:BD:EF:7B +# Issuer: CN=OISTE WISeKey Global Root GA CA,OU=OISTE Foundation Endorsed,OU=Copyright (c) 2005,O=WISeKey,C=CH +# Serial Number:41:3d:72:c7:f4:6b:1f:81:43:7d:f1:d2:28:54:df:9a +# Subject: CN=OISTE WISeKey Global Root GA CA,OU=OISTE Foundation Endorsed,OU=Copyright (c) 2005,O=WISeKey,C=CH +# Not Valid Before: Sun Dec 11 16:03:44 2005 +# Not Valid After : Fri Dec 11 16:09:51 2037 +# Fingerprint (MD5): BC:6C:51:33:A7:E9:D3:66:63:54:15:72:1B:21:92:93 +# Fingerprint (SHA1): 59:22:A1:E1:5A:EA:16:35:21:F8:98:39:6A:46:46:B0:44:1B:0F:A9 CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "COMODO Certification Authority" +CKA_LABEL UTF8 "OISTE WISeKey Global Root GA CA" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL -\060\201\201\061\013\060\011\006\003\125\004\006\023\002\107\102 -\061\033\060\031\006\003\125\004\010\023\022\107\162\145\141\164 -\145\162\040\115\141\156\143\150\145\163\164\145\162\061\020\060 -\016\006\003\125\004\007\023\007\123\141\154\146\157\162\144\061 -\032\060\030\006\003\125\004\012\023\021\103\117\115\117\104\117 -\040\103\101\040\114\151\155\151\164\145\144\061\047\060\045\006 -\003\125\004\003\023\036\103\117\115\117\104\117\040\103\145\162 -\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157 -\162\151\164\171 +\060\201\212\061\013\060\011\006\003\125\004\006\023\002\103\110 +\061\020\060\016\006\003\125\004\012\023\007\127\111\123\145\113 +\145\171\061\033\060\031\006\003\125\004\013\023\022\103\157\160 +\171\162\151\147\150\164\040\050\143\051\040\062\060\060\065\061 +\042\060\040\006\003\125\004\013\023\031\117\111\123\124\105\040 +\106\157\165\156\144\141\164\151\157\156\040\105\156\144\157\162 +\163\145\144\061\050\060\046\006\003\125\004\003\023\037\117\111 +\123\124\105\040\127\111\123\145\113\145\171\040\107\154\157\142 +\141\154\040\122\157\157\164\040\107\101\040\103\101 END CKA_ID UTF8 "0" CKA_ISSUER MULTILINE_OCTAL -\060\201\201\061\013\060\011\006\003\125\004\006\023\002\107\102 -\061\033\060\031\006\003\125\004\010\023\022\107\162\145\141\164 -\145\162\040\115\141\156\143\150\145\163\164\145\162\061\020\060 -\016\006\003\125\004\007\023\007\123\141\154\146\157\162\144\061 -\032\060\030\006\003\125\004\012\023\021\103\117\115\117\104\117 -\040\103\101\040\114\151\155\151\164\145\144\061\047\060\045\006 -\003\125\004\003\023\036\103\117\115\117\104\117\040\103\145\162 -\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157 -\162\151\164\171 +\060\201\212\061\013\060\011\006\003\125\004\006\023\002\103\110 +\061\020\060\016\006\003\125\004\012\023\007\127\111\123\145\113 +\145\171\061\033\060\031\006\003\125\004\013\023\022\103\157\160 +\171\162\151\147\150\164\040\050\143\051\040\062\060\060\065\061 +\042\060\040\006\003\125\004\013\023\031\117\111\123\124\105\040 +\106\157\165\156\144\141\164\151\157\156\040\105\156\144\157\162 +\163\145\144\061\050\060\046\006\003\125\004\003\023\037\117\111 +\123\124\105\040\127\111\123\145\113\145\171\040\107\154\157\142 +\141\154\040\122\157\157\164\040\107\101\040\103\101 END CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\020\116\201\055\212\202\145\340\013\002\356\076\065\002\106 -\345\075 +\002\020\101\075\162\307\364\153\037\201\103\175\361\322\050\124 +\337\232 END CKA_VALUE MULTILINE_OCTAL -\060\202\004\035\060\202\003\005\240\003\002\001\002\002\020\116 -\201\055\212\202\145\340\013\002\356\076\065\002\106\345\075\060 +\060\202\003\361\060\202\002\331\240\003\002\001\002\002\020\101 +\075\162\307\364\153\037\201\103\175\361\322\050\124\337\232\060 \015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\201 -\201\061\013\060\011\006\003\125\004\006\023\002\107\102\061\033 -\060\031\006\003\125\004\010\023\022\107\162\145\141\164\145\162 -\040\115\141\156\143\150\145\163\164\145\162\061\020\060\016\006 -\003\125\004\007\023\007\123\141\154\146\157\162\144\061\032\060 -\030\006\003\125\004\012\023\021\103\117\115\117\104\117\040\103 -\101\040\114\151\155\151\164\145\144\061\047\060\045\006\003\125 -\004\003\023\036\103\117\115\117\104\117\040\103\145\162\164\151 -\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151 -\164\171\060\036\027\015\060\066\061\062\060\061\060\060\060\060 -\060\060\132\027\015\062\071\061\062\063\061\062\063\065\071\065 -\071\132\060\201\201\061\013\060\011\006\003\125\004\006\023\002 -\107\102\061\033\060\031\006\003\125\004\010\023\022\107\162\145 -\141\164\145\162\040\115\141\156\143\150\145\163\164\145\162\061 -\020\060\016\006\003\125\004\007\023\007\123\141\154\146\157\162 -\144\061\032\060\030\006\003\125\004\012\023\021\103\117\115\117 -\104\117\040\103\101\040\114\151\155\151\164\145\144\061\047\060 -\045\006\003\125\004\003\023\036\103\117\115\117\104\117\040\103 -\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164 -\150\157\162\151\164\171\060\202\001\042\060\015\006\011\052\206 -\110\206\367\015\001\001\001\005\000\003\202\001\017\000\060\202 -\001\012\002\202\001\001\000\320\100\213\213\162\343\221\033\367 -\121\301\033\124\004\230\323\251\277\301\346\212\135\073\207\373 -\273\210\316\015\343\057\077\006\226\360\242\051\120\231\256\333 -\073\241\127\260\164\121\161\315\355\102\221\115\101\376\251\310 -\330\152\206\167\104\273\131\146\227\120\136\264\324\054\160\104 -\317\332\067\225\102\151\074\060\304\161\263\122\360\041\115\241 -\330\272\071\174\034\236\243\044\235\362\203\026\230\252\026\174 -\103\233\025\133\267\256\064\221\376\324\142\046\030\106\232\077 -\353\301\371\361\220\127\353\254\172\015\213\333\162\060\152\146 -\325\340\106\243\160\334\150\331\377\004\110\211\167\336\265\351 -\373\147\155\101\351\274\071\275\062\331\142\002\361\261\250\075 -\156\067\234\342\057\342\323\242\046\213\306\270\125\103\210\341 -\043\076\245\322\044\071\152\107\253\000\324\241\263\251\045\376 -\015\077\247\035\272\323\121\301\013\244\332\254\070\357\125\120 -\044\005\145\106\223\064\117\055\215\255\306\324\041\031\322\216 -\312\005\141\161\007\163\107\345\212\031\022\275\004\115\316\116 -\234\245\110\254\273\046\367\002\003\001\000\001\243\201\216\060 -\201\213\060\035\006\003\125\035\016\004\026\004\024\013\130\345 -\213\306\114\025\067\244\100\251\060\251\041\276\107\066\132\126 -\377\060\016\006\003\125\035\017\001\001\377\004\004\003\002\001 -\006\060\017\006\003\125\035\023\001\001\377\004\005\060\003\001 -\001\377\060\111\006\003\125\035\037\004\102\060\100\060\076\240 -\074\240\072\206\070\150\164\164\160\072\057\057\143\162\154\056 -\143\157\155\157\144\157\143\141\056\143\157\155\057\103\117\115 -\117\104\117\103\145\162\164\151\146\151\143\141\164\151\157\156 -\101\165\164\150\157\162\151\164\171\056\143\162\154\060\015\006 -\011\052\206\110\206\367\015\001\001\005\005\000\003\202\001\001 -\000\076\230\236\233\366\033\351\327\071\267\170\256\035\162\030 -\111\323\207\344\103\202\353\077\311\252\365\250\265\357\125\174 -\041\122\145\371\325\015\341\154\364\076\214\223\163\221\056\002 -\304\116\007\161\157\300\217\070\141\010\250\036\201\012\300\057 -\040\057\101\213\221\334\110\105\274\361\306\336\272\166\153\063 -\310\000\055\061\106\114\355\347\235\317\210\224\377\063\300\126 -\350\044\206\046\270\330\070\070\337\052\153\335\022\314\307\077 -\107\027\114\242\302\006\226\011\326\333\376\077\074\106\101\337 -\130\342\126\017\074\073\301\034\223\065\331\070\122\254\356\310 -\354\056\060\116\224\065\264\044\037\113\170\151\332\362\002\070 -\314\225\122\223\360\160\045\131\234\040\147\304\356\371\213\127 -\141\364\222\166\175\077\204\215\125\267\350\345\254\325\361\365 -\031\126\246\132\373\220\034\257\223\353\345\034\324\147\227\135 -\004\016\276\013\203\246\027\203\271\060\022\240\305\063\025\005 -\271\015\373\307\005\166\343\330\112\215\374\064\027\243\306\041 -\050\276\060\105\061\036\307\170\276\130\141\070\254\073\342\001 -\145 -END -CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE -CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE -CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE - -# Trust for Certificate "COMODO Certification Authority" -# Issuer: CN=COMODO Certification Authority,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB -# Serial Number:4e:81:2d:8a:82:65:e0:0b:02:ee:3e:35:02:46:e5:3d -# Subject: CN=COMODO Certification Authority,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB -# Not Valid Before: Fri Dec 01 00:00:00 2006 -# Not Valid After : Mon Dec 31 23:59:59 2029 -# Fingerprint (MD5): 5C:48:DC:F7:42:72:EC:56:94:6D:1C:CC:71:35:80:75 -# Fingerprint (SHA1): 66:31:BF:9E:F7:4F:9E:B6:C9:D5:A6:0C:BA:6A:BE:D1:F7:BD:EF:7B -CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST -CKA_TOKEN CK_BBOOL CK_TRUE -CKA_PRIVATE CK_BBOOL CK_FALSE -CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "COMODO Certification Authority" -CKA_CERT_SHA1_HASH MULTILINE_OCTAL -\146\061\277\236\367\117\236\266\311\325\246\014\272\152\276\321 -\367\275\357\173 -END -CKA_CERT_MD5_HASH MULTILINE_OCTAL -\134\110\334\367\102\162\354\126\224\155\034\314\161\065\200\165 -END -CKA_ISSUER MULTILINE_OCTAL -\060\201\201\061\013\060\011\006\003\125\004\006\023\002\107\102 -\061\033\060\031\006\003\125\004\010\023\022\107\162\145\141\164 -\145\162\040\115\141\156\143\150\145\163\164\145\162\061\020\060 -\016\006\003\125\004\007\023\007\123\141\154\146\157\162\144\061 -\032\060\030\006\003\125\004\012\023\021\103\117\115\117\104\117 -\040\103\101\040\114\151\155\151\164\145\144\061\047\060\045\006 -\003\125\004\003\023\036\103\117\115\117\104\117\040\103\145\162 -\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157 -\162\151\164\171 -END -CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\020\116\201\055\212\202\145\340\013\002\356\076\065\002\106 -\345\075 -END -CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST -CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - -# -# Certificate "Network Solutions Certificate Authority" -# -# Issuer: CN=Network Solutions Certificate Authority,O=Network Solutions L.L.C.,C=US -# Serial Number:57:cb:33:6f:c2:5c:16:e6:47:16:17:e3:90:31:68:e0 -# Subject: CN=Network Solutions Certificate Authority,O=Network Solutions L.L.C.,C=US -# Not Valid Before: Fri Dec 01 00:00:00 2006 -# Not Valid After : Mon Dec 31 23:59:59 2029 -# Fingerprint (MD5): D3:F3:A6:16:C0:FA:6B:1D:59:B1:2D:96:4D:0E:11:2E -# Fingerprint (SHA1): 74:F8:A3:C3:EF:E7:B3:90:06:4B:83:90:3C:21:64:60:20:E5:DF:CE -CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE -CKA_TOKEN CK_BBOOL CK_TRUE -CKA_PRIVATE CK_BBOOL CK_FALSE -CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Network Solutions Certificate Authority" -CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 -CKA_SUBJECT MULTILINE_OCTAL -\060\142\061\013\060\011\006\003\125\004\006\023\002\125\123\061 -\041\060\037\006\003\125\004\012\023\030\116\145\164\167\157\162 -\153\040\123\157\154\165\164\151\157\156\163\040\114\056\114\056 -\103\056\061\060\060\056\006\003\125\004\003\023\047\116\145\164 -\167\157\162\153\040\123\157\154\165\164\151\157\156\163\040\103 -\145\162\164\151\146\151\143\141\164\145\040\101\165\164\150\157 -\162\151\164\171 -END -CKA_ID UTF8 "0" -CKA_ISSUER MULTILINE_OCTAL -\060\142\061\013\060\011\006\003\125\004\006\023\002\125\123\061 -\041\060\037\006\003\125\004\012\023\030\116\145\164\167\157\162 -\153\040\123\157\154\165\164\151\157\156\163\040\114\056\114\056 -\103\056\061\060\060\056\006\003\125\004\003\023\047\116\145\164 -\167\157\162\153\040\123\157\154\165\164\151\157\156\163\040\103 -\145\162\164\151\146\151\143\141\164\145\040\101\165\164\150\157 -\162\151\164\171 -END -CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\020\127\313\063\157\302\134\026\346\107\026\027\343\220\061 -\150\340 -END -CKA_VALUE MULTILINE_OCTAL -\060\202\003\346\060\202\002\316\240\003\002\001\002\002\020\127 -\313\063\157\302\134\026\346\107\026\027\343\220\061\150\340\060 -\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\142 -\061\013\060\011\006\003\125\004\006\023\002\125\123\061\041\060 -\037\006\003\125\004\012\023\030\116\145\164\167\157\162\153\040 -\123\157\154\165\164\151\157\156\163\040\114\056\114\056\103\056 -\061\060\060\056\006\003\125\004\003\023\047\116\145\164\167\157 -\162\153\040\123\157\154\165\164\151\157\156\163\040\103\145\162 -\164\151\146\151\143\141\164\145\040\101\165\164\150\157\162\151 -\164\171\060\036\027\015\060\066\061\062\060\061\060\060\060\060 -\060\060\132\027\015\062\071\061\062\063\061\062\063\065\071\065 -\071\132\060\142\061\013\060\011\006\003\125\004\006\023\002\125 -\123\061\041\060\037\006\003\125\004\012\023\030\116\145\164\167 -\157\162\153\040\123\157\154\165\164\151\157\156\163\040\114\056 -\114\056\103\056\061\060\060\056\006\003\125\004\003\023\047\116 -\145\164\167\157\162\153\040\123\157\154\165\164\151\157\156\163 -\040\103\145\162\164\151\146\151\143\141\164\145\040\101\165\164 -\150\157\162\151\164\171\060\202\001\042\060\015\006\011\052\206 -\110\206\367\015\001\001\001\005\000\003\202\001\017\000\060\202 -\001\012\002\202\001\001\000\344\274\176\222\060\155\306\330\216 -\053\013\274\106\316\340\047\226\336\336\371\372\022\323\074\063 -\163\263\004\057\274\161\214\345\237\266\042\140\076\137\135\316 -\011\377\202\014\033\232\121\120\032\046\211\335\325\141\135\031 -\334\022\017\055\012\242\103\135\027\320\064\222\040\352\163\317 -\070\054\006\046\011\172\162\367\372\120\062\370\302\223\323\151 -\242\043\316\101\261\314\344\325\037\066\321\212\072\370\214\143 -\342\024\131\151\355\015\323\177\153\350\270\003\345\117\152\345 -\230\143\151\110\005\276\056\377\063\266\351\227\131\151\370\147 -\031\256\223\141\226\104\025\323\162\260\077\274\152\175\354\110 -\177\215\303\253\252\161\053\123\151\101\123\064\265\260\271\305 -\006\012\304\260\105\365\101\135\156\211\105\173\075\073\046\214 -\164\302\345\322\321\175\262\021\324\373\130\062\042\232\200\311 -\334\375\014\351\177\136\003\227\316\073\000\024\207\047\160\070 -\251\216\156\263\047\166\230\121\340\005\343\041\253\032\325\205 -\042\074\051\265\232\026\305\200\250\364\273\153\060\217\057\106 -\002\242\261\014\042\340\323\002\003\001\000\001\243\201\227\060 -\201\224\060\035\006\003\125\035\016\004\026\004\024\041\060\311 -\373\000\327\116\230\332\207\252\052\320\247\056\261\100\061\247 -\114\060\016\006\003\125\035\017\001\001\377\004\004\003\002\001 -\006\060\017\006\003\125\035\023\001\001\377\004\005\060\003\001 -\001\377\060\122\006\003\125\035\037\004\113\060\111\060\107\240 -\105\240\103\206\101\150\164\164\160\072\057\057\143\162\154\056 -\156\145\164\163\157\154\163\163\154\056\143\157\155\057\116\145 -\164\167\157\162\153\123\157\154\165\164\151\157\156\163\103\145 -\162\164\151\146\151\143\141\164\145\101\165\164\150\157\162\151 -\164\171\056\143\162\154\060\015\006\011\052\206\110\206\367\015 -\001\001\005\005\000\003\202\001\001\000\273\256\113\347\267\127 -\353\177\252\055\267\163\107\205\152\301\344\245\035\344\347\074 -\351\364\131\145\167\265\172\133\132\215\045\066\340\172\227\056 -\070\300\127\140\203\230\006\203\237\271\166\172\156\120\340\272 -\210\054\374\105\314\030\260\231\225\121\016\354\035\270\210\377 -\207\120\034\202\302\343\340\062\200\277\240\013\107\310\303\061 -\357\231\147\062\200\117\027\041\171\014\151\134\336\136\064\256 -\002\265\046\352\120\337\177\030\145\054\311\362\143\341\251\007 -\376\174\161\037\153\063\044\152\036\005\367\005\150\300\152\022 -\313\056\136\141\313\256\050\323\176\302\264\146\221\046\137\074 -\056\044\137\313\130\017\353\050\354\257\021\226\363\334\173\157 -\300\247\210\362\123\167\263\140\136\256\256\050\332\065\054\157 -\064\105\323\046\341\336\354\133\117\047\153\026\174\275\104\004 -\030\202\263\211\171\027\020\161\075\172\242\026\116\365\001\315 -\244\154\145\150\241\111\166\134\103\311\330\274\066\147\154\245 -\224\265\324\314\271\275\152\065\126\041\336\330\303\353\373\313 -\244\140\114\260\125\240\240\173\127\262 -END -CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE -CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE -CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE - -# Trust for Certificate "Network Solutions Certificate Authority" -# Issuer: CN=Network Solutions Certificate Authority,O=Network Solutions L.L.C.,C=US -# Serial Number:57:cb:33:6f:c2:5c:16:e6:47:16:17:e3:90:31:68:e0 -# Subject: CN=Network Solutions Certificate Authority,O=Network Solutions L.L.C.,C=US -# Not Valid Before: Fri Dec 01 00:00:00 2006 -# Not Valid After : Mon Dec 31 23:59:59 2029 -# Fingerprint (MD5): D3:F3:A6:16:C0:FA:6B:1D:59:B1:2D:96:4D:0E:11:2E -# Fingerprint (SHA1): 74:F8:A3:C3:EF:E7:B3:90:06:4B:83:90:3C:21:64:60:20:E5:DF:CE -CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST -CKA_TOKEN CK_BBOOL CK_TRUE -CKA_PRIVATE CK_BBOOL CK_FALSE -CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Network Solutions Certificate Authority" -CKA_CERT_SHA1_HASH MULTILINE_OCTAL -\164\370\243\303\357\347\263\220\006\113\203\220\074\041\144\140 -\040\345\337\316 -END -CKA_CERT_MD5_HASH MULTILINE_OCTAL -\323\363\246\026\300\372\153\035\131\261\055\226\115\016\021\056 -END -CKA_ISSUER MULTILINE_OCTAL -\060\142\061\013\060\011\006\003\125\004\006\023\002\125\123\061 -\041\060\037\006\003\125\004\012\023\030\116\145\164\167\157\162 -\153\040\123\157\154\165\164\151\157\156\163\040\114\056\114\056 -\103\056\061\060\060\056\006\003\125\004\003\023\047\116\145\164 -\167\157\162\153\040\123\157\154\165\164\151\157\156\163\040\103 -\145\162\164\151\146\151\143\141\164\145\040\101\165\164\150\157 -\162\151\164\171 -END -CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\020\127\313\063\157\302\134\026\346\107\026\027\343\220\061 -\150\340 -END -CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST -CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST -CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - -# -# Certificate "COMODO ECC Certification Authority" -# -# Issuer: CN=COMODO ECC Certification Authority,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB -# Serial Number:1f:47:af:aa:62:00:70:50:54:4c:01:9e:9b:63:99:2a -# Subject: CN=COMODO ECC Certification Authority,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB -# Not Valid Before: Thu Mar 06 00:00:00 2008 -# Not Valid After : Mon Jan 18 23:59:59 2038 -# Fingerprint (MD5): 7C:62:FF:74:9D:31:53:5E:68:4A:D5:78:AA:1E:BF:23 -# Fingerprint (SHA1): 9F:74:4E:9F:2B:4D:BA:EC:0F:31:2C:50:B6:56:3B:8E:2D:93:C3:11 -CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE -CKA_TOKEN CK_BBOOL CK_TRUE -CKA_PRIVATE CK_BBOOL CK_FALSE -CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "COMODO ECC Certification Authority" -CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 -CKA_SUBJECT MULTILINE_OCTAL -\060\201\205\061\013\060\011\006\003\125\004\006\023\002\107\102 -\061\033\060\031\006\003\125\004\010\023\022\107\162\145\141\164 -\145\162\040\115\141\156\143\150\145\163\164\145\162\061\020\060 -\016\006\003\125\004\007\023\007\123\141\154\146\157\162\144\061 -\032\060\030\006\003\125\004\012\023\021\103\117\115\117\104\117 -\040\103\101\040\114\151\155\151\164\145\144\061\053\060\051\006 -\003\125\004\003\023\042\103\117\115\117\104\117\040\105\103\103 -\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101 -\165\164\150\157\162\151\164\171 -END -CKA_ID UTF8 "0" -CKA_ISSUER MULTILINE_OCTAL -\060\201\205\061\013\060\011\006\003\125\004\006\023\002\107\102 -\061\033\060\031\006\003\125\004\010\023\022\107\162\145\141\164 -\145\162\040\115\141\156\143\150\145\163\164\145\162\061\020\060 -\016\006\003\125\004\007\023\007\123\141\154\146\157\162\144\061 -\032\060\030\006\003\125\004\012\023\021\103\117\115\117\104\117 -\040\103\101\040\114\151\155\151\164\145\144\061\053\060\051\006 -\003\125\004\003\023\042\103\117\115\117\104\117\040\105\103\103 -\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101 -\165\164\150\157\162\151\164\171 -END -CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\020\037\107\257\252\142\000\160\120\124\114\001\236\233\143 -\231\052 -END -CKA_VALUE MULTILINE_OCTAL -\060\202\002\211\060\202\002\017\240\003\002\001\002\002\020\037 -\107\257\252\142\000\160\120\124\114\001\236\233\143\231\052\060 -\012\006\010\052\206\110\316\075\004\003\003\060\201\205\061\013 -\060\011\006\003\125\004\006\023\002\107\102\061\033\060\031\006 -\003\125\004\010\023\022\107\162\145\141\164\145\162\040\115\141 -\156\143\150\145\163\164\145\162\061\020\060\016\006\003\125\004 -\007\023\007\123\141\154\146\157\162\144\061\032\060\030\006\003 -\125\004\012\023\021\103\117\115\117\104\117\040\103\101\040\114 -\151\155\151\164\145\144\061\053\060\051\006\003\125\004\003\023 -\042\103\117\115\117\104\117\040\105\103\103\040\103\145\162\164 -\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162 -\151\164\171\060\036\027\015\060\070\060\063\060\066\060\060\060 -\060\060\060\132\027\015\063\070\060\061\061\070\062\063\065\071 -\065\071\132\060\201\205\061\013\060\011\006\003\125\004\006\023 -\002\107\102\061\033\060\031\006\003\125\004\010\023\022\107\162 -\145\141\164\145\162\040\115\141\156\143\150\145\163\164\145\162 -\061\020\060\016\006\003\125\004\007\023\007\123\141\154\146\157 -\162\144\061\032\060\030\006\003\125\004\012\023\021\103\117\115 -\117\104\117\040\103\101\040\114\151\155\151\164\145\144\061\053 -\060\051\006\003\125\004\003\023\042\103\117\115\117\104\117\040 -\105\103\103\040\103\145\162\164\151\146\151\143\141\164\151\157 -\156\040\101\165\164\150\157\162\151\164\171\060\166\060\020\006 -\007\052\206\110\316\075\002\001\006\005\053\201\004\000\042\003 -\142\000\004\003\107\173\057\165\311\202\025\205\373\165\344\221 -\026\324\253\142\231\365\076\122\013\006\316\101\000\177\227\341 -\012\044\074\035\001\004\356\075\322\215\011\227\014\340\165\344 -\372\373\167\212\052\365\003\140\113\066\213\026\043\026\255\011 -\161\364\112\364\050\120\264\376\210\034\156\077\154\057\057\011 -\131\133\245\133\013\063\231\342\303\075\211\371\152\054\357\262 -\323\006\351\243\102\060\100\060\035\006\003\125\035\016\004\026 -\004\024\165\161\247\031\110\031\274\235\235\352\101\107\337\224 -\304\110\167\231\323\171\060\016\006\003\125\035\017\001\001\377 -\004\004\003\002\001\006\060\017\006\003\125\035\023\001\001\377 -\004\005\060\003\001\001\377\060\012\006\010\052\206\110\316\075 -\004\003\003\003\150\000\060\145\002\061\000\357\003\133\172\254 -\267\170\012\162\267\210\337\377\265\106\024\011\012\372\240\346 -\175\010\306\032\207\275\030\250\163\275\046\312\140\014\235\316 -\231\237\317\134\017\060\341\276\024\061\352\002\060\024\364\223 -\074\111\247\063\172\220\106\107\263\143\175\023\233\116\267\157 -\030\067\200\123\376\335\040\340\065\232\066\321\307\001\271\346 -\334\335\363\377\035\054\072\026\127\331\222\071\326 -END -CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE -CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE -CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE - -# Trust for Certificate "COMODO ECC Certification Authority" -# Issuer: CN=COMODO ECC Certification Authority,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB -# Serial Number:1f:47:af:aa:62:00:70:50:54:4c:01:9e:9b:63:99:2a -# Subject: CN=COMODO ECC Certification Authority,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB -# Not Valid Before: Thu Mar 06 00:00:00 2008 -# Not Valid After : Mon Jan 18 23:59:59 2038 -# Fingerprint (MD5): 7C:62:FF:74:9D:31:53:5E:68:4A:D5:78:AA:1E:BF:23 -# Fingerprint (SHA1): 9F:74:4E:9F:2B:4D:BA:EC:0F:31:2C:50:B6:56:3B:8E:2D:93:C3:11 -CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST -CKA_TOKEN CK_BBOOL CK_TRUE -CKA_PRIVATE CK_BBOOL CK_FALSE -CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "COMODO ECC Certification Authority" -CKA_CERT_SHA1_HASH MULTILINE_OCTAL -\237\164\116\237\053\115\272\354\017\061\054\120\266\126\073\216 -\055\223\303\021 -END -CKA_CERT_MD5_HASH MULTILINE_OCTAL -\174\142\377\164\235\061\123\136\150\112\325\170\252\036\277\043 -END -CKA_ISSUER MULTILINE_OCTAL -\060\201\205\061\013\060\011\006\003\125\004\006\023\002\107\102 -\061\033\060\031\006\003\125\004\010\023\022\107\162\145\141\164 -\145\162\040\115\141\156\143\150\145\163\164\145\162\061\020\060 -\016\006\003\125\004\007\023\007\123\141\154\146\157\162\144\061 -\032\060\030\006\003\125\004\012\023\021\103\117\115\117\104\117 -\040\103\101\040\114\151\155\151\164\145\144\061\053\060\051\006 -\003\125\004\003\023\042\103\117\115\117\104\117\040\105\103\103 -\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101 -\165\164\150\157\162\151\164\171 -END -CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\020\037\107\257\252\142\000\160\120\124\114\001\236\233\143 -\231\052 -END -CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST -CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - -# -# Certificate "OISTE WISeKey Global Root GA CA" -# -# Issuer: CN=OISTE WISeKey Global Root GA CA,OU=OISTE Foundation Endorsed,OU=Copyright (c) 2005,O=WISeKey,C=CH -# Serial Number:41:3d:72:c7:f4:6b:1f:81:43:7d:f1:d2:28:54:df:9a -# Subject: CN=OISTE WISeKey Global Root GA CA,OU=OISTE Foundation Endorsed,OU=Copyright (c) 2005,O=WISeKey,C=CH -# Not Valid Before: Sun Dec 11 16:03:44 2005 -# Not Valid After : Fri Dec 11 16:09:51 2037 -# Fingerprint (MD5): BC:6C:51:33:A7:E9:D3:66:63:54:15:72:1B:21:92:93 -# Fingerprint (SHA1): 59:22:A1:E1:5A:EA:16:35:21:F8:98:39:6A:46:46:B0:44:1B:0F:A9 -CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE -CKA_TOKEN CK_BBOOL CK_TRUE -CKA_PRIVATE CK_BBOOL CK_FALSE -CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "OISTE WISeKey Global Root GA CA" -CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 -CKA_SUBJECT MULTILINE_OCTAL -\060\201\212\061\013\060\011\006\003\125\004\006\023\002\103\110 -\061\020\060\016\006\003\125\004\012\023\007\127\111\123\145\113 -\145\171\061\033\060\031\006\003\125\004\013\023\022\103\157\160 -\171\162\151\147\150\164\040\050\143\051\040\062\060\060\065\061 -\042\060\040\006\003\125\004\013\023\031\117\111\123\124\105\040 -\106\157\165\156\144\141\164\151\157\156\040\105\156\144\157\162 -\163\145\144\061\050\060\046\006\003\125\004\003\023\037\117\111 -\123\124\105\040\127\111\123\145\113\145\171\040\107\154\157\142 -\141\154\040\122\157\157\164\040\107\101\040\103\101 -END -CKA_ID UTF8 "0" -CKA_ISSUER MULTILINE_OCTAL -\060\201\212\061\013\060\011\006\003\125\004\006\023\002\103\110 -\061\020\060\016\006\003\125\004\012\023\007\127\111\123\145\113 -\145\171\061\033\060\031\006\003\125\004\013\023\022\103\157\160 -\171\162\151\147\150\164\040\050\143\051\040\062\060\060\065\061 -\042\060\040\006\003\125\004\013\023\031\117\111\123\124\105\040 -\106\157\165\156\144\141\164\151\157\156\040\105\156\144\157\162 -\163\145\144\061\050\060\046\006\003\125\004\003\023\037\117\111 -\123\124\105\040\127\111\123\145\113\145\171\040\107\154\157\142 -\141\154\040\122\157\157\164\040\107\101\040\103\101 -END -CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\020\101\075\162\307\364\153\037\201\103\175\361\322\050\124 -\337\232 -END -CKA_VALUE MULTILINE_OCTAL -\060\202\003\361\060\202\002\331\240\003\002\001\002\002\020\101 -\075\162\307\364\153\037\201\103\175\361\322\050\124\337\232\060 -\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\201 -\212\061\013\060\011\006\003\125\004\006\023\002\103\110\061\020 -\060\016\006\003\125\004\012\023\007\127\111\123\145\113\145\171 -\061\033\060\031\006\003\125\004\013\023\022\103\157\160\171\162 -\151\147\150\164\040\050\143\051\040\062\060\060\065\061\042\060 -\040\006\003\125\004\013\023\031\117\111\123\124\105\040\106\157 -\165\156\144\141\164\151\157\156\040\105\156\144\157\162\163\145 -\144\061\050\060\046\006\003\125\004\003\023\037\117\111\123\124 -\105\040\127\111\123\145\113\145\171\040\107\154\157\142\141\154 -\040\122\157\157\164\040\107\101\040\103\101\060\036\027\015\060 -\065\061\062\061\061\061\066\060\063\064\064\132\027\015\063\067 -\061\062\061\061\061\066\060\071\065\061\132\060\201\212\061\013 -\060\011\006\003\125\004\006\023\002\103\110\061\020\060\016\006 -\003\125\004\012\023\007\127\111\123\145\113\145\171\061\033\060 -\031\006\003\125\004\013\023\022\103\157\160\171\162\151\147\150 -\164\040\050\143\051\040\062\060\060\065\061\042\060\040\006\003 -\125\004\013\023\031\117\111\123\124\105\040\106\157\165\156\144 -\141\164\151\157\156\040\105\156\144\157\162\163\145\144\061\050 -\060\046\006\003\125\004\003\023\037\117\111\123\124\105\040\127 -\111\123\145\113\145\171\040\107\154\157\142\141\154\040\122\157 -\157\164\040\107\101\040\103\101\060\202\001\042\060\015\006\011 -\052\206\110\206\367\015\001\001\001\005\000\003\202\001\017\000 -\060\202\001\012\002\202\001\001\000\313\117\263\000\233\075\066 -\335\371\321\111\152\153\020\111\037\354\330\053\262\306\370\062 -\201\051\103\225\114\232\031\043\041\025\105\336\343\310\034\121 -\125\133\256\223\350\067\377\053\153\351\324\352\276\052\335\250 -\121\053\327\146\303\141\134\140\002\310\365\316\162\173\073\270 -\362\116\145\010\232\315\244\152\031\301\001\273\163\246\327\366 -\303\335\315\274\244\213\265\231\141\270\001\242\243\324\115\324 -\005\075\221\255\370\264\010\161\144\257\160\361\034\153\176\366 -\303\167\235\044\163\173\344\014\214\341\331\066\341\231\213\005 -\231\013\355\105\061\011\312\302\000\333\367\162\240\226\252\225 -\207\320\216\307\266\141\163\015\166\146\214\334\033\264\143\242 -\237\177\223\023\060\361\241\047\333\331\377\054\125\210\221\240 -\340\117\007\260\050\126\214\030\033\227\104\216\211\335\340\027 -\156\347\052\357\217\071\012\061\204\202\330\100\024\111\056\172 -\101\344\247\376\343\144\314\301\131\161\113\054\041\247\133\175 -\340\035\321\056\201\233\303\330\150\367\275\226\033\254\160\261 -\026\024\013\333\140\271\046\001\005\002\003\001\000\001\243\121 -\060\117\060\013\006\003\125\035\017\004\004\003\002\001\206\060 -\017\006\003\125\035\023\001\001\377\004\005\060\003\001\001\377 -\060\035\006\003\125\035\016\004\026\004\024\263\003\176\256\066 -\274\260\171\321\334\224\046\266\021\276\041\262\151\206\224\060 -\020\006\011\053\006\001\004\001\202\067\025\001\004\003\002\001 -\000\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000 -\003\202\001\001\000\113\241\377\013\207\156\263\371\301\103\261 -\110\363\050\300\035\056\311\011\101\372\224\000\034\244\244\253 -\111\117\217\075\036\357\115\157\275\274\244\366\362\046\060\311 -\020\312\035\210\373\164\031\037\205\105\275\260\154\121\371\066 -\176\333\365\114\062\072\101\117\133\107\317\350\013\055\266\304 -\031\235\164\305\107\306\073\152\017\254\024\333\074\364\163\234 -\251\005\337\000\334\164\170\372\370\065\140\131\002\023\030\174 -\274\373\115\260\040\155\103\273\140\060\172\147\063\134\305\231 -\321\370\055\071\122\163\373\214\252\227\045\134\162\331\010\036 -\253\116\074\343\201\061\237\003\246\373\300\376\051\210\125\332 -\204\325\120\003\266\342\204\243\246\066\252\021\072\001\341\030 -\113\326\104\150\263\075\371\123\164\204\263\106\221\106\226\000 -\267\200\054\266\341\343\020\342\333\242\347\050\217\001\226\142 -\026\076\000\343\034\245\066\201\030\242\114\122\166\300\021\243 -\156\346\035\272\343\132\276\066\123\305\076\165\217\206\151\051 -\130\123\265\234\273\157\237\134\305\030\354\335\057\341\230\311 -\374\276\337\012\015 -END -CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE -CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE -CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE - -# Trust for Certificate "OISTE WISeKey Global Root GA CA" -# Issuer: CN=OISTE WISeKey Global Root GA CA,OU=OISTE Foundation Endorsed,OU=Copyright (c) 2005,O=WISeKey,C=CH -# Serial Number:41:3d:72:c7:f4:6b:1f:81:43:7d:f1:d2:28:54:df:9a -# Subject: CN=OISTE WISeKey Global Root GA CA,OU=OISTE Foundation Endorsed,OU=Copyright (c) 2005,O=WISeKey,C=CH -# Not Valid Before: Sun Dec 11 16:03:44 2005 -# Not Valid After : Fri Dec 11 16:09:51 2037 -# Fingerprint (MD5): BC:6C:51:33:A7:E9:D3:66:63:54:15:72:1B:21:92:93 -# Fingerprint (SHA1): 59:22:A1:E1:5A:EA:16:35:21:F8:98:39:6A:46:46:B0:44:1B:0F:A9 -CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST -CKA_TOKEN CK_BBOOL CK_TRUE -CKA_PRIVATE CK_BBOOL CK_FALSE -CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "OISTE WISeKey Global Root GA CA" -CKA_CERT_SHA1_HASH MULTILINE_OCTAL -\131\042\241\341\132\352\026\065\041\370\230\071\152\106\106\260 -\104\033\017\251 -END -CKA_CERT_MD5_HASH MULTILINE_OCTAL -\274\154\121\063\247\351\323\146\143\124\025\162\033\041\222\223 -END -CKA_ISSUER MULTILINE_OCTAL -\060\201\212\061\013\060\011\006\003\125\004\006\023\002\103\110 -\061\020\060\016\006\003\125\004\012\023\007\127\111\123\145\113 -\145\171\061\033\060\031\006\003\125\004\013\023\022\103\157\160 -\171\162\151\147\150\164\040\050\143\051\040\062\060\060\065\061 -\042\060\040\006\003\125\004\013\023\031\117\111\123\124\105\040 -\106\157\165\156\144\141\164\151\157\156\040\105\156\144\157\162 -\163\145\144\061\050\060\046\006\003\125\004\003\023\037\117\111 -\123\124\105\040\127\111\123\145\113\145\171\040\107\154\157\142 -\141\154\040\122\157\157\164\040\107\101\040\103\101 -END -CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\020\101\075\162\307\364\153\037\201\103\175\361\322\050\124 -\337\232 -END -CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_MUST_VERIFY_TRUST -CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST -CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - -# -# Certificate "Certigna" -# -# Issuer: CN=Certigna,O=Dhimyotis,C=FR -# Serial Number:00:fe:dc:e3:01:0f:c9:48:ff -# Subject: CN=Certigna,O=Dhimyotis,C=FR -# Not Valid Before: Fri Jun 29 15:13:05 2007 -# Not Valid After : Tue Jun 29 15:13:05 2027 -# Fingerprint (MD5): AB:57:A6:5B:7D:42:82:19:B5:D8:58:26:28:5E:FD:FF -# Fingerprint (SHA1): B1:2E:13:63:45:86:A4:6F:1A:B2:60:68:37:58:2D:C4:AC:FD:94:97 -CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE -CKA_TOKEN CK_BBOOL CK_TRUE -CKA_PRIVATE CK_BBOOL CK_FALSE -CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Certigna" -CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 -CKA_SUBJECT MULTILINE_OCTAL -\060\064\061\013\060\011\006\003\125\004\006\023\002\106\122\061 -\022\060\020\006\003\125\004\012\014\011\104\150\151\155\171\157 -\164\151\163\061\021\060\017\006\003\125\004\003\014\010\103\145 -\162\164\151\147\156\141 -END -CKA_ID UTF8 "0" -CKA_ISSUER MULTILINE_OCTAL -\060\064\061\013\060\011\006\003\125\004\006\023\002\106\122\061 -\022\060\020\006\003\125\004\012\014\011\104\150\151\155\171\157 -\164\151\163\061\021\060\017\006\003\125\004\003\014\010\103\145 -\162\164\151\147\156\141 -END -CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\011\000\376\334\343\001\017\311\110\377 -END -CKA_VALUE MULTILINE_OCTAL -\060\202\003\250\060\202\002\220\240\003\002\001\002\002\011\000 -\376\334\343\001\017\311\110\377\060\015\006\011\052\206\110\206 -\367\015\001\001\005\005\000\060\064\061\013\060\011\006\003\125 -\004\006\023\002\106\122\061\022\060\020\006\003\125\004\012\014 -\011\104\150\151\155\171\157\164\151\163\061\021\060\017\006\003 -\125\004\003\014\010\103\145\162\164\151\147\156\141\060\036\027 -\015\060\067\060\066\062\071\061\065\061\063\060\065\132\027\015 -\062\067\060\066\062\071\061\065\061\063\060\065\132\060\064\061 -\013\060\011\006\003\125\004\006\023\002\106\122\061\022\060\020 -\006\003\125\004\012\014\011\104\150\151\155\171\157\164\151\163 -\061\021\060\017\006\003\125\004\003\014\010\103\145\162\164\151 -\147\156\141\060\202\001\042\060\015\006\011\052\206\110\206\367 -\015\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002 -\202\001\001\000\310\150\361\311\326\326\263\064\165\046\202\036 -\354\264\276\352\134\341\046\355\021\107\141\341\242\174\026\170 -\100\041\344\140\236\132\310\143\341\304\261\226\222\377\030\155 -\151\043\341\053\142\367\335\342\066\057\221\007\271\110\317\016 -\354\171\266\054\347\064\113\160\010\045\243\074\207\033\031\362 -\201\007\017\070\220\031\323\021\376\206\264\362\321\136\036\036 -\226\315\200\154\316\073\061\223\266\362\240\320\251\225\022\175 -\245\232\314\153\310\204\126\212\063\251\347\042\025\123\026\360 -\314\027\354\127\137\351\242\012\230\011\336\343\137\234\157\334 -\110\343\205\013\025\132\246\272\237\254\110\343\011\262\367\364 -\062\336\136\064\276\034\170\135\102\133\316\016\042\217\115\220 -\327\175\062\030\263\013\054\152\277\216\077\024\021\211\040\016 -\167\024\265\075\224\010\207\367\045\036\325\262\140\000\354\157 -\052\050\045\156\052\076\030\143\027\045\077\076\104\040\026\366 -\046\310\045\256\005\112\264\347\143\054\363\214\026\123\176\134 -\373\021\032\010\301\106\142\237\042\270\361\302\215\151\334\372 -\072\130\006\337\002\003\001\000\001\243\201\274\060\201\271\060 -\017\006\003\125\035\023\001\001\377\004\005\060\003\001\001\377 -\060\035\006\003\125\035\016\004\026\004\024\032\355\376\101\071 -\220\264\044\131\276\001\362\122\325\105\366\132\071\334\021\060 -\144\006\003\125\035\043\004\135\060\133\200\024\032\355\376\101 -\071\220\264\044\131\276\001\362\122\325\105\366\132\071\334\021 -\241\070\244\066\060\064\061\013\060\011\006\003\125\004\006\023 -\002\106\122\061\022\060\020\006\003\125\004\012\014\011\104\150 -\151\155\171\157\164\151\163\061\021\060\017\006\003\125\004\003 -\014\010\103\145\162\164\151\147\156\141\202\011\000\376\334\343 -\001\017\311\110\377\060\016\006\003\125\035\017\001\001\377\004 -\004\003\002\001\006\060\021\006\011\140\206\110\001\206\370\102 -\001\001\004\004\003\002\000\007\060\015\006\011\052\206\110\206 -\367\015\001\001\005\005\000\003\202\001\001\000\205\003\036\222 -\161\366\102\257\341\243\141\236\353\363\300\017\362\245\324\332 -\225\346\326\276\150\066\075\176\156\037\114\212\357\321\017\041 -\155\136\245\122\143\316\022\370\357\052\332\157\353\067\376\023 -\002\307\313\073\076\042\153\332\141\056\177\324\162\075\335\060 -\341\036\114\100\031\214\017\327\234\321\203\060\173\230\131\334 -\175\306\271\014\051\114\241\063\242\353\147\072\145\204\323\226 -\342\355\166\105\160\217\265\053\336\371\043\326\111\156\074\024 -\265\306\237\065\036\120\320\301\217\152\160\104\002\142\313\256 -\035\150\101\247\252\127\350\123\252\007\322\006\366\325\024\006 -\013\221\003\165\054\154\162\265\141\225\232\015\213\271\015\347 -\365\337\124\315\336\346\330\326\011\010\227\143\345\301\056\260 -\267\104\046\300\046\300\257\125\060\236\073\325\066\052\031\004 -\364\134\036\377\317\054\267\377\320\375\207\100\021\325\021\043 -\273\110\300\041\251\244\050\055\375\025\370\260\116\053\364\060 -\133\041\374\021\221\064\276\101\357\173\235\227\165\377\227\225 -\300\226\130\057\352\273\106\327\273\344\331\056 -END -CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE -CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE -CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE - -# Trust for Certificate "Certigna" -# Issuer: CN=Certigna,O=Dhimyotis,C=FR -# Serial Number:00:fe:dc:e3:01:0f:c9:48:ff -# Subject: CN=Certigna,O=Dhimyotis,C=FR -# Not Valid Before: Fri Jun 29 15:13:05 2007 -# Not Valid After : Tue Jun 29 15:13:05 2027 -# Fingerprint (MD5): AB:57:A6:5B:7D:42:82:19:B5:D8:58:26:28:5E:FD:FF -# Fingerprint (SHA1): B1:2E:13:63:45:86:A4:6F:1A:B2:60:68:37:58:2D:C4:AC:FD:94:97 -CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST -CKA_TOKEN CK_BBOOL CK_TRUE -CKA_PRIVATE CK_BBOOL CK_FALSE -CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Certigna" -CKA_CERT_SHA1_HASH MULTILINE_OCTAL -\261\056\023\143\105\206\244\157\032\262\140\150\067\130\055\304 -\254\375\224\227 -END -CKA_CERT_MD5_HASH MULTILINE_OCTAL -\253\127\246\133\175\102\202\031\265\330\130\046\050\136\375\377 -END -CKA_ISSUER MULTILINE_OCTAL -\060\064\061\013\060\011\006\003\125\004\006\023\002\106\122\061 -\022\060\020\006\003\125\004\012\014\011\104\150\151\155\171\157 -\164\151\163\061\021\060\017\006\003\125\004\003\014\010\103\145 -\162\164\151\147\156\141 -END -CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\011\000\376\334\343\001\017\311\110\377 -END -CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST -CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - -# -# Certificate "Cybertrust Global Root" -# -# Issuer: CN=Cybertrust Global Root,O="Cybertrust, Inc" -# Serial Number:04:00:00:00:00:01:0f:85:aa:2d:48 -# Subject: CN=Cybertrust Global Root,O="Cybertrust, Inc" -# Not Valid Before: Fri Dec 15 08:00:00 2006 -# Not Valid After : Wed Dec 15 08:00:00 2021 -# Fingerprint (MD5): 72:E4:4A:87:E3:69:40:80:77:EA:BC:E3:F4:FF:F0:E1 -# Fingerprint (SHA1): 5F:43:E5:B1:BF:F8:78:8C:AC:1C:C7:CA:4A:9A:C6:22:2B:CC:34:C6 -CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE -CKA_TOKEN CK_BBOOL CK_TRUE -CKA_PRIVATE CK_BBOOL CK_FALSE -CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Cybertrust Global Root" -CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 -CKA_SUBJECT MULTILINE_OCTAL -\060\073\061\030\060\026\006\003\125\004\012\023\017\103\171\142 -\145\162\164\162\165\163\164\054\040\111\156\143\061\037\060\035 -\006\003\125\004\003\023\026\103\171\142\145\162\164\162\165\163 -\164\040\107\154\157\142\141\154\040\122\157\157\164 -END -CKA_ID UTF8 "0" -CKA_ISSUER MULTILINE_OCTAL -\060\073\061\030\060\026\006\003\125\004\012\023\017\103\171\142 -\145\162\164\162\165\163\164\054\040\111\156\143\061\037\060\035 -\006\003\125\004\003\023\026\103\171\142\145\162\164\162\165\163 -\164\040\107\154\157\142\141\154\040\122\157\157\164 -END -CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\013\004\000\000\000\000\001\017\205\252\055\110 -END -CKA_VALUE MULTILINE_OCTAL -\060\202\003\241\060\202\002\211\240\003\002\001\002\002\013\004 -\000\000\000\000\001\017\205\252\055\110\060\015\006\011\052\206 -\110\206\367\015\001\001\005\005\000\060\073\061\030\060\026\006 -\003\125\004\012\023\017\103\171\142\145\162\164\162\165\163\164 -\054\040\111\156\143\061\037\060\035\006\003\125\004\003\023\026 -\103\171\142\145\162\164\162\165\163\164\040\107\154\157\142\141 -\154\040\122\157\157\164\060\036\027\015\060\066\061\062\061\065 -\060\070\060\060\060\060\132\027\015\062\061\061\062\061\065\060 -\070\060\060\060\060\132\060\073\061\030\060\026\006\003\125\004 -\012\023\017\103\171\142\145\162\164\162\165\163\164\054\040\111 -\156\143\061\037\060\035\006\003\125\004\003\023\026\103\171\142 -\145\162\164\162\165\163\164\040\107\154\157\142\141\154\040\122 -\157\157\164\060\202\001\042\060\015\006\011\052\206\110\206\367 -\015\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002 -\202\001\001\000\370\310\274\275\024\120\146\023\377\360\323\171 -\354\043\362\267\032\307\216\205\361\022\163\246\031\252\020\333 -\234\242\145\164\132\167\076\121\175\126\366\334\043\266\324\355 -\137\130\261\067\115\325\111\016\156\365\152\207\326\322\214\322 -\047\306\342\377\066\237\230\145\240\023\116\306\052\144\233\325 -\220\022\317\024\006\364\073\343\324\050\276\350\016\370\253\116 -\110\224\155\216\225\061\020\134\355\242\055\275\325\072\155\262 -\034\273\140\300\106\113\001\365\111\256\176\106\212\320\164\215 -\241\014\002\316\356\374\347\217\270\153\146\363\177\104\000\277 -\146\045\024\053\335\020\060\035\007\226\077\115\366\153\270\217 -\267\173\014\245\070\353\336\107\333\325\135\071\374\210\247\363 -\327\052\164\361\350\132\242\073\237\120\272\246\214\105\065\302 -\120\145\225\334\143\202\357\335\277\167\115\234\142\311\143\163 -\026\320\051\017\111\251\110\360\263\252\267\154\305\247\060\071 -\100\135\256\304\342\135\046\123\360\316\034\043\010\141\250\224 -\031\272\004\142\100\354\037\070\160\167\022\006\161\247\060\030 -\135\045\047\245\002\003\001\000\001\243\201\245\060\201\242\060 -\016\006\003\125\035\017\001\001\377\004\004\003\002\001\006\060 +\212\061\013\060\011\006\003\125\004\006\023\002\103\110\061\020 +\060\016\006\003\125\004\012\023\007\127\111\123\145\113\145\171 +\061\033\060\031\006\003\125\004\013\023\022\103\157\160\171\162 +\151\147\150\164\040\050\143\051\040\062\060\060\065\061\042\060 +\040\006\003\125\004\013\023\031\117\111\123\124\105\040\106\157 +\165\156\144\141\164\151\157\156\040\105\156\144\157\162\163\145 +\144\061\050\060\046\006\003\125\004\003\023\037\117\111\123\124 +\105\040\127\111\123\145\113\145\171\040\107\154\157\142\141\154 +\040\122\157\157\164\040\107\101\040\103\101\060\036\027\015\060 +\065\061\062\061\061\061\066\060\063\064\064\132\027\015\063\067 +\061\062\061\061\061\066\060\071\065\061\132\060\201\212\061\013 +\060\011\006\003\125\004\006\023\002\103\110\061\020\060\016\006 +\003\125\004\012\023\007\127\111\123\145\113\145\171\061\033\060 +\031\006\003\125\004\013\023\022\103\157\160\171\162\151\147\150 +\164\040\050\143\051\040\062\060\060\065\061\042\060\040\006\003 +\125\004\013\023\031\117\111\123\124\105\040\106\157\165\156\144 +\141\164\151\157\156\040\105\156\144\157\162\163\145\144\061\050 +\060\046\006\003\125\004\003\023\037\117\111\123\124\105\040\127 +\111\123\145\113\145\171\040\107\154\157\142\141\154\040\122\157 +\157\164\040\107\101\040\103\101\060\202\001\042\060\015\006\011 +\052\206\110\206\367\015\001\001\001\005\000\003\202\001\017\000 +\060\202\001\012\002\202\001\001\000\313\117\263\000\233\075\066 +\335\371\321\111\152\153\020\111\037\354\330\053\262\306\370\062 +\201\051\103\225\114\232\031\043\041\025\105\336\343\310\034\121 +\125\133\256\223\350\067\377\053\153\351\324\352\276\052\335\250 +\121\053\327\146\303\141\134\140\002\310\365\316\162\173\073\270 +\362\116\145\010\232\315\244\152\031\301\001\273\163\246\327\366 +\303\335\315\274\244\213\265\231\141\270\001\242\243\324\115\324 +\005\075\221\255\370\264\010\161\144\257\160\361\034\153\176\366 +\303\167\235\044\163\173\344\014\214\341\331\066\341\231\213\005 +\231\013\355\105\061\011\312\302\000\333\367\162\240\226\252\225 +\207\320\216\307\266\141\163\015\166\146\214\334\033\264\143\242 +\237\177\223\023\060\361\241\047\333\331\377\054\125\210\221\240 +\340\117\007\260\050\126\214\030\033\227\104\216\211\335\340\027 +\156\347\052\357\217\071\012\061\204\202\330\100\024\111\056\172 +\101\344\247\376\343\144\314\301\131\161\113\054\041\247\133\175 +\340\035\321\056\201\233\303\330\150\367\275\226\033\254\160\261 +\026\024\013\333\140\271\046\001\005\002\003\001\000\001\243\121 +\060\117\060\013\006\003\125\035\017\004\004\003\002\001\206\060 \017\006\003\125\035\023\001\001\377\004\005\060\003\001\001\377 -\060\035\006\003\125\035\016\004\026\004\024\266\010\173\015\172 -\314\254\040\114\206\126\062\136\317\253\156\205\055\160\127\060 -\077\006\003\125\035\037\004\070\060\066\060\064\240\062\240\060 -\206\056\150\164\164\160\072\057\057\167\167\167\062\056\160\165 -\142\154\151\143\055\164\162\165\163\164\056\143\157\155\057\143 -\162\154\057\143\164\057\143\164\162\157\157\164\056\143\162\154 -\060\037\006\003\125\035\043\004\030\060\026\200\024\266\010\173 -\015\172\314\254\040\114\206\126\062\136\317\253\156\205\055\160 -\127\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000 -\003\202\001\001\000\126\357\012\043\240\124\116\225\227\311\370 -\211\332\105\301\324\243\000\045\364\037\023\253\267\243\205\130 -\151\302\060\255\330\025\212\055\343\311\315\201\132\370\163\043 -\132\247\174\005\363\375\042\073\016\321\006\304\333\066\114\163 -\004\216\345\260\042\344\305\363\056\245\331\043\343\270\116\112 -\040\247\156\002\044\237\042\140\147\173\213\035\162\011\305\061 -\134\351\171\237\200\107\075\255\241\013\007\024\075\107\377\003 -\151\032\014\013\104\347\143\045\247\177\262\311\270\166\204\355 -\043\366\175\007\253\105\176\323\337\263\277\351\212\266\315\250 -\242\147\053\122\325\267\145\360\071\114\143\240\221\171\223\122 -\017\124\335\203\273\237\321\217\247\123\163\303\313\377\060\354 -\174\004\270\330\104\037\223\137\161\011\042\267\156\076\352\034 -\003\116\235\032\040\141\373\201\067\354\136\374\012\105\253\327 -\347\027\125\320\240\352\140\233\246\366\343\214\133\051\302\006 -\140\024\235\055\227\114\251\223\025\235\141\304\001\137\110\326 -\130\275\126\061\022\116\021\310\041\340\263\021\221\145\333\264 -\246\210\070\316\125 -END -CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE -CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE -CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE - -# Trust for Certificate "Cybertrust Global Root" -# Issuer: CN=Cybertrust Global Root,O="Cybertrust, Inc" -# Serial Number:04:00:00:00:00:01:0f:85:aa:2d:48 -# Subject: CN=Cybertrust Global Root,O="Cybertrust, Inc" -# Not Valid Before: Fri Dec 15 08:00:00 2006 -# Not Valid After : Wed Dec 15 08:00:00 2021 -# Fingerprint (MD5): 72:E4:4A:87:E3:69:40:80:77:EA:BC:E3:F4:FF:F0:E1 -# Fingerprint (SHA1): 5F:43:E5:B1:BF:F8:78:8C:AC:1C:C7:CA:4A:9A:C6:22:2B:CC:34:C6 -CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST -CKA_TOKEN CK_BBOOL CK_TRUE -CKA_PRIVATE CK_BBOOL CK_FALSE -CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Cybertrust Global Root" -CKA_CERT_SHA1_HASH MULTILINE_OCTAL -\137\103\345\261\277\370\170\214\254\034\307\312\112\232\306\042 -\053\314\064\306 -END -CKA_CERT_MD5_HASH MULTILINE_OCTAL -\162\344\112\207\343\151\100\200\167\352\274\343\364\377\360\341 -END -CKA_ISSUER MULTILINE_OCTAL -\060\073\061\030\060\026\006\003\125\004\012\023\017\103\171\142 -\145\162\164\162\165\163\164\054\040\111\156\143\061\037\060\035 -\006\003\125\004\003\023\026\103\171\142\145\162\164\162\165\163 -\164\040\107\154\157\142\141\154\040\122\157\157\164 -END -CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\013\004\000\000\000\000\001\017\205\252\055\110 -END -CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST -CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST -CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - -# -# Certificate "ePKI Root Certification Authority" -# -# Issuer: OU=ePKI Root Certification Authority,O="Chunghwa Telecom Co., Ltd.",C=TW -# Serial Number:15:c8:bd:65:47:5c:af:b8:97:00:5e:e4:06:d2:bc:9d -# Subject: OU=ePKI Root Certification Authority,O="Chunghwa Telecom Co., Ltd.",C=TW -# Not Valid Before: Mon Dec 20 02:31:27 2004 -# Not Valid After : Wed Dec 20 02:31:27 2034 -# Fingerprint (MD5): 1B:2E:00:CA:26:06:90:3D:AD:FE:6F:15:68:D3:6B:B3 -# Fingerprint (SHA1): 67:65:0D:F1:7E:8E:7E:5B:82:40:A4:F4:56:4B:CF:E2:3D:69:C6:F0 -CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE -CKA_TOKEN CK_BBOOL CK_TRUE -CKA_PRIVATE CK_BBOOL CK_FALSE -CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "ePKI Root Certification Authority" -CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 -CKA_SUBJECT MULTILINE_OCTAL -\060\136\061\013\060\011\006\003\125\004\006\023\002\124\127\061 -\043\060\041\006\003\125\004\012\014\032\103\150\165\156\147\150 -\167\141\040\124\145\154\145\143\157\155\040\103\157\056\054\040 -\114\164\144\056\061\052\060\050\006\003\125\004\013\014\041\145 -\120\113\111\040\122\157\157\164\040\103\145\162\164\151\146\151 -\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171 -END -CKA_ID UTF8 "0" -CKA_ISSUER MULTILINE_OCTAL -\060\136\061\013\060\011\006\003\125\004\006\023\002\124\127\061 -\043\060\041\006\003\125\004\012\014\032\103\150\165\156\147\150 -\167\141\040\124\145\154\145\143\157\155\040\103\157\056\054\040 -\114\164\144\056\061\052\060\050\006\003\125\004\013\014\041\145 -\120\113\111\040\122\157\157\164\040\103\145\162\164\151\146\151 -\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171 -END -CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\020\025\310\275\145\107\134\257\270\227\000\136\344\006\322 -\274\235 -END -CKA_VALUE MULTILINE_OCTAL -\060\202\005\260\060\202\003\230\240\003\002\001\002\002\020\025 -\310\275\145\107\134\257\270\227\000\136\344\006\322\274\235\060 -\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\136 -\061\013\060\011\006\003\125\004\006\023\002\124\127\061\043\060 -\041\006\003\125\004\012\014\032\103\150\165\156\147\150\167\141 -\040\124\145\154\145\143\157\155\040\103\157\056\054\040\114\164 -\144\056\061\052\060\050\006\003\125\004\013\014\041\145\120\113 -\111\040\122\157\157\164\040\103\145\162\164\151\146\151\143\141 -\164\151\157\156\040\101\165\164\150\157\162\151\164\171\060\036 -\027\015\060\064\061\062\062\060\060\062\063\061\062\067\132\027 -\015\063\064\061\062\062\060\060\062\063\061\062\067\132\060\136 -\061\013\060\011\006\003\125\004\006\023\002\124\127\061\043\060 -\041\006\003\125\004\012\014\032\103\150\165\156\147\150\167\141 -\040\124\145\154\145\143\157\155\040\103\157\056\054\040\114\164 -\144\056\061\052\060\050\006\003\125\004\013\014\041\145\120\113 -\111\040\122\157\157\164\040\103\145\162\164\151\146\151\143\141 -\164\151\157\156\040\101\165\164\150\157\162\151\164\171\060\202 -\002\042\060\015\006\011\052\206\110\206\367\015\001\001\001\005 -\000\003\202\002\017\000\060\202\002\012\002\202\002\001\000\341 -\045\017\356\215\333\210\063\165\147\315\255\037\175\072\116\155 -\235\323\057\024\363\143\164\313\001\041\152\067\352\204\120\007 -\113\046\133\011\103\154\041\236\152\310\325\003\365\140\151\217 -\314\360\042\344\037\347\367\152\042\061\267\054\025\362\340\376 -\000\152\103\377\207\145\306\265\032\301\247\114\155\042\160\041 -\212\061\362\227\164\211\011\022\046\034\236\312\331\022\242\225 -\074\332\351\147\277\010\240\144\343\326\102\267\105\357\227\364 -\366\365\327\265\112\025\002\130\175\230\130\113\140\274\315\327 -\015\232\023\063\123\321\141\371\172\325\327\170\263\232\063\367 -\000\206\316\035\115\224\070\257\250\354\170\121\160\212\134\020 -\203\121\041\367\021\075\064\206\136\345\110\315\227\201\202\065 -\114\031\354\145\366\153\305\005\241\356\107\023\326\263\041\047 -\224\020\012\331\044\073\272\276\104\023\106\060\077\227\074\330 -\327\327\152\356\073\070\343\053\324\227\016\271\033\347\007\111 -\177\067\052\371\167\170\317\124\355\133\106\235\243\200\016\221 -\103\301\326\133\137\024\272\237\246\215\044\107\100\131\277\162 -\070\262\066\154\067\377\231\321\135\016\131\012\253\151\367\300 -\262\004\105\172\124\000\256\276\123\366\265\347\341\370\074\243 -\061\322\251\376\041\122\144\305\246\147\360\165\007\006\224\024 -\201\125\306\047\344\001\217\027\301\152\161\327\276\113\373\224 -\130\175\176\021\063\261\102\367\142\154\030\326\317\011\150\076 -\177\154\366\036\217\142\255\245\143\333\011\247\037\042\102\101 -\036\157\231\212\076\327\371\077\100\172\171\260\245\001\222\322 -\235\075\010\025\245\020\001\055\263\062\166\250\225\015\263\172 -\232\373\007\020\170\021\157\341\217\307\272\017\045\032\164\052 -\345\034\230\101\231\337\041\207\350\225\006\152\012\263\152\107 -\166\145\366\072\317\217\142\027\031\173\012\050\315\032\322\203 -\036\041\307\054\277\276\377\141\150\267\147\033\273\170\115\215 -\316\147\345\344\301\216\267\043\146\342\235\220\165\064\230\251 -\066\053\212\232\224\271\235\354\314\212\261\370\045\211\134\132 -\266\057\214\037\155\171\044\247\122\150\303\204\065\342\146\215 -\143\016\045\115\325\031\262\346\171\067\247\042\235\124\061\002 -\003\001\000\001\243\152\060\150\060\035\006\003\125\035\016\004 -\026\004\024\036\014\367\266\147\362\341\222\046\011\105\300\125 -\071\056\167\077\102\112\242\060\014\006\003\125\035\023\004\005 -\060\003\001\001\377\060\071\006\004\147\052\007\000\004\061\060 -\057\060\055\002\001\000\060\011\006\005\053\016\003\002\032\005 -\000\060\007\006\005\147\052\003\000\000\004\024\105\260\302\307 -\012\126\174\356\133\170\014\225\371\030\123\301\246\034\330\020 -\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\003 -\202\002\001\000\011\263\203\123\131\001\076\225\111\271\361\201 -\272\371\166\040\043\265\047\140\164\324\152\231\064\136\154\000 -\123\331\237\362\246\261\044\007\104\152\052\306\245\216\170\022 -\350\107\331\130\033\023\052\136\171\233\237\012\052\147\246\045 -\077\006\151\126\163\303\212\146\110\373\051\201\127\164\006\312 -\234\352\050\350\070\147\046\053\361\325\265\077\145\223\370\066 -\135\216\215\215\100\040\207\031\352\357\047\300\075\264\071\017 -\045\173\150\120\164\125\234\014\131\175\132\075\101\224\045\122 -\010\340\107\054\025\061\031\325\277\007\125\306\273\022\265\227 -\364\137\203\205\272\161\301\331\154\201\021\166\012\012\260\277 -\202\227\367\352\075\372\372\354\055\251\050\224\073\126\335\322 -\121\056\256\300\275\010\025\214\167\122\064\226\326\233\254\323 -\035\216\141\017\065\173\233\256\071\151\013\142\140\100\040\066 -\217\257\373\066\356\055\010\112\035\270\277\233\134\370\352\245 -\033\240\163\246\330\370\156\340\063\004\137\150\252\047\207\355 -\331\301\220\234\355\275\343\152\065\257\143\337\253\030\331\272 -\346\351\112\352\120\212\017\141\223\036\342\055\031\342\060\224 -\065\222\135\016\266\007\257\031\200\217\107\220\121\113\056\115 -\335\205\342\322\012\122\012\027\232\374\032\260\120\002\345\001 -\243\143\067\041\114\104\304\233\121\231\021\016\163\234\006\217 -\124\056\247\050\136\104\071\207\126\055\067\275\205\104\224\341 -\014\113\054\234\303\222\205\064\141\313\017\270\233\112\103\122 -\376\064\072\175\270\351\051\334\166\251\310\060\370\024\161\200 -\306\036\066\110\164\042\101\134\207\202\350\030\161\213\101\211 -\104\347\176\130\133\250\270\215\023\351\247\154\303\107\355\263 -\032\235\142\256\215\202\352\224\236\335\131\020\303\255\335\342 -\115\343\061\325\307\354\350\362\260\376\222\036\026\012\032\374 -\331\363\370\047\266\311\276\035\264\154\144\220\177\364\344\304 -\133\327\067\256\102\016\335\244\032\157\174\210\124\305\026\156 -\341\172\150\056\370\072\277\015\244\074\211\073\170\247\116\143 -\203\004\041\010\147\215\362\202\111\320\133\375\261\315\017\203 -\204\324\076\040\205\367\112\075\053\234\375\052\012\011\115\352 -\201\370\021\234 +\060\035\006\003\125\035\016\004\026\004\024\263\003\176\256\066 +\274\260\171\321\334\224\046\266\021\276\041\262\151\206\224\060 +\020\006\011\053\006\001\004\001\202\067\025\001\004\003\002\001 +\000\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000 +\003\202\001\001\000\113\241\377\013\207\156\263\371\301\103\261 +\110\363\050\300\035\056\311\011\101\372\224\000\034\244\244\253 +\111\117\217\075\036\357\115\157\275\274\244\366\362\046\060\311 +\020\312\035\210\373\164\031\037\205\105\275\260\154\121\371\066 +\176\333\365\114\062\072\101\117\133\107\317\350\013\055\266\304 +\031\235\164\305\107\306\073\152\017\254\024\333\074\364\163\234 +\251\005\337\000\334\164\170\372\370\065\140\131\002\023\030\174 +\274\373\115\260\040\155\103\273\140\060\172\147\063\134\305\231 +\321\370\055\071\122\163\373\214\252\227\045\134\162\331\010\036 +\253\116\074\343\201\061\237\003\246\373\300\376\051\210\125\332 +\204\325\120\003\266\342\204\243\246\066\252\021\072\001\341\030 +\113\326\104\150\263\075\371\123\164\204\263\106\221\106\226\000 +\267\200\054\266\341\343\020\342\333\242\347\050\217\001\226\142 +\026\076\000\343\034\245\066\201\030\242\114\122\166\300\021\243 +\156\346\035\272\343\132\276\066\123\305\076\165\217\206\151\051 +\130\123\265\234\273\157\237\134\305\030\354\335\057\341\230\311 +\374\276\337\012\015 END CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for Certificate "ePKI Root Certification Authority" -# Issuer: OU=ePKI Root Certification Authority,O="Chunghwa Telecom Co., Ltd.",C=TW -# Serial Number:15:c8:bd:65:47:5c:af:b8:97:00:5e:e4:06:d2:bc:9d -# Subject: OU=ePKI Root Certification Authority,O="Chunghwa Telecom Co., Ltd.",C=TW -# Not Valid Before: Mon Dec 20 02:31:27 2004 -# Not Valid After : Wed Dec 20 02:31:27 2034 -# Fingerprint (MD5): 1B:2E:00:CA:26:06:90:3D:AD:FE:6F:15:68:D3:6B:B3 -# Fingerprint (SHA1): 67:65:0D:F1:7E:8E:7E:5B:82:40:A4:F4:56:4B:CF:E2:3D:69:C6:F0 +# Trust for Certificate "OISTE WISeKey Global Root GA CA" +# Issuer: CN=OISTE WISeKey Global Root GA CA,OU=OISTE Foundation Endorsed,OU=Copyright (c) 2005,O=WISeKey,C=CH +# Serial Number:41:3d:72:c7:f4:6b:1f:81:43:7d:f1:d2:28:54:df:9a +# Subject: CN=OISTE WISeKey Global Root GA CA,OU=OISTE Foundation Endorsed,OU=Copyright (c) 2005,O=WISeKey,C=CH +# Not Valid Before: Sun Dec 11 16:03:44 2005 +# Not Valid After : Fri Dec 11 16:09:51 2037 +# Fingerprint (MD5): BC:6C:51:33:A7:E9:D3:66:63:54:15:72:1B:21:92:93 +# Fingerprint (SHA1): 59:22:A1:E1:5A:EA:16:35:21:F8:98:39:6A:46:46:B0:44:1B:0F:A9 CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "ePKI Root Certification Authority" +CKA_LABEL UTF8 "OISTE WISeKey Global Root GA CA" CKA_CERT_SHA1_HASH MULTILINE_OCTAL -\147\145\015\361\176\216\176\133\202\100\244\364\126\113\317\342 -\075\151\306\360 +\131\042\241\341\132\352\026\065\041\370\230\071\152\106\106\260 +\104\033\017\251 END CKA_CERT_MD5_HASH MULTILINE_OCTAL -\033\056\000\312\046\006\220\075\255\376\157\025\150\323\153\263 +\274\154\121\063\247\351\323\146\143\124\025\162\033\041\222\223 END CKA_ISSUER MULTILINE_OCTAL -\060\136\061\013\060\011\006\003\125\004\006\023\002\124\127\061 -\043\060\041\006\003\125\004\012\014\032\103\150\165\156\147\150 -\167\141\040\124\145\154\145\143\157\155\040\103\157\056\054\040 -\114\164\144\056\061\052\060\050\006\003\125\004\013\014\041\145 -\120\113\111\040\122\157\157\164\040\103\145\162\164\151\146\151 -\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171 +\060\201\212\061\013\060\011\006\003\125\004\006\023\002\103\110 +\061\020\060\016\006\003\125\004\012\023\007\127\111\123\145\113 +\145\171\061\033\060\031\006\003\125\004\013\023\022\103\157\160 +\171\162\151\147\150\164\040\050\143\051\040\062\060\060\065\061 +\042\060\040\006\003\125\004\013\023\031\117\111\123\124\105\040 +\106\157\165\156\144\141\164\151\157\156\040\105\156\144\157\162 +\163\145\144\061\050\060\046\006\003\125\004\003\023\037\117\111 +\123\124\105\040\127\111\123\145\113\145\171\040\107\154\157\142 +\141\154\040\122\157\157\164\040\107\101\040\103\101 END CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\020\025\310\275\145\107\134\257\270\227\000\136\344\006\322 -\274\235 +\002\020\101\075\162\307\364\153\037\201\103\175\361\322\050\124 +\337\232 END -CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR +CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_MUST_VERIFY_TRUST CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "certSIGN ROOT CA" +# Certificate "Certigna" # -# Issuer: OU=certSIGN ROOT CA,O=certSIGN,C=RO -# Serial Number:20:06:05:16:70:02 -# Subject: OU=certSIGN ROOT CA,O=certSIGN,C=RO -# Not Valid Before: Tue Jul 04 17:20:04 2006 -# Not Valid After : Fri Jul 04 17:20:04 2031 -# Fingerprint (MD5): 18:98:C0:D6:E9:3A:FC:F9:B0:F5:0C:F7:4B:01:44:17 -# Fingerprint (SHA1): FA:B7:EE:36:97:26:62:FB:2D:B0:2A:F6:BF:03:FD:E8:7C:4B:2F:9B +# Issuer: CN=Certigna,O=Dhimyotis,C=FR +# Serial Number:00:fe:dc:e3:01:0f:c9:48:ff +# Subject: CN=Certigna,O=Dhimyotis,C=FR +# Not Valid Before: Fri Jun 29 15:13:05 2007 +# Not Valid After : Tue Jun 29 15:13:05 2027 +# Fingerprint (MD5): AB:57:A6:5B:7D:42:82:19:B5:D8:58:26:28:5E:FD:FF +# Fingerprint (SHA1): B1:2E:13:63:45:86:A4:6F:1A:B2:60:68:37:58:2D:C4:AC:FD:94:97 CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "certSIGN ROOT CA" +CKA_LABEL UTF8 "Certigna" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL -\060\073\061\013\060\011\006\003\125\004\006\023\002\122\117\061 -\021\060\017\006\003\125\004\012\023\010\143\145\162\164\123\111 -\107\116\061\031\060\027\006\003\125\004\013\023\020\143\145\162 -\164\123\111\107\116\040\122\117\117\124\040\103\101 +\060\064\061\013\060\011\006\003\125\004\006\023\002\106\122\061 +\022\060\020\006\003\125\004\012\014\011\104\150\151\155\171\157 +\164\151\163\061\021\060\017\006\003\125\004\003\014\010\103\145 +\162\164\151\147\156\141 END CKA_ID UTF8 "0" CKA_ISSUER MULTILINE_OCTAL -\060\073\061\013\060\011\006\003\125\004\006\023\002\122\117\061 -\021\060\017\006\003\125\004\012\023\010\143\145\162\164\123\111 -\107\116\061\031\060\027\006\003\125\004\013\023\020\143\145\162 -\164\123\111\107\116\040\122\117\117\124\040\103\101 +\060\064\061\013\060\011\006\003\125\004\006\023\002\106\122\061 +\022\060\020\006\003\125\004\012\014\011\104\150\151\155\171\157 +\164\151\163\061\021\060\017\006\003\125\004\003\014\010\103\145 +\162\164\151\147\156\141 END CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\006\040\006\005\026\160\002 +\002\011\000\376\334\343\001\017\311\110\377 END CKA_VALUE MULTILINE_OCTAL -\060\202\003\070\060\202\002\040\240\003\002\001\002\002\006\040 -\006\005\026\160\002\060\015\006\011\052\206\110\206\367\015\001 -\001\005\005\000\060\073\061\013\060\011\006\003\125\004\006\023 -\002\122\117\061\021\060\017\006\003\125\004\012\023\010\143\145 -\162\164\123\111\107\116\061\031\060\027\006\003\125\004\013\023 -\020\143\145\162\164\123\111\107\116\040\122\117\117\124\040\103 -\101\060\036\027\015\060\066\060\067\060\064\061\067\062\060\060 -\064\132\027\015\063\061\060\067\060\064\061\067\062\060\060\064 -\132\060\073\061\013\060\011\006\003\125\004\006\023\002\122\117 -\061\021\060\017\006\003\125\004\012\023\010\143\145\162\164\123 -\111\107\116\061\031\060\027\006\003\125\004\013\023\020\143\145 -\162\164\123\111\107\116\040\122\117\117\124\040\103\101\060\202 -\001\042\060\015\006\011\052\206\110\206\367\015\001\001\001\005 -\000\003\202\001\017\000\060\202\001\012\002\202\001\001\000\267 -\063\271\176\310\045\112\216\265\333\264\050\033\252\127\220\350 -\321\042\323\144\272\323\223\350\324\254\206\141\100\152\140\127 -\150\124\204\115\274\152\124\002\005\377\337\233\232\052\256\135 -\007\217\112\303\050\177\357\373\053\372\171\361\307\255\360\020 -\123\044\220\213\146\311\250\210\253\257\132\243\000\351\276\272 -\106\356\133\163\173\054\027\202\201\136\142\054\241\002\145\263 -\275\305\053\000\176\304\374\003\063\127\015\355\342\372\316\135 -\105\326\070\315\065\266\262\301\320\234\201\112\252\344\262\001 -\134\035\217\137\231\304\261\255\333\210\041\353\220\010\202\200 -\363\060\243\103\346\220\202\256\125\050\111\355\133\327\251\020 -\070\016\376\217\114\133\233\106\352\101\365\260\010\164\303\320 -\210\063\266\174\327\164\337\334\204\321\103\016\165\071\241\045 -\100\050\352\170\313\016\054\056\071\235\214\213\156\026\034\057 -\046\202\020\342\343\145\224\012\004\300\136\367\135\133\370\020 -\342\320\272\172\113\373\336\067\000\000\032\133\050\343\322\234 -\163\076\062\207\230\241\311\121\057\327\336\254\063\263\117\002 -\003\001\000\001\243\102\060\100\060\017\006\003\125\035\023\001 -\001\377\004\005\060\003\001\001\377\060\016\006\003\125\035\017 -\001\001\377\004\004\003\002\001\306\060\035\006\003\125\035\016 -\004\026\004\024\340\214\233\333\045\111\263\361\174\206\326\262 -\102\207\013\320\153\240\331\344\060\015\006\011\052\206\110\206 -\367\015\001\001\005\005\000\003\202\001\001\000\076\322\034\211 -\056\065\374\370\165\335\346\177\145\210\364\162\114\311\054\327 -\062\116\363\335\031\171\107\275\216\073\133\223\017\120\111\044 -\023\153\024\006\162\357\011\323\241\241\343\100\204\311\347\030 -\062\164\074\110\156\017\237\113\324\367\036\323\223\206\144\124 -\227\143\162\120\325\125\317\372\040\223\002\242\233\303\043\223 -\116\026\125\166\240\160\171\155\315\041\037\317\057\055\274\031 -\343\210\061\370\131\032\201\011\310\227\246\164\307\140\304\133 -\314\127\216\262\165\375\033\002\011\333\131\157\162\223\151\367 -\061\101\326\210\070\277\207\262\275\026\171\371\252\344\276\210 -\045\335\141\047\043\034\265\061\007\004\066\264\032\220\275\240 -\164\161\120\211\155\274\024\343\017\206\256\361\253\076\307\240 -\011\314\243\110\321\340\333\144\347\222\265\317\257\162\103\160 -\213\371\303\204\074\023\252\176\222\233\127\123\223\372\160\302 -\221\016\061\371\233\147\135\351\226\070\136\137\263\163\116\210 -\025\147\336\236\166\020\142\040\276\125\151\225\103\000\071\115 -\366\356\260\132\116\111\104\124\130\137\102\203 +\060\202\003\250\060\202\002\220\240\003\002\001\002\002\011\000 +\376\334\343\001\017\311\110\377\060\015\006\011\052\206\110\206 +\367\015\001\001\005\005\000\060\064\061\013\060\011\006\003\125 +\004\006\023\002\106\122\061\022\060\020\006\003\125\004\012\014 +\011\104\150\151\155\171\157\164\151\163\061\021\060\017\006\003 +\125\004\003\014\010\103\145\162\164\151\147\156\141\060\036\027 +\015\060\067\060\066\062\071\061\065\061\063\060\065\132\027\015 +\062\067\060\066\062\071\061\065\061\063\060\065\132\060\064\061 +\013\060\011\006\003\125\004\006\023\002\106\122\061\022\060\020 +\006\003\125\004\012\014\011\104\150\151\155\171\157\164\151\163 +\061\021\060\017\006\003\125\004\003\014\010\103\145\162\164\151 +\147\156\141\060\202\001\042\060\015\006\011\052\206\110\206\367 +\015\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002 +\202\001\001\000\310\150\361\311\326\326\263\064\165\046\202\036 +\354\264\276\352\134\341\046\355\021\107\141\341\242\174\026\170 +\100\041\344\140\236\132\310\143\341\304\261\226\222\377\030\155 +\151\043\341\053\142\367\335\342\066\057\221\007\271\110\317\016 +\354\171\266\054\347\064\113\160\010\045\243\074\207\033\031\362 +\201\007\017\070\220\031\323\021\376\206\264\362\321\136\036\036 +\226\315\200\154\316\073\061\223\266\362\240\320\251\225\022\175 +\245\232\314\153\310\204\126\212\063\251\347\042\025\123\026\360 +\314\027\354\127\137\351\242\012\230\011\336\343\137\234\157\334 +\110\343\205\013\025\132\246\272\237\254\110\343\011\262\367\364 +\062\336\136\064\276\034\170\135\102\133\316\016\042\217\115\220 +\327\175\062\030\263\013\054\152\277\216\077\024\021\211\040\016 +\167\024\265\075\224\010\207\367\045\036\325\262\140\000\354\157 +\052\050\045\156\052\076\030\143\027\045\077\076\104\040\026\366 +\046\310\045\256\005\112\264\347\143\054\363\214\026\123\176\134 +\373\021\032\010\301\106\142\237\042\270\361\302\215\151\334\372 +\072\130\006\337\002\003\001\000\001\243\201\274\060\201\271\060 +\017\006\003\125\035\023\001\001\377\004\005\060\003\001\001\377 +\060\035\006\003\125\035\016\004\026\004\024\032\355\376\101\071 +\220\264\044\131\276\001\362\122\325\105\366\132\071\334\021\060 +\144\006\003\125\035\043\004\135\060\133\200\024\032\355\376\101 +\071\220\264\044\131\276\001\362\122\325\105\366\132\071\334\021 +\241\070\244\066\060\064\061\013\060\011\006\003\125\004\006\023 +\002\106\122\061\022\060\020\006\003\125\004\012\014\011\104\150 +\151\155\171\157\164\151\163\061\021\060\017\006\003\125\004\003 +\014\010\103\145\162\164\151\147\156\141\202\011\000\376\334\343 +\001\017\311\110\377\060\016\006\003\125\035\017\001\001\377\004 +\004\003\002\001\006\060\021\006\011\140\206\110\001\206\370\102 +\001\001\004\004\003\002\000\007\060\015\006\011\052\206\110\206 +\367\015\001\001\005\005\000\003\202\001\001\000\205\003\036\222 +\161\366\102\257\341\243\141\236\353\363\300\017\362\245\324\332 +\225\346\326\276\150\066\075\176\156\037\114\212\357\321\017\041 +\155\136\245\122\143\316\022\370\357\052\332\157\353\067\376\023 +\002\307\313\073\076\042\153\332\141\056\177\324\162\075\335\060 +\341\036\114\100\031\214\017\327\234\321\203\060\173\230\131\334 +\175\306\271\014\051\114\241\063\242\353\147\072\145\204\323\226 +\342\355\166\105\160\217\265\053\336\371\043\326\111\156\074\024 +\265\306\237\065\036\120\320\301\217\152\160\104\002\142\313\256 +\035\150\101\247\252\127\350\123\252\007\322\006\366\325\024\006 +\013\221\003\165\054\154\162\265\141\225\232\015\213\271\015\347 +\365\337\124\315\336\346\330\326\011\010\227\143\345\301\056\260 +\267\104\046\300\046\300\257\125\060\236\073\325\066\052\031\004 +\364\134\036\377\317\054\267\377\320\375\207\100\021\325\021\043 +\273\110\300\041\251\244\050\055\375\025\370\260\116\053\364\060 +\133\041\374\021\221\064\276\101\357\173\235\227\165\377\227\225 +\300\226\130\057\352\273\106\327\273\344\331\056 END CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for Certificate "certSIGN ROOT CA" -# Issuer: OU=certSIGN ROOT CA,O=certSIGN,C=RO -# Serial Number:20:06:05:16:70:02 -# Subject: OU=certSIGN ROOT CA,O=certSIGN,C=RO -# Not Valid Before: Tue Jul 04 17:20:04 2006 -# Not Valid After : Fri Jul 04 17:20:04 2031 -# Fingerprint (MD5): 18:98:C0:D6:E9:3A:FC:F9:B0:F5:0C:F7:4B:01:44:17 -# Fingerprint (SHA1): FA:B7:EE:36:97:26:62:FB:2D:B0:2A:F6:BF:03:FD:E8:7C:4B:2F:9B +# Trust for Certificate "Certigna" +# Issuer: CN=Certigna,O=Dhimyotis,C=FR +# Serial Number:00:fe:dc:e3:01:0f:c9:48:ff +# Subject: CN=Certigna,O=Dhimyotis,C=FR +# Not Valid Before: Fri Jun 29 15:13:05 2007 +# Not Valid After : Tue Jun 29 15:13:05 2027 +# Fingerprint (MD5): AB:57:A6:5B:7D:42:82:19:B5:D8:58:26:28:5E:FD:FF +# Fingerprint (SHA1): B1:2E:13:63:45:86:A4:6F:1A:B2:60:68:37:58:2D:C4:AC:FD:94:97 CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "certSIGN ROOT CA" +CKA_LABEL UTF8 "Certigna" CKA_CERT_SHA1_HASH MULTILINE_OCTAL -\372\267\356\066\227\046\142\373\055\260\052\366\277\003\375\350 -\174\113\057\233 +\261\056\023\143\105\206\244\157\032\262\140\150\067\130\055\304 +\254\375\224\227 END CKA_CERT_MD5_HASH MULTILINE_OCTAL -\030\230\300\326\351\072\374\371\260\365\014\367\113\001\104\027 +\253\127\246\133\175\102\202\031\265\330\130\046\050\136\375\377 END CKA_ISSUER MULTILINE_OCTAL -\060\073\061\013\060\011\006\003\125\004\006\023\002\122\117\061 -\021\060\017\006\003\125\004\012\023\010\143\145\162\164\123\111 -\107\116\061\031\060\027\006\003\125\004\013\023\020\143\145\162 -\164\123\111\107\116\040\122\117\117\124\040\103\101 +\060\064\061\013\060\011\006\003\125\004\006\023\002\106\122\061 +\022\060\020\006\003\125\004\012\014\011\104\150\151\155\171\157 +\164\151\163\061\021\060\017\006\003\125\004\003\014\010\103\145 +\162\164\151\147\156\141 END CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\006\040\006\005\026\160\002 +\002\011\000\376\334\343\001\017\311\110\377 END CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR @@ -6403,159 +5028,130 @@ CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "GeoTrust Primary Certification Authority - G3" +# Certificate "Cybertrust Global Root" # -# Issuer: CN=GeoTrust Primary Certification Authority - G3,OU=(c) 2008 GeoTrust Inc. - For authorized use only,O=GeoTrust Inc.,C=US -# Serial Number:15:ac:6e:94:19:b2:79:4b:41:f6:27:a9:c3:18:0f:1f -# Subject: CN=GeoTrust Primary Certification Authority - G3,OU=(c) 2008 GeoTrust Inc. - For authorized use only,O=GeoTrust Inc.,C=US -# Not Valid Before: Wed Apr 02 00:00:00 2008 -# Not Valid After : Tue Dec 01 23:59:59 2037 -# Fingerprint (MD5): B5:E8:34:36:C9:10:44:58:48:70:6D:2E:83:D4:B8:05 -# Fingerprint (SHA1): 03:9E:ED:B8:0B:E7:A0:3C:69:53:89:3B:20:D2:D9:32:3A:4C:2A:FD +# Issuer: CN=Cybertrust Global Root,O="Cybertrust, Inc" +# Serial Number:04:00:00:00:00:01:0f:85:aa:2d:48 +# Subject: CN=Cybertrust Global Root,O="Cybertrust, Inc" +# Not Valid Before: Fri Dec 15 08:00:00 2006 +# Not Valid After : Wed Dec 15 08:00:00 2021 +# Fingerprint (MD5): 72:E4:4A:87:E3:69:40:80:77:EA:BC:E3:F4:FF:F0:E1 +# Fingerprint (SHA1): 5F:43:E5:B1:BF:F8:78:8C:AC:1C:C7:CA:4A:9A:C6:22:2B:CC:34:C6 CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE -CKA_TOKEN CK_BBOOL CK_TRUE -CKA_PRIVATE CK_BBOOL CK_FALSE -CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GeoTrust Primary Certification Authority - G3" -CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 -CKA_SUBJECT MULTILINE_OCTAL -\060\201\230\061\013\060\011\006\003\125\004\006\023\002\125\123 -\061\026\060\024\006\003\125\004\012\023\015\107\145\157\124\162 -\165\163\164\040\111\156\143\056\061\071\060\067\006\003\125\004 -\013\023\060\050\143\051\040\062\060\060\070\040\107\145\157\124 -\162\165\163\164\040\111\156\143\056\040\055\040\106\157\162\040 -\141\165\164\150\157\162\151\172\145\144\040\165\163\145\040\157 -\156\154\171\061\066\060\064\006\003\125\004\003\023\055\107\145 -\157\124\162\165\163\164\040\120\162\151\155\141\162\171\040\103 -\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164 -\150\157\162\151\164\171\040\055\040\107\063 +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "Cybertrust Global Root" +CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +CKA_SUBJECT MULTILINE_OCTAL +\060\073\061\030\060\026\006\003\125\004\012\023\017\103\171\142 +\145\162\164\162\165\163\164\054\040\111\156\143\061\037\060\035 +\006\003\125\004\003\023\026\103\171\142\145\162\164\162\165\163 +\164\040\107\154\157\142\141\154\040\122\157\157\164 END CKA_ID UTF8 "0" CKA_ISSUER MULTILINE_OCTAL -\060\201\230\061\013\060\011\006\003\125\004\006\023\002\125\123 -\061\026\060\024\006\003\125\004\012\023\015\107\145\157\124\162 -\165\163\164\040\111\156\143\056\061\071\060\067\006\003\125\004 -\013\023\060\050\143\051\040\062\060\060\070\040\107\145\157\124 -\162\165\163\164\040\111\156\143\056\040\055\040\106\157\162\040 -\141\165\164\150\157\162\151\172\145\144\040\165\163\145\040\157 -\156\154\171\061\066\060\064\006\003\125\004\003\023\055\107\145 -\157\124\162\165\163\164\040\120\162\151\155\141\162\171\040\103 -\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164 -\150\157\162\151\164\171\040\055\040\107\063 +\060\073\061\030\060\026\006\003\125\004\012\023\017\103\171\142 +\145\162\164\162\165\163\164\054\040\111\156\143\061\037\060\035 +\006\003\125\004\003\023\026\103\171\142\145\162\164\162\165\163 +\164\040\107\154\157\142\141\154\040\122\157\157\164 END CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\020\025\254\156\224\031\262\171\113\101\366\047\251\303\030 -\017\037 +\002\013\004\000\000\000\000\001\017\205\252\055\110 END CKA_VALUE MULTILINE_OCTAL -\060\202\003\376\060\202\002\346\240\003\002\001\002\002\020\025 -\254\156\224\031\262\171\113\101\366\047\251\303\030\017\037\060 -\015\006\011\052\206\110\206\367\015\001\001\013\005\000\060\201 -\230\061\013\060\011\006\003\125\004\006\023\002\125\123\061\026 -\060\024\006\003\125\004\012\023\015\107\145\157\124\162\165\163 -\164\040\111\156\143\056\061\071\060\067\006\003\125\004\013\023 -\060\050\143\051\040\062\060\060\070\040\107\145\157\124\162\165 -\163\164\040\111\156\143\056\040\055\040\106\157\162\040\141\165 -\164\150\157\162\151\172\145\144\040\165\163\145\040\157\156\154 -\171\061\066\060\064\006\003\125\004\003\023\055\107\145\157\124 -\162\165\163\164\040\120\162\151\155\141\162\171\040\103\145\162 -\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157 -\162\151\164\171\040\055\040\107\063\060\036\027\015\060\070\060 -\064\060\062\060\060\060\060\060\060\132\027\015\063\067\061\062 -\060\061\062\063\065\071\065\071\132\060\201\230\061\013\060\011 -\006\003\125\004\006\023\002\125\123\061\026\060\024\006\003\125 -\004\012\023\015\107\145\157\124\162\165\163\164\040\111\156\143 -\056\061\071\060\067\006\003\125\004\013\023\060\050\143\051\040 -\062\060\060\070\040\107\145\157\124\162\165\163\164\040\111\156 -\143\056\040\055\040\106\157\162\040\141\165\164\150\157\162\151 -\172\145\144\040\165\163\145\040\157\156\154\171\061\066\060\064 -\006\003\125\004\003\023\055\107\145\157\124\162\165\163\164\040 -\120\162\151\155\141\162\171\040\103\145\162\164\151\146\151\143 -\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\040 -\055\040\107\063\060\202\001\042\060\015\006\011\052\206\110\206 -\367\015\001\001\001\005\000\003\202\001\017\000\060\202\001\012 -\002\202\001\001\000\334\342\136\142\130\035\063\127\071\062\063 -\372\353\313\207\214\247\324\112\335\006\210\352\144\216\061\230 -\245\070\220\036\230\317\056\143\053\360\106\274\104\262\211\241 -\300\050\014\111\160\041\225\237\144\300\246\223\022\002\145\046 -\206\306\245\211\360\372\327\204\240\160\257\117\032\227\077\006 -\104\325\311\353\162\020\175\344\061\050\373\034\141\346\050\007 -\104\163\222\042\151\247\003\210\154\235\143\310\122\332\230\047 -\347\010\114\160\076\264\311\022\301\305\147\203\135\063\363\003 -\021\354\152\320\123\342\321\272\066\140\224\200\273\141\143\154 -\133\027\176\337\100\224\036\253\015\302\041\050\160\210\377\326 -\046\154\154\140\004\045\116\125\176\175\357\277\224\110\336\267 -\035\335\160\215\005\137\210\245\233\362\302\356\352\321\100\101 -\155\142\070\035\126\006\305\003\107\121\040\031\374\173\020\013 -\016\142\256\166\125\277\137\167\276\076\111\001\123\075\230\045 -\003\166\044\132\035\264\333\211\352\171\345\266\263\073\077\272 -\114\050\101\177\006\254\152\216\301\320\366\005\035\175\346\102 -\206\343\245\325\107\002\003\001\000\001\243\102\060\100\060\017 -\006\003\125\035\023\001\001\377\004\005\060\003\001\001\377\060 +\060\202\003\241\060\202\002\211\240\003\002\001\002\002\013\004 +\000\000\000\000\001\017\205\252\055\110\060\015\006\011\052\206 +\110\206\367\015\001\001\005\005\000\060\073\061\030\060\026\006 +\003\125\004\012\023\017\103\171\142\145\162\164\162\165\163\164 +\054\040\111\156\143\061\037\060\035\006\003\125\004\003\023\026 +\103\171\142\145\162\164\162\165\163\164\040\107\154\157\142\141 +\154\040\122\157\157\164\060\036\027\015\060\066\061\062\061\065 +\060\070\060\060\060\060\132\027\015\062\061\061\062\061\065\060 +\070\060\060\060\060\132\060\073\061\030\060\026\006\003\125\004 +\012\023\017\103\171\142\145\162\164\162\165\163\164\054\040\111 +\156\143\061\037\060\035\006\003\125\004\003\023\026\103\171\142 +\145\162\164\162\165\163\164\040\107\154\157\142\141\154\040\122 +\157\157\164\060\202\001\042\060\015\006\011\052\206\110\206\367 +\015\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002 +\202\001\001\000\370\310\274\275\024\120\146\023\377\360\323\171 +\354\043\362\267\032\307\216\205\361\022\163\246\031\252\020\333 +\234\242\145\164\132\167\076\121\175\126\366\334\043\266\324\355 +\137\130\261\067\115\325\111\016\156\365\152\207\326\322\214\322 +\047\306\342\377\066\237\230\145\240\023\116\306\052\144\233\325 +\220\022\317\024\006\364\073\343\324\050\276\350\016\370\253\116 +\110\224\155\216\225\061\020\134\355\242\055\275\325\072\155\262 +\034\273\140\300\106\113\001\365\111\256\176\106\212\320\164\215 +\241\014\002\316\356\374\347\217\270\153\146\363\177\104\000\277 +\146\045\024\053\335\020\060\035\007\226\077\115\366\153\270\217 +\267\173\014\245\070\353\336\107\333\325\135\071\374\210\247\363 +\327\052\164\361\350\132\242\073\237\120\272\246\214\105\065\302 +\120\145\225\334\143\202\357\335\277\167\115\234\142\311\143\163 +\026\320\051\017\111\251\110\360\263\252\267\154\305\247\060\071 +\100\135\256\304\342\135\046\123\360\316\034\043\010\141\250\224 +\031\272\004\142\100\354\037\070\160\167\022\006\161\247\060\030 +\135\045\047\245\002\003\001\000\001\243\201\245\060\201\242\060 \016\006\003\125\035\017\001\001\377\004\004\003\002\001\006\060 -\035\006\003\125\035\016\004\026\004\024\304\171\312\216\241\116 -\003\035\034\334\153\333\061\133\224\076\077\060\177\055\060\015 -\006\011\052\206\110\206\367\015\001\001\013\005\000\003\202\001 -\001\000\055\305\023\317\126\200\173\172\170\275\237\256\054\231 -\347\357\332\337\224\136\011\151\247\347\156\150\214\275\162\276 -\107\251\016\227\022\270\112\361\144\323\071\337\045\064\324\301 -\315\116\201\360\017\004\304\044\263\064\226\306\246\252\060\337 -\150\141\163\327\371\216\205\211\357\016\136\225\050\112\052\047 -\217\020\216\056\174\206\304\002\236\332\014\167\145\016\104\015 -\222\375\375\263\026\066\372\021\015\035\214\016\007\211\152\051 -\126\367\162\364\335\025\234\167\065\146\127\253\023\123\330\216 -\301\100\305\327\023\026\132\162\307\267\151\001\304\172\261\203 -\001\150\175\215\101\241\224\030\301\045\134\374\360\376\203\002 -\207\174\015\015\317\056\010\134\112\100\015\076\354\201\141\346 -\044\333\312\340\016\055\007\262\076\126\334\215\365\101\205\007 -\110\233\014\013\313\111\077\175\354\267\375\313\215\147\211\032 -\253\355\273\036\243\000\010\010\027\052\202\134\061\135\106\212 -\055\017\206\233\164\331\105\373\324\100\261\172\252\150\055\206 -\262\231\042\341\301\053\307\234\370\363\137\250\202\022\353\031 -\021\055 +\017\006\003\125\035\023\001\001\377\004\005\060\003\001\001\377 +\060\035\006\003\125\035\016\004\026\004\024\266\010\173\015\172 +\314\254\040\114\206\126\062\136\317\253\156\205\055\160\127\060 +\077\006\003\125\035\037\004\070\060\066\060\064\240\062\240\060 +\206\056\150\164\164\160\072\057\057\167\167\167\062\056\160\165 +\142\154\151\143\055\164\162\165\163\164\056\143\157\155\057\143 +\162\154\057\143\164\057\143\164\162\157\157\164\056\143\162\154 +\060\037\006\003\125\035\043\004\030\060\026\200\024\266\010\173 +\015\172\314\254\040\114\206\126\062\136\317\253\156\205\055\160 +\127\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000 +\003\202\001\001\000\126\357\012\043\240\124\116\225\227\311\370 +\211\332\105\301\324\243\000\045\364\037\023\253\267\243\205\130 +\151\302\060\255\330\025\212\055\343\311\315\201\132\370\163\043 +\132\247\174\005\363\375\042\073\016\321\006\304\333\066\114\163 +\004\216\345\260\042\344\305\363\056\245\331\043\343\270\116\112 +\040\247\156\002\044\237\042\140\147\173\213\035\162\011\305\061 +\134\351\171\237\200\107\075\255\241\013\007\024\075\107\377\003 +\151\032\014\013\104\347\143\045\247\177\262\311\270\166\204\355 +\043\366\175\007\253\105\176\323\337\263\277\351\212\266\315\250 +\242\147\053\122\325\267\145\360\071\114\143\240\221\171\223\122 +\017\124\335\203\273\237\321\217\247\123\163\303\313\377\060\354 +\174\004\270\330\104\037\223\137\161\011\042\267\156\076\352\034 +\003\116\235\032\040\141\373\201\067\354\136\374\012\105\253\327 +\347\027\125\320\240\352\140\233\246\366\343\214\133\051\302\006 +\140\024\235\055\227\114\251\223\025\235\141\304\001\137\110\326 +\130\275\126\061\022\116\021\310\041\340\263\021\221\145\333\264 +\246\210\070\316\125 END CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE -# For Server Distrust After: Tue Apr 30 00:00:00 2019 -CKA_NSS_SERVER_DISTRUST_AFTER MULTILINE_OCTAL -\061\071\060\064\063\060\060\060\060\060\060\060\132 -END +CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for Certificate "GeoTrust Primary Certification Authority - G3" -# Issuer: CN=GeoTrust Primary Certification Authority - G3,OU=(c) 2008 GeoTrust Inc. - For authorized use only,O=GeoTrust Inc.,C=US -# Serial Number:15:ac:6e:94:19:b2:79:4b:41:f6:27:a9:c3:18:0f:1f -# Subject: CN=GeoTrust Primary Certification Authority - G3,OU=(c) 2008 GeoTrust Inc. - For authorized use only,O=GeoTrust Inc.,C=US -# Not Valid Before: Wed Apr 02 00:00:00 2008 -# Not Valid After : Tue Dec 01 23:59:59 2037 -# Fingerprint (MD5): B5:E8:34:36:C9:10:44:58:48:70:6D:2E:83:D4:B8:05 -# Fingerprint (SHA1): 03:9E:ED:B8:0B:E7:A0:3C:69:53:89:3B:20:D2:D9:32:3A:4C:2A:FD +# Trust for Certificate "Cybertrust Global Root" +# Issuer: CN=Cybertrust Global Root,O="Cybertrust, Inc" +# Serial Number:04:00:00:00:00:01:0f:85:aa:2d:48 +# Subject: CN=Cybertrust Global Root,O="Cybertrust, Inc" +# Not Valid Before: Fri Dec 15 08:00:00 2006 +# Not Valid After : Wed Dec 15 08:00:00 2021 +# Fingerprint (MD5): 72:E4:4A:87:E3:69:40:80:77:EA:BC:E3:F4:FF:F0:E1 +# Fingerprint (SHA1): 5F:43:E5:B1:BF:F8:78:8C:AC:1C:C7:CA:4A:9A:C6:22:2B:CC:34:C6 CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GeoTrust Primary Certification Authority - G3" +CKA_LABEL UTF8 "Cybertrust Global Root" CKA_CERT_SHA1_HASH MULTILINE_OCTAL -\003\236\355\270\013\347\240\074\151\123\211\073\040\322\331\062 -\072\114\052\375 +\137\103\345\261\277\370\170\214\254\034\307\312\112\232\306\042 +\053\314\064\306 END CKA_CERT_MD5_HASH MULTILINE_OCTAL -\265\350\064\066\311\020\104\130\110\160\155\056\203\324\270\005 +\162\344\112\207\343\151\100\200\167\352\274\343\364\377\360\341 END CKA_ISSUER MULTILINE_OCTAL -\060\201\230\061\013\060\011\006\003\125\004\006\023\002\125\123 -\061\026\060\024\006\003\125\004\012\023\015\107\145\157\124\162 -\165\163\164\040\111\156\143\056\061\071\060\067\006\003\125\004 -\013\023\060\050\143\051\040\062\060\060\070\040\107\145\157\124 -\162\165\163\164\040\111\156\143\056\040\055\040\106\157\162\040 -\141\165\164\150\157\162\151\172\145\144\040\165\163\145\040\157 -\156\154\171\061\066\060\064\006\003\125\004\003\023\055\107\145 -\157\124\162\165\163\164\040\120\162\151\155\141\162\171\040\103 -\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164 -\150\157\162\151\164\171\040\055\040\107\063 +\060\073\061\030\060\026\006\003\125\004\012\023\017\103\171\142 +\145\162\164\162\165\163\164\054\040\111\156\143\061\037\060\035 +\006\003\125\004\003\023\026\103\171\142\145\162\164\162\165\163 +\164\040\107\154\157\142\141\154\040\122\157\157\164 END CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\020\025\254\156\224\031\262\171\113\101\366\047\251\303\030 -\017\037 +\002\013\004\000\000\000\000\001\017\205\252\055\110 END CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST @@ -6563,303 +5159,298 @@ CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "thawte Primary Root CA - G2" +# Certificate "ePKI Root Certification Authority" # -# Issuer: CN=thawte Primary Root CA - G2,OU="(c) 2007 thawte, Inc. - For authorized use only",O="thawte, Inc.",C=US -# Serial Number:35:fc:26:5c:d9:84:4f:c9:3d:26:3d:57:9b:ae:d7:56 -# Subject: CN=thawte Primary Root CA - G2,OU="(c) 2007 thawte, Inc. - For authorized use only",O="thawte, Inc.",C=US -# Not Valid Before: Mon Nov 05 00:00:00 2007 -# Not Valid After : Mon Jan 18 23:59:59 2038 -# Fingerprint (MD5): 74:9D:EA:60:24:C4:FD:22:53:3E:CC:3A:72:D9:29:4F -# Fingerprint (SHA1): AA:DB:BC:22:23:8F:C4:01:A1:27:BB:38:DD:F4:1D:DB:08:9E:F0:12 +# Issuer: OU=ePKI Root Certification Authority,O="Chunghwa Telecom Co., Ltd.",C=TW +# Serial Number:15:c8:bd:65:47:5c:af:b8:97:00:5e:e4:06:d2:bc:9d +# Subject: OU=ePKI Root Certification Authority,O="Chunghwa Telecom Co., Ltd.",C=TW +# Not Valid Before: Mon Dec 20 02:31:27 2004 +# Not Valid After : Wed Dec 20 02:31:27 2034 +# Fingerprint (MD5): 1B:2E:00:CA:26:06:90:3D:AD:FE:6F:15:68:D3:6B:B3 +# Fingerprint (SHA1): 67:65:0D:F1:7E:8E:7E:5B:82:40:A4:F4:56:4B:CF:E2:3D:69:C6:F0 CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "thawte Primary Root CA - G2" +CKA_LABEL UTF8 "ePKI Root Certification Authority" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL -\060\201\204\061\013\060\011\006\003\125\004\006\023\002\125\123 -\061\025\060\023\006\003\125\004\012\023\014\164\150\141\167\164 -\145\054\040\111\156\143\056\061\070\060\066\006\003\125\004\013 -\023\057\050\143\051\040\062\060\060\067\040\164\150\141\167\164 -\145\054\040\111\156\143\056\040\055\040\106\157\162\040\141\165 -\164\150\157\162\151\172\145\144\040\165\163\145\040\157\156\154 -\171\061\044\060\042\006\003\125\004\003\023\033\164\150\141\167 -\164\145\040\120\162\151\155\141\162\171\040\122\157\157\164\040 -\103\101\040\055\040\107\062 +\060\136\061\013\060\011\006\003\125\004\006\023\002\124\127\061 +\043\060\041\006\003\125\004\012\014\032\103\150\165\156\147\150 +\167\141\040\124\145\154\145\143\157\155\040\103\157\056\054\040 +\114\164\144\056\061\052\060\050\006\003\125\004\013\014\041\145 +\120\113\111\040\122\157\157\164\040\103\145\162\164\151\146\151 +\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171 END CKA_ID UTF8 "0" CKA_ISSUER MULTILINE_OCTAL -\060\201\204\061\013\060\011\006\003\125\004\006\023\002\125\123 -\061\025\060\023\006\003\125\004\012\023\014\164\150\141\167\164 -\145\054\040\111\156\143\056\061\070\060\066\006\003\125\004\013 -\023\057\050\143\051\040\062\060\060\067\040\164\150\141\167\164 -\145\054\040\111\156\143\056\040\055\040\106\157\162\040\141\165 -\164\150\157\162\151\172\145\144\040\165\163\145\040\157\156\154 -\171\061\044\060\042\006\003\125\004\003\023\033\164\150\141\167 -\164\145\040\120\162\151\155\141\162\171\040\122\157\157\164\040 -\103\101\040\055\040\107\062 +\060\136\061\013\060\011\006\003\125\004\006\023\002\124\127\061 +\043\060\041\006\003\125\004\012\014\032\103\150\165\156\147\150 +\167\141\040\124\145\154\145\143\157\155\040\103\157\056\054\040 +\114\164\144\056\061\052\060\050\006\003\125\004\013\014\041\145 +\120\113\111\040\122\157\157\164\040\103\145\162\164\151\146\151 +\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171 END CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\020\065\374\046\134\331\204\117\311\075\046\075\127\233\256 -\327\126 +\002\020\025\310\275\145\107\134\257\270\227\000\136\344\006\322 +\274\235 END CKA_VALUE MULTILINE_OCTAL -\060\202\002\210\060\202\002\015\240\003\002\001\002\002\020\065 -\374\046\134\331\204\117\311\075\046\075\127\233\256\327\126\060 -\012\006\010\052\206\110\316\075\004\003\003\060\201\204\061\013 -\060\011\006\003\125\004\006\023\002\125\123\061\025\060\023\006 -\003\125\004\012\023\014\164\150\141\167\164\145\054\040\111\156 -\143\056\061\070\060\066\006\003\125\004\013\023\057\050\143\051 -\040\062\060\060\067\040\164\150\141\167\164\145\054\040\111\156 -\143\056\040\055\040\106\157\162\040\141\165\164\150\157\162\151 -\172\145\144\040\165\163\145\040\157\156\154\171\061\044\060\042 -\006\003\125\004\003\023\033\164\150\141\167\164\145\040\120\162 -\151\155\141\162\171\040\122\157\157\164\040\103\101\040\055\040 -\107\062\060\036\027\015\060\067\061\061\060\065\060\060\060\060 -\060\060\132\027\015\063\070\060\061\061\070\062\063\065\071\065 -\071\132\060\201\204\061\013\060\011\006\003\125\004\006\023\002 -\125\123\061\025\060\023\006\003\125\004\012\023\014\164\150\141 -\167\164\145\054\040\111\156\143\056\061\070\060\066\006\003\125 -\004\013\023\057\050\143\051\040\062\060\060\067\040\164\150\141 -\167\164\145\054\040\111\156\143\056\040\055\040\106\157\162\040 -\141\165\164\150\157\162\151\172\145\144\040\165\163\145\040\157 -\156\154\171\061\044\060\042\006\003\125\004\003\023\033\164\150 -\141\167\164\145\040\120\162\151\155\141\162\171\040\122\157\157 -\164\040\103\101\040\055\040\107\062\060\166\060\020\006\007\052 -\206\110\316\075\002\001\006\005\053\201\004\000\042\003\142\000 -\004\242\325\234\202\173\225\235\361\122\170\207\376\212\026\277 -\005\346\337\243\002\117\015\007\306\000\121\272\014\002\122\055 -\042\244\102\071\304\376\217\352\311\301\276\324\115\377\237\172 -\236\342\261\174\232\255\247\206\011\163\207\321\347\232\343\172 -\245\252\156\373\272\263\160\300\147\210\242\065\324\243\232\261 -\375\255\302\357\061\372\250\271\363\373\010\306\221\321\373\051 -\225\243\102\060\100\060\017\006\003\125\035\023\001\001\377\004 -\005\060\003\001\001\377\060\016\006\003\125\035\017\001\001\377 -\004\004\003\002\001\006\060\035\006\003\125\035\016\004\026\004 -\024\232\330\000\060\000\347\153\177\205\030\356\213\266\316\212 -\014\370\021\341\273\060\012\006\010\052\206\110\316\075\004\003 -\003\003\151\000\060\146\002\061\000\335\370\340\127\107\133\247 -\346\012\303\275\365\200\212\227\065\015\033\211\074\124\206\167 -\050\312\241\364\171\336\265\346\070\260\360\145\160\214\177\002 -\124\302\277\377\330\241\076\331\317\002\061\000\304\215\224\374 -\334\123\322\334\235\170\026\037\025\063\043\123\122\343\132\061 -\135\235\312\256\275\023\051\104\015\047\133\250\347\150\234\022 -\367\130\077\056\162\002\127\243\217\241\024\056 +\060\202\005\260\060\202\003\230\240\003\002\001\002\002\020\025 +\310\275\145\107\134\257\270\227\000\136\344\006\322\274\235\060 +\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\136 +\061\013\060\011\006\003\125\004\006\023\002\124\127\061\043\060 +\041\006\003\125\004\012\014\032\103\150\165\156\147\150\167\141 +\040\124\145\154\145\143\157\155\040\103\157\056\054\040\114\164 +\144\056\061\052\060\050\006\003\125\004\013\014\041\145\120\113 +\111\040\122\157\157\164\040\103\145\162\164\151\146\151\143\141 +\164\151\157\156\040\101\165\164\150\157\162\151\164\171\060\036 +\027\015\060\064\061\062\062\060\060\062\063\061\062\067\132\027 +\015\063\064\061\062\062\060\060\062\063\061\062\067\132\060\136 +\061\013\060\011\006\003\125\004\006\023\002\124\127\061\043\060 +\041\006\003\125\004\012\014\032\103\150\165\156\147\150\167\141 +\040\124\145\154\145\143\157\155\040\103\157\056\054\040\114\164 +\144\056\061\052\060\050\006\003\125\004\013\014\041\145\120\113 +\111\040\122\157\157\164\040\103\145\162\164\151\146\151\143\141 +\164\151\157\156\040\101\165\164\150\157\162\151\164\171\060\202 +\002\042\060\015\006\011\052\206\110\206\367\015\001\001\001\005 +\000\003\202\002\017\000\060\202\002\012\002\202\002\001\000\341 +\045\017\356\215\333\210\063\165\147\315\255\037\175\072\116\155 +\235\323\057\024\363\143\164\313\001\041\152\067\352\204\120\007 +\113\046\133\011\103\154\041\236\152\310\325\003\365\140\151\217 +\314\360\042\344\037\347\367\152\042\061\267\054\025\362\340\376 +\000\152\103\377\207\145\306\265\032\301\247\114\155\042\160\041 +\212\061\362\227\164\211\011\022\046\034\236\312\331\022\242\225 +\074\332\351\147\277\010\240\144\343\326\102\267\105\357\227\364 +\366\365\327\265\112\025\002\130\175\230\130\113\140\274\315\327 +\015\232\023\063\123\321\141\371\172\325\327\170\263\232\063\367 +\000\206\316\035\115\224\070\257\250\354\170\121\160\212\134\020 +\203\121\041\367\021\075\064\206\136\345\110\315\227\201\202\065 +\114\031\354\145\366\153\305\005\241\356\107\023\326\263\041\047 +\224\020\012\331\044\073\272\276\104\023\106\060\077\227\074\330 +\327\327\152\356\073\070\343\053\324\227\016\271\033\347\007\111 +\177\067\052\371\167\170\317\124\355\133\106\235\243\200\016\221 +\103\301\326\133\137\024\272\237\246\215\044\107\100\131\277\162 +\070\262\066\154\067\377\231\321\135\016\131\012\253\151\367\300 +\262\004\105\172\124\000\256\276\123\366\265\347\341\370\074\243 +\061\322\251\376\041\122\144\305\246\147\360\165\007\006\224\024 +\201\125\306\047\344\001\217\027\301\152\161\327\276\113\373\224 +\130\175\176\021\063\261\102\367\142\154\030\326\317\011\150\076 +\177\154\366\036\217\142\255\245\143\333\011\247\037\042\102\101 +\036\157\231\212\076\327\371\077\100\172\171\260\245\001\222\322 +\235\075\010\025\245\020\001\055\263\062\166\250\225\015\263\172 +\232\373\007\020\170\021\157\341\217\307\272\017\045\032\164\052 +\345\034\230\101\231\337\041\207\350\225\006\152\012\263\152\107 +\166\145\366\072\317\217\142\027\031\173\012\050\315\032\322\203 +\036\041\307\054\277\276\377\141\150\267\147\033\273\170\115\215 +\316\147\345\344\301\216\267\043\146\342\235\220\165\064\230\251 +\066\053\212\232\224\271\235\354\314\212\261\370\045\211\134\132 +\266\057\214\037\155\171\044\247\122\150\303\204\065\342\146\215 +\143\016\045\115\325\031\262\346\171\067\247\042\235\124\061\002 +\003\001\000\001\243\152\060\150\060\035\006\003\125\035\016\004 +\026\004\024\036\014\367\266\147\362\341\222\046\011\105\300\125 +\071\056\167\077\102\112\242\060\014\006\003\125\035\023\004\005 +\060\003\001\001\377\060\071\006\004\147\052\007\000\004\061\060 +\057\060\055\002\001\000\060\011\006\005\053\016\003\002\032\005 +\000\060\007\006\005\147\052\003\000\000\004\024\105\260\302\307 +\012\126\174\356\133\170\014\225\371\030\123\301\246\034\330\020 +\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\003 +\202\002\001\000\011\263\203\123\131\001\076\225\111\271\361\201 +\272\371\166\040\043\265\047\140\164\324\152\231\064\136\154\000 +\123\331\237\362\246\261\044\007\104\152\052\306\245\216\170\022 +\350\107\331\130\033\023\052\136\171\233\237\012\052\147\246\045 +\077\006\151\126\163\303\212\146\110\373\051\201\127\164\006\312 +\234\352\050\350\070\147\046\053\361\325\265\077\145\223\370\066 +\135\216\215\215\100\040\207\031\352\357\047\300\075\264\071\017 +\045\173\150\120\164\125\234\014\131\175\132\075\101\224\045\122 +\010\340\107\054\025\061\031\325\277\007\125\306\273\022\265\227 +\364\137\203\205\272\161\301\331\154\201\021\166\012\012\260\277 +\202\227\367\352\075\372\372\354\055\251\050\224\073\126\335\322 +\121\056\256\300\275\010\025\214\167\122\064\226\326\233\254\323 +\035\216\141\017\065\173\233\256\071\151\013\142\140\100\040\066 +\217\257\373\066\356\055\010\112\035\270\277\233\134\370\352\245 +\033\240\163\246\330\370\156\340\063\004\137\150\252\047\207\355 +\331\301\220\234\355\275\343\152\065\257\143\337\253\030\331\272 +\346\351\112\352\120\212\017\141\223\036\342\055\031\342\060\224 +\065\222\135\016\266\007\257\031\200\217\107\220\121\113\056\115 +\335\205\342\322\012\122\012\027\232\374\032\260\120\002\345\001 +\243\143\067\041\114\104\304\233\121\231\021\016\163\234\006\217 +\124\056\247\050\136\104\071\207\126\055\067\275\205\104\224\341 +\014\113\054\234\303\222\205\064\141\313\017\270\233\112\103\122 +\376\064\072\175\270\351\051\334\166\251\310\060\370\024\161\200 +\306\036\066\110\164\042\101\134\207\202\350\030\161\213\101\211 +\104\347\176\130\133\250\270\215\023\351\247\154\303\107\355\263 +\032\235\142\256\215\202\352\224\236\335\131\020\303\255\335\342 +\115\343\061\325\307\354\350\362\260\376\222\036\026\012\032\374 +\331\363\370\047\266\311\276\035\264\154\144\220\177\364\344\304 +\133\327\067\256\102\016\335\244\032\157\174\210\124\305\026\156 +\341\172\150\056\370\072\277\015\244\074\211\073\170\247\116\143 +\203\004\041\010\147\215\362\202\111\320\133\375\261\315\017\203 +\204\324\076\040\205\367\112\075\053\234\375\052\012\011\115\352 +\201\370\021\234 END CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE -# For Server Distrust After: Sun Sep 30 00:00:00 2018 -CKA_NSS_SERVER_DISTRUST_AFTER MULTILINE_OCTAL -\061\070\060\071\063\060\060\060\060\060\060\060\132 -END +CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for Certificate "thawte Primary Root CA - G2" -# Issuer: CN=thawte Primary Root CA - G2,OU="(c) 2007 thawte, Inc. - For authorized use only",O="thawte, Inc.",C=US -# Serial Number:35:fc:26:5c:d9:84:4f:c9:3d:26:3d:57:9b:ae:d7:56 -# Subject: CN=thawte Primary Root CA - G2,OU="(c) 2007 thawte, Inc. - For authorized use only",O="thawte, Inc.",C=US -# Not Valid Before: Mon Nov 05 00:00:00 2007 -# Not Valid After : Mon Jan 18 23:59:59 2038 -# Fingerprint (MD5): 74:9D:EA:60:24:C4:FD:22:53:3E:CC:3A:72:D9:29:4F -# Fingerprint (SHA1): AA:DB:BC:22:23:8F:C4:01:A1:27:BB:38:DD:F4:1D:DB:08:9E:F0:12 +# Trust for Certificate "ePKI Root Certification Authority" +# Issuer: OU=ePKI Root Certification Authority,O="Chunghwa Telecom Co., Ltd.",C=TW +# Serial Number:15:c8:bd:65:47:5c:af:b8:97:00:5e:e4:06:d2:bc:9d +# Subject: OU=ePKI Root Certification Authority,O="Chunghwa Telecom Co., Ltd.",C=TW +# Not Valid Before: Mon Dec 20 02:31:27 2004 +# Not Valid After : Wed Dec 20 02:31:27 2034 +# Fingerprint (MD5): 1B:2E:00:CA:26:06:90:3D:AD:FE:6F:15:68:D3:6B:B3 +# Fingerprint (SHA1): 67:65:0D:F1:7E:8E:7E:5B:82:40:A4:F4:56:4B:CF:E2:3D:69:C6:F0 CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "thawte Primary Root CA - G2" +CKA_LABEL UTF8 "ePKI Root Certification Authority" CKA_CERT_SHA1_HASH MULTILINE_OCTAL -\252\333\274\042\043\217\304\001\241\047\273\070\335\364\035\333 -\010\236\360\022 +\147\145\015\361\176\216\176\133\202\100\244\364\126\113\317\342 +\075\151\306\360 END CKA_CERT_MD5_HASH MULTILINE_OCTAL -\164\235\352\140\044\304\375\042\123\076\314\072\162\331\051\117 +\033\056\000\312\046\006\220\075\255\376\157\025\150\323\153\263 END CKA_ISSUER MULTILINE_OCTAL -\060\201\204\061\013\060\011\006\003\125\004\006\023\002\125\123 -\061\025\060\023\006\003\125\004\012\023\014\164\150\141\167\164 -\145\054\040\111\156\143\056\061\070\060\066\006\003\125\004\013 -\023\057\050\143\051\040\062\060\060\067\040\164\150\141\167\164 -\145\054\040\111\156\143\056\040\055\040\106\157\162\040\141\165 -\164\150\157\162\151\172\145\144\040\165\163\145\040\157\156\154 -\171\061\044\060\042\006\003\125\004\003\023\033\164\150\141\167 -\164\145\040\120\162\151\155\141\162\171\040\122\157\157\164\040 -\103\101\040\055\040\107\062 +\060\136\061\013\060\011\006\003\125\004\006\023\002\124\127\061 +\043\060\041\006\003\125\004\012\014\032\103\150\165\156\147\150 +\167\141\040\124\145\154\145\143\157\155\040\103\157\056\054\040 +\114\164\144\056\061\052\060\050\006\003\125\004\013\014\041\145 +\120\113\111\040\122\157\157\164\040\103\145\162\164\151\146\151 +\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171 END CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\020\065\374\046\134\331\204\117\311\075\046\075\127\233\256 -\327\126 +\002\020\025\310\275\145\107\134\257\270\227\000\136\344\006\322 +\274\235 END CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST +CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "thawte Primary Root CA - G3" +# Certificate "certSIGN ROOT CA" # -# Issuer: CN=thawte Primary Root CA - G3,OU="(c) 2008 thawte, Inc. - For authorized use only",OU=Certification Services Division,O="thawte, Inc.",C=US -# Serial Number:60:01:97:b7:46:a7:ea:b4:b4:9a:d6:4b:2f:f7:90:fb -# Subject: CN=thawte Primary Root CA - G3,OU="(c) 2008 thawte, Inc. - For authorized use only",OU=Certification Services Division,O="thawte, Inc.",C=US -# Not Valid Before: Wed Apr 02 00:00:00 2008 -# Not Valid After : Tue Dec 01 23:59:59 2037 -# Fingerprint (MD5): FB:1B:5D:43:8A:94:CD:44:C6:76:F2:43:4B:47:E7:31 -# Fingerprint (SHA1): F1:8B:53:8D:1B:E9:03:B6:A6:F0:56:43:5B:17:15:89:CA:F3:6B:F2 +# Issuer: OU=certSIGN ROOT CA,O=certSIGN,C=RO +# Serial Number:20:06:05:16:70:02 +# Subject: OU=certSIGN ROOT CA,O=certSIGN,C=RO +# Not Valid Before: Tue Jul 04 17:20:04 2006 +# Not Valid After : Fri Jul 04 17:20:04 2031 +# Fingerprint (MD5): 18:98:C0:D6:E9:3A:FC:F9:B0:F5:0C:F7:4B:01:44:17 +# Fingerprint (SHA1): FA:B7:EE:36:97:26:62:FB:2D:B0:2A:F6:BF:03:FD:E8:7C:4B:2F:9B CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "thawte Primary Root CA - G3" +CKA_LABEL UTF8 "certSIGN ROOT CA" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL -\060\201\256\061\013\060\011\006\003\125\004\006\023\002\125\123 -\061\025\060\023\006\003\125\004\012\023\014\164\150\141\167\164 -\145\054\040\111\156\143\056\061\050\060\046\006\003\125\004\013 -\023\037\103\145\162\164\151\146\151\143\141\164\151\157\156\040 -\123\145\162\166\151\143\145\163\040\104\151\166\151\163\151\157 -\156\061\070\060\066\006\003\125\004\013\023\057\050\143\051\040 -\062\060\060\070\040\164\150\141\167\164\145\054\040\111\156\143 -\056\040\055\040\106\157\162\040\141\165\164\150\157\162\151\172 -\145\144\040\165\163\145\040\157\156\154\171\061\044\060\042\006 -\003\125\004\003\023\033\164\150\141\167\164\145\040\120\162\151 -\155\141\162\171\040\122\157\157\164\040\103\101\040\055\040\107 -\063 +\060\073\061\013\060\011\006\003\125\004\006\023\002\122\117\061 +\021\060\017\006\003\125\004\012\023\010\143\145\162\164\123\111 +\107\116\061\031\060\027\006\003\125\004\013\023\020\143\145\162 +\164\123\111\107\116\040\122\117\117\124\040\103\101 END CKA_ID UTF8 "0" CKA_ISSUER MULTILINE_OCTAL -\060\201\256\061\013\060\011\006\003\125\004\006\023\002\125\123 -\061\025\060\023\006\003\125\004\012\023\014\164\150\141\167\164 -\145\054\040\111\156\143\056\061\050\060\046\006\003\125\004\013 -\023\037\103\145\162\164\151\146\151\143\141\164\151\157\156\040 -\123\145\162\166\151\143\145\163\040\104\151\166\151\163\151\157 -\156\061\070\060\066\006\003\125\004\013\023\057\050\143\051\040 -\062\060\060\070\040\164\150\141\167\164\145\054\040\111\156\143 -\056\040\055\040\106\157\162\040\141\165\164\150\157\162\151\172 -\145\144\040\165\163\145\040\157\156\154\171\061\044\060\042\006 -\003\125\004\003\023\033\164\150\141\167\164\145\040\120\162\151 -\155\141\162\171\040\122\157\157\164\040\103\101\040\055\040\107 -\063 +\060\073\061\013\060\011\006\003\125\004\006\023\002\122\117\061 +\021\060\017\006\003\125\004\012\023\010\143\145\162\164\123\111 +\107\116\061\031\060\027\006\003\125\004\013\023\020\143\145\162 +\164\123\111\107\116\040\122\117\117\124\040\103\101 END CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\020\140\001\227\267\106\247\352\264\264\232\326\113\057\367 -\220\373 +\002\006\040\006\005\026\160\002 END CKA_VALUE MULTILINE_OCTAL -\060\202\004\052\060\202\003\022\240\003\002\001\002\002\020\140 -\001\227\267\106\247\352\264\264\232\326\113\057\367\220\373\060 -\015\006\011\052\206\110\206\367\015\001\001\013\005\000\060\201 -\256\061\013\060\011\006\003\125\004\006\023\002\125\123\061\025 -\060\023\006\003\125\004\012\023\014\164\150\141\167\164\145\054 -\040\111\156\143\056\061\050\060\046\006\003\125\004\013\023\037 -\103\145\162\164\151\146\151\143\141\164\151\157\156\040\123\145 -\162\166\151\143\145\163\040\104\151\166\151\163\151\157\156\061 -\070\060\066\006\003\125\004\013\023\057\050\143\051\040\062\060 -\060\070\040\164\150\141\167\164\145\054\040\111\156\143\056\040 -\055\040\106\157\162\040\141\165\164\150\157\162\151\172\145\144 -\040\165\163\145\040\157\156\154\171\061\044\060\042\006\003\125 -\004\003\023\033\164\150\141\167\164\145\040\120\162\151\155\141 -\162\171\040\122\157\157\164\040\103\101\040\055\040\107\063\060 -\036\027\015\060\070\060\064\060\062\060\060\060\060\060\060\132 -\027\015\063\067\061\062\060\061\062\063\065\071\065\071\132\060 -\201\256\061\013\060\011\006\003\125\004\006\023\002\125\123\061 -\025\060\023\006\003\125\004\012\023\014\164\150\141\167\164\145 -\054\040\111\156\143\056\061\050\060\046\006\003\125\004\013\023 -\037\103\145\162\164\151\146\151\143\141\164\151\157\156\040\123 -\145\162\166\151\143\145\163\040\104\151\166\151\163\151\157\156 -\061\070\060\066\006\003\125\004\013\023\057\050\143\051\040\062 -\060\060\070\040\164\150\141\167\164\145\054\040\111\156\143\056 -\040\055\040\106\157\162\040\141\165\164\150\157\162\151\172\145 -\144\040\165\163\145\040\157\156\154\171\061\044\060\042\006\003 -\125\004\003\023\033\164\150\141\167\164\145\040\120\162\151\155 -\141\162\171\040\122\157\157\164\040\103\101\040\055\040\107\063 -\060\202\001\042\060\015\006\011\052\206\110\206\367\015\001\001 -\001\005\000\003\202\001\017\000\060\202\001\012\002\202\001\001 -\000\262\277\047\054\373\333\330\133\335\170\173\033\236\167\146 -\201\313\076\274\174\256\363\246\047\232\064\243\150\061\161\070 -\063\142\344\363\161\146\171\261\251\145\243\245\213\325\217\140 -\055\077\102\314\252\153\062\300\043\313\054\101\335\344\337\374 -\141\234\342\163\262\042\225\021\103\030\137\304\266\037\127\154 -\012\005\130\042\310\066\114\072\174\245\321\317\206\257\210\247 -\104\002\023\164\161\163\012\102\131\002\370\033\024\153\102\337 -\157\137\272\153\202\242\235\133\347\112\275\036\001\162\333\113 -\164\350\073\177\177\175\037\004\264\046\233\340\264\132\254\107 -\075\125\270\327\260\046\122\050\001\061\100\146\330\331\044\275 -\366\052\330\354\041\111\134\233\366\172\351\177\125\065\176\226 -\153\215\223\223\047\313\222\273\352\254\100\300\237\302\370\200 -\317\135\364\132\334\316\164\206\246\076\154\013\123\312\275\222 -\316\031\006\162\346\014\134\070\151\307\004\326\274\154\316\133 -\366\367\150\234\334\045\025\110\210\241\351\251\370\230\234\340 -\363\325\061\050\141\021\154\147\226\215\071\231\313\302\105\044 -\071\002\003\001\000\001\243\102\060\100\060\017\006\003\125\035 -\023\001\001\377\004\005\060\003\001\001\377\060\016\006\003\125 -\035\017\001\001\377\004\004\003\002\001\006\060\035\006\003\125 -\035\016\004\026\004\024\255\154\252\224\140\234\355\344\377\372 -\076\012\164\053\143\003\367\266\131\277\060\015\006\011\052\206 -\110\206\367\015\001\001\013\005\000\003\202\001\001\000\032\100 -\330\225\145\254\011\222\211\306\071\364\020\345\251\016\146\123 -\135\170\336\372\044\221\273\347\104\121\337\306\026\064\012\357 -\152\104\121\352\053\007\212\003\172\303\353\077\012\054\122\026 -\240\053\103\271\045\220\077\160\251\063\045\155\105\032\050\073 -\047\317\252\303\051\102\033\337\073\114\300\063\064\133\101\210 -\277\153\053\145\257\050\357\262\365\303\252\146\316\173\126\356 -\267\310\313\147\301\311\234\032\030\270\304\303\111\003\361\140 -\016\120\315\106\305\363\167\171\367\266\025\340\070\333\307\057 -\050\240\014\077\167\046\164\331\045\022\332\061\332\032\036\334 -\051\101\221\042\074\151\247\273\002\362\266\134\047\003\211\364 -\006\352\233\344\162\202\343\241\011\301\351\000\031\323\076\324 -\160\153\272\161\246\252\130\256\364\273\351\154\266\357\207\314 -\233\273\377\071\346\126\141\323\012\247\304\134\114\140\173\005 -\167\046\172\277\330\007\122\054\142\367\160\143\331\071\274\157 -\034\302\171\334\166\051\257\316\305\054\144\004\136\210\066\156 -\061\324\100\032\142\064\066\077\065\001\256\254\143\240 +\060\202\003\070\060\202\002\040\240\003\002\001\002\002\006\040 +\006\005\026\160\002\060\015\006\011\052\206\110\206\367\015\001 +\001\005\005\000\060\073\061\013\060\011\006\003\125\004\006\023 +\002\122\117\061\021\060\017\006\003\125\004\012\023\010\143\145 +\162\164\123\111\107\116\061\031\060\027\006\003\125\004\013\023 +\020\143\145\162\164\123\111\107\116\040\122\117\117\124\040\103 +\101\060\036\027\015\060\066\060\067\060\064\061\067\062\060\060 +\064\132\027\015\063\061\060\067\060\064\061\067\062\060\060\064 +\132\060\073\061\013\060\011\006\003\125\004\006\023\002\122\117 +\061\021\060\017\006\003\125\004\012\023\010\143\145\162\164\123 +\111\107\116\061\031\060\027\006\003\125\004\013\023\020\143\145 +\162\164\123\111\107\116\040\122\117\117\124\040\103\101\060\202 +\001\042\060\015\006\011\052\206\110\206\367\015\001\001\001\005 +\000\003\202\001\017\000\060\202\001\012\002\202\001\001\000\267 +\063\271\176\310\045\112\216\265\333\264\050\033\252\127\220\350 +\321\042\323\144\272\323\223\350\324\254\206\141\100\152\140\127 +\150\124\204\115\274\152\124\002\005\377\337\233\232\052\256\135 +\007\217\112\303\050\177\357\373\053\372\171\361\307\255\360\020 +\123\044\220\213\146\311\250\210\253\257\132\243\000\351\276\272 +\106\356\133\163\173\054\027\202\201\136\142\054\241\002\145\263 +\275\305\053\000\176\304\374\003\063\127\015\355\342\372\316\135 +\105\326\070\315\065\266\262\301\320\234\201\112\252\344\262\001 +\134\035\217\137\231\304\261\255\333\210\041\353\220\010\202\200 +\363\060\243\103\346\220\202\256\125\050\111\355\133\327\251\020 +\070\016\376\217\114\133\233\106\352\101\365\260\010\164\303\320 +\210\063\266\174\327\164\337\334\204\321\103\016\165\071\241\045 +\100\050\352\170\313\016\054\056\071\235\214\213\156\026\034\057 +\046\202\020\342\343\145\224\012\004\300\136\367\135\133\370\020 +\342\320\272\172\113\373\336\067\000\000\032\133\050\343\322\234 +\163\076\062\207\230\241\311\121\057\327\336\254\063\263\117\002 +\003\001\000\001\243\102\060\100\060\017\006\003\125\035\023\001 +\001\377\004\005\060\003\001\001\377\060\016\006\003\125\035\017 +\001\001\377\004\004\003\002\001\306\060\035\006\003\125\035\016 +\004\026\004\024\340\214\233\333\045\111\263\361\174\206\326\262 +\102\207\013\320\153\240\331\344\060\015\006\011\052\206\110\206 +\367\015\001\001\005\005\000\003\202\001\001\000\076\322\034\211 +\056\065\374\370\165\335\346\177\145\210\364\162\114\311\054\327 +\062\116\363\335\031\171\107\275\216\073\133\223\017\120\111\044 +\023\153\024\006\162\357\011\323\241\241\343\100\204\311\347\030 +\062\164\074\110\156\017\237\113\324\367\036\323\223\206\144\124 +\227\143\162\120\325\125\317\372\040\223\002\242\233\303\043\223 +\116\026\125\166\240\160\171\155\315\041\037\317\057\055\274\031 +\343\210\061\370\131\032\201\011\310\227\246\164\307\140\304\133 +\314\127\216\262\165\375\033\002\011\333\131\157\162\223\151\367 +\061\101\326\210\070\277\207\262\275\026\171\371\252\344\276\210 +\045\335\141\047\043\034\265\061\007\004\066\264\032\220\275\240 +\164\161\120\211\155\274\024\343\017\206\256\361\253\076\307\240 +\011\314\243\110\321\340\333\144\347\222\265\317\257\162\103\160 +\213\371\303\204\074\023\252\176\222\233\127\123\223\372\160\302 +\221\016\061\371\233\147\135\351\226\070\136\137\263\163\116\210 +\025\147\336\236\166\020\142\040\276\125\151\225\103\000\071\115 +\366\356\260\132\116\111\104\124\130\137\102\203 END CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE -# For Server Distrust After: Tue Apr 30 00:00:00 2019 -CKA_NSS_SERVER_DISTRUST_AFTER MULTILINE_OCTAL -\061\071\060\064\063\060\060\060\060\060\060\060\132 -END +CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for Certificate "thawte Primary Root CA - G3" -# Issuer: CN=thawte Primary Root CA - G3,OU="(c) 2008 thawte, Inc. - For authorized use only",OU=Certification Services Division,O="thawte, Inc.",C=US -# Serial Number:60:01:97:b7:46:a7:ea:b4:b4:9a:d6:4b:2f:f7:90:fb -# Subject: CN=thawte Primary Root CA - G3,OU="(c) 2008 thawte, Inc. - For authorized use only",OU=Certification Services Division,O="thawte, Inc.",C=US -# Not Valid Before: Wed Apr 02 00:00:00 2008 -# Not Valid After : Tue Dec 01 23:59:59 2037 -# Fingerprint (MD5): FB:1B:5D:43:8A:94:CD:44:C6:76:F2:43:4B:47:E7:31 -# Fingerprint (SHA1): F1:8B:53:8D:1B:E9:03:B6:A6:F0:56:43:5B:17:15:89:CA:F3:6B:F2 +# Trust for Certificate "certSIGN ROOT CA" +# Issuer: OU=certSIGN ROOT CA,O=certSIGN,C=RO +# Serial Number:20:06:05:16:70:02 +# Subject: OU=certSIGN ROOT CA,O=certSIGN,C=RO +# Not Valid Before: Tue Jul 04 17:20:04 2006 +# Not Valid After : Fri Jul 04 17:20:04 2031 +# Fingerprint (MD5): 18:98:C0:D6:E9:3A:FC:F9:B0:F5:0C:F7:4B:01:44:17 +# Fingerprint (SHA1): FA:B7:EE:36:97:26:62:FB:2D:B0:2A:F6:BF:03:FD:E8:7C:4B:2F:9B CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "thawte Primary Root CA - G3" +CKA_LABEL UTF8 "certSIGN ROOT CA" CKA_CERT_SHA1_HASH MULTILINE_OCTAL -\361\213\123\215\033\351\003\266\246\360\126\103\133\027\025\211 -\312\363\153\362 +\372\267\356\066\227\046\142\373\055\260\052\366\277\003\375\350 +\174\113\057\233 END CKA_CERT_MD5_HASH MULTILINE_OCTAL -\373\033\135\103\212\224\315\104\306\166\362\103\113\107\347\061 -END -CKA_ISSUER MULTILINE_OCTAL -\060\201\256\061\013\060\011\006\003\125\004\006\023\002\125\123 -\061\025\060\023\006\003\125\004\012\023\014\164\150\141\167\164 -\145\054\040\111\156\143\056\061\050\060\046\006\003\125\004\013 -\023\037\103\145\162\164\151\146\151\143\141\164\151\157\156\040 -\123\145\162\166\151\143\145\163\040\104\151\166\151\163\151\157 -\156\061\070\060\066\006\003\125\004\013\023\057\050\143\051\040 -\062\060\060\070\040\164\150\141\167\164\145\054\040\111\156\143 -\056\040\055\040\106\157\162\040\141\165\164\150\157\162\151\172 -\145\144\040\165\163\145\040\157\156\154\171\061\044\060\042\006 -\003\125\004\003\023\033\164\150\141\167\164\145\040\120\162\151 -\155\141\162\171\040\122\157\157\164\040\103\101\040\055\040\107 -\063 +\030\230\300\326\351\072\374\371\260\365\014\367\113\001\104\027 +END +CKA_ISSUER MULTILINE_OCTAL +\060\073\061\013\060\011\006\003\125\004\006\023\002\122\117\061 +\021\060\017\006\003\125\004\012\023\010\143\145\162\164\123\111 +\107\116\061\031\060\027\006\003\125\004\013\023\020\143\145\162 +\164\123\111\107\116\040\122\117\117\124\040\103\101 END CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\020\140\001\227\267\106\247\352\264\264\232\326\113\057\367 -\220\373 +\002\006\040\006\005\026\160\002 END CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST +CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE @@ -7179,167 +5770,6 @@ CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE -# -# Certificate "VeriSign Class 3 Public Primary Certification Authority - G4" -# -# Issuer: CN=VeriSign Class 3 Public Primary Certification Authority - G4,OU="(c) 2007 VeriSign, Inc. - For authorized use only",OU=VeriSign Trust Network,O="VeriSign, Inc.",C=US -# Serial Number:2f:80:fe:23:8c:0e:22:0f:48:67:12:28:91:87:ac:b3 -# Subject: CN=VeriSign Class 3 Public Primary Certification Authority - G4,OU="(c) 2007 VeriSign, Inc. - For authorized use only",OU=VeriSign Trust Network,O="VeriSign, Inc.",C=US -# Not Valid Before: Mon Nov 05 00:00:00 2007 -# Not Valid After : Mon Jan 18 23:59:59 2038 -# Fingerprint (MD5): 3A:52:E1:E7:FD:6F:3A:E3:6F:F3:6F:99:1B:F9:22:41 -# Fingerprint (SHA1): 22:D5:D8:DF:8F:02:31:D1:8D:F7:9D:B7:CF:8A:2D:64:C9:3F:6C:3A -CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE -CKA_TOKEN CK_BBOOL CK_TRUE -CKA_PRIVATE CK_BBOOL CK_FALSE -CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "VeriSign Class 3 Public Primary Certification Authority - G4" -CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 -CKA_SUBJECT MULTILINE_OCTAL -\060\201\312\061\013\060\011\006\003\125\004\006\023\002\125\123 -\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123 -\151\147\156\054\040\111\156\143\056\061\037\060\035\006\003\125 -\004\013\023\026\126\145\162\151\123\151\147\156\040\124\162\165 -\163\164\040\116\145\164\167\157\162\153\061\072\060\070\006\003 -\125\004\013\023\061\050\143\051\040\062\060\060\067\040\126\145 -\162\151\123\151\147\156\054\040\111\156\143\056\040\055\040\106 -\157\162\040\141\165\164\150\157\162\151\172\145\144\040\165\163 -\145\040\157\156\154\171\061\105\060\103\006\003\125\004\003\023 -\074\126\145\162\151\123\151\147\156\040\103\154\141\163\163\040 -\063\040\120\165\142\154\151\143\040\120\162\151\155\141\162\171 -\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101 -\165\164\150\157\162\151\164\171\040\055\040\107\064 -END -CKA_ID UTF8 "0" -CKA_ISSUER MULTILINE_OCTAL -\060\201\312\061\013\060\011\006\003\125\004\006\023\002\125\123 -\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123 -\151\147\156\054\040\111\156\143\056\061\037\060\035\006\003\125 -\004\013\023\026\126\145\162\151\123\151\147\156\040\124\162\165 -\163\164\040\116\145\164\167\157\162\153\061\072\060\070\006\003 -\125\004\013\023\061\050\143\051\040\062\060\060\067\040\126\145 -\162\151\123\151\147\156\054\040\111\156\143\056\040\055\040\106 -\157\162\040\141\165\164\150\157\162\151\172\145\144\040\165\163 -\145\040\157\156\154\171\061\105\060\103\006\003\125\004\003\023 -\074\126\145\162\151\123\151\147\156\040\103\154\141\163\163\040 -\063\040\120\165\142\154\151\143\040\120\162\151\155\141\162\171 -\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101 -\165\164\150\157\162\151\164\171\040\055\040\107\064 -END -CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\020\057\200\376\043\214\016\042\017\110\147\022\050\221\207 -\254\263 -END -CKA_VALUE MULTILINE_OCTAL -\060\202\003\204\060\202\003\012\240\003\002\001\002\002\020\057 -\200\376\043\214\016\042\017\110\147\022\050\221\207\254\263\060 -\012\006\010\052\206\110\316\075\004\003\003\060\201\312\061\013 -\060\011\006\003\125\004\006\023\002\125\123\061\027\060\025\006 -\003\125\004\012\023\016\126\145\162\151\123\151\147\156\054\040 -\111\156\143\056\061\037\060\035\006\003\125\004\013\023\026\126 -\145\162\151\123\151\147\156\040\124\162\165\163\164\040\116\145 -\164\167\157\162\153\061\072\060\070\006\003\125\004\013\023\061 -\050\143\051\040\062\060\060\067\040\126\145\162\151\123\151\147 -\156\054\040\111\156\143\056\040\055\040\106\157\162\040\141\165 -\164\150\157\162\151\172\145\144\040\165\163\145\040\157\156\154 -\171\061\105\060\103\006\003\125\004\003\023\074\126\145\162\151 -\123\151\147\156\040\103\154\141\163\163\040\063\040\120\165\142 -\154\151\143\040\120\162\151\155\141\162\171\040\103\145\162\164 -\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162 -\151\164\171\040\055\040\107\064\060\036\027\015\060\067\061\061 -\060\065\060\060\060\060\060\060\132\027\015\063\070\060\061\061 -\070\062\063\065\071\065\071\132\060\201\312\061\013\060\011\006 -\003\125\004\006\023\002\125\123\061\027\060\025\006\003\125\004 -\012\023\016\126\145\162\151\123\151\147\156\054\040\111\156\143 -\056\061\037\060\035\006\003\125\004\013\023\026\126\145\162\151 -\123\151\147\156\040\124\162\165\163\164\040\116\145\164\167\157 -\162\153\061\072\060\070\006\003\125\004\013\023\061\050\143\051 -\040\062\060\060\067\040\126\145\162\151\123\151\147\156\054\040 -\111\156\143\056\040\055\040\106\157\162\040\141\165\164\150\157 -\162\151\172\145\144\040\165\163\145\040\157\156\154\171\061\105 -\060\103\006\003\125\004\003\023\074\126\145\162\151\123\151\147 -\156\040\103\154\141\163\163\040\063\040\120\165\142\154\151\143 -\040\120\162\151\155\141\162\171\040\103\145\162\164\151\146\151 -\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171 -\040\055\040\107\064\060\166\060\020\006\007\052\206\110\316\075 -\002\001\006\005\053\201\004\000\042\003\142\000\004\247\126\172 -\174\122\332\144\233\016\055\134\330\136\254\222\075\376\001\346 -\031\112\075\024\003\113\372\140\047\040\331\203\211\151\372\124 -\306\232\030\136\125\052\144\336\006\366\215\112\073\255\020\074 -\145\075\220\210\004\211\340\060\141\263\256\135\001\247\173\336 -\174\262\276\312\145\141\000\206\256\332\217\173\320\211\255\115 -\035\131\232\101\261\274\107\200\334\236\142\303\371\243\201\262 -\060\201\257\060\017\006\003\125\035\023\001\001\377\004\005\060 -\003\001\001\377\060\016\006\003\125\035\017\001\001\377\004\004 -\003\002\001\006\060\155\006\010\053\006\001\005\005\007\001\014 -\004\141\060\137\241\135\240\133\060\131\060\127\060\125\026\011 -\151\155\141\147\145\057\147\151\146\060\041\060\037\060\007\006 -\005\053\016\003\002\032\004\024\217\345\323\032\206\254\215\216 -\153\303\317\200\152\324\110\030\054\173\031\056\060\045\026\043 -\150\164\164\160\072\057\057\154\157\147\157\056\166\145\162\151 -\163\151\147\156\056\143\157\155\057\166\163\154\157\147\157\056 -\147\151\146\060\035\006\003\125\035\016\004\026\004\024\263\026 -\221\375\356\246\156\344\265\056\111\217\207\170\201\200\354\345 -\261\265\060\012\006\010\052\206\110\316\075\004\003\003\003\150 -\000\060\145\002\060\146\041\014\030\046\140\132\070\173\126\102 -\340\247\374\066\204\121\221\040\054\166\115\103\075\304\035\204 -\043\320\254\326\174\065\006\316\315\151\275\220\015\333\154\110 -\102\035\016\252\102\002\061\000\234\075\110\071\043\071\130\032 -\025\022\131\152\236\357\325\131\262\035\122\054\231\161\315\307 -\051\337\033\052\141\173\161\321\336\363\300\345\015\072\112\252 -\055\247\330\206\052\335\056\020 -END -CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE -# For Server Distrust After: Thu Jan 31 00:00:00 2019 -CKA_NSS_SERVER_DISTRUST_AFTER MULTILINE_OCTAL -\061\071\060\061\063\061\060\060\060\060\060\060\132 -END -CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE - -# Trust for Certificate "VeriSign Class 3 Public Primary Certification Authority - G4" -# Issuer: CN=VeriSign Class 3 Public Primary Certification Authority - G4,OU="(c) 2007 VeriSign, Inc. - For authorized use only",OU=VeriSign Trust Network,O="VeriSign, Inc.",C=US -# Serial Number:2f:80:fe:23:8c:0e:22:0f:48:67:12:28:91:87:ac:b3 -# Subject: CN=VeriSign Class 3 Public Primary Certification Authority - G4,OU="(c) 2007 VeriSign, Inc. - For authorized use only",OU=VeriSign Trust Network,O="VeriSign, Inc.",C=US -# Not Valid Before: Mon Nov 05 00:00:00 2007 -# Not Valid After : Mon Jan 18 23:59:59 2038 -# Fingerprint (MD5): 3A:52:E1:E7:FD:6F:3A:E3:6F:F3:6F:99:1B:F9:22:41 -# Fingerprint (SHA1): 22:D5:D8:DF:8F:02:31:D1:8D:F7:9D:B7:CF:8A:2D:64:C9:3F:6C:3A -CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST -CKA_TOKEN CK_BBOOL CK_TRUE -CKA_PRIVATE CK_BBOOL CK_FALSE -CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "VeriSign Class 3 Public Primary Certification Authority - G4" -CKA_CERT_SHA1_HASH MULTILINE_OCTAL -\042\325\330\337\217\002\061\321\215\367\235\267\317\212\055\144 -\311\077\154\072 -END -CKA_CERT_MD5_HASH MULTILINE_OCTAL -\072\122\341\347\375\157\072\343\157\363\157\231\033\371\042\101 -END -CKA_ISSUER MULTILINE_OCTAL -\060\201\312\061\013\060\011\006\003\125\004\006\023\002\125\123 -\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123 -\151\147\156\054\040\111\156\143\056\061\037\060\035\006\003\125 -\004\013\023\026\126\145\162\151\123\151\147\156\040\124\162\165 -\163\164\040\116\145\164\167\157\162\153\061\072\060\070\006\003 -\125\004\013\023\061\050\143\051\040\062\060\060\067\040\126\145 -\162\151\123\151\147\156\054\040\111\156\143\056\040\055\040\106 -\157\162\040\141\165\164\150\157\162\151\172\145\144\040\165\163 -\145\040\157\156\154\171\061\105\060\103\006\003\125\004\003\023 -\074\126\145\162\151\123\151\147\156\040\103\154\141\163\163\040 -\063\040\120\165\142\154\151\143\040\120\162\151\155\141\162\171 -\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101 -\165\164\150\157\162\151\164\171\040\055\040\107\064 -END -CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\020\057\200\376\043\214\016\042\017\110\147\022\050\221\207 -\254\263 -END -CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST -CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST -CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - # # Certificate "NetLock Arany (Class Gold) Főtanúsítvány" # @@ -11241,7 +9671,9 @@ CKA_VALUE MULTILINE_OCTAL \145\353\127\331\363\127\226\273\110\315\201 END CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE -CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE +CKA_NSS_SERVER_DISTRUST_AFTER MULTILINE_OCTAL +\062\060\060\067\060\061\060\060\060\060\060\060\132 +END CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE # Trust for "Trustis FPS Root CA" @@ -23098,3 +21530,177 @@ CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + +# +# Certificate "NAVER Global Root Certification Authority" +# +# Issuer: CN=NAVER Global Root Certification Authority,O=NAVER BUSINESS PLATFORM Corp.,C=KR +# Serial Number:01:94:30:1e:a2:0b:dd:f5:c5:33:2a:b1:43:44:71:f8:d6:50:4d:0d +# Subject: CN=NAVER Global Root Certification Authority,O=NAVER BUSINESS PLATFORM Corp.,C=KR +# Not Valid Before: Fri Aug 18 08:58:42 2017 +# Not Valid After : Tue Aug 18 23:59:59 2037 +# Fingerprint (SHA-256): 88:F4:38:DC:F8:FF:D1:FA:8F:42:91:15:FF:E5:F8:2A:E1:E0:6E:0C:70:C3:75:FA:AD:71:7B:34:A4:9E:72:65 +# Fingerprint (SHA1): 8F:6B:F2:A9:27:4A:DA:14:A0:C4:F4:8E:61:27:F9:C0:1E:78:5D:D1 +CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "NAVER Global Root Certification Authority" +CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +CKA_SUBJECT MULTILINE_OCTAL +\060\151\061\013\060\011\006\003\125\004\006\023\002\113\122\061 +\046\060\044\006\003\125\004\012\014\035\116\101\126\105\122\040 +\102\125\123\111\116\105\123\123\040\120\114\101\124\106\117\122 +\115\040\103\157\162\160\056\061\062\060\060\006\003\125\004\003 +\014\051\116\101\126\105\122\040\107\154\157\142\141\154\040\122 +\157\157\164\040\103\145\162\164\151\146\151\143\141\164\151\157 +\156\040\101\165\164\150\157\162\151\164\171 +END +CKA_ID UTF8 "0" +CKA_ISSUER MULTILINE_OCTAL +\060\151\061\013\060\011\006\003\125\004\006\023\002\113\122\061 +\046\060\044\006\003\125\004\012\014\035\116\101\126\105\122\040 +\102\125\123\111\116\105\123\123\040\120\114\101\124\106\117\122 +\115\040\103\157\162\160\056\061\062\060\060\006\003\125\004\003 +\014\051\116\101\126\105\122\040\107\154\157\142\141\154\040\122 +\157\157\164\040\103\145\162\164\151\146\151\143\141\164\151\157 +\156\040\101\165\164\150\157\162\151\164\171 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\024\001\224\060\036\242\013\335\365\305\063\052\261\103\104 +\161\370\326\120\115\015 +END +CKA_VALUE MULTILINE_OCTAL +\060\202\005\242\060\202\003\212\240\003\002\001\002\002\024\001 +\224\060\036\242\013\335\365\305\063\052\261\103\104\161\370\326 +\120\115\015\060\015\006\011\052\206\110\206\367\015\001\001\014 +\005\000\060\151\061\013\060\011\006\003\125\004\006\023\002\113 +\122\061\046\060\044\006\003\125\004\012\014\035\116\101\126\105 +\122\040\102\125\123\111\116\105\123\123\040\120\114\101\124\106 +\117\122\115\040\103\157\162\160\056\061\062\060\060\006\003\125 +\004\003\014\051\116\101\126\105\122\040\107\154\157\142\141\154 +\040\122\157\157\164\040\103\145\162\164\151\146\151\143\141\164 +\151\157\156\040\101\165\164\150\157\162\151\164\171\060\036\027 +\015\061\067\060\070\061\070\060\070\065\070\064\062\132\027\015 +\063\067\060\070\061\070\062\063\065\071\065\071\132\060\151\061 +\013\060\011\006\003\125\004\006\023\002\113\122\061\046\060\044 +\006\003\125\004\012\014\035\116\101\126\105\122\040\102\125\123 +\111\116\105\123\123\040\120\114\101\124\106\117\122\115\040\103 +\157\162\160\056\061\062\060\060\006\003\125\004\003\014\051\116 +\101\126\105\122\040\107\154\157\142\141\154\040\122\157\157\164 +\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101 +\165\164\150\157\162\151\164\171\060\202\002\042\060\015\006\011 +\052\206\110\206\367\015\001\001\001\005\000\003\202\002\017\000 +\060\202\002\012\002\202\002\001\000\266\324\361\223\134\265\100 +\211\012\253\015\220\133\120\143\256\220\224\164\027\105\162\326 +\173\145\132\051\113\247\126\240\113\270\057\102\165\351\331\173 +\044\132\061\145\253\027\027\321\063\072\331\021\334\100\066\207 +\337\307\152\351\046\136\131\212\167\343\350\110\234\061\026\372 +\076\221\261\312\311\243\342\237\316\041\123\243\002\066\060\313 +\122\002\345\332\062\135\303\305\346\371\356\021\307\213\311\104 +\036\204\223\030\112\264\237\345\022\144\151\320\046\205\142\001 +\266\311\002\035\276\203\121\273\134\332\370\255\025\152\231\367 +\222\124\367\064\133\351\277\352\051\201\022\324\123\221\226\263 +\221\132\335\376\220\163\050\373\060\106\265\312\010\007\307\161 +\162\311\146\323\064\227\366\214\364\030\112\341\320\075\132\105 +\266\151\247\051\373\043\316\210\330\022\234\000\110\250\246\017 +\263\073\222\215\161\016\164\305\213\310\114\371\364\233\216\270 +\074\151\355\157\073\120\057\130\355\304\260\320\034\033\152\014 +\342\274\104\252\330\315\024\135\224\170\141\277\016\156\332\052 +\274\057\014\013\161\246\263\026\077\234\346\371\314\237\123\065 +\342\003\240\240\030\277\273\361\276\364\326\214\207\015\102\367 +\006\271\361\155\355\004\224\250\376\266\323\006\306\100\141\337 +\235\235\363\124\166\316\123\072\001\246\222\101\354\004\243\217 +\015\242\325\011\312\326\313\232\361\357\103\135\300\253\245\101 +\317\134\123\160\160\311\210\246\055\324\153\141\163\120\046\206 +\141\016\137\033\302\053\342\214\325\273\235\301\003\102\272\224 +\332\137\251\260\312\314\115\012\357\107\151\003\057\042\373\361 +\050\316\277\135\120\145\250\220\155\263\164\260\010\307\254\250 +\321\353\076\234\374\135\032\203\056\053\313\265\363\104\235\072 +\247\027\141\226\242\161\323\160\226\025\115\267\114\163\356\031 +\134\305\133\076\101\376\254\165\140\073\033\143\316\000\335\332 +\010\220\142\264\345\055\356\110\247\153\027\231\124\276\207\112 +\343\251\136\004\114\353\020\155\124\326\357\361\350\362\142\026 +\313\200\153\355\075\355\365\037\060\245\256\113\311\023\355\212 +\001\001\311\270\121\130\300\146\072\261\146\113\304\325\061\002 +\142\351\164\204\014\333\115\106\055\002\003\001\000\001\243\102 +\060\100\060\035\006\003\125\035\016\004\026\004\024\322\237\210 +\337\241\315\054\275\354\365\073\001\001\223\063\047\262\353\140 +\113\060\016\006\003\125\035\017\001\001\377\004\004\003\002\001 +\006\060\017\006\003\125\035\023\001\001\377\004\005\060\003\001 +\001\377\060\015\006\011\052\206\110\206\367\015\001\001\014\005 +\000\003\202\002\001\000\062\312\200\263\235\075\124\006\335\322 +\322\056\360\244\001\041\013\147\110\312\155\216\340\310\252\015 +\252\215\041\127\217\306\076\172\312\333\121\324\122\263\324\226 +\204\245\130\140\177\345\013\216\037\365\334\012\025\201\345\073 +\266\267\042\057\011\234\023\026\261\154\014\065\010\155\253\143 +\162\355\334\276\354\307\127\346\060\040\161\326\327\020\301\023 +\125\001\214\052\103\344\101\361\317\072\172\123\222\316\242\003 +\005\015\070\337\002\273\020\056\331\073\322\233\172\300\241\246 +\370\265\061\346\364\165\311\271\123\231\165\107\042\132\024\025 +\307\170\033\266\235\351\014\370\033\166\361\205\204\336\241\332 +\022\357\244\342\020\227\172\170\336\014\121\227\250\041\100\213 +\206\275\015\360\136\116\113\066\273\073\040\037\212\102\126\341 +\013\032\277\173\320\042\103\054\104\214\373\345\052\264\154\034 +\034\272\224\340\023\176\041\346\232\302\313\305\102\144\264\036 +\224\173\010\045\310\161\314\207\105\127\205\323\237\051\142\042 +\203\121\227\000\030\227\167\152\230\222\311\174\140\154\337\154 +\175\112\344\160\114\302\236\270\035\367\320\064\307\017\314\373 +\247\377\003\276\255\160\220\332\013\335\310\155\227\137\232\177 +\011\062\101\375\315\242\314\132\155\114\362\252\111\376\146\370 +\351\330\065\353\016\050\036\356\110\057\072\320\171\011\070\174 +\246\042\202\223\225\320\003\276\276\002\240\005\335\040\042\343 +\157\035\210\064\140\306\346\012\271\011\165\013\360\007\350\151 +\226\065\307\373\043\201\216\070\071\270\105\053\103\170\242\321 +\054\024\377\015\050\162\162\225\233\136\011\333\211\104\230\252 +\241\111\273\161\122\362\277\366\377\047\241\066\257\270\266\167 +\210\335\072\244\155\233\064\220\334\024\135\060\277\267\353\027 +\344\207\267\161\320\241\327\167\025\324\102\327\362\363\061\231 +\135\233\335\026\155\077\352\006\043\370\106\242\042\355\223\366 +\335\232\346\052\207\261\230\124\361\042\367\153\105\343\342\216 +\166\035\232\215\304\006\215\066\267\024\363\235\124\151\267\216 +\074\325\244\155\223\201\267\255\366\275\144\173\302\311\150\071 +\240\222\234\315\064\206\221\220\372\144\121\235\376\376\353\245 +\365\165\336\211\367\162 +END +CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE +CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE +CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE + +# Trust for "NAVER Global Root Certification Authority" +# Issuer: CN=NAVER Global Root Certification Authority,O=NAVER BUSINESS PLATFORM Corp.,C=KR +# Serial Number:01:94:30:1e:a2:0b:dd:f5:c5:33:2a:b1:43:44:71:f8:d6:50:4d:0d +# Subject: CN=NAVER Global Root Certification Authority,O=NAVER BUSINESS PLATFORM Corp.,C=KR +# Not Valid Before: Fri Aug 18 08:58:42 2017 +# Not Valid After : Tue Aug 18 23:59:59 2037 +# Fingerprint (SHA-256): 88:F4:38:DC:F8:FF:D1:FA:8F:42:91:15:FF:E5:F8:2A:E1:E0:6E:0C:70:C3:75:FA:AD:71:7B:34:A4:9E:72:65 +# Fingerprint (SHA1): 8F:6B:F2:A9:27:4A:DA:14:A0:C4:F4:8E:61:27:F9:C0:1E:78:5D:D1 +CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "NAVER Global Root Certification Authority" +CKA_CERT_SHA1_HASH MULTILINE_OCTAL +\217\153\362\251\047\112\332\024\240\304\364\216\141\047\371\300 +\036\170\135\321 +END +CKA_CERT_MD5_HASH MULTILINE_OCTAL +\310\176\101\366\045\073\365\011\263\027\350\106\075\277\320\233 +END +CKA_ISSUER MULTILINE_OCTAL +\060\151\061\013\060\011\006\003\125\004\006\023\002\113\122\061 +\046\060\044\006\003\125\004\012\014\035\116\101\126\105\122\040 +\102\125\123\111\116\105\123\123\040\120\114\101\124\106\117\122 +\115\040\103\157\162\160\056\061\062\060\060\006\003\125\004\003 +\014\051\116\101\126\105\122\040\107\154\157\142\141\154\040\122 +\157\157\164\040\103\145\162\164\151\146\151\143\141\164\151\157 +\156\040\101\165\164\150\157\162\151\164\171 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\024\001\224\060\036\242\013\335\365\305\063\052\261\103\104 +\161\370\326\120\115\015 +END +CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR +CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST +CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST +CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl index 9be1e7708..a6656ccf5 100644 --- a/config/cfgroot/general-functions.pl +++ b/config/cfgroot/general-functions.pl @@ -635,12 +635,12 @@ sub validhostname # Checks a hostname against RFC1035 my $hostname = $_[0]; - # Each part should be at least two characters in length + # Hostname should be at least one character in length # but no more than 63 characters if (length ($hostname) < 1 || length ($hostname) > 63) { return 0;} # Only valid characters are a-z, A-Z, 0-9 and - - if ($hostname !~ /^[a-zA-Z0-9-\s]*$/) { + if ($hostname !~ /^[a-zA-Z0-9-]*$/) { return 0;} # First character can only be a letter or a digit if (substr ($hostname, 0, 1) !~ /^[a-zA-Z0-9]*$/) { @@ -655,46 +655,53 @@ sub validdomainname { my $part; - # Checks a domain name against RFC1035 + # Checks a domain name against RFC1035 and RFC2181 my $domainname = $_[0]; - my @parts = split (/\./, $domainname); # Split hostname at the '.' + my @parts = split (/\./, $domainname); # Split domain name at the '.' foreach $part (@parts) { - # Each part should be no more than 63 characters in length + # Each part should be at least one character in length + # but no more than 63 characters if (length ($part) < 1 || length ($part) > 63) { return 0;} # Only valid characters are a-z, A-Z, 0-9, _ and - if ($part !~ /^[a-zA-Z0-9_-]*$/) { - return 0; - } + return 0;} } return 1; } sub validfqdn { - my $part; - - # Checks a fully qualified domain name against RFC1035 + # Checks a fully qualified domain name against RFC1035 and RFC2181 my $fqdn = $_[0]; - my @parts = split (/\./, $fqdn); # Split hostname at the '.' + my @parts = split (/\./, $fqdn); # Split FQDN at the '.' if (scalar(@parts) < 2) { # At least two parts should return 0;} # exist in a FQDN # (i.e.hostname.domain) - foreach $part (@parts) { + + for (my $index=0; $index < scalar(@parts); $index++) { # Each part should be at least one character in length # but no more than 63 characters - if (length ($part) < 1 || length ($part) > 63) { - return 0;} - # Only valid characters are a-z, A-Z, 0-9 and - - if ($part !~ /^[a-zA-Z0-9-]*$/) { - return 0;} - # First character can only be a letter or a digit - if (substr ($part, 0, 1) !~ /^[a-zA-Z0-9]*$/) { - return 0;} - # Last character can only be a letter or a digit - if (substr ($part, -1, 1) !~ /^[a-zA-Z0-9]*$/) { + if (length ($parts[$index]) < 1 || length ($parts[$index]) > 63) { return 0;} + if ($index eq 0) { + # This is the hostname part + # Only valid characters are a-z, A-Z, 0-9 and - + if ($parts[$index] !~ /^[a-zA-Z0-9-]*$/) { + return 0;} + # First character can only be a letter or a digit + if (substr ($parts[$index], 0, 1) !~ /^[a-zA-Z0-9]*$/) { + return 0;} + # Last character can only be a letter or a digit + if (substr ($parts[$index], -1, 1) !~ /^[a-zA-Z0-9]*$/) { + return 0;} + } else{ + # This is the domain part + # Only valid characters are a-z, A-Z, 0-9, _ and - + if ($parts[$index] !~ /^[a-zA-Z0-9_-]*$/) { + return 0;} + } } return 1; } diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl index e2e6fd689..5684c01c5 100644 --- a/config/cfgroot/header.pl +++ b/config/cfgroot/header.pl @@ -311,22 +311,6 @@ sub getcgihash { return; } - -# Test if IP is within a subnet -# Call: IpInSubnet (Addr, Subnet, Subnet Mask) -# Subnet can be an IP of the subnet: 10.0.0.0 or 10.0.0.1 -# Everything in dottted notation -# Return: TRUE/FALSE -sub IpInSubnet -{ - $ip = unpack('N', inet_aton(shift)); - $start = unpack('N', inet_aton(shift)); - $mask = unpack('N', inet_aton(shift)); - $start &= $mask; # base of subnet... - $end = $start + ~$mask; - return (($ip >= $start) && ($ip <= $end)); -} - sub escape($) { my $s = shift; return HTML::Entities::encode_entities($s); @@ -559,13 +543,13 @@ sub colorize { return "<font color='".${Header::colourovpn}."'>".$string."</font>"; } elsif ( $string =~ "lo" or $string =~ "127.0.0.0" ){ return "<font color='".${Header::colourfw}."'>".$string."</font>"; - } elsif ( $string =~ $ethsettings{'GREEN_DEV'} or &IpInSubnet($string2,$ethsettings{'GREEN_NETADDRESS'},$ethsettings{'GREEN_NETMASK'}) ){ + } elsif ( $string =~ $ethsettings{'GREEN_DEV'} or &General::IpInSubnet($string2,$ethsettings{'GREEN_NETADDRESS'},$ethsettings{'GREEN_NETMASK'}) ){ return "<font color='".${Header::colourgreen}."'>".$string."</font>"; } elsif ( $string =~ "ppp0" or $string =~ $ethsettings{'RED_DEV'} or $string =~ "0.0.0.0" or $string =~ $ethsettings{'RED_ADDRESS'} ){ return "<font color='".${Header::colourred}."'>".$string."</font>"; - } elsif ( $ethsettings{'CONFIG_TYPE'}>1 and ( $string =~ $ethsettings{'BLUE_DEV'} or &IpInSubnet($string2,$ethsettings{'BLUE_NETADDRESS'},$ethsettings{'BLUE_NETMASK'}) )){ + } elsif ( $ethsettings{'CONFIG_TYPE'}>1 and ( $string =~ $ethsettings{'BLUE_DEV'} or &General::IpInSubnet($string2,$ethsettings{'BLUE_NETADDRESS'},$ethsettings{'BLUE_NETMASK'}) )){ return "<font color='".${Header::colourblue}."'>".$string."</font>"; - } elsif ( $ethsettings{'CONFIG_TYPE'}>2 and ( $string =~ $ethsettings{'ORANGE_DEV'} or &IpInSubnet($string2,$ethsettings{'ORANGE_NETADDRESS'},$ethsettings{'ORANGE_NETMASK'}) )){ + } elsif ( $ethsettings{'CONFIG_TYPE'}>2 and ( $string =~ $ethsettings{'ORANGE_DEV'} or &General::IpInSubnet($string2,$ethsettings{'ORANGE_NETADDRESS'},$ethsettings{'ORANGE_NETMASK'}) )){ return "<font color='".${Header::colourorange}."'>".$string."</font>"; } else { return $string; diff --git a/config/cfgroot/ids-functions.pl b/config/cfgroot/ids-functions.pl index d45e1c70a..2fdae4a7a 100644 --- a/config/cfgroot/ids-functions.pl +++ b/config/cfgroot/ids-functions.pl @@ -24,6 +24,7 @@ package IDS; require '/var/ipfire/general-functions.pl'; +require "${General::swroot}/network-functions.pl"; # Location where all config and settings files are stored. our $settingsdir = "${General::swroot}/suricata"; @@ -410,42 +411,6 @@ sub _store_error_message ($) { &set_ownership("$storederrorfile"); } -# -## Function to get a list of all available network zones. -# -sub get_available_network_zones () { - # Get netsettings. - my %netsettings = (); - &General::readhash("${General::swroot}/ethernet/settings", \%netsettings); - - # Obtain the configuration type from the netsettings hash. - my $config_type = $netsettings{'CONFIG_TYPE'}; - - # Hash which contains the conversation from the config mode - # to the existing network interface names. They are stored like - # an array. - # - # Mode "0" red is a modem and green - # Mode "1" red is a netdev and green - # Mode "2" red, green and orange - # Mode "3" red, green and blue - # Mode "4" red, green, blue, orange - my %config_type_to_interfaces = ( - "0" => [ "red", "green" ], - "1" => [ "red", "green" ], - "2" => [ "red", "green", "orange" ], - "3" => [ "red", "green", "blue" ], - "4" => [ "red", "green", "blue", "orange" ] - ); - - # Obtain and dereference the corresponding network interaces based on the read - # network config type. - my @network_zones = @{ $config_type_to_interfaces{$config_type} }; - - # Return them. - return @network_zones; -} - # ## Function to check if the IDS is running. # @@ -613,7 +578,7 @@ sub generate_home_net_file() { &General::readhash("${General::swroot}/ethernet/settings", \%netsettings); # Get available network zones. - my @network_zones = &get_available_network_zones(); + my @network_zones = &Network::get_available_network_zones(); # Temporary array to store network address and prefix of the configured # networks. diff --git a/config/cfgroot/network-functions.pl b/config/cfgroot/network-functions.pl index 3d7f04743..e94404f05 100644 --- a/config/cfgroot/network-functions.pl +++ b/config/cfgroot/network-functions.pl @@ -25,8 +25,17 @@ package Network; require "/var/ipfire/general-functions.pl"; +use experimental 'smartmatch'; use Socket; +# System ethernet configuration +our %ethernet_settings = (); +&General::readhash("${General::swroot}/ethernet/settings", \%ethernet_settings); + +# List of all possible network zones that can be configured +our @known_network_zones = ("red", "green", "orange", "blue"); + +# IPv4 netmask CIDR to dotted decimal notation conversion table my %PREFIX2NETMASK = ( 32 => "255.255.255.255", 31 => "255.255.255.254", @@ -444,6 +453,64 @@ sub get_mac_by_name($) { return $mac; } +# +## Function to get a list of all available network zones. +# +sub get_available_network_zones () { + # Obtain the configuration type from the netsettings hash. + my $config_type = $ethernet_settings{'CONFIG_TYPE'}; + + # Hash which contains the conversation from the config mode + # to the existing network interface names. They are stored like + # an array. + # + # Mode "0" red is a modem and green + # Mode "1" red is a netdev and green + # Mode "2" red, green and orange + # Mode "3" red, green and blue + # Mode "4" red, green, blue, orange + my %config_type_to_interfaces = ( + "0" => [ "red", "green" ], + "1" => [ "red", "green" ], + "2" => [ "red", "green", "orange" ], + "3" => [ "red", "green", "blue" ], + "4" => [ "red", "green", "blue", "orange" ] + ); + + # Obtain and dereference the corresponding network interaces based on the read + # network config type. + my @network_zones = @{ $config_type_to_interfaces{$config_type} }; + + # Return them. + return @network_zones; +} + +# +## Function to check if a network zone is available in the current configuration +# +sub is_zone_available() { + my $zone = lc shift; + + # Make sure the zone is valid + die("Unknown network zone '$zone'") unless ($zone ~~ @known_network_zones); + + # Get available zones and return result + my @available_zones = get_available_network_zones(); + return ($zone ~~ @available_zones); +} + +# +## Function to determine if the RED zone is in standard IP (or modem, PPP, VDSL, ...) mode +# +sub is_red_mode_ip() { + # Obtain the settings from the netsettings hash + my $config_type = $ethernet_settings{'CONFIG_TYPE'}; + my $red_type = $ethernet_settings{'RED_TYPE'}; + + # RED must be a network device (configuration 1-4) with dynamic or static IP + return (($config_type ~~ [1..4]) && ($red_type ~~ ["DHCP", "STATIC"])); +} + 1; # Remove the next line to enable the testsuite diff --git a/config/hostapd/config b/config/hostapd/config index 78206ed78..d3383afde 100644 --- a/config/hostapd/config +++ b/config/hostapd/config @@ -44,41 +44,35 @@ CONFIG_LIBNL32=y # Driver interface for no driver (e.g., RADIUS server only) #CONFIG_DRIVER_NONE=y -# IEEE 802.11F/IAPP -CONFIG_IAPP=y - # WPA2/IEEE 802.11i RSN pre-authentication CONFIG_RSN_PREAUTH=y -# IEEE 802.11w (management frame protection) -CONFIG_IEEE80211W=y - # Support Operating Channel Validation #CONFIG_OCV=y # Integrated EAP server -CONFIG_EAP=y +#CONFIG_EAP=y # EAP Re-authentication Protocol (ERP) in integrated EAP server -CONFIG_ERP=y +#CONFIG_ERP=y # EAP-MD5 for the integrated EAP server -CONFIG_EAP_MD5=y +#CONFIG_EAP_MD5=y # EAP-TLS for the integrated EAP server -CONFIG_EAP_TLS=y +#CONFIG_EAP_TLS=y # EAP-MSCHAPv2 for the integrated EAP server -CONFIG_EAP_MSCHAPV2=y +#CONFIG_EAP_MSCHAPV2=y # EAP-PEAP for the integrated EAP server -CONFIG_EAP_PEAP=y +#CONFIG_EAP_PEAP=y # EAP-GTC for the integrated EAP server -CONFIG_EAP_GTC=y +#CONFIG_EAP_GTC=y # EAP-TTLS for the integrated EAP server -CONFIG_EAP_TTLS=y +#CONFIG_EAP_TTLS=y # EAP-SIM for the integrated EAP server #CONFIG_EAP_SIM=y @@ -138,7 +132,7 @@ CONFIG_EAP_TTLS=y # PKCS#12 (PFX) support (used to read private key and certificate file from # a file that usually has extension .p12 or .pfx) -CONFIG_PKCS12=y +#CONFIG_PKCS12=y # RADIUS authentication server. This provides access to the integrated EAP # server from external hosts using RADIUS. @@ -154,9 +148,6 @@ CONFIG_PKCS12=y # the IEEE 802.11 Management capability (e.g., FreeBSD/net80211) #CONFIG_DRIVER_RADIUS_ACL=y -# IEEE 802.11n (High Throughput) support -CONFIG_IEEE80211N=y - # Wireless Network Management (IEEE Std 802.11v-2011) # Note: This is experimental and not complete implementation. #CONFIG_WNM=y @@ -168,7 +159,7 @@ CONFIG_IEEE80211AC=y # Note: This is experimental and work in progress. The definitions are still # subject to change and this should not be expected to interoperate with the # final IEEE 802.11ax version. -#CONFIG_IEEE80211AX=y +CONFIG_IEEE80211AX=y # Remove debugging code that is printing out debug messages to stdout. # This can be used to reduce the size of the hostapd considerably if debugging @@ -189,13 +180,13 @@ CONFIG_IEEE80211AC=y #CONFIG_DEBUG_LINUX_TRACING=y # Remove support for RADIUS accounting -#CONFIG_NO_ACCOUNTING=y +CONFIG_NO_ACCOUNTING=y # Remove support for RADIUS -#CONFIG_NO_RADIUS=y +CONFIG_NO_RADIUS=y # Remove support for VLANs -#CONFIG_NO_VLAN=y +CONFIG_NO_VLAN=y # Enable support for fully dynamic VLANs. This enables hostapd to # automatically create bridge and VLAN interfaces if necessary. @@ -279,7 +270,7 @@ CONFIG_ELOOP_EPOLL=y # internal = Internal TLSv1 implementation (experimental) # linux = Linux kernel AF_ALG and internal TLSv1 implementation (experimental) # none = Empty template -#CONFIG_TLS=openssl +CONFIG_TLS=openssl # TLS-based EAP methods require at least TLS v1.0. Newer version of TLS (v1.1) # can be enabled to get a stronger construction of messages when block ciphers @@ -360,7 +351,7 @@ CONFIG_ELOOP_EPOLL=y CONFIG_ACS=y # Multiband Operation support -# These extentions facilitate efficient use of multiple frequency bands +# These extensions facilitate efficient use of multiple frequency bands # available to the AP and the devices that may associate with it. #CONFIG_MBO=y @@ -377,7 +368,7 @@ CONFIG_TAXONOMY=y # Include internal line edit mode in hostapd_cli. This can be used to provide # limited command line editing and history support. -#CONFIG_WPA_CLI_EDIT=y +CONFIG_WPA_CLI_EDIT=y # Opportunistic Wireless Encryption (OWE) # Experimental implementation of draft-harkins-owe-07.txt @@ -390,5 +381,21 @@ CONFIG_AIRTIME_POLICY=y # parameter. See that parameter in hostapd.conf for more details. #CFLAGS += -DDEFAULT_WPA_DISABLE_EAPOL_KEY_RETRIES=1 -# Custom configuration +# Wired equivalent privacy (WEP) +# WEP is an obsolete cryptographic data confidentiality algorithm that is not +# considered secure. It should not be used for anything anymore. The +# functionality needed to use WEP is available in the current hostapd +# release under this optional build parameter. This functionality is subject to +# be completely removed in a future release. +#CONFIG_WEP=y + +# Remove all TKIP functionality +# TKIP is an old cryptographic data confidentiality algorithm that is not +# considered secure. It should not be used anymore. For now, the default hostapd +# build includes this to allow mixed mode WPA+WPA2 networks to be enabled, but +# that functionality is subject to be removed in the future. +#CONFIG_NO_TKIP=y + +# Manually added options CONFIG_SAE=y +CONFIG_IEEE80211W=y diff --git a/config/menu/EX-asterisk.menu b/config/menu/EX-asterisk.menu deleted file mode 100644 index 506fb6d2f..000000000 --- a/config/menu/EX-asterisk.menu +++ /dev/null @@ -1,15 +0,0 @@ - $subipfire->{'31.asterisk'} = {'caption' => 'Asterisk Status', - 'uri' => '/cgi-bin/asterisk/status.cgi', - 'title' => 'Asterisk Status', - 'enabled' => 1, - }; - $subipfire->{'32.asterisk'} = {'caption' => 'Asterisk Config', - 'uri' => '/cgi-bin/asterisk/conf.cgi', - 'title' => 'Asterisk Config', - 'enabled' => 1, - }; - $subipfire->{'33.asterisk'} = {'caption' => 'Asterisk Calls', - 'uri' => '/cgi-bin/asterisk/calls.cgi', - 'title' => 'Asterisk Calls', - 'enabled' => 1, - }; diff --git a/config/rootfiles/common/aarch64/linux b/config/rootfiles/common/aarch64/linux index 7ffc70468..cbd3fcf4f 100644 --- a/config/rootfiles/common/aarch64/linux +++ b/config/rootfiles/common/aarch64/linux @@ -19823,6 +19823,7 @@ lib/modules/KVER-ipfire/kernel lib/modules/KVER-ipfire/modules.alias lib/modules/KVER-ipfire/modules.alias.bin lib/modules/KVER-ipfire/modules.builtin +lib/modules/KVER-ipfire/modules.builtin.alias.bin lib/modules/KVER-ipfire/modules.builtin.bin lib/modules/KVER-ipfire/modules.dep lib/modules/KVER-ipfire/modules.dep.bin diff --git a/config/rootfiles/common/acl b/config/rootfiles/common/acl index a217714aa..19ce21ca0 100644 --- a/config/rootfiles/common/acl +++ b/config/rootfiles/common/acl @@ -7,14 +7,22 @@ usr/bin/setfacl #usr/lib/libacl.la usr/lib/libacl.so usr/lib/libacl.so.1 -usr/lib/libacl.so.1.1.0 +usr/lib/libacl.so.1.1.2253 +#usr/lib/pkgconfig/libacl.pc #usr/share/doc/acl -#usr/share/doc/acl/CHANGES.gz +#usr/share/doc/acl/CHANGES #usr/share/doc/acl/COPYING #usr/share/doc/acl/COPYING.LGPL #usr/share/doc/acl/PORTING -#usr/share/doc/acl/README +#usr/share/doc/acl/extensions.txt +#usr/share/doc/acl/libacl.txt #usr/share/locale/de/LC_MESSAGES/acl.mo +#usr/share/locale/en@boldquot +#usr/share/locale/en@boldquot/LC_MESSAGES +#usr/share/locale/en(a)boldquot/LC_MESSAGES/acl.mo +#usr/share/locale/en@quot +#usr/share/locale/en@quot/LC_MESSAGES +#usr/share/locale/en(a)quot/LC_MESSAGES/acl.mo #usr/share/locale/es/LC_MESSAGES/acl.mo #usr/share/locale/fr/LC_MESSAGES/acl.mo #usr/share/locale/gl/LC_MESSAGES/acl.mo diff --git a/config/rootfiles/common/armv5tel/linux-multi b/config/rootfiles/common/armv5tel/linux-multi index 7d0eee919..b5df3ef34 100644 --- a/config/rootfiles/common/armv5tel/linux-multi +++ b/config/rootfiles/common/armv5tel/linux-multi @@ -20900,6 +20900,7 @@ lib/modules/KVER-ipfire-multi/kernel lib/modules/KVER-ipfire-multi/modules.alias lib/modules/KVER-ipfire-multi/modules.alias.bin lib/modules/KVER-ipfire-multi/modules.builtin +lib/modules/KVER-ipfire-multi/modules.builtin.alias.bin lib/modules/KVER-ipfire-multi/modules.builtin.bin lib/modules/KVER-ipfire-multi/modules.dep lib/modules/KVER-ipfire-multi/modules.dep.bin diff --git a/config/rootfiles/common/bind b/config/rootfiles/common/bind index e3f055b43..d18332bf4 100644 --- a/config/rootfiles/common/bind +++ b/config/rootfiles/common/bind @@ -122,6 +122,7 @@ usr/bin/nsupdate #usr/include/isc/boolean.h #usr/include/isc/buffer.h #usr/include/isc/bufferlist.h +#usr/include/isc/cmocka.h #usr/include/isc/commandline.h #usr/include/isc/condition.h #usr/include/isc/counter.h @@ -271,12 +272,12 @@ usr/lib/libbind9.so.161 usr/lib/libbind9.so.161.0.4 #usr/lib/libdns.la #usr/lib/libdns.so -usr/lib/libdns.so.1110 -usr/lib/libdns.so.1110.0.4 +usr/lib/libdns.so.1112 +usr/lib/libdns.so.1112.0.2 #usr/lib/libisc.la #usr/lib/libisc.so -usr/lib/libisc.so.1105 -usr/lib/libisc.so.1105.1.1 +usr/lib/libisc.so.1107 +usr/lib/libisc.so.1107.0.4 #usr/lib/libisccc.la #usr/lib/libisccc.so usr/lib/libisccc.so.161 diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot index 1027b5139..8c91ca5d5 100644 --- a/config/rootfiles/common/configroot +++ b/config/rootfiles/common/configroot @@ -51,8 +51,8 @@ var/ipfire/ethernet #var/ipfire/ethernet/vlans #var/ipfire/ethernet/wireless var/ipfire/extrahd -#var/ipfire/extrahd/bin -#var/ipfire/extrahd/bin/extrahd.pl +var/ipfire/extrahd/bin +var/ipfire/extrahd/bin/extrahd.pl #var/ipfire/extrahd/devices #var/ipfire/extrahd/partitions #var/ipfire/extrahd/scan diff --git a/config/rootfiles/common/curl b/config/rootfiles/common/curl index f4240065e..a542bd6c9 100644 --- a/config/rootfiles/common/curl +++ b/config/rootfiles/common/curl @@ -109,6 +109,7 @@ usr/lib/libcurl.so.4.7.0 #usr/share/man/man3/CURLOPT_ALTSVC_CTRL.3 #usr/share/man/man3/CURLOPT_APPEND.3 #usr/share/man/man3/CURLOPT_AUTOREFERER.3 +#usr/share/man/man3/CURLOPT_AWS_SIGV4.3 #usr/share/man/man3/CURLOPT_BUFFERSIZE.3 #usr/share/man/man3/CURLOPT_CAINFO.3 #usr/share/man/man3/CURLOPT_CAPATH.3 @@ -177,6 +178,12 @@ usr/lib/libcurl.so.4.7.0 #usr/share/man/man3/CURLOPT_HEADERDATA.3 #usr/share/man/man3/CURLOPT_HEADERFUNCTION.3 #usr/share/man/man3/CURLOPT_HEADEROPT.3 +#usr/share/man/man3/CURLOPT_HSTS.3 +#usr/share/man/man3/CURLOPT_HSTSREADDATA.3 +#usr/share/man/man3/CURLOPT_HSTSREADFUNCTION.3 +#usr/share/man/man3/CURLOPT_HSTSWRITEDATA.3 +#usr/share/man/man3/CURLOPT_HSTSWRITEFUNCTION.3 +#usr/share/man/man3/CURLOPT_HSTS_CTRL.3 #usr/share/man/man3/CURLOPT_HTTP09_ALLOWED.3 #usr/share/man/man3/CURLOPT_HTTP200ALIASES.3 #usr/share/man/man3/CURLOPT_HTTPAUTH.3 diff --git a/config/rootfiles/common/fcron b/config/rootfiles/common/fcron index fb4410f4d..30823b004 100644 --- a/config/rootfiles/common/fcron +++ b/config/rootfiles/common/fcron @@ -15,67 +15,67 @@ etc/fcron.weekly/info.txt usr/bin/fcronsighup usr/bin/fcrontab usr/sbin/fcron -#usr/share/doc/fcron-3.2.0 -#usr/share/doc/fcron-3.2.0/en -#usr/share/doc/fcron-3.2.0/en/HTML -#usr/share/doc/fcron-3.2.0/en/HTML/LEGALNOTICE.html -#usr/share/doc/fcron-3.2.0/en/HTML/changes.html -#usr/share/doc/fcron-3.2.0/en/HTML/faq.html -#usr/share/doc/fcron-3.2.0/en/HTML/fcron.8.html -#usr/share/doc/fcron-3.2.0/en/HTML/fcron.conf.5.html -#usr/share/doc/fcron-3.2.0/en/HTML/fcrondyn.1.html -#usr/share/doc/fcron-3.2.0/en/HTML/fcrontab.1.html -#usr/share/doc/fcron-3.2.0/en/HTML/fcrontab.5.html -#usr/share/doc/fcron-3.2.0/en/HTML/fdl.html -#usr/share/doc/fcron-3.2.0/en/HTML/gpl.html -#usr/share/doc/fcron-3.2.0/en/HTML/how-and-why.html -#usr/share/doc/fcron-3.2.0/en/HTML/index.html -#usr/share/doc/fcron-3.2.0/en/HTML/install.html -#usr/share/doc/fcron-3.2.0/en/HTML/manpages.html -#usr/share/doc/fcron-3.2.0/en/HTML/readme.html -#usr/share/doc/fcron-3.2.0/en/HTML/relnotes.html -#usr/share/doc/fcron-3.2.0/en/HTML/thanks.html -#usr/share/doc/fcron-3.2.0/en/HTML/todo.html -#usr/share/doc/fcron-3.2.0/en/HTML/using-fcron.html -#usr/share/doc/fcron-3.2.0/en/txt -#usr/share/doc/fcron-3.2.0/en/txt/changes.txt -#usr/share/doc/fcron-3.2.0/en/txt/faq.txt -#usr/share/doc/fcron-3.2.0/en/txt/gpl.txt -#usr/share/doc/fcron-3.2.0/en/txt/install.txt -#usr/share/doc/fcron-3.2.0/en/txt/readme.txt -#usr/share/doc/fcron-3.2.0/en/txt/relnotes.txt -#usr/share/doc/fcron-3.2.0/en/txt/thanks.txt -#usr/share/doc/fcron-3.2.0/en/txt/todo.txt -#usr/share/doc/fcron-3.2.0/fr -#usr/share/doc/fcron-3.2.0/fr/HTML -#usr/share/doc/fcron-3.2.0/fr/HTML/LEGALNOTICE.html -#usr/share/doc/fcron-3.2.0/fr/HTML/changes.html -#usr/share/doc/fcron-3.2.0/fr/HTML/faq.html -#usr/share/doc/fcron-3.2.0/fr/HTML/fcron.8.html -#usr/share/doc/fcron-3.2.0/fr/HTML/fcron.conf.5.html -#usr/share/doc/fcron-3.2.0/fr/HTML/fcrondyn.1.html -#usr/share/doc/fcron-3.2.0/fr/HTML/fcrontab.1.html -#usr/share/doc/fcron-3.2.0/fr/HTML/fcrontab.5.html -#usr/share/doc/fcron-3.2.0/fr/HTML/fdl.html -#usr/share/doc/fcron-3.2.0/fr/HTML/gpl.html -#usr/share/doc/fcron-3.2.0/fr/HTML/how-and-why.html -#usr/share/doc/fcron-3.2.0/fr/HTML/index.html -#usr/share/doc/fcron-3.2.0/fr/HTML/install.html -#usr/share/doc/fcron-3.2.0/fr/HTML/manpages.html -#usr/share/doc/fcron-3.2.0/fr/HTML/readme.html -#usr/share/doc/fcron-3.2.0/fr/HTML/relnotes.html -#usr/share/doc/fcron-3.2.0/fr/HTML/thanks.html -#usr/share/doc/fcron-3.2.0/fr/HTML/todo.html -#usr/share/doc/fcron-3.2.0/fr/HTML/using-fcron.html -#usr/share/doc/fcron-3.2.0/fr/txt -#usr/share/doc/fcron-3.2.0/fr/txt/changes.txt -#usr/share/doc/fcron-3.2.0/fr/txt/faq.txt -#usr/share/doc/fcron-3.2.0/fr/txt/gpl.txt -#usr/share/doc/fcron-3.2.0/fr/txt/install.txt -#usr/share/doc/fcron-3.2.0/fr/txt/readme.txt -#usr/share/doc/fcron-3.2.0/fr/txt/relnotes.txt -#usr/share/doc/fcron-3.2.0/fr/txt/thanks.txt -#usr/share/doc/fcron-3.2.0/fr/txt/todo.txt +#usr/share/doc/fcron-3.2.1 +#usr/share/doc/fcron-3.2.1/en +#usr/share/doc/fcron-3.2.1/en/HTML +#usr/share/doc/fcron-3.2.1/en/HTML/LEGALNOTICE.html +#usr/share/doc/fcron-3.2.1/en/HTML/changes.html +#usr/share/doc/fcron-3.2.1/en/HTML/faq.html +#usr/share/doc/fcron-3.2.1/en/HTML/fcron.8.html +#usr/share/doc/fcron-3.2.1/en/HTML/fcron.conf.5.html +#usr/share/doc/fcron-3.2.1/en/HTML/fcrondyn.1.html +#usr/share/doc/fcron-3.2.1/en/HTML/fcrontab.1.html +#usr/share/doc/fcron-3.2.1/en/HTML/fcrontab.5.html +#usr/share/doc/fcron-3.2.1/en/HTML/fdl.html +#usr/share/doc/fcron-3.2.1/en/HTML/gpl.html +#usr/share/doc/fcron-3.2.1/en/HTML/how-and-why.html +#usr/share/doc/fcron-3.2.1/en/HTML/index.html +#usr/share/doc/fcron-3.2.1/en/HTML/install.html +#usr/share/doc/fcron-3.2.1/en/HTML/manpages.html +#usr/share/doc/fcron-3.2.1/en/HTML/readme.html +#usr/share/doc/fcron-3.2.1/en/HTML/relnotes.html +#usr/share/doc/fcron-3.2.1/en/HTML/thanks.html +#usr/share/doc/fcron-3.2.1/en/HTML/todo.html +#usr/share/doc/fcron-3.2.1/en/HTML/using-fcron.html +#usr/share/doc/fcron-3.2.1/en/txt +#usr/share/doc/fcron-3.2.1/en/txt/changes.txt +#usr/share/doc/fcron-3.2.1/en/txt/faq.txt +#usr/share/doc/fcron-3.2.1/en/txt/gpl.txt +#usr/share/doc/fcron-3.2.1/en/txt/install.txt +#usr/share/doc/fcron-3.2.1/en/txt/readme.txt +#usr/share/doc/fcron-3.2.1/en/txt/relnotes.txt +#usr/share/doc/fcron-3.2.1/en/txt/thanks.txt +#usr/share/doc/fcron-3.2.1/en/txt/todo.txt +#usr/share/doc/fcron-3.2.1/fr +#usr/share/doc/fcron-3.2.1/fr/HTML +#usr/share/doc/fcron-3.2.1/fr/HTML/LEGALNOTICE.html +#usr/share/doc/fcron-3.2.1/fr/HTML/changes.html +#usr/share/doc/fcron-3.2.1/fr/HTML/faq.html +#usr/share/doc/fcron-3.2.1/fr/HTML/fcron.8.html +#usr/share/doc/fcron-3.2.1/fr/HTML/fcron.conf.5.html +#usr/share/doc/fcron-3.2.1/fr/HTML/fcrondyn.1.html +#usr/share/doc/fcron-3.2.1/fr/HTML/fcrontab.1.html +#usr/share/doc/fcron-3.2.1/fr/HTML/fcrontab.5.html +#usr/share/doc/fcron-3.2.1/fr/HTML/fdl.html +#usr/share/doc/fcron-3.2.1/fr/HTML/gpl.html +#usr/share/doc/fcron-3.2.1/fr/HTML/how-and-why.html +#usr/share/doc/fcron-3.2.1/fr/HTML/index.html +#usr/share/doc/fcron-3.2.1/fr/HTML/install.html +#usr/share/doc/fcron-3.2.1/fr/HTML/manpages.html +#usr/share/doc/fcron-3.2.1/fr/HTML/readme.html +#usr/share/doc/fcron-3.2.1/fr/HTML/relnotes.html +#usr/share/doc/fcron-3.2.1/fr/HTML/thanks.html +#usr/share/doc/fcron-3.2.1/fr/HTML/todo.html +#usr/share/doc/fcron-3.2.1/fr/HTML/using-fcron.html +#usr/share/doc/fcron-3.2.1/fr/txt +#usr/share/doc/fcron-3.2.1/fr/txt/changes.txt +#usr/share/doc/fcron-3.2.1/fr/txt/faq.txt +#usr/share/doc/fcron-3.2.1/fr/txt/gpl.txt +#usr/share/doc/fcron-3.2.1/fr/txt/install.txt +#usr/share/doc/fcron-3.2.1/fr/txt/readme.txt +#usr/share/doc/fcron-3.2.1/fr/txt/relnotes.txt +#usr/share/doc/fcron-3.2.1/fr/txt/thanks.txt +#usr/share/doc/fcron-3.2.1/fr/txt/todo.txt #usr/share/man/fr #usr/share/man/fr/man1 #usr/share/man/fr/man1/fcrondyn.1 diff --git a/config/rootfiles/common/findutils b/config/rootfiles/common/findutils index edb91a9bf..d9f9ad0b6 100644 --- a/config/rootfiles/common/findutils +++ b/config/rootfiles/common/findutils @@ -5,8 +5,6 @@ usr/bin/locate usr/bin/updatedb usr/bin/xargs #usr/lib/findutils -usr/lib/findutils/bigram -usr/lib/findutils/code usr/lib/findutils/frcode #usr/share/info/find-maint.info #usr/share/info/find.info @@ -17,4 +15,3 @@ usr/lib/findutils/frcode #usr/share/man/man1/updatedb.1 #usr/share/man/man1/xargs.1 #usr/share/man/man5/locatedb.5 -var/lib/locate diff --git a/config/rootfiles/common/fuse b/config/rootfiles/common/fuse index 2cd91cb0c..bae55b321 100644 --- a/config/rootfiles/common/fuse +++ b/config/rootfiles/common/fuse @@ -1,30 +1,38 @@ -#etc/rc.d/init.d/fuse -etc/udev/rules.d/99-fuse.rules -sbin/mount.fuse -usr/bin/fusermount -usr/bin/ulockmgr_server -#usr/include/fuse -#usr/include/fuse.h -#usr/include/fuse/cuse_lowlevel.h -#usr/include/fuse/fuse.h -#usr/include/fuse/fuse_common.h -#usr/include/fuse/fuse_common_compat.h -#usr/include/fuse/fuse_compat.h -#usr/include/fuse/fuse_lowlevel.h -#usr/include/fuse/fuse_lowlevel_compat.h -#usr/include/fuse/fuse_opt.h -#usr/include/ulockmgr.h -#usr/lib/libfuse.a -#usr/lib/libfuse.la -usr/lib/libfuse.so -usr/lib/libfuse.so.2 -usr/lib/libfuse.so.2.9.7 -#usr/lib/libulockmgr.a -#usr/lib/libulockmgr.la -usr/lib/libulockmgr.so -usr/lib/libulockmgr.so.1 -usr/lib/libulockmgr.so.1.0.1 -#usr/lib/pkgconfig/fuse.pc -#usr/share/man/man1/fusermount.1 -#usr/share/man/man1/ulockmgr_server.1 -#usr/share/man/man8/mount.fuse.8 +#etc/rc.d/init.d/fuse3 +#lib/udev/rules.d/99-fuse3.rules +etc/udev/rules.d/99-fuse3.rules +sbin/mount.fuse3 +usr/bin/fusermount3 +#usr/local/bin/fusermount3 +#usr/local/etc +#usr/local/etc/fuse.conf +#usr/local/include/fuse3 +#usr/local/include/fuse3/cuse_lowlevel.h +#usr/local/include/fuse3/fuse.h +#usr/local/include/fuse3/fuse_common.h +#usr/local/include/fuse3/fuse_log.h +#usr/local/include/fuse3/fuse_lowlevel.h +#usr/local/include/fuse3/fuse_opt.h +#usr/local/lib/libfuse3.so +#usr/local/lib/libfuse3.so.3 +#usr/local/lib/libfuse3.so.3.10.1 +#usr/local/lib/pkgconfig +#usr/local/lib/pkgconfig/fuse3.pc +#usr/local/sbin/mount.fuse3 +#usr/local/share/man/man1/fusermount3.1 +#usr/local/share/man/man8/mount.fuse3.8 +#etc/fuse.conf +#usr/include/fuse3 +#usr/include/fuse3/cuse_lowlevel.h +#usr/include/fuse3/fuse.h +#usr/include/fuse3/fuse_common.h +#usr/include/fuse3/fuse_log.h +#usr/include/fuse3/fuse_lowlevel.h +#usr/include/fuse3/fuse_opt.h +#usr/lib/libfuse3.so +usr/lib/libfuse3.so.3 +usr/lib/libfuse3.so.3.10.1 +#usr/lib/pkgconfig/fuse3.pc +#usr/sbin/mount.fuse3 +#usr/share/man/man1/fusermount3.1 +#usr/share/man/man8/mount.fuse3.8 diff --git a/config/rootfiles/common/i586/hyperscan b/config/rootfiles/common/i586/hyperscan index a091e22b5..006e0fff9 100644 --- a/config/rootfiles/common/i586/hyperscan +++ b/config/rootfiles/common/i586/hyperscan @@ -5,10 +5,10 @@ #usr/include/hs/hs_runtime.h #usr/lib/libhs.so usr/lib/libhs.so.5 -usr/lib/libhs.so.5.3.0 +usr/lib/libhs.so.5.4.0 usr/lib/libhs_runtime.so usr/lib/libhs_runtime.so.5 -usr/lib/libhs_runtime.so.5.3.0 +usr/lib/libhs_runtime.so.5.4.0 #usr/lib/pkgconfig/libhs.pc #usr/share/doc/hyperscan #usr/share/doc/hyperscan/examples diff --git a/config/rootfiles/common/i586/linux b/config/rootfiles/common/i586/linux index 06bf8c2da..4c2113823 100644 --- a/config/rootfiles/common/i586/linux +++ b/config/rootfiles/common/i586/linux @@ -21835,6 +21835,7 @@ lib/modules/KVER-ipfire/kernel lib/modules/KVER-ipfire/modules.alias lib/modules/KVER-ipfire/modules.alias.bin lib/modules/KVER-ipfire/modules.builtin +lib/modules/KVER-ipfire/modules.builtin.alias.bin lib/modules/KVER-ipfire/modules.builtin.bin lib/modules/KVER-ipfire/modules.dep lib/modules/KVER-ipfire/modules.dep.bin diff --git a/config/rootfiles/common/ipset b/config/rootfiles/common/ipset index b3fcb640b..84703391f 100644 --- a/config/rootfiles/common/ipset +++ b/config/rootfiles/common/ipset @@ -21,7 +21,7 @@ etc/ipset #usr/lib/libipset.la #usr/lib/libipset.so usr/lib/libipset.so.13 -usr/lib/libipset.so.13.1.0 +usr/lib/libipset.so.13.2.0 #usr/lib/pkgconfig/libipset.pc usr/sbin/ipset #usr/share/man/man3/libipset.3 diff --git a/config/rootfiles/common/iptables b/config/rootfiles/common/iptables index 2246ee17c..b8bf748a5 100644 --- a/config/rootfiles/common/iptables +++ b/config/rootfiles/common/iptables @@ -13,7 +13,7 @@ lib/libipq.so.0.0.0 #lib/libxtables.la lib/libxtables.so lib/libxtables.so.12 -lib/libxtables.so.12.3.0 +lib/libxtables.so.12.4.0 #lib/xtables lib/xtables/libip6t_DNAT.so lib/xtables/libip6t_DNPT.so @@ -133,6 +133,7 @@ sbin/ip6tables-apply sbin/ip6tables-restore sbin/ip6tables-save sbin/iptables +sbin/iptables-apply #sbin/iptables-legacy #sbin/iptables-legacy-restore #sbin/iptables-legacy-save diff --git a/config/rootfiles/common/kmod b/config/rootfiles/common/kmod index ff9cda26d..56806fd1f 100644 --- a/config/rootfiles/common/kmod +++ b/config/rootfiles/common/kmod @@ -9,6 +9,6 @@ sbin/rmmod #usr/lib/libkmod.la #usr/lib/libkmod.so usr/lib/libkmod.so.2 -usr/lib/libkmod.so.2.3.4 +usr/lib/libkmod.so.2.3.6 #usr/lib/pkgconfig/libkmod.pc #usr/share/bash-completion/completions/kmod diff --git a/config/rootfiles/common/libgcrypt b/config/rootfiles/common/libgcrypt index b22708afa..63af7e6b1 100644 --- a/config/rootfiles/common/libgcrypt +++ b/config/rootfiles/common/libgcrypt @@ -6,7 +6,7 @@ #usr/lib/libgcrypt.la #usr/lib/libgcrypt.so usr/lib/libgcrypt.so.20 -usr/lib/libgcrypt.so.20.2.6 +usr/lib/libgcrypt.so.20.3.1 #usr/lib/pkgconfig/libgcrypt.pc #usr/share/aclocal/libgcrypt.m4 #usr/share/info/gcrypt.info diff --git a/config/rootfiles/common/libgpg-error b/config/rootfiles/common/libgpg-error index 1b5b127b2..40ad003bc 100644 --- a/config/rootfiles/common/libgpg-error +++ b/config/rootfiles/common/libgpg-error @@ -7,7 +7,7 @@ usr/bin/gpg-error #usr/lib/libgpg-error.la #usr/lib/libgpg-error.so usr/lib/libgpg-error.so.0 -usr/lib/libgpg-error.so.0.29.0 +usr/lib/libgpg-error.so.0.31.1 #usr/lib/pkgconfig/gpg-error.pc #usr/share/aclocal/gpg-error.m4 #usr/share/aclocal/gpgrt.m4 diff --git a/config/rootfiles/common/lzip b/config/rootfiles/common/lzip new file mode 100644 index 000000000..730246a74 --- /dev/null +++ b/config/rootfiles/common/lzip @@ -0,0 +1,3 @@ +usr/bin/lzip +#usr/share/info/lzip.info +#usr/share/man/man1/lzip.1 diff --git a/config/rootfiles/common/meson b/config/rootfiles/common/meson new file mode 100644 index 000000000..a9c2d7ad0 --- /dev/null +++ b/config/rootfiles/common/meson @@ -0,0 +1,178 @@ +#usr/bin/meson +#usr/lib/python3.8/site-packages/meson-0.56.0-py3.8.egg-info +#usr/lib/python3.8/site-packages/meson-0.56.0-py3.8.egg-info/PKG-INFO +#usr/lib/python3.8/site-packages/meson-0.56.0-py3.8.egg-info/SOURCES.txt +#usr/lib/python3.8/site-packages/meson-0.56.0-py3.8.egg-info/dependency_links.txt +#usr/lib/python3.8/site-packages/meson-0.56.0-py3.8.egg-info/entry_points.txt +#usr/lib/python3.8/site-packages/meson-0.56.0-py3.8.egg-info/requires.txt +#usr/lib/python3.8/site-packages/meson-0.56.0-py3.8.egg-info/top_level.txt +#usr/lib/python3.8/site-packages/mesonbuild +#usr/lib/python3.8/site-packages/mesonbuild/__init__.py +#usr/lib/python3.8/site-packages/mesonbuild/_pathlib.py +#usr/lib/python3.8/site-packages/mesonbuild/arglist.py +#usr/lib/python3.8/site-packages/mesonbuild/ast +#usr/lib/python3.8/site-packages/mesonbuild/ast/__init__.py +#usr/lib/python3.8/site-packages/mesonbuild/ast/interpreter.py +#usr/lib/python3.8/site-packages/mesonbuild/ast/introspection.py +#usr/lib/python3.8/site-packages/mesonbuild/ast/postprocess.py +#usr/lib/python3.8/site-packages/mesonbuild/ast/printer.py +#usr/lib/python3.8/site-packages/mesonbuild/ast/visitor.py +#usr/lib/python3.8/site-packages/mesonbuild/backend +#usr/lib/python3.8/site-packages/mesonbuild/backend/__init__.py +#usr/lib/python3.8/site-packages/mesonbuild/backend/backends.py +#usr/lib/python3.8/site-packages/mesonbuild/backend/ninjabackend.py +#usr/lib/python3.8/site-packages/mesonbuild/backend/vs2010backend.py +#usr/lib/python3.8/site-packages/mesonbuild/backend/vs2015backend.py +#usr/lib/python3.8/site-packages/mesonbuild/backend/vs2017backend.py +#usr/lib/python3.8/site-packages/mesonbuild/backend/vs2019backend.py +#usr/lib/python3.8/site-packages/mesonbuild/backend/xcodebackend.py +#usr/lib/python3.8/site-packages/mesonbuild/build.py +#usr/lib/python3.8/site-packages/mesonbuild/cmake +#usr/lib/python3.8/site-packages/mesonbuild/cmake/__init__.py +#usr/lib/python3.8/site-packages/mesonbuild/cmake/client.py +#usr/lib/python3.8/site-packages/mesonbuild/cmake/common.py +#usr/lib/python3.8/site-packages/mesonbuild/cmake/executor.py +#usr/lib/python3.8/site-packages/mesonbuild/cmake/fileapi.py +#usr/lib/python3.8/site-packages/mesonbuild/cmake/generator.py +#usr/lib/python3.8/site-packages/mesonbuild/cmake/interpreter.py +#usr/lib/python3.8/site-packages/mesonbuild/cmake/toolchain.py +#usr/lib/python3.8/site-packages/mesonbuild/cmake/traceparser.py +#usr/lib/python3.8/site-packages/mesonbuild/compilers +#usr/lib/python3.8/site-packages/mesonbuild/compilers/__init__.py +#usr/lib/python3.8/site-packages/mesonbuild/compilers/c.py +#usr/lib/python3.8/site-packages/mesonbuild/compilers/c_function_attributes.py +#usr/lib/python3.8/site-packages/mesonbuild/compilers/compilers.py +#usr/lib/python3.8/site-packages/mesonbuild/compilers/cpp.py +#usr/lib/python3.8/site-packages/mesonbuild/compilers/cs.py +#usr/lib/python3.8/site-packages/mesonbuild/compilers/cuda.py +#usr/lib/python3.8/site-packages/mesonbuild/compilers/d.py +#usr/lib/python3.8/site-packages/mesonbuild/compilers/fortran.py +#usr/lib/python3.8/site-packages/mesonbuild/compilers/java.py +#usr/lib/python3.8/site-packages/mesonbuild/compilers/mixins +#usr/lib/python3.8/site-packages/mesonbuild/compilers/mixins/__init__.py +#usr/lib/python3.8/site-packages/mesonbuild/compilers/mixins/arm.py +#usr/lib/python3.8/site-packages/mesonbuild/compilers/mixins/c2000.py +#usr/lib/python3.8/site-packages/mesonbuild/compilers/mixins/ccrx.py +#usr/lib/python3.8/site-packages/mesonbuild/compilers/mixins/clang.py +#usr/lib/python3.8/site-packages/mesonbuild/compilers/mixins/clike.py +#usr/lib/python3.8/site-packages/mesonbuild/compilers/mixins/compcert.py +#usr/lib/python3.8/site-packages/mesonbuild/compilers/mixins/elbrus.py +#usr/lib/python3.8/site-packages/mesonbuild/compilers/mixins/emscripten.py +#usr/lib/python3.8/site-packages/mesonbuild/compilers/mixins/gnu.py +#usr/lib/python3.8/site-packages/mesonbuild/compilers/mixins/intel.py +#usr/lib/python3.8/site-packages/mesonbuild/compilers/mixins/islinker.py +#usr/lib/python3.8/site-packages/mesonbuild/compilers/mixins/pgi.py +#usr/lib/python3.8/site-packages/mesonbuild/compilers/mixins/visualstudio.py +#usr/lib/python3.8/site-packages/mesonbuild/compilers/mixins/xc16.py +#usr/lib/python3.8/site-packages/mesonbuild/compilers/objc.py +#usr/lib/python3.8/site-packages/mesonbuild/compilers/objcpp.py +#usr/lib/python3.8/site-packages/mesonbuild/compilers/rust.py +#usr/lib/python3.8/site-packages/mesonbuild/compilers/swift.py +#usr/lib/python3.8/site-packages/mesonbuild/compilers/vala.py +#usr/lib/python3.8/site-packages/mesonbuild/coredata.py +#usr/lib/python3.8/site-packages/mesonbuild/dependencies +#usr/lib/python3.8/site-packages/mesonbuild/dependencies/__init__.py +#usr/lib/python3.8/site-packages/mesonbuild/dependencies/base.py +#usr/lib/python3.8/site-packages/mesonbuild/dependencies/boost.py +#usr/lib/python3.8/site-packages/mesonbuild/dependencies/coarrays.py +#usr/lib/python3.8/site-packages/mesonbuild/dependencies/cuda.py +#usr/lib/python3.8/site-packages/mesonbuild/dependencies/dev.py +#usr/lib/python3.8/site-packages/mesonbuild/dependencies/hdf5.py +#usr/lib/python3.8/site-packages/mesonbuild/dependencies/misc.py +#usr/lib/python3.8/site-packages/mesonbuild/dependencies/mpi.py +#usr/lib/python3.8/site-packages/mesonbuild/dependencies/platform.py +#usr/lib/python3.8/site-packages/mesonbuild/dependencies/scalapack.py +#usr/lib/python3.8/site-packages/mesonbuild/dependencies/ui.py +#usr/lib/python3.8/site-packages/mesonbuild/depfile.py +#usr/lib/python3.8/site-packages/mesonbuild/envconfig.py +#usr/lib/python3.8/site-packages/mesonbuild/environment.py +#usr/lib/python3.8/site-packages/mesonbuild/interpreter.py +#usr/lib/python3.8/site-packages/mesonbuild/interpreterbase.py +#usr/lib/python3.8/site-packages/mesonbuild/linkers.py +#usr/lib/python3.8/site-packages/mesonbuild/mcompile.py +#usr/lib/python3.8/site-packages/mesonbuild/mconf.py +#usr/lib/python3.8/site-packages/mesonbuild/mdist.py +#usr/lib/python3.8/site-packages/mesonbuild/mesondata.py +#usr/lib/python3.8/site-packages/mesonbuild/mesonlib.py +#usr/lib/python3.8/site-packages/mesonbuild/mesonmain.py +#usr/lib/python3.8/site-packages/mesonbuild/minit.py +#usr/lib/python3.8/site-packages/mesonbuild/minstall.py +#usr/lib/python3.8/site-packages/mesonbuild/mintro.py +#usr/lib/python3.8/site-packages/mesonbuild/mlog.py +#usr/lib/python3.8/site-packages/mesonbuild/modules +#usr/lib/python3.8/site-packages/mesonbuild/modules/__init__.py +#usr/lib/python3.8/site-packages/mesonbuild/modules/cmake.py +#usr/lib/python3.8/site-packages/mesonbuild/modules/dlang.py +#usr/lib/python3.8/site-packages/mesonbuild/modules/fs.py +#usr/lib/python3.8/site-packages/mesonbuild/modules/gnome.py +#usr/lib/python3.8/site-packages/mesonbuild/modules/hotdoc.py +#usr/lib/python3.8/site-packages/mesonbuild/modules/i18n.py +#usr/lib/python3.8/site-packages/mesonbuild/modules/keyval.py +#usr/lib/python3.8/site-packages/mesonbuild/modules/modtest.py +#usr/lib/python3.8/site-packages/mesonbuild/modules/pkgconfig.py +#usr/lib/python3.8/site-packages/mesonbuild/modules/python.py +#usr/lib/python3.8/site-packages/mesonbuild/modules/python3.py +#usr/lib/python3.8/site-packages/mesonbuild/modules/qt.py +#usr/lib/python3.8/site-packages/mesonbuild/modules/qt4.py +#usr/lib/python3.8/site-packages/mesonbuild/modules/qt5.py +#usr/lib/python3.8/site-packages/mesonbuild/modules/rpm.py +#usr/lib/python3.8/site-packages/mesonbuild/modules/sourceset.py +#usr/lib/python3.8/site-packages/mesonbuild/modules/unstable_cuda.py +#usr/lib/python3.8/site-packages/mesonbuild/modules/unstable_external_project.py +#usr/lib/python3.8/site-packages/mesonbuild/modules/unstable_icestorm.py +#usr/lib/python3.8/site-packages/mesonbuild/modules/unstable_simd.py +#usr/lib/python3.8/site-packages/mesonbuild/modules/windows.py +#usr/lib/python3.8/site-packages/mesonbuild/mparser.py +#usr/lib/python3.8/site-packages/mesonbuild/msetup.py +#usr/lib/python3.8/site-packages/mesonbuild/msubprojects.py +#usr/lib/python3.8/site-packages/mesonbuild/mtest.py +#usr/lib/python3.8/site-packages/mesonbuild/munstable_coredata.py +#usr/lib/python3.8/site-packages/mesonbuild/optinterpreter.py +#usr/lib/python3.8/site-packages/mesonbuild/rewriter.py +#usr/lib/python3.8/site-packages/mesonbuild/scripts +#usr/lib/python3.8/site-packages/mesonbuild/scripts/__init__.py +#usr/lib/python3.8/site-packages/mesonbuild/scripts/clangformat.py +#usr/lib/python3.8/site-packages/mesonbuild/scripts/clangtidy.py +#usr/lib/python3.8/site-packages/mesonbuild/scripts/cleantrees.py +#usr/lib/python3.8/site-packages/mesonbuild/scripts/cmake_run_ctgt.py +#usr/lib/python3.8/site-packages/mesonbuild/scripts/commandrunner.py +#usr/lib/python3.8/site-packages/mesonbuild/scripts/coverage.py +#usr/lib/python3.8/site-packages/mesonbuild/scripts/delwithsuffix.py +#usr/lib/python3.8/site-packages/mesonbuild/scripts/depfixer.py +#usr/lib/python3.8/site-packages/mesonbuild/scripts/dirchanger.py +#usr/lib/python3.8/site-packages/mesonbuild/scripts/externalproject.py +#usr/lib/python3.8/site-packages/mesonbuild/scripts/gettext.py +#usr/lib/python3.8/site-packages/mesonbuild/scripts/gtkdochelper.py +#usr/lib/python3.8/site-packages/mesonbuild/scripts/hotdochelper.py +#usr/lib/python3.8/site-packages/mesonbuild/scripts/meson_exe.py +#usr/lib/python3.8/site-packages/mesonbuild/scripts/msgfmthelper.py +#usr/lib/python3.8/site-packages/mesonbuild/scripts/regen_checker.py +#usr/lib/python3.8/site-packages/mesonbuild/scripts/scanbuild.py +#usr/lib/python3.8/site-packages/mesonbuild/scripts/symbolextractor.py +#usr/lib/python3.8/site-packages/mesonbuild/scripts/tags.py +#usr/lib/python3.8/site-packages/mesonbuild/scripts/uninstall.py +#usr/lib/python3.8/site-packages/mesonbuild/scripts/vcstagger.py +#usr/lib/python3.8/site-packages/mesonbuild/scripts/yelphelper.py +#usr/lib/python3.8/site-packages/mesonbuild/templates +#usr/lib/python3.8/site-packages/mesonbuild/templates/__init__.py +#usr/lib/python3.8/site-packages/mesonbuild/templates/cpptemplates.py +#usr/lib/python3.8/site-packages/mesonbuild/templates/cstemplates.py +#usr/lib/python3.8/site-packages/mesonbuild/templates/ctemplates.py +#usr/lib/python3.8/site-packages/mesonbuild/templates/cudatemplates.py +#usr/lib/python3.8/site-packages/mesonbuild/templates/dlangtemplates.py +#usr/lib/python3.8/site-packages/mesonbuild/templates/fortrantemplates.py +#usr/lib/python3.8/site-packages/mesonbuild/templates/javatemplates.py +#usr/lib/python3.8/site-packages/mesonbuild/templates/mesontemplates.py +#usr/lib/python3.8/site-packages/mesonbuild/templates/objcpptemplates.py +#usr/lib/python3.8/site-packages/mesonbuild/templates/objctemplates.py +#usr/lib/python3.8/site-packages/mesonbuild/templates/rusttemplates.py +#usr/lib/python3.8/site-packages/mesonbuild/templates/samplefactory.py +#usr/lib/python3.8/site-packages/mesonbuild/templates/sampleimpl.py +#usr/lib/python3.8/site-packages/mesonbuild/wrap +#usr/lib/python3.8/site-packages/mesonbuild/wrap/__init__.py +#usr/lib/python3.8/site-packages/mesonbuild/wrap/wrap.py +#usr/lib/python3.8/site-packages/mesonbuild/wrap/wraptool.py +#usr/share/man/man1/meson.1 +#usr/share/polkit-1 +#usr/share/polkit-1/actions +#usr/share/polkit-1/actions/com.mesonbuild.install.policy diff --git a/config/rootfiles/common/misc-progs b/config/rootfiles/common/misc-progs index c48a474b2..d6594b3f8 100644 --- a/config/rootfiles/common/misc-progs +++ b/config/rootfiles/common/misc-progs @@ -1,5 +1,4 @@ usr/local/bin/addonctrl -#usr/local/bin/applejuicectrl usr/local/bin/backupctrl usr/local/bin/captivectrl #usr/local/bin/clamavctrl @@ -14,7 +13,6 @@ usr/local/bin/getipstat #usr/local/bin/iowrap usr/local/bin/ipfirereboot usr/local/bin/ipsecctrl -usr/local/bin/launch-ether-wake usr/local/bin/logwatch #usr/local/bin/mpfirectrl usr/local/bin/openvpnctrl @@ -34,7 +32,6 @@ usr/local/bin/timectrl #usr/local/bin/torctrl usr/local/bin/unboundctrl usr/local/bin/updxlratorctrl -usr/local/bin/upnpctrl usr/local/bin/urlfilterctrl #usr/local/bin/wiohelper #usr/local/bin/wioscan diff --git a/config/rootfiles/common/newt b/config/rootfiles/common/newt index 71e3d732c..5cc993d51 100644 --- a/config/rootfiles/common/newt +++ b/config/rootfiles/common/newt @@ -3,7 +3,7 @@ usr/bin/whiptail #usr/lib/libnewt.a #usr/lib/libnewt.so usr/lib/libnewt.so.0.52 -usr/lib/libnewt.so.0.52.18 +usr/lib/libnewt.so.0.52.21 #usr/lib/pkgconfig/libnewt.pc #usr/lib/python2.7/site-packages/_snack.so #usr/lib/python2.7/site-packages/snack.py @@ -15,8 +15,6 @@ usr/lib/libnewt.so.0.52.18 #usr/share/locale/as #usr/share/locale/as/LC_MESSAGES #usr/share/locale/as/LC_MESSAGES/newt.mo -#usr/share/locale/ast -#usr/share/locale/ast/LC_MESSAGES #usr/share/locale/ast/LC_MESSAGES/newt.mo #usr/share/locale/bal #usr/share/locale/bal/LC_MESSAGES @@ -66,6 +64,9 @@ usr/lib/libnewt.so.0.52.18 #usr/share/locale/id/LC_MESSAGES/newt.mo #usr/share/locale/it/LC_MESSAGES/newt.mo #usr/share/locale/ja/LC_MESSAGES/newt.mo +#usr/share/locale/ka +#usr/share/locale/ka/LC_MESSAGES +#usr/share/locale/ka/LC_MESSAGES/newt.mo #usr/share/locale/km #usr/share/locale/km/LC_MESSAGES #usr/share/locale/km/LC_MESSAGES/newt.mo @@ -77,8 +78,6 @@ usr/lib/libnewt.so.0.52.18 #usr/share/locale/ku/LC_MESSAGES #usr/share/locale/ku/LC_MESSAGES/newt.mo #usr/share/locale/lt/LC_MESSAGES/newt.mo -#usr/share/locale/lv -#usr/share/locale/lv/LC_MESSAGES #usr/share/locale/lv/LC_MESSAGES/newt.mo #usr/share/locale/mg #usr/share/locale/mg/LC_MESSAGES @@ -104,8 +103,6 @@ usr/lib/libnewt.so.0.52.18 #usr/share/locale/nn #usr/share/locale/nn/LC_MESSAGES #usr/share/locale/nn/LC_MESSAGES/newt.mo -#usr/share/locale/pa -#usr/share/locale/pa/LC_MESSAGES #usr/share/locale/pa/LC_MESSAGES/newt.mo #usr/share/locale/pl/LC_MESSAGES/newt.mo #usr/share/locale/pt/LC_MESSAGES/newt.mo @@ -120,8 +117,6 @@ usr/lib/libnewt.so.0.52.18 #usr/share/locale/sr@latin/LC_MESSAGES #usr/share/locale/sr(a)latin/LC_MESSAGES/newt.mo #usr/share/locale/sv/LC_MESSAGES/newt.mo -#usr/share/locale/ta -#usr/share/locale/ta/LC_MESSAGES #usr/share/locale/ta/LC_MESSAGES/newt.mo #usr/share/locale/te #usr/share/locale/te/LC_MESSAGES @@ -129,8 +124,6 @@ usr/lib/libnewt.so.0.52.18 #usr/share/locale/tg #usr/share/locale/tg/LC_MESSAGES #usr/share/locale/tg/LC_MESSAGES/newt.mo -#usr/share/locale/th -#usr/share/locale/th/LC_MESSAGES #usr/share/locale/th/LC_MESSAGES/newt.mo #usr/share/locale/tl #usr/share/locale/tl/LC_MESSAGES diff --git a/config/rootfiles/common/ninja b/config/rootfiles/common/ninja new file mode 100644 index 000000000..f402add1b --- /dev/null +++ b/config/rootfiles/common/ninja @@ -0,0 +1 @@ +#usr/bin/ninja diff --git a/config/rootfiles/common/pam b/config/rootfiles/common/pam index 0ca320f8f..e487e3fe2 100644 --- a/config/rootfiles/common/pam +++ b/config/rootfiles/common/pam @@ -2,6 +2,7 @@ etc/pam.d etc/security #etc/security/access.conf +#etc/security/faillock.conf #etc/security/group.conf #etc/security/limits.conf #etc/security/limits.d @@ -11,6 +12,7 @@ etc/security #etc/security/pam_env.conf #etc/security/time.conf #lib/security +#lib/security/faillock #lib/security/mkhomedir_helper #lib/security/pam_access.la lib/security/pam_access.so @@ -26,6 +28,8 @@ lib/security/pam_env.so lib/security/pam_exec.so #lib/security/pam_faildelay.la lib/security/pam_faildelay.so +#lib/security/pam_faillock.la +#lib/security/pam_faillock.so #lib/security/pam_filter #lib/security/pam_filter.la #lib/security/pam_filter.so @@ -56,6 +60,7 @@ lib/security/pam_mail.so #lib/security/pam_motd.so #lib/security/pam_namespace.la #lib/security/pam_namespace.so +#lib/security/pam_namespace_helper #lib/security/pam_nologin.la lib/security/pam_nologin.so #lib/security/pam_permit.la @@ -68,18 +73,14 @@ lib/security/pam_rhosts.so #lib/security/pam_rootok.so #lib/security/pam_securetty.la #lib/security/pam_securetty.so +#lib/security/pam_setquota.la +#lib/security/pam_setquota.so #lib/security/pam_shells.la lib/security/pam_shells.so #lib/security/pam_stress.la #lib/security/pam_stress.so #lib/security/pam_succeed_if.la #lib/security/pam_succeed_if.so -#lib/security/pam_tally -#lib/security/pam_tally.la -#lib/security/pam_tally.so -#lib/security/pam_tally2 -#lib/security/pam_tally2.la -#lib/security/pam_tally2.so #lib/security/pam_time.la #lib/security/pam_time.so #lib/security/pam_timestamp.la @@ -91,12 +92,15 @@ lib/security/pam_shells.so lib/security/pam_unix.so #lib/security/pam_userdb.la #lib/security/pam_userdb.so +#lib/security/pam_usertype.la +#lib/security/pam_usertype.so #lib/security/pam_warn.la #lib/security/pam_warn.so #lib/security/pam_wheel.la #lib/security/pam_wheel.so #lib/security/pam_xauth.la #lib/security/pam_xauth.so +#lib/security/pwhistory_helper lib/security/unix_chkpwd lib/security/unix_update #usr/include/security @@ -113,7 +117,7 @@ lib/security/unix_update #usr/lib/libpam.la #usr/lib/libpam.so usr/lib/libpam.so.0 -usr/lib/libpam.so.0.84.2 +usr/lib/libpam.so.0.85.1 #usr/lib/libpam_misc.la #usr/lib/libpam_misc.so usr/lib/libpam_misc.so.0 @@ -122,6 +126,9 @@ usr/lib/libpam_misc.so.0.82.1 #usr/lib/libpamc.so usr/lib/libpamc.so.0 usr/lib/libpamc.so.0.82.1 +#usr/lib/systemd +#usr/lib/systemd/system +#usr/lib/systemd/system/pam_namespace.service #usr/share/doc/Linux-PAM #usr/share/doc/Linux-PAM/draft-morgan-pam-current.txt #usr/share/doc/Linux-PAM/index.html @@ -170,6 +177,7 @@ usr/lib/libpamc.so.0.82.1 #usr/share/man/man3/pam_xauth_data.3 #usr/share/man/man5/access.conf.5 #usr/share/man/man5/environment.5 +#usr/share/man/man5/faillock.conf.5 #usr/share/man/man5/group.conf.5 #usr/share/man/man5/limits.conf.5 #usr/share/man/man5/namespace.conf.5 @@ -178,6 +186,7 @@ usr/lib/libpamc.so.0.82.1 #usr/share/man/man5/pam_env.conf.5 #usr/share/man/man5/time.conf.5 #usr/share/man/man8/PAM.8 +#usr/share/man/man8/faillock.8 #usr/share/man/man8/mkhomedir_helper.8 #usr/share/man/man8/pam.8 #usr/share/man/man8/pam_access.8 @@ -187,6 +196,7 @@ usr/lib/libpamc.so.0.82.1 #usr/share/man/man8/pam_env.8 #usr/share/man/man8/pam_exec.8 #usr/share/man/man8/pam_faildelay.8 +#usr/share/man/man8/pam_faillock.8 #usr/share/man/man8/pam_filter.8 #usr/share/man/man8/pam_ftp.8 #usr/share/man/man8/pam_group.8 @@ -201,24 +211,27 @@ usr/lib/libpamc.so.0.82.1 #usr/share/man/man8/pam_mkhomedir.8 #usr/share/man/man8/pam_motd.8 #usr/share/man/man8/pam_namespace.8 +#usr/share/man/man8/pam_namespace_helper.8 #usr/share/man/man8/pam_nologin.8 #usr/share/man/man8/pam_permit.8 #usr/share/man/man8/pam_pwhistory.8 #usr/share/man/man8/pam_rhosts.8 #usr/share/man/man8/pam_rootok.8 #usr/share/man/man8/pam_securetty.8 +#usr/share/man/man8/pam_setquota.8 #usr/share/man/man8/pam_shells.8 +#usr/share/man/man8/pam_stress.8 #usr/share/man/man8/pam_succeed_if.8 -#usr/share/man/man8/pam_tally.8 -#usr/share/man/man8/pam_tally2.8 #usr/share/man/man8/pam_time.8 #usr/share/man/man8/pam_timestamp.8 #usr/share/man/man8/pam_timestamp_check.8 #usr/share/man/man8/pam_umask.8 #usr/share/man/man8/pam_unix.8 #usr/share/man/man8/pam_userdb.8 +#usr/share/man/man8/pam_usertype.8 #usr/share/man/man8/pam_warn.8 #usr/share/man/man8/pam_wheel.8 #usr/share/man/man8/pam_xauth.8 +#usr/share/man/man8/pwhistory_helper.8 #usr/share/man/man8/unix_chkpwd.8 #usr/share/man/man8/unix_update.8 diff --git a/config/rootfiles/common/procps b/config/rootfiles/common/procps index 1f32be94a..fc7d9326e 100644 --- a/config/rootfiles/common/procps +++ b/config/rootfiles/common/procps @@ -1,36 +1,67 @@ bin/kill bin/ps -lib/libproc-3.2.8.so +#lib/libprocps.a +#lib/libprocps.la +#lib/libprocps.so +lib/libprocps.so.8 +lib/libprocps.so.8.0.2 +#lib/pkgconfig +#lib/pkgconfig/libprocps.pc sbin/sysctl usr/bin/free usr/bin/pgrep +usr/bin/pidof #usr/bin/pkill #usr/bin/pmap #usr/bin/pwdx -#usr/bin/skill #usr/bin/slabtop -#usr/bin/snice #usr/bin/tload usr/bin/top -usr/bin/uptime usr/bin/vmstat usr/bin/w usr/bin/watch +#usr/include/proc +#usr/include/proc/alloc.h +#usr/include/proc/devname.h +#usr/include/proc/escape.h +#usr/include/proc/numa.h +#usr/include/proc/procps.h +#usr/include/proc/pwcache.h +#usr/include/proc/readproc.h +#usr/include/proc/sig.h +#usr/include/proc/slab.h +#usr/include/proc/sysinfo.h +#usr/include/proc/version.h +#usr/include/proc/wchan.h +#usr/include/proc/whattime.h +#usr/share/doc/procps-ng +#usr/share/doc/procps-ng/FAQ +#usr/share/doc/procps-ng/bugs.md +#usr/share/locale/de/LC_MESSAGES/procps-ng.mo +#usr/share/locale/fr/LC_MESSAGES/procps-ng.mo +#usr/share/locale/pl/LC_MESSAGES/procps-ng.mo +#usr/share/locale/pt_BR/LC_MESSAGES/procps-ng.mo +#usr/share/locale/sv/LC_MESSAGES/procps-ng.mo +#usr/share/locale/uk/LC_MESSAGES/procps-ng.mo +#usr/share/locale/vi/LC_MESSAGES/procps-ng.mo +#usr/share/locale/zh_CN/LC_MESSAGES/procps-ng.mo #usr/share/man/man1/free.1 #usr/share/man/man1/kill.1 #usr/share/man/man1/pgrep.1 +#usr/share/man/man1/pidof.1 #usr/share/man/man1/pkill.1 #usr/share/man/man1/pmap.1 +#usr/share/man/man1/procps.1 #usr/share/man/man1/ps.1 #usr/share/man/man1/pwdx.1 -#usr/share/man/man1/skill.1 #usr/share/man/man1/slabtop.1 -#usr/share/man/man1/snice.1 #usr/share/man/man1/tload.1 #usr/share/man/man1/top.1 -#usr/share/man/man1/uptime.1 #usr/share/man/man1/w.1 #usr/share/man/man1/watch.1 +#usr/share/man/man3/openproc.3 +#usr/share/man/man3/readproc.3 +#usr/share/man/man3/readproctab.3 #usr/share/man/man5/sysctl.conf.5 #usr/share/man/man8/sysctl.8 #usr/share/man/man8/vmstat.8 diff --git a/config/rootfiles/common/screen b/config/rootfiles/common/screen index 6124db15f..b30c8ddb5 100644 --- a/config/rootfiles/common/screen +++ b/config/rootfiles/common/screen @@ -1,13 +1,6 @@ etc/screenrc usr/bin/screen -usr/bin/screen-4.2.1 -#usr/info/screen.info -#usr/info/screen.info-1 -#usr/info/screen.info-2 -#usr/info/screen.info-3 -#usr/info/screen.info-4 -#usr/info/screen.info-5 -#usr/man/man1/screen.1 +usr/bin/screen-4.8.0 #usr/share/info/screen.info #usr/share/man/man1/screen.1 #usr/share/screen diff --git a/config/rootfiles/common/sshfs b/config/rootfiles/common/sshfs index 2cafa3e24..579b938f5 100644 --- a/config/rootfiles/common/sshfs +++ b/config/rootfiles/common/sshfs @@ -1,2 +1,4 @@ usr/bin/sshfs +#usr/sbin/mount.fuse.sshfs +#usr/sbin/mount.sshfs #usr/share/man/man1/sshfs.1 diff --git a/config/rootfiles/common/sudo b/config/rootfiles/common/sudo index 860981890..babdcb484 100644 --- a/config/rootfiles/common/sudo +++ b/config/rootfiles/common/sudo @@ -1,13 +1,31 @@ +#etc/sudo.conf +#etc/sudo_logsrvd.conf etc/sudoers +#etc/sudoers.dist +#usr/bin/cvtsudoers usr/bin/sudo usr/bin/sudoedit usr/bin/sudoreplay #usr/include/sudo_plugin.h usr/lib/sudo +#usr/lib/sudo/audit_json.la +#usr/lib/sudo/audit_json.so +#usr/lib/sudo/group_file.la usr/lib/sudo/group_file.so +#usr/lib/sudo/libsudo_util.la +#usr/lib/sudo/libsudo_util.so +#usr/lib/sudo/libsudo_util.so.0 +usr/lib/sudo/libsudo_util.so.0.0.0 +#usr/lib/sudo/sample_approval.la +usr/lib/sudo/sample_approval.so +#usr/lib/sudo/sudo_noexec.la usr/lib/sudo/sudo_noexec.so +#usr/lib/sudo/sudoers.la usr/lib/sudo/sudoers.so +#usr/lib/sudo/system_group.la usr/lib/sudo/system_group.so +#usr/sbin/sudo_logsrvd +#usr/sbin/sudo_sendlog usr/sbin/visudo #usr/share/doc/sudo #usr/share/doc/sudo/CONTRIBUTORS @@ -18,17 +36,23 @@ usr/sbin/visudo #usr/share/doc/sudo/README #usr/share/doc/sudo/TROUBLESHOOTING #usr/share/doc/sudo/UPGRADE -#usr/share/doc/sudo/sample.pam -#usr/share/doc/sudo/sample.sudo.conf -#usr/share/doc/sudo/sample.sudoers -#usr/share/doc/sudo/sample.syslog.conf +#usr/share/doc/sudo/examples +#usr/share/doc/sudo/examples/pam.conf +#usr/share/doc/sudo/examples/sudo.conf +#usr/share/doc/sudo/examples/sudo_logsrvd.conf +#usr/share/doc/sudo/examples/sudoers +#usr/share/doc/sudo/examples/syslog.conf +#usr/share/locale/ast/LC_MESSAGES/sudo.mo +#usr/share/locale/ast/LC_MESSAGES/sudoers.mo #usr/share/locale/ca/LC_MESSAGES/sudo.mo +#usr/share/locale/ca/LC_MESSAGES/sudoers.mo #usr/share/locale/cs/LC_MESSAGES/sudo.mo #usr/share/locale/cs/LC_MESSAGES/sudoers.mo #usr/share/locale/da/LC_MESSAGES/sudo.mo #usr/share/locale/da/LC_MESSAGES/sudoers.mo #usr/share/locale/de/LC_MESSAGES/sudo.mo #usr/share/locale/de/LC_MESSAGES/sudoers.mo +#usr/share/locale/el/LC_MESSAGES/sudoers.mo #usr/share/locale/eo/LC_MESSAGES/sudo.mo #usr/share/locale/eo/LC_MESSAGES/sudoers.mo #usr/share/locale/es/LC_MESSAGES/sudo.mo @@ -37,21 +61,38 @@ usr/sbin/visudo #usr/share/locale/fi/LC_MESSAGES/sudo.mo #usr/share/locale/fi/LC_MESSAGES/sudoers.mo #usr/share/locale/fr/LC_MESSAGES/sudo.mo +#usr/share/locale/fr/LC_MESSAGES/sudoers.mo +#usr/share/locale/fur/LC_MESSAGES/sudo.mo +#usr/share/locale/fur/LC_MESSAGES/sudoers.mo #usr/share/locale/gl/LC_MESSAGES/sudo.mo #usr/share/locale/hr/LC_MESSAGES/sudo.mo #usr/share/locale/hr/LC_MESSAGES/sudoers.mo +#usr/share/locale/hu/LC_MESSAGES/sudo.mo +#usr/share/locale/hu/LC_MESSAGES/sudoers.mo #usr/share/locale/it/LC_MESSAGES/sudo.mo #usr/share/locale/it/LC_MESSAGES/sudoers.mo #usr/share/locale/ja/LC_MESSAGES/sudo.mo #usr/share/locale/ja/LC_MESSAGES/sudoers.mo +#usr/share/locale/ko/LC_MESSAGES/sudo.mo +#usr/share/locale/ko/LC_MESSAGES/sudoers.mo #usr/share/locale/lt/LC_MESSAGES/sudoers.mo +#usr/share/locale/nb/LC_MESSAGES/sudo.mo +#usr/share/locale/nb/LC_MESSAGES/sudoers.mo #usr/share/locale/nl/LC_MESSAGES/sudo.mo #usr/share/locale/nl/LC_MESSAGES/sudoers.mo +#usr/share/locale/nn/LC_MESSAGES/sudo.mo #usr/share/locale/pl/LC_MESSAGES/sudo.mo #usr/share/locale/pl/LC_MESSAGES/sudoers.mo +#usr/share/locale/pt/LC_MESSAGES/sudo.mo +#usr/share/locale/pt/LC_MESSAGES/sudoers.mo #usr/share/locale/pt_BR/LC_MESSAGES/sudo.mo #usr/share/locale/pt_BR/LC_MESSAGES/sudoers.mo +#usr/share/locale/ro/LC_MESSAGES/sudo.mo +#usr/share/locale/ro/LC_MESSAGES/sudoers.mo #usr/share/locale/ru/LC_MESSAGES/sudo.mo +#usr/share/locale/ru/LC_MESSAGES/sudoers.mo +#usr/share/locale/sk/LC_MESSAGES/sudo.mo +#usr/share/locale/sk/LC_MESSAGES/sudoers.mo #usr/share/locale/sl/LC_MESSAGES/sudo.mo #usr/share/locale/sl/LC_MESSAGES/sudoers.mo #usr/share/locale/sr/LC_MESSAGES/sudo.mo @@ -66,11 +107,20 @@ usr/sbin/visudo #usr/share/locale/vi/LC_MESSAGES/sudoers.mo #usr/share/locale/zh_CN/LC_MESSAGES/sudo.mo #usr/share/locale/zh_CN/LC_MESSAGES/sudoers.mo +#usr/share/locale/zh_TW/LC_MESSAGES/sudo.mo +#usr/share/locale/zh_TW/LC_MESSAGES/sudoers.mo +#usr/share/man/man1/cvtsudoers.1 #usr/share/man/man5/sudo.conf.5 +#usr/share/man/man5/sudo_logsrv.proto.5 +#usr/share/man/man5/sudo_logsrvd.conf.5 #usr/share/man/man5/sudoers.5 +#usr/share/man/man5/sudoers_timestamp.5 #usr/share/man/man8/sudo.8 +#usr/share/man/man8/sudo_logsrvd.8 #usr/share/man/man8/sudo_plugin.8 +#usr/share/man/man8/sudo_sendlog.8 #usr/share/man/man8/sudoedit.8 #usr/share/man/man8/sudoreplay.8 #usr/share/man/man8/visudo.8 var/db/sudo +#var/db/sudo/lectured diff --git a/config/rootfiles/common/unbound b/config/rootfiles/common/unbound index f24c4f136..45fee4460 100644 --- a/config/rootfiles/common/unbound +++ b/config/rootfiles/common/unbound @@ -11,7 +11,7 @@ etc/unbound/unbound.conf #usr/lib/libunbound.la #usr/lib/libunbound.so usr/lib/libunbound.so.8 -usr/lib/libunbound.so.8.1.10 +usr/lib/libunbound.so.8.1.11 #usr/lib/pkgconfig/libunbound.pc usr/sbin/unbound usr/sbin/unbound-anchor diff --git a/config/rootfiles/common/web-user-interface b/config/rootfiles/common/web-user-interface index 3eac4411a..9b2667676 100644 --- a/config/rootfiles/common/web-user-interface +++ b/config/rootfiles/common/web-user-interface @@ -1,10 +1,4 @@ srv/web/ipfire/cgi-bin/aliases.cgi -#srv/web/ipfire/cgi-bin/asterisk -#srv/web/ipfire/cgi-bin/asterisk/calls.cgi -#srv/web/ipfire/cgi-bin/asterisk/conf -#srv/web/ipfire/cgi-bin/asterisk/conf.cgi -#srv/web/ipfire/cgi-bin/asterisk/conf/telbook.conf -#srv/web/ipfire/cgi-bin/asterisk/status.cgi srv/web/ipfire/cgi-bin/atm-status.cgi srv/web/ipfire/cgi-bin/backup.cgi #srv/web/ipfire/cgi-bin/captive @@ -83,7 +77,6 @@ srv/web/ipfire/cgi-bin/time.cgi #srv/web/ipfire/cgi-bin/tor.cgi srv/web/ipfire/cgi-bin/traffic.cgi srv/web/ipfire/cgi-bin/updatexlrator.cgi -#srv/web/ipfire/cgi-bin/upnp.cgi srv/web/ipfire/cgi-bin/urlfilter.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi srv/web/ipfire/cgi-bin/vulnerabilities.cgi diff --git a/config/rootfiles/common/x86_64/hyperscan b/config/rootfiles/common/x86_64/hyperscan index a091e22b5..006e0fff9 100644 --- a/config/rootfiles/common/x86_64/hyperscan +++ b/config/rootfiles/common/x86_64/hyperscan @@ -5,10 +5,10 @@ #usr/include/hs/hs_runtime.h #usr/lib/libhs.so usr/lib/libhs.so.5 -usr/lib/libhs.so.5.3.0 +usr/lib/libhs.so.5.4.0 usr/lib/libhs_runtime.so usr/lib/libhs_runtime.so.5 -usr/lib/libhs_runtime.so.5.3.0 +usr/lib/libhs_runtime.so.5.4.0 #usr/lib/pkgconfig/libhs.pc #usr/share/doc/hyperscan #usr/share/doc/hyperscan/examples diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x86_64/linux index 37355bc18..06de3c089 100644 --- a/config/rootfiles/common/x86_64/linux +++ b/config/rootfiles/common/x86_64/linux @@ -21766,6 +21766,7 @@ lib/modules/KVER-ipfire/kernel lib/modules/KVER-ipfire/modules.alias lib/modules/KVER-ipfire/modules.alias.bin lib/modules/KVER-ipfire/modules.builtin +lib/modules/KVER-ipfire/modules.builtin.alias.bin lib/modules/KVER-ipfire/modules.builtin.bin lib/modules/KVER-ipfire/modules.dep lib/modules/KVER-ipfire/modules.dep.bin diff --git a/config/rootfiles/core/153/exclude b/config/rootfiles/core/154/exclude similarity index 100% rename from config/rootfiles/core/153/exclude rename to config/rootfiles/core/154/exclude diff --git a/config/rootfiles/core/154/filelists/acl b/config/rootfiles/core/154/filelists/acl new file mode 120000 index 000000000..d819f9c48 --- /dev/null +++ b/config/rootfiles/core/154/filelists/acl @@ -0,0 +1 @@ +../../../common/acl \ No newline at end of file diff --git a/config/rootfiles/core/154/filelists/arping b/config/rootfiles/core/154/filelists/arping new file mode 120000 index 000000000..5662e8d92 --- /dev/null +++ b/config/rootfiles/core/154/filelists/arping @@ -0,0 +1 @@ +../../../common/arping \ No newline at end of file diff --git a/config/rootfiles/core/154/filelists/bind b/config/rootfiles/core/154/filelists/bind new file mode 120000 index 000000000..48a0ebaef --- /dev/null +++ b/config/rootfiles/core/154/filelists/bind @@ -0,0 +1 @@ +../../../common/bind \ No newline at end of file diff --git a/config/rootfiles/core/154/filelists/ca-certificates b/config/rootfiles/core/154/filelists/ca-certificates new file mode 120000 index 000000000..320fea8f4 --- /dev/null +++ b/config/rootfiles/core/154/filelists/ca-certificates @@ -0,0 +1 @@ +../../../common/ca-certificates \ No newline at end of file diff --git a/config/rootfiles/core/153/filelists/curl b/config/rootfiles/core/154/filelists/curl similarity index 100% rename from config/rootfiles/core/153/filelists/curl rename to config/rootfiles/core/154/filelists/curl diff --git a/config/rootfiles/core/153/filelists/ddns b/config/rootfiles/core/154/filelists/ddns similarity index 100% rename from config/rootfiles/core/153/filelists/ddns rename to config/rootfiles/core/154/filelists/ddns diff --git a/config/rootfiles/core/154/filelists/dhcpcd b/config/rootfiles/core/154/filelists/dhcpcd new file mode 120000 index 000000000..1e799dabb --- /dev/null +++ b/config/rootfiles/core/154/filelists/dhcpcd @@ -0,0 +1 @@ +../../../common/dhcpcd \ No newline at end of file diff --git a/config/rootfiles/core/154/filelists/dma b/config/rootfiles/core/154/filelists/dma new file mode 120000 index 000000000..60f4682da --- /dev/null +++ b/config/rootfiles/core/154/filelists/dma @@ -0,0 +1 @@ +../../../common/dma \ No newline at end of file diff --git a/config/rootfiles/core/154/filelists/etherwake b/config/rootfiles/core/154/filelists/etherwake new file mode 120000 index 000000000..1bf1e6a54 --- /dev/null +++ b/config/rootfiles/core/154/filelists/etherwake @@ -0,0 +1 @@ +../../../common/etherwake \ No newline at end of file diff --git a/config/rootfiles/core/154/filelists/fcron b/config/rootfiles/core/154/filelists/fcron new file mode 120000 index 000000000..4a454ea21 --- /dev/null +++ b/config/rootfiles/core/154/filelists/fcron @@ -0,0 +1 @@ +../../../common/fcron \ No newline at end of file diff --git a/config/rootfiles/core/154/filelists/files b/config/rootfiles/core/154/filelists/files new file mode 100644 index 000000000..d8daaa25a --- /dev/null +++ b/config/rootfiles/core/154/filelists/files @@ -0,0 +1,33 @@ +etc/system-release +etc/issue +etc/os-release +etc/rc.d/init.d/functions +etc/rc.d/init.d/sshd +etc/rc.d/init.d/unbound +etc/rc.d/init.d/wlanclient +etc/unbound/unbound.conf +lib/udev/network-hotplug-bridges +opt/pakfire/lib/functions.sh +srv/web/ipfire/cgi-bin/country.cgi +srv/web/ipfire/cgi-bin/credits.cgi +srv/web/ipfire/cgi-bin/ddns.cgi +srv/web/ipfire/cgi-bin/dhcp.cgi +srv/web/ipfire/cgi-bin/extrahd.cgi +srv/web/ipfire/cgi-bin/gpl.cgi +srv/web/ipfire/cgi-bin/hardwaregraphs.cgi +srv/web/ipfire/cgi-bin/ids.cgi +srv/web/ipfire/cgi-bin/optionsfw.cgi +srv/web/ipfire/cgi-bin/pakfire.cgi +srv/web/ipfire/cgi-bin/remote.cgi +srv/web/ipfire/cgi-bin/services.cgi +srv/web/ipfire/cgi-bin/wakeonlan.cgi +srv/web/ipfire/cgi-bin/wirelessclient.cgi +usr/local/bin/ipsec-interfaces +usr/local/bin/sshctrl +usr/sbin/convert-snort +var/ipfire/extrahd/bin/extrahd.pl +var/ipfire/general-functions.pl +var/ipfire/ids-functions.pl +var/ipfire/network-functions.pl +var/ipfire/header.pl +var/ipfire/langs diff --git a/config/rootfiles/core/154/filelists/findutils b/config/rootfiles/core/154/filelists/findutils new file mode 120000 index 000000000..545280ac5 --- /dev/null +++ b/config/rootfiles/core/154/filelists/findutils @@ -0,0 +1 @@ +../../../common/findutils \ No newline at end of file diff --git a/config/rootfiles/core/154/filelists/fuse b/config/rootfiles/core/154/filelists/fuse new file mode 120000 index 000000000..570edaade --- /dev/null +++ b/config/rootfiles/core/154/filelists/fuse @@ -0,0 +1 @@ +../../../common/fuse \ No newline at end of file diff --git a/config/rootfiles/core/154/filelists/i586/hyperscan b/config/rootfiles/core/154/filelists/i586/hyperscan new file mode 120000 index 000000000..85730b04f --- /dev/null +++ b/config/rootfiles/core/154/filelists/i586/hyperscan @@ -0,0 +1 @@ +../../../../common/i586/hyperscan \ No newline at end of file diff --git a/config/rootfiles/core/154/filelists/iproute2 b/config/rootfiles/core/154/filelists/iproute2 new file mode 120000 index 000000000..05f0f71fb --- /dev/null +++ b/config/rootfiles/core/154/filelists/iproute2 @@ -0,0 +1 @@ +../../../common/iproute2 \ No newline at end of file diff --git a/config/rootfiles/core/154/filelists/ipset b/config/rootfiles/core/154/filelists/ipset new file mode 120000 index 000000000..2b43691f2 --- /dev/null +++ b/config/rootfiles/core/154/filelists/ipset @@ -0,0 +1 @@ +../../../common/ipset \ No newline at end of file diff --git a/config/rootfiles/core/154/filelists/iptables b/config/rootfiles/core/154/filelists/iptables new file mode 120000 index 000000000..8caf12bcc --- /dev/null +++ b/config/rootfiles/core/154/filelists/iptables @@ -0,0 +1 @@ +../../../common/iptables \ No newline at end of file diff --git a/config/rootfiles/core/154/filelists/iw b/config/rootfiles/core/154/filelists/iw new file mode 120000 index 000000000..7c58a2089 --- /dev/null +++ b/config/rootfiles/core/154/filelists/iw @@ -0,0 +1 @@ +../../../common/iw \ No newline at end of file diff --git a/config/rootfiles/core/154/filelists/kmod b/config/rootfiles/core/154/filelists/kmod new file mode 120000 index 000000000..0020e197e --- /dev/null +++ b/config/rootfiles/core/154/filelists/kmod @@ -0,0 +1 @@ +../../../common/kmod \ No newline at end of file diff --git a/config/rootfiles/core/153/filelists/knot b/config/rootfiles/core/154/filelists/knot similarity index 100% rename from config/rootfiles/core/153/filelists/knot rename to config/rootfiles/core/154/filelists/knot diff --git a/config/rootfiles/core/154/filelists/less b/config/rootfiles/core/154/filelists/less new file mode 120000 index 000000000..65c0e0771 --- /dev/null +++ b/config/rootfiles/core/154/filelists/less @@ -0,0 +1 @@ +../../../common/less \ No newline at end of file diff --git a/config/rootfiles/core/154/filelists/libgcrypt b/config/rootfiles/core/154/filelists/libgcrypt new file mode 120000 index 000000000..2df12a20e --- /dev/null +++ b/config/rootfiles/core/154/filelists/libgcrypt @@ -0,0 +1 @@ +../../../common/libgcrypt \ No newline at end of file diff --git a/config/rootfiles/core/154/filelists/libgpg-error b/config/rootfiles/core/154/filelists/libgpg-error new file mode 120000 index 000000000..cad431339 --- /dev/null +++ b/config/rootfiles/core/154/filelists/libgpg-error @@ -0,0 +1 @@ +../../../common/libgpg-error \ No newline at end of file diff --git a/config/rootfiles/core/153/filelists/libhtp b/config/rootfiles/core/154/filelists/libhtp similarity index 100% rename from config/rootfiles/core/153/filelists/libhtp rename to config/rootfiles/core/154/filelists/libhtp diff --git a/config/rootfiles/core/153/filelists/libloc b/config/rootfiles/core/154/filelists/libloc similarity index 100% rename from config/rootfiles/core/153/filelists/libloc rename to config/rootfiles/core/154/filelists/libloc diff --git a/config/rootfiles/core/154/filelists/logrotate b/config/rootfiles/core/154/filelists/logrotate new file mode 120000 index 000000000..bc192c05d --- /dev/null +++ b/config/rootfiles/core/154/filelists/logrotate @@ -0,0 +1 @@ +../../../common/logrotate \ No newline at end of file diff --git a/config/rootfiles/core/153/filelists/logwatch b/config/rootfiles/core/154/filelists/logwatch similarity index 100% rename from config/rootfiles/core/153/filelists/logwatch rename to config/rootfiles/core/154/filelists/logwatch diff --git a/config/rootfiles/core/154/filelists/lvm2 b/config/rootfiles/core/154/filelists/lvm2 new file mode 120000 index 000000000..d640870b7 --- /dev/null +++ b/config/rootfiles/core/154/filelists/lvm2 @@ -0,0 +1 @@ +../../../common/lvm2 \ No newline at end of file diff --git a/config/rootfiles/core/154/filelists/lzip b/config/rootfiles/core/154/filelists/lzip new file mode 120000 index 000000000..dd4b832b1 --- /dev/null +++ b/config/rootfiles/core/154/filelists/lzip @@ -0,0 +1 @@ +../../../common/lzip \ No newline at end of file diff --git a/config/rootfiles/core/154/filelists/newt b/config/rootfiles/core/154/filelists/newt new file mode 120000 index 000000000..fb3eb20c3 --- /dev/null +++ b/config/rootfiles/core/154/filelists/newt @@ -0,0 +1 @@ +../../../common/newt \ No newline at end of file diff --git a/config/rootfiles/core/154/filelists/pam b/config/rootfiles/core/154/filelists/pam new file mode 120000 index 000000000..660a1d80e --- /dev/null +++ b/config/rootfiles/core/154/filelists/pam @@ -0,0 +1 @@ +../../../common/pam \ No newline at end of file diff --git a/config/rootfiles/core/154/filelists/pptp b/config/rootfiles/core/154/filelists/pptp new file mode 120000 index 000000000..2b3dfadc0 --- /dev/null +++ b/config/rootfiles/core/154/filelists/pptp @@ -0,0 +1 @@ +../../../common/pptp \ No newline at end of file diff --git a/config/rootfiles/core/154/filelists/procps b/config/rootfiles/core/154/filelists/procps new file mode 120000 index 000000000..e17e8ed70 --- /dev/null +++ b/config/rootfiles/core/154/filelists/procps @@ -0,0 +1 @@ +../../../common/procps \ No newline at end of file diff --git a/config/rootfiles/core/154/filelists/sed b/config/rootfiles/core/154/filelists/sed new file mode 120000 index 000000000..fc5f5c6d6 --- /dev/null +++ b/config/rootfiles/core/154/filelists/sed @@ -0,0 +1 @@ +../../../common/sed \ No newline at end of file diff --git a/config/rootfiles/core/154/filelists/setup b/config/rootfiles/core/154/filelists/setup new file mode 120000 index 000000000..209374bbc --- /dev/null +++ b/config/rootfiles/core/154/filelists/setup @@ -0,0 +1 @@ +../../../common/setup \ No newline at end of file diff --git a/config/rootfiles/core/154/filelists/sqlite b/config/rootfiles/core/154/filelists/sqlite new file mode 120000 index 000000000..4ea569766 --- /dev/null +++ b/config/rootfiles/core/154/filelists/sqlite @@ -0,0 +1 @@ +../../../common/sqlite \ No newline at end of file diff --git a/config/rootfiles/core/154/filelists/sudo b/config/rootfiles/core/154/filelists/sudo new file mode 120000 index 000000000..0d3c45e04 --- /dev/null +++ b/config/rootfiles/core/154/filelists/sudo @@ -0,0 +1 @@ +../../../common/sudo \ No newline at end of file diff --git a/config/rootfiles/core/154/filelists/tar b/config/rootfiles/core/154/filelists/tar new file mode 120000 index 000000000..3e585d2eb --- /dev/null +++ b/config/rootfiles/core/154/filelists/tar @@ -0,0 +1 @@ +../../../common/tar \ No newline at end of file diff --git a/config/rootfiles/core/153/filelists/tzdata b/config/rootfiles/core/154/filelists/tzdata similarity index 100% rename from config/rootfiles/core/153/filelists/tzdata rename to config/rootfiles/core/154/filelists/tzdata diff --git a/config/rootfiles/core/154/filelists/unbound b/config/rootfiles/core/154/filelists/unbound new file mode 120000 index 000000000..66adf0924 --- /dev/null +++ b/config/rootfiles/core/154/filelists/unbound @@ -0,0 +1 @@ +../../../common/unbound \ No newline at end of file diff --git a/config/rootfiles/core/154/filelists/wpa_supplicant b/config/rootfiles/core/154/filelists/wpa_supplicant new file mode 120000 index 000000000..1d04c03c0 --- /dev/null +++ b/config/rootfiles/core/154/filelists/wpa_supplicant @@ -0,0 +1 @@ +../../../common/wpa_supplicant \ No newline at end of file diff --git a/config/rootfiles/core/154/filelists/x86_64/hyperscan b/config/rootfiles/core/154/filelists/x86_64/hyperscan new file mode 120000 index 000000000..ee1858dca --- /dev/null +++ b/config/rootfiles/core/154/filelists/x86_64/hyperscan @@ -0,0 +1 @@ +../../../../common/x86_64/hyperscan \ No newline at end of file diff --git a/config/rootfiles/core/154/update.sh b/config/rootfiles/core/154/update.sh new file mode 100644 index 000000000..143f828c7 --- /dev/null +++ b/config/rootfiles/core/154/update.sh @@ -0,0 +1,74 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 3 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2020 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=154 + +# Remove old core updates from pakfire cache to save space... +for (( i=1; i<=$core; i++ )); do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# Remove files +rm -vf \ + /usr/local/bin/launch-ether-wake \ + /usr/local/bin/upnpctrl + +# Stop services + +# Extract files +extract_files + +# update linker config +ldconfig + +# Manually set capabilities +setcap cap_net_raw+ep /usr/sbin/etherwake + +# Update Language cache +/usr/local/bin/update-lang-cache + +# Filesytem cleanup +/usr/local/bin/filesystem-cleanup + +# Start services +/etc/init.d/unbound restart + +# This update needs a reboot... +#touch /var/run/need_reboot + +# Finish +/etc/init.d/fireinfo start +sendprofile + +# Update grub config to display new core version +if [ -e /boot/grub/grub.cfg ]; then + grub-mkconfig -o /boot/grub/grub.cfg +fi + +sync + +# Don't report the exitcode last command +exit 0 diff --git a/config/rootfiles/oldcore/153/exclude b/config/rootfiles/oldcore/153/exclude new file mode 100644 index 000000000..818039f4a --- /dev/null +++ b/config/rootfiles/oldcore/153/exclude @@ -0,0 +1,34 @@ +boot/config.txt +boot/grub/grub.cfg +boot/grub/grubenv +etc/alternatives +etc/collectd.custom +etc/default/grub +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/shadow +etc/snort/snort.conf +etc/ssl/openssl.cnf +etc/sudoers +etc/sysconfig/firewall.local +etc/sysconfig/rc.local +etc/udev/rules.d/30-persistent-network.rules +srv/web/ipfire/html/proxy.pac +usr/share/xt_geoip +var/ipfire/dma +var/ipfire/time +var/ipfire/firewall/locationblock +var/ipfire/fwhosts/customlocationgrp +var/ipfire/ovpn +var/ipfire/urlfilter/blacklist +var/ipfire/urlfilter/settings +var/lib/alternatives +var/lib/location/database.db +var/log/cache +var/log/dhcpcd.log +var/log/messages +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/core/153/filelists/aarch64/linux b/config/rootfiles/oldcore/153/filelists/aarch64/linux similarity index 100% rename from config/rootfiles/core/153/filelists/aarch64/linux rename to config/rootfiles/oldcore/153/filelists/aarch64/linux diff --git a/config/rootfiles/core/153/filelists/aarch64/linux-initrd b/config/rootfiles/oldcore/153/filelists/aarch64/linux-initrd similarity index 100% rename from config/rootfiles/core/153/filelists/aarch64/linux-initrd rename to config/rootfiles/oldcore/153/filelists/aarch64/linux-initrd diff --git a/config/rootfiles/core/153/filelists/armv5tel/linux-initrd-multi b/config/rootfiles/oldcore/153/filelists/armv5tel/linux-initrd-multi similarity index 100% rename from config/rootfiles/core/153/filelists/armv5tel/linux-initrd-multi rename to config/rootfiles/oldcore/153/filelists/armv5tel/linux-initrd-multi diff --git a/config/rootfiles/core/153/filelists/armv5tel/linux-multi b/config/rootfiles/oldcore/153/filelists/armv5tel/linux-multi similarity index 100% rename from config/rootfiles/core/153/filelists/armv5tel/linux-multi rename to config/rootfiles/oldcore/153/filelists/armv5tel/linux-multi diff --git a/config/rootfiles/core/153/filelists/bash b/config/rootfiles/oldcore/153/filelists/bash similarity index 100% rename from config/rootfiles/core/153/filelists/bash rename to config/rootfiles/oldcore/153/filelists/bash diff --git a/config/rootfiles/oldcore/153/filelists/curl b/config/rootfiles/oldcore/153/filelists/curl new file mode 120000 index 000000000..4b84bef53 --- /dev/null +++ b/config/rootfiles/oldcore/153/filelists/curl @@ -0,0 +1 @@ +../../../common/curl \ No newline at end of file diff --git a/config/rootfiles/oldcore/153/filelists/ddns b/config/rootfiles/oldcore/153/filelists/ddns new file mode 120000 index 000000000..739516420 --- /dev/null +++ b/config/rootfiles/oldcore/153/filelists/ddns @@ -0,0 +1 @@ +../../../common/ddns \ No newline at end of file diff --git a/config/rootfiles/core/153/filelists/file b/config/rootfiles/oldcore/153/filelists/file similarity index 100% rename from config/rootfiles/core/153/filelists/file rename to config/rootfiles/oldcore/153/filelists/file diff --git a/config/rootfiles/core/153/filelists/files b/config/rootfiles/oldcore/153/filelists/files similarity index 100% rename from config/rootfiles/core/153/filelists/files rename to config/rootfiles/oldcore/153/filelists/files diff --git a/config/rootfiles/core/153/filelists/hwdata b/config/rootfiles/oldcore/153/filelists/hwdata similarity index 100% rename from config/rootfiles/core/153/filelists/hwdata rename to config/rootfiles/oldcore/153/filelists/hwdata diff --git a/config/rootfiles/core/153/filelists/i586/intel-microcode b/config/rootfiles/oldcore/153/filelists/i586/intel-microcode similarity index 100% rename from config/rootfiles/core/153/filelists/i586/intel-microcode rename to config/rootfiles/oldcore/153/filelists/i586/intel-microcode diff --git a/config/rootfiles/core/153/filelists/i586/linux b/config/rootfiles/oldcore/153/filelists/i586/linux similarity index 100% rename from config/rootfiles/core/153/filelists/i586/linux rename to config/rootfiles/oldcore/153/filelists/i586/linux diff --git a/config/rootfiles/core/153/filelists/i586/linux-initrd b/config/rootfiles/oldcore/153/filelists/i586/linux-initrd similarity index 100% rename from config/rootfiles/core/153/filelists/i586/linux-initrd rename to config/rootfiles/oldcore/153/filelists/i586/linux-initrd diff --git a/config/rootfiles/core/153/filelists/i586/openssl-sse2 b/config/rootfiles/oldcore/153/filelists/i586/openssl-sse2 similarity index 100% rename from config/rootfiles/core/153/filelists/i586/openssl-sse2 rename to config/rootfiles/oldcore/153/filelists/i586/openssl-sse2 diff --git a/config/rootfiles/core/153/filelists/ids-ruleset-sources b/config/rootfiles/oldcore/153/filelists/ids-ruleset-sources similarity index 100% rename from config/rootfiles/core/153/filelists/ids-ruleset-sources rename to config/rootfiles/oldcore/153/filelists/ids-ruleset-sources diff --git a/config/rootfiles/oldcore/153/filelists/knot b/config/rootfiles/oldcore/153/filelists/knot new file mode 120000 index 000000000..28e96f878 --- /dev/null +++ b/config/rootfiles/oldcore/153/filelists/knot @@ -0,0 +1 @@ +../../../common/knot \ No newline at end of file diff --git a/config/rootfiles/core/153/filelists/libarchive b/config/rootfiles/oldcore/153/filelists/libarchive similarity index 100% rename from config/rootfiles/core/153/filelists/libarchive rename to config/rootfiles/oldcore/153/filelists/libarchive diff --git a/config/rootfiles/oldcore/153/filelists/libhtp b/config/rootfiles/oldcore/153/filelists/libhtp new file mode 120000 index 000000000..676e2c5e8 --- /dev/null +++ b/config/rootfiles/oldcore/153/filelists/libhtp @@ -0,0 +1 @@ +../../../common/libhtp \ No newline at end of file diff --git a/config/rootfiles/oldcore/153/filelists/libloc b/config/rootfiles/oldcore/153/filelists/libloc new file mode 120000 index 000000000..ff4a92429 --- /dev/null +++ b/config/rootfiles/oldcore/153/filelists/libloc @@ -0,0 +1 @@ +../../../common/libloc \ No newline at end of file diff --git a/config/rootfiles/oldcore/153/filelists/logwatch b/config/rootfiles/oldcore/153/filelists/logwatch new file mode 120000 index 000000000..f14eabda9 --- /dev/null +++ b/config/rootfiles/oldcore/153/filelists/logwatch @@ -0,0 +1 @@ +../../../common/logwatch \ No newline at end of file diff --git a/config/rootfiles/core/153/filelists/openssl b/config/rootfiles/oldcore/153/filelists/openssl similarity index 100% rename from config/rootfiles/core/153/filelists/openssl rename to config/rootfiles/oldcore/153/filelists/openssl diff --git a/config/rootfiles/core/153/filelists/openvpn b/config/rootfiles/oldcore/153/filelists/openvpn similarity index 100% rename from config/rootfiles/core/153/filelists/openvpn rename to config/rootfiles/oldcore/153/filelists/openvpn diff --git a/config/rootfiles/core/153/filelists/strongswan b/config/rootfiles/oldcore/153/filelists/strongswan similarity index 100% rename from config/rootfiles/core/153/filelists/strongswan rename to config/rootfiles/oldcore/153/filelists/strongswan diff --git a/config/rootfiles/core/153/filelists/suricata b/config/rootfiles/oldcore/153/filelists/suricata similarity index 100% rename from config/rootfiles/core/153/filelists/suricata rename to config/rootfiles/oldcore/153/filelists/suricata diff --git a/config/rootfiles/oldcore/153/filelists/tzdata b/config/rootfiles/oldcore/153/filelists/tzdata new file mode 120000 index 000000000..5a6e3252f --- /dev/null +++ b/config/rootfiles/oldcore/153/filelists/tzdata @@ -0,0 +1 @@ +../../../common/tzdata \ No newline at end of file diff --git a/config/rootfiles/core/153/filelists/usb_modeswitch b/config/rootfiles/oldcore/153/filelists/usb_modeswitch similarity index 100% rename from config/rootfiles/core/153/filelists/usb_modeswitch rename to config/rootfiles/oldcore/153/filelists/usb_modeswitch diff --git a/config/rootfiles/core/153/filelists/usb_modeswitch_data b/config/rootfiles/oldcore/153/filelists/usb_modeswitch_data similarity index 100% rename from config/rootfiles/core/153/filelists/usb_modeswitch_data rename to config/rootfiles/oldcore/153/filelists/usb_modeswitch_data diff --git a/config/rootfiles/core/153/filelists/x86_64/intel-microcode b/config/rootfiles/oldcore/153/filelists/x86_64/intel-microcode similarity index 100% rename from config/rootfiles/core/153/filelists/x86_64/intel-microcode rename to config/rootfiles/oldcore/153/filelists/x86_64/intel-microcode diff --git a/config/rootfiles/core/153/filelists/x86_64/linux b/config/rootfiles/oldcore/153/filelists/x86_64/linux similarity index 100% rename from config/rootfiles/core/153/filelists/x86_64/linux rename to config/rootfiles/oldcore/153/filelists/x86_64/linux diff --git a/config/rootfiles/core/153/filelists/x86_64/linux-initrd b/config/rootfiles/oldcore/153/filelists/x86_64/linux-initrd similarity index 100% rename from config/rootfiles/core/153/filelists/x86_64/linux-initrd rename to config/rootfiles/oldcore/153/filelists/x86_64/linux-initrd diff --git a/config/rootfiles/core/153/update.sh b/config/rootfiles/oldcore/153/update.sh similarity index 100% rename from config/rootfiles/core/153/update.sh rename to config/rootfiles/oldcore/153/update.sh diff --git a/config/rootfiles/packages/7zip b/config/rootfiles/packages/7zip index f56e95c8c..a5d5ed607 100644 --- a/config/rootfiles/packages/7zip +++ b/config/rootfiles/packages/7zip @@ -9,102 +9,105 @@ usr/lib/p7zip/7za usr/lib/p7zip/7zr usr/lib/p7zip/Codecs usr/lib/p7zip/Codecs/Rar.so -#usr/share/doc/p7zip-16.02 -#usr/share/doc/p7zip-16.02/ChangeLog -#usr/share/doc/p7zip-16.02/DOC -#usr/share/doc/p7zip-16.02/DOC/7zC.txt -#usr/share/doc/p7zip-16.02/DOC/7zFormat.txt -#usr/share/doc/p7zip-16.02/DOC/License.txt -#usr/share/doc/p7zip-16.02/DOC/MANUAL -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/commands -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/commands/add.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/commands/bench.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/commands/delete.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/commands/extract.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/commands/extract_full.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/commands/hash.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/commands/index.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/commands/list.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/commands/rename.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/commands/style.css -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/commands/test.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/commands/update.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/exit_codes.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/index.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/style.css -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/ar_exclude.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/ar_include.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/ar_no.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/bb.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/bs.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/charset.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/exclude.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/include.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/index.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/large_pages.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/list_tech.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/method.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/output_dir.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/overwrite.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/password.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/recurse.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/sa.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/scc.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/scrc.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/sdel.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/sfx.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/shared.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/sni.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/sns.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/spf.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/ssc.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/stdin.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/stdout.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/stl.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/stop_switch.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/stx.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/style.css -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/type.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/update.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/volume.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/working_dir.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/yes.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/syntax.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/fm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/fm/about.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/fm/benchmark.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/fm/index.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/fm/menu.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/fm/options.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/fm/plugins -#usr/share/doc/p7zip-16.02/DOC/MANUAL/fm/plugins/7-zip -#usr/share/doc/p7zip-16.02/DOC/MANUAL/fm/plugins/7-zip/add.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/fm/plugins/7-zip/extract.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/fm/plugins/7-zip/index.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/fm/plugins/7-zip/style.css -#usr/share/doc/p7zip-16.02/DOC/MANUAL/fm/plugins/index.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/fm/plugins/style.css -#usr/share/doc/p7zip-16.02/DOC/MANUAL/fm/style.css -#usr/share/doc/p7zip-16.02/DOC/MANUAL/general -#usr/share/doc/p7zip-16.02/DOC/MANUAL/general/7z.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/general/faq.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/general/formats.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/general/index.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/general/license.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/general/performance.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/general/style.css -#usr/share/doc/p7zip-16.02/DOC/MANUAL/general/thanks.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/start.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/style.css -#usr/share/doc/p7zip-16.02/DOC/Methods.txt -#usr/share/doc/p7zip-16.02/DOC/copying.txt -#usr/share/doc/p7zip-16.02/DOC/lzma.txt -#usr/share/doc/p7zip-16.02/DOC/readme.txt -#usr/share/doc/p7zip-16.02/DOC/src-history.txt -#usr/share/doc/p7zip-16.02/DOC/unRarLicense.txt -#usr/share/doc/p7zip-16.02/README -#usr/share/man/man1/7z.1 -#usr/share/man/man1/7za.1 -#usr/share/man/man1/7zr.1 +#usr/share/doc/p7zip-17.03 +#usr/share/doc/p7zip-17.03/ChangeLog +#usr/share/doc/p7zip-17.03/DOC +#usr/share/doc/p7zip-17.03/DOC/7zC.txt +#usr/share/doc/p7zip-17.03/DOC/7zFormat.txt +#usr/share/doc/p7zip-17.03/DOC/License.txt +#usr/share/doc/p7zip-17.03/DOC/MANUAL +#usr/share/doc/p7zip-17.03/DOC/MANUAL/7-zip.chm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/commands +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/commands/add.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/commands/bench.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/commands/delete.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/commands/extract.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/commands/extract_full.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/commands/hash.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/commands/index.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/commands/list.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/commands/rename.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/commands/style.css +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/commands/test.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/commands/update.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/exit_codes.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/index.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/style.css +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/ar_exclude.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/ar_include.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/ar_no.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/bb.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/bs.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/charset.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/exclude.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/include.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/index.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/large_pages.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/list_tech.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/method.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/output_dir.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/overwrite.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/password.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/recurse.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/sa.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/scc.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/scrc.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/sdel.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/sfx.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/shared.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/sni.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/sns.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/spf.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/ssc.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/stdin.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/stdout.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/stl.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/stop_switch.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/stx.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/style.css +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/type.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/update.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/volume.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/working_dir.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/yes.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/syntax.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/fm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/fm/about.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/fm/benchmark.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/fm/index.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/fm/menu.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/fm/options.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/fm/plugins +#usr/share/doc/p7zip-17.03/DOC/MANUAL/fm/plugins/7-zip +#usr/share/doc/p7zip-17.03/DOC/MANUAL/fm/plugins/7-zip/add.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/fm/plugins/7-zip/extract.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/fm/plugins/7-zip/index.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/fm/plugins/7-zip/style.css +#usr/share/doc/p7zip-17.03/DOC/MANUAL/fm/plugins/index.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/fm/plugins/style.css +#usr/share/doc/p7zip-17.03/DOC/MANUAL/fm/style.css +#usr/share/doc/p7zip-17.03/DOC/MANUAL/general +#usr/share/doc/p7zip-17.03/DOC/MANUAL/general/7z.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/general/faq.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/general/formats.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/general/index.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/general/license.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/general/performance.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/general/style.css +#usr/share/doc/p7zip-17.03/DOC/MANUAL/general/thanks.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/start.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/style.css +#usr/share/doc/p7zip-17.03/DOC/Methods.txt +#usr/share/doc/p7zip-17.03/DOC/Struct.EAP +#usr/share/doc/p7zip-17.03/DOC/Struct.ldb +#usr/share/doc/p7zip-17.03/DOC/copying.txt +#usr/share/doc/p7zip-17.03/DOC/lzma.txt +#usr/share/doc/p7zip-17.03/DOC/readme.txt +#usr/share/doc/p7zip-17.03/DOC/src-history.txt +#usr/share/doc/p7zip-17.03/DOC/unRarLicense.txt +#usr/share/doc/p7zip-17.03/README +#usr/share/man/man1/7z.1.gz +#usr/share/man/man1/7za.1.gz +#usr/share/man/man1/7zr.1.gz \ No newline at end of file diff --git a/config/rootfiles/packages/aarch64/samba b/config/rootfiles/packages/aarch64/samba index 9d88cbacf..c0995904c 100644 --- a/config/rootfiles/packages/aarch64/samba +++ b/config/rootfiles/packages/aarch64/samba @@ -268,6 +268,7 @@ usr/lib/python3.8/site-packages/samba/dcerpc/witness.cpython-38-aarch64-linux-gn usr/lib/python3.8/site-packages/samba/dcerpc/wkssvc.cpython-38-aarch64-linux-gnu.so usr/lib/python3.8/site-packages/samba/dcerpc/xattr.cpython-38-aarch64-linux-gnu.so usr/lib/python3.8/site-packages/samba/descriptor.py +usr/lib/python3.8/site-packages/samba/dnsresolver.py usr/lib/python3.8/site-packages/samba/dnsserver.py usr/lib/python3.8/site-packages/samba/domain_update.py usr/lib/python3.8/site-packages/samba/drs_utils.py @@ -788,6 +789,7 @@ usr/lib/security/pam_winbind.so usr/libexec/samba/smbspool_krb5_wrapper usr/sbin/eventlogadm usr/sbin/nmbd +usr/sbin/samba-change-password usr/sbin/samba-gpupdate usr/sbin/smbd usr/sbin/winbindd @@ -797,6 +799,7 @@ var/ipfire/samba/global #var/ipfire/samba/private var/ipfire/samba/private/secrets.tdb var/ipfire/samba/private/smbpasswd +var/ipfire/samba/samba-change-password var/ipfire/samba/settings var/ipfire/samba/shares var/ipfire/samba/smb.conf diff --git a/config/rootfiles/packages/armv5tel/samba b/config/rootfiles/packages/armv5tel/samba index fa039f604..78b2a1d97 100644 --- a/config/rootfiles/packages/armv5tel/samba +++ b/config/rootfiles/packages/armv5tel/samba @@ -268,6 +268,7 @@ usr/lib/python3.8/site-packages/samba/dcerpc/witness.cpython-38-arm-linux-gnueab usr/lib/python3.8/site-packages/samba/dcerpc/wkssvc.cpython-38-arm-linux-gnueabi.so usr/lib/python3.8/site-packages/samba/dcerpc/xattr.cpython-38-arm-linux-gnueabi.so usr/lib/python3.8/site-packages/samba/descriptor.py +usr/lib/python3.8/site-packages/samba/dnsresolver.py usr/lib/python3.8/site-packages/samba/dnsserver.py usr/lib/python3.8/site-packages/samba/domain_update.py usr/lib/python3.8/site-packages/samba/drs_utils.py @@ -788,6 +789,7 @@ usr/lib/security/pam_winbind.so usr/libexec/samba/smbspool_krb5_wrapper usr/sbin/eventlogadm usr/sbin/nmbd +usr/sbin/samba-change-password usr/sbin/samba-gpupdate usr/sbin/smbd usr/sbin/winbindd @@ -797,6 +799,7 @@ var/ipfire/samba/global #var/ipfire/samba/private var/ipfire/samba/private/secrets.tdb var/ipfire/samba/private/smbpasswd +var/ipfire/samba/samba-change-password var/ipfire/samba/settings var/ipfire/samba/shares var/ipfire/samba/smb.conf diff --git a/config/rootfiles/packages/bacula b/config/rootfiles/packages/bacula index bb766fb07..e9313d083 100644 --- a/config/rootfiles/packages/bacula +++ b/config/rootfiles/packages/bacula @@ -1,7 +1,7 @@ #etc/bacula #etc/bacula/bacula #etc/bacula/bacula-ctl-dir -etc/bacula/bacula-ctl-fd +#etc/bacula/bacula-ctl-fd #etc/bacula/bacula-ctl-sd etc/bacula/bacula-fd.conf #etc/bacula/bacula-tray-monitor.desktop @@ -21,13 +21,13 @@ etc/rc.d/init.d/bacula #opt/bacula #opt/bacula/log #usr/lib/bpipe-fd.so -usr/lib/libbac-9.6.6.so +usr/lib/libbac-9.6.7.so #usr/lib/libbac.la usr/lib/libbac.so -usr/lib/libbaccfg-9.6.6.so +usr/lib/libbaccfg-9.6.7.so #usr/lib/libbaccfg.la usr/lib/libbaccfg.so -usr/lib/libbacfind-9.6.6.so +usr/lib/libbacfind-9.6.7.so #usr/lib/libbacfind.la usr/lib/libbacfind.so #usr/sbin/bacula diff --git a/config/rootfiles/packages/c-ares b/config/rootfiles/packages/c-ares new file mode 100644 index 000000000..6027768f3 --- /dev/null +++ b/config/rootfiles/packages/c-ares @@ -0,0 +1,68 @@ +#usr/include/ares.h +#usr/include/ares_build.h +#usr/include/ares_dns.h +#usr/include/ares_rules.h +#usr/include/ares_version.h +#usr/lib/libcares.la +#usr/lib/libcares.so +usr/lib/libcares.so.2 +usr/lib/libcares.so.2.4.2 +#usr/lib/pkgconfig/libcares.pc +#usr/share/man/man3/ares_cancel.3 +#usr/share/man/man3/ares_create_query.3 +#usr/share/man/man3/ares_destroy.3 +#usr/share/man/man3/ares_destroy_options.3 +#usr/share/man/man3/ares_dup.3 +#usr/share/man/man3/ares_expand_name.3 +#usr/share/man/man3/ares_expand_string.3 +#usr/share/man/man3/ares_fds.3 +#usr/share/man/man3/ares_free_data.3 +#usr/share/man/man3/ares_free_hostent.3 +#usr/share/man/man3/ares_free_string.3 +#usr/share/man/man3/ares_freeaddrinfo.3 +#usr/share/man/man3/ares_get_servers.3 +#usr/share/man/man3/ares_get_servers_ports.3 +#usr/share/man/man3/ares_getaddrinfo.3 +#usr/share/man/man3/ares_gethostbyaddr.3 +#usr/share/man/man3/ares_gethostbyname.3 +#usr/share/man/man3/ares_gethostbyname_file.3 +#usr/share/man/man3/ares_getnameinfo.3 +#usr/share/man/man3/ares_getsock.3 +#usr/share/man/man3/ares_inet_ntop.3 +#usr/share/man/man3/ares_inet_pton.3 +#usr/share/man/man3/ares_init.3 +#usr/share/man/man3/ares_init_options.3 +#usr/share/man/man3/ares_library_cleanup.3 +#usr/share/man/man3/ares_library_init.3 +#usr/share/man/man3/ares_library_init_android.3 +#usr/share/man/man3/ares_library_initialized.3 +#usr/share/man/man3/ares_mkquery.3 +#usr/share/man/man3/ares_parse_a_reply.3 +#usr/share/man/man3/ares_parse_aaaa_reply.3 +#usr/share/man/man3/ares_parse_caa_reply.3 +#usr/share/man/man3/ares_parse_mx_reply.3 +#usr/share/man/man3/ares_parse_naptr_reply.3 +#usr/share/man/man3/ares_parse_ns_reply.3 +#usr/share/man/man3/ares_parse_ptr_reply.3 +#usr/share/man/man3/ares_parse_soa_reply.3 +#usr/share/man/man3/ares_parse_srv_reply.3 +#usr/share/man/man3/ares_parse_txt_reply.3 +#usr/share/man/man3/ares_process.3 +#usr/share/man/man3/ares_query.3 +#usr/share/man/man3/ares_save_options.3 +#usr/share/man/man3/ares_search.3 +#usr/share/man/man3/ares_send.3 +#usr/share/man/man3/ares_set_local_dev.3 +#usr/share/man/man3/ares_set_local_ip4.3 +#usr/share/man/man3/ares_set_local_ip6.3 +#usr/share/man/man3/ares_set_servers.3 +#usr/share/man/man3/ares_set_servers_csv.3 +#usr/share/man/man3/ares_set_servers_ports.3 +#usr/share/man/man3/ares_set_servers_ports_csv.3 +#usr/share/man/man3/ares_set_socket_callback.3 +#usr/share/man/man3/ares_set_socket_configure_callback.3 +#usr/share/man/man3/ares_set_socket_functions.3 +#usr/share/man/man3/ares_set_sortlist.3 +#usr/share/man/man3/ares_strerror.3 +#usr/share/man/man3/ares_timeout.3 +#usr/share/man/man3/ares_version.3 diff --git a/config/rootfiles/packages/cifs-utils b/config/rootfiles/packages/cifs-utils index e26e37e88..fe8109a62 100644 --- a/config/rootfiles/packages/cifs-utils +++ b/config/rootfiles/packages/cifs-utils @@ -1,3 +1,9 @@ sbin/mount.cifs +sbin/mount.smb3 +#usr/local/bin/smb2-quota +#usr/local/bin/smbinfo #usr/local/include/cifsidmap.h +#usr/local/share/man/man1/smb2-quota.1 +#usr/local/share/man/man1/smbinfo.1 #usr/local/share/man/man8/mount.cifs.8 +#usr/local/share/man/man8/mount.smb3.8 diff --git a/config/rootfiles/packages/cups-filters b/config/rootfiles/packages/cups-filters index 0c31d52f0..285eb9d3a 100644 --- a/config/rootfiles/packages/cups-filters +++ b/config/rootfiles/packages/cups-filters @@ -7,6 +7,7 @@ etc/rc.d/init.d/cups-browsed #etc/rc5.d/K35cups-browsed #etc/rc5.d/S82cups-browsed usr/bin/driverless +usr/bin/driverless-fax usr/bin/foomatic-rip usr/bin/ttfread #usr/include/cupsfilters @@ -27,10 +28,12 @@ usr/bin/ttfread usr/lib/cups/backend/beh usr/lib/cups/backend/cups-brf usr/lib/cups/backend/driverless +usr/lib/cups/backend/driverless-fax usr/lib/cups/backend/implicitclass usr/lib/cups/backend/parallel usr/lib/cups/backend/serial usr/lib/cups/driver/driverless +usr/lib/cups/driver/driverless-fax usr/lib/cups/filter/bannertopdf usr/lib/cups/filter/brftoembosser usr/lib/cups/filter/brftopagedbrf diff --git a/config/rootfiles/packages/dbus b/config/rootfiles/packages/dbus index 219676841..abcb6c695 100644 --- a/config/rootfiles/packages/dbus +++ b/config/rootfiles/packages/dbus @@ -41,7 +41,7 @@ usr/bin/dbus-uuidgen #usr/lib/libdbus-1.la usr/lib/libdbus-1.so usr/lib/libdbus-1.so.3 -usr/lib/libdbus-1.so.3.16.4 +usr/lib/libdbus-1.so.3.19.13 #usr/lib/pkgconfig/dbus-1.pc usr/libexec/dbus-daemon-launch-helper #usr/share/dbus-1 diff --git a/config/rootfiles/packages/ddrescue b/config/rootfiles/packages/ddrescue index 3d0a0b9af..a3d8f5911 100644 --- a/config/rootfiles/packages/ddrescue +++ b/config/rootfiles/packages/ddrescue @@ -1,3 +1,5 @@ usr/bin/ddrescue +usr/bin/ddrescuelog #usr/share/info/ddrescue.info #usr/share/man/man1/ddrescue.1 +#usr/share/man/man1/ddrescuelog.1 diff --git a/config/rootfiles/packages/elfutils b/config/rootfiles/packages/elfutils index e5b1124a5..05cb542ac 100644 --- a/config/rootfiles/packages/elfutils +++ b/config/rootfiles/packages/elfutils @@ -1,5 +1,6 @@ usr/bin/eu-addr2line usr/bin/eu-ar +usr/bin/eu-elfclassify usr/bin/eu-elfcmp usr/bin/eu-elfcompress usr/bin/eu-elflint @@ -22,52 +23,19 @@ usr/bin/eu-unstrip #usr/include/elfutils/libdw.h #usr/include/elfutils/libdwelf.h #usr/include/elfutils/libdwfl.h -#usr/include/elfutils/libebl.h #usr/include/elfutils/version.h #usr/include/gelf.h #usr/include/libelf.h #usr/include/nlist.h -usr/lib/elfutils -usr/lib/elfutils/libebl_aarch64-0.176.so -#usr/lib/elfutils/libebl_aarch64.so -usr/lib/elfutils/libebl_alpha-0.176.so -#usr/lib/elfutils/libebl_alpha.so -usr/lib/elfutils/libebl_arm-0.176.so -#usr/lib/elfutils/libebl_arm.so -usr/lib/elfutils/libebl_bpf-0.176.so -#usr/lib/elfutils/libebl_bpf.so -usr/lib/elfutils/libebl_i386-0.176.so -#usr/lib/elfutils/libebl_i386.so -usr/lib/elfutils/libebl_ia64-0.176.so -#usr/lib/elfutils/libebl_ia64.so -usr/lib/elfutils/libebl_m68k-0.176.so -#usr/lib/elfutils/libebl_m68k.so -usr/lib/elfutils/libebl_ppc-0.176.so -#usr/lib/elfutils/libebl_ppc.so -usr/lib/elfutils/libebl_ppc64-0.176.so -#usr/lib/elfutils/libebl_ppc64.so -usr/lib/elfutils/libebl_riscv-0.176.so -#usr/lib/elfutils/libebl_riscv.so -usr/lib/elfutils/libebl_s390-0.176.so -#usr/lib/elfutils/libebl_s390.so -usr/lib/elfutils/libebl_sh-0.176.so -#usr/lib/elfutils/libebl_sh.so -usr/lib/elfutils/libebl_sparc-0.176.so -#usr/lib/elfutils/libebl_sparc.so -usr/lib/elfutils/libebl_tilegx-0.176.so -#usr/lib/elfutils/libebl_tilegx.so -usr/lib/elfutils/libebl_x86_64-0.176.so -#usr/lib/elfutils/libebl_x86_64.so -usr/lib/libasm-0.176.so +usr/lib/libasm-0.182.so #usr/lib/libasm.a usr/lib/libasm.so usr/lib/libasm.so.1 -usr/lib/libdw-0.176.so +usr/lib/libdw-0.182.so #usr/lib/libdw.a usr/lib/libdw.so usr/lib/libdw.so.1 -#usr/lib/libebl.a -usr/lib/libelf-0.176.so +usr/lib/libelf-0.182.so #usr/lib/libelf.a usr/lib/libelf.so usr/lib/libelf.so.1 @@ -80,3 +48,9 @@ usr/lib/libelf.so.1 #usr/share/locale/ja/LC_MESSAGES/elfutils.mo #usr/share/locale/pl/LC_MESSAGES/elfutils.mo #usr/share/locale/uk/LC_MESSAGES/elfutils.mo +#usr/share/man/man1/eu-elfclassify.1 +#usr/share/man/man1/eu-readelf.1 +#usr/share/man/man3/elf_begin.3 +#usr/share/man/man3/elf_clone.3 +#usr/share/man/man3/elf_getdata.3 +#usr/share/man/man3/elf_update.3 \ No newline at end of file diff --git a/config/rootfiles/packages/fireperf b/config/rootfiles/packages/fireperf new file mode 100644 index 000000000..e69de29bb diff --git a/config/rootfiles/packages/hplip b/config/rootfiles/packages/hplip index 424af5860..e0d2a1b1f 100644 --- a/config/rootfiles/packages/hplip +++ b/config/rootfiles/packages/hplip @@ -1,40 +1,40 @@ -#usr/share/doc/hplip-3.18.6 -#usr/share/doc/hplip-3.18.6/COPYING -#usr/share/doc/hplip-3.18.6/README_LIBJPG -#usr/share/doc/hplip-3.18.6/commandline.html -#usr/share/doc/hplip-3.18.6/copying.html -#usr/share/doc/hplip-3.18.6/copyright -#usr/share/doc/hplip-3.18.6/devicemanager.html -#usr/share/doc/hplip-3.18.6/faxtrouble.html -#usr/share/doc/hplip-3.18.6/gettinghelp.html -#usr/share/doc/hplip-3.18.6/hpscan.html -#usr/share/doc/hplip-3.18.6/images -#usr/share/doc/hplip-3.18.6/images/favicon.ico -#usr/share/doc/hplip-3.18.6/images/print.png -#usr/share/doc/hplip-3.18.6/images/toolbox_actions.png -#usr/share/doc/hplip-3.18.6/images/toolbox_fax.png -#usr/share/doc/hplip-3.18.6/images/toolbox_print_control.png -#usr/share/doc/hplip-3.18.6/images/toolbox_print_settings.png -#usr/share/doc/hplip-3.18.6/images/toolbox_status.png -#usr/share/doc/hplip-3.18.6/images/toolbox_supplies.png -#usr/share/doc/hplip-3.18.6/images/xsane.png -#usr/share/doc/hplip-3.18.6/index.html -#usr/share/doc/hplip-3.18.6/mainttask.html -#usr/share/doc/hplip-3.18.6/plugins.html -#usr/share/doc/hplip-3.18.6/print.html -#usr/share/doc/hplip-3.18.6/printing.html -#usr/share/doc/hplip-3.18.6/printoptions.html -#usr/share/doc/hplip-3.18.6/printtroubleshooting.html -#usr/share/doc/hplip-3.18.6/scanning.html -#usr/share/doc/hplip-3.18.6/scantrouble.html -#usr/share/doc/hplip-3.18.6/sendfax.html -#usr/share/doc/hplip-3.18.6/setup.html -#usr/share/doc/hplip-3.18.6/styles -#usr/share/doc/hplip-3.18.6/styles/css.css -#usr/share/doc/hplip-3.18.6/systray.html -#usr/share/doc/hplip-3.18.6/troubleshooting.html -#usr/share/doc/hplip-3.18.6/uninstalling.html -#usr/share/doc/hplip-3.18.6/upgrading.html +#usr/share/doc/hplip-3.20.11 +#usr/share/doc/hplip-3.20.11/COPYING +#usr/share/doc/hplip-3.20.11/README_LIBJPG +#usr/share/doc/hplip-3.20.11/commandline.html +#usr/share/doc/hplip-3.20.11/copying.html +#usr/share/doc/hplip-3.20.11/copyright +#usr/share/doc/hplip-3.20.11/devicemanager.html +#usr/share/doc/hplip-3.20.11/faxtrouble.html +#usr/share/doc/hplip-3.20.11/gettinghelp.html +#usr/share/doc/hplip-3.20.11/hpscan.html +#usr/share/doc/hplip-3.20.11/images +#usr/share/doc/hplip-3.20.11/images/favicon.ico +#usr/share/doc/hplip-3.20.11/images/print.png +#usr/share/doc/hplip-3.20.11/images/toolbox_actions.png +#usr/share/doc/hplip-3.20.11/images/toolbox_fax.png +#usr/share/doc/hplip-3.20.11/images/toolbox_print_control.png +#usr/share/doc/hplip-3.20.11/images/toolbox_print_settings.png +#usr/share/doc/hplip-3.20.11/images/toolbox_status.png +#usr/share/doc/hplip-3.20.11/images/toolbox_supplies.png +#usr/share/doc/hplip-3.20.11/images/xsane.png +#usr/share/doc/hplip-3.20.11/index.html +#usr/share/doc/hplip-3.20.11/mainttask.html +#usr/share/doc/hplip-3.20.11/plugins.html +#usr/share/doc/hplip-3.20.11/print.html +#usr/share/doc/hplip-3.20.11/printing.html +#usr/share/doc/hplip-3.20.11/printoptions.html +#usr/share/doc/hplip-3.20.11/printtroubleshooting.html +#usr/share/doc/hplip-3.20.11/scanning.html +#usr/share/doc/hplip-3.20.11/scantrouble.html +#usr/share/doc/hplip-3.20.11/sendfax.html +#usr/share/doc/hplip-3.20.11/setup.html +#usr/share/doc/hplip-3.20.11/styles +#usr/share/doc/hplip-3.20.11/styles/css.css +#usr/share/doc/hplip-3.20.11/systray.html +#usr/share/doc/hplip-3.20.11/troubleshooting.html +#usr/share/doc/hplip-3.20.11/uninstalling.html +#usr/share/doc/hplip-3.20.11/upgrading.html #usr/share/hplip usr/share/hplip/dat2drv usr/share/hplip/locatedriver @@ -71,11 +71,10 @@ usr/share/ppd/HP #usr/share/ppd/HP/hp-business_inkjet_3000-ps.ppd.gz #usr/share/ppd/HP/hp-cm8050_mfp_with_edgeline-ps.ppd.gz #usr/share/ppd/HP/hp-cm8060_mfp_with_edgeline-ps.ppd.gz -#usr/share/ppd/HP/hp-color_inkjet_cp1700.ppd.gz +#usr/share/ppd/HP/hp-color_designjet_xl_3600-ps.ppd.gz #usr/share/ppd/HP/hp-color_inkjet_printer_cp1700.ppd.gz #usr/share/ppd/HP/hp-color_laserjet-ps.ppd.gz #usr/share/ppd/HP/hp-color_laserjet_1600.ppd.gz -#usr/share/ppd/HP/hp-color_laserjet_2500-pcl3.ppd.gz #usr/share/ppd/HP/hp-color_laserjet_2500-ps.ppd.gz #usr/share/ppd/HP/hp-color_laserjet_2500_series-ps.ppd.gz #usr/share/ppd/HP/hp-color_laserjet_2500_series.ppd.gz @@ -110,7 +109,6 @@ usr/share/ppd/HP #usr/share/ppd/HP/hp-color_laserjet_4600-pcl3.ppd.gz #usr/share/ppd/HP/hp-color_laserjet_4600-ps.ppd.gz #usr/share/ppd/HP/hp-color_laserjet_4600_series-ps.ppd.gz -#usr/share/ppd/HP/hp-color_laserjet_4600_series.ppd.gz #usr/share/ppd/HP/hp-color_laserjet_4610-pcl3.ppd.gz #usr/share/ppd/HP/hp-color_laserjet_4610-ps.ppd.gz #usr/share/ppd/HP/hp-color_laserjet_4650-pcl3.ppd.gz @@ -132,8 +130,8 @@ usr/share/ppd/HP #usr/share/ppd/HP/hp-color_laserjet_8550-ps.ppd.gz #usr/share/ppd/HP/hp-color_laserjet_9500-pcl3.ppd.gz #usr/share/ppd/HP/hp-color_laserjet_9500-ps.ppd.gz -#usr/share/ppd/HP/hp-color_laserjet_9500_mfp-pcl3.ppd.gz #usr/share/ppd/HP/hp-color_laserjet_9500_mfp-ps.ppd.gz +#usr/share/ppd/HP/hp-color_laserjet_E65150_E65160-ps.ppd.gz #usr/share/ppd/HP/hp-color_laserjet_cm1015-ps.ppd.gz #usr/share/ppd/HP/hp-color_laserjet_cm1017-ps.ppd.gz #usr/share/ppd/HP/hp-color_laserjet_cm1312_mfp-pcl3.ppd.gz @@ -196,27 +194,53 @@ usr/share/ppd/HP #usr/share/ppd/HP/hp-color_laserjet_cp5520_series-ps.ppd.gz #usr/share/ppd/HP/hp-color_laserjet_cp6015-pcl3.ppd.gz #usr/share/ppd/HP/hp-color_laserjet_cp6015-ps.ppd.gz +#usr/share/ppd/HP/hp-color_laserjet_e55040-ps.ppd.gz #usr/share/ppd/HP/hp-color_laserjet_e65050_e65060-ps.ppd.gz #usr/share/ppd/HP/hp-color_laserjet_e67550_e67560-ps.ppd.gz +#usr/share/ppd/HP/hp-color_laserjet_e67650_e67660-ps.ppd.gz +#usr/share/ppd/HP/hp-color_laserjet_e75245-ps.ppd.gz +#usr/share/ppd/HP/hp-color_laserjet_e85055-ps.ppd.gz +#usr/share/ppd/HP/hp-color_laserjet_flow_e57540-ps.ppd.gz #usr/share/ppd/HP/hp-color_laserjet_flow_mfp_m680-ps.ppd.gz #usr/share/ppd/HP/hp-color_laserjet_flow_mfp_m880-ps.ppd.gz +#usr/share/ppd/HP/hp-color_laserjet_flowmfp_m578-ps.ppd.gz +#usr/share/ppd/HP/hp-color_laserjet_flowmfp_m776-ps.ppd.gz #usr/share/ppd/HP/hp-color_laserjet_m153-m154-ps.ppd.gz +#usr/share/ppd/HP/hp-color_laserjet_m155-m156-ps.ppd.gz +#usr/share/ppd/HP/hp-color_laserjet_m182-m185-ps.ppd.gz #usr/share/ppd/HP/hp-color_laserjet_m253-m254-ps.ppd.gz +#usr/share/ppd/HP/hp-color_laserjet_m255-m256-ps.ppd.gz +#usr/share/ppd/HP/hp-color_laserjet_m282-m285-ps.ppd.gz #usr/share/ppd/HP/hp-color_laserjet_m452-ps.ppd.gz #usr/share/ppd/HP/hp-color_laserjet_m452d-ps.ppd.gz #usr/share/ppd/HP/hp-color_laserjet_m552-ps.ppd.gz #usr/share/ppd/HP/hp-color_laserjet_m553-ps.ppd.gz +#usr/share/ppd/HP/hp-color_laserjet_m554-ps.ppd.gz +#usr/share/ppd/HP/hp-color_laserjet_m555-ps.ppd.gz #usr/share/ppd/HP/hp-color_laserjet_m651-ps.ppd.gz #usr/share/ppd/HP/hp-color_laserjet_m652_m653-ps.ppd.gz #usr/share/ppd/HP/hp-color_laserjet_m750-ps.ppd.gz +#usr/share/ppd/HP/hp-color_laserjet_m751-ps.ppd.gz #usr/share/ppd/HP/hp-color_laserjet_m855-ps.ppd.gz +#usr/share/ppd/HP/hp-color_laserjet_m856-ps.ppd.gz +#usr/share/ppd/HP/hp-color_laserjet_mfp_e57540-ps.ppd.gz +#usr/share/ppd/HP/hp-color_laserjet_mfp_e77422-ps.ppd.gz +#usr/share/ppd/HP/hp-color_laserjet_mfp_e77428-ps.ppd.gz +#usr/share/ppd/HP/hp-color_laserjet_mfp_e78223-ps.ppd.gz +#usr/share/ppd/HP/hp-color_laserjet_mfp_e78228-ps.ppd.gz +#usr/share/ppd/HP/hp-color_laserjet_mfp_e78323-25-30-ps.ppd.gz #usr/share/ppd/HP/hp-color_laserjet_mfp_m178-m181-ps.ppd.gz #usr/share/ppd/HP/hp-color_laserjet_mfp_m274-ps.ppd.gz #usr/share/ppd/HP/hp-color_laserjet_mfp_m278-m281-ps.ppd.gz #usr/share/ppd/HP/hp-color_laserjet_mfp_m577-ps.ppd.gz +#usr/share/ppd/HP/hp-color_laserjet_mfp_m578-ps.ppd.gz #usr/share/ppd/HP/hp-color_laserjet_mfp_m680-ps.ppd.gz #usr/share/ppd/HP/hp-color_laserjet_mfp_m681_m682-ps.ppd.gz +#usr/share/ppd/HP/hp-color_laserjet_mfp_m776-ps.ppd.gz #usr/share/ppd/HP/hp-color_laserjet_pro_m252-ps.ppd.gz +#usr/share/ppd/HP/hp-color_laserjet_pro_m453-4-ps.ppd.gz +#usr/share/ppd/HP/hp-color_laserjet_pro_m478f-9f-ps.ppd.gz +#usr/share/ppd/HP/hp-color_laserjet_pro_m479-ps.ppd.gz #usr/share/ppd/HP/hp-color_laserjet_pro_mfp_m176n.ppd.gz #usr/share/ppd/HP/hp-color_laserjet_pro_mfp_m177fw.ppd.gz #usr/share/ppd/HP/hp-color_laserjet_pro_mfp_m277-ps.ppd.gz @@ -231,6 +255,12 @@ usr/share/ppd/HP #usr/share/ppd/HP/hp-designjet_4500ps.ppd.gz #usr/share/ppd/HP/hp-designjet_4520mfp-ps.ppd.gz #usr/share/ppd/HP/hp-designjet_4520ps-ps.ppd.gz +#usr/share/ppd/HP/hp-designjet_Z6_24in-ps.ppd.gz +#usr/share/ppd/HP/hp-designjet_Z6_44in-ps.ppd.gz +#usr/share/ppd/HP/hp-designjet_Z6dr_44in-ps.ppd.gz +#usr/share/ppd/HP/hp-designjet_Z9_24in-ps.ppd.gz +#usr/share/ppd/HP/hp-designjet_Z9_44in-ps.ppd.gz +#usr/share/ppd/HP/hp-designjet_Z9dr_44in-ps.ppd.gz #usr/share/ppd/HP/hp-designjet_d5800-ps.ppd.gz #usr/share/ppd/HP/hp-designjet_t1100ps_24in-ps.ppd.gz #usr/share/ppd/HP/hp-designjet_t1100ps_44in-ps.ppd.gz @@ -239,10 +269,18 @@ usr/share/ppd/HP #usr/share/ppd/HP/hp-designjet_t1200_postscript-ps.ppd.gz #usr/share/ppd/HP/hp-designjet_t1300_postscript-ps.ppd.gz #usr/share/ppd/HP/hp-designjet_t1500-postscript.ppd.gz +#usr/share/ppd/HP/hp-designjet_t1530-postscript.ppd.gz +#usr/share/ppd/HP/hp-designjet_t1600_printer-ps.ppd.gz +#usr/share/ppd/HP/hp-designjet_t1600dr-ps.ppd.gz #usr/share/ppd/HP/hp-designjet_t1700_postscript-ps.ppd.gz #usr/share/ppd/HP/hp-designjet_t1700dr_postscript-ps.ppd.gz +#usr/share/ppd/HP/hp-designjet_t1708_postscript-ps.ppd.gz +#usr/share/ppd/HP/hp-designjet_t1708dr_postscript-ps.ppd.gz #usr/share/ppd/HP/hp-designjet_t2300_postscript-ps.ppd.gz #usr/share/ppd/HP/hp-designjet_t2500-postscript.ppd.gz +#usr/share/ppd/HP/hp-designjet_t2530-postscript.ppd.gz +#usr/share/ppd/HP/hp-designjet_t2600-ps.ppd.gz +#usr/share/ppd/HP/hp-designjet_t2600dr-ps.ppd.gz #usr/share/ppd/HP/hp-designjet_t3500-ps.ppd.gz #usr/share/ppd/HP/hp-designjet_t7100ps-ps.ppd.gz #usr/share/ppd/HP/hp-designjet_t7100ps_monochrome-ps.ppd.gz @@ -253,6 +291,7 @@ usr/share/ppd/HP #usr/share/ppd/HP/hp-designjet_t790ps_44in-ps.ppd.gz #usr/share/ppd/HP/hp-designjet_t795ps_44in-ps.ppd.gz #usr/share/ppd/HP/hp-designjet_t920-postscript.ppd.gz +#usr/share/ppd/HP/hp-designjet_t930-postscript.ppd.gz #usr/share/ppd/HP/hp-designjet_z2600_postscript-ps.ppd.gz #usr/share/ppd/HP/hp-designjet_z5200_postscript-ps.ppd.gz #usr/share/ppd/HP/hp-designjet_z5400-postscript.ppd.gz @@ -273,6 +312,7 @@ usr/share/ppd/HP #usr/share/ppd/HP/hp-deskjet_1110_series.ppd.gz #usr/share/ppd/HP/hp-deskjet_1120.ppd.gz #usr/share/ppd/HP/hp-deskjet_1125.ppd.gz +#usr/share/ppd/HP/hp-deskjet_1200_series.ppd.gz #usr/share/ppd/HP/hp-deskjet_1200c.ppd.gz #usr/share/ppd/HP/hp-deskjet_1220c.ppd.gz #usr/share/ppd/HP/hp-deskjet_1280.ppd.gz @@ -285,11 +325,13 @@ usr/share/ppd/HP #usr/share/ppd/HP/hp-deskjet_2050_j510_series.ppd.gz #usr/share/ppd/HP/hp-deskjet_2130_series.ppd.gz #usr/share/ppd/HP/hp-deskjet_2200_series.ppd.gz +#usr/share/ppd/HP/hp-deskjet_2300_series.ppd.gz #usr/share/ppd/HP/hp-deskjet_2510_series.ppd.gz #usr/share/ppd/HP/hp-deskjet_2520_series.ppd.gz #usr/share/ppd/HP/hp-deskjet_2540_series.ppd.gz #usr/share/ppd/HP/hp-deskjet_2600_series.ppd.gz #usr/share/ppd/HP/hp-deskjet_2640_series.ppd.gz +#usr/share/ppd/HP/hp-deskjet_2700_series.ppd.gz #usr/share/ppd/HP/hp-deskjet_3000_j310_series.ppd.gz #usr/share/ppd/HP/hp-deskjet_3050_j610_series.ppd.gz #usr/share/ppd/HP/hp-deskjet_3050a_j611_series.ppd.gz @@ -299,6 +341,7 @@ usr/share/ppd/HP #usr/share/ppd/HP/hp-deskjet_3420.ppd.gz #usr/share/ppd/HP/hp-deskjet_3425.ppd.gz #usr/share/ppd/HP/hp-deskjet_3450.ppd.gz +#usr/share/ppd/HP/hp-deskjet_350.ppd.gz #usr/share/ppd/HP/hp-deskjet_3500.ppd.gz #usr/share/ppd/HP/hp-deskjet_3510_series.ppd.gz #usr/share/ppd/HP/hp-deskjet_3520_series.ppd.gz @@ -323,6 +366,8 @@ usr/share/ppd/HP #usr/share/ppd/HP/hp-deskjet_3940.ppd.gz #usr/share/ppd/HP/hp-deskjet_400.ppd.gz #usr/share/ppd/HP/hp-deskjet_400l.ppd.gz +#usr/share/ppd/HP/hp-deskjet_4100_series.ppd.gz +#usr/share/ppd/HP/hp-deskjet_450.ppd.gz #usr/share/ppd/HP/hp-deskjet_4510_series.ppd.gz #usr/share/ppd/HP/hp-deskjet_4530_series.ppd.gz #usr/share/ppd/HP/hp-deskjet_460.ppd.gz @@ -381,7 +426,6 @@ usr/share/ppd/HP #usr/share/ppd/HP/hp-deskjet_680.ppd.gz #usr/share/ppd/HP/hp-deskjet_6800.ppd.gz #usr/share/ppd/HP/hp-deskjet_682.ppd.gz -#usr/share/ppd/HP/hp-deskjet_690.ppd.gz #usr/share/ppd/HP/hp-deskjet_690c.ppd.gz #usr/share/ppd/HP/hp-deskjet_692.ppd.gz #usr/share/ppd/HP/hp-deskjet_693.ppd.gz @@ -451,8 +495,6 @@ usr/share/ppd/HP #usr/share/ppd/HP/hp-deskjet_f300_series.ppd.gz #usr/share/ppd/HP/hp-deskjet_f4100_series.ppd.gz #usr/share/ppd/HP/hp-deskjet_f4200_series.ppd.gz -#usr/share/ppd/HP/hp-deskjet_f4210_series.ppd.gz -#usr/share/ppd/HP/hp-deskjet_f4213_series.ppd.gz #usr/share/ppd/HP/hp-deskjet_f4400_series.ppd.gz #usr/share/ppd/HP/hp-deskjet_f4500_series.ppd.gz #usr/share/ppd/HP/hp-deskjet_f735.ppd.gz @@ -460,8 +502,9 @@ usr/share/ppd/HP #usr/share/ppd/HP/hp-deskjet_ink_adv_2060_k110.ppd.gz #usr/share/ppd/HP/hp-deskjet_ink_advant_k109a-z.ppd.gz #usr/share/ppd/HP/hp-deskjet_ink_advant_k209a-z.ppd.gz -#usr/share/ppd/HP/hp-dj350.ppd.gz -#usr/share/ppd/HP/hp-dj450.ppd.gz +#usr/share/ppd/HP/hp-deskjet_plus_4100_series.ppd.gz +#usr/share/ppd/HP/hp-deskjet_plus_6000_series.ppd.gz +#usr/share/ppd/HP/hp-deskjet_plus_6400_series.ppd.gz #usr/share/ppd/HP/hp-envy_100_d410_series.ppd.gz #usr/share/ppd/HP/hp-envy_110_series.ppd.gz #usr/share/ppd/HP/hp-envy_120_series.ppd.gz @@ -473,11 +516,19 @@ usr/share/ppd/HP #usr/share/ppd/HP/hp-envy_5540_series.ppd.gz #usr/share/ppd/HP/hp-envy_5640_series.ppd.gz #usr/share/ppd/HP/hp-envy_5660_series.ppd.gz +#usr/share/ppd/HP/hp-envy_6000_series.ppd.gz #usr/share/ppd/HP/hp-envy_7640_series.ppd.gz #usr/share/ppd/HP/hp-envy_8000_series.ppd.gz #usr/share/ppd/HP/hp-envy_photo_6200_series.ppd.gz #usr/share/ppd/HP/hp-envy_photo_7100_series.ppd.gz #usr/share/ppd/HP/hp-envy_photo_7800_series.ppd.gz +#usr/share/ppd/HP/hp-envy_pro_6400_series.ppd.gz +#usr/share/ppd/HP/hp-ink_tank_110_series.ppd.gz +#usr/share/ppd/HP/hp-ink_tank_310_series.ppd.gz +#usr/share/ppd/HP/hp-ink_tank_wireless_410_series.ppd.gz +#usr/share/ppd/HP/hp-laserJet_m610_m611_m612-ps.ppd.gz +#usr/share/ppd/HP/hp-laser_ns_1020.ppd.gz +#usr/share/ppd/HP/hp-laser_ns_mfp_1005.ppd.gz #usr/share/ppd/HP/hp-laserjet_1000.ppd.gz #usr/share/ppd/HP/hp-laserjet_1005_series.ppd.gz #usr/share/ppd/HP/hp-laserjet_100_color_mfp_m175-ps.ppd.gz @@ -493,7 +544,6 @@ usr/share/ppd/HP #usr/share/ppd/HP/hp-laserjet_1100a.ppd.gz #usr/share/ppd/HP/hp-laserjet_1100xi.ppd.gz #usr/share/ppd/HP/hp-laserjet_1150.ppd.gz -#usr/share/ppd/HP/hp-laserjet_1160.ppd.gz #usr/share/ppd/HP/hp-laserjet_1160_series.ppd.gz #usr/share/ppd/HP/hp-laserjet_1200-pcl3.ppd.gz #usr/share/ppd/HP/hp-laserjet_1200-ps.ppd.gz @@ -523,14 +573,11 @@ usr/share/ppd/HP #usr/share/ppd/HP/hp-laserjet_200_colormfp_m275-ps.ppd.gz #usr/share/ppd/HP/hp-laserjet_200_colormfp_m276-ps.ppd.gz #usr/share/ppd/HP/hp-laserjet_2100-ps.ppd.gz -#usr/share/ppd/HP/hp-laserjet_2100.ppd.gz #usr/share/ppd/HP/hp-laserjet_2100_series-pcl3.ppd.gz #usr/share/ppd/HP/hp-laserjet_2100_series-ps.ppd.gz -#usr/share/ppd/HP/hp-laserjet_2200-pcl3.ppd.gz #usr/share/ppd/HP/hp-laserjet_2200-ps.ppd.gz #usr/share/ppd/HP/hp-laserjet_2200_series-ps.ppd.gz #usr/share/ppd/HP/hp-laserjet_2200_series.ppd.gz -#usr/share/ppd/HP/hp-laserjet_2300-pcl3.ppd.gz #usr/share/ppd/HP/hp-laserjet_2300-ps.ppd.gz #usr/share/ppd/HP/hp-laserjet_2300_series-ps.ppd.gz #usr/share/ppd/HP/hp-laserjet_2300_series.ppd.gz @@ -554,9 +601,7 @@ usr/share/ppd/HP #usr/share/ppd/HP/hp-laserjet_3100.ppd.gz #usr/share/ppd/HP/hp-laserjet_3150.ppd.gz #usr/share/ppd/HP/hp-laserjet_3200.ppd.gz -#usr/share/ppd/HP/hp-laserjet_3200m-pcl3.ppd.gz #usr/share/ppd/HP/hp-laserjet_3200m-ps.ppd.gz -#usr/share/ppd/HP/hp-laserjet_3200se.ppd.gz #usr/share/ppd/HP/hp-laserjet_3300_3310_3320-pcl3.ppd.gz #usr/share/ppd/HP/hp-laserjet_3300_3310_3320-ps.ppd.gz #usr/share/ppd/HP/hp-laserjet_3330.ppd.gz @@ -602,7 +647,6 @@ usr/share/ppd/HP #usr/share/ppd/HP/hp-laserjet_4v-pcl3.ppd.gz #usr/share/ppd/HP/hp-laserjet_4v-ps.ppd.gz #usr/share/ppd/HP/hp-laserjet_5000-ps.ppd.gz -#usr/share/ppd/HP/hp-laserjet_5000.ppd.gz #usr/share/ppd/HP/hp-laserjet_5000_series-pcl3.ppd.gz #usr/share/ppd/HP/hp-laserjet_5000_series-ps.ppd.gz #usr/share/ppd/HP/hp-laserjet_500_color_m551-ps.ppd.gz @@ -635,7 +679,6 @@ usr/share/ppd/HP #usr/share/ppd/HP/hp-laserjet_700_color_mfp_m775-ps.ppd.gz #usr/share/ppd/HP/hp-laserjet_700_m712-ps.ppd.gz #usr/share/ppd/HP/hp-laserjet_8000-ps.ppd.gz -#usr/share/ppd/HP/hp-laserjet_8000.ppd.gz #usr/share/ppd/HP/hp-laserjet_8000_series-pcl3.ppd.gz #usr/share/ppd/HP/hp-laserjet_8000_series-ps.ppd.gz #usr/share/ppd/HP/hp-laserjet_8100_mfp-ps.ppd.gz @@ -674,11 +717,16 @@ usr/share/ppd/HP #usr/share/ppd/HP/hp-laserjet_cp1025.ppd.gz #usr/share/ppd/HP/hp-laserjet_cp1025nw.ppd.gz #usr/share/ppd/HP/hp-laserjet_cp1520_series-ps.ppd.gz -#usr/share/ppd/HP/hp-laserjet_cp_1025.ppd.gz -#usr/share/ppd/HP/hp-laserjet_cp_1025nw.ppd.gz +#usr/share/ppd/HP/hp-laserjet_e50145-ps.ppd.gz #usr/share/ppd/HP/hp-laserjet_e60055-e60075-ps.ppd.gz +#usr/share/ppd/HP/hp-laserjet_e60155-ps.ppd.gz +#usr/share/ppd/HP/hp-laserjet_e60165-ps.ppd.gz +#usr/share/ppd/HP/hp-laserjet_e60175-ps.ppd.gz #usr/share/ppd/HP/hp-laserjet_e62555-e62575-ps.ppd.gz +#usr/share/ppd/HP/hp-laserjet_e62655-e62675-ps.ppd.gz +#usr/share/ppd/HP/hp-laserjet_flow_mfp_e52645-ps.ppd.gz #usr/share/ppd/HP/hp-laserjet_flow_mfp_m525-ps.ppd.gz +#usr/share/ppd/HP/hp-laserjet_flow_mfp_m528-ps.ppd.gz #usr/share/ppd/HP/hp-laserjet_flow_mfp_m630-ps.ppd.gz #usr/share/ppd/HP/hp-laserjet_flow_mfp_m830-ps.ppd.gz #usr/share/ppd/HP/hp-laserjet_m1005.ppd.gz @@ -712,6 +760,7 @@ usr/share/ppd/HP #usr/share/ppd/HP/hp-laserjet_m5035_mfp-ps.ppd.gz #usr/share/ppd/HP/hp-laserjet_m5039_mfp-pcl3.ppd.gz #usr/share/ppd/HP/hp-laserjet_m506-ps.ppd.gz +#usr/share/ppd/HP/hp-laserjet_m507-ps.ppd.gz #usr/share/ppd/HP/hp-laserjet_m604_m605_m606-ps.ppd.gz #usr/share/ppd/HP/hp-laserjet_m607_m608_m609-ps.ppd.gz #usr/share/ppd/HP/hp-laserjet_m806-ps.ppd.gz @@ -721,17 +770,21 @@ usr/share/ppd/HP #usr/share/ppd/HP/hp-laserjet_m9050_mfp-ps.ppd.gz #usr/share/ppd/HP/hp-laserjet_m9059_mfp-pcl3.ppd.gz #usr/share/ppd/HP/hp-laserjet_m9059_mfp-ps.ppd.gz +#usr/share/ppd/HP/hp-laserjet_mfp_e72425-ps.ppd.gz +#usr/share/ppd/HP/hp-laserjet_mfp_e72430-ps.ppd.gz #usr/share/ppd/HP/hp-laserjet_mfp_e72525-25-30-35-ps.ppd.gz #usr/share/ppd/HP/hp-laserjet_mfp_e77822-25-30-ps.ppd.gz #usr/share/ppd/HP/hp-laserjet_mfp_e82540-50-60-ps.ppd.gz #usr/share/ppd/HP/hp-laserjet_mfp_e87640-50-60-ps.ppd.gz #usr/share/ppd/HP/hp-laserjet_mfp_m129-m134.ppd.gz +#usr/share/ppd/HP/hp-laserjet_mfp_m232-m237.ppd.gz #usr/share/ppd/HP/hp-laserjet_mfp_m28-m31.ppd.gz #usr/share/ppd/HP/hp-laserjet_mfp_m426_m427-ps.ppd.gz #usr/share/ppd/HP/hp-laserjet_mfp_m521-ps.ppd.gz #usr/share/ppd/HP/hp-laserjet_mfp_m527-ps.ppd.gz #usr/share/ppd/HP/hp-laserjet_mfp_m630-ps.ppd.gz #usr/share/ppd/HP/hp-laserjet_mfp_m631_m632_m633-ps.ppd.gz +#usr/share/ppd/HP/hp-laserjet_mfp_m634_m635_m636-ps.ppd.gz #usr/share/ppd/HP/hp-laserjet_mfp_m725-ps.ppd.gz #usr/share/ppd/HP/hp-laserjet_p1005.ppd.gz #usr/share/ppd/HP/hp-laserjet_p1006.ppd.gz @@ -775,10 +828,17 @@ usr/share/ppd/HP #usr/share/ppd/HP/hp-laserjet_p4515tn.ppd.gz #usr/share/ppd/HP/hp-laserjet_p4515x.ppd.gz #usr/share/ppd/HP/hp-laserjet_p4515xm.ppd.gz +#usr/share/ppd/HP/hp-laserjet_pro_m118-m119-ps.ppd.gz +#usr/share/ppd/HP/hp-laserjet_pro_m148-m149-ps.ppd.gz +#usr/share/ppd/HP/hp-laserjet_pro_m148f-m149f-ps.ppd.gz #usr/share/ppd/HP/hp-laserjet_pro_m201_m202-ps.ppd.gz #usr/share/ppd/HP/hp-laserjet_pro_m203_m206-ps.ppd.gz +#usr/share/ppd/HP/hp-laserjet_pro_m304-m305-ps.ppd.gz #usr/share/ppd/HP/hp-laserjet_pro_m402_m403-ps.ppd.gz #usr/share/ppd/HP/hp-laserjet_pro_m402_m403d-ps.ppd.gz +#usr/share/ppd/HP/hp-laserjet_pro_m404-m405-ps.ppd.gz +#usr/share/ppd/HP/hp-laserjet_pro_m428-m429-ps.ppd.gz +#usr/share/ppd/HP/hp-laserjet_pro_m428f-m429f-ps.ppd.gz #usr/share/ppd/HP/hp-laserjet_pro_m501dn-ps.ppd.gz #usr/share/ppd/HP/hp-laserjet_pro_m501n-ps.ppd.gz #usr/share/ppd/HP/hp-laserjet_pro_m701-ps.ppd.gz @@ -806,6 +866,7 @@ usr/share/ppd/HP #usr/share/ppd/HP/hp-laserjet_pro_mfp_m26nw.ppd.gz #usr/share/ppd/HP/hp-laserjet_pro_mfp_m27c.ppd.gz #usr/share/ppd/HP/hp-laserjet_pro_mfp_m27cnw.ppd.gz +#usr/share/ppd/HP/hp-laserjet_pro_mfp_m329-ps.ppd.gz #usr/share/ppd/HP/hp-laserjet_pro_mfp_m435-ps.ppd.gz #usr/share/ppd/HP/hp-laserjet_professional_m1132_mfp.ppd.gz #usr/share/ppd/HP/hp-laserjet_professional_m1136_mfp.ppd.gz @@ -823,7 +884,6 @@ usr/share/ppd/HP #usr/share/ppd/HP/hp-laserjet_professional_m1219nfg_mfp.ppd.gz #usr/share/ppd/HP/hp-laserjet_professional_m1219nfs_mfp.ppd.gz #usr/share/ppd/HP/hp-laserjet_professional_p1102.ppd.gz -#usr/share/ppd/HP/hp-laserjet_professional_p1102w.ppd.gz #usr/share/ppd/HP/hp-laserjet_professional_p1106.ppd.gz #usr/share/ppd/HP/hp-laserjet_professional_p1106w.ppd.gz #usr/share/ppd/HP/hp-laserjet_professional_p1107.ppd.gz @@ -847,6 +907,8 @@ usr/share/ppd/HP #usr/share/ppd/HP/hp-mopier_240-ps.ppd.gz #usr/share/ppd/HP/hp-mopier_320-pcl3.ppd.gz #usr/share/ppd/HP/hp-mopier_320-ps.ppd.gz +#usr/share/ppd/HP/hp-neverstop_laser_100x.ppd.gz +#usr/share/ppd/HP/hp-neverstop_laser_mfp_120x.ppd.gz #usr/share/ppd/HP/hp-officejet.ppd.gz #usr/share/ppd/HP/hp-officejet_100_mobile_l411.ppd.gz #usr/share/ppd/HP/hp-officejet_150_mobile_l511.ppd.gz @@ -871,9 +933,6 @@ usr/share/ppd/HP #usr/share/ppd/HP/hp-officejet_4630_series.ppd.gz #usr/share/ppd/HP/hp-officejet_4650_series.ppd.gz #usr/share/ppd/HP/hp-officejet_5100_series.ppd.gz -#usr/share/ppd/HP/hp-officejet_5105.ppd.gz -#usr/share/ppd/HP/hp-officejet_5110.ppd.gz -#usr/share/ppd/HP/hp-officejet_5110v.ppd.gz #usr/share/ppd/HP/hp-officejet_5200_series.ppd.gz #usr/share/ppd/HP/hp-officejet_5500_series.ppd.gz #usr/share/ppd/HP/hp-officejet_5600_series.ppd.gz @@ -894,7 +953,6 @@ usr/share/ppd/HP #usr/share/ppd/HP/hp-officejet_6800.ppd.gz #usr/share/ppd/HP/hp-officejet_6950.ppd.gz #usr/share/ppd/HP/hp-officejet_6960.ppd.gz -#usr/share/ppd/HP/hp-officejet_7000_e809a.ppd.gz #usr/share/ppd/HP/hp-officejet_7000_e809a_series.ppd.gz #usr/share/ppd/HP/hp-officejet_7100_series.ppd.gz #usr/share/ppd/HP/hp-officejet_7110_series.ppd.gz @@ -904,8 +962,11 @@ usr/share/ppd/HP #usr/share/ppd/HP/hp-officejet_7500_e910.ppd.gz #usr/share/ppd/HP/hp-officejet_7510_series.ppd.gz #usr/share/ppd/HP/hp-officejet_7610_series.ppd.gz +#usr/share/ppd/HP/hp-officejet_8010_series.ppd.gz +#usr/share/ppd/HP/hp-officejet_8020_series.ppd.gz #usr/share/ppd/HP/hp-officejet_8040_series.ppd.gz #usr/share/ppd/HP/hp-officejet_8700.ppd.gz +#usr/share/ppd/HP/hp-officejet_9010_series.ppd.gz #usr/share/ppd/HP/hp-officejet_9100_series-pcl3.ppd.gz #usr/share/ppd/HP/hp-officejet_color_mfp_x585.ppd.gz #usr/share/ppd/HP/hp-officejet_color_x555-ps.ppd.gz @@ -948,6 +1009,8 @@ usr/share/ppd/HP #usr/share/ppd/HP/hp-officejet_pro_7740_series.ppd.gz #usr/share/ppd/HP/hp-officejet_pro_8000_a809.ppd.gz #usr/share/ppd/HP/hp-officejet_pro_8000_enterprise_a811a-ps.ppd.gz +#usr/share/ppd/HP/hp-officejet_pro_8020_series.ppd.gz +#usr/share/ppd/HP/hp-officejet_pro_8030_series.ppd.gz #usr/share/ppd/HP/hp-officejet_pro_8100.ppd.gz #usr/share/ppd/HP/hp-officejet_pro_8210-ps.ppd.gz #usr/share/ppd/HP/hp-officejet_pro_8500_a909a.ppd.gz @@ -965,6 +1028,8 @@ usr/share/ppd/HP #usr/share/ppd/HP/hp-officejet_pro_8730-ps.ppd.gz #usr/share/ppd/HP/hp-officejet_pro_8732-ps.ppd.gz #usr/share/ppd/HP/hp-officejet_pro_8740-ps.ppd.gz +#usr/share/ppd/HP/hp-officejet_pro_9010_series.ppd.gz +#usr/share/ppd/HP/hp-officejet_pro_9020_series.ppd.gz #usr/share/ppd/HP/hp-officejet_pro_k5300.ppd.gz #usr/share/ppd/HP/hp-officejet_pro_k5400.ppd.gz #usr/share/ppd/HP/hp-officejet_pro_k550.ppd.gz @@ -1007,6 +1072,7 @@ usr/share/ppd/HP #usr/share/ppd/HP/hp-pagewide_377_mfp-ps.ppd.gz #usr/share/ppd/HP/hp-pagewide_P77440_P77940-60-ps.ppd.gz #usr/share/ppd/HP/hp-pagewide_color_556-ps.ppd.gz +#usr/share/ppd/HP/hp-pagewide_color_755-ps.ppd.gz #usr/share/ppd/HP/hp-pagewide_color_765-ps.ppd.gz #usr/share/ppd/HP/hp-pagewide_color_P75250-ps.ppd.gz #usr/share/ppd/HP/hp-pagewide_color_e55650-ps.ppd.gz @@ -1014,6 +1080,7 @@ usr/share/ppd/HP #usr/share/ppd/HP/hp-pagewide_color_e77650-e77660-ps.ppd.gz #usr/share/ppd/HP/hp-pagewide_color_flow_mfp_586-ps.ppd.gz #usr/share/ppd/HP/hp-pagewide_color_mfp_586-ps.ppd.gz +#usr/share/ppd/HP/hp-pagewide_color_mfp_774-779-ps.ppd.gz #usr/share/ppd/HP/hp-pagewide_color_mfp_780-785-ps.ppd.gz #usr/share/ppd/HP/hp-pagewide_color_mfp_e58650-ps.ppd.gz #usr/share/ppd/HP/hp-pagewide_mfp_p57750-ps.ppd.gz @@ -1026,10 +1093,15 @@ usr/share/ppd/HP #usr/share/ppd/HP/hp-pagewide_pro_577_mfp-ps.ppd.gz #usr/share/ppd/HP/hp-pagewide_pro_750-ps.ppd.gz #usr/share/ppd/HP/hp-pagewide_pro_mfp_772-777-ps.ppd.gz +#usr/share/ppd/HP/hp-pagewide_xl_3900ps_mfp-ps.ppd.gz #usr/share/ppd/HP/hp-pagewide_xl_4000ps-ps.ppd.gz #usr/share/ppd/HP/hp-pagewide_xl_4000ps_mfp-ps.ppd.gz +#usr/share/ppd/HP/hp-pagewide_xl_4100ps-ps.ppd.gz +#usr/share/ppd/HP/hp-pagewide_xl_4100ps_mfp-ps.ppd.gz #usr/share/ppd/HP/hp-pagewide_xl_4500ps-ps.ppd.gz #usr/share/ppd/HP/hp-pagewide_xl_4500ps_mfp-ps.ppd.gz +#usr/share/ppd/HP/hp-pagewide_xl_4600ps-ps.ppd.gz +#usr/share/ppd/HP/hp-pagewide_xl_4600ps_mfp-ps.ppd.gz #usr/share/ppd/HP/hp-pagewide_xl_5000ps-ps.ppd.gz #usr/share/ppd/HP/hp-pagewide_xl_5000ps_blueprinter-ps.ppd.gz #usr/share/ppd/HP/hp-pagewide_xl_5000ps_mfp-ps.ppd.gz @@ -1066,10 +1138,8 @@ usr/share/ppd/HP #usr/share/ppd/HP/hp-photosmart_5520_series.ppd.gz #usr/share/ppd/HP/hp-photosmart_6510_series.ppd.gz #usr/share/ppd/HP/hp-photosmart_6520_series.ppd.gz -#usr/share/ppd/HP/hp-photosmart_7150.ppd.gz #usr/share/ppd/HP/hp-photosmart_7200_series.ppd.gz #usr/share/ppd/HP/hp-photosmart_7345.ppd.gz -#usr/share/ppd/HP/hp-photosmart_7350.ppd.gz #usr/share/ppd/HP/hp-photosmart_7400_series.ppd.gz #usr/share/ppd/HP/hp-photosmart_7510_series.ppd.gz #usr/share/ppd/HP/hp-photosmart_7520_series.ppd.gz @@ -1097,7 +1167,6 @@ usr/share/ppd/HP #usr/share/ppd/HP/hp-photosmart_a710_series.ppd.gz #usr/share/ppd/HP/hp-photosmart_a820_series.ppd.gz #usr/share/ppd/HP/hp-photosmart_b010_series.ppd.gz -#usr/share/ppd/HP/hp-photosmart_b109a-m.ppd.gz #usr/share/ppd/HP/hp-photosmart_b109a_series.ppd.gz #usr/share/ppd/HP/hp-photosmart_b110_series.ppd.gz #usr/share/ppd/HP/hp-photosmart_b8500_series.ppd.gz @@ -1157,7 +1226,6 @@ usr/share/ppd/HP #usr/share/ppd/HP/hp-psc_1358_series.ppd.gz #usr/share/ppd/HP/hp-psc_1400_series.ppd.gz #usr/share/ppd/HP/hp-psc_1500_series.ppd.gz -#usr/share/ppd/HP/hp-psc_1510_series.ppd.gz #usr/share/ppd/HP/hp-psc_1600_series.ppd.gz #usr/share/ppd/HP/hp-psc_2100_series.ppd.gz #usr/share/ppd/HP/hp-psc_2150_series.ppd.gz @@ -1180,3 +1248,13 @@ usr/share/ppd/HP #usr/share/ppd/HP/hp-psc_950.ppd.gz #usr/share/ppd/HP/hp-psc_950vr.ppd.gz #usr/share/ppd/HP/hp-psc_950xi.ppd.gz +#usr/share/ppd/HP/hp-smart_tank_350_series.ppd.gz +#usr/share/ppd/HP/hp-smart_tank_500_series.ppd.gz +#usr/share/ppd/HP/hp-smart_tank_510_series.ppd.gz +#usr/share/ppd/HP/hp-smart_tank_530_series.ppd.gz +#usr/share/ppd/HP/hp-smart_tank_610_series.ppd.gz +#usr/share/ppd/HP/hp-smart_tank_plus_550_series.ppd.gz +#usr/share/ppd/HP/hp-smart_tank_plus_570_series.ppd.gz +#usr/share/ppd/HP/hp-smart_tank_plus_650_series.ppd.gz +#usr/share/ppd/HP/hp-smart_tank_wireless_450_series.ppd.gz +#usr/share/ppd/HP/hp-tango.ppd.gz diff --git a/config/rootfiles/packages/htop b/config/rootfiles/packages/htop index 6de652286..6028f6c3c 100644 --- a/config/rootfiles/packages/htop +++ b/config/rootfiles/packages/htop @@ -1,7 +1,11 @@ usr/bin/htop -#usr/man/man1/htop.1 #usr/share/applications #usr/share/applications/htop.desktop +#usr/share/icons +#usr/share/icons/hicolor +#usr/share/icons/hicolor/scalable +#usr/share/icons/hicolor/scalable/apps +#usr/share/icons/hicolor/scalable/apps/htop.svg #usr/share/man/man1/htop.1 #usr/share/pixmaps #usr/share/pixmaps/htop.png diff --git a/config/rootfiles/packages/i586/samba b/config/rootfiles/packages/i586/samba index 1f406cc71..06780b2eb 100644 --- a/config/rootfiles/packages/i586/samba +++ b/config/rootfiles/packages/i586/samba @@ -268,6 +268,7 @@ usr/lib/python3.8/site-packages/samba/dcerpc/witness.cpython-38-i386-linux-gnu.s usr/lib/python3.8/site-packages/samba/dcerpc/wkssvc.cpython-38-i386-linux-gnu.so usr/lib/python3.8/site-packages/samba/dcerpc/xattr.cpython-38-i386-linux-gnu.so usr/lib/python3.8/site-packages/samba/descriptor.py +usr/lib/python3.8/site-packages/samba/dnsresolver.py usr/lib/python3.8/site-packages/samba/dnsserver.py usr/lib/python3.8/site-packages/samba/domain_update.py usr/lib/python3.8/site-packages/samba/drs_utils.py @@ -788,6 +789,7 @@ usr/lib/security/pam_winbind.so usr/libexec/samba/smbspool_krb5_wrapper usr/sbin/eventlogadm usr/sbin/nmbd +usr/sbin/samba-change-password usr/sbin/samba-gpupdate usr/sbin/smbd usr/sbin/winbindd @@ -797,6 +799,7 @@ var/ipfire/samba/global #var/ipfire/samba/private var/ipfire/samba/private/secrets.tdb var/ipfire/samba/private/smbpasswd +var/ipfire/samba/samba-change-password var/ipfire/samba/settings var/ipfire/samba/shares var/ipfire/samba/smb.conf diff --git a/config/rootfiles/packages/krb5 b/config/rootfiles/packages/krb5 index 0db708f4e..9a68f1b87 100644 --- a/config/rootfiles/packages/krb5 +++ b/config/rootfiles/packages/krb5 @@ -16,6 +16,7 @@ usr/bin/kpasswd #usr/include/gssapi #usr/include/gssapi.h #usr/include/gssapi/gssapi.h +#usr/include/gssapi/gssapi_alloc.h #usr/include/gssapi/gssapi_ext.h #usr/include/gssapi/gssapi_generic.h #usr/include/gssapi/gssapi_krb5.h @@ -46,9 +47,12 @@ usr/bin/kpasswd #usr/include/krb5 #usr/include/krb5.h #usr/include/krb5/ccselect_plugin.h +#usr/include/krb5/certauth_plugin.h #usr/include/krb5/clpreauth_plugin.h #usr/include/krb5/hostrealm_plugin.h +#usr/include/krb5/kadm5_auth_plugin.h #usr/include/krb5/kadm5_hook_plugin.h +#usr/include/krb5/kdcpolicy_plugin.h #usr/include/krb5/kdcpreauth_plugin.h #usr/include/krb5/krb5.h #usr/include/krb5/localauth_plugin.h @@ -59,17 +63,18 @@ usr/bin/kpasswd #usr/include/profile.h #usr/include/verto-module.h #usr/include/verto.h -usr/lib/krb5 -usr/lib/krb5/plugins +#usr/lib/krb5 +#usr/lib/krb5/plugins usr/lib/krb5/plugins/authdata usr/lib/krb5/plugins/kdb usr/lib/krb5/plugins/kdb/db2.so usr/lib/krb5/plugins/libkrb5 -usr/lib/krb5/plugins/preauth +#usr/lib/krb5/plugins/preauth usr/lib/krb5/plugins/preauth/otp.so usr/lib/krb5/plugins/preauth/pkinit.so +usr/lib/krb5/plugins/preauth/spake.so usr/lib/krb5/plugins/preauth/test.so -usr/lib/krb5/plugins/tls +#usr/lib/krb5/plugins/tls usr/lib/krb5/plugins/tls/k5tls.so #usr/lib/libgssapi_krb5.so usr/lib/libgssapi_krb5.so.2 @@ -82,15 +87,15 @@ usr/lib/libk5crypto.so.3 usr/lib/libk5crypto.so.3.1 #usr/lib/libkadm5clnt.so #usr/lib/libkadm5clnt_mit.so -usr/lib/libkadm5clnt_mit.so.11 -usr/lib/libkadm5clnt_mit.so.11.0 +usr/lib/libkadm5clnt_mit.so.12 +usr/lib/libkadm5clnt_mit.so.12.0 #usr/lib/libkadm5srv.so #usr/lib/libkadm5srv_mit.so -usr/lib/libkadm5srv_mit.so.11 -usr/lib/libkadm5srv_mit.so.11.0 +usr/lib/libkadm5srv_mit.so.12 +usr/lib/libkadm5srv_mit.so.12.0 #usr/lib/libkdb5.so -usr/lib/libkdb5.so.8 -usr/lib/libkdb5.so.8.0 +usr/lib/libkdb5.so.10 +usr/lib/libkdb5.so.10.0 #usr/lib/libkrad.so usr/lib/libkrad.so.0 usr/lib/libkrad.so.0.0 @@ -128,11 +133,13 @@ usr/lib/libverto.so.0.0 #usr/share/examples/krb5/kdc.conf #usr/share/examples/krb5/krb5.conf #usr/share/examples/krb5/services.append +#usr/share/locale/de/LC_MESSAGES/mit-krb5.mo #usr/share/locale/en_US #usr/share/locale/en_US/LC_MESSAGES #usr/share/locale/en_US/LC_MESSAGES/mit-krb5.mo #usr/share/man/cat1 #usr/share/man/cat5 +#usr/share/man/cat7 #usr/share/man/cat8 #usr/share/man/man1/k5srvutil.1 #usr/share/man/man1/kadmin.1 @@ -153,6 +160,7 @@ usr/lib/libverto.so.0.0 #usr/share/man/man5/kadm5.acl.5 #usr/share/man/man5/kdc.conf.5 #usr/share/man/man5/krb5.conf.5 +#usr/share/man/man7/kerberos.7 #usr/share/man/man8/kadmin.local.8 #usr/share/man/man8/kadmind.8 #usr/share/man/man8/kdb5_ldap_util.8 @@ -163,5 +171,3 @@ usr/lib/libverto.so.0.0 #usr/share/man/man8/krb5kdc.8 #usr/share/man/man8/sserver.8 var/lib/krb5kdc -var/lib/run -var/lib/run/krb5kdc diff --git a/config/rootfiles/packages/libassuan b/config/rootfiles/packages/libassuan index d8e471773..c1bb31883 100644 --- a/config/rootfiles/packages/libassuan +++ b/config/rootfiles/packages/libassuan @@ -3,7 +3,7 @@ usr/bin/libassuan-config #usr/lib/libassuan.la usr/lib/libassuan.so usr/lib/libassuan.so.0 -usr/lib/libassuan.so.0.8.3 +usr/lib/libassuan.so.0.8.4 #usr/lib/pkgconfig/libassuan.pc #usr/share/aclocal/libassuan.m4 #usr/share/info/assuan.info diff --git a/config/rootfiles/packages/libseccomp b/config/rootfiles/packages/libseccomp index 214c14328..fb0b35d31 100644 --- a/config/rootfiles/packages/libseccomp +++ b/config/rootfiles/packages/libseccomp @@ -4,7 +4,7 @@ usr/bin/scmp_sys_resolver #usr/lib/libseccomp.la #usr/lib/libseccomp.so usr/lib/libseccomp.so.2 -usr/lib/libseccomp.so.2.4.4 +usr/lib/libseccomp.so.2.5.1 #usr/lib/pkgconfig/libseccomp.pc #usr/share/man/man1/scmp_sys_resolver.1 #usr/share/man/man3/seccomp_api_get.3 @@ -21,6 +21,12 @@ usr/lib/libseccomp.so.2.4.4 #usr/share/man/man3/seccomp_init.3 #usr/share/man/man3/seccomp_load.3 #usr/share/man/man3/seccomp_merge.3 +#usr/share/man/man3/seccomp_notify_alloc.3 +#usr/share/man/man3/seccomp_notify_fd.3 +#usr/share/man/man3/seccomp_notify_free.3 +#usr/share/man/man3/seccomp_notify_id_valid.3 +#usr/share/man/man3/seccomp_notify_receive.3 +#usr/share/man/man3/seccomp_notify_respond.3 #usr/share/man/man3/seccomp_release.3 #usr/share/man/man3/seccomp_reset.3 #usr/share/man/man3/seccomp_rule_add.3 diff --git a/config/rootfiles/packages/lynis b/config/rootfiles/packages/lynis index a7ca0e3dd..357f9cb3a 100644 --- a/config/rootfiles/packages/lynis +++ b/config/rootfiles/packages/lynis @@ -1,10 +1,5 @@ var/ipfire/lynis -#var/ipfire/lynis/CHANGELOG.md -#var/ipfire/lynis/CODE_OF_CONDUCT.md -#var/ipfire/lynis/CONTRIBUTING.md -#var/ipfire/lynis/CONTRIBUTORS.md -#var/ipfire/lynis/HAPPY_USERS.md -#var/ipfire/lynis/SECURITY.md +#var/ipfire/lynis/LICENSE #var/ipfire/lynis/db var/ipfire/lynis/db/fileperms.db var/ipfire/lynis/db/hints.db @@ -119,7 +114,8 @@ var/ipfire/lynis/include/tests_virtualization var/ipfire/lynis/include/tests_webservers var/ipfire/lynis/include/tool_tips var/ipfire/lynis/lynis -var/ipfire/lynis/lynis.8 #var/ipfire/lynis/plugins -var/ipfire/lynis/plugins/README +#var/ipfire/lynis/plugins/README var/ipfire/lynis/plugins/custom_plugin.template +var/ipfire/lynis/plugins/plugin_pam_phase1 +var/ipfire/lynis/plugins/plugin_systemd_phase1 diff --git a/config/rootfiles/packages/minicom b/config/rootfiles/packages/minicom index 53266e604..38d7e524a 100644 --- a/config/rootfiles/packages/minicom +++ b/config/rootfiles/packages/minicom @@ -17,8 +17,10 @@ usr/bin/xminicom #usr/share/locale/ro/LC_MESSAGES/minicom.mo #usr/share/locale/ru/LC_MESSAGES/minicom.mo #usr/share/locale/rw/LC_MESSAGES/minicom.mo +#usr/share/locale/sr/LC_MESSAGES/minicom.mo #usr/share/locale/sv/LC_MESSAGES/minicom.mo #usr/share/locale/vi/LC_MESSAGES/minicom.mo +#usr/share/locale/zh_CN/LC_MESSAGES/minicom.mo #usr/share/locale/zh_TW/LC_MESSAGES/minicom.mo #usr/share/man/man1/ascii-xfr.1 #usr/share/man/man1/minicom.1 diff --git a/config/rootfiles/packages/qemu b/config/rootfiles/packages/qemu index 21ae286e8..ee4b9f736 100644 --- a/config/rootfiles/packages/qemu +++ b/config/rootfiles/packages/qemu @@ -1,7 +1,5 @@ lib/udev/rules.d/65-kvm.rules usr/bin/elf2dmp -usr/bin/ivshmem-client -usr/bin/ivshmem-server usr/bin/qemu usr/bin/qemu-arm usr/bin/qemu-edid @@ -19,8 +17,6 @@ usr/bin/qemu-x86_64 usr/libexec/qemu-bridge-helper usr/libexec/virtiofsd #usr/share/applications/qemu.desktop -#usr/share/icons -#usr/share/icons/hicolor #usr/share/icons/hicolor/128x128 #usr/share/icons/hicolor/128x128/apps #usr/share/icons/hicolor/128x128/apps/qemu.png @@ -46,8 +42,6 @@ usr/libexec/virtiofsd #usr/share/icons/hicolor/64x64 #usr/share/icons/hicolor/64x64/apps #usr/share/icons/hicolor/64x64/apps/qemu.png -#usr/share/icons/hicolor/scalable -#usr/share/icons/hicolor/scalable/apps #usr/share/icons/hicolor/scalable/apps/qemu.svg #usr/share/qemu #usr/share/qemu/QEMU,cgthree.bin @@ -121,13 +115,14 @@ usr/share/qemu/kvmvapic.bin usr/share/qemu/linuxboot.bin usr/share/qemu/linuxboot_dma.bin usr/share/qemu/multiboot.bin +usr/share/qemu/npcm7xx_bootrom.bin #usr/share/qemu/openbios-ppc #usr/share/qemu/openbios-sparc32 #usr/share/qemu/openbios-sparc64 -#usr/share/qemu/opensbi-riscv32-sifive_u-fw_jump.bin -#usr/share/qemu/opensbi-riscv32-virt-fw_jump.bin -#usr/share/qemu/opensbi-riscv64-sifive_u-fw_jump.bin -#usr/share/qemu/opensbi-riscv64-virt-fw_jump.bin +#usr/share/qemu/opensbi-riscv32-generic-fw_dynamic.bin +#usr/share/qemu/opensbi-riscv32-generic-fw_dynamic.elf +#usr/share/qemu/opensbi-riscv64-generic-fw_dynamic.bin +#usr/share/qemu/opensbi-riscv64-generic-fw_dynamic.elf #usr/share/qemu/palcode-clipper #usr/share/qemu/petalogix-ml605.dtb #usr/share/qemu/petalogix-s3adsp1800.dtb @@ -138,6 +133,7 @@ usr/share/qemu/pxe-ne2k_pci.rom usr/share/qemu/pxe-pcnet.rom usr/share/qemu/pxe-rtl8139.rom usr/share/qemu/pxe-virtio.rom +usr/share/qemu/qboot.rom usr/share/qemu/qemu-nsis.bmp usr/share/qemu/qemu_vga.ndrv #usr/share/qemu/s390-ccw.img diff --git a/config/rootfiles/packages/tshark b/config/rootfiles/packages/tshark index c5081989c..f397bbf01 100644 --- a/config/rootfiles/packages/tshark +++ b/config/rootfiles/packages/tshark @@ -29,6 +29,7 @@ usr/bin/tshark #usr/include/wireshark/epan/capture_dissectors.h #usr/include/wireshark/epan/charsets.h #usr/include/wireshark/epan/chdlctypes.h +#usr/include/wireshark/epan/cisco_pid.h #usr/include/wireshark/epan/color_filters.h #usr/include/wireshark/epan/column-info.h #usr/include/wireshark/epan/column-utils.h @@ -53,6 +54,7 @@ usr/bin/tshark #usr/include/wireshark/epan/dissectors/file-rbm.h #usr/include/wireshark/epan/dissectors/packet-6lowpan.h #usr/include/wireshark/epan/dissectors/packet-a21.h +#usr/include/wireshark/epan/dissectors/packet-acdr.h #usr/include/wireshark/epan/dissectors/packet-acp133.h #usr/include/wireshark/epan/dissectors/packet-acse.h #usr/include/wireshark/epan/dissectors/packet-actrace.h @@ -82,6 +84,7 @@ usr/bin/tshark #usr/include/wireshark/epan/dissectors/packet-bthci_acl.h #usr/include/wireshark/epan/dissectors/packet-bthci_cmd.h #usr/include/wireshark/epan/dissectors/packet-bthci_evt.h +#usr/include/wireshark/epan/dissectors/packet-bthci_iso.h #usr/include/wireshark/epan/dissectors/packet-bthci_sco.h #usr/include/wireshark/epan/dissectors/packet-btl2cap.h #usr/include/wireshark/epan/dissectors/packet-btle.h @@ -146,6 +149,7 @@ usr/bin/tshark #usr/include/wireshark/epan/dissectors/packet-erf.h #usr/include/wireshark/epan/dissectors/packet-ess.h #usr/include/wireshark/epan/dissectors/packet-eth.h +#usr/include/wireshark/epan/dissectors/packet-f1ap.h #usr/include/wireshark/epan/dissectors/packet-f5ethtrailer.h #usr/include/wireshark/epan/dissectors/packet-fc.h #usr/include/wireshark/epan/dissectors/packet-fcbls.h @@ -161,6 +165,7 @@ usr/bin/tshark #usr/include/wireshark/epan/dissectors/packet-fmp.h #usr/include/wireshark/epan/dissectors/packet-frame.h #usr/include/wireshark/epan/dissectors/packet-ftam.h +#usr/include/wireshark/epan/dissectors/packet-ftdi-ft.h #usr/include/wireshark/epan/dissectors/packet-geonw.h #usr/include/wireshark/epan/dissectors/packet-giop.h #usr/include/wireshark/epan/dissectors/packet-gluster.h @@ -238,6 +243,7 @@ usr/bin/tshark #usr/include/wireshark/epan/dissectors/packet-lnet.h #usr/include/wireshark/epan/dissectors/packet-logotypecertextn.h #usr/include/wireshark/epan/dissectors/packet-lpp.h +#usr/include/wireshark/epan/dissectors/packet-lppa.h #usr/include/wireshark/epan/dissectors/packet-lte-rrc.h #usr/include/wireshark/epan/dissectors/packet-mac-lte.h #usr/include/wireshark/epan/dissectors/packet-mausb.h @@ -417,6 +423,7 @@ usr/bin/tshark #usr/include/wireshark/epan/dissectors/packet-xmpp-other.h #usr/include/wireshark/epan/dissectors/packet-xmpp-utils.h #usr/include/wireshark/epan/dissectors/packet-xmpp.h +#usr/include/wireshark/epan/dissectors/packet-xnap.h #usr/include/wireshark/epan/dissectors/packet-ypbind.h #usr/include/wireshark/epan/dissectors/packet-yppasswd.h #usr/include/wireshark/epan/dissectors/packet-ypserv.h @@ -572,6 +579,7 @@ usr/bin/tshark #usr/include/wireshark/wsutil/crc8.h #usr/include/wireshark/wsutil/curve25519.h #usr/include/wireshark/wsutil/eax.h +#usr/include/wireshark/wsutil/epochs.h #usr/include/wireshark/wsutil/filesystem.h #usr/include/wireshark/wsutil/frequency-utils.h #usr/include/wireshark/wsutil/g711.h @@ -611,14 +619,14 @@ usr/bin/tshark #usr/include/wireshark/wsutil/wsjson.h #usr/include/wireshark/wsutil/xtea.h #usr/lib/libwireshark.so -usr/lib/libwireshark.so.13 -usr/lib/libwireshark.so.13.0.6 +usr/lib/libwireshark.so.14 +usr/lib/libwireshark.so.14.0.2 #usr/lib/libwiretap.so -usr/lib/libwiretap.so.10 -usr/lib/libwiretap.so.10.0.6 +usr/lib/libwiretap.so.11 +usr/lib/libwiretap.so.11.0.2 #usr/lib/libwsutil.so -usr/lib/libwsutil.so.11 -usr/lib/libwsutil.so.11.0.0 +usr/lib/libwsutil.so.12 +usr/lib/libwsutil.so.12.0.0 #usr/lib/pkgconfig/wireshark.pc #usr/lib/wireshark #usr/lib/wireshark/cmake @@ -640,27 +648,28 @@ usr/lib/wireshark/extcap/randpktdump usr/lib/wireshark/extcap/sshdump usr/lib/wireshark/extcap/udpdump #usr/lib/wireshark/plugins -#usr/lib/wireshark/plugins/3.2 -#usr/lib/wireshark/plugins/3.2/codecs -usr/lib/wireshark/plugins/3.2/codecs/g711.so -usr/lib/wireshark/plugins/3.2/codecs/g722.so -usr/lib/wireshark/plugins/3.2/codecs/g726.so -usr/lib/wireshark/plugins/3.2/codecs/l16mono.so -#usr/lib/wireshark/plugins/3.2/epan -usr/lib/wireshark/plugins/3.2/epan/ethercat.so -usr/lib/wireshark/plugins/3.2/epan/gryphon.so -usr/lib/wireshark/plugins/3.2/epan/irda.so -usr/lib/wireshark/plugins/3.2/epan/mate.so -usr/lib/wireshark/plugins/3.2/epan/opcua.so -usr/lib/wireshark/plugins/3.2/epan/profinet.so -usr/lib/wireshark/plugins/3.2/epan/stats_tree.so -usr/lib/wireshark/plugins/3.2/epan/transum.so -usr/lib/wireshark/plugins/3.2/epan/unistim.so -usr/lib/wireshark/plugins/3.2/epan/wimax.so -usr/lib/wireshark/plugins/3.2/epan/wimaxasncp.so -usr/lib/wireshark/plugins/3.2/epan/wimaxmacphy.so -#usr/lib/wireshark/plugins/3.2/wiretap -usr/lib/wireshark/plugins/3.2/wiretap/usbdump.so +#usr/lib/wireshark/plugins/3.4 +#usr/lib/wireshark/plugins/3.4/codecs +usr/lib/wireshark/plugins/3.4/codecs/g711.so +usr/lib/wireshark/plugins/3.4/codecs/g722.so +usr/lib/wireshark/plugins/3.4/codecs/g726.so +usr/lib/wireshark/plugins/3.4/codecs/l16mono.so +usr/lib/wireshark/plugins/3.4/codecs/opus_dec.so +#usr/lib/wireshark/plugins/3.4/epan +usr/lib/wireshark/plugins/3.4/epan/ethercat.so +usr/lib/wireshark/plugins/3.4/epan/gryphon.so +usr/lib/wireshark/plugins/3.4/epan/irda.so +usr/lib/wireshark/plugins/3.4/epan/mate.so +usr/lib/wireshark/plugins/3.4/epan/opcua.so +usr/lib/wireshark/plugins/3.4/epan/profinet.so +usr/lib/wireshark/plugins/3.4/epan/stats_tree.so +usr/lib/wireshark/plugins/3.4/epan/transum.so +usr/lib/wireshark/plugins/3.4/epan/unistim.so +usr/lib/wireshark/plugins/3.4/epan/wimax.so +usr/lib/wireshark/plugins/3.4/epan/wimaxasncp.so +usr/lib/wireshark/plugins/3.4/epan/wimaxmacphy.so +#usr/lib/wireshark/plugins/3.4/wiretap +usr/lib/wireshark/plugins/3.4/wiretap/usbdump.so #usr/share/doc/wireshark #usr/share/doc/wireshark/androiddump.html #usr/share/doc/wireshark/capinfos.html @@ -711,7 +720,7 @@ usr/lib/wireshark/plugins/3.2/wiretap/usbdump.so usr/share/wireshark/cfilters #usr/share/wireshark/ciscodump.html usr/share/wireshark/colorfilters -usr/share/wireshark/dfilter_macros +#usr/share/wireshark/dfilter_macros usr/share/wireshark/dfilters #usr/share/wireshark/dftest.html #usr/share/wireshark/diameter @@ -724,6 +733,7 @@ usr/share/wireshark/diameter/HP.xml usr/share/wireshark/diameter/Huawei.xml usr/share/wireshark/diameter/Inovar.xml usr/share/wireshark/diameter/Juniper.xml +usr/share/wireshark/diameter/Metaswitch.xml usr/share/wireshark/diameter/Microsoft.xml usr/share/wireshark/diameter/Nokia.xml usr/share/wireshark/diameter/NokiaSolutionsAndNetworks.xml @@ -839,6 +849,7 @@ usr/share/wireshark/radius/dictionary.dlink usr/share/wireshark/radius/dictionary.dragonwave usr/share/wireshark/radius/dictionary.efficientip usr/share/wireshark/radius/dictionary.eltex +usr/share/wireshark/radius/dictionary.enterasys usr/share/wireshark/radius/dictionary.epygi usr/share/wireshark/radius/dictionary.equallogic usr/share/wireshark/radius/dictionary.ericsson @@ -860,6 +871,7 @@ usr/share/wireshark/radius/dictionary.h3c usr/share/wireshark/radius/dictionary.hp usr/share/wireshark/radius/dictionary.huawei usr/share/wireshark/radius/dictionary.iana +usr/share/wireshark/radius/dictionary.identity_engines usr/share/wireshark/radius/dictionary.iea usr/share/wireshark/radius/dictionary.infoblox usr/share/wireshark/radius/dictionary.infonet diff --git a/config/rootfiles/packages/x86_64/samba b/config/rootfiles/packages/x86_64/samba index 2df36e438..590479da7 100644 --- a/config/rootfiles/packages/x86_64/samba +++ b/config/rootfiles/packages/x86_64/samba @@ -268,6 +268,7 @@ usr/lib/python3.8/site-packages/samba/dcerpc/witness.cpython-38-x86_64-linux-gnu usr/lib/python3.8/site-packages/samba/dcerpc/wkssvc.cpython-38-x86_64-linux-gnu.so usr/lib/python3.8/site-packages/samba/dcerpc/xattr.cpython-38-x86_64-linux-gnu.so usr/lib/python3.8/site-packages/samba/descriptor.py +usr/lib/python3.8/site-packages/samba/dnsresolver.py usr/lib/python3.8/site-packages/samba/dnsserver.py usr/lib/python3.8/site-packages/samba/domain_update.py usr/lib/python3.8/site-packages/samba/drs_utils.py @@ -788,6 +789,7 @@ usr/lib/security/pam_winbind.so usr/libexec/samba/smbspool_krb5_wrapper usr/sbin/eventlogadm usr/sbin/nmbd +usr/sbin/samba-change-password usr/sbin/samba-gpupdate usr/sbin/smbd usr/sbin/winbindd @@ -797,6 +799,7 @@ var/ipfire/samba/global #var/ipfire/samba/private var/ipfire/samba/private/secrets.tdb var/ipfire/samba/private/smbpasswd +var/ipfire/samba/samba-change-password var/ipfire/samba/settings var/ipfire/samba/shares var/ipfire/samba/smb.conf diff --git a/config/samba/samba-change-password b/config/samba/samba-change-password new file mode 100644 index 000000000..06f783e52 --- /dev/null +++ b/config/samba/samba-change-password @@ -0,0 +1,37 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2021 IPFire Team <info(a)ipfire.org> # +# # +############################################################################ + +main() { + local username="${1}" + local password="${2}" + + # Change password UNIX account + printf -- "${username}:${password}\n" | chpasswd + + # Change SMB password + printf -- "${password}\n${password}\n" | smbpasswd -as "${username}" + + return 0 +} + +main "$@" || exit "$?" diff --git a/config/suricata/convert-snort b/config/suricata/convert-snort index 3e938137e..7d75233b4 100644 --- a/config/suricata/convert-snort +++ b/config/suricata/convert-snort @@ -23,6 +23,7 @@ use strict; require '/var/ipfire/general-functions.pl'; require "${General::swroot}/ids-functions.pl"; +require "${General::swroot}/network-functions.pl"; # Snort settings file, which contains the settings from the WUI. my $snort_settings_file = "${General::swroot}/snort/settings"; @@ -129,7 +130,7 @@ my %rulessettings = ( ); # Get all available network zones. -my @network_zones = &IDS::get_available_network_zones(); +my @network_zones = &Network::get_available_network_zones(); # Read-in snort settings file. &General::readhash("$snort_settings_file", \%snortsettings); diff --git a/config/udev/network-hotplug-bridges b/config/udev/network-hotplug-bridges index 89470fec0..4fc11fb33 100644 --- a/config/udev/network-hotplug-bridges +++ b/config/udev/network-hotplug-bridges @@ -87,8 +87,8 @@ STP_PRIORITY="$(get_value "${ZONE}_STP_PRIORITY")" case "${MODE}" in bridge) # We need to check if $STP_PRIORITY has a valid value if not set it - if [ -n "${STP_PRIORITY}" ]; then - STP_PRIORITY=16384; + if [ -z "${STP_PRIORITY}" ]; then + STP_PRIORITY=16384 fi ADDRESS="$(get_value "${ZONE}_MACADDR")" diff --git a/config/unbound/unbound.conf b/config/unbound/unbound.conf index 3aab6ea46..9d5e840dd 100644 --- a/config/unbound/unbound.conf +++ b/config/unbound/unbound.conf @@ -27,9 +27,6 @@ server: prefetch: yes prefetch-key: yes - # Randomise any cached responses - rrset-roundrobin: yes - # Privacy Options hide-identity: yes hide-version: yes @@ -47,9 +44,6 @@ server: # TLS tls-cert-bundle: /etc/ssl/certs/ca-bundle.crt - # EDNS Buffer Size (#12240) - edns-buffer-size: 1232 - # Harden against DNS cache poisoning unwanted-reply-threshold: 1000000 @@ -60,6 +54,9 @@ server: # Allow access from everywhere access-control: 0.0.0.0/0 allow + # Timeout behaviour + infra-keep-probing: yes + # Bootstrap root servers root-hints: "/etc/unbound/root.hints" diff --git a/config/wpa_supplicant/config b/config/wpa_supplicant/config index f3e114bfd..d2fed45cd 100644 --- a/config/wpa_supplicant/config +++ b/config/wpa_supplicant/config @@ -1,9 +1,9 @@ # Example wpa_supplicant build time configuration # # This file lists the configuration options that are used when building the -# hostapd binary. All lines starting with # are ignored. Configuration option -# lines must be commented out complete, if they are not to be included, i.e., -# just setting VARIABLE=n is not disabling that variable. +# wpa_supplicant binary. All lines starting with # are ignored. Configuration +# option lines must be commented out complete, if they are not to be included, +# i.e., just setting VARIABLE=n is not disabling that variable. # # This file is included in Makefile, so variables like CFLAGS and LIBS can also # be modified from here. In most cases, these lines should use += in order not @@ -20,75 +20,39 @@ # used to fix build issues on such systems (krb5.h not found). #CFLAGS += -I/usr/include/kerberos -# Example configuration for various cross-compilation platforms - -#### sveasoft (e.g., for Linksys WRT54G) ###################################### -#CC=mipsel-uclibc-gcc -#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc -#CFLAGS += -Os -#CPPFLAGS += -I../src/include -I../../src/router/openssl/include -#LIBS += -L/opt/brcm/hndtools-mipsel-uclibc-0.9.19/lib -lssl -############################################################################### - -#### openwrt (e.g., for Linksys WRT54G) ####################################### -#CC=mipsel-uclibc-gcc -#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc -#CFLAGS += -Os -#CPPFLAGS=-I../src/include -I../openssl-0.9.7d/include \ -# -I../WRT54GS/release/src/include -#LIBS = -lssl -############################################################################### - - -# Driver interface for Host AP driver -CONFIG_DRIVER_HOSTAP=y - -# Driver interface for Agere driver -#CONFIG_DRIVER_HERMES=y -# Change include directories to match with the local setup -#CFLAGS += -I../../hcf -I../../include -I../../include/hcf -#CFLAGS += -I../../include/wireless - -# Driver interface for madwifi driver -#CONFIG_DRIVER_MADWIFI=y -# Set include directory to the madwifi source tree -#CFLAGS += -I/usr/src/madwifi - -# Driver interface for Prism54 driver -# (Note: Prism54 is not yet supported, i.e., this will not work as-is and is -# for developers only) -CONFIG_DRIVER_PRISM54=y - -# Driver interface for ndiswrapper -CONFIG_DRIVER_NDISWRAPPER=y - -# Driver interface for Atmel driver -CONFIG_DRIVER_ATMEL=y - -# Driver interface for old Broadcom driver -# Please note that the newer Broadcom driver ("hybrid Linux driver") supports -# Linux wireless extensions and does not need (or even work) with the old -# driver wrapper. Use CONFIG_DRIVER_WEXT=y with that driver. -#CONFIG_DRIVER_BROADCOM=y -# Example path for wlioctl.h; change to match your configuration -#CFLAGS += -I/opt/WRT54GS/release/src/include - -# Driver interface for Intel ipw2100/2200 driver -CONFIG_DRIVER_IPW=y - -# Driver interface for Ralink driver -CONFIG_DRIVER_RALINK=y - # Driver interface for generic Linux wireless extensions +# Note: WEXT is deprecated in the current Linux kernel version and no new +# functionality is added to it. nl80211-based interface is the new +# replacement for WEXT and its use allows wpa_supplicant to properly control +# the driver to improve existing functionality like roaming and to support new +# functionality. CONFIG_DRIVER_WEXT=y # Driver interface for Linux drivers using the nl80211 kernel interface CONFIG_DRIVER_NL80211=y +# QCA vendor extensions to nl80211 +#CONFIG_DRIVER_NL80211_QCA=y + +# driver_nl80211.c requires libnl. If you are compiling it yourself +# you may need to point hostapd to your version of libnl. +# +#CFLAGS += -I$<path to libnl include files> +#LIBS += -L$<path to libnl library files> + +# Use libnl v2.0 (or 3.0) libraries. +#CONFIG_LIBNL20=y + +# Use libnl 3.2 libraries (if this is selected, CONFIG_LIBNL20 is ignored) +CONFIG_LIBNL32=y + + # Driver interface for FreeBSD net80211 layer (e.g., Atheros driver) #CONFIG_DRIVER_BSD=y #CFLAGS += -I/usr/local/include #LIBS += -L/usr/local/lib +#LIBS_p += -L/usr/local/lib +#LIBS_c += -L/usr/local/lib # Driver interface for Windows NDIS #CONFIG_DRIVER_NDIS=y @@ -106,17 +70,27 @@ CONFIG_DRIVER_NL80211=y # wpa_supplicant. # CONFIG_USE_NDISUIO=y -# Driver interface for development testing -#CONFIG_DRIVER_TEST=y - # Driver interface for wired Ethernet drivers CONFIG_DRIVER_WIRED=y +# Driver interface for MACsec capable Qualcomm Atheros drivers +#CONFIG_DRIVER_MACSEC_QCA=y + +# Driver interface for Linux MACsec drivers +#CONFIG_DRIVER_MACSEC_LINUX=y + # Driver interface for the Broadcom RoboSwitch family #CONFIG_DRIVER_ROBOSWITCH=y -# Enable IEEE 802.1X Supplicant (automatically included if any EAP method is -# included) +# Driver interface for no driver (e.g., WPS ER only) +#CONFIG_DRIVER_NONE=y + +# Solaris libraries +#LIBS += -lsocket -ldlpi -lnsl +#LIBS_c += -lsocket + +# Enable IEEE 802.1X Supplicant (automatically included if any EAP method or +# MACsec is included) CONFIG_IEEE8021X_EAPOL=y # EAP-MD5 @@ -135,11 +109,17 @@ CONFIG_EAP_PEAP=y CONFIG_EAP_TTLS=y # EAP-FAST -# Note: Default OpenSSL package does not include support for all the -# functionality needed for EAP-FAST. If EAP-FAST is enabled with OpenSSL, -# the OpenSSL library must be patched (openssl-0.9.8d-tls-extensions.patch) -# to add the needed functions. -#CONFIG_EAP_FAST=y +CONFIG_EAP_FAST=y + +# EAP-TEAP +# Note: The current EAP-TEAP implementation is experimental and should not be +# enabled for production use. The IETF RFC 7170 that defines EAP-TEAP has number +# of conflicting statements and missing details and the implementation has +# vendor specific workarounds for those and as such, may not interoperate with +# any other implementation. This should not be used for anything else than +# experimentation and interoperability testing until those issues has been +# resolved. +#CONFIG_EAP_TEAP=y # EAP-GTC CONFIG_EAP_GTC=y @@ -150,11 +130,17 @@ CONFIG_EAP_OTP=y # EAP-SIM (enable CONFIG_PCSC, if EAP-SIM is used) #CONFIG_EAP_SIM=y +# Enable SIM simulator (Milenage) for EAP-SIM +#CONFIG_SIM_SIMULATOR=y + # EAP-PSK (experimental; this is _not_ needed for WPA-PSK) #CONFIG_EAP_PSK=y +# EAP-pwd (secure authentication using only a password) +CONFIG_EAP_PWD=y + # EAP-PAX -#CONFIG_EAP_PAX=y +CONFIG_EAP_PAX=y # LEAP CONFIG_EAP_LEAP=y @@ -170,22 +156,35 @@ CONFIG_EAP_LEAP=y #CONFIG_USIM_SIMULATOR=y # EAP-SAKE -#CONFIG_EAP_SAKE=y +CONFIG_EAP_SAKE=y # EAP-GPSK -#CONFIG_EAP_GPSK=y +CONFIG_EAP_GPSK=y # Include support for optional SHA256 cipher suite in EAP-GPSK -#CONFIG_EAP_GPSK_SHA256=y +CONFIG_EAP_GPSK_SHA256=y # EAP-TNC and related Trusted Network Connect support (experimental) -#CONFIG_EAP_TNC=y +CONFIG_EAP_TNC=y # Wi-Fi Protected Setup (WPS) CONFIG_WPS=y +# Enable WPS external registrar functionality +#CONFIG_WPS_ER=y +# Disable credentials for an open network by default when acting as a WPS +# registrar. +#CONFIG_WPS_REG_DISABLE_OPEN=y +# Enable WPS support with NFC config method +#CONFIG_WPS_NFC=y # EAP-IKEv2 CONFIG_EAP_IKEV2=y +# EAP-EKE +#CONFIG_EAP_EKE=y + +# MACsec +CONFIG_MACSEC=y + # PKCS#12 (PFX) support (used to read private key and certificate file from # a file that usually has extension .p12 or .pfx) CONFIG_PKCS12=y @@ -198,13 +197,22 @@ CONFIG_SMARTCARD=y # Enable this if EAP-SIM or EAP-AKA is included #CONFIG_PCSC=y +# Support HT overrides (disable HT/HT40, mask MCS rates, etc.) +#CONFIG_HT_OVERRIDES=y + +# Support VHT overrides (disable VHT, mask MCS rates, etc.) +#CONFIG_VHT_OVERRIDES=y + # Development testing #CONFIG_EAPOL_TEST=y # Select control interface backend for external programs, e.g, wpa_cli: # unix = UNIX domain sockets (default for Linux/*BSD) # udp = UDP sockets using localhost (127.0.0.1) +# udp6 = UDP IPv6 sockets using localhost (::1) # named_pipe = Windows Named Pipe (default for Windows) +# udp-remote = UDP sockets with remote access (only for tests systems/purpose) +# udp6-remote = UDP IPv6 sockets with remote access (only for tests purpose) # y = use default (backwards compatibility) # If this option is commented out, control interface is not included in the # build. @@ -216,6 +224,10 @@ CONFIG_CTRL_IFACE=y # the resulting binary. #CONFIG_READLINE=y +# Include internal line edit mode in wpa_cli. This can be used as a replacement +# for GNU Readline to provide limited command line editing and history support. +#CONFIG_WPA_CLI_EDIT=y + # Remove debugging code that is printing out debug message to stdout. # This can be used to reduce the size of the wpa_supplicant considerably # if debugging code is not needed. The size reduction can be around 35% @@ -226,11 +238,6 @@ CONFIG_CTRL_IFACE=y # 35-50 kB in code size. #CONFIG_NO_WPA=y -# Remove WPA2 support. This allows WPA to be used, but removes WPA2 code to -# save about 1 kB in code size when building only WPA-Personal (no EAP support) -# or 6 kB if building for WPA-Enterprise. -#CONFIG_NO_WPA2=y - # Remove IEEE 802.11i/WPA-Personal ASCII passphrase support # This option can be used to reduce code size by removing support for # converting ASCII passphrases into PSK. If this functionality is removed, the @@ -238,12 +245,10 @@ CONFIG_CTRL_IFACE=y # wpa_passphrase). This saves about 0.5 kB in code size. #CONFIG_NO_WPA_PASSPHRASE=y -# Remove AES extra functions. This can be used to reduce code size by about -# 1.5 kB by removing extra AES modes that are not needed for commonly used -# client configurations (they are needed for some EAP types). -#CONFIG_NO_AES_EXTRAS=y +# Simultaneous Authentication of Equals (SAE), WPA3-Personal +CONFIG_SAE=y -# Disable scan result processing (ap_mode=1) to save code size by about 1 kB. +# Disable scan result processing (ap_scan=1) to save code size by about 1 kB. # This can be used if ap_scan=1 mode is never enabled. #CONFIG_NO_SCAN_PROCESSING=y @@ -270,7 +275,7 @@ CONFIG_BACKEND=file # main_none = Very basic example (development use only) #CONFIG_MAIN=main -# Select wrapper for operatins system and C library specific functions +# Select wrapper for operating system and C library specific functions # unix = UNIX/POSIX like systems (default) # win32 = Windows systems # none = Empty template @@ -279,9 +284,17 @@ CONFIG_BACKEND=file # Select event loop implementation # eloop = select() loop (default) # eloop_win = Windows events and WaitForMultipleObject() loop -# eloop_none = Empty template #CONFIG_ELOOP=eloop +# Should we use poll instead of select? Select is used by default. +#CONFIG_ELOOP_POLL=y + +# Should we use epoll instead of select? Select is used by default. +#CONFIG_ELOOP_EPOLL=y + +# Should we use kqueue instead of select? Select is used by default. +#CONFIG_ELOOP_KQUEUE=y + # Select layer 2 packet implementation # linux = Linux packet socket (default) # pcap = libpcap/libdnet/WinPcap @@ -291,29 +304,40 @@ CONFIG_BACKEND=file # none = Empty template #CONFIG_L2_PACKET=linux -# PeerKey handshake for Station to Station Link (IEEE 802.11e DLS) -CONFIG_PEERKEY=y +# Disable Linux packet socket workaround applicable for station interface +# in a bridge for EAPOL frames. This should be uncommented only if the kernel +# is known to not have the regression issue in packet socket behavior with +# bridge interfaces (commit 'bridge: respect RFC2863 operational state')'). +#CONFIG_NO_LINUX_PACKET_SOCKET_WAR=y -# IEEE 802.11w (management frame protection) -# This version is an experimental implementation based on IEEE 802.11w/D1.0 -# draft and is subject to change since the standard has not yet been finalized. -# Driver support is also needed for IEEE 802.11w. -#CONFIG_IEEE80211W=y +# Support Operating Channel Validation +#CONFIG_OCV=y # Select TLS implementation # openssl = OpenSSL (default) -# gnutls = GnuTLS (needed for TLS/IA, see also CONFIG_GNUTLS_EXTRA) +# gnutls = GnuTLS # internal = Internal TLSv1 implementation (experimental) +# linux = Linux kernel AF_ALG and internal TLSv1 implementation (experimental) # none = Empty template #CONFIG_TLS=openssl -# Whether to enable TLS/IA support, which is required for EAP-TTLSv1. -# You need CONFIG_TLS=gnutls for this to have any effect. Please note that -# even though the core GnuTLS library is released under LGPL, this extra -# library uses GPL and as such, the terms of GPL apply to the combination -# of wpa_supplicant and GnuTLS if this option is enabled. BSD license may not -# apply for distribution of the resulting binary. -#CONFIG_GNUTLS_EXTRA=y +# TLS-based EAP methods require at least TLS v1.0. Newer version of TLS (v1.1) +# can be enabled to get a stronger construction of messages when block ciphers +# are used. It should be noted that some existing TLS v1.0 -based +# implementation may not be compatible with TLS v1.1 message (ClientHello is +# sent prior to negotiating which version will be used) +#CONFIG_TLSV11=y + +# TLS-based EAP methods require at least TLS v1.0. Newer version of TLS (v1.2) +# can be enabled to enable use of stronger crypto algorithms. It should be +# noted that some existing TLS v1.0 -based implementation may not be compatible +# with TLS v1.2 message (ClientHello is sent prior to negotiating which version +# will be used) +#CONFIG_TLSV12=y + +# Select which ciphers to use by default with OpenSSL if the user does not +# specify them. +#CONFIG_TLS_DEFAULT_CIPHERS="DEFAULT:!EXP:!LOW" # If CONFIG_TLS=internal is used, additional library and include paths are # needed for LibTomMath. Alternatively, an integrated, minimal version of @@ -337,8 +361,12 @@ CONFIG_PEERKEY=y #CONFIG_NDIS_EVENTS_INTEGRATED=y #PLATFORMSDKLIB="/opt/Program Files/Microsoft Platform SDK/Lib" -# Add support for DBus control interface -#CONFIG_CTRL_IFACE_DBUS=y +# Add support for new DBus control interface +# (fi.w1.wpa_supplicant1) +#CONFIG_CTRL_IFACE_DBUS_NEW=y + +# Add introspection support for new DBus control interface +#CONFIG_CTRL_IFACE_DBUS_INTRO=y # Add support for loading EAP methods dynamically as shared libraries. # When this option is enabled, each EAP method can be either included @@ -361,18 +389,26 @@ CONFIG_PEERKEY=y # amount of memory/flash. #CONFIG_DYNAMIC_EAP_METHODS=y -# Include client MLME (management frame processing). -# This can be used to move MLME processing of Linux mac80211 stack into user -# space. Please note that this is currently only available with -# driver_nl80211.c and only with a modified version of Linux kernel and -# wpa_supplicant. -#CONFIG_CLIENT_MLME=y - -# IEEE Std 802.11r-2008 (Fast BSS Transition) -#CONFIG_IEEE80211R=y +# IEEE Std 802.11r-2008 (Fast BSS Transition) for station mode +CONFIG_IEEE80211R=y # Add support for writing debug log to a file (/tmp/wpa_supplicant-log-#.txt) -#CONFIG_DEBUG_FILE=y +CONFIG_DEBUG_FILE=y + +# Send debug messages to syslog instead of stdout +CONFIG_DEBUG_SYSLOG=y +# Set syslog facility for debug messages +#CONFIG_DEBUG_SYSLOG_FACILITY=LOG_DAEMON + +# Add support for sending all debug messages (regardless of debug verbosity) +# to the Linux kernel tracing facility. This helps debug the entire stack by +# making it easy to record everything happening from the driver up into the +# same file, e.g., using trace-cmd. +#CONFIG_DEBUG_LINUX_TRACING=y + +# Add support for writing debug log to Android logcat instead of standard +# output +#CONFIG_ANDROID_LOG=y # Enable privilege separation (see README 'Privilege separation' for details) #CONFIG_PRIVSEP=y @@ -380,3 +416,210 @@ CONFIG_PEERKEY=y # Enable mitigation against certain attacks against TKIP by delaying Michael # MIC error reports by a random amount of time between 0 and 60 seconds #CONFIG_DELAYED_MIC_ERROR_REPORT=y + +# Enable tracing code for developer debugging +# This tracks use of memory allocations and other registrations and reports +# incorrect use with a backtrace of call (or allocation) location. +#CONFIG_WPA_TRACE=y +# For BSD, uncomment these. +#LIBS += -lexecinfo +#LIBS_p += -lexecinfo +#LIBS_c += -lexecinfo + +# Use libbfd to get more details for developer debugging +# This enables use of libbfd to get more detailed symbols for the backtraces +# generated by CONFIG_WPA_TRACE=y. +#CONFIG_WPA_TRACE_BFD=y +# For BSD, uncomment these. +#LIBS += -lbfd -liberty -lz +#LIBS_p += -lbfd -liberty -lz +#LIBS_c += -lbfd -liberty -lz + +# wpa_supplicant depends on strong random number generation being available +# from the operating system. os_get_random() function is used to fetch random +# data when needed, e.g., for key generation. On Linux and BSD systems, this +# works by reading /dev/urandom. It should be noted that the OS entropy pool +# needs to be properly initialized before wpa_supplicant is started. This is +# important especially on embedded devices that do not have a hardware random +# number generator and may by default start up with minimal entropy available +# for random number generation. +# +# As a safety net, wpa_supplicant is by default trying to internally collect +# additional entropy for generating random data to mix in with the data fetched +# from the OS. This by itself is not considered to be very strong, but it may +# help in cases where the system pool is not initialized properly. However, it +# is very strongly recommended that the system pool is initialized with enough +# entropy either by using hardware assisted random number generator or by +# storing state over device reboots. +# +# wpa_supplicant can be configured to maintain its own entropy store over +# restarts to enhance random number generation. This is not perfect, but it is +# much more secure than using the same sequence of random numbers after every +# reboot. This can be enabled with -e<entropy file> command line option. The +# specified file needs to be readable and writable by wpa_supplicant. +# +# If the os_get_random() is known to provide strong random data (e.g., on +# Linux/BSD, the board in question is known to have reliable source of random +# data from /dev/urandom), the internal wpa_supplicant random pool can be +# disabled. This will save some in binary size and CPU use. However, this +# should only be considered for builds that are known to be used on devices +# that meet the requirements described above. +#CONFIG_NO_RANDOM_POOL=y + +# Should we attempt to use the getrandom(2) call that provides more reliable +# yet secure randomness source than /dev/random on Linux 3.17 and newer. +# Requires glibc 2.25 to build, falls back to /dev/random if unavailable. +CONFIG_GETRANDOM=y + +# IEEE 802.11ac (Very High Throughput) support (mainly for AP mode) +CONFIG_IEEE80211AC=y + +# Wireless Network Management (IEEE Std 802.11v-2011) +# Note: This is experimental and not complete implementation. +#CONFIG_WNM=y + +# Interworking (IEEE 802.11u) +# This can be used to enable functionality to improve interworking with +# external networks (GAS/ANQP to learn more about the networks and network +# selection based on available credentials). +CONFIG_INTERWORKING=y + +# Hotspot 2.0 +CONFIG_HS20=y + +# Enable interface matching in wpa_supplicant +#CONFIG_MATCH_IFACE=y + +# Disable roaming in wpa_supplicant +#CONFIG_NO_ROAMING=y + +# AP mode operations with wpa_supplicant +# This can be used for controlling AP mode operations with wpa_supplicant. It +# should be noted that this is mainly aimed at simple cases like +# WPA2-Personal while more complex configurations like WPA2-Enterprise with an +# external RADIUS server can be supported with hostapd. +CONFIG_AP=y + +# P2P (Wi-Fi Direct) +# This can be used to enable P2P support in wpa_supplicant. See README-P2P for +# more information on P2P operations. +CONFIG_P2P=y + +# Enable TDLS support +CONFIG_TDLS=y + +# Wi-Fi Display +# This can be used to enable Wi-Fi Display extensions for P2P using an external +# program to control the additional information exchanges in the messages. +CONFIG_WIFI_DISPLAY=y + +# Autoscan +# This can be used to enable automatic scan support in wpa_supplicant. +# See wpa_supplicant.conf for more information on autoscan usage. +# +# Enabling directly a module will enable autoscan support. +# For exponential module: +#CONFIG_AUTOSCAN_EXPONENTIAL=y +# For periodic module: +#CONFIG_AUTOSCAN_PERIODIC=y + +# Password (and passphrase, etc.) backend for external storage +# These optional mechanisms can be used to add support for storing passwords +# and other secrets in external (to wpa_supplicant) location. This allows, for +# example, operating system specific key storage to be used +# +# External password backend for testing purposes (developer use) +#CONFIG_EXT_PASSWORD_TEST=y + +# Enable Fast Session Transfer (FST) +#CONFIG_FST=y + +# Enable CLI commands for FST testing +#CONFIG_FST_TEST=y + +# OS X builds. This is only for building eapol_test. +#CONFIG_OSX=y + +# Automatic Channel Selection +# This will allow wpa_supplicant to pick the channel automatically when channel +# is set to "0". +# +# TODO: Extend parser to be able to parse "channel=acs_survey" as an alternative +# to "channel=0". This would enable us to eventually add other ACS algorithms in +# similar way. +# +# Automatic selection is currently only done through initialization, later on +# we hope to do background checks to keep us moving to more ideal channels as +# time goes by. ACS is currently only supported through the nl80211 driver and +# your driver must have survey dump capability that is filled by the driver +# during scanning. +# +# TODO: In analogy to hostapd be able to customize the ACS survey algorithm with +# a newly to create wpa_supplicant.conf variable acs_num_scans. +# +# Supported ACS drivers: +# * ath9k +# * ath5k +# * ath10k +# +# For more details refer to: +# http://wireless.kernel.org/en/users/Documentation/acs +#CONFIG_ACS=y + +# Support Multi Band Operation +#CONFIG_MBO=y + +# Fast Initial Link Setup (FILS) (IEEE 802.11ai) +#CONFIG_FILS=y +# FILS shared key authentication with PFS +#CONFIG_FILS_SK_PFS=y + +# Support RSN on IBSS networks +# This is needed to be able to use mode=1 network profile with proto=RSN and +# key_mgmt=WPA-PSK (i.e., full key management instead of WPA-None). +CONFIG_IBSS_RSN=y + +# External PMKSA cache control +# This can be used to enable control interface commands that allow the current +# PMKSA cache entries to be fetched and new entries to be added. +#CONFIG_PMKSA_CACHE_EXTERNAL=y + +# Mesh Networking (IEEE 802.11s) +#CONFIG_MESH=y + +# Background scanning modules +# These can be used to request wpa_supplicant to perform background scanning +# operations for roaming within an ESS (same SSID). See the bgscan parameter in +# the wpa_supplicant.conf file for more details. +# Periodic background scans based on signal strength +CONFIG_BGSCAN_SIMPLE=y +# Learn channels used by the network and try to avoid bgscans on other +# channels (experimental) +#CONFIG_BGSCAN_LEARN=y + +# Opportunistic Wireless Encryption (OWE) +# Experimental implementation of draft-harkins-owe-07.txt +#CONFIG_OWE=y + +# Device Provisioning Protocol (DPP) +CONFIG_DPP=y + +# Wired equivalent privacy (WEP) +# WEP is an obsolete cryptographic data confidentiality algorithm that is not +# considered secure. It should not be used for anything anymore. The +# functionality needed to use WEP is available in the current wpa_supplicant +# release under this optional build parameter. This functionality is subject to +# be completely removed in a future release. +#CONFIG_WEP=y + +# Remove all TKIP functionality +# TKIP is an old cryptographic data confidentiality algorithm that is not +# considered secure. It should not be used anymore for anything else than a +# backwards compatibility option as a group cipher when connecting to APs that +# use WPA+WPA2 mixed mode. For now, the default wpa_supplicant build includes +# support for this by default, but that functionality is subject to be removed +# in the future. +#CONFIG_NO_TKIP=y + +# Enable 802.11w +CONFIG_IEEE80211W=y diff --git a/doc/language_issues.de b/doc/language_issues.de index 6d22fcea4..aae7ca565 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -39,7 +39,6 @@ WARNING: translation string unused: accounting WARNING: translation string unused: accounting user nonpdc WARNING: translation string unused: accounting user pdc WARNING: translation string unused: activate user -WARNING: translation string unused: active WARNING: translation string unused: add a new rule WARNING: translation string unused: add cron WARNING: translation string unused: add network @@ -116,7 +115,6 @@ WARNING: translation string unused: and WARNING: translation string unused: apply WARNING: translation string unused: archive not exist WARNING: translation string unused: attemps -WARNING: translation string unused: available updates WARNING: translation string unused: avoid dod WARNING: translation string unused: backup config floppy WARNING: translation string unused: backup configuration @@ -524,6 +522,7 @@ WARNING: translation string unused: open to all WARNING: translation string unused: openvpn disabled WARNING: translation string unused: openvpn enabled WARNING: translation string unused: optional data +WARNING: translation string unused: options WARNING: translation string unused: optionsfw portlist hint WARNING: translation string unused: optionsfw warning WARNING: translation string unused: or @@ -766,7 +765,9 @@ WARNING: translation string unused: umount WARNING: translation string unused: umount removable media before to unplug WARNING: translation string unused: unencrypted WARNING: translation string unused: unix charset +WARNING: translation string unused: unix group WARNING: translation string unused: unix password sync +WARNING: translation string unused: unix shell WARNING: translation string unused: update transcript WARNING: translation string unused: updatedatabase WARNING: translation string unused: updates @@ -887,6 +888,7 @@ WARNING: untranslated string: show tls-auth key = Show tls-auth key WARNING: untranslated string: smb daemon = SMB Daemon WARNING: untranslated string: user management = User Management WARNING: untranslated string: winbind daemon = Winbind Daemon +WARNING: untranslated string: wlan client encryption wpa3 = WPA3 WARNING: untranslated string: wlanap 802.11w disabled = Disabled WARNING: untranslated string: wlanap 802.11w enforced = Enforced WARNING: untranslated string: wlanap 802.11w optional = Optional diff --git a/doc/language_issues.en b/doc/language_issues.en index b3c46de5e..434115902 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -95,6 +95,7 @@ WARNING: untranslated string: abort = abort WARNING: untranslated string: acpitemp = ACPI - Temperatures WARNING: untranslated string: action = Action WARNING: untranslated string: activate = Activate +WARNING: untranslated string: active = Active WARNING: untranslated string: add = Add WARNING: untranslated string: add a host = Add a host WARNING: untranslated string: add device = Add device @@ -332,6 +333,7 @@ WARNING: untranslated string: august = August WARNING: untranslated string: authentication = Authentication: WARNING: untranslated string: automatic = Automatic WARNING: untranslated string: autonomous system = Autonomous System +WARNING: untranslated string: available updates = Available updates WARNING: untranslated string: average = Average WARNING: untranslated string: back = Back WARNING: untranslated string: backup = Backup @@ -574,6 +576,7 @@ WARNING: untranslated string: dhcp advopt value = Option value WARNING: untranslated string: dhcp allow bootp = Allow bootp clients WARNING: untranslated string: dhcp bootp pxe data = Enter optional bootp pxe data for this fixed lease WARNING: untranslated string: dhcp configuration = DHCP configuration +WARNING: untranslated string: dhcp deny known clients: = Deny known clients: WARNING: untranslated string: dhcp dns enable update = Enable DNS Update (RFC2136): WARNING: untranslated string: dhcp dns key name = Key Name WARNING: untranslated string: dhcp dns update = DNS Update @@ -582,6 +585,7 @@ WARNING: untranslated string: dhcp dns update secret = Secret WARNING: untranslated string: dhcp server = DHCP Server WARNING: untranslated string: dhcp server disabled = DHCP server disabled. Stopped. WARNING: untranslated string: dhcp server enabled = DHCP server enabled. Restarting. +WARNING: untranslated string: dhcp valid range required when deny known clients checked = Valid range required when "Deny known clients:" is checked WARNING: untranslated string: dhcp-options = DHCP push options WARNING: untranslated string: dial = Connect WARNING: untranslated string: dial profile = Connect with profile @@ -1363,7 +1367,6 @@ WARNING: untranslated string: openvpn server = OpenVPN server WARNING: untranslated string: openvpn subnet is used = The given subnet is used by another OpenVPN server. WARNING: untranslated string: optional = Optional WARNING: untranslated string: optional at cmd = optional AT command -WARNING: untranslated string: options = Options WARNING: untranslated string: options fw = Firewall Options WARNING: untranslated string: orange = ORANGE WARNING: untranslated string: organization cant be empty = Organization can't be empty. @@ -1418,7 +1421,7 @@ WARNING: untranslated string: pakfire ago = ago. WARNING: untranslated string: pakfire available addons = Available Addons: WARNING: untranslated string: pakfire configuration = Pakfire Configuration WARNING: untranslated string: pakfire core update level = Core-Update-Level -WARNING: untranslated string: pakfire install description = Please choose one or more items from the list below and <br /> click the plus to install. +WARNING: untranslated string: pakfire install description = Please choose one or more items from the list below and click the plus to install. WARNING: untranslated string: pakfire install package = You want to install the following packages: WARNING: untranslated string: pakfire installed addons = Installed Addons: WARNING: untranslated string: pakfire invalid tree = Invalid repository selected @@ -1433,7 +1436,7 @@ WARNING: untranslated string: pakfire tree stable = Stable WARNING: untranslated string: pakfire tree testing = Testing WARNING: untranslated string: pakfire tree unstable = Unstable WARNING: untranslated string: pakfire uninstall all = Do you want to uninstall the following packages? -WARNING: untranslated string: pakfire uninstall description = Please choose one or more items from the list below and <br /> click the minus to uninstall. +WARNING: untranslated string: pakfire uninstall description = Please choose one or more items from the list below and click the minus to uninstall. WARNING: untranslated string: pakfire uninstall package = You want to uninstall the following packages: WARNING: untranslated string: pakfire working = Pakfire is working ... Please wait until all operations have completed successfully. WARNING: untranslated string: pap or chap = PAP or CHAP @@ -1685,6 +1688,8 @@ WARNING: untranslated string: title = Title WARNING: untranslated string: to = To WARNING: untranslated string: toggle = pause/resume WARNING: untranslated string: toggle enable disable = Enable or disable +WARNING: untranslated string: token = Token: +WARNING: untranslated string: token not set = No Token has been given. WARNING: untranslated string: tone = Tone WARNING: untranslated string: tone dial = Tone dial: WARNING: untranslated string: tor = Tor @@ -1754,8 +1759,6 @@ WARNING: untranslated string: unblock = Unblock WARNING: untranslated string: unblock all = Unblock all WARNING: untranslated string: uncheck all = Uncheck all WARNING: untranslated string: uninstall = Uninstall -WARNING: untranslated string: unix group = UNIX usergroup -WARNING: untranslated string: unix shell = UNIX Shell WARNING: untranslated string: unknown = UNKNOWN WARNING: untranslated string: unlimited = Unlimited WARNING: untranslated string: unnamed = Unnamed @@ -2124,6 +2127,7 @@ WARNING: untranslated string: wlan client encryption none = None WARNING: untranslated string: wlan client encryption wep = WEP WARNING: untranslated string: wlan client encryption wpa = WPA WARNING: untranslated string: wlan client encryption wpa2 = WPA2 +WARNING: untranslated string: wlan client encryption wpa3 = WPA3 WARNING: untranslated string: wlan client group cipher = Group cipher WARNING: untranslated string: wlan client group key algorithm = GKA WARNING: untranslated string: wlan client identity = Identity diff --git a/doc/language_issues.es b/doc/language_issues.es index 9f62f03f2..2feec8924 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -18,7 +18,6 @@ WARNING: translation string unused: accounting WARNING: translation string unused: accounting user nonpdc WARNING: translation string unused: accounting user pdc WARNING: translation string unused: activate user -WARNING: translation string unused: active WARNING: translation string unused: add a new rule WARNING: translation string unused: add cron WARNING: translation string unused: add network @@ -90,7 +89,6 @@ WARNING: translation string unused: ansi t1.483 WARNING: translation string unused: apply WARNING: translation string unused: archive not exist WARNING: translation string unused: attemps -WARNING: translation string unused: available updates WARNING: translation string unused: avoid dod WARNING: translation string unused: backup archive WARNING: translation string unused: backup clear archive @@ -472,6 +470,7 @@ WARNING: translation string unused: online help en WARNING: translation string unused: only red WARNING: translation string unused: open to all WARNING: translation string unused: optional data +WARNING: translation string unused: options WARNING: translation string unused: optionsfw portlist hint WARNING: translation string unused: optionsfw warning WARNING: translation string unused: or @@ -690,7 +689,9 @@ WARNING: translation string unused: umount WARNING: translation string unused: umount removable media before to unplug WARNING: translation string unused: unencrypted WARNING: translation string unused: unix charset +WARNING: translation string unused: unix group WARNING: translation string unused: unix password sync +WARNING: translation string unused: unix shell WARNING: translation string unused: update transcript WARNING: translation string unused: updatedatabase WARNING: translation string unused: updates @@ -886,11 +887,13 @@ WARNING: untranslated string: dh key move failed = Diffie-Hellman parameters mov WARNING: untranslated string: dh key warn = Creating DH-parameters with a length of 2048 bits takes up to several minutes. Lengths of 3072 or 4096 bits might needs several hours. Please be patient. WARNING: untranslated string: dh key warn1 = For weak systems or systems with little entropy, it is recommended to upload long Diffie-Hellman parameters by usage of the upload function. WARNING: untranslated string: dh parameter = Diffie-Hellman parameters +WARNING: untranslated string: dhcp deny known clients: = Deny known clients: WARNING: untranslated string: dhcp dns enable update = Enable DNS Update (RFC2136): WARNING: untranslated string: dhcp dns key name = Key Name WARNING: untranslated string: dhcp dns update = DNS Update WARNING: untranslated string: dhcp dns update algo = Algorithm WARNING: untranslated string: dhcp dns update secret = Secret +WARNING: untranslated string: dhcp valid range required when deny known clients checked = Valid range required when "Deny known clients:" is checked WARNING: untranslated string: disable = Disable WARNING: untranslated string: disconnected = Disconnected WARNING: untranslated string: dl client arch insecure = Download insecure Client Package (zip) @@ -1387,6 +1390,8 @@ WARNING: untranslated string: taa zombieload2 = TSX Async Abort / ZombieLoad v2 WARNING: untranslated string: tcp more reliable = TCP (more reliable) WARNING: untranslated string: ten minutes = 10 Minutes WARNING: untranslated string: thirty minutes = 30 Minutes +WARNING: untranslated string: token = Token: +WARNING: untranslated string: token not set = No Token has been given. WARNING: untranslated string: tor = Tor WARNING: untranslated string: tor accounting = Accounting WARNING: untranslated string: tor accounting bytes = Traffic (read/written) @@ -1499,6 +1504,7 @@ WARNING: untranslated string: wlan client encryption none = None WARNING: untranslated string: wlan client encryption wep = WEP WARNING: untranslated string: wlan client encryption wpa = WPA WARNING: untranslated string: wlan client encryption wpa2 = WPA2 +WARNING: untranslated string: wlan client encryption wpa3 = WPA3 WARNING: untranslated string: wlan client group cipher = Group cipher WARNING: untranslated string: wlan client group key algorithm = GKA WARNING: untranslated string: wlan client identity = Identity diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 90a745360..835352cf5 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -43,7 +43,6 @@ WARNING: translation string unused: accounting WARNING: translation string unused: accounting user nonpdc WARNING: translation string unused: accounting user pdc WARNING: translation string unused: activate user -WARNING: translation string unused: active WARNING: translation string unused: add a new rule WARNING: translation string unused: add cron WARNING: translation string unused: add network @@ -121,7 +120,6 @@ WARNING: translation string unused: and WARNING: translation string unused: apply WARNING: translation string unused: archive not exist WARNING: translation string unused: attemps -WARNING: translation string unused: available updates WARNING: translation string unused: avoid dod WARNING: translation string unused: backup archive WARNING: translation string unused: backup clear archive @@ -555,6 +553,7 @@ WARNING: translation string unused: open to all WARNING: translation string unused: openvpn disabled WARNING: translation string unused: openvpn enabled WARNING: translation string unused: optional data +WARNING: translation string unused: options WARNING: translation string unused: optionsfw portlist hint WARNING: translation string unused: optionsfw warning WARNING: translation string unused: or @@ -771,6 +770,7 @@ WARNING: translation string unused: tor accounting period weekly WARNING: translation string unused: tor bridge enabled WARNING: translation string unused: tor errmsg invalid node id WARNING: translation string unused: tor exit country +WARNING: translation string unused: tor guard country WARNING: translation string unused: traffic back WARNING: translation string unused: traffic calc time WARNING: translation string unused: traffic calc time bad @@ -803,7 +803,9 @@ WARNING: translation string unused: umount WARNING: translation string unused: umount removable media before to unplug WARNING: translation string unused: unencrypted WARNING: translation string unused: unix charset +WARNING: translation string unused: unix group WARNING: translation string unused: unix password sync +WARNING: translation string unused: unix shell WARNING: translation string unused: update transcript WARNING: translation string unused: updatedatabase WARNING: translation string unused: updates @@ -877,9 +879,8 @@ WARNING: translation string unused: zoneconf val ppp assignment error WARNING: translation string unused: zoneconf val vlan amount assignment error WARNING: translation string unused: zoneconf val vlan tag assignment error WARNING: translation string unused: zoneconf val zoneslave amount error -WARNING: untranslated string: asn lookup failed = AS lookup failed -WARNING: untranslated string: autonomous system = Autonomous System -WARNING: untranslated string: dns enable safe-search youtube = Include YouTube in Safe Search +WARNING: untranslated string: dhcp deny known clients: = Deny known clients: +WARNING: untranslated string: dhcp valid range required when deny known clients checked = Valid range required when "Deny known clients:" is checked WARNING: untranslated string: fwhost cust locationgrp = unknown string WARNING: untranslated string: fwhost err hostip = unknown string WARNING: untranslated string: guardian block a host = unknown string @@ -911,13 +912,10 @@ WARNING: untranslated string: guardian logtarget_file = unknown string WARNING: untranslated string: guardian logtarget_syslog = unknown string WARNING: untranslated string: guardian no entries = unknown string WARNING: untranslated string: guardian service = unknown string -WARNING: untranslated string: ip basic info = Basic IP information -WARNING: untranslated string: ip info for = IP information for WARNING: untranslated string: pakfire ago = ago. WARNING: untranslated string: route config changed = unknown string WARNING: untranslated string: routing config added = unknown string WARNING: untranslated string: routing config changed = unknown string -WARNING: untranslated string: tor guard country any = Any country -WARNING: untranslated string: tor guard nodes = Guard Nodes -WARNING: untranslated string: tor use guard nodes = Use only these guard nodes (one fingerprint per line) -WARNING: untranslated string: whois results from = WHOIS results from +WARNING: untranslated string: token = Token: +WARNING: untranslated string: token not set = No Token has been given. +WARNING: untranslated string: wlan client encryption wpa3 = WPA3 diff --git a/doc/language_issues.it b/doc/language_issues.it index 62e4f9953..152ce4786 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -19,7 +19,6 @@ WARNING: translation string unused: accounting WARNING: translation string unused: accounting user nonpdc WARNING: translation string unused: accounting user pdc WARNING: translation string unused: activate user -WARNING: translation string unused: active WARNING: translation string unused: add a new rule WARNING: translation string unused: add cron WARNING: translation string unused: add network @@ -96,7 +95,6 @@ WARNING: translation string unused: ansi t1.483 WARNING: translation string unused: apply WARNING: translation string unused: archive not exist WARNING: translation string unused: attemps -WARNING: translation string unused: available updates WARNING: translation string unused: avoid dod WARNING: translation string unused: backup archive WARNING: translation string unused: backup clear archive @@ -529,6 +527,7 @@ WARNING: translation string unused: open to all WARNING: translation string unused: openvpn disabled WARNING: translation string unused: openvpn enabled WARNING: translation string unused: optional data +WARNING: translation string unused: options WARNING: translation string unused: optionsfw portlist hint WARNING: translation string unused: optionsfw warning WARNING: translation string unused: or @@ -591,7 +590,6 @@ WARNING: translation string unused: pakfire core update auto WARNING: translation string unused: pakfire health check WARNING: translation string unused: pakfire register WARNING: translation string unused: pakfire update daily -WARNING: translation string unused: pakfire updates WARNING: translation string unused: password contains illegal characters WARNING: translation string unused: password crypting key WARNING: translation string unused: passwords must be at least 6 characters in length @@ -778,7 +776,9 @@ WARNING: translation string unused: umount WARNING: translation string unused: umount removable media before to unplug WARNING: translation string unused: unencrypted WARNING: translation string unused: unix charset +WARNING: translation string unused: unix group WARNING: translation string unused: unix password sync +WARNING: translation string unused: unix shell WARNING: translation string unused: update transcript WARNING: translation string unused: updatedatabase WARNING: translation string unused: updates @@ -911,11 +911,13 @@ WARNING: untranslated string: crypto warning = Cryptographic warning WARNING: untranslated string: dangerous = Dangerous WARNING: untranslated string: default IP address = Default IP Address WARNING: untranslated string: desired = Desired +WARNING: untranslated string: dhcp deny known clients: = Deny known clients: WARNING: untranslated string: dhcp dns enable update = Enable DNS Update (RFC2136): WARNING: untranslated string: dhcp dns key name = Key Name WARNING: untranslated string: dhcp dns update = DNS Update WARNING: untranslated string: dhcp dns update algo = Algorithm WARNING: untranslated string: dhcp dns update secret = Secret +WARNING: untranslated string: dhcp valid range required when deny known clients checked = Valid range required when "Deny known clients:" is checked WARNING: untranslated string: disable = Disable WARNING: untranslated string: disconnected = Disconnected WARNING: untranslated string: dl client arch insecure = Download insecure Client Package (zip) @@ -1148,6 +1150,8 @@ WARNING: untranslated string: taa zombieload2 = TSX Async Abort / ZombieLoad v2 WARNING: untranslated string: tcp more reliable = TCP (more reliable) WARNING: untranslated string: ten minutes = 10 Minutes WARNING: untranslated string: thirty minutes = 30 Minutes +WARNING: untranslated string: token = Token: +WARNING: untranslated string: token not set = No Token has been given. WARNING: untranslated string: tor guard country any = Any country WARNING: untranslated string: tor guard nodes = Guard Nodes WARNING: untranslated string: tor use guard nodes = Use only these guard nodes (one fingerprint per line) @@ -1191,6 +1195,7 @@ WARNING: untranslated string: wlan client eap authentication method = EAP Authen WARNING: untranslated string: wlan client eap phase2 method = EAP Phase 2 Method WARNING: untranslated string: wlan client eap state = EAP Status WARNING: untranslated string: wlan client encryption eap = EAP +WARNING: untranslated string: wlan client encryption wpa3 = WPA3 WARNING: untranslated string: wlan client identity = Identity WARNING: untranslated string: wlan client method = Method WARNING: untranslated string: wlan client password = Password diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 9a767322e..683c08f44 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -19,7 +19,6 @@ WARNING: translation string unused: accounting WARNING: translation string unused: accounting user nonpdc WARNING: translation string unused: accounting user pdc WARNING: translation string unused: activate user -WARNING: translation string unused: active WARNING: translation string unused: add a new rule WARNING: translation string unused: add cron WARNING: translation string unused: add network @@ -95,7 +94,6 @@ WARNING: translation string unused: ansi t1.483 WARNING: translation string unused: apply WARNING: translation string unused: archive not exist WARNING: translation string unused: attemps -WARNING: translation string unused: available updates WARNING: translation string unused: avoid dod WARNING: translation string unused: backup archive WARNING: translation string unused: backup clear archive @@ -525,6 +523,7 @@ WARNING: translation string unused: open to all WARNING: translation string unused: openvpn disabled WARNING: translation string unused: openvpn enabled WARNING: translation string unused: optional data +WARNING: translation string unused: options WARNING: translation string unused: optionsfw portlist hint WARNING: translation string unused: optionsfw warning WARNING: translation string unused: or @@ -771,7 +770,9 @@ WARNING: translation string unused: umount WARNING: translation string unused: umount removable media before to unplug WARNING: translation string unused: unencrypted WARNING: translation string unused: unix charset +WARNING: translation string unused: unix group WARNING: translation string unused: unix password sync +WARNING: translation string unused: unix shell WARNING: translation string unused: update transcript WARNING: translation string unused: updatedatabase WARNING: translation string unused: updates @@ -1187,6 +1188,8 @@ WARNING: untranslated string: taa zombieload2 = TSX Async Abort / ZombieLoad v2 WARNING: untranslated string: tcp more reliable = TCP (more reliable) WARNING: untranslated string: ten minutes = 10 Minutes WARNING: untranslated string: thirty minutes = 30 Minutes +WARNING: untranslated string: token = Token: +WARNING: untranslated string: token not set = No Token has been given. WARNING: untranslated string: tor guard country any = Any country WARNING: untranslated string: tor guard nodes = Guard Nodes WARNING: untranslated string: tor use guard nodes = Use only these guard nodes (one fingerprint per line) @@ -1232,6 +1235,7 @@ WARNING: untranslated string: wlan client eap authentication method = EAP Authen WARNING: untranslated string: wlan client eap phase2 method = EAP Phase 2 Method WARNING: untranslated string: wlan client eap state = EAP Status WARNING: untranslated string: wlan client encryption eap = EAP +WARNING: untranslated string: wlan client encryption wpa3 = WPA3 WARNING: untranslated string: wlan client identity = Identity WARNING: untranslated string: wlan client method = Method WARNING: untranslated string: wlan client password = Password diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 9f62f03f2..2feec8924 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -18,7 +18,6 @@ WARNING: translation string unused: accounting WARNING: translation string unused: accounting user nonpdc WARNING: translation string unused: accounting user pdc WARNING: translation string unused: activate user -WARNING: translation string unused: active WARNING: translation string unused: add a new rule WARNING: translation string unused: add cron WARNING: translation string unused: add network @@ -90,7 +89,6 @@ WARNING: translation string unused: ansi t1.483 WARNING: translation string unused: apply WARNING: translation string unused: archive not exist WARNING: translation string unused: attemps -WARNING: translation string unused: available updates WARNING: translation string unused: avoid dod WARNING: translation string unused: backup archive WARNING: translation string unused: backup clear archive @@ -472,6 +470,7 @@ WARNING: translation string unused: online help en WARNING: translation string unused: only red WARNING: translation string unused: open to all WARNING: translation string unused: optional data +WARNING: translation string unused: options WARNING: translation string unused: optionsfw portlist hint WARNING: translation string unused: optionsfw warning WARNING: translation string unused: or @@ -690,7 +689,9 @@ WARNING: translation string unused: umount WARNING: translation string unused: umount removable media before to unplug WARNING: translation string unused: unencrypted WARNING: translation string unused: unix charset +WARNING: translation string unused: unix group WARNING: translation string unused: unix password sync +WARNING: translation string unused: unix shell WARNING: translation string unused: update transcript WARNING: translation string unused: updatedatabase WARNING: translation string unused: updates @@ -886,11 +887,13 @@ WARNING: untranslated string: dh key move failed = Diffie-Hellman parameters mov WARNING: untranslated string: dh key warn = Creating DH-parameters with a length of 2048 bits takes up to several minutes. Lengths of 3072 or 4096 bits might needs several hours. Please be patient. WARNING: untranslated string: dh key warn1 = For weak systems or systems with little entropy, it is recommended to upload long Diffie-Hellman parameters by usage of the upload function. WARNING: untranslated string: dh parameter = Diffie-Hellman parameters +WARNING: untranslated string: dhcp deny known clients: = Deny known clients: WARNING: untranslated string: dhcp dns enable update = Enable DNS Update (RFC2136): WARNING: untranslated string: dhcp dns key name = Key Name WARNING: untranslated string: dhcp dns update = DNS Update WARNING: untranslated string: dhcp dns update algo = Algorithm WARNING: untranslated string: dhcp dns update secret = Secret +WARNING: untranslated string: dhcp valid range required when deny known clients checked = Valid range required when "Deny known clients:" is checked WARNING: untranslated string: disable = Disable WARNING: untranslated string: disconnected = Disconnected WARNING: untranslated string: dl client arch insecure = Download insecure Client Package (zip) @@ -1387,6 +1390,8 @@ WARNING: untranslated string: taa zombieload2 = TSX Async Abort / ZombieLoad v2 WARNING: untranslated string: tcp more reliable = TCP (more reliable) WARNING: untranslated string: ten minutes = 10 Minutes WARNING: untranslated string: thirty minutes = 30 Minutes +WARNING: untranslated string: token = Token: +WARNING: untranslated string: token not set = No Token has been given. WARNING: untranslated string: tor = Tor WARNING: untranslated string: tor accounting = Accounting WARNING: untranslated string: tor accounting bytes = Traffic (read/written) @@ -1499,6 +1504,7 @@ WARNING: untranslated string: wlan client encryption none = None WARNING: untranslated string: wlan client encryption wep = WEP WARNING: untranslated string: wlan client encryption wpa = WPA WARNING: untranslated string: wlan client encryption wpa2 = WPA2 +WARNING: untranslated string: wlan client encryption wpa3 = WPA3 WARNING: untranslated string: wlan client group cipher = Group cipher WARNING: untranslated string: wlan client group key algorithm = GKA WARNING: untranslated string: wlan client identity = Identity diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 5d16e0b18..cbd25d176 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -19,7 +19,6 @@ WARNING: translation string unused: accounting WARNING: translation string unused: accounting user nonpdc WARNING: translation string unused: accounting user pdc WARNING: translation string unused: activate user -WARNING: translation string unused: active WARNING: translation string unused: add a new rule WARNING: translation string unused: add cron WARNING: translation string unused: add network @@ -91,7 +90,6 @@ WARNING: translation string unused: ansi t1.483 WARNING: translation string unused: apply WARNING: translation string unused: archive not exist WARNING: translation string unused: attemps -WARNING: translation string unused: available updates WARNING: translation string unused: avoid dod WARNING: translation string unused: backup archive WARNING: translation string unused: backup clear archive @@ -463,6 +461,7 @@ WARNING: translation string unused: online help en WARNING: translation string unused: only red WARNING: translation string unused: open to all WARNING: translation string unused: optional data +WARNING: translation string unused: options WARNING: translation string unused: optionsfw portlist hint WARNING: translation string unused: optionsfw warning WARNING: translation string unused: or @@ -692,7 +691,9 @@ WARNING: translation string unused: umount WARNING: translation string unused: umount removable media before to unplug WARNING: translation string unused: unencrypted WARNING: translation string unused: unix charset +WARNING: translation string unused: unix group WARNING: translation string unused: unix password sync +WARNING: translation string unused: unix shell WARNING: translation string unused: update transcript WARNING: translation string unused: updatedatabase WARNING: translation string unused: updates @@ -888,11 +889,13 @@ WARNING: untranslated string: dh key move failed = Diffie-Hellman parameters mov WARNING: untranslated string: dh key warn = Creating DH-parameters with a length of 2048 bits takes up to several minutes. Lengths of 3072 or 4096 bits might needs several hours. Please be patient. WARNING: untranslated string: dh key warn1 = For weak systems or systems with little entropy, it is recommended to upload long Diffie-Hellman parameters by usage of the upload function. WARNING: untranslated string: dh parameter = Diffie-Hellman parameters +WARNING: untranslated string: dhcp deny known clients: = Deny known clients: WARNING: untranslated string: dhcp dns enable update = Enable DNS Update (RFC2136): WARNING: untranslated string: dhcp dns key name = Key Name WARNING: untranslated string: dhcp dns update = DNS Update WARNING: untranslated string: dhcp dns update algo = Algorithm WARNING: untranslated string: dhcp dns update secret = Secret +WARNING: untranslated string: dhcp valid range required when deny known clients checked = Valid range required when "Deny known clients:" is checked WARNING: untranslated string: disable = Disable WARNING: untranslated string: disconnected = Disconnected WARNING: untranslated string: disk access = Disk Access @@ -1380,6 +1383,8 @@ WARNING: untranslated string: taa zombieload2 = TSX Async Abort / ZombieLoad v2 WARNING: untranslated string: tcp more reliable = TCP (more reliable) WARNING: untranslated string: ten minutes = 10 Minutes WARNING: untranslated string: thirty minutes = 30 Minutes +WARNING: untranslated string: token = Token: +WARNING: untranslated string: token not set = No Token has been given. WARNING: untranslated string: tor = Tor WARNING: untranslated string: tor accounting = Accounting WARNING: untranslated string: tor accounting bytes = Traffic (read/written) @@ -1492,6 +1497,7 @@ WARNING: untranslated string: wlan client encryption none = None WARNING: untranslated string: wlan client encryption wep = WEP WARNING: untranslated string: wlan client encryption wpa = WPA WARNING: untranslated string: wlan client encryption wpa2 = WPA2 +WARNING: untranslated string: wlan client encryption wpa3 = WPA3 WARNING: untranslated string: wlan client group cipher = Group cipher WARNING: untranslated string: wlan client group key algorithm = GKA WARNING: untranslated string: wlan client identity = Identity diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 26530a923..e4c25f931 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -40,7 +40,6 @@ WARNING: translation string unused: accounting WARNING: translation string unused: accounting user nonpdc WARNING: translation string unused: accounting user pdc WARNING: translation string unused: activate user -WARNING: translation string unused: active WARNING: translation string unused: add a new rule WARNING: translation string unused: add cron WARNING: translation string unused: add network @@ -118,7 +117,6 @@ WARNING: translation string unused: ansi t1.483 WARNING: translation string unused: apply WARNING: translation string unused: archive not exist WARNING: translation string unused: attemps -WARNING: translation string unused: available updates WARNING: translation string unused: avoid dod WARNING: translation string unused: backup archive WARNING: translation string unused: backup clear archive @@ -557,6 +555,7 @@ WARNING: translation string unused: open to all WARNING: translation string unused: openvpn disabled WARNING: translation string unused: openvpn enabled WARNING: translation string unused: optional data +WARNING: translation string unused: options WARNING: translation string unused: optionsfw portlist hint WARNING: translation string unused: optionsfw warning WARNING: translation string unused: or @@ -806,7 +805,9 @@ WARNING: translation string unused: umount WARNING: translation string unused: umount removable media before to unplug WARNING: translation string unused: unencrypted WARNING: translation string unused: unix charset +WARNING: translation string unused: unix group WARNING: translation string unused: unix password sync +WARNING: translation string unused: unix shell WARNING: translation string unused: update transcript WARNING: translation string unused: updatedatabase WARNING: translation string unused: updates @@ -894,6 +895,8 @@ WARNING: untranslated string: crypto warning = Cryptographic warning WARNING: untranslated string: dangerous = Dangerous WARNING: untranslated string: default IP address = Default IP Address WARNING: untranslated string: desired = Desired +WARNING: untranslated string: dhcp deny known clients: = Deny known clients: +WARNING: untranslated string: dhcp valid range required when deny known clients checked = Valid range required when "Deny known clients:" is checked WARNING: untranslated string: disable = Disable WARNING: untranslated string: disconnected = Disconnected WARNING: untranslated string: dns check servers = Check DNS Servers @@ -1047,6 +1050,8 @@ WARNING: untranslated string: strict = Strict WARNING: untranslated string: subnet mask = Subnet Mask WARNING: untranslated string: system is offline = The system is offline. WARNING: untranslated string: taa zombieload2 = TSX Async Abort / ZombieLoad v2 +WARNING: untranslated string: token = Token: +WARNING: untranslated string: token not set = No Token has been given. WARNING: untranslated string: tor guard country any = Any country WARNING: untranslated string: tor guard nodes = Guard Nodes WARNING: untranslated string: tor use guard nodes = Use only these guard nodes (one fingerprint per line) @@ -1061,6 +1066,7 @@ WARNING: untranslated string: vulnerability = Vulnerability WARNING: untranslated string: vulnerable = Vulnerable WARNING: untranslated string: whois results from = WHOIS results from WARNING: untranslated string: winbind daemon = Winbind Daemon +WARNING: untranslated string: wlan client encryption wpa3 = WPA3 WARNING: untranslated string: wlanap 802.11w disabled = Disabled WARNING: untranslated string: wlanap 802.11w enforced = Enforced WARNING: untranslated string: wlanap 802.11w optional = Optional diff --git a/doc/language_missings b/doc/language_missings index 12e341402..1956eac48 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -64,6 +64,7 @@ < wlanap 802.11w disabled < wlanap 802.11w enforced < wlanap 802.11w optional +< wlan client encryption wpa3 ############################################################################ # Checking cgi-bin translations for language: es # ############################################################################ @@ -222,11 +223,13 @@ < desired < details < dh +< dhcp deny known clients: < dhcp dns enable update < dhcp dns key name < dhcp dns update < dhcp dns update algo < dhcp dns update secret +< dhcp valid range required when deny known clients checked < dh key move failed < dh key warn < dh key warn1 @@ -780,6 +783,8 @@ < ten minutes < teovpn_fragment < thirty minutes +< token +< token not set < tor < tor 0 = disabled < tor accounting @@ -917,6 +922,7 @@ < wlan client encryption wep < wlan client encryption wpa < wlan client encryption wpa2 +< wlan client encryption wpa3 < wlan client group cipher < wlan client group key algorithm < wlan client identity @@ -958,21 +964,16 @@ # Checking cgi-bin translations for language: fr # ############################################################################ < ansi t1.483 -< asn lookup failed -< autonomous system < bewan adsl pci st < bewan adsl usb -< dns enable safe-search youtube +< dhcp deny known clients: +< dhcp valid range required when deny known clients checked < g.dtm < g.lite -< ip basic info -< ip info for -< tor guard country -< tor guard country any -< tor guard nodes -< tor use guard nodes +< token +< token not set < upload fcdsl.o -< whois results from +< wlan client encryption wpa3 ############################################################################ # Checking cgi-bin translations for language: it # ############################################################################ @@ -1061,11 +1062,13 @@ < dangerous < default IP address < desired +< dhcp deny known clients: < dhcp dns enable update < dhcp dns key name < dhcp dns update < dhcp dns update algo < dhcp dns update secret +< dhcp valid range required when deny known clients checked < disable < Disabled < disconnected @@ -1276,6 +1279,8 @@ < tcp more reliable < ten minutes < thirty minutes +< token +< token not set < tor guard country < tor guard country any < tor guard nodes @@ -1332,6 +1337,7 @@ < wlan client eap phase2 method < wlan client eap state < wlan client encryption eap +< wlan client encryption wpa3 < wlan client identity < wlan client method < wlan client password @@ -1709,6 +1715,8 @@ < ten minutes < teovpn_fragment < thirty minutes +< token +< token not set < tor guard country < tor guard country any < tor guard nodes @@ -1767,6 +1775,7 @@ < wlan client eap phase2 method < wlan client eap state < wlan client encryption eap +< wlan client encryption wpa3 < wlan client identity < wlan client method < wlan client password @@ -1945,11 +1954,13 @@ < desired < details < dh +< dhcp deny known clients: < dhcp dns enable update < dhcp dns key name < dhcp dns update < dhcp dns update algo < dhcp dns update secret +< dhcp valid range required when deny known clients checked < dh key move failed < dh key warn < dh key warn1 @@ -2488,6 +2499,8 @@ < ten minutes < teovpn_fragment < thirty minutes +< token +< token not set < tor < tor 0 = disabled < tor accounting @@ -2625,6 +2638,7 @@ < wlan client encryption wep < wlan client encryption wpa < wlan client encryption wpa2 +< wlan client encryption wpa3 < wlan client group cipher < wlan client group key algorithm < wlan client identity @@ -2822,11 +2836,13 @@ < desired < details < dh +< dhcp deny known clients: < dhcp dns enable update < dhcp dns key name < dhcp dns update < dhcp dns update algo < dhcp dns update secret +< dhcp valid range required when deny known clients checked < dh key move failed < dh key warn < dh key warn1 @@ -3368,6 +3384,8 @@ < ten minutes < teovpn_fragment < thirty minutes +< token +< token not set < tor < tor 0 = disabled < tor accounting @@ -3506,6 +3524,7 @@ < wlan client encryption wep < wlan client encryption wpa < wlan client encryption wpa2 +< wlan client encryption wpa3 < wlan client group cipher < wlan client group key algorithm < wlan client identity @@ -3568,6 +3587,8 @@ < dangerous < default IP address < desired +< dhcp deny known clients: +< dhcp valid range required when deny known clients checked < disable < Disabled < disconnected @@ -3689,6 +3710,8 @@ < subnet mask < system is offline < taa zombieload2 +< token +< token not set < tor guard country < tor guard country any < tor guard nodes @@ -3714,6 +3737,7 @@ < wlanap neighbor scan < wlanap neighbor scan warning < wlanap ssid +< wlan client encryption wpa3 < working < zoneconf access native < zoneconf access none diff --git a/html/cgi-bin/asterisk/calls.cgi b/html/cgi-bin/asterisk/calls.cgi deleted file mode 100644 index c5877b2ea..000000000 --- a/html/cgi-bin/asterisk/calls.cgi +++ /dev/null @@ -1,132 +0,0 @@ -#!/usr/bin/perl - -require '/var/ipfire/general-functions.pl'; -require "${General::swroot}/lang.pl"; -require "${General::swroot}/header.pl"; - -&Header::showhttpheaders(); - -my (%asterisksettings, %checked); - -my %cgiparams; - -&Header::getcgihash(\%cgiparams); - -$asterisksettings{'ACTION'} = ''; - -$file = "/var/log/asterisk/cdr-csv/Master.csv"; - -open(DATEN, "$file") or die "Can't open file: $file: $!\n"; -@datafile = <DATEN>; -close(DATEN); - -$file = "./conf/telbook.conf"; -open(DATEN, "$file") or die "Can't open file: $file: $!\n"; -@telbook = <DATEN>; -close(DATEN); - -&Header::openpage('asterisk', 1, ''); - -&Header::openbigbox('100%', 'LEFT'); - -if ($cgiparams{'ACTION'} eq $Lang::tr{'update'}) -{ - $mday3 = $cgiparams{'day3'}; - $mon3 = $cgiparams{'month3'}; - $jahr3 = $cgiparams{'year3'}; - $mday4 = $cgiparams{'day4'}; - $mon4 = $cgiparams{'month4'}; - $jahr4 = $cgiparams{'year4'}; -} -else -{ - @datum3 = localtime(time()); - ($sec3,$min3,$stunde3,$mday3,$mon3,$jahr3,$wday3,$yday3,$isdst3)=@datum3; - $jahr3 = $jahr3 + 1900; - $mon3 = $mon3+1; - if ($mon3 < 10) { $mon3 = "0$mon3"; } - if ($mday3 <10) { $mday3= "0$mday3";} - $sec4 = $sec3; - $min4 = $min3; - $stunde4 = $stunde3; - $mday4 = $mday3; - $mon4 = $mon3; - $jahr4 = $jahr3; - $wday4 = $wday3; - $isdst4 = $isdst3; -} - -if ($errormessage) { - &openbox('100%', 'LEFT', $tr{'error messages'}); - print "<FONT CLASS='base'>$errormessage </FONT>\n"; - &closebox(); -} - -print "<FORM METHOD='POST'>\n"; - -&Header::openbox('100%', 'LEFT', 'Filter'); - -print <<END -<center><table border=0><tr><td> </td><td width=50px>Tag:</td><td width=50px>Monat:</td><td width=50px>Jahr:</td></tr> -<tr><td>Von: <td><input type=text name=day3 maxlength=2 size=2 value="$mday3"><td><input type=text name=month3 maxlength=2 size=2 value="$mon3"><td><input type=text name=year3 maxlength=4 size=4 value="$jahr3"> -<tr><td>Bis: <td><input type=text name=day4 maxlength=2 size=2 value="$mday4"><td><input type=text name=month4 maxlength=2 size=2 value="$mon4"><td><input type=text name=year4 maxlength=4 size=4 value="$jahr4"> - -<tr><td colspan=2>Von oder zum Anrufer mit der ID/Nummer:<td colspan=2><input type=text name=number size=20 maxlength=100 value="$cgiparams{'number'}"> - -<tr><td align=center colspan=4><input type=submit name='ACTION' value=$Lang::tr{'update'}> -</table> -END -; - -&Header::closebox(); - -&Header::openbox('100%', 'LEFT', 'Anrufe'); -print "<table border=0 width=100%> <tr> <td align=center><b>Anfrufer <td align=center><b>Angerufene <td align=center><b>CallerID <td align=center><b>Start des Anrufs <td align=center><b>Ende des Anrufs <td align=center><b>Dauer (in Sek.) <td align=center><b>Status"; -print "<tr><td colspan=6> "; -foreach $line (reverse @datafile) { -chomp $line; -(@spalten) = split (/,/, $line); -$spalten[1] =~ s/"//g; -$spalten[2] =~ s/"//g; -$spalten[4] =~ s/"//g; -$spalten[10]=~ s/"//g; -$spalten[11]=~ s/"//g; -$spalten[13]=~ s/"//g; -$spalten[14]=~ s/"//g; -(@zdatum) = split (/ /, $spalten[11]); -(@datu) = split (/-/, $zdatum[0]); -(@dzeit) = split (/:/, $zdatum[1]); -$datum1 = $datu[0].$datu[1].$datu[2]; -@datum2_1 = localtime(time()); -($sec,$min,$stunde,$mday,$mon,$jahr,$wday,$yday,$isdst)=@datum2_1; -$jahr = $jahr + 1900; -$mon = $mon+1; -if ($mon < 10) { $mon = "0$mon"; } -if ($mday <10) { $mday= "0$mday";} -$datum2 = $jahr.$mon.$mday; -$datum3_1 = $jahr3.$mon3.$mday3; -$datum4_1 = $jahr4.$mon4.$mday4; -$datum2 = $datum2-100; -if ($datum1 ge $datum3_1 && $datum1 le $datum4_1 && ($cgiparams{'number'} eq '' || $cgiparams{'number'} eq $spalten[1] || $cgiparams{'number'} eq $spalten[2])) { -$telline = @telbook[0]; -$telline =~ s/\[telnr\]/$spalten[1]/g; -$dauer_m = int($spalten[13]/60); -$dauer_s = $spalten[13]%60; -$dauer_h = int($spalten[13]/3600); -$dauer_m2= $dauer_m-($dauer_h*60); -$dauer_t = $dauer_h.":"; -if ($dauer_m2 < 10) { $dauer_t .= "0".$dauer_m2."."; } - else { $dauer_t .= $dauer_m2."."; } -if ($dauer_s < 10) { $dauer_t .= "0".$dauer_s; } - else { $dauer_t .= $dauer_s; } -print "<tr bgcolor=#C0C0C0> <td align=center><a target='_blank' href=$telline> $spalten[1]</a> <td align=center>$spalten[2] <td align=center>$spalten[4] <td align=center bgcolor=#339933>$spalten[10] <td align=center bgcolor=#339933>$spalten[11] <td align=center>$dauer_t <td align=center bgcolor='#993333'><font color=white>$spalten[14]\n";} -} -print "</table>"; - -&Header::closebox(); - -print "</FORM>\n"; - -&Header::closebigbox(); - -&Header::closepage(); diff --git a/html/cgi-bin/asterisk/conf.cgi b/html/cgi-bin/asterisk/conf.cgi deleted file mode 100644 index 2dd8cf0a8..000000000 --- a/html/cgi-bin/asterisk/conf.cgi +++ /dev/null @@ -1,161 +0,0 @@ -#!/usr/bin/perl - -require '/var/ipfire/general-functions.pl'; -require "${General::swroot}/lang.pl"; -require "${General::swroot}/header.pl"; - -&Header::showhttpheaders(); - -my %cgiparams; - -&Header::getcgihash(\%cgiparams); - -&Header::openpage('asterisk', 1, ''); - -&Header::openbigbox('100%', 'LEFT'); - -if ($cgiparams{'ACTION'} eq $Lang::tr{'save'}) - { - $conf_file = $cgiparams{'save_path'}; - open (FILE, ">$conf_file") or die "Kann die Datei nicht speichern: $!"; - flock (FILE, 2); - print FILE "$cgiparams{'textarea'}"; - close FILE; - &Header::openbox('100%', 'LEFT', 'info'); - print "$conf_file wurde gespeichert"; - &Header::closebox(); - } - -if ($cgiparams{'ACTION'} eq Bearbeiten) - { - $conf_file = $cgiparams{'conf_file'}; - } - -if ($conf_file eq '') { - $conf_file='/var/ipfire/asterisk/extensions.conf'; - } - -if ($cgiparams{'ACTION'} eq extensions) - { - $conf_file='/var/ipfire/asterisk/extensions.conf'; - } - -if ($cgiparams{'ACTION'} eq sip) - { - $conf_file='/var/ipfire/asterisk/sip.conf'; - } - -if ($cgiparams{'ACTION'} eq iax) - { - $conf_file='/var/ipfire/asterisk/iax.conf'; - } - - - - -if ($errormessage) { - &Header::openbox('100%', 'LEFT', $tr{'error messages'}); - print "<FONT CLASS='base'>$errormessage </FONT>\n"; - &Header::closebox(); -} - -$cgiparams{'ACTION'} = ''; - -print "<FORM METHOD='POST'>\n"; - -if ($conf_file ne '') { - -&Header::openbox('100%', 'LEFT', $conf_file); - print <<END - <center><table border=0> - <tr><td><textarea name="textarea" cols="80" rows="20" wrap="VIRTUAL"> -END -; -system("cat $conf_file"); -print <<END -</textarea>\n - - <tr><td align=center> - <p><input type=text name=save_path value=$conf_file size=25> - <p><input type=submit name=ACTION value=$Lang::tr{'save'}> - </table> - -END -; - -&Header::closebox(); -} - -&Header::openbox('100%', 'LEFT', 'Dateiauswahl'); - -my $dir = '/var/ipfire/asterisk/'; -my @dateien; - -listFiles ($dir); - -print <<END -<table width=100% border=0> -<tr><td width=33% align=right> -  - <input type=submit name=ACTION value=extensions><input type=submit name=ACTION value=sip><input type=submit name=ACTION value=iax> - <td width=33% align=right> - <center><select name=conf_file> -END -; -foreach $line (sort (@dateien)) { -$op_name = $line; -$op_name =~ s/$dir//g; -print "<option value='$line'>$op_name</option>\n"; -} - -my $dir2 = '/home/httpd/cgi-bin/asterisk/conf/'; -my @dateien2; - -listFiles2 ($dir2); - -foreach $line2 (sort (@dateien2)) { -$op_name2 = $line2; -$op_name2 =~ s/$dir2//g; -print "<option value='$line2'>$op_name2</option>\n"; -} - -print "</select><input type=submit name=ACTION value=Bearbeiten></center><td width=33% align=right>&nbsp</table>"; - -sub listFiles { -local *DH; -my ($item, $pfad); -my $dir = shift; - -opendir (DH, $dir) or return; -while ($item = readdir (DH)) { -next if ( $item =~ /^\./ ); -$pfad = ( ($dir =~ /\/$/) ? ($dir . $item) : ($dir . '/'.$item) ); -push (@dateien, $pfad) if (-f $pfad); -listFiles ($pfad) if (-d $pfad); -} -closedir (DH); -} - -sub listFiles2 { -local *DH2; -my ($item2, $pfad2); -my $dir2 = shift; - -opendir (DH2, $dir2) or return; -while ($item2 = readdir (DH2)) { -next if ( $item2 =~ /^\./ ); -$pfad2 = ( ($dir2 =~ /\/$/) ? ($dir2 . $item2) : ($dir2 . '/'.$item2) ); -push (@dateien2, $pfad2) if (-f $pfad2); -listFiles2 ($pfad2) if (-d $pfad2); -} -closedir (DH2); -} - - -&Header::closebox(); - -print "</FORM>\n"; - -&Header::closebigbox(); - -&Header::closepage(); diff --git a/html/cgi-bin/asterisk/conf/telbook.conf b/html/cgi-bin/asterisk/conf/telbook.conf deleted file mode 100644 index b2a1d6a97..000000000 --- a/html/cgi-bin/asterisk/conf/telbook.conf +++ /dev/null @@ -1 +0,0 @@ -http://tel.search.ch/result.html?name=&misc=&strasse=&ort=&kanton=&tel=[telnr] diff --git a/html/cgi-bin/asterisk/status.cgi b/html/cgi-bin/asterisk/status.cgi deleted file mode 100644 index adfceb1db..000000000 --- a/html/cgi-bin/asterisk/status.cgi +++ /dev/null @@ -1,119 +0,0 @@ -#!/usr/bin/perl - -require '/var/ipfire/general-functions.pl'; -require "${General::swroot}/lang.pl"; -require "${General::swroot}/header.pl"; - -&Header::showhttpheaders(); - -#use warnings; -#use CGI::Carp 'fatalsToBrowser'; - -my %asterisksettings; - -&Header::getcgihash(\%asterisksettings); - -&Header::openpage('asterisk', 1, ''); - -&Header::openbigbox('100%', 'LEFT'); - -if ($asterisksettings{'ACTION'} eq 'Start') -{ - system("/etc/init.d/asterisk start >/dev/null 2>&1"); - sleep 5; -} -if ($asterisksettings{'ACTION'} eq $Lang::tr{'stop'}) -{ - system("/etc/init.d/asterisk stop >/dev/null 2>&1"); - sleep 5; -} -if ($asterisksettings{'ACTION'} eq $Lang::tr{'reboot'}) -{ - system("/etc/init.d/asterisk restart >/dev/null 2>&1"); - sleep 5; -} -if ($asterisksettings{'ACTION'} eq "$Lang::tr{'reload'} EXT") -{ - system("/etc/init.d/asterisk remod ext >/dev/null 2>&1"); -} -if ($asterisksettings{'ACTION'} eq "$Lang::tr{'reload'} SIP") -{ - system("/etc/init.d/asterisk remod sip >/dev/null 2>&1"); -} -if ($asterisksettings{'ACTION'} eq "$Lang::tr{'reload'} IAX") -{ - system("/etc/init.d/asterisk remod iax >/dev/null 2>&1"); -} - - my $pid = ''; - my $testcmd = ''; - my $exename; - my @memory; - - if (open(FILE, "/var/run/asterisk.pid")){ - $pid = <FILE>; chomp $pid; - close FILE; - if (open(FILE, "/proc/${pid}/status")){ - while (<FILE>){ - if (/^Name:\W+(.*)/) {$testcmd = $1;} - } - close FILE; - } - } - -if ($testcmd !~ /asterisk/) { - $checked{'ENABLE_AST'}{'status_s'}="<font style=\"color:white;background-color:red;\"> $Lang::tr{'not running'}</font>"; - $checked{'ENABLE_AST'}{'status_b'}="<INPUT TYPE='submit' NAME='ACTION' VALUE='Start'>"; -} else { - $checked{'ENABLE_AST'}{'status_s'}="<font style=\"color:white;background-color:green;\"> $Lang::tr{'running'}</font>"; - $checked{'ENABLE_AST'}{'status_b'}="<INPUT TYPE='submit' NAME='ACTION' VALUE='$Lang::tr{'reboot'}'><INPUT TYPE='submit' NAME='ACTION' VALUE='$Lang::tr{'stop'}'>"; -} - -if ($errormessage) { - &Header::openbox('100%', 'LEFT', $tr{'error messages'}); - print "<FONT CLASS='base'>$errormessage </FONT>\n"; - &Header::closebox(); -} - -if ($message) { - &Header::openbox('100%', 'LEFT', 'Message'); - print "<FONT CLASS='base'>$message </FONT>\n"; - &Header::closebox(); -} - -print "<FORM METHOD='POST'>\n"; - -&Header::openbox('100%', 'LEFT', 'Status:'); - print <<END - <center> -<TABLE WIDTH='100%'> -<TR> - <TD WIDTH='33%' CLASS='base' ALIGN='RIGHT'>Asterisk</TD> - <TD WIDTH='33%' ALIGN='RIGHT'>$checked{'ENABLE_AST'}{'status_s'}</TD> - <TD WIDTH='33%' ALIGN='LEFT'>$checked{'ENABLE_AST'}{'status_b'}</TD> -</TR> -<TR> - <TD WIDTH='33%' CLASS='base' ALIGN='RIGHT'>Dialplan</TD> - <TD WIDTH='33%' ALIGN='RIGHT'></TD> - <TD WIDTH='33%' ALIGN='LEFT'> <INPUT TYPE='submit' NAME='ACTION' VALUE='$Lang::tr{'reload'} EXT'></TD> -</TR> -<TR> - <TD WIDTH='33%' CLASS='base' ALIGN='RIGHT'>SIP</TD> - <TD WIDTH='33%' ALIGN='RIGHT'></TD> - <TD WIDTH='33%' ALIGN='LEFT'> <INPUT TYPE='submit' NAME='ACTION' VALUE='$Lang::tr{'reload'} SIP'></TD> -</TR> -<TR> - <TD WIDTH='33%' CLASS='base' ALIGN='RIGHT'>IAX</TD> - <TD WIDTH='33%' ALIGN='RIGHT'></TD> - <TD WIDTH='33%' ALIGN='LEFT'> <INPUT TYPE='submit' NAME='ACTION' VALUE='$Lang::tr{'reload'} IAX'></TD> -</TR> - -</TABLE> -END -; - -&Header::closebox(); - -&Header::closebigbox(); - -&Header::closepage(); diff --git a/html/cgi-bin/country.cgi b/html/cgi-bin/country.cgi index b1c72bb22..6519aa26c 100644 --- a/html/cgi-bin/country.cgi +++ b/html/cgi-bin/country.cgi @@ -53,7 +53,7 @@ print<<END; END # Get a list of all supported country codes. -my @countries = &Location::database_countries(); +my @countries = &Location::Functions::get_locations(); # Loop through whole country list. foreach my $country (@countries) { @@ -96,10 +96,17 @@ foreach my $country (@countries) { print "</table>"; &Header::closebox(); -&Header::closebigbox(); +print <<END +<div align='center'> +<table width='80%'> +<tr> +<-><td align='center'><a href='$ENV{'HTTP_REFERER'}'><img src='/images/back.png' alt='$Lang::tr{'back'}' title='$Lang::tr{'back'}' /></a></td> +</tr> +</table> +</div> +END +; -print "<div style='text-align:center'><a href='$ENV{'HTTP_REFERER'}'>$Lang::tr{'back'}</a></div>\n"; +&Header::closebigbox(); &Header::closepage(); - - diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi index 8d757d37c..67988a0bf 100644 --- a/html/cgi-bin/credits.cgi +++ b/html/cgi-bin/credits.cgi @@ -72,6 +72,7 @@ Jan Paul Tücking, Jonatan Schlag, Dirk Wagner, Marcel Lorenz, +Adolf Belka, Alf Høgemark, Ben Schweikert, Peter Pfeiffer, @@ -85,16 +86,15 @@ Jan Lentfer, Marcus Scholz, Ersan Yildirim, Jörn-Ingo Weigert, -Adolf Belka, Alexander Koch, Wolfgang Apolinarski, Alfred Haas, +Leo-Andres Hofmann, Lars Schuhmacher, Rene Zingel, Sascha Kilian, Ronald Wiesinger, Florian Bührle, -Leo-Andres Hofmann, Bernhard Bitsch, Justin Luth, Michael Eitelwein, @@ -122,6 +122,7 @@ Douglas Duckworth, Eberhard Beilharz, Ersan Yildirim Ersan, Gerd Hoerst, +Giovanni Aneloni, H. Horsten, Heino Gutschmidt, Jan Behrens, diff --git a/html/cgi-bin/ddns.cgi b/html/cgi-bin/ddns.cgi index 024eaf7f6..9b58db895 100644 --- a/html/cgi-bin/ddns.cgi +++ b/html/cgi-bin/ddns.cgi @@ -59,14 +59,18 @@ $settings{'HOSTNAME'} = ''; $settings{'DOMAIN'} = ''; $settings{'LOGIN'} = ''; $settings{'PASSWORD'} = ''; +$settings{'TOKEN'} = ''; $settings{'ENABLED'} = ''; $settings{'PROXY'} = ''; $settings{'SERVICE'} = ''; $settings{'ACTION'} = ''; -# Get supported ddns providers. -my @providers = &GetProviders(); +# Get all supported ddns providers. +my @providers = &GetProviders("all"); + +# Get provider which support a token based authentication mechanism. +my @token_provider = &GetProviders("token-providers"); # Hook to regenerate the configuration files, if cgi got called from command line. if ($ENV{"REMOTE_ADDR"} eq "") { @@ -178,6 +182,11 @@ if (($settings{'ACTION'} eq $Lang::tr{'add'}) || ($settings{'ACTION'} eq $Lang:: $errormessage = $Lang::tr{'password not set'}; } + # Check if a token has been given for provider which support tokens. + if (($settings{'SERVICE'} ~~ @token_provider) && ($settings{'TOKEN'} eq '')) { + $errormessage = $Lang::tr{'token not set'}; + } + # Go furter if there was no error. if (!$errormessage) { # Splitt hostname field into 2 parts for storrage. @@ -189,6 +198,16 @@ if (($settings{'ACTION'} eq $Lang::tr{'add'}) || ($settings{'ACTION'} eq $Lang:: $settings{'ENABLED'} = 'off'; } + # Handle token provider. + if($settings{'SERVICE'} ~~ @token_provider) { + # Clear username and password if they contain values. + undef($settings{'LOGIN'}); + undef($settings{'PASSWORD'}); + + # Assign the token as a password for saving. + $settings{'PASSWORD'} = $settings{'TOKEN'}; + } + # Handle adding new accounts. if ($settings{'ACTION'} eq $Lang::tr{'add'}) { # Open /var/ipfire/ddns/config for writing. @@ -234,7 +253,8 @@ if (($settings{'ACTION'} eq $Lang::tr{'add'}) || ($settings{'ACTION'} eq $Lang:: # Write out notice to logfile. &General::log($Lang::tr{'ddns hostname modified'}); } - undef $settings{'ID'}; + # Clear settings hash. + %settings = ''; # Update ddns config file. &GenerateDDNSConfigFile(); @@ -307,6 +327,7 @@ if ($settings{'ACTION'} eq $Lang::tr{'edit'}) { $settings{'WILDCARDS'} = $temp[4]; $settings{'LOGIN'} = $temp[5]; $settings{'PASSWORD'} = $temp[6]; + $settings{'TOKEN'} = $temp[6]; $settings{'ENABLED'} = $temp[7]; } @@ -334,6 +355,58 @@ if (!$settings{'ACTION'}) { } &Header::openpage($Lang::tr{'dynamic dns'}, 1, ''); + +### Java Script ### +print"<script>\n"; + +# Generate Java Script Array which contains the provider that support token. +my $line = ""; +$line = join("', '", @token_provider); + +print "\t// Array which contains the providers that support token.\n"; +print "\ttoken_provider = ['$line']\;\n\n"; + +print <<END + // Java Script function to swap the text input fields for + // username and password or token. + var update_auth = function() { + if(inArray(\$('#SERVICE').val(), token_provider)) { + \$('.username').hide(); + \$('.password').hide(); + \$('.token').show(); + } else { + \$('.username').show(); + \$('.password').show(); + \$('.token').hide(); + } + }; + + // Java Script function to check if a given value is part of + // an array. + function inArray(value,array) { + var count=array.length; + + for(var i=0;i<count;i++) { + if(array[i]===value){ + return true; + } + } + + return false; + } + + // JQuery function to call corresponding function when + // the service provider is changed or the page is loaded for showing/hiding + // the username/password or token area. + \$(document).ready(function() { + \$('#SERVICE').change(update_auth); + update_auth(); + }); + +</script> +END +; + &Header::openbigbox('100%', 'left', '', $errormessage); # Read file for general ddns settings. @@ -414,7 +487,7 @@ print <<END END ; # Generate dropdown menu for service selection. - print"<select size='1' name='SERVICE'>\n"; + print"<select size='1' name='SERVICE' id='SERVICE'>\n"; my $selected; @@ -440,11 +513,15 @@ print <<END <tr> <td class='base'>$Lang::tr{'enabled'}</td> <td><input type='checkbox' name='ENABLED' $checked{'ENABLED'}{'on'} /></td> - <td class='base'>$Lang::tr{'username'}</td> - <td><input type='text' name='LOGIN' value='$settings{'LOGIN'}' /></td> + + <td class='username'>$Lang::tr{'username'}</td> + <td class='username'><input type='text' name='LOGIN' value='$settings{'LOGIN'}' /></td> + + <td class='token' style='display:none'>$Lang::tr{'token'}</td> + <td class='token' style='display:none'><input type='text' name='TOKEN' value='$settings{'TOKEN'}' /></td> </tr> - <tr> + <tr class='password'> <td class='base'></td> <td></td> <td class='base'>$Lang::tr{'password'}</td> @@ -665,8 +742,8 @@ sub GenerateDDNSConfigFile { my $use_token = 0; - # Check if token based auth is configured. - if ($username eq "token") { + # Handle token based auth for various providers. + if ($provider ~~ @token_provider) { $use_token = 1; } @@ -707,9 +784,20 @@ sub GenerateDDNSConfigFile { } # Function which generates an array (@providers) which contains the supported providers. -sub GetProviders { - # Get supported providers. - open(PROVIDERS, "/usr/bin/ddns list-providers |"); +sub GetProviders ($) { + my ($type) = @_; + + # Set default type to get all providers + $type = $type ? $type : "all"; + + # Check if the requested type is "token-providers". + if ($type eq "token-providers") { + # Call ddns util to only get providers which supports token based auth. + open(PROVIDERS, "/usr/bin/ddns list-token-providers |"); + } else { + # Get all supported providers. + open(PROVIDERS, "/usr/bin/ddns list-providers |"); + } # Create new array to store the providers. my @providers = (); diff --git a/html/cgi-bin/dhcp.cgi b/html/cgi-bin/dhcp.cgi index 8c57c675d..2ebdde818 100644 --- a/html/cgi-bin/dhcp.cgi +++ b/html/cgi-bin/dhcp.cgi @@ -74,6 +74,7 @@ foreach my $itf (@ITFs) { $dhcpsettings{"DNS_UPDATE_KEY_NAME_${itf}"} = ''; $dhcpsettings{"DNS_UPDATE_KEY_SECRET_${itf}"} = ''; $dhcpsettings{"DNS_UPDATE_KEY_ALGO_${itf}"} = ''; + $dhcpsettings{"DENY_KNOWN_CLIENTS_${itf}"} = 'off'; } $dhcpsettings{'SORT_FLEASELIST'} = 'FIPADDR'; @@ -175,9 +176,16 @@ if ($dhcpsettings{'ACTION'} eq $Lang::tr{'save'}) { } } + if ($dhcpsettings{"DENY_KNOWN_CLIENTS_${itf}"} eq 'on') { + if (($dhcpsettings{"START_ADDR_${itf}"}) eq '' && ($dhcpsettings{"END_ADDR_${itf}"}) eq '') { + $errormessage = "DHCP on ${itf}: " . $Lang::tr{'dhcp valid range required when deny known clients checked'}; + goto ERROR; + } + if (!($dhcpsettings{"DEFAULT_LEASE_TIME_${itf}"} =~ /^\d+$/)) { $errormessage = "DHCP on ${itf}: " . $Lang::tr{'invalid default lease time'} . $dhcpsettings{'DEFAULT_LEASE_TIME_${itf}'}; goto ERROR; + } } if (!($dhcpsettings{"MAX_LEASE_TIME_${itf}"} =~ /^\d+$/)) { @@ -548,6 +556,7 @@ foreach my $itf (@ITFs) { my %checked=(); $checked{'ENABLE'}{'on'} = ( $dhcpsettings{"ENABLE_${itf}"} ne 'on') ? '' : "checked='checked'"; $checked{'ENABLEBOOTP'}{'on'} = ( $dhcpsettings{"ENABLEBOOTP_${itf}"} ne 'on') ? '' : "checked='checked'"; + $checked{'DENY_KNOWN_CLIENTS'}{'on'} = ( $dhcpsettings{"DENY_KNOWN_CLIENTS_${itf}"} ne 'on') ? '' : "checked='checked'"; if ($netsettings{"${itf}_DEV"} ne '' ) { # Show only defined interface my $lc_itf=lc($itf); @@ -563,6 +572,9 @@ print <<END <td width='25%'><input type='text' name='START_ADDR_${itf}' value='$dhcpsettings{"START_ADDR_${itf}"}' /></td> <td width='25%' class='base'>$Lang::tr{'end address'} <img src='/blob.gif' alt='*' /></td> <td width='25%'><input type='text' name='END_ADDR_${itf}' value='$dhcpsettings{"END_ADDR_${itf}"}' /></td> +</tr><tr> + <td class='base'>$Lang::tr{'dhcp deny known clients:'}</td> + <td><input type='checkbox' name='DENY_KNOWN_CLIENTS_${itf}' $checked{'DENY_KNOWN_CLIENTS'}{'on'} /></td> </tr><tr> <td class='base'>$Lang::tr{'default lease time'} <img src='/blob.gif' alt='*' /></td> <td><input type='text' name='DEFAULT_LEASE_TIME_${itf}' value='$dhcpsettings{"DEFAULT_LEASE_TIME_${itf}"}' /></td> @@ -1264,7 +1276,12 @@ sub buildconf { if ($dhcpsettings{"ENABLE_${itf}"} eq 'on' ){ print FILE "subnet " . $netsettings{"${itf}_NETADDRESS"} . " netmask ". $netsettings{"${itf}_NETMASK"} . " #$itf\n"; print FILE "{\n"; - print FILE "\trange " . $dhcpsettings{"START_ADDR_${itf}"} . ' ' . $dhcpsettings{"END_ADDR_${itf}"}.";\n" if ($dhcpsettings{"START_ADDR_${itf}"}); + if ($dhcpsettings{"START_ADDR_${itf}"}) { + print FILE "pool {\n"; + print FILE "\trange " . $dhcpsettings{"START_ADDR_${itf}"} . ' ' . $dhcpsettings{"END_ADDR_${itf}"}.";\n"; + print FILE "\tdeny known-clients;\n" if ($dhcpsettings{"DENY_KNOWN_CLIENTS_${itf}"} eq 'on'); + print FILE " }\n"; # pool + } print FILE "\toption subnet-mask " . $netsettings{"${itf}_NETMASK"} . ";\n"; print FILE "\toption domain-name \"" . $dhcpsettings{"DOMAIN_NAME_${itf}"} . "\";\n"; print FILE "\toption routers " . $netsettings{"${itf}_ADDRESS"} . ";\n"; diff --git a/html/cgi-bin/extrahd.cgi b/html/cgi-bin/extrahd.cgi index da1efb2dd..aaf42baff 100644 --- a/html/cgi-bin/extrahd.cgi +++ b/html/cgi-bin/extrahd.cgi @@ -156,7 +156,7 @@ END <input type='hidden' name='DEVICE' value='$deviceline[0]' /> <input type='hidden' name='FS' value='$deviceline[1]' /> <input type='hidden' name='PATH' value='$deviceline[2]' /> - <input type='hidden' name='ACTION' value=$Lang::tr{'delete'} /> + <input type='hidden' name='ACTION' value='$Lang::tr{'delete'}' /> <input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/delete.gif' /> </form></td></tr> END @@ -228,7 +228,7 @@ END <td align="center"> <input type='hidden' name='DEVICE' value='$partitionline[0]' /> <input type='hidden' name='UUID' value='$partitionline[2]' /> - <input type='hidden' name='ACTION' value=$Lang::tr{'add'} /> + <input type='hidden' name='ACTION' value='$Lang::tr{'add'}' /> <input type='image' alt='$Lang::tr{'add'}' title='$Lang::tr{'add'}' src='/images/add.gif' /> </form></td></tr> END diff --git a/html/cgi-bin/gpl.cgi b/html/cgi-bin/gpl.cgi index 94187ce7a..be1ea2639 100644 --- a/html/cgi-bin/gpl.cgi +++ b/html/cgi-bin/gpl.cgi @@ -71,7 +71,7 @@ print <<END; <form method='post' action='$ENV{'SCRIPT_NAME'}'> <input type='checkbox' name='gpl_accepted' value='1'/> $Lang::tr{'gpl i accept these terms and conditions'}. <br/ > - <input type='submit' name='ACTION' value=$Lang::tr{'yes'} /> + <input type='submit' name='ACTION' value='$Lang::tr{'yes'}' /> </form> </p> <a href='http://www.gnu.org/licenses/translations.html' target='_blank'>$Lang::tr{'gpl unofficial translation of the general public license v3'}</a> diff --git a/html/cgi-bin/hardwaregraphs.cgi b/html/cgi-bin/hardwaregraphs.cgi index e582acfb9..5c677d815 100644 --- a/html/cgi-bin/hardwaregraphs.cgi +++ b/html/cgi-bin/hardwaregraphs.cgi @@ -167,7 +167,7 @@ END print <<END <tr> - <td align='center' colspan='2' ><input type='submit' name='ACTION' value=$Lang::tr{'save'} /></td> + <td align='center' colspan='2' ><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td> </tr> </table> </form> diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi index bc31a341f..83d5f52ba 100644 --- a/html/cgi-bin/ids.cgi +++ b/html/cgi-bin/ids.cgi @@ -29,6 +29,7 @@ require '/var/ipfire/general-functions.pl'; require "${General::swroot}/lang.pl"; require "${General::swroot}/header.pl"; require "${General::swroot}/ids-functions.pl"; +require "${General::swroot}/network-functions.pl"; my %color = (); my %mainsettings = (); @@ -47,7 +48,7 @@ my %ignored=(); # Get the available network zones, based on the config type of the system and store # the list of zones in an array. -my @network_zones = &IDS::get_available_network_zones(); +my @network_zones = &Network::get_available_network_zones(); # Check if openvpn is started and add it to the array of network zones. if ( -e "/var/run/openvpn.pid") { diff --git a/html/cgi-bin/optionsfw.cgi b/html/cgi-bin/optionsfw.cgi index 47aba59cb..8c996802c 100644 --- a/html/cgi-bin/optionsfw.cgi +++ b/html/cgi-bin/optionsfw.cgi @@ -323,7 +323,7 @@ END <br /> <table width='100%' cellspacing='0'> <tr><td align='right'><form method='post' action='$ENV{'SCRIPT_NAME'}'> -<input type='submit' name='ACTION' value=$Lang::tr{'save'} /> +<input type='submit' name='ACTION' value='$Lang::tr{'save'}' /> </form></td></tr> </table> </form> @@ -345,7 +345,7 @@ print <<END; <tr><td width='15%' align='left'> <select name='POLICY' style="width: 100px"> <option value='MODE1' $selected{'POLICY'}{'MODE1'}>$Lang::tr{'fwdfw pol block'}</option> <option value='MODE2' $selected{'POLICY'}{'MODE2'}>$Lang::tr{'fwdfw pol allow'}</option></select> - <input type='submit' name='ACTION' value=$Lang::tr{'save'} /><input type='hidden' name='defpol' value='1'></td> + <input type='submit' name='ACTION' value='$Lang::tr{'save'}' /><input type='hidden' name='defpol' value='1'></td> END print "</tr></table></form>"; print"<br><br>"; diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi index 39389ad02..dd96a92e9 100644 --- a/html/cgi-bin/pakfire.cgi +++ b/html/cgi-bin/pakfire.cgi @@ -183,7 +183,7 @@ if ($return) { print <<END; <table> <tr><td> - <img src='/images/indicator.gif' alt='$Lang::tr{'aktiv'}' title='$Lang::tr{'aktiv'}' />  + <img src='/images/indicator.gif' alt='$Lang::tr{'active'}' title='$Lang::tr{'active'}' />  <td> $Lang::tr{'pakfire working'} <tr><td colspan='2' align='center'> @@ -217,7 +217,7 @@ my $packages_update_age = &General::age("/opt/pakfire/db/lists/packages_list.db" &Header::openbox("100%", "center", "Pakfire"); print <<END; - <table width='95%' cellpadding='5' > + <table width='95%' cellpadding='5'> END if ( -e "/var/run/need_reboot") { print "<tr><td align='center' colspan='2'><font color='red'>$Lang::tr{'needreboot'}!</font></td></tr>"; @@ -225,18 +225,21 @@ if ( -e "/var/run/need_reboot") { } print <<END; <tr><td width="50%" bgcolor='$color{'color20'}' align="center"><b>$Lang::tr{'pakfire system state'}:</b> - <td width="50%"> + + <td width="50%" bgcolor='$color{'color20'}' align="center"><b>$Lang::tr{'available updates'}:</b></tr> + <tr><td align="center">$Lang::tr{'pakfire core update level'}: $core_release<hr /> $Lang::tr{'pakfire last update'} $core_update_age $Lang::tr{'pakfire ago'}<br /> $Lang::tr{'pakfire last serverlist update'} $server_update_age $Lang::tr{'pakfire ago'}<br /> $Lang::tr{'pakfire last core list update'} $corelist_update_age $Lang::tr{'pakfire ago'}<br /> $Lang::tr{'pakfire last package update'} $packages_update_age $Lang::tr{'pakfire ago'} <form method='post' action='$ENV{'SCRIPT_NAME'}'> - <input type='hidden' name='ACTION' value='update' /> + <input type='hidden' name='ACTION' value='update' /><br /> <input type='submit' value='$Lang::tr{'calamaris refresh list'}' /><br /> </form> +<br /> <td align="center"> - <form method='post' action='$ENV{'SCRIPT_NAME'}'> + <form method='post' action='$ENV{'SCRIPT_NAME'}'> <select name="UPDPAKS" size="5" disabled> END &Pakfire::dblist("upgrade", "forweb"); @@ -250,7 +253,7 @@ END <tr><td colspan="2">  <tr><td bgcolor='$color{'color20'}' align="center"><b>$Lang::tr{'pakfire available addons'}</b> <td bgcolor='$color{'color20'}' align="center"><b>$Lang::tr{'pakfire installed addons'}</b> - <tr><td align="center"> + <tr><td style="padding:5px 10px 20px 20px" align="center"> <p>$Lang::tr{'pakfire install description'}</p> <form method='post' action='$ENV{'SCRIPT_NAME'}'> <select name="INSPAKS" size="10" multiple> @@ -264,7 +267,7 @@ print <<END; <input type='image' alt='$Lang::tr{'install'}' title='$Lang::tr{'install'}' src='/images/list-add.png' /> </form> - <td align="center"> + <td style="padding:5px 10px 20px 20px" align="center"> <p>$Lang::tr{'pakfire uninstall description'}</p> <form method='post' action='$ENV{'SCRIPT_NAME'}'> <select name="DELPAKS" size="10" multiple> diff --git a/html/cgi-bin/remote.cgi b/html/cgi-bin/remote.cgi index 31e4f4085..9e566201d 100644 --- a/html/cgi-bin/remote.cgi +++ b/html/cgi-bin/remote.cgi @@ -185,7 +185,7 @@ print "</form>\n"; &Header::openbox('100%', 'center', $Lang::tr{'ssh host keys'}); -print "<table class='tbl'>\n"; +print "<table class='tbl' width='100%'>\n"; print <<END <thead> @@ -213,7 +213,7 @@ print "</tbody>\n</table>\n"; &Header::openbox('100%', 'center', $Lang::tr{'ssh active sessions'}); print <<END; - <table class="tbl" width='66%'> + <table class="tbl" width="100%"> <thead> <tr> <th align="center"> @@ -273,7 +273,7 @@ sub printactivelogins() if ( scalar(@output) == 0 ) { # no logins appeared - my $table_colour = ($id++ % 2) ? $color{'color22'} : $color{'color20'}; + my $table_colour = ($id++ % 2) ? $color{'color20'} : $color{'color22'}; print "<tr bgcolor='$table_colour'><td colspan='5'>$Lang::tr{'ssh no active logins'}</td></tr>\n"; } else { # list active logins... @@ -295,7 +295,7 @@ sub printactivelogins() my $rdns = gethostbyaddr($iaddr, AF_INET); if (!$rdns) { $rdns = $Lang::tr{'ptr lookup failed'}; }; - my $table_colour = ($id++ % 2) ? $color{'color22'} : $color{'color20'}; + my $table_colour = ($id++ % 2) ? $color{'color20'} : $color{'color22'}; print <<END; <tr bgcolor='$table_colour'> diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 6a61300a2..4e0f14a01 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -87,7 +87,7 @@ delete $sambasettings{'__CGI__'};delete $sambasettings{'x'};delete $sambasetting if ($sambasettings{'ACTION'} eq 'smbuserdisable'){system("/usr/local/bin/sambactrl smbuserdisable $sambasettings{'NAME'}");} if ($sambasettings{'ACTION'} eq 'smbuserenable'){system("/usr/local/bin/sambactrl smbuserenable $sambasettings{'NAME'}");} -if ($sambasettings{'ACTION'} eq 'smbuseradd'){system("/usr/local/bin/sambactrl smbuseradd $sambasettings{'USERNAME'} $sambasettings{'PASSWORD'} $sambasettings{'GROUP'} $sambasettings{'SHELL'}");} +if ($sambasettings{'ACTION'} eq 'smbuseradd'){system("/usr/local/bin/sambactrl smbuseradd $sambasettings{'USERNAME'} $sambasettings{'PASSWORD'}");} if ($sambasettings{'ACTION'} eq 'smbchangepw'){system("/usr/local/bin/sambactrl smbchangepw $sambasettings{'USERNAME'} $sambasettings{'PASSWORD'}");} if ($sambasettings{'ACTION'} eq 'smbrestart'){system("/usr/local/bin/sambactrl smbrestart");} if ($sambasettings{'ACTION'} eq 'smbstart'){system("/usr/local/bin/sambactrl smbstart");} @@ -482,18 +482,6 @@ END <input type='password' name='PASSWORD' value='$password' size='30' /> </td> </tr> - <tr> - <td align='left'>$Lang::tr{'unix group'}</td> - <td> - <input type='text' name='GROUP' value='sambauser' size='30' /> - </td> - </tr> - <tr> - <td align='left'>$Lang::tr{'unix shell'}</td> - <td> - <input type='text' name='SHELL' value='/bin/false' size='30' /> - </td> - </tr> <tr> <td colspan='2' align='center'> <input type='hidden' name='ACTION' value='smbuseradd'> diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi index 26ab4f314..36954ba70 100644 --- a/html/cgi-bin/services.cgi +++ b/html/cgi-bin/services.cgi @@ -161,19 +161,20 @@ END my $lines=0; # Used to count the outputlines to make different bgcolor # Generate list of installed addon pak's - my @pak = `find /opt/pakfire/db/installed/meta-* 2>/dev/null | cut -d"-" -f2`; + opendir (DIR, "/opt/pakfire/db/installed") || die "Cannot opendir /opt/pakfire/db/installed/: $!"; + my @pak = sort readdir DIR; foreach (@pak){ chomp($_); + next unless (m/^meta-/); + s/^meta-//; # Check which of the paks are services - my @svc = `find /etc/init.d/$_ 2>/dev/null | cut -d"/" -f4`; - foreach (@svc){ + if (-e "/etc/init.d/$_") { # blacklist some packages # # alsa has trouble with the volume saving and was not really stopped # mdadm should not stopped with webif because this could crash the system # - chomp($_); if ( $_ eq 'squid' ) { next; } diff --git a/html/cgi-bin/upnp.cgi b/html/cgi-bin/upnp.cgi deleted file mode 100644 index 07dfa2677..000000000 --- a/html/cgi-bin/upnp.cgi +++ /dev/null @@ -1,228 +0,0 @@ -#!/usr/bin/perl -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # -# # -# 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 # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see <http://www.gnu.org/licenses/>. # -# # -############################################################################### - -use strict; -# enable only the following on debugging purpose -#use warnings; -#use CGI::Carp 'fatalsToBrowser'; - -require '/var/ipfire/general-functions.pl'; -require "${General::swroot}/lang.pl"; -require "${General::swroot}/header.pl"; - -my %upnpsettings = (); -my %netsettings = (); -my $message = ""; -my $errormessage = ""; -my %selected= () ; - -my %servicenames =('UPnP Daemon' => 'upnpd',); - -my %color = (); -my %mainsettings = (); -&General::readhash("${General::swroot}/main/settings", \%mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color); - -&Header::showhttpheaders(); -############################################################################################################################ -############################################### Setzen von Standartwerten ################################################## - -$upnpsettings{'DEBUGMODE'} = '3'; -$upnpsettings{'FORWARDRULES'} = 'yes'; -$upnpsettings{'DOWNSTREAM'} = '1048576'; -$upnpsettings{'UPSTREAM'} = '131072'; -$upnpsettings{'DESCRIPTION'} = 'gatedesc.xml'; -$upnpsettings{'XML'} = '/etc/linuxigd'; -$upnpsettings{'ENABLED'} = 'off'; -$upnpsettings{'friendlyName'} = 'IPFire Gateway'; -### Values that have to be initialized -$upnpsettings{'ACTION'} = ''; - -&General::readhash("${General::swroot}/upnp/settings", \%upnpsettings); -&General::readhash("${General::swroot}/ethernet/settings", \%netsettings); -&Header::getcgihash(\%upnpsettings); - -&Header::openpage('UPnP', 1, ''); -&Header::openbigbox('100%', 'left', '', $errormessage); - -############################################################################################################################ -################################################### Speichern der Config ################################################### - -if ($upnpsettings{'ACTION'} eq $Lang::tr{'save'}) - { - $upnpsettings{'DOWNSTREAM'} = $upnpsettings{'DOWNSTREAM'} * 1024; - $upnpsettings{'UPSTREAM'} = $upnpsettings{'UPSTREAM'} * 1024; - &General::writehash("${General::swroot}/upnp/settings", \%upnpsettings); - - open (FILE, ">${General::swroot}/upnp/upnpd.conf") or die "Can't save the upnp config: $!"; - flock (FILE, 2); - - print FILE <<END - -# UPnP Config by Ipfire Project - -debug_mode = $upnpsettings{'DEBUGMODE'} -insert_forward_rules = $upnpsettings{'FORWARDRULES'} -forward_chain_name = FORWARD -prerouting_chain_name = UPNPFW -upstream_bitrate = $upnpsettings{'DOWNSTREAM'} -downstream_bitrate = $upnpsettings{'UPSTREAM'} -description_document_name = $upnpsettings{'DESCRIPTION'} -xml_document_path = $upnpsettings{'XML'} - -END -; - close FILE; - system("/usr/local/bin/upnpctrl","upnpxml","$upnpsettings{'friendlyName'}","$upnpsettings{'XML'}","$upnpsettings{'DESCRIPTION'}"); - } -elsif ($upnpsettings{'ACTION'} eq 'Start') - { - $upnpsettings{'ENABLED'} = 'on'; - &General::writehash("${General::swroot}/upnp/settings", \%upnpsettings); - system("/usr/local/bin/upnpctrl upnpdstart $netsettings{'RED_DEV'} $netsettings{'GREEN_DEV'}"); - } -elsif ($upnpsettings{'ACTION'} eq 'Stop') - { - $upnpsettings{'ENABLED'} = 'off'; - &General::writehash("${General::swroot}/upnp/settings", \%upnpsettings); - system("/usr/local/bin/upnpctrl stop"); - } -elsif ($upnpsettings{'ACTION'} eq $Lang::tr{'restart'}) - { - &General::writehash("${General::swroot}/upnp/settings", \%upnpsettings); - system("/usr/local/bin/upnpctrl stop"); - system("/usr/local/bin/upnpctrl start $netsettings{'RED_DEV'} $netsettings{'GREEN_DEV'}"); - } - -&General::readhash("${General::swroot}/upnp/settings", \%upnpsettings); -$upnpsettings{'DOWNSTREAM'} = $upnpsettings{'DOWNSTREAM'} / 1024; -$upnpsettings{'UPSTREAM'} = $upnpsettings{'UPSTREAM'} / 1024; - -if ($errormessage) - { - &Header::openbox('100%', 'left', $Lang::tr{'error messages'}); - print "<class name='base'>$errormessage\n"; - print " </class>\n"; - &Header::closebox(); - } - -############################################################################################################################ -############################################################################################################################ - -&Header::openbox('100%', 'center', 'UPnP'); -print <<END -<form method='post' action='$ENV{'SCRIPT_NAME'}'> -<table width='95%' cellspacing='0'> -END -; -if ( $message ne "" ) {print "<tr><td colspan='3' style='text-align:center; color:red;'>$message</td></tr>";} - -my $lines = 0; -my $key = ''; -foreach $key (sort keys %servicenames) -{ - print "<tr><td align='left'>$key\n"; - my $shortname = $servicenames{$key}; - my $status = &isrunning($shortname); - print "$status\n"; - $lines++; -} - -print <<END -<tr><td align='left'>Alle Dienste:</td><td align='center' colspan='2'> -<input type='submit' name='ACTION' value='Start' /> -<input type='submit' name='ACTION' value='Stop' /> -<input type='submit' name='ACTION' value='$Lang::tr{'restart'}' /> -</table> -</form> -<br /> -<form method='post' action='$ENV{'SCRIPT_NAME'}'> -<table width='95%' cellspacing='0'> -<tr><td colspan='2' align='left' bgcolor='$color{'color20'}'><b>$Lang::tr{'options'}</b></td></tr> -<tr><td align='left' colspan='2'><br /></td></tr> -<tr><td align='left'>UPnP Device Name:</td><td><input type='text' name='friendlyName' value='$upnpsettings{'friendlyName'}' size="30" /></td></tr> -<tr><td align='left' colspan='2'><br /></td></tr> -<tr><td align='left'>Downstream in KB:</td><td><input type='text' name='DOWNSTREAM' value='$upnpsettings{'DOWNSTREAM'}' size="30" /></td></tr> -<tr><td align='left'>Upstream in KB:</td><td><input type='text' name='UPSTREAM' value='$upnpsettings{'UPSTREAM'}' size="30" /></td></tr> -<tr><td align='left' colspan='2'><br /></td></tr> -<tr><td colspan='2' align='center'> <input type='hidden' name='ACTION' value=$Lang::tr{'save'} /> -<input type='image' alt='$Lang::tr{'save'}' title='$Lang::tr{'save'}' src='/images/floppy.gif' /></td></tr> -</table></form> -END -; -&Header::closebox(); - -&Header::openbox('100%', 'center', 'Aktuell geoeffnete Ports'); -my @output = qx(iptables -t nat -n -L PORTFW); -my ($outputline, $extip, $extport, $int); -my @output2; -print "<table>"; -foreach $outputline (@output) { - if ( $outputline =~ /^DNAT/ ) { - @output2 = split(/ /, $outputline); - $extip = $output2[23]; - $extport = $output2[29]; - $extport =~ s/dpt://; - $int = "$output2[31]"; - $int =~ s/to://; - print "<tr><td>$extip:$extport<td align='center'><img src='/images/forward.gif' alt='=>' /><td>$int"; - - } -} - -print "</table>"; - -&Header::closebox(); - -&Header::closebigbox(); -&Header::closepage(); - -############################################################################################################################ -############################################################################################################################ - -sub isrunning -{ - my $cmd = $_[0]; - my $status = "<td bgcolor='${Header::colourred}' style='text-align:center; color:white;'><b>$Lang::tr{'stopped'}</b></td>"; - my $pid = ''; - my $testcmd = ''; - my $exename; - - $cmd =~ /(^[a-z]+)/; - $exename = $1; - - if (open(FILE, "/var/run/${cmd}.pid")) - { - $pid = <FILE>; chomp $pid; - close FILE; - if (open(FILE, "/proc/${pid}/status")) - { - while (<FILE>) - {if (/^Name:\W+(.*)/) {$testcmd = $1; }} - close FILE; - if ($testcmd =~ /$exename/) - {$status = "<td style='color:white; background-color:${Header::colourgreen};'><b>$Lang::tr{'running'}</b></td>";} - } - } - - return $status; -} - diff --git a/html/cgi-bin/wakeonlan.cgi b/html/cgi-bin/wakeonlan.cgi index bb55add70..1f7fde54a 100644 --- a/html/cgi-bin/wakeonlan.cgi +++ b/html/cgi-bin/wakeonlan.cgi @@ -171,7 +171,7 @@ if ( $cgiparams{'ACTION'} eq 'wakeup' ) undef %cgiparams; - system("/usr/local/bin/launch-ether-wake $mac $iface"); + system("/usr/sbin/etherwake -i $iface $mac"); # make a box with info, 'refresh' to normal screen after 5 seconds if ( $refresh eq 'yes' ) diff --git a/html/cgi-bin/wirelessclient.cgi b/html/cgi-bin/wirelessclient.cgi index 6978663cf..e8c3c9628 100644 --- a/html/cgi-bin/wirelessclient.cgi +++ b/html/cgi-bin/wirelessclient.cgi @@ -462,6 +462,7 @@ sub showEditBox() { my %selected = (); $selected{'ENCRYPTION'} = (); $selected{'ENCRYPTION'}{'NONE'} = ''; + $selected{'ENCRYPTION'}{'WPA3'} = ''; $selected{'ENCRYPTION'}{'WPA2'} = ''; $selected{'ENCRYPTION'}{'WPA'} = ''; $selected{'ENCRYPTION'}{'WEP'} = ''; @@ -505,9 +506,10 @@ sub showEditBox() { <select name='ENCRYPTION'> <option value="NONE" $selected{'ENCRYPTION'}{'NONE'}>$Lang::tr{'wlan client encryption none'}</option> <option value="EAP" $selected{'ENCRYPTION'}{'EAP'}>$Lang::tr{'wlan client encryption eap'}</option> + <option value="WPA3" $selected{'ENCRYPTION'}{'WPA3'}>$Lang::tr{'wlan client encryption wpa3'}</option> <option value="WPA2" $selected{'ENCRYPTION'}{'WPA2'}>$Lang::tr{'wlan client encryption wpa2'}</option> <option value="WPA" $selected{'ENCRYPTION'}{'WPA'}>$Lang::tr{'wlan client encryption wpa'}</option> - <option value="WEP" $selected{'ENCRYPTION'}{'WEP'}>$Lang::tr{'wlan client encryption wep'}</option> + <option value="WEP" $selected{'ENCRYPTION'}{'WEP'}>$Lang::tr{'wlan client encryption wep'}</option> </select> </td> <td colspan="2" width='40%'></td> @@ -839,7 +841,6 @@ sub ValidateInput($) { # Check for invalid key length. } elsif (ValidKeyLength($settings{'ENCRYPTION'}, $settings{'PSK'})) { return "$Lang::tr{'wlan client invalid key length'}"; - } # Reset WPA mode, if WPA(2) is not selected. diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi index fd7e9a679..575b696d7 100644 --- a/html/cgi-bin/wlanap.cgi +++ b/html/cgi-bin/wlanap.cgi @@ -516,8 +516,7 @@ print <<END <table width='80%' cellspacing='0'> <tr><td align='center'> <form method='post' action='$ENV{'SCRIPT_NAME'}'> - <input type='hidden' name='ACTION' value=$Lang::tr{'save'} /> - <input type='image' alt='$Lang::tr{'save'}' title='$Lang::tr{'save'}' src='/images/media-floppy.png' /></form></td> + <input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></form></td> </tr> </table> END diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 2fb46e741..307b8a97c 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -453,7 +453,7 @@ 'authentication' => 'Authentifizierung:', 'automatic' => 'Automatisch', 'autonomous system' => 'Autonomes System', -'available updates' => 'Verfügbare Updates:', +'available updates' => 'Verfügbare Updates', 'average' => 'Durchschnitt', 'avoid dod' => 'Benutzen Sie diese Option nicht mit Dial on Demand! Wird hauptsächlich verwendet, wenn Ihr IPFire sich hinter einem Router befindet. Ihre ROTE IP muss sich innerhalb eines der drei reservierten Netzwerkbereiche befinden z.B. 10/8, 172.16/12, 192.168/16.', 'back' => 'ZURÜCK', @@ -781,6 +781,7 @@ 'dhcp bootp pxe data' => 'Geben Sie optionale BOOTP-PXE-Daten für diese feste Zuordnung ein', 'dhcp configuration' => 'DHCP-Konfiguration', 'dhcp create fixed leases' => 'Feste Zuordnungen erzeugen', +'dhcp deny known clients:' => 'Bekannte Clients verweigern:', 'dhcp dns enable update' => 'DNS-Update nach RFC 2136 aktivieren:', 'dhcp dns key name' => 'Schlüsselname', 'dhcp dns update' => 'DNS-Update', @@ -792,6 +793,7 @@ 'dhcp server' => 'DHCP-Server', 'dhcp server disabled' => 'DHCP-Server deaktiviert. Angehalten.', 'dhcp server enabled' => 'DHCP-Server aktiviert. Starte neu.', +'dhcp valid range required when deny known clients checked' => 'Gültiger Bereich erforderlich, wenn "Bekannte Clients verweigern:" aktiviert ist', 'dhcp-options' => 'DHCP push Optionen', 'dial' => 'Verbinden', 'dial profile' => 'Verbinde mit Profil', @@ -2274,7 +2276,7 @@ 'ssh active sessions' => 'Aktive Benutzeranmeldungen', 'ssh agent forwarding' => 'Weiterleitung des SSH-Agenten (Agent Forwarding) zulassen', 'ssh fingerprint' => 'Fingerabdruck', -'ssh host keys' => 'SSH Host Schlüssel', +'ssh host keys' => 'SSH-Serverschlüssel', 'ssh is disabled' => 'Secure Shell ist deaktiviert. Halte an.', 'ssh is enabled' => 'Secure Shell ist aktiviert. Starte neu.', 'ssh key' => 'Schlüssel', @@ -2372,6 +2374,8 @@ 'to warn email bad' => 'An E-Mail-Adresse ist nicht gültig', 'toggle' => 'Pause/Resume', 'toggle enable disable' => 'Aktivieren oder Deaktivieren', +'token' => 'Token:', +'token not set' => 'Kein Token angegeben.', 'tone' => 'Ton', 'tone dial' => 'Tonwahl:', 'too long 80 char max' => ' ist zu lang, es sind maximal 80 Zeichen erlaubt', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index b5284effa..22e8a4cc6 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -452,7 +452,7 @@ 'authentication' => 'Authentication:', 'automatic' => 'Automatic', 'autonomous system' => 'Autonomous System', -'available updates' => 'Available updates:', +'available updates' => 'Available updates', 'average' => 'Average', 'avoid dod' => 'Do not use this option with Dial on Demand! Mainly used if your IPFire is behind a router. Your RED IP must be inside one of the three reserved network numbers e.g. 10/8, 172.16/12, 192.168/16', 'back' => 'Back', @@ -800,6 +800,7 @@ 'dhcp bootp pxe data' => 'Enter optional bootp pxe data for this fixed lease', 'dhcp configuration' => 'DHCP configuration', 'dhcp create fixed leases' => 'Create fixed leases', +'dhcp deny known clients:' => 'Deny known clients:', 'dhcp dns enable update' => 'Enable DNS Update (RFC2136):', 'dhcp dns key name' => 'Key Name', 'dhcp dns update' => 'DNS Update', @@ -813,6 +814,7 @@ 'dhcp server disabled on blue interface' => 'DHCP server disabled on BLUE interface', 'dhcp server enabled' => 'DHCP server enabled. Restarting.', 'dhcp server enabled on blue interface' => 'DHCP server enabled on BLUE interface', +'dhcp valid range required when deny known clients checked' => 'Valid range required when "Deny known clients:" is checked', 'dhcp-options' => 'DHCP push options', 'dial' => 'Connect', 'dial profile' => 'Connect with profile', @@ -2000,7 +2002,7 @@ 'pakfire core update auto' => 'Install core and addon updates automatically:', 'pakfire core update level' => 'Core-Update-Level', 'pakfire health check' => 'Check if mirror is reachable (ping):', -'pakfire install description' => 'Please choose one or more items from the list below and <br /> click the plus to install.', +'pakfire install description' => 'Please choose one or more items from the list below and click the plus to install.', 'pakfire install package' => 'You want to install the following packages: ', 'pakfire installed addons' => 'Installed Addons:', 'pakfire invalid tree' => 'Invalid repository selected', @@ -2016,10 +2018,9 @@ 'pakfire tree testing' => 'Testing', 'pakfire tree unstable' => 'Unstable', 'pakfire uninstall all' => 'Do you want to uninstall the following packages?', -'pakfire uninstall description' => 'Please choose one or more items from the list below and <br /> click the minus to uninstall.', +'pakfire uninstall description' => 'Please choose one or more items from the list below and click the minus to uninstall.', 'pakfire uninstall package' => 'You want to uninstall the following packages: ', 'pakfire update daily' => 'Search for updates daily:', -'pakfire updates' => 'Available Update:', 'pakfire working' => 'Pakfire is working ... Please wait until all operations have completed successfully.', 'pap or chap' => 'PAP or CHAP', 'parentclass' => 'Parentclass', @@ -2411,6 +2412,8 @@ 'to warn email bad' => 'To e-mail address is not valid', 'toggle' => 'pause/resume', 'toggle enable disable' => 'Enable or disable', +'token' => 'Token:', +'token not set' => 'No Token has been given.', 'tone' => 'Tone', 'tone dial' => 'Tone dial:', 'too long 80 char max' => ' is too long, maximum allowed is 80 characters', @@ -2948,6 +2951,7 @@ 'wlan client encryption wep' => 'WEP', 'wlan client encryption wpa' => 'WPA', 'wlan client encryption wpa2' => 'WPA2', +'wlan client encryption wpa3' => 'WPA3', 'wlan client group cipher' => 'Group cipher', 'wlan client group key algorithm' => 'GKA', 'wlan client identity' => 'Identity', diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl index 93a15bba0..9a39ffd16 100644 --- a/langs/es/cgi-bin/es.pl +++ b/langs/es/cgi-bin/es.pl @@ -1363,7 +1363,7 @@ 'pakfire core update auto' => 'Instalar actualizaciones de Core y de addons automáticamente', 'pakfire core update level' => 'Nivel de actualización del Core', 'pakfire health check' => 'Verificar disponibilidad del mirror (ping):', -'pakfire install description' => 'Por favor elija uno o más elementos de la siguiente lista y <br /> haga click en el signo + para instalar', +'pakfire install description' => 'Por favor elija uno o más elementos de la siguiente lista y haga click en el signo + para instalar', 'pakfire install package' => 'Ud. desea instalar los siguientes paquetes:', 'pakfire installed addons' => 'Addons instalados:', 'pakfire last core list update' => 'Última lista de actualización de core hecha', @@ -1374,7 +1374,7 @@ 'pakfire register' => 'Registrar en el servidor pakfire:', 'pakfire system state' => 'Status del sistema', 'pakfire uninstall all' => '¿Desea desinstalar los siguientes paquetes?', -'pakfire uninstall description' => 'Por favor elija uno o más elementos de la siguiente lista y <br /> haga click en el signo - para desinstalar', +'pakfire uninstall description' => 'Por favor elija uno o más elementos de la siguiente lista y haga click en el signo - para desinstalar', 'pakfire uninstall package' => 'Ud. desea desinstalar los siguientes paquetes:', 'pakfire update daily' => 'Buscar actualizaciones diariamente:', 'pakfire updates' => 'Actualización disponible:', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index a2d27939c..bc0a53df8 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -112,7 +112,7 @@ 'Port Rule' => 'Règle de port', 'QoS not enabled' => 'La QoS n\'est pas active !', 'Queuelenght' => 'Taille de la file d\'attente ', -'Remote IP' => ' IP / Nom hôte distant (DynDNS) :', +'Remote IP' => 'IP / Nom hôte distant (DynDNS) :', 'Remote VPN IP' => 'Sous-réseau VPN (ex. 10.0.10.0/255.255.255.0) :', 'Resolv' => 'Résoudre/réessayer :', 'Scan for Files' => 'Recherche de fichiers', @@ -449,6 +449,7 @@ 'are you sure' => 'Etes-vous sûr ?', 'arp table entries' => 'Table d\'entrées ARP :', 'artist' => 'Artiste', +'asn lookup failed' => 'La recherche AS a échoué', 'atm device' => 'Périphérique :', 'atm settings' => 'Réglages ATM', 'attemps' => 'Tentatives', @@ -456,6 +457,7 @@ 'august' => 'Août', 'authentication' => 'Authentification :', 'automatic' => 'Automatique', +'autonomous system' => 'Système autonome', 'available updates' => 'Mises à jour disponibles :', 'average' => 'Moyenne', 'avoid dod' => 'Ne pas utiliser cette option avec connexion à la demande ! Principalement utilisée si votre IPFire se trouve derrière un routeur. Votre IP ROUGE doit être au coeur de l\'un des trois numéros de réseau réservés, par exemple 10 / 8, 172.16/12, 192.168/16', @@ -857,6 +859,7 @@ 'dns could not add server' => 'Ne peut ajouter le serveur - Motif :', 'dns desc' => 'Si l\'interface ROUGE0 obtient ses informations d\'adresse IP via le DHCP du fournisseur d\'accès, les adresses du serveur DNS seront définies automatiquement. Sinon, vous pouvez également remplacer les adresses IP du serveur DNS par celles de votre choix.', 'dns enable safe-search' => 'Activer la recherche sécurisée', +'dns enable safe-search youtube' => 'Inclure YouTube dans la recherche sécurisée', 'dns error 0' => 'L\'adresse IP du <strong>premier</strong> serveur DNS n\'est pas valide, veuillez revoir votre saisie<br />La saisie de l\'adresse du <strong>second</strong> serveur DNS est valide.', 'dns error 01' => 'Les adresses IP du <strong>premier</strong> et du <strong>second</strong> serveur DNS ne sont pas valides, veuillez revoir vos saisies', 'dns error 1' => 'L\'adresse IP du <strong>second</strong> serveur DNS n\'est pas valide, veuillez revoir votre saisie<br />La saisie de l\'adresse du <strong>premier</strong> serveur DNS est valide.', @@ -1535,7 +1538,9 @@ 'ip alias added' => 'Alias d\'IP externe ajoutée', 'ip alias changed' => 'Alias d\'IP externe modifiée', 'ip alias removed' => 'Alias d\'IP externe supprimée', +'ip basic info' => 'Information IP basique', 'ip info' => 'Information IP', +'ip info for' => 'Information IP pour', 'ipfire has now rebooted' => 'IPFire va à présent redémarrer.', 'ipfire has now shutdown' => 'IPFire va à présent s\'arrêter.', 'ipfire side' => 'Côté IPFire :', @@ -2104,7 +2109,7 @@ 'proxy reports weekly' => 'Rapports hebdomadaires', 'psk' => 'PSK', 'ptr' => 'PTR', -'ptr lookup failed' => 'La recherche inversée a échouée', +'ptr lookup failed' => 'La recherche inversée a échoué', 'pulse' => 'Impulsion', 'pulse dial' => 'Numérotation par impulsions :', 'qos add subclass' => 'Ajouter une sous-classe', @@ -2454,6 +2459,9 @@ 'tor exit country' => 'Pays de sortie', 'tor exit country any' => 'N\'importe quel pays', 'tor exit nodes' => 'Noeuds de sortie', +'tor guard country' => 'Pays de garde', +'tor guard country any' => 'N\'importe quel pays', +'tor guard nodes' => 'Noeuds de garde', 'tor relay address' => 'Adresse relais', 'tor relay configuration' => 'Configuration relais Tor', 'tor relay enabled' => 'Activer relais Tor', @@ -2473,6 +2481,7 @@ 'tor traffic limit soft' => 'Limite de trafic presque atteinte. Ne pas accepter de nouvelles connexions.', 'tor traffic read written' => 'Trafic total (lu / écrit)', 'tor use exit nodes' => 'Utiliser uniquement ces noeuds de sortie (un par ligne)', +'tor use guard nodes' => 'Utiliser uniquement ces noeuds de garde (un par ligne)', 'total connection time' => 'Temps total de connexion', 'total hits for log section' => 'Nombre d\'occurrences pour la section', 'traffic back' => 'Retour', @@ -2915,6 +2924,7 @@ 'week-graph' => 'Semaine', 'weekly firewallhits' => 'Contacts hebdomadaires du pare-feu', 'weeks' => 'semaine(s)', +'whois results from' => 'Le WHOIS résulte de', 'wildcards' => 'Jokers', 'winbind daemon' => 'Service Winbind', 'wins server' => 'Serveur Wins', diff --git a/langs/it/cgi-bin/it.pl b/langs/it/cgi-bin/it.pl index 14436de4b..28c7b79ad 100644 --- a/langs/it/cgi-bin/it.pl +++ b/langs/it/cgi-bin/it.pl @@ -374,7 +374,7 @@ 'august' => 'Agosto', 'authentication' => 'Authentication:', 'automatic' => 'Automatic', -'available updates' => 'Available updates:', +'available updates' => 'Available updates', 'average' => 'Average', 'avoid dod' => 'Do not use this option with Dial on Demand! Mainly used if your IPFire is behind a router. Your RED IP must be inside one of the three reserved network numbers e.g. 10/8, 172.16/12, 192.168/16', 'back' => 'BACK', @@ -1752,7 +1752,7 @@ 'pakfire core update auto' => 'Install core and addon updates automatically:', 'pakfire core update level' => 'Core-Update-Level', 'pakfire health check' => 'Controllare se il mirror è raggiungibile (ping):', -'pakfire install description' => 'Si prega di scegliere uno o più elementi dalla lista qui sotto e <br /> fai clic sul segno più per installare.', +'pakfire install description' => 'Si prega di scegliere uno o più elementi dalla lista qui sotto e fai clic sul segno più per installare.', 'pakfire install package' => 'You want to install the following packages: ', 'pakfire installed addons' => 'Addons installati:', 'pakfire last core list update' => 'Ultimo aggiornamento della lista di sistema', @@ -1763,10 +1763,9 @@ 'pakfire register' => 'Registrati sul pakfire-server:', 'pakfire system state' => 'Stato del Sistema', 'pakfire uninstall all' => 'Vuoi disinstallare i seguenti pacchetti?', -'pakfire uninstall description' => 'Si prega di scegliere uno o più elementi dalla lista qui sotto e <br /> fare clic sul meno per disinstallare..', +'pakfire uninstall description' => 'Si prega di scegliere uno o più elementi dalla lista qui sotto e fare clic sul meno per disinstallare..', 'pakfire uninstall package' => 'You want to uninstall the following packages: ', 'pakfire update daily' => 'Ricerca gli aggiornamenti una volta al giorno:', -'pakfire updates' => 'Available Update:', 'pakfire working' => 'Pakfire sta lavorando... Per favore attendi il termine delle operazioni', 'pap or chap' => 'PAP or CHAP', 'parentclass' => 'Parentclass', diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl index 53341a6f8..4ada179c1 100644 --- a/langs/nl/cgi-bin/nl.pl +++ b/langs/nl/cgi-bin/nl.pl @@ -372,7 +372,7 @@ 'august' => 'Augustus', 'authentication' => 'Authenticatie:', 'automatic' => 'Automatisch', -'available updates' => 'Beschikbare updates:', +'available updates' => 'Beschikbare updates', 'average' => 'Gemiddeld', 'avoid dod' => 'Gebruik deze optie niet met inbellen op afroep! Wordt voornamelijk gebruikt als IPFire achter een router staat. Uw RODE IP moet dan binnen het bereik vallen van een van de drie gereserveerde netwerken, bijv. 10/8, 172.16/12, 192.168/16', 'back' => 'TERUG', @@ -702,6 +702,7 @@ 'dhcp bootp pxe data' => 'Voer optionele bootp pxe data in voor deze vaste lease', 'dhcp configuration' => 'DHCP configuratie', 'dhcp create fixed leases' => 'Aanmaken vaste leases', +'dhcp deny known clients:' => 'Bekende clients weigeren:', 'dhcp fixed lease err1' => 'Voor een vaste lease moet u het MAC-adres of de hostnaam invoeren, of beide.', 'dhcp fixed lease help1' => 'IP-adressen mogen ook als FQDN worden ingevoerd', 'dhcp mode' => 'DHCP', @@ -710,6 +711,7 @@ 'dhcp server disabled on blue interface' => 'DHCP server uitgeschakeld op de BLAUWE interface', 'dhcp server enabled' => 'DHCP server ingeschakeld. Herstarten.', 'dhcp server enabled on blue interface' => 'DHCP server ingeschakeld op de BLAUWE interface', +'dhcp valid range required when deny known clients checked' => 'Geldig bereik wanneer "Bekende clients weigeren:" is aangevinkt', 'dhcp-options' => 'DHCP push opties', 'dial' => 'Verbind', 'dial profile' => 'Verbind met profile', @@ -1706,7 +1708,7 @@ 'pakfire core update auto' => 'Installeer core- en extensie-updates automatisch:', 'pakfire core update level' => 'Core-updateniveau', 'pakfire health check' => 'Controleer of de mirror bereikbaar is (ping):', -'pakfire install description' => 'Kies een of meer items uit de lijst hieronder en <br /> klik op de plus om te installeren.', +'pakfire install description' => 'Kies een of meer items uit de lijst hieronder en klik op de plus om te installeren.', 'pakfire install package' => 'U wilt de volgende pakketten installeren: ', 'pakfire installed addons' => 'Geïnstalleerde extensies:', 'pakfire last core list update' => 'Laatste core-lijst update gemaakt', @@ -1717,7 +1719,7 @@ 'pakfire register' => 'Registreer bij de pakfire-server:', 'pakfire system state' => 'Systeemstatus', 'pakfire uninstall all' => 'Wilt u de volgende pakketten verwijderen?', -'pakfire uninstall description' => 'Kies een of meer items uit de lijst hieronder en <br /> klik op de min om te deinstalleren.', +'pakfire uninstall description' => 'Kies een of meer items uit de lijst hieronder en klik op de min om te deinstalleren.', 'pakfire uninstall package' => 'U wilt de volgende pakketten deinstalleren: ', 'pakfire update daily' => 'Zoek dagelijks naar updates:', 'pakfire updates' => 'Beschikbare update:', diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl index 63c8a1793..59ca85cb9 100644 --- a/langs/pl/cgi-bin/pl.pl +++ b/langs/pl/cgi-bin/pl.pl @@ -354,7 +354,7 @@ 'august' => 'Sierpień', 'authentication' => 'Uwierzytelnianie:', 'automatic' => 'Automatycznie', -'available updates' => 'Dostępne aktualizacje:', +'available updates' => 'Dostępne aktualizacje', 'average' => 'Srednia', 'avoid dod' => 'Nie używaj tej opcji jeżeli wykorzystujesz wdzanianie na żądanie! Zazwyczaj wykorzystywane jeżeli IPFire jest za routerem. Interfejs RED musi być w jednej z 3 sieci np. 10/8, 172.16/12, 192.168/16', 'back' => 'WRÓĆ', @@ -1375,7 +1375,7 @@ 'pakfire core update auto' => 'Instaluj aktualizacje jądra automatycznie:', 'pakfire core update level' => 'Aktualizacja jądra', 'pakfire health check' => 'Sprawdź czy mirror jest dostępny (ping):', -'pakfire install description' => 'Proszę wybrać jedną lub kilka pozycji z poniższej listy, <br /> a następnie kliknąć plus aby zainstalować.', +'pakfire install description' => 'Proszę wybrać jedną lub kilka pozycji z poniższej listy, a następnie kliknąć plus aby zainstalować.', 'pakfire install package' => 'Zamierzasz zainstalować następujące pakiety: ', 'pakfire installed addons' => 'Zainstalowane dodatki:', 'pakfire last core list update' => 'Sprawdzenie aktualizacja jądra:', @@ -1386,7 +1386,7 @@ 'pakfire register' => 'Register at pakfire-server:', 'pakfire system state' => 'Status systemu', 'pakfire uninstall all' => 'Czy chcesz odinstalować następujące pakiety?', -'pakfire uninstall description' => 'Proszę wybrać jedną lub kilka pozycji z poniższej listy, <br /> a następnie kliknąć minus aby odinstalować.', +'pakfire uninstall description' => 'Proszę wybrać jedną lub kilka pozycji z poniższej listy, a następnie kliknąć minus aby odinstalować.', 'pakfire uninstall package' => 'Zamierzasz odinstalować następujące pakiety: ', 'pakfire update daily' => 'Szukaj aktualizacje codziennie:', 'pakfire updates' => 'Dostępne aktualizacje:', diff --git a/langs/ru/cgi-bin/ru.pl b/langs/ru/cgi-bin/ru.pl index 4f69dc47a..abcebab28 100644 --- a/langs/ru/cgi-bin/ru.pl +++ b/langs/ru/cgi-bin/ru.pl @@ -352,7 +352,7 @@ 'august' => 'Август', 'authentication' => 'Аутентификация:', 'automatic' => 'Автоматически', -'available updates' => 'Доступные обновления:', +'available updates' => 'Доступные обновления', 'average' => 'Average', 'avoid dod' => 'Не используйте эту опцию с дозвоном по требованию! Обычно используется, когда IPFire находится за роутером. Ваш RED IP должен находиться в одной из трёх зарезервированных сетей то есть 10/8, 172.16/12, 192.168/16', 'back' => 'НАЗАД', @@ -1370,7 +1370,7 @@ 'pakfire core update auto' => 'Устанавливать обновления ядра и аддонов автоматически:', 'pakfire core update level' => 'Уровень обновления системы', 'pakfire health check' => 'Пинговать зеркало на доступность:', -'pakfire install description' => 'Пожалуйста, укажите один или несколько элементов в списке ниже и <br /> нажмите плюсик для установки.', +'pakfire install description' => 'Пожалуйста, укажите один или несколько элементов в списке ниже и нажмите плюсик для установки.', 'pakfire install package' => 'Вы собираетесь установить следующие пакеты: ', 'pakfire installed addons' => 'Установленные Аддоны:', 'pakfire last core list update' => 'Обновление core-списков', @@ -1381,7 +1381,7 @@ 'pakfire register' => 'Регистрировать на pakfire-сервере:', 'pakfire system state' => 'Статус системы', 'pakfire uninstall all' => 'Вы хотите удалить следующие пакеты?', -'pakfire uninstall description' => 'Пожалуйста, укажите один или несколько элементов в списке ниже и <br /> нажмите минус для удаления.', +'pakfire uninstall description' => 'Пожалуйста, укажите один или несколько элементов в списке ниже и нажмите минус для удаления.', 'pakfire uninstall package' => 'Вы собираетесь удалить следующие пакеты: ', 'pakfire update daily' => 'Ежедневный поиск обновлений:', 'pakfire updates' => 'Доступное обновление:', diff --git a/langs/tr/cgi-bin/tr.pl b/langs/tr/cgi-bin/tr.pl index 34e8bdcf7..81d9509b7 100644 --- a/langs/tr/cgi-bin/tr.pl +++ b/langs/tr/cgi-bin/tr.pl @@ -438,7 +438,7 @@ 'august' => 'Ağustos', 'authentication' => 'Kimlik doğrulama:', 'automatic' => 'Otomatik', -'available updates' => 'Mevcut güncellemeler:', +'available updates' => 'Mevcut güncellemeler', 'average' => 'Ortalama', 'avoid dod' => 'Bu seçeneği çevirmeli ağ ile isteğe göre kullanmayın. Genellikle bu, IPFire sisteminiz bir yönlendirici arkasındaysa kullanılır. KIRMIZI IP adresiniz üç bölüme ayrılmış ağ numaralarından oluşmalıdır. Örneğin: 10/8, 172.16/12, 192.168/16', 'back' => 'GERİ', @@ -1897,7 +1897,7 @@ 'pakfire core update auto' => 'Otomatik olarak çekirdek ve eklenti güncelleştirmelerini yükle:', 'pakfire core update level' => 'Çekirdek-Güncelleme-Seviyesi', 'pakfire health check' => 'Yansımanın ulaşılabilir olup olmadığını kontrol et (ping):', -'pakfire install description' => 'Aşağıdaki listeden bir veya daha fazla öğeyi seçtikten sonra<br />eklemek için artı simgesine tıklayınız.', +'pakfire install description' => 'Aşağıdaki listeden bir veya daha fazla öğeyi seçtikten sonra eklemek için artı simgesine tıklayınız.', 'pakfire install package' => 'Aşağıdaki paketleri yüklemek istediniz: ', 'pakfire installed addons' => 'Kurulu eklentiler:', 'pakfire last core list update' => 'Son çekirdek listesi güncellemesi', @@ -1908,7 +1908,7 @@ 'pakfire register' => 'Pakfire sunucusuna kayıt:', 'pakfire system state' => 'Sistem durumu', 'pakfire uninstall all' => 'Aşağıdaki paketleri kaldırmak istiyor musunuz?', -'pakfire uninstall description' => 'Aşağıdaki listeden bir veya daha fazla öğeyi seçtikten sonra<br />kaldırmak için eksi simgesine tıklayınız.', +'pakfire uninstall description' => 'Aşağıdaki listeden bir veya daha fazla öğeyi seçtikten sonra kaldırmak için eksi simgesine tıklayınız.', 'pakfire uninstall package' => 'Aşağıdaki paketleri kaldırmak istiyorum: ', 'pakfire update daily' => 'Günlük güncellemeleri ara:', 'pakfire updates' => 'Mevcut Güncelleme:', diff --git a/lfs/7zip b/lfs/7zip index 7f8ca29f4..b70ce491c 100644 --- a/lfs/7zip +++ b/lfs/7zip @@ -24,15 +24,15 @@ include Config -VER = 16.02 +VER = 17.03 -THISAPP = p7zip_$(VER) -DL_FILE = $(THISAPP)_src_all.tar.bz2 -DL_FROM = $(URL_IPFIRE) +THISAPP = p7zip-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = https://github.com/jinfeihan57/p7zip/archive/v$(VER)/ DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = 7zip -PAK_VER = 7 +PAK_VER = 8 DEPS = @@ -46,7 +46,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = a0128d661cfe7cc8c121e73519c54fbf +$(DL_FILE)_MD5 = fd7e6b082db89edfc047c1ce2d810850 install : $(TARGET) @@ -78,8 +78,7 @@ dist: $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/p7zip-16.02-consolidated_fixes-1.patch + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && make all3 $(MAKETUNING) cd $(DIR_APP) && make DEST_HOME=/usr DEST_MAN=/usr/share/man \ DEST_SHARE_DOC=/usr/share/doc/p7zip-$(VER) install diff --git a/lfs/Config b/lfs/Config index b16da91bd..524ba35c0 100644 --- a/lfs/Config +++ b/lfs/Config @@ -70,7 +70,10 @@ else PREFIX = /usr endif -TAR_OPTIONS = --xz +TAR_OPTIONS = \ + --format=pax \ + --acls \ + --xattrs --xattrs-include='*' # URLs that are common sources of downloads. If you're having trouble with # a site you should change its URL to that of a suitable mirror site. diff --git a/lfs/acl b/lfs/acl index 2bfa818d2..5cf262ef9 100644 --- a/lfs/acl +++ b/lfs/acl @@ -24,13 +24,13 @@ include Config -VER = 2.2.52 +VER = 2.2.53 THISAPP = acl-$(VER) -DL_FILE = $(THISAPP).src.tar.gz +DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/acl-2.2.52 -TARGET = $(DIR_INFO)/acl-2.2.52 +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) ############################################################################### # Top-level Rules @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = a61415312426e9c2212bd7dc7929abda +$(DL_FILE)_MD5 = 007aabf1dbb550bcddde52a244cd1070 install : $(TARGET) @@ -73,8 +73,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && ./configure --prefix=/usr --libexecdir=/usr/lib --disable-static cd $(DIR_APP) && make cd $(DIR_APP) && make install - cd $(DIR_APP) && make install-lib - cd $(DIR_APP) && make install-dev chmod -v 755 /usr/lib/libacl.so @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/acpid b/lfs/acpid index 986109d93..5415c2cb9 100644 --- a/lfs/acpid +++ b/lfs/acpid @@ -24,7 +24,7 @@ include Config -VER = 2.0.28 +VER = 2.0.32 THISAPP = acpid-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 0432407b5ff75ae8e08afb43052fde2b +$(DL_FILE)_MD5 = 248995264b9d1cd8bdb923d5b190fd44 install : $(TARGET) diff --git a/lfs/arping b/lfs/arping index 26ee1c5fb..8c6d7beb5 100644 --- a/lfs/arping +++ b/lfs/arping @@ -24,7 +24,7 @@ include Config -VER = 2.15 +VER = 2.21 THISAPP = arping-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 676584f6eb4ccc8c70fc6b2c702df75d +$(DL_FILE)_MD5 = 14ba0be312cb37a01954e83c23d6fc02 install : $(TARGET) diff --git a/lfs/automake b/lfs/automake index 0dcb58983..08da70bcd 100644 --- a/lfs/automake +++ b/lfs/automake @@ -24,7 +24,7 @@ include Config -VER = 1.16.2 +VER = 1.16.3 THISAPP = automake-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 6cb234c86f3f984df29ce758e6d0d1d7 +$(DL_FILE)_MD5 = c27f608a4e1f302ec7ce42f1251c184e install : $(TARGET) diff --git a/lfs/bacula b/lfs/bacula index 1921db11a..5b9f119ff 100644 --- a/lfs/bacula +++ b/lfs/bacula @@ -24,7 +24,7 @@ include Config -VER = 9.6.6 +VER = 9.6.7 THISAPP = bacula-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = bacula -PAK_VER = 7 +PAK_VER = 9 DEPS = @@ -47,7 +47,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 1ba9e2a2d979cbe9b5d76187f98418ac +$(DL_FILE)_MD5 = 2fa01ba7b0bb171535f6510b96ffd22b install : $(TARGET) @@ -89,10 +89,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --enable-client-only cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install - ln -sf /etc/bacula/bacula-ctl-fd /etc/rc.d/init.d/bacula + + #install initscripts + $(call INSTALL_INITSCRIPT,bacula) + install -v -m 644 ${DIR_SRC}/config/backup/includes/bacula \ /var/ipfire/backup/addons/includes/bacula - rm -f /root/.rnd @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/bind b/lfs/bind index 053b8d8b7..0069fea59 100644 --- a/lfs/bind +++ b/lfs/bind @@ -25,7 +25,7 @@ include Config -VER = 9.11.21 +VER = 9.11.26 THISAPP = bind-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -43,7 +43,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 0967d4dd4e21e8f8d9202c5e148c27ca +$(DL_FILE)_MD5 = 1e5fb81b0ef562d32a19e579c0183f1a install : $(TARGET) diff --git a/lfs/bird b/lfs/bird index 9b045528f..ee1829907 100644 --- a/lfs/bird +++ b/lfs/bird @@ -24,7 +24,7 @@ include Config -VER = 2.0.6 +VER = 2.0.7 THISAPP = bird-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = bird -PAK_VER = 6 +PAK_VER = 7 DEPS = @@ -46,7 +46,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = bc05f225f4fcb365da1dbb308a7e23cc +$(DL_FILE)_MD5 = dc884bbe5905578e452f28158700527c install : $(TARGET) diff --git a/lfs/c-ares b/lfs/c-ares new file mode 100644 index 000000000..1f07623ac --- /dev/null +++ b/lfs/c-ares @@ -0,0 +1,89 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2020 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 # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.17.1 + +THISAPP = c-ares-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = c-ares +PAK_VER = 1 + +DEPS = + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 28f65c8ee6c097986bd902fd4f0804e2 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(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 \ + --enable-static=no + + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + + @rm -rf $(DIR_APP) + @$(POSTBUILD) + diff --git a/lfs/ca-certificates b/lfs/ca-certificates index 4317657c6..eed5384e4 100644 --- a/lfs/ca-certificates +++ b/lfs/ca-certificates @@ -24,7 +24,7 @@ include Config -VER = 20201023 +VER = 20201221 THISAPP = ca-certificates DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/ccache b/lfs/ccache index 1361f3ed0..e930f20d1 100644 --- a/lfs/ccache +++ b/lfs/ccache @@ -24,7 +24,7 @@ include Config -VER = 3.4.1 +VER = 3.7.12 THISAPP = ccache-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -51,7 +51,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 39492aea565c3e6d5affa633672a93bd +$(DL_FILE)_MD5 = 4c9a09ae499d1d82bb83e67f1068f9bb install : $(TARGET) diff --git a/lfs/cdrom b/lfs/cdrom index f18b80a03..a764416d0 100644 --- a/lfs/cdrom +++ b/lfs/cdrom @@ -32,12 +32,6 @@ TARGET = $(DIR_INFO)/$(THISAPP) # Fail when there is an error in the tar pipe SHELL=/bin/bash -o pipefail -ifeq "$(BUILD_PLATFORM)" "arm" - TAR_OPTIONS = -else - TAR_OPTIONS = --lzma -endif - HAS_MEMTEST = 0 HAS_IPXE = 0 HAS_ISOLINUX = 0 @@ -166,12 +160,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) # Compress root filesystem # Reason for this tar+untar+tar is removing of entries listed two or more in src/ROOTFILES rm -rf $(DIR_TMP)/root && mkdir -p $(DIR_TMP)/root - tar -c --exclude='#*' --exclude='proc/*' --exclude='dev/pts/*' --exclude='tmp/*' \ + tar $(TAR_OPTIONS) -c --exclude='#*' --exclude='proc/*' --exclude='dev/pts/*' --exclude='tmp/*' \ --exclude='__pycache__' \ - -C / --files-from=$(DIR_TMP)/ROOTFILES | tar -x -C $(DIR_TMP)/root + -C / --files-from=$(DIR_TMP)/ROOTFILES | tar $(TAR_OPTIONS) -x -C $(DIR_TMP)/root rm -f $(DIR_TMP)/ROOTFILES mkdir $(DIR_TMP)/root/sys - cd $(DIR_TMP)/root && tar cf - * | xz $(XZ_OPT) > $(DIR_TMP)/cdrom/distro.img + cd $(DIR_TMP)/root && tar $(TAR_OPTIONS) -cf - * | xz $(XZ_OPT) > $(DIR_TMP)/cdrom/distro.img rm -rf $(DIR_TMP)/root # Other files diff --git a/lfs/cifs-utils b/lfs/cifs-utils index 7502cb021..05705393c 100644 --- a/lfs/cifs-utils +++ b/lfs/cifs-utils @@ -24,7 +24,7 @@ include Config -VER = 5.9 +VER = 6.12 THISAPP = cifs-utils-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = cifs-utils -PAK_VER = 1 +PAK_VER = 2 DEPS = @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 7164ad6f7963a31fcbffbe4f14a7cfc6 +$(DL_FILE)_MD5 = b49b10692bcae7f28669173a472077dd install : $(TARGET) diff --git a/lfs/clamav b/lfs/clamav index e3e55c3b9..2c4d6a6ba 100644 --- a/lfs/clamav +++ b/lfs/clamav @@ -24,7 +24,7 @@ include Config -VER = 0.103.0 +VER = 0.103.1 THISAPP = clamav-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = clamav -PAK_VER = 53 +PAK_VER = 54 DEPS = @@ -50,7 +50,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 453a389e0147b5df8fae5601b390d7db +$(DL_FILE)_MD5 = f895e9a261937ed91f5cb3ead4791555 install : $(TARGET) diff --git a/lfs/configroot b/lfs/configroot index a37c2c401..bc8c0283f 100644 --- a/lfs/configroot +++ b/lfs/configroot @@ -151,6 +151,9 @@ $(TARGET) : # set converters executable chmod 755 /usr/sbin/convert-* + # Make extrahd.pl executable + chmod 755 /var/ipfire/extrahd/bin/extrahd.pl + # Modify variables in header.pl sed -i -e "s+CONFIG_ROOT+$(CONFIG_ROOT)+g" \ -e "s+VERSION+$(VERSION)+g" \ diff --git a/lfs/core-updates b/lfs/core-updates index e0dfa69f4..fa8b36d50 100644 --- a/lfs/core-updates +++ b/lfs/core-updates @@ -28,7 +28,6 @@ VER = ipfire THISAPP = core-updates TARGET = $(DIR_INFO)/$(THISAPP) -TAR_OPTIONS = --xz ############################################################################### # Top-level Rules @@ -72,13 +71,13 @@ core/%: sed -e "s/KVER/$(KVER)/g" -i /tmp/ROOTFILES #Remove doubled files with tar/untar/tar to save space - tar -c --exclude='proc/*' --exclude='tmp/ROOTFILES' --exclude='__pycache__' --exclude='#*' --exclude='dev/pts/*' \ + tar $(TAR_OPTIONS) -c --exclude='proc/*' --exclude='tmp/ROOTFILES' --exclude='__pycache__' --exclude='#*' --exclude='dev/pts/*' \ --exclude-from=$(DIR_SRC)/config/rootfiles/$@/exclude \ -C / --files-from=/tmp/ROOTFILES -f /$(SNAME).tar mv -f /tmp/ROOTFILES /install/packages/package/ROOTFILES - tar -p --numeric-owner -x -C /tmp -f /$(SNAME).tar + tar $(TAR_OPTIONS) -p --numeric-owner -x -C /tmp -f /$(SNAME).tar rm -f /$(SNAME).tar - cd /tmp && XZ_OPT="$(XZ_OPT)" tar cJf /install/packages/package/files.tar.xz $(TAR_OPTIONS) * && rm -rf * + cd /tmp && XZ_OPT="$(XZ_OPT)" tar $(TAR_OPTIONS) -cJf /install/packages/package/files.tar.xz $(TAR_OPTIONS) * && rm -rf * cat /install/packages/package/ROOTFILES | grep -v "#" > /install/packages/package/ROOTFILES.tmp rm /install/packages/package/ROOTFILES mv /install/packages/package/ROOTFILES.tmp /install/packages/package/ROOTFILES diff --git a/lfs/cups-filters b/lfs/cups-filters index 4f4d88b95..e7640f307 100644 --- a/lfs/cups-filters +++ b/lfs/cups-filters @@ -24,7 +24,7 @@ include Config -VER = 1.27.4 +VER = 1.28.7 THISAPP = cups-filters-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = cups-filters -PAK_VER = 3 +PAK_VER = 4 DEPS = cups ghostscript @@ -46,7 +46,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = fd43c2fa2f542d45580d113d30bdd2da +$(DL_FILE)_MD5 = 2efeed97e11ea5e157c5f4f2e0780fe7 install : $(TARGET) diff --git a/lfs/curl b/lfs/curl index 1f188fc02..0d8f6a6fd 100644 --- a/lfs/curl +++ b/lfs/curl @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2021 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 # @@ -24,7 +24,7 @@ include Config -VER = 7.73.0 +VER = 7.75.0 THISAPP = curl-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = d7df02d3b78b625fee4dd765808a6eb6 +$(DL_FILE)_MD5 = 9730df8636d67b4e256ebc49daf27246 install : $(TARGET) diff --git a/lfs/dbus b/lfs/dbus index f1fbdade4..06431b4b5 100644 --- a/lfs/dbus +++ b/lfs/dbus @@ -24,7 +24,7 @@ include Config -VER = 1.11.12 +VER = 1.12.20 THISAPP = dbus-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = dbus -PAK_VER = 2 +PAK_VER = 3 DEPS = @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 76cdf92ca208652ee487b1e9dfda1093 +$(DL_FILE)_MD5 = dfe8a71f412e0b53be26ed4fbfdc91c4 install : $(TARGET) diff --git a/lfs/ddns b/lfs/ddns index 2a6dbca2b..98b374ed1 100644 --- a/lfs/ddns +++ b/lfs/ddns @@ -75,6 +75,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ddns-013-dyfi-use-https.patch cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ddns-013-ddnss-fix-unhandled-exeption-on-update-patch cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ddns-013-duckdns-new-api.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ddns-013-add-option-to-list-token-provider.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ddns-013-proper-encode-string.patch cd $(DIR_APP) && [ -x "configure" ] || sh ./autogen.sh cd $(DIR_APP) && ./configure \ diff --git a/lfs/ddrescue b/lfs/ddrescue index f30a5edb5..3c45896e9 100644 --- a/lfs/ddrescue +++ b/lfs/ddrescue @@ -24,14 +24,14 @@ include Config -VER = 1.12 +VER = 1.25 THISAPP = ddrescue-$(VER) -DL_FILE = $(THISAPP).tar.gz +DL_FILE = $(THISAPP).tar.lz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = ddrescue -PAK_VER = 1 +PAK_VER = 2 DEPS = @@ -43,7 +43,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = b3d8a9a9098b87939fba05a45848bd8d +$(DL_FILE)_MD5 = 99fd7a28bf9953d88534c7ee9ab5bd2a install : $(TARGET) @@ -76,7 +76,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure --prefix=/usr cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/lfs/dehydrated b/lfs/dehydrated index 34b938c13..c2c3a9e00 100644 --- a/lfs/dehydrated +++ b/lfs/dehydrated @@ -24,7 +24,7 @@ include Config -VER = 0.6.5 +VER = 0.7.0 THISAPP = dehydrated-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = dehydrated -PAK_VER = 3 +PAK_VER = 4 DEPS = @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = cedf07369517c317c4e1075540b94699 +$(DL_FILE)_MD5 = a23c9f7a475b9d690e788ee13dd8f14a install : $(TARGET) diff --git a/lfs/dhcpcd b/lfs/dhcpcd index 3bd33dc56..4e34e19d5 100644 --- a/lfs/dhcpcd +++ b/lfs/dhcpcd @@ -24,7 +24,7 @@ include Config -VER = 9.1.4 +VER = 9.3.4 THISAPP = dhcpcd-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = dd77711cf3232002bb075f5210269f88 +$(DL_FILE)_MD5 = badb02dfc69fe9bbeec35a02efcdb4db install : $(TARGET) @@ -70,6 +70,9 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dhcpcd/01_Fix_Linux_i386_for_SECCOMP_as_it_just_uses_socketcall.patch + cd $(DIR_APP) && ./configure --prefix="" --sysconfdir=/var/ipfire/dhcpc \ --dbdir=/var/ipfire/dhcpc \ --libexecdir=/var/ipfire/dhcpc \ diff --git a/lfs/dma b/lfs/dma index aceb2704e..78bb6465f 100644 --- a/lfs/dma +++ b/lfs/dma @@ -24,7 +24,7 @@ include Config -VER = 0.12 +VER = 0.13 THISAPP = dma-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 58cb2a286995381c92dc557e639622d6 +$(DL_FILE)_MD5 = 8bf824b065295a594f399c8b96663673 install : $(TARGET) diff --git a/lfs/dracut b/lfs/dracut index a6a6f1f23..c4f7231b1 100644 --- a/lfs/dracut +++ b/lfs/dracut @@ -71,7 +71,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dracut-038-always-enable-mdraid.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dracut-038_add_sdhci-pci.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dracut-038_add_hyperv-keyboard_and_sdhci-pci.patch cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install sbindir=/sbin sysconfdir=/etc diff --git a/lfs/elfutils b/lfs/elfutils index 3170d9b1e..19311d7aa 100644 --- a/lfs/elfutils +++ b/lfs/elfutils @@ -24,7 +24,7 @@ include Config -VER = 0.176 +VER = 0.182 THISAPP = elfutils-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = elfutils -PAK_VER = 2 +PAK_VER = 3 DEPS = @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 077e4f49320cad82bf17a997068b1db9 +$(DL_FILE)_MD5 = ebd95e1858280095fd60d0f765d50fef install : $(TARGET) @@ -77,7 +77,10 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --disable-debuginfod \ + --disable-libdebuginfod cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) diff --git a/lfs/etherwake b/lfs/etherwake index c133ed12a..3aa961ce2 100644 --- a/lfs/etherwake +++ b/lfs/etherwake @@ -72,5 +72,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_APP) && make install + + # Allow execution by other users than root + setcap cap_net_raw+ep /usr/sbin/etherwake + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/fcron b/lfs/fcron index 8e39dc6be..97f67e5cc 100644 --- a/lfs/fcron +++ b/lfs/fcron @@ -24,7 +24,7 @@ include Config -VER = 3.2.0 +VER = 3.2.1 THISAPP = fcron-$(VER) DL_FILE = $(THISAPP).src.tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 4b031c2fba32a98fa814d1557158b0e9 +$(DL_FILE)_MD5 = bd4996e941a40327d11efc5e3fd1f839 install : $(TARGET) diff --git a/lfs/findutils b/lfs/findutils index 1ec69c99a..0b2753dc1 100644 --- a/lfs/findutils +++ b/lfs/findutils @@ -24,10 +24,10 @@ include Config -VER = 4.6.0 +VER = 4.8.0 THISAPP = findutils-$(VER) -DL_FILE = $(THISAPP).tar.gz +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) @@ -50,7 +50,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 9936aa8009438ce185bea2694a997fc1 +$(DL_FILE)_MD5 = eeefe2e6380931a77dfa6d9350b43186 install : $(TARGET) @@ -79,14 +79,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - - # Newer C libraries omit this include from sys/types.h. - # https://lists.gnu.org/archive/html/bug-gnulib/2016-03/msg00018.html - cd $(DIR_APP) && sed -i gl/lib/mountlist.c \ - -e "/include.*config.h/a#ifdef MAJOR_IN_SYSMACROS\n#include <sys/sysmacros.h>\n#endif\n" - - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/findutils-4.6.0-glibc2.28.patch + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure $(EXTRA_CONFIG) cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/lfs/fireperf b/lfs/fireperf new file mode 100644 index 000000000..bb88d290e --- /dev/null +++ b/lfs/fireperf @@ -0,0 +1,85 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2021 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 # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 0.1.0 + +THISAPP = fireperf-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = fireperf +PAK_VER = 1 + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = https://source.ipfire.org/releases/fireperf/$(DL_FILE) + +$(DL_FILE)_MD5 = 1388fd154cfeab52608f81816c5bed96 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xvf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./autogen.sh + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --disable-man-pages + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/firmware-update b/lfs/firmware-update index 2fe4622db..bce9c4404 100644 --- a/lfs/firmware-update +++ b/lfs/firmware-update @@ -24,7 +24,7 @@ include Config -VER = 20190329 +VER = 20210107 THISAPP = firmware-update-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = https://source.ipfire.org/releases/firmware-update/ DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = firmware-update -PAK_VER = 1 +PAK_VER = 2 DEPS = flashrom @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 493f6d678bd9d3c7f35b25256e423ad2 +$(DL_FILE)_MD5 = 581d8b5784c3ebbc335ae034fd70c5a6 install : $(TARGET) diff --git a/lfs/flash-images b/lfs/flash-images index 5f39c488f..9fd925055 100644 --- a/lfs/flash-images +++ b/lfs/flash-images @@ -152,9 +152,9 @@ endif # Install IPFire ifneq "$(BUILD_PLATFORM)" "arm" - tar -x --xz -C $(MNThdd)/ -f $(DIR_TMP)/cdrom/distro.img + tar $(TAR_OPTIONS) -x --xz -C $(MNThdd)/ -f $(DIR_TMP)/cdrom/distro.img else - tar -x -C $(MNThdd)/ -f $(DIR_TMP)/cdrom/distro.img + tar $(TAR_OPTIONS) -x -C $(MNThdd)/ -f $(DIR_TMP)/cdrom/distro.img endif -touch $(MNThdd)/lib/modules/$(KVER)-ipfire/modules.dep mkdir $(MNThdd)/proc diff --git a/lfs/flashrom b/lfs/flashrom index d3ae0a487..e770cfcf0 100644 --- a/lfs/flashrom +++ b/lfs/flashrom @@ -24,7 +24,7 @@ include Config -VER = 1.0.1 +VER = 1.2 THISAPP = flashrom-v$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -32,7 +32,8 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = flashrom -PAK_VER = 1 +PAK_VER = 2 +SUP_ARCH = i586 x86_64 DEPS = @@ -44,7 +45,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 6a108a81db229016abd7f5397da39255 +$(DL_FILE)_MD5 = 7f8e4b87087eb12ecee0fcc5445b4956 install : $(TARGET) diff --git a/lfs/fuse b/lfs/fuse index db649a880..167612f68 100644 --- a/lfs/fuse +++ b/lfs/fuse @@ -24,10 +24,10 @@ include Config -VER = 2.9.7 +VER = 3.10.1 THISAPP = fuse-$(VER) -DL_FILE = $(THISAPP).tar.gz +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 9bd4ce8184745fd3d000ca2692adacdb +$(DL_FILE)_MD5 = e973012119e98b048307558271b5b296 install : $(TARGET) @@ -72,12 +72,14 @@ $(subst %,%_MD5,$(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 < $(DIR_SRC)/src/patches/fuse-2.9.2-namespace-conflict-fix.patch - cd $(DIR_APP) && ./configure \ - --prefix=/usr + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && meson --prefix=/usr builddir && cd builddir && ninja && ninja install + + # Move mount.fuse3 to same location as mount.fuse was in previous version + mv -v /usr/sbin/mount.fuse3 /sbin + + # Move 99-fuse3 rules to same udev location as in previous version of fuse + mv -v /lib/udev/rules.d/99-fuse3.rules /etc/udev/rules.d - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/hostapd b/lfs/hostapd index f70d09f4b..e6b92db3a 100644 --- a/lfs/hostapd +++ b/lfs/hostapd @@ -24,15 +24,15 @@ include Config -VER = 2.9 +VER = 581dfcc THISAPP = hostapd-$(VER) DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) +DIR_APP = $(DIR_SRC)/hostap-$(VER) TARGET = $(DIR_INFO)/$(THISAPP) PROG = hostapd -PAK_VER = 52 +PAK_VER = 54 DEPS = @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = f188fc53a495fe7af3b6d77d3c31dee8 +$(DL_FILE)_MD5 = eed922f2daabe16d74adf2b23455d8bd install : $(TARGET) @@ -83,7 +83,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP)/hostapd && cp $(DIR_SRC)/config/hostapd/config ./.config cd $(DIR_APP)/hostapd && sed -e "s@/usr/local@/usr@g" -i Makefile - cd $(DIR_APP)/hostapd && make $(MAKETUNING) $(EXTRA_MAKE) + cd $(DIR_APP)/hostapd && make $(MAKETUNING) cd $(DIR_APP)/hostapd && make install install -v -m 644 $(DIR_SRC)/config/backup/includes/hostapd /var/ipfire/backup/addons/includes/hostapd # install initscript diff --git a/lfs/hplip b/lfs/hplip index 8b16f1eb4..ee9c4d460 100644 --- a/lfs/hplip +++ b/lfs/hplip @@ -24,7 +24,7 @@ include Config -VER = 3.18.6 +VER = 3.20.11 THISAPP = hplip-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = hplip -PAK_VER = 3 +PAK_VER = 4 DEPS = @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 3857eae76c49c00fa185628d4dce7d61 +$(DL_FILE)_MD5 = dbd44f63450424eea293fccea0589d33 install : $(TARGET) diff --git a/lfs/htop b/lfs/htop index 8bf588be9..0dfdf011f 100644 --- a/lfs/htop +++ b/lfs/htop @@ -24,7 +24,7 @@ include Config -VER = 3.0.2 +VER = 3.0.5 THISAPP = htop-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = htop -PAK_VER = 13 +PAK_VER = 16 DEPS = @@ -46,7 +46,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = fb848a1c91871d134c785bccb560ca8d +$(DL_FILE)_MD5 = 780b79322cfc576a762c2dadb5575d04 install : $(TARGET) diff --git a/lfs/hyperscan b/lfs/hyperscan index 96979c718..f89b20224 100644 --- a/lfs/hyperscan +++ b/lfs/hyperscan @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2021 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 # @@ -24,7 +24,7 @@ include Config -VER = 5.3.0 +VER = 5.4.0 THISAPP = hyperscan-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -46,7 +46,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 6acab4b242dd81b3cede211d4a9e7101 +$(DL_FILE)_MD5 = 65e08385038c24470a248f6ff2fa379b install : $(TARGET) @@ -76,6 +76,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && cmake . \ -DCMAKE_INSTALL_PREFIX:PATH=/usr \ -DBUILD_SHARED_LIBS:BOOL=ON \ diff --git a/lfs/iperf b/lfs/iperf index 4614fba3e..3cc7733b8 100644 --- a/lfs/iperf +++ b/lfs/iperf @@ -24,7 +24,7 @@ include Config -VER = 2.0.13 +VER = 2.0.14a THISAPP = iperf-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = iperf -PAK_VER = 4 +PAK_VER = 5 DEPS = @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 31ea1c6d5cbf80b16ff3abe4288dad5e +$(DL_FILE)_MD5 = 323a68e3668bc3e4afcc90adefeb238f install : $(TARGET) diff --git a/lfs/iperf3 b/lfs/iperf3 index 69b1ed14a..96b1e264d 100644 --- a/lfs/iperf3 +++ b/lfs/iperf3 @@ -24,7 +24,7 @@ include Config -VER = 3.7 +VER = 3.9 THISAPP = iperf-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = iperf3 -PAK_VER = 2 +PAK_VER = 3 DEPS = @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 9534aae7430791b46d8cb8fc44afb6f8 +$(DL_FILE)_MD5 = 510fdb0943e88da5e0063f4599fa14f3 install : $(TARGET) check : $(patsubst %,$(DIR_CHK)/%,$(objects)) @@ -76,7 +76,7 @@ $(subst %,%_MD5,$(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/iperf3/iperf-3.7-remove-pg-flag.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/iperf3/iperf-3.9-remove-pg-flag.patch cd $(DIR_APP) && ./configure --prefix=/usr cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_APP) && make install diff --git a/lfs/iproute2 b/lfs/iproute2 index 53fd4a59e..27e246d23 100644 --- a/lfs/iproute2 +++ b/lfs/iproute2 @@ -24,7 +24,7 @@ include Config -VER = 5.8.0 +VER = 5.10.0 THISAPP = iproute2-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = e2016acc07d91b2508916c459a8435af +$(DL_FILE)_MD5 = 19ffea480a21e600453776b7225f3319 install : $(TARGET) diff --git a/lfs/ipset b/lfs/ipset index 1f6f47d2a..65d5cdc59 100644 --- a/lfs/ipset +++ b/lfs/ipset @@ -24,7 +24,7 @@ include Config -VER = 7.6 +VER = 7.10 THISAPP = ipset-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = e107b679c3256af795261cece864d6d9 +$(DL_FILE)_MD5 = 1f500b5300184964cbacc3cbca6e5bb1 install : $(TARGET) diff --git a/lfs/iptables b/lfs/iptables index afe452f10..7b0d0b637 100644 --- a/lfs/iptables +++ b/lfs/iptables @@ -24,7 +24,7 @@ include Config -VER = 1.8.5 +VER = 1.8.7 THISAPP = iptables-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -41,7 +41,7 @@ objects = $(DL_FILE) \ $(DL_FILE) = $(DL_FROM)/$(DL_FILE) netfilter-layer7-v2.23.tar.gz = $(URL_IPFIRE)/netfilter-layer7-v2.23.tar.gz -$(DL_FILE)_MD5 = 42cfa96d4ac5eb93ee7ed8dd85cfe8fb +$(DL_FILE)_MD5 = 602ba7e937c72fbb7b1c2b71c3b0004b netfilter-layer7-v2.23.tar.gz_MD5 = 10910b6173d18e426cb56ae7e1300eeb install : $(TARGET) diff --git a/lfs/iw b/lfs/iw index 279457f53..18cf3a24a 100644 --- a/lfs/iw +++ b/lfs/iw @@ -24,7 +24,7 @@ include Config -VER = 4.14 +VER = 5.9 THISAPP = iw-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 9e6bb70ae4f19283e921fc59c6079556 +$(DL_FILE)_MD5 = 7a47d6f749ec69afcaf351166fd12f6f install : $(TARGET) diff --git a/lfs/kmod b/lfs/kmod index 39e350c02..3d9acd899 100644 --- a/lfs/kmod +++ b/lfs/kmod @@ -24,7 +24,7 @@ include Config -VER = 26 +VER = 28 THISAPP = kmod-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 1129c243199bdd7db01b55a61aa19601 +$(DL_FILE)_MD5 = 0a2b887b1b3dfb8c0b3f41f598203e56 install : $(TARGET) @@ -77,7 +77,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --disable-manpages \ --with-openssl \ --with-xz \ - --with-zlib + --with-zlib \ + --with-zstd cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/lfs/knot b/lfs/knot index 4bb8dcbf0..39940a358 100644 --- a/lfs/knot +++ b/lfs/knot @@ -24,7 +24,7 @@ include Config -VER = 3.0.2 +VER = 3.0.4 THISAPP = knot-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = c4e18bd1e595cffb185a042522985dec +$(DL_FILE)_MD5 = c0a546927ff50db153893de43758cb37 install : $(TARGET) @@ -73,13 +73,13 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure \ - --prefix=/usr \ - --enable-static=no \ - --disable-fastparser \ - --disable-daemon \ - --disable-modules \ - --enable-maxminddb=no \ + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --enable-static=no \ + --disable-fastparser \ + --disable-daemon \ + --disable-modules \ + --enable-maxminddb=no \ --disable-documentation cd $(DIR_APP)/src && make $(MAKETUNING) kdig diff --git a/lfs/krb5 b/lfs/krb5 index 4ab342c01..766dc8d05 100644 --- a/lfs/krb5 +++ b/lfs/krb5 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2020 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 # @@ -24,7 +24,7 @@ include Config -VER = 1.15.2 +VER = 1.18.3 THISAPP = krb5-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP)/src TARGET = $(DIR_INFO)/$(THISAPP) PROG = krb5 -PAK_VER = 3 +PAK_VER = 4 DEPS = @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = b160f72161c730897dc7689f876b6e2a +$(DL_FILE)_MD5 = a64e8018a7572e0b4bd477c745129ffc install : $(TARGET) @@ -78,10 +78,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_SRC)/$(THISAPP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && sed -e "s@python2.5/Python.h@& python2.7/Python.h@g" \ - -e "s@-lpython2.5]@&,\n AC_CHECK_LIB(python2.7,main,[PYTHON_LIB=-lpython2.7])@g" \ - -i configure.in - cd $(DIR_APP) && autoconf + cd $(DIR_APP) && patch -Np2 -i $(DIR_SRC)/src/patches/krb5-1.18.3_prevent_spurious_text.patch + cd $(DIR_APP) && patch -Np2 -i $(DIR_SRC)/src/patches/krb5-1.18.3_remove_known_failed_test.patch cd $(DIR_APP) && ./configure \ --prefix=/usr \ diff --git a/lfs/less b/lfs/less index 2b4534214..4d6cf4877 100644 --- a/lfs/less +++ b/lfs/less @@ -24,7 +24,7 @@ include Config -VER = 530 +VER = 563 THISAPP = less-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 6a39bccf420c946b0fd7ffc64961315b +$(DL_FILE)_MD5 = 1ee44fa71447a845f6eef5b3f38d2781 install : $(TARGET) diff --git a/lfs/libassuan b/lfs/libassuan index 16619ae63..7aeadf9bb 100644 --- a/lfs/libassuan +++ b/lfs/libassuan @@ -24,7 +24,7 @@ include Config -VER = 2.5.3 +VER = 2.5.4 THISAPP = libassuan-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = libassuan -PAK_VER = 5 +PAK_VER = 6 DEPS = @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 226c504ea78a232224bf3b6846b3adb9 +$(DL_FILE)_MD5 = d5cee3492f0e0c4fd537af798621dd5b install : $(TARGET) diff --git a/lfs/libgcrypt b/lfs/libgcrypt index a89cc9156..a901c558f 100644 --- a/lfs/libgcrypt +++ b/lfs/libgcrypt @@ -24,7 +24,7 @@ include Config -VER = 1.8.6 +VER = 1.9.1 THISAPP = libgcrypt-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = e9dfc1e789a2a42f36917c543fcd7862 +$(DL_FILE)_MD5 = 8805f3e466af315222b6e1864f52b79a install : $(TARGET) diff --git a/lfs/libgpg-error b/lfs/libgpg-error index c8d85c3a7..05fb715d0 100644 --- a/lfs/libgpg-error +++ b/lfs/libgpg-error @@ -24,7 +24,7 @@ include Config -VER = 1.38 +VER = 1.41 THISAPP = libgpg-error-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = f164ce3400c820907965fdc53e43acfc +$(DL_FILE)_MD5 = 36e9e7e6fffefac1eae5a1a49f14ac4f install : $(TARGET) diff --git a/lfs/libloc b/lfs/libloc index 010ddf1cb..ac0aecb3b 100644 --- a/lfs/libloc +++ b/lfs/libloc @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2021 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 # @@ -24,8 +24,8 @@ include Config -VER = 0.9.4 -DB_DATE = 2020-09-21 +VER = 0.9.5 +DB_DATE = 2021-01-28 THISAPP = libloc-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,11 +40,11 @@ TARGET = $(DIR_INFO)/$(THISAPP) objects = $(DL_FILE) \ location-$(DB_DATE).db.xz -$(DL_FILE) = https://source.ipfire.org/releases/libloc//$(DL_FILE) +$(DL_FILE) = https://source.ipfire.org/releases/libloc/$(DL_FILE) location-$(DB_DATE).db.xz = https://location.ipfire.org/databases/1/archive/location-$(DB_DATE).db.xz -$(DL_FILE)_MD5 = 82770e9eba20f636c96e6fa42ff234b5 -location-$(DB_DATE).db.xz_MD5 = fa3069bf31170629d638317e283913c0 +$(DL_FILE)_MD5 = 41d8dc3fb4e498db958b7696cadd61f5 +location-$(DB_DATE).db.xz_MD5 = f1814a144e22c9386aea00fa01992719 install : $(TARGET) @@ -78,8 +78,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xvf $(DIR_DL)/$(DL_FILE) - # Import changes from upstream - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/libloc-0.9.4-upstream.patch + # Import recent patches from upstream + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/libloc-0.9.5-location-Fix-list-networks-by-as.patch # Add patch for i586 to disable strong stack protector. ifeq "$(BUILD_ARCH)" "i586" diff --git a/lfs/libseccomp b/lfs/libseccomp index b04fda5de..38d7a7dde 100644 --- a/lfs/libseccomp +++ b/lfs/libseccomp @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2021 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 # @@ -24,7 +24,7 @@ include Config -VER = 2.4.4 +VER = 2.5.1 THISAPP = libseccomp-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = libseccomp -PAK_VER = 4 +PAK_VER = 5 DEPS = @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 05013a9e372f822f41ac4cb3f18703c0 +$(DL_FILE)_MD5 = 59f5563c532d3fa1df9db0516b36b1cd install : $(TARGET) diff --git a/lfs/logrotate b/lfs/logrotate index 45a0d47e2..cc6f07fa3 100644 --- a/lfs/logrotate +++ b/lfs/logrotate @@ -24,7 +24,7 @@ include Config -VER = 3.17.0 +VER = 3.18.0 THISAPP = logrotate-$(VER) DL_FILE = logrotate-$(VER).tar.gz @@ -42,7 +42,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 6bd4d3102ae9c86d37e46ca93bcffa66 +$(DL_FILE)_MD5 = f8ad01f87865cd7b80136eccf16ba4a1 install : $(TARGET) diff --git a/lfs/logwatch b/lfs/logwatch index 7aa145121..8baaef2ce 100644 --- a/lfs/logwatch +++ b/lfs/logwatch @@ -24,7 +24,7 @@ include Config -VER = 7.5.4 +VER = 7.5.5 THISAPP = logwatch-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 47b35a8e5efc415b4a775415255b8d1f +$(DL_FILE)_MD5 = b658e4db27d905151396ecadcbcb24b1 install : $(TARGET) @@ -73,7 +73,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && sed -e "s/^TEMPDIR=.*/TEMPDIR=\"\/tmp\"/g" -i install_logwatch.sh cd $(DIR_APP)/lib && patch < $(DIR_SRC)/src/patches/logwatch/logwatch-7.3.6-date_manip6.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/logwatch/logwatch-7.5.4-dhcpd_reuse_lease_entries.patch cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/logwatch/logwatch-7.5.4-disable_iptables.patch @cd $(DIR_APP) && chmod 755 install_logwatch.sh diff --git a/lfs/lvm2 b/lfs/lvm2 index a9e02b692..9b19c1d14 100644 --- a/lfs/lvm2 +++ b/lfs/lvm2 @@ -24,7 +24,7 @@ include Config -VER = 2.02.181 +VER = 2.02.187 THISAPP = LVM2.$(VER) DL_FILE = $(THISAPP).tgz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 7d6380d9a34981fd7b605eaa371295b3 +$(DL_FILE)_MD5 = 7941cbe16126ef334b4aa8fcb5c985b5 install : $(TARGET) diff --git a/lfs/lynis b/lfs/lynis index 7dc807781..1ae501603 100644 --- a/lfs/lynis +++ b/lfs/lynis @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2021 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 # @@ -24,16 +24,16 @@ include Config -VER = 3.0.1 +VER = 3.0.3 THISAPP = lynis-$(VER) DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/lynis +DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = lynis -PAK_VER = 8 +PAK_VER = 9 DEPS = ############################################################################### @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = ac984258e89b88c86e8c1c5395de8a15 +$(DL_FILE)_MD5 = d5c7cdbab15029449fe5ef4b59ee941d install : $(TARGET) @@ -77,7 +77,7 @@ dist: $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && rm -rf {dev,CHANGELOG,README,INSTALL,TODO,FAQ,LICENSE} - cp -vrf $(DIR_APP) /var/ipfire/ + cd $(DIR_APP) && rm -rf .git* .travis.yml *.md FAQ INSTALL LICENCE lynis.8 README + cp -vrf $(DIR_APP) /var/ipfire/lynis @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/lzip b/lfs/lzip new file mode 100644 index 000000000..d0a982590 --- /dev/null +++ b/lfs/lzip @@ -0,0 +1,82 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2020 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 # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.22 + +THISAPP = lzip-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) + +ifeq "$(ROOT)" "" + TARGET = $(DIR_INFO)/$(THISAPP) +else + TARGET = $(DIR_INFO)/$(THISAPP)-tools +endif + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = f062faf68595d594a28fade73a43c001 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=$(PREFIX) + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/meson b/lfs/meson new file mode 100644 index 000000000..13c8c8c46 --- /dev/null +++ b/lfs/meson @@ -0,0 +1,80 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2018 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 # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 0.56.0 + +THISAPP = meson-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 67ce2c0c3eab1b8ee9ddaa1c5143e7c0 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && python3 setup.py build + + cd $(DIR_APP) && python3 setup.py install --root=dest + cd $(DIR_APP) && cp -rv dest/* / + + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/minicom b/lfs/minicom index 154c31984..7e6ec7586 100644 --- a/lfs/minicom +++ b/lfs/minicom @@ -24,7 +24,7 @@ include Config -VER = 2.7.1 +VER = 2.8 THISAPP = minicom-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = minicom -PAK_VER = 1 +PAK_VER = 2 DEPS = @@ -46,7 +46,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 9021cb8c5445f6e6e74b2acc39962d62 +$(DL_FILE)_MD5 = dd71fa302ae822a8e73dcfe5bccc8dca install : $(TARGET) diff --git a/lfs/monit b/lfs/monit index 99750370a..caaa022e2 100644 --- a/lfs/monit +++ b/lfs/monit @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2019 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2020 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 # @@ -24,7 +24,7 @@ include Config -VER = 5.25.3 +VER = 5.27.1 THISAPP = monit-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = monit -PAK_VER = 11 +PAK_VER = 12 DEPS = @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 8d91f6e756cca42450ab0815b3086d5b +$(DL_FILE)_MD5 = 200068f37847e3402f6a9b061c2d327e install : $(TARGET) @@ -54,7 +54,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/nano b/lfs/nano index 36a1e25d9..a9fa2a1d9 100644 --- a/lfs/nano +++ b/lfs/nano @@ -24,7 +24,7 @@ include Config -VER = 5.3 +VER = 5.5 THISAPP = nano-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = nano -PAK_VER = 33 +PAK_VER = 35 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 0ff50c2d3068c6ce9e77b1f6a485eb19 +$(DL_FILE)_MD5 = 145bc1ae94e25bd4f9168b7c56fee984 install : $(TARGET) diff --git a/lfs/newt b/lfs/newt index 735df459b..d7ba62866 100644 --- a/lfs/newt +++ b/lfs/newt @@ -24,7 +24,7 @@ include Config -VER = 0.52.18 +VER = 0.52.21 THISAPP = newt-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 685721bee1a318570704b19dcf31d268 +$(DL_FILE)_MD5 = a0a5fd6b53bb167a65e15996b249ebb5 install : $(TARGET) diff --git a/lfs/ninja b/lfs/ninja new file mode 100644 index 000000000..ed9f8b778 --- /dev/null +++ b/lfs/ninja @@ -0,0 +1,92 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2018 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 # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.10.2 + +THISAPP = ninja-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 639f75bc2e3b19ab893eaf2c810d4eb4 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + # Allow to limit the paralell build processes ninja will do. + cd $(DIR_APP) && sed -i '/int Guess/a \ + int j = 0;\ + char* jobs = getenv( "NINJAJOBS" );\ + if ( jobs != NULL ) j = atoi( jobs );\ + if ( j > 0 ) return j;\ + ' src/ninja.cc + + # Configure and bootstrap the build environment + cd $(DIR_APP) && python3 configure.py --bootstrap --verbose + + # Build ninja + cd $(DIR_APP) && ./ninja -v all + + # Install ninja. + cd $(DIR_APP) && install -vm755 ninja /usr/bin/ + + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/pam b/lfs/pam index d5ce5ef69..daae2def3 100644 --- a/lfs/pam +++ b/lfs/pam @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2019 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2020 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 # @@ -24,7 +24,7 @@ include Config -VER = 1.3.1 +VER = 1.5.1 THISAPP = Linux-PAM-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 558ff53b0fc0563ca97f79e911822165 +$(DL_FILE)_MD5 = 155f2a31d07077b2c63a1f135876c31b install : $(TARGET) diff --git a/lfs/postfix b/lfs/postfix index 56b3aaaec..628704152 100644 --- a/lfs/postfix +++ b/lfs/postfix @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2021 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 # @@ -24,7 +24,7 @@ include Config -VER = 3.5.7 +VER = 3.5.9 THISAPP = postfix-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = postfix -PAK_VER = 27 +PAK_VER = 29 DEPS = @@ -66,7 +66,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = cc727f7a332765199ce67bf14753ff08 +$(DL_FILE)_MD5 = a4d1b2df03a500cf8f9759d5fca1c1f6 install : $(TARGET) diff --git a/lfs/pptp b/lfs/pptp index 850573810..91165bab7 100644 --- a/lfs/pptp +++ b/lfs/pptp @@ -24,7 +24,7 @@ include Config -VER = 1.7.2 +VER = 1.10.0 THISAPP = pptp-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 4c3d19286a37459a632c7128c92a9857 +$(DL_FILE)_MD5 = 8d25341352fdae5ad5b36b9f18254908 install : $(TARGET) @@ -70,7 +70,6 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/pptp-1.7.2-compat.patch cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) diff --git a/lfs/procps b/lfs/procps index 4807f5210..4667917c8 100644 --- a/lfs/procps +++ b/lfs/procps @@ -24,7 +24,7 @@ include Config -VER = 3.2.8 +VER = v3.3.16 THISAPP = procps-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 9532714b6846013ca9898984ba4cd7e0 +$(DL_FILE)_MD5 = 2af440d54f94a3b44020bf0ea1bf9de8 install : $(TARGET) @@ -70,9 +70,17 @@ $(subst %,%_MD5,$(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 < $(DIR_SRC)/src/patches/$(THISAPP)-fix_unknown_HZ_value.patch - cd $(DIR_APP) && make $(MAKETUNING) LIBPROC=proc/libproc-$(VER).so + cd $(DIR_APP) && ./autogen.sh + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --libdir=/lib + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install install -m 0644 $(DIR_SRC)/config/etc/sysctl.conf /etc + + # Move some tools to /bin & /sbin + mv -v /usr/bin/{kill,ps} /bin + mv -v /usr/sbin/sysctl /sbin + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/qemu b/lfs/qemu index edd7a78a9..2ab1bf8c0 100644 --- a/lfs/qemu +++ b/lfs/qemu @@ -24,7 +24,7 @@ include Config -VER = 5.0.0 +VER = 5.2.0 THISAPP = qemu-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -33,7 +33,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) SUP_ARCH = i586 x86_64 PROG = qemu -PAK_VER = 28 +PAK_VER = 29 DEPS = libusbredir spice libseccomp @@ -45,7 +45,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = ede6005d7143fe994dd089d31dc2cf6c +$(DL_FILE)_MD5 = 179f86928835da857c237b42f4b2df73 install : $(TARGET) @@ -78,9 +78,6 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - -# cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/qemu-4.1.0-build-fix-glibc-2.31.patch - cd $(DIR_APP) && ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/lfs/samba b/lfs/samba index f57a04737..d218ecf38 100644 --- a/lfs/samba +++ b/lfs/samba @@ -24,7 +24,7 @@ include Config -VER = 4.13.1 +VER = 4.13.4 THISAPP = samba-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = samba -PAK_VER = 75 +PAK_VER = 76 DEPS = avahi cups libtirpc krb5 perl-Parse-Yapp @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = d9243ab374897ba91aa3eb7354e83553 +$(DL_FILE)_MD5 = ba89901019e05585f9511f52a4667d4f install : $(TARGET) @@ -114,6 +114,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) mkdir -p /var/spool/samba chmod -v 1777 /var/spool/samba/ + # Install password change helper script + install -m 755 $(DIR_SRC)/config/samba/samba-change-password /usr/sbin/samba-change-password + #install initscripts $(call INSTALL_INITSCRIPT,samba) diff --git a/lfs/screen b/lfs/screen index eb56ace7c..33102615a 100644 --- a/lfs/screen +++ b/lfs/screen @@ -24,7 +24,7 @@ include Config -VER = 4.2.1 +VER = 4.8.0 THISAPP = screen-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 419a0594e2b25039239af8b90eda7d92 +$(DL_FILE)_MD5 = d276213d3acd10339cd37848b8c4ab1e install : $(TARGET) @@ -70,8 +70,6 @@ $(subst %,%_MD5,$(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 < $(DIR_SRC)/src/patches/screen-4.2.1-cpation-hardstatus.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/screen-4.2.1-altscreen.patch cd $(DIR_APP) && ./configure --prefix=/usr --with-socket-dir=/var/run/screen --with-sys-screenrc=/etc/screenrc cd $(DIR_APP) && sed -i -e "s%/usr/local/etc/screenrc%/etc/screenrc%" {etc,doc}/* cd $(DIR_APP) && make $(MAKETUNING) diff --git a/lfs/sed b/lfs/sed index 9123183e3..9c5b33e4a 100644 --- a/lfs/sed +++ b/lfs/sed @@ -24,7 +24,7 @@ include Config -VER = 4.4 +VER = 4.8 THISAPP = sed-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -53,7 +53,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = e0c583d4c380059abd818cd540fe6938 +$(DL_FILE)_MD5 = 6d906edfdb3202304059233f51f9a71d install : $(TARGET) diff --git a/lfs/shairport-sync b/lfs/shairport-sync index e3bf9935d..6ec986bbe 100644 --- a/lfs/shairport-sync +++ b/lfs/shairport-sync @@ -24,7 +24,7 @@ include Config -VER = 3.3.6 +VER = 3.3.7 THISAPP = shairport-sync-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = shairport-sync -PAK_VER = 4 +PAK_VER = 5 DEPS = alac alsa avahi libdaemon soxr @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 769c6d0cc660567e5521467d79ee9939 +$(DL_FILE)_MD5 = 5f4206ac28e323fda3c150575eb64e15 install : $(TARGET) diff --git a/lfs/sqlite b/lfs/sqlite index 8f02634cd..b2e1b6d3b 100644 --- a/lfs/sqlite +++ b/lfs/sqlite @@ -24,7 +24,7 @@ include Config -VER = 3260000 +VER = 3340000 THISAPP = sqlite-autoconf-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = ac2b3b8cd3a97600e36fb8e756e8dda1 +$(DL_FILE)_MD5 = 7f33c9db7b713957fcb9271fe9049fef install : $(TARGET) diff --git a/lfs/sshfs b/lfs/sshfs index 23fbd18ca..1e7706194 100644 --- a/lfs/sshfs +++ b/lfs/sshfs @@ -24,10 +24,10 @@ include Config -VER = 2.2 +VER = 3.7.1 -THISAPP = sshfs-fuse-$(VER) -DL_FILE = $(THISAPP).tar.gz +THISAPP = sshfs-$(VER) +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 26e9206eb5169e87e6f95f54bc005a4f +$(DL_FILE)_MD5 = 22ac23d05ca7c56fb568627f086374d0 install : $(TARGET) @@ -72,9 +72,7 @@ $(subst %,%_MD5,$(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 - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && meson --prefix=/usr builddir && cd builddir && ninja && ninja install @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/strace b/lfs/strace index ec26bd299..c6ea35876 100644 --- a/lfs/strace +++ b/lfs/strace @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2021 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 # @@ -24,7 +24,7 @@ include Config -VER = 5.5 +VER = 5.10 SUP_ARCHES = x86_64 i586 armv5tel THISAPP = strace-$(VER) @@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = strace -PAK_VER = 3 +PAK_VER = 4 DEPS = elfutils @@ -45,7 +45,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = dbce2e84632b39a4ed86b9fc60447af9 +$(DL_FILE)_MD5 = 5f9f87f9afa282e7512f67a129287d6c install : $(TARGET) diff --git a/lfs/stunnel b/lfs/stunnel index 1ddb2a963..eab56e721 100644 --- a/lfs/stunnel +++ b/lfs/stunnel @@ -24,7 +24,7 @@ include Config -VER = 5.56 +VER = 5.57 THISAPP = stunnel-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = stunnel -PAK_VER = 5 +PAK_VER = 6 DEPS = @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 01b0ca9e071f582ff803a85d5ed72166 +$(DL_FILE)_MD5 = 6bbe921f8d2ab4967dc7ff42f6e5d45a install : $(TARGET) diff --git a/lfs/sudo b/lfs/sudo index 066a29fa0..bb2279e8f 100644 --- a/lfs/sudo +++ b/lfs/sudo @@ -24,7 +24,7 @@ include Config -VER = 1.8.10p3 +VER = 1.9.5p2 THISAPP = sudo-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = fcd8d0d9f9f0397d076ee901e242ed39 +$(DL_FILE)_MD5 = e6bc4c18c06346e6b3431637a2b5f3d5 install : $(TARGET) diff --git a/lfs/texinfo b/lfs/texinfo index 4a93748ef..236713b47 100644 --- a/lfs/texinfo +++ b/lfs/texinfo @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2020 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 # @@ -24,12 +24,12 @@ include Config -VER = 6.6 +VER = 6.7 THISAPP = texinfo-$(VER) DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/texinfo-6.6 +DIR_APP = $(DIR_SRC)/texinfo-6.7 # Normal build or $(TOOLS_DIR) build. # @@ -47,7 +47,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 5231da3e6aa106cd0532b8609e5b3702 +$(DL_FILE)_MD5 = d4c5d8cc84438c5993ec5163a59522a6 install : $(TARGET) diff --git a/lfs/tor b/lfs/tor index 6d758dcb0..e36d5c6cf 100644 --- a/lfs/tor +++ b/lfs/tor @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2021 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 # @@ -24,7 +24,7 @@ include Config -VER = 0.4.4.6 +VER = 0.4.4.7 THISAPP = tor-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = tor -PAK_VER = 56 +PAK_VER = 57 DEPS = libseccomp @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 3635b2f7b6645910bf702ce8eaeffd0d +$(DL_FILE)_MD5 = 6ea60eb939ab3633a682a81fb46dd37f install : $(TARGET) diff --git a/lfs/tshark b/lfs/tshark index 7b124ef5b..01c99e712 100644 --- a/lfs/tshark +++ b/lfs/tshark @@ -24,7 +24,7 @@ include Config -VER = 3.2.6 +VER = 3.4.2 THISAPP = wireshark-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -32,8 +32,8 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = tshark -DEPS = krb5 -PAK_VER = 7 +DEPS = krb5 c-ares +PAK_VER = 9 ############################################################################### # Top-level Rules @@ -43,7 +43,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = f14ef8d73fa5f30b57fec51283e6b73e +$(DL_FILE)_MD5 = cf35d1413e7e3b1429ac7f12c823ccd4 install : $(TARGET) diff --git a/lfs/tzdata b/lfs/tzdata index 50457dbe9..9fdecc53b 100644 --- a/lfs/tzdata +++ b/lfs/tzdata @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2021 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 # @@ -24,7 +24,7 @@ include Config -VER = 2020d +VER = 2021a TZDATA_VER = $(VER) TZCODE_VER = $(VER) @@ -45,8 +45,8 @@ objects = tzdata$(TZDATA_VER).tar.gz tzcode$(TZCODE_VER).tar.gz tzdata$(TZDATA_VER).tar.gz = $(DL_FROM)/tzdata$(TZDATA_VER).tar.gz tzcode$(TZCODE_VER).tar.gz = $(DL_FROM)/tzcode$(TZCODE_VER).tar.gz -tzdata$(TZDATA_VER).tar.gz_MD5 = 2f58d72e31cf073f5076c2cbf182cba3 -tzcode$(TZCODE_VER).tar.gz_MD5 = b4c46a69e5894aac713e8365a9be9411 +tzdata$(TZDATA_VER).tar.gz_MD5 = 20eae7d1da671c6eac56339c8df85bbd +tzcode$(TZCODE_VER).tar.gz_MD5 = 41a624869eed4cc36b9d163764f972a3 install : $(TARGET) diff --git a/lfs/unbound b/lfs/unbound index 5ffadff9b..69cb91d73 100644 --- a/lfs/unbound +++ b/lfs/unbound @@ -24,7 +24,7 @@ include Config -VER = 1.12.0 +VER = 1.13.0 THISAPP = unbound-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = eb03869cea5dd2b65e21ca068e78d6b0 +$(DL_FILE)_MD5 = 5a522f10c65332efe627098d2d24f947 install : $(TARGET) diff --git a/lfs/wget b/lfs/wget index 00ca75033..903f266cb 100644 --- a/lfs/wget +++ b/lfs/wget @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2019 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2020 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 # @@ -24,7 +24,7 @@ include Config -VER = 1.20.3 +VER = 1.21 THISAPP = wget-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = db4e6dc7977cbddcd543b240079a4899 +$(DL_FILE)_MD5 = 3852118b7a771a7c9c0388883c8f5dbf install : $(TARGET) diff --git a/lfs/wpa_supplicant b/lfs/wpa_supplicant index 549cee152..c64b6aab4 100644 --- a/lfs/wpa_supplicant +++ b/lfs/wpa_supplicant @@ -24,14 +24,13 @@ include Config -VER = 2.9 +VER = 581dfcc THISAPP = wpa_supplicant-$(VER) -DL_FILE = $(THISAPP).tar.gz +DL_FILE = hostapd-$(VER).tar.gz DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) +DIR_APP = $(DIR_SRC)/hostap-$(VER) TARGET = $(DIR_INFO)/$(THISAPP) -PROG = wpa_supplicant ############################################################################### # Top-level Rules @@ -41,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 2d2958c782576dc9901092fbfecb4190 +$(DL_FILE)_MD5 = eed922f2daabe16d74adf2b23455d8bd install : $(TARGET) @@ -74,10 +73,10 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP)/wpa_supplicant && cp $(DIR_SRC)/config/wpa_supplicant/config ./.config cd $(DIR_APP)/wpa_supplicant && sed -e "s/wpa_cli\ dynamic_eap_methods/wpa_cli\ #dynamic_eap_methods/" -i Makefile cd $(DIR_APP)/wpa_supplicant && sed -e "s@/usr/local@/usr@g" -i Makefile - cd $(DIR_APP)/wpa_supplicant && make && make install + cd $(DIR_APP)/wpa_supplicant && make $(MAKETUNING) + cd $(DIR_APP)/wpa_supplicant && make install @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/make.sh b/make.sh index b17aca457..94bb86d5b 100755 --- a/make.sh +++ b/make.sh @@ -26,10 +26,9 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name # If you update the version don't forget to update backupiso and add it to core update VERSION="2.25" # Version number -CORE="153" # Core Level (Filename) +CORE="154" # Core Level (Filename) SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir -NICE=10 # Nice level MAX_RETRIES=1 # prefetch/check loop BUILD_IMAGES=1 # Flash and Xen Downloader KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'` @@ -220,6 +219,9 @@ configure_build() { # Use this as default PARALLELISM DEFAULT_PARALLELISM="${parallelism}" + # Limit lauched ninja build jobs to computed parallel value. + NINJAJOBS="${parallelism}" + # Compression parameters # We use mode 8 for reasonable memory usage when decompressing # but with overall good compression @@ -432,11 +434,6 @@ prepareenv() { # Trap on emergency exit trap "exiterror 'Build process interrupted'" SIGINT SIGTERM SIGKILL SIGSTOP SIGQUIT - # Resetting our nice level - if ! renice ${NICE} $$ >/dev/null; then - exiterror "Failed to set nice level to ${NICE}" - fi - # Checking if running as root user if [ $(id -u) -ne 0 ]; then exiterror "root privileges required for building" @@ -465,7 +462,7 @@ prepareenv() { # Setup environment set +h LC_ALL=POSIX - export LFS LC_ALL CFLAGS CXXFLAGS DEFAULT_PARALLELISM RUSTFLAGS + export LFS LC_ALL CFLAGS CXXFLAGS DEFAULT_PARALLELISM RUSTFLAGS NINJAJOBS unset CC CXX CPP LD_LIBRARY_PATH LD_PRELOAD # Make some extra directories @@ -1076,6 +1073,7 @@ buildbase() { lfsmake2 tzdata lfsmake2 cleanup-toolchain lfsmake2 zlib + lfsmake2 zstd lfsmake2 binutils lfsmake2 gmp lfsmake2 gmp-compat @@ -1093,15 +1091,18 @@ buildbase() { lfsmake2 m4 lfsmake2 bison lfsmake2 ncurses - lfsmake2 procps lfsmake2 libtool lfsmake2 perl lfsmake2 readline lfsmake2 readline-compat lfsmake2 bzip2 lfsmake2 xz + lfsmake2 lzip lfsmake2 pcre lfsmake2 pcre-compat + lfsmake2 gettext + lfsmake2 attr + lfsmake2 acl lfsmake2 bash lfsmake2 diffutils lfsmake2 e2fsprogs @@ -1109,7 +1110,6 @@ buildbase() { lfsmake2 findutils lfsmake2 flex lfsmake2 gawk - lfsmake2 gettext lfsmake2 go lfsmake2 grep lfsmake2 groff @@ -1121,6 +1121,7 @@ buildbase() { lfsmake2 kbd lfsmake2 less lfsmake2 pkg-config + lfsmake2 procps lfsmake2 make lfsmake2 man lfsmake2 net-tools @@ -1233,6 +1234,7 @@ buildipfire() { lfsmake2 linux-atm lfsmake2 gdbm lfsmake2 pam + lfsmake2 c-ares lfsmake2 curl lfsmake2 tcl lfsmake2 sqlite @@ -1252,6 +1254,8 @@ buildipfire() { lfsmake2 nasm lfsmake2 libarchive lfsmake2 cmake + lfsmake2 ninja + lfsmake2 meson lfsmake2 libjpeg lfsmake2 libjpeg-compat lfsmake2 openjpeg @@ -1263,8 +1267,6 @@ buildipfire() { lfsmake2 slang lfsmake2 newt lfsmake2 libsmooth - lfsmake2 attr - lfsmake2 acl lfsmake2 libcap lfsmake2 libcap-ng lfsmake2 pciutils @@ -1385,7 +1387,6 @@ buildipfire() { lfsmake2 spandsp lfsmake2 lz4 lfsmake2 lzo - lfsmake2 zstd lfsmake2 openvpn lfsmake2 mpage lfsmake2 dbus @@ -1505,6 +1506,7 @@ buildipfire() { lfsmake2 cpufrequtils lfsmake2 gutenprint lfsmake2 apcupsd + lfsmake2 fireperf lfsmake2 iperf lfsmake2 iperf3 lfsmake2 7zip diff --git a/src/initscripts/packages/bacula b/src/initscripts/packages/bacula new file mode 100644 index 000000000..2b925ad4f --- /dev/null +++ b/src/initscripts/packages/bacula @@ -0,0 +1,28 @@ +#!/bin/sh +# Begin $rc_base/init.d/bacula + +# Based on sysklogd script from LFS-3.1 and earlier. + +. /etc/sysconfig/rc +. $rc_functions + +case "$1" in + start) + boot_mesg "Starting bacula-fd daemon..." + loadproc /usr/sbin/bacula-fd + ;; + stop) + boot_mesg "Stopping bacula-fd daemon..." + killproc /usr/sbin/bacula-fd + ;; + status) + statusproc /usr/sbin/bacula-fd + ;; + *) + echo "Usage: $0 (start|stop|status)" + exit 1 + ;; +esac + +# End $rc_base/init.d/bacula + diff --git a/src/initscripts/system/functions b/src/initscripts/system/functions index 71edf500b..d610a524d 100644 --- a/src/initscripts/system/functions +++ b/src/initscripts/system/functions @@ -793,17 +793,13 @@ running_on_hypervisor() { running_on_ec2() { local uuid - # Check if the hypervisor UUID starts with ec2 - if [ -r "/sys/hypervisor/uuid" ]; then - uuid=$(</sys/hypervisor/uuid) - - [ "${uuid:0:3}" = "ec2" ] && return 0 - fi - # Check if the DMI product UUID starts with EC2 if [ -r "/sys/devices/virtual/dmi/id/product_uuid" ]; then uuid=$(</sys/devices/virtual/dmi/id/product_uuid) + # Convert the UUID as uppercase + uuid="${uuid^^}" + [ "${uuid:0:3}" = "EC2" ] && return 0 fi diff --git a/src/initscripts/system/sshd b/src/initscripts/system/sshd index c3c02adc1..d0d859118 100644 --- a/src/initscripts/system/sshd +++ b/src/initscripts/system/sshd @@ -37,7 +37,7 @@ case "$1" in stop) boot_mesg "Stopping SSH Server..." - killproc -p "/var/run/sshd.pid" /usr/sbin/sshd + killproc -p "/var/run/sshd.pid" /usr/sbin/sshd || true ;; reload) diff --git a/src/initscripts/system/unbound b/src/initscripts/system/unbound index 5c5d2e3f4..b379bf331 100644 --- a/src/initscripts/system/unbound +++ b/src/initscripts/system/unbound @@ -81,7 +81,7 @@ write_hosts_conf() { # Skip empty domainnames [ "${domainname}" = "" ] && continue - echo "local-zone: ${domainname} typetransparent" + echo "local-zone: ${domainname} transparent" done < /var/ipfire/main/hosts | sort -u # Add all hosts diff --git a/src/initscripts/system/wlanclient b/src/initscripts/system/wlanclient index b32a4cb4a..4b3938b46 100644 --- a/src/initscripts/system/wlanclient +++ b/src/initscripts/system/wlanclient @@ -86,6 +86,7 @@ function wpa_supplicant_config_line() { local config=${2} shift 2 + local ieee80211w local anonymous_identity local auth_alg local auth_mode @@ -142,17 +143,22 @@ function wpa_supplicant_config_line() { case "${mode}" in EAP) - key_mgmt="WPA-EAP" + key_mgmt="WPA-EAP-SHA256 WPA-EAP" + ;; + WPA3) + key_mgmt="SAE" + + ieee80211w="2" ;; WPA2) auth_alg="OPEN" proto="RSN" - key_mgmt="WPA-PSK" + key_mgmt="WPA-PSK-SHA256 WPA-PSK" ;; WPA) auth_alg="OPEN" proto="WPA" - key_mgmt="WPA-PSK" + key_mgmt="WPA-PSK-SHA256 WPA-PSK" ;; WEP) auth_alg="SHARED" @@ -209,7 +215,11 @@ function wpa_supplicant_config_line() { echo " key_mgmt=${key_mgmt}" fi if [ -n "${psk}" ]; then - echo " psk=\"${psk}\"" + if [ "${key_mgmt}" = "SAE" ]; then + echo " sae_password=\"${psk}\"" + else + echo " psk=\"${psk}\"" + fi fi if [ -n "${wep_tx_keyidx}" ]; then echo " wep_tx_keyidx=${wep_tx_keyidx}" @@ -227,6 +237,9 @@ function wpa_supplicant_config_line() { if [ -n "${priority}" ]; then echo " priority=${priority}" fi + if [ -n "${ieee80211w}" ]; then + echo " ieee80211w=${ieee80211w}" + fi # EAP if [ "${mode}" = "EAP" ]; then diff --git a/src/installer/main.c b/src/installer/main.c index 3eff481b0..00d172888 100644 --- a/src/installer/main.c +++ b/src/installer/main.c @@ -781,7 +781,7 @@ int main(int argc, char *argv[]) { // Extract files... snprintf(commandstring, STRING_SIZE, - "/bin/tar -C /harddisk -xvf /cdrom/distro.img --xz 2>/dev/null"); + "/bin/tar --acls --xattrs --xattrs-include='*' -C /harddisk -xvf /cdrom/distro.img --xz 2>/dev/null"); if (runcommandwithprogress(60, 4, title, commandstring, INST_FILECOUNT, _("Installing the system..."), logfile)) { diff --git a/src/misc-progs/Makefile b/src/misc-progs/Makefile index bea54e773..7c3ef7529 100644 --- a/src/misc-progs/Makefile +++ b/src/misc-progs/Makefile @@ -25,15 +25,14 @@ LIBS = -lsmooth -lnewt PROGS = iowrap SUID_PROGS = squidctrl sshctrl ipfirereboot \ ipsecctrl timectrl dhcpctrl suricatactrl \ - applejuicectrl rebuildhosts backupctrl collectdctrl \ + rebuildhosts backupctrl collectdctrl \ logwatch wioscan wiohelper openvpnctrl firewallctrl \ - wirelessctrl getipstat qosctrl launch-ether-wake \ - redctrl syslogdctrl extrahdctrl sambactrl upnpctrl \ + wirelessctrl getipstat qosctrl \ + redctrl syslogdctrl extrahdctrl sambactrl \ smartctrl clamavctrl addonctrl pakfire mpfirectrl wlanapctrl \ setaliases urlfilterctrl updxlratorctrl fireinfoctrl rebuildroutes \ getconntracktable wirelessclient torctrl ddnsctrl unboundctrl \ captivectrl -SUID_UPDX = updxsetperms OBJS = $(patsubst %,%.o,$(PROGS) $(SUID_PROGS)) diff --git a/src/misc-progs/addonctrl.c b/src/misc-progs/addonctrl.c index 53e0a55f2..9645cee18 100644 --- a/src/misc-progs/addonctrl.c +++ b/src/misc-progs/addonctrl.c @@ -15,9 +15,8 @@ #define BUFFER_SIZE 1024 -char command[BUFFER_SIZE]; - int main(int argc, char *argv[]) { + char command[BUFFER_SIZE]; if (!(initsetuid())) exit(1); @@ -26,48 +25,51 @@ int main(int argc, char *argv[]) { fprintf(stderr, "\nMissing arguments.\n\naddonctrl addon (start|stop|restart|reload|enable|disable)\n\n"); exit(1); } + + const char* name = argv[1]; - if ( strlen(argv[1])>32 ) { + if (strlen(name) > 32) { fprintf(stderr, "\nString to large.\n\naddonctrl addon (start|stop|restart|reload|enable|disable)\n\n"); exit(1); } - - if ( strchr(argv[1],'/') || strchr(argv[1],'$') || strchr(argv[1],'[') || strchr(argv[1],'{') ) { - fprintf(stderr, "\nIllegal Char found.\n\naddonctrl addon (start|stop|restart|reload|enable|disable)\n\n"); - exit(1); + + // Check if the input argument is valid + if (!is_valid_argument_alnum(name)) { + fprintf(stderr, "Invalid add-on name: %s\n", name); + exit(2); } - - sprintf(command, "/opt/pakfire/db/installed/meta-%s", argv[1]); + + sprintf(command, "/opt/pakfire/db/installed/meta-%s", name); FILE *fp = fopen(command,"r"); if ( fp ) { fclose(fp); } else { - fprintf(stderr, "\nAddon '%s' not found.\n\naddonctrl addon (start|stop|restart|reload|status|enable|disable)\n\n", argv[1]); + fprintf(stderr, "\nAddon '%s' not found.\n\naddonctrl addon (start|stop|restart|reload|status|enable|disable)\n\n", name); exit(1); } - + if (strcmp(argv[2], "start") == 0) { - sprintf(command,"/etc/rc.d/init.d/%s start", argv[1]); + snprintf(command, BUFFER_SIZE - 1, "/etc/rc.d/init.d/%s start", name); safe_system(command); } else if (strcmp(argv[2], "stop") == 0) { - sprintf(command,"/etc/rc.d/init.d/%s stop", argv[1]); + snprintf(command, BUFFER_SIZE - 1, "/etc/rc.d/init.d/%s stop", name); safe_system(command); } else if (strcmp(argv[2], "restart") == 0) { - sprintf(command,"/etc/rc.d/init.d/%s restart", argv[1]); + snprintf(command, BUFFER_SIZE - 1, "/etc/rc.d/init.d/%s restart", name); safe_system(command); } else if (strcmp(argv[2], "reload") == 0) { - sprintf(command,"/etc/rc.d/init.d/%s reload", argv[1]); + snprintf(command, BUFFER_SIZE - 1, "/etc/rc.d/init.d/%s reload", name); safe_system(command); } else if (strcmp(argv[2], "status") == 0) { - sprintf(command,"/etc/rc.d/init.d/%s status", argv[1]); + snprintf(command, BUFFER_SIZE - 1, "/etc/rc.d/init.d/%s status", name); safe_system(command); } else if (strcmp(argv[2], "enable") == 0) { - sprintf(command,"mv -f /etc/rc.d/rc3.d/off/S??%s /etc/rc.d/rc3.d" , argv[1]); + snprintf(command, BUFFER_SIZE - 1, "mv -f /etc/rc.d/rc3.d/off/S??%s /etc/rc.d/rc3.d" , name); safe_system(command); } else if (strcmp(argv[2], "disable") == 0) { - sprintf(command,"mkdir -p /etc/rc.d/rc3.d/off"); + snprintf(command, BUFFER_SIZE - 1, "mkdir -p /etc/rc.d/rc3.d/off"); safe_system(command); - sprintf(command,"mv -f /etc/rc.d/rc3.d/S??%s /etc/rc.d/rc3.d/off" , argv[1]); + snprintf(command, BUFFER_SIZE - 1, "mv -f /etc/rc.d/rc3.d/S??%s /etc/rc.d/rc3.d/off" , name); safe_system(command); } else { fprintf(stderr, "\nBad argument given.\n\naddonctrl addon (start|stop|restart|reload|enable|disable)\n\n"); diff --git a/src/misc-progs/applejuicectrl.c b/src/misc-progs/applejuicectrl.c deleted file mode 100644 index 9d63e51f2..000000000 --- a/src/misc-progs/applejuicectrl.c +++ /dev/null @@ -1,44 +0,0 @@ -/* This file is part of the IPFire Firewall. - * - * This program is distributed under the terms of the GNU General Public - * Licence. See the file COPYING for details. - * - */ - -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <unistd.h> -#include <sys/types.h> -#include <fcntl.h> -#include "setuid.h" - -int main(int argc, char *argv[]) { - - if (!(initsetuid())) - exit(1); - - if (argc < 2) { - fprintf(stderr, "\nNo argument given.\n\napplejuicectrl (start|stop|restart)\n\n"); - exit(1); - } - - if (strcmp(argv[1], "start") == 0) { - safe_system("/etc/rc.d/init.d/applejuice start"); - } else if (strcmp(argv[1], "stop") == 0) { - safe_system("/etc/rc.d/init.d/applejuice stop"); - } else if (strcmp(argv[1], "restart") == 0) { - safe_system("/etc/rc.d/init.d/applejuice restart"); - } else if (strcmp(argv[1], "enable") == 0) { - safe_system("ln -fs ../init.d/applejuice /etc/rc.d/rc3.d/S99applejuice >/dev/null 2>&1"); - safe_system("ln -fs ../init.d/applejuice /etc/rc.d/rc0.d/K00applejuice >/dev/null 2>&1"); - safe_system("ln -fs ../init.d/applejuice /etc/rc.d/rc6.d/K00applejuice >/dev/null 2>&1"); - } else if (strcmp(argv[1], "disable") == 0) { - safe_system("rm -f /etc/rc.d/rc*.d/*applejuice >/dev/null 2>&1"); - } else { - fprintf(stderr, "\nBad argument given.\n\napplejuicectrl (start|stop|restart)\n\n"); - exit(1); - } - - return 0; -} diff --git a/src/misc-progs/backupctrl.c b/src/misc-progs/backupctrl.c index 00c8d5b86..0a85141ca 100644 --- a/src/misc-progs/backupctrl.c +++ b/src/misc-progs/backupctrl.c @@ -5,40 +5,11 @@ * */ -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <unistd.h> -#include <sys/types.h> -#include <fcntl.h> #include "setuid.h" -int main(int argc, char *argv[]) { - int i; - char command[STRING_SIZE] = "/var/ipfire/backup/bin/backup.pl"; - char temp[STRING_SIZE]; - - if (!(initsetuid())) +int main(int argc, char** argv) { + if (!initsetuid()) exit(1); - for (i = 1; i < argc; i++) { - if (strstr(argv[i], "&&")){ - fprintf (stderr, "Bad Argument!\n"); - exit (1); - - } else if (strstr(argv[i], "|")) { - fprintf (stderr, "Bad Argument!\n"); - exit (1); - - } else if (argc > 3) { - fprintf (stderr, "Too Many Arguments!\n"); - exit (1); - - } else { - snprintf(temp, STRING_SIZE, "%s %s", command, argv[i]); - snprintf(command, STRING_SIZE, "%s", temp); - } - } - - return safe_system(command); + return run("/var/ipfire/backup/bin/backup.pl", argv); } diff --git a/src/misc-progs/extrahdctrl.c b/src/misc-progs/extrahdctrl.c index 1d5b96019..49a25387f 100644 --- a/src/misc-progs/extrahdctrl.c +++ b/src/misc-progs/extrahdctrl.c @@ -5,21 +5,11 @@ * */ -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <unistd.h> -#include <sys/types.h> -#include <fcntl.h> #include "setuid.h" -int main(int argc, char *argv[]) { - - char command[512]; - if (!(initsetuid())) +int main(int argc, char** argv) { + if (!initsetuid()) exit(1); - snprintf(command, 512, "/var/ipfire/extrahd/bin/extrahd.pl %s %s", argv[1], argv[2]); - safe_system("chmod 755 /var/ipfire/extrahd/bin/extrahd.pl 2>&1 >/dev/null"); - safe_system(command); + return run("/var/ipfire/extrahd/bin/extrahd.pl", argv); } diff --git a/src/misc-progs/ipfiredeath.c b/src/misc-progs/ipfiredeath.c deleted file mode 100644 index 8a13fa60a..000000000 --- a/src/misc-progs/ipfiredeath.c +++ /dev/null @@ -1,25 +0,0 @@ -/* SmoothWall helper program - smoothiedeath - * - * This program is distributed under the terms of the GNU General Public - * Licence. See the file COPYING for details. - * - * (c) Lawrence Manning, 2001 - * Simple program intended to be installed setuid(0) that can be used for - * starting shutdown. - * - * $Id: ipcopdeath.c,v 1.2 2003/12/11 10:57:34 riddles Exp $ - * - */ - -#include <stdlib.h> -#include "setuid.h" - -int main(void) -{ - if (!(initsetuid())) - exit(1); - - safe_system("/sbin/shutdown -h now"); - - return 0; -} diff --git a/src/misc-progs/ipfirerebirth.c b/src/misc-progs/ipfirerebirth.c deleted file mode 100644 index 10230c3e1..000000000 --- a/src/misc-progs/ipfirerebirth.c +++ /dev/null @@ -1,25 +0,0 @@ -/* SmoothWall helper program - smoothierebirth - * - * This program is distributed under the terms of the GNU General Public - * Licence. See the file COPYING for details. - * - * (c) Lawrence Manning, 2001 - * Simple program intended to be installed setuid(0) that can be used for - * starting reboot. - * - * $Id: ipcoprebirth.c,v 1.2 2003/12/11 10:57:34 riddles Exp $ - * - */ - -#include <stdlib.h> -#include "setuid.h" - -int main(void) -{ - if (!(initsetuid())) - exit(1); - - safe_system("/sbin/shutdown -r now"); - - return 0; -} diff --git a/src/misc-progs/ipfirereboot.c b/src/misc-progs/ipfirereboot.c index 5e758791c..6f5ecf89a 100644 --- a/src/misc-progs/ipfirereboot.c +++ b/src/misc-progs/ipfirereboot.c @@ -31,9 +31,6 @@ #define OP_REBOOT "boot" #define OP_REBOOT_FS "bootfs" // add filesystem check option (not yet in GUI) #define OP_SHUTDOWN "down" -#define OP_SCHEDULE_ADD "cron+" -#define OP_SCHEDULE_REM "cron-" -#define OP_SCHEDULE_GET "cron?" int main(int argc, char**argv) { @@ -66,52 +63,6 @@ int main(int argc, char**argv) return 0; } - // output schedule to stdout - if (argc==2 && strcmp(argv[1], OP_SCHEDULE_GET)==0) - { - safe_system("/bin/grep /sbin/shutdown /var/spool/cron/root.orig"); - return 0; - } - - if (argc==2 && strcmp(argv[1], OP_SCHEDULE_REM)==0) - { - safe_system("/usr/bin/perl -i -p -e 's/^.*\\/sbin\\/shutdown.*$//s' /var/spool/cron/root.orig"); - safe_system("/usr/bin/fcrontab -u root -z"); - return 0; - } - - if (argc==6 && strcmp(argv[1], OP_SCHEDULE_ADD)==0) - { - // check args - if (!( strlen(argv[2])<3 && - strspn(argv[2], "0123456789") == strlen (argv[2]) && - strlen(argv[3])<3 && - strspn(argv[3], "0123456789") == strlen (argv[3]) && - strlen(argv[4])<14 && - strspn(argv[4], "1234567,*") == strlen (argv[4]) && - ((strcmp(argv[5], "-r")==0) || //reboot - (strcmp(argv[5], "-h")==0)) ) //hangup - ) { - fprintf (stderr, "Bad cron+ parameters!\n"); - return 1; - } - - // remove old entry - safe_system("/usr/bin/perl -i -p -e 's/^.*\\/sbin\\/shutdown.*$//s' /var/spool/cron/root.orig"); - - // add new entry - FILE *fd = NULL; - if ((fd = fopen("/var/spool/cron/root.orig", "a"))) - { - fprintf (fd,"%s %s * * %s /sbin/shutdown %s 1\n",argv[2],argv[3],argv[4],argv[5]); - fclose (fd); - } - - // inform cron - safe_system("/usr/bin/fcrontab -u root -z"); - return 0; - } - fprintf (stderr, "Bad reboot command!\n"); return 1; } diff --git a/src/misc-progs/launch-ether-wake.c b/src/misc-progs/launch-ether-wake.c deleted file mode 100644 index cac4d3c3f..000000000 --- a/src/misc-progs/launch-ether-wake.c +++ /dev/null @@ -1,37 +0,0 @@ -/* This file is part of the Wake-on-LAN GUI AddOn - * - * This program is distributed under the terms of the GNU General Public - * Licence. See the file COPYING for details. - * - * Copyright (C) 2006-03-03 weizen_42 - * - * - */ - -#include <stdio.h> -#include <string.h> -#include <unistd.h> -#include <stdlib.h> -#include <sys/types.h> -#include <fcntl.h> -#include "setuid.h" - - -#define BUFFER_SIZE 512 - -char command[BUFFER_SIZE]; - -int main(int argc, char *argv[]) -{ - if (!(initsetuid())) - exit(1); - - snprintf(command, BUFFER_SIZE-1, "/usr/sbin/etherwake -i %s %s", argv[2], argv[1]); - safe_system(command); - - /* Send magic packet with broadcast flag set. */ - snprintf(command, BUFFER_SIZE-1, "/usr/sbin/etherwake -i %s -b %s", argv[2], argv[1]); - safe_system(command); - - return(0); -} diff --git a/src/misc-progs/mpfirectrl.c b/src/misc-progs/mpfirectrl.c index 07b3e8f5c..a71789c0f 100644 --- a/src/misc-progs/mpfirectrl.c +++ b/src/misc-progs/mpfirectrl.c @@ -5,35 +5,11 @@ * */ -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <unistd.h> -#include <sys/types.h> -#include <fcntl.h> #include "setuid.h" -int main(int argc, char *argv[]) { - int i; - char command[1024]; - char add[STRING_SIZE]; - - if (!(initsetuid())) +int main(int argc, char** argv) { + if (!initsetuid()) exit(1); - snprintf(command, STRING_SIZE, "/var/ipfire/mpfire/bin/mpfire.pl"); - - for (i = 1; i < argc; i++) { - if (strstr(argv[i], "&&")){ - fprintf (stderr, "Bad Argument!\n"); - exit (1); - } - else if (strstr(argv[i], "|")){ - fprintf (stderr, "Bad Argument!\n"); - exit (1); - } - sprintf(add, " %s", argv[i]); - strcat(command, add); - } - return safe_system(command); + return run("/var/ipfire/mpfire/bin/mpfire.pl", argv); } diff --git a/src/misc-progs/pakfire.c b/src/misc-progs/pakfire.c index fe6edfc32..93a18e604 100644 --- a/src/misc-progs/pakfire.c +++ b/src/misc-progs/pakfire.c @@ -5,26 +5,11 @@ * */ -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <unistd.h> -#include <sys/types.h> -#include <fcntl.h> #include "setuid.h" -int main(int argc, char *argv[]) { - int i; - char command[STRING_SIZE] = "/opt/pakfire/pakfire"; - char temp[STRING_SIZE]; - - if (!(initsetuid())) +int main(int argc, char** argv) { + if (!initsetuid()) exit(1); - for (i = 1; i < argc; i++) { - snprintf(temp, STRING_SIZE, "%s %s", command, argv[i]); - snprintf(command, STRING_SIZE, "%s", temp); - } - - return safe_system(command); + return run("/opt/pakfire/pakfire", argv); } diff --git a/src/misc-progs/sambactrl.c b/src/misc-progs/sambactrl.c index 91761a422..9753492f6 100644 --- a/src/misc-progs/sambactrl.c +++ b/src/misc-progs/sambactrl.c @@ -20,14 +20,29 @@ int main(int argc, char *argv[]) { return 1; } else if (strcmp(argv[1], "smbuserdisable") == 0) { + if (!is_valid_argument_alnum(argv[2])) { + fprintf(stderr, "Invalid username '%s'\n", argv[2]); + exit(2); + } + snprintf(command, BUFFER_SIZE-1, "/usr/bin/smbpasswd -d %s >/dev/null", argv[2]); safe_system(command); } else if (strcmp(argv[1], "smbuserenable") == 0) { + if (!is_valid_argument_alnum(argv[2])) { + fprintf(stderr, "Invalid username '%s'\n", argv[2]); + exit(2); + } + snprintf(command, BUFFER_SIZE-1, "/usr/bin/smbpasswd -e %s >/dev/null", argv[2]); safe_system(command); } else if (strcmp(argv[1], "smbuserdelete") == 0) { + if (!is_valid_argument_alnum(argv[2])) { + fprintf(stderr, "Invalid username '%s'\n", argv[2]); + exit(2); + } + snprintf(command, BUFFER_SIZE-1, "/usr/bin/smbpasswd -x %s >/dev/null", argv[2]); safe_system(command); @@ -37,9 +52,6 @@ int main(int argc, char *argv[]) { } else if (strcmp(argv[1], "smbsafeconf") == 0) { safe_system("/bin/cat /var/ipfire/samba/global /var/ipfire/samba/shares > /var/ipfire/samba/smb.conf"); - } else if (strcmp(argv[1], "smbsafeconfpdc") == 0) { - safe_system("/bin/cat /var/ipfire/samba/global /var/ipfire/samba/pdc /var/ipfire/samba/shares > /var/ipfire/samba/smb.conf"); - } else if (strcmp(argv[1], "smbstop") == 0) { safe_system("/etc/rc.d/init.d/samba stop >/dev/null"); safe_system("/usr/local/bin/sambactrl disable"); @@ -59,24 +71,26 @@ int main(int argc, char *argv[]) { safe_system(command); } else if (strcmp(argv[1], "smbuseradd") == 0) { - snprintf(command, BUFFER_SIZE-1, "/usr/sbin/groupadd sambauser >/dev/null"); - safe_system(command); + if (!is_valid_argument_alnum(argv[2])) { + fprintf(stderr, "Invalid username '%s'\n", argv[2]); + exit(2); + } - snprintf(command, BUFFER_SIZE-1, "/usr/sbin/useradd -c 'Samba User' -m -g %s -s %s %s >/dev/null", argv[4], argv[5], argv[2]); + snprintf(command, BUFFER_SIZE-1, "/usr/sbin/groupadd sambauser >/dev/null"); safe_system(command); - snprintf(command, BUFFER_SIZE-1, "echo %s:%s | chpasswd", argv[2], argv[3]); + snprintf(command, BUFFER_SIZE-1, "/usr/sbin/useradd -c 'Samba User' -m -g sambauser -s /bin/false %s >/dev/null", argv[2]); safe_system(command); - snprintf(command, BUFFER_SIZE-1, "/usr/bin/printf '%s\n%s\n' | /usr/bin/smbpasswd -as %s >/dev/null", argv[3], argv[3], argv[2]); - safe_system(command); + run("/usr/sbin/samba-change-password", argv + 1); } else if (strcmp(argv[1], "smbchangepw") == 0) { - snprintf(command, BUFFER_SIZE-1, "echo %s:%s | chpasswd", argv[2], argv[3]); - safe_system(command); + if (!is_valid_argument_alnum(argv[2])) { + fprintf(stderr, "Invalid username '%s'\n", argv[2]); + exit(2); + } - snprintf(command, BUFFER_SIZE-1, "/usr/bin/printf '%s\n%s\n' | /usr/bin/smbpasswd -as %s >/dev/null", argv[3], argv[3], argv[2]); - safe_system(command); + run("/usr/sbin/samba-change-password", argv + 1); } else if (strcmp(argv[1], "readsmbpasswd") == 0) { safe_system("/bin/chown root:nobody /var/ipfire/samba/private >/dev/null"); diff --git a/src/misc-progs/setuid.c b/src/misc-progs/setuid.c index e54b5d3ab..efd181ad8 100644 --- a/src/misc-progs/setuid.c +++ b/src/misc-progs/setuid.c @@ -20,6 +20,7 @@ * */ +#include <ctype.h> #include <stdio.h> #include <string.h> #include <errno.h> @@ -41,6 +42,8 @@ #define OPEN_MAX 256 #endif +#define MAX_ARGUMENTS 128 + /* Trusted environment for executing commands */ char * trusted_env[4] = { "PATH=/usr/bin:/usr/sbin:/sbin:/bin", @@ -49,37 +52,40 @@ char * trusted_env[4] = { NULL }; -/* Spawns a child process that uses /bin/sh to interpret a command. - * This is much the same in use and purpose as system(), yet as it uses execve - * to pass a trusted environment it's immune to attacks based upon changing - * IFS, ENV, BASH_ENV and other such variables. - * Note this does NOT guard against any other attacks, inparticular you MUST - * validate the command you are passing. If the command is formed from user - * input be sure to check this input is what you expect. Nasty things can - * happen if a user can inject ; or `` into your command for example */ -int safe_system(char* command) { - return system_core(command, 0, 0, "safe_system"); -} - -/* Much like safe_system but lets you specify a non-root uid and gid to run - * the command as */ -int unpriv_system(char* command, uid_t uid, gid_t gid) { - return system_core(command, uid, gid, "unpriv_system"); -} - -int system_core(char* command, uid_t uid, gid_t gid, char *error) { +static int system_core(char* command, char** args, uid_t uid, gid_t gid, char *error) { int pid, status; + char* argv[MAX_ARGUMENTS + 1]; + unsigned int argc = 0; + if(!command) return 1; +#if 0 + // Add command as first element to argv + argv[argc++] = command; +#endif + + // Add all other arguments + if (args) { + while (*args) { + argv[argc++] = *args++; + + // Break when argv is full + if (argc >= MAX_ARGUMENTS) { + return 2; + } + } + } + + // Make sure that argv is NULL-terminated + argv[argc] = NULL; + switch(pid = fork()) { case -1: return -1; case 0: /* child */ { - char *argv[4]; - if (gid && setgid(gid)) { fprintf(stderr, "%s: ", error); perror("Couldn't setgid"); @@ -92,11 +98,8 @@ int system_core(char* command, uid_t uid, gid_t gid, char *error) { exit(127); } - argv[0] = "sh"; - argv[1] = "-c"; - argv[2] = command; - argv[3] = NULL; - execve("/bin/sh", argv, trusted_env); + execve(command, argv, trusted_env); + fprintf(stderr, "%s: ", error); perror("execve failed"); exit(127); @@ -115,6 +118,35 @@ int system_core(char* command, uid_t uid, gid_t gid, char *error) { } +int run(char* command, char** argv) { + return system_core(command, argv, 0, 0, "run"); +} + +/* Spawns a child process that uses /bin/sh to interpret a command. + * This is much the same in use and purpose as system(), yet as it uses execve + * to pass a trusted environment it's immune to attacks based upon changing + * IFS, ENV, BASH_ENV and other such variables. + * Note this does NOT guard against any other attacks, inparticular you MUST + * validate the command you are passing. If the command is formed from user + * input be sure to check this input is what you expect. Nasty things can + * happen if a user can inject ; or `` into your command for example */ +int safe_system(char* command) { + char* argv[4] = { + "/bin/sh", + "-c", + command, + NULL, + }; + + return system_core(argv[0], argv, 0, 0, "safe_system"); +} + +/* Much like safe_system but lets you specify a non-root uid and gid to run + * the command as */ +int unpriv_system(char* command, uid_t uid, gid_t gid) { + return system_core(command, NULL, uid, gid, "unpriv_system"); +} + /* General routine to initialise a setuid root program, and put the * environment in a known state. Returns 1 on success, if initsetuid() returns * 0 then you should exit(1) immediately, DON'T attempt to recover from the @@ -167,3 +199,42 @@ int initsetuid(void) { return 1; } + +/* Checks if a string only contains alphanumerical characters, dash or underscore */ +int is_valid_argument_alnum(const char* arg) { + size_t l = strlen(arg); + + for (unsigned int i = 0; i < l; i++) { + char c = arg[i]; + + // Dash or underscore + if (c == '-' || c == '_') + continue; + + // Any alphanumerical character + if (isalnum(c)) + continue; + + // Invalid + return 0; + } + + return 1; +} + +int is_valid_argument_num(const char* arg) { + size_t l = strlen(arg); + + for (unsigned int i = 0; i < l; i++) { + char c = arg[i]; + + // Any digit + if (isdigit(c)) + continue; + + // Invalid + return 0; + } + + return 1; +} diff --git a/src/misc-progs/setuid.h b/src/misc-progs/setuid.h index 2e90537a6..2936c4399 100644 --- a/src/misc-progs/setuid.h +++ b/src/misc-progs/setuid.h @@ -18,13 +18,24 @@ #define STRING_SIZE 1024 #endif +#ifndef CONFIG_ROOT +#define CONFIG_ROOT "/var/ipfire" +#endif + +#ifndef SNAME +#define SNAME "SNAME to be filled" +#endif + extern char * trusted_env[4]; -int system_core(char* command, uid_t uid, gid_t gid, char *error); +int run(char* command, char** argv); int safe_system(char* command); int unpriv_system(char* command, uid_t uid, gid_t gid); int initsetuid(void); +int is_valid_argument_alnum(const char* arg); +int is_valid_argument_num(const char* arg); + /* Compatibility for the local copy of strlcat, * which has been removed. */ #define strlcat(src, dst, size) strncat(src, dst, size) diff --git a/src/misc-progs/smartctrl.c b/src/misc-progs/smartctrl.c index c6451acba..22f0e0a10 100644 --- a/src/misc-progs/smartctrl.c +++ b/src/misc-progs/smartctrl.c @@ -22,6 +22,11 @@ int main(int argc, char *argv[]) { exit(1); } + if (!is_valid_argument_alnum(argv[1])) { + fprintf(stderr, "Invalid device name '%s'\n", argv[1]); + exit(2); + } + char command[STRING_SIZE]; snprintf(command, STRING_SIZE, "/var/run/hddshutdown-%s", argv[1]); diff --git a/src/misc-progs/sshctrl.c b/src/misc-progs/sshctrl.c index f855c5a4a..0d458a865 100644 --- a/src/misc-progs/sshctrl.c +++ b/src/misc-progs/sshctrl.c @@ -67,10 +67,10 @@ int main(int argc, char *argv[]) strlcat(command, "s/^PasswordAuthentication .*$/PasswordAuthentication yes/;", STRING_SIZE - 1 ); if(findkey(kv, "ENABLE_SSH_PORTFW", buffer) && !strcmp(buffer,"on")) - strlcat(command, "s/^AllowTcpForwarding .*$/AllowTcpForwarding yes/;", STRING_SIZE - 1 ); + strlcat(command, "s/^AllowTcpForwarding .*$/AllowTcpForwarding yes/;" "s/^PermitOpen .*$/PermitOpen any/;", STRING_SIZE - 1 ); else - strlcat(command, "s/^AllowTcpForwarding .*$/AllowTcpForwarding no/;", STRING_SIZE - 1 ); - + strlcat(command, "s/^AllowTcpForwarding .*$/AllowTcpForwarding no/;" "s/^PermitOpen .*$/PermitOpen none/;", STRING_SIZE - 1 ); + if(findkey(kv, "SSH_PORT", buffer) && !strcmp(buffer,"on")) strlcat(command, "s/^Port .*$/Port 22/;", STRING_SIZE - 1 ); else @@ -133,6 +133,11 @@ int main(int argc, char *argv[]) return 0; } else if (strcmp(argv[1], "tempstart") == 0) { + if (!is_valid_argument_num(argv[2])) { + fprintf(stderr, "Invalid time '%s'\n", argv[2]); + exit(2); + } + safe_system("/usr/local/bin/sshctrl"); sleep(5); unlink("/var/ipfire/remote/enablessh"); diff --git a/src/misc-progs/updxsetperms.c b/src/misc-progs/updxsetperms.c deleted file mode 100644 index be7d0e171..000000000 --- a/src/misc-progs/updxsetperms.c +++ /dev/null @@ -1,28 +0,0 @@ -/* This file is part of the IPFire Firewall. - * - * This program is distributed under the terms of the GNU General Public - * Licence. See the file COPYING for details. - * - */ - -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <unistd.h> -#include <sys/types.h> -#include <fcntl.h> -#include "setuid.h" - -int main(int argc, char *argv[]) { - - if (!(initsetuid())) - exit(1); - - if (argc > 1) { - fprintf(stderr, "\nNo argument should be given.\n"); - exit(1); - } - - safe_system("/etc/rc.d/init.d/squid setperms"); - return 0; -} diff --git a/src/misc-progs/upnpctrl.c b/src/misc-progs/upnpctrl.c deleted file mode 100644 index f42502ddd..000000000 --- a/src/misc-progs/upnpctrl.c +++ /dev/null @@ -1,54 +0,0 @@ -#include <stdio.h> -#include <string.h> -#include <stdlib.h> -#include <unistd.h> -#include <sys/types.h> -#include <fcntl.h> -#include "setuid.h" - -#define BUFFER_SIZE 1024 - -char command[BUFFER_SIZE]; - -int main(int argc, char *argv[]) -{ - - if (!(initsetuid())) - exit(1); - - // Check what command is asked - if (argc==1) - { - fprintf (stderr, "Missing smbctrl command!\n"); - return 1; - } - - if (strcmp(argv[1], "upnpstart")==0) - { - snprintf(command, BUFFER_SIZE-1, "route add -net 239.0.0.0 netmask 255.0.0.0 %s", argv[3]); - safe_system(command); - printf(command); - snprintf(command, BUFFER_SIZE-1, "/usr/sbin/upnpd %s %s", argv[2], argv[3] ); - safe_system(command); - printf(command); - return 0; - } - - if (strcmp(argv[1], "upnpstop")==0) - { - snprintf(command, BUFFER_SIZE-1, "killall upnpd"); - safe_system(command); - printf(command); - snprintf(command, BUFFER_SIZE-1, "route del -net 239.0.0.0 netmask 255.0.0.0 %s", argv[3]); - safe_system(command); - printf(command); - return 0; - } - if (strcmp(argv[1], "upnpxml")==0) - { - snprintf(command, BUFFER_SIZE-1, "sed 's/\<friendlyName\>.*\<\/friendlyName\>/\<friendlyName\>%s\<\/friendlyName\>/gi' %s/%s > tmp && mv tmp %s/%s", argv[2], argv[3], argv[4], argv[3], argv[4]); - safe_system(command); - printf(command); - return 0; - } -} diff --git a/src/pakfire/lib/functions.sh b/src/pakfire/lib/functions.sh index 375169760..5918649db 100644 --- a/src/pakfire/lib/functions.sh +++ b/src/pakfire/lib/functions.sh @@ -24,7 +24,8 @@ extract_files() { echo "Extracting files..." - tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C / + tar --acls --xattrs --xattrs-include='*' \ + -xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C / echo "...Finished." } diff --git a/src/patches/ddns-013-add-option-to-list-token-provider.patch b/src/patches/ddns-013-add-option-to-list-token-provider.patch new file mode 100644 index 000000000..7603422a2 --- /dev/null +++ b/src/patches/ddns-013-add-option-to-list-token-provider.patch @@ -0,0 +1,292 @@ +commit 287b2bfe7bf5e0639da9227a8c7893ce40d298ae +Author: Stefan Schantl <stefan.schantl(a)ipfire.org> +Date: Wed Dec 2 20:31:19 2020 +0100 + + Add option to list provider with token support. + + This option can be used to get a list of all known provider which support + a token based authentication method. + + In order to provide this feature the provider details has been extended + to contain the information if a provider supports this authentication + method or not. + + Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> + +diff --git a/ddns.in b/ddns.in +old mode 100644 +new mode 100755 +index 0e377e7..538e4b0 +--- a/ddns.in ++++ b/ddns.in +@@ -49,6 +49,10 @@ def main(): + p_list_providers = subparsers.add_parser("list-providers", + help=_("List all available providers")) + ++ # list-token-provider ++ p_list_token_provider = subparsers.add_parser("list-token-provider", ++ help=_("List all providers which supports authentication via token")) ++ + # update + p_update = subparsers.add_parser("update", help=_("Update DNS record")) + p_update.add_argument("hostname") +@@ -85,6 +89,10 @@ def main(): + provider_names = d.get_provider_names() + print("\n".join(provider_names)) + ++ elif args.subparsers_name == "list-token-providers": ++ token_provider = d.get_provider_with_token_support() ++ print("\n".join(token_provider)) ++ + elif args.subparsers_name == "update": + d.updateone(hostname=args.hostname, force=args.force) + +diff --git a/src/ddns/__init__.py b/src/ddns/__init__.py +index 3e43fa7..ca232bf 100644 +--- a/src/ddns/__init__.py ++++ b/src/ddns/__init__.py +@@ -86,6 +86,20 @@ class DDNSCore(object): + """ + return sorted(self.providers.keys()) + ++ def get_provider_with_token_support(self): ++ """ ++ Returns a list with names of all registered providers ++ which support token based authtentication. ++ """ ++ ++ token_provider = [] ++ ++ for handle, provider in sorted(self.providers.items()): ++ if provider.supports_token_auth is True: ++ token_provider.append(handle) ++ ++ return sorted(token_provider) ++ + def load_configuration(self, filename): + logger.debug(_("Loading configuration file %s") % filename) + +diff --git a/src/ddns/providers.py b/src/ddns/providers.py +index a1ca3f3..b0066d5 100644 +--- a/src/ddns/providers.py ++++ b/src/ddns/providers.py +@@ -73,6 +73,10 @@ class DDNSProvider(object): + # Required to remove AAAA records if IPv6 is absent again. + can_remove_records = True + ++ # True if the provider supports authentication via a random ++ # generated token instead of username and password. ++ supports_token_auth = True ++ + @staticmethod + def supported(): + """ +@@ -352,6 +356,10 @@ class DDNSProtocolDynDNS2(object): + # The DynDNS protocol version 2 does not allow to remove records + can_remove_records = False + ++ # The DynDNS protocol version 2 only supports authentication via ++ # username and password. ++ supports_token_auth = False ++ + def prepare_request_data(self, proto): + data = { + "hostname" : self.hostname, +@@ -440,6 +448,7 @@ class DDNSProviderAllInkl(DDNSProvider): + + url = "http://dyndns.kasserver.com" + can_remove_records = False ++ supports_token_auth = False + + def update(self): + # There is no additional data required so we directly can +@@ -464,6 +473,8 @@ class DDNSProviderBindNsupdate(DDNSProvider): + + DEFAULT_TTL = 60 + ++ supports_token_auth = False ++ + @staticmethod + def supported(): + # Search if the nsupdate utility is available +@@ -550,6 +561,7 @@ class DDNSProviderChangeIP(DDNSProvider): + + url = "https://nic.changeip.com/nic/update" + can_remove_records = False ++ supports_token_auth = False + + def update_protocol(self, proto): + data = { +@@ -616,6 +628,7 @@ class DDNSProviderDDNSS(DDNSProvider): + + url = "http://www.ddnss.de/upd.php" + can_remove_records = False ++ supports_token_auth = False + + def update_protocol(self, proto): + data = { +@@ -678,6 +691,7 @@ class DDNSProviderDHS(DDNSProvider): + + url = "http://members.dhs.org/nic/hosts" + can_remove_records = False ++ supports_token_auth = False + + def update_protocol(self, proto): + data = { +@@ -710,6 +724,7 @@ class DDNSProviderDNSpark(DDNSProvider): + + url = "https://control.dnspark.com/api/dynamic/update.php" + can_remove_records = False ++ supports_token_auth = False + + def update_protocol(self, proto): + data = { +@@ -758,6 +773,7 @@ class DDNSProviderDtDNS(DDNSProvider): + + url = "https://www.dtdns.com/api/autodns.cfm" + can_remove_records = False ++ supports_token_auth = False + + def update_protocol(self, proto): + data = { +@@ -813,6 +829,7 @@ class DDNSProviderDuckDNS(DDNSProvider): + + url = "https://www.duckdns.org/update" + can_remove_records = False ++ supports_token_auth = True + + def update(self): + # Raise an error if no auth details are given. +@@ -914,6 +931,7 @@ class DDNSProviderDynUp(DDNSProvider): + + url = "https://dynup.de/dyn.php" + can_remove_records = False ++ supports_token_auth = False + + def update_protocol(self, proto): + data = { +@@ -979,6 +997,8 @@ class DDNSProviderEasyDNS(DDNSProvider): + + url = "http://api.cp.easydns.com/dyn/tomato.php" + ++ supports_token_auth = False ++ + def update_protocol(self, proto): + data = { + "myip" : self.get_address(proto, "-"), +@@ -1032,6 +1052,7 @@ class DDNSProviderDynsNet(DDNSProvider): + website = "http://www.dyns.net/" + protocols = ("ipv4",) + can_remove_records = False ++ supports_token_auth = False + + # There is very detailed informatio about how to send the update request and + # the possible response codes. (Currently we are using the v1.1 proto) +@@ -1083,6 +1104,7 @@ class DDNSProviderEnomCom(DDNSResponseParserXML, DDNSProvider): + + url = "https://dynamic.name-services.com/interface.asp" + can_remove_records = False ++ supports_token_auth = False + + def update_protocol(self, proto): + data = { +@@ -1125,6 +1147,7 @@ class DDNSProviderEntryDNS(DDNSProvider): + # here: https://entrydns.net/help + url = "https://entrydns.net/records/modify" + can_remove_records = False ++ supports_token_auth = True + + def update_protocol(self, proto): + data = { +@@ -1165,6 +1188,7 @@ class DDNSProviderFreeDNSAfraidOrg(DDNSProvider): + # page. All used values have been collected by testing. + url = "https://freedns.afraid.org/dynamic/update.php" + can_remove_records = False ++ supports_token_auth = True + + def update_protocol(self, proto): + data = { +@@ -1246,6 +1270,7 @@ class DDNSProviderKEYSYSTEMS(DDNSProvider): + + url = "https://dynamicdns.key-systems.net/update.php" + can_remove_records = False ++ supports_token_auth = False + + def update_protocol(self, proto): + address = self.get_address(proto) +@@ -1297,6 +1322,8 @@ class DDNSProviderLightningWireLabs(DDNSProvider): + # Information about the format of the HTTPS request is to be found + # https://dns.lightningwirelabs.com/knowledge-base/api/ddns + ++ supports_token_auth = True ++ + url = "https://dns.lightningwirelabs.com/update" + + def update(self): +@@ -1365,6 +1392,7 @@ class DDNSProviderNamecheap(DDNSResponseParserXML, DDNSProvider): + + url = "https://dynamicdns.park-your-domain.com/update" + can_remove_records = False ++ supports_token_auth = False + + def update_protocol(self, proto): + # Namecheap requires the hostname splitted into a host and domain part. +@@ -1458,6 +1486,8 @@ class DDNSProviderNsupdateINFO(DDNSProtocolDynDNS2, DDNSProvider): + # has not been implemented here, yet. + can_remove_records = False + ++ supports_token_auth = True ++ + # After a failed update, there will be no retries + # https://bugzilla.ipfire.org/show_bug.cgi?id=10603 + holdoff_failure_days = None +@@ -1534,6 +1564,7 @@ class DDNSProviderRegfish(DDNSProvider): + + url = "https://dyndns.regfish.de/" + can_remove_records = False ++ supports_token_auth = True + + def update(self): + data = { +@@ -1630,6 +1661,7 @@ class DDNSProviderServercow(DDNSProvider): + + url = "https://www.servercow.de/dnsupdate/update.php" + can_remove_records = False ++ supports_token_auth = False + + def update_protocol(self, proto): + data = { +@@ -1671,6 +1703,8 @@ class DDNSProviderSPDNS(DDNSProtocolDynDNS2, DDNSProvider): + + url = "https://update.spdyn.de/nic/update" + ++ supports_token_auth = True ++ + @property + def username(self): + return self.get("username") or self.hostname +@@ -1774,6 +1808,8 @@ class DDNSProviderZoneedit(DDNSProvider): + website = "http://www.zoneedit.com" + protocols = ("ipv4",) + ++ supports_token_auth = False ++ + # Detailed information about the request and the response codes can be + # obtained here: + # http://www.zoneedit.com/doc/api/other.html +@@ -1821,6 +1857,7 @@ class DDNSProviderDNSmadeEasy(DDNSProvider): + + url = "https://cp.dnsmadeeasy.com/servlet/updateip?" + can_remove_records = False ++ supports_token_auth = False + + def update_protocol(self, proto): + data = { +@@ -1871,6 +1908,7 @@ class DDNSProviderZZZZ(DDNSProvider): + + url = "https://zzzz.io/api/v1/update" + can_remove_records = False ++ supports_token_auth = True + + def update_protocol(self, proto): + data = { diff --git a/src/patches/ddns-013-proper-encode-string.patch b/src/patches/ddns-013-proper-encode-string.patch new file mode 100644 index 000000000..b101913e8 --- /dev/null +++ b/src/patches/ddns-013-proper-encode-string.patch @@ -0,0 +1,24 @@ +commit 27aea61ba3c8e561c4a5921aeb0ea0986d4d234c +Author: Johannes Schwietzke <johannes.schwietzke(a)web.de> +Date: Tue Dec 29 12:07:19 2020 +0100 + + providers.py: Proper encode string. + + Python 3 memoryview requires an encoded string. + + Signed-off-by: Johannes Schwietzke <johannes.schwietzke(a)web.de> + Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> + +diff --git a/src/ddns/providers.py b/src/ddns/providers.py +index b0066d5..56e6620 100644 +--- a/src/ddns/providers.py ++++ b/src/ddns/providers.py +@@ -547,7 +547,7 @@ class DDNSProviderBindNsupdate(DDNSProvider): + + logger.debug(" %s" % line) + +- return "\n".join(scriptlet) ++ return "\n".join(scriptlet).encode() + + + class DDNSProviderChangeIP(DDNSProvider): diff --git a/src/patches/dhcpcd/01_Fix_Linux_i386_for_SECCOMP_as_it_just_uses_socketcall.patch b/src/patches/dhcpcd/01_Fix_Linux_i386_for_SECCOMP_as_it_just_uses_socketcall.patch new file mode 100644 index 000000000..9efcde219 --- /dev/null +++ b/src/patches/dhcpcd/01_Fix_Linux_i386_for_SECCOMP_as_it_just_uses_socketcall.patch @@ -0,0 +1,36 @@ +diff --git a/src/privsep-linux.c b/src/privsep-linux.c +index 050a30cf..d31d720d 100644 +--- a/src/privsep-linux.c ++++ b/src/privsep-linux.c +@@ -32,6 +32,7 @@ + + #include <linux/audit.h> + #include <linux/filter.h> ++#include <linux/net.h> + #include <linux/seccomp.h> + #include <linux/sockios.h> + +@@ -304,6 +305,23 @@ static struct sock_filter ps_seccomp_filter[] = { + #ifdef __NR_sendto + SECCOMP_ALLOW(__NR_sendto), + #endif ++#ifdef __NR_socketcall ++ /* i386 needs this and demonstrates why SECCOMP ++ * is poor compared to OpenBSD pledge(2) and FreeBSD capsicum(4) ++ * as this is soooo tied to the kernel API which changes per arch ++ * and likely libc as well. */ ++ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_ACCEPT), ++ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_ACCEPT4), ++ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_LISTEN), ++ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_GETSOCKOPT), /* overflow */ ++ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_RECV), ++ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_RECVFROM), ++ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_RECVMSG), ++ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_SEND), ++ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_SENDMSG), ++ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_SENDTO), ++ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_SHUTDOWN), ++#endif + #ifdef __NR_shutdown + SECCOMP_ALLOW(__NR_shutdown), + #endif diff --git a/src/patches/dracut-038_add_sdhci-pci.patch b/src/patches/dracut-038_add_hyperv-keyboard_and_sdhci-pci.patch similarity index 92% rename from src/patches/dracut-038_add_sdhci-pci.patch rename to src/patches/dracut-038_add_hyperv-keyboard_and_sdhci-pci.patch index b002246d4..19ed15fd3 100644 --- a/src/patches/dracut-038_add_sdhci-pci.patch +++ b/src/patches/dracut-038_add_hyperv-keyboard_and_sdhci-pci.patch @@ -6,7 +6,7 @@ diff -Naur dracut-038.org/modules.d/90kernel-modules/module-setup.sh dracut-038/ hid-logitech-dj hid-microsoft firewire-ohci \ pcmcia usb_storage nvme hid-hyperv hv-vmbus \ - sdhci_acpi -+ sdhci_acpi sdhci_pci ++ hyperv-keyboard sdhci_acpi sdhci_pci if [[ "$(uname -p)" == arm* ]]; then # arm specific modules diff --git a/src/patches/findutils-4.6.0-glibc2.28.patch b/src/patches/findutils-4.6.0-glibc2.28.patch deleted file mode 100644 index 651c2d265..000000000 --- a/src/patches/findutils-4.6.0-glibc2.28.patch +++ /dev/null @@ -1,335 +0,0 @@ -Fix build failure on glibc-2.28: - fseeko.c: In function 'rpl_fseeko': - fseeko.c:110:4: error: #error "Please port gnulib fseeko.c to your platform! Look at the code in fseeko.c, then report this to bug-gnulib." - #error "Please port gnulib fseeko.c to your platform! Look at the code in fseeko.c, then report this to bug-gnulib." - -Patch by milan hodoscek. - -https://bugs.gentoo.org/663242 ---- a/old/stdio-impl.h -+++ b/gl/lib/stdio-impl.h -@@ -1,5 +1,5 @@ - /* Implementation details of FILE streams. -- Copyright (C) 2007-2008, 2010-2015 Free Software Foundation, Inc. -+ Copyright (C) 2007-2008, 2010-2018 Free Software Foundation, Inc. - - 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 -@@ -12,12 +12,18 @@ - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License -- along with this program. If not, see <http://www.gnu.org/licenses/>. */ -+ along with this program. If not, see <https://www.gnu.org/licenses/>. */ - - /* Many stdio implementations have the same logic and therefore can share - the same implementation of stdio extension API, except that some fields - have different naming conventions, or their access requires some casts. */ - -+/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this -+ problem by defining it ourselves. FIXME: Do not rely on glibc -+ internals. */ -+#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN -+# define _IO_IN_BACKUP 0x100 -+#endif - - /* BSD stdio derived implementations. */ - -@@ -29,10 +35,10 @@ - #include <errno.h> /* For detecting Plan9. */ - - #if defined __sferror || defined __DragonFly__ || defined __ANDROID__ -- /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ -+ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ - - # if defined __DragonFly__ /* DragonFly */ -- /* See <http://www.dragonflybsd.org/cvsweb/src/lib/libc/stdio/priv_stdio.h?rev=HEAD…>. */ -+ /* See <https://gitweb.dragonflybsd.org/dragonfly.git/blob_plain/HEAD:/lib/libc/std…>. */ - # define fp_ ((struct { struct __FILE_public pub; \ - struct { unsigned char *_base; int _size; } _bf; \ - void *cookie; \ -@@ -49,30 +55,84 @@ - fpos_t _offset; \ - /* More fields, not relevant here. */ \ - } *) fp) -- /* See <http://www.dragonflybsd.org/cvsweb/src/include/stdio.h?rev=HEAD&content-typ…>. */ -+ /* See <https://gitweb.dragonflybsd.org/dragonfly.git/blob_plain/HEAD:/include/stdi…>. */ - # define _p pub._p - # define _flags pub._flags - # define _r pub._r - # define _w pub._w -+# elif defined __ANDROID__ /* Android */ -+ /* Up to this commit from 2015-10-12 -+ <https://android.googlesource.com/platform/bionic.git/+/f0141dfab10a4b332769…> -+ the innards of FILE were public, and fp_ub could be defined like for OpenBSD, -+ see <https://android.googlesource.com/platform/bionic.git/+/e78392637d5086384a56…> -+ and <https://android.googlesource.com/platform/bionic.git/+/e78392637d5086384a56…>. -+ After this commit, the innards of FILE are hidden. */ -+# define fp_ ((struct { unsigned char *_p; \ -+ int _r; \ -+ int _w; \ -+ int _flags; \ -+ int _file; \ -+ struct { unsigned char *_base; size_t _size; } _bf; \ -+ int _lbfsize; \ -+ void *_cookie; \ -+ void *_close; \ -+ void *_read; \ -+ void *_seek; \ -+ void *_write; \ -+ struct { unsigned char *_base; size_t _size; } _ext; \ -+ unsigned char *_up; \ -+ int _ur; \ -+ unsigned char _ubuf[3]; \ -+ unsigned char _nbuf[1]; \ -+ struct { unsigned char *_base; size_t _size; } _lb; \ -+ int _blksize; \ -+ fpos_t _offset; \ -+ /* More fields, not relevant here. */ \ -+ } *) fp) - # else - # define fp_ fp - # endif - --# if (defined __NetBSD__ && __NetBSD_Version__ >= 105270000) || defined __OpenBSD__ || defined __ANDROID__ /* NetBSD >= 1.5ZA, OpenBSD, Android */ -+# if (defined __NetBSD__ && __NetBSD_Version__ >= 105270000) || defined __OpenBSD__ || defined __minix /* NetBSD >= 1.5ZA, OpenBSD, Minix 3 */ - /* See <http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libc/stdio/fileext.h?rev=HEAD&c…> -- and <http://www.openbsd.org/cgi-bin/cvsweb/src/lib/libc/stdio/fileext.h?rev=HEAD…> */ -+ and <https://cvsweb.openbsd.org/cgi-bin/cvsweb/src/lib/libc/stdio/fileext.h?rev=…> -+ and <https://github.com/Stichting-MINIX-Research-Foundation/minix/blob/master/li…> */ - struct __sfileext - { - struct __sbuf _ub; /* ungetc buffer */ - /* More fields, not relevant here. */ - }; - # define fp_ub ((struct __sfileext *) fp->_ext._base)->_ub --# else /* FreeBSD, NetBSD <= 1.5Z, DragonFly, Mac OS X, Cygwin, Android */ -+# elif defined __ANDROID__ /* Android */ -+ struct __sfileext -+ { -+ struct { unsigned char *_base; size_t _size; } _ub; /* ungetc buffer */ -+ /* More fields, not relevant here. */ -+ }; -+# define fp_ub ((struct __sfileext *) fp_->_ext._base)->_ub -+# else /* FreeBSD, NetBSD <= 1.5Z, DragonFly, Mac OS X, Cygwin */ - # define fp_ub fp_->_ub - # endif - - # define HASUB(fp) (fp_ub._base != NULL) - -+# if defined __ANDROID__ /* Android */ -+ /* Needed after this commit from 2016-01-25 -+ <https://android.googlesource.com/platform/bionic.git/+/e70e0e9267d069bf56a5…> */ -+# ifndef __SEOF -+# define __SLBF 1 -+# define __SNBF 2 -+# define __SRD 4 -+# define __SWR 8 -+# define __SRW 0x10 -+# define __SEOF 0x20 -+# define __SERR 0x40 -+# endif -+# ifndef __SOFF -+# define __SOFF 0x1000 -+# endif -+# endif -+ - #endif - - -@@ -81,7 +141,7 @@ - #ifdef __TANDEM /* NonStop Kernel */ - # ifndef _IOERR - /* These values were determined by the program 'stdioext-flags' at -- <http://lists.gnu.org/archive/html/bug-gnulib/2010-12/msg00165.html>. */ -+ <https://lists.gnu.org/r/bug-gnulib/2010-12/msg00165.html>. */ - # define _IOERR 0x40 - # define _IOREAD 0x80 - # define _IOWRT 0x4 -@@ -99,6 +159,8 @@ - int _file; \ - unsigned int _flag; \ - } *) fp) -+# elif defined __VMS /* OpenVMS */ -+# define fp_ ((struct _iobuf *) fp) - # else - # define fp_ fp - # endif -@@ -110,4 +172,31 @@ - # define _flag __flag - # endif - -+#elif defined _WIN32 && ! defined __CYGWIN__ /* newer Windows with MSVC */ -+ -+/* <stdio.h> does not define the innards of FILE any more. */ -+# define WINDOWS_OPAQUE_FILE -+ -+struct _gl_real_FILE -+{ -+ /* Note: Compared to older Windows and to mingw, it has the fields -+ _base and _cnt swapped. */ -+ unsigned char *_ptr; -+ unsigned char *_base; -+ int _cnt; -+ int _flag; -+ int _file; -+ int _charbuf; -+ int _bufsiz; -+}; -+# define fp_ ((struct _gl_real_FILE *) fp) -+ -+/* These values were determined by a program similar to the one at -+ <https://lists.gnu.org/r/bug-gnulib/2010-12/msg00165.html>. */ -+# define _IOREAD 0x1 -+# define _IOWRT 0x2 -+# define _IORW 0x4 -+# define _IOEOF 0x8 -+# define _IOERR 0x10 -+ - #endif ---- a/old/fseeko.c -+++ b/gl/lib/fseeko.c -@@ -1,5 +1,5 @@ - /* An fseeko() function that, together with fflush(), is POSIX compliant. -- Copyright (C) 2007-2015 Free Software Foundation, Inc. -+ Copyright (C) 2007-2018 Free Software Foundation, Inc. - - 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 -@@ -12,7 +12,7 @@ - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along -- with this program; if not, see <http://www.gnu.org/licenses/>. */ -+ with this program; if not, see <https://www.gnu.org/licenses/>. */ - - #include <config.h> - -@@ -33,9 +33,9 @@ fseeko (FILE *fp, off_t offset, int whence) - #endif - #if _GL_WINDOWS_64_BIT_OFF_T - # undef fseeko --# if HAVE__FSEEKI64 /* msvc, mingw64 */ -+# if HAVE__FSEEKI64 && HAVE_DECL__FSEEKI64 /* msvc, mingw since msvcrt8.0, mingw64 */ - # define fseeko _fseeki64 --# else /* mingw */ -+# else /* mingw before msvcrt8.0 */ - # define fseeko fseeko64 - # endif - #endif -@@ -47,12 +47,13 @@ fseeko (FILE *fp, off_t offset, int whence) - #endif - - /* These tests are based on fpurge.c. */ --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 -+ /* GNU libc, BeOS, Haiku, Linux libc5 */ - if (fp->_IO_read_end == fp->_IO_read_ptr - && fp->_IO_write_ptr == fp->_IO_write_base - && fp->_IO_save_base == NULL) - #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ -- /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ -+ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ - # if defined __SL64 && defined __SCLE /* Cygwin */ - if ((fp->_flags & __SL64) == 0) - { -@@ -80,7 +81,7 @@ fseeko (FILE *fp, off_t offset, int whence) - #elif defined __minix /* Minix */ - if (fp_->_ptr == fp_->_buf - && (fp_->_ptr == NULL || fp_->_count == 0)) --#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, NonStop Kernel */ -+#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, MSVC, NonStop Kernel, OpenVMS */ - if (fp_->_ptr == fp_->_base - && (fp_->_ptr == NULL || fp_->_cnt == 0)) - #elif defined __UCLIBC__ /* uClibc */ -@@ -117,18 +118,19 @@ fseeko (FILE *fp, off_t offset, int whence) - if (pos == -1) - { - #if defined __sferror || defined __DragonFly__ || defined __ANDROID__ -- /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ -+ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ - fp_->_flags &= ~__SOFF; - #endif - return -1; - } - --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 -+ /* GNU libc, BeOS, Haiku, Linux libc5 */ - fp->_flags &= ~_IO_EOF_SEEN; - fp->_offset = pos; - #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ -- /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ --# if defined __CYGWIN__ || (defined __NetBSD__ && __NetBSD_Version__ >= 600000000) -+ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ -+# if defined __CYGWIN__ || (defined __NetBSD__ && __NetBSD_Version__ >= 600000000) || defined __minix - /* fp_->_offset is typed as an integer. */ - fp_->_offset = pos; - # else -@@ -150,8 +152,8 @@ fseeko (FILE *fp, off_t offset, int whence) - fp_->_flags &= ~__SEOF; - #elif defined __EMX__ /* emx+gcc */ - fp->_flags &= ~_IOEOF; --#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, NonStop Kernel */ -- fp->_flag &= ~_IOEOF; -+#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, MSVC, NonStop Kernel, OpenVMS */ -+ fp_->_flag &= ~_IOEOF; - #elif defined __MINT__ /* Atari FreeMiNT */ - fp->__offset = pos; - fp->__eof = 0; ---- a/old/freadahead.c -+++ b/gl/lib/freadahead.c -@@ -1,5 +1,5 @@ - /* Retrieve information about a FILE stream. -- Copyright (C) 2007-2015 Free Software Foundation, Inc. -+ Copyright (C) 2007-2018 Free Software Foundation, Inc. - - 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 -@@ -12,7 +12,7 @@ - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License -- along with this program. If not, see <http://www.gnu.org/licenses/>. */ -+ along with this program. If not, see <https://www.gnu.org/licenses/>. */ - - #include <config.h> - -@@ -22,17 +22,26 @@ - #include <stdlib.h> - #include "stdio-impl.h" - -+#if defined __DragonFly__ -+/* Defined in libc, but not declared in <stdio.h>. */ -+extern size_t __sreadahead (FILE *); -+#endif -+ -+/* This file is not used on systems that have the __freadahead function, -+ namely musl libc. */ -+ - size_t - freadahead (FILE *fp) - { --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 -+ /* GNU libc, BeOS, Haiku, Linux libc5 */ - if (fp->_IO_write_ptr > fp->_IO_write_base) - return 0; - return (fp->_IO_read_end - fp->_IO_read_ptr) - + (fp->_flags & _IO_IN_BACKUP ? fp->_IO_save_end - fp->_IO_save_base : - 0); - #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ -- /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ -+ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ - if ((fp_->_flags & __SWR) != 0 || fp_->_r < 0) - return 0; - # if defined __DragonFly__ -@@ -53,7 +62,7 @@ freadahead (FILE *fp) - if ((fp_->_flags & _IOWRITING) != 0) - return 0; - return fp_->_count; --#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, NonStop Kernel */ -+#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, MSVC, NonStop Kernel, OpenVMS */ - if ((fp_->_flag & _IOWRT) != 0) - return 0; - return fp_->_cnt; diff --git a/src/patches/fuse-2.9.2-namespace-conflict-fix.patch b/src/patches/fuse-2.9.2-namespace-conflict-fix.patch deleted file mode 100644 index ae67e7d45..000000000 --- a/src/patches/fuse-2.9.2-namespace-conflict-fix.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up fuse-2.9.2/include/fuse_kernel.h.conflictfix fuse-2.9.2/include/fuse_kernel.h ---- fuse-2.9.2/include/fuse_kernel.h.conflictfix 2013-06-26 09:31:57.862198038 -0400 -+++ fuse-2.9.2/include/fuse_kernel.h 2013-06-26 09:32:19.679198365 -0400 -@@ -88,12 +88,16 @@ - #ifndef _LINUX_FUSE_H - #define _LINUX_FUSE_H - --#include <sys/types.h> -+#ifdef __linux__ -+#include <linux/types.h> -+#else -+#include <stdint.h> - #define __u64 uint64_t - #define __s64 int64_t - #define __u32 uint32_t - #define __s32 int32_t - #define __u16 uint16_t -+#endif - - /* - * Version negotiation: diff --git a/src/patches/hostapd/hostapd-2.9-noscan.patch b/src/patches/hostapd/hostapd-2.9-noscan.patch index c4df23029..638b76f84 100644 --- a/src/patches/hostapd/hostapd-2.9-noscan.patch +++ b/src/patches/hostapd/hostapd-2.9-noscan.patch @@ -1,10 +1,9 @@ -diff U3 hostapd/config_file.c hostapd/config_file.c ---- a/hostapd/config_file.c Wed Aug 7 15:25:25 2019 -+++ b/hostapd/config_file.c Fri Sep 20 17:36:33 2019 -@@ -3411,6 +3411,10 @@ +--- a/hostapd/config_file.c ++++ b/hostapd/config_file.c +@@ -3493,6 +3493,10 @@ static int hostapd_config_fill(struct ho + if (bss->ocv && !bss->ieee80211w) bss->ieee80211w = 1; #endif /* CONFIG_OCV */ - #ifdef CONFIG_IEEE80211N + } else if (os_strcmp(buf, "noscan") == 0) { + conf->noscan = atoi(pos); + } else if (os_strcmp(buf, "ht_coex") == 0) { @@ -12,10 +11,9 @@ diff U3 hostapd/config_file.c hostapd/config_file.c } else if (os_strcmp(buf, "ieee80211n") == 0) { conf->ieee80211n = atoi(pos); } else if (os_strcmp(buf, "ht_capab") == 0) { -diff U3 src/ap/ap_config.h src/ap/ap_config.h ---- a/src/ap/ap_config.h Wed Aug 7 15:25:25 2019 -+++ b/src/ap/ap_config.h Fri Sep 20 17:38:06 2019 -@@ -932,6 +932,8 @@ +--- a/src/ap/ap_config.h ++++ b/src/ap/ap_config.h +@@ -984,6 +984,8 @@ struct hostapd_config { int ht_op_mode_fixed; u16 ht_capab; @@ -24,10 +22,9 @@ diff U3 src/ap/ap_config.h src/ap/ap_config.h int ieee80211n; int secondary_channel; int no_pri_sec_switch; -diff U3 src/ap/hw_features.c src/ap/hw_features.c ---- a/src/ap/hw_features.c Wed Aug 7 15:25:25 2019 -+++ b/src/ap/hw_features.c Fri Sep 20 17:39:02 2019 -@@ -477,7 +477,8 @@ +--- a/src/ap/hw_features.c ++++ b/src/ap/hw_features.c +@@ -500,7 +500,8 @@ static int ieee80211n_check_40mhz(struct int ret; /* Check that HT40 is used and PRI / SEC switch is allowed */ @@ -37,10 +34,9 @@ diff U3 src/ap/hw_features.c src/ap/hw_features.c return 0; hostapd_set_state(iface, HAPD_IFACE_HT_SCAN); -diff U3 src/ap/ieee802_11_ht.c src/ap/ieee802_11_ht.c ---- a/src/ap/ieee802_11_ht.c Wed Aug 7 15:25:25 2019 -+++ b/src/ap/ieee802_11_ht.c Fri Sep 20 17:41:24 2019 -@@ -252,6 +252,9 @@ +--- a/src/ap/ieee802_11_ht.c ++++ b/src/ap/ieee802_11_ht.c +@@ -230,6 +230,9 @@ void hostapd_2040_coex_action(struct hos return; } @@ -50,13 +46,13 @@ diff U3 src/ap/ieee802_11_ht.c src/ap/ieee802_11_ht.c if (len < IEEE80211_HDRLEN + 2 + sizeof(*bc_ie)) { wpa_printf(MSG_DEBUG, "Ignore too short 20/40 BSS Coexistence Management frame"); -@@ -410,6 +413,9 @@ - void ht40_intolerant_add(struct hostapd_iface *iface, struct sta_info *sta) - { +@@ -390,6 +393,9 @@ void ht40_intolerant_add(struct hostapd_ if (iface->current_mode->mode != HOSTAPD_MODE_IEEE80211G) -+ return; -+ -+ if (iface->conf->noscan || iface->conf->no_ht_coex) return; ++ if (iface->conf->noscan || iface->conf->no_ht_coex) ++ return; ++ wpa_printf(MSG_INFO, "HT: Forty MHz Intolerant is set by STA " MACSTR + " in Association Request", MAC2STR(sta->addr)); + diff --git a/src/patches/iperf3/iperf-3.7-remove-pg-flag.patch b/src/patches/iperf3/iperf-3.9-remove-pg-flag.patch similarity index 68% rename from src/patches/iperf3/iperf-3.7-remove-pg-flag.patch rename to src/patches/iperf3/iperf-3.9-remove-pg-flag.patch index 1dae2c211..e5fafe4af 100644 --- a/src/patches/iperf3/iperf-3.7-remove-pg-flag.patch +++ b/src/patches/iperf3/iperf-3.9-remove-pg-flag.patch @@ -1,6 +1,6 @@ -diff -Naur iperf-3.7.org/src/Makefile.am iperf-3.7/src/Makefile.am ---- iperf-3.7.org/src/Makefile.am 2019-06-21 03:12:47.000000000 +0200 -+++ iperf-3.7/src/Makefile.am 2019-07-17 12:19:38.133540594 +0200 +diff -Naur iperf-3.9.org/src/Makefile.am iperf-3.9/src/Makefile.am +--- iperf-3.9.org/src/Makefile.am 2020-08-15 00:08:27.000000000 +0200 ++++ iperf-3.9/src/Makefile.am 2020-12-22 22:16:14.488228000 +0100 @@ -58,9 +58,9 @@ iperf3_profile_SOURCES = main.c \ $(libiperf_la_SOURCES) @@ -13,10 +13,10 @@ diff -Naur iperf-3.7.org/src/Makefile.am iperf-3.7/src/Makefile.am endif # Specify the sources and various flags for the test cases -diff -Naur iperf-3.7.org/src/Makefile.in iperf-3.7/src/Makefile.in ---- iperf-3.7.org/src/Makefile.in 2019-06-21 03:12:47.000000000 +0200 -+++ iperf-3.7/src/Makefile.in 2019-07-17 12:19:53.133496336 +0200 -@@ -670,9 +670,9 @@ +diff -Naur iperf-3.9.org/src/Makefile.in iperf-3.9/src/Makefile.in +--- iperf-3.9.org/src/Makefile.in 2020-08-15 00:08:27.000000000 +0200 ++++ iperf-3.9/src/Makefile.in 2020-12-22 22:16:41.934746000 +0100 +@@ -680,9 +680,9 @@ @ENABLE_PROFILING_TRUE@iperf3_profile_SOURCES = main.c \ @ENABLE_PROFILING_TRUE@ $(libiperf_la_SOURCES) diff --git a/src/patches/krb5-1.18.3_prevent_spurious_text.patch b/src/patches/krb5-1.18.3_prevent_spurious_text.patch new file mode 100644 index 000000000..0e3015379 --- /dev/null +++ b/src/patches/krb5-1.18.3_prevent_spurious_text.patch @@ -0,0 +1,18 @@ +Submitted By: linuxfromscratch DOT org +Date: 2020-11-19 +Initial Package Version: 1.18.3 +Origin: http://www.linuxfromscratch.org/blfs/view/svn/postlfs/mitkrb.html +Description: Patch increases the width of the virtual terminal used for some tests to prevent some spurious text in the output which is taken as a failure. + +diff --color -Nur krb5-1.18.3.orig/src/tests/dejagnu/config/default.exp krb5-1.18.3/src/tests/dejagnu/config/default.exp +--- krb5-1.18.3.orig/src/tests/dejagnu/config/default.exp 2020-12-07 04:51:12.997708618 +0100 ++++ krb5-1.18.3/src/tests/dejagnu/config/default.exp 2020-12-07 04:56:29.805839425 +0100 +@@ -12,7 +12,7 @@ + # realm name, defaulting to KRBTEST.COM. + + set timeout 100 +-set stty_init {erase \^h kill \^u} ++set stty_init {erase \^h kill \^u cols 300} + set env(TERM) dumb + + set des3_krbtgt 0 diff --git a/src/patches/krb5-1.18.3_remove_known_failed_test.patch b/src/patches/krb5-1.18.3_remove_known_failed_test.patch new file mode 100644 index 000000000..b148d4248 --- /dev/null +++ b/src/patches/krb5-1.18.3_remove_known_failed_test.patch @@ -0,0 +1,18 @@ +Submitted By: linuxfromscratch DOT org +Date: 2020-11-19 +Initial Package Version: 1.18.3 +Origin: http://www.linuxfromscratch.org/blfs/view/svn/postlfs/mitkrb.html +Description: Patch removes a test that is known to fail. + +diff --color -Nur krb5-1.18.3.orig/src/plugins/kdb/db2/libdb2/test/run.test krb5-1.18.3/src/plugins/kdb/db2/libdb2/test/run.test +--- krb5-1.18.3.orig/src/plugins/kdb/db2/libdb2/test/run.test 2020-12-07 04:58:27.210999666 +0100 ++++ krb5-1.18.3/src/plugins/kdb/db2/libdb2/test/run.test 2020-12-07 04:58:48.579210832 +0100 +@@ -38,7 +38,7 @@ + find $bindir -type f -exec test -r {} \; -print | head -100 > $BINFILES + + if [ $# -eq 0 ]; then +- for t in 1 2 3 4 5 6 7 8 9 10 11 12 13 20 40 41 50 60 61 62 63; do ++ for t in 1 2 3 4 5 6 7 8 9 10 11 13 20 40 41 50 60 61 62 63; do + test$t + done + else diff --git a/src/patches/libloc-0.9.4-upstream.patch b/src/patches/libloc-0.9.4-upstream.patch deleted file mode 100644 index a6ec1066b..000000000 --- a/src/patches/libloc-0.9.4-upstream.patch +++ /dev/null @@ -1,3850 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index a0431a6..dc594f8 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -91,11 +91,14 @@ EXTRA_DIST += \ - pkginclude_HEADERS = \ - src/loc/libloc.h \ - src/loc/as.h \ -+ src/loc/as-list.h \ - src/loc/compat.h \ - src/loc/country.h \ -+ src/loc/country-list.h \ - src/loc/database.h \ - src/loc/format.h \ - src/loc/network.h \ -+ src/loc/network-list.h \ - src/loc/private.h \ - src/loc/stringpool.h \ - src/loc/resolv.h \ -@@ -107,9 +110,12 @@ lib_LTLIBRARIES = \ - src_libloc_la_SOURCES = \ - src/libloc.c \ - src/as.c \ -+ src/as-list.c \ - src/country.c \ -+ src/country-list.c \ - src/database.c \ - src/network.c \ -+ src/network-list.c \ - src/resolv.c \ - src/stringpool.c \ - src/writer.c -@@ -312,6 +318,7 @@ check_PROGRAMS = \ - src/test-database \ - src/test-as \ - src/test-network \ -+ src/test-network-list \ - src/test-country \ - src/test-signature - -@@ -351,6 +358,15 @@ src_test_network_CFLAGS = \ - src_test_network_LDADD = \ - src/libloc.la - -+src_test_network_list_SOURCES = \ -+ src/test-network-list.c -+ -+src_test_network_list_CFLAGS = \ -+ $(TESTS_CFLAGS) -+ -+src_test_network_list_LDADD = \ -+ src/libloc.la -+ - src_test_stringpool_SOURCES = \ - src/test-stringpool.c - -@@ -390,7 +406,7 @@ MANPAGES_XML = $(patsubst %.txt,%.xml,$(MANPAGES_TXT)) - .PHONY: man - man: $(MANPAGES) $(MANPAGES_HTML) - --if ENABLE_MANPAGES -+if ENABLE_MAN_PAGES - man_MANS = \ - $(MANPAGES) - endif -diff --git a/configure.ac b/configure.ac -index 2364dfd..9eb9012 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1,6 +1,6 @@ - AC_PREREQ(2.60) - AC_INIT([libloc], -- [0.9.4], -+ [0.9.5], - [location(a)lists.ipfire.org], - [libloc], - [https://location.ipfire.org/]) -@@ -43,16 +43,16 @@ AC_PROG_MKDIR_P - - # - man ------------------------------------------------------------------------ - --have_manpages=no --AC_ARG_ENABLE(manpages, AS_HELP_STRING([--disable-man-pages], -+have_man_pages=no -+AC_ARG_ENABLE(man_pages, AS_HELP_STRING([--disable-man-pages], - [do not install man pages])) --AS_IF([test "x$enable_manpages" != xno], [have_manpages=yes]) --AM_CONDITIONAL(ENABLE_MANPAGES, [test "x$have_manpages" = "xyes"]) -+AS_IF([test "x$enable_man_pages" != xno], [have_man_pages=yes]) -+AM_CONDITIONAL(ENABLE_MAN_PAGES, [test "x$have_man_pages" = "xyes"]) - - AC_PATH_PROG([XSLTPROC], [xsltproc]) - - AC_CHECK_PROGS(ASCIIDOC, [asciidoc]) --if test "${have_manpages}" = "yes" && test -z "${ASCIIDOC}"; then -+if test "${have_man_pages}" = "yes" && test -z "${ASCIIDOC}"; then - AC_MSG_ERROR([Required program 'asciidoc' not found]) - fi - # - debug ---------------------------------------------------------------------- -diff --git a/src/.gitignore b/src/.gitignore -index caf80b5..3ccbdb8 100644 ---- a/src/.gitignore -+++ b/src/.gitignore -@@ -10,5 +10,6 @@ test-libloc - test-database - test-country - test-network -+test-network-list - test-signature - test-stringpool -diff --git a/src/as-list.c b/src/as-list.c -new file mode 100644 -index 0000000..5acbb8a ---- /dev/null -+++ b/src/as-list.c -@@ -0,0 +1,161 @@ -+/* -+ libloc - A library to determine the location of someone on the Internet -+ -+ Copyright (C) 2020 IPFire Development Team <info(a)ipfire.org> -+ -+ This library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ This library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+*/ -+ -+#include <errno.h> -+#include <stdlib.h> -+ -+#include <loc/as.h> -+#include <loc/as-list.h> -+#include <loc/private.h> -+ -+struct loc_as_list { -+ struct loc_ctx* ctx; -+ int refcount; -+ -+ struct loc_as** elements; -+ size_t elements_size; -+ -+ size_t size; -+}; -+ -+static int loc_as_list_grow(struct loc_as_list* list, size_t size) { -+ DEBUG(list->ctx, "Growing AS list %p by %zu to %zu\n", -+ list, size, list->elements_size + size); -+ -+ struct loc_as** elements = reallocarray(list->elements, -+ list->elements_size + size, sizeof(*list->elements)); -+ if (!elements) -+ return -errno; -+ -+ list->elements = elements; -+ list->elements_size += size; -+ -+ return 0; -+} -+ -+LOC_EXPORT int loc_as_list_new(struct loc_ctx* ctx, -+ struct loc_as_list** list) { -+ struct loc_as_list* l = calloc(1, sizeof(*l)); -+ if (!l) -+ return -ENOMEM; -+ -+ l->ctx = loc_ref(ctx); -+ l->refcount = 1; -+ -+ DEBUG(l->ctx, "AS list allocated at %p\n", l); -+ *list = l; -+ -+ return 0; -+} -+ -+LOC_EXPORT struct loc_as_list* loc_as_list_ref(struct loc_as_list* list) { -+ list->refcount++; -+ -+ return list; -+} -+ -+static void loc_as_list_free(struct loc_as_list* list) { -+ DEBUG(list->ctx, "Releasing AS list at %p\n", list); -+ -+ loc_as_list_clear(list); -+ -+ loc_unref(list->ctx); -+ free(list); -+} -+ -+LOC_EXPORT struct loc_as_list* loc_as_list_unref(struct loc_as_list* list) { -+ if (!list) -+ return NULL; -+ -+ if (--list->refcount > 0) -+ return list; -+ -+ loc_as_list_free(list); -+ return NULL; -+} -+ -+LOC_EXPORT size_t loc_as_list_size(struct loc_as_list* list) { -+ return list->size; -+} -+ -+LOC_EXPORT int loc_as_list_empty(struct loc_as_list* list) { -+ return list->size == 0; -+} -+ -+LOC_EXPORT void loc_as_list_clear(struct loc_as_list* list) { -+ if (!list->elements) -+ return; -+ -+ for (unsigned int i = 0; i < list->size; i++) -+ loc_as_unref(list->elements[i]); -+ -+ free(list->elements); -+ list->elements = NULL; -+ list->elements_size = 0; -+ -+ list->size = 0; -+} -+ -+LOC_EXPORT struct loc_as* loc_as_list_get(struct loc_as_list* list, size_t index) { -+ // Check index -+ if (index >= list->size) -+ return NULL; -+ -+ return loc_as_ref(list->elements[index]); -+} -+ -+LOC_EXPORT int loc_as_list_append( -+ struct loc_as_list* list, struct loc_as* as) { -+ if (loc_as_list_contains(list, as)) -+ return 0; -+ -+ // Check if we have space left -+ if (list->size >= list->elements_size) { -+ int r = loc_as_list_grow(list, 64); -+ if (r) -+ return r; -+ } -+ -+ DEBUG(list->ctx, "%p: Appending AS %p to list\n", list, as); -+ -+ list->elements[list->size++] = loc_as_ref(as); -+ -+ return 0; -+} -+ -+LOC_EXPORT int loc_as_list_contains( -+ struct loc_as_list* list, struct loc_as* as) { -+ for (unsigned int i = 0; i < list->size; i++) { -+ if (loc_as_cmp(as, list->elements[i]) == 0) -+ return 1; -+ } -+ -+ return 0; -+} -+ -+LOC_EXPORT int loc_as_list_contains_number( -+ struct loc_as_list* list, uint32_t number) { -+ struct loc_as* as; -+ -+ int r = loc_as_new(list->ctx, &as, number); -+ if (r) -+ return -1; -+ -+ r = loc_as_list_contains(list, as); -+ loc_as_unref(as); -+ -+ return r; -+} -diff --git a/src/as.c b/src/as.c -index e1fbb01..757bf3d 100644 ---- a/src/as.c -+++ b/src/as.c -@@ -90,7 +90,13 @@ LOC_EXPORT const char* loc_as_get_name(struct loc_as* as) { - } - - LOC_EXPORT int loc_as_set_name(struct loc_as* as, const char* name) { -- as->name = strdup(name); -+ if (as->name) -+ free(as->name); -+ -+ if (name) -+ as->name = strdup(name); -+ else -+ as->name = NULL; - - return 0; - } -@@ -139,6 +145,10 @@ int loc_as_match_string(struct loc_as* as, const char* string) { - if (!string) - return 1; - -+ // Cannot match anything when name is not set -+ if (!as->name) -+ return 1; -+ - // Search if string is in name - if (strcasestr(as->name, string) != NULL) - return 1; -diff --git a/src/country-list.c b/src/country-list.c -new file mode 100644 -index 0000000..cc36740 ---- /dev/null -+++ b/src/country-list.c -@@ -0,0 +1,161 @@ -+/* -+ libloc - A library to determine the location of someone on the Internet -+ -+ Copyright (C) 2020 IPFire Development Team <info(a)ipfire.org> -+ -+ This library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ This library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+*/ -+ -+#include <errno.h> -+#include <stdlib.h> -+ -+#include <loc/country.h> -+#include <loc/country-list.h> -+#include <loc/private.h> -+ -+struct loc_country_list { -+ struct loc_ctx* ctx; -+ int refcount; -+ -+ struct loc_country** elements; -+ size_t elements_size; -+ -+ size_t size; -+}; -+ -+static int loc_country_list_grow(struct loc_country_list* list, size_t size) { -+ DEBUG(list->ctx, "Growing country list %p by %zu to %zu\n", -+ list, size, list->elements_size + size); -+ -+ struct loc_country** elements = reallocarray(list->elements, -+ list->elements_size + size, sizeof(*list->elements)); -+ if (!elements) -+ return -errno; -+ -+ list->elements = elements; -+ list->elements_size += size; -+ -+ return 0; -+} -+ -+LOC_EXPORT int loc_country_list_new(struct loc_ctx* ctx, -+ struct loc_country_list** list) { -+ struct loc_country_list* l = calloc(1, sizeof(*l)); -+ if (!l) -+ return -ENOMEM; -+ -+ l->ctx = loc_ref(ctx); -+ l->refcount = 1; -+ -+ DEBUG(l->ctx, "Country list allocated at %p\n", l); -+ *list = l; -+ -+ return 0; -+} -+ -+LOC_EXPORT struct loc_country_list* loc_country_list_ref(struct loc_country_list* list) { -+ list->refcount++; -+ -+ return list; -+} -+ -+static void loc_country_list_free(struct loc_country_list* list) { -+ DEBUG(list->ctx, "Releasing country list at %p\n", list); -+ -+ loc_country_list_clear(list); -+ -+ loc_unref(list->ctx); -+ free(list); -+} -+ -+LOC_EXPORT struct loc_country_list* loc_country_list_unref(struct loc_country_list* list) { -+ if (!list) -+ return NULL; -+ -+ if (--list->refcount > 0) -+ return list; -+ -+ loc_country_list_free(list); -+ return NULL; -+} -+ -+LOC_EXPORT size_t loc_country_list_size(struct loc_country_list* list) { -+ return list->size; -+} -+ -+LOC_EXPORT int loc_country_list_empty(struct loc_country_list* list) { -+ return list->size == 0; -+} -+ -+LOC_EXPORT void loc_country_list_clear(struct loc_country_list* list) { -+ if (!list->elements) -+ return; -+ -+ for (unsigned int i = 0; i < list->size; i++) -+ loc_country_unref(list->elements[i]); -+ -+ free(list->elements); -+ list->elements = NULL; -+ list->elements_size = 0; -+ -+ list->size = 0; -+} -+ -+LOC_EXPORT struct loc_country* loc_country_list_get(struct loc_country_list* list, size_t index) { -+ // Check index -+ if (index >= list->size) -+ return NULL; -+ -+ return loc_country_ref(list->elements[index]); -+} -+ -+LOC_EXPORT int loc_country_list_append( -+ struct loc_country_list* list, struct loc_country* country) { -+ if (loc_country_list_contains(list, country)) -+ return 0; -+ -+ // Check if we have space left -+ if (list->size >= list->elements_size) { -+ int r = loc_country_list_grow(list, 64); -+ if (r) -+ return r; -+ } -+ -+ DEBUG(list->ctx, "%p: Appending country %p to list\n", list, country); -+ -+ list->elements[list->size++] = loc_country_ref(country); -+ -+ return 0; -+} -+ -+LOC_EXPORT int loc_country_list_contains( -+ struct loc_country_list* list, struct loc_country* country) { -+ for (unsigned int i = 0; i < list->size; i++) { -+ if (loc_country_cmp(country, list->elements[i]) == 0) -+ return 1; -+ } -+ -+ return 0; -+} -+ -+LOC_EXPORT int loc_country_list_contains_code( -+ struct loc_country_list* list, const char* code) { -+ struct loc_country* country; -+ -+ int r = loc_country_new(list->ctx, &country, code); -+ if (r) -+ return -1; -+ -+ r = loc_country_list_contains(list, country); -+ loc_country_unref(country); -+ -+ return r; -+} -diff --git a/src/country.c b/src/country.c -index 2ba93e6..7aac0db 100644 ---- a/src/country.c -+++ b/src/country.c -@@ -34,6 +34,9 @@ struct loc_country { - }; - - LOC_EXPORT int loc_country_new(struct loc_ctx* ctx, struct loc_country** country, const char* country_code) { -+ if (!loc_country_code_is_valid(country_code)) -+ return -EINVAL; -+ - struct loc_country* c = calloc(1, sizeof(*c)); - if (!c) - return -ENOMEM; -diff --git a/src/database.c b/src/database.c -index fa1dad0..4b8bf1d 100644 ---- a/src/database.c -+++ b/src/database.c -@@ -38,8 +38,10 @@ - - #include <loc/libloc.h> - #include <loc/as.h> -+#include <loc/as-list.h> - #include <loc/compat.h> - #include <loc/country.h> -+#include <loc/country-list.h> - #include <loc/database.h> - #include <loc/format.h> - #include <loc/network.h> -@@ -99,11 +101,14 @@ struct loc_database_enumerator { - - // Search string - char* string; -- char country_code[3]; -- uint32_t asn; -+ struct loc_country_list* countries; -+ struct loc_as_list* asns; - enum loc_network_flags flags; - int family; - -+ // Flatten output? -+ int flatten; -+ - // Index of the AS we are looking at - unsigned int as_index; - -@@ -115,6 +120,9 @@ struct loc_database_enumerator { - struct loc_node_stack network_stack[MAX_STACK_DEPTH]; - int network_stack_depth; - unsigned int* networks_visited; -+ -+ // For subnet search -+ struct loc_network_list* stack; - }; - - static int loc_database_read_magic(struct loc_database* db) { -@@ -242,11 +250,11 @@ static int loc_database_read_signature(struct loc_database* db, - char** dst, char* src, size_t length) { - // Check for a plausible signature length - if (length > LOC_SIGNATURE_MAX_LENGTH) { -- ERROR(db->ctx, "Signature too long: %ld\n", length); -+ ERROR(db->ctx, "Signature too long: %zu\n", length); - return -EINVAL; - } - -- DEBUG(db->ctx, "Reading signature of %ld bytes\n", length); -+ DEBUG(db->ctx, "Reading signature of %zu bytes\n", length); - - // Allocate space - *dst = malloc(length); -@@ -611,7 +619,7 @@ LOC_EXPORT int loc_database_verify(struct loc_database* db, FILE* f) { - } - - clock_t end = clock(); -- DEBUG(db->ctx, "Signature checked in %.4fms\n", -+ INFO(db->ctx, "Signature checked in %.4fms\n", - (double)(end - start) / CLOCKS_PER_SEC * 1000); - - CLEANUP: -@@ -671,8 +679,10 @@ LOC_EXPORT int loc_database_get_as(struct loc_database* db, struct loc_as** as, - off_t lo = 0; - off_t hi = db->as_count - 1; - -+#ifdef ENABLE_DEBUG - // Save start time - clock_t start = clock(); -+#endif - - while (lo <= hi) { - off_t i = (lo + hi) / 2; -@@ -685,11 +695,13 @@ LOC_EXPORT int loc_database_get_as(struct loc_database* db, struct loc_as** as, - // Check if this is a match - uint32_t as_number = loc_as_get_number(*as); - if (as_number == number) { -+#ifdef ENABLE_DEBUG - clock_t end = clock(); - - // Log how fast this has been - DEBUG(db->ctx, "Found AS%u in %.4fms\n", as_number, - (double)(end - start) / CLOCKS_PER_SEC * 1000); -+#endif - - return 0; - } -@@ -733,11 +745,13 @@ static int loc_database_fetch_network(struct loc_database* db, struct loc_networ - return -1; - } - -+#ifdef ENABLE_DEBUG - if (r == 0) { - char* string = loc_network_str(*network); - DEBUG(db->ctx, "Got network %s\n", string); - free(string); - } -+#endif - - return r; - } -@@ -762,8 +776,7 @@ static int __loc_database_lookup_handle_leaf(struct loc_database* db, const stru - } - - // Check if the given IP address is inside the network -- r = loc_network_match_address(*network, address); -- if (r) { -+ if (!loc_network_match_address(*network, address)) { - DEBUG(db->ctx, "Searched address is not part of the network\n"); - - loc_network_unref(*network); -@@ -832,17 +845,21 @@ LOC_EXPORT int loc_database_lookup(struct loc_database* db, - - *network = NULL; - -+#ifdef ENABLE_DEBUG - // Save start time - clock_t start = clock(); -+#endif - - int r = __loc_database_lookup(db, address, network, &network_address, - db->network_nodes_v1, 0); - -+#ifdef ENABLE_DEBUG - clock_t end = clock(); - - // Log how fast this has been - DEBUG(db->ctx, "Executed network search in %.4fms\n", - (double)(end - start) / CLOCKS_PER_SEC * 1000); -+#endif - - return r; - } -@@ -889,8 +906,10 @@ LOC_EXPORT int loc_database_get_country(struct loc_database* db, - off_t lo = 0; - off_t hi = db->countries_count - 1; - -+#ifdef ENABLE_DEBUG - // Save start time - clock_t start = clock(); -+#endif - - while (lo <= hi) { - off_t i = (lo + hi) / 2; -@@ -905,11 +924,13 @@ LOC_EXPORT int loc_database_get_country(struct loc_database* db, - int result = strcmp(code, cc); - - if (result == 0) { -+#ifdef ENABLE_DEBUG - clock_t end = clock(); - - // Log how fast this has been - DEBUG(db->ctx, "Found country %s in %.4fms\n", cc, - (double)(end - start) / CLOCKS_PER_SEC * 1000); -+#endif - - return 0; - } -@@ -932,8 +953,34 @@ LOC_EXPORT int loc_database_get_country(struct loc_database* db, - - // Enumerator - -+static void loc_database_enumerator_free(struct loc_database_enumerator* enumerator) { -+ DEBUG(enumerator->ctx, "Releasing database enumerator %p\n", enumerator); -+ -+ // Release all references -+ loc_database_unref(enumerator->db); -+ loc_unref(enumerator->ctx); -+ -+ if (enumerator->string) -+ free(enumerator->string); -+ -+ if (enumerator->countries) -+ loc_country_list_unref(enumerator->countries); -+ -+ if (enumerator->asns) -+ loc_as_list_unref(enumerator->asns); -+ -+ // Free network search -+ free(enumerator->networks_visited); -+ -+ // Free subnet stack -+ if (enumerator->stack) -+ loc_network_list_unref(enumerator->stack); -+ -+ free(enumerator); -+} -+ - LOC_EXPORT int loc_database_enumerator_new(struct loc_database_enumerator** enumerator, -- struct loc_database* db, enum loc_database_enumerator_mode mode) { -+ struct loc_database* db, enum loc_database_enumerator_mode mode, int flags) { - struct loc_database_enumerator* e = calloc(1, sizeof(*e)); - if (!e) - return -ENOMEM; -@@ -944,11 +991,20 @@ LOC_EXPORT int loc_database_enumerator_new(struct loc_database_enumerator** enum - e->mode = mode; - e->refcount = 1; - -+ // Flatten output? -+ e->flatten = (flags & LOC_DB_ENUMERATOR_FLAGS_FLATTEN); -+ - // Initialise graph search -- //e->network_stack[++e->network_stack_depth] = 0; - e->network_stack_depth = 1; - e->networks_visited = calloc(db->network_nodes_count, sizeof(*e->networks_visited)); - -+ // Allocate stack -+ int r = loc_network_list_new(e->ctx, &e->stack); -+ if (r) { -+ loc_database_enumerator_free(e); -+ return r; -+ } -+ - DEBUG(e->ctx, "Database enumerator object allocated at %p\n", e); - - *enumerator = e; -@@ -961,22 +1017,6 @@ LOC_EXPORT struct loc_database_enumerator* loc_database_enumerator_ref(struct lo - return enumerator; - } - --static void loc_database_enumerator_free(struct loc_database_enumerator* enumerator) { -- DEBUG(enumerator->ctx, "Releasing database enumerator %p\n", enumerator); -- -- // Release all references -- loc_database_unref(enumerator->db); -- loc_unref(enumerator->ctx); -- -- if (enumerator->string) -- free(enumerator->string); -- -- // Free network search -- free(enumerator->networks_visited); -- -- free(enumerator); --} -- - LOC_EXPORT struct loc_database_enumerator* loc_database_enumerator_unref(struct loc_database_enumerator* enumerator) { - if (!enumerator) - return NULL; -@@ -998,40 +1038,38 @@ LOC_EXPORT int loc_database_enumerator_set_string(struct loc_database_enumerator - return 0; - } - --LOC_EXPORT int loc_database_enumerator_set_country_code(struct loc_database_enumerator* enumerator, const char* country_code) { -- // Set empty country code -- if (!country_code || !*country_code) { -- *enumerator->country_code = '\0'; -- return 0; -- } -+LOC_EXPORT struct loc_country_list* loc_database_enumerator_get_countries( -+ struct loc_database_enumerator* enumerator) { -+ if (!enumerator->countries) -+ return NULL; - -- // Treat A1, A2, A3 as special country codes, -- // but perform search for flags instead -- if (strcmp(country_code, "A1") == 0) { -- return loc_database_enumerator_set_flag(enumerator, -- LOC_NETWORK_FLAG_ANONYMOUS_PROXY); -- } else if (strcmp(country_code, "A2") == 0) { -- return loc_database_enumerator_set_flag(enumerator, -- LOC_NETWORK_FLAG_SATELLITE_PROVIDER); -- } else if (strcmp(country_code, "A3") == 0) { -- return loc_database_enumerator_set_flag(enumerator, -- LOC_NETWORK_FLAG_ANYCAST); -- } -+ return loc_country_list_ref(enumerator->countries); -+} - -- // Country codes must be two characters -- if (!loc_country_code_is_valid(country_code)) -- return -EINVAL; -+LOC_EXPORT int loc_database_enumerator_set_countries( -+ struct loc_database_enumerator* enumerator, struct loc_country_list* countries) { -+ if (enumerator->countries) -+ loc_country_list_unref(enumerator->countries); - -- for (unsigned int i = 0; i < 3; i++) { -- enumerator->country_code[i] = country_code[i]; -- } -+ enumerator->countries = loc_country_list_ref(countries); - - return 0; - } - --LOC_EXPORT int loc_database_enumerator_set_asn( -- struct loc_database_enumerator* enumerator, unsigned int asn) { -- enumerator->asn = asn; -+LOC_EXPORT struct loc_as_list* loc_database_enumerator_get_asns( -+ struct loc_database_enumerator* enumerator) { -+ if (!enumerator->asns) -+ return NULL; -+ -+ return loc_as_list_ref(enumerator->asns); -+} -+ -+LOC_EXPORT int loc_database_enumerator_set_asns( -+ struct loc_database_enumerator* enumerator, struct loc_as_list* asns) { -+ if (enumerator->asns) -+ loc_as_list_unref(enumerator->asns); -+ -+ enumerator->asns = loc_as_list_ref(asns); - - return 0; - } -@@ -1110,16 +1148,64 @@ static int loc_database_enumerator_stack_push_node( - return 0; - } - --LOC_EXPORT int loc_database_enumerator_next_network( -- struct loc_database_enumerator* enumerator, struct loc_network** network) { -- // Reset network -- *network = NULL; -+static int loc_database_enumerator_filter_network( -+ struct loc_database_enumerator* enumerator, struct loc_network* network) { -+ // Skip if the family does not match -+ if (enumerator->family && loc_network_address_family(network) != enumerator->family) { -+ DEBUG(enumerator->ctx, "Filtered network %p because of family not matching\n", network); -+ return 1; -+ } - -- // Do not do anything if not in network mode -- if (enumerator->mode != LOC_DB_ENUMERATE_NETWORKS) -- return 0; -+ // Skip if the country code does not match -+ if (enumerator->countries && !loc_country_list_empty(enumerator->countries)) { -+ const char* country_code = loc_network_get_country_code(network); - -- int r; -+ if (!loc_country_list_contains_code(enumerator->countries, country_code)) { -+ DEBUG(enumerator->ctx, "Filtered network %p because of country code not matching\n", network); -+ return 1; -+ } -+ } -+ -+ // Skip if the ASN does not match -+ if (enumerator->asns && !loc_as_list_empty(enumerator->asns)) { -+ uint32_t asn = loc_network_get_asn(network); -+ -+ if (!loc_as_list_contains_number(enumerator->asns, asn)) { -+ DEBUG(enumerator->ctx, "Filtered network %p because of ASN not matching\n", network); -+ return 1; -+ } -+ } -+ -+ // Skip if flags do not match -+ if (enumerator->flags && !loc_network_match_flag(network, enumerator->flags)) { -+ DEBUG(enumerator->ctx, "Filtered network %p because of flags not matching\n", network); -+ return 1; -+ } -+ -+ // Do not filter -+ return 0; -+} -+ -+static int __loc_database_enumerator_next_network( -+ struct loc_database_enumerator* enumerator, struct loc_network** network, int filter) { -+ // Return top element from the stack -+ while (1) { -+ *network = loc_network_list_pop_first(enumerator->stack); -+ -+ // Stack is empty -+ if (!*network) -+ break; -+ -+ // Throw away any networks by filter -+ if (filter && loc_database_enumerator_filter_network(enumerator, *network)) { -+ loc_network_unref(*network); -+ *network = NULL; -+ continue; -+ } -+ -+ // Return result -+ return 0; -+ } - - DEBUG(enumerator->ctx, "Called with a stack of %u nodes\n", - enumerator->network_stack_depth); -@@ -1149,7 +1235,7 @@ LOC_EXPORT int loc_database_enumerator_next_network( - enumerator->db->network_nodes_v1 + node->offset; - - // Add edges to stack -- r = loc_database_enumerator_stack_push_node(enumerator, -+ int r = loc_database_enumerator_stack_push_node(enumerator, - be32toh(n->one), 1, node->depth + 1); - - if (r) -@@ -1175,54 +1261,142 @@ LOC_EXPORT int loc_database_enumerator_next_network( - if (r) - return r; - -- // Check if we are interested in this network -+ // Return all networks when the filter is disabled -+ if (!filter) -+ return 0; - -- // Skip if the family does not match -- if (enumerator->family && loc_network_address_family(*network) != enumerator->family) { -+ // Check if we are interested in this network -+ if (loc_database_enumerator_filter_network(enumerator, *network)) { - loc_network_unref(*network); - *network = NULL; - - continue; - } - -- // Skip if the country code does not match -- if (*enumerator->country_code && -- !loc_network_match_country_code(*network, enumerator->country_code)) { -- loc_network_unref(*network); -- *network = NULL; -+ return 0; -+ } -+ } - -- continue; -- } -+ // Reached the end of the search -+ return 0; -+} - -- // Skip if the ASN does not match -- if (enumerator->asn && -- !loc_network_match_asn(*network, enumerator->asn)) { -- loc_network_unref(*network); -- *network = NULL; -+static int __loc_database_enumerator_next_network_flattened( -+ struct loc_database_enumerator* enumerator, struct loc_network** network) { -+ // Fetch the next network -+ int r = __loc_database_enumerator_next_network(enumerator, network, 1); -+ if (r) -+ return r; - -- continue; -- } -+ // End if we could not read another network -+ if (!*network) -+ return 0; - -- // Skip if flags do not match -- if (enumerator->flags && -- !loc_network_match_flag(*network, enumerator->flags)) { -- loc_network_unref(*network); -- *network = NULL; -+ struct loc_network* subnet = NULL; -+ struct loc_network_list* subnets; - -- continue; -+ // Create a list with all subnets -+ r = loc_network_list_new(enumerator->ctx, &subnets); -+ if (r) -+ return r; -+ -+ // Search all subnets from the database -+ while (1) { -+ // Fetch the next network in line -+ r = __loc_database_enumerator_next_network(enumerator, &subnet, 0); -+ if (r) { -+ loc_network_unref(subnet); -+ loc_network_list_unref(subnets); -+ -+ return r; -+ } -+ -+ // End if we did not receive another subnet -+ if (!subnet) -+ break; -+ -+ // Collect all subnets in a list -+ if (loc_network_is_subnet(*network, subnet)) { -+ r = loc_network_list_push(subnets, subnet); -+ if (r) { -+ loc_network_unref(subnet); -+ loc_network_list_unref(subnets); -+ -+ return r; - } - -- return 0; -+ loc_network_unref(subnet); -+ continue; -+ } -+ -+ // If this is not a subnet, we push it back onto the stack and break -+ r = loc_network_list_push(enumerator->stack, subnet); -+ if (r) { -+ loc_network_unref(subnet); -+ loc_network_list_unref(subnets); -+ -+ return r; - } -+ -+ loc_network_unref(subnet); -+ break; - } - -- // Reached the end of the search -+ DEBUG(enumerator->ctx, "Found %zu subnet(s)\n", loc_network_list_size(subnets)); - -- // Mark all nodes as non-visited -- for (unsigned int i = 0; i < enumerator->db->network_nodes_count; i++) -- enumerator->networks_visited[i] = 0; -+ // We can abort here if the network has no subnets -+ if (loc_network_list_empty(subnets)) { -+ loc_network_list_unref(subnets); - -- return 0; -+ return 0; -+ } -+ -+ // If the network has any subnets, we will break it into smaller parts -+ // without the subnets. -+ struct loc_network_list* excluded = loc_network_exclude_list(*network, subnets); -+ if (!excluded) { -+ loc_network_list_unref(subnets); -+ return -1; -+ } -+ -+ // Merge subnets onto the stack -+ r = loc_network_list_merge(enumerator->stack, subnets); -+ if (r) { -+ loc_network_list_unref(subnets); -+ loc_network_list_unref(excluded); -+ -+ return r; -+ } -+ -+ // Push excluded list onto the stack -+ r = loc_network_list_merge(enumerator->stack, excluded); -+ if (r) { -+ loc_network_list_unref(subnets); -+ loc_network_list_unref(excluded); -+ -+ return r; -+ } -+ -+ loc_network_list_unref(subnets); -+ loc_network_list_unref(excluded); -+ -+ // Drop the network and restart the whole process again to pick the next network -+ loc_network_unref(*network); -+ -+ return __loc_database_enumerator_next_network_flattened(enumerator, network); -+} -+ -+LOC_EXPORT int loc_database_enumerator_next_network( -+ struct loc_database_enumerator* enumerator, struct loc_network** network) { -+ // Do not do anything if not in network mode -+ if (enumerator->mode != LOC_DB_ENUMERATE_NETWORKS) -+ return 0; -+ -+ // Flatten output? -+ if (enumerator->flatten) -+ return __loc_database_enumerator_next_network_flattened(enumerator, network); -+ -+ return __loc_database_enumerator_next_network(enumerator, network, 1); - } - - LOC_EXPORT int loc_database_enumerator_next_country( -diff --git a/src/libloc.sym b/src/libloc.sym -index b8296eb..ee333f1 100644 ---- a/src/libloc.sym -+++ b/src/libloc.sym -@@ -37,6 +37,18 @@ global: - loc_as_set_name; - loc_as_unref; - -+ # AS List -+ loc_as_list_append; -+ loc_as_list_clear; -+ loc_as_list_contains; -+ loc_as_list_contains_number; -+ loc_as_list_empty; -+ loc_as_list_get; -+ loc_as_list_new; -+ loc_as_list_ref; -+ loc_as_list_size; -+ loc_as_list_unref; -+ - # Country - loc_country_cmp; - loc_country_code_is_valid; -@@ -49,6 +61,18 @@ global: - loc_country_set_name; - loc_country_unref; - -+ # Country List -+ loc_country_list_append; -+ loc_country_list_clear; -+ loc_country_list_contains; -+ loc_country_list_contains_code; -+ loc_country_list_empty; -+ loc_country_list_get; -+ loc_country_list_new; -+ loc_country_list_ref; -+ loc_country_list_size; -+ loc_country_list_unref; -+ - # Database - loc_database_add_as; - loc_database_count_as; -@@ -66,13 +90,15 @@ global: - loc_database_verify; - - # Database Enumerator -+ loc_database_enumerator_get_asns; -+ loc_database_enumerator_get_countries; - loc_database_enumerator_new; - loc_database_enumerator_next_as; - loc_database_enumerator_next_country; - loc_database_enumerator_next_network; - loc_database_enumerator_ref; -- loc_database_enumerator_set_asn; -- loc_database_enumerator_set_country_code; -+ loc_database_enumerator_set_asns; -+ loc_database_enumerator_set_countries; - loc_database_enumerator_set_family; - loc_database_enumerator_set_flag; - loc_database_enumerator_set_string; -@@ -80,24 +106,48 @@ global: - - # Network - loc_network_address_family; -+ loc_network_cmp; -+ loc_network_exclude; -+ loc_network_exclude_list; - loc_network_format_first_address; - loc_network_format_last_address; - loc_network_get_asn; - loc_network_get_country_code; -+ loc_network_get_first_address; -+ loc_network_get_last_address; - loc_network_has_flag; -- loc_network_is_subnet_of; -+ loc_network_is_subnet; -+ loc_network_match_address; - loc_network_match_asn; - loc_network_match_country_code; - loc_network_match_flag; - loc_network_new; - loc_network_new_from_string; -+ loc_network_overlaps; -+ loc_network_prefix; - loc_network_ref; - loc_network_set_asn; - loc_network_set_country_code; - loc_network_set_flag; - loc_network_str; -+ loc_network_subnets; - loc_network_unref; - -+ # Network List -+ loc_network_list_clear; -+ loc_network_list_contains; -+ loc_network_list_dump; -+ loc_network_list_empty; -+ loc_network_list_get; -+ loc_network_list_merge; -+ loc_network_list_new; -+ loc_network_list_pop; -+ loc_network_list_pop_first; -+ loc_network_list_push; -+ loc_network_list_ref; -+ loc_network_list_size; -+ loc_network_list_unref; -+ - # Writer - loc_writer_add_as; - loc_writer_add_country; -diff --git a/src/loc/as-list.h b/src/loc/as-list.h -new file mode 100644 -index 0000000..7b5c4e8 ---- /dev/null -+++ b/src/loc/as-list.h -@@ -0,0 +1,41 @@ -+/* -+ libloc - A library to determine the location of someone on the Internet -+ -+ Copyright (C) 2017 IPFire Development Team <info(a)ipfire.org> -+ -+ This library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ This library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+*/ -+ -+#ifndef LIBLOC_AS_LIST_H -+#define LIBLOC_AS_LIST_H -+ -+#include <loc/as.h> -+#include <loc/libloc.h> -+ -+struct loc_as_list; -+ -+int loc_as_list_new(struct loc_ctx* ctx, struct loc_as_list** list); -+struct loc_as_list* loc_as_list_ref(struct loc_as_list* list); -+struct loc_as_list* loc_as_list_unref(struct loc_as_list* list); -+ -+size_t loc_as_list_size(struct loc_as_list* list); -+int loc_as_list_empty(struct loc_as_list* list); -+void loc_as_list_clear(struct loc_as_list* list); -+ -+struct loc_as* loc_as_list_get(struct loc_as_list* list, size_t index); -+int loc_as_list_append(struct loc_as_list* list, struct loc_as* as); -+ -+int loc_as_list_contains( -+ struct loc_as_list* list, struct loc_as* as); -+int loc_as_list_contains_number( -+ struct loc_as_list* list, uint32_t number); -+ -+#endif -diff --git a/src/loc/country-list.h b/src/loc/country-list.h -new file mode 100644 -index 0000000..a7f818a ---- /dev/null -+++ b/src/loc/country-list.h -@@ -0,0 +1,43 @@ -+/* -+ libloc - A library to determine the location of someone on the Internet -+ -+ Copyright (C) 2017 IPFire Development Team <info(a)ipfire.org> -+ -+ This library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ This library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+*/ -+ -+#ifndef LIBLOC_COUNTRY_LIST_H -+#define LIBLOC_COUNTRY_LIST_H -+ -+#include <stdlib.h> -+ -+#include <loc/libloc.h> -+#include <loc/country.h> -+ -+struct loc_country_list; -+ -+int loc_country_list_new(struct loc_ctx* ctx, struct loc_country_list** list); -+struct loc_country_list* loc_country_list_ref(struct loc_country_list* list); -+struct loc_country_list* loc_country_list_unref(struct loc_country_list* list); -+ -+size_t loc_country_list_size(struct loc_country_list* list); -+int loc_country_list_empty(struct loc_country_list* list); -+void loc_country_list_clear(struct loc_country_list* list); -+ -+struct loc_country* loc_country_list_get(struct loc_country_list* list, size_t index); -+int loc_country_list_append(struct loc_country_list* list, struct loc_country* country); -+ -+int loc_country_list_contains( -+ struct loc_country_list* list, struct loc_country* country); -+int loc_country_list_contains_code( -+ struct loc_country_list* list, const char* code); -+ -+#endif -diff --git a/src/loc/database.h b/src/loc/database.h -index 43173dd..70801f0 100644 ---- a/src/loc/database.h -+++ b/src/loc/database.h -@@ -25,6 +25,7 @@ - #include <loc/network.h> - #include <loc/as.h> - #include <loc/country.h> -+#include <loc/country-list.h> - - struct loc_database; - int loc_database_new(struct loc_ctx* ctx, struct loc_database** database, FILE* f); -@@ -55,15 +56,24 @@ enum loc_database_enumerator_mode { - LOC_DB_ENUMERATE_COUNTRIES = 3, - }; - -+enum loc_database_enumerator_flags { -+ LOC_DB_ENUMERATOR_FLAGS_FLATTEN = (1 << 0), -+}; -+ - struct loc_database_enumerator; - int loc_database_enumerator_new(struct loc_database_enumerator** enumerator, -- struct loc_database* db, enum loc_database_enumerator_mode mode); -+ struct loc_database* db, enum loc_database_enumerator_mode mode, int flags); - struct loc_database_enumerator* loc_database_enumerator_ref(struct loc_database_enumerator* enumerator); - struct loc_database_enumerator* loc_database_enumerator_unref(struct loc_database_enumerator* enumerator); - - int loc_database_enumerator_set_string(struct loc_database_enumerator* enumerator, const char* string); --int loc_database_enumerator_set_country_code(struct loc_database_enumerator* enumerator, const char* country_code); --int loc_database_enumerator_set_asn(struct loc_database_enumerator* enumerator, unsigned int asn); -+struct loc_country_list* loc_database_enumerator_get_countries(struct loc_database_enumerator* enumerator); -+int loc_database_enumerator_set_countries( -+ struct loc_database_enumerator* enumerator, struct loc_country_list* countries); -+struct loc_as_list* loc_database_enumerator_get_asns( -+ struct loc_database_enumerator* enumerator); -+int loc_database_enumerator_set_asns( -+ struct loc_database_enumerator* enumerator, struct loc_as_list* asns); - int loc_database_enumerator_set_flag(struct loc_database_enumerator* enumerator, enum loc_network_flags flag); - int loc_database_enumerator_set_family(struct loc_database_enumerator* enumerator, int family); - int loc_database_enumerator_next_as( -diff --git a/src/loc/network-list.h b/src/loc/network-list.h -new file mode 100644 -index 0000000..bee21c4 ---- /dev/null -+++ b/src/loc/network-list.h -@@ -0,0 +1,37 @@ -+/* -+ libloc - A library to determine the location of someone on the Internet -+ -+ Copyright (C) 2020 IPFire Development Team <info(a)ipfire.org> -+ -+ This library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ This library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+*/ -+ -+#ifndef LIBLOC_NETWORK_LIST_H -+#define LIBLOC_NETWORK_LIST_H -+ -+#include <loc/network.h> -+ -+struct loc_network_list; -+int loc_network_list_new(struct loc_ctx* ctx, struct loc_network_list** list); -+struct loc_network_list* loc_network_list_ref(struct loc_network_list* list); -+struct loc_network_list* loc_network_list_unref(struct loc_network_list* list); -+size_t loc_network_list_size(struct loc_network_list* list); -+int loc_network_list_empty(struct loc_network_list* list); -+void loc_network_list_clear(struct loc_network_list* list); -+void loc_network_list_dump(struct loc_network_list* list); -+struct loc_network* loc_network_list_get(struct loc_network_list* list, size_t index); -+int loc_network_list_push(struct loc_network_list* list, struct loc_network* network); -+struct loc_network* loc_network_list_pop(struct loc_network_list* list); -+struct loc_network* loc_network_list_pop_first(struct loc_network_list* list); -+int loc_network_list_contains(struct loc_network_list* list, struct loc_network* network); -+int loc_network_list_merge(struct loc_network_list* self, struct loc_network_list* other); -+ -+#endif -diff --git a/src/loc/network.h b/src/loc/network.h -index 70c3803..af3dafd 100644 ---- a/src/loc/network.h -+++ b/src/loc/network.h -@@ -21,6 +21,7 @@ - - #include <loc/libloc.h> - #include <loc/format.h> -+#include <loc/network-list.h> - - enum loc_network_flags { - LOC_NETWORK_FLAG_ANONYMOUS_PROXY = (1 << 0), // A1 -@@ -37,8 +38,11 @@ struct loc_network* loc_network_ref(struct loc_network* network); - struct loc_network* loc_network_unref(struct loc_network* network); - char* loc_network_str(struct loc_network* network); - int loc_network_address_family(struct loc_network* network); -+unsigned int loc_network_prefix(struct loc_network* network); - -+const struct in6_addr* loc_network_get_first_address(struct loc_network* network); - char* loc_network_format_first_address(struct loc_network* network); -+const struct in6_addr* loc_network_get_last_address(struct loc_network* network); - char* loc_network_format_last_address(struct loc_network* network); - int loc_network_match_address(struct loc_network* network, const struct in6_addr* address); - -@@ -54,7 +58,14 @@ int loc_network_has_flag(struct loc_network* network, uint32_t flag); - int loc_network_set_flag(struct loc_network* network, uint32_t flag); - int loc_network_match_flag(struct loc_network* network, uint32_t flag); - --int loc_network_is_subnet_of(struct loc_network* self, struct loc_network* other); -+int loc_network_cmp(struct loc_network* self, struct loc_network* other); -+int loc_network_overlaps(struct loc_network* self, struct loc_network* other); -+int loc_network_is_subnet(struct loc_network* self, struct loc_network* other); -+int loc_network_subnets(struct loc_network* network, struct loc_network** subnet1, struct loc_network** subnet2); -+struct loc_network_list* loc_network_exclude( -+ struct loc_network* self, struct loc_network* other); -+struct loc_network_list* loc_network_exclude_list( -+ struct loc_network* network, struct loc_network_list* list); - - #ifdef LIBLOC_PRIVATE - -diff --git a/src/network-list.c b/src/network-list.c -new file mode 100644 -index 0000000..698d3ab ---- /dev/null -+++ b/src/network-list.c -@@ -0,0 +1,299 @@ -+/* -+ libloc - A library to determine the location of someone on the Internet -+ -+ Copyright (C) 2020 IPFire Development Team <info(a)ipfire.org> -+ -+ This library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ This library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+*/ -+ -+#include <errno.h> -+#include <stdlib.h> -+#include <time.h> -+ -+#include <loc/libloc.h> -+#include <loc/network.h> -+#include <loc/private.h> -+ -+struct loc_network_list { -+ struct loc_ctx* ctx; -+ int refcount; -+ -+ struct loc_network** elements; -+ size_t elements_size; -+ -+ size_t size; -+}; -+ -+static int loc_network_list_grow(struct loc_network_list* list, size_t size) { -+ DEBUG(list->ctx, "Growing network list %p by %zu to %zu\n", -+ list, size, list->elements_size + size); -+ -+ struct loc_network** elements = reallocarray(list->elements, -+ list->elements_size + size, sizeof(*list->elements)); -+ if (!elements) -+ return -errno; -+ -+ list->elements = elements; -+ list->elements_size += size; -+ -+ return 0; -+} -+ -+LOC_EXPORT int loc_network_list_new(struct loc_ctx* ctx, -+ struct loc_network_list** list) { -+ struct loc_network_list* l = calloc(1, sizeof(*l)); -+ if (!l) -+ return -ENOMEM; -+ -+ l->ctx = loc_ref(ctx); -+ l->refcount = 1; -+ -+ DEBUG(l->ctx, "Network list allocated at %p\n", l); -+ *list = l; -+ return 0; -+} -+ -+LOC_EXPORT struct loc_network_list* loc_network_list_ref(struct loc_network_list* list) { -+ list->refcount++; -+ -+ return list; -+} -+ -+static void loc_network_list_free(struct loc_network_list* list) { -+ DEBUG(list->ctx, "Releasing network list at %p\n", list); -+ -+ // Remove all content -+ loc_network_list_clear(list); -+ -+ loc_unref(list->ctx); -+ free(list); -+} -+ -+LOC_EXPORT struct loc_network_list* loc_network_list_unref(struct loc_network_list* list) { -+ if (!list) -+ return NULL; -+ -+ if (--list->refcount > 0) -+ return list; -+ -+ loc_network_list_free(list); -+ return NULL; -+} -+ -+LOC_EXPORT size_t loc_network_list_size(struct loc_network_list* list) { -+ return list->size; -+} -+ -+LOC_EXPORT int loc_network_list_empty(struct loc_network_list* list) { -+ return list->size == 0; -+} -+ -+LOC_EXPORT void loc_network_list_clear(struct loc_network_list* list) { -+ if (!list->elements) -+ return; -+ -+ for (unsigned int i = 0; i < list->size; i++) -+ loc_network_unref(list->elements[i]); -+ -+ free(list->elements); -+ list->elements = NULL; -+ list->elements_size = 0; -+ -+ list->size = 0; -+} -+ -+LOC_EXPORT void loc_network_list_dump(struct loc_network_list* list) { -+ struct loc_network* network; -+ char* s; -+ -+ for (unsigned int i = 0; i < list->size; i++) { -+ network = list->elements[i]; -+ -+ s = loc_network_str(network); -+ -+ INFO(list->ctx, "%4d: %s\n", i, s); -+ free(s); -+ } -+} -+ -+LOC_EXPORT struct loc_network* loc_network_list_get(struct loc_network_list* list, size_t index) { -+ // Check index -+ if (index >= list->size) -+ return NULL; -+ -+ return loc_network_ref(list->elements[index]); -+} -+ -+static off_t loc_network_list_find(struct loc_network_list* list, -+ struct loc_network* network, int* found) { -+ // Insert at the beginning for an empty list -+ if (loc_network_list_empty(list)) -+ return 0; -+ -+ off_t lo = 0; -+ off_t hi = list->size - 1; -+ int result; -+ -+ // Since we are working on an ordered list, there is often a good chance that -+ // the network we are looking for is at the end or has to go to the end. -+ if (hi >= 0) { -+ result = loc_network_cmp(network, list->elements[hi]); -+ -+ // Match, so we are done -+ if (result == 0) { -+ *found = 1; -+ -+ return hi; -+ -+ // This needs to be added after the last one -+ } else if (result > 0) { -+ *found = 0; -+ -+ return hi + 1; -+ } -+ } -+ -+#ifdef ENABLE_DEBUG -+ // Save start time -+ clock_t start = clock(); -+#endif -+ -+ off_t i = 0; -+ -+ while (lo <= hi) { -+ i = (lo + hi) / 2; -+ -+ // Check if this is a match -+ result = loc_network_cmp(network, list->elements[i]); -+ -+ if (result == 0) { -+ *found = 1; -+ -+#ifdef ENABLE_DEBUG -+ clock_t end = clock(); -+ -+ // Log how fast this has been -+ DEBUG(list->ctx, "Found network in %.4fms at %jd\n", -+ (double)(end - start) / CLOCKS_PER_SEC * 1000, (intmax_t)i); -+#endif -+ -+ return i; -+ } -+ -+ if (result > 0) { -+ lo = i + 1; -+ i++; -+ } else { -+ hi = i - 1; -+ } -+ } -+ -+ *found = 0; -+ -+#ifdef ENABLE_DEBUG -+ clock_t end = clock(); -+ -+ // Log how fast this has been -+ DEBUG(list->ctx, "Did not find network in %.4fms (last i = %jd)\n", -+ (double)(end - start) / CLOCKS_PER_SEC * 1000, (intmax_t)i); -+#endif -+ -+ return i; -+} -+ -+LOC_EXPORT int loc_network_list_push(struct loc_network_list* list, struct loc_network* network) { -+ int found = 0; -+ -+ off_t index = loc_network_list_find(list, network, &found); -+ -+ // The network has been found on the list. Nothing to do. -+ if (found) -+ return 0; -+ -+ DEBUG(list->ctx, "%p: Inserting network %p at index %jd\n", -+ list, network, (intmax_t)index); -+ -+ // Check if we have space left -+ if (list->size >= list->elements_size) { -+ int r = loc_network_list_grow(list, 64); -+ if (r) -+ return r; -+ } -+ -+ // The list is now larger -+ list->size++; -+ -+ // Move all elements out of the way -+ for (unsigned int i = list->size - 1; i > index; i--) -+ list->elements[i] = list->elements[i - 1]; -+ -+ // Add the new element at the right place -+ list->elements[index] = loc_network_ref(network); -+ -+ return 0; -+} -+ -+LOC_EXPORT struct loc_network* loc_network_list_pop(struct loc_network_list* list) { -+ // Return nothing when empty -+ if (loc_network_list_empty(list)) { -+ DEBUG(list->ctx, "%p: Popped empty stack\n", list); -+ return NULL; -+ } -+ -+ struct loc_network* network = list->elements[--list->size]; -+ -+ DEBUG(list->ctx, "%p: Popping network %p from stack\n", list, network); -+ -+ return network; -+} -+ -+LOC_EXPORT struct loc_network* loc_network_list_pop_first(struct loc_network_list* list) { -+ // Return nothing when empty -+ if (loc_network_list_empty(list)) { -+ DEBUG(list->ctx, "%p: Popped empty stack\n", list); -+ return NULL; -+ } -+ -+ struct loc_network* network = list->elements[0]; -+ -+ // Move all elements to the top of the stack -+ for (unsigned int i = 0; i < list->size - 1; i++) { -+ list->elements[i] = list->elements[i+1]; -+ } -+ -+ // The list is shorter now -+ --list->size; -+ -+ DEBUG(list->ctx, "%p: Popping network %p from stack\n", list, network); -+ -+ return network; -+} -+ -+LOC_EXPORT int loc_network_list_contains(struct loc_network_list* list, struct loc_network* network) { -+ int found = 0; -+ -+ loc_network_list_find(list, network, &found); -+ -+ return found; -+} -+ -+LOC_EXPORT int loc_network_list_merge( -+ struct loc_network_list* self, struct loc_network_list* other) { -+ int r; -+ -+ for (unsigned int i = 0; i < other->size; i++) { -+ r = loc_network_list_push(self, other->elements[i]); -+ if (r) -+ return r; -+ } -+ -+ return 0; -+} -diff --git a/src/network.c b/src/network.c -index 366caa2..a6b679c 100644 ---- a/src/network.c -+++ b/src/network.c -@@ -29,6 +29,7 @@ - #include <loc/compat.h> - #include <loc/country.h> - #include <loc/network.h> -+#include <loc/network-list.h> - #include <loc/private.h> - - struct loc_network { -@@ -97,6 +98,21 @@ static struct in6_addr make_last_address(const struct in6_addr* address, const s - return a; - } - -+static struct in6_addr address_increment(const struct in6_addr* address) { -+ struct in6_addr a = *address; -+ -+ for (int octet = 15; octet >= 0; octet--) { -+ if (a.s6_addr[octet] < 255) { -+ a.s6_addr[octet]++; -+ break; -+ } else { -+ a.s6_addr[octet] = 0; -+ } -+ } -+ -+ return a; -+} -+ - LOC_EXPORT int loc_network_new(struct loc_ctx* ctx, struct loc_network** network, - struct in6_addr* address, unsigned int prefix) { - // Address cannot be unspecified -@@ -160,9 +176,11 @@ LOC_EXPORT int loc_network_new(struct loc_ctx* ctx, struct loc_network** network - LOC_EXPORT int loc_network_new_from_string(struct loc_ctx* ctx, struct loc_network** network, - const char* address_string) { - struct in6_addr first_address; -- unsigned int prefix = 0; - char* prefix_string; -- int r = 1; -+ unsigned int prefix = 128; -+ int r = -EINVAL; -+ -+ DEBUG(ctx, "Attempting to parse network %s\n", address_string); - - // Make a copy of the string to work on it - char* buffer = strdup(address_string); -@@ -171,29 +189,40 @@ LOC_EXPORT int loc_network_new_from_string(struct loc_ctx* ctx, struct loc_netwo - // Split address and prefix - address_string = strsep(&prefix_string, "/"); - -- // Did we find a prefix? -+ DEBUG(ctx, " Split into address = %s, prefix = %s\n", address_string, prefix_string); -+ -+ // Parse the address -+ r = loc_parse_address(ctx, address_string, &first_address); -+ if (r) { -+ DEBUG(ctx, "The address could not be parsed\n"); -+ goto FAIL; -+ } -+ -+ // If a prefix was given, we will try to parse it - if (prefix_string) { - // Convert prefix to integer - prefix = strtol(prefix_string, NULL, 10); - -- if (prefix) { -- // Parse the address -- r = loc_parse_address(ctx, address_string, &first_address); -- -- // Map the prefix to IPv6 if needed -- if (IN6_IS_ADDR_V4MAPPED(&first_address)) -- prefix += 96; -+ if (!prefix) { -+ DEBUG(ctx, "The prefix was not parsable: %s\n", prefix_string); -+ goto FAIL; - } -+ -+ // Map the prefix to IPv6 if needed -+ if (IN6_IS_ADDR_V4MAPPED(&first_address)) -+ prefix += 96; - } - -+FAIL: - // Free temporary buffer - free(buffer); - -- if (r == 0) { -- r = loc_network_new(ctx, network, &first_address, prefix); -- } -+ // Exit if the parsing was unsuccessful -+ if (r) -+ return r; - -- return r; -+ // Create a new network -+ return loc_network_new(ctx, network, &first_address, prefix); - } - - LOC_EXPORT struct loc_network* loc_network_ref(struct loc_network* network) { -@@ -281,6 +310,18 @@ LOC_EXPORT int loc_network_address_family(struct loc_network* network) { - return network->family; - } - -+LOC_EXPORT unsigned int loc_network_prefix(struct loc_network* network) { -+ switch (network->family) { -+ case AF_INET6: -+ return network->prefix; -+ -+ case AF_INET: -+ return network->prefix - 96; -+ } -+ -+ return 0; -+} -+ - static char* loc_network_format_address(struct loc_network* network, const struct in6_addr* address) { - const size_t length = INET6_ADDRSTRLEN; - -@@ -314,10 +355,18 @@ static char* loc_network_format_address(struct loc_network* network, const struc - return string; - } - -+LOC_EXPORT const struct in6_addr* loc_network_get_first_address(struct loc_network* network) { -+ return &network->first_address; -+} -+ - LOC_EXPORT char* loc_network_format_first_address(struct loc_network* network) { - return loc_network_format_address(network, &network->first_address); - } - -+LOC_EXPORT const struct in6_addr* loc_network_get_last_address(struct loc_network* network) { -+ return &network->last_address; -+} -+ - LOC_EXPORT char* loc_network_format_last_address(struct loc_network* network) { - return loc_network_format_address(network, &network->last_address); - } -@@ -325,14 +374,14 @@ LOC_EXPORT char* loc_network_format_last_address(struct loc_network* network) { - LOC_EXPORT int loc_network_match_address(struct loc_network* network, const struct in6_addr* address) { - // Address must be larger than the start address - if (in6_addr_cmp(&network->first_address, address) > 0) -- return 1; -+ return 0; - - // Address must be smaller than the last address - if (in6_addr_cmp(&network->last_address, address) < 0) -- return 1; -+ return 0; - - // The address is inside this network -- return 0; -+ return 1; - } - - LOC_EXPORT const char* loc_network_get_country_code(struct loc_network* network) { -@@ -392,20 +441,310 @@ LOC_EXPORT int loc_network_match_flag(struct loc_network* network, uint32_t flag - return loc_network_has_flag(network, flag); - } - --LOC_EXPORT int loc_network_is_subnet_of(struct loc_network* self, struct loc_network* other) { -+LOC_EXPORT int loc_network_cmp(struct loc_network* self, struct loc_network* other) { -+ // Compare address -+ int r = in6_addr_cmp(&self->first_address, &other->first_address); -+ if (r) -+ return r; -+ -+ // Compare prefix -+ if (self->prefix > other->prefix) -+ return 1; -+ else if (self->prefix < other->prefix) -+ return -1; -+ -+ // Both networks are equal -+ return 0; -+} -+ -+LOC_EXPORT int loc_network_overlaps(struct loc_network* self, struct loc_network* other) { -+ // Either of the start addresses must be in the other subnet -+ if (loc_network_match_address(self, &other->first_address)) -+ return 1; -+ -+ if (loc_network_match_address(other, &self->first_address)) -+ return 1; -+ -+ // Or either of the end addresses is in the other subnet -+ if (loc_network_match_address(self, &other->last_address)) -+ return 1; -+ -+ if (loc_network_match_address(other, &self->last_address)) -+ return 1; -+ -+ return 0; -+} -+ -+LOC_EXPORT int loc_network_is_subnet(struct loc_network* self, struct loc_network* other) { -+ // The prefix must be smaller (this avoids the more complex comparisons later) -+ if (self->prefix > other->prefix) -+ return 0; -+ - // If the start address of the other network is smaller than this network, - // it cannot be a subnet. -- if (in6_addr_cmp(&self->first_address, &other->first_address) < 0) -+ if (in6_addr_cmp(&self->first_address, &other->first_address) > 0) - return 0; - - // If the end address of the other network is greater than this network, - // it cannot be a subnet. -- if (in6_addr_cmp(&self->last_address, &other->last_address) > 0) -+ if (in6_addr_cmp(&self->last_address, &other->last_address) < 0) - return 0; - - return 1; - } - -+LOC_EXPORT int loc_network_subnets(struct loc_network* network, -+ struct loc_network** subnet1, struct loc_network** subnet2) { -+ int r; -+ *subnet1 = NULL; -+ *subnet2 = NULL; -+ -+ // New prefix length -+ unsigned int prefix = network->prefix + 1; -+ -+ // Check if the new prefix is valid -+ if (valid_prefix(&network->first_address, prefix)) -+ return -1; -+ -+ // Create the first half of the network -+ r = loc_network_new(network->ctx, subnet1, &network->first_address, prefix); -+ if (r) -+ return r; -+ -+ // The next subnet starts after the first one -+ struct in6_addr first_address = address_increment(&(*subnet1)->last_address); -+ -+ // Create the second half of the network -+ r = loc_network_new(network->ctx, subnet2, &first_address, prefix); -+ if (r) -+ return r; -+ -+ // Copy country code -+ const char* country_code = loc_network_get_country_code(network); -+ if (country_code) { -+ loc_network_set_country_code(*subnet1, country_code); -+ loc_network_set_country_code(*subnet2, country_code); -+ } -+ -+ // Copy ASN -+ uint32_t asn = loc_network_get_asn(network); -+ if (asn) { -+ loc_network_set_asn(*subnet1, asn); -+ loc_network_set_asn(*subnet2, asn); -+ } -+ -+ // Copy flags -+ loc_network_set_flag(*subnet1, network->flags); -+ loc_network_set_flag(*subnet2, network->flags); -+ -+ return 0; -+} -+ -+static int __loc_network_exclude(struct loc_network* network, -+ struct loc_network* other, struct loc_network_list* list) { -+ struct loc_network* subnet1 = NULL; -+ struct loc_network* subnet2 = NULL; -+ -+ int r = loc_network_subnets(network, &subnet1, &subnet2); -+ if (r) -+ goto ERROR; -+ -+ if (loc_network_cmp(other, subnet1) == 0) { -+ r = loc_network_list_push(list, subnet2); -+ if (r) -+ goto ERROR; -+ -+ } else if (loc_network_cmp(other, subnet2) == 0) { -+ r = loc_network_list_push(list, subnet1); -+ if (r) -+ goto ERROR; -+ -+ } else if (loc_network_is_subnet(subnet1, other)) { -+ r = loc_network_list_push(list, subnet2); -+ if (r) -+ goto ERROR; -+ -+ r = __loc_network_exclude(subnet1, other, list); -+ if (r) -+ goto ERROR; -+ -+ } else if (loc_network_is_subnet(subnet2, other)) { -+ r = loc_network_list_push(list, subnet1); -+ if (r) -+ goto ERROR; -+ -+ r = __loc_network_exclude(subnet2, other, list); -+ if (r) -+ goto ERROR; -+ -+ } else { -+ ERROR(network->ctx, "We should never get here\n"); -+ r = 1; -+ goto ERROR; -+ } -+ -+ERROR: -+ if (subnet1) -+ loc_network_unref(subnet1); -+ -+ if (subnet2) -+ loc_network_unref(subnet2); -+ -+ return r; -+} -+ -+static int __loc_network_exclude_to_list(struct loc_network* self, -+ struct loc_network* other, struct loc_network_list* list) { -+ // Other must be a subnet of self -+ if (!loc_network_is_subnet(self, other)) { -+ DEBUG(self->ctx, "Network %p is not contained in network %p\n", other, self); -+ -+ // Exit silently -+ return 0; -+ } -+ -+ // We cannot perform this operation if both networks equal -+ if (loc_network_cmp(self, other) == 0) { -+ DEBUG(self->ctx, "Networks %p and %p are equal\n", self, other); -+ -+ // Exit silently -+ return 0; -+ } -+ -+ return __loc_network_exclude(self, other, list); -+} -+ -+LOC_EXPORT struct loc_network_list* loc_network_exclude( -+ struct loc_network* self, struct loc_network* other) { -+ struct loc_network_list* list; -+ -+#ifdef ENABLE_DEBUG -+ char* n1 = loc_network_str(self); -+ char* n2 = loc_network_str(other); -+ -+ DEBUG(self->ctx, "Returning %s excluding %s...\n", n1, n2); -+ -+ free(n1); -+ free(n2); -+#endif -+ -+ // Create a new list with the result -+ int r = loc_network_list_new(self->ctx, &list); -+ if (r) { -+ ERROR(self->ctx, "Could not create network list: %d\n", r); -+ -+ return NULL; -+ } -+ -+ r = __loc_network_exclude_to_list(self, other, list); -+ if (r) { -+ loc_network_list_unref(list); -+ -+ return NULL; -+ } -+ -+ // Return the result -+ return list; -+} -+ -+LOC_EXPORT struct loc_network_list* loc_network_exclude_list( -+ struct loc_network* network, struct loc_network_list* list) { -+ struct loc_network_list* to_check; -+ -+ // Create a new list with all networks to look at -+ int r = loc_network_list_new(network->ctx, &to_check); -+ if (r) -+ return NULL; -+ -+ struct loc_network* subnet = NULL; -+ struct loc_network_list* subnets = NULL; -+ -+ for (unsigned int i = 0; i < loc_network_list_size(list); i++) { -+ subnet = loc_network_list_get(list, i); -+ -+ // Find all excluded networks -+ if (!loc_network_list_contains(to_check, subnet)) { -+ r = __loc_network_exclude_to_list(network, subnet, to_check); -+ if (r) { -+ loc_network_list_unref(to_check); -+ loc_network_unref(subnet); -+ -+ return NULL; -+ } -+ } -+ -+ // Cleanup -+ loc_network_unref(subnet); -+ } -+ -+ r = loc_network_list_new(network->ctx, &subnets); -+ if (r) { -+ loc_network_list_unref(to_check); -+ return NULL; -+ } -+ -+ off_t smallest_subnet = 0; -+ -+ while (!loc_network_list_empty(to_check)) { -+ struct loc_network* subnet_to_check = loc_network_list_pop_first(to_check); -+ -+ // Check whether the subnet to check is part of the input list -+ if (loc_network_list_contains(list, subnet_to_check)) { -+ loc_network_unref(subnet_to_check); -+ continue; -+ } -+ -+ // Marks whether this subnet passed all checks -+ int passed = 1; -+ -+ for (unsigned int i = smallest_subnet; i < loc_network_list_size(list); i++) { -+ subnet = loc_network_list_get(list, i); -+ -+ // Drop this subnet if is a subnet of another subnet -+ if (loc_network_is_subnet(subnet, subnet_to_check)) { -+ passed = 0; -+ loc_network_unref(subnet); -+ break; -+ } -+ -+ // Break it down if it overlaps -+ if (loc_network_overlaps(subnet, subnet_to_check)) { -+ passed = 0; -+ -+ __loc_network_exclude_to_list(subnet_to_check, subnet, to_check); -+ -+ loc_network_unref(subnet); -+ break; -+ } -+ -+ // If the subnet is strictly greater, we do not need to continue the search -+ r = loc_network_cmp(subnet, subnet_to_check); -+ if (r > 0) { -+ loc_network_unref(subnet); -+ break; -+ -+ // If it is strictly smaller, we can continue the search from here next -+ // time because all networks that are to be checked can only be larger -+ // than this one. -+ } else if (r < 0) { -+ smallest_subnet = i; -+ } -+ -+ loc_network_unref(subnet); -+ } -+ -+ if (passed) { -+ r = loc_network_list_push(subnets, subnet_to_check); -+ } -+ -+ loc_network_unref(subnet_to_check); -+ } -+ -+ loc_network_list_unref(to_check); -+ -+ return subnets; -+} -+ - LOC_EXPORT int loc_network_to_database_v1(struct loc_network* network, struct loc_database_network_v1* dbobj) { - // Add country code - loc_country_code_copy(dbobj->country_code, network->country_code); -@@ -474,7 +813,7 @@ struct loc_network_tree_node { - struct loc_network* network; - }; - --LOC_EXPORT int loc_network_tree_new(struct loc_ctx* ctx, struct loc_network_tree** tree) { -+int loc_network_tree_new(struct loc_ctx* ctx, struct loc_network_tree** tree) { - struct loc_network_tree* t = calloc(1, sizeof(*t)); - if (!t) - return -ENOMEM; -@@ -494,7 +833,7 @@ LOC_EXPORT int loc_network_tree_new(struct loc_ctx* ctx, struct loc_network_tree - return 0; - } - --LOC_EXPORT struct loc_network_tree_node* loc_network_tree_get_root(struct loc_network_tree* tree) { -+struct loc_network_tree_node* loc_network_tree_get_root(struct loc_network_tree* tree) { - return loc_network_tree_node_ref(tree->root); - } - -@@ -566,7 +905,7 @@ static int __loc_network_tree_walk(struct loc_ctx* ctx, struct loc_network_tree_ - return 0; - } - --LOC_EXPORT int loc_network_tree_walk(struct loc_network_tree* tree, -+int loc_network_tree_walk(struct loc_network_tree* tree, - int(*filter_callback)(struct loc_network* network, void* data), - int(*callback)(struct loc_network* network, void* data), void* data) { - return __loc_network_tree_walk(tree->ctx, tree->root, filter_callback, callback, data); -@@ -581,7 +920,7 @@ static void loc_network_tree_free(struct loc_network_tree* tree) { - free(tree); - } - --LOC_EXPORT struct loc_network_tree* loc_network_tree_unref(struct loc_network_tree* tree) { -+struct loc_network_tree* loc_network_tree_unref(struct loc_network_tree* tree) { - if (--tree->refcount > 0) - return tree; - -@@ -602,13 +941,13 @@ static int __loc_network_tree_dump(struct loc_network* network, void* data) { - return 0; - } - --LOC_EXPORT int loc_network_tree_dump(struct loc_network_tree* tree) { -+int loc_network_tree_dump(struct loc_network_tree* tree) { - DEBUG(tree->ctx, "Dumping network tree at %p\n", tree); - - return loc_network_tree_walk(tree, NULL, __loc_network_tree_dump, NULL); - } - --LOC_EXPORT int loc_network_tree_add_network(struct loc_network_tree* tree, struct loc_network* network) { -+int loc_network_tree_add_network(struct loc_network_tree* tree, struct loc_network* network) { - DEBUG(tree->ctx, "Adding network %p to tree %p\n", network, tree); - - struct loc_network_tree_node* node = loc_network_tree_get_path(tree, -@@ -639,7 +978,7 @@ static int __loc_network_tree_count(struct loc_network* network, void* data) { - return 0; - } - --LOC_EXPORT size_t loc_network_tree_count_networks(struct loc_network_tree* tree) { -+size_t loc_network_tree_count_networks(struct loc_network_tree* tree) { - size_t counter = 0; - - int r = loc_network_tree_walk(tree, NULL, __loc_network_tree_count, &counter); -@@ -661,11 +1000,11 @@ static size_t __loc_network_tree_count_nodes(struct loc_network_tree_node* node) - return counter; - } - --LOC_EXPORT size_t loc_network_tree_count_nodes(struct loc_network_tree* tree) { -+size_t loc_network_tree_count_nodes(struct loc_network_tree* tree) { - return __loc_network_tree_count_nodes(tree->root); - } - --LOC_EXPORT int loc_network_tree_node_new(struct loc_ctx* ctx, struct loc_network_tree_node** node) { -+int loc_network_tree_node_new(struct loc_ctx* ctx, struct loc_network_tree_node** node) { - struct loc_network_tree_node* n = calloc(1, sizeof(*n)); - if (!n) - return -ENOMEM; -@@ -680,7 +1019,7 @@ LOC_EXPORT int loc_network_tree_node_new(struct loc_ctx* ctx, struct loc_network - return 0; - } - --LOC_EXPORT struct loc_network_tree_node* loc_network_tree_node_ref(struct loc_network_tree_node* node) { -+struct loc_network_tree_node* loc_network_tree_node_ref(struct loc_network_tree_node* node) { - if (node) - node->refcount++; - -@@ -703,7 +1042,7 @@ static void loc_network_tree_node_free(struct loc_network_tree_node* node) { - free(node); - } - --LOC_EXPORT struct loc_network_tree_node* loc_network_tree_node_unref(struct loc_network_tree_node* node) { -+struct loc_network_tree_node* loc_network_tree_node_unref(struct loc_network_tree_node* node) { - if (!node) - return NULL; - -@@ -714,7 +1053,7 @@ LOC_EXPORT struct loc_network_tree_node* loc_network_tree_node_unref(struct loc_ - return NULL; - } - --LOC_EXPORT struct loc_network_tree_node* loc_network_tree_node_get(struct loc_network_tree_node* node, unsigned int index) { -+struct loc_network_tree_node* loc_network_tree_node_get(struct loc_network_tree_node* node, unsigned int index) { - if (index == 0) - node = node->zero; - else -@@ -726,10 +1065,10 @@ LOC_EXPORT struct loc_network_tree_node* loc_network_tree_node_get(struct loc_ne - return loc_network_tree_node_ref(node); - } - --LOC_EXPORT int loc_network_tree_node_is_leaf(struct loc_network_tree_node* node) { -+int loc_network_tree_node_is_leaf(struct loc_network_tree_node* node) { - return (!!node->network); - } - --LOC_EXPORT struct loc_network* loc_network_tree_node_get_network(struct loc_network_tree_node* node) { -+struct loc_network* loc_network_tree_node_get_network(struct loc_network_tree_node* node) { - return loc_network_ref(node->network); - } -diff --git a/src/perl/Location.xs b/src/perl/Location.xs -index dcf3f0d..b7676d2 100644 ---- a/src/perl/Location.xs -+++ b/src/perl/Location.xs -@@ -125,7 +125,7 @@ database_countries(db) - PPCODE: - // Create Database enumerator - struct loc_database_enumerator* enumerator; -- int err = loc_database_enumerator_new(&enumerator, db, LOC_DB_ENUMERATE_COUNTRIES); -+ int err = loc_database_enumerator_new(&enumerator, db, LOC_DB_ENUMERATE_COUNTRIES, 0); - - if (err) { - croak("Could not create a database enumerator\n"); -diff --git a/src/python/database.c b/src/python/database.c -index 1013a58..0aa03cc 100644 ---- a/src/python/database.c -+++ b/src/python/database.c -@@ -17,6 +17,8 @@ - #include <Python.h> - - #include <loc/libloc.h> -+#include <loc/as.h> -+#include <loc/as-list.h> - #include <loc/database.h> - - #include "locationmodule.h" -@@ -207,10 +209,10 @@ static PyObject* new_database_enumerator(PyTypeObject* type, struct loc_database - return (PyObject*)self; - } - --static PyObject* Database_iterate_all(DatabaseObject* self, enum loc_database_enumerator_mode what) { -+static PyObject* Database_iterate_all(DatabaseObject* self, enum loc_database_enumerator_mode what, int flags) { - struct loc_database_enumerator* enumerator; - -- int r = loc_database_enumerator_new(&enumerator, self->db, what); -+ int r = loc_database_enumerator_new(&enumerator, self->db, what, flags); - if (r) { - PyErr_SetFromErrno(PyExc_SystemError); - return NULL; -@@ -223,7 +225,7 @@ static PyObject* Database_iterate_all(DatabaseObject* self, enum loc_database_en - } - - static PyObject* Database_ases(DatabaseObject* self) { -- return Database_iterate_all(self, LOC_DB_ENUMERATE_ASES); -+ return Database_iterate_all(self, LOC_DB_ENUMERATE_ASES, 0); - } - - static PyObject* Database_search_as(DatabaseObject* self, PyObject* args) { -@@ -234,7 +236,7 @@ static PyObject* Database_search_as(DatabaseObject* self, PyObject* args) { - - struct loc_database_enumerator* enumerator; - -- int r = loc_database_enumerator_new(&enumerator, self->db, LOC_DB_ENUMERATE_ASES); -+ int r = loc_database_enumerator_new(&enumerator, self->db, LOC_DB_ENUMERATE_ASES, 0); - if (r) { - PyErr_SetFromErrno(PyExc_SystemError); - return NULL; -@@ -250,44 +252,142 @@ static PyObject* Database_search_as(DatabaseObject* self, PyObject* args) { - } - - static PyObject* Database_networks(DatabaseObject* self) { -- return Database_iterate_all(self, LOC_DB_ENUMERATE_NETWORKS); -+ return Database_iterate_all(self, LOC_DB_ENUMERATE_NETWORKS, 0); -+} -+ -+static PyObject* Database_networks_flattened(DatabaseObject *self) { -+ return Database_iterate_all(self, LOC_DB_ENUMERATE_NETWORKS, LOC_DB_ENUMERATOR_FLAGS_FLATTEN); - } - - static PyObject* Database_search_networks(DatabaseObject* self, PyObject* args, PyObject* kwargs) { -- char* kwlist[] = { "country_code", "asn", "flags", "family", NULL }; -- const char* country_code = NULL; -- unsigned int asn = 0; -+ char* kwlist[] = { "country_codes", "asns", "flags", "family", "flatten", NULL }; -+ PyObject* country_codes = NULL; -+ PyObject* asn_list = NULL; - int flags = 0; - int family = 0; -+ int flatten = 0; - -- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|siii", kwlist, &country_code, &asn, &flags, &family)) -+ if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|O!O!iip", kwlist, -+ &PyList_Type, &country_codes, &PyList_Type, &asn_list, &flags, &family, &flatten)) - return NULL; - - struct loc_database_enumerator* enumerator; -- int r = loc_database_enumerator_new(&enumerator, self->db, LOC_DB_ENUMERATE_NETWORKS); -+ int r = loc_database_enumerator_new(&enumerator, self->db, LOC_DB_ENUMERATE_NETWORKS, -+ (flatten) ? LOC_DB_ENUMERATOR_FLAGS_FLATTEN : 0); - if (r) { - PyErr_SetFromErrno(PyExc_SystemError); - return NULL; - } - - // Set country code we are searching for -- if (country_code) { -- r = loc_database_enumerator_set_country_code(enumerator, country_code); -+ if (country_codes) { -+ struct loc_country_list* countries; -+ r = loc_country_list_new(loc_ctx, &countries); -+ if (r) { -+ PyErr_SetString(PyExc_SystemError, "Could not create country list"); -+ return NULL; -+ } -+ -+ for (int i = 0; i < PyList_Size(country_codes); i++) { -+ PyObject* item = PyList_GetItem(country_codes, i); -+ -+ if (!PyUnicode_Check(item)) { -+ PyErr_SetString(PyExc_TypeError, "Country codes must be strings"); -+ loc_country_list_unref(countries); -+ return NULL; -+ } -+ -+ const char* country_code = PyUnicode_AsUTF8(item); -+ -+ struct loc_country* country; -+ r = loc_country_new(loc_ctx, &country, country_code); -+ if (r) { -+ if (r == -EINVAL) { -+ PyErr_Format(PyExc_ValueError, "Invalid country code: %s", country_code); -+ } else { -+ PyErr_SetString(PyExc_SystemError, "Could not create country"); -+ } -+ -+ loc_country_list_unref(countries); -+ return NULL; -+ } -+ -+ // Append it to the list -+ r = loc_country_list_append(countries, country); -+ if (r) { -+ PyErr_SetString(PyExc_SystemError, "Could not append country to the list"); -+ -+ loc_country_list_unref(countries); -+ loc_country_unref(country); -+ return NULL; -+ } -+ -+ loc_country_unref(country); -+ } - -+ r = loc_database_enumerator_set_countries(enumerator, countries); - if (r) { - PyErr_SetFromErrno(PyExc_SystemError); -+ -+ loc_country_list_unref(countries); - return NULL; - } -+ -+ loc_country_list_unref(countries); - } - - // Set the ASN we are searching for -- if (asn) { -- r = loc_database_enumerator_set_asn(enumerator, asn); -+ if (asn_list) { -+ struct loc_as_list* asns; -+ r = loc_as_list_new(loc_ctx, &asns); -+ if (r) { -+ PyErr_SetString(PyExc_SystemError, "Could not create AS list"); -+ return NULL; -+ } -+ -+ for (int i = 0; i < PyList_Size(asn_list); i++) { -+ PyObject* item = PyList_GetItem(asn_list, i); -+ -+ if (!PyLong_Check(item)) { -+ PyErr_SetString(PyExc_TypeError, "ASNs must be numbers"); - -+ loc_as_list_unref(asns); -+ return NULL; -+ } -+ -+ unsigned long number = PyLong_AsLong(item); -+ -+ struct loc_as* as; -+ r = loc_as_new(loc_ctx, &as, number); -+ if (r) { -+ PyErr_SetString(PyExc_SystemError, "Could not create AS"); -+ -+ loc_as_list_unref(asns); -+ loc_as_unref(as); -+ return NULL; -+ } -+ -+ r = loc_as_list_append(asns, as); -+ if (r) { -+ PyErr_SetString(PyExc_SystemError, "Could not append AS to the list"); -+ -+ loc_as_list_unref(asns); -+ loc_as_unref(as); -+ return NULL; -+ } -+ -+ loc_as_unref(as); -+ } -+ -+ r = loc_database_enumerator_set_asns(enumerator, asns); - if (r) { - PyErr_SetFromErrno(PyExc_SystemError); -+ -+ loc_as_list_unref(asns); - return NULL; - } -+ -+ loc_as_list_unref(asns); - } - - // Set the flags we are searching for -@@ -317,7 +417,7 @@ static PyObject* Database_search_networks(DatabaseObject* self, PyObject* args, - } - - static PyObject* Database_countries(DatabaseObject* self) { -- return Database_iterate_all(self, LOC_DB_ENUMERATE_COUNTRIES); -+ return Database_iterate_all(self, LOC_DB_ENUMERATE_COUNTRIES, 0); - } - - static struct PyMethodDef Database_methods[] = { -@@ -403,6 +503,13 @@ static struct PyGetSetDef Database_getsetters[] = { - NULL, - NULL, - }, -+ { -+ "networks_flattened", -+ (getter)Database_networks_flattened, -+ NULL, -+ NULL, -+ NULL, -+ }, - { - "vendor", - (getter)Database_get_vendor, -diff --git a/src/python/downloader.py b/src/python/downloader.py -index 87bbb68..05f7872 100644 ---- a/src/python/downloader.py -+++ b/src/python/downloader.py -@@ -119,8 +119,8 @@ class Downloader(object): - - headers = {} - if timestamp: -- headers["If-Modified-Since"] = timestamp.strftime( -- "%a, %d %b %Y %H:%M:%S GMT", -+ headers["If-Modified-Since"] = time.strftime( -+ "%a, %d %b %Y %H:%M:%S GMT", time.gmtime(timestamp), - ) - - t = tempfile.NamedTemporaryFile(dir=tmpdir, delete=False) -@@ -195,7 +195,7 @@ class Downloader(object): - db = Database(f.name) - - # Database is not recent -- if timestamp and db.created_at < timestamp.timestamp(): -+ if timestamp and db.created_at < timestamp: - return False - - log.info("Downloaded new database from %s" % (time.strftime( -diff --git a/src/python/export.py b/src/python/export.py -index d15c6f0..f0eae26 100644 ---- a/src/python/export.py -+++ b/src/python/export.py -@@ -29,7 +29,7 @@ import _location - log = logging.getLogger("location.export") - log.propagate = 1 - --flags = { -+FLAGS = { - _location.NETWORK_FLAG_ANONYMOUS_PROXY : "A1", - _location.NETWORK_FLAG_SATELLITE_PROVIDER : "A2", - _location.NETWORK_FLAG_ANYCAST : "A3", -@@ -39,11 +39,8 @@ class OutputWriter(object): - suffix = "networks" - mode = "w" - -- def __init__(self, f, prefix=None, flatten=True): -- self.f, self.prefix, self.flatten = f, prefix, flatten -- -- # The previously written network -- self._last_network = None -+ def __init__(self, f, prefix=None): -+ self.f, self.prefix = f, prefix - - # Immediately write the header - self._write_header() -@@ -60,18 +57,6 @@ class OutputWriter(object): - def __repr__(self): - return "<%s f=%s>" % (self.__class__.__name__, self.f) - -- def _flatten(self, network): -- """ -- Checks if the given network needs to be written to file, -- or if it is a subnet of the previously written network. -- """ -- if self._last_network and network.is_subnet_of(self._last_network): -- return True -- -- # Remember this network for the next call -- self._last_network = network -- return False -- - def _write_header(self): - """ - The header of the file -@@ -84,16 +69,8 @@ class OutputWriter(object): - """ - pass - -- def _write_network(self, network): -- self.f.write("%s\n" % network) -- - def write(self, network): -- if self.flatten and self._flatten(network): -- log.debug("Skipping writing network %s" % network) -- return -- -- # Write the network to file -- self._write_network(network) -+ self.f.write("%s\n" % network) - - def finish(self): - """ -@@ -114,7 +91,7 @@ class IpsetOutputWriter(OutputWriter): - def _write_header(self): - self.f.write("create %s hash:net family inet hashsize 1024 maxelem 65536\n" % self.prefix) - -- def _write_network(self, network): -+ def write(self, network): - self.f.write("add %s %s\n" % (self.prefix, network)) - - -@@ -130,7 +107,7 @@ class NftablesOutputWriter(OutputWriter): - def _write_footer(self): - self.f.write("}\n") - -- def _write_network(self, network): -+ def write(self, network): - self.f.write(" %s,\n" % network) - - -@@ -142,14 +119,9 @@ class XTGeoIPOutputWriter(OutputWriter): - suffix = "iv" - mode = "wb" - -- def _write_network(self, network): -- for address in (network.first_address, network.last_address): -- # Convert this into a string of bits -- bytes = socket.inet_pton( -- network.family, address, -- ) -- -- self.f.write(bytes) -+ def write(self, network): -+ self.f.write(network._first_address) -+ self.f.write(network._last_address) - - - formats = { -@@ -185,8 +157,14 @@ class Exporter(object): - - writers[asn] = self.writer.open(filename, prefix="AS%s" % asn) - -+ # Filter countries from special country codes -+ country_codes = [ -+ country_code for country_code in countries if not country_code in FLAGS.values() -+ ] -+ - # Get all networks that match the family -- networks = self.db.search_networks(family=family) -+ networks = self.db.search_networks(family=family, -+ country_codes=country_codes, asns=asns, flatten=True) - - # Walk through all networks - for network in networks: -@@ -203,10 +181,10 @@ class Exporter(object): - pass - - # Handle flags -- for flag in flags: -+ for flag in FLAGS: - if network.has_flag(flag): - # Fetch the "fake" country code -- country = flags[flag] -+ country = FLAGS[flag] - - try: - writers[country].write(network) -diff --git a/src/python/importer.py b/src/python/importer.py -index f19db4b..5f46bc3 100644 ---- a/src/python/importer.py -+++ b/src/python/importer.py -@@ -64,7 +64,7 @@ EXTENDED_SOURCES = ( - "https://ftp.arin.net/pub/stats/arin/delegated-arin-extended-latest", - - # Latin America and Caribbean Network Information Centre -- "http://ftp.lacnic.net/pub/stats/lacnic/delegated-lacnic-extended-latest", -+ "https://ftp.lacnic.net/pub/stats/lacnic/delegated-lacnic-extended-latest", - - # Réseaux IP Européens - #"https://ftp.ripe.net/pub/stats/ripencc/delegated-ripencc-extended-latest", -diff --git a/src/python/location-importer.in b/src/python/location-importer.in -index 1467923..2dec89e 100644 ---- a/src/python/location-importer.in -+++ b/src/python/location-importer.in -@@ -152,6 +152,7 @@ class CLI(object): - last_seen_at timestamp without time zone DEFAULT CURRENT_TIMESTAMP); - CREATE UNIQUE INDEX IF NOT EXISTS announcements_networks ON announcements(network); - CREATE INDEX IF NOT EXISTS announcements_family ON announcements(family(network)); -+ CREATE INDEX IF NOT EXISTS announcements_search ON announcements USING GIST(network inet_ops); - - -- autnums - CREATE TABLE IF NOT EXISTS autnums(number bigint, name text NOT NULL); -@@ -165,6 +166,7 @@ class CLI(object): - -- networks - CREATE TABLE IF NOT EXISTS networks(network inet, country text); - CREATE UNIQUE INDEX IF NOT EXISTS networks_network ON networks(network); -+ CREATE INDEX IF NOT EXISTS networks_family ON networks USING BTREE(family(network)); - CREATE INDEX IF NOT EXISTS networks_search ON networks USING GIST(network inet_ops); - - -- overrides -@@ -188,6 +190,8 @@ class CLI(object): - ); - CREATE UNIQUE INDEX IF NOT EXISTS network_overrides_network - ON network_overrides(network); -+ CREATE INDEX IF NOT EXISTS network_overrides_search -+ ON network_overrides USING GIST(network inet_ops); - """) - - return db -@@ -234,32 +238,24 @@ class CLI(object): - - # Select all known networks - rows = self.db.query(""" -- -- Get a (sorted) list of all known networks -- WITH known_networks AS ( -- SELECT network FROM announcements -- UNION -- SELECT network FROM networks -- ORDER BY network -- ) -- - -- Return a list of those networks enriched with all - -- other information that we store in the database - SELECT -- DISTINCT ON (known_networks.network) -- known_networks.network AS network, -- announcements.autnum AS autnum, -+ DISTINCT ON (network) -+ network, -+ autnum, - - -- Country - COALESCE( - ( - SELECT country FROM network_overrides overrides -- WHERE announcements.network <<= overrides.network -+ WHERE networks.network <<= overrides.network - ORDER BY masklen(overrides.network) DESC - LIMIT 1 - ), - ( - SELECT country FROM autnum_overrides overrides -- WHERE announcements.autnum = overrides.number -+ WHERE networks.autnum = overrides.number - ), - networks.country - ) AS country, -@@ -268,50 +264,67 @@ class CLI(object): - COALESCE( - ( - SELECT is_anonymous_proxy FROM network_overrides overrides -- WHERE announcements.network <<= overrides.network -+ WHERE networks.network <<= overrides.network - ORDER BY masklen(overrides.network) DESC - LIMIT 1 - ), - ( - SELECT is_anonymous_proxy FROM autnum_overrides overrides -- WHERE announcements.autnum = overrides.number -+ WHERE networks.autnum = overrides.number - ), - FALSE - ) AS is_anonymous_proxy, - COALESCE( - ( - SELECT is_satellite_provider FROM network_overrides overrides -- WHERE announcements.network <<= overrides.network -+ WHERE networks.network <<= overrides.network - ORDER BY masklen(overrides.network) DESC - LIMIT 1 - ), - ( - SELECT is_satellite_provider FROM autnum_overrides overrides -- WHERE announcements.autnum = overrides.number -+ WHERE networks.autnum = overrides.number - ), - FALSE - ) AS is_satellite_provider, - COALESCE( - ( - SELECT is_anycast FROM network_overrides overrides -- WHERE announcements.network <<= overrides.network -+ WHERE networks.network <<= overrides.network - ORDER BY masklen(overrides.network) DESC - LIMIT 1 - ), - ( - SELECT is_anycast FROM autnum_overrides overrides -- WHERE announcements.autnum = overrides.number -+ WHERE networks.autnum = overrides.number - ), - FALSE -- ) AS is_anycast, -- -- -- Must be part of returned values for ORDER BY clause -- masklen(announcements.network) AS sort_a, -- masklen(networks.network) AS sort_b -- FROM known_networks -- LEFT JOIN announcements ON known_networks.network <<= announcements.network -- LEFT JOIN networks ON known_networks.network <<= networks.network -- ORDER BY known_networks.network, sort_a DESC, sort_b DESC -+ ) AS is_anycast -+ FROM ( -+ SELECT -+ known_networks.network AS network, -+ announcements.autnum AS autnum, -+ networks.country AS country, -+ -+ -- Must be part of returned values for ORDER BY clause -+ masklen(announcements.network) AS sort_a, -+ masklen(networks.network) AS sort_b -+ FROM ( -+ SELECT network FROM announcements -+ UNION ALL -+ SELECT network FROM networks -+ UNION ALL -+ SELECT network FROM network_overrides -+ ) known_networks -+ LEFT JOIN -+ announcements ON known_networks.network <<= announcements.network -+ LEFT JOIN -+ networks ON known_networks.network <<= networks.network -+ ORDER BY -+ known_networks.network, -+ sort_a DESC, -+ sort_b DESC -+ ) networks - """) - - for row in rows: -@@ -363,6 +376,16 @@ class CLI(object): - CREATE TEMPORARY TABLE _organizations(handle text, name text NOT NULL) - ON COMMIT DROP; - CREATE UNIQUE INDEX _organizations_handle ON _organizations(handle); -+ -+ CREATE TEMPORARY TABLE _rirdata(network inet NOT NULL, country text NOT NULL) -+ ON COMMIT DROP; -+ CREATE INDEX _rirdata_search ON _rirdata USING BTREE(family(network), masklen(network)); -+ CREATE UNIQUE INDEX _rirdata_network ON _rirdata(network); -+ """) -+ -+ # Remove all previously imported content -+ self.db.execute(""" -+ TRUNCATE TABLE networks; - """) - - for source in location.importer.WHOIS_SOURCES: -@@ -370,31 +393,72 @@ class CLI(object): - for block in f: - self._parse_block(block) - -+ # Process all parsed networks from every RIR we happen to have access to, -+ # insert the largest network chunks into the networks table immediately... -+ families = self.db.query("SELECT DISTINCT family(network) AS family FROM _rirdata ORDER BY family(network)") -+ -+ for family in (row.family for row in families): -+ smallest = self.db.get("SELECT MIN(masklen(network)) AS prefix FROM _rirdata WHERE family(network) = %s", family) -+ -+ self.db.execute("INSERT INTO networks(network, country) \ -+ SELECT network, country FROM _rirdata WHERE masklen(network) = %s AND family(network) = %s", smallest.prefix, family) -+ -+ # ... determine any other prefixes for this network family, ... -+ prefixes = self.db.query("SELECT DISTINCT masklen(network) AS prefix FROM _rirdata \ -+ WHERE family(network) = %s ORDER BY masklen(network) ASC OFFSET 1", family) -+ -+ # ... and insert networks with this prefix in case they provide additional -+ # information (i. e. subnet of a larger chunk with a different country) -+ for prefix in (row.prefix for row in prefixes): -+ self.db.execute(""" -+ WITH candidates AS ( -+ SELECT -+ _rirdata.network, -+ _rirdata.country -+ FROM -+ _rirdata -+ WHERE -+ family(_rirdata.network) = %s -+ AND -+ masklen(_rirdata.network) = %s -+ ), -+ filtered AS ( -+ SELECT -+ DISTINCT ON (c.network) -+ c.network, -+ c.country, -+ masklen(networks.network), -+ networks.country AS parent_country -+ FROM -+ candidates c -+ LEFT JOIN -+ networks -+ ON -+ c.network << networks.network -+ ORDER BY -+ c.network, -+ masklen(networks.network) DESC NULLS LAST -+ ) -+ INSERT INTO -+ networks(network, country) -+ SELECT -+ network, -+ country -+ FROM -+ filtered -+ WHERE -+ parent_country IS NULL -+ OR -+ country <> parent_country -+ ON CONFLICT DO NOTHING""", -+ family, prefix, -+ ) -+ - self.db.execute(""" - INSERT INTO autnums(number, name) - SELECT _autnums.number, _organizations.name FROM _autnums - JOIN _organizations ON _autnums.organization = _organizations.handle -- ON CONFLICT (number) DO UPDATE SET name = excluded.name -- """) -- -- self.db.execute(""" -- --- Purge any redundant entries -- CREATE TEMPORARY TABLE _garbage ON COMMIT DROP -- AS -- SELECT network FROM networks candidates -- WHERE EXISTS ( -- SELECT FROM networks -- WHERE -- networks.network << candidates.network -- AND -- networks.country = candidates.country -- ); -- -- CREATE UNIQUE INDEX _garbage_search ON _garbage USING BTREE(network); -- -- DELETE FROM networks WHERE EXISTS ( -- SELECT FROM _garbage WHERE networks.network = _garbage.network -- ); -+ ON CONFLICT (number) DO UPDATE SET name = excluded.name; - """) - - # Download all extended sources -@@ -405,6 +469,69 @@ class CLI(object): - for line in f: - self._parse_line(line) - -+ def _check_parsed_network(self, network): -+ """ -+ Assistive function to detect and subsequently sort out parsed -+ networks from RIR data (both Whois and so-called "extended sources"), -+ which are or have... -+ -+ (a) not globally routable (RFC 1918 space, et al.) -+ (b) covering a too large chunk of the IP address space (prefix length -+ is < 7 for IPv4 networks, and < 10 for IPv6) -+ (c) "0.0.0.0" or "::" as a network address -+ (d) are too small for being publicly announced (we have decided not to -+ process them at the moment, as they significantly enlarge our -+ database without providing very helpful additional information) -+ -+ This unfortunately is necessary due to brain-dead clutter across -+ various RIR databases, causing mismatches and eventually disruptions. -+ -+ We will return False in case a network is not suitable for adding -+ it to our database, and True otherwise. -+ """ -+ -+ if not network or not (isinstance(network, ipaddress.IPv4Network) or isinstance(network, ipaddress.IPv6Network)): -+ return False -+ -+ if not network.is_global: -+ log.warning("Skipping non-globally routable network: %s" % network) -+ return False -+ -+ if network.version == 4: -+ if network.prefixlen < 7: -+ log.warning("Skipping too big IP chunk: %s" % network) -+ return False -+ -+ if network.prefixlen > 24: -+ log.debug("Skipping network too small to be publicly announced: %s" % network) -+ return False -+ -+ if str(network.network_address) == "0.0.0.0": -+ log.warning("Skipping network based on 0.0.0.0: %s" % network) -+ return False -+ -+ elif network.version == 6: -+ if network.prefixlen < 10: -+ log.warning("Skipping too big IP chunk: %s" % network) -+ return False -+ -+ if network.prefixlen > 48: -+ log.debug("Skipping network too small to be publicly announced: %s" % network) -+ return False -+ -+ if str(network.network_address) == "::": -+ log.warning("Skipping network based on '::': %s" % network) -+ return False -+ -+ else: -+ # This should not happen... -+ log.warning("Skipping network of unknown family, this should not happen: %s" % network) -+ return False -+ -+ # In case we have made it here, the network is considered to -+ # be suitable for libloc consumption... -+ return True -+ - def _parse_block(self, block): - # Get first line to find out what type of block this is - line = block[0] -@@ -433,7 +560,7 @@ class CLI(object): - autnum["asn"] = m.group(2) - - elif key == "org": -- autnum[key] = val -+ autnum[key] = val.upper() - - # Skip empty objects - if not autnum: -@@ -447,15 +574,22 @@ class CLI(object): - ) - - def _parse_inetnum_block(self, block): -- logging.debug("Parsing inetnum block:") -+ log.debug("Parsing inetnum block:") - - inetnum = {} - for line in block: -- logging.debug(line) -+ log.debug(line) - - # Split line - key, val = split_line(line) - -+ # Filter any inetnum records which are only referring to IP space -+ # not managed by that specific RIR... -+ if key == "netname": -+ if re.match(r"(ERX-NETBLOCK|(AFRINIC|ARIN|LACNIC|RIPE)-CIDR-BLOCK|IANA-NETBLOCK-\d{1,3}|NON-RIPE-NCC-MANAGED-ADDRESS-BLOCK)", val.strip()): -+ log.warning("Skipping record indicating historic/orphaned data: %s" % val.strip()) -+ return -+ - if key == "inetnum": - start_address, delim, end_address = val.partition("-") - -@@ -467,7 +601,7 @@ class CLI(object): - start_address = ipaddress.ip_address(start_address) - end_address = ipaddress.ip_address(end_address) - except ValueError: -- logging.warning("Could not parse line: %s" % line) -+ log.warning("Could not parse line: %s" % line) - return - - # Set prefix to default -@@ -484,23 +618,24 @@ class CLI(object): - inetnum[key] = val - - elif key == "country": -- if val == "UNITED STATES": -- val = "US" -- - inetnum[key] = val.upper() - - # Skip empty objects -- if not inetnum: -+ if not inetnum or not "country" in inetnum: -+ return -+ -+ # Skip objects with bogus country code 'ZZ' -+ if inetnum.get("country") == "ZZ": -+ log.warning("Skipping network with bogus country 'ZZ': %s" % \ -+ (inetnum.get("inet6num") or inetnum.get("inetnum"))) - return - - network = ipaddress.ip_network(inetnum.get("inet6num") or inetnum.get("inetnum"), strict=False) - -- # Bail out in case we have processed a non-public IP network -- if network.is_private: -- logging.warning("Skipping non-globally routable network: %s" % network) -+ if not self._check_parsed_network(network): - return - -- self.db.execute("INSERT INTO networks(network, country) \ -+ self.db.execute("INSERT INTO _rirdata(network, country) \ - VALUES(%s, %s) ON CONFLICT (network) DO UPDATE SET country = excluded.country", - "%s" % network, inetnum.get("country"), - ) -@@ -511,7 +646,9 @@ class CLI(object): - # Split line - key, val = split_line(line) - -- if key in ("organisation", "org-name"): -+ if key == "organisation": -+ org[key] = val.upper() -+ elif key == "org-name": - org[key] = val - - # Skip empty objects -@@ -581,6 +718,9 @@ class CLI(object): - log.warning("Invalid IP address: %s" % address) - return - -+ if not self._check_parsed_network(network): -+ return -+ - self.db.execute("INSERT INTO networks(network, country) \ - VALUES(%s, %s) ON CONFLICT (network) DO \ - UPDATE SET country = excluded.country", -diff --git a/src/python/location.in b/src/python/location.in -index 44ad726..b30beae 100644 ---- a/src/python/location.in -+++ b/src/python/location.in -@@ -253,6 +253,7 @@ class CLI(object): - network = db.lookup(address) - except ValueError: - print(_("Invalid IP address: %s") % address, file=sys.stderr) -+ return 2 - - args = { - "address" : address, -@@ -398,10 +399,7 @@ class CLI(object): - - def handle_update(self, db, ns): - if ns.cron and db: -- now = datetime.datetime.utcnow() -- -- # Parse the database timestamp -- t = datetime.datetime.utcfromtimestamp(db.created_at) -+ now = time.time() - - if ns.cron == "daily": - delta = datetime.timedelta(days=1) -@@ -410,22 +408,20 @@ class CLI(object): - elif ns.cron == "monthly": - delta = datetime.timedelta(days=30) - -+ delta = delta.total_seconds() -+ - # Check if the database has recently been updated -- if t >= (now - delta): -+ if db.created_at >= (now - delta): - log.info( -- _("The database has been updated recently (%s)") % \ -- format_timedelta(now - t), -+ _("The database has been updated recently"), - ) - return 3 - - # Fetch the timestamp we need from DNS - t = location.discover_latest_version() - -- # Parse timestamp into datetime format -- timestamp = datetime.datetime.utcfromtimestamp(t) if t else None -- - # Check the version of the local database -- if db and timestamp and db.created_at >= timestamp.timestamp(): -+ if db and t and db.created_at >= t: - log.info("Already on the latest version") - return - -@@ -437,7 +433,7 @@ class CLI(object): - - # Try downloading a new database - try: -- t = d.download(public_key=ns.public_key, timestamp=timestamp, tmpdir=tmpdir) -+ t = d.download(public_key=ns.public_key, timestamp=t, tmpdir=tmpdir) - - # If no file could be downloaded, log a message - except FileNotFoundError as e: -@@ -453,13 +449,7 @@ class CLI(object): - - return 0 - -- def handle_verify(self, ns): -- try: -- db = location.Database(ns.database) -- except FileNotFoundError as e: -- log.error("%s: %s" % (ns.database, e)) -- return 127 -- -+ def handle_verify(self, db, ns): - # Verify the database - with open(ns.public_key, "r") as f: - if not db.verify(f): -diff --git a/src/python/network.c b/src/python/network.c -index 5496d1e..5b1369d 100644 ---- a/src/python/network.c -+++ b/src/python/network.c -@@ -17,13 +17,33 @@ - #include <Python.h> - - #include <errno.h> -+#include <limits.h> - - #include <loc/libloc.h> - #include <loc/network.h> -+#include <loc/network-list.h> - - #include "locationmodule.h" - #include "network.h" - -+static PyObject* PyList_FromNetworkList(struct loc_network_list* networks) { -+ PyObject* list = PyList_New(0); -+ if (!networks) -+ return list; -+ -+ while (!loc_network_list_empty(networks)) { -+ struct loc_network* network = loc_network_list_pop(networks); -+ -+ PyObject* n = new_network(&NetworkType, network); -+ PyList_Append(list, n); -+ -+ loc_network_unref(network); -+ Py_DECREF(n); -+ } -+ -+ return list; -+} -+ - PyObject* new_network(PyTypeObject* type, struct loc_network* network) { - NetworkObject* self = (NetworkObject*)type->tp_alloc(type, 0); - if (self) { -@@ -114,10 +134,18 @@ static int Network_set_asn(NetworkObject* self, PyObject* value) { - long int asn = PyLong_AsLong(value); - - // Check if the ASN is within the valid range -- if (asn <= 0 || asn > UINT32_MAX) { -+ if (asn <= 0) { -+ PyErr_Format(PyExc_ValueError, "Invalid ASN %ld", asn); -+ return -1; -+ } -+ -+#if (__WORDSIZE > 32) -+ // Check whether the input was longer than 32 bit -+ if (asn > UINT32_MAX) { - PyErr_Format(PyExc_ValueError, "Invalid ASN %ld", asn); - return -1; - } -+#endif - - int r = loc_network_set_asn(self->network, asn); - if (r) -@@ -154,13 +182,28 @@ static PyObject* Network_set_flag(NetworkObject* self, PyObject* args) { - Py_RETURN_NONE; - } - -+static PyObject* Network_exclude(NetworkObject* self, PyObject* args) { -+ NetworkObject* other = NULL; -+ -+ if (!PyArg_ParseTuple(args, "O!", &NetworkType, &other)) -+ return NULL; -+ -+ struct loc_network_list* list = loc_network_exclude(self->network, other->network); -+ -+ // Convert to Python objects -+ PyObject* obj = PyList_FromNetworkList(list); -+ loc_network_list_unref(list); -+ -+ return obj; -+} -+ - static PyObject* Network_is_subnet_of(NetworkObject* self, PyObject* args) { - NetworkObject* other = NULL; - - if (!PyArg_ParseTuple(args, "O!", &NetworkType, &other)) - return NULL; - -- if (loc_network_is_subnet_of(self->network, other->network)) -+ if (loc_network_is_subnet(other->network, self->network)) - Py_RETURN_TRUE; - - Py_RETURN_FALSE; -@@ -181,6 +224,26 @@ static PyObject* Network_get_first_address(NetworkObject* self) { - return obj; - } - -+static PyObject* PyBytes_FromAddress(const struct in6_addr* address6) { -+ struct in_addr address4; -+ -+ // Convert IPv4 addresses to struct in_addr -+ if (IN6_IS_ADDR_V4MAPPED(address6)) { -+ address4.s_addr = address6->s6_addr32[3]; -+ -+ return PyBytes_FromStringAndSize((const char*)&address4, sizeof(address4)); -+ } -+ -+ // Return IPv6 addresses as they are -+ return PyBytes_FromStringAndSize((const char*)address6, sizeof(*address6)); -+} -+ -+static PyObject* Network_get__first_address(NetworkObject* self) { -+ const struct in6_addr* address = loc_network_get_first_address(self->network); -+ -+ return PyBytes_FromAddress(address); -+} -+ - static PyObject* Network_get_last_address(NetworkObject* self) { - char* address = loc_network_format_last_address(self->network); - -@@ -190,7 +253,19 @@ static PyObject* Network_get_last_address(NetworkObject* self) { - return obj; - } - -+static PyObject* Network_get__last_address(NetworkObject* self) { -+ const struct in6_addr* address = loc_network_get_last_address(self->network); -+ -+ return PyBytes_FromAddress(address); -+} -+ - static struct PyMethodDef Network_methods[] = { -+ { -+ "exclude", -+ (PyCFunction)Network_exclude, -+ METH_VARARGS, -+ NULL, -+ }, - { - "has_flag", - (PyCFunction)Network_has_flag, -@@ -241,6 +316,13 @@ static struct PyGetSetDef Network_getsetters[] = { - NULL, - NULL, - }, -+ { -+ "_first_address", -+ (getter)Network_get__first_address, -+ NULL, -+ NULL, -+ NULL, -+ }, - { - "last_address", - (getter)Network_get_last_address, -@@ -248,6 +330,13 @@ static struct PyGetSetDef Network_getsetters[] = { - NULL, - NULL, - }, -+ { -+ "_last_address", -+ (getter)Network_get__last_address, -+ NULL, -+ NULL, -+ NULL, -+ }, - { NULL }, - }; - -diff --git a/src/test-as.c b/src/test-as.c -index 839a04c..2d61675 100644 ---- a/src/test-as.c -+++ b/src/test-as.c -@@ -95,7 +95,7 @@ int main(int argc, char** argv) { - // Enumerator - - struct loc_database_enumerator* enumerator; -- err = loc_database_enumerator_new(&enumerator, db, LOC_DB_ENUMERATE_ASES); -+ err = loc_database_enumerator_new(&enumerator, db, LOC_DB_ENUMERATE_ASES, 0); - if (err) { - fprintf(stderr, "Could not create a database enumerator\n"); - exit(EXIT_FAILURE); -diff --git a/src/test-database.c b/src/test-database.c -index b4a75c4..da4b11c 100644 ---- a/src/test-database.c -+++ b/src/test-database.c -@@ -38,6 +38,14 @@ const char* DESCRIPTION = - "Maecenas ut venenatis nunc."; - const char* LICENSE = "CC"; - -+const char* networks[] = { -+ "2001:db8::/32", -+ "2001:db8:1000::/48", -+ "2001:db8:2000::/48", -+ "2001:db8:2020::/48", -+ NULL, -+}; -+ - static int attempt_to_open(struct loc_ctx* ctx, char* path) { - FILE* f = fopen(path, "r"); - if (!f) -@@ -139,6 +147,24 @@ int main(int argc, char** argv) { - exit(EXIT_FAILURE); - } - -+ struct loc_network* network = NULL; -+ -+ // Add some networks -+ const char** n = networks; -+ while (*n) { -+ err = loc_writer_add_network(writer, &network, *n); -+ if (err) { -+ fprintf(stderr, "Could not add network %s\n", *n); -+ exit(EXIT_FAILURE); -+ } -+ -+ // Set a country -+ loc_network_set_country_code(network, "XX"); -+ -+ // Next one -+ n++; -+ } -+ - FILE* f = tmpfile(); - if (!f) { - fprintf(stderr, "Could not open file for writing: %s\n", strerror(errno)); -@@ -170,6 +196,33 @@ int main(int argc, char** argv) { - exit(EXIT_FAILURE); - } - -+ // Enumerator -+ struct loc_database_enumerator* enumerator; -+ err = loc_database_enumerator_new(&enumerator, db, LOC_DB_ENUMERATE_NETWORKS, 0); -+ if (err) { -+ fprintf(stderr, "Could not initialise the enumerator: %d\n", err); -+ exit(EXIT_FAILURE); -+ } -+ -+ // Walk through all networks -+ while (1) { -+ err = loc_database_enumerator_next_network(enumerator, &network); -+ if (err) { -+ fprintf(stderr, "Error fetching the next network: %d\n", err); -+ exit(EXIT_FAILURE); -+ } -+ -+ if (!network) -+ break; -+ -+ char* s = loc_network_str(network); -+ printf("Got network: %s\n", s); -+ free(s); -+ } -+ -+ // Free the enumerator -+ loc_database_enumerator_unref(enumerator); -+ - // Close the database - loc_database_unref(db); - loc_unref(ctx); -diff --git a/src/test-network-list.c b/src/test-network-list.c -new file mode 100644 -index 0000000..6f32ff7 ---- /dev/null -+++ b/src/test-network-list.c -@@ -0,0 +1,183 @@ -+/* -+ libloc - A library to determine the location of someone on the Internet -+ -+ Copyright (C) 2017 IPFire Development 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 -+ the Free Software Foundation; either version 2 of the License, or -+ (at your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+*/ -+ -+#include <errno.h> -+#include <stdio.h> -+#include <stddef.h> -+#include <stdlib.h> -+#include <string.h> -+#include <syslog.h> -+ -+#include <loc/libloc.h> -+#include <loc/network.h> -+#include <loc/network-list.h> -+ -+int main(int argc, char** argv) { -+ int err; -+ -+ struct loc_ctx* ctx; -+ err = loc_new(&ctx); -+ if (err < 0) -+ exit(EXIT_FAILURE); -+ -+ // Enable debug logging -+ loc_set_log_priority(ctx, LOG_DEBUG); -+ -+ // Create a network -+ struct loc_network* network1; -+ err = loc_network_new_from_string(ctx, &network1, "2001:db8::/32"); -+ if (err) { -+ fprintf(stderr, "Could not create the network1\n"); -+ exit(EXIT_FAILURE); -+ } -+ -+ struct loc_network* subnet1; -+ err = loc_network_new_from_string(ctx, &subnet1, "2001:db8:a::/48"); -+ if (err) { -+ fprintf(stderr, "Could not create the subnet1\n"); -+ exit(EXIT_FAILURE); -+ } -+ -+ struct loc_network* subnet2; -+ err = loc_network_new_from_string(ctx, &subnet2, "2001:db8:b::/48"); -+ if (err) { -+ fprintf(stderr, "Could not create the subnet2\n"); -+ exit(EXIT_FAILURE); -+ } -+ -+ struct loc_network* subnet3; -+ err = loc_network_new_from_string(ctx, &subnet3, "2001:db8:c::/48"); -+ if (err) { -+ fprintf(stderr, "Could not create the subnet3\n"); -+ exit(EXIT_FAILURE); -+ } -+ -+ struct loc_network* subnet4; -+ err = loc_network_new_from_string(ctx, &subnet4, "2001:db8:d::/48"); -+ if (err) { -+ fprintf(stderr, "Could not create the subnet4\n"); -+ exit(EXIT_FAILURE); -+ } -+ -+ struct loc_network* subnet5; -+ err = loc_network_new_from_string(ctx, &subnet5, "2001:db8:e::/48"); -+ if (err) { -+ fprintf(stderr, "Could not create the subnet5\n"); -+ exit(EXIT_FAILURE); -+ } -+ -+ struct loc_network* subnet6; -+ err = loc_network_new_from_string(ctx, &subnet6, "2001:db8:1::/48"); -+ if (err) { -+ fprintf(stderr, "Could not create the subnet6\n"); -+ exit(EXIT_FAILURE); -+ } -+ -+ // Make a list with both subnets -+ struct loc_network_list* subnets; -+ err = loc_network_list_new(ctx, &subnets); -+ if (err) { -+ fprintf(stderr, "Could not create subnets list\n"); -+ exit(EXIT_FAILURE); -+ } -+ -+ size_t size = loc_network_list_size(subnets); -+ if (size > 0) { -+ fprintf(stderr, "The list is not empty: %zu\n", size); -+ exit(EXIT_FAILURE); -+ } -+ -+ err = loc_network_list_push(subnets, subnet1); -+ if (err) { -+ fprintf(stderr, "Could not add subnet1 to subnets list\n"); -+ exit(EXIT_FAILURE); -+ } -+ -+ if (loc_network_list_empty(subnets)) { -+ fprintf(stderr, "The subnets list reports that it is empty\n"); -+ exit(EXIT_FAILURE); -+ } -+ -+ err = loc_network_list_push(subnets, subnet2); -+ if (err) { -+ fprintf(stderr, "Could not add subnet2 to subnets list\n"); -+ exit(EXIT_FAILURE); -+ } -+ -+ // Add the fourth one next -+ err = loc_network_list_push(subnets, subnet4); -+ if (err) { -+ fprintf(stderr, "Could not add subnet4 to subnets list\n"); -+ exit(EXIT_FAILURE); -+ } -+ -+ // Add the third one -+ err = loc_network_list_push(subnets, subnet3); -+ if (err) { -+ fprintf(stderr, "Could not add subnet3 to subnets list\n"); -+ exit(EXIT_FAILURE); -+ } -+ -+ // Add more subnets -+ err = loc_network_list_push(subnets, subnet5); -+ if (err) { -+ fprintf(stderr, "Could not add subnet5 to subnets list\n"); -+ exit(EXIT_FAILURE); -+ } -+ -+ err = loc_network_list_push(subnets, subnet6); -+ if (err) { -+ fprintf(stderr, "Could not add subnet6 to subnets list\n"); -+ exit(EXIT_FAILURE); -+ } -+ -+ loc_network_list_dump(subnets); -+ -+ size = loc_network_list_size(subnets); -+ if (size != 6) { -+ fprintf(stderr, "Network list is reporting an incorrect size: %zu\n", size); -+ exit(EXIT_FAILURE); -+ } -+ -+ // Exclude subnet1 from network1 -+ struct loc_network_list* excluded = loc_network_exclude(network1, subnet1); -+ if (!excluded) { -+ fprintf(stderr, "Received an empty result from loc_network_exclude() for subnet1\n"); -+ exit(EXIT_FAILURE); -+ } -+ -+ loc_network_list_dump(excluded); -+ -+ // Exclude all subnets from network1 -+ excluded = loc_network_exclude_list(network1, subnets); -+ if (!excluded) { -+ fprintf(stderr, "Received an empty result from loc_network_exclude() for subnets\n"); -+ exit(EXIT_FAILURE); -+ } -+ -+ loc_network_list_dump(excluded); -+ -+ if (excluded) -+ loc_network_list_unref(excluded); -+ -+ loc_network_list_unref(subnets); -+ loc_network_unref(network1); -+ loc_network_unref(subnet1); -+ loc_network_unref(subnet2); -+ loc_unref(ctx); -+ -+ return EXIT_SUCCESS; -+} -diff --git a/src/test-network.c b/src/test-network.c -index d38f13d..dde13f1 100644 ---- a/src/test-network.c -+++ b/src/test-network.c -@@ -14,6 +14,7 @@ - GNU General Public License for more details. - */ - -+#include <arpa/inet.h> - #include <errno.h> - #include <stdio.h> - #include <stddef.h> -@@ -37,12 +38,21 @@ int main(int argc, char** argv) { - // Enable debug logging - loc_set_log_priority(ctx, LOG_DEBUG); - -+#if 0 - struct loc_network_tree* tree; - err = loc_network_tree_new(ctx, &tree); - if (err) { - fprintf(stderr, "Could not create the network tree\n"); - exit(EXIT_FAILURE); - } -+#endif -+ -+ struct in6_addr address; -+ err = inet_pton(AF_INET6, "2001:db8::1", &address); -+ if (err != 1) { -+ fprintf(stderr, "Could not parse IP address\n"); -+ exit(EXIT_FAILURE); -+ } - - // Create a network - struct loc_network* network1; -@@ -58,12 +68,14 @@ int main(int argc, char** argv) { - exit(EXIT_FAILURE); - } - -+#if 0 - // Adding network to the tree - err = loc_network_tree_add_network(tree, network1); - if (err) { - fprintf(stderr, "Could not add network to the tree\n"); - exit(EXIT_FAILURE); - } -+#endif - - // Check if the first and last addresses are correct - char* string = loc_network_format_first_address(network1); -@@ -88,6 +100,12 @@ int main(int argc, char** argv) { - exit(EXIT_FAILURE); - } - -+ err = loc_network_match_address(network1, &address); -+ if (!err) { -+ fprintf(stderr, "Network1 does not match address\n"); -+ exit(EXIT_FAILURE); -+ } -+ - struct loc_network* network2; - err = loc_network_new_from_string(ctx, &network2, "2001:db8:ffff::/48"); - if (err) { -@@ -101,6 +119,7 @@ int main(int argc, char** argv) { - exit(EXIT_FAILURE); - } - -+#if 0 - // Adding network to the tree - err = loc_network_tree_add_network(tree, network2); - if (err) { -@@ -117,20 +136,84 @@ int main(int argc, char** argv) { - - size_t nodes = loc_network_tree_count_nodes(tree); - printf("The tree has %zu nodes\n", nodes); -+#endif -+ -+ // Check equals function -+ err = loc_network_cmp(network1, network1); -+ if (err) { -+ fprintf(stderr, "Network is not equal with itself\n"); -+ exit(EXIT_FAILURE); -+ } -+ -+ err = loc_network_cmp(network1, network2); -+ if (!err) { -+ fprintf(stderr, "Networks equal unexpectedly\n"); -+ exit(EXIT_FAILURE); -+ } - - // Check subnet function -- err = loc_network_is_subnet_of(network1, network2); -- if (err != 0) { -+ err = loc_network_is_subnet(network1, network2); -+ if (!err) { - fprintf(stderr, "Subnet check 1 failed: %d\n", err); - exit(EXIT_FAILURE); - } - -- err = loc_network_is_subnet_of(network2, network1); -- if (err != 1) { -+ err = loc_network_is_subnet(network2, network1); -+ if (err) { - fprintf(stderr, "Subnet check 2 failed: %d\n", err); - exit(EXIT_FAILURE); - } - -+ // Make subnets -+ struct loc_network* subnet1 = NULL; -+ struct loc_network* subnet2 = NULL; -+ -+ err = loc_network_subnets(network1, &subnet1, &subnet2); -+ if (err || !subnet1 || !subnet2) { -+ fprintf(stderr, "Could not find subnets of network: %d\n", err); -+ exit(EXIT_FAILURE); -+ } -+ -+ char* s = loc_network_str(subnet1); -+ printf("Received subnet1 = %s\n", s); -+ free(s); -+ -+ s = loc_network_str(subnet2); -+ printf("Received subnet2 = %s\n", s); -+ free(s); -+ -+ if (!loc_network_is_subnet(network1, subnet1)) { -+ fprintf(stderr, "Subnet1 is not a subnet\n"); -+ exit(EXIT_FAILURE); -+ } -+ -+ if (!loc_network_is_subnet(network1, subnet2)) { -+ fprintf(stderr, "Subnet2 is not a subnet\n"); -+ exit(EXIT_FAILURE); -+ } -+ -+ if (!loc_network_overlaps(network1, subnet1)) { -+ fprintf(stderr, "Network1 does not seem to contain subnet1\n"); -+ exit(EXIT_FAILURE); -+ } -+ -+ if (!loc_network_overlaps(network1, subnet2)) { -+ fprintf(stderr, "Network1 does not seem to contain subnet2\n"); -+ exit(EXIT_FAILURE); -+ } -+ -+ loc_network_unref(subnet1); -+ loc_network_unref(subnet2); -+ -+ struct loc_network_list* excluded = loc_network_exclude(network1, network2); -+ if (!excluded) { -+ fprintf(stderr, "Could not create excluded list\n"); -+ exit(EXIT_FAILURE); -+ } -+ -+ loc_network_list_dump(excluded); -+ loc_network_list_unref(excluded); -+ - // Create a database - struct loc_writer* writer; - err = loc_writer_new(ctx, &writer, NULL, NULL); -@@ -160,6 +243,28 @@ int main(int argc, char** argv) { - // Set ASN - loc_network_set_asn(network4, 1024); - -+ // Try adding an invalid network -+ struct loc_network* network; -+ err = loc_writer_add_network(writer, &network, "xxxx:xxxx::/32"); -+ if (err != -EINVAL) { -+ fprintf(stderr, "It was possible to add an invalid network (err = %d)\n", err); -+ exit(EXIT_FAILURE); -+ } -+ -+ // Try adding a single address -+ err = loc_writer_add_network(writer, &network, "2001:db8::"); -+ if (err) { -+ fprintf(stderr, "It was impossible to add an single IP address (err = %d)\n", err); -+ exit(EXIT_FAILURE); -+ } -+ -+ // Try adding localhost -+ err = loc_writer_add_network(writer, &network, "::1/128"); -+ if (err != -EINVAL) { -+ fprintf(stderr, "It was possible to add localhost (::1/128): %d\n", err); -+ exit(EXIT_FAILURE); -+ } -+ - FILE* f = tmpfile(); - if (!f) { - fprintf(stderr, "Could not open file for writing: %s\n", strerror(errno)); -@@ -177,7 +282,10 @@ int main(int argc, char** argv) { - loc_network_unref(network2); - loc_network_unref(network3); - loc_network_unref(network4); -+ -+#if 0 - loc_network_tree_unref(tree); -+#endif - - // And open it again from disk - struct loc_database* db; -diff --git a/src/writer.c b/src/writer.c -index 5939cff..c61a6df 100644 ---- a/src/writer.c -+++ b/src/writer.c -@@ -147,8 +147,19 @@ static void loc_writer_free(struct loc_writer* writer) { - EVP_PKEY_free(writer->private_key2); - - // Unref all AS -- for (unsigned int i = 0; i < writer->as_count; i++) { -- loc_as_unref(writer->as[i]); -+ if (writer->as) { -+ for (unsigned int i = 0; i < writer->as_count; i++) { -+ loc_as_unref(writer->as[i]); -+ } -+ free(writer->as); -+ } -+ -+ // Unref all countries -+ if (writer->countries) { -+ for (unsigned int i = 0; i < writer->countries_count; i++) { -+ loc_country_unref(writer->countries[i]); -+ } -+ free(writer->countries); - } - - // Release network tree -@@ -601,7 +612,7 @@ static int loc_writer_create_signature(struct loc_writer* writer, - goto END; - } - -- DEBUG(writer->ctx, "Successfully generated signature of %lu bytes\n", *length); -+ DEBUG(writer->ctx, "Successfully generated signature of %zu bytes\n", *length); - r = 0; - - // Dump signature diff --git a/src/patches/libloc-0.9.5-location-Fix-list-networks-by-as.patch b/src/patches/libloc-0.9.5-location-Fix-list-networks-by-as.patch new file mode 100644 index 000000000..ea29885a8 --- /dev/null +++ b/src/patches/libloc-0.9.5-location-Fix-list-networks-by-as.patch @@ -0,0 +1,27 @@ +From b178117bac33b4b1e7ce341a6f2eec493cca13f8 Mon Sep 17 00:00:00 2001 +From: Michael Tremer <michael.tremer(a)ipfire.org> +Date: Mon, 21 Dec 2020 16:25:46 +0000 +Subject: [PATCH] location: Fix list-networks-by-as + +Fixes: #12554 +Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> +--- + src/python/location.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/python/location.in b/src/python/location.in +index b30beae..ad2ccf5 100644 +--- a/src/python/location.in ++++ b/src/python/location.in +@@ -493,7 +493,7 @@ class CLI(object): + f = writer(sys.stdout, prefix="AS%s" % asn) + + # Print all matching networks +- for n in db.search_networks(asn=asn, family=ns.family): ++ for n in db.search_networks(asns=[asn], family=ns.family): + f.write(n) + + f.finish() +-- +2.26.2 + diff --git a/src/patches/logwatch/logwatch-7.5.4-dhcpd_reuse_lease_entries.patch b/src/patches/logwatch/logwatch-7.5.4-dhcpd_reuse_lease_entries.patch deleted file mode 100644 index a66170ae5..000000000 --- a/src/patches/logwatch/logwatch-7.5.4-dhcpd_reuse_lease_entries.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/scripts/services/dhcpd b/scripts/services/dhcpd -index 87312f7..bb5cd4c 100644 ---- a/scripts/services/dhcpd -+++ b/scripts/services/dhcpd -@@ -79,7 +79,9 @@ while (my $line = <STDIN>) { - ($line =~ /^Solicit message from/) or - ($line =~ /^Sending Advertise to/) or - ($line =~ /^pool [0-9a-f]+ /) or -- ($line =~ /^[^ ]* file: /) -+ ($line =~ /^[^ ]* file: /) or -+ ($line =~ /^reuse_lease: lease age \d+ $secs$ under \d+\% threshold, reply with unaltered, existing lease for/) or -+ 0 # noop, but makes diffs easier when appending ignore statements - ) { - # Ignore these lines - } elsif ($line =~ s/Listening on\s+//) { diff --git a/src/patches/p7zip-16.02-consolidated_fixes-1.patch b/src/patches/p7zip-16.02-consolidated_fixes-1.patch deleted file mode 100644 index 3f6da9cde..000000000 --- a/src/patches/p7zip-16.02-consolidated_fixes-1.patch +++ /dev/null @@ -1,466 +0,0 @@ -Submitted By: Bruce Dubbs <bdubbs(a)linuxfromscratch.org> -Date: 2020-05-12 -Initial Package Version: 16.02 -Upstream Status: Unknown. -Origin: Arch and Fedora -Description: Updates for CVE-2016-9296, CVE-2017-17969, CVE-2018-5996, - CVE-2018-10115 and GCC10. - -diff -Naur p7zip_16.02.orig/CPP/7zip/Archive/7z/7zIn.cpp p7zip_16.02/CPP/7zip/Archive/7z/7zIn.cpp ---- p7zip_16.02.orig/CPP/7zip/Archive/7z/7zIn.cpp 2016-05-20 03:20:03.000000000 -0500 -+++ p7zip_16.02/CPP/7zip/Archive/7z/7zIn.cpp 2020-05-12 15:34:34.513287566 -0500 -@@ -1097,7 +1097,8 @@ - if (CrcCalc(data, unpackSize) != folders.FolderCRCs.Vals[i]) - ThrowIncorrect(); - } -- HeadersSize += folders.PackPositions[folders.NumPackStreams]; -+ if (folders.PackPositions) -+ HeadersSize += folders.PackPositions[folders.NumPackStreams]; - return S_OK; - } - -diff -Naur p7zip_16.02.orig/CPP/7zip/Compress/Rar1Decoder.cpp p7zip_16.02/CPP/7zip/Compress/Rar1Decoder.cpp ---- p7zip_16.02.orig/CPP/7zip/Compress/Rar1Decoder.cpp 2015-09-01 13:04:52.000000000 -0500 -+++ p7zip_16.02/CPP/7zip/Compress/Rar1Decoder.cpp 2020-05-12 15:35:00.897548643 -0500 -@@ -29,7 +29,7 @@ - }; - */ - --CDecoder::CDecoder(): m_IsSolid(false) { } -+CDecoder::CDecoder(): _isSolid(false), _solidAllowed(false), _errorMode(false) { } - - void CDecoder::InitStructures() - { -@@ -345,7 +345,7 @@ - - void CDecoder::InitData() - { -- if (!m_IsSolid) -+ if (!_isSolid) - { - AvrPlcB = AvrLn1 = AvrLn2 = AvrLn3 = NumHuf = Buf60 = 0; - AvrPlc = 0x3500; -@@ -391,6 +391,11 @@ - if (inSize == NULL || outSize == NULL) - return E_INVALIDARG; - -+ if (_isSolid && !_solidAllowed) -+ return S_FALSE; -+ -+ _solidAllowed = false; -+ - if (!m_OutWindowStream.Create(kHistorySize)) - return E_OUTOFMEMORY; - if (!m_InBitStream.Create(1 << 20)) -@@ -398,17 +403,22 @@ - - m_UnpackSize = (Int64)*outSize; - m_OutWindowStream.SetStream(outStream); -- m_OutWindowStream.Init(m_IsSolid); -+ m_OutWindowStream.Init(_isSolid); - m_InBitStream.SetStream(inStream); - m_InBitStream.Init(); - - // CCoderReleaser coderReleaser(this); - InitData(); -- if (!m_IsSolid) -+ if (!_isSolid) - { -+ _errorMode = false; - InitStructures(); - InitHuff(); - } -+ -+ if (_errorMode) -+ return S_FALSE; -+ - if (m_UnpackSize > 0) - { - GetFlagsBuf(); -@@ -470,6 +480,7 @@ - } - if (m_UnpackSize < 0) - return S_FALSE; -+ _solidAllowed = true; - return m_OutWindowStream.Flush(); - } - -@@ -477,16 +488,16 @@ - const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress) - { - try { return CodeReal(inStream, outStream, inSize, outSize, progress); } -- catch(const CInBufferException &e) { return e.ErrorCode; } -- catch(const CLzOutWindowException &e) { return e.ErrorCode; } -- catch(...) { return S_FALSE; } -+ catch(const CInBufferException &e) { _errorMode = true; return e.ErrorCode; } -+ catch(const CLzOutWindowException &e) { _errorMode = true; return e.ErrorCode; } -+ catch(...) { _errorMode = true; return S_FALSE; } - } - - STDMETHODIMP CDecoder::SetDecoderProperties2(const Byte *data, UInt32 size) - { - if (size < 1) - return E_INVALIDARG; -- m_IsSolid = ((data[0] & 1) != 0); -+ _isSolid = ((data[0] & 1) != 0); - return S_OK; - } - -diff -Naur p7zip_16.02.orig/CPP/7zip/Compress/Rar1Decoder.h p7zip_16.02/CPP/7zip/Compress/Rar1Decoder.h ---- p7zip_16.02.orig/CPP/7zip/Compress/Rar1Decoder.h 2014-12-21 06:44:00.000000000 -0600 -+++ p7zip_16.02/CPP/7zip/Compress/Rar1Decoder.h 2020-05-12 15:35:00.897548643 -0500 -@@ -38,7 +38,9 @@ - UInt32 LastLength; - - Int64 m_UnpackSize; -- bool m_IsSolid; -+ bool _isSolid; -+ bool _solidAllowed; -+ bool _errorMode; - - UInt32 ReadBits(int numBits); - HRESULT CopyBlock(UInt32 distance, UInt32 len); -diff -Naur p7zip_16.02.orig/CPP/7zip/Compress/Rar2Decoder.cpp p7zip_16.02/CPP/7zip/Compress/Rar2Decoder.cpp ---- p7zip_16.02.orig/CPP/7zip/Compress/Rar2Decoder.cpp 2015-10-03 03:49:14.000000000 -0500 -+++ p7zip_16.02/CPP/7zip/Compress/Rar2Decoder.cpp 2020-05-12 15:35:00.897548643 -0500 -@@ -80,7 +80,9 @@ - static const UInt32 kWindowReservSize = (1 << 22) + 256; - - CDecoder::CDecoder(): -- m_IsSolid(false) -+ _isSolid(false), -+ _solidAllowed(false), -+ m_TablesOK(false) - { - } - -@@ -100,6 +102,8 @@ - - bool CDecoder::ReadTables(void) - { -+ m_TablesOK = false; -+ - Byte levelLevels[kLevelTableSize]; - Byte newLevels[kMaxTableSize]; - m_AudioMode = (ReadBits(1) == 1); -@@ -170,6 +174,8 @@ - } - - memcpy(m_LastLevels, newLevels, kMaxTableSize); -+ m_TablesOK = true; -+ - return true; - } - -@@ -315,6 +321,10 @@ - if (inSize == NULL || outSize == NULL) - return E_INVALIDARG; - -+ if (_isSolid && !_solidAllowed) -+ return S_FALSE; -+ _solidAllowed = false; -+ - if (!m_OutWindowStream.Create(kHistorySize)) - return E_OUTOFMEMORY; - if (!m_InBitStream.Create(1 << 20)) -@@ -325,12 +335,12 @@ - UInt64 pos = 0, unPackSize = *outSize; - - m_OutWindowStream.SetStream(outStream); -- m_OutWindowStream.Init(m_IsSolid); -+ m_OutWindowStream.Init(_isSolid); - m_InBitStream.SetStream(inStream); - m_InBitStream.Init(); - - // CCoderReleaser coderReleaser(this); -- if (!m_IsSolid) -+ if (!_isSolid) - { - InitStructures(); - if (unPackSize == 0) -@@ -338,12 +348,16 @@ - if (m_InBitStream.GetProcessedSize() + 2 <= m_PackSize) // test it: probably incorrect; - if (!ReadTables()) - return S_FALSE; -+ _solidAllowed = true; - return S_OK; - } - if (!ReadTables()) - return S_FALSE; - } - -+ if (!m_TablesOK) -+ return S_FALSE; -+ - UInt64 startPos = m_OutWindowStream.GetProcessedSize(); - while (pos < unPackSize) - { -@@ -378,6 +392,9 @@ - - if (!ReadLastTables()) - return S_FALSE; -+ -+ _solidAllowed = true; -+ - return m_OutWindowStream.Flush(); - } - -@@ -394,7 +411,7 @@ - { - if (size < 1) - return E_INVALIDARG; -- m_IsSolid = ((data[0] & 1) != 0); -+ _isSolid = ((data[0] & 1) != 0); - return S_OK; - } - -diff -Naur p7zip_16.02.orig/CPP/7zip/Compress/Rar2Decoder.h p7zip_16.02/CPP/7zip/Compress/Rar2Decoder.h ---- p7zip_16.02.orig/CPP/7zip/Compress/Rar2Decoder.h 2015-06-19 05:52:06.000000000 -0500 -+++ p7zip_16.02/CPP/7zip/Compress/Rar2Decoder.h 2020-05-12 15:35:00.898548653 -0500 -@@ -138,7 +138,9 @@ - Byte m_LastLevels[kMaxTableSize]; - - UInt64 m_PackSize; -- bool m_IsSolid; -+ bool _isSolid; -+ bool _solidAllowed; -+ bool m_TablesOK; - - void InitStructures(); - UInt32 ReadBits(unsigned numBits); -diff -Naur p7zip_16.02.orig/CPP/7zip/Compress/Rar3Decoder.cpp p7zip_16.02/CPP/7zip/Compress/Rar3Decoder.cpp ---- p7zip_16.02.orig/CPP/7zip/Compress/Rar3Decoder.cpp 2016-05-20 03:20:03.000000000 -0500 -+++ p7zip_16.02/CPP/7zip/Compress/Rar3Decoder.cpp 2020-05-12 15:35:00.898548653 -0500 -@@ -92,7 +92,9 @@ - _writtenFileSize(0), - _vmData(0), - _vmCode(0), -- m_IsSolid(false) -+ _isSolid(false), -+ _solidAllowed(false), -+ _errorMode(false) - { - Ppmd7_Construct(&_ppmd); - } -@@ -545,6 +547,9 @@ - return InitPPM(); - } - -+ TablesRead = false; -+ TablesOK = false; -+ - _lzMode = true; - PrevAlignBits = 0; - PrevAlignCount = 0; -@@ -606,6 +611,9 @@ - } - } - } -+ if (InputEofError()) -+ return S_FALSE; -+ - TablesRead = true; - - // original code has check here: -@@ -623,6 +631,9 @@ - RIF(m_LenDecoder.Build(&newLevels[kMainTableSize + kDistTableSize + kAlignTableSize])); - - memcpy(m_LastLevels, newLevels, kTablesSizesSum); -+ -+ TablesOK = true; -+ - return S_OK; - } - -@@ -811,7 +822,7 @@ - { - _writtenFileSize = 0; - _unsupportedFilter = false; -- if (!m_IsSolid) -+ if (!_isSolid) - { - _lzSize = 0; - _winPos = 0; -@@ -824,13 +835,21 @@ - PpmEscChar = 2; - PpmError = true; - InitFilters(); -+ _errorMode = false; - } -- if (!m_IsSolid || !TablesRead) -+ -+ if (_errorMode) -+ return S_FALSE; -+ -+ if (!_isSolid || !TablesRead) - { - bool keepDecompressing; - RINOK(ReadTables(keepDecompressing)); - if (!keepDecompressing) -+ { -+ _solidAllowed = true; - return S_OK; -+ } - } - - for (;;) -@@ -838,6 +857,8 @@ - bool keepDecompressing; - if (_lzMode) - { -+ if (!TablesOK) -+ return S_FALSE; - RINOK(DecodeLZ(keepDecompressing)) - } - else -@@ -853,6 +874,9 @@ - if (!keepDecompressing) - break; - } -+ -+ _solidAllowed = true; -+ - RINOK(WriteBuf()); - UInt64 packSize = m_InBitStream.BitDecoder.GetProcessedSize(); - RINOK(progress->SetRatioInfo(&packSize, &_writtenFileSize)); -@@ -873,6 +897,10 @@ - if (!inSize) - return E_INVALIDARG; - -+ if (_isSolid && !_solidAllowed) -+ return S_FALSE; -+ _solidAllowed = false; -+ - if (!_vmData) - { - _vmData = (Byte *)::MidAlloc(kVmDataSizeMax + kVmCodeSizeMax); -@@ -901,8 +929,8 @@ - _unpackSize = outSize ? *outSize : (UInt64)(Int64)-1; - return CodeReal(progress); - } -- catch(const CInBufferException &e) { return e.ErrorCode; } -- catch(...) { return S_FALSE; } -+ catch(const CInBufferException &e) { _errorMode = true; return e.ErrorCode; } -+ catch(...) { _errorMode = true; return S_FALSE; } - // CNewException is possible here. But probably CNewException is caused - // by error in data stream. - } -@@ -911,7 +939,7 @@ - { - if (size < 1) - return E_INVALIDARG; -- m_IsSolid = ((data[0] & 1) != 0); -+ _isSolid = ((data[0] & 1) != 0); - return S_OK; - } - -diff -Naur p7zip_16.02.orig/CPP/7zip/Compress/Rar3Decoder.h p7zip_16.02/CPP/7zip/Compress/Rar3Decoder.h ---- p7zip_16.02.orig/CPP/7zip/Compress/Rar3Decoder.h 2015-10-03 03:49:12.000000000 -0500 -+++ p7zip_16.02/CPP/7zip/Compress/Rar3Decoder.h 2020-05-12 15:35:00.898548653 -0500 -@@ -191,7 +191,9 @@ - CRecordVector<CTempFilter *> _tempFilters; - UInt32 _lastFilter; - -- bool m_IsSolid; -+ bool _isSolid; -+ bool _solidAllowed; -+ bool _errorMode; - - bool _lzMode; - bool _unsupportedFilter; -@@ -200,6 +202,7 @@ - UInt32 PrevAlignCount; - - bool TablesRead; -+ bool TablesOK; - - CPpmd7 _ppmd; - int PpmEscChar; -diff -Naur p7zip_16.02.orig/CPP/7zip/Compress/Rar5Decoder.cpp p7zip_16.02/CPP/7zip/Compress/Rar5Decoder.cpp ---- p7zip_16.02.orig/CPP/7zip/Compress/Rar5Decoder.cpp 2016-05-20 03:20:04.000000000 -0500 -+++ p7zip_16.02/CPP/7zip/Compress/Rar5Decoder.cpp 2020-05-12 15:35:00.899548663 -0500 -@@ -72,6 +72,7 @@ - _writtenFileSize(0), - _dictSizeLog(0), - _isSolid(false), -+ _solidAllowed(false), - _wasInit(false), - _inputBuf(NULL) - { -@@ -801,7 +802,10 @@ - */ - - if (res == S_OK) -+ { -+ _solidAllowed = true; - res = res2; -+ } - - if (res == S_OK && _unpackSize_Defined && _writtenFileSize != _unpackSize) - return S_FALSE; -@@ -821,6 +825,10 @@ - { - try - { -+ if (_isSolid && !_solidAllowed) -+ return S_FALSE; -+ _solidAllowed = false; -+ - if (_dictSizeLog >= sizeof(size_t) * 8) - return E_NOTIMPL; - -diff -Naur p7zip_16.02.orig/CPP/7zip/Compress/Rar5Decoder.h p7zip_16.02/CPP/7zip/Compress/Rar5Decoder.h ---- p7zip_16.02.orig/CPP/7zip/Compress/Rar5Decoder.h 2015-09-01 13:04:50.000000000 -0500 -+++ p7zip_16.02/CPP/7zip/Compress/Rar5Decoder.h 2020-05-12 15:35:00.899548663 -0500 -@@ -271,6 +271,7 @@ - Byte _dictSizeLog; - bool _tableWasFilled; - bool _isSolid; -+ bool _solidAllowed; - bool _wasInit; - - UInt32 _reps[kNumReps]; -diff -Naur p7zip_16.02.orig/CPP/7zip/Compress/ShrinkDecoder.cpp p7zip_16.02/CPP/7zip/Compress/ShrinkDecoder.cpp ---- p7zip_16.02.orig/CPP/7zip/Compress/ShrinkDecoder.cpp 2016-05-18 12:31:02.000000000 -0500 -+++ p7zip_16.02/CPP/7zip/Compress/ShrinkDecoder.cpp 2020-05-12 15:34:45.120392530 -0500 -@@ -121,7 +121,12 @@ - { - _stack[i++] = _suffixes[cur]; - cur = _parents[cur]; -+ if (cur >= kNumItems || i >= kNumItems) -+ break; - } -+ -+ if (cur >= kNumItems || i >= kNumItems) -+ break; - - _stack[i++] = (Byte)cur; - lastChar2 = (Byte)cur; -diff -Naur p7zip_16.02.orig/CPP/Windows/ErrorMsg.cpp p7zip_16.02/CPP/Windows/ErrorMsg.cpp ---- p7zip_16.02.orig/CPP/Windows/ErrorMsg.cpp 2015-01-18 12:20:28.000000000 -0600 -+++ p7zip_16.02/CPP/Windows/ErrorMsg.cpp 2020-05-12 15:37:52.688247586 -0500 -@@ -14,15 +14,15 @@ - AString msg; - - switch(errorCode) { -- case ERROR_NO_MORE_FILES : txt = "No more files"; break ; -- case E_NOTIMPL : txt = "E_NOTIMPL"; break ; -- case E_NOINTERFACE : txt = "E_NOINTERFACE"; break ; -- case E_ABORT : txt = "E_ABORT"; break ; -- case E_FAIL : txt = "E_FAIL"; break ; -- case STG_E_INVALIDFUNCTION : txt = "STG_E_INVALIDFUNCTION"; break ; -- case E_OUTOFMEMORY : txt = "E_OUTOFMEMORY"; break ; -- case E_INVALIDARG : txt = "E_INVALIDARG"; break ; -- case ERROR_DIRECTORY : txt = "Error Directory"; break ; -+ case unsigned (ERROR_NO_MORE_FILES) : txt = "No more files"; break ; -+ case unsigned (E_NOTIMPL) : txt = "E_NOTIMPL"; break ; -+ case unsigned (E_NOINTERFACE) : txt = "E_NOINTERFACE"; break ; -+ case unsigned (E_ABORT) : txt = "E_ABORT"; break ; -+ case unsigned (E_FAIL) : txt = "E_FAIL"; break ; -+ case unsigned (STG_E_INVALIDFUNCTION) : txt = "STG_E_INVALIDFUNCTION"; break ; -+ case unsigned (E_OUTOFMEMORY) : txt = "E_OUTOFMEMORY"; break ; -+ case unsigned (E_INVALIDARG) : txt = "E_INVALIDARG"; break ; -+ case ERROR_DIRECTORY : txt = "Error Directory"; break ; - default: - txt = strerror(errorCode); - } diff --git a/src/patches/p7zip/CVE-2016-2334.patch b/src/patches/p7zip/CVE-2016-2334.patch deleted file mode 100644 index 1eb5163cb..000000000 --- a/src/patches/p7zip/CVE-2016-2334.patch +++ /dev/null @@ -1,24 +0,0 @@ -Index: p7zip_15.14.1/CPP/7zip/Archive/HfsHandler.cpp -=================================================================== ---- p7zip_15.14.1.orig/CPP/7zip/Archive/HfsHandler.cpp -+++ p7zip_15.14.1/CPP/7zip/Archive/HfsHandler.cpp -@@ -987,7 +987,9 @@ HRESULT CDatabase::LoadCatalog(const CFo - item.GroupID = Get32(r + 0x24); - item.AdminFlags = r[0x28]; - item.OwnerFlags = r[0x29]; -+ */ - item.FileMode = Get16(r + 0x2A); -+ /* - item.special.iNodeNum = Get16(r + 0x2C); // or .linkCount - item.FileType = Get32(r + 0x30); - item.FileCreator = Get32(r + 0x34); -@@ -1572,6 +1574,9 @@ HRESULT CHandler::ExtractZlibFile( - - UInt32 size = GetUi32(tableBuf + i * 8 + 4); - -+ if (size > buf.Size() || size > kCompressionBlockSize + 1) -+ return S_FALSE; -+ - RINOK(ReadStream_FALSE(inStream, buf, size)); - - if ((buf[0] & 0xF) == 0xF) diff --git a/src/patches/p7zip/CVE-2016-2335.patch b/src/patches/p7zip/CVE-2016-2335.patch deleted file mode 100644 index a00d6a386..000000000 --- a/src/patches/p7zip/CVE-2016-2335.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: p7zip_15.14.1/CPP/7zip/Archive/Udf/UdfIn.cpp -=================================================================== ---- p7zip_15.14.1.orig/CPP/7zip/Archive/Udf/UdfIn.cpp -+++ p7zip_15.14.1/CPP/7zip/Archive/Udf/UdfIn.cpp -@@ -389,7 +389,11 @@ HRESULT CInArchive::ReadFileItem(int vol - return S_FALSE; - CFile &file = Files.Back(); - const CLogVol &vol = LogVols[volIndex]; -- CPartition &partition = Partitions[vol.PartitionMaps[lad.Location.PartitionRef].PartitionIndex]; -+ unsigned partitionRef = lad.Location.PartitionRef; -+ -+ if (partitionRef >= vol.PartitionMaps.Size()) -+ return S_FALSE; -+ CPartition &partition = Partitions[vol.PartitionMaps[partitionRef].PartitionIndex]; - - UInt32 key = lad.Location.Pos; - UInt32 value; diff --git a/src/patches/pptp-1.7.2-compat.patch b/src/patches/pptp-1.7.2-compat.patch deleted file mode 100644 index 0ea155166..000000000 --- a/src/patches/pptp-1.7.2-compat.patch +++ /dev/null @@ -1,71 +0,0 @@ -Index: pptp_compat.c -=================================================================== -RCS file: /cvsroot/pptpclient/pptp-linux/pptp_compat.c,v -retrieving revision 1.1 -retrieving revision 1.3 -diff -u -r1.1 -r1.3 ---- pptp_compat.c 19 Feb 2008 21:43:28 -0000 1.1 -+++ pptp_compat.c 25 Jul 2008 00:13:56 -0000 1.3 -@@ -7,14 +7,15 @@ - #include <fcntl.h> - #include <sys/types.h> - #include <unistd.h> --#include <stropts.h> - #include <stdlib.h> -+#if defined (__SVR4) && defined (__sun) /* Solaris */ -+#include <stropts.h> -+#endif - #include <strings.h> - #include "pptp_compat.h" - #include <stdio.h> - #include "util.h" - -- - #if defined (__SVR4) && defined (__sun) /* Solaris */ - /* - * daemon implementation from uClibc -Index: pptp.c -=================================================================== -RCS file: /cvsroot/pptpclient/pptp-linux/pptp.c,v -retrieving revision 1.49 -retrieving revision 1.51 -diff -u -r1.49 -r1.51 ---- pptp.c 14 May 2008 06:32:52 -0000 1.49 -+++ pptp.c 24 Jul 2008 05:53:05 -0000 1.51 -@@ -61,9 +61,8 @@ - #include "version.h" - #if defined(__linux__) - #include <sys/prctl.h> --#else --#include "inststr.h" - #endif -+#include "inststr.h" - #include "util.h" - #include "pptp_quirks.h" - #include "pqueue.h" -@@ -129,7 +128,7 @@ - } - - #if defined (__SVR4) && defined (__sun) --struct in_addr localbind = { INADDR_ANY }; -+struct in_addr localbind = { .s_addr = INADDR_ANY }; - #else - struct in_addr localbind = { INADDR_NONE }; - #endif -@@ -183,6 +182,7 @@ - struct in_addr inetaddr; - volatile int callmgr_sock = -1; - char ttydev[PATH_MAX]; -+ char *tty_name; - int pty_fd, tty_fd, gre_fd, rc; - volatile pid_t parent_pid, child_pid; - u_int16_t call_id, peer_call_id; -@@ -391,7 +391,7 @@ - file2fd("/dev/null", "wb", STDERR_FILENO); - } - -- char *tty_name = ttyname(tty_fd); -+ tty_name = ttyname(tty_fd); - snprintf(buf, sizeof(buf), "pptp: GRE-to-PPP gateway on %s", - tty_name ? tty_name : "(null)"); - #ifdef PR_SET_NAME diff --git a/src/patches/procps-3.2.8-fix_unknown_HZ_value.patch b/src/patches/procps-3.2.8-fix_unknown_HZ_value.patch deleted file mode 100644 index 08edaa6cc..000000000 --- a/src/patches/procps-3.2.8-fix_unknown_HZ_value.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -Naur procps-3.2.6.org/proc/sysinfo.c procps-3.2.6/proc/sysinfo.c ---- procps-3.2.6.org/proc/sysinfo.c 2005-03-14 05:31:27.000000000 +0100 -+++ procps-3.2.6/proc/sysinfo.c 2011-10-02 12:51:32.000000000 +0200 -@@ -212,6 +212,7 @@ - static void init_libproc(void) __attribute__((constructor)); - static void init_libproc(void){ - have_privs = check_for_privs(); -+ init_Linux_version(); - // ought to count CPUs in /proc/stat instead of relying - // on glibc, which foolishly tries to parse /proc/cpuinfo - // -diff -Naur procps-3.2.6.org/proc/version.c procps-3.2.6/proc/version.c ---- procps-3.2.6.org/proc/version.c 2003-01-29 02:11:43.000000000 +0100 -+++ procps-3.2.6/proc/version.c 2011-10-02 12:52:36.000000000 +0200 -@@ -33,8 +33,7 @@ - - int linux_version_code; - --static void init_Linux_version(void) __attribute__((constructor)); --static void init_Linux_version(void) { -+void init_Linux_version(void) { - static struct utsname uts; - int x = 0, y = 0, z = 0; /* cleared in case sscanf() < 3 */ - -diff -Naur procps-3.2.6.org/proc/version.h procps-3.2.6/proc/version.h ---- procps-3.2.6.org/proc/version.h 2002-12-15 01:08:32.000000000 +0100 -+++ procps-3.2.6/proc/version.h 2011-10-02 12:53:10.000000000 +0200 -@@ -14,6 +14,7 @@ - - EXTERN_C_BEGIN - -+extern void init_Linux_version(void); - extern void display_version(void); /* display suite version */ - extern const char procps_version[]; /* global buf for suite version */ - diff --git a/src/patches/qemu-4.1.0-build-fix-glibc-2.31.patch b/src/patches/qemu-4.1.0-build-fix-glibc-2.31.patch deleted file mode 100644 index 37c744d3b..000000000 --- a/src/patches/qemu-4.1.0-build-fix-glibc-2.31.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 0f1f2d4596aee037d3ccbcf10592466daa54107f Mon Sep 17 00:00:00 2001 -From: Laurent Vivier <laurent(a)vivier.eu> -Date: Tue, 12 Nov 2019 15:25:56 +0100 -Subject: [PATCH] linux-user: remove host stime() syscall - -stime() has been withdrawn from glibc -(12cbde1dae6f "Use clock_settime to implement stime; withdraw stime.") - -Implement the target stime() syscall using host -clock_settime(CLOCK_REALTIME, ...) as it is done internally in glibc. - -Tested qemu-ppc/x86_64 with: - - #include <time.h> - #include <stdio.h> - - int main(void) - { - time_t t; - int ret; - - /* date -u -d"2019-11-12T15:11:00" "+%s" */ - t = 1573571460; - ret = stime(&t); - printf("ret %d\n", ret); - return 0; - } - - # date; ./stime; date - Tue Nov 12 14:18:32 UTC 2019 - ret 0 - Tue Nov 12 15:11:00 UTC 2019 - -Buglink: https://bugs.launchpad.net/qemu/+bug/1852115 -Reported-by: Cole Robinson <crobinso(a)redhat.com> -Signed-off-by: Laurent Vivier <laurent(a)vivier.eu> -Reviewed-by: Peter Maydell <peter.maydell(a)linaro.org> -Message-Id: <20191112142556.6335-1-laurent(a)vivier.eu> ---- - linux-user/syscall.c | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 4e97bcf..ce399a5 100644 ---- a/linux-user/syscall.c -+++ b/linux-user/syscall.c -@@ -7764,10 +7764,12 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, - #ifdef TARGET_NR_stime /* not on alpha */ - case TARGET_NR_stime: - { -- time_t host_time; -- if (get_user_sal(host_time, arg1)) -+ struct timespec ts; -+ ts.tv_nsec = 0; -+ if (get_user_sal(ts.tv_sec, arg1)) { - return -TARGET_EFAULT; -- return get_errno(stime(&host_time)); -+ } -+ return get_errno(clock_settime(CLOCK_REALTIME, &ts)); - } - #endif - #ifdef TARGET_NR_alarm /* not on alpha */ --- -1.8.3.1 - diff --git a/src/patches/screen-4.2.1-altscreen.patch b/src/patches/screen-4.2.1-altscreen.patch deleted file mode 100644 index 0a3516613..000000000 --- a/src/patches/screen-4.2.1-altscreen.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/src/ansi.c b/src/ansi.c -index e76eef4..bbdc119 100644 ---- a/ansi.c -+++ b/ansi.c -@@ -1444,8 +1444,8 @@ int c, intermediate; - else - { - if (curr->w_alt.on) { -- LeaveAltScreen(curr); -- RestoreCursor(&curr->w_alt.cursor); -+ RestoreCursor(&curr->w_alt.cursor); -+ LeaveAltScreen(curr); - } - } - if (a1 == 47 && !i) - diff --git a/src/patches/screen-4.2.1-cpation-hardstatus.patch b/src/patches/screen-4.2.1-cpation-hardstatus.patch deleted file mode 100644 index c6809af50..000000000 --- a/src/patches/screen-4.2.1-cpation-hardstatus.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/src/screen.c b/src/screen.c -index 473e4fa..8b36bea 100644 ---- a/screen.c -+++ b/screen.c -@@ -2271,8 +2271,8 @@ int padlen; - while (i-- > 0) - *pn-- = ' '; - numpad--; -- if (r && p - buf == winmsg_rendpos[r - 1]) -- winmsg_rendpos[--r] = pn - buf; -+ if (r && p - buf + 1== winmsg_rendpos[r - 1]) -+ winmsg_rendpos[--r] = pn - buf + 1; - } - } - return pn2; - diff --git a/src/scripts/ipsec-interfaces b/src/scripts/ipsec-interfaces index 2546f8927..f0983dbdc 100644 --- a/src/scripts/ipsec-interfaces +++ b/src/scripts/ipsec-interfaces @@ -228,6 +228,11 @@ main() { ip addr flush dev "${intf}" ip addr add "${interface_address}" dev "${intf}" + # Disable IPsec policy lookup for VTI + if [ "${interface_mode}" = "vti" ]; then + sysctl -qw "net.ipv4.conf.${intf}.disable_policy=1" + fi + # Set MTU ip link set dev "${intf}" mtu "${interface_mtu}" diff --git a/src/setup/netstuff.c b/src/setup/netstuff.c index 91604de14..1e196dc1e 100644 --- a/src/setup/netstuff.c +++ b/src/setup/netstuff.c @@ -31,6 +31,7 @@ int scanned_nics_read_done = 0; newtComponent networkform; newtComponent addressentry; newtComponent netmaskentry; +newtComponent gatewayentry; newtComponent statictyperadio; newtComponent dhcptyperadio; newtComponent pppoetyperadio; @@ -53,12 +54,14 @@ int changeaddress(struct keyvalue *kv, char *colour, int typeflag, { char *addressresult; char *netmaskresult; + char *gatewayresult; char *dhcphostnameresult; char *dhcpforcemturesult; struct newtExitStruct es; newtComponent header; newtComponent addresslabel; newtComponent netmasklabel; + newtComponent gatewaylabel; newtComponent dhcphostnamelabel; newtComponent dhcpforcemtulabel; newtComponent ok, cancel; @@ -66,6 +69,7 @@ int changeaddress(struct keyvalue *kv, char *colour, int typeflag, char temp[STRING_SIZE]; char addressfield[STRING_SIZE]; char netmaskfield[STRING_SIZE]; + char gatewayfield[STRING_SIZE]; char typefield[STRING_SIZE]; char dhcphostnamefield[STRING_SIZE]; char dhcpforcemtufield[STRING_SIZE]; @@ -80,12 +84,13 @@ int changeaddress(struct keyvalue *kv, char *colour, int typeflag, /* Build some key strings. */ sprintf(addressfield, "%s_ADDRESS", colour); sprintf(netmaskfield, "%s_NETMASK", colour); + sprintf(gatewayfield, "DEFAULT_GATEWAY"); sprintf(typefield, "%s_TYPE", colour); sprintf(dhcphostnamefield, "%s_DHCP_HOSTNAME", colour); sprintf(dhcpforcemtufield, "%s_DHCP_FORCE_MTU", colour); sprintf(message, _("Interface - %s"), colour); - newtCenteredWindow(44, (typeflag ? 18 : 12), message); + newtCenteredWindow(44, (typeflag ? 19 : 12), message); networkform = newtForm(NULL, NULL, 0); @@ -154,9 +159,24 @@ int changeaddress(struct keyvalue *kv, char *colour, int typeflag, newtFormAddComponent(networkform, netmasklabel); newtFormAddComponent(networkform, netmaskentry); + if (typeflag) + { + /* Gateway */ + gatewaylabel = newtTextbox(2, (typeflag ? 11 : 4) + 2, 18, 1, 0); + newtTextboxSetText(gatewaylabel, _("Gateway:")); + strcpy(temp, ""); + findkey(kv, gatewayfield, temp); + gatewayentry = newtEntry(20, (typeflag ? 11 : 4) + 2, temp, 20, &gatewayresult, 0); + newtEntrySetFilter(gatewayentry, ip_input_filter, NULL); + if (typeflag == 1 && startstatictype == 0) + newtEntrySetFlags(gatewayentry, NEWT_FLAG_DISABLED, NEWT_FLAGS_SET); + newtFormAddComponent(networkform, gatewaylabel); + newtFormAddComponent(networkform, gatewayentry); + } + /* Buttons. */ - ok = newtButton(8, (typeflag ? 14 : 7), _("OK")); - cancel = newtButton(26, (typeflag ? 14 : 7), _("Cancel")); + ok = newtButton(8, (typeflag ? 15 : 7), _("OK")); + cancel = newtButton(26, (typeflag ? 15 : 7), _("Cancel")); newtFormAddComponents(networkform, ok, cancel, NULL); @@ -191,6 +211,13 @@ int changeaddress(struct keyvalue *kv, char *colour, int typeflag, strcat(message, "\n"); error = 1; } + if (typeflag && (inet_addr(gatewayresult) == INADDR_NONE)) + { + strcat(message, _("Gateway")); + strcat(message, "\n"); + error = 1; + } + } if (strcmp(type, "DHCP") == 0) { @@ -214,13 +241,15 @@ int changeaddress(struct keyvalue *kv, char *colour, int typeflag, { replacekeyvalue(kv, addressfield, "0.0.0.0"); replacekeyvalue(kv, netmaskfield, "0.0.0.0"); + replacekeyvalue(kv, gatewayfield, "0.0.0.0"); } else { replacekeyvalue(kv, addressfield, addressresult); replacekeyvalue(kv, netmaskfield, netmaskresult); + replacekeyvalue(kv, gatewayfield, gatewayresult); } - replacekeyvalue(kv, typefield, type); + replacekeyvalue(kv, typefield, type); } else { @@ -311,11 +340,13 @@ void networkdialogcallbacktype(newtComponent cm, void *data) { newtEntrySetFlags(addressentry, NEWT_FLAG_DISABLED, NEWT_FLAGS_SET); newtEntrySetFlags(netmaskentry, NEWT_FLAG_DISABLED, NEWT_FLAGS_SET); + newtEntrySetFlags(gatewayentry, NEWT_FLAG_DISABLED, NEWT_FLAGS_SET); } else { newtEntrySetFlags(addressentry, NEWT_FLAG_DISABLED, NEWT_FLAGS_RESET); newtEntrySetFlags(netmaskentry, NEWT_FLAG_DISABLED, NEWT_FLAGS_RESET); + newtEntrySetFlags(gatewayentry, NEWT_FLAG_DISABLED, NEWT_FLAGS_RESET); } if (strcmp(type, "DHCP") == 0) { diff --git a/src/setup/networking.c b/src/setup/networking.c index 97d58f724..9dd5205e5 100644 --- a/src/setup/networking.c +++ b/src/setup/networking.c @@ -51,7 +51,6 @@ int drivermenu(void); int changedrivers(void); int greenaddressmenu(void); int addressesmenu(void); -int gatewaymenu(void); int handlenetworking(void) { @@ -83,10 +82,6 @@ int handlenetworking(void) addressesmenu(); break; - case 4: - gatewaymenu(); - break; - case 0: if (oktoleave()) done = 1; break; @@ -215,18 +210,6 @@ int oktoleave(void) return 0; } } - - strcpy(temp, ""); findkey(kv, "RED_TYPE", temp); - if ((configtype == 0) || (strcmp(temp, "STATIC") == 0)) - { - strcpy(temp, ""); findkey(kv, "DEFAULT_GATEWAY", temp); - if (!(strlen(temp))) - { - errorbox(_("Missing Default Gateway.")); - freekeyvalues(kv); - return 0; - } - } return 1; } @@ -238,7 +221,6 @@ int firstmenu(void) _("Network configuration type"), _("Drivers and card assignments"), _("Address settings"), - _("Gateway settings"), NULL }; int rc; @@ -695,70 +677,3 @@ int addressesmenu(void) return 0; } - -/* default gateway.... */ -int gatewaymenu(void) -{ - struct keyvalue *kv = initkeyvalues(); - char message[1000]; - char temp[STRING_SIZE] = "0"; - struct newtWinEntry entries[2]; - char* values[1]; /* pointers for the values. */ - int error; - int configtype; - int rc; - - if (!(readkeyvalues(kv, CONFIG_ROOT "/ethernet/settings"))) - { - freekeyvalues(kv); - errorbox(_("Unable to open settings file")); - return 0; - } - - entries[0].text = _("Default gateway:"); - strcpy(temp, ""); findkey(kv, "DEFAULT_GATEWAY", temp); - values[0] = strdup(temp); - entries[0].value = &values[0]; - entries[0].flags = 0; - - entries[1].text = NULL; - entries[1].value = NULL; - entries[1].flags = 0; - - do - { - error = 0; - - rc = newtWinEntries(_("Gateway settings"), - _("Enter the gateway information. " - "These settings are used only with Static IP on the RED interface."), - 50, 5, 5, 18, entries, _("OK"), _("Cancel"), NULL); - if (rc == 0 || rc == 1) - { - if (strlen(values[0])) - { - if (inet_addr(values[0]) == INADDR_NONE) - { - strcat(message, _("Default gateway")); - strcat(message, "\n"); - error = 1; - } - } - - if (error) - errorbox(message); - else - { - replacekeyvalue(kv, "DEFAULT_GATEWAY", values[0]); - netaddresschange = 1; - free(values[0]); - writekeyvalues(kv, CONFIG_ROOT "/ethernet/settings"); - } - } - } - while (error); - - freekeyvalues(kv); - - return 1; -} hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core154, updated. c1b356d20da2ebb162072787927b5babbafebfa4
by Michael Tremer 05 Feb '21

05 Feb '21

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core154, created. 8e308e4eb2534c260a29a17bd66700f894a84cb9
by Michael Tremer 05 Feb '21

05 Feb '21

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, core154 has been created at 8e308e4eb2534c260a29a17bd66700f894a84cb9 (commit) - Log ----------------------------------------------------------------- commit 8e308e4eb2534c260a29a17bd66700f894a84cb9 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Feb 5 16:44:41 2021 +0000 Update contributors Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit ed900d153ef5452779f8eae0320c424b4216d9b4 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Feb 5 11:24:50 2021 +0000 core154: Ship lzip Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit f407f05a6f0b4a85e7852ac01d71f4d9373940ae Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Thu Feb 4 23:17:22 2021 +0100 lzip: Installation of lzip-1.22 - Installation of lzip-1.22 into IPFire Build system. Required for update of ddrescue addon as gnu only using lzip compression for ddrescue from 2013. - Created rootfiles - Installed lzip into build sequence of make.sh at same location as other compressor packages. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit ece62d250091d962f12cbfb8de92ebfc26a0856e Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Thu Feb 4 23:17:08 2021 +0100 ddrescue: Update to 1.25 - Update ddrescue from 1.12 to 1.25 - Updated rootfiles - Since 2013 gnu started to only use lzip for compression of ddrescue Therefore second patch of this series is the installation of lzip in the IPFire Build. - Changelog 2020-02-21 Antonio Diaz Diaz <antonio(a)gnu.org> * Version 1.25 released. * block.h: Add default constructors to classes Block and Sblock. (Reported by Rosen Penev). * check.sh: Quote all file name variables to allow names with spaces. (Reported by David Morrison). * In rescue mode, join non-finished subsectors read from mapfile. (Reported by David Burton). * mapbook.cc (update_mapfile): Exclude writing time from intervals. (Reported by David Burton). * rescuebook.cc (extend_outfile_size): Use ftruncate if it works. * Print large numbers in groups of 3 digits separated by underscores. * main.cc: Set a valid invocation_name even if argc == 0. 2019-02-24 Antonio Diaz Diaz <antonio(a)gnu.org> * Version 1.24 released. * Added new option '--command-mode'. * Implemented mapfile backup. * ddrescue.texi: Documented final contents of bad areas in outfile. * configure: Accept appending to CXXFLAGS, 'CXXFLAGS+=OPTIONS'. 2018-02-13 Antonio Diaz Diaz <antonio(a)gnu.org> * Version 1.23 released. * rescuebook.cc (trim_errors): Fix wrong change to non-scraped. * Added new option '--same-file'. * Added new option '--shift' to ddrescuelog. * fillbook.cc (fill_block): Write location data as one line. * fillbook.cc (read_buffer): Do not require a seekable infile. * ddrescue.texi: Added chapter 'Output'. * check.sh: Added 'combined rescue' test. * io.cc: Added missing '#include <cstdio>'. 2017-02-03 Antonio Diaz Diaz <antonio(a)gnu.org> * Version 1.22 released. * Option '-X, --exit-on-error' replaced by '-X, --max-read-errors'. * Added new option '--max-slow-reads'. * Added new option '--delay-slow'. * Added new option '--reset-slow'. * Added new option '--log-events'. * Added new option '--mapfile-interval'. * Added new option '--pause-on-error'. * Option '--pause' has been renamed to '--pause-on-pass'. * Option '--max-errors' has been renamed to '--max-bad-areas'. * Renamed 'errsize' to 'bad_size' and 'errors' to 'bad_areas' * Rescuebook: Show read_errors, error_rate and slow_reads. * Added 'current_pass' field to mapfile. * Added two new passes (3 and 4) to the copying phase. * main.cc (parse_cpass): Accept ranges of passes. * Option '-K, --skip-size' now accepts sizes up to 1 EiB. * Initial skip size now defaults to (infile_size / 100_000). * rescuebook.cc (copy_non_tried): Don't reduce min_read_rate, enable it only for passes 1 and 2. * rescuebook.cc (trim_errors): Don't trim bad edges. * main_common.cc (getnum): Accept 's' after other multiplier. * '--ask', '-vv' now show size along with model and serial number. * non_posix.cc: Add 'device_id' for Cygwin. (Patch written by Christian Franke <franke(a)computer.org>). * rescuebook.cc (do_rescue): Show full sizes in domain warning. * Added new option '-A, --annotate-mapfile' to ddrescuelog. 2016-03-17 Antonio Diaz Diaz <antonio(a)gnu.org> * Version 1.21 released. * mapbook.cc (Mapbook): Fix iobuf alignment. (Reported by Heikki Tauriainen). * Removed short option names '-1' and '-2'. * Allow only regular files for '--log-rates' and '--log-reads'. * Option '-D, --odirect' now works also in fill mode. * rescuebook.cc (copy_block): Return 1 on unaligned read error. Set e_code on any error if verify_on_error. * Option '-X, --exit-on-error' has been extended to all phases. * Assigned short name '-Z' to option '--max-read-rate'. * mapbook.cc (update_mapfile): 'fsync' the mapfile every 5 minutes. * Rescuebook: Show full range of sizes from non-tried to finished. * rescuebook.cc (show_status): Show percentage rescued. * configure: Avoid warning on some shells when testing for g++. * Makefile.in: Detect the existence of install-info. 2015-09-10 Antonio Diaz Diaz <antonio(a)gnu.org> * Version 1.20 released. * 'logfile' has been renamed to 'mapfile' everywhere. * Changed short name of option '--synchronous' to '-y'. * Changed long name of option '-d' to '--idirect'. * Added new option '-D, --odirect'. * Added new option '-J, --verify-on-error'. * Added new option '--max-read-rate'. * rescuebook.cc (copy_block): Copy arbitrary blocks with '--idirect'. * Include only bad-sector blocks in 'errsize'. * rescuebook.cc (show_status): Show the estimated remaining time. * io.cc (format_time): Show time in days, hours, minutes and seconds. * Added per sector location data to fill mode. * mapbook.cc: Added emergency save of the mapfile. * Show device name with '--ask' or '-vv' on Haiku. * mapfile.cc (read_mapfile): Read read-only mapfiles from stdin. * ddrescuelog.cc: Allow multiple mapfiles for '-t, --show-status'. * ddrescuelog.cc (create_mapfile): '-' writes mapfile to stdout. * ddrescue.texi: Added new chapter 'Optical media'. * ddrescue.texi: Documented maximum size of the rescue domain. * configure: Option '--enable-linux' renamed to '--enable-non-posix'. * Makefile.in: Added new targets 'install*-compress'. * File 'ddrescue.h' renamed to 'mapbook.h'. * File 'logbook.cc' renamed to 'mapbook.cc'. * File 'logfile.cc' renamed to 'mapfile.cc'. * Files linux.{h,cc} renamed to non_posix.{h,cc}. 2014-10-03 Antonio Diaz Diaz <antonio(a)gnu.org> * Version 1.19 released. * Fixed a race condition at start of run with '--timeout=0'. * Added new option '-P, --data-preview'. * Added new option '-u, --unidirectional'. * Added new option '-X, --exit-on-error'. * Added new option '--ask' to ask for user confirmation. * Added new option '--cpass' to select passes during copying phase. * Added new option '--pause' to insert a pause between passes. * Removed option '-l, --logfile-size'. * Skip on the first error during the copying phase. * rescuebook.cc: Trimming done in one pass, may be run in reverse. * The splitting phase has been replaced by a scraping phase. * Changed long name of option '-n' to '--no-scrape'. * rescuebook.cc: Alternate direction of passes during retrying phase. * Show ATA model and serial number with '--ask' or '-vv' on Linux. * configure: Added new option '--enable-linux'. * New files linux.h linux.cc. * License changed to GPL version 2 or later. 2014-06-10 Antonio Diaz Diaz <antonio(a)gnu.org> * Version 1.18.1 released. * ddrescuelog.cc (do_logic_ops): Fixed 'or' and 'xor'. * Added new option '-H, --test-mode' to simulate read errors. * Added new option '-L, --loose-domain' to ddrescue and ddrescuelog. * Added new option '-N, --no-trim' to disable trimming of damaged areas. * Added new option '-O, --reopen-on-error'. * Added new options '-1, --log-rates', '-2, --log-reads'. * Extended '-K, --skip-size' with maximum and disable values. * Changed long name of option '-r' to '--retry-passes'. * Changed short name of option '--generate-mode' to '-G'. * Default value of option '-l, --logfile-size' increased to 10000. * If interrupted, ddrescue terminates by raising the signal received. * rescuebook.cc (copy_non_tried): Don't mark skipped blocks as non-trimmed. Try them in additional passes (before trimming). * rescuebook.cc: Limit the copying phase to 3 passes. * rescuebook.cc: Alternate direction of passes during copying phase. * rescuebook.cc: Smallest blocks are trimmed first. * rescuebook.cc (split_errors): Read largest first if logfile full. * Improved speed when using option '-m, --domain-logfile'. * io.cc (show_status): Show the current total run time. * rescuebook.cc: Show pass number and direction during copying. * rescuebook.cc (show_status): Show block pos instead of current_pos. * main.cc: Show "an unknown number of bytes" for unknown insize. * Added option '-B, --binary-prefixes' to ddrescuelog. * Added new option '-C, --complete-logfile' to ddrescuelog. * Added new option '-P, --compare-as-domain' to ddrescuelog. * Improved speed of logic operations in ddrescuelog. * rescuebook.cc (do_rescue): Show warning when domain is smaller than logfile. * ddrescuelog.cc (do_show_status): Show logfile and domain extents when domain is smaller than logfile. * block.h: Class Block now forces the invariant by itself. * Code reorganization. New class 'Logfile'. * Added status message to rescue logfile. * Many improvements to documentation. * ddrescue.texinfo: Renamed to ddrescue.texi. 2013-07-09 Antonio Diaz Diaz <antonio(a)gnu.org> * Version 1.17 released. * Added new option '-l, --logfile-size'. * Added new option '-w, --ignore-write-errors'. * Option '--fill' has been renamed to '--fill-mode'. * Option '--generate-logfile' has been renamed to '--generate-mode'. * Added option '--sector-size' as a synonym of '--block-size'. * Added option '--retries' as a synonym of '--max-retries'. * Added option '--size' as a synonym of '--max-size'. * rescuebook.cc: Trimming is now done from both edges of each non-trimmed block. Largest blocks are trimmed first. * rescuebook.cc: Largest blocks are now split first until logfile reaches '--logfile-size' entries. * logbook.cc (extend_sblock_vector, truncate_vector): Terminate if truncation would discard finished blocks. * rescuebook.cc: Mark failed blocks with 1 sector as bad-sector. * logbook.cc (extend_sblock_vector): Remove last block of logfile if it starts at insize and is not marked as finished. * io.cc (show_status, update_rates): Detect a jump back in time and adjust status. * ddrescue.h (slow_read): Return false for the first 10 seconds. * io.cc (show_status) Leave cursor after message so that ^C does not overwrite it. * main.cc: Don't require '--force' for generate mode. * ddrescue.h (Logbook::logfile_exists): Don't return false if logfile exists but is empty. * ddrescue.texinfo: Added new chapter 'Using ddrescue safely'. * Documented that 'direct disc access' only reads whole sectors. * configure: Options now accept a separate argument. * Makefile.in: Added new target 'install-bin'. 2012-06-11 Antonio Diaz Diaz <ant_diaz(a)teleline.es> * Version 1.16 released. * Added new option '-K, --skip-size'. * Added new option '-T, --timeout'. * Changed short name of option '--try-again' to '-A'. * Maximum skip size is now limited to 1% of infile size or 1 GiB (whichever is smaller), rounded to the next multiple of sector size. * Set current_pos to end of block when reading backwards. * The option '-E, --max-error-rate' now checks the rate of actually failed reads, not the growth of error size. * The option '-v, --verbose' now increases verbosity if repeated. * Changed quote characters in messages as advised by GNU Standards. * configure: 'datadir' renamed to 'datarootdir'. * New files rational.h, rational.cc. 2012-01-01 Antonio Diaz Diaz <ant_diaz(a)teleline.es> * Version 1.15 released. * Added new option '-a, --min-read-rate'. * Added new option '-I, --verify-input-size'. * Added new option '-x, --extend-outfile'. * main.cc: Verify that infile, outfile and logfile are all different. * Non-tried blocks are now read aligned to cluster-size sectors. * rescuebook.cc: Improved skip algorithm for the split pass. * main.cc: Removed spurious warning about '-D' ignored in fill mode. * ddrescue.texinfo: Improved description of algorithm. * logbook.cc (change_chunk_status): Return an adjust value (-1, 0, 1) to keep "errors" updated without calling count_errors every time. * ddrescue.cc: Renamed to io.cc. * Added 'ddrescuelog', a program for logfile manipulation. 2011-01-10 Antonio Diaz Diaz <ant_diaz(a)teleline.es> * Version 1.14 released. * Added new option '-R, --reverse'. * Added new option '-E, --max-error-rate'. * Extended syntax '--max-errors=+N' to specify new errors. * Changed short name of option '--retrim' to '-M'. * Removed spurious warning about 'preallocation not available'. * Code reorganization. New class 'Genbook'. 2010-08-27 Antonio Diaz Diaz <ant_diaz(a)teleline.es> * Version 1.13 released. * Non-regular output files are no longer overwritten by default. * Added new option '-f, --force'. * Added new option '-p, --preallocate'. * main.cc (write_logfile_header): Write command line to logfile. * ddrescue.texinfo: Added info about logfile and recoverable formats. * ddrescue.texinfo: Added a couple more warnings to the tutorial. * testsuite: 'test1' renamed to 'test.txt' * Revert to use 'long' instead of 'time_t' for time variables. Ddrescue only needs counting seconds and 'time_t' causes warnings on some systems. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 446b9291f9773ba462da8a561c966e59e48f19cb Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Feb 5 11:23:30 2021 +0000 core154: Ship curl Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 2e4321c1f49dc3a8b4c5b0357a8b60889d9da89c Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Thu Feb 4 17:21:46 2021 +0100 curl: Update to 7.75 For details see: https://curl.se/changes.html Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 8474dc4a7743fc9da0cf1496c76c74c4aaf7cc36 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Thu Feb 4 21:39:32 2021 +0100 Tor: update to 0.4.4.7 Full changelog of this version as per https://gitweb.torproject.org/tor.git/plain/ChangeLog?h=tor-0.4.4.7: Changes in version 0.4.4.7 - 2021-02-03 Tor 0.4.4.7 backports numerous bugfixes from later releases, including one that made v3 onion services more susceptible to denial-of-service attacks, and a feature that makes some kinds of DoS attacks harder to perform. o Major bugfixes (onion service v3, backport from 0.4.5.3-rc): - Stop requiring a live consensus for v3 clients and services, and allow a "reasonably live" consensus instead. This allows v3 onion services to work even if the authorities fail to generate a consensus for more than 2 hours in a row. Fixes bug 40237; bugfix on 0.3.5.1-alpha. o Major feature (exit, backport from 0.4.5.5-rc): - Re-entry into the network is now denied at the Exit level to all relays' ORPorts and authorities' ORPorts and DirPorts. This change should help mitgate a set of denial-of-service attacks. Closes ticket 2667. o Minor feature (build system, backport from 0.4.5.4-rc): - New "make lsp" command to generate the compile_commands.json file used by the ccls language server. The "bear" program is needed for this. Closes ticket 40227. o Minor features (compilation, backport from 0.4.5.2-rc): - Disable deprecation warnings when building with OpenSSL 3.0.0 or later. There are a number of APIs newly deprecated in OpenSSL 3.0.0 that Tor still requires. (A later version of Tor will try to stop depending on these APIs.) Closes ticket 40165. o Minor features (crypto, backport from 0.4.5.3-rc): - Fix undefined behavior on our Keccak library. The bug only appeared on platforms with 32-byte CPU cache lines (e.g. armv5tel) and would result in wrong digests. Fixes bug 40210; bugfix on 0.2.8.1-alpha. Thanks to Bernhard Übelacker, Arnd Bergmann and weasel for diagnosing this. o Minor bugfixes (compatibility, backport from 0.4.5.1-rc): - Strip '\r' characters when reading text files on Unix platforms. This should resolve an issue where a relay operator migrates a relay from Windows to Unix, but does not change the line ending of Tor's various state files to match the platform, and the CRLF line endings from Windows end up leaking into other files such as the extra-info document. Fixes bug 33781; bugfix on 0.0.9pre5. o Minor bugfixes (compilation, backport from 0.4.5.3-rc): - Fix a compilation warning about unreachable fallthrough annotations when building with "--enable-all-bugs-are-fatal" on some compilers. Fixes bug 40241; bugfix on 0.3.5.4-alpha. o Minor bugfixes (SOCKS5, backport from 0.4.5.3-rc): - Handle partial SOCKS5 messages correctly. Previously, our code would send an incorrect error message if it got a SOCKS5 request that wasn't complete. Fixes bug 40190; bugfix on 0.3.5.1-alpha. o Minor bugfixes (testing, backport from 0.4.5.2-alpha): - Fix the `config/parse_tcp_proxy_line` test so that it works correctly on systems where the DNS provider hijacks invalid queries. Fixes part of bug 40179; bugfix on 0.4.3.1-alpha. - Fix our Python reference-implementation for the v3 onion service handshake so that it works correctly with the version of hashlib provided by Python 3.9. Fixes part of bug 40179; bugfix on 0.3.1.6-rc. - Fix the `tortls/openssl/log_one_error` test to work with OpenSSL 3.0.0. Fixes bug 40170; bugfix on 0.2.8.1-alpha. Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 8e07deb9839e341bf9841fd08e82c55cd5ab6017 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Thu Feb 4 18:27:21 2021 +0100 clamav: Update to 0.103.1 For details see: https://blog.clamav.net/2021/02/clamav-01031-patch-release.html Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit fe2c0e0fa0729589488e60eda4aa6dd6f70ee01f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Feb 5 11:19:34 2021 +0000 core154: Ship pptp Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 74e28f29f8cfe2ab8df905cee1b29cbfe00f81fb Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Thu Feb 4 13:56:39 2021 +0100 pptp: Update to 1.10.0 - Update pptp from 1.7.2 (Jun 2008) to 1.10.0 (Jan 2018) - No change to rootfile - Removal of pptp-1.7.2-compat.patch as all changes to pptp_compat.c are now included in the file in the new tarball. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 1116930315418a0dbc410a0c49de22134d68205d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Feb 5 11:17:54 2021 +0000 core154: Ship less Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 304f647749912c429cee7791d6da8ccd70692868 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Thu Feb 4 13:56:27 2021 +0100 less: Update to version 563 - Update less from 530 to 563 - No change in rootfile - Changelog Version 563 was released on 21 Oct 2020. These are the differences between version 551 and version 563: Update Unicode tables. Treat Hangul Jamo medial vowels and final consonants as zero width. Display error message immediately when -o is toggled and input is not a pipe. Fix regression: make screen repaint when "squished" and a no-movement command is given. Fix erroneous EOF calculation when F command is interrupted. Make WIN32C version include this fix from 551: Don't count lines in initial screen if using -X with -F. Fix display bug in WIN32C version. Fix memory corruption when built with libtermcap. Fix crash on some systems due to realpath incompatibility. Support libtinfow. Version 551 was released on 11 Jun 2019 551 is the same as 550 except for a few documentation changes. Version 550 was released on 3 Jun 2019. These are the differences between version 530 and version 550: Add --mouse option. Add --wheel-lines option. Add --no-histdups option. Add --save-marks option. Support PCRE2 regular expression library. Redraw screen on SIGWINCH even if screen size doesn't change. Shell-escape filenames in history so they can be used again. Ring bell if user enters invalid long option name. Use PCRE_UTF8 flag for pcre regular expressions when in UTF-8 mode. Windows: use wide-char string to set console title. Don't count lines in initial screen if using -X with -F. Support mingw build system. Fix bug in v command on empty file. Fix bug in v command when filename contains shell metacharacters. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 4306f30b6f80de3c7c0d7b398e42616abdc4d006 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Feb 5 11:16:58 2021 +0000 core154: Ship findutils Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 5de33a38d801a1fb0420efa20d108b9f5312d913 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Thu Feb 4 13:55:08 2021 +0100 findutils: Update to 4.8.0 - Update findutils from 4.6.0 to 4.8.0 - Remove findutils-4.6.0-glibc2.28.patch from lfs as all patch items are now in the new tarball files. - Remove sed command on gl/lib/mountlist.c from lfs as all fixes are in the mountlist.c file in the new tarball. - Update rootfiles - Changelog Following are major changes. Further detailed info available in changelog file in tarball. * Noteworthy changes in release 4.8.0 (2021-01-09) [stable] ** Changes in xargs 'xargs -t' no longer outputs a trailing blank to stderr after the last argument of each constructed command line to be executed. [#57291] xargs now warns when more than one of the conflicting options --max-lines (-L, -l), --replace (-i/-I) and --max-args (-n) are specified on the command line. [#52137] ** Bug Fixes find no longer crashes when an XFS filesystem is heavily changed during the run. Discussed at: <https://lists.gnu.org/r/bug-gnulib/2020-04/msg00068.html> find -used works again. This predicate was not working properly since adding the support for sub-second timestamp resolution for various predicates in FINDUTILS_4_3_3-1 back in 2007. Discussed at: <https://lists.gnu.org/r/bug-findutils/2019-11/msg00010.html> ** Improvements 'find -D exec' now diagnoses all -exec, -execdir, -ok and -okdir runs including the call arguments and the exit code of the launched process. [#59083] ** Documentation Changes The documentation of 'find -printf %Ak' has been improved: it now refers to the strftime(3) documentation for a complete list of supported conversion specifiers, and documents the 'F' conversion specifier ('yyyy-mm-dd'). The man pages (find.1, locate.1, locatedb.5, updatedb.1, and xargs.1) now consistently end with the sections "REPORTING BUGS", "COPYRIGHT" and "SEE ALSO", with the latter referring to the online page on the GNU web server. The "EXAMPLES" section in the find.1 man page now shows the examples in a better structure and uses consistent formatting. Various man page fixes - syntax issues and typos. [#59745, #59330, #59012, #58193, #57807, #57775] Other documentation changes: #58654: doc: clarify that 'find -perm +MODE' is unrelated to umask #58458: doc: improve section 'Hard links', especially fix the description regarding 'find -L -samefile FILE'. #58205: find.1: clarify double dash '--' option #58149: 'xargs --help' now mentions that --replace (-I, -i) splits the input at newline characters. #57025: doc: enhance description of tests accepting numeric arguments in find.1 [see also #49640]. #54730: Add additional valuable example of find -quit #48135: Fix testsuite error on Hurd and BSD related to ln #35253: Clarify descriptions of -printf %f, %h. ** Changes to the build process The configure option --without-fts has been removed. The attempt to use it stopped configure with an error message since 4.5.18 (2015) anyway. * Major changes in release 4.7.0, 2019-08-29 ** Changes to locate / updatedb Support for generating old-format databases (with updatedb --old-format or updatedb --dbformat=old) has been removed. The old database format was deprecated in 2007 (and updatedb has warned about this since that time). The locate program will will read old-format databases, though this support also will be removed. The updatedb script now operates in the C locale only. This means that character encoding issues are now not likely to cause sort to fail. It also honours the TMPDIR environment variable if that was set, and no longer sorts file names case-insensitively. The (unspecified) order in which filenames are stored in the locate database is now different to previous versions. However, you should not rely on locate's output appearing in any particular order in any case. ** Improvements All utilities now only show the full usage text when requested via the --help option. Previously, when the user passed invalid options or arguments, the user's attention to the corresponding error diagnostic was distracted by that lengthy text. find now accepts multiple file type arguments to the -type and -xtype options separated by comma ','. For example, to search for symbolic links and directories simply provide the shorter '-type l,d' instead of the - yet more portable - '( -type l -o -type d )'. find now diagnoses failures returned by readdir(). This bug was inherent in the use of FTS. find now exits in more cases immediately after the error diagnostic, i.e., without the following usage text, to make the former more eye-catching. find now outputs a better hint in case the user passed an unquoted shell- glob pattern to options like -name, i.e., when the offending argument is an existing file. find now supports the debug option '-D all' to include all of the other debug options at once. xargs now supports the -o, --open-tty option to reopen stdin as /dev/tty in the child process before executing the command; useful to run an interactive application. Added for compatibility with BSD. xargs now supports the GNU_FINDUTILS_FD_LEAK_CHECK environment variable to enable/disable fd leak check. 'xargs -t' (--verbose) now properly quotes each part of the command to the executed if needed when printing it to stderr; likewise -p (--interactive). ** Documentation Changes Prefer https:// over http:// links where possible, e.g. for '*.gnu.org' servers. Both find.1 and the find texinfo manual now consistently document all of the 'N', 'L' and '?' possibilities in '-printf %Y' output when the determination of the type of a symlink target fails. find.1 now correctly states the -prune has no effect when the -depth option is given. Before, it wrongly stated that -prune would return false in that case. Some minor documentation improvements are listed in "Bug Fixes" below. ** Bug Fixes #56820: find: improve diagnostic when a global option like -maxdepth is specified after another argument like a test, thus hopefully avoiding translation issues (at least French, German). #56142: doc: fix bug #56142 by specifying which actions inhibit the default -print. #55272: find: improve diagnostic when -name or -iname is used with a pattern containing a directory separator ('/'), suggesting to use -wholename or -iwholename respectively. #54859: doc: fix typo in 'xargs -l' examples in texinfo manual. Change from 'xargs -1' (minus one) to 'xargs -l' (minus El) in 3 places. #54838: doc: fix the examples of the -perm option in the texinfo documentation. The example '-perm -g+w,o+w' was misplaced. Bug present since FINDUTILS_4_2_27-1. #54262: 'find -printf "%Y"' now correctly outputs 'N' for broken symlinks (ENOENT or ENOTDIR). Previously, it output 'l' in such a case. Bug introduced while attempting to fix #29460 in version v4.5.8. #54171: 'find -depth' now outputs the name of unreadable directories. Previously, FTS-based find missed to output those entries. Bug present since the FTS implementation in FINDUTILS_4_3_0-1. #52981: find: the '-delete' action no longer complains about disappeared files when the '-ignore_readdir_race' option is given, too. That action will also returns true in such a case now. #52220: 'find -D' without any further argument no longer crashes. Bug present since the implementation of -D in FINDUTILS_4_3_1-1. #51304: doc: use correct IEC unit prefixes in the documentation of 'find -size'. find(1) uses binary-based units for the suffixes 'k', 'M', and 'G' of the argument of the '-size' option: 1024, 1024*1024 and 1024^3. Therefore, the documentation should use the correct IEC prefixes kibibyte, mebibyte and gibibyte respectively (or their abbreviations 'KiB', 'MiB' and 'GiB'). #50758: doc: fix the description of the -perm examples matching the permission mode "022" in find's texinfo manual: the match is for the file's group and 'other' mode bits instead of for user and group. Bug introduced when adding the -perm examples in FINDUTILS-4.2.11. #50326: find no longer leaks memory for a recently added member in gnulib's mount list structure. #50259: find -printf '%h' now outputs the correct path for arguments with one or more trailing slashes. Previously, it would e.g. output "foo" instead of "." when "foo/" was passed; likewise, it would output "/user/xxx/" instead of "/user" when "/user/xxx//" was passed. Bug introduced in FINDUTILS-4.2.19. #48180: find -noop (an internal option not intended to be exposed to the user) no longer crashes. Bug introduced in FINDUTILS-4.3.1. #48030: find -exec + does not pass all arguments for certain specific filename lengths. After the internal (usually 128k) buffer is full and find(1) executed the given command with these arguments, it would miss to run the command yet another time if only one other file argument has to be processed. Bug introduced in FINDUTILS-4.2.12. #46784: frcode drops last char if no final newline ** Changes to the build process The configure option --enable-id-cache has been removed. It has been a no-op since findnutils-4.5.15. The configure option --enable-debug has been removed. Debugging in find is now controlled by its -D option only. The configure option --enable-silent-rules is the default now. Use --disable-silent-rules or "make V=1" to get verbose build output. "make dist" no longer builds .tar.gz files. xz is portable enough and in wide-enough use that distributing only .tar.xz files is enough. Maintainer builds from the Git repository now derive the version string from the version control system instead of using a fixed string (changed after each release manually). As a result, the inter-release builds can now be distinguished: e.g. "4.6.0.152-fe9c" is the 152th commit after the tag "v4.6.0" and has the Git short hash "fe9c". Builds from an unclean tree are marked with the suffix "-dirty". The translation files in the PO directory are no longer version controlled; instead bootstrap auto-updates them from "translationproject.org" during a maintainer build. A shell-style test framework borrowed from GNU coreutils has been added. This allows better tests with more control over stdin, stdout, stderr, signals, preparatory steps, cleanup, return code verification, root-only tests, etc. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 1a4e9c9db4857d0a578bcd5f4d4a60edc5129834 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Feb 4 17:58:08 2021 +0000 fireperf: Add pakfire packaging meta data Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 67fbd255d1f9b609bcdf241b3bc6d30eba46f1d5 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Feb 4 15:57:26 2021 +0000 fireperf: New package https://lists.ipfire.org/pipermail/development/2021-February/009285.html Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit e514d67f8e6fd3364b3bfa19d68e39435e103a9a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 3 22:50:36 2021 +0000 samba: Update to 4.13.4 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit d086a16619c89cd2420a0f6ed80aa93ecb696f73 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 3 22:31:02 2021 +0000 Update contributors Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 51605e1b52bac244e3ab8d938010988efa82c232 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 3 22:30:37 2021 +0000 Update languages Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 20918d700a49187cbdc4066a978b6c8853802097 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 3 22:30:23 2021 +0000 core154: Ship sed Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 8928b738d7bbc324cd288fcef2abf7f2bab305d7 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Wed Feb 3 16:01:48 2021 +0100 sed: Update to 4.8 - Update sed from 4.4 to 4.8 - Updated rootfile - Changelog * Noteworthy changes in release 4.8 (2020-01-14) [stable] ** Bug fixes - "sed -i" now creates temporary files with correct umask (limited to u=rwx). Previously sed would incorrectly set umask on temporary files, resulting in problems under certain fuse-like file systems. [bug introduced in sed 4.2.1] ** Release distribute gzip-compressed tarballs once again ** Improvements a year's worth of gnulib development, including improved DFA performance * Noteworthy changes in release 4.7 (2018-12-20) [stable] ** Bug fixes - Some uses of \b in the C locale and with the DFA matcher would fail, e.g., the following would mistakenly print "123-x" instead of "123": echo 123-x|LC_ALL=C sed 's/.\bx//' - Using a multibyte locale or certain regexp constructs (some ranges, backreferences) would avoid the bug. [bug introduced in sed 4.6] * Noteworthy changes in release 4.6 (2018-12-19) [stable] ** Improvements - sed now prints a clear error message when r/R/w/W (and s///w) commands are missing a filename. Previously, w/W commands would fail with confusing error message, while r/R would be a silent no-op. - sed now uses fully-buffered output (instead of line-buffered) when writing to files. This should noticeably improve performance of "sed -i" and other write commands. Buffering can be disabled (as before) with "sed -u". - sed in non-cygwin windows environments (e.g. mingw) now properly handles '\n' newlines in -b/--binary mode. ** Bug fixes - sed no longer accesses invalid memory (heap overflow) when given invalid backreferences in 's' command [bug#32082, present at least since sed-4.0.6]. - sed no longer adds extraneous NUL when given s/$//n command. [related to bug#32271, present since sed-4.0.7] - sed no longer accesses invalid memory (heap overflow) with s/$//n regexes. [bug#32271, present since sed-4.3]. ** New Features New option, --debug: print the input sed script in canonical form and annotate program execution. * Noteworthy changes in release 4.5 (2018-03-31) [stable] ** Bug fixes - sed now fails when matching very long input lines (>2GB). Before, sed would silently ignore the regex without indicating an error. [Bug present at least since sed-3.02] - sed no longer rejects comments and closing braces after y/// commands. [Bug existed at least since sed-3.02] - sed -E --posix no longer ignores special meaning of '+','?','|' . [Bug introduced in the original implementation of --posix option in v4.1a-5-gba68fb4] - sed -i now creates selinux context based on the context of the symlink instead of the symlink target. [Bug present since at least sed-4.2] - sed -i --follow-symlinks remains unchanged. - sed now treats the sequence '\x5c' (ASCII 92, backslash) as literal backslash character, not as an escape prefix character. [Bug present since sed-3.02.80] Old behavior: $ echo z | sed -E 's/(z)/\x5c1/' # identical to 's/(z)/\1/' z New behavior: $ echo z | sed -E 's/(z)/\x5c1/' \1 Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit be184f040f4f18ccb3eca6f0ec38e2d84b350424 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 3 22:28:44 2021 +0000 core154: Ship newt Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit fb87d2756e8bb1fee1156b554943c7f25019544c Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Wed Feb 3 16:01:36 2021 +0100 newt: Update to 0.52.21 - Update newt from 0.52.18 to 0.52.21 - Updated rootfile - Changelog 0.52.21 - define env NEWT_NOFLOWCTRL to disable flow control (Robert Gill) - don't leak memory on errors in dialogboxes - fix radio button selection check in snack - fix plural forms in Lithuanian translation (#1568999) - fix parallel build (Émeric Dupont) - allow python versions to be specified with --with-python option 0.52.20 - improve handling of long strings in whiptail menu (#1353792) - support screen resize as hotkey in form (#1432926) 0.52.19 - support --notags in whiptail checklist and radiolist (#1319794) - don't hard-code -I/usr/include/slang in CPPFLAGS (Alex Suykov) - use $(CC) instead of $(CPP) to generate .depend files (Samuel Martin) - update translations from Zanata Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 0610914f7b12b5be128dfba90dc4d3460f7350c3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 3 22:26:10 2021 +0000 core154: Ship lvm2 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b84005daaaaa7d0e82d34485c56b0546cc4942d0 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Wed Feb 3 16:01:21 2021 +0100 lvm2: Update to 2.02.187 - Update lvm2 from 2.02.181 to 2.02.187 - Updated rootfile - Changelog Version 2.02.187 - 24th March 2020 ================================== Avoid running cache input arg validation when creating vdo pool. Prevent raid reshaping of stacked volumes. Ensure minimum required region size on striped RaidLV creation. Fix resize of thin-pool with data and metadata of different segtype. Fix splitting mirror leg in cluster. Fix activation order when removing merged snapshot. Add support for DM_DEVICE_GET_TARGET_VERSION into device_mapper. Add lvextend-raid.sh to check on RaidLV extensions synchronization. Fix lvmetad shutdown and avoid lenghty timeouts when rebooting system. Prevent creating VGs with PVs with different logical block sizes. Pvmove runs in exlusively activating mode for exclusively active LVs. Activate thin-pool layered volume as 'read-only' device. Ignore crypto devices with UUID signature CRYPT-SUBDEV. Enhance validation for thin and cache pool conversion and swapping. Fixed activation on boot - lvm2 no longer activates incomplete VGs. Version 2.02.186 - 27th August 2019 =================================== Improve internal removal of cached devices. Synchronize with udev when dropping snapshot. Add missing device synchronization point before removing pvmove node. Correctly set read_ahead for LVs when pvmove is finished. Fix metadata writes from corrupting with large physical block size. Report no_discard_passdown for cache LVs with lvs -o+kernel_discards. Prevent shared active mirror LVs with lvmlockd. Version 2.02.185 - 13th May 2019 ================================ Fix change of monitoring in clustered volumes. Improve -lXXX%VG modifier which improves cache segment estimation. Add synchronization with udev before removing cached devices. Fix missing growth of _pmspare volume when extending _tmeta volume. Automatically grow thin metadata, when thin data gets too big. Add support for vgsplit with cached devices. Fix signal delivery checking race in libdaemon (lvmetad). Add missing Before=shutdown.target to LVM2 services to fix shutdown ordering. Version 2.02.184 - 22nd March 2019 ================================== Fix (de)activation of RaidLVs with visible SubLVs Change scan_lvs default to 0 so LVs are not scanned for PVs. Add scan_lvs config setting to control if lvm scans LVs for PVs. Fix missing proper initialization of pv_list struct when adding pv. Version 2.02.183 - 07th December 2018 ===================================== Avoid disabling lvmetad when repair does nothing. Fix component detection for md version 0.90. Use sync io if async io_setup fails, or use_aio=0 is set in config. Avoid opening devices to get block size by using existing open fd. Version 2.02.182 - 30th October 2018 ==================================== Fix possible write race between last metadata block and the first extent. Fix filtering of md 1.0 devices so they are not seen as duplicate PVs. Fix lvconvert striped/raid0/raid0_meta -> raid6 regression. Add After=rbdmap.service to {lvm2-activation-net,blk-availability}.service. Fix pvs with lvmetad to avoid too many open files from filter reads. Fix pvscan --cache to avoid too many open files from filter reads. Reduce max concurrent aios to avoid EMFILE with many devices. Fix lvconvert conversion attempts to linear. Fix lvconvert raid0/raid0_meta -> striped regression. Fix lvconvert --splitmirror for mirror type (2.02.178). Do not pair cache policy and cache metadata format. Fix mirrors honoring read_only_volume_list. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 5ac4578d2e1ab03a170f31f16ae1b4c46b422aa3 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Wed Feb 3 16:00:54 2021 +0100 elfutils: Update to 0.182 - Update elfutils from 0.176 to 0.182 - Updated rootfile - From version 0.178 debuginfod client/server capability was added. Additional .configure options required to disable debuginfod and libdebuginfod - Changelog 2020-10-28 Mark Wielaard <mark(a)klomp.org> * configure.ac: Set version to 0.182. * NEWS: Add 0.182 section. 2020-10-28 Tom Tromey <tom(a)tromey.com> * .gitignore: Add /tests/leb128. 2020-10-01 Frank Ch. Eigler <fche(a)redhat.com> PR25461 * configure.ac: Add --enable-debuginfod-urls[=URLS] option. 2020-09-18 Mark Wielaard <mark(a)klomp.org> * configure.ac: Check availability of libzstd and zstd. 2020-09-08 Mark Wielaard <mark(a)klomp.org> * configure.ac: Set version to 0.181. * NEWS: Add 0.181 section. 2020-08-20 Dmitry V. Levin <ldv(a)altlinux.org> * configure.ac (--enable-libdebuginfod): AC_DEFINE ENABLE_LIBDEBUGINFOD. 2020-07-17 Mark Wielaard <mark(a)klomp.org> * configure.ac: Set -DBAD_FTS=1 also for CXXFLAGS. 2020-06-19 Mark Wielaard <mark(a)klomp.org> * Makefile.am (SUBDIRS): Always add debuginfod. * configure.ac (debuginfod): Split off... (libdebuginfod): ... this. Also add DUMME_DEBUGINFOD. 2020-06-15 Sergei Trofimovich <slyfox(a)gentoo.org> * configure.ac: Use READELF in build-id check. 2020-06-11 Mark Wielaard <mark(a)klomp.org> * configure.ac: Set version to 0.180. * NEWS: Add 0.180 section. * .gitignore: Update with new generated file. 2020-06-10 Mark Wielaard <mark(a)klomp.org> * configure.ac (MODVERSION): Remove. 2020-03-30 Mark Wielaard <mark(a)klomp.org> * configure.ac: Set version to 0.179. * NEWS: Add 0.179 section. 2020-03-25 Mark Wielaard <mark(a)klomp.org> * README: Update mailinglist subscription info. * CONTRIBUTING: Likewise. 2020-02-03 Frank Ch. Eigler <fche(a)redhat.com> * configure.ac: Tolerate CXX= for debuginfod configuration. 2019-12-11 Omar Sandoval <osandov(a)fb.com> * configure.ac: Apply -Werror after user-defined CFLAGS in -D_FORTIFY_SOURCE=2 check. 2019-12-06 Mark Wielaard <mark(a)klomp.org> * configure.ac: Add ac_cv_buildid check. 2019-11-26 Mark Wielaard <mark(a)klomp.org> * configure.ac: Set version to 0.178. NEWS: Add 0.178 section. 2019-11-26 Mark Wielaard <mark(a)klomp.org> * configure.ac: Add CXXFLAGS for gcov. 2019-10-28 Aaron Merey <amerey(a)redhat.com> * debuginfod/: New directory for debuginfod code. * Makefile.am (SUBDIRS): Recurse there. * configure.ac (--enable-debuginfod): New flag & checks. 2019-08-25 Jonathon Anderson <jma14(a)rice.edu> * configure.ac: Add new --enable-valgrind-annotations * configure.ac: Add new --with-valgrind (headers only) 2019-07-05 Omar Sandoval <osandov(a)fb.com> * configure.ac: Get rid of --enable-libebl-subdir. * Makefile.am (SUBDIRS): Reorder backends and libcpu before libebl to satisfy build dependencies. 2019-08-13 Mark Wielaard <mark(a)klomp.org> * configure.ac: Set version to 0.177. * NEWS: Mention elfclassify, readelf DW_AT_data_member_location and DW_AT_discr_list attribute changes, dwarf.h DW_AT_GNU additions, dwelf_elf_e_machine_string function, dwelf_elf_begin change and C-SKY backend support. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit dae10ab8c51f677860a877b4ab4385227afbe93c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 3 22:23:39 2021 +0000 core154: Ship fcron Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit a87abffc9e2d9fd4ca038ed17bcb582c979663bc Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Wed Feb 3 16:01:07 2021 +0100 fcron: Update to 3.2.1 - Update fcron from 3.2.0 (Jul 2014) to 3.2.1 (Jun 2016 - latest version) - Updated rootfile - Changelog From version 3.2.0 to 3.2.1 * @-line can now be run every second (minimum every 10s previously) * Fixed occasional 1s slippage. This was due to a race condition between when time_to_sleep is run and when we compute how long to sleep for, which could happen in the following second: if that happened we end up sleeping for 1s instead of not sleeping at all. The fix was to replace time_to_sleep() by next_wake_time(). * add From: header to emails. Similarly to other crons, use: "From: %s (fcron)" with %s being either the user the job is run as or the value of MAILFROM. * The installation script now supports systemd fully. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 8ace58e8ac0491aa72f1213841824d284377db0d Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Tue Feb 2 22:46:14 2021 +0100 p7zip: Update to 17.03 - Update p7zip from 16.02 (Jul 2016) to 17.03 (Dec 2020) - Version 16.02 was the last version by the previous dev team. A fork was created in May 2020 with version 17.01 - Rootfile updated - Changelog Version 17.03 ============= - add zstd to zip - add hash algorithm - XXHASH32 - XXHASH64 - MD2 - MD4 - MD5 - sha384 - sha512 - add Lzfse to dmg - add lz5 to 7z - add lizard to 7z - update lz4 to v1.9.3 - add brotli to 7z - update cmake build - fix xz crc64 error - use system local to select OEM code - add rpm install - fix lzma2 and flzma22 call the same algorithm - add 7zr build - fix tar format link file compress and decompress Version 17.02 ============= - p7zip 17.02 is more like 7zip 17.01(only 7za and 7z),The difference from 7zip 17.01 and older version p7zip is the following description - Supports Fast lzma2 1.0.1 compression method - Update Zstd method to 1.4.5 - Add zstd method parameters in 7z format ZSTD parameters NEW name: strategy -> strat fast -> fast long -> long WindowLog -> wlog HashLog -> hlog ChainLog -> clog SearchLog -> slog MinMatch -> slen TargetLen -> tlen OverlapLog -> ovlog LdmHashLog -> ldmhlog LdmSearchLength -> ldmslen LdmBucketSizeLog -> ldmblog LdmHashRateLog -> ldmhevery - Fix symlink files contained inside tar and squashfs as regular file - Add lz4 and Zstd decompress method to squashfs Version 17.01 ============= - Fix BUG CVE-2018-10115 - Fix BUG CVE-2018-5996 - Fix BUG CVE-2017-17969 - Fix BUG CVE-2016-9296 - The bug fixes in version 17.01 address the same CVE bugs as the p7zip-16.02-consolidated_fixes-1.patch Therefore this patch is no longer needed - The patches for CVE-2016-2334 & 2335 were for versions before 16.00 so are no longer needed Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b51d19ece203ecfd20e89f72abf49953e7a4c2ac Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Tue Feb 2 22:46:01 2021 +0100 automake: Update to 1.16.3 - Update automake from 1.16.2 to 1.16.3 - No change to rootfile - New in 1.16.3: * New features added - In the testsuite summary, the "for $(PACKAGE_STRING)" suffix can be overridden with the AM_TESTSUITE_SUMMARY_HEADER variable. * Bugs fixed - Python 3.10 version number no longer considered to be 3.1. - Broken links in manual fixed or removed, and new script contrib/checklinkx (a small modification of W3C checklink) added, with accompany target checklinkx to recheck urls. - install-exec target depends on $(BUILT_SOURCES). - valac argument matching more precise, to avoid garbage in DIST_COMMON. - Support for Vala in VPATH builds fixed so that both freshly-generated and distributed C files work, and operation is more reliable with or without an installed valac. - Dejagnu doesn't break on directories containing spaces. * Distribution - new variable AM_DISTCHECK_DVI_TARGET, to allow overriding the "make dvi" that is done as part of distcheck. * Miscellaneous changes - install-sh tweaks: . new option -p to preserve mtime, i.e., invoke cp -p. . new option -S SUFFIX to attempt backup files using SUFFIX. . no longer unconditionally uses -f when rm is overridden by RMPROG. . does not chown existing directories. - Removed function up_to_date_p in lib/Automake/FileUtils.pm. We believe this function is completely unused. - Support for in-tree Vala libraries improved. - Full change details are in ChangeLog file in tarball Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 278b53e96f8a64585078fac20639bf3444e2e4f5 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 3 22:20:18 2021 +0000 core154: Ship acl Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 10ad593d83c492f1e5ecab61604c2af14715d859 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Tue Feb 2 22:45:41 2021 +0100 acl: Update to 2.2.53 - Update acl from 2.2.52 (May 2013) to 2.2.53 (Jun 2018 - latest version) - Rootfile updated - No make rules for install-lib or install-dev in new version. Only for install - Changelog in tarball has 2.2.49 (Nov 2009) as the latest change - Could not find changelog info anywhere else. - Following changelog created by extracting from git commits (thanks for idea Peter Mueller) - include: fix uninstall for `make distcheck` Mike Frysinger - acl.5 man page: Update link to POSIX.1e draft Andreas Gruenbacher - test: add regression test Dmitry V. Levin - Enable large-file support on systems that do not enable it by default Dmitry V. Levin - libacl: Fix acl_from_text() returning NULL on all input Dmitry V. Levin - setfacl --restore: Silence valgrind Andreas Gruenbacher - setfacl: Preserve special mode bits on filesystems without POSIX ACL support Andreas Gruenbacher - setfacl.1: document the meaning of '-' in perms Kamil Dudka - setfacl: Allow more than four characters in the perms field Andreas Gruenbacher - permissions.test: Fix umask Andreas Gruenbacher - Add additional group names for root-specific tests Andreas Gruenbacher - libtestlookup: Add missing EXPORT and static declarations Andreas Gruenbacher - Minor man-page clarifications Andreas Gruenbacher - Remove ACL_ADD and ACL_DELETE Andreas Gruenbacher - test: fixups on SELinux machines for root testcases He Zhe - libacl: Ignore warning in parse_acl_entry() Andreas Gruenbacher - Cleanup visibility of API functions Yury Usishchev - Cleanup internal headers usage Yury Usishchev - Rework config.h usage Yury Usishchev - walk_tree_rec: Add parentheses to clarify code Andreas Gruenbacher - __acl_from_xattr: Set errno for invalid tag types Andreas Gruenbacher - Fix checks for valid permissions in input Corinna Vinschen - use portable AC_C_BIGENDIAN Mike Frysinger - quote: escape literal backslashes Jeff Mahoney - test: Add helper library to fake passwd/group files Jeff Mahoney - ignore configure.lineno Mike Frysinger - walk_tree: mark internal variables as static Dmitry V. Levin - Do not export symbols that are not supposed to be exported Dmitry V. Levin - getfacl: Fix minor resource leak Andreas Gruenbacher - setfacl man page: Minor wording improvements Andreas Gruenbacher - Fix the display block nesting in acl.5 Andreas Gruenbacher - getfacl: Fix memory leak Andreas Gruenbacher - fix compilation with latest xattr git Brice De Bruyne - libacl: acl_set_file: Remove unnecesary racy check Andreas Gruenbacher - cp.test: Check permissions of the right file Andreas Gruenbacher - add __acl_ prefixes to internal symbols Mike Frysinger - mark libmisc funcs as hidden so they are not exported Mike Frysinger - telldir return value and seekdir second parameters are of type long Cristian Rodríguez - read_acl_{comments,seq}: switch to next_line Mike Frysinger - read_acl_{comments,seq}: rename "line" to "lineno" Mike Frysinger - build: ship a pkgconfig file for libacl Mike Frysinger - build: make use of an aux-dir to stow away helper scripts Mike Frysinger - build: drop aclincludedir, use pkgincludedir Mike Frysinger - po: regenerate files after move Mike Frysinger - modernize build system Mike Frysinger - test: make running parallel/out-of-tree safe Mike Frysinger - move gettext logic into misc.h Mike Frysinger - punt debian/rpm packaging logic Mike Frysinger - libacl: fix SIGSEGV of getfacl -e on overly long group name Kamil Dudka - libacl: Make sure that acl_from_text() always sets errno when it fails Andreas Gruenbacher - Use autoreconf rather than autoconf to regenerate the files. Fabrice Bauzac - .gitignore: ignore *~ and config.h.in. Fabrice Bauzac - Bad markup in acl.5 page Eric S. Raymond - Makefile: rename configure.in to configure.ac Mike Frysinger - test: fix insufficient quoting of '\' Kamil Dudka - setfacl.1: fix typo 'inclu de' -> 'include' John Bradshaw - Install the libraries to the appropriate directory Brandon Philips Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 2e2170bfb541ea1238f1dcc9f026fab1c3f28d51 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Feb 3 19:31:50 2021 +0100 setup: fix field-order at addressconfig for red i have added the gatewayfield at the line below the IP and Netmask fields but prior this fields so the cursor jumps first the the gateway and after this to the IP. This patch fix the activation order. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 7b476adef33171763c1e764c013c98055d3965b5 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 3 22:15:07 2021 +0000 lynis: Update rootfile Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit f1f2a8dbefd8a90622a1de641adb61f6cffc7a5f Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Mon Feb 1 19:37:27 2021 +0100 lynis: update to 3.0.3 The changelog of lynis 3.0.3 is available at https://github.com/CISOfy/lynis/releases/tag/3.0.3; all changes since lynis 3.0.1 can be inspected at https://github.com/CISOfy/lynis/releases. lynis 3.0.2 adds detection for IPFire, so we can hope to have those "unknown operating system" messages omitted in future. :-) Minor adjustments to LFS and rootfile were necessary to purge unused CI/CD stuff as well as some markdown files (licence, code of conduct, etc. pp.) from the extracted archive. Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit e36cd564317a3223192c16aa3b17d42b0aac9fe7 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Feb 2 10:55:21 2021 +0000 core154: Ship unbound.conf Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 89b044918573826c2b52b27293a81d66ac0504e1 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Mon Feb 1 18:47:27 2021 +0100 unbound.conf: do not set defaults again These are meanwhile set by Unbound upstream as well, so there is no need to do things twice here. Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 710b6ef1e828a93e48052adc79f400ac243e63c7 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Feb 1 11:13:24 2021 +0000 Update the kernel's rootfile Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 7a3f7634cc10674b2b9610e19995c6bbab36611a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Feb 1 10:53:25 2021 +0000 make.sh: Do not decrease nice level of build This was designed to keep a workstation that is compiling IPFire responsive during the build. However, the kernel's scheduler has been improved enough that this is no longer an issue. Instead of telling the kernel that the build job is something with a lower priority (which it isn't) we now simply run with the nicelevel of the parent process that has called make.sh. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit d5eb0e3906782acffd0b6081fbee8a1fe9415254 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Sun Jan 31 21:33:27 2021 +0100 libseccomp: update to 2.5.1 Release notes as per https://github.com/seccomp/libseccomp/releases/tag/v2.5.1: Version 2.5.1 - November 20, 2020 Fix a bug where seccomp_load() could only be called once Change the notification fd handling to only request a notification fd if the filter has a _NOTIFY action Add documentation about SCMP_ACT_NOTIFY to the seccomp_add_rule(3) manpage Clarify the maintainers' GPG keys Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit f453ff84159f2ab28b9f32aaaa299df7ce5683e4 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Feb 1 10:48:29 2021 +0000 core154: Ship hyperscan Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b815ec45d55953a1c89007ba4aef8bc46fc29f9d Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Sun Jan 31 20:01:28 2021 +0100 hyperscan: update to 5.4.0 Please refer to https://github.com/intel/hyperscan/releases/tag/v5.4.0 for the (rather length) release announcement. Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit d06693b487cc80a3d8ed654edde76f407b13fc78 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Sun Jan 31 18:36:43 2021 +0100 qemu: Update to 5.2.0 - Update qemu from 5.0.0 to 5.2.0 - Changelogs for 5.1.0 and 5.2.0 available at https://wiki.qemu.org/ChangeLog/ - rootfile updated - patch no longer needed as fix built into source. patch was not utilised for 5.0.0 version. Patch line was commented out in previous lfs Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit ae94f85b0210b5e2daf7f1ccdbcc7cf3b25388d9 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sun Jan 31 09:06:27 2021 +0100 logwatch 7.5.5: Deleted no longer needed patch for clamav 0.103.0 I've should have read the changelog from opensuse more thoroughly: ... 4a862fa [clamav] Ignore new "Activating the newly loaded database" message ... Sorry for the noise. Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 68fbf256e26c6c3b65bff31dbf13235db087aab4 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Sat Jan 30 23:40:47 2021 +0100 cups-filters: Update to 1.28.7 - Update cups-filters from 1.27.4 to 1.28.7 - Changelog CHANGES IN V1.28.7 - driverless: Removed the support quality check from Pull request #235 as it takes significant time for each printer being listed, making cups-driverd (`lpinfo -m`) timing out when there are many printers (OpenPrinting CUPS issue #65). - libcupsfilters: In the PPD generator give priority to Apple Raster against PDF (Issue #331). - libcupsfilters: Added NULL check when removing ".Borderless" suffixes from page size names (Issue #314, Pull request #328). - libcupsfilters: In the cupsRasterParseIPPOptions() map the color spaces the same way as in the PPD generator (Issue #326, Pull request #327). - libcupsfilters: Fixed addition of grayscale mode in generated PPD files, to avoid duplicate entries (OpenPrinting CUPS issue #59). CHANGES IN V1.28.6 - libcupsfilters: In generated PPDs add a grayscale mode if there are only color printing modes (from OpenPrinting CUPS). - libcupsfilters: In generated PPDs add an "OutputBin" option also if it has only one choice (OpenPrinting CUPS pull request #18). - libcupsfilters: Generated PPDs could have an "Unknown" default InputSlot (OpenPrinting CUPS issue #44). - cups-browsed: Removed unneeded IPP attribute additions preventing the created local queues from preserving a location or description the user assigns to them (Issue #323). - cups-browsed: Removed all calls of the resolve_uri() function of libcupsfilters, as these are not actually needed and in case the supplied DNS-SD-based URI is not resolvable, the function gets stuck for ~5 seconds. - cups-browsed: Fixed several memory leaks, mainly from the code to merge printer IPP attributes for clusters (Pull request #322). - cups-browsed: Silenced compiler warning. - foomatic-rip: Fix infinite loop and input from file on raw printing (Pull request #318). - foomatic-rip: Remove temporary file created during pdf-to-ps conversion (Pull request #313). CHANGES IN V1.28.5 - cups-browsed: UUID from IPP response was used after its pointer was freed by ippDelete() (Pull request #311). CHANGES IN V1.28.4 - driverless: Avoid duplicate PPD list entries from the same device via UUID - driverless: Reduce ippfind calls by "driverless" and "driverless-fax"called by CUPS. Let "driverless list" list both print and fax PPDs and "driverless-fax list" do nothing. - driverless: Avoid duplicate listings in printer discovery, by "driverless-fax" not listing any URI as "driverless" lists them all already. - driverless: Vastly improve performance by doing only one ippfind call instead of two (IPP, IPPS) as ippfind accepts more than one reg type on the command line. - Sample PPDs: Corrected manufacturer name in Fuji_Xerox-DocuPrint_CM305_df-PDF.ppd. CHANGES IN V1.28.3 - libcupsfilters, cups-browsed: Fixed inconsistency between resolvers for DNS-SD-based URIs, resolve_uri() and ippfind_based_uri_converter(). Now both return a freeable string. - libcupsfilters: Fix uninitialized buffer and parsing ippfind output in ippfind_based_uri_converter() function (Issue #308, Pull request #309). CHANGES IN V1.28.2 - driverless: Free allocated memory, use MAX_OUTPUT_LEN (Pull request #304). - driverless: Make the two ippfind tasks(for IPP and IPPS) run in parallel (Pull request #302, #305, #306). - braille: Support new liblouis tables not containing a display name (Pull request #303) - Build system: Let ./configure not error out when there is more than one DejaVuSans.ttf test font candidate (Issue #300). - cups-browsed: Crash when a remote printer set as default gets removed, due to missing variable in printf() call (Issue #299). - libcupsfilters: Removed all signal handling and global variables from get_printer_attributes() and ippfind_based_uri_converter(). This is overkill for these quick operations and causes problems when shutting down cups-browsed (Issue #298). CHANGES IN V1.28.1 - COPYING: Fixed several typos - libcupsfilters: Fixed typo in log message of get_printer_attributes functions. - cups-browsed: Fixed typos in configuration file and man page - libcupsfilters: Let the PPD generator not suffix page size names with ".Borderless" if all page sizes would get this suffix, for example for printers which generally print borderless. - libcupsfilters: Added "faxPrefix" option for generated IPP Fax Out PPDs, so that this option also appears in print dialogs. - driverless: List addresses for local services correctly when using "--std-ipp-uris" (with "localhost" hostname). - driverless: Make calls of the ippfind utility somewhat faster, setting the timeout of ippfind to automatic. - libcupsfilters: Resolve DNS-SD-based URIs for local services correctly (using hostname "localhost"). - libcupsfilters: In get_printer_attributes() functions do not try to convert URIs which are not DNS-SD-based (Issue #294). - libcupsfilters: In get_printer_attributes() functions also support URIs with "dnssd://..." scheme. - libcupsfilters: Moved signal handling back into main function of the get_printer_attributes() variants, it got moved out accidentally. - driverless: For generating a PPD, independent whether via "driverless URI" or "driverless cat URI", always allow CUPS driver URIs (prefixed with "driverless: " or "driverless-fax:") and pure IPP URIs. - driverless: Accept clean IPP URIs also for 'driverless cat ...' (Issue #295, Pull request #296). - driverless-fax: Do not use fixed path for call of driverless itself (Pull request #293). CHANGES IN V1.28.0 - driverless, driverless-fax, libcupsfilters: Added IPP Fax Out support. Now printer setup tools list an additional fax "driver". A fax queue is created by selecting this driver. Jobs have to be sent with "-o phone=12345" to supply the destination phone number (Pull request #280). - libfontembed: Silenced warning with gcc 10.x (Pull request #287). - cups-browsed: Added ./configure options --enable-saving-created-queues and --with-remote-cups-local-queue-naming (Pull request: #253, #285). - cups-browsed: Fixed several memory leaks, mainly from the code to merge printer IPP attributes for clusters (Pull request #281, #283). - driverless: Added "--std-ipp-uris" command line option to show listed URIs in standard hostname-based form (not the CUPS DNS-SD-service-name-based form. Only for manual call of the utility, for debugging purposes (Pull request #277). - libfontembed: Removed assert() calls which cause crashes when unsupported emoji fonts are installed (Issue #254, Pull request #276). - driverless: Added support for IPPS (use "ipps://..." URIs if possible, Issue #251, Pull request #270, #273). - gstoraster, gstopdf: When converting PostScript to PDF use the "pdfwrite" output device with "-dPDFSETTINGS=/default" instead of with "-dPDFSETTINGS=/printer". This reproduces bitmaps in the PostScript file with their original image quality (Issue #272). - cups-browsed: Limit log file size and add backup file for previous log entries. Introduced the configuration option DebugLogFileSize in cups-browsed.conf to set the actual limit in kilobytes or 0 to get the old behavior of an unlimited size for the log file (Issue #260, Pull request #267). - gstoraster, gstopdf: Do not apply margins when output format is PDF, as then we convert an incoming PostScript file to PDF (pre-pdftopdf) and do not prepare the pages for the printer (post-pdftopdf, Issue #250). - cups-browsed: Do not write any log messages directly to stderr, there were some concerning timeouts on queue creation (Issue #260). - Build system: Fix cross-compilation without DejaVu test font in configure.ac (Issue #262, Pull request #263). - libcupsfilters: Respect the fact that PPD keywords are case-sensitive when adding "*cupsManualCopies: True" in PPD file (Issue #242). - libcupsfilters: Older versions of libcups (< 2.3.1) had the enum name for fold-accordion finishings mistyped. Added a workaround. - cups-browsed: Remove left-over local queues from the previous session more quickly when CUPS legacy browsing is turned on. - cups-browsed: Left-over local queues from the previous session for which the corresponding remote printer did not appear again did not get removed as they were considered externally overwritten. - gstoraster, gstopdf: Add option "-dDoNumCopies" to Ghostscript command line if we are outputting PDF (called via gstopdf wrapper) and the number of copies supplied to CUPS is 1 (4th command line argument). In this case we convert incoming PostScript to PDF and need to respect embedded PostScript commands to implement the number of copies (Issue #255, CUPS Issue #5796, OpenSUSE bug #1173345). - imagetoraster: Potential null dereference fix (when no valid PPD is supplied, Pull request #256). - cups-browsed: Call cupsGetNamedDest() only if "OnlyUnsupportedByCUPS No" - Sample PPDs: Corrected ColorModel default for Generic PWG Raster PPD to Color (Pull request #247). - cups-browsed: Mark the temp queue as cups-browsed-generated during setting printer-is-shared (Pull request #246). - cups-browsed: Remove mentions of README and AUTHORS files in the man page (Pull request #244). - pclmtoraster: Added new filter to extract Raster data from raster-only PDF files, here for the special case of PCLm files (Pull request #243, #257). - Sample PPDs: In Generic-PDF_Printer-PDF.ppd add option to switch between color and grayscale printing (Pull request #237). CHANGES IN V1.27.5 - cups-browsed: Do not remove the created local queues on shutdown, to avoid their re-creation on restart, so that desktops get no cluttered with notifications of new queues being created. One can return to the old behavior via "KeepGeneratedQueuesOnShutdown No" in cups-browsed.conf (Ubuntu bug #1869981, #1878241). - cups-browsed: Do not accept DNS-SD broadcasts of IPPS type of "remote" CUPS queues of another CUPS instance on the local machine. This way we get a local queue pointing to such a printer only in unencrypted version (IPP). For some reason printing from one CUPS server to another on the same machine works only unencrypted. - foomatic-rip: Map two-sided-short-edge to DuplexTumble (Pull request #236) - Build system: In configure.ac use AS_IF instead of AC_CHECK_FILE for font check (Issue #239, Pull request #240) - cups-browsed: Cleaned up code for determining to which CUPS server (host/port/domain socket) to connect, so that connection via DomainSocket cups-browsed.conf directive, CUPS_SERVER and IPP_PORT environment variables and all defaults and methods of libcups, including CUPS' client.conf work. - gstoraster, rastertopdf: Do not pass NULL to fprintf() (Pull request #230). - libcupsfilters: Silence compiler warning (Pull request #229). - rootfile updated Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit aadf0a01e3837fb874748ebb0e32d37c64632605 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Sat Jan 30 23:40:27 2021 +0100 cifs-utils: Update to 6.12 - Update cifs-utils from 5.9 to 6.12 - Changelog - URL for each change gives more details of changes December, 2020: Release 6.12 get/setcifsacl tools are improved to support changing owner, group and SACLs mount.cifs is enhanced to use SUDO_UID env variable for cruid smbinfo is re-written in Python language https://lists.samba.org/archive/samba-technical/2020-December/136156.html September, 2020: Release 6.11 CVE-2020-14342: mount.cifs: fix shell command injection https://lists.samba.org/archive/samba-technical/2020-September/135747.html December 16, 2019: Release 6.10 smb3 alias/fstype is added smb2-quota tool is added to display quota information smb2-secdesc UI tool to view security descriptors is added smbinfo is enhanced with capabilities to dump session keys and get/set compression of files smbinfo bash completion is supported getcifsacl tool is improved to support multiple files https://lists.samba.org/archive/samba-technical/2019-December/134662.html April 5, 2019: Release 6.9 smbinfo utility is added to query various kinds of information from the server (objectId, snapshots, different FileInfo* classes and other metadata) server IP change is supported by expiring DNS key resolver entries get/setcifsacl tools are improved to handle unexpected behavior share snapshot are allowed to be specified by a GMT token or SMB 100-nanoseconds time various new mount option are documented: bsize, handletimeout, handlecache, rdma, max_credits and others https://lists.samba.org/archive/samba-technical/2019-April/133233.html March 9, 2018: Release 6.8 man pages updates (auto-negotiate protocol version by default) and cleanups (moving to .rst format) setcifsacl: fix security descriptor buffer size mismatch cifscreds: fix a segfault for incorrect usage minor mount.cifs fixes https://lists.samba.org/archive/samba-technical/2018-March/126227.html March 2, 2017: Release 6.7 fixes for regressions from cifs.upcall overhaul mount.cifs cleanups https://lists.samba.org/archive/samba-technical/2017-March/119036.html September 3, 2016: Release 6.6 cleanup/overhaul of cifs.upcall krb5 credcache handling https://lists.samba.org/archive/samba-technical/2016-September/115974.html February 22, 2016: Release 6.5 mount.cifs: ignore x- mount options minor build fixes minor manpage fix https://lists.samba.org/archive/samba-technical/2016-February/112372.html July 11, 2014: Release 6.4 allow PAM directory to be configurable better determination of default keytab file better cifscreds error handling uppercase devicename when retrying mount https://lists.samba.org/archive/samba-technical/2014-July/101132.html January 9, 2014: Release 6.3 fixes for various bugs turned up by Coverity clean unused cruft out of upcall binary add new pam_cifscreds PAM module for establishing NTLM creds on login https://lists.samba.org/archive/samba-technical/2014-January/097124.html October 4, 2013: Release 6.2 setcifsacl can now work without a plugin systemd-ask-password is found using $PATH now cifs.upcall now works with KEYRING: credcaches https://lists.samba.org/archive/samba-technical/2013-October/095287.html July 2, 2013: Release 6.1 minor bugfixes allow cifs.upcall to use dedicated keytab https://lists.samba.org/archive/samba-technical/2013-July/093601.html March 25, 2013: Release 6.0 minor bugfixes and documentation updates support for NFS-style device names removed https://lists.samba.org/archive/samba-technical/2013-March/091169.html - Rootfile updated Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 9ab74511dacc7ccc9b1e090552174f06c1b18c1a Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Sat Jan 30 23:40:11 2021 +0100 screen: Update to 4.8.0 - Update screen from 4.2.1 to 4.8.0 - Changelog Version 4.8.0 (05/02/2020) * Improve startup time by only polling for files to close Fixes: - Fix for segfault if termcap doesn't have Km entry - Make screen exit code be 0 when checking --version - Fix potential memory corruption when using OSC 49 Version 4.7.0 (02/10/2019) * Add support for SGR (1006) mouse mode * Add support for OSC 11 * Update Unicode ambiguous and wide tables to 12.1.0 * Fixes: - cross-compilation support (bug #43223) - a lot of manpage fixes and cleanups Version 4.6.2 (23/10/2017): * Fixes: - revert changes to cursor position restore behavour (bug #51832) - set freed pointer to NULL (bug #52133) - documentation fixes - fix windowlist crashes (bug #43054 & #51500) Version 4.6.1 (10/07/2017): * Fixes: - problems with starting session in some cases - parallel make install - segfault when querying info on nonUTF locale (bug #51402) Version 4.6.0 (28/06/2017): * Update Unicode wide tables to 9.0 (bug #50044) * Support more serial speeds * Improved namespaces support * Migrate from fifos to sockets * Start viewing scrollback at first line of output (bug #49377) Version 4.5.1 (25/02/2017): * Fixes: - logfile permissions problem (CVE-2017-5618) - SunOS build problem (bug #50089) - FreeBSD core dumps (bug #50143) Version 4.5.0 (10/12/2016): * Allow specifying logfile's name via command line parameter '-L' * Fixes: - broken handling of "bind u digraph U+" (bug #48691) - crash with long $TERM (bug #48983) - crash when bumping blank window - build for AIX (bug #49149) - %x improperly separating arguments - install with custom DESTDIR (bug #48370) Version 4.4.0 (19/06/2016): * Support up to 24 function keys * Fix runtime issues * 'logfile' command, starts logging into new file upon changing Version 4.3.1 (28/06/2015): * Fix resize bug Version 4.3.0 (13/06/2015): * Introduce Xx string escape showing the executed command of a window * Implement dead/zombie window polling, allowing for auto reconnecting * Allow setting hardstatus on first line New Commands: * 'sort' command sorting windows by title * 'bumpleft', 'bumpright' - manually move windows on window list * 'collapse' removing numbering 'gaps' between windows, by renumbering * 'windows' command now accepts arguments for use with querying - Rootfile updated - Two screen patchfiles deleted as the patch changes are now built into the source files Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 69d90c36cc17a6b475253c29d98f02e26f1adb5e Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jan 30 20:52:42 2021 +0100 network-functions.pl: declare use of smartmatch perl complains about the use of experimental smartmatch feature if it is not declared. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit dd401c4d8a666aa57fe6be71cae0e1062dbcebc1 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sat Jan 30 17:54:11 2021 +0100 libassuan: Update to 2.5.4 Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 84371e42dfc6fc7b0c6775cff80c45e869e073a3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Feb 1 10:38:21 2021 +0000 core154: Ship libgpg-error Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit d3d50399244c969adff6cb71fd847bcbf77814c9 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sat Jan 30 17:51:31 2021 +0100 libgpg-error: Update to 1.41 Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit f4abc0221fe7968fa49f9b1694ac97ca759455bb Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Feb 1 10:37:51 2021 +0000 core154: Ship libgcrypt Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 47cf62d3b74190c08ec002b6b27d0734ad309925 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sat Jan 30 17:43:43 2021 +0100 libgcrypt: Update to 1.9.1 For details - especially for this version - see: https://lists.gnupg.org/pipermail/gnupg-announce/2021q1/000456.html Overview: https://dev.gnupg.org/source/libgcrypt/browse/master/NEWS Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit f90fd27a70f1acb6304cf3b8a4253f47ef1a8edf Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Sat Jan 30 14:26:11 2021 +0100 Postfix: update to 3.5.9 This release adds runtime detection of DNSSEC support; please refer to http://www.postfix.org/announcements/postfix-3.5.9.html for its full announcement. Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit bf2ff65e6cd9a7550dec48f214eac310ca24585b Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sat Jan 30 13:44:54 2021 +0100 logwatch: Update to 7.5.5 For details see: https://build.opensuse.org/package/view_file/server:monitoring/logwatch/Cha… Plus: deleted no longer need dhcpd-patch. Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 6106a465d774b9bb983fc4d06104877af1c08e49 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Feb 1 10:36:33 2021 +0000 core154: Ship dma Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b3a4ea2817abaadfab5012d36e2e4a382124f269 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sat Jan 30 12:42:51 2021 +0100 knot: Update to 3.0.4 Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b1f51038991423a9ff0d00a78175cedda1818c1b Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sat Jan 30 12:41:05 2021 +0100 knot: Cosmetic changes in lfs Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 5bc11f39e38b29afe6690e010ceb23e92980b611 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Fri Jan 29 22:58:23 2021 +0100 dbus: Update to 1.12.20 - Update dbus from 1.11.12 to 1.12.20 (latest in release line 1.13.x is also available but this is the development line and not recommended for production use - Changelog between these two versions is very long (750 lines long) and can be found in the NEWS file in the source tarball. - rootfile updated Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit d1efdea0d3ba1a184752181d9c7ac5f470b7cf3a Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Thu Jan 28 21:17:30 2021 +0100 dma: Update to 0.13 - Update dma from 0.12 to 0.13 - No changelog information available - No change to the rootfile Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit fa82a2156ae837b91304a190e10e10d8314d2ece Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jan 29 14:43:20 2021 +0000 Revert "core154: Ship freetype" This reverts commit 45063142bed6287d29d21170873d3f67eff2aa50. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 52bf6075d080ae7e1aea21b805378d4bc4efd5fa Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jan 29 14:43:05 2021 +0000 Revert "freetype: update to 2.10.4" This reverts commit 5653a45f813f57368bf2a32f9468ba6bd496274a. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 9a0e00209806949435105610ad8cb63e9e9ff3db Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jan 29 11:14:43 2021 +0000 core154: Ship ipset Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit bc19698555838a849c1bf9c5231610899ff9007d Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Thu Jan 28 21:17:00 2021 +0100 ipset: Update to 7.10 - Update ipset from 7.6 to 7.10 - Changelog 7.10 Kernel part changes Fix patch "Handle false warning from -Wstringop-overflow" Backward compatibility: handle renaming nla_strlcpy to nla_strscpy treewide: rename nla_strlcpy to nla_strscpy. (Francis Laniel) netfilter: ipset: fix shift-out-of-bounds in htable_bits() (Vasily Averin) netfilter: ipset: fixes possible oops in mtype_resize (Vasily Averin) Handle false warning from -Wstringop-overflow Backward compatibility: handle missing strscpy with a wrapper of strlcpy. Move compiler specific compatibility support to separated file (broken compatibility support reported by Ed W) 7.9 Userspace changes Fix library versioning (Jan Engelhardt) 7.8 Kernel part changes Complete backward compatibility fix for package copy of <linux/jhash.h> Compatibility: check for kvzalloc() and GFP_KERNEL_ACCOUNT netfilter: ipset: enable memory accounting for ipset allocations (Vasily Averin) netfilter: ipset: prevent uninit-value in hash_ip6_add (Eric Dumazet) Compatibility: use skb_policy() from if_vlan.h if available Compatibility: Check for the fourth arg of list_for_each_entry_rcu() Backward compatibility fix for the package copy of <linux/jhash.h> 7.7 Userspace changes Expose the initval hash parameter to userspace Handle all variable header parts in helper scripts instead ot test tasks Add bucketsize parameter to all hash types Support the -exist flag with the destroy command Kernel part changes Expose the initval hash parameter to userspace Add bucketsize parameter to all hash types Use fallthrough pseudo-keyword in the package copy of too Support the -exist flag with the destroy command netfilter: Use fallthrough pseudo-keyword (Gustavo A. R. Silva) netfilter: Replace zero-length array with flexible-array member (Gustavo A. R. Silva) netfilter: ipset: call ip_set_free() instead of kfree() (Eric Dumazet) netfiler: ipset: fix unaligned atomic access (Russell King) netfilter: ipset: Fix subcounter update skip (Phil Sutter) ipset: Update byte and packet counters regardless of whether they match (Stefano Brivio) netfilter: ipset: Pass lockdep expression to RCU lists (Amol Grover) ip_set: Fix compatibility with kernels between v3.3 and v4.5 (Serhey Popovych) ip_set: Fix build on kernels without INIT_DEFERRABLE_WORK (Serhey Popovych) ipset: Support kernels with at least system_wq support ip_set: Fix build on kernels without system_power_efficient_wq (Serhey Popovych) - Rootfiles updated Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 45063142bed6287d29d21170873d3f67eff2aa50 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jan 29 11:14:06 2021 +0000 core154: Ship freetype Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 5653a45f813f57368bf2a32f9468ba6bd496274a Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Thu Jan 28 19:43:22 2021 +0100 freetype: update to 2.10.4 This fixes a heap buffer overflow in the handling of embedded PNG bitmaps (CVE-2020-15999). Further information is available at https://sourceforge.net/projects/freetype/files/freetype2/2.10.4/ . Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 968ad8ba8d4f730d52da90641539cc38bc92e27f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jan 29 11:09:34 2021 +0000 samba: Update rootfiles Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit ecf0ba6d127ea594aa02cb8eefe47cbc5f499c93 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Thu Jan 28 15:55:57 2021 +0100 minicom: Update to 2.8 - Update minicom from 2.7.1 to 2.8 - Changelog for version 2.8 New timestamp mode: Delta to previous line. Add HPA ESC sequence Add alternative window support (ti/te) Fix file name of non-global configuration settings. Update translations: Indonesian, French, Swedish, Spanish, German, Brazilian Portuguese, Vietnamese, Polish, Danish, Norwegian, Serbian New translation: Serbian, Simplified chinese Fix F10 macro key used in current setups Add F11 and F12 for macro use Fixed DTR for recent systems Add support for RS485. Add --capturefile-buffer-mode option Bug fixes - Updated rootfile Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit ff5aef9d30241ee170cb42922b9ebbf052376f6a Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Thu Jan 28 15:56:14 2021 +0100 tshark: Update to 3.4.2 - Update tshark from 3.2.6 (Old Stable Release line) to 3.4.2 (Stable Release line) - Changelog at https://www.wireshark.org/docs/relnotes/ - Rootfile updated Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit d52d7073815a5576215ebcc3a5fc6ae765574ddc Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jan 28 16:44:51 2021 +0000 core154: Ship arping Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 6b22a5d2fdce2c440e7620f25b414a7173597f1a Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Wed Jan 27 23:17:00 2021 +0100 arping: Update to 2.21 - Update arping from 2.15 to 2.21 - Notable changes from 2.20 to 2.21: * Use more modern pcap API calls, when available * Add payload data to mac ping * chdir(/) after chroot() * Misc minor cleanup - Notable changes from 2.19 to 2.20: * Improved support for cross-compile * Use unveil(2) and pledge(2) where available (i.e. OpenBSD) * Fix false duplicates when destination address is *also* assigned to local interface * Minor typo-level fixes - Notable changes from 2.18 to 2.19: * Added -g to drop privs to alternate user (for Android) * Slightly improved error messages - Notable changes from 2.17 to 2.18: * Make -w/-W work like 'ping' - Notable changes from 2.16 to 2.17: * Add padding to packets to work on Raspberry Pi 3 - Notable changes from 2.15 to 2.16: * VLAN tagging (Nikolay Aleksandrov) * 802.1Q priority (Nikolay Aleksandrov) * Added a bunch of unit tests. * Be more lazy about initializing libnet. This fixes issues where arping would sometimes pick an unsuitable device during arg parsing, if the "first" device on the system is not a "normal" device. - No change to rootfile Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit e2bf0fa529d93ac8172bda53b85c50c4b45432fa Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Thu Jan 28 17:00:47 2021 +0100 libloc: ship a more recent database by default The database we ship by default is meanwhile four weeks old, and since the merge window for Core Update 154 is still open, there is no need to ship data being more outdated than they have to be. :-) The second version of this patch also updates the checksum for the downloaded database file. Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit ffe6303b2bfc0feebf60604d41bc9428ba567764 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jan 27 22:09:34 2021 +0000 core154: Ship tzdata Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 922d881312482049dc67c2c1f4435ae7f7a266bd Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Wed Jan 27 22:31:46 2021 +0100 tzdata: update to 2021a Please refer to https://www.iana.org/time-zones for further information. Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 273708295b5553f174b27101a33c7d1402e4eb78 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Wed Jan 27 21:14:44 2021 +0100 sudo: Upgrade to 1.9.5p2 - Update sudo from 1.9.5p1 to 1.9.5p2 - Major changes between version 1.9.5p2 and 1.9.5p1: Fixed sudo's setprogname(3) emulation on systems that don't provide it. Fixed a problem with the sudoers log server client where a partial write to the server could result the sudo process consuming large amounts of CPU time due to a cycle in the buffer queue. Bug #954. Added a missing dependency on libsudo_util in libsudo_eventlog. Fixes a link error when building sudo statically. The user's KRB5CCNAME environment variable is now preserved when performing PAM authentication. This fixes GSSAPI authentication when the user has a non-default ccache. When invoked as sudoedit, the same set of command line options are now accepted as for sudo -e. The -H and -P options are now rejected for sudoedit and sudo -e which matches the sudo 1.7 behavior. This is part of the fix for CVE-2021-3156. Fixed a potential buffer overflow when unescaping backslashes in the command's arguments. Normally, sudo escapes special characters when running a command via a shell (sudo -s or sudo -i). However, it was also possible to run sudoedit with the -s or -i flags in which case no escaping had actually been done, making a buffer overflow possible. This fixes CVE-2021-3156. - No change to rootfile Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 157d64250a170b905cb440dd6968f7ba6cbaf988 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jan 7 12:13:30 2021 +0000 misc-progs: addonctrl: Replace all sprintf() with snprintf() Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 37fe3658a04f200732651ae997ff408efd7a92f6 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jan 6 14:38:03 2021 +0000 samba: Add helper script to pipe password It is complicated to set the password in the C helper binary. Therefore it is being set by a helper script. This is still not an optimal solution since the password might be exposed to the shell environment, but has the advantage that shell command injection is no longer possible. Fixes: #12562 Reported-by: Albert Schwarzkopf <ipfire(a)quitesimple.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 354c3e2b45d9b3e51a29c8632bd18deb603a811f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jan 6 12:00:32 2021 +0000 samba: Remove option to chose user group and shell There is no need for this being implemented and it is dangerous to allow the user to create any shell accounts or users that belong to groups with higher privileges. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 64883513d5940c17afe2fcf1d876feae61921ea9 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jan 6 11:56:08 2021 +0000 misc-progs: sambactrl: Sanitise username Fixes: #12562 Reported-by: Albert Schwarzkopf <ipfire(a)quitesimple.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 8e4b2125ccfd005c30adb9c568f2103bbc36bdb7 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jan 6 11:52:39 2021 +0000 misc-progs: sambactrl: Remove unused smbsafeconfpdc command Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 84de1f087c8a3bb0b5ca58503101f95117a69cf0 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jan 6 11:49:04 2021 +0000 misc-progs: sshctrl: Sanitise runtime for "tempstart" Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 14dc1c68f75b2ea70c0acfc55c1c168cc1ba8dff Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jan 6 11:45:20 2021 +0000 misc-progs: smartctrl: Sanitise device name Fixes: #12562 Reported-by: Albert Schwarzkopf <ipfire(a)quitesimple.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 5efedb5487fa6fcc771c03bb9f15b5cb2412416c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jan 6 11:42:06 2021 +0000 misc-progs: mpfirectrl: Use new run() function Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit c651dd9b6b2e00fb10d1ca1a99cf9efaec42df19 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jan 6 11:39:46 2021 +0000 misc-progs: extrahdctrl: Use new run() function Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit cf9efe511a403f9dba38340bf9c89bc1d30776f5 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jan 6 11:34:50 2021 +0000 misc-progs: addonctrl: Sanitise add-on names before use Fixes: #12562 Reported-by: Albert Schwarzkopf <ipfire(a)quitesimple.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit db984059b22a4680046df31579b44fa05c8264d5 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jan 6 11:34:31 2021 +0000 misc-progs: Add functions to sanitise input arguments Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 6733d973d663968e1d642c18b3a0fe6526f07252 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jan 6 11:18:33 2021 +0000 misc-progs: pakfire: Use new run() function Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit c33f477f5bf1942f70dfaeff793e3d553afe4960 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jan 6 11:17:53 2021 +0000 misc-progs: backupctrl: Use new run() function Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit ca060524a79e6d9d874b82f081e8c98d1abe4ff1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jan 6 11:15:47 2021 +0000 misc-progs: Introduce run() This function invokes a new command similar to safe_system() but without launching a shell before. That way, it is possible to execute commands without any risk of shell command injection from nobody. Fixes: #12562 Reported-by: Albert Schwarzkopf <ipfire(a)quitesimple.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 5d482a74faf4732db7c77ee693a2bc65e0b81a7a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jan 5 16:55:25 2021 +0000 core154: Manually set capabilites for etherwake The changes are not available in the running instance of pakfire and tar. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit d9f9f16366d6a8332d5fd8e864d1a9c552db1387 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jan 5 16:01:56 2021 +0000 Drop launch-ether-wake The helper binary is being dropped and etherwake is enabled for CAP_NET_RAW. This allows execution by unprivileged users as needed by the web user interface (nobody). Reported-by: Albert Schwarzkopf <ipfire(a)quitesimple.org> Fixes: #12562 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 29156d15f637faa7b5a23c797f0b0cd858a300ff Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jan 27 18:56:07 2021 +0000 hostapd: Re-add accidentially removed CONFIG_SAE Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 1035570fb0ab8b62ed8511f27261fbe609dc3178 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jan 27 18:43:30 2021 +0000 core154: Do not package libloc database files This is carried over from Core Update 153 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 85f5656aca91992d8cf135da603d729cc8ac8e0d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jan 26 11:15:04 2021 +0000 Revert "make: update to 4.3" This reverts commit f1d98a1c3fb2459cf481e9330d113a958be35e58. The new version of make seems to break building u-boot on armv5tel. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 53f04366ed8eff56b11cc4d070fe36ed5ddb376b Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Thu Jan 21 21:17:06 2021 +0100 iptables: Update to version 1.8.7 - Update from 1.8.6 to 1.8.7 Florian Westphal (4): xtables-monitor: fix rule printing xtables-monitor: fix packet family protocol xtables-monitor: print packet first xtables-monitor: Pablo Neira Ayuso (2): tests: shell: update format of registers in bitwise payloads. configure: bump version for 1.8.7 release Phil Sutter (21): nft: Optimize class-based IP prefix matches ebtables: Optimize masked MAC address matches tests/shell: Add test for bitwise avoidance fixes ebtables: Fix for broken chain renaming iptables-test.py: Accept multiple test files on commandline iptables-test.py: Try to unshare netns by default libxtables: Extend MAC address printing/parsing support xtables-arp: Don't use ARPT_INV_* xshared: Merge some command option-related code tests/shell: Test for fixed extension registration extensions: dccp: Fix for DCCP type 'INVALID' nft: Fix selective chain compatibility checks nft: cache: Introduce nft_cache_add_chain() nft: Implement nft_chain_foreach() nft: cache: Move nft_chain_find() over nft: Introduce struct nft_chain nft: Introduce a dedicated base chain array nft: cache: Sort custom chains by name tests: shell: Drop any dump sorting in place nft: Avoid pointless table/chain creation tests/shell: Fix nft-only/0009-needless-bitwise_0 - Rootfile updated Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit adc2aa5f67dfcc537bb0c0acc4136b69cd62b8e0 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jan 25 19:34:16 2021 +0000 core154: Ship updated perl files Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit eea288bc1a55ac99cac868b00367999455cecde5 Author: Leo-Andres Hofmann <hofmann(a)leo-andres.de> Date: Sun Jan 17 15:20:04 2021 +0100 network-functions.pl: Improve zone configuration functions Cache ethernet configuration in public variable "ethernet_settings", add functions to simplify working with the network configuration. Signed-off-by: Leo-Andres Hofmann <hofmann(a)leo-andres.de> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit abffcc99adab8311e9421c8203a82d65b7c5ea1c Author: Leo-Andres Hofmann <hofmann(a)leo-andres.de> Date: Sun Jan 17 15:20:03 2021 +0100 Refactor "get_available_network_zones", move to network-functions.pl This function nicely translates the ethernet/settings "CONFIG_TYPE" into a list of available zones. Therefore it should be more accessible! Signed-off-by: Leo-Andres Hofmann <hofmann(a)leo-andres.de> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit f1d98a1c3fb2459cf481e9330d113a958be35e58 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Jan 21 14:35:16 2021 +0100 make: update to 4.3 this this needed to build on systems with kernel >=5.5 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 502f6c63a3120a85ca855ec9aaec9c6cb90cbefd Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jan 18 17:05:46 2021 +0000 network-hotplug-bridges: Fix logical error in STP_PRIORITY check Reported-by: Daniel Weismüller <daniel.weismueller(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit bb859c27f08b67d05c204455849f173df29cfdf1 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sat Jan 16 18:11:35 2021 +0100 nano: Update to 5.5 For details see: https://www.nano-editor.org/news.php Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 387d4b5e43fb602c3be6078ce3a2284f07be55ba Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jan 18 13:06:25 2021 +0000 core154: Ship logrotate Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 9f2779d71c9289e0c01da191666eef77062eb91d Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sat Jan 16 16:57:56 2021 +0100 logrotate: Update to 3.18.0 Exerpt from 'ChangeLog.md': "## [3.18.0] - 2021-01-08 - allow UIDs and GIDs to be specified numerically (#217) - add support for Zstandard compressed files (#355) - make `delaycompress` not to fail with `rotate 0` (#341)" Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit bcc66365764642ffa529a5bd6623110fa78c44b6 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sat Jan 16 16:53:07 2021 +0100 htop: Update to 3.0.5 For details see: https://github.com/htop-dev/htop/blob/master/ChangeLog Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 597e584f3dcbec0488f7471f7f657a0d092df627 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jan 18 13:05:42 2021 +0000 core154: Ship ipsec-interfaces Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 0de7cc50ac420b3a635a342197a0174d5eeb4e1d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jan 14 18:54:03 2021 +0000 IPsec: Disable XFRM policy lookup for VTI devices This speeds up throughput slightly Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 37ff8e005db883c8e476dedd1b73e6623e271cc9 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jan 18 13:04:55 2021 +0000 core154: Ship sudo Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 161613165a64dffeef9a0d5bc545c698dfdda002 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Thu Jan 14 19:37:11 2021 +0100 sudo: Upgrade to 1.9.5p1 - Upgrade sudo from 1.8.10p3 to 1.9.5p1 - Move sudo from legacy release (1.8) branch to stable release (1.9) branch - Update rootfile - Changelog available at https://www.sudo.ws/changes.html - Tested out on vm testbed and sudo is working correctly Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 93d540832a2077e276c8c5d8eec14f3aa9fe47a4 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jan 18 13:02:43 2021 +0000 wpa_supplicant: Update to development version Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 5b2fc5d65f85917e906af70f63c2fc238b266420 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jan 18 13:02:15 2021 +0000 hostapd: Update to development version Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 50f75f88068420c66a64661120ab24f32feda22a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jan 13 11:20:34 2021 +0000 core154: Ship kmod Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 5c21f1a0784c73aa9c1cdf387f2940efb11ddf67 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jan 13 11:20:09 2021 +0000 kmod: Update to 28 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b14c24ca90e048cf65bd32b5d431c435e24d5610 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Dec 30 17:55:35 2020 +0000 make.sh: Build zstd earlier in stage2 Since programs from the toolchain are linked against this, we need to make this library available in stage 2, too. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 5c3f3da55921a8f027d06d69df8bde19fef0c478 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jan 13 11:14:30 2021 +0000 core154: Ship SSH initscript Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 675c9ca558f3d354127c4746fed187b3ff4380cd Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jan 13 11:12:03 2021 +0000 ssh: Ignore any errors when stopping daemon The SSH init script only kills the main daemon which leads to any child processes (for remaining connections) being untouched. killproc returns 4 (unknown error) when not all processes were killed which is not intended here. Therefore we ignore the error and do not pause the shut down process for a minute. Fixes: #12544 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 0b58804370ce8ee1350b85d30e1577e7dfaec90f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jan 13 10:54:07 2021 +0000 core154: Ship initscript functions Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit ad594123b6dd1115138a70ed15e59f3d43a91021 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jan 13 10:53:15 2021 +0000 core154: Ship header.pl Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 56d37c8dbfe5793212163814e6ca34b9ee6d34e2 Author: Leo-Andres Hofmann <hofmann(a)leo-andres.de> Date: Tue Jan 12 19:11:14 2021 +0100 header.pl: Remove duplicate "IpInSubnet" function This function is deprecated. The commonly used and maintained "IpInSubnet" function can be found in general-functions.pl. Signed-off-by: Leo-Andres Hofmann <hofmann(a)leo-andres.de> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 7fd195938f0e4f48168148e2ca3f16e91d895241 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Jan 7 14:55:59 2021 +0100 strace: update to 5.10 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 80b1dc64f2020c2771fd43460e6a07f348f0b4d9 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jan 13 10:44:16 2021 +0000 AWS: Ensure the product UUID is uppercase Newer kernels seem to return this in lowercase format which makes the comparison to "EC2" fail. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit baa97123726d5e9d58af27595e7c9ad9bafa2a46 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jan 13 10:42:38 2021 +0000 AWS: Hypervisor UUID has been dropped from newer kernels Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 611c2b7103f6921a2cb11be26c799d7613793cfb Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jan 12 10:43:52 2021 +0000 iw: Update to 5.9 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit a4cfeae49b531035c17463d2f4ea3db5010bc50a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jan 12 10:40:28 2021 +0000 core154: Ship WiFi changes Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 0eec4bbe46752aa732132436cf3aaff58be2e855 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jan 6 14:43:14 2021 +0000 wpa_supplicant: Import fresh default configuration This enables some more features that have been added to wpa_supplicant over time. In our case we need SAE for WPA3 support. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 3403eb308c7220cde9c08c555c2d263a1f1501d7 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jan 6 14:43:13 2021 +0000 wireless client: Try using SHA256 over SHA1 when possible Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 5addf347804340cef0808d6fb119b6092244dec6 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jan 6 14:43:12 2021 +0000 wireless client: Add support for WPA3 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 0c2be650b04ba40a38e51188bce1821808d2e197 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jan 12 10:37:17 2021 +0000 core154: Ship setup Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 14cb18a5395cee2c9ff0ed13afdc5feca8d45514 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jan 9 18:39:00 2021 +0100 setup: move gateway setting to red address setting. DEFAULT_GATEWAY is used only in RED_STATIC config so it fits better to this menu and is only selectable if red is set to static mode. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit f0b53518e5b74ef7e7b432f1c627772253a5ea3a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jan 7 13:52:01 2021 +0000 flashrom: Only build package for x86_64 and i586 The ARM architectures do not seem to be supported Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit acc82ade06f1bf68e3d47630699d9f9745088311 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jan 7 11:57:53 2021 +0000 core154: Ship unbound initscript Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 2b113aebc482389692c9843a289ca489364a0c6f Author: Giovanni Aneloni <giovanni.aneloni(a)live.com> Date: Tue Apr 28 00:23:57 2020 +0200 unbound: make local zone transparent Change local zone to "trasnparent" instead of "typetrasnparent" to avoid NXDOMAIN when querying local hosts Fixes: #12391 Signed-off-by: Giovanni Aneloni <giovanni.aneloni(a)live.com> Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org> Acked-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit f8e0e85d2ef1231aec962604ea5a9d5814cba293 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jan 7 11:39:08 2021 +0000 flashrom: Update to 1.2 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit cc62cff43fc8bfba762fce51e48c18a0ceca3e0d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jan 7 11:37:01 2021 +0000 firmware-update: It is 2021 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 1deb76d7fba31f1a547cd83a5ef99862a02f9f6c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jan 7 11:20:09 2021 +0000 firmware-update: Update to version 20200107 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit d701756a83e3fcf2fda0b85accc601b9799f7a0a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jan 6 17:27:36 2021 +0000 make.sh: Build gettext earlier msgmerge is needed by attr Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit eb2cf5d0f3971431d60c0d2e8b5807f8f112a983 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jan 6 15:33:36 2021 +0000 core154: Ship ddns.cgi Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 0562cdb360b28802427fc9f51d2e467788222109 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Wed Jan 6 15:18:27 2021 +0100 ddns.cgi: Make dealing with auth tokens more user-friendly. If a provider supports authentication with a token, now the username and password fileds will be swapped by some Java Script code in favour of an input field for the token. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit f6557ced12d4e6137c8d2fa6d1a376aefb2a0052 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jan 6 15:32:41 2021 +0000 core154: Ship ddns Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 7d425e7cfa9767fedc460cf5e452a736163e738a Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Wed Jan 6 15:16:41 2021 +0100 ddns: Add latest upstream patches. * Add patch to support listing of token providers. * Add fix to proper encode python string. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 211b6bc16e3d1c383e63835572c21d8f7ed63822 Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Date: Wed Jan 6 10:16:49 2021 +0000 unbound: keep probing when servers are down Till now when a server was in the "blocking regime" there was one probe made every 15 min, to see if this server is up again. In situations where all servers where down (e.g. because of a massive package loss) it could take up to 15 min to have a working dns again. This patch changes this behaviour in a way that a server marked down is probed every 2 min. Fixes: #12557 Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 02037c964fade3d58b0e4d9a05d3034955e8f5bc Author: Adolf Belka <ahb.ipfire(a)gmail.com> Date: Tue Jan 5 15:20:57 2021 +0100 sshfs: Update to 3.7.1 - Update sshfs from 2.2 to 3.7.1 - Changelog is available at https://github.com/libfuse/sshfs/releases - Build had to be changed from autotools to meson/ninja - Change in rootfiles Signed-off-by: Adolf Belka <ahb.ipfire(a)gmail.com> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 6f20cb9688535efaf22cc490ffdcbed99088e67a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jan 6 15:21:32 2021 +0000 core154: Ship fuse Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 35b8dc552ddf08bd3d2290621076e323859b23cd Author: Adolf Belka <ahb.ipfire(a)gmail.com> Date: Tue Jan 5 15:21:19 2021 +0100 fuse: Update to 3.10.1 - Update fuse from 2.9.7 to 3.10.1 - Update also required by sshfs update - Changelog is available at https://github.com/libfuse/libfuse/releases - Build had to be changed from autools to meson/ninja - Rootfiles changed - namespace conflict fix patch no longer required. Fix now built into kernel.h Signed-off-by: Adolf Belka <ahb.ipfire(a)gmail.com> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 8468f164abec32309e7c09bf044face0a153c56a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jan 6 15:17:50 2021 +0000 core154: Ship iproute2 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 34866cace5ffbd587bab91a00d763fa18853746b Author: Adolf Belka <ahb.ipfire(a)gmail.com> Date: Wed Jan 6 14:43:59 2021 +0100 iproute2: Update to 5.10.0 - Update from 5.8.0 to 5.10.0 - No changelog available - No changes to the rootfiles Signed-off-by: Adolf Belka <ahb.ipfire(a)gmail.com> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 6ae847429ed258ce3f7f50317bec3d4ed3efe6cc Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jan 6 15:15:22 2021 +0000 core154: Ship iptables Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 84e4274e59912b854363597c97602432a9a5f615 Author: Adolf Belka <ahb.ipfire(a)gmail.com> Date: Wed Jan 6 14:43:27 2021 +0100 iptables: Update to 1.8.6 - Update from 1.8.5 to 1.8.6 - Changelog info Arturo Borrero Gonzalez (1): xtables-translate: don't fail if help was requested Giuseppe Scrivano (1): iptables: accept lock file name at runtime Jan Engelhardt (2): doc: document danger of applying REJECT to INVALID CTs build: resolve iptables-apply not getting installed Maciej Żenczykowski (1): libxtables: compiler warning fixes for NO_SHARED_LIBS Pablo Neira Ayuso (4): extensions: libxt_conntrack: provide translation for DNAT and SNAT --ctstate iptables: replace libnftnl table list by linux list iptables-nft: fix basechain policy configuration configure: bump version for 1.8.6 release Phil Sutter (31): xtables-restore: Fix verbose mode table flushing build: Fix for failing 'make uninstall' xtables-translate: Use proper clear_cs function tests: shell: Add help output to run-tests.sh nft: Make table creation purely implicit nft: Be lazy when flushing nft: cache: Drop duplicate chain check nft: Drop pointless nft_xt_builtin_init() call nft: Turn nft_chain_save() into a foreach-callback nft: Use nft_chain_find() in two more places nft: Reorder enum nft_table_type nft: Eliminate table list from cache nft: Fix command name in ip6tables error message tests: shell: Merge and extend return codes test xtables-monitor: Fix ip6tables rule printing nft: Fix for ruleset flush while restoring Makefile: Add missing man pages to CLEANFILES nft: cache: Check consistency with NFT_CL_FAKE, too nft: Extend use of nftnl_chain_list_foreach() nft: Fold nftnl_rule_list_chain_save() into caller nft: Use nft_chain_find() in nft_chain_builtin_init() nft: Fix for broken address mask match detection extensions: libipt_icmp: Fix translation of type 'any' libxtables: Make sure extensions register in revision order libxtables: Simplify pending extension registration libxtables: Register multiple extensions in ascending order nft: Make batch_add_chain() return the added batch object nft: Fix error reporting for refreshed transactions libiptc: Avoid gcc-10 zero-length array warning nft: Fix for concurrent noflush restore calls tests: shell: Improve concurrent noflush restore test a bit - Rootfiles updated Signed-off-by: Adolf Belka <ahb.ipfire(a)gmail.com> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 248902f8c9a9ea1a8b549aff87344e024e1a1d8d Author: Adolf Belka <ahb.ipfire(a)gmail.com> Date: Tue Jan 5 18:35:16 2021 +0100 stunnel: Update to 5.57 - Update of stunnel from 5.56 to 5.57 - Changelog Version 5.57, 2020.10.11, urgency: HIGH Security bugfixes The "redirect" option was fixed to properly handle "verifyChain = yes" (thx to Rob Hoes). OpenSSL DLLs updated to version 1.1.1h. New features New securityLevel configuration file option. FIPS support for RHEL-based distributions. Support for modern PostgreSQL clients (thx to Bram Geron). Windows tooltip texts updated to mention "stunnel". TLS 1.3 configuration updated for better compatibility. Bugfixes Fixed a transfer() loop bug. Fixed memory leaks on configuration reloading errors. DH/ECDH initialization restored for client sections. Delay startup with systemd until network is online. bin\libssp-0.dll removed when uninstalling. A number of testing framework fixes and improvements. - No change to rootfiles Signed-off-by: Adolf Belka <ahb.ipfire(a)gmail.com> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 1a886f57d865e6cb568bb6bfe3e043cdd7c2dd0f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jan 6 11:51:36 2021 +0000 misc-progs: ipfirereboot: Remove unused cron functions Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 36f253d2911c56715b435acee2c14dd14a7cc828 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jan 6 11:39:32 2021 +0000 configroot: Make extrahd.pl executable Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 81790c8a002363bd4bddf46c3621e051c549f702 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jan 6 11:19:18 2021 +0000 misc-progs: Set some defaults for CONFIG_ROOT and SNAME Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 1a79ef8e43a4e406a79344341055dd9fa79ce57d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jan 5 17:17:33 2021 +0000 misc-progs: Drop unused upnpctrl Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit f0c39f17390ce71960cf3c6fb06498a20634b263 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jan 5 17:15:11 2021 +0000 misc-progs: Drop unused updxsetperms Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 7908de2a952edc91b1effa6245dbb6dc80b7dafc Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jan 5 17:02:44 2021 +0000 misc-progs: Drop unused ipfiredeath & ipfirerebirth Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 5cef36ccb14424270a451c11d235ece4dc3be946 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jan 5 16:59:14 2021 +0000 misc-progs: Drop unused applejuicectrl Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b37678e92231a7497820b2f39f040cccacfd808e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jan 5 16:53:36 2021 +0000 Package extended attributes in distro.img and Core Updates System capabilities are stored in extended file system attributes which are by default not stored in tar balls. This patch ensures that they are packaged and extracted. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 241bf919fc2d056124c1082a0488bfa4c3fe8298 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jan 5 16:09:16 2021 +0000 make.sh: Build acl and attr earlier These libraries are needed to link tar against them for extended attribute support Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit d0a16dba2835fc1c27c1d12765d7461a9d48c04c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jan 4 10:44:56 2021 +0000 core154: Ship general-functions.pl Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 5b4e33bc3b754dd14ecc279bc421ec232a489507 Author: Adolf Belka <ahb.ipfire(a)gmail.com> Date: Sat Jan 2 13:54:45 2021 +0100 general-functions.pl: Update to fix bug #12428 - Patch of general-functions.pl for implementation of fix provided by Bernhard Bitsch in bug #12428. Had to be modified as that fix gave a failure for single character hostnames. Updated version prevents spaces being put into hostnames and works for single character hostnames - Updated subroutine validfqdn to apply consistent rules for hostname & domain name portions of fqdn - Minor updates for consistency across validhostname, validdomainname & validfqdn - Patch implemented into testbed system and confirmed working for hostnames, domain names and FQDN's. Signed-off-by: Adolf Belka <ahb.ipfire(a)gmail.com> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 888a21f928d1eb79ae7049bdde394f54ebc39e2c Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Fri Jan 1 16:47:54 2021 +0100 wget: Update to 1.21 Sorry, no changelog found, only: https://fossies.org/linux/wget/ChangeLog Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 21970dd75f4f5a00b89f4cec4a56bb5c959c9407 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jan 3 11:18:06 2021 +0000 core154: Ship knot Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 3d725ebbec589c137f40c59296662b21583225e1 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Fri Jan 1 10:58:16 2021 +0100 knot: Update to 3.0.3 For details see: https://www.knot-dns.cz/2020-12-15-version-303.html Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 86bd9ccc951473f4e9ec3df7748a89b954beda1c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jan 3 11:17:28 2021 +0000 Drop unused Asterisk CGI files Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit edd2710520fb2b762b1b4a05a0a34180ad30b7ae Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jan 3 11:16:22 2021 +0000 Drop unused upnp.cgi Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 2b4110cd64721eb591a75e7bc0856afff4b4ff93 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jan 3 11:15:45 2021 +0000 core154: Ship updated CGI files Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 1d55fccdc58f56c7cea81b9c7c6a96aec89458ae Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Tue Dec 29 13:50:11 2020 +0100 Syntax fixes in several CGIs Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 15194c7c52c2438611832cecf4dad24fec304322 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Tue Dec 29 13:36:21 2020 +0100 dhcpcd: Update to 9.4.0 For details see: https://roy.marples.name/archives/dhcpcd-discuss/0003420.html Former patch for Bug #12552 is now included. Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit da310b22465c5147fa5d63bb763d9b1963726eb8 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Dec 29 10:18:44 2020 +0000 core154: Ship logwatch Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit e49289c9ea0d1ccd1462aa0012d00f434e8ac259 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Fri Dec 25 13:07:18 2020 +0100 logwatch: Fix unmatched entries from clamav This - cosmetic - patch fixes the unnecessary unmatched "Activating the newly loaded database..."-entries introduced with 'clamav 0.103.0'. Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 2127c97b8f738a1d2b75d817a42d73145bde257c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Dec 29 10:17:09 2020 +0000 hostapd: Bump package version Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit ed7f8152662d2371b7624fd4f26499f4236c35c2 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Mon Dec 28 14:40:21 2020 +0100 wlanap.cgi: Cosmetic fix - replace 'Save' image with 'Save' button Fixed syntax for "value".. Thanks! Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 438fce1f19d6e01058dfa04b0d7fa308d574121a Author: Stéphane Pautrel <steph78630(a)gmail.com> Date: Tue Dec 29 10:16:08 2020 +0000 lang: Update French translation Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 2abcb7ee5f25becda8056c01c1e98faf80c57807 Author: Adolf Belka <ahb.ipfire(a)gmail.com> Date: Sun Dec 27 12:06:27 2020 +0100 bacula: Update to 9.6.7 - Update bacula from 9.6.6 to 9.6.7 This is a minor bug release See https://sourceforge.net/projects/bacula/files/bacula/9.6.7/ReleaseNotes/ - This is the last of the version 9 series. The next update will be the version 11 series. - Update of lfs and rootfiles Signed-off-by: Adolf Belka <ahb.ipfire(a)gmail.com> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 2b4353a436af758876a043b8cbaa5819ebde3c6a Author: Adolf Belka <ahb.ipfire(a)gmail.com> Date: Sun Dec 27 19:59:29 2020 +0100 iperf3: Update to version 3.9 - Update iperf3 from 3.7 to 3.9 - No changes to rootfiles - Update patch file to remove pg flag - Release notes from version 3.8 onwards:- iperf 3.9 2020-08-17 -------------------- * Notable user-visible changes * A --timestamps flag has been added, which prepends a timestamp to each output line. An optional argument to this flag, which is a format specification to strftime(3), allows for custom timestamp formats (#909, #1028). * A --server-bitrate-limit flag has been added as a server-side command-line argument. It allows a server to enforce a maximum throughput rate; client connections that specify a higher bitrate or exceed this bitrate during a test will be terminated. The bitrate is expressed in bits per second, with an optional trailing slash and integer count that specifies an averaging interval over which to enforce the limit (#999). * A bug that caused increased CPU usage with the --bidir option has been fixed (#1011). * Notable developer-visible changes * Fixed various minor memory leaks (#1023). iperf 3.8.1 2020-06-10 ---------------------- * Notable user-visible changes * A regression with "make install", where the libiperf shared library files were not getting installed, has been fixed (#1013 / #1014). iperf 3.8 2020-06-08 -------------------- * Notable user-visible changes * Profiled libraries and binaries are no longer built by default (#950). * A minimal Dockerfile has been added (#824). * A bug with burst mode and unlimited rate has been fixed (#898). * Configuring with the --enable-static-bin flag will now cause a statically-linked iperf3 binary to be built (#989). * Configuring with the --without-sctp flag will now prevent SCTP from being auto-detected (#1008). This flag allows building a static binary (see above item) on a CentOS system with SCTP installed, because no static SCTP libraries are available. * Clock skew between the iperf3 client and server will no longer skew the computation of jitter during UDP tests (#842 / #990). * A possible buffer overflow in the authentication feature has been fixed. This was only relevant when configuration authentication using the libiperf3 API, and did not affect command-line usage. Various other improvements and fixes in this area were also made (#996). * Notable developer-visible changes * The embedded version of cJSON has been updated to 1.7.13 (#978). * Some server authentication functions have been added to the API (#911). * API access has been added to the connection timeout parameter (#1001). * Tests for some authentication functions have been added. * Various compiler errors and warnings have been fixed. Signed-off-by: Adolf Belka <ahb.ipfire(a)gmail.com> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 382f92fa5b9f2064ccfd204c5fa7aa3b9a4b69a3 Author: Adolf Belka <ahb.ipfire(a)gmail.com> Date: Sun Dec 27 19:51:45 2020 +0100 iperf: Update to 2.0.14a - Update from version 2.0.13 to 2.0.14a - No change in rootfiles - Release notes for change:- o scaling improvements for -P, i.e. improved support for large numbers of traffic threads o major code refactoring (see doc/DESIGN_NOTES) for maintainability, extensibilty, performance, scaling, memory usage o support for full duplex traffic using --full-duplex o support for reverse traffic using --reverse o support for role-reversal character of asterisk in the transfer id o transfer id now an incrementing integer and no longer the socket id o support for TCP connect only tests with --connect-only o isochronous support compiled in by default, must use config to disable o support --isochronous for both UDP or TCP traffic to simulate video streams o use of clock_nanosleep when supported to schedule isochronous burst starts, otherwise use nanosleep delay o support for --trip-times indicating the client and server clocks are synchronized to an accuracy sufficient, note: consider the use of precision time protocol as well as ask your data center to provide access to a GPS disciplined reference time source o support for --trip-times with -d and -r bidirectional tests o output TCP connect times (3WHS) in connect reports o support for application level tcp connect retries via --connect-retries n o rate-limited options of -b and --fq-rate supported for unidirectional, full duplex and reverse traffic o reporter thread designed to automatically cause packet reports to aggregate - mitigating and hopefully removing thread thrashing o support for frame or burst based reporting or sampling vs time based via -i [f|F] (experimental) o support for UDP traffic only from client to server with --no-udp-fin o support for write to read latencies (UDP and TCP) with --trip-times o support for sum only outputs with --sum-only o support for little's law calculations in --trip-time outputs o support for --txstart-time <epoch-time> to schedule client traffic start, timestamp support microseconds, e.g. unix $(expr $(date +%s) + 1).$(date +%N) o support for --txdelay-time to insert delay between TCP three way handshake (3WHS) and data transfer o support for --no-connect-sync which disables transmit traffic start synchronization when -P is used, defaults to synchronized o option of --full-duplex implementation uses a barrier on the client side to synchronize full duplex traffic o no limits to group sum reports, i.e. all clients will get its own sum report per a server o improved report timestamps, e.g. end to end or client and server based timestamps with --trip-times o improved settings messaging o improved messaging for --tcp-congestion or -Z o re-implemented -U for single UDP server with minimal threading interactions o re-implemented -1 or --singleclient where server will serialize traffic runs o warning message if the test were likely CPU bound instead of network i/o bound o fix the case when -P <value> is set on the server such that summing output is displayed o multicast listener will autoset -U (single server), e.g -P > 1 not supported for multicast o multicast listener no longer busy drops multicast packets during traffic test, i.e. only server thread receives them o immediate bail out on mutually exclusive command line options o fix -o or --output using freopen to redirect stdout and stderr to a file o man page updates with examples o tested with 1000's of traffic streams, WiFi, 10G and 100G Signed-off-by: Adolf Belka <ahb.ipfire(a)gmail.com> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 3a4d52603d6af0c239da3a3ab18c7ed3055cbfa1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Dec 27 10:58:37 2020 +0000 core154: Ship new procps Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 50992c73210f05384a976dbe21843c37734b4a3f Author: Adolf Belka <ahb.ipfire(a)gmail.com> Date: Sat Dec 26 17:40:32 2020 +0100 procps: Update to 3.3.16 - update from 3.2.8 to 3.3.16 This is also an update from procps to procps-ng The previous version was no longer being maintained. - Added autogen.sh into lfs as ity is needed to create the config script. - Added libdir=/lib line into configure command as default is /usr/lib - Added mv commands for kill, ps & sysctl to place them into the same locations as the previous version of procps - Moved lfsmake2 procps line to after pkg-config in make.sh The autogen line requires autoconf, libtool, gettext and pkg-config to be available so procps moved to after them. - procps-3.2.8-fix_unknown_HZ_value.patch no longer required with new version so removed. - rootfile updated. - libprocps library being maintained by the same people now maitaining this version of procps. - information on the releases from 3.3.13 to 3.3.16 available on https://gitlab.com/procps-ng/procps/-/releases Signed-off-by: Adolf Belka <ahb.ipfire(a)gmail.com> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 986a116beb92399d9574e1552e0e2a0d6fc614f3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Dec 27 10:37:59 2020 +0000 meson: Update MD5 checksum Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit e1616eb4509bda0f4c892f992c3324980c796ebb Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat Dec 26 18:09:24 2020 +0100 make.sh: Limit ninja to compute paralellism value Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 9c51467d05d765fad1788be478b41412192af8d9 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat Dec 26 18:09:23 2020 +0100 ninja: Allow to limit the parallel build processes. When run, ninja normally runs a maximum number of processes in parallel. By default this is the number of cores on the system plus two. In some cases this can overheat a CPU or run a system out of memory. If run from the command line, passing a -jN parameter will limit the number of parallel processes, but some packages embed the execution of ninja and do not pass a -j parameter. Using this optional procedure allows us to limit the number of parallel processes via an environment variable, NINJAJOBS. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 814a33ff4d5032e641c673973c66f31c8ebe77eb Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat Dec 26 17:48:00 2020 +0100 make.sh: Build ninja and meson. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 630e8601f839c2a0e93900000c10363057b2fe7d Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat Dec 26 17:47:59 2020 +0100 meson: New package. More and more packages uses meson as build environment instead of autotools or cmake. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit f8c5644dc5facad5a1b3a0265ff4ff3bf9f6fe49 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat Dec 26 17:47:58 2020 +0100 ninja: New package This tool required to build more and more packages. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 73a92c604cf27df8b31c3ae15f0d6981e88b504d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Dec 24 12:01:12 2020 +0000 Run "./make.sh lang" Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 642316370f9cfa65175ae1cbed462a3b6c59622c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Dec 24 12:00:39 2020 +0000 core154: Ship pakfire.cgi Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 6666b93d11b3add035baaf5a41a1ef16f4da9e19 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Thu Dec 24 01:09:04 2020 +0100 Update (and cosmetic fixes) for 'pakfire.cgi': Added GUI entry for existing, but unused translation string While preparing the Core153 update, I found by chance that a language string had been added from Core152 to Core153 which I couldn't find in any CGI-file. The translation suggested that this string ('Available Updates') could belong to 'pakfire.cgi'. And I thought that on the pakfire GUI something was actually missing: the heading above the box listing the 'Available Updates'. Don't know why I didn't saw this before. So tried to add these missing heading. I hope I made it right... Some cosmetic fixes: I also added some space around the text for 'Available Addons' and 'Installed Addons' because the text lines weren't separated. There is no seen wordwrapping. This required deleting some unwanted '<br />' in the affected translation strings. I tried this about 4 years ago, but somehow this patch got lost. Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 0b1d45849f9df9ac145359a02cd383c7baff6c5b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Dec 24 11:59:46 2020 +0000 core154: Ship country.cgi Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit f65629dd479a2846e9e4b1af910bf879d133e186 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Thu Dec 24 11:56:13 2020 +0100 country.cgi: Cosmetic fix for 'Back'-button' While testing Peter's patch for Bug #12560 I noticed that the standard 'back'-button at the end of the page - like in 'ipinfo.cgi' - was implemented as a text string. I just took the code segment with the 'back'-*image* from 'ipinfo.cgi' to make this link looking similar to the other pages. Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 4ed49291c2eb23e7043721ed55f07c0135440dcb Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Thu Dec 24 09:19:15 2020 +0100 country.cgi: fix location function call Fixes: #12560 Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit d96d979e2a0bb199b5ae7bec75964f4091996268 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Thu Dec 24 00:06:55 2020 +0100 dhcpcd: Update to 9.3.4 For details see: https://roy.marples.name/archives/dhcpcd-discuss/0003334.html This version contains the official fix from here: https://roy.marples.name/cgit/dhcpcd.git/commit/?id=12cdb2be46e25e1ab99df18… This should fix Bug #12552 (dhcpcd-9.3.4 crash with bad system call) on 32bit/i686 systems. Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 631b7056acfd21f03b21f446eb6b26e5bd86f699 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Thu Dec 24 01:15:19 2020 +0100 htop: Update to 3.0.4 For details see: https://github.com/htop-dev/htop/blob/master/ChangeLog Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 03bebd2303f560626ed2e465967a6b7846f21644 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Dec 23 14:36:04 2020 +0000 core154: Ship libloc Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit f31c8d2adec2f629aedcd7c3db5d15a6bdf42e94 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Wed Dec 23 15:03:32 2020 +0100 libloc: update to 0.9.5 and backport fix for #12554 This patch updates libloc to 0.9.5, deletes the upstream patchset from version 0.9.4, and includes a latest upstream patch to backport a fix for #12554. Cc: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 5189d54a2f3eb30feea999beb42e753b592c0671 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Dec 23 14:32:30 2020 +0000 core154: Ship remote.cgi Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 05f68686a0c4259ad2fcb96e2ea3d2fa71e40a77 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Tue Dec 22 17:01:25 2020 +0100 remote.cgi: cosmetic changes - Swap colour generation to improve readability in case of no active SSH logins - Unify table layout - Improve German "SSH host key" translation to avoid Deppenleerzeichen This patch does not introduce functional changes. Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 79feb120a0827f47df14e6fbb6b32970bc36d04a Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Tue Dec 22 12:31:09 2020 +0100 Postfix: update to 3.5.8 Please refer to http://www.postfix.org/announcements/postfix-3.5.8.html for the release announcement of this version. The second version of this patch should correctly apply against next, while the first did not due to human error and/or lack of coffee. :-/ Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit e9fbd9293a8732e8be47eed8d5da85e4a257c897 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Mon Dec 21 22:25:34 2020 +0100 texinfo: update to 6.7 Full changelog as retrieved from https://git.savannah.gnu.org/cgit/texinfo.git/plain/NEWS: 6.7 (23 September 2019) * Language: . support of index subentries and sub-subentries with @subentry . new commands @seeentry and @seealso in index entries . no need to wrap Top node in @ifnottex - omitted automatically when processed with TeX . UTF-8 is the default input encoding * texi2any . for HTML output, mark index nodes in menus and tables of contents with the 'rel' attribute of the 'a' tag. . TOP_NODE_UP is now only used in HTML if TOP_NODE_UP_URL is set. Also TOP_NODE_UP should now be formatted in the output format. In HTML TOP_NODE_UP should be suitable for inclusion in HTML element attributes, so for instance should not contain elements. . support of noderename.cnf files has been removed . INPUT_PERL_ENCODING, INPUT_ENCODING_NAME, NODE_FILE_EXTENSION, NODE_FILENAMES, SHORTEXTN and TOP_NODE_FILE removed as customization variables. . TOP_NODE_FILE_TARGET now contains the extension. . error messages translated when the XS parser module is in use * texi2dvi . unconditionally run in --batch mode, i.e. without stopping if there is a TeX error . keep on going after a TeX error if the index files changed . with --tidy (or --build-dir), avoid reading index files from previous runs where --tidy was not used * info . for a tree search (with M-/), '}' and '{' work as well as 'M-}' and 'M-{' to go through the results * Distribution: . Several obsolete portability checks removed . gettext 0.20.1, automake 1.16.1 No rootfile changes were necessary. Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 6f56c219deda7feb97220dccd525187c0e7151ba Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Mon Dec 21 20:02:10 2020 +0100 ccache: update to 3.7.12 Please refer to https://ccache.dev/news.html#2020-10-01 for a list of all release notes since version 3.4.1, it is unfortunately way too long to be added here. :-] Since ccache is not part of the distribution itself, no rootfile updates were necessary. Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 9f87208cd77722c2588822b6a7df028e10fc4a39 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Dec 21 21:33:36 2020 +0000 core154: Ship sshctrl Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit fe0984e07bb48922acae5a4993503455df9dec0d Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Mon Dec 21 21:55:43 2020 +0100 sshctrl: when enable or disable AllowTcpForwarding, change PermitOpen accordingly Fixes: #12546 Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 7d8a116a41354743de76e989d67fd79f7de8abfe Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Dec 21 21:30:05 2020 +0000 core154: Ship ca-certificates Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 96adf682bcb7640a9ef8e5caab9f93a887bd0271 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Mon Dec 21 21:59:04 2020 +0100 update ca-certificates CA bundle Update the CA certificates list to what Mozilla NSS ships currently. The original file can be retrieved from: https://hg.mozilla.org/mozilla-central/raw-file/tip/security/nss/lib/ckfw/b… Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 4af97be3029bfd4e857d1c5a7d764528e7fbdd5e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Dec 21 16:48:51 2020 +0000 core154: Ship dhcp.cgi Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 9dbf3c4936395bebc5db124382209b8cd3fcb241 Author: Adolf Belka <ahb.ipfire(a)gmail.com> Date: Wed Dec 16 13:33:22 2020 +0100 Fix for bug 10743 This adds in the option to have "deny known clients" in dhcpd.conf This is applied to the range command so applies to the dynamic addresses given. If you have just a range statement say in blue then if you are not using vlans you could have the situation where a known host in green might end up getting a lease from the blue range. Here a deny known-clients makes sense. Your range in this case would be limited to only unknown clients if deny known-clients was selected. dhcp WUI has been modified to add in this command. Error message has been added to check that a range has been specified if the deny unknown clients checkbox has been selected. Language files updated with additional items (English, German & Dutch). For more information on the history of this please see the bugzilla entry Signed-off-by: Adolf Belka <ahb.ipfire(a)gmail.com> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit fef289cef78c9041615eda22180b56294b6354e2 Author: Adolf Belka <ahb.ipfire(a)gmail.com> Date: Mon Dec 21 12:23:57 2020 +0100 dehydrated: Update to 0.7.0 - Update dehydrated from 0.6.5 to 0.7.0 - No changes to the rootfiles - This update patch also addresses bug #12425 The changes from the interim patch mentioned in bug #12425 are included into this update - Changes for all releases can be found at https://github.com/dehydrated-io/dehydrated/releases - Changes for this version update Added Support for external account bindings Special support for ZeroSSL Support presets for some CAs instead of requiring URLs Allow requesting preferred chain (--preferred-chain) Added method to show CAs current terms of service (--display-terms) Allow setting path to domains.txt using cli arguments (--domains-txt) Added new cli command --cleanupdelete which deletes old files instead of archiving them Fixed No more silent failures on broken hook-scripts Better error-handling with KEEP_GOING enabled Check actual order status instead of assuming it's valid Don't include keyAuthorization in challenge validation (RFC compliance) Changed Using EC secp384r1 as default certificate type Use JSON.sh to parse JSON Use account URL instead of account ID (RFC compliance) Dehydrated now has a new home: https://github.com/dehydrated-io/dehydrated Added OCSP_FETCH and OCSP_DAYS to per-certificate configurable options Cleanup now also removes dangling symlinks Signed-off-by: Adolf Belka <ahb.ipfire(a)gmail.com> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 9cea690a93be0373a01163caf2848e5e526813ae Author: Adolf Belka <ahb.ipfire(a)gmail.com> Date: Sun Dec 20 19:47:58 2020 +0100 htop: Update to 3.0.3 - Update htop from 3.0.2 to 3.0.3 See the Change Log for details of changes https://github.com/htop-dev/htop/blob/master/ChangeLog - Rootfiles updated Signed-off-by: Adolf Belka <ahb.ipfire(a)gmail.com> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 9ee802c508e56415f9150a450affb649b7951cdf Author: Adolf Belka <ahb.ipfire(a)gmail.com> Date: Fri Dec 18 22:07:16 2020 +0100 hplip: Update to 3.20.11 - Update from 3.18.6 to 3.20.11 (16 updates) - See Release notes for bug fixes and support for additional printers https://sourceforge.net/p/hplip/news/ - Update of rootfile :-) Signed-off-by: Adolf Belka <ahb.ipfire(a)gmail.com> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 34081d2f239df9481da9f614dcdbf582f4f44a01 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Fri Dec 18 18:54:31 2020 +0100 bind: Update to 9.11.26 For details see: https://downloads.isc.org/isc/bind9/9.11.26/RELEASE-NOTES-bind-9.11.26.html Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 60aab42a632b36d01e9fa1c85a910462dd0e1273 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Dec 20 09:46:16 2020 +0000 Revert "htop: Update to 3.0.3" This reverts commit ce26b2a364fbf884e2d715349fb6a8d329f99633. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 8e3c15e687fa892c8ca167c3242ff1f51747ada7 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Dec 18 16:49:11 2020 +0000 Revert "dhcpcd: Update to 9.3.4" This reverts commit 64dfe751428c2cac0c1d700fb71054166973e567. This version does not run in i686 as reported in #12552. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit f6ede20a629fc1b56bf4910729819ff4c7716f23 Author: Adolf Belka <ahb.ipfire(a)gmail.com> Date: Fri Dec 18 17:35:41 2020 +0100 acpid: Update to 2.0.32 - Update acpid from 2.0.28 to 2.0.32 - Full changelog is available in the source file. 2.0.29 2018-04-16 Ted Felix <ted(a)tedfelix.com> - 2.0.29 release (configure.ac) (Ted Felix) - Decouple -d and -f options. Bug #15. (acpid.8 acpid.c acpid.h log.c log.h TESTPLAN) (Casper Ti. Vector) - Rename acpid_debug -> debug_level. (acpid.c event.c log.c log.h) (Ted Felix) - Standards: man page command references. (acpid.8 kacpimon/kacpimon.8) (Ted Felix) - Log missing input layer as a warning. (inotify_handler.c) (Ted Felix) 2.0.30 2018-07-18 Ted Felix <ted(a)tedfelix.com> - 2.0.30 release (configure.ac) (Ted Felix) - configure: Don't use AC_FUNC_MALLOC, AC_FUNC_REALLOC. (configure.ac) (Robin Gloster <mail(a)glob.in>) - samples: powerbtn: extend the list of known PMS (powerbtn.sh) (Andrey Utkin <andrey_utkin(a)gentoo.org>) - samples: powerbtn: fix kde4 power management detection (powerbtn.sh) (Andrey Utkin <andrey_utkin(a)gentoo.org>) 2.0.31 2018-11-15 Ted Felix <ted(a)tedfelix.com> - 2.0.31 release (configure.ac) (Ted Felix) - Add events for keyboard illumination up/down (input_layer.c) (Lars-Dominik Braun) - kacpimon: Bump connection limit to 100 Debian #909399 (kacpimon/connection_list.c) (Ted Felix) 2.0.32 2019-08-15 Ted Felix <ted(a)tedfelix.com> - 2.0.32 release (configure.ac) (Ted Felix) - Remove filename argument from --nosocket option Bug #17 (acpid.c acpid.8) (Ted Felix) - Fix race during startup Bug #18. Debian #933230. (acpid.c input_layer.c) (anomie) - No change to rootfile Signed-off-by: Adolf Belka <ahb.ipfire(a)gmail.com> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 471407756443b33d82e6d52559399c995aa624fa Author: Adolf Belka <ahb.ipfire(a)gmail.com> Date: Thu Dec 17 21:01:59 2020 +0100 bird: Update to 2.0.7 Update bird from 2.0.6 to 2.0.7 Changes from changelog - BGP: Fix reconfiguration with import table *Change of some options requires route refresh, but when import table is active, channel reload is done from it instead of doing full route refresh. So in this case we request it internally. - Doc: Minor documentation fixes - Nest: Handle non-MPLS on MPLS case in recursive route update *When non-MPLS recursive route resolves to MPLS underlying route, then it should get MPLS labels from the the underlying route. - Nest: Handle PtP links in recursive route update *Underlying (IGP) route may lead to PtP link, in this case it does not need gateway. Which is different than direct route without gateway. *When recursive (BGP) route uses PtP route, it should not use recursive next hop as immediate next hop, while for direct routes it should. - Nest: Fix recursive route update *Missing cleanup can lead to dangling pointer to old next hops. Signed-off-by: Adolf Belka <ahb.ipfire(a)gmail.com> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit ce26b2a364fbf884e2d715349fb6a8d329f99633 Author: Adolf Belka <ahb.ipfire(a)gmail.com> Date: Thu Dec 17 17:13:28 2020 +0100 htop: Update to 3.0.3 Update htop from 3.0.2 to 3.0.3 See the Change Log for details of changes https://github[.]com/htop-dev/htop/blob/master/ChangeLog Signed-off-by: Adolf Belka <ahb.ipfire(a)gmail.com> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit d7f3843d67b2e913effa57ce19e50e85dbbfeeee Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Dec 18 09:45:32 2020 +0000 core154: Ship sqlite Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 58303fb9f0e7a02ebf1a5f15cef5387f1945e3e0 Author: Adolf Belka <ahb.ipfire(a)gmail.com> Date: Wed Dec 16 19:28:05 2020 +0100 sqlite: Update to 3.34.0 -Update sqlite from 3.26.0 to 3.34.0 See https://sqlite[.]org/chronology[.]html for history between these releases. -Have reviewed all release notes between these two releases and there are no deprecations. -No change to rootfile. Signed-off-by: Adolf Belka <ahb.ipfire(a)gmail.com> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 7e09bcbc45695026592ac4169f9aa18bb8fb811e Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Dec 16 16:22:02 2020 +0100 dracut: add hyperv-keyboard module to initrd. the missing module should be the reason for not responding setup on some hyper-v configurations. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit e6575e1a58cce7aeef56b142560890a384eecd2d Merge: b954ae275 c4f1f5615 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Dec 16 10:33:36 2020 +0000 Merge branch 'master' into next commit b954ae2750e4d36323cc497563fa7c12420df5e4 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Dec 14 09:35:37 2020 +0000 core154: Ship libhtp Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit ea7a9a4b2fccaa7320702588cd31c919d08f1160 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sat Dec 12 10:18:30 2020 +0100 libhtp: Update to 0.5.36 For details see: https://github.com/OISF/libhtp/releases Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit a410004c610f8b21f9372056523a419085dbb3b7 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Dec 10 13:18:26 2020 +0000 shairport-sync: Update to 3.3.7 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit c84046215309c2c5dec62f4a87fd86d9e5bf8fb0 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Dec 10 13:04:38 2020 +0000 core154: Ship PAM Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 904b8b625966c05324e39e5e2d9081555978f92e Author: ummeegge <erik.kapfer(a)ipfire.org> Date: Sun Dec 6 10:08:59 2020 +0000 Pam: Update to version 1.5.1 Several fixes and improvements since the current available 1.3.1 version are included. CVE-2020-27780 has also been fixed. For a full release overview --> https://github.com/linux-pam/linux-pam/releases . Signed-off-by: ummeegge <erik.kapfer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit babe22939080474f8285eea24d2abc7ce1b1addc Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Dec 10 13:02:43 2020 +0000 core154: Ship unbound Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 5fd8c3e1f5e3a470f283485e562a9a41242265bd Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sun Dec 6 10:43:54 2020 +0100 unbound: Update to 1.13.0 For details see: https://lists.nlnetlabs.nl/pipermail/unbound-users/2020-December/007102.html Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit ebbda8ed863ac1eb29c549c015a363dea83fa580 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Dec 10 13:01:45 2020 +0000 core154: Ship dhcpcd Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 64dfe751428c2cac0c1d700fb71054166973e567 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sun Dec 6 10:39:05 2020 +0100 dhcpcd: Update to 9.3.4 For details see: https://roy.marples.name/blog/dhcpcd-9-3-4-released.html Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 8d3135455f05de92c6b1f22a4b8b2020903f80a6 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Dec 10 13:00:51 2020 +0000 core154: Ship bind Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit fde5772fde4f47b923493c558280a70716bd6116 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sun Dec 6 10:34:07 2020 +0100 bind: Update to 9.11.25 For details see: https://downloads.isc.org/isc/bind9/9.11.25/RELEASE-NOTES-bind-9.11.25.html Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit d7f93218b154f30a3b603956ebfa0d41aa48fa15 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Dec 10 13:00:06 2020 +0000 core154: Ship services.cgi Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit d978558809285afcee56b2120b10d9107b1b260b Author: Adolf Belka <ahb.ipfire(a)gmail.com> Date: Mon Dec 7 15:01:36 2020 +0100 Fix for bug 12539 The installer recognises cups and cups-filters both as cups and puts two instances of cups in the add-on services table. Based on input from Michael Tremer this patch replaces the command returning the second element between hyphens with one that takes what comes after "meta-" using Perl code rather than a shell command. The second find command was changed as per Michael's suggestion. Tested in my ipfire test bed system and only results in one cups entry. Signed-off-by: Adolf Belka <ahb.ipfire(a)gmail.com> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 50752f1b61997b60e7850d41d5c633a688ab1353 Author: ummeegge <erik.kapfer(a)ipfire.org> Date: Mon Dec 7 14:23:05 2020 +0000 kerberos: Update to version 1.18.3 Since version 1.15.2 several fixes and enhancements has been introduced. For a full overview the release notes can be found in the next lines. https://web.mit.edu/kerberos/krb5-1.16/ https://web.mit.edu/kerberos/krb5-1.17/ https://web.mit.edu/kerberos/krb5-1.18/ Signed-off-by: ummeegge <erik.kapfer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 14baf8472a74b18ff1779a9caf534a8af91e0134 Author: ummeegge <erik.kapfer(a)ipfire.org> Date: Sun Dec 6 15:03:45 2020 +0000 tshark: Update to version 3.4.0 - Since tshark uses since 3.4.0 an always enabled asynchronous DNS resolution, c-ares is a needed dependency. - Since the current actual version 3.2.6 a lot of bug fixes, fixed vulnerabilities, updated features, new protocols but also updated protocols has been integrated. A full overview of all changes can be found in here --> Update to version 3.2.7: https://www.wireshark.org/docs/relnotes/wireshark-3.2.7.html Update to version 3.2.8: https://www.wireshark.org/docs/relnotes/wireshark-3.2.8.html Update to version 3.4.0 https://www.wireshark.org/docs/relnotes/wireshark-3.4.0.html Signed-off-by: ummeegge <erik.kapfer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit d44ce7d4c25e9a1d0a8a358c0f16a17d1d417cf1 Author: ummeegge <erik.kapfer(a)ipfire.org> Date: Sun Dec 6 15:03:44 2020 +0000 c-ares: New package. Needed as tshark Dependency - Since tshark uses with version 3.4.0 an always enabled asynchronous DNS resolution c-ares is a needed dependency. - Since curl can also use c-ares --> https://c-ares.haxx.se/ it has been placed in make.sh before curl even no compiletime options has been set to enable this. c-ares has also been placed in packages and not in common which would be needed if it should be used for curl too. Signed-off-by: ummeegge <erik.kapfer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit ca4ce968000125f237da77da6bcf88738ec6b060 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sun Dec 6 10:46:36 2020 +0100 nano: Update to 5.4 For details see: https://www.nano-editor.org/news.php Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 0f4d1a8e6b37a4ac1b9cb64bc34f9d4b31423099 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sun Dec 6 00:26:21 2020 +0100 monit: Update to 5.27.1 For details see: https://mmonit.com/monit/changes/ Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit c2f02d9d5977d7ead634760bc8987bafbfc62370 Author: Adolf Belka <ahb.ipfire(a)gmail.com> Date: Sat Dec 5 15:51:11 2020 +0100 bacula: Update to use IPFire initscript Bacula install used the bacula initscript for starting and stopping bacula. This works fine but results in no pid or memory input in the addons table under services. Using the IPFire initscript also successfully starts and stops bacula with no problems but also provides the pid and memory information in the services addons table. - rootfiles adjusted to remove the reference to bacula-ctl-fd - lfs/bacula adjusted to remove the init.d/bacula link generation remove the "rm -f /root/.rnd" command. This file is not present and I have not seen this command in any other lfs file that I have looked at. - new bacula initscript created Signed-off-by: Adolf Belka <ahb.ipfire(a)gmail.com> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 86a7c165a1a3afdf21734aad5291403440d04d08 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Dec 10 12:28:12 2020 +0000 Start Core Update 154 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0