[git.ipfire.org] IPFire 2.x development tree branch, next, updated. a702353e262542fd5becc930e42b2a47caca2a00
by Michael Tremer 14 Jul '22
by Michael Tremer 14 Jul '22
14 Jul '22
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 a702353e262542fd5becc930e42b2a47caca2a00 (commit)
via b7f887e3b112d5a871886d942645f11c59465753 (commit)
via e3d8db51fbf721698aa3cb767fbc134b12b0592d (commit)
via ce8610479e024c2c81a4b4893b7dbc792a32252c (commit)
from 979a8b3df745e74173a777ef361bf8f3abfcbad0 (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 a702353e262542fd5becc930e42b2a47caca2a00
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Jul 14 09:44:42 2022 +0000
c170: Ship suricata
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit b7f887e3b112d5a871886d942645f11c59465753
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Wed Jul 13 23:03:50 2022 +0200
suricata: Update to 5.0.10
Changelog:
"5.0.10 -- 2022-07-12
Bug #5429: TCP flow that retransmits the SYN with a newer TSval not properly tracked (5.0.x backport)
[Note: Therefore 'suricata-5.0-stream-tcp-Handle-retransmitted-SYN-with-TSval.patch' could be removed]
Bug #5424: inspection of smb traffic without smb/dcerpc doesn't work correct. (5.0.x backport)
Bug #5423: DCERPC protocol detection when nested in SMB (5.0.x backport)
Bug #5404: detect: will still inspect packets of a "dropped" flow for non-TCP (5.0.x backport)
Bug #5388: detect/threshold: offline time handling issue (5.0.x backports)
Bug #5358: test failure on Ubuntu 22.04 with GCC 12 (5.0.x backport)
Bug #5354: detect/alert: fix segvfault when incrementing discarded alerts if alert-queue-expand fails (5.0.x backport)
Bug #5345: CIDR prefix calculation fails on big endian archs (5.0.x backport)
Bug #5343: ftp: quadratic complexity for tx iterator with linked list (5.0.x backport)
Bug #5341: decode/mime: base64 decoding for data with spaces is broken (5.0.x backport)
Bug #5339: PreProcessCommands does not handle all the edge cases (5.0.x backport)
Bug #5325: FTP: expectation created in wrong direction (5.0.x backport)
Bug #5305: cppcheck: various static analyzer "warning"s
Bug #5302: Failed assert DeStateSearchState
Bug #5301: eve: payload field randomly missing even if the packet field is present
Bug #5289: Remove unneeded stack-on-signal initialization.
Bug #5283: 5.0.x: ftp: don't let first incomplete segment be over maximum length
Bug #5124: alerts: 5.0.8/6.0.4 count noalert sigs towards built-in alert limit (5.0.x backport)
Bug #5113: Off-by-one in flow-manager flow_hash row allocation
Bug #5055: Documentation copyright years are invalid
Bug #5021: dataset: error with space in rule language
Bug #4926: Rule error in SMB dce_iface and dce_opnum keywords (5.0.x backport)
Bug #4646: TCP reassembly, failed assert app_progress > last_ack_abs, both sides need to be pruned
Optimization #5123: alerts: use alert queing in DetectEngineThreadCtx (5.0.x backport)
Optimization #5121: Use configurable or more dynamic @ PACKET_ALERT_MAX@ (5.0.x backport)
Task #5322: stats/alert: log out to stats alerts that have been discarded from packet queue (5.0.x backport)"
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Reviewed-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Reviewed-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit e3d8db51fbf721698aa3cb767fbc134b12b0592d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Jul 14 09:42:11 2022 +0000
c170: Update collectd.conf
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit ce8610479e024c2c81a4b4893b7dbc792a32252c
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Wed Jul 13 20:05:16 2022 +0000
collectd: Do not keep track of entropy any more
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/collectd/collectd.conf | 1 -
.../{oldcore/131 => core/170}/filelists/suricata | 0
config/rootfiles/core/170/update.sh | 6 +++
lfs/suricata | 5 +-
...m-tcp-Handle-retransmitted-SYN-with-TSval.patch | 55 ----------------------
5 files changed, 8 insertions(+), 59 deletions(-)
copy config/rootfiles/{oldcore/131 => core/170}/filelists/suricata (100%)
delete mode 100644 src/patches/suricata/suricata-5.0-stream-tcp-Handle-retransmitted-SYN-with-TSval.patch
Difference in files:
diff --git a/config/collectd/collectd.conf b/config/collectd/collectd.conf
index e34a97da1..4ef34ea07 100644
--- a/config/collectd/collectd.conf
+++ b/config/collectd/collectd.conf
@@ -16,7 +16,6 @@ LoadPlugin conntrack
LoadPlugin cpu
#LoadPlugin cpufreq
LoadPlugin disk
-LoadPlugin entropy
LoadPlugin interface
LoadPlugin iptables
LoadPlugin load
diff --git a/config/rootfiles/core/170/filelists/suricata b/config/rootfiles/core/170/filelists/suricata
new file mode 120000
index 000000000..f671f6993
--- /dev/null
+++ b/config/rootfiles/core/170/filelists/suricata
@@ -0,0 +1 @@
+../../../common/suricata
\ No newline at end of file
diff --git a/config/rootfiles/core/170/update.sh b/config/rootfiles/core/170/update.sh
index 7dde03060..aaa42cbb4 100644
--- a/config/rootfiles/core/170/update.sh
+++ b/config/rootfiles/core/170/update.sh
@@ -107,8 +107,14 @@ chown nobody:nobody /var/lib/ipblocklist
# Rebuild fcrontab from scratch
/usr/bin/fcrontab -z
+# Update collectd.conf
+sed -i /etc/collectd.conf \
+ -e "/LoadPlugin entropy/d"
+/etc/init.d/collectd restart
+
# Start services
/etc/init.d/rc.d/unbound start
+/etc/init.d/rc.d/suricata restart
# This update needs a reboot...
touch /var/run/need_reboot
diff --git a/lfs/suricata b/lfs/suricata
index 1ebcb4ba4..1fbc2c185 100644
--- a/lfs/suricata
+++ b/lfs/suricata
@@ -24,7 +24,7 @@
include Config
-VER = 5.0.9
+VER = 5.0.10
THISAPP = suricata-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 02ab99585233a47b1577e55060ba1141c339718e5bd39b6f4d38bb9384fd459aae353f313083048128507f9023a8bcfea3e5a5bcc9ea0c75cfc9c288ca9db6b6
+$(DL_FILE)_BLAKE2 = b5c83b9882e89894c3dedb7f536d584a20bbeab24236752e528171db6589a6308422c8b0be4f433fc63b8cfc227aa0b67935a4aece943b10f4577398ea9ed467
install : $(TARGET)
@@ -70,7 +70,6 @@ $(subst %,%_BLAKE2,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/suricata/suricata-5.0-stream-tcp-Handle-retransmitted-SYN-with-TSval.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/suricata/suricata-disable-sid-2210059.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/suricata/suricata-5.0.8-fix-level1-cache-line-size-detection.patch
cd $(DIR_APP) && LDFLAGS="$(LDFLAGS)" ./configure \
diff --git a/src/patches/suricata/suricata-5.0-stream-tcp-Handle-retransmitted-SYN-with-TSval.patch b/src/patches/suricata/suricata-5.0-stream-tcp-Handle-retransmitted-SYN-with-TSval.patch
deleted file mode 100644
index 6bc745a0f..000000000
--- a/src/patches/suricata/suricata-5.0-stream-tcp-Handle-retransmitted-SYN-with-TSval.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 511648b3d7a4b5a5b4d55b92dffd63fcb23903a0 Mon Sep 17 00:00:00 2001
-From: Michael Tremer <michael.tremer(a)ipfire.org>
-Date: Fri, 19 Nov 2021 17:17:47 +0000
-Subject: [PATCH] stream: tcp: Handle retransmitted SYN with TSval
-
-For connections that use TCP timestamps for which the first SYN packet
-does not reach the server, any replies to retransmitted SYNs will be
-tropped.
-
-This is happening in StateSynSentValidateTimestamp, where the timestamp
-value in a SYN-ACK packet must match the one from the SYN packet.
-However, since the server never received the first SYN packet, it will
-respond with an updated timestamp from any of the following SYN packets.
-
-The timestamp value inside suricata is not being updated at any time
-which should happen. This patch fixes that problem.
-
-This problem was introduced in 9f0294fadca3dcc18c919424242a41e01f3e8318.
-
-Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
----
- src/stream-tcp.c | 17 +++++++++++++++++
- 1 file changed, 17 insertions(+)
-
-diff --git a/src/stream-tcp.c b/src/stream-tcp.c
-index 1cff19fa5..af681760b 100644
---- a/src/stream-tcp.c
-+++ b/src/stream-tcp.c
-@@ -1641,6 +1641,23 @@ static int StreamTcpPacketStateSynSent(ThreadVars *tv, Packet *p,
- "ssn->client.last_ack %"PRIu32"", ssn,
- ssn->client.isn, ssn->client.next_seq,
- ssn->client.last_ack);
-+ } else if (PKT_IS_TOSERVER(p)) {
-+ /*
-+ * On retransmitted SYN packets, the timestamp value must be updated,
-+ * to avoid dropping any SYN+ACK packets that respond to a retransmitted SYN
-+ * with an updated timestamp in StateSynSentValidateTimestamp.
-+ */
-+ if ((ssn->client.flags & STREAMTCP_STREAM_FLAG_TIMESTAMP) && TCP_HAS_TS(p)) {
-+ uint32_t ts_val = TCP_GET_TSVAL(p);
-+
-+ // Check whether packets have been received in the correct order (only ever update)
-+ if (ssn->client.last_ts < ts_val) {
-+ ssn->client.last_ts = ts_val;
-+ ssn->client.last_pkt_ts = p->ts.tv_sec;
-+ }
-+
-+ SCLogDebug("ssn %p: Retransmitted SYN. Updated timestamp from packet %"PRIu64, ssn, p->pcap_cnt);
-+ }
- }
-
- /** \todo check if it's correct or set event */
---
-2.30.2
-
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, core169, updated. f26f08b464287f91ff6df849b9e77d354e72d4cb
by Michael Tremer 07 Jul '22
by Michael Tremer 07 Jul '22
07 Jul '22
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, core169 has been updated
via f26f08b464287f91ff6df849b9e77d354e72d4cb (commit)
from 8000bc0a4375ee7afdc1d56023681b8ac9502c3d (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 f26f08b464287f91ff6df849b9e77d354e72d4cb
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Thu Jul 7 13:58:05 2022 +0000
Core Update 169: Delete unused initrd on 32-bit ARM to save space in /boot
On 64-bit ARM, this is still needed for booting. Since the initrds were
already shipped with the updater, there is no need to regenerate them
locally again.
https://community.ipfire.org/t/again-with-the-file-system-full-core-169/8186
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/169/update.sh | 7 +++++++
1 file changed, 7 insertions(+)
Difference in files:
diff --git a/config/rootfiles/core/169/update.sh b/config/rootfiles/core/169/update.sh
index 3902e2d45..dc7a2a18a 100644
--- a/config/rootfiles/core/169/update.sh
+++ b/config/rootfiles/core/169/update.sh
@@ -150,6 +150,13 @@ ldconfig
# Apply sysctl changes
/etc/init.d/sysctl start
+# Delete unused initrd on 32-bit ARM to save space in /boot
+case "$(uname -m)" in
+ armv*)
+ rm /boot/initramfs-${KVER}-ipfire.img
+ ;;
+esac
+
# Start services
telinit u
/etc/init.d/firewall restart
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, master, updated. f26f08b464287f91ff6df849b9e77d354e72d4cb
by Michael Tremer 07 Jul '22
by Michael Tremer 07 Jul '22
07 Jul '22
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 f26f08b464287f91ff6df849b9e77d354e72d4cb (commit)
from 8000bc0a4375ee7afdc1d56023681b8ac9502c3d (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 f26f08b464287f91ff6df849b9e77d354e72d4cb
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Thu Jul 7 13:58:05 2022 +0000
Core Update 169: Delete unused initrd on 32-bit ARM to save space in /boot
On 64-bit ARM, this is still needed for booting. Since the initrds were
already shipped with the updater, there is no need to regenerate them
locally again.
https://community.ipfire.org/t/again-with-the-file-system-full-core-169/8186
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/169/update.sh | 7 +++++++
1 file changed, 7 insertions(+)
Difference in files:
diff --git a/config/rootfiles/core/169/update.sh b/config/rootfiles/core/169/update.sh
index 3902e2d45..dc7a2a18a 100644
--- a/config/rootfiles/core/169/update.sh
+++ b/config/rootfiles/core/169/update.sh
@@ -150,6 +150,13 @@ ldconfig
# Apply sysctl changes
/etc/init.d/sysctl start
+# Delete unused initrd on 32-bit ARM to save space in /boot
+case "$(uname -m)" in
+ armv*)
+ rm /boot/initramfs-${KVER}-ipfire.img
+ ;;
+esac
+
# Start services
telinit u
/etc/init.d/firewall restart
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 6f62108b30d3a3c370e6bcc8ab38fc2d69fcf06b
by Michael Tremer 07 Jul '22
by Michael Tremer 07 Jul '22
07 Jul '22
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 3.x development tree".
The branch, master has been updated
via 6f62108b30d3a3c370e6bcc8ab38fc2d69fcf06b (commit)
via a3ae148339ccd646d86ea45b565adc8fd91f1573 (commit)
from 3f48d7a3a344f38e6ed7efb012ec8dd75436722b (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 6f62108b30d3a3c370e6bcc8ab38fc2d69fcf06b
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Wed Jul 6 17:26:37 2022 +0200
gdk-pixbuf2: Build without X11 support.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit a3ae148339ccd646d86ea45b565adc8fd91f1573
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Wed Jul 6 17:27:22 2022 +0200
atk: Drop package.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
atk/atk.nm | 58 ----------------------------------------------
gdk-pixbuf2/gdk-pixbuf2.nm | 5 ++--
2 files changed, 2 insertions(+), 61 deletions(-)
delete mode 100644 atk/atk.nm
Difference in files:
diff --git a/atk/atk.nm b/atk/atk.nm
deleted file mode 100644
index 4b7c16670..000000000
--- a/atk/atk.nm
+++ /dev/null
@@ -1,58 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = atk
-version = %{ver_major}.%{ver_minor}
-ver_major = 2.20
-ver_minor = 0
-release = 2
-
-groups = System/Libraries
-url = http://www.gnome.org
-license = LGPLv2+
-summary = Interfaces for accessibility support.
-
-description
- The ATK library provides a set of interfaces for adding accessibility
- support to applications and graphical user interface toolkits.
-end
-
-source_dl = http://download.gnome.org/sources/%{name}/%{ver_major}/
-sources = %{thisapp}.tar.xz
-
-build
- requires
- glib2-devel >= 2.31.2
- gobject-introspection-devel >= 1.39.3
- end
-
- export LD_LIBRARY_PATH=%{DIR_APP}/atk/.libs
-
- configure_options += \
- --enable-introspection=yes \
- --disable-gtk-doc \
- --disable-gtk-doc-html \
- --disable-gtk-doc-pdf \
- --disable-static
-
- test
- make check
- end
-end
-
-packages
- package %{name}
-
- package %{name}-devel
- template DEVEL
-
- files += \
- %{datadir}/gir*/
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/gdk-pixbuf2/gdk-pixbuf2.nm b/gdk-pixbuf2/gdk-pixbuf2.nm
index 47f6d90ab..7c39db0de 100644
--- a/gdk-pixbuf2/gdk-pixbuf2.nm
+++ b/gdk-pixbuf2/gdk-pixbuf2.nm
@@ -7,7 +7,7 @@ name = gdk-pixbuf2
version = %{ver_major}.%{ver_minor}
ver_major = 2.33
ver_minor = 2
-release = 2
+release = 3
groups = System/Libraries
url = http://www.gtk.org/
@@ -31,13 +31,12 @@ build
libpng-devel
libjpeg-devel
libtiff-devel
- libX11-devel
end
export LD_LIBRARY_PATH = %{DIR_APP}/gdk-pixbuf/.libs
configure_options += \
- --with-x11 \
+ --without-x11 \
--with-included-loaders=png
make_install_targets += RUN_QUERY_LOADER_TEST=false
hooks/post-receive
--
IPFire 3.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5ead33d796b9537bddbc4e2d5d27029de4df001a
by Peter Müller 07 Jul '22
by Peter Müller 07 Jul '22
07 Jul '22
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 5ead33d796b9537bddbc4e2d5d27029de4df001a (commit)
from b317b60a3e27253c6df4b2189cbeba8f603d91f5 (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 5ead33d796b9537bddbc4e2d5d27029de4df001a
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Thu Jul 7 13:52:09 2022 +0000
Core Update 169: Delete unused initrd on 32-bit ARM to save space in /boot
On 64-bit ARM, this is still needed for booting. Since the initrds were
already shipped with the updater, there is no need to regenerate them
locally again.
https://community.ipfire.org/t/again-with-the-file-system-full-core-169/8186
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/oldcore/169/update.sh | 7 +++++++
1 file changed, 7 insertions(+)
Difference in files:
diff --git a/config/rootfiles/oldcore/169/update.sh b/config/rootfiles/oldcore/169/update.sh
index 3902e2d45..dc7a2a18a 100644
--- a/config/rootfiles/oldcore/169/update.sh
+++ b/config/rootfiles/oldcore/169/update.sh
@@ -150,6 +150,13 @@ ldconfig
# Apply sysctl changes
/etc/init.d/sysctl start
+# Delete unused initrd on 32-bit ARM to save space in /boot
+case "$(uname -m)" in
+ armv*)
+ rm /boot/initramfs-${KVER}-ipfire.img
+ ;;
+esac
+
# Start services
telinit u
/etc/init.d/firewall restart
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, next, updated. b317b60a3e27253c6df4b2189cbeba8f603d91f5
by Peter Müller 06 Jul '22
by Peter Müller 06 Jul '22
06 Jul '22
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 b317b60a3e27253c6df4b2189cbeba8f603d91f5 (commit)
via a93d06297947a68e598b1a8478e79714427da247 (commit)
via 20d4c7293a0ee7d0eb229911898a24dd941536a5 (commit)
from 284efdbfb1e9ba9aeba17eb327cdd3f97ba0d1e5 (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 b317b60a3e27253c6df4b2189cbeba8f603d91f5
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Wed Jul 6 19:21:32 2022 +0000
Core Update 170: Ship lsof
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit a93d06297947a68e598b1a8478e79714427da247
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Tue May 10 12:31:40 2022 +0200
lsof: Update to version 4.95.0
- Update from version 4.91 to 4.95.0
- version 4.91 was the last version provided bia purdue.edu after which they stopped
maintaining it. It is now taken over ny the lsof-org team at Github.
https://github.com/lsof-org/lsof
- Update of rootfile not required - only one line in the rootfile
- Changelog
lsof-4.95.0-linux
[n+obsd] fix syntax error
Corrected end of comment.
This change closes #138.
@albert-github reported this issue in #138,
and provided the fix in #140
Don't ignore failures in test/Makefile
Tobias Geerinckx-Rice <me(a)tobias.gr> provides the fix.
Update perl scripts for the past few decades of progress
Generally, perl is available on base systems - people who are manually
installing perl into /usr/local/bin are the exception rather than the
rule. In addition, Perl 5 was release in 1994, so Perl 4 isn't relevant
any more. We've also standardized on the .pl extension, rather than
.perl5 or whatever.
Provided by @dilinger (Andres Salomon) in #149.
A commit in the pull request includes work of Nicholas Bamber.
Drop LSOF_CCDATE across all dialects to ensure reproducible builds
Simplify things for reproducible builds by just getting rid of
the embedded date/time string. With LSOF_CCDATE gone, keeping
SOURCE_DATE_EPOCH around doesn't make much sense, so drop that as
well. Folks doing reproducible builds should still override the
LSOF_HOST, LSOF_LOGNAME, LSOF_SYSINFO, and LSOF_USER variables (as
they were previously doing before SOURCE_DATE_EPOCH).
Provided by @dilinger (Andres Salomon) in #150.
[FreeBSD] get the ISO9660 filesystem working again
The ISO9660 filesystem broke starting with FreeBSD 7 due to the header
location changing. Fix the header search path to get it to be detected
again. Fix the header inclusion order. Also add the new way of finding
dev_t on more recent FreeBSD versions.
Provided by Damjan Jovanovic in #151.
[FreeBSD] add support for msdosfs on FreeBSD
Provided by Damjan Jovanovic in #151.
Fix FD field description.
In 811dc78 the output format was changed to not printf the `f`
field by default, however the field description in `lsof_fields.h`,
as seen in `-F?` output still included the `(always selected)` text.
Provided by @algorythmic (Grisha Levit) in #158.
Adjust alignment of buffer passed to stat().
The original code passes char[] buffer to stat(). This can be cause
a SIGBUS. #160 reported an actual crash on armv7a + glibc-2.33 platform.
See also https://sourceware.org/bugzilla/show_bug.cgi?id=27993.
Reported by @10ne1 in #160.
Clean up source code and documentats.
- remove trailing whitespace,
- fix some issues in scripts found through shellcheck, and
- fix spelling
Provided by @a1346054 in #163.
man page: fix hyphen issues
Properly use '-' and '\-' in the man page, ensuring that users
can cut & paste commandline options without issue. Original
patch from Raoul Gunnar Borenius <borenius(a)dfn.de>, and
submitted/expanded by @dilinger (Andres Salomon) in #168.
[FreeBSD] update for FreeBSD 13 & 14, and various internal changes
submitted by @DmitryAndric & @emaste.
[FreeBSD] remove various old FreeBSD versions from support
submitted by @emaste
[FreeBSD] configure: suggest variable to set if FreeBSD sys not
found
submitted by @emaste
Fix broken LSOF_CFLAGS_OVERRIDE.
Provided by Fabrice Fontaine in #172.
[linux] Remove sysvlegacy function.
Provided by Fabrice Fontaine in #195.
[linux] use close_range instead of calling close repeatedly
At the starting up, lsof closes its file descriptors greater
than 2 by calling close(2) repeatedly. As reported in #186,
it can take long time. Linux 5.9 introduced close_range(2).
The new system call can close multiple file descriptors faster.
@qianzhangyl reported the original issue (#186).
Add -Q option for adjusting exit status when failed to find a
search item (#129)
In the original code, lsof returned 1 when it failed to find a
search item. With the new option, lsof returns 0 in the case.
Document -Q option in manpage/00QUICKSTART, and adjust -h
output by @dilinger (Andres Salomon) in #129.
Improve readability of complex adverbial clause by adding a
comma.
Provided by Danny Fowler in #156.
lsof-4.94.0-linux
(All changes in this version are ported from
lsof-org/lsof-linux repository at GitHub).
Introduced a new test harness. The harness can run
test cases specific to a dialect. It is designed for
running test cases on CI environment like Travis-CI.
However, it is runnable locally with following command
line:
$ ./check.sh DIALECT
after making lsof executable.
[linux] Fixed a bug +|-E options output for pipe.
If two processes use the same fd number for a pipe
connecting them, the option didn't print the
information about it.
[linux] Fixed a bug +|-E options output for PTY.
If two processes use the same fd number for a PTY
connecting them, the option didn't print the
information about it.
[linux] Fixed a bug +|-E options output for PTY.
The code for detecting a slave device was incorrect.
[linux] Fixed a potential bug +|-E options output for
PTY. A structure field for the feature was not
initialized.
[linux] Added a code for decoding O_PATH flag in +fg
option.
[linux] Added a code for decoding O_CLOEXEC flag as CX
in +fg option.
[linux] Added a code for decoding O_TMPFILE flag as
TMPF in +fg option.
[linux] Added Linux display of INET socket endpoint
information with +|-E option. The option handles
INET sockets using IPC.
[linux] Added support for POSIX MQ of Linux
implementation. A POSIX message queue (MQ) is
represented in a fd on Linux. lsof reported it as a
regular file. lsof with this change reports it as a
file with PSXMQ type if mqueue file system is mounted.
[linux] Added Linux display of POSIX message queue
endpoint information with +|-E option. mqueue file system
must be mounted to display the information.
[linux] Added Linux display of INET6 socket endpoint
information with +|-E option. The option handles
INET6 sockets using IPC.
[FreeBSD] update to include <sys/_lock.h> on recent -CURRENT
since it is no longer implicitly included via header pollution.
[linux] Added Linux display of eventfd endpoint information
with +|-E option. The option handles eventfd using IPC.
[FreeBSD] include <stdbool.h> for recent change requiring
refcount(9).
Enhanced -r option. With `c<N>' specifier, lsof can stop itself
when the number of iterations reaches at <N>.
[linux] Fixed accessing an uninitialized local variable.
Detected by valgrind.
[linux] fix a crash when printing the endpoint for unaccepted
unix socket with +E option.
This closes the github issue #74 reported by @jolmg.
[linux] abort execution when failing in memory allocation for
socket private data.
[linux] decode the name of DCCP socket type.
[linux] decode more netlink protocol numbers (RDMA, CRYPTO, and
SMC).
[linux] print the connection state of unix domain socket
Lsof can print the state of TCP socket like:
nc 22247 yamato 3u IPv4 471409 0t0 TCP localhost:38802->localhost:9999 (ESTABLISHED)
This change exnteds this feature to support unix domain sockets.
LISTEN, UNCONNECTED, CONNECTING, CONNECTED, DISCONNECTING,
and UNKNOWN can be taken as a state.
An example of output:
evince 17333 yamato 1u unix 0x0000000054183795 0t0 89141 type=STREAM (CONNECTED)
This feature is enabled by default.
To turn off printing state information, use -T option.
Don't display command usage even when a file (or directory) listed
in command line doesn't exist.
This closes the github issue #90 reported by @rowlap.
[FreeBSD] merge all the FreeBSD specific fixes from the FreeBSD sysutils/lsof port
[linux] allow reproducible builds
In a reproducible build all varied information is removed. This
change does so, by checking if the standard SOURCE_DATE_EPOCH
variable is set. If it is, we are attempting a reproducible build
and will strip varying information.
About the standard, see https://reproducible-builds.org/specs/source-date-epoch/
Provided in github pull request #93 by @T4cC0re.
[freebsd] update for r363214
- no user visible changes
Added the way to include (or exclude) all numbered file descriptors
in -d option. "fd" is a pseudo file descriptor name for the purpose.
See the following output on Linux; lsof doesn't print cwd, rtd, txt,
and mem files.
# ./lsof -p $$ -a -d fd
COMMAND PID USER FD TYPE DEVICE SIZE/OFF NODE NAME
bash 866421 root 0u CHR 136,1 0t0 4 /dev/pts/1
bash 866421 root 1u CHR 136,1 0t0 4 /dev/pts/1
bash 866421 root 2u CHR 136,1 0t0 4 /dev/pts/1
bash 866421 root 255u CHR 136,1 0t0 4 /dev/pts/1
docs: fixed minor grammatical error in instructions in Customize file
The change is provided by @hardikpnsp.
man page: improve phrasing and add examples
The change is provided by Martin D Kealey.
man page: improve explanation of -t implying -w
The change is provided by Martin D Kealey.
test cases, [linux]: fix tests for large inode-numbers (i >= 2^32)
The change is provided by Henry Peteet.
[linux] handle ffff:ffff in ipv6 addr correctly
The listen address and port of an AF_INET6 socket were not display if
the socket listened at an ipv6 address including ffff:ffff.
Here is a command session demonstrating the bug:
# ip -6 addr add abcd:ef10:ffff:ffff:ffff:ffff:ffff:ff62 dev lo
# nc -6 -l abcd:ef10:ffff:ffff:ffff:ffff:ffff:ff62 8888 &
[1] 6762
# ./lsof -p 6762 -a -d fd -P -n
COMMAND PID USER FD TYPE DEVICE SIZE/OFF NODE NAME
nc 6762 yamato 0u CHR 136,6 0t0 9 /dev/pts/6
nc 6762 yamato 1u CHR 136,6 0t0 9 /dev/pts/6
nc 6762 yamato 2u CHR 136,6 0t0 9 /dev/pts/6
nc 6762 yamato 3u sock 0,9 0t0 5833594 protocol: TCPv6
The last line should be:
nc 6762 yamato 3u IPv6 5833594 0t0 TCP [abcd:ef10:ffff:ffff:ffff:ffff:ffff:ff62]:8888 (LISTEN)
The original code decoding an ipv6 address uses UINT32_MAX constant
incorrect way.
@zhrf2020 reported this bug in #102.
@zhrf2020 provided the initial version of fix, #109.
man page,[linux]: enumerate abbreviated flags printed with '+f g' option
Make -Fo option work
-Fo option is for printing file offset. For regular files,
the option didn't work.
Here is a command session demonstrating the fix:
# ./lsof -Fo -o0| grep ^o | sort | uniq -c
90586 o0t0
87 o0t101
84 o0t103
...
@JustAnotherArchivist reported this bug in #118.
man page: fix definition of the `o` field on programmatic output
The change is provided by @JustAnotherArchivist who reported
the original issue in #118.
[linux]: show the pid monitored by a pidfd
With this change, lsof prints pidfd in the following form:
[pidfd:%d]
where %d represents the pid monitored by the pidfd.
Example output:
# ./lsof -p 12573 -p 12710 | grep pidfd
dbus-brok 12573 jet 11u a_inode 0,13 0 13312 [pidfd:12575]
dbus-brok 12710 jet 10u a_inode 0,13 0 13312 [pidfd:12711]
fd 11 of pid 12573 monitors pid 12575.
fd 10 of pid 12710 monitors pid 12711.
This change closed #116.
Don't select the file descriptor field by default.
The version 4.88 introduced the change for selecting the file
descriptor field by default. However, the change is not
suitable for users who wants to print only PID field.
@po5857 suggests the use case and the way to improve the man page.
[linux]: enumerate fds monitored by an eventpoll fd
With this change, lsof prints an eventpoll fd in the following form:
[eventpoll:<fd0>,<fd1>,...,<fdn>...]
Here fdX is a file descriptor monitored by the eventpoll fd.
If an eventpoll fd monitors too many file descriptors, lsof
truncates the list of fds. "..." at the end of list implies
the truncation.
Example output:
# sudo ./lsof -p 1 -a -d 10,11,12
COMMAND PID USER FD TYPE DEVICE SIZE/OFF NODE NAME
systemd 1 root 10u a_inode 0,13 0 11624 [eventpoll:11,12]
systemd 1 root 11r REG 0,4 0 17680 /proc/1/mountinfo
systemd 1 root 12r a_inode 0,13 0 11624 inotify
systemd monitors fd 11 and fd 12 via eventpoll fd 10.
[linux]: implement "make check"
The target runs check.bash.
4.93.2 May 8, 2019
Update the version number embedded in lsof executable.
lsof-4.93.1
4.93.0 May 7, 2019
[freebsd] Made FreeBSD 13 adjustment.
[darwin] Fix a typo causing a build error.
Fix a potential memory leak.
[linux] use tirpc for rpc if libc doesn't provide rpc.h.
Fix a typo in man page.
[linux] fix memory leaks detected by valgrind about unix
endpoint information.
Update the description about -fg and -fG options on linux.
4.93.1 May 7, 2019
Fix a broken symbolic link.
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 20d4c7293a0ee7d0eb229911898a24dd941536a5
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Wed Jul 6 12:37:29 2022 +0000
Run ./make.sh update-contributors
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/170/filelists/lsof | 1 +
html/cgi-bin/credits.cgi | 4 ++--
lfs/lsof | 13 ++++++-------
3 files changed, 9 insertions(+), 9 deletions(-)
create mode 120000 config/rootfiles/core/170/filelists/lsof
Difference in files:
diff --git a/config/rootfiles/core/170/filelists/lsof b/config/rootfiles/core/170/filelists/lsof
new file mode 120000
index 000000000..1353d33e5
--- /dev/null
+++ b/config/rootfiles/core/170/filelists/lsof
@@ -0,0 +1 @@
+../../../common/lsof
\ No newline at end of file
diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi
index 13d0005e3..1eb774b1d 100644
--- a/html/cgi-bin/credits.cgi
+++ b/html/cgi-bin/credits.cgi
@@ -88,18 +88,18 @@ Marcus Scholz,
Ersan Yildirim,
Jörn-Ingo Weigert,
Alexander Koch,
+Robin Roevens,
Wolfgang Apolinarski,
Alfred Haas,
Lars Schuhmacher,
Rene Zingel,
Sascha Kilian,
Bernhard Bitsch,
+Jon Murphy,
Ronald Wiesinger,
Florian Bührle,
-Jon Murphy,
Justin Luth,
Michael Eitelwein,
-Robin Roevens,
Alex Koch,
Dominik Hassler,
Larsen,
diff --git a/lfs/lsof b/lfs/lsof
index 8ea9e6c56..eefaf35f5 100644
--- a/lfs/lsof
+++ b/lfs/lsof
@@ -24,10 +24,10 @@
include Config
-VER = 4.91
+VER = 4.95.0.linux
THISAPP = lsof_$(VER)
-DL_FILE = $(THISAPP).tar.gz
+DL_FILE = $(THISAPP).tar.bz2
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)_BLAKE2 = b727acd6064b1c1d20b13311756c8bcb1cf20f5d68b4295b2a5fe8fcc0dbf35a2957017763212b48c338f5ac251d905f648a9c0df1babd30809676b1aa657b5c
+$(DL_FILE)_BLAKE2 = 6a7d6353ec7f0f1e14416bff98867e64009c3f3901110c947f845bb3dcf9af3d40755c7ac6d586412a61778bc8ac355d2388cf2cfa8a975dbf4870c339c75a8c
install : $(TARGET)
@@ -70,9 +70,8 @@ $(subst %,%_BLAKE2,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && tar axf lsof_$(VER)_src.tar
- cd $(DIR_APP)/lsof_$(VER)_src && ./Configure linux -n
- cd $(DIR_APP)/lsof_$(VER)_src && make $(MAKETUNING) CC="cc $(CFLAGS) $(LDFLAGS)"
- cd $(DIR_APP)/lsof_$(VER)_src && install -m 755 -o root -g root lsof /usr/bin
+ cd $(DIR_APP) && ./Configure linux
+ cd $(DIR_APP) && make $(MAKETUNING) CC="cc $(CFLAGS) $(LDFLAGS)"
+ cd $(DIR_APP) && install -m 755 -o root -g root lsof /usr/bin
@rm -rf $(DIR_APP)
@$(POSTBUILD)
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 284efdbfb1e9ba9aeba17eb327cdd3f97ba0d1e5
by Peter Müller 06 Jul '22
by Peter Müller 06 Jul '22
06 Jul '22
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 284efdbfb1e9ba9aeba17eb327cdd3f97ba0d1e5 (commit)
via 72696db892c8dcc8533f7b1813316592111cb46a (commit)
via 6395bed8a4d621e2ed5b4e1417934c34ddc9a9a3 (commit)
via f704d76e089604e94045b7ea83f2315dbddf52ca (commit)
via 50fdf0ee9c4a212a7c446dc47ca94af0193c2612 (commit)
via 1898c66a4826b46056e598d04911e537b1e41f86 (commit)
via 092330b128e39a548f37a9bd38b809fc3be62adb (commit)
via e2d54d57d49439e8e4227bf09e38301b3e4a63b4 (commit)
via 1d00837e7ec11cc8fd88f9bb0cbbfc152012b793 (commit)
via 9497d862baa8c3ea632147527fe5af6efa28a387 (commit)
via 8ac8abb2695f0a780d078ed4f21412fc0113e29d (commit)
from 801143615a8c8e68adad8cd6e9ffa4a07b7ae0b0 (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 284efdbfb1e9ba9aeba17eb327cdd3f97ba0d1e5
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Wed Jul 6 10:03:16 2022 +0000
Core Update 170: Ship files affected by "aliases" changes
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 72696db892c8dcc8533f7b1813316592111cb46a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Jun 29 18:27:24 2022 +0000
aliases: Don't call arpping to announce new IP addresses
I am not sure what the rationale is here, but we should probably not do
this. Other hosts on the network will be able to update their ARP caches
properly.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Acked-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 6395bed8a4d621e2ed5b4e1417934c34ddc9a9a3
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Jun 29 18:27:23 2022 +0000
aliases: Add support to assign aliases to multiple RED interfaces
This is a little patch which will extend the aliases page to offer an
interface selection if there are more than one RED interfaces.
This is a little hack to make configuration easier for users who have
manually set up more than one RED interface (e.g. for load balancing or
fail-over) and want to use the UI to configure firewall rules.
As a little benefit on the side, I had to rewrite setaliases.c to use
ip(8) instead of ifconfig(8).
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Acked-by: Peter Müller <peter.mueller(a)ipfire.org>
commit f704d76e089604e94045b7ea83f2315dbddf52ca
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Wed Jul 6 10:00:57 2022 +0000
dnsdist: Bump package version
https://lists.ipfire.org/pipermail/development/2022-July/013794.html
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 50fdf0ee9c4a212a7c446dc47ca94af0193c2612
Author: Robin Roevens <robin.roevens(a)disroot.org>
Date: Thu Jun 30 12:15:55 2022 +0200
zabbix_agentd: Add IPFire specific userparameters
Provide IPFire specific items for the Zabbix server to monitor:
- ipfire.net.gateway.pingtime: Internet Line Quality
- ipfire.net.gateway.ping: Internet connection
- ipfire.net.fw.hits.raw: JSON formatted list of Firewall hits/chain
- ipfire.dhcpd.clients: Number of active DHCP leases
- ipfire.captive.clients: Number of Captive Portal clients
Signed-off-by: Robin Roevens <robin.roevens(a)disroot.org>
commit 1898c66a4826b46056e598d04911e537b1e41f86
Author: Robin Roevens <robin.roevens(a)disroot.org>
Date: Thu Jun 30 12:15:54 2022 +0200
zabbix_agentd: By default only listen on GREEN ip
- Change zabbix_agentd.conf during install to only listen on the
GREEN ip by default.
Signed-off-by: Robin Roevens <robin.roevens(a)disroot.org>
commit 092330b128e39a548f37a9bd38b809fc3be62adb
Author: Robin Roevens <robin.roevens(a)disroot.org>
Date: Thu Jun 30 12:15:53 2022 +0200
zabbix_agentd: Sudoers file reorganization
- Remove sudoers file 'zabbix' in favour of new IPFire managed
'zabbix_agentd' and user managed 'zabbix_agentd_user' which is
included in the backup
- Provide migration of old sudoers file 'zabbix' or 'zabbix.user' to
new zabbix_agentd_user sudoers file if it was modified by user.
Signed-off-by: Robin Roevens <robin.roevens(a)disroot.org>
commit e2d54d57d49439e8e4227bf09e38301b3e4a63b4
Author: Robin Roevens <robin.roevens(a)disroot.org>
Date: Thu Jun 30 12:15:52 2022 +0200
zabbix_agentd: Configfile reorganization
- Restrict default main config to only the bare minimum options
and add upstream provided config as example file.
- Remove /etc/zabbix_agentd from backup and instead add only
zabbix_agentd.conf and subdirs 'scripts' and 'zabbix_agentd.d' to
the backup.
- Move ipfire managed userparameter_pakfire.conf from
user managed dir /etc/zabbix_agentd/zabbix_agent.d to
ipfire managed dir /var/ipfire/zabbix_agentd/userparameters
- Add Include line to existing zabbix_agentd.conf to include
the new ipfire managed config dir /var/ipfire/zabbix_agentd/...
- Add and include mandatory IPFire specific agent configuration
which should never be changed by the user.
Signed-off-by: Robin Roevens <robin.roevens(a)disroot.org>
commit 1d00837e7ec11cc8fd88f9bb0cbbfc152012b793
Author: Robin Roevens <robin.roevens(a)disroot.org>
Date: Thu Jun 30 12:15:51 2022 +0200
zabbix_agentd: Fix agent modules dir and few minor bugs
- Add agent modules-dir to backup
- Remove original, not used agent modules dir from rootfile
- Create modules-dir during install if it not already exists
- bugfix: Add existence check before creating log-dir, avoiding error
messages if it already exists from a previous install
- bugfix: add extract_backup_includes to update.sh script to make
sure backup includes exist when backup is taken.
Signed-off-by: Robin Roevens <robin.roevens(a)disroot.org>
commit 9497d862baa8c3ea632147527fe5af6efa28a387
Author: Robin Roevens <robin.roevens(a)disroot.org>
Date: Thu Jun 30 12:15:50 2022 +0200
zabbix_agentd: Update to v6.0.6 (LTS)
- Update from 4.2.6 to latest LTS version 6.0.6
See release notes: https://www.zabbix.com/rn/rn6.0.6
Signed-off-by: Robin Roevens <robin.roevens(a)disroot.org>
commit 8ac8abb2695f0a780d078ed4f21412fc0113e29d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Jun 30 13:21:15 2022 +0000
stripper: Strip any PIE executables
Fixes: #12894
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/backup/includes/zabbix_agentd | 7 +-
config/cfgroot/network-functions.pl | 20 +
config/rootfiles/core/170/filelists/files | 3 +
config/rootfiles/packages/zabbix_agentd | 12 +-
config/zabbix_agentd/sudoers | 16 +-
config/zabbix_agentd/{sudoers => sudoers_user} | 7 +-
config/zabbix_agentd/userparameter_ipfire.conf | 12 +
config/zabbix_agentd/zabbix_agentd.conf | 406 +--------------------
.../zabbix_agentd_ipfire_mandatory.conf | 11 +
html/cgi-bin/aliases.cgi | 63 +++-
langs/en/cgi-bin/en.pl | 1 +
lfs/dnsdist | 4 +-
lfs/zabbix_agentd | 31 +-
src/misc-progs/setaliases.c | 39 +-
src/paks/zabbix_agentd/install.sh | 48 ++-
src/paks/zabbix_agentd/update.sh | 23 +-
src/stripper | 4 +
17 files changed, 256 insertions(+), 451 deletions(-)
copy config/zabbix_agentd/{sudoers => sudoers_user} (80%)
create mode 100644 config/zabbix_agentd/userparameter_ipfire.conf
create mode 100644 config/zabbix_agentd/zabbix_agentd_ipfire_mandatory.conf
Difference in files:
diff --git a/config/backup/includes/zabbix_agentd b/config/backup/includes/zabbix_agentd
index cba18d772..834766992 100644
--- a/config/backup/includes/zabbix_agentd
+++ b/config/backup/includes/zabbix_agentd
@@ -1,2 +1,5 @@
-/etc/sudoers.d/zabbix
-/etc/zabbix_agentd/*
+/etc/sudoers.d/zabbix_agentd_user
+/etc/zabbix_agentd/zabbix_agentd.conf
+/etc/zabbix_agentd/scripts/
+/etc/zabbix_agentd/zabbix_agentd.d/
+/usr/lib/zabbix/
\ No newline at end of file
diff --git a/config/cfgroot/network-functions.pl b/config/cfgroot/network-functions.pl
index d50322823..4ac6d8670 100644
--- a/config/cfgroot/network-functions.pl
+++ b/config/cfgroot/network-functions.pl
@@ -332,6 +332,26 @@ sub setup_upstream_proxy() {
}
}
+sub get_red_interfaces() {
+ my $default = &General::get_red_interface();
+
+ my @intfs = (
+ $default,
+ );
+
+ opendir(INTERFACES, "/sys/class/net");
+
+ while (my $intf = readdir(INTERFACES)) {
+ if ($intf =~ m/^red[0-9]+$/) {
+ push(@intfs, $intf);
+ }
+ }
+
+ closedir(INTERFACES);
+
+ return &General::uniq(@intfs);
+}
+
sub list_wireless_interfaces() {
my %interfaces = ();
diff --git a/config/rootfiles/core/170/filelists/files b/config/rootfiles/core/170/filelists/files
index e71417ae0..a27d8561b 100644
--- a/config/rootfiles/core/170/filelists/files
+++ b/config/rootfiles/core/170/filelists/files
@@ -1 +1,4 @@
opt/pakfire/lib/functions.pl
+srv/web/ipfire/cgi-bin/aliases.cgi
+usr/local/bin/setaliases
+var/ipfire/network-functions.pl
diff --git a/config/rootfiles/packages/zabbix_agentd b/config/rootfiles/packages/zabbix_agentd
index 4420bda05..6f2c831d7 100644
--- a/config/rootfiles/packages/zabbix_agentd
+++ b/config/rootfiles/packages/zabbix_agentd
@@ -1,18 +1,24 @@
etc/logrotate.d/zabbix_agentd
etc/rc.d/init.d/zabbix_agentd
-etc/sudoers.d/zabbix
+etc/sudoers.d/zabbix_agentd
+etc/sudoers.d/zabbix_agentd_user
etc/zabbix_agentd
etc/zabbix_agentd/scripts
etc/zabbix_agentd/zabbix_agentd.conf
+etc/zabbix_agentd/zabbix_agentd.conf.example
etc/zabbix_agentd/zabbix_agentd.d
-etc/zabbix_agentd/zabbix_agentd.d/userparameter_pakfire.conf
usr/bin/zabbix_get
usr/bin/zabbix_sender
-usr/lib/modules
+#usr/lib/modules
usr/lib/zabbix
usr/sbin/zabbix_agentd
#usr/share/man/man1/zabbix_get.1
#usr/share/man/man1/zabbix_sender.1
#usr/share/man/man8/zabbix_agentd.8
var/ipfire/backup/addons/includes/zabbix_agentd
+var/ipfire/zabbix_agentd
+var/ipfire/zabbix_agentd/zabbix_agentd_ipfire_mandatory.conf
+var/ipfire/zabbix_agentd/userparameters
+var/ipfire/zabbix_agentd/userparameters/userparameter_pakfire.conf
+var/ipfire/zabbix_agentd/userparameters/userparameter_ipfire.conf
#var/log/zabbix
diff --git a/config/zabbix_agentd/sudoers b/config/zabbix_agentd/sudoers
index 1b362a4fd..2d71ae78f 100644
--- a/config/zabbix_agentd/sudoers
+++ b/config/zabbix_agentd/sudoers
@@ -1,17 +1,11 @@
# Include file for sudoers file
#
-# This is needed for some userparameters to be able to execute commands that only run as root (using sudo)
-# e.g. /usr/bin/openssl or /usr/sbin/smartctl
+# This is needed for some IPFire specific userparameters to be able to execute commands that only run as root (using sudo)
#
-# USE AT YOU'RE OWN RISK. USING THIS WRONG CAN RESULT IN A SECURITY BREACH!
+# DO NOT CHANGE THIS FILE. This file is managed by IPFire, will be overwritten on next addon upgrade and is not
+# included in the backup.
#
-# Some hints:
-# - It is strongly recommended to edit this file only using the visudo -f <filename> command. If you mess up this file,
-# you might end up locking yourself out of your system!
-# - Append the full path incl. parameters to each command, using "," as separator.
-# - Only add commands you really need. Zabbix should not have more rights than it has to.
-#
-# Append / edit the following list of commands to fit your needs:
+# To add more sudo rights to zabbix agent, you should modify the sudoers file zabbix_agentd_user
#
Defaults:zabbix !requiretty
-zabbix ALL=(ALL) NOPASSWD: /opt/pakfire/pakfire status
+zabbix ALL=(ALL) NOPASSWD: /opt/pakfire/pakfire status, /usr/sbin/fping, /usr/local/bin/getipstat
diff --git a/config/zabbix_agentd/sudoers_user b/config/zabbix_agentd/sudoers_user
new file mode 100644
index 000000000..61cbc417b
--- /dev/null
+++ b/config/zabbix_agentd/sudoers_user
@@ -0,0 +1,16 @@
+# Include file for sudoers file
+#
+# This is needed for some userparameters to be able to execute commands that only run as root (using sudo)
+# e.g. /usr/bin/openssl or /usr/sbin/smartctl
+#
+# USE AT YOU'RE OWN RISK. USING THIS WRONG CAN RESULT IN A SECURITY BREACH!
+#
+# Some hints:
+# - It is strongly recommended to edit this file only using the visudo -f <filename> command. If you mess up this file,
+# you might end up locking yourself out of your system!
+# - Append the full path incl. parameters to each command, using "," as separator.
+# - Only add commands you really need. Zabbix should not have more rights than it has to.
+#
+# Uncomment the following line and edit the example of commands to fit your needs:
+
+#zabbix ALL=(ALL) NOPASSWD: <custom command 1>, <custom command 2>, ...
diff --git a/config/zabbix_agentd/userparameter_ipfire.conf b/config/zabbix_agentd/userparameter_ipfire.conf
new file mode 100644
index 000000000..10c09c25d
--- /dev/null
+++ b/config/zabbix_agentd/userparameter_ipfire.conf
@@ -0,0 +1,12 @@
+# Parameters for monitoring IPFire specific metrics
+#
+# Internet Gateway ping timings, can be used to measure "Internet Line Quality"
+UserParameter=ipfire.net.gateway.pingtime,sudo /usr/sbin/fping -c 3 gateway 2>&1 | tail -n 1 | awk '{print $NF}' | cut -d '/' -f2
+# Internet Gateway availability, can be used to check Internet connection
+UserParameter=ipfire.net.gateway.ping,sudo /usr/sbin/fping -q -r 3 gateway; [ ! $? ]; echo $?
+# Firewall Filter Forward chain drops in bytes/chain (JSON), can be used for discovery of firewall chains and monitoring of firewall hits on each chain
+UserParameter=ipfire.net.fw.hits.raw,sudo /usr/local/bin/getipstat -xf | grep "\/\* DROP_.* \*\/$" | awk 'BEGIN { ORS = ""; print "["} { printf "%s{\"chain\": \"%s\", \"bytes\": \"%s\"}", separator, substr($11, 6), $2; separator = ", "; } END { print"]" }'
+# Number of currently Active DHCP leases
+UserParameter=ipfire.dhcpd.clients,grep -s -E 'lease|bind' /var/state/dhcp/dhcpd.leases | sed ':a;/{$/{N;s/\n//;ba}' | grep "state active" | wc -l
+# Number of Captive Portal clients
+UserParameter=ipfire.captive.clients,awk -F ',' 'length($2) == 17 {sum += 1} END {if (length(sum) == 0) print 0; else print sum}' /var/ipfire/captive/clients
\ No newline at end of file
diff --git a/config/zabbix_agentd/zabbix_agentd.conf b/config/zabbix_agentd/zabbix_agentd.conf
index 21b8e0122..4480e43f2 100644
--- a/config/zabbix_agentd/zabbix_agentd.conf
+++ b/config/zabbix_agentd/zabbix_agentd.conf
@@ -1,399 +1,27 @@
# This is a configuration file for Zabbix agent daemon (Unix)
# To get more information about Zabbix, visit http://www.zabbix.com
-
-############ GENERAL PARAMETERS #################
-
-### Option: PidFile
-# Name of PID file.
-#
-# Mandatory: no
-# Default:
-# PidFile=/tmp/zabbix_agentd.pid
-
-PidFile=/var/run/zabbix/zabbix_agentd.pid
-
-### Option: LogType
-# Specifies where log messages are written to:
-# system - syslog
-# file - file specified with LogFile parameter
-# console - standard output
-#
-# Mandatory: no
-# Default:
-# LogType=file
-
-### Option: LogFile
-# Log file name for LogType 'file' parameter.
-#
-# Mandatory: yes, if LogType is set to file, otherwise no
-# Default:
-# LogFile=
-
-LogFile=/var/log/zabbix/zabbix_agentd.log
-
-### Option: LogFileSize
-# Maximum size of log file in MB.
-# 0 - disable automatic log rotation.
#
-# Mandatory: no
-# Range: 0-1024
-# Default:
-# LogFileSize=1
-
-LogFileSize=0
+# For possible configuration options,
+# see /etc/zabbix_agentd/zabbix_agentd.conf.example
-### Option: DebugLevel
-# Specifies debug level:
-# 0 - basic information about starting and stopping of Zabbix processes
-# 1 - critical information
-# 2 - error information
-# 3 - warnings
-# 4 - for debugging (produces lots of information)
-# 5 - extended debugging (produces even more information)
-#
-# Mandatory: no
-# Range: 0-5
-# Default:
-# DebugLevel=3
-
-### Option: SourceIP
-# Source IP address for outgoing connections.
-#
-# Mandatory: no
-# Default:
-# SourceIP=
-
-### Option: EnableRemoteCommands
-# Whether remote commands from Zabbix server are allowed.
-# 0 - not allowed
-# 1 - allowed
-#
-# Mandatory: no
-# Default:
-# EnableRemoteCommands=0
-
-### Option: LogRemoteCommands
-# Enable logging of executed shell commands as warnings.
-# 0 - disabled
-# 1 - enabled
-#
-# Mandatory: no
-# Default:
-# LogRemoteCommands=0
-
-##### Passive checks related
-
-### Option: Server
-# List of comma delimited IP addresses, optionally in CIDR notation, or DNS names of Zabbix servers and Zabbix proxies.
-# Incoming connections will be accepted only from the hosts listed here.
-# If IPv6 support is enabled then '127.0.0.1', '::127.0.0.1', '::ffff:127.0.0.1' are treated equally
-# and '::/0' will allow any IPv4 or IPv6 address.
-# '0.0.0.0/0' can be used to allow any IPv4 address.
-# Example: Server=127.0.0.1,192.168.1.0/24,::1,2001:db8::/32,zabbix.example.com
-#
-# Mandatory: yes, if StartAgents is not explicitly set to 0
-# Default:
-# Server=
+# To make sure all Zabbix configuration is correctly included in IPFire backups:
+# - Put custom userparameters in /etc/zabbix_agentd/zabbix_agentd.d/*.conf
+# - Put custom scripts in /etc/zabbix_agentd/scripts
+# - Put custom modules in /usr/lib/zabbix
+# Set your Zabbix Server IP or hostname here (Passive and/or Active):
Server=127.0.0.1
-
-### Option: ListenPort
-# Agent will listen on this port for connections from the server.
-#
-# Mandatory: no
-# Range: 1024-32767
-# Default:
-# ListenPort=10050
-
-### Option: ListenIP
-# List of comma delimited IP addresses that the agent should listen on.
-# First IP address is sent to Zabbix server if connecting to it to retrieve list of active checks.
-#
-# Mandatory: no
-# Default:
-# ListenIP=0.0.0.0
-
-### Option: StartAgents
-# Number of pre-forked instances of zabbix_agentd that process passive checks.
-# If set to 0, disables passive checks and the agent will not listen on any TCP port.
-#
-# Mandatory: no
-# Range: 0-100
-# Default:
-# StartAgents=3
-
-##### Active checks related
-
-### Option: ServerActive
-# List of comma delimited IP:port (or DNS name:port) pairs of Zabbix servers and Zabbix proxies for active checks.
-# If port is not specified, default port is used.
-# IPv6 addresses must be enclosed in square brackets if port for that host is specified.
-# If port is not specified, square brackets for IPv6 addresses are optional.
-# If this parameter is not specified, active checks are disabled.
-# Example: ServerActive=127.0.0.1:20051,zabbix.domain,[::1]:30051,::1,[12fc::1]
-#
-# Mandatory: no
-# Default:
-# ServerActive=
-
ServerActive=127.0.0.1
-### Option: Hostname
-# Unique, case sensitive hostname.
-# Required for active checks and must match hostname as configured on the server.
-# Value is acquired from HostnameItem if undefined.
-#
-# Mandatory: no
-# Default:
-# Hostname=
-
-### Option: HostnameItem
-# Item used for generating Hostname if it is undefined. Ignored if Hostname is defined.
-# Does not support UserParameters or aliases.
-#
-# Mandatory: no
-# Default:
-# HostnameItem=system.hostname
-
-### Option: HostMetadata
-# Optional parameter that defines host metadata.
-# Host metadata is used at host auto-registration process.
-# An agent will issue an error and not start if the value is over limit of 255 characters.
-# If not defined, value will be acquired from HostMetadataItem.
-#
-# Mandatory: no
-# Range: 0-255 characters
-# Default:
-# HostMetadata=
-
-### Option: HostMetadataItem
-# Optional parameter that defines an item used for getting host metadata.
-# Host metadata is used at host auto-registration process.
-# During an auto-registration request an agent will log a warning message if
-# the value returned by specified item is over limit of 255 characters.
-# This option is only used when HostMetadata is not defined.
-#
-# Mandatory: no
-# Default:
-# HostMetadataItem=
-
-### Option: RefreshActiveChecks
-# How often list of active checks is refreshed, in seconds.
-#
-# Mandatory: no
-# Range: 60-3600
-# Default:
-# RefreshActiveChecks=120
+# List of comma delimited IP addresses that the agent should listen on.
+ListenIP=GREEN_ADDRESS
-### Option: BufferSend
-# Do not keep data longer than N seconds in buffer.
-#
-# Mandatory: no
-# Range: 1-3600
-# Default:
-# BufferSend=5
-
-### Option: BufferSize
-# Maximum number of values in a memory buffer. The agent will send
-# all collected data to Zabbix Server or Proxy if the buffer is full.
-#
-# Mandatory: no
-# Range: 2-65535
-# Default:
-# BufferSize=100
-
-### Option: MaxLinesPerSecond
-# Maximum number of new lines the agent will send per second to Zabbix Server
-# or Proxy processing 'log' and 'logrt' active checks.
-# The provided value will be overridden by the parameter 'maxlines',
-# provided in 'log' or 'logrt' item keys.
-#
-# Mandatory: no
-# Range: 1-1000
-# Default:
-# MaxLinesPerSecond=20
+# This line activates IPFire specific userparameters.
+# See IPFire wiki for details.
+# To deactivate them: Comment this line out.
+# (DO NOT REMOVE OR ALTER IT as then it will be re-added on next upgrade)
+Include=/var/ipfire/zabbix_agentd/userparameters/*.conf
-############ ADVANCED PARAMETERS #################
-
-### Option: Alias
-# Sets an alias for an item key. It can be used to substitute long and complex item key with a smaller and simpler one.
-# Multiple Alias parameters may be present. Multiple parameters with the same Alias key are not allowed.
-# Different Alias keys may reference the same item key.
-# For example, to retrieve the ID of user 'zabbix':
-# Alias=zabbix.userid:vfs.file.regexp[/etc/passwd,^zabbix:.:([0-9]+),,,,\1]
-# Now shorthand key zabbix.userid may be used to retrieve data.
-# Aliases can be used in HostMetadataItem but not in HostnameItem parameters.
-#
-# Mandatory: no
-# Range:
-# Default:
-
-### Option: Timeout
-# Spend no more than Timeout seconds on processing
-#
-# Mandatory: no
-# Range: 1-30
-# Default:
-# Timeout=3
-
-### Option: AllowRoot
-# Allow the agent to run as 'root'. If disabled and the agent is started by 'root', the agent
-# will try to switch to the user specified by the User configuration option instead.
-# Has no effect if started under a regular user.
-# 0 - do not allow
-# 1 - allow
-#
-# Mandatory: no
-# Default:
-# AllowRoot=0
-
-### Option: User
-# Drop privileges to a specific, existing user on the system.
-# Only has effect if run as 'root' and AllowRoot is disabled.
-#
-# Mandatory: no
-# Default:
-# User=zabbix
-
-### Option: Include
-# You may include individual files or all files in a directory in the configuration file.
-# Installing Zabbix will create include directory in /usr/local/etc, unless modified during the compile time.
-#
-# Mandatory: no
-# Default:
-# Include=
-
-Include=/etc/zabbix_agentd/zabbix_agentd.d/*.conf
-
-
-####### USER-DEFINED MONITORED PARAMETERS #######
-
-### Option: UnsafeUserParameters
-# Allow all characters to be passed in arguments to user-defined parameters.
-# The following characters are not allowed:
-# \ ' " ` * ? [ ] { } ~ $ ! & ; ( ) < > | # @
-# Additionally, newline characters are not allowed.
-# 0 - do not allow
-# 1 - allow
-#
-# Mandatory: no
-# Range: 0-1
-# Default:
-# UnsafeUserParameters=0
-
-### Option: UserParameter
-# User-defined parameter to monitor. There can be several user-defined parameters.
-# Format: UserParameter=<key>,<shell command>
-# See 'zabbix_agentd' directory for examples.
-#
-# Mandatory: no
-# Default:
-# UserParameter=
-
-####### LOADABLE MODULES #######
-
-### Option: LoadModulePath
-# Full path to location of agent modules.
-# Default depends on compilation options.
-# To see the default path run command "zabbix_agentd --help".
-#
-# Mandatory: no
-# Default:
-# LoadModulePath=/usr/lib/modules
-
-LoadModulePath=/usr/lib/zabbix
-
-### Option: LoadModule
-# Module to load at agent startup. Modules are used to extend functionality of the agent.
-# Formats:
-# LoadModule=<module.so>
-# LoadModule=<path/module.so>
-# LoadModule=</abs_path/module.so>
-# Either the module must be located in directory specified by LoadModulePath or the path must precede the module name.
-# If the preceding path is absolute (starts with '/') then LoadModulePath is ignored.
-# It is allowed to include multiple LoadModule parameters.
-#
-# Mandatory: no
-# Default:
-# LoadModule=
-
-####### TLS-RELATED PARAMETERS #######
-
-### Option: TLSConnect
-# How the agent should connect to server or proxy. Used for active checks.
-# Only one value can be specified:
-# unencrypted - connect without encryption
-# psk - connect using TLS and a pre-shared key
-# cert - connect using TLS and a certificate
-#
-# Mandatory: yes, if TLS certificate or PSK parameters are defined (even for 'unencrypted' connection)
-# Default:
-# TLSConnect=unencrypted
-
-### Option: TLSAccept
-# What incoming connections to accept.
-# Multiple values can be specified, separated by comma:
-# unencrypted - accept connections without encryption
-# psk - accept connections secured with TLS and a pre-shared key
-# cert - accept connections secured with TLS and a certificate
-#
-# Mandatory: yes, if TLS certificate or PSK parameters are defined (even for 'unencrypted' connection)
-# Default:
-# TLSAccept=unencrypted
-
-### Option: TLSCAFile
-# Full pathname of a file containing the top-level CA(s) certificates for
-# peer certificate verification.
-#
-# Mandatory: no
-# Default:
-# TLSCAFile=
-
-### Option: TLSCRLFile
-# Full pathname of a file containing revoked certificates.
-#
-# Mandatory: no
-# Default:
-# TLSCRLFile=
-
-### Option: TLSServerCertIssuer
-# Allowed server certificate issuer.
-#
-# Mandatory: no
-# Default:
-# TLSServerCertIssuer=
-
-### Option: TLSServerCertSubject
-# Allowed server certificate subject.
-#
-# Mandatory: no
-# Default:
-# TLSServerCertSubject=
-
-### Option: TLSCertFile
-# Full pathname of a file containing the agent certificate or certificate chain.
-#
-# Mandatory: no
-# Default:
-# TLSCertFile=
-
-### Option: TLSKeyFile
-# Full pathname of a file containing the agent private key.
-#
-# Mandatory: no
-# Default:
-# TLSKeyFile=
-
-### Option: TLSPSKIdentity
-# Unique, case sensitive string used to identify the pre-shared key.
-#
-# Mandatory: no
-# Default:
-# TLSPSKIdentity=
-
-### Option: TLSPSKFile
-# Full pathname of a file containing the pre-shared key.
-#
-# Mandatory: no
-# Default:
-# TLSPSKFile=
+# Mandatory Zabbix Agent configuration to start and run on IPFire correctly
+# DO NOT REMOVE OR MODIFY THIS LINE:
+Include=/var/ipfire/zabbix_agentd/zabbix_agentd_ipfire_mandatory.conf
\ No newline at end of file
diff --git a/config/zabbix_agentd/zabbix_agentd_ipfire_mandatory.conf b/config/zabbix_agentd/zabbix_agentd_ipfire_mandatory.conf
new file mode 100644
index 000000000..c6be948be
--- /dev/null
+++ b/config/zabbix_agentd/zabbix_agentd_ipfire_mandatory.conf
@@ -0,0 +1,11 @@
+PidFile=/var/run/zabbix/zabbix_agentd.pid
+
+# Log rotation is managed by logrotate
+LogFile=/var/log/zabbix/zabbix_agentd.log
+LogFileSize=0
+
+# These paths are included in the IPFire backups. Do not put user modules
+# or configuration files in other locations if you want them included in the
+# backups.
+LoadModulePath=/usr/lib/zabbix
+Include=/etc/zabbix_agentd/zabbix_agentd.d/*.conf
\ No newline at end of file
diff --git a/html/cgi-bin/aliases.cgi b/html/cgi-bin/aliases.cgi
index 7b80b3c84..def03ff9b 100644
--- a/html/cgi-bin/aliases.cgi
+++ b/html/cgi-bin/aliases.cgi
@@ -34,6 +34,7 @@ require '/var/ipfire/general-functions.pl'; # replace /var/ipcop with /var/ipcop
require "${General::swroot}/lang.pl";
require "${General::swroot}/header.pl";
require "${General::swroot}/ids-functions.pl";
+require "${General::swroot}/network-functions.pl";
my $configfwdfw = "${General::swroot}/firewall/config";
my $configinput = "${General::swroot}/firewall/input";
@@ -52,6 +53,11 @@ undef (@dummy);
my $setting = "${General::swroot}/ethernet/settings";
our $datafile = "${General::swroot}/ethernet/aliases";
+# Fetch the name of the main RED interface
+my $RED_INTERFACE = &General::get_red_interface();
+
+# Fetch all RED interfaces
+my @RED_INTERFACES = &Network::get_red_interfaces();
our %settings=();
#Settings1
@@ -61,7 +67,8 @@ our %settings=();
$settings{'IP'} = '';
$settings{'ENABLED'} = 'off'; # Every check box must be set to off
$settings{'NAME'} = '';
-my @nosaved=('IP','ENABLED','NAME'); # List here ALL setting2 fields. Mandatory
+$settings{'INTERFACE'} = '';
+my @nosaved=('IP','ENABLED','NAME','INTERFACE'); # List here ALL setting2 fields. Mandatory
$settings{'ACTION'} = ''; # add/edit/remove
$settings{'KEY1'} = ''; # point record for ACTION
@@ -215,10 +222,10 @@ if ($settings{'ACTION'} eq $Lang::tr{'add'}) {
}
unless ($errormessage) {
if ($settings{'KEY1'} eq '') { #add or edit ?
- unshift (@current, "$settings{'IP'},$settings{'ENABLED'},$settings{'NAME'}\n");
+ unshift (@current, "$settings{'IP'},$settings{'ENABLED'},$settings{'NAME'},$settings{'INTERFACE'}\n");
&General::log($Lang::tr{'ip alias added'});
} else {
- @current[$settings{'KEY1'}] = "$settings{'IP'},$settings{'ENABLED'},$settings{'NAME'}\n";
+ @current[$settings{'KEY1'}] = "$settings{'IP'},$settings{'ENABLED'},$settings{'NAME'},$settings{'INTERFACE'}\n";
$settings{'KEY1'} = ''; # End edit mode
&General::log($Lang::tr{'ip alias changed'});
}
@@ -250,6 +257,7 @@ if ($settings{'ACTION'} eq $Lang::tr{'edit'}) {
$settings{'IP'}=$temp[0]; # Prepare the screen for editing
$settings{'ENABLED'}=$temp[1];
$settings{'NAME'}=$temp[2];
+ $settings{'INTERFACE'}=$temp[3];
}
if ($settings{'ACTION'} eq $Lang::tr{'remove'}) {
@@ -295,6 +303,7 @@ if ($settings{'ACTION'} eq '' ) { # First launch from GUI
&Header::openpage($Lang::tr{'external aliases configuration'}, 1, '');
&Header::openbigbox('100%', 'left', '', $errormessage);
my %checked =(); # Checkbox manipulations
+my %selected = ();
if ($errormessage) {
&Header::openbox('100%', 'left', $Lang::tr{'error messages'});
@@ -320,6 +329,11 @@ END
#
$checked{'ENABLED'}{'on'} = ($settings{'ENABLED'} eq 'on') ? "checked='checked'" : '' ;
+$selected{'INTERFACE'} = ();
+foreach my $intf (@RED_INTERFACES) {
+ $selected{'INTERFACE'}{$intf} = ($settings{'INTERFACE'} eq $intf) ? "selected" : "";
+}
+
my $buttontext = $Lang::tr{'add'};
if ($settings{'KEY1'} ne '') {
$buttontext = $Lang::tr{'update'};
@@ -329,7 +343,7 @@ if ($settings{'KEY1'} ne '') {
}
#Edited line number (KEY1) passed until cleared by 'save' or 'remove' or 'new sort order'
-print <<END
+print <<END;
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
<input type='hidden' name='KEY1' value='$settings{'KEY1'}' />
<input type='hidden' name='OLDNAME' value='$settings{'NAME'}' />
@@ -340,6 +354,33 @@ print <<END
<td><input type='text' name='NAME' value='$settings{'NAME'}' size='32' /></td>
<td class='base' style='text-align:right; color:${Header::colourred};'>$Lang::tr{'alias ip'}: </td>
<td><input type='text' name='IP' value='$settings{'IP'}' size='16' /></td>
+END
+
+if (scalar @RED_INTERFACES >= 2) {
+ print <<END;
+ <td class='base' style='color:${Header::colourred};'>$Lang::tr{'interface'}:</td>
+ <td>
+ <select name="INTERFACE">
+ <option value="">$Lang::tr{'aliases default interface'}</option>
+END
+
+ # Print an option for each RED interface
+ foreach my $intf (@RED_INTERFACES) {
+ # Skip the default one
+ next if ($RED_INTERFACE eq $intf);
+
+ print <<END;
+ <option value="$intf" $selected{'INTERFACE'}{$intf}>$intf</option>
+END
+ }
+
+ print <<END;
+ </select>
+ </td>
+END
+}
+
+print <<END;
<td class='base' style='text-align:right;'>$Lang::tr{'enabled'} </td>
<td><input type='checkbox' name='ENABLED' $checked{'ENABLED'}{'on'} /></td>
</tr>
@@ -353,7 +394,7 @@ print <<END
</table>
</form>
END
-;
+
&Header::closebox();
# Add visual indicators to column headings to show sort order - EO
@@ -419,9 +460,15 @@ foreach my $line (@current) {
}
print "<tr style='$col'>";
+ my $address = $temp[0];
+
+ if ($temp[3] ne "") {
+ $address .= " @ $temp[3]";
+ }
+
print <<END
<td style='text-align:center; $col'>$temp[2]</td>
-<td style='text-align:center; $col'>$temp[0]</td>
+<td style='text-align:center; $col'>$address</td>
<td style='text-align:center; $col'>
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
@@ -542,7 +589,7 @@ sub SortDataFile
# The KEY,key record permits doublons. If removed, then F1 becomes the key without doublon permitted.
- my @record = ('KEY',$key++,'IP',$temp[0],'ENABLED',$temp[1],'NAME',$temp[2]);
+ my @record = ('KEY',$key++,'IP',$temp[0],'ENABLED',$temp[1],'NAME',$temp[2],'INTERFACE',$temp[3]);
my $record = {}; # create a reference to empty hash
%{$record} = @record; # populate that hash with @record
$entries{$record->{KEY}} = $record; # add this to a hash of hashes
@@ -552,7 +599,7 @@ sub SortDataFile
# Each field value is printed , with the newline ! Don't forget separator and order of them.
foreach my $entry (sort fixedleasesort keys %entries) {
- print FILE "$entries{$entry}->{IP},$entries{$entry}->{ENABLED},$entries{$entry}->{NAME}\n";
+ print FILE "$entries{$entry}->{IP},$entries{$entry}->{ENABLED},$entries{$entry}->{NAME},$entries{$entry}->{INTERFACE}\n";
}
close(FILE);
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 2c79f1cbc..99698948d 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -422,6 +422,7 @@
'alcatelusb upload' => 'Upload Speedtouch USB firmware',
'alias ip' => 'Alias IP',
'aliases' => 'Aliases',
+'aliases default interface' => '- Default Interface -',
'aliases not active' => 'Aliases will not be active unless your RED interface is STATIC',
'all' => 'All',
'all interfaces' => 'All Interfaces',
diff --git a/lfs/dnsdist b/lfs/dnsdist
index 9b668f40a..790505751 100644
--- a/lfs/dnsdist
+++ b/lfs/dnsdist
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2021 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2022 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 #
@@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = dnsdist
-PAK_VER = 12
+PAK_VER = 13
SUP_ARCH = x86_64 aarch64
diff --git a/lfs/zabbix_agentd b/lfs/zabbix_agentd
index 63566c1a7..73c5dc0b6 100644
--- a/lfs/zabbix_agentd
+++ b/lfs/zabbix_agentd
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2019 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -26,7 +26,7 @@ include Config
SUMMARY = Zabbix Agent
-VER = 4.2.6
+VER = 6.0.6
THISAPP = zabbix-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -34,8 +34,9 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = zabbix_agentd
-PAK_VER = 4
-DEPS =
+PAK_VER = 5
+
+DEPS = fping
SERVICES = zabbix_agentd
@@ -47,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 644bb9fd3afaa26c572f97018039d564a7ce156d0bf8d2449a1d3d04fdfaca05087d71e6a5ddcf3ed13a5719256865780f180dd3488bab470816dac7af70ff09
+$(DL_FILE)_BLAKE2 = f9d07ca8938ae4e5e47048c32872644caeda0ecdef17513c63c63d1ce2aaa4ac0c92e6c70932bc598ff908419dae05bab32924f5973a5528b5668f7c7c2c5a17
install : $(TARGET)
@@ -84,7 +85,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
--prefix=/usr \
--enable-agent \
--sysconfdir=/etc/zabbix_agentd \
- --with-openssl
+ --with-openssl \
+ --with-libcurl
cd $(DIR_APP) && make
cd $(DIR_APP) && make install
@@ -93,10 +95,21 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-rmdir /etc/zabbix_agentd/zabbix_agentd.conf.d
-mkdir -pv /etc/zabbix_agentd/zabbix_agentd.d
-mkdir -pv /etc/zabbix_agentd/scripts
+ # Move upstream supplied config out of the way for reference
+ # and install our own version of the config.
+ -mv /etc/zabbix_agentd/zabbix_agentd.conf \
+ /etc/zabbix_agentd/zabbix_agentd.conf.example
install -v -m 644 $(DIR_SRC)/config/zabbix_agentd/zabbix_agentd.conf \
/etc/zabbix_agentd/zabbix_agentd.conf
+
+ # Install IPFire-specific Zabbix Agent config
+ -mkdir -pv /var/ipfire/zabbix_agentd/userparameters
+ install -v -m 644 $(DIR_SRC)/config/zabbix_agentd/zabbix_agentd_ipfire_mandatory.conf \
+ /var/ipfire/zabbix_agentd/zabbix_agentd_ipfire_mandatory.conf
install -v -m 644 $(DIR_SRC)/config/zabbix_agentd/userparameter_pakfire.conf \
- /etc/zabbix_agentd/zabbix_agentd.d/userparameter_pakfire.conf
+ /var/ipfire/zabbix_agentd/userparameters/userparameter_pakfire.conf
+ install -v -m 644 $(DIR_SRC)/config/zabbix_agentd/userparameter_ipfire.conf \
+ /var/ipfire/zabbix_agentd/userparameters/userparameter_ipfire.conf
# Create directory for additional agent modules
-mkdir -pv /usr/lib/zabbix
@@ -114,7 +127,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
# Install sudoers include file
install -v -m 640 $(DIR_SRC)/config/zabbix_agentd/sudoers \
- /etc/sudoers.d/zabbix
+ /etc/sudoers.d/zabbix_agentd
+ install -v -m 640 $(DIR_SRC)/config/zabbix_agentd/sudoers_user \
+ /etc/sudoers.d/zabbix_agentd_user
# Install include file for backup
install -v -m 644 $(DIR_SRC)/config/backup/includes/zabbix_agentd \
diff --git a/src/misc-progs/setaliases.c b/src/misc-progs/setaliases.c
index 4ba6816af..a541a4fd2 100644
--- a/src/misc-progs/setaliases.c
+++ b/src/misc-progs/setaliases.c
@@ -28,6 +28,8 @@
struct keyvalue *kv = NULL;
FILE *file = NULL;
+#define SCOPE 128
+
void exithandler(void)
{
if (kv) freekeyvalues(kv);
@@ -45,6 +47,7 @@ int main(void)
char *enabled;
char *sptr;
char *comment;
+ char* intf = NULL;
int alias;
int count;
@@ -118,13 +121,12 @@ int main(void)
exit(1);
}
- /* down the aliases in turn until ifconfig complains */
- alias=0;
- do
- {
- memset(command, 0, STRING_SIZE);
- snprintf(command, STRING_SIZE-1, "/sbin/ifconfig %s:%d down 2>/dev/null", red_dev, alias++);
- } while (safe_system(command)==0);
+ // Flush all previous aliases
+ alias = 0;
+ do {
+ snprintf(command, STRING_SIZE - 1,
+ "ip addr flush dev red%d scope %d 2>/dev/null", alias++, SCOPE);
+ } while (safe_system(command) == 0);
/* Now set up the new aliases from the config file */
if (!(file = fopen(CONFIG_ROOT "/ethernet/aliases", "r")))
@@ -144,15 +146,18 @@ int main(void)
aliasip = NULL;
enabled = NULL;
comment = NULL;
+ intf = NULL;
sptr = strtok(s, ",");
while (sptr)
{
if (count == 0)
aliasip = sptr;
- if (count == 1)
+ else if (count == 1)
enabled = sptr;
- else
+ else if (count == 2)
comment = sptr;
+ else if (count == 3)
+ intf = sptr;
count++;
sptr = strtok(NULL, ",");
}
@@ -175,16 +180,14 @@ int main(void)
exit(1);
}
- memset(command, 0, STRING_SIZE);
- snprintf(command, STRING_SIZE-1,
- "/sbin/ifconfig %s:%d %s netmask %s up",
- red_dev, alias, aliasip, red_netmask);
- safe_system(command);
- memset(command, 0, STRING_SIZE);
- snprintf(command, STRING_SIZE-1,
- "/usr/sbin/arping -q -c 1 -w 1 -i %s -S %s %s",
- red_dev, aliasip, default_gateway);
+ // Default to RED_DEV if intf isn't set
+ if (!intf)
+ intf = red_dev;
+
+ snprintf(command, STRING_SIZE - 1, "ip addr add %s/%s dev %s scope %d",
+ aliasip, red_netmask, intf, SCOPE);
safe_system(command);
+
alias++;
}
return 0;
diff --git a/src/paks/zabbix_agentd/install.sh b/src/paks/zabbix_agentd/install.sh
index e1450a1d8..80632d1ec 100644
--- a/src/paks/zabbix_agentd/install.sh
+++ b/src/paks/zabbix_agentd/install.sh
@@ -39,8 +39,52 @@ ln -sf ../init.d/zabbix_agentd /etc/rc.d/rc0.d/K02zabbix_agentd
ln -sf ../init.d/zabbix_agentd /etc/rc.d/rc6.d/K02zabbix_agentd
# Create additonal directories and set permissions
-mkdir -pv /var/log/zabbix
-chown zabbix.zabbix /var/log/zabbix
+[ -d /var/log/zabbix ] || ( mkdir -pv /var/log/zabbix && chown zabbix.zabbix /var/log/zabbix )
+[ -d /usr/lib/zabbix ] || ( mkdir -pv /usr/lib/zabbix && chown zabbix.zabbix /usr/lib/zabbix )
restore_backup ${NAME}
+
+# Check if old IPFire specifc userparameters exist and move out of the way
+if [ -f /etc/zabbix_agentd/zabbix_agentd.d/userparameter_pakfire.conf ]; then
+ mv /etc/zabbix_agentd/zabbix_agentd.d/userparameter_pakfire.conf \
+ /etc/zabbix_agentd/zabbix_agentd.d/userparameter_pakfire.conf.save
+fi
+
+# Check if new IPFire specific config is included in restored config
+# and add if required.
+grep -q "Include=/var/ipfire/zabbix_agentd/userparameters/\*.conf" /etc/zabbix_agentd/zabbix_agentd.conf
+if [ $? -eq 1 ]; then
+ echo "" >> /etc/zabbix_agentd/zabbix_agentd.conf
+ echo "# This line activates IPFire specific userparameters. " >> /etc/zabbix_agentd/zabbix_agentd.conf
+ echo "# See IPFire wiki for details." >> /etc/zabbix_agentd/zabbix_agentd.conf
+ echo "# To deactivate them: Comment this line out." >> /etc/zabbix_agentd/zabbix_agentd.conf
+ echo "# (DO NOT REMOVE OR ALTER IT as then it will be re-added on next upgrade)" >> /etc/zabbix_agentd/zabbix_agentd.conf
+ echo "Include=/var/ipfire/zabbix_agentd/userparameters/*.conf" >> /etc/zabbix_agentd/zabbix_agentd.conf
+fi
+
+grep -q "Include=/var/ipfire/zabbix_agentd/zabbix_agentd_ipfire_mandatory.conf" /etc/zabbix_agentd/zabbix_agentd.conf
+if [ $? -eq 1 ]; then
+ # Remove settings that are now in our own config
+ sed -i -e "\|^PidFile=.*$|d" /etc/zabbix_agentd/zabbix_agentd.conf
+ sed -i -e "\|^LogFile=.*$|d" /etc/zabbix_agentd/zabbix_agentd.conf
+ sed -i -e "\|^LogFileSize=.*$|d" /etc/zabbix_agentd/zabbix_agentd.conf
+ sed -i -e "\|^LoadModulePath=.*$|d" /etc/zabbix_agentd/zabbix_agentd.conf
+ sed -i -e "\|^Include=/etc/zabbix_agentd/zabbix_agentd\.d/\*\.conf$|d" /etc/zabbix_agentd/zabbix_agentd.conf
+ # Include our own config in main config
+ echo "" >> /etc/zabbix_agentd/zabbix_agentd.conf
+ echo "# Mandatory Zabbix Agent configuration to start and run on IPFire correctly" >> /etc/zabbix_agentd/zabbix_agentd.conf
+ echo "# DO NOT REMOVE OR MODIFY THIS LINE:" >> /etc/zabbix_agentd/zabbix_agentd.conf
+ echo "Include=/var/ipfire/zabbix_agentd/zabbix_agentd_ipfire_mandatory.conf" >> /etc/zabbix_agentd/zabbix_agentd.conf
+fi
+
+# By default, only listen on GREEN
+(
+ eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
+ if [ -n "${GREEN_ADDRESS}" ]; then
+ sed -i -e "s|ListenIP=GREEN_ADDRESS|ListenIP=${GREEN_ADDRESS}|g" /etc/zabbix_agentd/zabbix_agentd.conf
+ else
+ sed -i -e "\|ListenIP=GREEN_ADDRESS|d" /etc/zabbix_agentd/zabbix_agentd.conf
+ fi
+) || :
+
start_service --background ${NAME}
diff --git a/src/paks/zabbix_agentd/update.sh b/src/paks/zabbix_agentd/update.sh
index 7fc1c96fb..a41e72ab4 100644
--- a/src/paks/zabbix_agentd/update.sh
+++ b/src/paks/zabbix_agentd/update.sh
@@ -22,10 +22,25 @@
############################################################################
#
. /opt/pakfire/lib/functions.sh
-./uninstall.sh
-./install.sh
-# Ensure /etc/sudoers.d/zabbix.user is renamed to /etc/sudoers.d/zabbix
-if [ -e /etc/sudoers.d/zabbix.user ]; then
+# Check if old sudoers file exists and remove if it was not modified
+# or rename to the new zabbix_agentd_user file if it was.
+if [ -f /etc/sudoers.d/zabbix.user ]; then
mv -v /etc/sudoers.d/zabbix.user /etc/sudoers.d/zabbix
fi
+
+if [ -f /etc/sudoers.d/zabbix ]; then
+ blake2=$(b2sum /etc/sudoers.d/zabbix | cut -f1 -d" ")
+ # from commits 5737a22 & 06fc617
+ if [ "$blake2" == "b0f73b107fd3842efc7ef3e30f6d948235aa07d533715476c2d3f58c08379193fdde9ff69aa6e0f5eb6cf4a98b2ed2a6f003f23078a57aff239b34cc29e62a98" ] || \
+ [ "$blake2" == "0628c416a1f217b0962a8ce6d1e339bdb0f0427d86fc06b2e40b63487ffc1a3543562d16f7f954d7fb92cee9764f0261c1663a39dd50bc73fd9b772575c56cfc" ]; then
+ rm -vf /etc/sudoers.d/zabbix
+ else
+ mv -v /etc/sudoers.d/zabbix /etc/sudoers.d/zabbix_agentd_user
+ fi
+fi
+
+extract_backup_includes
+./uninstall.sh
+./install.sh
+
diff --git a/src/stripper b/src/stripper
index fadbc514b..4014f03a4 100755
--- a/src/stripper
+++ b/src/stripper
@@ -38,6 +38,10 @@ function _strip() {
args+=( "--strip-all" )
;;
+ *Type:*"DYN (Position-Independent Executable file)"*)
+ args+=( "--strip-all" )
+ ;;
+
# Binaries
*Type:*"EXEC (Executable file)"*)
args+=( "--strip-all" )
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 801143615a8c8e68adad8cd6e9ffa4a07b7ae0b0
by Peter Müller 06 Jul '22
by Peter Müller 06 Jul '22
06 Jul '22
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 801143615a8c8e68adad8cd6e9ffa4a07b7ae0b0 (commit)
via 9c695193ef90149e0bd87bbfa2b27ad303423dde (commit)
from f42dc99758f90700fc0fd1a12bb1768fb6a3f9e1 (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 801143615a8c8e68adad8cd6e9ffa4a07b7ae0b0
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Wed Jul 6 06:30:09 2022 +0000
Core Update 170: Ship ca-certificates
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 9c695193ef90149e0bd87bbfa2b27ad303423dde
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sat Jun 25 22:30:23 2022 +0000
ca-certificates: Update root CA certificates bundle
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/ca-certificates/certdata.txt | 1296 +++++++++++++++++---
.../121 => core/170}/filelists/ca-certificates | 0
lfs/ca-certificates | 2 +-
3 files changed, 1139 insertions(+), 159 deletions(-)
copy config/rootfiles/{oldcore/121 => core/170}/filelists/ca-certificates (100%)
Difference in files:
diff --git a/config/ca-certificates/certdata.txt b/config/ca-certificates/certdata.txt
index 4645042ba..e42b8c345 100644
--- a/config/ca-certificates/certdata.txt
+++ b/config/ca-certificates/certdata.txt
@@ -8003,164 +8003,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 "Hellenic Academic and Research Institutions RootCA 2011"
-#
-# Issuer: CN=Hellenic Academic and Research Institutions RootCA 2011,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR
-# Serial Number: 0 (0x0)
-# Subject: CN=Hellenic Academic and Research Institutions RootCA 2011,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR
-# Not Valid Before: Tue Dec 06 13:49:52 2011
-# Not Valid After : Mon Dec 01 13:49:52 2031
-# Fingerprint (SHA-256): BC:10:4F:15:A4:8B:E7:09:DC:A5:42:A7:E1:D4:B9:DF:6F:05:45:27:E8:02:EA:A9:2D:59:54:44:25:8A:FE:71
-# Fingerprint (SHA1): FE:45:65:9B:79:03:5B:98:A1:61:B5:51:2E:AC:DA:58:09:48:22:4D
-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 "Hellenic Academic and Research Institutions RootCA 2011"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\201\225\061\013\060\011\006\003\125\004\006\023\002\107\122
-\061\104\060\102\006\003\125\004\012\023\073\110\145\154\154\145
-\156\151\143\040\101\143\141\144\145\155\151\143\040\141\156\144
-\040\122\145\163\145\141\162\143\150\040\111\156\163\164\151\164
-\165\164\151\157\156\163\040\103\145\162\164\056\040\101\165\164
-\150\157\162\151\164\171\061\100\060\076\006\003\125\004\003\023
-\067\110\145\154\154\145\156\151\143\040\101\143\141\144\145\155
-\151\143\040\141\156\144\040\122\145\163\145\141\162\143\150\040
-\111\156\163\164\151\164\165\164\151\157\156\163\040\122\157\157
-\164\103\101\040\062\060\061\061
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\225\061\013\060\011\006\003\125\004\006\023\002\107\122
-\061\104\060\102\006\003\125\004\012\023\073\110\145\154\154\145
-\156\151\143\040\101\143\141\144\145\155\151\143\040\141\156\144
-\040\122\145\163\145\141\162\143\150\040\111\156\163\164\151\164
-\165\164\151\157\156\163\040\103\145\162\164\056\040\101\165\164
-\150\157\162\151\164\171\061\100\060\076\006\003\125\004\003\023
-\067\110\145\154\154\145\156\151\143\040\101\143\141\144\145\155
-\151\143\040\141\156\144\040\122\145\163\145\141\162\143\150\040
-\111\156\163\164\151\164\165\164\151\157\156\163\040\122\157\157
-\164\103\101\040\062\060\061\061
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\000
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\004\061\060\202\003\031\240\003\002\001\002\002\001\000
-\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060
-\201\225\061\013\060\011\006\003\125\004\006\023\002\107\122\061
-\104\060\102\006\003\125\004\012\023\073\110\145\154\154\145\156
-\151\143\040\101\143\141\144\145\155\151\143\040\141\156\144\040
-\122\145\163\145\141\162\143\150\040\111\156\163\164\151\164\165
-\164\151\157\156\163\040\103\145\162\164\056\040\101\165\164\150
-\157\162\151\164\171\061\100\060\076\006\003\125\004\003\023\067
-\110\145\154\154\145\156\151\143\040\101\143\141\144\145\155\151
-\143\040\141\156\144\040\122\145\163\145\141\162\143\150\040\111
-\156\163\164\151\164\165\164\151\157\156\163\040\122\157\157\164
-\103\101\040\062\060\061\061\060\036\027\015\061\061\061\062\060
-\066\061\063\064\071\065\062\132\027\015\063\061\061\062\060\061
-\061\063\064\071\065\062\132\060\201\225\061\013\060\011\006\003
-\125\004\006\023\002\107\122\061\104\060\102\006\003\125\004\012
-\023\073\110\145\154\154\145\156\151\143\040\101\143\141\144\145
-\155\151\143\040\141\156\144\040\122\145\163\145\141\162\143\150
-\040\111\156\163\164\151\164\165\164\151\157\156\163\040\103\145
-\162\164\056\040\101\165\164\150\157\162\151\164\171\061\100\060
-\076\006\003\125\004\003\023\067\110\145\154\154\145\156\151\143
-\040\101\143\141\144\145\155\151\143\040\141\156\144\040\122\145
-\163\145\141\162\143\150\040\111\156\163\164\151\164\165\164\151
-\157\156\163\040\122\157\157\164\103\101\040\062\060\061\061\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
-\251\123\000\343\056\246\366\216\372\140\330\055\225\076\370\054
-\052\124\116\315\271\204\141\224\130\117\217\075\213\344\103\363
-\165\211\215\121\344\303\067\322\212\210\115\171\036\267\022\335
-\103\170\112\212\222\346\327\110\325\017\244\072\051\104\065\270
-\007\366\150\035\125\315\070\121\360\214\044\061\205\257\203\311
-\175\351\167\257\355\032\173\235\027\371\263\235\070\120\017\246
-\132\171\221\200\257\067\256\246\323\061\373\265\046\011\235\074
-\132\357\121\305\053\337\226\135\353\062\036\002\332\160\111\354
-\156\014\310\232\067\215\367\361\066\140\113\046\054\202\236\320
-\170\363\015\017\143\244\121\060\341\371\053\047\022\007\330\352
-\275\030\142\230\260\131\067\175\276\356\363\040\121\102\132\203
-\357\223\272\151\025\361\142\235\237\231\071\202\241\267\164\056
-\213\324\305\013\173\057\360\310\012\332\075\171\012\232\223\034
-\245\050\162\163\221\103\232\247\321\115\205\204\271\251\164\217
-\024\100\307\334\336\254\101\144\154\264\031\233\002\143\155\044
-\144\217\104\262\045\352\316\135\164\014\143\062\134\215\207\345
-\002\003\001\000\001\243\201\211\060\201\206\060\017\006\003\125
-\035\023\001\001\377\004\005\060\003\001\001\377\060\013\006\003
-\125\035\017\004\004\003\002\001\006\060\035\006\003\125\035\016
-\004\026\004\024\246\221\102\375\023\141\112\043\236\010\244\051
-\345\330\023\004\043\356\101\045\060\107\006\003\125\035\036\004
-\100\060\076\240\074\060\005\202\003\056\147\162\060\005\202\003
-\056\145\165\060\006\202\004\056\145\144\165\060\006\202\004\056
-\157\162\147\060\005\201\003\056\147\162\060\005\201\003\056\145
-\165\060\006\201\004\056\145\144\165\060\006\201\004\056\157\162
-\147\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000
-\003\202\001\001\000\037\357\171\101\341\173\156\077\262\214\206
-\067\102\112\116\034\067\036\215\146\272\044\201\311\117\022\017
-\041\300\003\227\206\045\155\135\323\042\051\250\154\242\015\251
-\353\075\006\133\231\072\307\314\303\232\064\177\253\016\310\116
-\034\341\372\344\334\315\015\276\277\044\376\154\347\153\302\015
-\310\006\236\116\215\141\050\246\152\375\345\366\142\352\030\074
-\116\240\123\235\262\072\234\353\245\234\221\026\266\115\202\340
-\014\005\110\251\154\365\314\370\313\235\111\264\360\002\245\375
-\160\003\355\212\041\245\256\023\206\111\303\063\163\276\207\073
-\164\213\027\105\046\114\026\221\203\376\147\175\315\115\143\147
-\372\363\003\022\226\170\006\215\261\147\355\216\077\276\237\117
-\002\365\263\011\057\363\114\207\337\052\313\225\174\001\314\254
-\066\172\277\242\163\172\367\217\301\265\232\241\024\262\217\063
-\237\015\357\042\334\146\173\204\275\105\027\006\075\074\312\271
-\167\064\217\312\352\317\077\061\076\343\210\343\200\111\045\310
-\227\265\235\232\231\115\260\074\370\112\000\233\144\335\237\071
-\113\321\047\327\270
-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 "Hellenic Academic and Research Institutions RootCA 2011"
-# Issuer: CN=Hellenic Academic and Research Institutions RootCA 2011,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR
-# Serial Number: 0 (0x0)
-# Subject: CN=Hellenic Academic and Research Institutions RootCA 2011,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR
-# Not Valid Before: Tue Dec 06 13:49:52 2011
-# Not Valid After : Mon Dec 01 13:49:52 2031
-# Fingerprint (SHA-256): BC:10:4F:15:A4:8B:E7:09:DC:A5:42:A7:E1:D4:B9:DF:6F:05:45:27:E8:02:EA:A9:2D:59:54:44:25:8A:FE:71
-# Fingerprint (SHA1): FE:45:65:9B:79:03:5B:98:A1:61:B5:51:2E:AC:DA:58:09:48:22:4D
-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 "Hellenic Academic and Research Institutions RootCA 2011"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\376\105\145\233\171\003\133\230\241\141\265\121\056\254\332\130
-\011\110\042\115
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\163\237\114\113\163\133\171\351\372\272\034\357\156\313\325\311
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\225\061\013\060\011\006\003\125\004\006\023\002\107\122
-\061\104\060\102\006\003\125\004\012\023\073\110\145\154\154\145
-\156\151\143\040\101\143\141\144\145\155\151\143\040\141\156\144
-\040\122\145\163\145\141\162\143\150\040\111\156\163\164\151\164
-\165\164\151\157\156\163\040\103\145\162\164\056\040\101\165\164
-\150\157\162\151\164\171\061\100\060\076\006\003\125\004\003\023
-\067\110\145\154\154\145\156\151\143\040\101\143\141\144\145\155
-\151\143\040\141\156\144\040\122\145\163\145\141\162\143\150\040
-\111\156\163\164\151\164\165\164\151\157\156\163\040\122\157\157
-\164\103\101\040\062\060\061\061
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\000
-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 "Actalis Authentication Root CA"
#
@@ -23499,3 +23341,1141 @@ 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 "DigiCert TLS ECC P384 Root G5"
+#
+# Issuer: CN=DigiCert TLS ECC P384 Root G5,O="DigiCert, Inc.",C=US
+# Serial Number:09:e0:93:65:ac:f7:d9:c8:b9:3e:1c:0b:04:2a:2e:f3
+# Subject: CN=DigiCert TLS ECC P384 Root G5,O="DigiCert, Inc.",C=US
+# Not Valid Before: Fri Jan 15 00:00:00 2021
+# Not Valid After : Sun Jan 14 23:59:59 2046
+# Fingerprint (SHA-256): 01:8E:13:F0:77:25:32:CF:80:9B:D1:B1:72:81:86:72:83:FC:48:C6:E1:3B:E9:C6:98:12:85:4A:49:0C:1B:05
+# Fingerprint (SHA1): 17:F3:DE:5E:9F:0F:19:E9:8E:F6:1F:32:26:6E:20:C4:07:AE:30:EE
+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 "DigiCert TLS ECC P384 Root G5"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\116\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\027\060\025\006\003\125\004\012\023\016\104\151\147\151\103\145
+\162\164\054\040\111\156\143\056\061\046\060\044\006\003\125\004
+\003\023\035\104\151\147\151\103\145\162\164\040\124\114\123\040
+\105\103\103\040\120\063\070\064\040\122\157\157\164\040\107\065
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\116\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\027\060\025\006\003\125\004\012\023\016\104\151\147\151\103\145
+\162\164\054\040\111\156\143\056\061\046\060\044\006\003\125\004
+\003\023\035\104\151\147\151\103\145\162\164\040\124\114\123\040
+\105\103\103\040\120\063\070\064\040\122\157\157\164\040\107\065
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\020\011\340\223\145\254\367\331\310\271\076\034\013\004\052
+\056\363
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\002\031\060\202\001\237\240\003\002\001\002\002\020\011
+\340\223\145\254\367\331\310\271\076\034\013\004\052\056\363\060
+\012\006\010\052\206\110\316\075\004\003\003\060\116\061\013\060
+\011\006\003\125\004\006\023\002\125\123\061\027\060\025\006\003
+\125\004\012\023\016\104\151\147\151\103\145\162\164\054\040\111
+\156\143\056\061\046\060\044\006\003\125\004\003\023\035\104\151
+\147\151\103\145\162\164\040\124\114\123\040\105\103\103\040\120
+\063\070\064\040\122\157\157\164\040\107\065\060\036\027\015\062
+\061\060\061\061\065\060\060\060\060\060\060\132\027\015\064\066
+\060\061\061\064\062\063\065\071\065\071\132\060\116\061\013\060
+\011\006\003\125\004\006\023\002\125\123\061\027\060\025\006\003
+\125\004\012\023\016\104\151\147\151\103\145\162\164\054\040\111
+\156\143\056\061\046\060\044\006\003\125\004\003\023\035\104\151
+\147\151\103\145\162\164\040\124\114\123\040\105\103\103\040\120
+\063\070\064\040\122\157\157\164\040\107\065\060\166\060\020\006
+\007\052\206\110\316\075\002\001\006\005\053\201\004\000\042\003
+\142\000\004\301\104\241\317\021\227\120\232\336\043\202\065\007
+\315\320\313\030\235\322\361\177\167\065\117\073\335\224\162\122
+\355\302\073\370\354\372\173\153\130\040\354\231\256\311\374\150
+\263\165\271\333\011\354\310\023\365\116\306\012\035\146\060\114
+\273\037\107\012\074\141\020\102\051\174\245\010\016\340\042\351
+\323\065\150\316\233\143\237\204\265\231\115\130\240\216\365\124
+\347\225\311\243\102\060\100\060\035\006\003\125\035\016\004\026
+\004\024\301\121\105\120\131\253\076\347\054\132\372\040\042\022
+\007\200\210\174\021\152\060\016\006\003\125\035\017\001\001\377
+\004\004\003\002\001\206\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\211\152\215\107\347
+\354\374\156\125\003\331\147\154\046\116\203\306\375\311\373\053
+\023\274\267\172\214\264\145\322\151\151\143\023\143\073\046\120
+\056\001\241\171\006\221\235\110\277\302\276\002\060\107\303\025
+\173\261\240\221\231\111\223\250\074\174\350\106\006\213\054\362
+\061\000\224\235\142\310\211\275\031\204\024\351\245\373\001\270
+\015\166\103\214\056\123\313\174\337\014\027\226\120
+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 "DigiCert TLS ECC P384 Root G5"
+# Issuer: CN=DigiCert TLS ECC P384 Root G5,O="DigiCert, Inc.",C=US
+# Serial Number:09:e0:93:65:ac:f7:d9:c8:b9:3e:1c:0b:04:2a:2e:f3
+# Subject: CN=DigiCert TLS ECC P384 Root G5,O="DigiCert, Inc.",C=US
+# Not Valid Before: Fri Jan 15 00:00:00 2021
+# Not Valid After : Sun Jan 14 23:59:59 2046
+# Fingerprint (SHA-256): 01:8E:13:F0:77:25:32:CF:80:9B:D1:B1:72:81:86:72:83:FC:48:C6:E1:3B:E9:C6:98:12:85:4A:49:0C:1B:05
+# Fingerprint (SHA1): 17:F3:DE:5E:9F:0F:19:E9:8E:F6:1F:32:26:6E:20:C4:07:AE:30:EE
+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 "DigiCert TLS ECC P384 Root G5"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\027\363\336\136\237\017\031\351\216\366\037\062\046\156\040\304
+\007\256\060\356
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\323\161\004\152\103\034\333\246\131\341\250\243\252\305\161\355
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\116\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\027\060\025\006\003\125\004\012\023\016\104\151\147\151\103\145
+\162\164\054\040\111\156\143\056\061\046\060\044\006\003\125\004
+\003\023\035\104\151\147\151\103\145\162\164\040\124\114\123\040
+\105\103\103\040\120\063\070\064\040\122\157\157\164\040\107\065
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\020\011\340\223\145\254\367\331\310\271\076\034\013\004\052
+\056\363
+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 "DigiCert TLS RSA4096 Root G5"
+#
+# Issuer: CN=DigiCert TLS RSA4096 Root G5,O="DigiCert, Inc.",C=US
+# Serial Number:08:f9:b4:78:a8:fa:7e:da:6a:33:37:89:de:7c:cf:8a
+# Subject: CN=DigiCert TLS RSA4096 Root G5,O="DigiCert, Inc.",C=US
+# Not Valid Before: Fri Jan 15 00:00:00 2021
+# Not Valid After : Sun Jan 14 23:59:59 2046
+# Fingerprint (SHA-256): 37:1A:00:DC:05:33:B3:72:1A:7E:EB:40:E8:41:9E:70:79:9D:2B:0A:0F:2C:1D:80:69:31:65:F7:CE:C4:AD:75
+# Fingerprint (SHA1): A7:88:49:DC:5D:7C:75:8C:8C:DE:39:98:56:B3:AA:D0:B2:A5:71:35
+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 "DigiCert TLS RSA4096 Root G5"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\115\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\027\060\025\006\003\125\004\012\023\016\104\151\147\151\103\145
+\162\164\054\040\111\156\143\056\061\045\060\043\006\003\125\004
+\003\023\034\104\151\147\151\103\145\162\164\040\124\114\123\040
+\122\123\101\064\060\071\066\040\122\157\157\164\040\107\065
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\115\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\027\060\025\006\003\125\004\012\023\016\104\151\147\151\103\145
+\162\164\054\040\111\156\143\056\061\045\060\043\006\003\125\004
+\003\023\034\104\151\147\151\103\145\162\164\040\124\114\123\040
+\122\123\101\064\060\071\066\040\122\157\157\164\040\107\065
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\020\010\371\264\170\250\372\176\332\152\063\067\211\336\174
+\317\212
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\005\146\060\202\003\116\240\003\002\001\002\002\020\010
+\371\264\170\250\372\176\332\152\063\067\211\336\174\317\212\060
+\015\006\011\052\206\110\206\367\015\001\001\014\005\000\060\115
+\061\013\060\011\006\003\125\004\006\023\002\125\123\061\027\060
+\025\006\003\125\004\012\023\016\104\151\147\151\103\145\162\164
+\054\040\111\156\143\056\061\045\060\043\006\003\125\004\003\023
+\034\104\151\147\151\103\145\162\164\040\124\114\123\040\122\123
+\101\064\060\071\066\040\122\157\157\164\040\107\065\060\036\027
+\015\062\061\060\061\061\065\060\060\060\060\060\060\132\027\015
+\064\066\060\061\061\064\062\063\065\071\065\071\132\060\115\061
+\013\060\011\006\003\125\004\006\023\002\125\123\061\027\060\025
+\006\003\125\004\012\023\016\104\151\147\151\103\145\162\164\054
+\040\111\156\143\056\061\045\060\043\006\003\125\004\003\023\034
+\104\151\147\151\103\145\162\164\040\124\114\123\040\122\123\101
+\064\060\071\066\040\122\157\157\164\040\107\065\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\320\364
+\311\171\021\235\375\374\146\201\347\314\325\344\274\354\201\076
+\152\065\216\056\267\347\336\257\371\007\115\317\060\235\352\011
+\013\231\275\154\127\332\030\112\270\170\254\072\071\250\246\110
+\254\056\162\345\275\353\361\032\315\347\244\003\251\077\021\264
+\330\057\211\026\373\224\001\075\273\057\370\023\005\241\170\034
+\216\050\340\105\340\203\364\131\033\225\263\256\176\003\105\345
+\276\302\102\376\356\362\074\266\205\023\230\062\235\026\250\051
+\302\013\034\070\334\237\061\167\134\277\047\243\374\047\254\267
+\053\275\164\233\027\055\362\201\332\135\260\341\043\027\076\210
+\112\022\043\320\352\317\235\336\003\027\261\102\112\240\026\114
+\244\155\223\351\077\072\356\072\174\235\130\235\364\116\217\374
+\073\043\310\155\270\342\005\332\314\353\354\303\061\364\327\247
+\051\124\200\317\104\133\114\157\060\236\363\314\335\037\224\103
+\235\115\177\160\160\015\324\072\321\067\360\154\235\233\300\024
+\223\130\357\315\101\070\165\274\023\003\225\174\177\343\134\351
+\325\015\325\342\174\020\142\252\153\360\075\166\363\077\243\350
+\260\301\375\357\252\127\115\254\206\247\030\264\051\301\054\016
+\277\144\276\051\214\330\002\055\315\134\057\362\177\357\025\364
+\014\025\254\012\260\361\323\015\117\152\115\167\227\001\240\361
+\146\267\267\316\357\316\354\354\245\165\312\254\343\341\143\367
+\270\241\004\310\274\173\077\135\055\026\042\126\355\110\111\376
+\247\057\171\060\045\233\272\153\055\077\235\073\304\027\347\035
+\056\373\362\317\246\374\343\024\054\226\230\041\214\264\221\351
+\031\140\203\362\060\053\006\163\120\325\230\073\006\351\307\212
+\014\140\214\050\370\122\233\156\341\366\115\273\006\044\233\327
+\053\046\077\375\052\057\161\365\326\044\276\177\061\236\017\155
+\350\217\117\115\243\077\377\065\352\337\111\136\101\217\206\371
+\361\167\171\113\033\264\243\136\057\373\106\002\320\146\023\136
+\136\205\117\316\330\160\210\173\316\001\265\226\227\327\315\175
+\375\202\370\302\044\301\312\001\071\117\215\242\301\024\100\037
+\234\146\325\014\011\106\326\362\320\321\110\166\126\072\103\313
+\266\012\021\071\272\214\023\154\006\265\236\317\353\002\003\001
+\000\001\243\102\060\100\060\035\006\003\125\035\016\004\026\004
+\024\121\063\034\355\066\100\257\027\323\045\315\151\150\362\257
+\116\043\076\263\101\060\016\006\003\125\035\017\001\001\377\004
+\004\003\002\001\206\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\140\246\257\133\137\127
+\332\211\333\113\120\251\304\043\065\041\377\320\141\060\204\221
+\267\077\020\317\045\216\311\277\106\064\331\301\041\046\034\160
+\031\162\036\243\311\207\376\251\103\144\226\072\310\123\004\012
+\266\101\273\304\107\000\331\237\030\030\073\262\016\363\064\352
+\044\367\335\257\040\140\256\222\050\137\066\347\135\344\336\307
+\074\333\120\071\255\273\075\050\115\226\174\166\306\133\364\301
+\333\024\245\253\031\142\007\030\100\137\227\221\334\234\307\253
+\265\121\015\346\151\123\125\314\071\175\332\305\021\125\162\305
+\073\213\211\370\064\055\244\027\345\027\346\231\175\060\210\041
+\067\315\060\027\075\270\362\274\250\165\240\103\334\076\211\113
+\220\256\155\003\340\034\243\240\226\011\273\175\243\267\052\020
+\104\113\106\007\064\143\355\061\271\004\356\243\233\232\256\346
+\061\170\364\352\044\141\073\253\130\144\377\273\207\047\142\045
+\201\337\334\241\057\366\355\247\377\172\217\121\056\060\370\244
+\001\322\205\071\137\001\231\226\157\132\133\160\031\106\376\206
+\140\076\255\200\020\011\335\071\045\057\130\177\273\322\164\360
+\367\106\037\106\071\112\330\123\320\363\056\073\161\245\324\157
+\374\363\147\344\007\217\335\046\031\341\215\133\372\243\223\021
+\233\351\310\072\303\125\150\232\222\341\122\166\070\350\341\272
+\275\373\117\325\357\263\347\110\203\061\360\202\041\343\266\276
+\247\253\157\357\237\337\114\317\001\270\142\152\043\075\347\011
+\115\200\033\173\060\244\303\335\007\177\064\276\244\046\262\366
+\101\350\011\035\343\040\230\252\067\117\377\367\361\342\051\160
+\061\107\077\164\320\024\026\372\041\212\002\325\212\011\224\167
+\056\362\131\050\213\174\120\222\012\146\170\070\203\165\304\265
+\132\250\021\306\345\301\235\146\125\317\123\304\257\327\165\205
+\251\102\023\126\354\041\167\201\223\132\014\352\226\331\111\312
+\241\010\362\227\073\155\233\004\030\044\104\216\174\001\362\334
+\045\330\136\206\232\261\071\333\365\221\062\152\321\246\160\212
+\242\367\336\244\105\205\046\250\036\214\135\051\133\310\113\330
+\232\152\003\136\160\362\205\117\154\113\150\057\312\124\366\214
+\332\062\376\303\153\203\077\070\306\176
+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 "DigiCert TLS RSA4096 Root G5"
+# Issuer: CN=DigiCert TLS RSA4096 Root G5,O="DigiCert, Inc.",C=US
+# Serial Number:08:f9:b4:78:a8:fa:7e:da:6a:33:37:89:de:7c:cf:8a
+# Subject: CN=DigiCert TLS RSA4096 Root G5,O="DigiCert, Inc.",C=US
+# Not Valid Before: Fri Jan 15 00:00:00 2021
+# Not Valid After : Sun Jan 14 23:59:59 2046
+# Fingerprint (SHA-256): 37:1A:00:DC:05:33:B3:72:1A:7E:EB:40:E8:41:9E:70:79:9D:2B:0A:0F:2C:1D:80:69:31:65:F7:CE:C4:AD:75
+# Fingerprint (SHA1): A7:88:49:DC:5D:7C:75:8C:8C:DE:39:98:56:B3:AA:D0:B2:A5:71:35
+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 "DigiCert TLS RSA4096 Root G5"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\247\210\111\334\135\174\165\214\214\336\071\230\126\263\252\320
+\262\245\161\065
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\254\376\367\064\226\251\362\263\264\022\113\344\047\101\157\341
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\115\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\027\060\025\006\003\125\004\012\023\016\104\151\147\151\103\145
+\162\164\054\040\111\156\143\056\061\045\060\043\006\003\125\004
+\003\023\034\104\151\147\151\103\145\162\164\040\124\114\123\040
+\122\123\101\064\060\071\066\040\122\157\157\164\040\107\065
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\020\010\371\264\170\250\372\176\332\152\063\067\211\336\174
+\317\212
+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 "DigiCert SMIME ECC P384 Root G5"
+#
+# Issuer: CN=DigiCert SMIME ECC P384 Root G5,O="DigiCert, Inc.",C=US
+# Serial Number:05:3f:6e:a0:06:01:72:7d:ed:3f:c3:a3:b6:a3:d6:ef
+# Subject: CN=DigiCert SMIME ECC P384 Root G5,O="DigiCert, Inc.",C=US
+# Not Valid Before: Fri Jan 15 00:00:00 2021
+# Not Valid After : Sun Jan 14 23:59:59 2046
+# Fingerprint (SHA-256): E8:E8:17:65:36:A6:0C:C2:C4:E1:01:87:C3:BE:FC:A2:0E:F2:63:49:70:18:F5:66:D5:BE:A0:F9:4D:0C:11:1B
+# Fingerprint (SHA1): 1C:B8:A7:08:C9:0D:20:79:01:A0:B2:36:7F:F0:95:65:E4:53:24:FE
+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 "DigiCert SMIME ECC P384 Root G5"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\120\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\027\060\025\006\003\125\004\012\023\016\104\151\147\151\103\145
+\162\164\054\040\111\156\143\056\061\050\060\046\006\003\125\004
+\003\023\037\104\151\147\151\103\145\162\164\040\123\115\111\115
+\105\040\105\103\103\040\120\063\070\064\040\122\157\157\164\040
+\107\065
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\120\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\027\060\025\006\003\125\004\012\023\016\104\151\147\151\103\145
+\162\164\054\040\111\156\143\056\061\050\060\046\006\003\125\004
+\003\023\037\104\151\147\151\103\145\162\164\040\123\115\111\115
+\105\040\105\103\103\040\120\063\070\064\040\122\157\157\164\040
+\107\065
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\020\005\077\156\240\006\001\162\175\355\077\303\243\266\243
+\326\357
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\002\034\060\202\001\243\240\003\002\001\002\002\020\005
+\077\156\240\006\001\162\175\355\077\303\243\266\243\326\357\060
+\012\006\010\052\206\110\316\075\004\003\003\060\120\061\013\060
+\011\006\003\125\004\006\023\002\125\123\061\027\060\025\006\003
+\125\004\012\023\016\104\151\147\151\103\145\162\164\054\040\111
+\156\143\056\061\050\060\046\006\003\125\004\003\023\037\104\151
+\147\151\103\145\162\164\040\123\115\111\115\105\040\105\103\103
+\040\120\063\070\064\040\122\157\157\164\040\107\065\060\036\027
+\015\062\061\060\061\061\065\060\060\060\060\060\060\132\027\015
+\064\066\060\061\061\064\062\063\065\071\065\071\132\060\120\061
+\013\060\011\006\003\125\004\006\023\002\125\123\061\027\060\025
+\006\003\125\004\012\023\016\104\151\147\151\103\145\162\164\054
+\040\111\156\143\056\061\050\060\046\006\003\125\004\003\023\037
+\104\151\147\151\103\145\162\164\040\123\115\111\115\105\040\105
+\103\103\040\120\063\070\064\040\122\157\157\164\040\107\065\060
+\166\060\020\006\007\052\206\110\316\075\002\001\006\005\053\201
+\004\000\042\003\142\000\004\026\235\125\345\266\324\373\373\147
+\153\032\324\241\252\322\167\225\076\210\345\007\237\266\160\146
+\040\050\244\210\354\160\065\257\263\062\377\067\023\112\236\274
+\001\003\336\204\301\270\306\346\145\107\211\362\023\125\277\315
+\245\036\010\140\177\255\177\350\141\222\051\317\011\107\136\013
+\034\300\037\244\277\362\133\274\230\357\231\114\314\160\153\266
+\272\320\050\035\277\276\004\243\102\060\100\060\035\006\003\125
+\035\016\004\026\004\024\163\172\153\226\333\102\007\213\122\146
+\302\144\062\027\376\340\147\220\056\255\060\016\006\003\125\035
+\017\001\001\377\004\004\003\002\001\206\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\147\000\060\144\002\060\067\104
+\365\062\200\343\161\353\364\155\317\174\314\221\232\303\156\161
+\330\322\043\135\222\115\202\102\155\134\141\225\366\221\365\247
+\010\366\152\227\351\234\224\055\230\160\375\063\266\011\002\060
+\007\074\057\271\130\202\136\017\243\142\250\223\147\360\040\303
+\151\277\003\054\073\120\247\073\257\101\070\311\122\110\221\326
+\016\373\274\140\060\174\144\077\022\036\105\177\121\076\364\246
+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 "DigiCert SMIME ECC P384 Root G5"
+# Issuer: CN=DigiCert SMIME ECC P384 Root G5,O="DigiCert, Inc.",C=US
+# Serial Number:05:3f:6e:a0:06:01:72:7d:ed:3f:c3:a3:b6:a3:d6:ef
+# Subject: CN=DigiCert SMIME ECC P384 Root G5,O="DigiCert, Inc.",C=US
+# Not Valid Before: Fri Jan 15 00:00:00 2021
+# Not Valid After : Sun Jan 14 23:59:59 2046
+# Fingerprint (SHA-256): E8:E8:17:65:36:A6:0C:C2:C4:E1:01:87:C3:BE:FC:A2:0E:F2:63:49:70:18:F5:66:D5:BE:A0:F9:4D:0C:11:1B
+# Fingerprint (SHA1): 1C:B8:A7:08:C9:0D:20:79:01:A0:B2:36:7F:F0:95:65:E4:53:24:FE
+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 "DigiCert SMIME ECC P384 Root G5"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\034\270\247\010\311\015\040\171\001\240\262\066\177\360\225\145
+\344\123\044\376
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\246\376\364\122\066\104\330\356\015\267\003\013\357\164\263\003
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\120\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\027\060\025\006\003\125\004\012\023\016\104\151\147\151\103\145
+\162\164\054\040\111\156\143\056\061\050\060\046\006\003\125\004
+\003\023\037\104\151\147\151\103\145\162\164\040\123\115\111\115
+\105\040\105\103\103\040\120\063\070\064\040\122\157\157\164\040
+\107\065
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\020\005\077\156\240\006\001\162\175\355\077\303\243\266\243
+\326\357
+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 "DigiCert SMIME RSA4096 Root G5"
+#
+# Issuer: CN=DigiCert SMIME RSA4096 Root G5,O="DigiCert, Inc.",C=US
+# Serial Number:05:f6:ba:04:23:83:46:cb:7d:5c:e6:b9:5b:ba:1c:55
+# Subject: CN=DigiCert SMIME RSA4096 Root G5,O="DigiCert, Inc.",C=US
+# Not Valid Before: Fri Jan 15 00:00:00 2021
+# Not Valid After : Sun Jan 14 23:59:59 2046
+# Fingerprint (SHA-256): 90:37:0D:3E:FA:88:BF:58:C3:01:05:BA:25:10:4A:35:84:60:A7:FA:52:DF:C2:01:1D:F2:33:A0:F4:17:91:2A
+# Fingerprint (SHA1): 5B:C5:AD:E2:9A:A7:54:DA:84:89:53:A5:FE:D7:5B:46:86:D0:57:08
+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 "DigiCert SMIME RSA4096 Root G5"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\117\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\027\060\025\006\003\125\004\012\023\016\104\151\147\151\103\145
+\162\164\054\040\111\156\143\056\061\047\060\045\006\003\125\004
+\003\023\036\104\151\147\151\103\145\162\164\040\123\115\111\115
+\105\040\122\123\101\064\060\071\066\040\122\157\157\164\040\107
+\065
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\117\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\027\060\025\006\003\125\004\012\023\016\104\151\147\151\103\145
+\162\164\054\040\111\156\143\056\061\047\060\045\006\003\125\004
+\003\023\036\104\151\147\151\103\145\162\164\040\123\115\111\115
+\105\040\122\123\101\064\060\071\066\040\122\157\157\164\040\107
+\065
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\020\005\366\272\004\043\203\106\313\175\134\346\271\133\272
+\034\125
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\005\152\060\202\003\122\240\003\002\001\002\002\020\005
+\366\272\004\043\203\106\313\175\134\346\271\133\272\034\125\060
+\015\006\011\052\206\110\206\367\015\001\001\014\005\000\060\117
+\061\013\060\011\006\003\125\004\006\023\002\125\123\061\027\060
+\025\006\003\125\004\012\023\016\104\151\147\151\103\145\162\164
+\054\040\111\156\143\056\061\047\060\045\006\003\125\004\003\023
+\036\104\151\147\151\103\145\162\164\040\123\115\111\115\105\040
+\122\123\101\064\060\071\066\040\122\157\157\164\040\107\065\060
+\036\027\015\062\061\060\061\061\065\060\060\060\060\060\060\132
+\027\015\064\066\060\061\061\064\062\063\065\071\065\071\132\060
+\117\061\013\060\011\006\003\125\004\006\023\002\125\123\061\027
+\060\025\006\003\125\004\012\023\016\104\151\147\151\103\145\162
+\164\054\040\111\156\143\056\061\047\060\045\006\003\125\004\003
+\023\036\104\151\147\151\103\145\162\164\040\123\115\111\115\105
+\040\122\123\101\064\060\071\066\040\122\157\157\164\040\107\065
+\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\340\152\133\331\370\371\175\354\265\173\357\137\335\134\064
+\330\332\135\321\313\145\165\253\041\174\133\000\324\202\157\105
+\205\101\212\251\022\002\162\062\360\024\365\003\165\273\143\227
+\111\017\100\231\013\032\036\126\247\322\320\341\253\335\345\004
+\033\343\037\024\022\002\210\365\240\200\011\366\047\232\120\360
+\272\343\242\340\254\152\024\221\265\153\070\020\172\242\061\341
+\221\033\267\271\360\053\133\310\167\011\166\267\121\304\066\012
+\231\123\124\104\045\267\011\065\206\027\005\126\223\075\101\267
+\002\327\142\037\212\222\021\207\352\021\155\352\010\021\334\261
+\170\110\111\222\366\264\121\200\170\043\330\376\341\126\032\072
+\220\023\126\064\211\325\342\225\213\137\336\262\314\373\077\070
+\267\205\367\352\236\277\056\241\056\057\115\175\152\021\056\066
+\240\377\021\010\004\225\125\340\033\073\147\223\251\224\125\352
+\062\355\006\072\177\302\177\343\255\023\047\321\064\101\263\060
+\303\277\264\210\370\003\202\244\337\076\253\170\167\240\131\223
+\161\347\335\353\000\004\173\314\110\071\050\340\036\243\025\151
+\310\066\262\241\013\227\337\125\326\357\221\234\244\366\026\367
+\121\012\356\003\043\221\334\004\377\340\335\070\366\042\003\000
+\302\007\161\032\022\311\327\106\052\224\033\315\326\273\033\356
+\277\276\115\120\130\260\013\315\060\166\051\365\317\345\266\152
+\057\166\260\260\151\152\320\155\145\030\065\176\223\274\162\027
+\301\125\102\315\057\302\045\273\364\375\035\241\144\042\124\135
+\342\236\162\101\204\156\161\226\352\105\007\266\136\172\112\206
+\235\163\144\167\070\003\322\017\123\245\125\040\304\115\377\150
+\157\125\251\352\335\161\344\117\331\205\243\174\116\051\002\236
+\013\011\362\032\123\314\000\246\335\321\064\366\015\301\060\261
+\234\002\144\254\065\355\245\260\051\261\322\225\063\017\322\040
+\063\275\354\043\113\362\031\371\332\230\144\344\054\061\037\056
+\341\215\034\004\225\050\115\214\130\315\113\345\163\202\206\214
+\354\250\326\171\134\373\144\273\334\014\114\050\366\027\257\342
+\150\326\026\206\230\333\374\001\334\061\272\370\234\016\371\050
+\106\112\341\375\226\006\105\171\021\150\027\145\134\213\046\207
+\133\002\003\001\000\001\243\102\060\100\060\035\006\003\125\035
+\016\004\026\004\024\321\243\324\127\035\117\125\333\165\114\134
+\102\236\143\026\316\264\306\073\037\060\016\006\003\125\035\017
+\001\001\377\004\004\003\002\001\206\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\007\247
+\012\336\123\273\232\353\160\277\262\066\220\315\344\247\270\361
+\014\344\135\132\035\170\145\374\311\270\036\043\021\127\174\151
+\065\155\001\377\123\120\277\007\016\272\307\001\077\130\052\224
+\165\003\253\034\013\043\334\033\212\036\067\075\035\130\217\163
+\331\263\052\157\337\020\240\133\014\247\312\260\177\271\044\242
+\001\065\062\345\136\106\101\353\330\177\163\347\102\351\244\121
+\046\167\201\012\250\353\017\012\120\235\176\212\040\147\374\013
+\216\072\021\323\305\214\140\030\331\113\261\374\324\361\264\111
+\116\256\207\341\321\373\166\241\137\363\006\317\227\226\014\351
+\236\165\201\134\123\015\042\374\066\346\111\156\164\333\000\205
+\215\174\042\240\216\373\020\114\324\142\023\133\357\113\162\046
+\213\374\116\212\217\376\227\020\123\305\170\213\102\144\033\137
+\340\211\375\273\011\177\120\340\124\205\046\021\152\035\145\371
+\111\051\334\174\066\337\373\075\367\322\254\356\062\215\156\246
+\175\071\234\105\304\312\015\365\073\264\171\123\245\057\126\307
+\121\305\212\114\144\135\220\103\043\216\153\114\027\170\314\350
+\277\365\073\344\250\110\317\255\233\014\337\062\112\323\331\022
+\216\043\170\015\055\257\237\257\236\074\011\302\227\000\355\072
+\151\034\161\077\071\337\323\217\304\146\365\357\066\224\017\363
+\335\222\266\226\137\220\246\335\163\252\246\040\224\224\045\152
+\011\014\162\344\023\043\140\114\243\312\027\056\173\147\000\333
+\320\315\352\172\037\071\046\127\211\060\167\313\116\345\225\105
+\117\137\373\066\134\075\371\040\265\072\020\045\117\223\062\132
+\356\301\226\350\351\126\004\260\111\141\115\354\170\250\235\030
+\301\377\330\352\057\126\357\225\053\173\004\136\147\343\125\100
+\355\071\004\371\013\171\365\152\214\134\017\211\232\220\307\315
+\213\336\333\046\065\241\156\315\263\102\362\242\017\073\014\216
+\223\377\024\317\374\367\223\367\344\101\010\156\031\122\021\017
+\123\031\163\170\014\317\330\205\201\370\255\125\310\260\236\106
+\143\257\234\122\356\134\277\360\300\133\067\036\011\040\322\076
+\043\306\241\025\112\016\066\176\060\305\171\152\274\042\210\331
+\014\122\100\037\335\116\017\147\046\026\322\255\027\034
+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 "DigiCert SMIME RSA4096 Root G5"
+# Issuer: CN=DigiCert SMIME RSA4096 Root G5,O="DigiCert, Inc.",C=US
+# Serial Number:05:f6:ba:04:23:83:46:cb:7d:5c:e6:b9:5b:ba:1c:55
+# Subject: CN=DigiCert SMIME RSA4096 Root G5,O="DigiCert, Inc.",C=US
+# Not Valid Before: Fri Jan 15 00:00:00 2021
+# Not Valid After : Sun Jan 14 23:59:59 2046
+# Fingerprint (SHA-256): 90:37:0D:3E:FA:88:BF:58:C3:01:05:BA:25:10:4A:35:84:60:A7:FA:52:DF:C2:01:1D:F2:33:A0:F4:17:91:2A
+# Fingerprint (SHA1): 5B:C5:AD:E2:9A:A7:54:DA:84:89:53:A5:FE:D7:5B:46:86:D0:57:08
+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 "DigiCert SMIME RSA4096 Root G5"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\133\305\255\342\232\247\124\332\204\211\123\245\376\327\133\106
+\206\320\127\010
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\321\173\340\265\077\065\162\237\175\276\013\245\244\035\251\156
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\117\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\027\060\025\006\003\125\004\012\023\016\104\151\147\151\103\145
+\162\164\054\040\111\156\143\056\061\047\060\045\006\003\125\004
+\003\023\036\104\151\147\151\103\145\162\164\040\123\115\111\115
+\105\040\122\123\101\064\060\071\066\040\122\157\157\164\040\107
+\065
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\020\005\366\272\004\043\203\106\313\175\134\346\271\133\272
+\034\125
+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 "Certainly Root R1"
+#
+# Issuer: CN=Certainly Root R1,O=Certainly,C=US
+# Serial Number:00:8e:0f:f9:4b:90:71:68:65:33:54:f4:d4:44:39:b7:e0
+# Subject: CN=Certainly Root R1,O=Certainly,C=US
+# Not Valid Before: Thu Apr 01 00:00:00 2021
+# Not Valid After : Sun Apr 01 00:00:00 2046
+# Fingerprint (SHA-256): 77:B8:2C:D8:64:4C:43:05:F7:AC:C5:CB:15:6B:45:67:50:04:03:3D:51:C6:0C:62:02:A8:E0:C3:34:67:D3:A0
+# Fingerprint (SHA1): A0:50:EE:0F:28:71:F4:27:B2:12:6D:6F:50:96:25:BA:CC:86:42:AF
+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 "Certainly Root R1"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\075\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\022\060\020\006\003\125\004\012\023\011\103\145\162\164\141\151
+\156\154\171\061\032\060\030\006\003\125\004\003\023\021\103\145
+\162\164\141\151\156\154\171\040\122\157\157\164\040\122\061
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\075\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\022\060\020\006\003\125\004\012\023\011\103\145\162\164\141\151
+\156\154\171\061\032\060\030\006\003\125\004\003\023\021\103\145
+\162\164\141\151\156\154\171\040\122\157\157\164\040\122\061
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\021\000\216\017\371\113\220\161\150\145\063\124\364\324\104
+\071\267\340
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\005\107\060\202\003\057\240\003\002\001\002\002\021\000
+\216\017\371\113\220\161\150\145\063\124\364\324\104\071\267\340
+\060\015\006\011\052\206\110\206\367\015\001\001\013\005\000\060
+\075\061\013\060\011\006\003\125\004\006\023\002\125\123\061\022
+\060\020\006\003\125\004\012\023\011\103\145\162\164\141\151\156
+\154\171\061\032\060\030\006\003\125\004\003\023\021\103\145\162
+\164\141\151\156\154\171\040\122\157\157\164\040\122\061\060\036
+\027\015\062\061\060\064\060\061\060\060\060\060\060\060\132\027
+\015\064\066\060\064\060\061\060\060\060\060\060\060\132\060\075
+\061\013\060\011\006\003\125\004\006\023\002\125\123\061\022\060
+\020\006\003\125\004\012\023\011\103\145\162\164\141\151\156\154
+\171\061\032\060\030\006\003\125\004\003\023\021\103\145\162\164
+\141\151\156\154\171\040\122\157\157\164\040\122\061\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\320\066
+\324\037\352\335\253\344\321\266\346\373\042\300\335\023\015\152
+\173\042\023\034\227\074\150\143\146\062\234\003\265\215\244\201
+\203\332\170\060\021\317\334\262\053\276\222\277\216\344\304\023
+\276\244\150\114\332\002\150\026\164\276\262\335\004\344\153\052
+\335\067\037\140\054\333\365\367\241\174\225\267\014\160\206\056
+\361\072\357\122\367\314\323\233\371\213\276\016\337\061\267\235
+\150\134\222\246\365\345\363\012\064\265\377\173\242\344\207\241
+\306\257\027\000\357\003\221\355\251\034\116\161\075\322\213\154
+\211\364\170\206\346\152\111\240\316\265\322\260\253\233\366\364
+\324\056\343\162\371\066\306\353\025\267\045\214\072\374\045\015
+\263\042\163\041\164\310\112\226\141\222\365\057\013\030\245\364
+\255\342\356\101\275\001\171\372\226\214\215\027\002\060\264\371
+\257\170\032\214\264\066\020\020\007\005\160\320\364\061\220\212
+\121\305\206\046\171\262\021\210\136\305\360\012\124\315\111\246
+\277\002\234\322\104\247\355\343\170\357\106\136\155\161\321\171
+\160\034\106\137\121\351\311\067\334\137\176\151\173\101\337\064
+\105\340\073\204\364\241\212\012\066\236\067\314\142\122\341\211
+\015\050\371\172\043\261\015\075\075\232\375\235\201\357\054\220
+\300\173\104\116\273\111\340\016\112\126\222\274\313\265\335\171
+\027\211\221\336\141\211\164\222\250\343\062\205\276\116\205\244
+\113\131\313\053\305\170\216\161\124\320\002\067\231\214\345\111
+\352\340\124\162\244\021\006\057\013\214\301\133\276\265\241\260
+\123\156\234\270\140\221\037\131\153\371\055\364\224\012\227\265
+\354\305\166\003\124\033\145\122\272\114\222\126\121\065\240\100
+\330\051\333\256\122\166\073\055\060\100\233\212\320\102\126\264
+\267\210\001\244\207\073\123\226\315\243\026\217\363\146\252\027
+\261\307\140\340\301\103\005\014\356\233\133\140\157\006\134\207
+\133\047\371\100\021\236\234\063\301\267\345\065\127\005\177\047
+\316\027\040\214\034\374\361\373\332\061\051\111\355\365\013\204
+\247\117\301\366\116\302\050\234\372\356\340\257\007\373\063\021
+\172\041\117\013\041\020\266\100\072\253\042\072\004\234\213\233
+\204\206\162\232\322\247\245\304\264\165\221\251\053\043\002\003
+\001\000\001\243\102\060\100\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\035\006\003\125\035\016\004
+\026\004\024\340\252\077\045\215\237\104\134\301\072\350\056\256
+\167\114\204\076\147\014\364\060\015\006\011\052\206\110\206\367
+\015\001\001\013\005\000\003\202\002\001\000\271\127\257\270\022
+\332\127\203\217\150\013\063\035\003\123\125\364\225\160\344\053
+\075\260\071\353\372\211\142\375\367\326\030\004\057\041\064\335
+\361\150\360\325\226\132\336\302\200\243\301\215\306\152\367\131
+\167\256\025\144\317\133\171\005\167\146\352\214\323\153\015\335
+\361\131\054\301\063\245\060\200\025\105\007\105\032\061\042\266
+\222\000\253\231\115\072\217\167\257\251\042\312\057\143\312\025
+\326\307\306\360\075\154\374\034\015\230\020\141\236\021\242\042
+\327\012\362\221\172\153\071\016\057\060\303\066\111\237\340\351
+\017\002\104\120\067\224\125\175\352\237\366\073\272\224\245\114
+\351\274\076\121\264\350\312\222\066\124\155\134\045\050\332\335
+\255\024\375\323\356\342\042\005\353\320\362\267\150\022\327\132
+\212\101\032\306\222\245\132\073\143\105\117\277\341\072\167\042
+\057\134\277\106\371\132\003\205\023\102\137\312\336\123\327\142
+\265\246\065\004\302\107\377\231\375\204\337\134\316\351\136\200
+\050\101\362\175\347\036\220\330\117\166\076\202\074\015\374\245
+\003\372\173\032\331\105\036\140\332\304\216\371\374\053\311\173
+\225\305\052\377\252\211\337\202\061\017\162\377\014\047\327\012
+\036\126\000\120\036\014\220\301\226\265\330\024\205\273\247\015
+\026\301\370\007\044\033\272\205\241\032\005\011\200\272\225\143
+\311\072\354\045\237\177\235\272\244\107\025\233\104\160\361\152
+\113\326\070\136\103\363\030\176\120\156\351\132\050\346\145\346
+\167\033\072\375\035\276\003\046\243\333\324\341\273\176\226\047
+\053\035\356\244\373\332\045\124\023\003\336\071\306\303\037\115
+\220\354\217\033\112\322\034\355\205\225\070\120\171\106\326\301
+\220\120\061\251\134\232\156\035\365\063\126\213\247\231\322\362
+\310\054\063\223\222\060\307\116\214\145\063\020\144\027\375\044
+\027\226\321\215\302\072\152\053\353\023\213\104\362\041\363\112
+\032\267\167\137\327\355\210\244\162\345\071\037\225\235\276\147
+\301\160\021\075\273\364\370\111\267\343\046\227\072\237\322\137
+\174\373\300\231\174\071\051\340\173\035\277\015\247\217\322\051
+\064\156\044\025\313\336\220\136\277\032\304\146\352\302\346\272
+\071\137\212\231\251\101\131\007\260\054\257
+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 "Certainly Root R1"
+# Issuer: CN=Certainly Root R1,O=Certainly,C=US
+# Serial Number:00:8e:0f:f9:4b:90:71:68:65:33:54:f4:d4:44:39:b7:e0
+# Subject: CN=Certainly Root R1,O=Certainly,C=US
+# Not Valid Before: Thu Apr 01 00:00:00 2021
+# Not Valid After : Sun Apr 01 00:00:00 2046
+# Fingerprint (SHA-256): 77:B8:2C:D8:64:4C:43:05:F7:AC:C5:CB:15:6B:45:67:50:04:03:3D:51:C6:0C:62:02:A8:E0:C3:34:67:D3:A0
+# Fingerprint (SHA1): A0:50:EE:0F:28:71:F4:27:B2:12:6D:6F:50:96:25:BA:CC:86:42:AF
+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 "Certainly Root R1"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\240\120\356\017\050\161\364\047\262\022\155\157\120\226\045\272
+\314\206\102\257
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\007\160\324\076\202\207\240\372\063\066\023\364\372\063\347\022
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\075\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\022\060\020\006\003\125\004\012\023\011\103\145\162\164\141\151
+\156\154\171\061\032\060\030\006\003\125\004\003\023\021\103\145
+\162\164\141\151\156\154\171\040\122\157\157\164\040\122\061
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\021\000\216\017\371\113\220\161\150\145\063\124\364\324\104
+\071\267\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 "Certainly Root E1"
+#
+# Issuer: CN=Certainly Root E1,O=Certainly,C=US
+# Serial Number:06:25:33:b1:47:03:33:27:5c:f9:8d:9a:b9:bf:cc:f8
+# Subject: CN=Certainly Root E1,O=Certainly,C=US
+# Not Valid Before: Thu Apr 01 00:00:00 2021
+# Not Valid After : Sun Apr 01 00:00:00 2046
+# Fingerprint (SHA-256): B4:58:5F:22:E4:AC:75:6A:4E:86:12:A1:36:1C:5D:9D:03:1A:93:FD:84:FE:BB:77:8F:A3:06:8B:0F:C4:2D:C2
+# Fingerprint (SHA1): F9:E1:6D:DC:01:89:CF:D5:82:45:63:3E:C5:37:7D:C2:EB:93:6F:2B
+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 "Certainly Root E1"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\075\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\022\060\020\006\003\125\004\012\023\011\103\145\162\164\141\151
+\156\154\171\061\032\060\030\006\003\125\004\003\023\021\103\145
+\162\164\141\151\156\154\171\040\122\157\157\164\040\105\061
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\075\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\022\060\020\006\003\125\004\012\023\011\103\145\162\164\141\151
+\156\154\171\061\032\060\030\006\003\125\004\003\023\021\103\145
+\162\164\141\151\156\154\171\040\122\157\157\164\040\105\061
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\020\006\045\063\261\107\003\063\047\134\371\215\232\271\277
+\314\370
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\001\367\060\202\001\175\240\003\002\001\002\002\020\006
+\045\063\261\107\003\063\047\134\371\215\232\271\277\314\370\060
+\012\006\010\052\206\110\316\075\004\003\003\060\075\061\013\060
+\011\006\003\125\004\006\023\002\125\123\061\022\060\020\006\003
+\125\004\012\023\011\103\145\162\164\141\151\156\154\171\061\032
+\060\030\006\003\125\004\003\023\021\103\145\162\164\141\151\156
+\154\171\040\122\157\157\164\040\105\061\060\036\027\015\062\061
+\060\064\060\061\060\060\060\060\060\060\132\027\015\064\066\060
+\064\060\061\060\060\060\060\060\060\132\060\075\061\013\060\011
+\006\003\125\004\006\023\002\125\123\061\022\060\020\006\003\125
+\004\012\023\011\103\145\162\164\141\151\156\154\171\061\032\060
+\030\006\003\125\004\003\023\021\103\145\162\164\141\151\156\154
+\171\040\122\157\157\164\040\105\061\060\166\060\020\006\007\052
+\206\110\316\075\002\001\006\005\053\201\004\000\042\003\142\000
+\004\336\157\370\177\034\337\355\371\107\207\206\261\244\300\212
+\370\202\227\200\352\217\310\112\136\052\175\210\150\247\001\142
+\024\221\044\172\134\236\243\027\175\212\206\041\064\030\120\033
+\020\336\320\067\113\046\307\031\140\200\351\064\275\140\031\066
+\100\326\051\207\011\074\221\172\366\274\023\043\335\131\116\004
+\136\317\310\002\034\030\123\301\061\330\332\040\351\104\215\344
+\166\243\102\060\100\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\035\006\003\125\035\016\004\026\004
+\024\363\050\030\313\144\165\356\051\052\353\355\256\043\130\070
+\205\353\310\042\007\060\012\006\010\052\206\110\316\075\004\003
+\003\003\150\000\060\145\002\061\000\261\216\132\040\303\262\031
+\142\115\336\260\117\337\156\322\160\212\361\237\176\152\214\346
+\272\336\203\151\312\151\263\251\005\265\226\222\027\207\302\322
+\352\320\173\316\330\101\133\174\256\002\060\106\336\352\313\135
+\232\354\062\302\145\026\260\114\060\134\060\363\332\116\163\206
+\006\330\316\211\004\110\067\067\370\335\063\121\235\160\257\173
+\125\330\001\056\175\005\144\016\206\270\221
+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 "Certainly Root E1"
+# Issuer: CN=Certainly Root E1,O=Certainly,C=US
+# Serial Number:06:25:33:b1:47:03:33:27:5c:f9:8d:9a:b9:bf:cc:f8
+# Subject: CN=Certainly Root E1,O=Certainly,C=US
+# Not Valid Before: Thu Apr 01 00:00:00 2021
+# Not Valid After : Sun Apr 01 00:00:00 2046
+# Fingerprint (SHA-256): B4:58:5F:22:E4:AC:75:6A:4E:86:12:A1:36:1C:5D:9D:03:1A:93:FD:84:FE:BB:77:8F:A3:06:8B:0F:C4:2D:C2
+# Fingerprint (SHA1): F9:E1:6D:DC:01:89:CF:D5:82:45:63:3E:C5:37:7D:C2:EB:93:6F:2B
+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 "Certainly Root E1"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\371\341\155\334\001\211\317\325\202\105\143\076\305\067\175\302
+\353\223\157\053
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\012\236\312\315\076\122\120\306\066\363\113\243\355\247\123\351
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\075\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\022\060\020\006\003\125\004\012\023\011\103\145\162\164\141\151
+\156\154\171\061\032\060\030\006\003\125\004\003\023\021\103\145
+\162\164\141\151\156\154\171\040\122\157\157\164\040\105\061
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\020\006\045\063\261\107\003\063\047\134\371\215\232\271\277
+\314\370
+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 "E-Tugra Global Root CA RSA v3"
+#
+# Issuer: CN=E-Tugra Global Root CA RSA v3,OU=E-Tugra Trust Center,O=E-Tugra EBG A.S.,L=Ankara,C=TR
+# Serial Number:0d:4d:c5:cd:16:22:95:96:08:7e:b8:0b:7f:15:06:34:fb:79:10:34
+# Subject: CN=E-Tugra Global Root CA RSA v3,OU=E-Tugra Trust Center,O=E-Tugra EBG A.S.,L=Ankara,C=TR
+# Not Valid Before: Wed Mar 18 09:07:17 2020
+# Not Valid After : Sun Mar 12 09:07:17 2045
+# Fingerprint (SHA-256): EF:66:B0:B1:0A:3C:DB:9F:2E:36:48:C7:6B:D2:AF:18:EA:D2:BF:E6:F1:17:65:5E:28:C4:06:0D:A1:A3:F4:C2
+# Fingerprint (SHA1): E9:A8:5D:22:14:52:1C:5B:AA:0A:B4:BE:24:6A:23:8A:C9:BA:E2: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 "E-Tugra Global Root CA RSA v3"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\201\200\061\013\060\011\006\003\125\004\006\023\002\124\122
+\061\017\060\015\006\003\125\004\007\023\006\101\156\153\141\162
+\141\061\031\060\027\006\003\125\004\012\023\020\105\055\124\165
+\147\162\141\040\105\102\107\040\101\056\123\056\061\035\060\033
+\006\003\125\004\013\023\024\105\055\124\165\147\162\141\040\124
+\162\165\163\164\040\103\145\156\164\145\162\061\046\060\044\006
+\003\125\004\003\023\035\105\055\124\165\147\162\141\040\107\154
+\157\142\141\154\040\122\157\157\164\040\103\101\040\122\123\101
+\040\166\063
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\200\061\013\060\011\006\003\125\004\006\023\002\124\122
+\061\017\060\015\006\003\125\004\007\023\006\101\156\153\141\162
+\141\061\031\060\027\006\003\125\004\012\023\020\105\055\124\165
+\147\162\141\040\105\102\107\040\101\056\123\056\061\035\060\033
+\006\003\125\004\013\023\024\105\055\124\165\147\162\141\040\124
+\162\165\163\164\040\103\145\156\164\145\162\061\046\060\044\006
+\003\125\004\003\023\035\105\055\124\165\147\162\141\040\107\154
+\157\142\141\154\040\122\157\157\164\040\103\101\040\122\123\101
+\040\166\063
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\024\015\115\305\315\026\042\225\226\010\176\270\013\177\025
+\006\064\373\171\020\064
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\005\363\060\202\003\333\240\003\002\001\002\002\024\015
+\115\305\315\026\042\225\226\010\176\270\013\177\025\006\064\373
+\171\020\064\060\015\006\011\052\206\110\206\367\015\001\001\013
+\005\000\060\201\200\061\013\060\011\006\003\125\004\006\023\002
+\124\122\061\017\060\015\006\003\125\004\007\023\006\101\156\153
+\141\162\141\061\031\060\027\006\003\125\004\012\023\020\105\055
+\124\165\147\162\141\040\105\102\107\040\101\056\123\056\061\035
+\060\033\006\003\125\004\013\023\024\105\055\124\165\147\162\141
+\040\124\162\165\163\164\040\103\145\156\164\145\162\061\046\060
+\044\006\003\125\004\003\023\035\105\055\124\165\147\162\141\040
+\107\154\157\142\141\154\040\122\157\157\164\040\103\101\040\122
+\123\101\040\166\063\060\036\027\015\062\060\060\063\061\070\060
+\071\060\067\061\067\132\027\015\064\065\060\063\061\062\060\071
+\060\067\061\067\132\060\201\200\061\013\060\011\006\003\125\004
+\006\023\002\124\122\061\017\060\015\006\003\125\004\007\023\006
+\101\156\153\141\162\141\061\031\060\027\006\003\125\004\012\023
+\020\105\055\124\165\147\162\141\040\105\102\107\040\101\056\123
+\056\061\035\060\033\006\003\125\004\013\023\024\105\055\124\165
+\147\162\141\040\124\162\165\163\164\040\103\145\156\164\145\162
+\061\046\060\044\006\003\125\004\003\023\035\105\055\124\165\147
+\162\141\040\107\154\157\142\141\154\040\122\157\157\164\040\103
+\101\040\122\123\101\040\166\063\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\242\146\360\211\267\162\173
+\356\011\311\143\322\323\103\335\136\303\246\204\070\112\361\215
+\201\273\024\275\107\350\100\027\363\075\303\170\105\162\246\056
+\220\336\232\072\324\040\161\312\274\237\035\113\227\012\307\061
+\272\076\327\376\045\251\052\216\066\364\321\057\307\267\251\135
+\063\334\060\160\370\100\154\113\262\246\061\141\321\064\074\075
+\061\172\307\257\304\247\247\204\341\227\244\350\113\366\027\174
+\356\074\007\355\342\212\127\334\266\373\370\103\045\120\352\047
+\201\250\206\274\217\122\112\226\072\140\032\226\273\375\163\364
+\205\375\203\375\177\204\155\064\154\177\152\267\113\001\003\277
+\255\151\267\327\062\331\365\127\152\351\206\202\076\245\146\061
+\263\026\075\302\363\046\140\062\323\122\036\260\154\244\067\076
+\364\365\257\353\341\337\200\006\317\052\101\347\146\011\341\113
+\227\347\167\275\041\155\051\266\147\303\055\176\355\326\171\145
+\321\317\072\266\321\261\136\126\141\120\172\132\316\116\120\061
+\200\003\230\107\347\344\030\174\104\132\306\244\263\073\306\306
+\303\072\360\154\303\213\310\244\221\005\363\365\331\266\252\006
+\241\267\253\344\261\352\041\024\134\203\244\374\377\266\120\323
+\214\022\046\231\166\160\351\300\017\246\164\374\273\320\033\170
+\316\162\222\342\050\234\274\346\351\011\330\072\323\211\346\276
+\056\167\337\001\012\157\226\366\345\215\074\115\122\166\032\126
+\341\163\176\027\254\075\255\154\243\122\022\030\160\346\200\116
+\063\362\176\046\062\254\005\215\070\244\346\166\074\237\020\151
+\016\155\235\322\301\171\040\153\133\317\063\215\321\224\166\065
+\347\135\125\307\267\254\050\253\106\314\347\073\041\265\012\012
+\344\112\131\334\201\065\113\104\225\022\012\147\245\241\377\133
+\000\007\322\300\314\371\077\374\237\063\362\000\370\214\154\207
+\235\006\055\361\357\343\346\006\372\305\146\023\133\374\120\007
+\236\161\206\262\332\157\164\060\317\223\123\350\334\042\326\336
+\040\037\141\215\243\056\243\170\062\220\154\334\254\062\265\005
+\344\365\074\063\015\326\340\207\167\027\114\235\260\330\011\250
+\015\127\367\104\205\360\310\004\276\134\135\132\343\027\216\124
+\143\151\177\111\164\144\005\214\243\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\037\006\003\125\035\043\004\030\060\026\200\024
+\262\264\256\346\055\367\046\325\252\165\055\166\113\300\033\123
+\041\320\110\357\060\035\006\003\125\035\016\004\026\004\024\262
+\264\256\346\055\367\046\325\252\165\055\166\113\300\033\123\041
+\320\110\357\060\016\006\003\125\035\017\001\001\377\004\004\003
+\002\001\006\060\015\006\011\052\206\110\206\367\015\001\001\013
+\005\000\003\202\002\001\000\211\250\162\177\214\353\316\056\030
+\304\020\200\055\020\014\377\373\024\315\004\340\024\074\116\232
+\373\237\051\277\042\236\127\271\202\163\022\143\046\265\314\220
+\351\322\052\051\356\234\055\314\054\231\276\105\047\344\261\161
+\355\344\070\225\061\101\362\175\172\143\170\337\312\066\026\057
+\202\210\237\274\021\107\117\166\115\310\055\216\353\337\055\174
+\116\073\332\256\366\343\332\135\024\246\256\350\205\104\235\006
+\156\216\373\357\172\112\152\055\053\050\030\376\277\220\054\165
+\026\237\017\352\226\175\005\356\233\023\245\104\154\370\003\320
+\335\043\341\375\003\022\022\010\364\030\064\263\340\067\013\167
+\021\001\110\277\141\264\265\370\031\331\313\115\352\243\214\357
+\375\360\006\265\155\222\364\112\141\120\204\355\354\111\323\344
+\276\150\346\056\343\061\013\124\013\032\222\326\202\330\266\242
+\145\074\146\004\371\125\332\154\373\333\265\024\146\115\224\203
+\073\315\036\246\053\262\376\167\100\206\253\347\337\012\311\375
+\366\335\207\126\030\330\260\054\125\140\226\372\010\176\122\220
+\365\113\246\056\207\174\313\040\333\006\076\240\135\003\167\175
+\242\074\023\033\051\242\023\125\240\075\024\042\257\157\270\320
+\232\033\162\335\005\001\215\206\140\277\244\147\356\265\245\015
+\321\177\346\032\053\142\146\303\007\272\347\240\110\034\070\303
+\351\105\373\247\177\374\355\002\150\032\312\167\022\167\246\000
+\125\050\024\354\326\307\022\242\033\145\102\351\221\350\313\076
+\207\211\124\135\331\257\235\227\234\151\347\012\377\017\132\170
+\213\143\052\114\175\107\224\077\336\113\351\123\320\060\361\305
+\366\236\111\337\073\240\221\243\243\376\315\130\314\352\337\257
+\157\050\073\240\151\233\217\354\254\256\053\124\235\233\004\261
+\107\040\257\226\022\076\143\224\035\004\347\056\273\206\307\014
+\232\210\277\166\107\357\367\260\013\227\146\322\104\317\140\122
+\007\341\325\054\112\072\047\141\167\312\327\217\347\207\016\060
+\377\014\273\004\342\141\303\242\310\227\141\216\264\060\152\074
+\155\302\007\137\112\163\057\077\371\026\212\001\146\357\272\221
+\312\122\127\173\256\324\346\017\335\013\172\177\213\236\046\040
+\317\073\357\201\161\203\131
+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 "E-Tugra Global Root CA RSA v3"
+# Issuer: CN=E-Tugra Global Root CA RSA v3,OU=E-Tugra Trust Center,O=E-Tugra EBG A.S.,L=Ankara,C=TR
+# Serial Number:0d:4d:c5:cd:16:22:95:96:08:7e:b8:0b:7f:15:06:34:fb:79:10:34
+# Subject: CN=E-Tugra Global Root CA RSA v3,OU=E-Tugra Trust Center,O=E-Tugra EBG A.S.,L=Ankara,C=TR
+# Not Valid Before: Wed Mar 18 09:07:17 2020
+# Not Valid After : Sun Mar 12 09:07:17 2045
+# Fingerprint (SHA-256): EF:66:B0:B1:0A:3C:DB:9F:2E:36:48:C7:6B:D2:AF:18:EA:D2:BF:E6:F1:17:65:5E:28:C4:06:0D:A1:A3:F4:C2
+# Fingerprint (SHA1): E9:A8:5D:22:14:52:1C:5B:AA:0A:B4:BE:24:6A:23:8A:C9:BA:E2: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 "E-Tugra Global Root CA RSA v3"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\351\250\135\042\024\122\034\133\252\012\264\276\044\152\043\212
+\311\272\342\251
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\042\276\020\366\302\370\003\210\163\137\063\051\107\050\107\244
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\200\061\013\060\011\006\003\125\004\006\023\002\124\122
+\061\017\060\015\006\003\125\004\007\023\006\101\156\153\141\162
+\141\061\031\060\027\006\003\125\004\012\023\020\105\055\124\165
+\147\162\141\040\105\102\107\040\101\056\123\056\061\035\060\033
+\006\003\125\004\013\023\024\105\055\124\165\147\162\141\040\124
+\162\165\163\164\040\103\145\156\164\145\162\061\046\060\044\006
+\003\125\004\003\023\035\105\055\124\165\147\162\141\040\107\154
+\157\142\141\154\040\122\157\157\164\040\103\101\040\122\123\101
+\040\166\063
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\024\015\115\305\315\026\042\225\226\010\176\270\013\177\025
+\006\064\373\171\020\064
+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 "E-Tugra Global Root CA ECC v3"
+#
+# Issuer: CN=E-Tugra Global Root CA ECC v3,OU=E-Tugra Trust Center,O=E-Tugra EBG A.S.,L=Ankara,C=TR
+# Serial Number:26:46:19:77:31:e1:4f:6f:28:36:de:39:51:86:e6:d4:97:88:22:c1
+# Subject: CN=E-Tugra Global Root CA ECC v3,OU=E-Tugra Trust Center,O=E-Tugra EBG A.S.,L=Ankara,C=TR
+# Not Valid Before: Wed Mar 18 09:46:58 2020
+# Not Valid After : Sun Mar 12 09:46:58 2045
+# Fingerprint (SHA-256): 87:3F:46:85:FA:7F:56:36:25:25:2E:6D:36:BC:D7:F1:6F:C2:49:51:F2:64:E4:7E:1B:95:4F:49:08:CD:CA:13
+# Fingerprint (SHA1): 8A:2F:AF:57:53:B1:B0:E6:A1:04:EC:5B:6A:69:71:6D:F6:1C:E2:84
+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 "E-Tugra Global Root CA ECC v3"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\201\200\061\013\060\011\006\003\125\004\006\023\002\124\122
+\061\017\060\015\006\003\125\004\007\023\006\101\156\153\141\162
+\141\061\031\060\027\006\003\125\004\012\023\020\105\055\124\165
+\147\162\141\040\105\102\107\040\101\056\123\056\061\035\060\033
+\006\003\125\004\013\023\024\105\055\124\165\147\162\141\040\124
+\162\165\163\164\040\103\145\156\164\145\162\061\046\060\044\006
+\003\125\004\003\023\035\105\055\124\165\147\162\141\040\107\154
+\157\142\141\154\040\122\157\157\164\040\103\101\040\105\103\103
+\040\166\063
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\200\061\013\060\011\006\003\125\004\006\023\002\124\122
+\061\017\060\015\006\003\125\004\007\023\006\101\156\153\141\162
+\141\061\031\060\027\006\003\125\004\012\023\020\105\055\124\165
+\147\162\141\040\105\102\107\040\101\056\123\056\061\035\060\033
+\006\003\125\004\013\023\024\105\055\124\165\147\162\141\040\124
+\162\165\163\164\040\103\145\156\164\145\162\061\046\060\044\006
+\003\125\004\003\023\035\105\055\124\165\147\162\141\040\107\154
+\157\142\141\154\040\122\157\157\164\040\103\101\040\105\103\103
+\040\166\063
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\024\046\106\031\167\061\341\117\157\050\066\336\071\121\206
+\346\324\227\210\042\301
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\002\245\060\202\002\052\240\003\002\001\002\002\024\046
+\106\031\167\061\341\117\157\050\066\336\071\121\206\346\324\227
+\210\042\301\060\012\006\010\052\206\110\316\075\004\003\003\060
+\201\200\061\013\060\011\006\003\125\004\006\023\002\124\122\061
+\017\060\015\006\003\125\004\007\023\006\101\156\153\141\162\141
+\061\031\060\027\006\003\125\004\012\023\020\105\055\124\165\147
+\162\141\040\105\102\107\040\101\056\123\056\061\035\060\033\006
+\003\125\004\013\023\024\105\055\124\165\147\162\141\040\124\162
+\165\163\164\040\103\145\156\164\145\162\061\046\060\044\006\003
+\125\004\003\023\035\105\055\124\165\147\162\141\040\107\154\157
+\142\141\154\040\122\157\157\164\040\103\101\040\105\103\103\040
+\166\063\060\036\027\015\062\060\060\063\061\070\060\071\064\066
+\065\070\132\027\015\064\065\060\063\061\062\060\071\064\066\065
+\070\132\060\201\200\061\013\060\011\006\003\125\004\006\023\002
+\124\122\061\017\060\015\006\003\125\004\007\023\006\101\156\153
+\141\162\141\061\031\060\027\006\003\125\004\012\023\020\105\055
+\124\165\147\162\141\040\105\102\107\040\101\056\123\056\061\035
+\060\033\006\003\125\004\013\023\024\105\055\124\165\147\162\141
+\040\124\162\165\163\164\040\103\145\156\164\145\162\061\046\060
+\044\006\003\125\004\003\023\035\105\055\124\165\147\162\141\040
+\107\154\157\142\141\154\040\122\157\157\164\040\103\101\040\105
+\103\103\040\166\063\060\166\060\020\006\007\052\206\110\316\075
+\002\001\006\005\053\201\004\000\042\003\142\000\004\216\230\051
+\277\307\020\036\047\333\253\003\314\050\054\330\136\110\031\020
+\051\314\313\131\201\314\214\270\222\027\211\203\052\222\366\303
+\244\035\114\142\325\237\326\240\106\334\034\274\166\301\343\107
+\320\133\023\332\347\245\263\146\110\347\041\232\112\117\206\012
+\175\154\352\115\062\200\012\262\172\011\233\151\113\230\201\342
+\056\354\002\160\226\037\375\365\106\316\312\334\202\243\143\060
+\141\060\017\006\003\125\035\023\001\001\377\004\005\060\003\001
+\001\377\060\037\006\003\125\035\043\004\030\060\026\200\024\377
+\202\061\162\076\371\304\146\154\255\070\236\321\260\121\210\245
+\220\314\365\060\035\006\003\125\035\016\004\026\004\024\377\202
+\061\162\076\371\304\146\154\255\070\236\321\260\121\210\245\220
+\314\365\060\016\006\003\125\035\017\001\001\377\004\004\003\002
+\001\006\060\012\006\010\052\206\110\316\075\004\003\003\003\151
+\000\060\146\002\061\000\346\005\130\151\141\345\055\312\015\313
+\361\031\010\275\326\375\121\222\032\176\143\124\004\220\221\232
+\065\221\071\231\372\007\251\146\223\272\310\150\324\212\077\372
+\355\156\026\002\047\267\002\061\000\335\132\027\053\166\035\145
+\102\226\246\254\135\212\171\126\330\212\033\337\232\336\137\307
+\120\217\261\133\161\014\046\337\152\100\000\354\063\221\041\161
+\276\150\344\043\244\331\255\241\067
+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 "E-Tugra Global Root CA ECC v3"
+# Issuer: CN=E-Tugra Global Root CA ECC v3,OU=E-Tugra Trust Center,O=E-Tugra EBG A.S.,L=Ankara,C=TR
+# Serial Number:26:46:19:77:31:e1:4f:6f:28:36:de:39:51:86:e6:d4:97:88:22:c1
+# Subject: CN=E-Tugra Global Root CA ECC v3,OU=E-Tugra Trust Center,O=E-Tugra EBG A.S.,L=Ankara,C=TR
+# Not Valid Before: Wed Mar 18 09:46:58 2020
+# Not Valid After : Sun Mar 12 09:46:58 2045
+# Fingerprint (SHA-256): 87:3F:46:85:FA:7F:56:36:25:25:2E:6D:36:BC:D7:F1:6F:C2:49:51:F2:64:E4:7E:1B:95:4F:49:08:CD:CA:13
+# Fingerprint (SHA1): 8A:2F:AF:57:53:B1:B0:E6:A1:04:EC:5B:6A:69:71:6D:F6:1C:E2:84
+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 "E-Tugra Global Root CA ECC v3"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\212\057\257\127\123\261\260\346\241\004\354\133\152\151\161\155
+\366\034\342\204
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\106\274\201\273\361\265\036\367\113\226\274\024\342\347\047\144
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\200\061\013\060\011\006\003\125\004\006\023\002\124\122
+\061\017\060\015\006\003\125\004\007\023\006\101\156\153\141\162
+\141\061\031\060\027\006\003\125\004\012\023\020\105\055\124\165
+\147\162\141\040\105\102\107\040\101\056\123\056\061\035\060\033
+\006\003\125\004\013\023\024\105\055\124\165\147\162\141\040\124
+\162\165\163\164\040\103\145\156\164\145\162\061\046\060\044\006
+\003\125\004\003\023\035\105\055\124\165\147\162\141\040\107\154
+\157\142\141\154\040\122\157\157\164\040\103\101\040\105\103\103
+\040\166\063
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\024\046\106\031\167\061\341\117\157\050\066\336\071\121\206
+\346\324\227\210\042\301
+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/rootfiles/core/170/filelists/ca-certificates b/config/rootfiles/core/170/filelists/ca-certificates
new file mode 120000
index 000000000..320fea8f4
--- /dev/null
+++ b/config/rootfiles/core/170/filelists/ca-certificates
@@ -0,0 +1 @@
+../../../common/ca-certificates
\ No newline at end of file
diff --git a/lfs/ca-certificates b/lfs/ca-certificates
index aca609ffc..a0305f5ed 100644
--- a/lfs/ca-certificates
+++ b/lfs/ca-certificates
@@ -24,7 +24,7 @@
include Config
-VER = 20220402
+VER = 20220625
# From https://hg.mozilla.org/mozilla-central/raw-file/tip/security/nss/lib/ckfw/b…
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, next, updated. f42dc99758f90700fc0fd1a12bb1768fb6a3f9e1
by Peter Müller 06 Jul '22
by Peter Müller 06 Jul '22
06 Jul '22
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 f42dc99758f90700fc0fd1a12bb1768fb6a3f9e1 (commit)
via 5503a18d716c42c68b5ffab7b29a19710afa4646 (commit)
via 53eb573f27effd3fa9e6f116c90ccbacdc9e54a7 (commit)
via 8ce729457d736aee35fc5f731cc6aa17ff549c73 (commit)
via 0eaaa300d8c4d682d7302c39d36ffba1fde18ef7 (commit)
via 541f938d8b3f991c12c866c94e0803ffb940c2ef (commit)
via ccddf4ce8d2bd728a307455155b75baf7dc4d5fd (commit)
via fdb3fb1565879a5b541d96c91e231796a0f4be94 (commit)
via 023ed8cefd6f3511263dfddb298fba5613f159cc (commit)
via 1cc86b66ecae3866ac0b58044874a05605a759fb (commit)
via e09731d5e4eda69ed37286c7e9de3cce07141ec9 (commit)
via c5706bf1efaea76b9d42225093a4d56e4bc5ef35 (commit)
via 79781dda3fe241002c39046c15dc6f5aa0ee1e50 (commit)
via fe6afd5ccc14706fc9646b19bf84bc58a7d45c97 (commit)
via 44daf2f5ee6bf240d6738494c93095ce6122b597 (commit)
via 5b855a903ec098222b65f93c4f06e793239cd240 (commit)
via d6626067a7044c4a06df637fdf8cefc6adb3684c (commit)
via bc9673ded3d8d997f2d9dd1b1a84d7744fc1bf66 (commit)
via 09c2a2ec0e3c6c1057ac7a23115185f027168f5a (commit)
via 1d14e5a23a056cf2b315f8ff8ee7ec2eb97960d3 (commit)
via 98eac192ad4071d74e5a4c4f5631f9edfd3f0715 (commit)
via 7230084809ea5704e56aec4bb1173845e4567e55 (commit)
via 4ccf0c9ddc5c8e76147abfe6cfd316360e9e3502 (commit)
via 8024cc05a10dff90e2c3d0069d1ff27e1b6a3ce2 (commit)
via cacf78e8ccce668a85fb347de398958de6d15568 (commit)
via 34ebd4e5f1431c5c4f6da4a011f896212d234118 (commit)
via 643871d4a79791e469b798414778669a3cf67ce9 (commit)
via 34e16b8653a3e770523035a4c898acaee762d5c4 (commit)
via 2296698ec46d297520584f67936be3d81c20feb4 (commit)
via a8344bbac55279517848f33214da9016d49d08de (commit)
via ef03abb15d8ca7811472e99a72b1afc8dc17ac84 (commit)
via f653df852ad45a19e686c0c8d833a1fcbfd4faac (commit)
from 8000bc0a4375ee7afdc1d56023681b8ac9502c3d (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 f42dc99758f90700fc0fd1a12bb1768fb6a3f9e1
Merge: 5503a18d7 8000bc0a4
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Wed Jul 6 06:14:54 2022 +0000
Merge branch 'next' into temp-c170-development
commit 5503a18d716c42c68b5ffab7b29a19710afa4646
Merge: 53eb573f2 f5117ab51
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Mon Jun 27 13:29:18 2022 +0000
Merge branch 'next' into temp-c170-development
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 53eb573f27effd3fa9e6f116c90ccbacdc9e54a7
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sat Jun 25 11:15:43 2022 +0000
Core Update 170: Ship Pakfire functions.pl
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 8ce729457d736aee35fc5f731cc6aa17ff549c73
Author: Robin Roevens <robin.roevens(a)disroot.org>
Date: Wed Feb 23 21:21:30 2022 +0100
pakfire: Better errorhandling on downloads
- Add true/false return codes to fetchfile, getmetafile and getmirrors
indicating succes or failure.
- Check on those return codes and fail gracefully with clean
error message(s) when downloads fail.
- Replace duplicate meta-file fetching code in dbgetlist with
getmetafile function (fixing possibly missed cariage return
conversion in meta-files).
- Remove pointless 5 retries to download server-list.db in
selectmirror as fetchfile already retries 5 times.
commit 0eaaa300d8c4d682d7302c39d36ffba1fde18ef7
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Fri Jun 17 11:42:43 2022 +0200
rust-time: Required for update of python3-cryptography
- lfs and rootfile created
- Patch created to remove requirement for winapi and related windows dependencies
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 541f938d8b3f991c12c866c94e0803ffb940c2ef
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Fri Jun 17 11:42:42 2022 +0200
rust-stable_deref_trait: Required for update of python3-cryptography
- lfs and rootfile created
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit ccddf4ce8d2bd728a307455155b75baf7dc4d5fd
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Fri Jun 17 11:42:41 2022 +0200
rust-proc-macro-error-attr: Required for update of python3-cryptography
- lfs and rootfile created
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit fdb3fb1565879a5b541d96c91e231796a0f4be94
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Fri Jun 17 11:42:40 2022 +0200
rust-proc-macro-error: Required for update of python3-cryptography
- lfs and rootfile created
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 023ed8cefd6f3511263dfddb298fba5613f159cc
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Fri Jun 17 11:42:39 2022 +0200
rust-pem: Required for update of python3-cryptography
- lfs and rootfile created
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 1cc86b66ecae3866ac0b58044874a05605a759fb
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Fri Jun 17 11:42:38 2022 +0200
rust-paste-0.1.18: Required for update of python3-cryptography
- lfs and rootfile created
- python3-cryptography build requires older version than was already installed.
Therefore named version 0.1.18 created, leaving original rust-paste in place
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit e09731d5e4eda69ed37286c7e9de3cce07141ec9
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Fri Jun 17 11:42:37 2022 +0200
rust-ouroboros_macro: Required for update of python3-cryptography
- lfs and rootfile created
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit c5706bf1efaea76b9d42225093a4d56e4bc5ef35
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Fri Jun 17 11:42:36 2022 +0200
rust-ouroboros: Required for update of python3-cryptography
- lfs and rootfile created
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 79781dda3fe241002c39046c15dc6f5aa0ee1e50
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Fri Jun 17 11:42:35 2022 +0200
rust-num_threads: Required for update of python3-cryptography
- lfs and rootfile created
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit fe6afd5ccc14706fc9646b19bf84bc58a7d45c97
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Fri Jun 17 11:42:34 2022 +0200
rust-num-traits: Required for update of python3-cryptography
- lfs and rootfile created
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 44daf2f5ee6bf240d6738494c93095ce6122b597
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Fri Jun 17 11:42:33 2022 +0200
rust-num-integer: Required for update of python3-cryptography
- lfs and rootfile created
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 5b855a903ec098222b65f93c4f06e793239cd240
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Fri Jun 17 11:42:32 2022 +0200
rust-indoc-0.3.6: Required for update of python3-cryptography
- lfs and rootfile created
- python3-cryptography build requires older version than was already installed.
Therefore named version 0.3.6 created, leaving original rust-indoc in place
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit d6626067a7044c4a06df637fdf8cefc6adb3684c
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Fri Jun 17 11:42:31 2022 +0200
rust-chrono: Required for update of python3-cryptography
- lfs and rootfile created
- Patch created to remove requirement for winapi and related windows dependencies
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit bc9673ded3d8d997f2d9dd1b1a84d7744fc1bf66
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Fri Jun 17 11:42:30 2022 +0200
rust-base64: Required for update of python3-cryptography
- lfs and rootfile created
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 09c2a2ec0e3c6c1057ac7a23115185f027168f5a
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Fri Jun 17 11:42:29 2022 +0200
rust-asn1_derive: Required for update of python3-cryptography
- lfs and rootfile created
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 1d14e5a23a056cf2b315f8ff8ee7ec2eb97960d3
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Fri Jun 17 11:42:28 2022 +0200
rust-asn1: Required for update of python3-cryptography
- lfs and rootfile created
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 98eac192ad4071d74e5a4c4f5631f9edfd3f0715
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Fri Jun 17 11:42:27 2022 +0200
rust-aliasable: Required for update of python3-cryptography
- lfs and rootfile created
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 7230084809ea5704e56aec4bb1173845e4567e55
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Fri Jun 17 11:42:26 2022 +0200
rust-Inflector: Required for update of python3-cryptography
- lfs and rootfile created
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 4ccf0c9ddc5c8e76147abfe6cfd316360e9e3502
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Fri Jun 17 11:42:25 2022 +0200
rust-pyo3-macros-backend: Update to version 0.15.1 - required for python3-cryptography update
- Update from version 0.13.1 to 0.15.1
Required to be at same version as rust-pyo3
- Update of rootfile
- Changelog not available
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 8024cc05a10dff90e2c3d0069d1ff27e1b6a3ce2
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Fri Jun 17 11:42:24 2022 +0200
rust-pyo3-macros: Update to version 0.15.1 - required for python3-cryptography update
- Update from version 0.13.1 to 0.15.1
Required to be at same version as rust-pyo3
- Update of rootfile
- Changelog not available
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit cacf78e8ccce668a85fb347de398958de6d15568
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Fri Jun 17 11:42:23 2022 +0200
rust-pyo3: Update to version 0.15.1 - required for python3-cryptography
- Update from version 0.13.1 to 0.15.1
- Update of rootfile
- Changelog is too long to include here. For details see CHANGELOG.md file in source
tarball
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 34ebd4e5f1431c5c4f6da4a011f896212d234118
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Fri Jun 17 11:42:22 2022 +0200
make.sh: New rust dependencies for python3-cryptography
- New rust dependencies added for python3-cryptography
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 643871d4a79791e469b798414778669a3cf67ce9
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Fri Jun 17 11:42:21 2022 +0200
python3-cryptography: Update to version 36.0.2
- Update from version 3.4.7 to 36.0.2
After version 3.4.8 the numbering scheme changed to 35.0.0 in Sept 2021
See Chanelog section 35.0.0 below
- New release requires a lot of rust packages - see Changelog sections 35.0.0 & 36.0.0
below. The required rust packages are installed in separate patches in this series
- Update of rootfile
- Changelog
36.0.2 - 2022-03-15¶
Updated Windows, macOS, and Linux wheels to be compiled with OpenSSL 1.1.1n.
36.0.1 - 2021-12-14¶
Updated Windows, macOS, and Linux wheels to be compiled with OpenSSL 1.1.1m.
36.0.0 - 2021-11-21¶
FINAL DEPRECATION Support for verifier and signer on our asymmetric key
classes was deprecated in version 2.0. These functions had an extended
deprecation due to usage, however the next version of cryptography will drop
support. Users should migrate to sign and verify.
The entire X.509 layer is now written in Rust. This allows alternate
asymmetric key implementations that can support cloud key management
services or hardware security modules provided they implement the necessary
interface (for example: EllipticCurvePrivateKey).
Deprecated the backend argument for all functions.
Added support for AESOCB3.
Added support for iterating over arbitrary request attributes.
Deprecated the get_attribute_for_oid method on CertificateSigningRequest in
favor of get_attribute_for_oid() on the new Attributes object.
Fixed handling of PEM files to allow loading when certificate and key are in
the same file.
Fixed parsing of CertificatePolicies extensions containing legacy BMPString
values in their explicitText.
Allow parsing of negative serial numbers in certificates. Negative serial
numbers are prohibited by RFC 5280 so a deprecation warning will be raised
whenever they are encountered. A future version of cryptography will drop
support for parsing them.
Added support for parsing PKCS12 files with friendly names for all
certificates with load_pkcs12(), which will return an object of type
PKCS12KeyAndCertificates.
rfc4514_string() and related methods now have an optional attr_name_overrides
parameter to supply custom OID to name mappings, which can be used to match
vendor-specific extensions.
BACKWARDS INCOMPATIBLE: Reverted the nonstandard formatting of email address
fields as E in rfc4514_string() methods from version 35.0.
The previous behavior can be restored with:
name.rfc4514_string({NameOID.EMAIL_ADDRESS: "E"})
Allow X25519PublicKey and X448PublicKey to be used as public keys when
parsing certificates or creating them with CertificateBuilder. These key
types must be signed with a different signing algorithm as X25519 and X448
do not support signing.
Extension values can now be serialized to a DER byte string by calling
public_bytes().
Added experimental support for compiling against BoringSSL. As BoringSSL
does not commit to a stable API, cryptography tests against the latest
commit only. Please note that several features are not available when
building against BoringSSL.
Parsing CertificateSigningRequest from DER and PEM now, for a limited time
period, allows the Extension critical field to be incorrectly encoded. See
the issue for complete details. This will be reverted in a future
cryptography release.
When OCSPNonce are parsed and generated their value is now correctly wrapped
in an ASN.1 OCTET STRING. This conforms to RFC 6960 but conflicts with the
original behavior specified in RFC 2560. For a temporary period for
backwards compatibility, we will also parse values that are encoded as
specified in RFC 2560 but this behavior will be removed in a future release.
35.0.0 - 2021-09-29¶
Changed the version scheme. This will result in us incrementing the major
version more frequently, but does not change our existing backwards
compatibility policy.
BACKWARDS INCOMPATIBLE: The X.509 PEM parsers now require that the PEM
string passed have PEM delimiters of the correct type. For example, parsing
a private key PEM concatenated with a certificate PEM will no longer be
accepted by the PEM certificate parser.
BACKWARDS INCOMPATIBLE: The X.509 certificate parser no longer allows
negative serial numbers. RFC 5280 has always prohibited these.
BACKWARDS INCOMPATIBLE: Additional forms of invalid ASN.1 found during X.509
parsing will raise an error on initial parse rather than when the malformed
field is accessed.
Rust is now required for building cryptography, the
CRYPTOGRAPHY_DONT_BUILD_RUST environment variable is no longer respected.
Parsers for X.509 no longer use OpenSSL and have been rewritten in Rust.
This should be backwards compatible (modulo the items listed above) and
improve both security and performance.
Added support for OpenSSL 3.0.0 as a compilation target.
Added support for SM3 and SM4, when using OpenSSL 1.1.1. These algorithms
are provided for compatibility in regions where they may be required, and
are not generally recommended.
We now ship manylinux_2_24 and musllinux_1_1 wheels, in addition to our
manylinux2010 and manylinux2014 wheels. Users on distributions like Alpine
Linux should ensure they upgrade to the latest pip to correctly receive
wheels.
Added rfc4514_attribute_name attribute to x509.NameAttribute.
Added KBKDFCMAC.
3.4.8 - 2021-08-24¶
Updated Windows, macOS, and manylinux wheels to be compiled with
OpenSSL 1.1.1l.
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 34e16b8653a3e770523035a4c898acaee762d5c4
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sat Jun 25 11:12:44 2022 +0000
Core Update 170: Ship sudo
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 2296698ec46d297520584f67936be3d81c20feb4
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Wed Jun 22 09:10:59 2022 +0200
sudo: Update to version 1.9.11p3
- Update from version 1.9.10 to 1.9.11p3
- Update of rootfile required
- Changelog
What's new in Sudo 1.9.11p3
* Fixed "connection reset" errors on AIX when running shell scripts
with the "intercept" or "log_subcmds" sudoers options enabled.
Bug #1034.
* Fixed very slow execution of shell scripts when the "intercept"
or "log_subcmds" sudoers options are set on systems that enable
Nagle's algorithm on the loopback device, such as AIX.
Bug #1034.
What's new in Sudo 1.9.11p2
* Fixed a compilation error on Linux/x86_64 with the x32 ABI.
* Fixed a regression introduced in 1.9.11p1 that caused a warning
when logging to sudo_logsrvd if the command returned no output.
What's new in Sudo 1.9.11p1
* Correctly handle EAGAIN in the I/O read/right events. This fixes
a hang seen on some systems when piping a large amount of data
through sudo, such as via rsync. Bug #963.
* Changes to avoid implementation or unspecified behavior when
bit shifting signed values in the protobuf library.
* Fixed a compilation error on Linux/aarch64.
* Fixed the configure check for seccomp(2) support on Linux.
* Corrected the EBNF specification for tags in the sudoers manual
page. GitHub issue #153.
What's new in Sudo 1.9.11
* Fixed a crash in the Python module with Python 3.9.10 on some
systems. Additionally, "make check" now passes for Python 3.9.10.
* Error messages sent via email now include more details, including
the file name and the line number and column of the error.
Multiple errors are sent in a single message. Previously, only
the first error was included.
* Fixed logging of parse errors in JSON format. Previously,
the JSON logger would not write entries unless the command and
runuser were set. These may not be known at the time a parse
error is encountered.
* Fixed a potential crash parsing sudoers lines larger than twice
the value of LINE_MAX on systems that lack the getdelim() function.
* The tests run by "make check" now unset the LANGUAGE environment
variable. Otherwise, localization strings will not match if
LANGUAGE is set to a non-English locale. Bug #1025.
* The "starttime" test now passed when run under Debian faketime.
Bug #1026.
* The Kerberos authentication module now honors the custom password
prompt if one has been specified.
* The embedded copy of zlib has been updated to version 1.2.12.
* Updated the version of libtool used by sudo to version 2.4.7.
* Sudo now defines _TIME_BITS to 64 on systems that define __TIMESIZE
in the header files (currently only GNU libc). This is required
to allow the use of 64-bit time values on some 32-bit systems.
* Sudo's "intercept" and "log_subcmds" options no longer force the
command to run in its own pseudo-terminal. It is now also
possible to intercept the system(3) function.
* Fixed a bug in sudo_logsrvd when run in store-first relay mode
where the commit point messages sent by the server were incorrect
if the command was suspended or received a window size change
event.
* Fixed a potential crash in sudo_logsrvd when the "tls_dhparams"
configuration setting was used.
* The "intercept" and "log_subcmds" functionality can now use
ptrace(2) on Linux systems that support seccomp(2) filtering.
This has the advantage of working for both static and dynamic
binaries and can work with sudo's SELinux RBAC mode. The following
architectures are currently supported: i386, x86_64, aarch64,
arm, mips (log_subcmds only), powerpc, riscv, and s390x. The
default is to use ptrace(2) where possible; the new "intercept_type"
sudoers setting can be used to explicitly set the type.
* New Georgian translation from translationproject.org.
* Fixed creating packages on CentOS Stream.
* Fixed a bug in the intercept and log_subcmds support where
the execve(2) wrapper was using the current environment instead
of the passed environment pointer. Bug #1030.
* Added AppArmor integration for Linux. A sudoers rule can now
specify an APPARMOR_PROFILE option to run a command confined by
the named AppArmor profile.
* Fixed parsing of the "server_log" setting in sudo_logsrvd.conf.
Non-paths were being treated as paths and an actual path was
treated as an error.
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
commit a8344bbac55279517848f33214da9016d49d08de
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sat Jun 25 11:12:14 2022 +0000
Core Update 170: Ship xfsprogs
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit ef03abb15d8ca7811472e99a72b1afc8dc17ac84
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Tue Jun 21 20:52:24 2022 +0200
xfsprogs: Update to version 5.18.0
- Update from version 5.16.0 to 5.18.0
- Update of rootfile not required
- Changelog
Release v5.18.0
xfsprogs: more autoconf modernisation
Release v5.18.0-rc1
mkfs: Fix memory leak
xfsprogs: autoconf modernisation
xfs_io: add a quiet option to bulkstat
metadump: be careful zeroing corrupt inode forks
metadump: handle corruption errors without aborting
xfs_db: take BB cluster offset into account when using 'type' cmd
xfs_scrub: don't revisit scanned inodes when reprocessing a stale inode
xfs_scrub: balance inode chunk scan across CPUs
xfs_scrub: prepare phase3 for per-inogrp worker threads
xfs_scrub: widen action list length variables
xfs_scrub: in phase 3, use the opened file descriptor for repair calls
xfs_scrub: make phase 4 go straight to fstrim if nothing to fix
xfs_scrub: don't try any file repairs during phase 3 if AG metadata bad
xfs_scrub: fall back to scrub-by-handle if opening handles fails
xfs_scrub: in phase 3, use the opened file descriptor for scrub calls
xfs_scrub: collapse trivial file scrub helpers
xfs_repair: check the ftype of dot and dotdot directory entries
xfs_repair: improve error reporting when checking rmap and refcount btrees
xfs_repair: detect v5 featureset mismatches in secondary supers
mkfs: don't trample the gid set in the protofile
mkfs: round log size down if rounding log start up causes overflow
mkfs: improve log extent validation
mkfs: don't let internal logs bump the root dir inode chunk to AG 1
mkfs: reduce internal log size when log stripe units are in play
mkfs: fix missing validation of -l size against maximum internal log size
xfs_repair: fix sizing of the incore rt space usage map calculation
xfs_db: report absolute maxlevels for each btree type
xfs_db: support computing btheight for all cursor types
xfs_repair: warn about suspicious btree levels in AG headers
xfs_db: warn about suspicious finobt trees when metadumping
xfs: note the removal of XFS_IOC_FSSETDM in the documentation
xfs_db: fix a complaint about a printf buffer overrun
xfs_scrub: move to mallinfo2 when available
debian: support multiarch for libhandle
debian: bump compat level to 11
debian: refactor common options
Release v5.18.0-rc0
mm/fs: delete PF_SWAPWRITElibxfs-5.18-sync
xfs: document the XFS_ALLOC_AGFL_RESERVE constant
xfs: constify xfs_name_dotdot
xfs: constify the name argument to various directory functions
xfs: remove the XFS_IOC_{ALLOC,FREE}SP* definitions
xfs: remove the XFS_IOC_FSSETDM definitions
xfs: pass the mapping flags to xfs_bmbt_to_iomap
Release v5.16.0
libxfs: remove kernel stubs from xfs_shared.h
debian: Generate .gitcensus instead of .census (Closes: #999743)
Release v5.16.0-rc0
xfs: Fix the free logic of state in xfs_attr_node_hasname
xfs: #ifdef out perag code for userspace
xfs: use swap() to make dabtree code cleaner
xfs: remove unused parameter from refcount code
xfs: reduce the size of struct xfs_extent_free_item
xfs: rename xfs_bmap_add_free to xfs_free_extent_later
xfs: create slab caches for frequently-used deferred items
xfs: compact deferred intent item structures
xfs: rename _zone variables to _cache
xfs: remove kmem_zone typedef
xfs: use separate btree cursor cache for each btree type
xfs: compute absolute maximum nlevels for each btree type
xfs: kill XFS_BTREE_MAXLEVELS
xfs_repair: stop using XFS_BTREE_MAXLEVELS
xfs_db: stop using XFS_BTREE_MAXLEVELS
xfs: compute the maximum height of the rmap btree when reflink enabled
xfs: clean up xfs_btree_{calc_size,compute_maxlevels}
xfs: compute maximum AG btree height for critical reservation calculation
xfs: rename m_ag_maxlevels to m_allocbt_maxlevels
xfs: dynamically allocate cursors based on maxlevels
xfs: encode the max btree height in the cursor
xfs: refactor btree cursor allocation function
xfs: rearrange xfs_btree_cur fields for better packing
xfs: prepare xfs_btree_cur for dynamic cursor heights
xfs: reduce the size of nr_ops for refcount btree cursors
xfs: remove xfs_btree_cur.bc_blocklog
xfs: fix perag reference leak on iteration race with growfs
xfs: terminate perag iteration reliably on agcount
xfs: rename the next_agno perag iteration variable
xfs: fold perag loop iteration logic into helper function
xfs: remove the xfs_dqblk_t typedef
xfs: remove the xfs_dsb_t typedef
xfs: remove the xfs_dinode_t typedef
xfs: check that bc_nlevels never overflows
xfs: remove xfs_btree_cur_t typedef
xfs: fix maxlevels comparisons in the btree staging code
xfs: port the defer ops capture and continue to resource capture
xfs: formalize the process of holding onto resources across a defer roll
xfs: use kmem_cache_free() for kmem_cache objects
xfs_repair: fix AG header btree level comparisons
xfs_db: fix metadump level comparisons
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
commit f653df852ad45a19e686c0c8d833a1fcbfd4faac
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sat Jun 25 11:07:09 2022 +0000
Start Core Update 170
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/rust-Inflector | 54 ++
config/rootfiles/common/rust-aliasable | 12 +
config/rootfiles/common/rust-asn1 | 17 +
config/rootfiles/common/rust-asn1_derive | 7 +
config/rootfiles/common/rust-base64 | 36 ++
config/rootfiles/common/rust-chrono | 44 ++
config/rootfiles/common/rust-indoc-0.3.6 | 30 ++
config/rootfiles/common/rust-num-integer | 20 +
config/rootfiles/common/rust-num-traits | 31 ++
config/rootfiles/common/rust-num_threads | 11 +
config/rootfiles/common/rust-ouroboros | 6 +
config/rootfiles/common/rust-ouroboros_macro | 21 +
config/rootfiles/common/rust-paste-0.1.18 | 41 ++
config/rootfiles/common/rust-pem | 14 +
config/rootfiles/common/rust-proc-macro-error | 53 ++
config/rootfiles/common/rust-proc-macro-error-attr | 11 +
config/rootfiles/common/rust-pyo3 | 547 ++++++++++++---------
config/rootfiles/common/rust-pyo3-macros | 14 +-
config/rootfiles/common/rust-pyo3-macros-backend | 41 +-
config/rootfiles/common/rust-stable_deref_trait | 9 +
config/rootfiles/common/rust-time | 13 +
config/rootfiles/common/sudo | 3 +-
config/rootfiles/core/{169 => 170}/core-files | 0
config/rootfiles/core/{169 => 170}/exclude | 0
.../core/{169 => 170}/filelists/core-files | 0
.../armv6l/pakfire => core/170/filelists/files} | 0
.../{oldcore/112 => core/170}/filelists/sudo | 0
.../rootfiles/core/{169 => 170}/filelists/xfsprogs | 0
config/rootfiles/core/170/update.sh | 67 +++
config/rootfiles/{core => oldcore}/169/core-files | 0
config/rootfiles/{core => oldcore}/169/exclude | 0
.../169/filelists/aarch64/binutils | 0
.../{core => oldcore}/169/filelists/aarch64/gcc | 0
.../{core => oldcore}/169/filelists/aarch64/glibc | 0
.../{core => oldcore}/169/filelists/aarch64/linux | 0
.../169/filelists/aarch64/linux-initrd | 0
.../{core => oldcore}/169/filelists/apache2 | 0
.../169/filelists/armv6l/binutils | 0
.../{core => oldcore}/169/filelists/armv6l/gcc | 0
.../{core => oldcore}/169/filelists/armv6l/glibc | 0
.../{core => oldcore}/169/filelists/armv6l/linux | 0
.../169/filelists/armv6l/linux-initrd | 0
.../rootfiles/{core => oldcore}/169/filelists/bind | 0
.../{core => oldcore}/169/filelists/core-files | 0
.../rootfiles/{core => oldcore}/169/filelists/curl | 0
.../{core => oldcore}/169/filelists/files | 0
.../rootfiles/{core => oldcore}/169/filelists/fuse | 0
.../{core => oldcore}/169/filelists/iptables | 0
.../{core => oldcore}/169/filelists/keyutils | 0
.../rootfiles/{core => oldcore}/169/filelists/krb5 | 0
.../169/filelists/libnetfilter_cthelper | 0
.../169/filelists/libnetfilter_cttimeout | 0
.../{core => oldcore}/169/filelists/libtiff | 0
.../{core => oldcore}/169/filelists/libxml2 | 0
.../{core => oldcore}/169/filelists/libxslt | 0
.../{core => oldcore}/169/filelists/libyang | 0
.../rootfiles/{core => oldcore}/169/filelists/lmdb | 0
.../{core => oldcore}/169/filelists/logrotate | 0
.../rootfiles/{core => oldcore}/169/filelists/lzip | 0
.../{core => oldcore}/169/filelists/misc-progs | 0
.../{core => oldcore}/169/filelists/oath-toolkit | 0
.../{core => oldcore}/169/filelists/openssl | 0
.../{core => oldcore}/169/filelists/openvpn | 0
.../169/filelists/perl-File-Remove | 0
.../{core => oldcore}/169/filelists/perl-Imager | 0
.../169/filelists/perl-Imager-QRCode | 0
.../169/filelists/perl-MIME-Base32 | 0
.../169/filelists/perl-Module-Build | 0
.../169/filelists/perl-Module-Install | 0
.../169/filelists/perl-Module-ScanDeps | 0
.../169/filelists/perl-URI-Encode | 0
.../{core => oldcore}/169/filelists/perl-YAML-Tiny | 0
.../{core => oldcore}/169/filelists/poppler | 0
.../{core => oldcore}/169/filelists/qrencode | 0
.../{core => oldcore}/169/filelists/sqlite | 0
.../{core => oldcore}/169/filelists/squid | 0
.../{core => oldcore}/169/filelists/tzdata | 0
.../{core => oldcore}/169/filelists/unbound | 0
.../169/filelists/x86_64/binutils | 0
.../{core => oldcore}/169/filelists/x86_64/gcc | 0
.../{core => oldcore}/169/filelists/x86_64/glibc | 0
.../{core => oldcore}/169/filelists/x86_64/linux | 0
.../169/filelists/x86_64/linux-initrd | 0
.../{core => oldcore}/169/filelists/xfsprogs | 0
config/rootfiles/{core => oldcore}/169/update.sh | 0
config/rootfiles/packages/python3-cryptography | 25 +-
lfs/python3-cryptography | 6 +-
lfs/{rust-pyo3 => rust-Inflector} | 6 +-
lfs/{rust-pyo3 => rust-aliasable} | 6 +-
lfs/{rust-pyo3 => rust-asn1} | 6 +-
lfs/{rust-pyo3 => rust-asn1_derive} | 6 +-
lfs/{rust-pyo3 => rust-base64} | 6 +-
lfs/{rust-pyo3-macros-backend => rust-chrono} | 7 +-
lfs/{rust-pyo3 => rust-indoc-0.3.6} | 8 +-
lfs/{rust-pyo3 => rust-num-integer} | 6 +-
lfs/{rust-pyo3 => rust-num-traits} | 6 +-
lfs/{rust-pyo3 => rust-num_threads} | 6 +-
lfs/{rust-pyo3 => rust-ouroboros} | 6 +-
lfs/{rust-pyo3 => rust-ouroboros_macro} | 6 +-
lfs/{rust-pyo3 => rust-paste-0.1.18} | 6 +-
lfs/{rust-pyo3 => rust-pem} | 6 +-
lfs/{rust-pyo3 => rust-proc-macro-error} | 6 +-
...3-macros-backend => rust-proc-macro-error-attr} | 6 +-
lfs/rust-pyo3 | 4 +-
lfs/rust-pyo3-macros | 4 +-
lfs/rust-pyo3-macros-backend | 4 +-
lfs/{rust-pyo3 => rust-stable_deref_trait} | 6 +-
lfs/{rust-pyo3-macros-backend => rust-time} | 7 +-
lfs/sudo | 4 +-
lfs/xfsprogs | 4 +-
make.sh | 18 +
src/pakfire/lib/functions.pl | 84 ++--
src/patches/rust-chrono-0.4.19-fix-metadata.patch | 23 +
src/patches/rust-time-0.1.43-fix-metadata.patch | 13 +
114 files changed, 1022 insertions(+), 381 deletions(-)
create mode 100644 config/rootfiles/common/rust-Inflector
create mode 100644 config/rootfiles/common/rust-aliasable
create mode 100644 config/rootfiles/common/rust-asn1
create mode 100644 config/rootfiles/common/rust-asn1_derive
create mode 100644 config/rootfiles/common/rust-base64
create mode 100644 config/rootfiles/common/rust-chrono
create mode 100644 config/rootfiles/common/rust-indoc-0.3.6
create mode 100644 config/rootfiles/common/rust-num-integer
create mode 100644 config/rootfiles/common/rust-num-traits
create mode 100644 config/rootfiles/common/rust-num_threads
create mode 100644 config/rootfiles/common/rust-ouroboros
create mode 100644 config/rootfiles/common/rust-ouroboros_macro
create mode 100644 config/rootfiles/common/rust-paste-0.1.18
create mode 100644 config/rootfiles/common/rust-pem
create mode 100644 config/rootfiles/common/rust-proc-macro-error
create mode 100644 config/rootfiles/common/rust-proc-macro-error-attr
create mode 100644 config/rootfiles/common/rust-stable_deref_trait
create mode 100644 config/rootfiles/common/rust-time
copy config/rootfiles/core/{169 => 170}/core-files (100%)
copy config/rootfiles/core/{169 => 170}/exclude (100%)
copy config/rootfiles/core/{169 => 170}/filelists/core-files (100%)
copy config/rootfiles/{oldcore/159/filelists/armv6l/pakfire => core/170/filelists/files} (100%)
copy config/rootfiles/{oldcore/112 => core/170}/filelists/sudo (100%)
copy config/rootfiles/core/{169 => 170}/filelists/xfsprogs (100%)
create mode 100644 config/rootfiles/core/170/update.sh
rename config/rootfiles/{core => oldcore}/169/core-files (100%)
rename config/rootfiles/{core => oldcore}/169/exclude (100%)
rename config/rootfiles/{core => oldcore}/169/filelists/aarch64/binutils (100%)
rename config/rootfiles/{core => oldcore}/169/filelists/aarch64/gcc (100%)
rename config/rootfiles/{core => oldcore}/169/filelists/aarch64/glibc (100%)
rename config/rootfiles/{core => oldcore}/169/filelists/aarch64/linux (100%)
rename config/rootfiles/{core => oldcore}/169/filelists/aarch64/linux-initrd (100%)
rename config/rootfiles/{core => oldcore}/169/filelists/apache2 (100%)
rename config/rootfiles/{core => oldcore}/169/filelists/armv6l/binutils (100%)
rename config/rootfiles/{core => oldcore}/169/filelists/armv6l/gcc (100%)
rename config/rootfiles/{core => oldcore}/169/filelists/armv6l/glibc (100%)
rename config/rootfiles/{core => oldcore}/169/filelists/armv6l/linux (100%)
rename config/rootfiles/{core => oldcore}/169/filelists/armv6l/linux-initrd (100%)
rename config/rootfiles/{core => oldcore}/169/filelists/bind (100%)
rename config/rootfiles/{core => oldcore}/169/filelists/core-files (100%)
rename config/rootfiles/{core => oldcore}/169/filelists/curl (100%)
rename config/rootfiles/{core => oldcore}/169/filelists/files (100%)
rename config/rootfiles/{core => oldcore}/169/filelists/fuse (100%)
rename config/rootfiles/{core => oldcore}/169/filelists/iptables (100%)
rename config/rootfiles/{core => oldcore}/169/filelists/keyutils (100%)
rename config/rootfiles/{core => oldcore}/169/filelists/krb5 (100%)
rename config/rootfiles/{core => oldcore}/169/filelists/libnetfilter_cthelper (100%)
rename config/rootfiles/{core => oldcore}/169/filelists/libnetfilter_cttimeout (100%)
rename config/rootfiles/{core => oldcore}/169/filelists/libtiff (100%)
rename config/rootfiles/{core => oldcore}/169/filelists/libxml2 (100%)
rename config/rootfiles/{core => oldcore}/169/filelists/libxslt (100%)
rename config/rootfiles/{core => oldcore}/169/filelists/libyang (100%)
rename config/rootfiles/{core => oldcore}/169/filelists/lmdb (100%)
rename config/rootfiles/{core => oldcore}/169/filelists/logrotate (100%)
rename config/rootfiles/{core => oldcore}/169/filelists/lzip (100%)
rename config/rootfiles/{core => oldcore}/169/filelists/misc-progs (100%)
rename config/rootfiles/{core => oldcore}/169/filelists/oath-toolkit (100%)
rename config/rootfiles/{core => oldcore}/169/filelists/openssl (100%)
rename config/rootfiles/{core => oldcore}/169/filelists/openvpn (100%)
rename config/rootfiles/{core => oldcore}/169/filelists/perl-File-Remove (100%)
rename config/rootfiles/{core => oldcore}/169/filelists/perl-Imager (100%)
rename config/rootfiles/{core => oldcore}/169/filelists/perl-Imager-QRCode (100%)
rename config/rootfiles/{core => oldcore}/169/filelists/perl-MIME-Base32 (100%)
rename config/rootfiles/{core => oldcore}/169/filelists/perl-Module-Build (100%)
rename config/rootfiles/{core => oldcore}/169/filelists/perl-Module-Install (100%)
rename config/rootfiles/{core => oldcore}/169/filelists/perl-Module-ScanDeps (100%)
rename config/rootfiles/{core => oldcore}/169/filelists/perl-URI-Encode (100%)
rename config/rootfiles/{core => oldcore}/169/filelists/perl-YAML-Tiny (100%)
rename config/rootfiles/{core => oldcore}/169/filelists/poppler (100%)
rename config/rootfiles/{core => oldcore}/169/filelists/qrencode (100%)
rename config/rootfiles/{core => oldcore}/169/filelists/sqlite (100%)
rename config/rootfiles/{core => oldcore}/169/filelists/squid (100%)
rename config/rootfiles/{core => oldcore}/169/filelists/tzdata (100%)
rename config/rootfiles/{core => oldcore}/169/filelists/unbound (100%)
rename config/rootfiles/{core => oldcore}/169/filelists/x86_64/binutils (100%)
rename config/rootfiles/{core => oldcore}/169/filelists/x86_64/gcc (100%)
rename config/rootfiles/{core => oldcore}/169/filelists/x86_64/glibc (100%)
rename config/rootfiles/{core => oldcore}/169/filelists/x86_64/linux (100%)
rename config/rootfiles/{core => oldcore}/169/filelists/x86_64/linux-initrd (100%)
rename config/rootfiles/{core => oldcore}/169/filelists/xfsprogs (100%)
rename config/rootfiles/{core => oldcore}/169/update.sh (100%)
copy lfs/{rust-pyo3 => rust-Inflector} (93%)
copy lfs/{rust-pyo3 => rust-aliasable} (93%)
copy lfs/{rust-pyo3 => rust-asn1} (94%)
copy lfs/{rust-pyo3 => rust-asn1_derive} (93%)
copy lfs/{rust-pyo3 => rust-base64} (93%)
copy lfs/{rust-pyo3-macros-backend => rust-chrono} (91%)
copy lfs/{rust-pyo3 => rust-indoc-0.3.6} (92%)
copy lfs/{rust-pyo3 => rust-num-integer} (93%)
copy lfs/{rust-pyo3 => rust-num-traits} (93%)
copy lfs/{rust-pyo3 => rust-num_threads} (93%)
copy lfs/{rust-pyo3 => rust-ouroboros} (93%)
copy lfs/{rust-pyo3 => rust-ouroboros_macro} (93%)
copy lfs/{rust-pyo3 => rust-paste-0.1.18} (93%)
copy lfs/{rust-pyo3 => rust-pem} (94%)
copy lfs/{rust-pyo3 => rust-proc-macro-error} (93%)
copy lfs/{rust-pyo3-macros-backend => rust-proc-macro-error-attr} (93%)
copy lfs/{rust-pyo3 => rust-stable_deref_trait} (93%)
copy lfs/{rust-pyo3-macros-backend => rust-time} (91%)
create mode 100644 src/patches/rust-chrono-0.4.19-fix-metadata.patch
create mode 100644 src/patches/rust-time-0.1.43-fix-metadata.patch
Difference in files:
diff --git a/config/rootfiles/common/rust-Inflector b/config/rootfiles/common/rust-Inflector
new file mode 100644
index 000000000..d97372ab4
--- /dev/null
+++ b/config/rootfiles/common/rust-Inflector
@@ -0,0 +1,54 @@
+#usr/share/cargo/registry/Inflector-0.11.4
+#usr/share/cargo/registry/Inflector-0.11.4/.cargo-checksum.json
+#usr/share/cargo/registry/Inflector-0.11.4/Cargo.toml
+#usr/share/cargo/registry/Inflector-0.11.4/README.md
+#usr/share/cargo/registry/Inflector-0.11.4/src
+#usr/share/cargo/registry/Inflector-0.11.4/src/cases
+#usr/share/cargo/registry/Inflector-0.11.4/src/cases/camelcase
+#usr/share/cargo/registry/Inflector-0.11.4/src/cases/camelcase/mod.rs
+#usr/share/cargo/registry/Inflector-0.11.4/src/cases/case
+#usr/share/cargo/registry/Inflector-0.11.4/src/cases/case/mod.rs
+#usr/share/cargo/registry/Inflector-0.11.4/src/cases/classcase
+#usr/share/cargo/registry/Inflector-0.11.4/src/cases/classcase/mod.rs
+#usr/share/cargo/registry/Inflector-0.11.4/src/cases/kebabcase
+#usr/share/cargo/registry/Inflector-0.11.4/src/cases/kebabcase/mod.rs
+#usr/share/cargo/registry/Inflector-0.11.4/src/cases/mod.rs
+#usr/share/cargo/registry/Inflector-0.11.4/src/cases/pascalcase
+#usr/share/cargo/registry/Inflector-0.11.4/src/cases/pascalcase/mod.rs
+#usr/share/cargo/registry/Inflector-0.11.4/src/cases/screamingsnakecase
+#usr/share/cargo/registry/Inflector-0.11.4/src/cases/screamingsnakecase/mod.rs
+#usr/share/cargo/registry/Inflector-0.11.4/src/cases/sentencecase
+#usr/share/cargo/registry/Inflector-0.11.4/src/cases/sentencecase/mod.rs
+#usr/share/cargo/registry/Inflector-0.11.4/src/cases/snakecase
+#usr/share/cargo/registry/Inflector-0.11.4/src/cases/snakecase/mod.rs
+#usr/share/cargo/registry/Inflector-0.11.4/src/cases/tablecase
+#usr/share/cargo/registry/Inflector-0.11.4/src/cases/tablecase/mod.rs
+#usr/share/cargo/registry/Inflector-0.11.4/src/cases/titlecase
+#usr/share/cargo/registry/Inflector-0.11.4/src/cases/titlecase/mod.rs
+#usr/share/cargo/registry/Inflector-0.11.4/src/cases/traincase
+#usr/share/cargo/registry/Inflector-0.11.4/src/cases/traincase/mod.rs
+#usr/share/cargo/registry/Inflector-0.11.4/src/lib.rs
+#usr/share/cargo/registry/Inflector-0.11.4/src/numbers
+#usr/share/cargo/registry/Inflector-0.11.4/src/numbers/deordinalize
+#usr/share/cargo/registry/Inflector-0.11.4/src/numbers/deordinalize/mod.rs
+#usr/share/cargo/registry/Inflector-0.11.4/src/numbers/mod.rs
+#usr/share/cargo/registry/Inflector-0.11.4/src/numbers/ordinalize
+#usr/share/cargo/registry/Inflector-0.11.4/src/numbers/ordinalize/mod.rs
+#usr/share/cargo/registry/Inflector-0.11.4/src/string
+#usr/share/cargo/registry/Inflector-0.11.4/src/string/constants
+#usr/share/cargo/registry/Inflector-0.11.4/src/string/constants/mod.rs
+#usr/share/cargo/registry/Inflector-0.11.4/src/string/deconstantize
+#usr/share/cargo/registry/Inflector-0.11.4/src/string/deconstantize/mod.rs
+#usr/share/cargo/registry/Inflector-0.11.4/src/string/demodulize
+#usr/share/cargo/registry/Inflector-0.11.4/src/string/demodulize/mod.rs
+#usr/share/cargo/registry/Inflector-0.11.4/src/string/mod.rs
+#usr/share/cargo/registry/Inflector-0.11.4/src/string/pluralize
+#usr/share/cargo/registry/Inflector-0.11.4/src/string/pluralize/mod.rs
+#usr/share/cargo/registry/Inflector-0.11.4/src/string/singularize
+#usr/share/cargo/registry/Inflector-0.11.4/src/string/singularize/mod.rs
+#usr/share/cargo/registry/Inflector-0.11.4/src/suffix
+#usr/share/cargo/registry/Inflector-0.11.4/src/suffix/foreignkey
+#usr/share/cargo/registry/Inflector-0.11.4/src/suffix/foreignkey/mod.rs
+#usr/share/cargo/registry/Inflector-0.11.4/src/suffix/mod.rs
+#usr/share/cargo/registry/Inflector-0.11.4/tests
+#usr/share/cargo/registry/Inflector-0.11.4/tests/lib.rs
diff --git a/config/rootfiles/common/rust-aliasable b/config/rootfiles/common/rust-aliasable
new file mode 100644
index 000000000..e994b8dae
--- /dev/null
+++ b/config/rootfiles/common/rust-aliasable
@@ -0,0 +1,12 @@
+#usr/share/cargo/registry/aliasable-0.1.3
+#usr/share/cargo/registry/aliasable-0.1.3/.cargo-checksum.json
+#usr/share/cargo/registry/aliasable-0.1.3/CHANGELOG.md
+#usr/share/cargo/registry/aliasable-0.1.3/Cargo.toml
+#usr/share/cargo/registry/aliasable-0.1.3/LICENSE
+#usr/share/cargo/registry/aliasable-0.1.3/README.md
+#usr/share/cargo/registry/aliasable-0.1.3/src
+#usr/share/cargo/registry/aliasable-0.1.3/src/boxed.rs
+#usr/share/cargo/registry/aliasable-0.1.3/src/lib.rs
+#usr/share/cargo/registry/aliasable-0.1.3/src/mut_ref.rs
+#usr/share/cargo/registry/aliasable-0.1.3/src/string.rs
+#usr/share/cargo/registry/aliasable-0.1.3/src/vec.rs
diff --git a/config/rootfiles/common/rust-asn1 b/config/rootfiles/common/rust-asn1
new file mode 100644
index 000000000..941f2ddaa
--- /dev/null
+++ b/config/rootfiles/common/rust-asn1
@@ -0,0 +1,17 @@
+#usr/share/cargo/registry/asn1-0.8.7
+#usr/share/cargo/registry/asn1-0.8.7/.cargo-checksum.json
+#usr/share/cargo/registry/asn1-0.8.7/Cargo.toml
+#usr/share/cargo/registry/asn1-0.8.7/Cargo.toml.deps
+#usr/share/cargo/registry/asn1-0.8.7/LICENSE
+#usr/share/cargo/registry/asn1-0.8.7/README.md
+#usr/share/cargo/registry/asn1-0.8.7/examples
+#usr/share/cargo/registry/asn1-0.8.7/examples/no_std.rs
+#usr/share/cargo/registry/asn1-0.8.7/src
+#usr/share/cargo/registry/asn1-0.8.7/src/bit_string.rs
+#usr/share/cargo/registry/asn1-0.8.7/src/lib.rs
+#usr/share/cargo/registry/asn1-0.8.7/src/object_identifier.rs
+#usr/share/cargo/registry/asn1-0.8.7/src/parser.rs
+#usr/share/cargo/registry/asn1-0.8.7/src/types.rs
+#usr/share/cargo/registry/asn1-0.8.7/src/writer.rs
+#usr/share/cargo/registry/asn1-0.8.7/tests
+#usr/share/cargo/registry/asn1-0.8.7/tests/derive_test.rs
diff --git a/config/rootfiles/common/rust-asn1_derive b/config/rootfiles/common/rust-asn1_derive
new file mode 100644
index 000000000..67a57cca9
--- /dev/null
+++ b/config/rootfiles/common/rust-asn1_derive
@@ -0,0 +1,7 @@
+#usr/share/cargo/registry/asn1_derive-0.8.7
+#usr/share/cargo/registry/asn1_derive-0.8.7/.cargo-checksum.json
+#usr/share/cargo/registry/asn1_derive-0.8.7/Cargo.toml
+#usr/share/cargo/registry/asn1_derive-0.8.7/Cargo.toml.deps
+#usr/share/cargo/registry/asn1_derive-0.8.7/LICENSE
+#usr/share/cargo/registry/asn1_derive-0.8.7/src
+#usr/share/cargo/registry/asn1_derive-0.8.7/src/lib.rs
diff --git a/config/rootfiles/common/rust-base64 b/config/rootfiles/common/rust-base64
new file mode 100644
index 000000000..3607db7aa
--- /dev/null
+++ b/config/rootfiles/common/rust-base64
@@ -0,0 +1,36 @@
+#usr/share/cargo/registry/base64-0.13.0
+#usr/share/cargo/registry/base64-0.13.0/.cargo-checksum.json
+#usr/share/cargo/registry/base64-0.13.0/Cargo.toml
+#usr/share/cargo/registry/base64-0.13.0/Cargo.toml.deps
+#usr/share/cargo/registry/base64-0.13.0/LICENSE-APACHE
+#usr/share/cargo/registry/base64-0.13.0/LICENSE-MIT
+#usr/share/cargo/registry/base64-0.13.0/README.md
+#usr/share/cargo/registry/base64-0.13.0/RELEASE-NOTES.md
+#usr/share/cargo/registry/base64-0.13.0/benches
+#usr/share/cargo/registry/base64-0.13.0/benches/benchmarks.rs
+#usr/share/cargo/registry/base64-0.13.0/examples
+#usr/share/cargo/registry/base64-0.13.0/examples/base64.rs
+#usr/share/cargo/registry/base64-0.13.0/examples/make_tables.rs
+#usr/share/cargo/registry/base64-0.13.0/icon_CLion.svg
+#usr/share/cargo/registry/base64-0.13.0/src
+#usr/share/cargo/registry/base64-0.13.0/src/chunked_encoder.rs
+#usr/share/cargo/registry/base64-0.13.0/src/decode.rs
+#usr/share/cargo/registry/base64-0.13.0/src/display.rs
+#usr/share/cargo/registry/base64-0.13.0/src/encode.rs
+#usr/share/cargo/registry/base64-0.13.0/src/lib.rs
+#usr/share/cargo/registry/base64-0.13.0/src/read
+#usr/share/cargo/registry/base64-0.13.0/src/read/decoder.rs
+#usr/share/cargo/registry/base64-0.13.0/src/read/decoder_tests.rs
+#usr/share/cargo/registry/base64-0.13.0/src/read/mod.rs
+#usr/share/cargo/registry/base64-0.13.0/src/tables.rs
+#usr/share/cargo/registry/base64-0.13.0/src/tests.rs
+#usr/share/cargo/registry/base64-0.13.0/src/write
+#usr/share/cargo/registry/base64-0.13.0/src/write/encoder.rs
+#usr/share/cargo/registry/base64-0.13.0/src/write/encoder_string_writer.rs
+#usr/share/cargo/registry/base64-0.13.0/src/write/encoder_tests.rs
+#usr/share/cargo/registry/base64-0.13.0/src/write/mod.rs
+#usr/share/cargo/registry/base64-0.13.0/tests
+#usr/share/cargo/registry/base64-0.13.0/tests/decode.rs
+#usr/share/cargo/registry/base64-0.13.0/tests/encode.rs
+#usr/share/cargo/registry/base64-0.13.0/tests/helpers.rs
+#usr/share/cargo/registry/base64-0.13.0/tests/tests.rs
diff --git a/config/rootfiles/common/rust-chrono b/config/rootfiles/common/rust-chrono
new file mode 100644
index 000000000..f30695b97
--- /dev/null
+++ b/config/rootfiles/common/rust-chrono
@@ -0,0 +1,44 @@
+#usr/share/cargo/registry/chrono-0.4.19
+#usr/share/cargo/registry/chrono-0.4.19/.cargo-checksum.json
+#usr/share/cargo/registry/chrono-0.4.19/AUTHORS.txt
+#usr/share/cargo/registry/chrono-0.4.19/CHANGELOG.md
+#usr/share/cargo/registry/chrono-0.4.19/Cargo.toml
+#usr/share/cargo/registry/chrono-0.4.19/Cargo.toml.deps
+#usr/share/cargo/registry/chrono-0.4.19/LICENSE.txt
+#usr/share/cargo/registry/chrono-0.4.19/README.md
+#usr/share/cargo/registry/chrono-0.4.19/benches
+#usr/share/cargo/registry/chrono-0.4.19/benches/chrono.rs
+#usr/share/cargo/registry/chrono-0.4.19/benches/serde.rs
+#usr/share/cargo/registry/chrono-0.4.19/rustfmt.toml
+#usr/share/cargo/registry/chrono-0.4.19/src
+#usr/share/cargo/registry/chrono-0.4.19/src/date.rs
+#usr/share/cargo/registry/chrono-0.4.19/src/datetime.rs
+#usr/share/cargo/registry/chrono-0.4.19/src/div.rs
+#usr/share/cargo/registry/chrono-0.4.19/src/format
+#usr/share/cargo/registry/chrono-0.4.19/src/format/locales.rs
+#usr/share/cargo/registry/chrono-0.4.19/src/format/mod.rs
+#usr/share/cargo/registry/chrono-0.4.19/src/format/parse.rs
+#usr/share/cargo/registry/chrono-0.4.19/src/format/parsed.rs
+#usr/share/cargo/registry/chrono-0.4.19/src/format/scan.rs
+#usr/share/cargo/registry/chrono-0.4.19/src/format/strftime.rs
+#usr/share/cargo/registry/chrono-0.4.19/src/lib.rs
+#usr/share/cargo/registry/chrono-0.4.19/src/naive
+#usr/share/cargo/registry/chrono-0.4.19/src/naive/date.rs
+#usr/share/cargo/registry/chrono-0.4.19/src/naive/datetime.rs
+#usr/share/cargo/registry/chrono-0.4.19/src/naive/internals.rs
+#usr/share/cargo/registry/chrono-0.4.19/src/naive/isoweek.rs
+#usr/share/cargo/registry/chrono-0.4.19/src/naive/time.rs
+#usr/share/cargo/registry/chrono-0.4.19/src/offset
+#usr/share/cargo/registry/chrono-0.4.19/src/offset/fixed.rs
+#usr/share/cargo/registry/chrono-0.4.19/src/offset/local.rs
+#usr/share/cargo/registry/chrono-0.4.19/src/offset/mod.rs
+#usr/share/cargo/registry/chrono-0.4.19/src/offset/utc.rs
+#usr/share/cargo/registry/chrono-0.4.19/src/oldtime.rs
+#usr/share/cargo/registry/chrono-0.4.19/src/round.rs
+#usr/share/cargo/registry/chrono-0.4.19/src/sys
+#usr/share/cargo/registry/chrono-0.4.19/src/sys.rs
+#usr/share/cargo/registry/chrono-0.4.19/src/sys/stub.rs
+#usr/share/cargo/registry/chrono-0.4.19/src/sys/unix.rs
+#usr/share/cargo/registry/chrono-0.4.19/src/sys/windows.rs
+#usr/share/cargo/registry/chrono-0.4.19/tests
+#usr/share/cargo/registry/chrono-0.4.19/tests/wasm.rs
diff --git a/config/rootfiles/common/rust-indoc-0.3.6 b/config/rootfiles/common/rust-indoc-0.3.6
new file mode 100644
index 000000000..b4ba2d7c6
--- /dev/null
+++ b/config/rootfiles/common/rust-indoc-0.3.6
@@ -0,0 +1,30 @@
+#usr/share/cargo/registry/indoc-0.3.6-0.3.6
+#usr/share/cargo/registry/indoc-0.3.6-0.3.6/.cargo-checksum.json
+#usr/share/cargo/registry/indoc-0.3.6-0.3.6/Cargo.toml
+#usr/share/cargo/registry/indoc-0.3.6-0.3.6/Cargo.toml.deps
+#usr/share/cargo/registry/indoc-0.3.6-0.3.6/LICENSE-APACHE
+#usr/share/cargo/registry/indoc-0.3.6-0.3.6/LICENSE-MIT
+#usr/share/cargo/registry/indoc-0.3.6-0.3.6/README.md
+#usr/share/cargo/registry/indoc-0.3.6-0.3.6/src
+#usr/share/cargo/registry/indoc-0.3.6-0.3.6/src/lib.rs
+#usr/share/cargo/registry/indoc-0.3.6-0.3.6/tests
+#usr/share/cargo/registry/indoc-0.3.6-0.3.6/tests/compiletest.rs
+#usr/share/cargo/registry/indoc-0.3.6-0.3.6/tests/run-pass.rs
+#usr/share/cargo/registry/indoc-0.3.6-0.3.6/tests/ui-stable
+#usr/share/cargo/registry/indoc-0.3.6-0.3.6/tests/ui-stable/no-arguments.rs
+#usr/share/cargo/registry/indoc-0.3.6-0.3.6/tests/ui-stable/no-arguments.stderr
+#usr/share/cargo/registry/indoc-0.3.6-0.3.6/tests/ui-stable/non-lit.rs
+#usr/share/cargo/registry/indoc-0.3.6-0.3.6/tests/ui-stable/non-lit.stderr
+#usr/share/cargo/registry/indoc-0.3.6-0.3.6/tests/ui-stable/non-string.rs
+#usr/share/cargo/registry/indoc-0.3.6-0.3.6/tests/ui-stable/non-string.stderr
+#usr/share/cargo/registry/indoc-0.3.6-0.3.6/tests/ui-stable/two-arguments.rs
+#usr/share/cargo/registry/indoc-0.3.6-0.3.6/tests/ui-stable/two-arguments.stderr
+#usr/share/cargo/registry/indoc-0.3.6-0.3.6/tests/ui-unstable
+#usr/share/cargo/registry/indoc-0.3.6-0.3.6/tests/ui-unstable/no-arguments.rs
+#usr/share/cargo/registry/indoc-0.3.6-0.3.6/tests/ui-unstable/no-arguments.stderr
+#usr/share/cargo/registry/indoc-0.3.6-0.3.6/tests/ui-unstable/non-lit.rs
+#usr/share/cargo/registry/indoc-0.3.6-0.3.6/tests/ui-unstable/non-lit.stderr
+#usr/share/cargo/registry/indoc-0.3.6-0.3.6/tests/ui-unstable/non-string.rs
+#usr/share/cargo/registry/indoc-0.3.6-0.3.6/tests/ui-unstable/non-string.stderr
+#usr/share/cargo/registry/indoc-0.3.6-0.3.6/tests/ui-unstable/two-arguments.rs
+#usr/share/cargo/registry/indoc-0.3.6-0.3.6/tests/ui-unstable/two-arguments.stderr
diff --git a/config/rootfiles/common/rust-num-integer b/config/rootfiles/common/rust-num-integer
new file mode 100644
index 000000000..dcc056a45
--- /dev/null
+++ b/config/rootfiles/common/rust-num-integer
@@ -0,0 +1,20 @@
+#usr/share/cargo/registry/num-integer-0.1.45
+#usr/share/cargo/registry/num-integer-0.1.45/.cargo-checksum.json
+#usr/share/cargo/registry/num-integer-0.1.45/Cargo.toml
+#usr/share/cargo/registry/num-integer-0.1.45/Cargo.toml.deps
+#usr/share/cargo/registry/num-integer-0.1.45/LICENSE-APACHE
+#usr/share/cargo/registry/num-integer-0.1.45/LICENSE-MIT
+#usr/share/cargo/registry/num-integer-0.1.45/README.md
+#usr/share/cargo/registry/num-integer-0.1.45/RELEASES.md
+#usr/share/cargo/registry/num-integer-0.1.45/benches
+#usr/share/cargo/registry/num-integer-0.1.45/benches/average.rs
+#usr/share/cargo/registry/num-integer-0.1.45/benches/gcd.rs
+#usr/share/cargo/registry/num-integer-0.1.45/benches/roots.rs
+#usr/share/cargo/registry/num-integer-0.1.45/build.rs
+#usr/share/cargo/registry/num-integer-0.1.45/src
+#usr/share/cargo/registry/num-integer-0.1.45/src/average.rs
+#usr/share/cargo/registry/num-integer-0.1.45/src/lib.rs
+#usr/share/cargo/registry/num-integer-0.1.45/src/roots.rs
+#usr/share/cargo/registry/num-integer-0.1.45/tests
+#usr/share/cargo/registry/num-integer-0.1.45/tests/average.rs
+#usr/share/cargo/registry/num-integer-0.1.45/tests/roots.rs
diff --git a/config/rootfiles/common/rust-num-traits b/config/rootfiles/common/rust-num-traits
new file mode 100644
index 000000000..faae900a2
--- /dev/null
+++ b/config/rootfiles/common/rust-num-traits
@@ -0,0 +1,31 @@
+#usr/share/cargo/registry/num-traits-0.2.15
+#usr/share/cargo/registry/num-traits-0.2.15/.cargo-checksum.json
+#usr/share/cargo/registry/num-traits-0.2.15/Cargo.toml
+#usr/share/cargo/registry/num-traits-0.2.15/Cargo.toml.deps
+#usr/share/cargo/registry/num-traits-0.2.15/LICENSE-APACHE
+#usr/share/cargo/registry/num-traits-0.2.15/LICENSE-MIT
+#usr/share/cargo/registry/num-traits-0.2.15/README.md
+#usr/share/cargo/registry/num-traits-0.2.15/RELEASES.md
+#usr/share/cargo/registry/num-traits-0.2.15/build.rs
+#usr/share/cargo/registry/num-traits-0.2.15/src
+#usr/share/cargo/registry/num-traits-0.2.15/src/bounds.rs
+#usr/share/cargo/registry/num-traits-0.2.15/src/cast.rs
+#usr/share/cargo/registry/num-traits-0.2.15/src/float.rs
+#usr/share/cargo/registry/num-traits-0.2.15/src/identities.rs
+#usr/share/cargo/registry/num-traits-0.2.15/src/int.rs
+#usr/share/cargo/registry/num-traits-0.2.15/src/lib.rs
+#usr/share/cargo/registry/num-traits-0.2.15/src/macros.rs
+#usr/share/cargo/registry/num-traits-0.2.15/src/ops
+#usr/share/cargo/registry/num-traits-0.2.15/src/ops/checked.rs
+#usr/share/cargo/registry/num-traits-0.2.15/src/ops/euclid.rs
+#usr/share/cargo/registry/num-traits-0.2.15/src/ops/inv.rs
+#usr/share/cargo/registry/num-traits-0.2.15/src/ops/mod.rs
+#usr/share/cargo/registry/num-traits-0.2.15/src/ops/mul_add.rs
+#usr/share/cargo/registry/num-traits-0.2.15/src/ops/overflowing.rs
+#usr/share/cargo/registry/num-traits-0.2.15/src/ops/saturating.rs
+#usr/share/cargo/registry/num-traits-0.2.15/src/ops/wrapping.rs
+#usr/share/cargo/registry/num-traits-0.2.15/src/pow.rs
+#usr/share/cargo/registry/num-traits-0.2.15/src/real.rs
+#usr/share/cargo/registry/num-traits-0.2.15/src/sign.rs
+#usr/share/cargo/registry/num-traits-0.2.15/tests
+#usr/share/cargo/registry/num-traits-0.2.15/tests/cast.rs
diff --git a/config/rootfiles/common/rust-num_threads b/config/rootfiles/common/rust-num_threads
new file mode 100644
index 000000000..8497a3042
--- /dev/null
+++ b/config/rootfiles/common/rust-num_threads
@@ -0,0 +1,11 @@
+#usr/share/cargo/registry/num_threads-0.1.5
+#usr/share/cargo/registry/num_threads-0.1.5/.cargo-checksum.json
+#usr/share/cargo/registry/num_threads-0.1.5/Cargo.toml
+#usr/share/cargo/registry/num_threads-0.1.5/LICENSE-Apache
+#usr/share/cargo/registry/num_threads-0.1.5/LICENSE-MIT
+#usr/share/cargo/registry/num_threads-0.1.5/src
+#usr/share/cargo/registry/num_threads-0.1.5/src/apple.rs
+#usr/share/cargo/registry/num_threads-0.1.5/src/freebsd.rs
+#usr/share/cargo/registry/num_threads-0.1.5/src/imp.rs
+#usr/share/cargo/registry/num_threads-0.1.5/src/lib.rs
+#usr/share/cargo/registry/num_threads-0.1.5/src/linux.rs
diff --git a/config/rootfiles/common/rust-ouroboros b/config/rootfiles/common/rust-ouroboros
new file mode 100644
index 000000000..6c93e73cf
--- /dev/null
+++ b/config/rootfiles/common/rust-ouroboros
@@ -0,0 +1,6 @@
+#usr/share/cargo/registry/ouroboros-0.13.0
+#usr/share/cargo/registry/ouroboros-0.13.0/.cargo-checksum.json
+#usr/share/cargo/registry/ouroboros-0.13.0/Cargo.toml
+#usr/share/cargo/registry/ouroboros-0.13.0/Cargo.toml.deps
+#usr/share/cargo/registry/ouroboros-0.13.0/src
+#usr/share/cargo/registry/ouroboros-0.13.0/src/lib.rs
diff --git a/config/rootfiles/common/rust-ouroboros_macro b/config/rootfiles/common/rust-ouroboros_macro
new file mode 100644
index 000000000..31002c72f
--- /dev/null
+++ b/config/rootfiles/common/rust-ouroboros_macro
@@ -0,0 +1,21 @@
+#usr/share/cargo/registry/ouroboros_macro-0.13.0
+#usr/share/cargo/registry/ouroboros_macro-0.13.0/.cargo-checksum.json
+#usr/share/cargo/registry/ouroboros_macro-0.13.0/Cargo.toml
+#usr/share/cargo/registry/ouroboros_macro-0.13.0/Cargo.toml.deps
+#usr/share/cargo/registry/ouroboros_macro-0.13.0/src
+#usr/share/cargo/registry/ouroboros_macro-0.13.0/src/covariance_detection.rs
+#usr/share/cargo/registry/ouroboros_macro-0.13.0/src/generate
+#usr/share/cargo/registry/ouroboros_macro-0.13.0/src/generate/constructor.rs
+#usr/share/cargo/registry/ouroboros_macro-0.13.0/src/generate/derives.rs
+#usr/share/cargo/registry/ouroboros_macro-0.13.0/src/generate/into_heads.rs
+#usr/share/cargo/registry/ouroboros_macro-0.13.0/src/generate/mod.rs
+#usr/share/cargo/registry/ouroboros_macro-0.13.0/src/generate/struc.rs
+#usr/share/cargo/registry/ouroboros_macro-0.13.0/src/generate/summon_borrowchk.rs
+#usr/share/cargo/registry/ouroboros_macro-0.13.0/src/generate/try_constructor.rs
+#usr/share/cargo/registry/ouroboros_macro-0.13.0/src/generate/type_asserts.rs
+#usr/share/cargo/registry/ouroboros_macro-0.13.0/src/generate/with_all.rs
+#usr/share/cargo/registry/ouroboros_macro-0.13.0/src/generate/with_each.rs
+#usr/share/cargo/registry/ouroboros_macro-0.13.0/src/info_structures.rs
+#usr/share/cargo/registry/ouroboros_macro-0.13.0/src/lib.rs
+#usr/share/cargo/registry/ouroboros_macro-0.13.0/src/parse.rs
+#usr/share/cargo/registry/ouroboros_macro-0.13.0/src/utils.rs
diff --git a/config/rootfiles/common/rust-paste-0.1.18 b/config/rootfiles/common/rust-paste-0.1.18
new file mode 100644
index 000000000..0b7609d47
--- /dev/null
+++ b/config/rootfiles/common/rust-paste-0.1.18
@@ -0,0 +1,41 @@
+#usr/share/cargo/registry/paste-0.1.18-0.1.18
+#usr/share/cargo/registry/paste-0.1.18-0.1.18/.cargo-checksum.json
+#usr/share/cargo/registry/paste-0.1.18-0.1.18/Cargo.toml
+#usr/share/cargo/registry/paste-0.1.18-0.1.18/Cargo.toml.deps
+#usr/share/cargo/registry/paste-0.1.18-0.1.18/LICENSE-APACHE
+#usr/share/cargo/registry/paste-0.1.18-0.1.18/LICENSE-MIT
+#usr/share/cargo/registry/paste-0.1.18-0.1.18/README.md
+#usr/share/cargo/registry/paste-0.1.18-0.1.18/src
+#usr/share/cargo/registry/paste-0.1.18-0.1.18/src/lib.rs
+#usr/share/cargo/registry/paste-0.1.18-0.1.18/tests
+#usr/share/cargo/registry/paste-0.1.18-0.1.18/tests/compiletest.rs
+#usr/share/cargo/registry/paste-0.1.18-0.1.18/tests/test.rs
+#usr/share/cargo/registry/paste-0.1.18-0.1.18/tests/ui
+#usr/share/cargo/registry/paste-0.1.18-0.1.18/tests/ui/case-warning.rs
+#usr/share/cargo/registry/paste-0.1.18-0.1.18/tests/ui/case-warning.stderr
+#usr/share/cargo/registry/paste-0.1.18-0.1.18/tests/ui/env-empty.rs
+#usr/share/cargo/registry/paste-0.1.18-0.1.18/tests/ui/env-empty.stderr
+#usr/share/cargo/registry/paste-0.1.18-0.1.18/tests/ui/env-non-string.rs
+#usr/share/cargo/registry/paste-0.1.18-0.1.18/tests/ui/env-non-string.stderr
+#usr/share/cargo/registry/paste-0.1.18-0.1.18/tests/ui/env-suffix.rs
+#usr/share/cargo/registry/paste-0.1.18-0.1.18/tests/ui/env-suffix.stderr
+#usr/share/cargo/registry/paste-0.1.18-0.1.18/tests/ui/env-unexpected.rs
+#usr/share/cargo/registry/paste-0.1.18-0.1.18/tests/ui/env-unexpected.stderr
+#usr/share/cargo/registry/paste-0.1.18-0.1.18/tests/ui/invalid-ident.rs
+#usr/share/cargo/registry/paste-0.1.18-0.1.18/tests/ui/invalid-ident.stderr
+#usr/share/cargo/registry/paste-0.1.18-0.1.18/tests/ui/missing-paren-on-env.rs
+#usr/share/cargo/registry/paste-0.1.18-0.1.18/tests/ui/missing-paren-on-env.stderr
+#usr/share/cargo/registry/paste-0.1.18-0.1.18/tests/ui/no-env-var.rs
+#usr/share/cargo/registry/paste-0.1.18-0.1.18/tests/ui/no-env-var.stderr
+#usr/share/cargo/registry/paste-0.1.18-0.1.18/tests/ui/no-ident-after-colon.rs
+#usr/share/cargo/registry/paste-0.1.18-0.1.18/tests/ui/no-ident-after-colon.stderr
+#usr/share/cargo/registry/paste-0.1.18-0.1.18/tests/ui/unexpected-group.rs
+#usr/share/cargo/registry/paste-0.1.18-0.1.18/tests/ui/unexpected-group.stderr
+#usr/share/cargo/registry/paste-0.1.18-0.1.18/tests/ui/unexpected-modifier.rs
+#usr/share/cargo/registry/paste-0.1.18-0.1.18/tests/ui/unexpected-modifier.stderr
+#usr/share/cargo/registry/paste-0.1.18-0.1.18/tests/ui/unexpected-punct.rs
+#usr/share/cargo/registry/paste-0.1.18-0.1.18/tests/ui/unexpected-punct.stderr
+#usr/share/cargo/registry/paste-0.1.18-0.1.18/tests/ui/unsupported-literal.rs
+#usr/share/cargo/registry/paste-0.1.18-0.1.18/tests/ui/unsupported-literal.stderr
+#usr/share/cargo/registry/paste-0.1.18-0.1.18/tests/ui/unsupported-modifier.rs
+#usr/share/cargo/registry/paste-0.1.18-0.1.18/tests/ui/unsupported-modifier.stderr
diff --git a/config/rootfiles/common/rust-pem b/config/rootfiles/common/rust-pem
new file mode 100644
index 000000000..042dbb7d8
--- /dev/null
+++ b/config/rootfiles/common/rust-pem
@@ -0,0 +1,14 @@
+#usr/share/cargo/registry/pem-1.0.2
+#usr/share/cargo/registry/pem-1.0.2/.cargo-checksum.json
+#usr/share/cargo/registry/pem-1.0.2/CHANGELOG.md
+#usr/share/cargo/registry/pem-1.0.2/Cargo.toml
+#usr/share/cargo/registry/pem-1.0.2/Cargo.toml.deps
+#usr/share/cargo/registry/pem-1.0.2/LICENSE.md
+#usr/share/cargo/registry/pem-1.0.2/README.md
+#usr/share/cargo/registry/pem-1.0.2/benches
+#usr/share/cargo/registry/pem-1.0.2/benches/pem_benchmark.rs
+#usr/share/cargo/registry/pem-1.0.2/rustfmt.toml
+#usr/share/cargo/registry/pem-1.0.2/src
+#usr/share/cargo/registry/pem-1.0.2/src/errors.rs
+#usr/share/cargo/registry/pem-1.0.2/src/lib.rs
+#usr/share/cargo/registry/pem-1.0.2/src/parser.rs
diff --git a/config/rootfiles/common/rust-proc-macro-error b/config/rootfiles/common/rust-proc-macro-error
new file mode 100644
index 000000000..850479af1
--- /dev/null
+++ b/config/rootfiles/common/rust-proc-macro-error
@@ -0,0 +1,53 @@
+#usr/share/cargo/registry/proc-macro-error-1.0.4
+#usr/share/cargo/registry/proc-macro-error-1.0.4/.cargo-checksum.json
+#usr/share/cargo/registry/proc-macro-error-1.0.4/CHANGELOG.md
+#usr/share/cargo/registry/proc-macro-error-1.0.4/Cargo.toml
+#usr/share/cargo/registry/proc-macro-error-1.0.4/Cargo.toml.deps
+#usr/share/cargo/registry/proc-macro-error-1.0.4/LICENSE-APACHE
+#usr/share/cargo/registry/proc-macro-error-1.0.4/LICENSE-MIT
+#usr/share/cargo/registry/proc-macro-error-1.0.4/README.md
+#usr/share/cargo/registry/proc-macro-error-1.0.4/build.rs
+#usr/share/cargo/registry/proc-macro-error-1.0.4/src
+#usr/share/cargo/registry/proc-macro-error-1.0.4/src/diagnostic.rs
+#usr/share/cargo/registry/proc-macro-error-1.0.4/src/dummy.rs
+#usr/share/cargo/registry/proc-macro-error-1.0.4/src/imp
+#usr/share/cargo/registry/proc-macro-error-1.0.4/src/imp/delegate.rs
+#usr/share/cargo/registry/proc-macro-error-1.0.4/src/imp/fallback.rs
+#usr/share/cargo/registry/proc-macro-error-1.0.4/src/lib.rs
+#usr/share/cargo/registry/proc-macro-error-1.0.4/src/macros.rs
+#usr/share/cargo/registry/proc-macro-error-1.0.4/src/sealed.rs
+#usr/share/cargo/registry/proc-macro-error-1.0.4/tests
+#usr/share/cargo/registry/proc-macro-error-1.0.4/tests/macro-errors.rs
+#usr/share/cargo/registry/proc-macro-error-1.0.4/tests/ok.rs
+#usr/share/cargo/registry/proc-macro-error-1.0.4/tests/runtime-errors.rs
+#usr/share/cargo/registry/proc-macro-error-1.0.4/tests/ui
+#usr/share/cargo/registry/proc-macro-error-1.0.4/tests/ui/abort.rs
+#usr/share/cargo/registry/proc-macro-error-1.0.4/tests/ui/abort.stderr
+#usr/share/cargo/registry/proc-macro-error-1.0.4/tests/ui/append_dummy.rs
+#usr/share/cargo/registry/proc-macro-error-1.0.4/tests/ui/append_dummy.stderr
+#usr/share/cargo/registry/proc-macro-error-1.0.4/tests/ui/children_messages.rs
+#usr/share/cargo/registry/proc-macro-error-1.0.4/tests/ui/children_messages.stderr
+#usr/share/cargo/registry/proc-macro-error-1.0.4/tests/ui/dummy.rs
+#usr/share/cargo/registry/proc-macro-error-1.0.4/tests/ui/dummy.stderr
+#usr/share/cargo/registry/proc-macro-error-1.0.4/tests/ui/emit.rs
+#usr/share/cargo/registry/proc-macro-error-1.0.4/tests/ui/emit.stderr
+#usr/share/cargo/registry/proc-macro-error-1.0.4/tests/ui/explicit_span_range.rs
+#usr/share/cargo/registry/proc-macro-error-1.0.4/tests/ui/explicit_span_range.stderr
+#usr/share/cargo/registry/proc-macro-error-1.0.4/tests/ui/misuse.rs
+#usr/share/cargo/registry/proc-macro-error-1.0.4/tests/ui/misuse.stderr
+#usr/share/cargo/registry/proc-macro-error-1.0.4/tests/ui/multiple_tokens.rs
+#usr/share/cargo/registry/proc-macro-error-1.0.4/tests/ui/multiple_tokens.stderr
+#usr/share/cargo/registry/proc-macro-error-1.0.4/tests/ui/not_proc_macro.rs
+#usr/share/cargo/registry/proc-macro-error-1.0.4/tests/ui/not_proc_macro.stderr
+#usr/share/cargo/registry/proc-macro-error-1.0.4/tests/ui/option_ext.rs
+#usr/share/cargo/registry/proc-macro-error-1.0.4/tests/ui/option_ext.stderr
+#usr/share/cargo/registry/proc-macro-error-1.0.4/tests/ui/proc_macro_hack.rs
+#usr/share/cargo/registry/proc-macro-error-1.0.4/tests/ui/proc_macro_hack.stderr
+#usr/share/cargo/registry/proc-macro-error-1.0.4/tests/ui/result_ext.rs
+#usr/share/cargo/registry/proc-macro-error-1.0.4/tests/ui/result_ext.stderr
+#usr/share/cargo/registry/proc-macro-error-1.0.4/tests/ui/to_tokens_span.rs
+#usr/share/cargo/registry/proc-macro-error-1.0.4/tests/ui/to_tokens_span.stderr
+#usr/share/cargo/registry/proc-macro-error-1.0.4/tests/ui/unknown_setting.rs
+#usr/share/cargo/registry/proc-macro-error-1.0.4/tests/ui/unknown_setting.stderr
+#usr/share/cargo/registry/proc-macro-error-1.0.4/tests/ui/unrelated_panic.rs
+#usr/share/cargo/registry/proc-macro-error-1.0.4/tests/ui/unrelated_panic.stderr
diff --git a/config/rootfiles/common/rust-proc-macro-error-attr b/config/rootfiles/common/rust-proc-macro-error-attr
new file mode 100644
index 000000000..17da5873f
--- /dev/null
+++ b/config/rootfiles/common/rust-proc-macro-error-attr
@@ -0,0 +1,11 @@
+#usr/share/cargo/registry/proc-macro-error-attr-1.0.4
+#usr/share/cargo/registry/proc-macro-error-attr-1.0.4/.cargo-checksum.json
+#usr/share/cargo/registry/proc-macro-error-attr-1.0.4/Cargo.toml
+#usr/share/cargo/registry/proc-macro-error-attr-1.0.4/Cargo.toml.deps
+#usr/share/cargo/registry/proc-macro-error-attr-1.0.4/LICENSE-APACHE
+#usr/share/cargo/registry/proc-macro-error-attr-1.0.4/LICENSE-MIT
+#usr/share/cargo/registry/proc-macro-error-attr-1.0.4/build.rs
+#usr/share/cargo/registry/proc-macro-error-attr-1.0.4/src
+#usr/share/cargo/registry/proc-macro-error-attr-1.0.4/src/lib.rs
+#usr/share/cargo/registry/proc-macro-error-attr-1.0.4/src/parse.rs
+#usr/share/cargo/registry/proc-macro-error-attr-1.0.4/src/settings.rs
diff --git a/config/rootfiles/common/rust-pyo3 b/config/rootfiles/common/rust-pyo3
index 8d49a81b1..4c4913c9a 100644
--- a/config/rootfiles/common/rust-pyo3
+++ b/config/rootfiles/common/rust-pyo3
@@ -1,239 +1,308 @@
-#usr/share/cargo/registry/pyo3-0.13.1
-#usr/share/cargo/registry/pyo3-0.13.1/.cargo-checksum.json
-#usr/share/cargo/registry/pyo3-0.13.1/CHANGELOG.md
-#usr/share/cargo/registry/pyo3-0.13.1/Cargo.toml
-#usr/share/cargo/registry/pyo3-0.13.1/Cargo.toml.deps
-#usr/share/cargo/registry/pyo3-0.13.1/Code-of-Conduct.md
-#usr/share/cargo/registry/pyo3-0.13.1/Contributing.md
-#usr/share/cargo/registry/pyo3-0.13.1/LICENSE
-#usr/share/cargo/registry/pyo3-0.13.1/Makefile
-#usr/share/cargo/registry/pyo3-0.13.1/README.md
-#usr/share/cargo/registry/pyo3-0.13.1/benches
-#usr/share/cargo/registry/pyo3-0.13.1/benches/bench_call.rs
-#usr/share/cargo/registry/pyo3-0.13.1/benches/bench_dict.rs
-#usr/share/cargo/registry/pyo3-0.13.1/benches/bench_list.rs
-#usr/share/cargo/registry/pyo3-0.13.1/benches/bench_pyobject.rs
-#usr/share/cargo/registry/pyo3-0.13.1/benches/bench_set.rs
-#usr/share/cargo/registry/pyo3-0.13.1/benches/bench_tuple.rs
-#usr/share/cargo/registry/pyo3-0.13.1/build.rs
-#usr/share/cargo/registry/pyo3-0.13.1/codecov.yml
-#usr/share/cargo/registry/pyo3-0.13.1/guide
-#usr/share/cargo/registry/pyo3-0.13.1/guide/book.toml
-#usr/share/cargo/registry/pyo3-0.13.1/guide/src
-#usr/share/cargo/registry/pyo3-0.13.1/guide/src/SUMMARY.md
-#usr/share/cargo/registry/pyo3-0.13.1/guide/src/advanced.md
-#usr/share/cargo/registry/pyo3-0.13.1/guide/src/building_and_distribution.md
-#usr/share/cargo/registry/pyo3-0.13.1/guide/src/changelog.md
-#usr/share/cargo/registry/pyo3-0.13.1/guide/src/class
-#usr/share/cargo/registry/pyo3-0.13.1/guide/src/class.md
-#usr/share/cargo/registry/pyo3-0.13.1/guide/src/class/protocols.md
-#usr/share/cargo/registry/pyo3-0.13.1/guide/src/conversions
-#usr/share/cargo/registry/pyo3-0.13.1/guide/src/conversions.md
-#usr/share/cargo/registry/pyo3-0.13.1/guide/src/conversions/tables.md
-#usr/share/cargo/registry/pyo3-0.13.1/guide/src/conversions/traits.md
-#usr/share/cargo/registry/pyo3-0.13.1/guide/src/debugging.md
-#usr/share/cargo/registry/pyo3-0.13.1/guide/src/exception.md
-#usr/share/cargo/registry/pyo3-0.13.1/guide/src/faq.md
-#usr/share/cargo/registry/pyo3-0.13.1/guide/src/features.md
-#usr/share/cargo/registry/pyo3-0.13.1/guide/src/function.md
-#usr/share/cargo/registry/pyo3-0.13.1/guide/src/index.md
-#usr/share/cargo/registry/pyo3-0.13.1/guide/src/logging.md
-#usr/share/cargo/registry/pyo3-0.13.1/guide/src/migration.md
-#usr/share/cargo/registry/pyo3-0.13.1/guide/src/module.md
-#usr/share/cargo/registry/pyo3-0.13.1/guide/src/parallelism.md
-#usr/share/cargo/registry/pyo3-0.13.1/guide/src/pypy.md
-#usr/share/cargo/registry/pyo3-0.13.1/guide/src/python_from_rust.md
-#usr/share/cargo/registry/pyo3-0.13.1/guide/src/rust_cpython.md
-#usr/share/cargo/registry/pyo3-0.13.1/guide/src/trait_bounds.md
-#usr/share/cargo/registry/pyo3-0.13.1/guide/src/types.md
-#usr/share/cargo/registry/pyo3-0.13.1/pyproject.toml
-#usr/share/cargo/registry/pyo3-0.13.1/src
-#usr/share/cargo/registry/pyo3-0.13.1/src/buffer.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/callback.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/class
-#usr/share/cargo/registry/pyo3-0.13.1/src/class/basic.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/class/buffer.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/class/context.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/class/descr.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/class/gc.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/class/iter.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/class/macros.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/class/mapping.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/class/methods.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/class/mod.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/class/number.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/class/proto_methods.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/class/pyasync.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/class/sequence.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/conversion.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/derive_utils.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/err
-#usr/share/cargo/registry/pyo3-0.13.1/src/err/err_state.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/err/impls.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/err/mod.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/exceptions.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/LICENSE
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/README.md
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/bltinmodule.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/boolobject.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/bytearrayobject.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/bytesobject.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/ceval.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/code.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/codecs.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/compile.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/complexobject.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/context.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/cpython
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/cpython/abstract_.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/cpython/bytesobject.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/cpython/ceval.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/cpython/code.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/cpython/dictobject.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/cpython/frameobject.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/cpython/mod.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/datetime.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/descrobject.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/dictobject.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/enumobject.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/eval.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/fileobject.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/floatobject.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/funcobject.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/genobject.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/import.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/initconfig.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/intrcheck.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/iterobject.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/listobject.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/longobject.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/marshal.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/memoryobject.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/methodobject.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/mod.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/modsupport.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/moduleobject.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/object.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/objectabstract.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/objimpl.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/osmodule.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/pyarena.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/pycapsule.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/pydebug.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/pyerrors.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/pyframe.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/pyhash.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/pylifecycle.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/pymem.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/pyport.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/pystate.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/pystrtod.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/pythonrun.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/rangeobject.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/setobject.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/sliceobject.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/structmember.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/structseq.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/sysmodule.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/traceback.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/tupleobject.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/typeslots.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/unicodeobject.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/warnings.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/ffi/weakrefobject.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/freelist.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/gil.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/instance.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/internal_tricks.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/lib.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/marshal.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/once_cell.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/panic.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/prelude.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/pycell.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/pyclass.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/pyclass_init.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/pyclass_slots.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/python.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/type_object.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/types
-#usr/share/cargo/registry/pyo3-0.13.1/src/types/any.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/types/boolobject.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/types/bytearray.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/types/bytes.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/types/complex.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/types/datetime.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/types/dict.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/types/floatob.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/types/function.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/types/iterator.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/types/list.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/types/mod.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/types/module.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/types/num.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/types/sequence.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/types/set.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/types/slice.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/types/string.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/types/tuple.rs
-#usr/share/cargo/registry/pyo3-0.13.1/src/types/typeobject.rs
-#usr/share/cargo/registry/pyo3-0.13.1/tests
-#usr/share/cargo/registry/pyo3-0.13.1/tests/common.rs
-#usr/share/cargo/registry/pyo3-0.13.1/tests/test_arithmetics.rs
-#usr/share/cargo/registry/pyo3-0.13.1/tests/test_buffer_protocol.rs
-#usr/share/cargo/registry/pyo3-0.13.1/tests/test_bytes.rs
-#usr/share/cargo/registry/pyo3-0.13.1/tests/test_class_attributes.rs
-#usr/share/cargo/registry/pyo3-0.13.1/tests/test_class_basics.rs
-#usr/share/cargo/registry/pyo3-0.13.1/tests/test_class_conversion.rs
-#usr/share/cargo/registry/pyo3-0.13.1/tests/test_class_new.rs
-#usr/share/cargo/registry/pyo3-0.13.1/tests/test_compile_error.rs
-#usr/share/cargo/registry/pyo3-0.13.1/tests/test_datetime.rs
-#usr/share/cargo/registry/pyo3-0.13.1/tests/test_dict_iter.rs
-#usr/share/cargo/registry/pyo3-0.13.1/tests/test_dunder.rs
-#usr/share/cargo/registry/pyo3-0.13.1/tests/test_exceptions.rs
-#usr/share/cargo/registry/pyo3-0.13.1/tests/test_frompyobject.rs
-#usr/share/cargo/registry/pyo3-0.13.1/tests/test_gc.rs
-#usr/share/cargo/registry/pyo3-0.13.1/tests/test_getter_setter.rs
-#usr/share/cargo/registry/pyo3-0.13.1/tests/test_inheritance.rs
-#usr/share/cargo/registry/pyo3-0.13.1/tests/test_mapping.rs
-#usr/share/cargo/registry/pyo3-0.13.1/tests/test_methods.rs
-#usr/share/cargo/registry/pyo3-0.13.1/tests/test_module.rs
-#usr/share/cargo/registry/pyo3-0.13.1/tests/test_pyfunction.rs
-#usr/share/cargo/registry/pyo3-0.13.1/tests/test_pyself.rs
-#usr/share/cargo/registry/pyo3-0.13.1/tests/test_sequence.rs
-#usr/share/cargo/registry/pyo3-0.13.1/tests/test_string.rs
-#usr/share/cargo/registry/pyo3-0.13.1/tests/test_text_signature.rs
-#usr/share/cargo/registry/pyo3-0.13.1/tests/test_unsendable_dict.rs
-#usr/share/cargo/registry/pyo3-0.13.1/tests/test_variable_arguments.rs
-#usr/share/cargo/registry/pyo3-0.13.1/tests/test_various.rs
-#usr/share/cargo/registry/pyo3-0.13.1/tests/ui
-#usr/share/cargo/registry/pyo3-0.13.1/tests/ui/abi3_nativetype_inheritance.rs
-#usr/share/cargo/registry/pyo3-0.13.1/tests/ui/abi3_nativetype_inheritance.stderr
-#usr/share/cargo/registry/pyo3-0.13.1/tests/ui/invalid_frompy_derive.rs
-#usr/share/cargo/registry/pyo3-0.13.1/tests/ui/invalid_frompy_derive.stderr
-#usr/share/cargo/registry/pyo3-0.13.1/tests/ui/invalid_macro_args.rs
-#usr/share/cargo/registry/pyo3-0.13.1/tests/ui/invalid_macro_args.stderr
-#usr/share/cargo/registry/pyo3-0.13.1/tests/ui/invalid_need_module_arg_position.rs
-#usr/share/cargo/registry/pyo3-0.13.1/tests/ui/invalid_need_module_arg_position.stderr
-#usr/share/cargo/registry/pyo3-0.13.1/tests/ui/invalid_property_args.rs
-#usr/share/cargo/registry/pyo3-0.13.1/tests/ui/invalid_property_args.stderr
-#usr/share/cargo/registry/pyo3-0.13.1/tests/ui/invalid_pyclass_args.rs
-#usr/share/cargo/registry/pyo3-0.13.1/tests/ui/invalid_pyclass_args.stderr
-#usr/share/cargo/registry/pyo3-0.13.1/tests/ui/invalid_pymethod_names.rs
-#usr/share/cargo/registry/pyo3-0.13.1/tests/ui/invalid_pymethod_names.stderr
-#usr/share/cargo/registry/pyo3-0.13.1/tests/ui/invalid_pymethod_receiver.rs
-#usr/share/cargo/registry/pyo3-0.13.1/tests/ui/invalid_pymethod_receiver.stderr
-#usr/share/cargo/registry/pyo3-0.13.1/tests/ui/invalid_result_conversion.rs
-#usr/share/cargo/registry/pyo3-0.13.1/tests/ui/invalid_result_conversion.stderr
-#usr/share/cargo/registry/pyo3-0.13.1/tests/ui/missing_clone.rs
-#usr/share/cargo/registry/pyo3-0.13.1/tests/ui/missing_clone.stderr
-#usr/share/cargo/registry/pyo3-0.13.1/tests/ui/pyclass_send.rs
-#usr/share/cargo/registry/pyo3-0.13.1/tests/ui/pyclass_send.stderr
-#usr/share/cargo/registry/pyo3-0.13.1/tests/ui/reject_generics.rs
-#usr/share/cargo/registry/pyo3-0.13.1/tests/ui/reject_generics.stderr
-#usr/share/cargo/registry/pyo3-0.13.1/tests/ui/static_ref.rs
-#usr/share/cargo/registry/pyo3-0.13.1/tests/ui/static_ref.stderr
-#usr/share/cargo/registry/pyo3-0.13.1/tests/ui/wrong_aspyref_lifetimes.rs
-#usr/share/cargo/registry/pyo3-0.13.1/tests/ui/wrong_aspyref_lifetimes.stderr
-#usr/share/cargo/registry/pyo3-0.13.1/tox.ini
+#usr/share/cargo/registry/pyo3-0.15.1
+#usr/share/cargo/registry/pyo3-0.15.1/.cargo-checksum.json
+#usr/share/cargo/registry/pyo3-0.15.1/Architecture.md
+#usr/share/cargo/registry/pyo3-0.15.1/CHANGELOG.md
+#usr/share/cargo/registry/pyo3-0.15.1/Cargo.toml
+#usr/share/cargo/registry/pyo3-0.15.1/Cargo.toml.deps
+#usr/share/cargo/registry/pyo3-0.15.1/Code-of-Conduct.md
+#usr/share/cargo/registry/pyo3-0.15.1/Contributing.md
+#usr/share/cargo/registry/pyo3-0.15.1/LICENSE
+#usr/share/cargo/registry/pyo3-0.15.1/README.md
+#usr/share/cargo/registry/pyo3-0.15.1/benches
+#usr/share/cargo/registry/pyo3-0.15.1/benches/bench_call.rs
+#usr/share/cargo/registry/pyo3-0.15.1/benches/bench_dict.rs
+#usr/share/cargo/registry/pyo3-0.15.1/benches/bench_err.rs
+#usr/share/cargo/registry/pyo3-0.15.1/benches/bench_gil.rs
+#usr/share/cargo/registry/pyo3-0.15.1/benches/bench_list.rs
+#usr/share/cargo/registry/pyo3-0.15.1/benches/bench_pyclass.rs
+#usr/share/cargo/registry/pyo3-0.15.1/benches/bench_pyobject.rs
+#usr/share/cargo/registry/pyo3-0.15.1/benches/bench_set.rs
+#usr/share/cargo/registry/pyo3-0.15.1/benches/bench_tuple.rs
+#usr/share/cargo/registry/pyo3-0.15.1/build.rs
+#usr/share/cargo/registry/pyo3-0.15.1/examples
+#usr/share/cargo/registry/pyo3-0.15.1/examples/README.md
+#usr/share/cargo/registry/pyo3-0.15.1/guide
+#usr/share/cargo/registry/pyo3-0.15.1/guide/book.toml
+#usr/share/cargo/registry/pyo3-0.15.1/guide/pyo3_version.py
+#usr/share/cargo/registry/pyo3-0.15.1/guide/src
+#usr/share/cargo/registry/pyo3-0.15.1/guide/src/SUMMARY.md
+#usr/share/cargo/registry/pyo3-0.15.1/guide/src/advanced.md
+#usr/share/cargo/registry/pyo3-0.15.1/guide/src/building_and_distribution
+#usr/share/cargo/registry/pyo3-0.15.1/guide/src/building_and_distribution.md
+#usr/share/cargo/registry/pyo3-0.15.1/guide/src/building_and_distribution/multiple_python_versions.md
+#usr/share/cargo/registry/pyo3-0.15.1/guide/src/changelog.md
+#usr/share/cargo/registry/pyo3-0.15.1/guide/src/class
+#usr/share/cargo/registry/pyo3-0.15.1/guide/src/class.md
+#usr/share/cargo/registry/pyo3-0.15.1/guide/src/class/protocols.md
+#usr/share/cargo/registry/pyo3-0.15.1/guide/src/conversions
+#usr/share/cargo/registry/pyo3-0.15.1/guide/src/conversions.md
+#usr/share/cargo/registry/pyo3-0.15.1/guide/src/conversions/tables.md
+#usr/share/cargo/registry/pyo3-0.15.1/guide/src/conversions/traits.md
+#usr/share/cargo/registry/pyo3-0.15.1/guide/src/debugging.md
+#usr/share/cargo/registry/pyo3-0.15.1/guide/src/ecosystem
+#usr/share/cargo/registry/pyo3-0.15.1/guide/src/ecosystem.md
+#usr/share/cargo/registry/pyo3-0.15.1/guide/src/ecosystem/async-await.md
+#usr/share/cargo/registry/pyo3-0.15.1/guide/src/ecosystem/logging.md
+#usr/share/cargo/registry/pyo3-0.15.1/guide/src/exception.md
+#usr/share/cargo/registry/pyo3-0.15.1/guide/src/faq.md
+#usr/share/cargo/registry/pyo3-0.15.1/guide/src/features.md
+#usr/share/cargo/registry/pyo3-0.15.1/guide/src/function.md
+#usr/share/cargo/registry/pyo3-0.15.1/guide/src/index.md
+#usr/share/cargo/registry/pyo3-0.15.1/guide/src/memory.md
+#usr/share/cargo/registry/pyo3-0.15.1/guide/src/migration.md
+#usr/share/cargo/registry/pyo3-0.15.1/guide/src/module.md
+#usr/share/cargo/registry/pyo3-0.15.1/guide/src/parallelism.md
+#usr/share/cargo/registry/pyo3-0.15.1/guide/src/python_from_rust.md
+#usr/share/cargo/registry/pyo3-0.15.1/guide/src/python_typing_hints.md
+#usr/share/cargo/registry/pyo3-0.15.1/guide/src/rust_cpython.md
+#usr/share/cargo/registry/pyo3-0.15.1/guide/src/trait_bounds.md
+#usr/share/cargo/registry/pyo3-0.15.1/guide/src/types.md
+#usr/share/cargo/registry/pyo3-0.15.1/rust-toolchain.toml
+#usr/share/cargo/registry/pyo3-0.15.1/src
+#usr/share/cargo/registry/pyo3-0.15.1/src/buffer.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/callback.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/class
+#usr/share/cargo/registry/pyo3-0.15.1/src/class/basic.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/class/buffer.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/class/context.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/class/descr.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/class/gc.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/class/impl_.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/class/iter.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/class/macros.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/class/mapping.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/class/methods.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/class/mod.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/class/number.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/class/pyasync.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/class/sequence.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/conversion.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/conversions
+#usr/share/cargo/registry/pyo3-0.15.1/src/conversions/anyhow.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/conversions/array.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/conversions/eyre.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/conversions/hashbrown.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/conversions/indexmap.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/conversions/mod.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/conversions/num_bigint.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/conversions/num_complex.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/conversions/osstr.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/conversions/path.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/conversions/serde.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/derive_utils.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/err
+#usr/share/cargo/registry/pyo3-0.15.1/src/err/err_state.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/err/impls.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/err/mod.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/exceptions.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/LICENSE
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/README.md
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/abstract_.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/bltinmodule.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/boolobject.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/bytearrayobject.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/bytesobject.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/ceval.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/code.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/codecs.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/compile.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/complexobject.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/context.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/cpython
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/cpython/abstract_.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/cpython/bytesobject.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/cpython/ceval.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/cpython/code.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/cpython/compile.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/cpython/dictobject.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/cpython/frameobject.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/cpython/import.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/cpython/initconfig.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/cpython/listobject.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/cpython/mod.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/cpython/object.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/cpython/pydebug.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/cpython/pylifecycle.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/cpython/pymem.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/cpython/pystate.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/cpython/pythonrun.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/cpython/tupleobject.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/cpython/unicodeobject.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/datetime.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/descrobject.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/dictobject.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/enumobject.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/eval.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/fileobject.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/fileutils.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/floatobject.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/funcobject.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/genobject.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/import.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/intrcheck.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/iterobject.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/listobject.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/longobject.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/marshal.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/memoryobject.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/methodobject.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/mod.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/modsupport.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/moduleobject.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/object.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/objimpl.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/osmodule.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/pyarena.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/pycapsule.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/pyerrors.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/pyframe.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/pyhash.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/pylifecycle.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/pymem.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/pyport.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/pystate.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/pystrtod.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/pythonrun.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/rangeobject.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/setobject.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/sliceobject.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/structmember.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/structseq.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/sysmodule.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/traceback.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/tupleobject.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/typeslots.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/unicodeobject.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/warnings.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/ffi/weakrefobject.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/gil.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/impl_
+#usr/share/cargo/registry/pyo3-0.15.1/src/impl_.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/impl_/deprecations.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/impl_/freelist.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/instance.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/internal_tricks.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/lib.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/macros.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/marshal.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/once_cell.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/panic.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/prelude.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/pycell.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/pyclass.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/pyclass_init.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/pyclass_slots.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/python.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/type_object.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/types
+#usr/share/cargo/registry/pyo3-0.15.1/src/types/any.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/types/boolobject.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/types/bytearray.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/types/bytes.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/types/complex.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/types/datetime.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/types/dict.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/types/floatob.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/types/function.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/types/iterator.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/types/list.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/types/mapping.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/types/mod.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/types/module.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/types/num.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/types/sequence.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/types/set.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/types/slice.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/types/string.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/types/traceback.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/types/tuple.rs
+#usr/share/cargo/registry/pyo3-0.15.1/src/types/typeobject.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests
+#usr/share/cargo/registry/pyo3-0.15.1/tests/common.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/hygiene
+#usr/share/cargo/registry/pyo3-0.15.1/tests/hygiene/misc.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/hygiene/pyclass.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/hygiene/pyfunction.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/hygiene/pymethods.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/hygiene/pymodule.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/hygiene/pyproto.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/not_msrv
+#usr/share/cargo/registry/pyo3-0.15.1/tests/not_msrv/requires_1_54.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/test_anyhow.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/test_arithmetics.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/test_arithmetics_protos.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/test_buffer.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/test_buffer_protocol.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/test_bytes.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/test_class_attributes.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/test_class_basics.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/test_class_conversion.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/test_class_new.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/test_compile_error.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/test_datetime.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/test_dict_iter.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/test_exceptions.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/test_frompyobject.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/test_gc.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/test_getter_setter.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/test_hygiene.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/test_inheritance.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/test_macros.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/test_mapping.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/test_methods.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/test_module.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/test_multiple_pymethods.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/test_not_msrv.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/test_proto_methods.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/test_py36_init.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/test_pyfunction.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/test_pyproto.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/test_pyself.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/test_sequence.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/test_serde.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/test_string.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/test_text_signature.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/test_unsendable_dict.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/test_variable_arguments.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/test_various.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/test_wrap_pyfunction_deduction.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/ui
+#usr/share/cargo/registry/pyo3-0.15.1/tests/ui/abi3_nativetype_inheritance.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/ui/abi3_nativetype_inheritance.stderr
+#usr/share/cargo/registry/pyo3-0.15.1/tests/ui/deprecations.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/ui/deprecations.stderr
+#usr/share/cargo/registry/pyo3-0.15.1/tests/ui/invalid_argument_attributes.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/ui/invalid_argument_attributes.stderr
+#usr/share/cargo/registry/pyo3-0.15.1/tests/ui/invalid_closure.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/ui/invalid_closure.stderr
+#usr/share/cargo/registry/pyo3-0.15.1/tests/ui/invalid_frompy_derive.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/ui/invalid_frompy_derive.stderr
+#usr/share/cargo/registry/pyo3-0.15.1/tests/ui/invalid_macro_args.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/ui/invalid_macro_args.stderr
+#usr/share/cargo/registry/pyo3-0.15.1/tests/ui/invalid_need_module_arg_position.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/ui/invalid_need_module_arg_position.stderr
+#usr/share/cargo/registry/pyo3-0.15.1/tests/ui/invalid_property_args.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/ui/invalid_property_args.stderr
+#usr/share/cargo/registry/pyo3-0.15.1/tests/ui/invalid_pyclass_args.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/ui/invalid_pyclass_args.stderr
+#usr/share/cargo/registry/pyo3-0.15.1/tests/ui/invalid_pyfunctions.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/ui/invalid_pyfunctions.stderr
+#usr/share/cargo/registry/pyo3-0.15.1/tests/ui/invalid_pymethod_names.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/ui/invalid_pymethod_names.stderr
+#usr/share/cargo/registry/pyo3-0.15.1/tests/ui/invalid_pymethod_receiver.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/ui/invalid_pymethod_receiver.stderr
+#usr/share/cargo/registry/pyo3-0.15.1/tests/ui/invalid_pymethods.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/ui/invalid_pymethods.stderr
+#usr/share/cargo/registry/pyo3-0.15.1/tests/ui/invalid_result_conversion.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/ui/invalid_result_conversion.stderr
+#usr/share/cargo/registry/pyo3-0.15.1/tests/ui/missing_clone.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/ui/missing_clone.stderr
+#usr/share/cargo/registry/pyo3-0.15.1/tests/ui/pyclass_send.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/ui/pyclass_send.stderr
+#usr/share/cargo/registry/pyo3-0.15.1/tests/ui/reject_generics.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/ui/reject_generics.stderr
+#usr/share/cargo/registry/pyo3-0.15.1/tests/ui/static_ref.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/ui/static_ref.stderr
+#usr/share/cargo/registry/pyo3-0.15.1/tests/ui/wrong_aspyref_lifetimes.rs
+#usr/share/cargo/registry/pyo3-0.15.1/tests/ui/wrong_aspyref_lifetimes.stderr
diff --git a/config/rootfiles/common/rust-pyo3-macros b/config/rootfiles/common/rust-pyo3-macros
index 912674772..c25fbb0b7 100644
--- a/config/rootfiles/common/rust-pyo3-macros
+++ b/config/rootfiles/common/rust-pyo3-macros
@@ -1,7 +1,7 @@
-#usr/share/cargo/registry/pyo3-macros-0.13.1
-#usr/share/cargo/registry/pyo3-macros-0.13.1/.cargo-checksum.json
-#usr/share/cargo/registry/pyo3-macros-0.13.1/Cargo.toml
-#usr/share/cargo/registry/pyo3-macros-0.13.1/Cargo.toml.deps
-#usr/share/cargo/registry/pyo3-macros-0.13.1/LICENSE
-#usr/share/cargo/registry/pyo3-macros-0.13.1/src
-#usr/share/cargo/registry/pyo3-macros-0.13.1/src/lib.rs
+#usr/share/cargo/registry/pyo3-macros-0.15.1
+#usr/share/cargo/registry/pyo3-macros-0.15.1/.cargo-checksum.json
+#usr/share/cargo/registry/pyo3-macros-0.15.1/Cargo.toml
+#usr/share/cargo/registry/pyo3-macros-0.15.1/Cargo.toml.deps
+#usr/share/cargo/registry/pyo3-macros-0.15.1/LICENSE
+#usr/share/cargo/registry/pyo3-macros-0.15.1/src
+#usr/share/cargo/registry/pyo3-macros-0.15.1/src/lib.rs
diff --git a/config/rootfiles/common/rust-pyo3-macros-backend b/config/rootfiles/common/rust-pyo3-macros-backend
index 9c81e674c..069fb8a77 100644
--- a/config/rootfiles/common/rust-pyo3-macros-backend
+++ b/config/rootfiles/common/rust-pyo3-macros-backend
@@ -1,19 +1,22 @@
-#usr/share/cargo/registry/pyo3-macros-backend-0.13.1
-#usr/share/cargo/registry/pyo3-macros-backend-0.13.1/.cargo-checksum.json
-#usr/share/cargo/registry/pyo3-macros-backend-0.13.1/Cargo.toml
-#usr/share/cargo/registry/pyo3-macros-backend-0.13.1/Cargo.toml.deps
-#usr/share/cargo/registry/pyo3-macros-backend-0.13.1/LICENSE
-#usr/share/cargo/registry/pyo3-macros-backend-0.13.1/src
-#usr/share/cargo/registry/pyo3-macros-backend-0.13.1/src/defs.rs
-#usr/share/cargo/registry/pyo3-macros-backend-0.13.1/src/from_pyobject.rs
-#usr/share/cargo/registry/pyo3-macros-backend-0.13.1/src/konst.rs
-#usr/share/cargo/registry/pyo3-macros-backend-0.13.1/src/lib.rs
-#usr/share/cargo/registry/pyo3-macros-backend-0.13.1/src/method.rs
-#usr/share/cargo/registry/pyo3-macros-backend-0.13.1/src/module.rs
-#usr/share/cargo/registry/pyo3-macros-backend-0.13.1/src/proto_method.rs
-#usr/share/cargo/registry/pyo3-macros-backend-0.13.1/src/pyclass.rs
-#usr/share/cargo/registry/pyo3-macros-backend-0.13.1/src/pyfunction.rs
-#usr/share/cargo/registry/pyo3-macros-backend-0.13.1/src/pyimpl.rs
-#usr/share/cargo/registry/pyo3-macros-backend-0.13.1/src/pymethod.rs
-#usr/share/cargo/registry/pyo3-macros-backend-0.13.1/src/pyproto.rs
-#usr/share/cargo/registry/pyo3-macros-backend-0.13.1/src/utils.rs
+#usr/share/cargo/registry/pyo3-macros-backend-0.15.1
+#usr/share/cargo/registry/pyo3-macros-backend-0.15.1/.cargo-checksum.json
+#usr/share/cargo/registry/pyo3-macros-backend-0.15.1/Cargo.toml
+#usr/share/cargo/registry/pyo3-macros-backend-0.15.1/Cargo.toml.deps
+#usr/share/cargo/registry/pyo3-macros-backend-0.15.1/LICENSE
+#usr/share/cargo/registry/pyo3-macros-backend-0.15.1/src
+#usr/share/cargo/registry/pyo3-macros-backend-0.15.1/src/attributes.rs
+#usr/share/cargo/registry/pyo3-macros-backend-0.15.1/src/defs.rs
+#usr/share/cargo/registry/pyo3-macros-backend-0.15.1/src/deprecations.rs
+#usr/share/cargo/registry/pyo3-macros-backend-0.15.1/src/from_pyobject.rs
+#usr/share/cargo/registry/pyo3-macros-backend-0.15.1/src/konst.rs
+#usr/share/cargo/registry/pyo3-macros-backend-0.15.1/src/lib.rs
+#usr/share/cargo/registry/pyo3-macros-backend-0.15.1/src/method.rs
+#usr/share/cargo/registry/pyo3-macros-backend-0.15.1/src/module.rs
+#usr/share/cargo/registry/pyo3-macros-backend-0.15.1/src/params.rs
+#usr/share/cargo/registry/pyo3-macros-backend-0.15.1/src/proto_method.rs
+#usr/share/cargo/registry/pyo3-macros-backend-0.15.1/src/pyclass.rs
+#usr/share/cargo/registry/pyo3-macros-backend-0.15.1/src/pyfunction.rs
+#usr/share/cargo/registry/pyo3-macros-backend-0.15.1/src/pyimpl.rs
+#usr/share/cargo/registry/pyo3-macros-backend-0.15.1/src/pymethod.rs
+#usr/share/cargo/registry/pyo3-macros-backend-0.15.1/src/pyproto.rs
+#usr/share/cargo/registry/pyo3-macros-backend-0.15.1/src/utils.rs
diff --git a/config/rootfiles/common/rust-stable_deref_trait b/config/rootfiles/common/rust-stable_deref_trait
new file mode 100644
index 000000000..be542c52f
--- /dev/null
+++ b/config/rootfiles/common/rust-stable_deref_trait
@@ -0,0 +1,9 @@
+#usr/share/cargo/registry/stable_deref_trait-1.2.0
+#usr/share/cargo/registry/stable_deref_trait-1.2.0/.cargo-checksum.json
+#usr/share/cargo/registry/stable_deref_trait-1.2.0/Cargo.toml
+#usr/share/cargo/registry/stable_deref_trait-1.2.0/Cargo.toml.deps
+#usr/share/cargo/registry/stable_deref_trait-1.2.0/LICENSE-APACHE
+#usr/share/cargo/registry/stable_deref_trait-1.2.0/LICENSE-MIT
+#usr/share/cargo/registry/stable_deref_trait-1.2.0/README.md
+#usr/share/cargo/registry/stable_deref_trait-1.2.0/src
+#usr/share/cargo/registry/stable_deref_trait-1.2.0/src/lib.rs
diff --git a/config/rootfiles/common/rust-time b/config/rootfiles/common/rust-time
new file mode 100644
index 000000000..08aaa8980
--- /dev/null
+++ b/config/rootfiles/common/rust-time
@@ -0,0 +1,13 @@
+#usr/share/cargo/registry/time-0.1.43
+#usr/share/cargo/registry/time-0.1.43/.cargo-checksum.json
+#usr/share/cargo/registry/time-0.1.43/Cargo.toml
+#usr/share/cargo/registry/time-0.1.43/Cargo.toml.deps
+#usr/share/cargo/registry/time-0.1.43/LICENSE-APACHE
+#usr/share/cargo/registry/time-0.1.43/LICENSE-MIT
+#usr/share/cargo/registry/time-0.1.43/README.md
+#usr/share/cargo/registry/time-0.1.43/src
+#usr/share/cargo/registry/time-0.1.43/src/display.rs
+#usr/share/cargo/registry/time-0.1.43/src/duration.rs
+#usr/share/cargo/registry/time-0.1.43/src/lib.rs
+#usr/share/cargo/registry/time-0.1.43/src/parse.rs
+#usr/share/cargo/registry/time-0.1.43/src/sys.rs
diff --git a/config/rootfiles/common/sudo b/config/rootfiles/common/sudo
index 1cb0d2bf7..93d9cbce2 100644
--- a/config/rootfiles/common/sudo
+++ b/config/rootfiles/common/sudo
@@ -80,6 +80,7 @@ usr/sbin/visudo
#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/ka/LC_MESSAGES/sudo.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
@@ -120,11 +121,11 @@ usr/sbin/visudo
#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/sudo_plugin.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
diff --git a/config/rootfiles/core/169/core-files b/config/rootfiles/core/170/core-files
similarity index 100%
rename from config/rootfiles/core/169/core-files
rename to config/rootfiles/core/170/core-files
diff --git a/config/rootfiles/core/169/exclude b/config/rootfiles/core/170/exclude
similarity index 100%
rename from config/rootfiles/core/169/exclude
rename to config/rootfiles/core/170/exclude
diff --git a/config/rootfiles/core/169/filelists/core-files b/config/rootfiles/core/170/filelists/core-files
similarity index 100%
rename from config/rootfiles/core/169/filelists/core-files
rename to config/rootfiles/core/170/filelists/core-files
diff --git a/config/rootfiles/core/170/filelists/files b/config/rootfiles/core/170/filelists/files
new file mode 100644
index 000000000..e71417ae0
--- /dev/null
+++ b/config/rootfiles/core/170/filelists/files
@@ -0,0 +1 @@
+opt/pakfire/lib/functions.pl
diff --git a/config/rootfiles/core/170/filelists/sudo b/config/rootfiles/core/170/filelists/sudo
new file mode 120000
index 000000000..0d3c45e04
--- /dev/null
+++ b/config/rootfiles/core/170/filelists/sudo
@@ -0,0 +1 @@
+../../../common/sudo
\ No newline at end of file
diff --git a/config/rootfiles/core/169/filelists/xfsprogs b/config/rootfiles/core/170/filelists/xfsprogs
similarity index 100%
rename from config/rootfiles/core/169/filelists/xfsprogs
rename to config/rootfiles/core/170/filelists/xfsprogs
diff --git a/config/rootfiles/core/170/update.sh b/config/rootfiles/core/170/update.sh
new file mode 100644
index 000000000..8edb5ff2e
--- /dev/null
+++ b/config/rootfiles/core/170/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) 2022 IPFire-Team <info(a)ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+core=170
+
+# 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
+
+# Stop services
+
+# Remove files
+
+# 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/169/core-files b/config/rootfiles/oldcore/169/core-files
new file mode 100644
index 000000000..0dec37e53
--- /dev/null
+++ b/config/rootfiles/oldcore/169/core-files
@@ -0,0 +1,5 @@
+etc/system-release
+etc/issue
+etc/os-release
+srv/web/ipfire/cgi-bin/credits.cgi
+var/ipfire/langs
diff --git a/config/rootfiles/oldcore/169/exclude b/config/rootfiles/oldcore/169/exclude
new file mode 100644
index 000000000..b22e5e943
--- /dev/null
+++ b/config/rootfiles/oldcore/169/exclude
@@ -0,0 +1,35 @@
+boot/config.txt
+boot/grub/grub.cfg
+boot/grub/grubenv
+boot/uEnv.txt
+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/169/filelists/aarch64/binutils b/config/rootfiles/oldcore/169/filelists/aarch64/binutils
similarity index 100%
rename from config/rootfiles/core/169/filelists/aarch64/binutils
rename to config/rootfiles/oldcore/169/filelists/aarch64/binutils
diff --git a/config/rootfiles/core/169/filelists/aarch64/gcc b/config/rootfiles/oldcore/169/filelists/aarch64/gcc
similarity index 100%
rename from config/rootfiles/core/169/filelists/aarch64/gcc
rename to config/rootfiles/oldcore/169/filelists/aarch64/gcc
diff --git a/config/rootfiles/core/169/filelists/aarch64/glibc b/config/rootfiles/oldcore/169/filelists/aarch64/glibc
similarity index 100%
rename from config/rootfiles/core/169/filelists/aarch64/glibc
rename to config/rootfiles/oldcore/169/filelists/aarch64/glibc
diff --git a/config/rootfiles/core/169/filelists/aarch64/linux b/config/rootfiles/oldcore/169/filelists/aarch64/linux
similarity index 100%
rename from config/rootfiles/core/169/filelists/aarch64/linux
rename to config/rootfiles/oldcore/169/filelists/aarch64/linux
diff --git a/config/rootfiles/core/169/filelists/aarch64/linux-initrd b/config/rootfiles/oldcore/169/filelists/aarch64/linux-initrd
similarity index 100%
rename from config/rootfiles/core/169/filelists/aarch64/linux-initrd
rename to config/rootfiles/oldcore/169/filelists/aarch64/linux-initrd
diff --git a/config/rootfiles/core/169/filelists/apache2 b/config/rootfiles/oldcore/169/filelists/apache2
similarity index 100%
rename from config/rootfiles/core/169/filelists/apache2
rename to config/rootfiles/oldcore/169/filelists/apache2
diff --git a/config/rootfiles/core/169/filelists/armv6l/binutils b/config/rootfiles/oldcore/169/filelists/armv6l/binutils
similarity index 100%
rename from config/rootfiles/core/169/filelists/armv6l/binutils
rename to config/rootfiles/oldcore/169/filelists/armv6l/binutils
diff --git a/config/rootfiles/core/169/filelists/armv6l/gcc b/config/rootfiles/oldcore/169/filelists/armv6l/gcc
similarity index 100%
rename from config/rootfiles/core/169/filelists/armv6l/gcc
rename to config/rootfiles/oldcore/169/filelists/armv6l/gcc
diff --git a/config/rootfiles/core/169/filelists/armv6l/glibc b/config/rootfiles/oldcore/169/filelists/armv6l/glibc
similarity index 100%
rename from config/rootfiles/core/169/filelists/armv6l/glibc
rename to config/rootfiles/oldcore/169/filelists/armv6l/glibc
diff --git a/config/rootfiles/core/169/filelists/armv6l/linux b/config/rootfiles/oldcore/169/filelists/armv6l/linux
similarity index 100%
rename from config/rootfiles/core/169/filelists/armv6l/linux
rename to config/rootfiles/oldcore/169/filelists/armv6l/linux
diff --git a/config/rootfiles/core/169/filelists/armv6l/linux-initrd b/config/rootfiles/oldcore/169/filelists/armv6l/linux-initrd
similarity index 100%
rename from config/rootfiles/core/169/filelists/armv6l/linux-initrd
rename to config/rootfiles/oldcore/169/filelists/armv6l/linux-initrd
diff --git a/config/rootfiles/core/169/filelists/bind b/config/rootfiles/oldcore/169/filelists/bind
similarity index 100%
rename from config/rootfiles/core/169/filelists/bind
rename to config/rootfiles/oldcore/169/filelists/bind
diff --git a/config/rootfiles/oldcore/169/filelists/core-files b/config/rootfiles/oldcore/169/filelists/core-files
new file mode 120000
index 000000000..709d6c14c
--- /dev/null
+++ b/config/rootfiles/oldcore/169/filelists/core-files
@@ -0,0 +1 @@
+../core-files
\ No newline at end of file
diff --git a/config/rootfiles/core/169/filelists/curl b/config/rootfiles/oldcore/169/filelists/curl
similarity index 100%
rename from config/rootfiles/core/169/filelists/curl
rename to config/rootfiles/oldcore/169/filelists/curl
diff --git a/config/rootfiles/core/169/filelists/files b/config/rootfiles/oldcore/169/filelists/files
similarity index 100%
rename from config/rootfiles/core/169/filelists/files
rename to config/rootfiles/oldcore/169/filelists/files
diff --git a/config/rootfiles/core/169/filelists/fuse b/config/rootfiles/oldcore/169/filelists/fuse
similarity index 100%
rename from config/rootfiles/core/169/filelists/fuse
rename to config/rootfiles/oldcore/169/filelists/fuse
diff --git a/config/rootfiles/core/169/filelists/iptables b/config/rootfiles/oldcore/169/filelists/iptables
similarity index 100%
rename from config/rootfiles/core/169/filelists/iptables
rename to config/rootfiles/oldcore/169/filelists/iptables
diff --git a/config/rootfiles/core/169/filelists/keyutils b/config/rootfiles/oldcore/169/filelists/keyutils
similarity index 100%
rename from config/rootfiles/core/169/filelists/keyutils
rename to config/rootfiles/oldcore/169/filelists/keyutils
diff --git a/config/rootfiles/core/169/filelists/krb5 b/config/rootfiles/oldcore/169/filelists/krb5
similarity index 100%
rename from config/rootfiles/core/169/filelists/krb5
rename to config/rootfiles/oldcore/169/filelists/krb5
diff --git a/config/rootfiles/core/169/filelists/libnetfilter_cthelper b/config/rootfiles/oldcore/169/filelists/libnetfilter_cthelper
similarity index 100%
rename from config/rootfiles/core/169/filelists/libnetfilter_cthelper
rename to config/rootfiles/oldcore/169/filelists/libnetfilter_cthelper
diff --git a/config/rootfiles/core/169/filelists/libnetfilter_cttimeout b/config/rootfiles/oldcore/169/filelists/libnetfilter_cttimeout
similarity index 100%
rename from config/rootfiles/core/169/filelists/libnetfilter_cttimeout
rename to config/rootfiles/oldcore/169/filelists/libnetfilter_cttimeout
diff --git a/config/rootfiles/core/169/filelists/libtiff b/config/rootfiles/oldcore/169/filelists/libtiff
similarity index 100%
rename from config/rootfiles/core/169/filelists/libtiff
rename to config/rootfiles/oldcore/169/filelists/libtiff
diff --git a/config/rootfiles/core/169/filelists/libxml2 b/config/rootfiles/oldcore/169/filelists/libxml2
similarity index 100%
rename from config/rootfiles/core/169/filelists/libxml2
rename to config/rootfiles/oldcore/169/filelists/libxml2
diff --git a/config/rootfiles/core/169/filelists/libxslt b/config/rootfiles/oldcore/169/filelists/libxslt
similarity index 100%
rename from config/rootfiles/core/169/filelists/libxslt
rename to config/rootfiles/oldcore/169/filelists/libxslt
diff --git a/config/rootfiles/core/169/filelists/libyang b/config/rootfiles/oldcore/169/filelists/libyang
similarity index 100%
rename from config/rootfiles/core/169/filelists/libyang
rename to config/rootfiles/oldcore/169/filelists/libyang
diff --git a/config/rootfiles/core/169/filelists/lmdb b/config/rootfiles/oldcore/169/filelists/lmdb
similarity index 100%
rename from config/rootfiles/core/169/filelists/lmdb
rename to config/rootfiles/oldcore/169/filelists/lmdb
diff --git a/config/rootfiles/core/169/filelists/logrotate b/config/rootfiles/oldcore/169/filelists/logrotate
similarity index 100%
rename from config/rootfiles/core/169/filelists/logrotate
rename to config/rootfiles/oldcore/169/filelists/logrotate
diff --git a/config/rootfiles/core/169/filelists/lzip b/config/rootfiles/oldcore/169/filelists/lzip
similarity index 100%
rename from config/rootfiles/core/169/filelists/lzip
rename to config/rootfiles/oldcore/169/filelists/lzip
diff --git a/config/rootfiles/core/169/filelists/misc-progs b/config/rootfiles/oldcore/169/filelists/misc-progs
similarity index 100%
rename from config/rootfiles/core/169/filelists/misc-progs
rename to config/rootfiles/oldcore/169/filelists/misc-progs
diff --git a/config/rootfiles/core/169/filelists/oath-toolkit b/config/rootfiles/oldcore/169/filelists/oath-toolkit
similarity index 100%
rename from config/rootfiles/core/169/filelists/oath-toolkit
rename to config/rootfiles/oldcore/169/filelists/oath-toolkit
diff --git a/config/rootfiles/core/169/filelists/openssl b/config/rootfiles/oldcore/169/filelists/openssl
similarity index 100%
rename from config/rootfiles/core/169/filelists/openssl
rename to config/rootfiles/oldcore/169/filelists/openssl
diff --git a/config/rootfiles/core/169/filelists/openvpn b/config/rootfiles/oldcore/169/filelists/openvpn
similarity index 100%
rename from config/rootfiles/core/169/filelists/openvpn
rename to config/rootfiles/oldcore/169/filelists/openvpn
diff --git a/config/rootfiles/core/169/filelists/perl-File-Remove b/config/rootfiles/oldcore/169/filelists/perl-File-Remove
similarity index 100%
rename from config/rootfiles/core/169/filelists/perl-File-Remove
rename to config/rootfiles/oldcore/169/filelists/perl-File-Remove
diff --git a/config/rootfiles/core/169/filelists/perl-Imager b/config/rootfiles/oldcore/169/filelists/perl-Imager
similarity index 100%
rename from config/rootfiles/core/169/filelists/perl-Imager
rename to config/rootfiles/oldcore/169/filelists/perl-Imager
diff --git a/config/rootfiles/core/169/filelists/perl-Imager-QRCode b/config/rootfiles/oldcore/169/filelists/perl-Imager-QRCode
similarity index 100%
rename from config/rootfiles/core/169/filelists/perl-Imager-QRCode
rename to config/rootfiles/oldcore/169/filelists/perl-Imager-QRCode
diff --git a/config/rootfiles/core/169/filelists/perl-MIME-Base32 b/config/rootfiles/oldcore/169/filelists/perl-MIME-Base32
similarity index 100%
rename from config/rootfiles/core/169/filelists/perl-MIME-Base32
rename to config/rootfiles/oldcore/169/filelists/perl-MIME-Base32
diff --git a/config/rootfiles/core/169/filelists/perl-Module-Build b/config/rootfiles/oldcore/169/filelists/perl-Module-Build
similarity index 100%
rename from config/rootfiles/core/169/filelists/perl-Module-Build
rename to config/rootfiles/oldcore/169/filelists/perl-Module-Build
diff --git a/config/rootfiles/core/169/filelists/perl-Module-Install b/config/rootfiles/oldcore/169/filelists/perl-Module-Install
similarity index 100%
rename from config/rootfiles/core/169/filelists/perl-Module-Install
rename to config/rootfiles/oldcore/169/filelists/perl-Module-Install
diff --git a/config/rootfiles/core/169/filelists/perl-Module-ScanDeps b/config/rootfiles/oldcore/169/filelists/perl-Module-ScanDeps
similarity index 100%
rename from config/rootfiles/core/169/filelists/perl-Module-ScanDeps
rename to config/rootfiles/oldcore/169/filelists/perl-Module-ScanDeps
diff --git a/config/rootfiles/core/169/filelists/perl-URI-Encode b/config/rootfiles/oldcore/169/filelists/perl-URI-Encode
similarity index 100%
rename from config/rootfiles/core/169/filelists/perl-URI-Encode
rename to config/rootfiles/oldcore/169/filelists/perl-URI-Encode
diff --git a/config/rootfiles/core/169/filelists/perl-YAML-Tiny b/config/rootfiles/oldcore/169/filelists/perl-YAML-Tiny
similarity index 100%
rename from config/rootfiles/core/169/filelists/perl-YAML-Tiny
rename to config/rootfiles/oldcore/169/filelists/perl-YAML-Tiny
diff --git a/config/rootfiles/core/169/filelists/poppler b/config/rootfiles/oldcore/169/filelists/poppler
similarity index 100%
rename from config/rootfiles/core/169/filelists/poppler
rename to config/rootfiles/oldcore/169/filelists/poppler
diff --git a/config/rootfiles/core/169/filelists/qrencode b/config/rootfiles/oldcore/169/filelists/qrencode
similarity index 100%
rename from config/rootfiles/core/169/filelists/qrencode
rename to config/rootfiles/oldcore/169/filelists/qrencode
diff --git a/config/rootfiles/core/169/filelists/sqlite b/config/rootfiles/oldcore/169/filelists/sqlite
similarity index 100%
rename from config/rootfiles/core/169/filelists/sqlite
rename to config/rootfiles/oldcore/169/filelists/sqlite
diff --git a/config/rootfiles/core/169/filelists/squid b/config/rootfiles/oldcore/169/filelists/squid
similarity index 100%
rename from config/rootfiles/core/169/filelists/squid
rename to config/rootfiles/oldcore/169/filelists/squid
diff --git a/config/rootfiles/core/169/filelists/tzdata b/config/rootfiles/oldcore/169/filelists/tzdata
similarity index 100%
rename from config/rootfiles/core/169/filelists/tzdata
rename to config/rootfiles/oldcore/169/filelists/tzdata
diff --git a/config/rootfiles/core/169/filelists/unbound b/config/rootfiles/oldcore/169/filelists/unbound
similarity index 100%
rename from config/rootfiles/core/169/filelists/unbound
rename to config/rootfiles/oldcore/169/filelists/unbound
diff --git a/config/rootfiles/core/169/filelists/x86_64/binutils b/config/rootfiles/oldcore/169/filelists/x86_64/binutils
similarity index 100%
rename from config/rootfiles/core/169/filelists/x86_64/binutils
rename to config/rootfiles/oldcore/169/filelists/x86_64/binutils
diff --git a/config/rootfiles/core/169/filelists/x86_64/gcc b/config/rootfiles/oldcore/169/filelists/x86_64/gcc
similarity index 100%
rename from config/rootfiles/core/169/filelists/x86_64/gcc
rename to config/rootfiles/oldcore/169/filelists/x86_64/gcc
diff --git a/config/rootfiles/core/169/filelists/x86_64/glibc b/config/rootfiles/oldcore/169/filelists/x86_64/glibc
similarity index 100%
rename from config/rootfiles/core/169/filelists/x86_64/glibc
rename to config/rootfiles/oldcore/169/filelists/x86_64/glibc
diff --git a/config/rootfiles/core/169/filelists/x86_64/linux b/config/rootfiles/oldcore/169/filelists/x86_64/linux
similarity index 100%
rename from config/rootfiles/core/169/filelists/x86_64/linux
rename to config/rootfiles/oldcore/169/filelists/x86_64/linux
diff --git a/config/rootfiles/core/169/filelists/x86_64/linux-initrd b/config/rootfiles/oldcore/169/filelists/x86_64/linux-initrd
similarity index 100%
rename from config/rootfiles/core/169/filelists/x86_64/linux-initrd
rename to config/rootfiles/oldcore/169/filelists/x86_64/linux-initrd
diff --git a/config/rootfiles/oldcore/169/filelists/xfsprogs b/config/rootfiles/oldcore/169/filelists/xfsprogs
new file mode 120000
index 000000000..91032964d
--- /dev/null
+++ b/config/rootfiles/oldcore/169/filelists/xfsprogs
@@ -0,0 +1 @@
+../../../common/xfsprogs
\ No newline at end of file
diff --git a/config/rootfiles/core/169/update.sh b/config/rootfiles/oldcore/169/update.sh
similarity index 100%
rename from config/rootfiles/core/169/update.sh
rename to config/rootfiles/oldcore/169/update.sh
diff --git a/config/rootfiles/packages/python3-cryptography b/config/rootfiles/packages/python3-cryptography
index 9f63606fb..a9ee32faf 100644
--- a/config/rootfiles/packages/python3-cryptography
+++ b/config/rootfiles/packages/python3-cryptography
@@ -1,20 +1,18 @@
usr/lib/python3.10/site-packages/cryptography
-#usr/lib/python3.10/site-packages/cryptography-3.4.7-py3.10.egg-info
-#usr/lib/python3.10/site-packages/cryptography-3.4.7-py3.10.egg-info/PKG-INFO
-#usr/lib/python3.10/site-packages/cryptography-3.4.7-py3.10.egg-info/SOURCES.txt
-#usr/lib/python3.10/site-packages/cryptography-3.4.7-py3.10.egg-info/dependency_links.txt
-#usr/lib/python3.10/site-packages/cryptography-3.4.7-py3.10.egg-info/not-zip-safe
-#usr/lib/python3.10/site-packages/cryptography-3.4.7-py3.10.egg-info/requires.txt
-#usr/lib/python3.10/site-packages/cryptography-3.4.7-py3.10.egg-info/top_level.txt
+#usr/lib/python3.10/site-packages/cryptography-36.0.2-py3.10.egg-info
+#usr/lib/python3.10/site-packages/cryptography-36.0.2-py3.10.egg-info/PKG-INFO
+#usr/lib/python3.10/site-packages/cryptography-36.0.2-py3.10.egg-info/SOURCES.txt
+#usr/lib/python3.10/site-packages/cryptography-36.0.2-py3.10.egg-info/dependency_links.txt
+#usr/lib/python3.10/site-packages/cryptography-36.0.2-py3.10.egg-info/not-zip-safe
+#usr/lib/python3.10/site-packages/cryptography-36.0.2-py3.10.egg-info/requires.txt
+#usr/lib/python3.10/site-packages/cryptography-36.0.2-py3.10.egg-info/top_level.txt
usr/lib/python3.10/site-packages/cryptography/__about__.py
usr/lib/python3.10/site-packages/cryptography/__init__.py
usr/lib/python3.10/site-packages/cryptography/exceptions.py
usr/lib/python3.10/site-packages/cryptography/fernet.py
usr/lib/python3.10/site-packages/cryptography/hazmat
usr/lib/python3.10/site-packages/cryptography/hazmat/__init__.py
-usr/lib/python3.10/site-packages/cryptography/hazmat/_der.py
usr/lib/python3.10/site-packages/cryptography/hazmat/_oid.py
-usr/lib/python3.10/site-packages/cryptography/hazmat/_types.py
usr/lib/python3.10/site-packages/cryptography/hazmat/backends
usr/lib/python3.10/site-packages/cryptography/hazmat/backends/__init__.py
usr/lib/python3.10/site-packages/cryptography/hazmat/backends/interfaces.py
@@ -33,7 +31,6 @@ usr/lib/python3.10/site-packages/cryptography/hazmat/backends/openssl/ed448.py
usr/lib/python3.10/site-packages/cryptography/hazmat/backends/openssl/encode_asn1.py
usr/lib/python3.10/site-packages/cryptography/hazmat/backends/openssl/hashes.py
usr/lib/python3.10/site-packages/cryptography/hazmat/backends/openssl/hmac.py
-usr/lib/python3.10/site-packages/cryptography/hazmat/backends/openssl/ocsp.py
usr/lib/python3.10/site-packages/cryptography/hazmat/backends/openssl/poly1305.py
usr/lib/python3.10/site-packages/cryptography/hazmat/backends/openssl/rsa.py
usr/lib/python3.10/site-packages/cryptography/hazmat/backends/openssl/utils.py
@@ -43,8 +40,12 @@ usr/lib/python3.10/site-packages/cryptography/hazmat/backends/openssl/x509.py
usr/lib/python3.10/site-packages/cryptography/hazmat/bindings
usr/lib/python3.10/site-packages/cryptography/hazmat/bindings/__init__.py
usr/lib/python3.10/site-packages/cryptography/hazmat/bindings/_openssl.abi3.so
-usr/lib/python3.10/site-packages/cryptography/hazmat/bindings/_padding.abi3.so
+usr/lib/python3.10/site-packages/cryptography/hazmat/bindings/_rust
usr/lib/python3.10/site-packages/cryptography/hazmat/bindings/_rust.abi3.so
+usr/lib/python3.10/site-packages/cryptography/hazmat/bindings/_rust/__init__.pyi
+usr/lib/python3.10/site-packages/cryptography/hazmat/bindings/_rust/asn1.pyi
+usr/lib/python3.10/site-packages/cryptography/hazmat/bindings/_rust/ocsp.pyi
+usr/lib/python3.10/site-packages/cryptography/hazmat/bindings/_rust/x509.pyi
usr/lib/python3.10/site-packages/cryptography/hazmat/bindings/openssl
usr/lib/python3.10/site-packages/cryptography/hazmat/bindings/openssl/__init__.py
usr/lib/python3.10/site-packages/cryptography/hazmat/bindings/openssl/_conditional.py
@@ -63,6 +64,7 @@ usr/lib/python3.10/site-packages/cryptography/hazmat/primitives/asymmetric/ed255
usr/lib/python3.10/site-packages/cryptography/hazmat/primitives/asymmetric/ed448.py
usr/lib/python3.10/site-packages/cryptography/hazmat/primitives/asymmetric/padding.py
usr/lib/python3.10/site-packages/cryptography/hazmat/primitives/asymmetric/rsa.py
+usr/lib/python3.10/site-packages/cryptography/hazmat/primitives/asymmetric/types.py
usr/lib/python3.10/site-packages/cryptography/hazmat/primitives/asymmetric/utils.py
usr/lib/python3.10/site-packages/cryptography/hazmat/primitives/asymmetric/x25519.py
usr/lib/python3.10/site-packages/cryptography/hazmat/primitives/asymmetric/x448.py
@@ -97,7 +99,6 @@ usr/lib/python3.10/site-packages/cryptography/hazmat/primitives/twofactor
usr/lib/python3.10/site-packages/cryptography/hazmat/primitives/twofactor/__init__.py
usr/lib/python3.10/site-packages/cryptography/hazmat/primitives/twofactor/hotp.py
usr/lib/python3.10/site-packages/cryptography/hazmat/primitives/twofactor/totp.py
-usr/lib/python3.10/site-packages/cryptography/hazmat/primitives/twofactor/utils.py
usr/lib/python3.10/site-packages/cryptography/py.typed
usr/lib/python3.10/site-packages/cryptography/utils.py
usr/lib/python3.10/site-packages/cryptography/x509
diff --git a/lfs/python3-cryptography b/lfs/python3-cryptography
index f3090bc6a..77e5f06b0 100644
--- a/lfs/python3-cryptography
+++ b/lfs/python3-cryptography
@@ -24,7 +24,7 @@
include Config
-VER = 3.4.7
+VER = 36.0.2
THISAPP = cryptography-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = python3-cryptography
-PAK_VER = 1
+PAK_VER = 2
DEPS = python3-cffi
@@ -46,7 +46,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 49bc1e098ed1ba0181059b645f6668cda6332d196eaca55270ebce6e07e5bb6ab6724c5050fde20e89b7025773960d74ec782bb875badbbd5dc9a04db0a536f1
+$(DL_FILE)_BLAKE2 = b34b994e44b1ccd099a56fba4a167d563a29652f86ab0f0000ef78b4093a15cbfb82a9cebecdcaf6bca782a5fdd20f6c7d2206d68a219626a9fe8ae13e9aec5e
install : $(TARGET)
diff --git a/lfs/rust-Inflector b/lfs/rust-Inflector
new file mode 100644
index 000000000..eb8a3fa5b
--- /dev/null
+++ b/lfs/rust-Inflector
@@ -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.11.4
+
+THISAPP = Inflector-$(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)_BLAKE2 = eaf0c7f983b3186e9bc89353021a10592f2877e46585bd50b96db9b087343d1199c7b6cf3fa53cd274fb6d33de025a904b8aa31a7ac9599ae3689ecdbcec34cd
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+b2 : $(subst %,%_BLAKE2,$(objects))
+
+dist:
+ @$(PAK)
+
+###############################################################################
+# Downloading, checking, b2sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_BLAKE2,$(objects)) :
+ @$(B2SUM)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && $(CARGO_PREPARE)
+ cd $(DIR_APP) && $(CARGO_BUILD)
+ cd $(DIR_APP) && $(CARGO_INSTALL)
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/rust-aliasable b/lfs/rust-aliasable
new file mode 100644
index 000000000..fbb487288
--- /dev/null
+++ b/lfs/rust-aliasable
@@ -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.1.3
+
+THISAPP = aliasable-$(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)_BLAKE2 = c23840c7f1df86109e004aa1929d7355bd815c69ce8c5a316c9e2810851b7faf91c7480924d67cf83520e94b86dc0cc1b90b0dcc84b446a15ba5cccc1bae95ca
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+b2 : $(subst %,%_BLAKE2,$(objects))
+
+dist:
+ @$(PAK)
+
+###############################################################################
+# Downloading, checking, b2sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_BLAKE2,$(objects)) :
+ @$(B2SUM)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && $(CARGO_PREPARE)
+ cd $(DIR_APP) && $(CARGO_BUILD)
+ cd $(DIR_APP) && $(CARGO_INSTALL)
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/rust-asn1 b/lfs/rust-asn1
new file mode 100644
index 000000000..fa9817ed4
--- /dev/null
+++ b/lfs/rust-asn1
@@ -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.8.7
+
+THISAPP = asn1-$(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)_BLAKE2 = 702fdd34d5489b74cad023969c8873c6d469bd58376fc86fc124638ffe677f2d7f2592d28219ba741597d3791716b1303cff1fa6352f5df0fa41fdd0add628fd
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+b2 : $(subst %,%_BLAKE2,$(objects))
+
+dist:
+ @$(PAK)
+
+###############################################################################
+# Downloading, checking, b2sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_BLAKE2,$(objects)) :
+ @$(B2SUM)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && $(CARGO_PREPARE)
+ cd $(DIR_APP) && $(CARGO_BUILD)
+ cd $(DIR_APP) && $(CARGO_INSTALL)
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/rust-asn1_derive b/lfs/rust-asn1_derive
new file mode 100644
index 000000000..b7dd21c43
--- /dev/null
+++ b/lfs/rust-asn1_derive
@@ -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.8.7
+
+THISAPP = asn1_derive-$(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)_BLAKE2 = cc1fe4a8c27730e65164daaed5d2d346364f08a47439e012f670db82190dba50cfbdf720cb253d7a057cb4b560b8ce73c557c639e90856e27d632995643dc45f
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+b2 : $(subst %,%_BLAKE2,$(objects))
+
+dist:
+ @$(PAK)
+
+###############################################################################
+# Downloading, checking, b2sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_BLAKE2,$(objects)) :
+ @$(B2SUM)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && $(CARGO_PREPARE)
+ cd $(DIR_APP) && $(CARGO_BUILD)
+ cd $(DIR_APP) && $(CARGO_INSTALL)
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/rust-base64 b/lfs/rust-base64
new file mode 100644
index 000000000..1b2d547c4
--- /dev/null
+++ b/lfs/rust-base64
@@ -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.13.0
+
+THISAPP = base64-$(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)_BLAKE2 = b957f65cdb1e28baeca0cefc92fa98be797409b7dabd15e0e88db6cdfb89779b662cba9f2270fbf3b7b66948fdc46c118b8040a78ab72049c48a928fa802bee0
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+b2 : $(subst %,%_BLAKE2,$(objects))
+
+dist:
+ @$(PAK)
+
+###############################################################################
+# Downloading, checking, b2sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_BLAKE2,$(objects)) :
+ @$(B2SUM)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && $(CARGO_PREPARE)
+ cd $(DIR_APP) && $(CARGO_BUILD)
+ cd $(DIR_APP) && $(CARGO_INSTALL)
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/rust-chrono b/lfs/rust-chrono
new file mode 100644
index 000000000..cac6a8033
--- /dev/null
+++ b/lfs/rust-chrono
@@ -0,0 +1,81 @@
+###############################################################################
+# #
+# 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.4.19
+
+THISAPP = chrono-$(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)_BLAKE2 = c92c273fb6475bbb2546dfb75eaa23321bc8f9a5fa8a7c652f527649b96ff8718fa932f52b500b02a4acae7837df5bdb14f69cb821d4962be2790dbd1d023a54
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+b2 : $(subst %,%_BLAKE2,$(objects))
+
+dist:
+ @$(PAK)
+
+###############################################################################
+# Downloading, checking, b2sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_BLAKE2,$(objects)) :
+ @$(B2SUM)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(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/rust-chrono-0.4.19-fix-metadata.patch
+ cd $(DIR_APP) && $(CARGO_PREPARE)
+ cd $(DIR_APP) && $(CARGO_BUILD)
+ cd $(DIR_APP) && $(CARGO_INSTALL)
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/rust-indoc-0.3.6 b/lfs/rust-indoc-0.3.6
new file mode 100644
index 000000000..d8eff0bf4
--- /dev/null
+++ b/lfs/rust-indoc-0.3.6
@@ -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.3.6
+
+THISAPP = indoc-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/indoc-0.3.6-$(VER)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_BLAKE2 = ca7a1f4d3cbedbee0ba0a3f19c4b3352ff90927eef744b7e4f1d60855d4dc4265202972e81e0fc06d1222d8d5fb322efc4ef669af7396b251248a1e45c91def2
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+b2 : $(subst %,%_BLAKE2,$(objects))
+
+dist:
+ @$(PAK)
+
+###############################################################################
+# Downloading, checking, b2sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_BLAKE2,$(objects)) :
+ @$(B2SUM)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && $(CARGO_PREPARE)
+ cd $(DIR_APP) && $(CARGO_BUILD)
+ cd $(DIR_APP) && $(CARGO_INSTALL)
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/rust-num-integer b/lfs/rust-num-integer
new file mode 100644
index 000000000..2fd539b19
--- /dev/null
+++ b/lfs/rust-num-integer
@@ -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.1.45
+
+THISAPP = num-integer-$(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)_BLAKE2 = 4da3e801f71ba8f92c692497e200bfc8d32183c94eaad91260683b09f4697c03175fec7cff5a9ff3782d5db5d514d74f22f7a61a102c0f0d2e67a7a4b4f29222
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+b2 : $(subst %,%_BLAKE2,$(objects))
+
+dist:
+ @$(PAK)
+
+###############################################################################
+# Downloading, checking, b2sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_BLAKE2,$(objects)) :
+ @$(B2SUM)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && $(CARGO_PREPARE)
+ cd $(DIR_APP) && $(CARGO_BUILD)
+ cd $(DIR_APP) && $(CARGO_INSTALL)
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/rust-num-traits b/lfs/rust-num-traits
new file mode 100644
index 000000000..cf4438214
--- /dev/null
+++ b/lfs/rust-num-traits
@@ -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.2.15
+
+THISAPP = num-traits-$(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)_BLAKE2 = 942ab170b2acce1cb40e6847f766bf810a79edd293d34f3a27864f464c16fe2b99fb13171ba429cc6d584248de879434beaadf1b231a4001b0e8389ed6c1be04
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+b2 : $(subst %,%_BLAKE2,$(objects))
+
+dist:
+ @$(PAK)
+
+###############################################################################
+# Downloading, checking, b2sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_BLAKE2,$(objects)) :
+ @$(B2SUM)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && $(CARGO_PREPARE)
+ cd $(DIR_APP) && $(CARGO_BUILD)
+ cd $(DIR_APP) && $(CARGO_INSTALL)
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/rust-num_threads b/lfs/rust-num_threads
new file mode 100644
index 000000000..dc6f8e203
--- /dev/null
+++ b/lfs/rust-num_threads
@@ -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.1.5
+
+THISAPP = num_threads-$(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)_BLAKE2 = b5a1055937a87c3f3b758ad527fce0a14c812b40c3bbda530bfc0e03f43dd3155c17e1eaa210c512a98919da802d9d48fec4e3c8464072fe4d309b9a402d9b61
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+b2 : $(subst %,%_BLAKE2,$(objects))
+
+dist:
+ @$(PAK)
+
+###############################################################################
+# Downloading, checking, b2sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_BLAKE2,$(objects)) :
+ @$(B2SUM)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && $(CARGO_PREPARE)
+ cd $(DIR_APP) && $(CARGO_BUILD)
+ cd $(DIR_APP) && $(CARGO_INSTALL)
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/rust-ouroboros b/lfs/rust-ouroboros
new file mode 100644
index 000000000..0b4739466
--- /dev/null
+++ b/lfs/rust-ouroboros
@@ -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.13.0
+
+THISAPP = ouroboros-$(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)_BLAKE2 = ff54f4ed318f7a1875612a4ed5762c60de516f43825f0ecf23e5343958e5c8af68ae4aecc1daf913e58d21183ac037af047be015ef1e5c227ab4750e763ed4ab
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+b2 : $(subst %,%_BLAKE2,$(objects))
+
+dist:
+ @$(PAK)
+
+###############################################################################
+# Downloading, checking, b2sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_BLAKE2,$(objects)) :
+ @$(B2SUM)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && $(CARGO_PREPARE)
+ cd $(DIR_APP) && $(CARGO_BUILD)
+ cd $(DIR_APP) && $(CARGO_INSTALL)
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/rust-ouroboros_macro b/lfs/rust-ouroboros_macro
new file mode 100644
index 000000000..6a4374550
--- /dev/null
+++ b/lfs/rust-ouroboros_macro
@@ -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.13.0
+
+THISAPP = ouroboros_macro-$(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)_BLAKE2 = 16b65a6417ef147d15083c51c96b382a96a71fae124f1baae91432c5de7585edf7ca3f3f8e35b303d3e3c17a411f740d1dccc3382d541c0e7ded22bda81a838e
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+b2 : $(subst %,%_BLAKE2,$(objects))
+
+dist:
+ @$(PAK)
+
+###############################################################################
+# Downloading, checking, b2sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_BLAKE2,$(objects)) :
+ @$(B2SUM)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && $(CARGO_PREPARE)
+ cd $(DIR_APP) && $(CARGO_BUILD)
+ cd $(DIR_APP) && $(CARGO_INSTALL)
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/rust-paste-0.1.18 b/lfs/rust-paste-0.1.18
new file mode 100644
index 000000000..138d45ec9
--- /dev/null
+++ b/lfs/rust-paste-0.1.18
@@ -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.1.18
+
+THISAPP = paste-$(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)_BLAKE2 = ed72b93a27166b0989743c2528d4a41f4b87ffdd0c588557d11a5f37f85d5b8f03ced86150af6209f9fa8d0f6efee705769b26a2f4dc3363f35cc3ac12c0e6ad
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+b2 : $(subst %,%_BLAKE2,$(objects))
+
+dist:
+ @$(PAK)
+
+###############################################################################
+# Downloading, checking, b2sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_BLAKE2,$(objects)) :
+ @$(B2SUM)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && $(CARGO_PREPARE)
+ cd $(DIR_APP) && $(CARGO_BUILD)
+ cd $(DIR_APP) && $(CARGO_INSTALL)
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/rust-pem b/lfs/rust-pem
new file mode 100644
index 000000000..59c51943b
--- /dev/null
+++ b/lfs/rust-pem
@@ -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 = 1.0.2
+
+THISAPP = pem-$(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)_BLAKE2 = 17c3457a90807bdcc75795161e244a7c531449d0679212394a76601c2bc1b353d8c18d34c5cccae3a728387c834a23011b17a8a1bace15a1aae26de30adb1c8a
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+b2 : $(subst %,%_BLAKE2,$(objects))
+
+dist:
+ @$(PAK)
+
+###############################################################################
+# Downloading, checking, b2sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_BLAKE2,$(objects)) :
+ @$(B2SUM)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && $(CARGO_PREPARE)
+ cd $(DIR_APP) && $(CARGO_BUILD)
+ cd $(DIR_APP) && $(CARGO_INSTALL)
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/rust-proc-macro-error b/lfs/rust-proc-macro-error
new file mode 100644
index 000000000..7260b3f93
--- /dev/null
+++ b/lfs/rust-proc-macro-error
@@ -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 = 1.0.4
+
+THISAPP = proc-macro-error-$(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)_BLAKE2 = ef918c5efaf2545ab38787c8d0c07315af00431139e4dff66346bf798e3a429f91d12a79776c150412fdda0b158a72badd5e1044ac4d6917f8482d4b5a7110b7
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+b2 : $(subst %,%_BLAKE2,$(objects))
+
+dist:
+ @$(PAK)
+
+###############################################################################
+# Downloading, checking, b2sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_BLAKE2,$(objects)) :
+ @$(B2SUM)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && $(CARGO_PREPARE)
+ cd $(DIR_APP) && $(CARGO_BUILD)
+ cd $(DIR_APP) && $(CARGO_INSTALL)
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/rust-proc-macro-error-attr b/lfs/rust-proc-macro-error-attr
new file mode 100644
index 000000000..37c76b170
--- /dev/null
+++ b/lfs/rust-proc-macro-error-attr
@@ -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 = 1.0.4
+
+THISAPP = proc-macro-error-attr-$(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)_BLAKE2 = 98e2925881c2be186e22c2c439697e91d43f807eb61a5d13e3b0b4321ed50a74f3d699942c04b89b6fea0f156bb5d19ebcf22f9cd4b98a7e6917c437600ed823
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+b2 : $(subst %,%_BLAKE2,$(objects))
+
+dist:
+ @$(PAK)
+
+###############################################################################
+# Downloading, checking, b2sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_BLAKE2,$(objects)) :
+ @$(B2SUM)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && $(CARGO_PREPARE)
+ cd $(DIR_APP) && $(CARGO_BUILD)
+ cd $(DIR_APP) && $(CARGO_INSTALL)
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/rust-pyo3 b/lfs/rust-pyo3
index cce8e55dd..9b5a179c7 100644
--- a/lfs/rust-pyo3
+++ b/lfs/rust-pyo3
@@ -24,7 +24,7 @@
include Config
-VER = 0.13.1
+VER = 0.15.1
THISAPP = pyo3-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 9f64e5ba53a2af2120518bb219088798bfbfbab9ff52af6109cd61a50b06ad377880b4bfafabc7a2fd554c7685bd3ba41a08c1e25fae6eae551842e918812289
+$(DL_FILE)_BLAKE2 = b755c93d8dca8e778b886ed1d16e83ddca483d0f6c932b3241edb2e1211306cb0257d2a6bc31ba4298335f277898e59aad67e9f675ed4ad9a2bb9d596400bda3
install : $(TARGET)
diff --git a/lfs/rust-pyo3-macros b/lfs/rust-pyo3-macros
index f6bdd98f1..367394067 100644
--- a/lfs/rust-pyo3-macros
+++ b/lfs/rust-pyo3-macros
@@ -24,7 +24,7 @@
include Config
-VER = 0.13.1
+VER = 0.15.1
THISAPP = pyo3-macros-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 3e5dc613edd7e9007c92ef83384e2379e3500f48d9d03f9875261b1af320a6d1d41eacff64c14b966561d9bb8b8b932f4dcc437480b91adaa64a8dd747cb89ac
+$(DL_FILE)_BLAKE2 = c7d87c150678efbb5dd6ef98da9997676ef3e7f8628a79f01a3ecbf94cc8b2d0752573d894fd769fb8791f30bcfd03a5c9f76cce73c00be90c1488faed63198d
install : $(TARGET)
diff --git a/lfs/rust-pyo3-macros-backend b/lfs/rust-pyo3-macros-backend
index d8dfa3569..5f79d7834 100644
--- a/lfs/rust-pyo3-macros-backend
+++ b/lfs/rust-pyo3-macros-backend
@@ -24,7 +24,7 @@
include Config
-VER = 0.13.1
+VER = 0.15.1
THISAPP = pyo3-macros-backend-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = f05e6834cd3d717f298e2ce66f4bb73786a9e996d6a9ef83f9e2c0e6538c8c4262ba332307478c086bc69b47a65c0596110ac792ba379ba6e7a97a2b7a7ba871
+$(DL_FILE)_BLAKE2 = fabde516114a001e7f9ec1a1f422c5819ad5bceb4db36ecf2ef5dfde397d4d3c7dc7a8acf11cafde4156594e90a4f95d51dbefa43ee8bc172441d3f81eb299b2
install : $(TARGET)
diff --git a/lfs/rust-stable_deref_trait b/lfs/rust-stable_deref_trait
new file mode 100644
index 000000000..9030d3bf2
--- /dev/null
+++ b/lfs/rust-stable_deref_trait
@@ -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 = 1.2.0
+
+THISAPP = stable_deref_trait-$(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)_BLAKE2 = 287a65c3e5b47213544a43e57c60a54add60b4c2e3c8d042407d860cc950ba7ca01a2e67ce56aed6744992b61ec1f9aed3321e3d88482e33129548b7d51df205
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+b2 : $(subst %,%_BLAKE2,$(objects))
+
+dist:
+ @$(PAK)
+
+###############################################################################
+# Downloading, checking, b2sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_BLAKE2,$(objects)) :
+ @$(B2SUM)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && $(CARGO_PREPARE)
+ cd $(DIR_APP) && $(CARGO_BUILD)
+ cd $(DIR_APP) && $(CARGO_INSTALL)
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/rust-time b/lfs/rust-time
new file mode 100644
index 000000000..2ea396c79
--- /dev/null
+++ b/lfs/rust-time
@@ -0,0 +1,81 @@
+###############################################################################
+# #
+# 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.1.43
+
+THISAPP = time-$(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)_BLAKE2 = 95fe69647e8d52784be1fd3457578896aa38279d00f51f1070eadab111d39450583c63854c73d4384f2e4349b0250f1c9bff9901529b776c596846c057c93335
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+b2 : $(subst %,%_BLAKE2,$(objects))
+
+dist:
+ @$(PAK)
+
+###############################################################################
+# Downloading, checking, b2sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_BLAKE2,$(objects)) :
+ @$(B2SUM)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(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/rust-time-0.1.43-fix-metadata.patch
+ cd $(DIR_APP) && $(CARGO_PREPARE)
+ cd $(DIR_APP) && $(CARGO_BUILD)
+ cd $(DIR_APP) && $(CARGO_INSTALL)
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/sudo b/lfs/sudo
index 4d73db639..ce9649d79 100644
--- a/lfs/sudo
+++ b/lfs/sudo
@@ -24,7 +24,7 @@
include Config
-VER = 1.9.10
+VER = 1.9.11p3
THISAPP = sudo-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 94d97379e31b41917616a829cbece3d3fce7dd6ab9d04791b928981c14249c306508298655c19dc59a054ccf7deed4e69e65367cbfe9f6d8b5aba8895cfa6064
+$(DL_FILE)_BLAKE2 = f8508f65b514abd9979a11628d8bc0e085b2625993281e7d1f8794a576e88970bda6939d2f2f50d9485f00276970aba3489b19c102eca5625e389c9610f338dd
install : $(TARGET)
diff --git a/lfs/xfsprogs b/lfs/xfsprogs
index fb2047800..b9ea1f694 100644
--- a/lfs/xfsprogs
+++ b/lfs/xfsprogs
@@ -24,7 +24,7 @@
include Config
-VER = 5.16.0
+VER = 5.18.0
THISAPP = xfsprogs-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = da328fe0c146a7b8ba866c5872f26ce95010939e05da51c73ed6374f00474605a81f4a822d65b60a132a4de47fff286e9f5f1ac809c1aa29420633f573b61aef
+$(DL_FILE)_BLAKE2 = a2a2835d53ee6ac55279636f3f3cdcecab8757911ce5c1ea5f350a4da9ff4c1ca64b2aba1c0e5424c0c0a01fd0504396d5fecca12e4689c372ed5bb76b9ac24e
install : $(TARGET)
diff --git a/make.sh b/make.sh
index ff58c75a9..4c2dc10b5 100755
--- a/make.sh
+++ b/make.sh
@@ -1270,6 +1270,7 @@ buildipfire() {
lfsmake2 rust-proc-macro-hack
lfsmake2 rust-indoc-impl
lfsmake2 rust-indoc
+ lfsmake2 rust-indoc-0.3.6
lfsmake2 rust-instant
lfsmake2 rust-lock_api
lfsmake2 rust-smallvec
@@ -1277,6 +1278,7 @@ buildipfire() {
lfsmake2 rust-parking_lot
lfsmake2 rust-paste-impl
lfsmake2 rust-paste
+ lfsmake2 rust-paste-0.1.18
lfsmake2 rust-ctor
lfsmake2 rust-ghost
lfsmake2 rust-inventory-impl
@@ -1285,6 +1287,22 @@ buildipfire() {
lfsmake2 rust-pyo3-macros-backend
lfsmake2 rust-pyo3-macros
lfsmake2 rust-pyo3
+ lfsmake2 rust-num-traits
+ lfsmake2 rust-num-integer
+ lfsmake2 rust-num_threads
+ lfsmake2 rust-time
+ lfsmake2 rust-chrono
+ lfsmake2 rust-asn1_derive
+ lfsmake2 rust-asn1
+ lfsmake2 rust-proc-macro-error-attr
+ lfsmake2 rust-proc-macro-error
+ lfsmake2 rust-Inflector
+ lfsmake2 rust-ouroboros_macro
+ lfsmake2 rust-aliasable
+ lfsmake2 rust-stable_deref_trait
+ lfsmake2 rust-ouroboros
+ lfsmake2 rust-base64
+ lfsmake2 rust-pem
lfsmake2 gdb
lfsmake2 grub
lfsmake2 efivar
diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl
index d4e338f23..24c55fd4a 100644
--- a/src/pakfire/lib/functions.pl
+++ b/src/pakfire/lib/functions.pl
@@ -2,7 +2,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2021 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2022 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 #
@@ -206,7 +206,7 @@ sub fetchfile {
if ( $code eq "500" ) {
message("Giving up: There was no chance to get the file \"$getfile\" from any available server.\nThere was an error on the way. Please fix it.");
- return 1;
+ return 0;
}
if ($response->is_success) {
@@ -226,7 +226,7 @@ sub fetchfile {
}
logger("DOWNLOAD FINISHED: $file");
$allok = 1;
- return 0;
+ return 1;
} else {
logger("DOWNLOAD ERROR: Could not open $Conf::tmpdir/$bfile for writing.");
}
@@ -235,7 +235,7 @@ sub fetchfile {
}
}
message("DOWNLOAD ERROR: There was no chance to get the file \"$getfile\" from any available server.\nMay be you should run \"pakfire update\" to get some new servers.");
- return 1;
+ return 0;
}
sub getmirrors {
@@ -256,9 +256,14 @@ sub getmirrors {
}
if ("$force" eq "force") {
- fetchfile("$Conf::version/lists/server-list.db", "$Conf::mainserver");
- move("$Conf::cachedir/server-list.db", "$Conf::dbdir/lists/server-list.db");
+ if (fetchfile("$Conf::version/lists/server-list.db", "$Conf::mainserver")) {
+ move("$Conf::cachedir/server-list.db", "$Conf::dbdir/lists/server-list.db");
+ } elsif (! -e "$Conf::dbdir/lists/server-list.db" ) {
+ # if we end up with no server-list at all, return failure
+ return 0;
+ }
}
+ return 1;
}
sub getcoredb {
@@ -279,8 +284,9 @@ sub getcoredb {
}
if ("$force" eq "force") {
- fetchfile("lists/core-list.db", "");
- move("$Conf::cachedir/core-list.db", "$Conf::dbdir/lists/core-list.db");
+ if (fetchfile("lists/core-list.db", "")) {
+ move("$Conf::cachedir/core-list.db", "$Conf::dbdir/lists/core-list.db");
+ }
}
}
@@ -318,15 +324,13 @@ sub selectmirror {
### Check if there is a current server list and read it.
# If there is no list try to get one.
- my $count = 0;
- while (!(open(FILE, "<$Conf::dbdir/lists/server-list.db")) && ($count lt 5)) {
- $count++;
- getmirrors("noforce");
- }
- if ($count == 5) {
- message("MIRROR ERROR: Could not find or download a server list");
- exit 1;
+ unless (open(FILE, "<$Conf::dbdir/lists/server-list.db")) {
+ unless (getmirrors("noforce")) {
+ message("MIRROR ERROR: Could not find or download a server list");
+ exit 1;
+ }
}
+
my @lines = <FILE>;
close(FILE);
@@ -390,8 +394,13 @@ sub dbgetlist {
}
if ("$force" eq "force") {
- fetchfile("lists/packages_list.db", "");
- move("$Conf::cachedir/packages_list.db", "$Conf::dbdir/lists/packages_list.db");
+ if (fetchfile("lists/packages_list.db", "")) {
+ move("$Conf::cachedir/packages_list.db", "$Conf::dbdir/lists/packages_list.db");
+ } elsif ( -e "$Conf::dbdir/lists/packages_list.db" ) {
+ # If we end up with no db file after download error there
+ # is nothing more we can do here.
+ return 0;
+ }
}
# Update the meta database if new packages was in the package list
@@ -419,8 +428,7 @@ sub dbgetlist {
@templine = split(/\;/,$prog);
if (("$metadata{'Name'}" eq "$templine[0]") && ("$metadata{'Release'}" ne "$templine[2]")) {
move("$Conf::dbdir/meta/meta-$metadata{'Name'}","$Conf::dbdir/meta/old_meta-$metadata{'Name'}");
- fetchfile("meta/meta-$metadata{'Name'}", "");
- move("$Conf::cachedir/meta-$metadata{'Name'}", "$Conf::dbdir/meta/meta-$metadata{'Name'}");
+ getmetafile($metadata{'Name'});
}
}
}
@@ -532,11 +540,14 @@ sub dblist {
sub resolvedeps_one {
my $pak = shift;
-
- getmetafile("$pak");
-
+
message("PAKFIRE RESV: $pak: Resolving dependencies...");
+ unless (getmetafile("$pak")) {
+ message("PAKFIRE ERROR: Error retrieving dependency information on $pak. Unable to resolve dependencies.");
+ exit 1;
+ };
+
my %metadata = parsemetafile("$Conf::dbdir/meta/meta-$pak");
my @all;
my @deps = split(/ /, $metadata{'Dependencies'});
@@ -629,14 +640,10 @@ sub cleanup {
sub getmetafile {
my $pak = shift;
-
- unless ( -e "$Conf::dbdir/meta/meta-$pak" ) {
- fetchfile("meta/meta-$pak", "");
- move("$Conf::cachedir/meta-$pak", "$Conf::dbdir/meta/meta-$pak");
- }
-
- if ( -z "$Conf::dbdir/meta/meta-$pak" ) {
- fetchfile("meta/meta-$pak", "");
+
+ # Try to download meta-file if we don't have one yet, or it is empty for some reason
+ if ((! -e "$Conf::dbdir/meta/meta-$pak" ) || ( -z "$Conf::dbdir/meta/meta-$pak" )) {
+ return 0 unless (fetchfile("meta/meta-$pak", ""));
move("$Conf::cachedir/meta-$pak", "$Conf::dbdir/meta/meta-$pak");
}
@@ -651,6 +658,7 @@ sub getmetafile {
print FILE $string;
}
close(FILE);
+
return 1;
}
@@ -713,8 +721,11 @@ sub getpak {
my $pak = shift;
my $force = shift;
- getmetafile("$pak");
-
+ unless (getmetafile("$pak")) {
+ message("PAKFIRE ERROR: Unable to retrieve $pak metadata.");
+ exit 1;
+ }
+
my %metadata = parsemetafile("$Conf::dbdir/meta/meta-$pak");
my $file = $metadata{'File'};
@@ -728,8 +739,11 @@ sub getpak {
return $file;
}
}
-
- fetchfile("paks/$file", "");
+
+ unless (fetchfile("paks/$file", "")) {
+ message("PAKFIRE ERROR: Unable to download $pak.");
+ exit 1;
+ }
return $file;
}
diff --git a/src/patches/rust-chrono-0.4.19-fix-metadata.patch b/src/patches/rust-chrono-0.4.19-fix-metadata.patch
new file mode 100644
index 000000000..cf6861693
--- /dev/null
+++ b/src/patches/rust-chrono-0.4.19-fix-metadata.patch
@@ -0,0 +1,23 @@
+--- chrono-0.4.19/Cargo.toml.original 2020-09-30 17:06:24.000000000 +0200
++++ chrono-0.4.19/Cargo.toml 2022-06-16 17:27:21.440234723 +0200
+@@ -93,7 +93,7 @@
+ __doctest = []
+ __internal_bench = []
+ alloc = []
+-clock = ["libc", "std", "winapi"]
++clock = ["libc", "std"]
+ default = ["clock", "std", "oldtime"]
+ oldtime = ["time"]
+ std = []
+@@ -108,10 +108,7 @@
+ optional = true
+ [target."cfg(all(target_arch = \"wasm32\", not(any(target_os = \"emscripten\", target_os = \"wasi\"))))".dev-dependencies.wasm-bindgen-test]
+ version = "0.3"
+-[target."cfg(windows)".dependencies.winapi]
+-version = "0.3.0"
+-features = ["std", "minwinbase", "minwindef", "timezoneapi"]
+-optional = true
++
+ [badges.appveyor]
+ repository = "chronotope/chrono"
+
diff --git a/src/patches/rust-time-0.1.43-fix-metadata.patch b/src/patches/rust-time-0.1.43-fix-metadata.patch
new file mode 100644
index 000000000..342281750
--- /dev/null
+++ b/src/patches/rust-time-0.1.43-fix-metadata.patch
@@ -0,0 +1,13 @@
+--- time-0.1.43/Cargo.toml.original 2020-04-20 00:31:10.000000000 +0200
++++ time-0.1.43/Cargo.toml 2022-06-16 15:21:19.210090045 +0200
+@@ -29,10 +29,3 @@
+ optional = true
+ [dev-dependencies.log]
+ version = "0.4"
+-
+-[dev-dependencies.winapi]
+-version = "0.3.0"
+-features = ["std", "processthreadsapi", "winbase"]
+-[target."cfg(windows)".dependencies.winapi]
+-version = "0.3.0"
+-features = ["std", "minwinbase", "minwindef", "ntdef", "profileapi", "sysinfoapi", "timezoneapi"]
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 3f48d7a3a344f38e6ed7efb012ec8dd75436722b
by Michael Tremer 05 Jul '22
by Michael Tremer 05 Jul '22
05 Jul '22
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 3.x development tree".
The branch, master has been updated
via 3f48d7a3a344f38e6ed7efb012ec8dd75436722b (commit)
via 1cd81daca731e99bbc7120d9d049b40ac083be40 (commit)
via 1ef1fcd99b7e5f3071f7fca660a28c1aa5639543 (commit)
via d6e9b7d05ad117814cb03309cfc9c580e4762d42 (commit)
from b40cdb8c182d8b4aa05c6e23cc67118c4aa4853c (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 3f48d7a3a344f38e6ed7efb012ec8dd75436722b
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sat Jul 2 17:09:29 2022 +0200
Cleanup: Remove more X11 related libraries and packages.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 1cd81daca731e99bbc7120d9d049b40ac083be40
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sat Jul 2 17:01:27 2022 +0200
Cleanup: Remove various for packages for X11, gtk3 and gnome.
These packages have been added in favour of a graphical install tool.
This idea has been dropped because we now have the TUI-based installer
called bricklayer, which perfectly does its job.
So there is no need anymore for all of those packages.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 1ef1fcd99b7e5f3071f7fca660a28c1aa5639543
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sat Jul 2 17:01:26 2022 +0200
pango: Do not link against X11 libs anymore.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit d6e9b7d05ad117814cb03309cfc9c580e4762d42
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sat Jul 2 17:01:25 2022 +0200
qemu: Build without support for SDL.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
SDL/SDL.nm | 64 ----
X11vnc/X11vnc.nm | 60 ---
.../x11vnc-0.9.8-XShm-explicit-include.patch | 10 -
X11vnc/patches/x11vnc-0.9.8-disableRpath.patch | 103 ------
at-spi2-atk/at-spi2-atk.nm | 60 ---
at-spi2-core/at-spi2-core.nm | 65 ----
clutter/clutter.nm | 70 ----
clutter/patches/clutter-1.13.4-xi23.patch | 65 ----
clutter/patches/oob-device-fix.patch | 33 --
cogl/cogl.nm | 82 -----
dejavu-fonts/dejavu-fonts.nm | 184 ----------
fontforge/fontforge.nm | 57 ---
.../patches/fontforge-20090224-pythondl.patch | 41 ---
.../fontforge-20100501-select-points-crash.patch | 11 -
.../patches/fontforge-20110222-libpng15.patch | 176 ---------
gnome-themes-standard/gnome-themes-standard.nm | 88 -----
gnome-themes-standard/settings.ini | 7 -
gtk3/gtk3.nm | 89 -----
libICE/libICE.nm | 43 ---
libSM/libSM.nm | 44 ---
libX11/libX11.nm | 42 ---
libXau/libXau.nm | 47 ---
libXau/patches/xau-1.0.4-local.patch | 22 --
libXaw/libXaw.nm | 49 ---
libXcomposite/libXcomposite.nm | 44 ---
libXcursor/index.theme | 2 -
libXcursor/libXcursor.nm | 55 ---
libXdamage/libXdamage.nm | 44 ---
libXdmcp/libXdmcp.nm | 42 ---
libXext/libXext.nm | 44 ---
libXfixes/libXfixes.nm | 43 ---
libXfont/libXfont.nm | 46 ---
libXft/libXft.nm | 45 ---
libXi/libXi.nm | 45 ---
libXinerama/libXinerama.nm | 43 ---
libXmu/libXmu.nm | 48 ---
libXpm/libXpm.nm | 51 ---
libXrandr/libXrandr.nm | 45 ---
libXrender/libXrender.nm | 45 ---
libXres/libXres.nm | 47 ---
libXt/libXt.nm | 47 ---
libXtst/libXtst.nm | 45 ---
libXv/libXv.nm | 45 ---
libXvMC/libXvMC.nm | 45 ---
libXxf86vm/libXxf86vm.nm | 44 ---
libfontenc/libfontenc.nm | 43 ---
libxcb/libxcb.nm | 58 ---
libxkbfile/libxkbfile.nm | 40 --
makedepend/makedepend.nm | 35 --
mesa/mesa.nm | 149 --------
pango/pango.nm | 3 +-
perl-Tk/patches/perl-Tk-debian.patch | 71 ----
perl-Tk/patches/perl-Tk-seg.patch | 33 --
perl-Tk/patches/perl-Tk-widget.patch0 | 26 --
perl-Tk/perl-Tk.nm | 74 ----
qemu/qemu.nm | 6 +-
xcb-proto/xcb-proto.nm | 39 --
xcb-util/xcb-util.nm | 55 ---
xclock/xclock.nm | 43 ---
xkeyboard-config/xkeyboard-config.nm | 48 ---
xorg-x11-drv-ati/xorg-x11-drv-ati.nm | 61 ----
xorg-x11-drv-evdev/xorg-x11-drv-evdev.nm | 61 ----
xorg-x11-drv-intel/intel.xinf | 28 --
xorg-x11-drv-intel/xorg-x11-drv-intel.nm | 77 ----
xorg-x11-drv-keyboard/xorg-x11-drv-keyboard.nm | 55 ---
.../xorg-x11-drv-modesetting.nm | 58 ---
xorg-x11-drv-mouse/xorg-x11-drv-mouse.nm | 55 ---
xorg-x11-drv-nouveau/xorg-x11-drv-nouveau.nm | 64 ----
xorg-x11-drv-synaptics/50-synaptics.conf | 22 --
xorg-x11-drv-synaptics/70-touchpad-quirks.rules | 15 -
xorg-x11-drv-synaptics/xorg-x11-drv-synaptics.nm | 64 ----
xorg-x11-drv-vesa/xorg-x11-drv-vesa.nm | 57 ---
xorg-x11-drv-vmware/xorg-x11-drv-vmware.nm | 58 ---
xorg-x11-font-utils/xorg-x11-font-utils.nm | 91 -----
xorg-x11-font-utils/xorg-x11-fonts-update-dirs | 60 ---
xorg-x11-fonts/xorg-x11-fonts.nm | 405 ---------------------
xorg-x11-proto-devel/xorg-x11-proto-devel.nm | 91 -----
xorg-x11-server/10-quirks.conf | 20 -
...erver-1.12-Xext-fix-selinux-build-failure.patch | 52 ---
.../patches/xserver-1.4.99-ssh-isnt-local.patch | 48 ---
.../xserver-1.6.0-less-acpi-brokenness.patch | 25 --
.../patches/xserver-1.6.99-right-of.patch | 162 ---------
.../patches/xserver-autobind-hotplug.patch | 106 ------
xorg-x11-server/xorg-x11-server.nm | 164 ---------
xorg-x11-util-macros/xorg-x11-util-macros.nm | 41 ---
.../patches/xinit-1.0.2-client-session.patch | 39 --
.../xorg-x11-xinit-1.3.2-systemd-logind.patch | 27 --
xorg-x11-xinit/xorg-x11-xinit.nm | 43 ---
xorg-x11-xkb-utils/xorg-x11-xkb-utils.nm | 72 ----
.../patches/xtrans-1.0.3-avoid-gethostname.patch | 11 -
xorg-x11-xtrans-devel/xorg-x11-xtrans-devel.nm | 34 --
xrandr/xrandr.nm | 44 ---
xterm/patches/xterm-245-resources.patch | 17 -
xterm/patches/xterm-256-man-page_paths.patch | 48 ---
xterm/patches/xterm-261-desk.patch | 16 -
xterm/xterm.nm | 55 ---
zenity/zenity.nm | 54 ---
97 files changed, 4 insertions(+), 5546 deletions(-)
delete mode 100644 SDL/SDL.nm
delete mode 100644 X11vnc/X11vnc.nm
delete mode 100644 X11vnc/patches/x11vnc-0.9.8-XShm-explicit-include.patch
delete mode 100644 X11vnc/patches/x11vnc-0.9.8-disableRpath.patch
delete mode 100644 at-spi2-atk/at-spi2-atk.nm
delete mode 100644 at-spi2-core/at-spi2-core.nm
delete mode 100644 clutter/clutter.nm
delete mode 100644 clutter/patches/clutter-1.13.4-xi23.patch
delete mode 100644 clutter/patches/oob-device-fix.patch
delete mode 100644 cogl/cogl.nm
delete mode 100644 dejavu-fonts/dejavu-fonts.nm
delete mode 100644 fontforge/fontforge.nm
delete mode 100644 fontforge/patches/fontforge-20090224-pythondl.patch
delete mode 100644 fontforge/patches/fontforge-20100501-select-points-crash.patch
delete mode 100644 fontforge/patches/fontforge-20110222-libpng15.patch
delete mode 100644 gnome-themes-standard/gnome-themes-standard.nm
delete mode 100644 gnome-themes-standard/settings.ini
delete mode 100644 gtk3/gtk3.nm
delete mode 100644 libICE/libICE.nm
delete mode 100644 libSM/libSM.nm
delete mode 100644 libX11/libX11.nm
delete mode 100644 libXau/libXau.nm
delete mode 100644 libXau/patches/xau-1.0.4-local.patch
delete mode 100644 libXaw/libXaw.nm
delete mode 100644 libXcomposite/libXcomposite.nm
delete mode 100644 libXcursor/index.theme
delete mode 100644 libXcursor/libXcursor.nm
delete mode 100644 libXdamage/libXdamage.nm
delete mode 100644 libXdmcp/libXdmcp.nm
delete mode 100644 libXext/libXext.nm
delete mode 100644 libXfixes/libXfixes.nm
delete mode 100644 libXfont/libXfont.nm
delete mode 100644 libXft/libXft.nm
delete mode 100644 libXi/libXi.nm
delete mode 100644 libXinerama/libXinerama.nm
delete mode 100644 libXmu/libXmu.nm
delete mode 100644 libXpm/libXpm.nm
delete mode 100644 libXrandr/libXrandr.nm
delete mode 100644 libXrender/libXrender.nm
delete mode 100644 libXres/libXres.nm
delete mode 100644 libXt/libXt.nm
delete mode 100644 libXtst/libXtst.nm
delete mode 100644 libXv/libXv.nm
delete mode 100644 libXvMC/libXvMC.nm
delete mode 100644 libXxf86vm/libXxf86vm.nm
delete mode 100644 libfontenc/libfontenc.nm
delete mode 100644 libxcb/libxcb.nm
delete mode 100644 libxkbfile/libxkbfile.nm
delete mode 100644 makedepend/makedepend.nm
delete mode 100644 mesa/mesa.nm
delete mode 100644 perl-Tk/patches/perl-Tk-debian.patch
delete mode 100644 perl-Tk/patches/perl-Tk-seg.patch
delete mode 100644 perl-Tk/patches/perl-Tk-widget.patch0
delete mode 100644 perl-Tk/perl-Tk.nm
delete mode 100644 xcb-proto/xcb-proto.nm
delete mode 100644 xcb-util/xcb-util.nm
delete mode 100644 xclock/xclock.nm
delete mode 100644 xkeyboard-config/xkeyboard-config.nm
delete mode 100644 xorg-x11-drv-ati/xorg-x11-drv-ati.nm
delete mode 100644 xorg-x11-drv-evdev/xorg-x11-drv-evdev.nm
delete mode 100644 xorg-x11-drv-intel/intel.xinf
delete mode 100644 xorg-x11-drv-intel/xorg-x11-drv-intel.nm
delete mode 100644 xorg-x11-drv-keyboard/xorg-x11-drv-keyboard.nm
delete mode 100644 xorg-x11-drv-modesetting/xorg-x11-drv-modesetting.nm
delete mode 100644 xorg-x11-drv-mouse/xorg-x11-drv-mouse.nm
delete mode 100644 xorg-x11-drv-nouveau/xorg-x11-drv-nouveau.nm
delete mode 100644 xorg-x11-drv-synaptics/50-synaptics.conf
delete mode 100644 xorg-x11-drv-synaptics/70-touchpad-quirks.rules
delete mode 100644 xorg-x11-drv-synaptics/xorg-x11-drv-synaptics.nm
delete mode 100644 xorg-x11-drv-vesa/xorg-x11-drv-vesa.nm
delete mode 100644 xorg-x11-drv-vmware/xorg-x11-drv-vmware.nm
delete mode 100644 xorg-x11-font-utils/xorg-x11-font-utils.nm
delete mode 100644 xorg-x11-font-utils/xorg-x11-fonts-update-dirs
delete mode 100644 xorg-x11-fonts/xorg-x11-fonts.nm
delete mode 100644 xorg-x11-proto-devel/xorg-x11-proto-devel.nm
delete mode 100644 xorg-x11-server/10-quirks.conf
delete mode 100644 xorg-x11-server/patches/xserver-1.12-Xext-fix-selinux-build-failure.patch
delete mode 100644 xorg-x11-server/patches/xserver-1.4.99-ssh-isnt-local.patch
delete mode 100644 xorg-x11-server/patches/xserver-1.6.0-less-acpi-brokenness.patch
delete mode 100644 xorg-x11-server/patches/xserver-1.6.99-right-of.patch
delete mode 100644 xorg-x11-server/patches/xserver-autobind-hotplug.patch
delete mode 100644 xorg-x11-server/xorg-x11-server.nm
delete mode 100644 xorg-x11-util-macros/xorg-x11-util-macros.nm
delete mode 100644 xorg-x11-xinit/patches/xinit-1.0.2-client-session.patch
delete mode 100644 xorg-x11-xinit/patches/xorg-x11-xinit-1.3.2-systemd-logind.patch
delete mode 100644 xorg-x11-xinit/xorg-x11-xinit.nm
delete mode 100644 xorg-x11-xkb-utils/xorg-x11-xkb-utils.nm
delete mode 100644 xorg-x11-xtrans-devel/patches/xtrans-1.0.3-avoid-gethostname.patch
delete mode 100644 xorg-x11-xtrans-devel/xorg-x11-xtrans-devel.nm
delete mode 100644 xrandr/xrandr.nm
delete mode 100644 xterm/patches/xterm-245-resources.patch
delete mode 100644 xterm/patches/xterm-256-man-page_paths.patch
delete mode 100644 xterm/patches/xterm-261-desk.patch
delete mode 100644 xterm/xterm.nm
delete mode 100644 zenity/zenity.nm
Difference in files:
diff --git a/SDL/SDL.nm b/SDL/SDL.nm
deleted file mode 100644
index 21fd5155f..000000000
--- a/SDL/SDL.nm
+++ /dev/null
@@ -1,64 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = SDL
-version = 1.2.15
-release = 1
-
-groups = System/Libraries
-url = http://www.libsdl.org/
-license = LGPLv2+
-summary = A cross-platform multimedia library.
-
-description
- Simple DirectMedia Layer (SDL) is a cross-platform multimedia library
- designed to provide fast access to the graphics frame buffer and audio
- device.
-end
-
-source_dl = http://www.libsdl.org/release/
-
-build
- requires
- libusb-compat-devel
- libX11-devel
- libXext-devel
- libXrandr-devel
- libXrender-devel
- mesa-devel
- end
-
- if "%{DISTRO_PLATFORM}" == "x86"
- requires += nasm
- end
-
- configure_options += \
- --disable-video-svga \
- --disable-video-ggi \
- --disable-video-aalib \
- --disable-video-ps3 \
- --enable-sdl-dlopen
-end
-
-packages
- package %{name}
-
- package %{name}-devel
- template DEVEL
-
- requires
- libX11-devel
- libXext-devel
- libXrandr-devel
- libXrender-devel
- mesa-devel
- SDL = %{thisver}
- end
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/X11vnc/X11vnc.nm b/X11vnc/X11vnc.nm
deleted file mode 100644
index e38dd26e7..000000000
--- a/X11vnc/X11vnc.nm
+++ /dev/null
@@ -1,60 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = X11vnc
-version = 0.9.12
-release = 0
-
-groups = Development/Tools
-url = http://www.karlrunge.com/x11vnc/
-license = GPLv2
-summary = VNC server for the current X11 session.
-
-description
- X11vnc provides a VNC access to the current X11 session.
-end
-
-source_dl = http://sourceforge.net/projects/libvncserver/files/x11vnc/%{version}/
-sources = x11vnc-%{version}.tar.gz
-
-build
- requires
- libX11-devel
- libXdamage-devel
- libXext-devel
- libXi-devel
- libXfixes-devel
- libXtst-devel
- libjpeg-devel
- libVNCServer-devel
- openssl-devel
- xorg-x11-proto-devel
- zlib-devel
- end
-
- DIR_APP = %{DIR_SRC}/x11vnc-%{version}
-
- configure_options += \
- --mandir=/usr/share/man \
- --with-system-libvncserver \
- --without-tightvnc-filetransfer
-
- # Remove java executables
- install_cmds
- cd %{BUILDROOT} && find -name '*.jar' -exec rm {} \;
- end
-end
-
-packages
- package %{name}
- requires
- xorg-x11-server
- end
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/X11vnc/patches/x11vnc-0.9.8-XShm-explicit-include.patch b/X11vnc/patches/x11vnc-0.9.8-XShm-explicit-include.patch
deleted file mode 100644
index 8ef1e3c92..000000000
--- a/X11vnc/patches/x11vnc-0.9.8-XShm-explicit-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/x11vnc/cleanup.c.orig 2009-06-14 19:29:17.000000000 +0400
-+++ b/x11vnc/cleanup.c 2009-08-07 02:44:14.000000000 +0400
-@@ -50,6 +50,7 @@
- #include "screen.h"
- #include "xrecord.h"
- #include "xevents.h"
-+#include <X11/extensions/shmproto.h> // For X_ShmAttach in Fedora 12
-
- /*
- * Exiting and error handling routines
diff --git a/X11vnc/patches/x11vnc-0.9.8-disableRpath.patch b/X11vnc/patches/x11vnc-0.9.8-disableRpath.patch
deleted file mode 100644
index 81be9a769..000000000
--- a/X11vnc/patches/x11vnc-0.9.8-disableRpath.patch
+++ /dev/null
@@ -1,103 +0,0 @@
---- a/configure.orig 2009-06-19 18:44:21.000000000 +0400
-+++ b/configure 2009-07-29 16:01:13.000000000 +0400
-@@ -4183,7 +4183,7 @@
- "SunOS 5"*)
- echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
- echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
-- ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
-+ ac_xsave_LIBS=$LIBS; LIBS="$LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -4233,9 +4233,9 @@
- if test $ac_R_nospace = yes; then
- echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
-- X_LIBS="$X_LIBS -R$x_libraries"
-+ X_LIBS="$X_LIBS"
- else
-- LIBS="$ac_xsave_LIBS -R $x_libraries"
-+ LIBS="$ac_xsave_LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -4285,7 +4285,7 @@
- if test $ac_R_space = yes; then
- echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
-- X_LIBS="$X_LIBS -R $x_libraries"
-+ X_LIBS="$X_LIBS"
- else
- echo "$as_me:$LINENO: result: neither works" >&5
- echo "${ECHO_T}neither works" >&6
-@@ -6705,7 +6705,7 @@
- if test ! -z "$HAVE_LIBXFIXES" -o ! -z "$HAVE_LIBXDAMAGE"; then
- # need /usr/sfw/lib in RPATH for Solaris 10 and later
- case `(uname -sr) 2>/dev/null` in
-- "SunOS 5"*) X_EXTRA_LIBS="$X_EXTRA_LIBS -R/usr/sfw/lib" ;;
-+ "SunOS 5"*) X_EXTRA_LIBS="$X_EXTRA_LIBS" ;;
- esac
- fi
- if test ! -z "$HAVE_LIBXRANDR"; then
-@@ -7026,9 +7026,9 @@
- if test "x$ld_minus_R" = "xno"; then
- :
- elif test "x$GCC" = "xyes"; then
-- LDFLAGS="$LDFLAGS -Xlinker -R$with_ssl/lib"
-+ LDFLAGS="$LDFLAGS -Xlinker"
- else
-- LDFLAGS="$LDFLAGS -R$with_ssl/lib"
-+ LDFLAGS="$LDFLAGS"
- fi
- fi
- echo "$as_me:$LINENO: checking for RAND_file_name in -lcrypto" >&5
-@@ -7910,13 +7910,6 @@
- fi
- if test "x$with_system_libvncserver" != "xyes"; then
- rflag=""
-- if test "x$ld_minus_R" = "xno"; then
-- :
-- elif test "x$GCC" = "xyes"; then
-- rflag="-Xlinker -R$with_system_libvncserver/lib"
-- else
-- rflag="-R$with_system_libvncserver/lib"
-- fi
- cmd="$with_system_libvncserver/bin/libvncserver-config"
- if $cmd --version 1>/dev/null 2>&1; then
- cvers=`$cmd --version 2>/dev/null`
-@@ -7958,9 +7951,9 @@
- if test "x$ld_minus_R" = "xno"; then
- :
- elif test "x$GCC" = "xyes"; then
-- rflag=" -Xlinker -R$rprefix/lib "
-+ rflag=" -Xlinker "
- else
-- rflag=" -R$rprefix/lib "
-+ rflag=" "
- fi
- cvers=`libvncserver-config --version 2>/dev/null`
- cscore=`echo "$cvers" | tr '.' ' ' | awk '{print 10000 * $1 + 100 * $2 + $3}'`
-@@ -8039,9 +8032,9 @@
- :
- elif test "x$GCC" = "xyes"; then
- # this is not complete... in general a rat's nest.
-- LDFLAGS="$LDFLAGS -Xlinker -R$with_jpeg/lib"
-+ LDFLAGS="$LDFLAGS -Xlinker"
- else
-- LDFLAGS="$LDFLAGS -R$with_jpeg/lib"
-+ LDFLAGS="$LDFLAGS"
- fi
- fi
- if test "${ac_cv_header_jpeglib_h+set}" = set; then
-@@ -8320,9 +8313,9 @@
- if test "x$ld_minus_R" = "xno"; then
- :
- elif test "x$GCC" = "xyes"; then
-- LDFLAGS="$LDFLAGS -Xlinker -R$with_zlib/lib"
-+ LDFLAGS="$LDFLAGS -Xlinker"
- else
-- LDFLAGS="$LDFLAGS -R$with_zlib/lib"
-+ LDFLAGS="$LDFLAGS"
- fi
- fi
- if test "${ac_cv_header_zlib_h+set}" = set; then
diff --git a/at-spi2-atk/at-spi2-atk.nm b/at-spi2-atk/at-spi2-atk.nm
deleted file mode 100644
index 32a168efb..000000000
--- a/at-spi2-atk/at-spi2-atk.nm
+++ /dev/null
@@ -1,60 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = at-spi2-atk
-version = %{ver_major}.%{ver_minor}
-ver_major = 2.19
-ver_minor = 92
-release = 1
-
-groups = System/Libraries
-url = http://www.linuxfoundation.org/en/AT-SPI_on_D-Bus
-license = LGPLv2+
-summary = A GTK+ module that bridges ATK to D-Bus at-spi.
-
-description
- The ATK library provides a set of interfaces for adding accessibility
- support to applications and graphical user interface toolkits.
-end
-
-source_dl = http://download.gnome.org/sources/%{name}/%{ver_major}/
-sources = %{thisapp}.tar.xz
-
-build
- requires
- at-spi2-core-devel >= 2.19
- atk-devel
- dbus-devel >= 1.5
- dbus-glib-devel
- glib2-devel
- intltool
- libxml2-devel
- end
-
- configure_options += \
- --disable-gtk-doc-html \
- --disable-static
-
- install_cmds
- # Remove unneedet files.
- rm -rvf %{BUILDROOT}%{libdir}/gnome-settings*
- rm -rvf %{BUILDROOT}%{libdir}/gtk-2*
- end
-end
-
-packages
- package %{name}
-
- package %{name}-devel
- template DEVEL
-
- files += \
- %{datadir}/gir*/
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/at-spi2-core/at-spi2-core.nm b/at-spi2-core/at-spi2-core.nm
deleted file mode 100644
index 0d525aa8a..000000000
--- a/at-spi2-core/at-spi2-core.nm
+++ /dev/null
@@ -1,65 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = at-spi2-core
-version = %{ver_major}.%{ver_minor}
-ver_major = 2.19
-ver_minor = 92
-release = 2
-
-groups = System/Libraries
-url = http://www.linuxfoundation.org/en/AT-SPI_on_D-Bus
-license = LGPLv2+
-summary = Protocol definitions and daemon for D-Bus at-spi.
-
-description
- The ATK library provides a set of interfaces for adding accessibility
- support to applications and graphical user interface toolkits.
-end
-
-source_dl = http://download.gnome.org/sources/%{name}/%{ver_major}/
-sources = %{thisapp}.tar.xz
-
-build
- requires
- dbus-devel
- intltool
- glib2-devel
- gobject-introspection-devel
- libXtst-devel
- libXext-devel
- libXi-devel
- end
-
- export LD_LIBRARY_PATH = %{DIR_APP}/atspi/.libs
-
- configure_options += \
- --disable-gtk-doc-html \
- --disable-static
-
- install_cmds
- # Remove unneeded files for xdg.
- rm -rvf %{BUILDROOT}%{sysconfdir}/xdg
- end
-end
-
-packages
- package %{name}
-
- package %{name}-libs
- template LIBS
- end
-
- package %{name}-devel
- template DEVEL
-
- files += \
- %{datadir}/gir*/
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/clutter/clutter.nm b/clutter/clutter.nm
deleted file mode 100644
index 1d812b464..000000000
--- a/clutter/clutter.nm
+++ /dev/null
@@ -1,70 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = clutter
-version = %{ver_maj}.%{ver_min}
-ver_maj = 1.13
-ver_min = 4
-release = 2
-
-groups = Development/Libraries
-url = http://www.clutter-project.org/
-license = LGPLv2+
-summary = Open Source software library for creating rich graphical user \
- interfaces.
-
-description
- Clutter is an open source software library for creating fast,
- visually rich graphical user interfaces. The most obvious example
- of potential usage is in media center type applications.
- We hope however it can be used for a lot more.
-end
-
-source_dl = http://download.gnome.org/sources/clutter/%{ver_maj}/
-sources = %{thisapp}.tar.xz
-
-build
- requires
- atk-devel
- cairo-gobject-devel
- gdk-pixbuf2-devel
- glib2-devel
- gobject-introspection-devel >= 0.9.6
- cogl-devel
- gtk3-devel
- json-glib-devel
- libXcomposite-devel
- libXdamage-devel
- libXi-devel
- libGL-devel
- pango-devel
- end
-
- export LD_LIBRARY_PATH = %{DIR_APP}/clutter/.libs
-
- configure_options += \
- --enable-xinput
-
- make_build_targets += V=1
-end
-
-packages
- package %{name}
- requires
- libGL
- end
- end
-
- package %{name}-devel
- template DEVEL
-
- files += \
- %{datadir}/gir*/
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/clutter/patches/clutter-1.13.4-xi23.patch b/clutter/patches/clutter-1.13.4-xi23.patch
deleted file mode 100644
index b11c80cba..000000000
--- a/clutter/patches/clutter-1.13.4-xi23.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From b58a1d66816c19eda079a1bd7cecd1ad03644e69 Mon Sep 17 00:00:00 2001
-From: "Jasper St. Pierre" <jstpierre(a)mecheye.net>
-Date: Wed, 23 Jan 2013 17:09:59 -0500
-Subject: [PATCH] x11: Always request XI2.2
-
-The X server should fill in the minor version that it supports in the
-case where it only supports the older version. We should not get a
-BadRequest or fail the version check if we pass something higher.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=692466
----
- clutter/x11/clutter-backend-x11.c | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/clutter/x11/clutter-backend-x11.c b/clutter/x11/clutter-backend-x11.c
-index 2d8f4ba..26f9581 100644
---- a/clutter/x11/clutter-backend-x11.c
-+++ b/clutter/x11/clutter-backend-x11.c
-@@ -239,12 +239,7 @@ clutter_backend_x11_create_device_manager (ClutterBackendX11 *backend_x11)
- {
- #ifdef HAVE_XINPUT_2
- int major = 2;
--
--#ifdef HAVE_XINPUT_2_2
- int minor = 2;
--#else
-- int minor = 0;
--#endif /* HAVE_XINPUT_2_2 */
-
- if (XIQueryVersion (backend_x11->xdpy, &major, &minor) != BadRequest)
- {
---
-1.8.1.2
-
-From 3e1450ba17fce90a8034cc525c67a87ff3cdd53d Mon Sep 17 00:00:00 2001
-From: "Jasper St. Pierre" <jstpierre(a)mecheye.net>
-Date: Wed, 23 Jan 2013 14:49:26 -0500
-Subject: [PATCH] clutter-backend: Request XI2.3
-
-Since XIQueryVersion, the bad API that it is, chooses the first client
-version that it gets, we need to ensure that we pass XIQueryVersion the
-new XI2.3 version, knowing fully well that Clutter won't be confused
-by the new features.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=692466
----
- clutter/x11/clutter-backend-x11.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/clutter/x11/clutter-backend-x11.c b/clutter/x11/clutter-backend-x11.c
-index 26f9581..1015f4c 100644
---- a/clutter/x11/clutter-backend-x11.c
-+++ b/clutter/x11/clutter-backend-x11.c
-@@ -239,7 +239,7 @@ clutter_backend_x11_create_device_manager (ClutterBackendX11 *backend_x11)
- {
- #ifdef HAVE_XINPUT_2
- int major = 2;
-- int minor = 2;
-+ int minor = 3;
-
- if (XIQueryVersion (backend_x11->xdpy, &major, &minor) != BadRequest)
- {
---
-1.8.1.2
-
diff --git a/clutter/patches/oob-device-fix.patch b/clutter/patches/oob-device-fix.patch
deleted file mode 100644
index cc5928273..000000000
--- a/clutter/patches/oob-device-fix.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From d5604be9e5a148ced73dee2ede49b38f97119baf Mon Sep 17 00:00:00 2001
-From: Yanko Kaneti <yaneti(a)declera.com>
-Date: Mon, 28 Jan 2013 15:49:51 +0200
-Subject: [PATCH] xi2: Fix access beyond array boundaries
-
----
- clutter/x11/clutter-device-manager-xi2.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/clutter/x11/clutter-device-manager-xi2.c b/clutter/x11/clutter-device-manager-xi2.c
-index 616dee7..bd9473e 100644
---- a/clutter/x11/clutter-device-manager-xi2.c
-+++ b/clutter/x11/clutter-device-manager-xi2.c
-@@ -94,13 +94,13 @@ translate_valuator_class (Display *xdisplay,
- atoms_initialized = TRUE;
- }
-
-- for (i = CLUTTER_INPUT_AXIS_IGNORE;
-- i < CLUTTER_INPUT_AXIS_LAST;
-+ for (i = 0;
-+ i < N_AXIS_ATOMS;
- i += 1)
- {
- if (clutter_input_axis_atoms[i] == class->label)
- {
-- axis = i;
-+ axis = i + 1;
- break;
- }
- }
---
-1.8.1
-
diff --git a/cogl/cogl.nm b/cogl/cogl.nm
deleted file mode 100644
index af6285ade..000000000
--- a/cogl/cogl.nm
+++ /dev/null
@@ -1,82 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = cogl
-version = %{ver_maj}.%{ver_min}
-ver_maj = 1.13
-ver_min = 2
-release = 2
-
-groups = Development/Libraries
-url = http://www.clutter-project.org/
-license = LGPLv2+
-summary = A library for using 3D graphics hardware to draw pretty pictures
-
-description
- Cogl is a small open source library for using 3D graphics hardware to draw
- pretty pictures. The API departs from the flat state machine style of
- OpenGL and is designed to make it easy to write orthogonal components that
- can render without stepping on each others toes.
-
- As well aiming for a nice API, we think having a single library as opposed
- to an API specification like OpenGL has a few advantages too; like being
- able to paper over the inconsistencies/bugs of different OpenGL
- implementations in a centralized place, not to mention the myriad of OpenGL
- extensions. It also means we are in a better position to provide utility
- APIs that help software developers since they only need to be implemented
- once and there is no risk of inconsistency between implementations.
-
- Having other backends, besides OpenGL, such as drm, Gallium or D3D are
- options we are interested in for the future.
-end
-
-source_dl = http://download.gnome.org/sources/cogl/%{ver_maj}/
-sources = %{thisapp}.tar.xz
-
-build
- requires
- cairo-devel
- gdk-pixbuf2-devel
- glib2-devel
- gobject-introspection-devel
- libXcomposite-devel
- libXdamage-devel
- libXext-devel
- libXfixes-devel
- libGL-devel
- pango-devel
- end
-
- export LD_LIBRARY_PATH = %{DIR_APP}/cogl/.libs:%{DIR_APP}/cogl-pango/.libs
-
- configure_options += \
- --enable-cairo \
- --enable-gdk-pixbuf \
- --enable-cogl-pango \
- --enable-glx \
- --enable-introspection=yes \
- --disable-gtk-doc
-
- make_build_targets += V=1
-
- install_cmds
- rm -vf %{BUILDROOT}%{datadir}/cogl/examples-data/crate.jpg
- end
-end
-
-packages
- package %{name}
-
- package %{name}-devel
- template DEVEL
-
- files += \
- %{datadir}/gir*/
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/dejavu-fonts/dejavu-fonts.nm b/dejavu-fonts/dejavu-fonts.nm
deleted file mode 100644
index 24a77fa79..000000000
--- a/dejavu-fonts/dejavu-fonts.nm
+++ /dev/null
@@ -1,184 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = dejavu-fonts
-version = 2.33
-release = 1
-arch = noarch
-
-groups = System/Fonts
-url = http://www.dejavu-fonts.org/
-license = Bitstream Vera and Public Domain
-summary = DejaVu fonts.
-
-description
- The DejaVu font set is based on the "Bitstream Vera" fonts, release 1.10. Its
- purpose is to provide a wider range of characters, while maintaining the
- original style, using an open collaborative development process.
-end
-
-source_dl = http://sourceforge.net/projects/dejavu/files/dejavu/%{version}/
-sources = %{thisapp}.tar.bz2
-
-fontname = dejavu
-fontdir = %{datadir}/fonts/%{fontname}/
-fontconfig_templatedir = %{datadir}/fontconfig/conf.avail/
-fontconfig_confdir = %{sysconfdir}/fonts/conf.d/
-
-build
- requires
- perl(Font::TTF)
- bzip2
- fontforge
- unicode-ucd
- end
-
- make_build_targets += \
- VERSION=%{version} \
- FC-LANG="" \
- BLOCKS=/usr/share/unicode/ucd/Blocks.txt \
- UNICODEDATA=/usr/share/unicode/ucd/UnicodeData.txt
-
- test
- make check
- end
-
- install
- # Compress the huge state.txt.
- bzip2 -9 build/status.txt
-
- # Create directories and install font files.
- install -m 0755 -d %{BUILDROOT}%{fontdir}
- install -m 0644 -p build/*.ttf %{BUILDROOT}%{fontdir}
-
- # Create directories for configuration files.
- install -m 0755 -d %{BUILDROOT}%{fontconfig_templatedir} \
- %{BUILDROOT}%{fontconfig_confdir}
-
- # Install config files and symlink them to /etc.
- cd fontconfig
- for fontconf in *conf; do
- install -m 0644 -p $fontconf %{BUILDROOT}%{fontconfig_templatedir}
- ln -s ../../..%{fontconfig_templatedir}$fontconf \
- %{BUILDROOT}%{fontconfig_confdir}/$fontconf
-
- done
- end
-end
-
-packages
- # Template for fonts.
- template FONT
- requires
- %{name} = %{thisver}
- end
- end
-
- package %{name}
-
- package %{name}-sans-fonts
- template FONT
-
- summary = Variable-width sans-serif font faces.
- description
- This package consists of the DejaVu sans-serif variable-width font faces, in
- their unabridged version.
- end
-
- files
- %{fontdir}DejaVuSans.ttf
- %{fontdir}DejaVuSans-*.ttf
- %{fontdir}DejaVuSansCondensed*.ttf
- %{fontconfig_templatedir}*-sans.conf
- %{fontconfig_confdir}*-sans.conf
- end
- end
-
- package %{name}-serif-fonts
- template FONT
-
- summary = Variable-width serif font faces.
- description
- This package consists of the DejaVu serif variable-width font faces, in
- their unabridged version.
- end
-
- files
- %{fontdir}DejaVuSerif.ttf
- %{fontdir}DejaVuSerif-*.ttf
- %{fontdir}DejaVuSerifCondensed*.ttf
- %{fontconfig_templatedir}*-serif.conf
- %{fontconfig_confdir}*-serif.conf
- end
- end
-
- package %{name}-sans-mono-fonts
- template FONT
-
- summary = Monospace sans-serif fon faces.
- description
- This package consists of the DejaVu sans-serif monospace font faces, in their
- unabridged version.
- end
-
- files
- %{fontdir}DejaVuSansMono.ttf
- %{fontconfig_templatedir}*-sans-mono.conf
- %{fontconfig_confdir}*-sans-mono.conf
- end
- end
-
- package %{name}-lgc-sans-fonts
- template FONT
-
- summary = Variable-width sans-serif font faces, Latin-Greek-Cyrillic subset.
- description
- This package consists of the DejaVu sans-serif variable-width font faces, with
- unicode coverage restricted to Latin, Greek and Cyrillic.
- end
-
- files
- %{fontdir}DejaVuLGCSans.ttf
- %{fontdir}DejaVuLGCSans-*.ttf
- %{fontdir}DejaVuLGCSansCondensed*.ttf
- %{fontconfig_templatedir}*-lgc-sans.conf
- %{fontconfig_confdir}*-lgc-sans.conf
- end
- end
-
- package %{name}-lgc-serif-fonts
- template FONT
-
- summary = Variable-width serif font faces, Latin-Greek-Cyrillic subset.
- description
- This package consists of the DejaVu serif variable-width font faces, with
- unicode coverage restricted to Latin, Greek and Cyrillic.
- end
-
- files
- %{fontdir}DejaVuLGCSerif.ttf
- %{fontdir}DejaVuLGCSerif-*.ttf
- %{fontdir}DejaVuLGCSerifCondensed*.ttf
- %{fontconfig_templatedir}*-lgc-serif.conf
- %{fontconfig_confdir}*-lgc-serif.conf
- end
- end
-
- package %{name}-lgc-sans-mono-fonts
- template FONT
-
- summary = Monospace sans-serif font faces, Latin-Greek-Cyrillic subset.
- description
- This package consists of the DejaVu sans-serif monospace font faces, with
- unicode coverage restricted to Latin, Greek and Cyrillic.
- end
-
- files
- %{fontdir}DejaVuLGCSansMono*.ttf
- %{fontconfig_templatedir}*-lgc-sans-mono.conf
- %{fontconfig_confdir}*-lgc-sans-mono.conf
- end
- end
-end
diff --git a/fontforge/fontforge.nm b/fontforge/fontforge.nm
deleted file mode 100644
index 75984edaa..000000000
--- a/fontforge/fontforge.nm
+++ /dev/null
@@ -1,57 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = fontforge
-version = 20110222
-release = 2
-
-groups = Applications/Publishing
-url = http://fontforge.sourceforge.net/
-license = BSD
-summary = Outline and bitmap font editor.
-
-description
- FontForge (former PfaEdit) is a font editor for outline and bitmap
- fonts. It supports a range of font formats, including PostScript
- (ASCII and binary Type 1, some Type 3 and Type 0), TrueType, OpenType
- (Type2) and CID-keyed fonts.
-end
-
-source_dl = http://sourceforge.net/projects/fontforge/files/fontforge-source/
-sources = %{name}_full-%{version}.tar.bz2
-
-build
- requires
- cairo-devel>=1.12.2
- freetype-devel
- gettext
- libjpeg-devel
- libpng-devel
- libtiff-devel
- libXft-devel
- libXt-devel
- libxml2-devel
- pango-devel>=1.29.5-2
- python-devel
- xorg-x11-proto-devel
- end
-
- configure_options += \
- --with-freetype-bytecode=no \
- --with-regular-link \
- --enable-pyextension
-end
-
-packages
- package %{name}
-
- package %{name}-devel
- template DEVEL
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/fontforge/patches/fontforge-20090224-pythondl.patch b/fontforge/patches/fontforge-20090224-pythondl.patch
deleted file mode 100644
index 45e04bfc1..000000000
--- a/fontforge/patches/fontforge-20090224-pythondl.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -Nur fontforge-20090224.orig/configure fontforge-20090224/configure
---- fontforge-20090224.orig/configure 2008-12-24 14:04:18.000000000 -0700
-+++ fontforge-20090224/configure 2009-04-01 22:56:07.000000000 -0600
-@@ -26670,6 +26670,7 @@
- else
- PYLIBS=""
- fi
-+ PYDEFINES="$PYDEFINES, ('SOLIBDIR','\"$libdir/\"')"
- PY=pyhook/setup.py
- fi
-
-diff -Nur fontforge-20090224.orig/pyhook/loadfontforge.h fontforge-20090224/pyhook/loadfontforge.h
---- fontforge-20090224.orig/pyhook/loadfontforge.h 2007-12-23 19:28:35.000000000 -0700
-+++ fontforge-20090224/pyhook/loadfontforge.h 2009-04-01 22:49:08.000000000 -0600
-@@ -11,7 +11,7 @@
-
- if ( (lib = dlopen("libgunicode" SO_EXT,RTLD_LAZY))==NULL ) {
- #ifdef PREFIX
-- lib = dlopen( PREFIX "/lib/" "libgunicode" SO_EXT,RTLD_LAZY);
-+ lib = dlopen( SOLIBDIR "libgunicode.so.3" ,RTLD_LAZY);
- #endif
- }
- if ( lib==NULL ) {
-@@ -21,7 +21,7 @@
-
- if ( (lib = dlopen("libgutils" SO_EXT,RTLD_LAZY))==NULL ) {
- #ifdef PREFIX
-- lib = dlopen( PREFIX "/lib/" "libgutils" SO_EXT,RTLD_LAZY);
-+ lib = dlopen( SOLIBDIR "libgutils.so.1" ,RTLD_LAZY);
- #endif
- }
- if ( lib==NULL ) {
-@@ -31,7 +31,7 @@
-
- if ( (lib = dlopen("libfontforge" SO_EXT,RTLD_LAZY))==NULL ) {
- #ifdef PREFIX
-- lib = dlopen( PREFIX "/lib/" "libfontforge" SO_EXT,RTLD_LAZY);
-+ lib = dlopen( SOLIBDIR "libfontforge.so.1" ,RTLD_LAZY);
- #endif
- }
- if ( lib==NULL ) {
diff --git a/fontforge/patches/fontforge-20100501-select-points-crash.patch b/fontforge/patches/fontforge-20100501-select-points-crash.patch
deleted file mode 100644
index 90c9bde31..000000000
--- a/fontforge/patches/fontforge-20100501-select-points-crash.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- fontforge-20100501.orig/fontforge/charview.c 2010-04-15 03:26:28.000000000 +0100
-+++ fontforge-20100501/fontforge/charview.c 2011-03-01 15:09:22.821753002 +0000
-@@ -8597,7 +8597,7 @@
- static int CVNumForePointsSelected(CharView *cv, BasePoint **bp) {
- SplineSet *spl;
- SplinePoint *test, *first;
-- BasePoint *bps[4];
-+ BasePoint *bps[5];
- int i, cnt;
-
- if ( cv->b.drawmode!=dm_fore )
diff --git a/fontforge/patches/fontforge-20110222-libpng15.patch b/fontforge/patches/fontforge-20110222-libpng15.patch
deleted file mode 100644
index 156e3c186..000000000
--- a/fontforge/patches/fontforge-20110222-libpng15.patch
+++ /dev/null
@@ -1,176 +0,0 @@
-From e76a8a537dbf8c47024f5863f9f18ed55ad686d3 Mon Sep 17 00:00:00 2001
-From: michal-n <michal-n(a)users.sourceforge.net>
-Date: Sat, 17 Dec 2011 15:24:12 +0100
-Subject: [PATCH] There was no need to panic...
- The patch from Paul contained errant reference to 'png_color16'.
- The correct form is 'png_color_16'. So, patch reapplied.
-
----
- gutils/gimagewritepng.c | 100 +++++++++++++++++++++++-----------------------
- 1 files changed, 50 insertions(+), 50 deletions(-)
-
-diff --git a/gutils/gimagewritepng.c b/gutils/gimagewritepng.c
-index 43fa097..a88ec63 100644
---- a/gutils/gimagewritepng.c
-+++ b/gutils/gimagewritepng.c
-@@ -236,6 +236,7 @@ return(false);
- }
- } else {
- if ( base->trans!=-1 ) {
-+ trans_color = galloc(sizeof(png_color_16));
- trans_color->red = COLOR_RED(base->trans);
- trans_color->green = COLOR_GREEN(base->trans);
- trans_color->blue = COLOR_BLUE(base->trans);
-@@ -258,6 +259,7 @@ return(false);
- _png_write_end(png_ptr, info_ptr);
-
- if ( trans_alpha!=NULL ) gfree(trans_alpha);
-+ if ( trans_color!=NULL ) gfree(trans_color);
- if ( palette!=NULL ) gfree(palette);
- _png_destroy_write_struct(&png_ptr, &info_ptr);
- gfree(rows);
-@@ -296,7 +298,7 @@ static void user_error_fn(png_structp png_ptr, png_const_charp error_msg) {
- #if (PNG_LIBPNG_VER < 10500)
- longjmp(png_ptr->jmpbuf,1);
- #else
-- _png_longjmp (png_ptr, 1);
-+ png_longjmp (png_ptr, 1);
- #endif
- }
-
-@@ -310,6 +312,12 @@ int GImageWrite_Png(GImage *gi, FILE *fp, int progressive) {
- png_infop info_ptr;
- png_byte **rows;
- int i;
-+ int bit_depth;
-+ int color_type;
-+ int num_palette;
-+ png_bytep trans_alpha = NULL;
-+ png_color_16p trans_color = NULL;
-+ png_colorp palette = NULL;
-
- png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING,
- (void *)NULL, user_error_fn, user_warning_fn);
-@@ -336,65 +344,60 @@ return(false);
-
- png_init_io(png_ptr, fp);
-
-- info_ptr->width = base->width;
-- info_ptr->height = base->height;
-- info_ptr->bit_depth = 8;
-- info_ptr->valid = 0;
-- info_ptr->interlace_type = progressive;
-- if ( base->trans!=-1 ) {
-- info_ptr->num_trans = 1;
-- info_ptr->valid |= PNG_INFO_tRNS;
-+ bit_depth = 8;
-+ num_palette = base->clut==NULL?2:base->clut->clut_len;
-+ if ( base->image_type==it_index || base->image_type==it_bitmap ) {
-+ color_type = PNG_COLOR_TYPE_PALETTE;
-+ if ( num_palette<=2 )
-+ bit_depth=1;
-+ else if ( num_palette<=4 )
-+ bit_depth=2;
-+ else if ( num_palette<=16 )
-+ bit_depth=4;
-+ } else {
-+ color_type = PNG_COLOR_TYPE_RGB;
-+ if ( base->image_type == it_rgba )
-+ color_type = PNG_COLOR_TYPE_RGB_ALPHA;
- }
-+
-+ png_set_IHDR(png_ptr, info_ptr, base->width, base->height,
-+ bit_depth, color_type, progressive,
-+ PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
- if ( base->image_type==it_index || base->image_type==it_bitmap ) {
-- info_ptr->color_type = PNG_COLOR_TYPE_PALETTE;
-- info_ptr->valid |= PNG_INFO_PLTE;
-- info_ptr->num_palette = base->clut==NULL?2:base->clut->clut_len;
-- info_ptr->palette = (png_color *) galloc(info_ptr->num_palette*sizeof(png_color));
-+ palette = (png_color *) galloc(num_palette*sizeof(png_color));
- if ( base->clut==NULL ) {
-- info_ptr->palette[0].red = info_ptr->palette[0].green = info_ptr->palette[0].blue = 0;
-- info_ptr->palette[1].red = info_ptr->palette[1].green = info_ptr->palette[1].blue = 0xff;
-+ palette[0].red = palette[0].green = palette[0].blue = 0;
-+ palette[1].red = palette[1].green = palette[1].blue = 0xff;
- } else {
-- for ( i=0; i<info_ptr->num_palette; ++i ) {
-+ for ( i=0; i<num_palette; ++i ) {
- long col = base->clut->clut[i];
-- info_ptr->palette[i].red = COLOR_RED(col);
-- info_ptr->palette[i].green = COLOR_GREEN(col);
-- info_ptr->palette[i].blue = COLOR_BLUE(col);
-+ palette[i].red = COLOR_RED(col);
-+ palette[i].green = COLOR_GREEN(col);
-+ palette[i].blue = COLOR_BLUE(col);
- }
- }
-- if ( info_ptr->num_palette<=2 )
-- info_ptr->bit_depth=1;
-- else if ( info_ptr->num_palette<=4 )
-- info_ptr->bit_depth=2;
-- else if ( info_ptr->num_palette<=16 )
-- info_ptr->bit_depth=4;
-- if ( info_ptr->num_palette<=16 )
-+ png_set_PLTE(png_ptr, info_ptr, palette, num_palette);
-+ if ( num_palette<=16 )
- png_set_packing(png_ptr);
-+
- if ( base->trans!=-1 ) {
--#if ( PNG_LIBPNG_VER_MAJOR > 1 || PNG_LIBPNG_VER_MINOR > 2 )
-- info_ptr->trans_alpha = galloc(1);
-- info_ptr->trans_alpha[0] = base->trans;
--#else
-- info_ptr->trans = galloc(1);
-- info_ptr->trans[0] = base->trans;
--#endif
-+ trans_alpha = galloc(1);
-+ trans_alpha[0] = base->trans;
- }
- } else {
-- info_ptr->color_type = PNG_COLOR_TYPE_RGB;
- if ( base->trans!=-1 ) {
--#if ( PNG_LIBPNG_VER_MAJOR > 1 || PNG_LIBPNG_VER_MINOR > 2 )
-- info_ptr->trans_color.red = COLOR_RED(base->trans);
-- info_ptr->trans_color.green = COLOR_GREEN(base->trans);
-- info_ptr->trans_color.blue = COLOR_BLUE(base->trans);
--#else
-- info_ptr->trans_values.red = COLOR_RED(base->trans);
-- info_ptr->trans_values.green = COLOR_GREEN(base->trans);
-- info_ptr->trans_values.blue = COLOR_BLUE(base->trans);
--#endif
-+ trans_color = galloc(sizeof(png_color_16));
-+ trans_color->red = COLOR_RED(base->trans);
-+ trans_color->green = COLOR_GREEN(base->trans);
-+ trans_color->blue = COLOR_BLUE(base->trans);
- }
- }
-+ if ( base->trans!=-1 ) {
-+ png_set_tRNS(png_ptr, info_ptr, trans_alpha, 1, trans_color);
-+ }
- png_write_info(png_ptr, info_ptr);
-
-- if (info_ptr->color_type == PNG_COLOR_TYPE_RGB)
-+ if (color_type == PNG_COLOR_TYPE_RGB)
- png_set_filler(png_ptr, '\0', PNG_FILLER_BEFORE);
-
- rows = galloc(base->height*sizeof(png_byte *));
-@@ -405,12 +408,9 @@ return(false);
-
- png_write_end(png_ptr, info_ptr);
-
--#if ( PNG_LIBPNG_VER_MAJOR > 1 || PNG_LIBPNG_VER_MINOR > 2 )
-- if ( info_ptr->trans_alpha!=NULL ) gfree(info_ptr->trans_alpha);
--#else
-- if ( info_ptr->trans!=NULL ) gfree(info_ptr->trans);
--#endif
-- if ( info_ptr->palette!=NULL ) gfree(info_ptr->palette);
-+ if ( trans_alpha!=NULL ) gfree(trans_alpha);
-+ if ( trans_color!=NULL ) gfree(trans_color);
-+ if ( palette!=NULL ) gfree(palette);
- png_destroy_write_struct(&png_ptr, &info_ptr);
- gfree(rows);
- return( 1 );
---
-1.7.4.1
-
diff --git a/gnome-themes-standard/gnome-themes-standard.nm b/gnome-themes-standard/gnome-themes-standard.nm
deleted file mode 100644
index e5f1fc282..000000000
--- a/gnome-themes-standard/gnome-themes-standard.nm
+++ /dev/null
@@ -1,88 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = gnome-themes-standard
-ver_major = 3.20
-version = %{ver_major}
-release = 1
-
-groups =
-url = http://git.gnome.org/browse/gnome-themes-standard
-license = LGPLv2+
-summary = Standard themes for GNOME applications.
-
-description
- The gnome-themes-standard package contains the standard theme for the GNOME
- desktop, which provides default appearance for cursors, desktop background,
- window borders and GTK+ applications.
-end
-
-source_dl = http://download.gnome.org/sources/%{name}/%{ver_major}/
-sources = %{thisapp}.tar.xz
-
-build
- requires
- /usr/bin/gtk-update-icon-cache
- gtk3-devel >= 3.0.2
- librsvg2-devel
- intltool
- end
-
- configure_options += \
- --disable-static \
- --disable-gtk2-engine
-
- install_cmds
- mkdir -pv %{BUILDROOT}%{sysconfdir}/gtk-3.0
-
- install -m 0664 %{DIR_SOURCE}/settings.ini \
- %{BUILDROOT}%{sysconfdir}/gtk-3.0/
- end
-end
-
-packages
- package %{name}
- requires
- adwaita-cursor-theme = %{thisver}
- adwaita-gtk3-theme = %{thisver}
- end
- end
-
- package adwaita-cursor-theme
- arch = noarch
-
- summary = Adwaita cursor theme.
- description
- The adwaita-cursor-theme package contains a modern set of cursors originally
- designed for the GNOME desktop.
- end
-
- files
- %{datadir}/icons/Adwaita
- end
- end
-
- package adwaita-gtk3-theme
- summary = Adwaita gtk3 theme.
- description
- The adwaita-gtk3-theme package contains a gtk3 theme for presenting widgets
- with a GNOME look and feel.
- end
-
- files
- %{libdir}/gtk-3.0/
- %{datadir}/themes/Adwaita/gtk-3.0
- %{sysconfdir}/gtk-3.0/settings.ini
- end
- end
-
- package %{name}-devel
- template DEVEL
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/gnome-themes-standard/settings.ini b/gnome-themes-standard/settings.ini
deleted file mode 100644
index aa2354418..000000000
--- a/gnome-themes-standard/settings.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[Settings]
-gtk-theme-name = Adwaita
-gtk-icon-theme-name = gnome
-gtk-cursor-theme-name = Adwaita
-gtk-button-images = 0
-gtk-menu-images = 0
-gtk-auto-mnemonics = 0
diff --git a/gtk3/gtk3.nm b/gtk3/gtk3.nm
deleted file mode 100644
index ff81f6d18..000000000
--- a/gtk3/gtk3.nm
+++ /dev/null
@@ -1,89 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = gtk3
-version = %{ver_major}.%{ver_minor}
-ver_major = 3.20
-ver_minor = 0
-release = 2
-
-groups = System/Libraries
-url = http://www.gtk.org
-license = LGPLv2+
-summary = The GIMP Toolkit, a library for creating GUIs for X.
-
-description
- GTK+ is a multi-platform toolkit for creating graphical user
- interfaces.
-end
-
-thisapp = gtk+-%{version}
-
-source_dl = http://download.gnome.org/sources/gtk+/%{ver_major}/
-sources = %{thisapp}.tar.xz
-
-build
- requires
- atk-devel >= 2.7.5
- at-spi2-atk-devel
- cairo-devel >= 1.14.0
- cairo-gobject-devel >= 1.14.0
- fontconfig-devel
- gdk-pixbuf2-devel >= 2.30.0
- gettext-devel >= 0.18.3
- glib2-devel >= 2.35.3
- gobject-introspection-devel >= 1.39.0
- libepoxy-devel >= 1.0
- libXi-devel
- libXrandr-devel
- libXrender-devel
- libXfixes-devel
- libXdamage-devel
- pango-devel >= 1.37.3
- end
-
- export LD_LIBRARY_PATH = %{DIR_APP}/gdk/.libs:%{DIR_APP}/gtk/.libs
-
- configure_options += \
- --enable-x11-backend \
- --enable-introspection=yes \
- --disable-gtk2-dependency \
- --disable-wayland-backend \
- --disable-gtk-doc-html \
- --disable-colord \
- --disable-cups \
- --disable-papi
-
- install_cmds
- # Remove unneeded files.
- rm -rvf %{BUILDROOT}%{datadir}/gtk-3.0/demo
- rm -rvf %{BUILDROOT}%{bindir}/*demo*
- end
-end
-
-packages
- package %{name}
-
- package %{name}-libs
- template LIBS
- end
-
- package %{name}-devel
- template DEVEL
-
- requires
- at-spi2-atk-devel
- atk-devel
- glib2-devel
- end
-
- files += \
- %{datadir}/gir*/
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/libICE/libICE.nm b/libICE/libICE.nm
deleted file mode 100644
index 0607f0a5c..000000000
--- a/libICE/libICE.nm
+++ /dev/null
@@ -1,43 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = libICE
-version = 1.0.9
-release = 1
-
-maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
-groups = X/Libraries
-url = http://www.x.org/
-license = MIT
-summary = X.Org X11 libICE runtime library.
-
-description
- X.Org X11 libICE development package.
-end
-
-source_dl = http://ftp.x.org/pub/individual/lib/
-
-build
- requires
- pkg-config
- xorg-x11-proto-devel
- xorg-x11-xtrans-devel
- end
-
- configure_options += \
- --disable-static
-end
-
-packages
- package %{name}
-
- package %{name}-devel
- template DEVEL
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/libSM/libSM.nm b/libSM/libSM.nm
deleted file mode 100644
index 8f0bcb8b7..000000000
--- a/libSM/libSM.nm
+++ /dev/null
@@ -1,44 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = libSM
-version = 1.2.2
-release = 1
-
-maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
-groups = X/Libraries
-url = http://www.x.org/
-license = MIT
-summary = X.Org X11 libSM runtime library.
-
-description
- X.Org X11 libSM development package.
-end
-
-source_dl = http://ftp.x.org/pub/individual/lib/
-
-build
- requires
- libICE-devel
- libuuid-devel
- xorg-x11-proto-devel
- xorg-x11-xtrans-devel
- end
-
- configure_options += \
- --disable-static
-end
-
-packages
- package %{name}
-
- package %{name}-devel
- template DEVEL
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/libX11/libX11.nm b/libX11/libX11.nm
deleted file mode 100644
index 3975a98d6..000000000
--- a/libX11/libX11.nm
+++ /dev/null
@@ -1,42 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = libX11
-version = 1.5.0
-release = 1
-
-maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
-groups = System/Libraries
-url = http://www.x.org/
-license = MIT
-summary = X11 protocol client library.
-
-description
- Client library for X.org X11 protocol.
-end
-
-source_dl = ftp://ftp.x.org/pub/individual/lib/
-sources = %{thisapp}.tar.bz2
-
-build
- requires
- libxcb-devel
- pkg-config
- xorg-x11-proto-devel
- xorg-x11-xtrans-devel
- end
-end
-
-packages
- package %{name}
-
- package %{name}-devel
- template DEVEL
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/libXau/libXau.nm b/libXau/libXau.nm
deleted file mode 100644
index b23f5eb6d..000000000
--- a/libXau/libXau.nm
+++ /dev/null
@@ -1,47 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = libXau
-version = 1.0.7
-release = 1
-
-maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
-groups = X/Libraries
-url = http://xcb.freedesktop.org/
-license = MIT
-summary = Sample Authorization Protocol for X.
-
-description
- This is a very simple mechanism for providing individual access
- to an X Window System display.It uses existing core protocol and
- library hooks for specifying authorization data in the connection
- setup block to restrict use of the display to only those clients
- that show that they know a server-specific key called a
- magic cookie.
-end
-
-source_dl = http://ftp.x.org/pub/individual/lib/
-
-build
- requires
- pkg-config
- xorg-x11-proto-devel
- end
-
- configure_options +=\
- --disable-static
-end
-
-packages
- package %{name}
-
- package %{name}-devel
- template DEVEL
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/libXau/patches/xau-1.0.4-local.patch b/libXau/patches/xau-1.0.4-local.patch
deleted file mode 100644
index 26b578bab..000000000
--- a/libXau/patches/xau-1.0.4-local.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/AuGetBest.c b/AuGetBest.c
-index ae2b748..5d92dad 100644
---- a/AuGetBest.c
-+++ b/AuGetBest.c
-@@ -120,7 +120,8 @@ XauGetBestAuthByAddr (
- * Match when:
- * either family or entry->family are FamilyWild or
- * family and entry->family are the same and
-- * address and entry->address are the same
-+ * address and entry->address are the same or
-+ * family is FamilyLocal
- * and
- * either number or entry->number are empty or
- * number and entry->number are the same
-@@ -139,6 +140,7 @@ XauGetBestAuthByAddr (
- binaryEqual (entry->address, fully_qual_address,
- (int) fully_qual_address_length))
- #endif
-+ || (family == FamilyLocal)
- ))) &&
- (number_length == 0 || entry->number_length == 0 ||
- (number_length == entry->number_length &&
diff --git a/libXaw/libXaw.nm b/libXaw/libXaw.nm
deleted file mode 100644
index 7dd6b4e55..000000000
--- a/libXaw/libXaw.nm
+++ /dev/null
@@ -1,49 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = libXaw
-version = 1.0.11
-release = 1
-
-maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
-groups = X/Libraries
-url = http://www.x.org/
-license = MIT
-summary = X Athena Widget Set.
-
-description
- Xaw is a widget set based on the X Toolkit Intrinsics (Xt) Library.
-end
-
-source_dl = http://ftp.x.org/pub/individual/lib/
-
-build
- requires
- libICE-devel
- libSM-devel
- libX11-devel
- libXt-devel
- libXmu-devel
- libXpm-devel
- libXext-devel
- pkg-config
- xorg-x11-proto-devel
- end
-
- configure_options += \
- --disable-static
-end
-
-packages
- package %{name}
-
- package %{name}-devel
- template DEVEL
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/libXcomposite/libXcomposite.nm b/libXcomposite/libXcomposite.nm
deleted file mode 100644
index ad9734f6d..000000000
--- a/libXcomposite/libXcomposite.nm
+++ /dev/null
@@ -1,44 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = libXcomposite
-version = 0.4.4
-release = 1
-
-maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
-groups = X/Libraries
-url = http://www.x.org/
-license = MIT
-summary = X Composite extension library.
-
-description
- X.Org X11 libXcomposite runtime library.
-end
-
-source_dl = http://ftp.x.org/pub/individual/lib/
-
-build
- requires
- libX11-devel
- libXfixes-devel
- pkg-config
- xorg-x11-proto-devel
- end
-
- configure_options += \
- --disable-static
-end
-
-packages
- package %{name}
-
- package %{name}-devel
- template DEVEL
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/libXcursor/index.theme b/libXcursor/index.theme
deleted file mode 100644
index cda0b19ae..000000000
--- a/libXcursor/index.theme
+++ /dev/null
@@ -1,2 +0,0 @@
-[Icon Theme]
-Inherits=Adwaita
diff --git a/libXcursor/libXcursor.nm b/libXcursor/libXcursor.nm
deleted file mode 100644
index 7c4608627..000000000
--- a/libXcursor/libXcursor.nm
+++ /dev/null
@@ -1,55 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = libXcursor
-version = 1.1.13
-release = 1
-
-maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
-groups = X/Libraries
-url = http://www.x.org/
-license = MIT
-summary = Cursor management library.
-
-description
- This is a simple library designed to help locate and load cursors.
- Cursors can be loaded from files or memory. A library of common cursors
- exists which map to the standard X cursor names.Cursors can exist in
- several sizes and the library automatically picks the best size.
-end
-
-source_dl = ftp://ftp.x.org/pub/individual/lib/
-
-build
- requires
- libX11-devel
- libXfixes-devel
- libXrender-devel >= 0.8.2
- xorg-x11-proto-devel
- xorg-x11-util-macros
- end
-
- configure_options += \
- --disable-static
-
- install_cmds
- # Install index.theme.
- mkdir -pv %{BUILDROOT}%{datadir}/icons/default
- install -m 644 -p %{DIR_SOURCE}/index.theme \
- %{BUILDROOT}%{datadir}/icons/default/index.theme
- end
-end
-
-packages
- package %{name}
-
- package %{name}-devel
- template DEVEL
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/libXdamage/libXdamage.nm b/libXdamage/libXdamage.nm
deleted file mode 100644
index 279b4b3e5..000000000
--- a/libXdamage/libXdamage.nm
+++ /dev/null
@@ -1,44 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = libXdamage
-version = 1.1.4
-release = 1
-
-maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
-groups = X/Libraries
-url = http://www.x.org/
-license = MIT
-summary = X Damage extension library.
-
-description
- X.Org X11 libXdamage runtime library.
-end
-
-source_dl = http://ftp.x.org/pub/individual/lib/
-
-build
- requires
- libX11-devel
- libXfixes-devel
- pkg-config
- xorg-x11-proto-devel
- end
-
- configure_options += \
- --disable-static
-end
-
-packages
- package %{name}
-
- package %{name}-devel
- template DEVEL
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/libXdmcp/libXdmcp.nm b/libXdmcp/libXdmcp.nm
deleted file mode 100644
index f72ce5525..000000000
--- a/libXdmcp/libXdmcp.nm
+++ /dev/null
@@ -1,42 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = libXdmcp
-version = 1.1.1
-release = 1
-
-maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
-groups = X/Libraries
-url = http://www.x.org/
-license = MIT
-summary = X Display Manager Control Protocol library.
-
-description
- X Display Manager Control Protocol library.
-end
-
-source_dl = http://ftp.x.org/pub/individual/lib/
-
-build
- requires
- pkg-config
- xorg-x11-proto-devel
- end
-
- configure_options += \
- --disable-static
-end
-
-packages
- package %{name}
-
- package %{name}-devel
- template DEVEL
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/libXext/libXext.nm b/libXext/libXext.nm
deleted file mode 100644
index 7109119a0..000000000
--- a/libXext/libXext.nm
+++ /dev/null
@@ -1,44 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = libXext
-version = 1.3.1
-release = 1
-
-maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
-groups = X/Libraries
-url = http://www.x.org/
-license = MIT
-summary = X.Org X11 libXext runtime library.
-
-description
- X.Org X11 libXext development package.
-end
-
-source_dl = ftp://ftp.x.org/pub/individual/lib/
-
-build
- requires
- libX11-devel
- libXau-devel
- pkg-config
- xorg-x11-proto-devel
- end
-
- configure_options += \
- --disable-static
-end
-
-packages
- package %{name}
-
- package %{name}-devel
- template DEVEL
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/libXfixes/libXfixes.nm b/libXfixes/libXfixes.nm
deleted file mode 100644
index 565807e9d..000000000
--- a/libXfixes/libXfixes.nm
+++ /dev/null
@@ -1,43 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = libXfixes
-version = 5.0
-release = 1
-
-maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
-groups = X/Libraries
-url = http://www.x.org/
-license = MIT
-summary = X Fixes library.
-
-description
- X Fixes library.
-end
-
-source_dl = http://ftp.x.org/pub/individual/lib/
-
-build
- requires
- libX11-devel
- pkg-config
- xorg-x11-proto-devel
- end
-
- configure_options += \
- --disable-static
-end
-
-packages
- package %{name}
-
- package %{name}-devel
- template DEVEL
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/libXfont/libXfont.nm b/libXfont/libXfont.nm
deleted file mode 100644
index 55de1ee5c..000000000
--- a/libXfont/libXfont.nm
+++ /dev/null
@@ -1,46 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = libXfont
-version = 1.4.5
-release = 1
-
-maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
-groups = X/Libraries
-url = http://www.x.org/
-license = MIT
-summary = X.Org X11 libXfont runtime library.
-
-description
- X.Org X11 libXfont development package.
-end
-
-source_dl = http://ftp.x.org/pub/individual/lib/
-
-build
- requires
- freetype-devel
- libfontenc-devel
- pkg-config
- xorg-x11-proto-devel
- xorg-x11-xtrans-devel
- zlib-devel
- end
-
- configure_options += \
- --disable-static
-end
-
-packages
- package %{name}
-
- package %{name}-devel
- template DEVEL
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/libXft/libXft.nm b/libXft/libXft.nm
deleted file mode 100644
index bf726f435..000000000
--- a/libXft/libXft.nm
+++ /dev/null
@@ -1,45 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = libXft
-version = 2.3.1
-release = 1
-
-maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
-groups = X/Libraries
-url = http://www.x.org/
-license = MIT
-summary = X.Org X11 libXft runtime library.
-
-description
- X.Org X11 libXft runtime library.
-end
-
-source_dl = http://ftp.x.org/pub/individual/lib/
-
-build
- requires
- fontconfig-devel
- freetype-devel
- libXrender-devel
- pkg-config
- xorg-x11-proto-devel
- end
-
- configure_options += \
- --disable-static
-end
-
-packages
- package %{name}
-
- package %{name}-devel
- template DEVEL
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/libXi/libXi.nm b/libXi/libXi.nm
deleted file mode 100644
index 444e2c2ee..000000000
--- a/libXi/libXi.nm
+++ /dev/null
@@ -1,45 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = libXi
-version = 1.6.2
-release = 1
-
-maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
-groups = X/Libraries
-url = http://xcb.freedesktop.org/
-license = MIT
-summary = X.Org X11 libXi runtime library.
-
-description
- X.Org X11 libXi runtime library.
-end
-
-source_dl = http://ftp.x.org/pub/individual/lib/
-
-build
- requires
- libX11-devel
- libXext-devel
- pkg-config
- xorg-x11-proto-devel
- xorg-x11-util-macros
- end
-
- configure_options += \
- --disable-static
-end
-
-packages
- package %{name}
-
- package %{name}-devel
- template DEVEL
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/libXinerama/libXinerama.nm b/libXinerama/libXinerama.nm
deleted file mode 100644
index c1afbbc9c..000000000
--- a/libXinerama/libXinerama.nm
+++ /dev/null
@@ -1,43 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = libXinerama
-version = 1.1.2
-release = 1
-
-maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
-groups = X/Libraries
-url = http://www.x.org/
-license = MIT
-summary = X.Org X11 libXinerama runtime library
-
-description
- X.Org X11 libXinerama runtime library
-end
-
-source_dl = ftp://ftp.x.org/pub/individual/lib/
-
-build
- requires
- libX11-devel
- libXext-devel
- xorg-x11-proto-devel
- end
-
- configure_options += \
- --disable-static
-end
-
-packages
- package %{name}
-
- package %{name}-devel
- template DEVEL
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/libXmu/libXmu.nm b/libXmu/libXmu.nm
deleted file mode 100644
index 5b526350a..000000000
--- a/libXmu/libXmu.nm
+++ /dev/null
@@ -1,48 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = libXmu
-version = 1.1.1
-release = 1
-
-maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
-groups = X/Libraries
-url = http://www.x.org/
-license = MIT
-summary = X.Org X11 libXmu/libXmuu runtime libraries.
-
-description
- X.Org X11 libXmu/libXmuu runtime libraries.
-end
-
-source_dl = http://ftp.x.org/pub/individual/lib/
-
-build
- requires
- libICE-devel
- libSM-devel
- libX11-devel
- libXext-devel
- libXt-devel
- pkg-config
- xorg-x11-util-macros
- xorg-x11-proto-devel
- end
-
- configure_options += \
- --disable-static
-end
-
-packages
- package %{name}
-
- package %{name}-devel
- template DEVEL
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/libXpm/libXpm.nm b/libXpm/libXpm.nm
deleted file mode 100644
index 217320f10..000000000
--- a/libXpm/libXpm.nm
+++ /dev/null
@@ -1,51 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = libXpm
-version = 3.5.10
-release = 2
-
-maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
-groups = X/Libraries
-url = http://www.x.org/
-license = MIT
-summary = X.Org X11 libXpm runtime library.
-
-description
- X.Org X11 libXpm runtime library.
-end
-
-source_dl = http://ftp.x.org/pub/individual/lib/
-
-build
- requires
- gettext
- libICE-devel
- libSM-devel
- libX11-devel
- libXau-devel
- libXext-devel
- libXt-devel
- pkg-config
- xorg-x11-proto-devel
- xorg-x11-util-macros
- end
-
- configure_options += \
- --disable-selective-werror \
- --disable-static
-end
-
-packages
- package %{name}
-
- package %{name}-devel
- template DEVEL
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/libXrandr/libXrandr.nm b/libXrandr/libXrandr.nm
deleted file mode 100644
index 2522d905a..000000000
--- a/libXrandr/libXrandr.nm
+++ /dev/null
@@ -1,45 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = libXrandr
-version = 1.4.0
-release = 1
-
-maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
-groups = X/Libraries
-url = http://www.x.org/
-license = MIT
-summary = X11 libXrandr runtime library.
-
-description
- X.Org X11 libXrandr runtime library.
-end
-
-source_dl = http://ftp.x.org/pub/individual/lib/
-
-build
- requires
- libX11-devel
- libXext-devel
- libXrender-devel
- pkg-config
- xorg-x11-proto-devel
- end
-
- configure_options += \
- --disable-static
-end
-
-packages
- package %{name}
-
- package %{name}-devel
- template DEVEL
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/libXrender/libXrender.nm b/libXrender/libXrender.nm
deleted file mode 100644
index c9ee5b430..000000000
--- a/libXrender/libXrender.nm
+++ /dev/null
@@ -1,45 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = libXrender
-version = 0.9.6
-release = 1
-
-maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
-groups = X/Libraries
-url = http://www.x.org/
-license = MIT
-summary = X11 libXrender runtime library.
-
-description
- X.Org X11 libXrender runtime library.
-end
-
-source_dl =
-sources = %{thisapp}.tar.bz2
-
-build
- requires
- libX11-devel
- pkg-config
- xorg-x11-proto-devel
- end
-
- configure_options += \
- --disable-static
-end
-
-packages
- package %{name}
- end
-
- package %{name}-devel
- template DEVEL
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/libXres/libXres.nm b/libXres/libXres.nm
deleted file mode 100644
index d84d1eece..000000000
--- a/libXres/libXres.nm
+++ /dev/null
@@ -1,47 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = libXres
-version = 1.0.6
-release = 1
-
-maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
-groups = X/Libraries
-url = http://www.x.org/
-license = MIT
-summary = X-Resource extension client library.
-
-description
- X-Resource is an extension that allows a client to query
- the X server about its usage of various resources.
-end
-
-source_dl = http://ftp.x.org/pub/individual/lib/
-
-build
- requires
- libX11-devel
- libXext-devel
- pkg-config
- xorg-x11-proto-devel
- end
-
- configure_options += \
- --disable-static
-
- make_install_targets += INSTALL="install -p"
-end
-
-packages
- package %{name}
-
- package %{name}-devel
- template DEVEL
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/libXt/libXt.nm b/libXt/libXt.nm
deleted file mode 100644
index 949146521..000000000
--- a/libXt/libXt.nm
+++ /dev/null
@@ -1,47 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = libXt
-version = 1.1.3
-release = 1
-
-maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
-groups = X/Libraries
-url = http://www.x.org/
-license = MIT
-summary = X.Org X11 libXt runtime library.
-
-description
- X.Org X11 libXt runtime library.
-end
-
-source_dl = http://ftp.x.org/pub/individual/lib/
-
-build
- requires
- libICE-devel
- libSM-devel
- libX11-devel
- pkg-config
- xorg-x11-proto-devel
- end
-
- CFLAGS += -fno-strict-aliasing
-
- configure_options += \
- --disable-static
-end
-
-packages
- package %{name}
-
- package %{name}-devel
- template DEVEL
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/libXtst/libXtst.nm b/libXtst/libXtst.nm
deleted file mode 100644
index d249ee853..000000000
--- a/libXtst/libXtst.nm
+++ /dev/null
@@ -1,45 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = libXtst
-version = 1.2.1
-release = 1
-
-maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
-groups = X/Libraries
-url = http://www.x.org/
-license = MIT
-summary = X.Org X11 libXtst runtime library.
-
-description
- X.Org X11 libXtst development package.
-end
-
-source_dl = http://ftp.x.org/pub/individual/lib/
-
-build
- requires
- libX11-devel
- libXext-devel
- libXi-devel
- pkg-config
- xorg-x11-proto-devel
- end
-
- configure_options += \
- --disable-static
-end
-
-packages
- package %{name}
-
- package %{name}-devel
- template DEVEL
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/libXv/libXv.nm b/libXv/libXv.nm
deleted file mode 100644
index 011aed039..000000000
--- a/libXv/libXv.nm
+++ /dev/null
@@ -1,45 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = libXv
-version = 1.0.7
-release = 1
-
-maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
-groups = X/Libraries
-url = http://www.x.org/
-license = MIT
-summary = X.Org X11 libXv runtime library.
-
-
-description
- X.Org X11 libXv runtime library.
-end
-
-source_dl = http://ftp.x.org/pub/individual/lib/
-
-build
- requires
- libX11-devel
- libXext-devel
- pkg-config
- xorg-x11-proto-devel
- end
-
- configure_options += \
- --disable-static
-end
-
-packages
- package %{name}
-
- package %{name}-devel
- template DEVEL
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/libXvMC/libXvMC.nm b/libXvMC/libXvMC.nm
deleted file mode 100644
index fb3bae7fd..000000000
--- a/libXvMC/libXvMC.nm
+++ /dev/null
@@ -1,45 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = libXvMC
-version = 1.0.7
-release = 1
-
-maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
-groups = X/Libraries
-url = http://www.x.org/
-license = MIT
-summary = X.Org X11 libXvMC runtime library.
-
-description
- X.Org X11 libXvMC runtime library.
-end
-
-source_dl = http://ftp.x.org/pub/individual/lib/
-
-build
- requires
- libX11-devel
- libXext-devel
- libXv-devel
- pkg-config
- xorg-x11-proto-devel
- end
-
- configure_options += \
- --disable-static
-end
-
-packages
- package %{name}
-
- package %{name}-devel
- template DEVEL
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/libXxf86vm/libXxf86vm.nm b/libXxf86vm/libXxf86vm.nm
deleted file mode 100644
index cbfdb62cb..000000000
--- a/libXxf86vm/libXxf86vm.nm
+++ /dev/null
@@ -1,44 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = libXxf86vm
-version = 1.1.2
-release = 1
-
-maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
-groups = X/Libraries
-url = http://www.x.org/
-license = MIT
-summary = X.Org X11 libXxf86vm runtime library.
-
-description
- X.Org X11 libXxf86vm runtime library.
-end
-
-source_dl = http://ftp.x.org/pub/individual/lib/
-
-build
- requires
- libX11-devel
- libXext-devel
- pkg-config
- xorg-x11-proto-devel
- end
-
- configure_options += \
- --disable-static
-end
-
-packages
- package %{name}
-
- package %{name}-devel
- template DEVEL
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/libfontenc/libfontenc.nm b/libfontenc/libfontenc.nm
deleted file mode 100644
index 25577a0a1..000000000
--- a/libfontenc/libfontenc.nm
+++ /dev/null
@@ -1,43 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = libfontenc
-version = 1.1.3
-release = 1
-
-maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
-groups = X/Libraries
-url = http://www.x.org/
-license = MIT
-summary = X.Org X11 libfontenc runtime library.
-
-description
- X.Org X11 libfontenc runtime library.
-end
-
-source_dl = http://ftp.x.org/pub/individual/lib/
-
-build
- requires
- pkg-config
- xorg-x11-proto-devel
- zlib-devel
- end
-
- configure_options += \
- --disable-static
-end
-
-packages
- package %{name}
-
- package %{name}-devel
- template DEVEL
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/libxcb/libxcb.nm b/libxcb/libxcb.nm
deleted file mode 100644
index c136327a9..000000000
--- a/libxcb/libxcb.nm
+++ /dev/null
@@ -1,58 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = libxcb
-version = 1.9
-release = 1
-
-maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
-groups = X/Libraries
-url = http://xcb.freedesktop.org/
-license = MIT
-summary = A C binding to the X11 protocol.
-
-description
- The X protocol C-language Binding (XCB) is a replacement for Xlib
- featuring a small footprint, latency hiding, direct access to the
- protocol, improved threading support, and extensibility.
-end
-
-source_dl = http://xcb.freedesktop.org/dist/
-
-build
- requires
- autoconf
- automake
- libtool
- libXau-devel
- libxslt-devel
- pkg-config
- python-devel
- xcb-proto >= 1.7
- xorg-x11-proto-devel
- end
-
- configure_options += \
- --disable-static
-
- prepare_cmds
- sed -e "s/pthread-stubs//g" -i configure.ac
- autoreconf -f --install
- end
-end
-
-packages
- package %{name}
-
- package %{name}-devel
- template DEVEL
-
- requires = libXau-devel
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/libxkbfile/libxkbfile.nm b/libxkbfile/libxkbfile.nm
deleted file mode 100644
index 61c7119ee..000000000
--- a/libxkbfile/libxkbfile.nm
+++ /dev/null
@@ -1,40 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = libxkbfile
-version = 1.0.8
-release = 1
-
-maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
-groups = X/Libraries
-url = http://www.x.org
-license = MIT
-summary = X.Org X11 libxkbfile runtime library.
-
-description
- X.Org X11 libxkbfile runtime library.
-end
-
-source_dl = http://ftp.x.org/pub/individual/lib/
-
-build
- requires
- libX11-devel
- pkg-config
- xorg-x11-proto-devel
- end
-end
-
-packages
- package %{name}
-
- package %{name}-devel
- template DEVEL
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/makedepend/makedepend.nm b/makedepend/makedepend.nm
deleted file mode 100644
index 7eca2cbbd..000000000
--- a/makedepend/makedepend.nm
+++ /dev/null
@@ -1,35 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = makedepend
-version = 1.0.4
-release = 1
-
-groups = Development/Tools
-url = http://www.x.org
-license = MIT
-summary = makedepend - create dependencies in makefiles.
-
-description
- Makedepend automatically creates dependencies in makefiles.
-end
-
-source_dl = ftp://ftp.x.org/pub/individual/util/
-
-build
- requires
- pkg-config
- xorg-x11-util-macros
- xorg-x11-proto-devel
- end
-end
-
-packages
- package %{name}
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/mesa/mesa.nm b/mesa/mesa.nm
deleted file mode 100644
index 692cc51df..000000000
--- a/mesa/mesa.nm
+++ /dev/null
@@ -1,149 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = mesa
-version = 9.0.2
-release = 4
-
-groups = Development/Tools
-url = http://www.mesa3d.org
-license = MIT
-summary = Mesa graphics libraries.
-
-description
- Mesa libGL runtime libraries and DRI drivers.
-end
-
-source_dl = ftp://ftp.freedesktop.org/pub/mesa/%{version}/
-sources = MesaLib-%{version}.tar.bz2
-
-build
- requires
- autoconf
- automake
- bison
- expat-devel
- flex
- gcc-c++
- pkg-config
- libX11-devel
- libXdamage-devel
- libXext-devel
- libXfixes-devel
- libXxf86vm-devel
- libdrm-devel >= 2.4.40
- libselinux-devel
- libtool
- libxcb-devel
- libxml2-devel
- makedepend
- xorg-x11-proto-devel
- end
-
- DIR_APP = %{DIR_SRC}/Mesa-%{version}
-
- if "%{DISTRO_PLATFORM}" == "x86"
- platform_drivers = nouveau,radeon,i915,i965
- end
-
- configure_options += \
- --enable-pic \
- --enable-selinux \
- --enable-pic \
- --enable-dri \
- --enable-egl \
- --with-dri-drivers="%{platform_drivers}" \
- --with-gallium-drivers=swrast \
- --disable-asm \
- --disable-gallium-llvm \
- --disable-gallium-egl \
- --disable-static \
- --without-demos
-
- prepare_cmds
- # Defaults to dri (not xlib) for libGL on all arches.
- sed -i 's/^default_driver.*$/default_driver="dri"/' configure.ac
-
- # Regenerate build system.
- autoreconf -vfi
- end
-end
-
-packages
- package dri-drivers
- summary = Mesa-based DRI drivers.
- description
- This package contains the Mesa-based DRI drivers.
- end
-
- obsoletes
- mesa <= 7.11.2-2
- end
-
- files
- %{sysconfdir}/drirc
- %{libdir}/libdri*.so.*
- %{libdir}/dri/*
- end
- end
-
- package libEGL
- summary = Mesa libEGL runtime library.
- description
- This package contains the Mesa libEGL runtime libraries.
- end
-
- files
- %{libdir}/libEGL.so.*
- end
- end
-
- package libGL
- summary = Mesa libGL runtime library.
- description
- This package contains the Mesa libGL runtime libraries.
- end
-
- obsoletes
- mesa <= 7.11.2-2
- end
-
- files
- %{libdir}/libGL.so.*
- end
- end
-
- package libglapi
- summary = Mesa shared glapi.
- description
- This package contains the shared glapi of Mesa.
- end
-
- obsoletes
- mesa <= 7.11.2-2
- end
-
- files
- %{libdir}/libglapi.so.*
- end
- end
-
- package %{name}-devel
- template DEVEL
-
- provides
- libEGL-devel = %{thisver}
- libGL-devel = %{thisver}
- end
-
- requires
- libX11-devel
- end
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/pango/pango.nm b/pango/pango.nm
index ac79ceb71..dc14b5564 100644
--- a/pango/pango.nm
+++ b/pango/pango.nm
@@ -7,7 +7,7 @@ name = pango
version = %{ver_major}.%{ver_minor}
ver_major = 1.40
ver_minor = 3
-release = 1
+release = 2
groups = System/Libraries
url = http://www.pango.org/
@@ -31,7 +31,6 @@ build
glib2-devel
gobject-introspection-devel
harfbuzz-devel >= 0.9.9
- libXft-devel
perl
pkg-config
end
diff --git a/perl-Tk/patches/perl-Tk-debian.patch b/perl-Tk/patches/perl-Tk-debian.patch
deleted file mode 100644
index 6b945b4b1..000000000
--- a/perl-Tk/patches/perl-Tk-debian.patch
+++ /dev/null
@@ -1,71 +0,0 @@
---- perl-tk-804.027.orig/objGlue.c
-+++ perl-tk-804.027/objGlue.c
-@@ -529,6 +529,10 @@
- sv_utf8_upgrade(objPtr);
- #endif
- s = SvPV(objPtr, len);
-+ if (!s)
-+ {
-+ return NULL;
-+ }
- #ifdef SvUTF8
- if (!is_utf8_string(s,len))
- {
-@@ -555,6 +559,10 @@
- else
- {
- s = LangString(objPtr);
-+ if (!s)
-+ {
-+ return NULL;
-+ }
- #ifdef SvUTF8
- if (!is_utf8_string(s,strlen(s)))
- {
---- perl-tk-804.027.orig/pTk/mTk/generic/tkFont.c
-+++ perl-tk-804.027/pTk/mTk/generic/tkFont.c
-@@ -1044,6 +1044,7 @@
- TkFont *fontPtr, *firstFontPtr, *oldFontPtr;
- int new, descent;
- NamedFont *nfPtr;
-+ char *fontString;
-
- fiPtr = ((TkWindow *) tkwin)->mainPtr->fontInfoPtr;
- if (objPtr->typePtr != &tkFontObjType) {
-@@ -1077,8 +1078,12 @@
- cacheHashPtr = oldFontPtr->cacheHashPtr;
- FreeFontObjProc(objPtr);
- } else {
-+ fontString = Tcl_GetString(objPtr);
-+ if (fontString == NULL) {
-+ fontString = "";
-+ }
- cacheHashPtr = Tcl_CreateHashEntry(&fiPtr->fontCache,
-- Tcl_GetString(objPtr), &new);
-+ fontString, &new);
- }
- firstFontPtr = (TkFont *) Tcl_GetHashValue(cacheHashPtr);
- for (fontPtr = firstFontPtr; (fontPtr != NULL);
-@@ -1095,8 +1100,12 @@
- * The desired font isn't in the table. Make a new one.
- */
-
-+ fontString = Tcl_GetString(objPtr);
-+ if (fontString == NULL) {
-+ fontString = "";
-+ }
- namedHashPtr = Tcl_FindHashEntry(&fiPtr->namedTable,
-- Tcl_GetString(objPtr));
-+ fontString);
- if (namedHashPtr != NULL) {
- /*
- * Construct a font based on a named font.
-@@ -1111,7 +1120,7 @@
- * Native font?
- */
-
-- fontPtr = TkpGetNativeFont(tkwin, Tcl_GetString(objPtr));
-+ fontPtr = TkpGetNativeFont(tkwin, fontString);
- if (fontPtr == NULL) {
- TkFontAttributes fa;
- Tcl_Obj *dupObjPtr = Tcl_DuplicateObj(objPtr);
diff --git a/perl-Tk/patches/perl-Tk-seg.patch b/perl-Tk/patches/perl-Tk-seg.patch
deleted file mode 100644
index 26201fa3a..000000000
--- a/perl-Tk/patches/perl-Tk-seg.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -up Tk-804.028/pTk/mTk/generic/tkConfig.c.seg Tk-804.028/pTk/mTk/generic/tkConfig.c
---- Tk-804.028/pTk/mTk/generic/tkConfig.c.seg 2008-03-11 23:29:39.000000000 -0400
-+++ Tk-804.028/pTk/mTk/generic/tkConfig.c 2008-03-11 23:28:09.000000000 -0400
-@@ -1210,11 +1210,11 @@ GetOptionFromObj(interp, objPtr, tablePt
- * First, check to see if the object already has the answer cached.
- */
-
-- if (objPtr->typePtr == &tkOptionObjType) {
-+/* if (objPtr->typePtr == &tkOptionObjType) {
- if (objPtr->internalRep.twoPtrValue.ptr1 == (VOID *) tablePtr) {
- return (Option *) objPtr->internalRep.twoPtrValue.ptr2;
- }
-- }
-+ }*/
-
- /*
- * The answer isn't cached.
-@@ -2277,9 +2277,15 @@ Tk_GetOptionValue(interp, recordPtr, opt
- if (optionPtr == NULL) {
- return NULL;
- }
-+
-+ if (optionPtr->specPtr == NULL) {
-+ return NULL;
-+ }
-+
- if (optionPtr->specPtr->type == TK_OPTION_SYNONYM) {
- optionPtr = optionPtr->extra.synonymPtr;
- }
-+
- if (optionPtr->specPtr->objOffset >= 0) {
- resultPtr = *((Tcl_Obj **) (recordPtr + optionPtr->specPtr->objOffset));
- if (resultPtr == NULL) {
diff --git a/perl-Tk/patches/perl-Tk-widget.patch0 b/perl-Tk/patches/perl-Tk-widget.patch0
deleted file mode 100644
index ec446586d..000000000
--- a/perl-Tk/patches/perl-Tk-widget.patch0
+++ /dev/null
@@ -1,26 +0,0 @@
---- demos/widget.orig 2008-01-02 13:24:14.000000000 +0100
-+++ demos/widget 2008-01-02 13:27:10.000000000 +0100
-@@ -3,7 +3,8 @@
- use 5.008;
- use Config;
- use Tk 804.000;
--use lib Tk->findINC( 'demos/widget_lib' );
-+#use lib Tk->findINC( 'demos/widget_lib' );
-+use lib "@demopath@/widget_lib";
- use Tk::widgets qw/ DialogBox ErrorDialog LabEntry ROText /;
- use Tk::Config ();
- use WidgetDemo;
-@@ -62,9 +63,11 @@
- $l->destroy;
- }
-
--my $widget_lib = Tk->findINC('demos/widget_lib');
-+#my $widget_lib = Tk->findINC('demos/widget_lib');
-+my $widget_lib = "@demopath@/widget_lib";
- my $wd = "$widget_lib/WidgetDemo.pm";
--$WIDTRIB = Tk->findINC('demos/widtrib');
-+#$WIDTRIB = Tk->findINC('demos/widtrib');
-+$WIDTRIB = "@demopath@/widtrib";
- unless (Tk::tainting) {
- $WIDTRIB = $ENV{WIDTRIB} if defined $ENV{WIDTRIB};
- $WIDTRIB = $ARGV[0] if defined $ARGV[0];
diff --git a/perl-Tk/perl-Tk.nm b/perl-Tk/perl-Tk.nm
deleted file mode 100644
index 665335df2..000000000
--- a/perl-Tk/perl-Tk.nm
+++ /dev/null
@@ -1,74 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = perl-Tk
-version = 804.033
-release = 1.1
-thisapp = Tk-%{version}
-
-groups = Development/Libraries
-url = http://search.cpan.org/dist/Tk/
-license = GPL+ or Artistic
-summary = Perl Graphical User Interface ToolKit.
-
-description
- This a re-port of a perl interface to Tk8.4.
- C code is derived from Tcl/Tk8.4.5.
- It also includes all the C code parts of Tix8.1.4 from SourceForge.
- The perl code corresponding to Tix's Tcl code is not fully implemented.
-
- Perl API is essentially the same as Tk800 series Tk800.025 but has not
- been verified as compliant. There ARE differences see pod/804delta.pod.
-end
-
-source_dl = http://cpan.org/modules/by-module/Tk/
-
-build
- requires
- perl(ExtUtils::ParseXS)
- perl(ExtUtils::MakeMaker)
- perl-devel
- libjpeg-devel
- libpng-devel
- libX11-devel
- libXft-devel
- pakfire >= 0.9.26-3.1
- end
-
- build
- perl Makefile.PL INSTALLDIRS=vendor X11LIB=%{libdir} XFT=1
- make %{PARALLELISMFLAGS}
- end
-
- install
- make pure_install PERL_INSTALL_ROOT=%{BUILDROOT}
-
- # Remove interpreter in /usr/local...
- sed -e "s@#!.*@#!/usr/bin/perl -w@g" \
- -i %{BUILDROOT}%{libdir}/perl5/vendor_perl/Tk/pTk/{Tcl-pTk,mkVFunc}
- end
-end
-
-packages
- package %{name}
- provides
- perl(Tk::LabRadio) = 4.004
- perl(Tk::TextReindex)
- perl(Tk) = %{version}
- end
-
- requires
- perl(:MODULE_COMPAT_%{perl_version})
- end
- end
-
- package %{name}-devel
- template DEVEL
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/qemu/qemu.nm b/qemu/qemu.nm
index c80c70d44..e16afe021 100644
--- a/qemu/qemu.nm
+++ b/qemu/qemu.nm
@@ -5,7 +5,7 @@
name = qemu
version = 3.1.0
-release = 1
+release = 2
groups = Applications/Virtualization
url = http://www.qemu.org
@@ -23,7 +23,6 @@ sources = %{thisapp}.tar.xz
build
requires
- SDL-devel
autoconf
automake
bison
@@ -78,7 +77,8 @@ build
--enable-vnc \
--enable-vnc-jpeg \
--enable-vnc-png \
- --disable-xen
+ --disable-xen \
+ --disable-sdl
configure_cmds
sed -e "s@-Wl,-rpath,%{libdir}@@g" -i config-host.mak
diff --git a/xcb-proto/xcb-proto.nm b/xcb-proto/xcb-proto.nm
deleted file mode 100644
index bddbaa098..000000000
--- a/xcb-proto/xcb-proto.nm
+++ /dev/null
@@ -1,39 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = xcb-proto
-version = 1.11
-release = 1
-arch = noarch
-
-maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
-groups = X/Headers
-url = http://xcb.freedesktop.org/
-license = MIT
-summary = XCB protocol descriptions.
-
-description
- XCB is a project to enable efficient language bindings to the X11
- protocol. This package contains the protocol descriptions themselves.
- Language bindings use these protocol descriptions to generate code for marshalling the protocol.
-end
-
-source_dl = http://xcb.freedesktop.org/dist/
-
-build
- requires
- pkg-config
- python-devel
- end
-
- # Place the .pc files in /usr/share so they
- # can be found on all architectures where libdir != /usr/lib.
- configure_options += \
- --libdir=%{datadir}
-end
-
-packages
- package %{name}
-end
diff --git a/xcb-util/xcb-util.nm b/xcb-util/xcb-util.nm
deleted file mode 100644
index 627ae35be..000000000
--- a/xcb-util/xcb-util.nm
+++ /dev/null
@@ -1,55 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = xcb-util
-version = 0.3.6
-release = 2
-
-maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
-groups = X/Libraries
-url = http://xcb.freedesktop.org/
-license = MIT
-summary = Convenience libraries sitting on top of libxcb.
-
-description
- The xcb-util module provides a number of libraries which sit on top of \
- libxcb, the core X protocol library, and some of the extension \
- libraries. These experimental libraries provide convenience functions \
- and interfaces which make the raw X protocol more usable.
-end
-
-source_dl = http://xcb.freedesktop.org/dist/
-sources = %{thisapp}.tar.bz2
-
-build
- requires
- gperf
- libxcb-devel
- m4
- pkg-config
- xorg-x11-proto-devel
- end
-
- configure_options += \
- --with-pic \
- --disable-static
-
- test
- export LD_LIBRARY_PATH=%{DIR_APP}/aux/.libs:%{DIR_APP}/image/.libs
- make check
- end
-end
-
-packages
- package %{name}
-
- package %{name}-devel
- template DEVEL
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/xclock/xclock.nm b/xclock/xclock.nm
deleted file mode 100644
index e4a710424..000000000
--- a/xclock/xclock.nm
+++ /dev/null
@@ -1,43 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = xclock
-version = 1.0.6
-release = 1
-
-maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
-groups = X/Tools
-url = http://www.x.org
-license = MIT
-summary = A classic X Window System clock utility.
-
-description
- xclock is the classic X Window System clock utility. It displays
- the time in analog or digital form, continuously updated at a
- frequency which may be specified by the user.
-end
-
-source_dl = http://ftp.x.org/pub/individual/app/
-sources = %{thisapp}.tar.bz2
-
-build
- requires
- libX11-devel
- libXaw-devel
- libXft-devel
- libXmu-devel
- libXrender-devel
- libxkbfile-devel
- xorg-x11-util-macros
- end
-end
-
-packages
- package %{name}
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/xkeyboard-config/xkeyboard-config.nm b/xkeyboard-config/xkeyboard-config.nm
deleted file mode 100644
index 504b7e8f7..000000000
--- a/xkeyboard-config/xkeyboard-config.nm
+++ /dev/null
@@ -1,48 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = xkeyboard-config
-version = 1.9
-release = 1
-arch = noarch
-
-maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
-groups = X/Utils
-url = http://www.x.org/
-license = MIT
-summary = X Keyboard Extension configuration data.
-
-description
- This package contains configuration data used by the X Keyboard
- Extension (XKB), which allows selection of keyboard layouts when
- using a graphical interface.
-end
-
-source_dl = http://ftp.x.org/pub/individual/data/
-sources = %{thisapp}.tar.bz2
-
-build
- requires
- gettext
- intltool
- pkg-config
- perl-XML-Parser
- xorg-x11-util-macros
- xorg-x11-xkb-utils
- end
-
- configure_options += \
- --disable-static \
- --with-xkb-base=/usr/share/X11/xkb \
- --disable-xkbcomp-symlink \
- --with-xkb-rules-symlink=xorg
-
- make_install_targets += INSTALL="install -p"
-end
-
-packages
- package %{name}
- end
-end
diff --git a/xorg-x11-drv-ati/xorg-x11-drv-ati.nm b/xorg-x11-drv-ati/xorg-x11-drv-ati.nm
deleted file mode 100644
index dec826189..000000000
--- a/xorg-x11-drv-ati/xorg-x11-drv-ati.nm
+++ /dev/null
@@ -1,61 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = xorg-x11-drv-ati
-version = 7.1.0
-release = 1
-
-maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
-groups = X/Driver
-url = http://www.x.org/
-license = MIT
-summary = Xorg X11 ati video driver.
-
-description
- X.Org X11 ati video driver.
-end
-
-# Specify the X Server version to build for.
-x11_server_ver = 1.13.2
-
-thisapp = xf86-video-ati-%{version}
-
-source_dl = http://ftp.x.org/pub/individual/driver/
-
-build
- requires
- libdrm-devel
- libpciaccess-devel
- libX11-devel
- mesa-devel >= 9.0.2
- pkg-config
- xorg-x11-proto-devel
- xorg-x11-server-devel >= %{x11_server_ver}
- xorg-x11-util-macros
- end
-
- CFLAGS += -Wl,-z,lazy
-
- configure_options += \
- --enable-dri \
- --disable-static
-end
-
-quality-agent
- permit_not_full_relro = yes
-end
-
-packages
- package %{name}
- requires
- dri-drivers >= 9.0.2
- xorg-x11-server >= %{x11_server_ver}
- end
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/xorg-x11-drv-evdev/xorg-x11-drv-evdev.nm b/xorg-x11-drv-evdev/xorg-x11-drv-evdev.nm
deleted file mode 100644
index a4da9c286..000000000
--- a/xorg-x11-drv-evdev/xorg-x11-drv-evdev.nm
+++ /dev/null
@@ -1,61 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = xorg-x11-drv-evdev
-version = 2.7.3
-release = 1
-
-maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
-groups = X/Driver
-url = http://www.x.org/
-license = MIT
-summary = Xorg X11 evdev input driver.
-
-description
- X.Org X11 evdev input driver.
-end
-
-# Specify the X Server version to build for.
-x11_server_ver = 1.13.2
-
-thisapp = xf86-input-evdev-%{version}
-
-source_dl = http://ftp.x.org/pub/individual/driver/
-
-build
- requires
- libudev-devel
- libxkbfile-devel
- pkg-config
- xorg-x11-proto-devel
- xorg-x11-server-devel >= %{x11_server_ver}
- xorg-x11-util-macros
- end
-
- CFLAGS += -Wl,-z,lazy
-
- configure_options += \
- --disable-static
-end
-
-quality-agent
- permit_not_full_relro = yes
-end
-
-packages
- package %{name}
- requires
- xorg-x11-server >= %{x11_server_ver}
- end
- end
-
- package %{name}-devel
- template DEVEL
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/xorg-x11-drv-intel/intel.xinf b/xorg-x11-drv-intel/intel.xinf
deleted file mode 100644
index 5867523c5..000000000
--- a/xorg-x11-drv-intel/intel.xinf
+++ /dev/null
@@ -1,28 +0,0 @@
-alias pcivideo:v00008086d00001132sv*sd*bc*sc*i* intel # i815
-alias pcivideo:v00008086d00002562sv*sd*bc*sc*i* intel # 845G
-alias pcivideo:v00008086d00002572sv*sd*bc*sc*i* intel # 865G
-alias pcivideo:v00008086d00002582sv*sd*bc*sc*i* intel # 915G
-alias pcivideo:v00008086d0000258Asv*sd*bc*sc*i* intel # E7221G ("915G")
-alias pcivideo:v00008086d00002592sv*sd*bc*sc*i* intel # 915GM
-alias pcivideo:v00008086d00002772sv*sd*bc*sc*i* intel # 945G
-alias pcivideo:v00008086d000027A2sv*sd*bc*sc*i* intel # 945GM
-alias pcivideo:v00008086d000027AEsv*sd*bc*sc*i* intel # 945GME
-alias pcivideo:v00008086d00002972sv*sd*bc*sc*i* intel # 946GZ, really a 965
-alias pcivideo:v00008086d00002982sv*sd*bc*sc*i* intel # 965G1
-alias pcivideo:v00008086d00002992sv*sd*bc*sc*i* intel # 965Q
-alias pcivideo:v00008086d000029A2sv*sd*bc*sc*i* intel # 965G
-alias pcivideo:v00008086d000029B2sv*sd*bc*sc*i* intel # Q35
-alias pcivideo:v00008086d000029C2sv*sd*bc*sc*i* intel # G33
-alias pcivideo:v00008086d000029D2sv*sd*bc*sc*i* intel # Q33
-alias pcivideo:v00008086d00002A02sv*sd*bc*sc*i* intel # 965GM
-alias pcivideo:v00008086d00002A12sv*sd*bc*sc*i* intel # 965GME
-alias pcivideo:v00008086d00002A42sv*sd*bc*sc*i* intel # GM45
-alias pcivideo:v00008086d00002e02sv*sd*bc*sc*i* intel # IGD_E_G
-alias pcivideo:v00008086d00002e12sv*sd*bc*sc*i* intel # Q45
-alias pcivideo:v00008086d00002e22sv*sd*bc*sc*i* intel # G45
-alias pcivideo:v00008086d00002e32sv*sd*bc*sc*i* intel # G41
-alias pcivideo:v00008086d00003577sv*sd*bc*sc*i* intel # i830
-alias pcivideo:v00008086d00003582sv*sd*bc*sc*i* intel # 855GM
-alias pcivideo:v00008086d00007121sv*sd*bc*sc*i* intel # i810
-alias pcivideo:v00008086d00007123sv*sd*bc*sc*i* intel # i810 DC100
-alias pcivideo:v00008086d00007125sv*sd*bc*sc*i* intel # i810E
diff --git a/xorg-x11-drv-intel/xorg-x11-drv-intel.nm b/xorg-x11-drv-intel/xorg-x11-drv-intel.nm
deleted file mode 100644
index f037878d4..000000000
--- a/xorg-x11-drv-intel/xorg-x11-drv-intel.nm
+++ /dev/null
@@ -1,77 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = xorg-x11-drv-intel
-version = 2.21.0
-release = 2
-sup_arches = x86_64 i686
-
-maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
-groups = X/Driver
-url = http://www.x.org/
-license = MIT
-summary = Xorg X11 intel video driver.
-
-description
- X.Org X11 intel video driver.
-end
-
-# Specify the X Server version to build for.
-x11_server_ver = 1.13.2
-
-thisapp = xf86-video-intel-%{version}
-
-source_dl = http://ftp.x.org/pub/individual/driver/
-
-build
- requires
- autoconf
- automake
- libdrm-devel
- libudev-devel
- libX11-devel
- libXvMC-devel
- libxcb-devel
- libtool
- mesa-devel >= 9.0.2
- pkg-config
- xcb-util-devel
- xorg-x11-proto-devel
- xorg-x11-server-devel >= %{x11_server_ver}
- xorg-x11-util-macros
- end
-
- CFLAGS += -Wl,-z,lazy
-
- configure_options += \
- --enable-dri \
- --enable-xvmc \
- --disable-static
-
- prepare_cmds
- autoreconf -vi
- end
-
- install_cmds
- install -Dm 0644 %{DIR_SOURCE}/intel.xinf %{BUILDROOT}/usr/share/hwdata/videoaliases/intel.xinf
- end
-end
-
-quality-agent
- permit_not_full_relro = yes
-end
-
-packages
- package %{name}
- requires
- dri-drivers >= 9.0.2
- xorg-x11-server >= %{x11_server_ver}
- end
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/xorg-x11-drv-keyboard/xorg-x11-drv-keyboard.nm b/xorg-x11-drv-keyboard/xorg-x11-drv-keyboard.nm
deleted file mode 100644
index 091383dd5..000000000
--- a/xorg-x11-drv-keyboard/xorg-x11-drv-keyboard.nm
+++ /dev/null
@@ -1,55 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = xorg-x11-drv-keyboard
-version = 1.6.2
-release = 1
-
-maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
-groups = X/Driver
-url = http://www.x.org/
-license = MIT
-summary = Xorg X11 keyboard input driver.
-
-description
- X.Org X11 keyboard input driver.
-end
-
-# Specify the X Server version to build for.
-x11_server_ver = 1.13.2
-
-thisapp = xf86-input-keyboard-%{version}
-
-source_dl = http://ftp.x.org/pub/individual/driver/
-
-build
- requires
- pkg-config
- xorg-x11-server-devel >= %{x11_server_ver}
- xorg-x11-proto-devel
- xorg-x11-util-macros
- end
-
- CFLAGS += -Wl,-z,lazy
-
- configure_options += \
- --disable-static
-end
-
-quality-agent
- permit_not_full_relro = yes
-end
-
-packages
- package %{name}
- requires
- xorg-x11-server >= %{x11_server_ver}
- end
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/xorg-x11-drv-modesetting/xorg-x11-drv-modesetting.nm b/xorg-x11-drv-modesetting/xorg-x11-drv-modesetting.nm
deleted file mode 100644
index 8ce3bdde7..000000000
--- a/xorg-x11-drv-modesetting/xorg-x11-drv-modesetting.nm
+++ /dev/null
@@ -1,58 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = xorg-x11-drv-modesetting
-version = 0.6.0
-release = 1
-
-maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
-groups = X/Driver
-url = http://www.x.org/
-license = MIT
-summary = Xorg X11 modesetting video driver.
-
-description
- X.Org X11 modesetting video driver.
-end
-
-# Specify the X Server version to build for.
-x11_server_ver = 1.13.2
-
-thisapp = xf86-video-modesetting-%{version}
-
-source_dl = http://ftp.x.org/pub/individual/driver/
-
-build
- requires
- libX11-devel
- libdrm-devel
- libudev-devel
- pkg-config
- xorg-x11-proto-devel
- xorg-x11-server-devel >= %{x11_server_ver}
- xorg-x11-util-macros
- end
-
- CFLAGS += -Wl,-z,lazy
-
- configure_options += \
- --disable-static
-end
-
-quality-agent
- permit_not_full_relro = yes
-end
-
-packages
- package %{name}
- requires
- xorg-x11-server >= %{x11_server_ver}
- end
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/xorg-x11-drv-mouse/xorg-x11-drv-mouse.nm b/xorg-x11-drv-mouse/xorg-x11-drv-mouse.nm
deleted file mode 100644
index 38d9d5a13..000000000
--- a/xorg-x11-drv-mouse/xorg-x11-drv-mouse.nm
+++ /dev/null
@@ -1,55 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = xorg-x11-drv-mouse
-version = 1.8.1
-release = 1
-
-maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
-groups = X/Driver
-url = http://www.x.org/
-license = MIT
-summary = Xorg X11 mouse input driver.
-
-description
- X.Org X11 mouse input driver.
-end
-
-# Specify the X Server version to build for.
-x11_server_ver = 1.13.2
-
-thisapp = xf86-input-mouse-%{version}
-
-source_dl = http://ftp.x.org/pub/individual/driver/
-
-build
- requires
- pkg-config
- xorg-x11-proto-devel
- xorg-x11-server-devel >= %{x11_server_ver}
- xorg-x11-util-macros
- end
-
- CFLAGS += -Wl,-z,lazy
-
- configure_options += \
- --disable-static
-end
-
-quality-agent
- permit_not_full_relro = yes
-end
-
-packages
- package %{name}
- requires
- xorg-x11-server >= %{x11_server_ver}
- end
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/xorg-x11-drv-nouveau/xorg-x11-drv-nouveau.nm b/xorg-x11-drv-nouveau/xorg-x11-drv-nouveau.nm
deleted file mode 100644
index 0a8c01a73..000000000
--- a/xorg-x11-drv-nouveau/xorg-x11-drv-nouveau.nm
+++ /dev/null
@@ -1,64 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = xorg-x11-drv-nouveau
-version = 1.0.6
-release = 1
-
-maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
-groups = X/Driver
-url = http://www.x.org/
-license = MIT
-summary = Xorg X11 nouveau video driver.
-
-description
- X.Org X11 nv video driver.
-end
-
-# Specify the X Server version to build for.
-x11_server_ver = 1.13.2
-
-thisapp = xf86-video-nouveau-%{version}
-
-source_dl = http://ftp.x.org/pub/individual/driver/
-
-build
- requires
- libX11-devel
- libdrm-devel
- libudev-devel
- mesa-devel >= 9.0.2
- pkg-config
- xorg-x11-proto-devel
- xorg-x11-server-devel >= %{x11_server_ver}
- xorg-x11-util-macros
- end
-
- CFLAGS += -Wl,-z,lazy
-
- configure_options += \
- --disable-static
-end
-
-quality-agent
- permit_not_full_relro = yes
-end
-
-packages
- package %{name}
- obsoletes
- xorg-x11-drv-nv
- end
-
- requires
- dri-drivers >= 9.0.2
- xorg-x11-server >= %{x11_server_ver}
- end
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/xorg-x11-drv-synaptics/50-synaptics.conf b/xorg-x11-drv-synaptics/50-synaptics.conf
deleted file mode 100644
index 54979f0f0..000000000
--- a/xorg-x11-drv-synaptics/50-synaptics.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-Section "InputClass"
- Identifier "touchpad catchall"
- Driver "synaptics"
- MatchIsTouchpad "on"
- MatchDevicePath "/dev/input/event*"
-EndSection
-
-
-# Quirks for special touchpads
-
-# Some devices have the buttons as part of the lower edge of the
-# touchpad. Pressing a button moves the cursor, causing cursor jumps and
-# erroneous clicks.
-# Use the synaptics area property to work around this, udev labels these
-# devices for us as touchpad_button_overlap.
-# Affected: Dell Mini
-Section "InputClass"
- Identifier "touchpad button overlap"
- MatchIsTouchpad "on"
- MatchTag "touchpad_button_overlap"
- Option "AreaBottomEdge" "4000"
-EndSection
diff --git a/xorg-x11-drv-synaptics/70-touchpad-quirks.rules b/xorg-x11-drv-synaptics/70-touchpad-quirks.rules
deleted file mode 100644
index 6c65c294e..000000000
--- a/xorg-x11-drv-synaptics/70-touchpad-quirks.rules
+++ /dev/null
@@ -1,15 +0,0 @@
-ACTION!="add|change", GOTO="touchpad_quirks_end"
-KERNEL!="event*", GOTO="touchpad_quirks_end"
-
-ENV{ID_INPUT_TOUCHPAD}!="1", GOTO="touchpad_quirks_end"
-
-# model specific quirks
-
-# Dell Minis have a touchpad where the buttons and the touchpad area
-# overlap. Clicking a button thus moves the pointer, this requires special
-# Xorg configuration.
-
-ATTR{[dmi/id]product_name}=="Inspiron 1011|Inspiron 1012", \
- ENV{ID_INPUT.tags}="touchpad_button_overlap"
-
-LABEL="touchpad_quirks_end"
diff --git a/xorg-x11-drv-synaptics/xorg-x11-drv-synaptics.nm b/xorg-x11-drv-synaptics/xorg-x11-drv-synaptics.nm
deleted file mode 100644
index 87d378fae..000000000
--- a/xorg-x11-drv-synaptics/xorg-x11-drv-synaptics.nm
+++ /dev/null
@@ -1,64 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = xorg-x11-drv-synaptics
-version = 1.3.0
-release = 1
-
-maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
-groups = X/Driver
-url = http://www.x.org/
-license = MIT
-summary = Xorg X11 synaptics input driver.
-
-description
- This is the Synaptics touchpad driver for the X.Org X server.
-end
-
-source_dl = http://ftp.x.org/pub/individual/driver/
-sources = xf86-input-synaptics-%{version}.tar.bz2
-
-build
- requires
- libX11-devel
- libXi-devel
- pkg-config
- xorg-x11-proto-devel
- xorg-x11-server-devel
- xorg-x11-util-macros
- end
-
- DIR_APP = %{DIR_SRC}/xf86-input-synaptics-%{version}
-
- configure_options += \
- --disable-static
-
- configure_cmds
- # Disable BIND_NOW for the X server module
- sed -e "s/^CFLAGS.*/& -Wl,-z,lazy/" -i src/Makefile
- end
-
- install_cmds
- install -Dm 0664 %{DIR_SOURCE}/50-synaptics.conf %{BUILDROOT}/etc/X11/xorg.conf.d/50-synaptics.conf
- install -Dm 0664 %{DIR_SOURCE}/70-touchpad-quirks.rules %{BUILDROOT}/lib/udev/rules.d/70-touchpad-quirks.rules
- end
-end
-
-quality-agent
- permit_not_full_relro = yes
-end
-
-packages
- package %{name}
- end
-
- package %{name}-devel
- template DEVEL
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/xorg-x11-drv-vesa/xorg-x11-drv-vesa.nm b/xorg-x11-drv-vesa/xorg-x11-drv-vesa.nm
deleted file mode 100644
index 4215f03ee..000000000
--- a/xorg-x11-drv-vesa/xorg-x11-drv-vesa.nm
+++ /dev/null
@@ -1,57 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = xorg-x11-drv-vesa
-version = 2.3.2
-release = 1
-
-maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
-groups = X/Driver
-url = http://www.x.org/
-license = MIT
-summary = Xorg X11 vesa video driver.
-
-description
- X.Org X11 vesa video driver.
-end
-
-# Specify the X Server version to build for.
-x11_server_ver = 1.13.2
-
-thisapp = xf86-video-vesa-%{version}
-
-source_dl = http://ftp.x.org/pub/individual/driver/
-
-build
- requires
- libX11-devel
- libpciaccess-devel >= 0.13.1
- pkg-config
- xorg-x11-proto-devel
- xorg-x11-server-devel >= %{x11_server_ver}
- xorg-x11-util-macros
- end
-
- CFLAGS += -Wl,-z,lazy
-
- configure_options += \
- --disable-static
-end
-
-quality-agent
- permit_not_full_relro = yes
-end
-
-packages
- package %{name}
- requires
- xorg-x11-server >= %{x11_server_ver}
- end
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/xorg-x11-drv-vmware/xorg-x11-drv-vmware.nm b/xorg-x11-drv-vmware/xorg-x11-drv-vmware.nm
deleted file mode 100644
index 795f7186c..000000000
--- a/xorg-x11-drv-vmware/xorg-x11-drv-vmware.nm
+++ /dev/null
@@ -1,58 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = xorg-x11-drv-vmware
-version = 13.0.0
-release = 1
-
-maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
-groups = X/Driver
-url = http://www.x.org/
-license = MIT
-summary = Xorg X11 vmware video driver.
-
-description
- X.Org X11 vmware video driver.
-end
-
-# Specify the X Server version to build for.
-x11_server_ver = 1.13.2
-
-thisapp = xf86-video-vmware-%{version}
-
-source_dl = http://ftp.x.org/pub/individual/driver/
-
-build
- requires
- libX11-devel
- libdrm-devel
- libpciaccess-devel
- pkg-config
- xorg-x11-proto-devel
- xorg-x11-server-devel >= %{x11_server_ver}
- xorg-x11-util-macros
- end
-
- CFLAGS += -Wl,-z,lazy
-
- configure_options += \
- --disable-static
-end
-
-quality-agent
- permit_not_full_relro = yes
-end
-
-packages
- package %{name}
- requires
- xorg-x11-server >= %{x11_server_ver}
- end
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/xorg-x11-font-utils/xorg-x11-font-utils.nm b/xorg-x11-font-utils/xorg-x11-font-utils.nm
deleted file mode 100644
index 651453102..000000000
--- a/xorg-x11-font-utils/xorg-x11-font-utils.nm
+++ /dev/null
@@ -1,91 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = xorg-x11-font-utils
-version = 7.4
-release = 3
-
-maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
-groups = X/Fonts
-url = http://www.x.org/
-license = MIT
-summary = X.Org X11 font utilities.
-
-description
- X.Org X11 font utilities required for font installation, conversion,
- and generation.
-end
-
-source_dl = http://ftp.x.org/pub/individual/app/
-
-sources =\
- bdftopcf-1.0.1.tar.bz2 \
- fonttosfnt-1.0.3.tar.bz2 \
- mkfontdir-1.0.5.tar.bz2 \
- mkfontscale-1.0.7.tar.bz2 \
- font-util-1.1.0.tar.bz2
-
-build
- requires
- autoconf
- freetype-devel
- libX11-devel
- libXfont-devel
- libfontenc-devel
- pkg-config
- xorg-x11-proto-devel
- zlib-devel
- end
-
- configure_options += \
- --with-mapdir=/usr/share/X11/fonts/util
-
- build
- for object in %{sources}; do
- dir=%{DIR_SRC}/${object%*.tar.bz2}
-
- if [ -d "${dir}" ]; then
- cd ${dir}
- autoconf
- ./configure %{configure_options}
-
- make %{PARALLELISMFLAGS}
- fi
- done
- end
-
- install
- for object in %{sources}; do
- dir=%{DIR_SRC}/${object%*.tar.bz2}
-
- if [ -d "${dir}" ]; then
- cd ${dir}
-
- make install DESTDIR=%{BUILDROOT}
- fi
- done
-
- # Install xorg-x11-fonts-update-dirs
- install -m 0744 %{DIR_SOURCE}/xorg-x11-fonts-update-dirs %{BUILDROOT}/usr/bin/
- sed -i "s:@DATADIR@:/usr/share:" %{BUILDROOT}/usr/bin/xorg-x11-fonts-update-dirs
- end
-end
-
-packages
- package %{name}
- end
-
- package %{name}-devel
- template DEVEL
-
- requires
- freetype-devel
- end
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/xorg-x11-font-utils/xorg-x11-fonts-update-dirs b/xorg-x11-font-utils/xorg-x11-fonts-update-dirs
deleted file mode 100644
index 536bfe82b..000000000
--- a/xorg-x11-font-utils/xorg-x11-fonts-update-dirs
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-# This script is used by the xorg-x11-fonts package in the %post stage for
-# some fonts to generate the right encodings.
-
-fontdir=""
-encodingsdir="@DATADIR@/X11/fonts/encodings"
-
-# some fonts need to skip mkfontscale, set to "yes" to skip
-skip_fontscale=""
-# some fonts need to run ttmkfdir, set to "yes" to run
-need_ttmkfdir=""
-
-if [ $# -lt 1 ]; then
- echo "Need at least one parameter for font dir."
- exit 1
-fi
-
-while [ $# != 0 ]; do
- case $1 in
- --skip-fontscale)
- skip_fontscale="yes"
- ;;
- --need-ttmkfdir)
- need_ttmkfdir="yes"
- ;;
- --encodingsdir)
- shift
- encodingsdir="$1"
- ;;
- *)
- fontdir="$1"
-
- if [ $# != 1 ]; then
- echo "Too many parameters."
- exit 1
- fi
- ;;
- esac
- shift
-done
-
-if [ "$skip_fontscale" != "yes" ]; then
- mkfontscale $fontdir
-fi
-if [ "$need_ttmkfdir" = "yes" ]; then
- ttmkfdir $fontdir
-fi
-
-mkfontdir $fontdir
-fc-cache $fontdir
-
-if ! [ -z "$encodingsdir" ]; then
- [ -d "$encodingsdir" ] || mkdir -p "$encodingsdir"
- oldpwd=$(pwd)
- cd "$encodingsdir"
- mkfontscale -n -e "$encodingsdir" -e "$encodingsdir/large"
- cd ${oldpwd}
-fi
-
-
diff --git a/xorg-x11-fonts/xorg-x11-fonts.nm b/xorg-x11-fonts/xorg-x11-fonts.nm
deleted file mode 100644
index c19caf737..000000000
--- a/xorg-x11-fonts/xorg-x11-fonts.nm
+++ /dev/null
@@ -1,405 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = xorg-x11-fonts
-version = 7.2
-release = 5
-arch = noarch
-
-maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
-groups = X/Fonts
-url = http://www.x.org/
-license = MIT
-summary = X.Org X11 fonts.
-
-description
- This package contains misc bitmap Chinese, Japanese, Korean, Indic, and
- Arabic fonts for use with X Window System.
-end
-
-source_dl = http://ftp.x.org/pub/individual/font/
-source_dl += http://unifoundry.com/
-
-sources = \
- encodings-1.0.3.tar.bz2 \
- font-alias-1.0.2.tar.bz2 \
- font-adobe-100dpi-1.0.1.tar.bz2 \
- font-adobe-75dpi-1.0.1.tar.bz2 \
- font-adobe-utopia-100dpi-1.0.2.tar.bz2 \
- font-adobe-utopia-75dpi-1.0.2.tar.bz2 \
- font-adobe-utopia-type1-1.0.2.tar.bz2 \
- font-arabic-misc-1.0.1.tar.bz2 \
- font-bh-100dpi-1.0.1.tar.bz2 \
- font-bh-75dpi-1.0.1.tar.bz2 \
- font-bh-lucidatypewriter-100dpi-1.0.1.tar.bz2 \
- font-bh-lucidatypewriter-75dpi-1.0.1.tar.bz2 \
- font-bitstream-100dpi-1.0.1.tar.bz2 \
- font-bitstream-75dpi-1.0.1.tar.bz2 \
- font-bitstream-type1-1.0.1.tar.bz2 \
- font-cronyx-cyrillic-1.0.1.tar.bz2 \
- font-cursor-misc-1.0.1.tar.bz2 \
- font-daewoo-misc-1.0.1.tar.bz2 \
- font-dec-misc-1.0.1.tar.bz2 \
- font-isas-misc-1.0.1.tar.bz2 \
- font-jis-misc-1.0.1.tar.bz2 \
- font-micro-misc-1.0.1.tar.bz2 \
- font-misc-cyrillic-1.0.1.tar.bz2 \
- font-misc-misc-1.1.0.tar.bz2 \
- font-mutt-misc-1.0.1.tar.bz2 \
- font-schumacher-misc-1.1.0.tar.bz2 \
- font-screen-cyrillic-1.0.2.tar.bz2 \
- font-sony-misc-1.0.1.tar.bz2 \
- font-sun-misc-1.0.1.tar.bz2 \
- font-winitzki-cyrillic-1.0.1.tar.bz2 \
- font-xfree86-type1-1.0.2.tar.bz2 \
- unifont-5.1.20080820.pcf.gz
-
-build
- requires
- /usr/bin/mkfontscale
- perl
- pkg-config
- xorg-x11-font-utils-devel
- end
-
- configure_options += \
- --with-fontrootdir=/usr/share/X11/fonts \
- --disable-iso8859-3 \
- --disable-iso8859-4 \
- --disable-iso8859-6 \
- --disable-iso8859-10 \
- --disable-iso8859-11 \
- --disable-iso8859-12 \
- --disable-iso8859-13 \
- --disable-iso8859-16
-
- prepare
- # Extract all source tarballs.
- for object in %{sources}; do
- # Only extract tar.bz2 files
- object=${object//*pcf.gz/}
- if [ -n "${object}" ]; then
- %{MACRO_EXTRACT} %{DIR_DL}/${object}
- fi
- done
-
- %{MACRO_FIX_AUTOTOOLS}
- end
-
- build
- for object in %{sources}; do
- dir=%{DIR_SRC}/${object%*.tar.bz2}
-
- if [ -d "${dir}" ]; then
- cd ${dir}
- ./configure %{configure_options}
-
- make %{PARALLELISMFLAGS}
- fi
- done
- end
-
- install
- for object in %{sources}; do
- dir=%{DIR_SRC}/${object%*.tar.bz2}
-
- if [ -d "${dir}" ]; then
- cd ${dir}
-
- make install DESTDIR=%{BUILDROOT}
- fi
- done
-
- # Install unifont
- mkdir -pv %{BUILDROOT}/usr/share/X11/fonts/misc
- cp -vf %{DIR_DL}/unifont-5.1.20080820.pcf.gz \
- %{BUILDROOT}/usr/share/X11/fonts/misc/unifont.pcf.gz
-
- # XXX Do we need to create these symlinks to use the fonts - check this in a running X environment.
- # Install catalogue symlinks
- #mkdir -pv %{BUILDROOT}/etc/X11/fontpath.d
- #ln -svf ../../../usr/share/X11/fonts/100dpi %{BUILDROOT}/etc/X11/fontpath.d/xorg-x11-fonts-100dpi
- #ln -svf ../../../usr/share/X11/fonts/75dpi %{BUILDROOT}/etc/X11/fontpath.d/xorg-x11-fonts-75dpi
- #ln -svf ../../../usr/share/X11/fonts/cyrillic %{BUILDROOT}/etc/X11/fontpath.d/xorg-x11-fonts-cyrillic
- #ln -svf ../../../usr/share/X11/fonts/misc %{BUILDROOT}/etc/X11/fontpath.d/xorg-x11-fonts-misc
- #ln -svf ../../../usr/share/X11/fonts/Type1 %{BUILDROOT}/etc/X11/fontpath.d/xorg-x11-fonts-Type1
- end
-end
-
-packages
- # Template for 75 DPI fonts
- template 75DPI
- requires
- fontconfig
- end
-
- #files
- # /etc/X11/fontpath.d/xorg-x11-fonts-75dpi
- #end
-
- prerequires = xorg-x11-font-utils
-
- script postin
- /usr/bin/mkfontdir /usr/share/X11/fonts/75dpi
- end
-
- script postun
- /usr/bin/mkfontdir /usr/share/X11/fonts/75dpi
- end
- end
-
- # Template for 100 DPI fonts
- template 100DPI
- requires
- fontconfig
- end
-
- #files
- # /etc/X11/fontpath.d/xorg-x11-fonts-100
- #end
-
- prerequires = xorg-x11-font-utils
-
- script postin
- /usr/bin/mkfontdir /usr/share/X11/fonts/100dpi
- end
-
- script postun
- /usr/bin/mkfontdir /usr/share/X11/fonts/100dpi
- end
- end
-
- package %{name}
- summary = Bitmap fonts for the X Window System.
- description
- This package contains misc bitmap Chinese, Japanese, Korean, Indic, and Arabic
- fonts for use with X Window System.
- end
-
- requires
- fontconfig
- end
-
- prerequires = xorg-x11-font-utils
-
- script postin
- /usr/bin/xorg-x11-fonts-update-dirs --skip-fontscale /usr/share/X11/fonts/misc
- end
-
- script postun
- /usr/bin/xorg-x11-fonts-update-dirs --skip-fontscale /usr/share/X11/fonts/misc
- end
- end
-
- package %{name}-Type1
- summary = Type1 fonts provided by the X Window System.
- description
- A collection of Type1 fonts which are part of the core X Window System
- distribution.
- end
-
- requires
- fontconfig
- end
-
- files
- /usr/share/X11/fonts/Type1/
- end
-
- prerequires = xorg-x11-font-utils
-
- script postin
- /usr/bin/xorg-x11-fonts-update-dirs --skip-fontscale /usr/share/X11/fonts/Type1
- end
-
- script postun
- /usr/bin/xorg-x11-fonts-update-dirs --skip-fontscale /usr/share/X11/fonts/Type1
- end
- end
-
- package %{name}-75dpi
- template 75DPI
-
- summary = A set of 75dpi resolution fonts for the X Window System.
- description
- A set of 75 dpi fonts used by the X window system.
- end
-
- files +=\
- /usr/share/X11/fonts/75dpi/
- end
-
- package %{name}-100dpi
- template 100DPI
-
- summary = A set of 100dpi resolution fonts for the X Window System.
- description
- A set of 100 dpi fonts used by the X window system.
- end
-
- files +=\
- /usr/share/X11/fonts/100dpi/
- end
-
- package %{name}-ISO8859-1-75dpi
- template 75DPI
-
- summary = A set of 75dpi ISO-8859-1 fonts for X.
- description
- Contains a set of 75dpi fonts for ISO-8859-1.
- end
-
- files +=\
- /usr/share/X11/fonts/75dpi/*ISO8859-1.*
- end
-
- package %{name}-ISO8859-1-100dpi
- template 100DPI
-
- summary = A set of 100dpi ISO-8859-1 fonts for X.
- description
- Contains a set of 100dpi fonts for ISO-8859-1.
- end
-
- files +=\
- /usr/share/X11/fonts/100dpi/*ISO8859-1.*
- end
-
- package %{name}-ISO8859-2-75dpi
- template 75DPI
-
- summary = A set of 75dpi Central European language fonts for X.
- description
- Contains a set of 75dpi fonts for Central European languages.
- end
-
- files +=\
- /usr/share/X11/fonts/75dpi/*ISO8859-2.*
- end
-
- package %{name}-ISO8859-2-100dpi
- template 100DPI
-
- summary = A set of 100dpi Central European language fonts for X.
- description
- Contains a set of 100dpi fonts for Central European languages.
- end
-
- files +=\
- /usr/share/X11/fonts/100dpi/*ISO8859-2.*
- end
-
- package %{name}-ISO8859-9-75dpi
- template 75DPI
-
- summary = ISO8859-9-75dpi fonts.
- description
- Contains a set of 75dpi fonts for the Turkish language.
- end
-
- files +=\
- /usr/share/X11/fonts/75dpi/*ISO8859-9.*
- end
-
- package %{name}-ISO8859-9-100dpi
- template 100DPI
-
- summary = ISO8859-9-100dpi fonts.
- description
- Contains a set of 100dpi fonts for the Turkish language.
- end
-
- files +=\
- /usr/share/X11/fonts/100dpi/*ISO8859-9.*
- end
-
- package %{name}-ISO8859-14-75dpi
- template 75DPI
-
- summary = ISO8859-14-75dpi fonts.
- description
- Contains a set of 75dpi fonts in the ISO8859-14 encoding which
- provide Welsh support.
- end
-
- files +=\
- /usr/share/X11/fonts/75dpi/*ISO8859-14.*
- end
-
- package %{name}-ISO8859-14-100dpi
- template 100DPI
-
- summary = ISO8859-14-100dpi fonts.
- description
- Contains a set of 100dpi fonts in the ISO8859-14 encoding which
- provide Welsh support.
- end
-
- files +=\
- /usr/share/X11/fonts/100dpi/*ISO8859-14.*
- end
-
- package %{name}-ISO8859-15-75dpi
- template 75DPI
-
- summary = ISO8859-15-75dpi fonts.
- description
- Contains a set of 75dpi fonts in the ISO8859-15 encoding which
- provide Euro support.
- end
-
- files +=\
- /usr/share/X11/fonts/75dpi/*ISO8859-15.*
- end
-
- package %{name}-ISO8859-15-100dpi
- template 100DPI
-
- summary = ISO8859-15-100dpi fonts.
- description
- Contains a set of 100dpi fonts in the ISO8859-15 encoding which
- provide Euro support.
- end
-
- files +=\
- /usr/share/X11/fonts/100dpi/*ISO8859-15.*
- end
-
- package %{name}-cyrillic
- summary = Cyrillic fonts for X.
- description
- Contains a set of Cyrillic fonts.
- end
-
- requires
- fontconfig
- end
-
- files
- /usr/share/X11/fonts/cyrillic/
- end
-
- prerequires = xorg-x11-font-utils
-
- script postin
- /usr/bin/mkfontdir /usr/share/X11/fonts/cyrillic
- end
-
- script postun
- /usr/bin/mkfontdir /usr/share/X11/fonts/cyrillic
- end
- end
-
- package %{name}-unifont
- summary = The GNU unifont.
- description
- GNU Unifont, contains glyphs for every printable code point in the Unicode 5.1 Basic Multilingual Plane (BMP).
- end
-
- files
- /usr/share/X11/fonts/misc/unifont.pcf.gz
- end
- end
-end
diff --git a/xorg-x11-proto-devel/xorg-x11-proto-devel.nm b/xorg-x11-proto-devel/xorg-x11-proto-devel.nm
deleted file mode 100644
index 8f74bbd09..000000000
--- a/xorg-x11-proto-devel/xorg-x11-proto-devel.nm
+++ /dev/null
@@ -1,91 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = xorg-x11-proto-devel
-version = 7.7
-release = 2
-arch = noarch
-
-maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
-groups = Development/System
-url = http://www.x.org/
-license = MIT
-summary = X11 potocol headers.
-
-description
- Development headers for X.org X11 protocol.
-end
-
-source_dl = http://ftp.x.org/pub/individual/proto/
-sources = \
- bigreqsproto-1.1.2.tar.bz2 \
- compositeproto-0.4.2.tar.bz2 \
- damageproto-1.2.1.tar.bz2 \
- dmxproto-2.3.1.tar.bz2 \
- dri2proto-2.8.tar.bz2 \
- evieext-1.1.1.tar.bz2 \
- fixesproto-5.0.tar.bz2 \
- fontsproto-2.1.2.tar.bz2 \
- glproto-1.4.16.tar.bz2 \
- inputproto-2.2.99.1.tar.bz2 \
- kbproto-1.0.6.tar.bz2 \
- randrproto-1.4.0.tar.bz2 \
- recordproto-1.14.2.tar.bz2 \
- renderproto-0.11.1.tar.bz2 \
- resourceproto-1.2.0.tar.bz2 \
- scrnsaverproto-1.2.2.tar.bz2 \
- videoproto-2.3.1.tar.bz2 \
- xcmiscproto-1.2.2.tar.bz2 \
- xextproto-7.2.1.tar.bz2 \
- xf86bigfontproto-1.2.0.tar.bz2 \
- xf86dgaproto-2.1.tar.bz2 \
- xf86driproto-2.1.1.tar.bz2 \
- xf86miscproto-0.9.3.tar.bz2 \
- xf86vidmodeproto-2.3.1.tar.bz2 \
- xineramaproto-1.2.1.tar.bz2 \
- xproto-7.0.23.tar.bz2 \
- xproxymanagementprotocol-1.0.3.tar.bz2
-
-build
- requires
- pkg-config
- xorg-x11-util-macros
- end
-
- prepare
- # Extract all source tarballs.
- for object in %{sources}; do
- %{MACRO_EXTRACT} %{DIR_DL}/${object}
- done
-
- %{MACRO_FIX_AUTOTOOLS}
- end
-
- # Place the .pc files in /usr/share so they
- # can be found on all architectures where libdir != /usr/lib.
- configure_options += \
- --libdir=%{datadir}
-
- build
- for object in %{sources}; do
- cd %{DIR_SRC}/${object%*.tar.bz2}
- [ -e configure ] || ./autogen.sh
- ./configure %{configure_options}
-
- make %{PARALLELISMFLAGS}
- done
- end
-
- install
- for object in %{sources}; do
- cd %{DIR_SRC}/${object%*.tar.bz2}
- make install DESTDIR=%{BUILDROOT}
- done
- end
-end
-
-packages
- package %{name}
-end
diff --git a/xorg-x11-server/10-quirks.conf b/xorg-x11-server/10-quirks.conf
deleted file mode 100644
index 82d3ec26c..000000000
--- a/xorg-x11-server/10-quirks.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-# Collection of quirks and blacklist/whitelists for specific devices.
-
-
-# Accelerometer device, posts data through ABS_X/ABS_Y, making X unusable
-# http://bugs.freedesktop.org/show_bug.cgi?id=22442
-Section "InputClass"
- Identifier "ThinkPad HDAPS accelerometer blacklist"
- MatchProduct "ThinkPad HDAPS accelerometer data"
- Option "Ignore" "on"
-EndSection
-
-# https://bugzilla.redhat.com/show_bug.cgi?id=523914
-# Mouse does not move in PV Xen guest
-# Explicitly tell evdev to not ignore the absolute axes.
-Section "InputClass"
- Identifier "Xen Virtual Pointer axis blacklist"
- MatchProduct "Xen Virtual Pointer"
- Option "IgnoreAbsoluteAxes" "off"
- Option "IgnoreRelativeAxes" "off"
-EndSection
diff --git a/xorg-x11-server/patches/xserver-1.12-Xext-fix-selinux-build-failure.patch b/xorg-x11-server/patches/xserver-1.12-Xext-fix-selinux-build-failure.patch
deleted file mode 100644
index a48a013c4..000000000
--- a/xorg-x11-server/patches/xserver-1.12-Xext-fix-selinux-build-failure.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 5d16c39108c72b08478b6bd548494d6c675495ee Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer(a)who-t.net>
-Date: Wed, 4 Jan 2012 09:31:51 +1000
-Subject: [PATCH 6/7] Xext: fix selinux build failure
-
-The server builds with -Werror=missing-braces, causing
-
-xselinux_hooks.c: In function 'SELinuxFlaskInit':
-xselinux_hooks.c:851:12: error: missing braces around initializer
-[-Werror=missing-braces]
-xselinux_hooks.c:851:12: error: (near initialization for
-'avc_option.<anonymous>') [-Werror=missing-braces]
-cc1: some warnings being treated as errors
-
-Source is libselinux' libselinux-rhat.patch which changes struct selinux_opt
-from { int, char * } to { int, union { char*, char** }}.
-
-Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net>
----
- Xext/xselinux_hooks.c | 2 +-
- Xext/xselinux_label.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Xext/xselinux_hooks.c b/Xext/xselinux_hooks.c
-index e9c7e93..0302f2f 100644
---- a/Xext/xselinux_hooks.c
-+++ b/Xext/xselinux_hooks.c
-@@ -851,7 +851,7 @@ SELinuxFlaskReset(void)
- void
- SELinuxFlaskInit(void)
- {
-- struct selinux_opt avc_option = { AVC_OPT_SETENFORCE, (char *) 0 };
-+ struct selinux_opt avc_option = { AVC_OPT_SETENFORCE, { (char *) 0 } };
- security_context_t ctx;
- int ret = TRUE;
-
-diff --git a/Xext/xselinux_label.c b/Xext/xselinux_label.c
-index 2c33d1c..81f2f36 100644
---- a/Xext/xselinux_label.c
-+++ b/Xext/xselinux_label.c
-@@ -361,7 +361,7 @@ SELinuxDefaultClientLabel(void)
- void
- SELinuxLabelInit(void)
- {
-- struct selinux_opt selabel_option = { SELABEL_OPT_VALIDATE, (char *) 1 };
-+ struct selinux_opt selabel_option = { SELABEL_OPT_VALIDATE, { (char *)1 } };
-
- label_hnd = selabel_open(SELABEL_CTX_X, &selabel_option, 1);
- if (!label_hnd)
---
-1.7.10.1
-
diff --git a/xorg-x11-server/patches/xserver-1.4.99-ssh-isnt-local.patch b/xorg-x11-server/patches/xserver-1.4.99-ssh-isnt-local.patch
deleted file mode 100644
index 2d33bed94..000000000
--- a/xorg-x11-server/patches/xserver-1.4.99-ssh-isnt-local.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 66a3b14e118e90db80f96fcab52af4df35bc2377 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax(a)redhat.com>
-Date: Mon, 10 Dec 2007 11:26:57 -0500
-Subject: [PATCH] Hack for proper MIT-SHM rejection for ssh-forwarded clients.
-
----
- Xext/shm.c | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
-
-diff --git a/Xext/shm.c b/Xext/shm.c
-index de48020..c011210 100644
---- a/Xext/shm.c
-+++ b/Xext/shm.c
-@@ -321,8 +321,21 @@ shm_access(ClientPtr client, SHMPERM_TYPE * perm, int readonly)
- mode_t mask;
- int uidset = 0, gidset = 0;
- LocalClientCredRec *lcc;
-+ Bool is_ssh = FALSE;
-
- if (GetLocalClientCreds(client, &lcc) != -1) {
-+#ifdef linux
-+ if (lcc->fieldsSet & LCC_PID_SET) {
-+ /* ssh isn't actually a local client */
-+ char exe[64], buf[64];
-+
-+ memset(buf, 0, 64);
-+ snprintf(exe, 64, "/proc/%d/exe", lcc->pid);
-+ readlink(exe, buf, 63);
-+ if (strstr(buf, "/ssh"))
-+ is_ssh = TRUE;
-+ }
-+#endif
-
- if (lcc->fieldsSet & LCC_UID_SET) {
- uid = lcc->euid;
-@@ -342,6 +355,9 @@ shm_access(ClientPtr client, SHMPERM_TYPE * perm, int readonly)
- #endif
- FreeLocalClientCreds(lcc);
-
-+ if (is_ssh)
-+ return -1;
-+
- if (uidset) {
- /* User id 0 always gets access */
- if (uid == 0) {
---
-1.7.10.1
-
diff --git a/xorg-x11-server/patches/xserver-1.6.0-less-acpi-brokenness.patch b/xorg-x11-server/patches/xserver-1.6.0-less-acpi-brokenness.patch
deleted file mode 100644
index b42c2d7c8..000000000
--- a/xorg-x11-server/patches/xserver-1.6.0-less-acpi-brokenness.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0002cde5312e785529b2901d7f8a82d5623e4ca7 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax(a)redhat.com>
-Date: Wed, 9 Nov 2011 11:52:06 +1000
-Subject: [PATCH 2/7] Don't build the ACPI code.
-
-No good can come of this.
----
- configure.ac | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index a12783c..54f4464 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1620,7 +1620,6 @@ if test "x$XORG" = xyes; then
- linux_alpha=yes
- ;;
- i*86|amd64*|x86_64*|ia64*)
-- linux_acpi="yes"
- ;;
- *)
- ;;
---
-1.7.10.1
-
diff --git a/xorg-x11-server/patches/xserver-1.6.99-right-of.patch b/xorg-x11-server/patches/xserver-1.6.99-right-of.patch
deleted file mode 100644
index bf7e7c87f..000000000
--- a/xorg-x11-server/patches/xserver-1.6.99-right-of.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-From 291bc9f827188461ff9717efccec1e350db537e8 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax(a)redhat.com>
-Date: Tue, 28 Jul 2009 11:07:13 -0400
-Subject: [PATCH 3/7] RANDR: right-of placement by default
-
-[Enhanced to add a new prefer clone option for drivers. This
-allows for servers like RN50 where two heads are disjoint. - airlied]
----
- hw/xfree86/common/xf86str.h | 8 ++++-
- hw/xfree86/modes/xf86Crtc.c | 76 ++++++++++++++++++++++++++++++++++++++-----
- 2 files changed, 75 insertions(+), 9 deletions(-)
-
-diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h
-index 0590262..d246634 100644
---- a/hw/xfree86/common/xf86str.h
-+++ b/hw/xfree86/common/xf86str.h
-@@ -508,10 +508,13 @@ typedef struct _confdrirec {
- } confDRIRec, *confDRIPtr;
-
- /* These values should be adjusted when new fields are added to ScrnInfoRec */
--#define NUM_RESERVED_INTS 16
-+#define NUM_RESERVED_INTS 15
- #define NUM_RESERVED_POINTERS 14
- #define NUM_RESERVED_FUNCS 10
-
-+/* let clients know they can use this */
-+#define XF86_SCRN_HAS_PREFER_CLONE 1
-+
- typedef pointer (*funcPointer) (void);
-
- /* flags for depth 24 pixmap options */
-@@ -769,6 +772,9 @@ typedef struct _ScrnInfoRec {
- ClockRangePtr clockRanges;
- int adjustFlags;
-
-+ /* initial rightof support disable */
-+ int preferClone;
-+
- /*
- * These can be used when the minor ABI version is incremented.
- * The NUM_* parameters must be reduced appropriately to keep the
-diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
-index 154f684..c58088d 100644
---- a/hw/xfree86/modes/xf86Crtc.c
-+++ b/hw/xfree86/modes/xf86Crtc.c
-@@ -1130,6 +1130,15 @@ xf86InitialOutputPositions(ScrnInfoPtr scrn, DisplayModePtr * modes)
- int o;
- int min_x, min_y;
-
-+ /* check for initial right-of heuristic */
-+ for (o = 0; o < config->num_output; o++)
-+ {
-+ xf86OutputPtr output = config->output[o];
-+
-+ if (output->initial_x || output->initial_y)
-+ return TRUE;
-+ }
-+
- for (o = 0; o < config->num_output; o++) {
- xf86OutputPtr output = config->output[o];
-
-@@ -1998,6 +2007,57 @@ bestModeForAspect(xf86CrtcConfigPtr config, Bool *enabled, float aspect)
- return match;
- }
-
-+static int
-+numEnabledOutputs(xf86CrtcConfigPtr config, Bool *enabled)
-+{
-+ int i = 0, p;
-+
-+ for (i = 0, p = -1; nextEnabledOutput(config, enabled, &p); i++) ;
-+
-+ return i;
-+}
-+
-+static Bool
-+xf86TargetRightOf(ScrnInfoPtr scrn, xf86CrtcConfigPtr config,
-+ DisplayModePtr *modes, Bool *enabled,
-+ int width, int height)
-+{
-+ int o;
-+ int w = 0;
-+
-+ if (scrn->preferClone)
-+ return FALSE;
-+
-+ if (numEnabledOutputs(config, enabled) < 2)
-+ return FALSE;
-+
-+ for (o = -1; nextEnabledOutput(config, enabled, &o); ) {
-+ DisplayModePtr mode =
-+ xf86OutputHasPreferredMode(config->output[o], width, height);
-+
-+ if (!mode)
-+ return FALSE;
-+
-+ w += mode->HDisplay;
-+ }
-+
-+ if (w > width)
-+ return FALSE;
-+
-+ w = 0;
-+ for (o = -1; nextEnabledOutput(config, enabled, &o); ) {
-+ DisplayModePtr mode =
-+ xf86OutputHasPreferredMode(config->output[o], width, height);
-+
-+ config->output[o]->initial_x = w;
-+ w += mode->HDisplay;
-+
-+ modes[o] = mode;
-+ }
-+
-+ return TRUE;
-+}
-+
- static Bool
- xf86TargetPreferred(ScrnInfoPtr scrn, xf86CrtcConfigPtr config,
- DisplayModePtr * modes, Bool *enabled,
-@@ -2074,14 +2134,10 @@ xf86TargetPreferred(ScrnInfoPtr scrn, xf86CrtcConfigPtr config,
- */
- if (!ret)
- do {
-- int i = 0;
- float aspect = 0.0;
- DisplayModePtr a = NULL, b = NULL;
-
-- /* count the number of enabled outputs */
-- for (i = 0, p = -1; nextEnabledOutput(config, enabled, &p); i++);
--
-- if (i != 1)
-+ if (numEnabledOutputs(config, enabled) != 1)
- break;
-
- p = -1;
-@@ -2385,6 +2441,8 @@ xf86InitialConfiguration(ScrnInfoPtr scrn, Bool canGrow)
- else {
- if (xf86TargetUserpref(scrn, config, modes, enabled, width, height))
- xf86DrvMsg(i, X_INFO, "Using user preference for initial modes\n");
-+ else if (xf86TargetRightOf(scrn, config, modes, enabled, width, height))
-+ xf86DrvMsg(i, X_INFO, "Using spanning desktop for initial modes\n");
- else if (xf86TargetPreferred
- (scrn, config, modes, enabled, width, height))
- xf86DrvMsg(i, X_INFO, "Using exact sizes for initial modes\n");
-@@ -2404,9 +2462,11 @@ xf86InitialConfiguration(ScrnInfoPtr scrn, Bool canGrow)
- "Output %s enabled but has no modes\n",
- config->output[o]->name);
- else
-- xf86DrvMsg(scrn->scrnIndex, X_INFO,
-- "Output %s using initial mode %s\n",
-- config->output[o]->name, modes[o]->name);
-+ xf86DrvMsg (scrn->scrnIndex, X_INFO,
-+ "Output %s using initial mode %s +%d+%d\n",
-+ config->output[o]->name, modes[o]->name,
-+ config->output[o]->initial_x,
-+ config->output[o]->initial_y);
- }
-
- /*
---
-1.7.10.4
-
diff --git a/xorg-x11-server/patches/xserver-autobind-hotplug.patch b/xorg-x11-server/patches/xserver-autobind-hotplug.patch
deleted file mode 100644
index 7d05f27ae..000000000
--- a/xorg-x11-server/patches/xserver-autobind-hotplug.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-From 536626891b60039c0f3f9b4cd96156e9fe810f39 Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied(a)redhat.com>
-Date: Fri, 17 Aug 2012 09:49:24 +1000
-Subject: [PATCH] autobind GPUs to the screen, (v2)
-
-this is racy and really not what we want for hotplug going forward,
-but until DE support is in GNOME its probably for the best.
-
-v2: fix if config or slave config is NULL
-DO NOT UPSTREAM.
----
- hw/xfree86/common/xf86Init.c | 12 ++++++++++++
- hw/xfree86/common/xf86platformBus.c | 3 +++
- hw/xfree86/modes/xf86Crtc.c | 28 ++++++++++++++++++++++++++++
- 3 files changed, 43 insertions(+)
-
-diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
-index d231ced..89629c1 100644
---- a/hw/xfree86/common/xf86Init.c
-+++ b/hw/xfree86/common/xf86Init.c
-@@ -361,6 +361,16 @@ xf86CreateRootWindow(WindowPtr pWin)
- return ret;
- }
-
-+extern void xf86AutoConfigOutputDevice(ScrnInfoPtr pScrn, ScrnInfoPtr master);
-+static void
-+xf86AutoConfigOutputDevices(void)
-+{
-+ int i;
-+
-+ for (i = 0; i < xf86NumGPUScreens; i++)
-+ xf86AutoConfigOutputDevice(xf86GPUScreens[i], xf86Screens[0]);
-+}
-+
- static void
- InstallSignalHandlers(void)
- {
-@@ -926,6 +936,8 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
- for (i = 0; i < xf86NumGPUScreens; i++)
- AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen);
-
-+ xf86AutoConfigOutputDevices();
-+
- xf86VGAarbiterWrapFunctions();
- if (sigio_blocked)
- OsReleaseSIGIO();
-diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
-index a73aea2..3810076 100644
---- a/hw/xfree86/common/xf86platformBus.c
-+++ b/hw/xfree86/common/xf86platformBus.c
-@@ -387,6 +387,8 @@ xf86platformProbeDev(DriverPtr drvp)
- return foundScreen;
- }
-
-+extern void xf86AutoConfigOutputDevice(ScrnInfoPtr pScrn, ScrnInfoPtr master);
-+
- int
- xf86platformAddDevice(int index)
- {
-@@ -446,6 +448,7 @@ xf86platformAddDevice(int index)
-
- /* attach unbound to 0 protocol screen */
- AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen);
-+ xf86AutoConfigOutputDevice(xf86GPUScreens[i], xf86Screens[0]);
-
- return 0;
- }
-diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
-index 8f05c53..ba84e6b 100644
---- a/hw/xfree86/modes/xf86Crtc.c
-+++ b/hw/xfree86/modes/xf86Crtc.c
-@@ -3321,3 +3321,31 @@ xf86DetachAllCrtc(ScrnInfoPtr scrn)
- crtc->x = crtc->y = 0;
- }
- }
-+
-+
-+void xf86AutoConfigOutputDevice(ScrnInfoPtr pScrn, ScrnInfoPtr master)
-+{
-+ RRProviderPtr master_provider;
-+ xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(master);
-+ xf86CrtcConfigPtr slave_config = XF86_CRTC_CONFIG_PTR(pScrn);
-+
-+ if (!config || !slave_config)
-+ return;
-+
-+ master_provider = config->randr_provider;
-+
-+ if ((master->capabilities & RR_Capability_SinkOffload) &&
-+ pScrn->capabilities & RR_Capability_SourceOffload) {
-+ /* source offload */
-+
-+ DetachUnboundGPU(pScrn->pScreen);
-+ AttachOffloadGPU(master->pScreen, pScrn->pScreen);
-+ slave_config->randr_provider->offload_sink = master_provider;
-+ } else if ((master->capabilities & RR_Capability_SourceOutput) &&
-+ pScrn->capabilities & RR_Capability_SinkOutput) {
-+ /* sink offload */
-+ DetachUnboundGPU(pScrn->pScreen);
-+ AttachOutputGPU(master->pScreen, pScrn->pScreen);
-+ slave_config->randr_provider->output_source = master_provider;
-+ }
-+}
---
-1.7.10.2
-
diff --git a/xorg-x11-server/xorg-x11-server.nm b/xorg-x11-server/xorg-x11-server.nm
deleted file mode 100644
index f2d933c4e..000000000
--- a/xorg-x11-server/xorg-x11-server.nm
+++ /dev/null
@@ -1,164 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = xorg-x11-server
-version = 1.13.2
-release = 1
-
-maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
-groups = X/Server
-url = http://www.x.org
-license = MIT
-summary = X.Org X11 X server.
-
-description
- X.org X11 is an open source implementation of the X Window System.
- It provides the basic low level functionality which full fledged
- graphical user interfaces (GUIs) such as GNOME and KDE are designed
- upon.
-end
-
-thisapp = xorg-server-%{version}
-
-source_dl = http://ftp.x.org/pub/individual/xserver/
-
-build
- requires
- audit-devel
- autoconf
- automake
- libcap
- libX11-devel
- libXau-devel
- libXdmcp-devel
- libXext-devel
- libXfixes-devel
- libXfont-devel
- libXmu-devel
- libXrender-devel
- libXres-devel
- libXt-devel
- libdrm-devel
- libfontenc-devel
- libpciaccess-devel
- libselinux-devel
- libtool
- libudev-devel
- libxcb-devel
- libxkbfile-devel
- mesa-devel >= 9.0.2
- openssl-devel
- pixman-devel
- pkg-config
- xorg-x11-font-utils-devel
- xorg-x11-util-macros
- xorg-x11-proto-devel >= 7.7
- xorg-x11-xtrans-devel
- end
-
- CFLAGS += -Wstrict-overflow -rdynamic
-
- configure_options += \
- --enable-xvfb \
- --enable-xfake \
- --enable-xfbdev \
- --enable-xorg \
- --disable-static \
- --disable-xnest \
- --disable-xephyr \
- --with-pic \
- --enable-maintainer-mode \
- --enable-xselinux \
- --with-int10=x86emu \
- --with-default-font-path="catalogue:/etc/X11/fontpath.d,built-ins" \
- --with-module-dir=%{libdir}/xorg/modules \
- --with-builderstring="Build ID: %{name} %{version}-%{release}" \
- --with-os-name="$(hostname -s) $(uname -r)" \
- --with-vendor-name="$(DISTRO_NAME) Project" \
- --with-vendor-web="http://www.ipfire.org" \
- --with-xkb-output=/var/lib/xkb \
- --enable-install-libxf86config \
- --localstatedir=/var \
- --disable-screensaver \
- --disable-config-dbus \
- --disable-config-hal \
- --enable-config-udev
-
- prepare_cmds
- autoreconf -vfi
- end
-
- configure_cmds
- # Remove BIND_NOW flag from server modules to provide autoloading of them if needed
- # by the server itself.
- sed -i -e "s/^CFLAGS.*/& -Wl,-z,lazy/" \
- -e "s/^CCASFLAGS.*/& -Wl,-z,lazy/" \
- \
- hw/xfree86/dixmods/Makefile \
- hw/xfree86/dri/Makefile \
- hw/xfree86/dri2/Makefile \
- hw/xfree86/exa/Makefile \
- hw/xfree86/fbdevhw/Makefile \
- hw/xfree86/i2c/Makefile \
- hw/xfree86/int10/Makefile \
- hw/xfree86/shadowfb/Makefile \
- hw/xfree86/vbe/Makefile \
- hw/xfree86/vgahw/Makefile \
- end
-
- make_install_targets += \
- moduledir=%{libdir}/xorg/modules
-
- install_cmds
- rm -vf %{BUILDROOT}%{libdir}/xorg/modules/libxf8_16bpp.so
- rm -vrf %{BUILDROOT}/var/log
-
- mkdir -pv %{BUILDROOT}/etc/X11/xorg.conf.d %{BUILDROOT}/usr/share/xorg
- install -m 0444 hw/xfree86/common/{vesa,extra}modes %{BUILDROOT}/usr/share/xorg/
- install -m 644 %{DIR_SOURCE}/10-quirks.conf %{BUILDROOT}/usr/share/X11/xorg.conf.d
- end
-end
-
-quality-agent
- permit_not_full_relro = yes
-end
-
-packages
- package %{name}
- requires
- pixman
- udev
- xkeyboard-config
- end
-
- recommends
- xorg-x11-drv-ati
- xorg-x11-drv-evdev
- xorg-x11-drv-intel
- xorg-x11-drv-keyboard
- xorg-x11-drv-modesetting
- xorg-x11-drv-mouse
- xorg-x11-drv-nouveau
- xorg-x11-drv-vesa
- xorg-x11-drv-vmware
- xorg-x11-fonts
- xorg-x11-font-utils
- xorg-x11-xkb-utils
- end
- end
-
- package %{name}-devel
- template DEVEL
-
- requires
- libpciaccess-devel
- pixman-devel
- end
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/xorg-x11-util-macros/xorg-x11-util-macros.nm b/xorg-x11-util-macros/xorg-x11-util-macros.nm
deleted file mode 100644
index 121c2c195..000000000
--- a/xorg-x11-util-macros/xorg-x11-util-macros.nm
+++ /dev/null
@@ -1,41 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = xorg-x11-util-macros
-version = 1.19.0
-release = 1
-arch = noarch
-
-maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
-groups = X/Libraries
-url = http://www.x.org/
-license = MIT
-summary = X.Org X11 Autotools macros.
-
-description
- X.Org X11 autotools macros required for building the various
- packages that comprise the X Window System.
-end
-
-thisapp = util-macros-%{version}
-
-source_dl = http://ftp.x.org/pub/individual/util/
-
-
-build
- requires
- pkg-config
- end
-
- configure_options += \
- --disable-static
-
- make_install_target += \
- INSTALL="install -p"
-end
-
-packages
- package %{name}
-end
diff --git a/xorg-x11-xinit/patches/xinit-1.0.2-client-session.patch b/xorg-x11-xinit/patches/xinit-1.0.2-client-session.patch
deleted file mode 100644
index a38c883b8..000000000
--- a/xorg-x11-xinit/patches/xinit-1.0.2-client-session.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: xinit-1.3.1/xinit.c
-===================================================================
---- xinit-1.3.1.orig/xinit.c
-+++ xinit-1.3.1/xinit.c
-@@ -91,6 +91,8 @@ char xserverrcbuf[256];
-
- #define TRUE 1
- #define FALSE 0
-+#define OK_EXIT 0
-+#define ERR_EXIT 1
-
- static char *default_server = "X";
- static char *default_display = ":0"; /* choose most efficient */
-@@ -561,6 +563,7 @@ startClient(char *client[])
- {
- clientpid = fork();
- if (clientpid == 0) {
-+ int fd;
- set_environment();
- setWindowPath();
-
-@@ -568,7 +571,16 @@ startClient(char *client[])
- Error("cannot change uid");
- _exit(EXIT_FAILURE);
- }
-- setpgid(0, getpid());
-+ fd = open ("/dev/null", O_RDONLY);
-+
-+ if (fd < 0) {
-+ Error("cannot open /dev/null: %s\n", strerror(errno));
-+ _exit(ERR_EXIT);
-+ }
-+ close (STDIN_FILENO);
-+ dup2 (fd, STDIN_FILENO);
-+ close (fd);
-+ setsid();
- Execute(client);
- Error("Unable to run program \"%s\"", client[0]);
-
diff --git a/xorg-x11-xinit/patches/xorg-x11-xinit-1.3.2-systemd-logind.patch b/xorg-x11-xinit/patches/xorg-x11-xinit-1.3.2-systemd-logind.patch
deleted file mode 100644
index 85261da5e..000000000
--- a/xorg-x11-xinit/patches/xorg-x11-xinit-1.3.2-systemd-logind.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Nur xinit-1.3.2.orig/startx.cpp xinit-1.3.2/startx.cpp
---- xinit-1.3.2.orig/startx.cpp 2012-09-29 11:55:06.661264745 -0600
-+++ xinit-1.3.2/startx.cpp 2012-09-29 11:56:24.849771316 -0600
-@@ -80,6 +80,7 @@
- defaultdisplay=":0"
- clientargs=""
- serverargs=""
-+tty_num=$(tty | grep -oE '[0-9]+$')
-
- #ifdef __APPLE__
-
-@@ -135,6 +136,15 @@
- enable_xauth=1
- #endif
-
-+if [ x"$tty_num" != x ]; then
-+ # Specify TTY number directly to avoid recognizing startx session as
-+ # inactive: RHBZ#820675
-+ serverargs=${serverargs}" vt"${tty_num}
-+else
-+ echo "Error getting tty num"
-+ exit 1
-+fi
-+
- XCOMM Automatically determine an unused $DISPLAY
- d=0
- while true ; do
diff --git a/xorg-x11-xinit/xorg-x11-xinit.nm b/xorg-x11-xinit/xorg-x11-xinit.nm
deleted file mode 100644
index c3ad69098..000000000
--- a/xorg-x11-xinit/xorg-x11-xinit.nm
+++ /dev/null
@@ -1,43 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = xorg-x11-xinit
-version = 1.3.2
-release = 1
-thisapp = xinit-%{version}
-
-groups = X/Server
-url = http://www.x.org
-license = MIT
-summary = X.Org X11 X Window System xinit startup scripts.
-
-description
- X.Org X11 X Window System xinit startup scripts.
-end
-
-source_dl = http://ftp.x.org/pub/individual/app/
-
-build
- requires
- autoconf
- automake
- libX11-devel
- libtool
- xorg-x11-util-macros
- end
-
- prepare_cmds
- # Regenerate build system.
- autoreconf -vfi
- end
-end
-
-packages
- package %{name}
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/xorg-x11-xkb-utils/xorg-x11-xkb-utils.nm b/xorg-x11-xkb-utils/xorg-x11-xkb-utils.nm
deleted file mode 100644
index 2b5c14dd0..000000000
--- a/xorg-x11-xkb-utils/xorg-x11-xkb-utils.nm
+++ /dev/null
@@ -1,72 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = xorg-x11-xkb-utils
-version = 7.4
-release = 1
-
-maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
-groups = X/Fonts
-url = http://www.x.org/
-license = MIT
-summary = X.Org X11 xkb utilities.
-
-description
- X.Org X11 xkb utilities.
-end
-
-configure_options += \
- --mandir=/usr/share/man
-
-CFLAGS += -DHAVE_STRCASECMP
-
-source_dl = http://ftp.x.org/pub/individual/app/
-sources = \
- xkbcomp-1.1.1.tar.bz2 \
- xkbutils-1.0.3.tar.bz2 \
- xkbevd-1.1.1.tar.bz2 \
- xkbprint-1.0.1.tar.bz2 \
- setxkbmap-1.2.0.tar.bz2
-
-build
- requires
- bison
- libICE-devel
- libSM-devel
- libX11-devel
- libXaw-devel
- libXmu-devel
- libXt-devel
- libxkbfile-devel
- pkg-config
- xorg-x11-proto-devel
- end
-
- build
- for object in %{sources}; do
- cd %{DIR_SRC}/${object%*.tar.bz2}
- rm -vf xkbparse.c # force regen
- ./configure %{configure_options}
-
- make %{PARALLELISMFLAGS}
- done
- end
-
- install
- for object in %{sources}; do
- cd %{DIR_SRC}/${object%*.tar.bz2}
- make install DESTDIR=%{BUILDROOT}
- done
- end
-end
-
-packages
- package %{name}
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/xorg-x11-xtrans-devel/patches/xtrans-1.0.3-avoid-gethostname.patch b/xorg-x11-xtrans-devel/patches/xtrans-1.0.3-avoid-gethostname.patch
deleted file mode 100644
index 5d474d5d9..000000000
--- a/xorg-x11-xtrans-devel/patches/xtrans-1.0.3-avoid-gethostname.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up xtrans-1.0.3/Xtransutil.c.jx xtrans-1.0.3/Xtransutil.c
---- xtrans-1.0.3/Xtransutil.c.jx 2006-12-06 11:08:53.000000000 -0500
-+++ xtrans-1.0.3/Xtransutil.c 2007-10-01 14:53:43.000000000 -0400
-@@ -271,6 +271,7 @@ TRANS(GetMyNetworkId) (XtransConnInfo ci
- case AF_UNIX:
- {
- struct sockaddr_un *saddr = (struct sockaddr_un *) addr;
-+ strcpy(hostnamebuf, "unix");
- networkId = (char *) xalloc (3 + strlen (transName) +
- strlen (hostnamebuf) + strlen (saddr->sun_path));
- sprintf (networkId, "%s/%s:%s", transName,
diff --git a/xorg-x11-xtrans-devel/xorg-x11-xtrans-devel.nm b/xorg-x11-xtrans-devel/xorg-x11-xtrans-devel.nm
deleted file mode 100644
index cf8f83f39..000000000
--- a/xorg-x11-xtrans-devel/xorg-x11-xtrans-devel.nm
+++ /dev/null
@@ -1,34 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = xorg-x11-xtrans-devel
-version = 1.2.5
-release = 2
-thisapp = xorg-xtrans-%{version}
-arch = noarch
-
-maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
-groups = X/Libraries
-url = http://www.x.org/
-license = MIT
-summary = X11 transport library.
-
-description
- Transprot library for X.org X11 protocol.
-end
-
-sources = xtrans-%{version}.tar.bz2
-
-build
- requires
- pkg-config
- end
-
- DIR_APP = %{DIR_SRC}/xtrans-%{version}
-end
-
-packages
- package %{name}
-end
diff --git a/xrandr/xrandr.nm b/xrandr/xrandr.nm
deleted file mode 100644
index eebec73e8..000000000
--- a/xrandr/xrandr.nm
+++ /dev/null
@@ -1,44 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = xrandr
-version = 1.3.3
-release = 1
-
-groups = X/Tools
-url = http://www.x.org/
-license = MIT
-summary = Primitive command line interface to RandR extension.
-
-description
- Xrandr is used to set the screen size, orientation and/or \
- reflection using the RandR extension.
-end
-
-source_dl = http://ftp.x.org/pub/individual/app
-sources = %{thisapp}.tar.bz2
-
-build
- requires
- libX11-devel
- libXrandr-devel
- libXrender-devel
- pkg-config
- end
-
- install_cmds
- # Remove xkeystone, it has a bad interpreter and we don't need it.
- rm -vf %{BUILDROOT}/usr/bin/xkeystone
- end
-end
-
-packages
- package %{name}
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/xterm/patches/xterm-245-resources.patch b/xterm/patches/xterm-245-resources.patch
deleted file mode 100644
index f3be10ae7..000000000
--- a/xterm/patches/xterm-245-resources.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -up xterm-245/XTerm.ad.resources xterm-245/XTerm.ad
---- xterm-245/XTerm.ad.resources 2009-02-13 01:14:13.000000000 +0100
-+++ xterm-245/XTerm.ad 2009-08-13 12:28:59.000000000 +0200
-@@ -210,3 +210,13 @@
- !*allowTcapOps: false
- !*allowTitleOps: false
- !*allowWindowOps: false
-+
-+! Red Hat Defaults:
-+*allowFontOps: false
-+*allowTcapOps: false
-+*allowWindowOps: false
-+*VT100*eightBitInput: false
-+*VT100*metaSendsEscape: true
-+*VT100*backarrowKey: false
-+*VT100*scrollBar: true
-+*VT100*utf8Title: true
diff --git a/xterm/patches/xterm-256-man-page_paths.patch b/xterm/patches/xterm-256-man-page_paths.patch
deleted file mode 100644
index 6bfd46def..000000000
--- a/xterm/patches/xterm-256-man-page_paths.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -up xterm-256/minstall.sh.man-page_paths xterm-256/minstall.sh
---- xterm-256/minstall.sh.man-page_paths 2010-03-04 00:44:49.000000000 +0100
-+++ xterm-256/minstall.sh 2010-03-09 12:11:26.000000000 +0100
-@@ -109,6 +109,10 @@ WTMP_PATH=$WTMP_PATH/$WTMP_NAME
- X_MANSECT=`man X 2>&1 | tr '\012' '\020' | sed -e 's/^[^0123456789]*\([^) ][^) ]*\).*/\1/'`
- test -z "$X_MANSECT" && X_MANSECT=$suffix
-
-+fontpath=/usr/share/X11/fonts
-+xorgcfgdir=/etc/X11
-+xorgcfgfil=xorg.conf
-+X_MANSECT=7
- sed -e 's%__vendorversion__%"X Window System"%' \
- -e s%__apploaddir__%$APPS_DIR% \
- -e s%__mansuffix__%$MY_MANSECT%g \
-@@ -117,6 +121,9 @@ sed -e 's%__vendorversion__%"X Window Sy
- -e s%/etc/utmp%$UTMP_PATH%g \
- -e s%fIwtmp'\\%fI'$WTMP_NAME'\\%g' \
- -e s%/etc/wtmp%$WTMP_PATH%g \
-+ -e s%__fontpath__%$fontpath%g \
-+ -e s%__xorgcfgdir__%$xorgcfgdir%g \
-+ -e s%__xorgcfgfil__%$xorgcfgfil%g \
- $OLD_FILE >$NEW_FILE
-
- echo "$MINSTALL $OLD_FILE $END_FILE"
-diff -up xterm-256/xterm.man.man-page_paths xterm-256/xterm.man
---- xterm-256/xterm.man.man-page_paths 2010-03-03 23:30:35.000000000 +0100
-+++ xterm-256/xterm.man 2010-03-09 12:11:26.000000000 +0100
-@@ -1699,17 +1699,17 @@ Since X11R6, bitmap fonts have been scal
- The font server claims to provide the bold font that \fIxterm\fP requests,
- but the result is not always readable.
- XFree86 provides a feature which can be used to suppress the scaling.
--In the X server's configuration file (e.g., "/etc/X11/XFree86"), you
-+In the X server's configuration file (e.g., __xorgcfgdir__/__xorgcfgfil__), you
- can add ":unscaled" to the end of the directory specification for the
- "misc" fonts, which comprise the fixed-pitch fonts that are used by \fIxterm\fP.
- For example
- .RS
-- FontPath "/usr/lib/X11/fonts/misc/"
-+ FontPath "__fontpath__"
- .RE
- .IP
- would become
- .RS
-- FontPath "/usr/lib/X11/fonts/misc/:unscaled"
-+ FontPath "__fontpath__/misc/:unscaled"
- .RE
- .IP
- Depending on your configuration, the font server may have its own configuration
diff --git a/xterm/patches/xterm-261-desk.patch b/xterm/patches/xterm-261-desk.patch
deleted file mode 100644
index b6483289f..000000000
--- a/xterm/patches/xterm-261-desk.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -up xterm-261/xterm.desktop.desk xterm-261/xterm.desktop
---- xterm-261/xterm.desktop.desk 2010-06-15 12:58:13.000000000 +0200
-+++ xterm-261/xterm.desktop 2010-07-02 13:02:56.000000000 +0200
-@@ -32,10 +32,11 @@
- # -----------------------------------------------------------------------------
- [Desktop Entry]
- Name=XTerm
-+GenericName=Terminal
- Comment=standard terminal emulator for the X window system
- Exec=xterm
- Terminal=false
- Type=Application
- Encoding=UTF-8
--Icon=xterm-color_48x48
-+Icon=gnome-xterm
- Categories=System;TerminalEmulator;
diff --git a/xterm/xterm.nm b/xterm/xterm.nm
deleted file mode 100644
index 52b824ad6..000000000
--- a/xterm/xterm.nm
+++ /dev/null
@@ -1,55 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = xterm
-version = 262
-release = 1
-
-groups = X/Application
-url = http://invisible-island.net/xterm/
-license = MIT
-summary = Terminal emulator for the X Window System.
-
-description
- The xterm program is a terminal emulator for the X Window System. It \
- provides DEC VT102 and Tektronix 4014 compatible terminals for \
- programs that can't use the window system directly.
-end
-
-source_dl = ftp://invisible-island.net/xterm/
-
-sources = %{thisapp}.tgz
-
-build
- requires
- libSM-devel
- libXft-devel
- libXaw-devel
- libXext-devel
- libxkbfile-devel
- ncurses-devel
- pkg-config
- end
-
- configure_options += \
- --mandir=/usr/share/man \
- --enable-256-color \
- --enable-exec-xterm \
- --enable-luit \
- --enable-warnings \
- --enable-wide-chars \
- --with-tty-group=tty \
- --disable-full-tgetent
-end
-
-packages
- package %{name}
- requires = xorg-x11-server
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/zenity/zenity.nm b/zenity/zenity.nm
deleted file mode 100644
index 4ce567bce..000000000
--- a/zenity/zenity.nm
+++ /dev/null
@@ -1,54 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = zenity
-version = %{ver_maj}.%{ver_min}
-ver_maj = 3.7
-ver_min = 2
-release = 1
-
-groups = Applications/System
-url = http://directory.fsf.org/zenity.html
-license = LGPLv2+
-summary = Display dialog boxes from shell scripts
-
-description
- Zenity lets you display Gtk+ dialog boxes from the command line and through
- shell scripts. It is similar to gdialog, but is intended to be saner. It comes
- from the same family as dialog, Xdialog, and cdialog.
-end
-
-source_dl = http://download.gnome.org/sources/%{name}/%{ver_maj}/
-sources = %{thisapp}.tar.xz
-
-build
- requires
- gettext
- gtk3-devel
- intltool
- which
- end
-
- configure_options += \
- --disable-scrollkeeper \
- --disable-webkitgtk \
- ITSTOOL=true
-
- install_cmds
- # we don't want a perl dependency just for this
- rm -vf %{BUILDROOT}%{bindir}/gdialog
-
- # Remove help documents.
- rm -rvf %{BUILDROOT}%{datadir}/help
- end
-end
-
-packages
- package %{name}
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
hooks/post-receive
--
IPFire 3.x development tree
1
0