[git.ipfire.org] IPFire 2.x development tree branch, next, updated. eafaa37c4f7ad472c28d37d1bdaaf69abf093870
by Peter Müller 31 Dec '22
by Peter Müller 31 Dec '22
31 Dec '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 eafaa37c4f7ad472c28d37d1bdaaf69abf093870 (commit)
via 9e5ab853a53bc585391a80205c731c17c263fc9d (commit)
via 50a71847bbd2dc47dfd012c80c6ea501adac08fb (commit)
via 8b5450a593b8d0d80082d59ff720cd016a4b9a79 (commit)
via 19511b131f0c0251dfc67c137a7e222beead08f0 (commit)
via a3e8b9bbff6107b29da6a2ab108b189d5b4a1bbe (commit)
from 8013f278c6c3763472eb8fba698add941bd9baf6 (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 eafaa37c4f7ad472c28d37d1bdaaf69abf093870
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Dec 30 13:59:52 2022 +0000
dnsdist: Update to 1.7.3
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 9e5ab853a53bc585391a80205c731c17c263fc9d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Dec 30 13:59:51 2022 +0000
bird: Update to 2.0.11
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 50a71847bbd2dc47dfd012c80c6ea501adac08fb
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sat Dec 31 10:56:22 2022 +0000
Core Update 173: Ship jquery
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 8b5450a593b8d0d80082d59ff720cd016a4b9a79
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Fri Dec 30 13:18:35 2022 +0100
jquery: Update to version 3.6.3
- Update from version 3.6.0 to 3.6.3
- There is no rootfile for this package
- Changelog
3.6.3
Build
remove stale Insight package from custom builds (81d5bd17)
Updating the 3.x-stable version to 3.6.3-pre. (2c5b47c4)
Selector
Update Sizzle from 2.3.8 to 2.3.9 (#5177, 8989500e)
3.6.2
CSS
Return undefined for whitespace-only CSS variable values (#5120) (8bea1dec)
Don’t trim whitespace of undefined custom property (#5105, c0db6d70)
Selector
Manipulation: Fix DOM manip within template contents (#5147, 5318e311)
Update Sizzle from 2.3.7 to 2.3.8 (#5147, a1b7ae3b)
Update Sizzle from 2.3.6 to 2.3.7 (#5098, ee0fec05)
Tests
Remove a workaround for a Firefox XML parsing issue (965391ab)
Make Ajax tests pass in iOS 9 (d051e0e3)
3.6.1
CSS
Skip falsy values in `addClass( array )`, compress code (#4998, 9b34bdb1)
Justify use of rtrim on CSS property values (a1373e2e)
Remove a redundant extension from rtrimCSS inclusion in curCSS (509eeb89)
Trim whitespace surrounding CSS Custom Properties values (#4926, 219ccf5c)
Deprecated
Improve $.trim performance for strings with lots of whitespace (69940100)
Docs
Update webpack website in README (410d5cf0)
add link to preview the new CLAs (b24e83bd)
Replace `#NUMBER` Trac issue references with `trac-NUMBER` (95e34b69)
remove expired links from old jquery source (c3c4d207)
Remove links to Web Archive from source (#4981, 4b0d8900)
Update the URL to the latest jQuery build in CONTRIBUTING.md (4bb7d069)
Remove the CLA checkbox in the pull request template (93406490)
Event
Don’t break focus triggering after `.on(focus).off(focus)` (#4867, b3e4a7eb)
Manipulation
Don’t remove HTML comments from scripts (#4904, 924b515d)
Tests
Exclude tests based on compilation flags, not API presence (3.x version) (#5069, bc165128)
Workaround an XML parsing bug in Firefox (be3bd560)
lock colors version to 1.4.0 (fa70e8fd)
Skip ETag AJAX tests on TestSwarm (81fa1e2a)
Allow statusText to be “success” in AJAX tests (7439e221)
Disable CSS Custom Properties tests in old Safari/iOS (e9f77267)
Make Karma browser timeout larger than the QUnit one (a51eec74)
Don’t remove csp.log in the cspClean action of mock.php (ba81326f)
Load the TestSwarm listener via HTTPS (f6f07204)
Switch background image from online file to local 1×1.jpg (8d20cb97)
Strip untypical callback parameter characters from mock.php (b14b62c8)
Infrastructure
Update GitHub Actions (0f6c3d9e)
Add dependabot.yml config (GitHub Actions) (5a363017)
Test on Node 17, update Grunt & `karma-*` packages (9bc0df70)
Separate the install step from running tests in GitHub Actions (cb35067f)
remove travis.yml and travis mentions from core (#4984) (55669883)
Migrate CI to GitHub Actions (b39cfa15)
Test on Node.js 16 instead of 15 (f12cac60)
Take core-js from the external directory as well (752b8981)
Updating the 3.x-stable version to 3.6.1-pre. (3642471e)
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 19511b131f0c0251dfc67c137a7e222beead08f0
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sat Dec 31 10:55:44 2022 +0000
Core Update 173: Ship ovpnmain.cgi
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit a3e8b9bbff6107b29da6a2ab108b189d5b4a1bbe
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sun Dec 18 16:54:56 2022 +0100
ovpnmain.cgi: Translation string 'dh parameter' doesn't exist
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/173/filelists/files | 1 +
config/rootfiles/{oldcore/156 => core/173}/filelists/jquery | 0
html/cgi-bin/ovpnmain.cgi | 2 +-
lfs/bird | 9 +++------
lfs/dnsdist | 4 ++--
lfs/jquery | 4 ++--
6 files changed, 9 insertions(+), 11 deletions(-)
copy config/rootfiles/{oldcore/156 => core/173}/filelists/jquery (100%)
Difference in files:
diff --git a/config/rootfiles/core/173/filelists/files b/config/rootfiles/core/173/filelists/files
index 2d8353e65..b6beaa774 100644
--- a/config/rootfiles/core/173/filelists/files
+++ b/config/rootfiles/core/173/filelists/files
@@ -3,5 +3,6 @@ etc/rc.d/init.d/networking/dhcpcd.exe
etc/rc.d/init.d/networking/functions.network
etc/rc.d/init.d/networking/red
lib/udev/network-hotplug-rename
+srv/web/ipfire/cgi-bin/ovpnmain.cgi
srv/web/ipfire/cgi-bin/pppsetup.cgi
var/ipfire/dhcpc/dhcpcd.conf
diff --git a/config/rootfiles/core/173/filelists/jquery b/config/rootfiles/core/173/filelists/jquery
new file mode 120000
index 000000000..65df10c16
--- /dev/null
+++ b/config/rootfiles/core/173/filelists/jquery
@@ -0,0 +1 @@
+../../../common/jquery
\ No newline at end of file
diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index ecfd4fdaf..2d19301a6 100644
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -5716,7 +5716,7 @@ END
# Nothing
print <<END;
<tr>
- <td width='25%' class='base' $col3>$Lang::tr{'dh parameter'}:</td>
+ <td width='25%' class='base' $col3>$Lang::tr{'dh'}:</td>
<td class='base' $col3>$Lang::tr{'not present'}</td>
</td><td colspan='3' $col3> </td>
</tr>
diff --git a/lfs/bird b/lfs/bird
index e60246cf8..17fd4715d 100644
--- a/lfs/bird
+++ b/lfs/bird
@@ -26,7 +26,7 @@ include Config
SUMMARY = The BIRD Internet Routing Daemon
-VER = 2.0.9
+VER = 2.0.11
THISAPP = bird-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -34,14 +34,12 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = bird
-PAK_VER = 10
+PAK_VER = 11
DEPS =
SERVICES = bird
-CFLAGS += -fcommon
-
###############################################################################
# Top-level Rules
###############################################################################
@@ -50,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 5226058ba8989a28e8151906e194fd3065276034f1304e0e45772b17f3d8095eff6add211320a23418bfb57b2c16c96594fb85345355e3b870d7bfa2cfe119b9
+$(DL_FILE)_BLAKE2 = 0761bd50b3b0338ecf2a6325f61f90db9f92324ed814de2ec6b360c6f5a7e12d6ae4ae9b73a11ddede0e6c8fd1d15bea1b62076c38c937ae281f10a8bc2d1cbf
install : $(TARGET)
@@ -83,7 +81,6 @@ $(subst %,%_BLAKE2,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
- $(UPDATE_AUTOMAKE)
cd $(DIR_APP) && \
./configure \
--prefix=/usr \
diff --git a/lfs/dnsdist b/lfs/dnsdist
index 4fd3ce6aa..8ee4fc023 100644
--- a/lfs/dnsdist
+++ b/lfs/dnsdist
@@ -26,7 +26,7 @@ include Config
SUMMARY = A highly DNS-, DoS- and abuse-aware loadbalancer
-VER = 1.7.2
+VER = 1.7.3
THISAPP = dnsdist-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -52,7 +52,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = cf2a9853be4c896b3909f871fad771d4298eb2586702a8a85eff2c612d275214cdad82e93961f4cfd58300f5629f06569c51a2c4f15de58188a69116bd5275de
+$(DL_FILE)_BLAKE2 = e7d1cb9dba3d3ad1dd696d324697ffac60863112eae83307237639bea339f7ed1c3f320002d3467a44ab38a9ea60ade95fff43645c889d29465760f7f467b996
install : $(TARGET)
diff --git a/lfs/jquery b/lfs/jquery
index fcfa47304..0ab12c790 100644
--- a/lfs/jquery
+++ b/lfs/jquery
@@ -24,7 +24,7 @@
include Config
-VER = 3.6.0
+VER = 3.6.3
THISAPP = jquery-$(VER)
DL_FILE = $(THISAPP).min.js
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 2ae88855ddf4957e944a5ca313d8854d7afff1e796694437b07fae15a67f75d46f357450b0e2a6f140c1d116512016f1d276e0e12fe3eb700e3c93e3492d6a9e
+$(DL_FILE)_BLAKE2 = ff1c58cc4d8efb7f3c134d4da0d0b6960c83d09edeffc9cff96230733c9c35c259282cb335aa2ceea75ca9d6548721aedbe3dbac6b68fa0a91e405c06f72f1d6
install : $(TARGET)
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 3.x development tree branch, master, updated. f57a528060244ef159467d3ba671f5a360ee450d
by Michael Tremer 30 Dec '22
by Michael Tremer 30 Dec '22
30 Dec '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 f57a528060244ef159467d3ba671f5a360ee450d (commit)
via 2bccf29a53cdfcfdaa6cffd88ddb17638abffb8f (commit)
via 5c05b5f7e661889fad8e7a002ff8c2549dd11bb6 (commit)
via c7be36215a8ff8b62960c7d1a3f208e84a9020fd (commit)
via cc917d0d1396c59344dbc43ff7dfc8e199d1939c (commit)
via fab1cfe0e257a01f2f55607116a3365ae1ca241a (commit)
via 682e99fb5b7860ce397e2bf80e21b4b6d3e062ff (commit)
via dd380882e9fd3debdc049412146467b6e239de95 (commit)
via 0d7519536863ae17704496739ed5dbe38c9ce672 (commit)
via 9f9357eaecf2ed66de5950638a4387ac36bd3b1b (commit)
via 9c66d2ecf338edb9c1529bfd7b8e9e27ffd3b6ee (commit)
via e2da3dffc79f172aae3a5b3679556dfbf5fb3643 (commit)
via 6fa7ec2136f62c6978d1f3485785d397e6e33a84 (commit)
via 986f57b71c731ecee695655d0e7f41a54f4da00a (commit)
via 4e76fdc0732ee76ad70d71484fd04b0ae7c41e66 (commit)
via f72c34fc8579fb84d31d8a32e9b233572b63755c (commit)
via dbc4cd15053cc286c7790d0eea213118446a5708 (commit)
via 3f54d58fc400286405472710cef0402e724e9a87 (commit)
via a23a06d9acf15fcece3aec232666c6b57724c04d (commit)
via 29ed087a69aa99dbcbc6402a8695186d5fdaafef (commit)
via 431d4c6513cd103f8bc9f76376703f8514d7f8b1 (commit)
via 371ab945660c089216ea64c48e3b5aef696f64f9 (commit)
via 694930ab448f4ff507162e6485e002adaf83c092 (commit)
via 2f82b73bb88e86b8ce9fad9573f4c51e11af914a (commit)
via d59330e48741323690a8f0466ff620ba2abfa503 (commit)
via c30208ed2dabeed1ecbf54a9cbe945efa55bf335 (commit)
via b87052f9981157ac5eb950f558734cc3d7c619fc (commit)
via ea100fcaa2d13bc272db3cfaed5e6a67cf2fc006 (commit)
via cc7e87ecca48758b13f47c6c318fab7910f3ef3e (commit)
via a52b3ac858290f59a618d9a1f82a3a632475a78e (commit)
via 955189f0ddd2751a0fad0321c0fe907ed9985c83 (commit)
via 9353997c8b0883a255a3f879829ae4cfc8092f3f (commit)
via f7664dac823c425be6cda7d29de12ee814ced036 (commit)
via 1e4b76d4ffb65a22d2ca2eaea2f1c9207c39bab1 (commit)
via b7bb75a27be86e8991736230c4d839be0591b03a (commit)
via 0cb653dfbe26a4c0c5b67e873bea80af56b4e476 (commit)
via 94991619e047db4072107b3d0d6ed7888e13c85d (commit)
via fe0d834e7e66b1b35658c73a5f8b199a6a7ecacb (commit)
via f51167f4a84d286875b84beadfb93ab524569435 (commit)
via 033aa36668d607e143491a566ceee3cec44c16e6 (commit)
from d62776ed14914cd0ecd0251c0279174a39e7a965 (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 f57a528060244ef159467d3ba671f5a360ee450d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Dec 30 18:49:14 2022 +0000
unzip: Import latest patches from Fedora
There have been no releases for unzip since 2009.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 2bccf29a53cdfcfdaa6cffd88ddb17638abffb8f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Dec 30 18:32:52 2022 +0000
joe: Drop package
Nobody uses this at the moment.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 5c05b5f7e661889fad8e7a002ff8c2549dd11bb6
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Dec 30 18:31:41 2022 +0000
gdbm: Update to 1.23
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit c7be36215a8ff8b62960c7d1a3f208e84a9020fd
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Dec 30 18:28:01 2022 +0000
vala: Update to 0.56.3
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit cc917d0d1396c59344dbc43ff7dfc8e199d1939c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Dec 30 18:22:32 2022 +0000
libdaq: Remove any statically linked libraries
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit fab1cfe0e257a01f2f55607116a3365ae1ca241a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Dec 30 18:18:59 2022 +0000
curl: Link against nghttp2 for HTTP/2.0 support
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 682e99fb5b7860ce397e2bf80e21b4b6d3e062ff
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Dec 30 18:18:05 2022 +0000
nghttp2: New package
Required by bind but will be used universally.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit dd380882e9fd3debdc049412146467b6e239de95
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Dec 30 18:10:06 2022 +0000
dracut: Implement some reasonable defaults
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 0d7519536863ae17704496739ed5dbe38c9ce672
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Dec 30 17:42:48 2022 +0000
dracut: Require device-mapper for dmsetup
We need dmsetup which is in the device-mapper package.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 9f9357eaecf2ed66de5950638a4387ac36bd3b1b
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Wed Dec 28 21:43:22 2022 +0100
perl: Update to 5.36.0
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
commit 9c66d2ecf338edb9c1529bfd7b8e9e27ffd3b6ee
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Dec 30 17:34:03 2022 +0000
sudo: Update to 1.9.12p1
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit e2da3dffc79f172aae3a5b3679556dfbf5fb3643
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Dec 30 17:00:57 2022 +0000
dracut: Drop network package & some more modules
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 6fa7ec2136f62c6978d1f3485785d397e6e33a84
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Dec 30 17:00:20 2022 +0000
rhash: Update to 1.4.3
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 986f57b71c731ecee695655d0e7f41a54f4da00a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Dec 30 16:41:23 2022 +0000
dracut: Add a -debuuginfo package
Some parts are binary and their debug stuff needs to be in a -debuginfo
package.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 4e76fdc0732ee76ad70d71484fd04b0ae7c41e66
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Dec 30 16:40:53 2022 +0000
c-ares: Update to 1.18.1
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit f72c34fc8579fb84d31d8a32e9b233572b63755c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Dec 30 16:38:15 2022 +0000
dmraid: Drop package
We currently don't support this
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit dbc4cd15053cc286c7790d0eea213118446a5708
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Dec 30 16:35:10 2022 +0000
dejagnu: Update to 1.6.3
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 3f54d58fc400286405472710cef0402e724e9a87
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Dec 30 16:29:19 2022 +0000
acpid: Update to 2.0.34
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit a23a06d9acf15fcece3aec232666c6b57724c04d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Dec 30 16:27:27 2022 +0000
apr-util: Update to 1.6.1
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 29ed087a69aa99dbcbc6402a8695186d5fdaafef
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Dec 30 16:24:35 2022 +0000
snort: New package
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 431d4c6513cd103f8bc9f76376703f8514d7f8b1
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Dec 30 16:21:42 2022 +0000
autogen: Drop package
Nothing depends on this
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 371ab945660c089216ea64c48e3b5aef696f64f9
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Dec 30 16:18:37 2022 +0000
dialog: Drop package
Nothing depends on this
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 694930ab448f4ff507162e6485e002adaf83c092
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Dec 30 16:17:39 2022 +0000
tree: Update to 2.1.0
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 2f82b73bb88e86b8ce9fad9573f4c51e11af914a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Dec 30 15:35:02 2022 +0000
bash-completion: Update to 2.11
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit d59330e48741323690a8f0466ff620ba2abfa503
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Dec 30 15:34:44 2022 +0000
p11-kit: Update to 0.24.1
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit c30208ed2dabeed1ecbf54a9cbe945efa55bf335
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Dec 29 18:55:39 2022 +0000
transmission: Drop package
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit b87052f9981157ac5eb950f558734cc3d7c619fc
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Dec 29 18:50:53 2022 +0000
libdaq: New package
Required by snort
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit ea100fcaa2d13bc272db3cfaed5e6a67cf2fc006
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Dec 29 18:50:38 2022 +0000
check: New package
Required by libdnet
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit cc7e87ecca48758b13f47c6c318fab7910f3ef3e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Dec 29 18:47:51 2022 +0000
luajit: New package
Required by snort
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit a52b3ac858290f59a618d9a1f82a3a632475a78e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Dec 29 18:43:30 2022 +0000
libdnet: Update to 1.16.1
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 955189f0ddd2751a0fad0321c0fe907ed9985c83
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Dec 29 18:20:35 2022 +0000
hwloc: New package
Required by snort
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 9353997c8b0883a255a3f879829ae4cfc8092f3f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Dec 29 17:07:05 2022 +0000
texinfo: Update to 7.0.1
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit f7664dac823c425be6cda7d29de12ee814ced036
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Dec 29 16:56:11 2022 +0000
cpio: Update to 2.13
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 1e4b76d4ffb65a22d2ca2eaea2f1c9207c39bab1
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Dec 29 16:48:20 2022 +0000
directfb: Drop package
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit b7bb75a27be86e8991736230c4d839be0591b03a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Dec 29 16:47:12 2022 +0000
libunwind: Update to 1.4.0
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 0cb653dfbe26a4c0c5b67e873bea80af56b4e476
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Dec 29 16:35:05 2022 +0000
graphviz: New package
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 94991619e047db4072107b3d0d6ed7888e13c85d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Dec 29 16:24:24 2022 +0000
suricata-update: Drop package
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit fe0d834e7e66b1b35658c73a5f8b199a6a7ecacb
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Dec 29 16:24:05 2022 +0000
suricata: Drop package
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit f51167f4a84d286875b84beadfb93ab524569435
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Dec 29 16:23:07 2022 +0000
librsvg2: Drop package
Newer versions need a Rust compiler which we currently don't have.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 033aa36668d607e143491a566ceee3cec44c16e6
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Dec 29 16:22:20 2022 +0000
ImageMagick: Update to 7.1.0-56
This patch compiles in support for a lot of stuff and drops a dependency
on librsvg.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
ImageMagick/ImageMagick.nm | 44 +-
acpid/acpid.nm | 11 +-
acpid/patches/acpid-2.0.15-makefile.patch | 24 -
apr-util/apr-util.nm | 20 +-
autogen/autogen.nm | 62 -
.../patches/autogen-5.9.4-autoopts-config.patch | 25 -
autogen/patches/autogen-5.9.4-pkgconfig.patch | 11 -
bash-completion/bash-completion.nm | 29 +-
c-ares/c-ares.nm | 8 +-
check/check.nm | 41 +
compat-gdbm/compat-gdbm.nm | 29 +-
compat-gdbm/patches/gdbm-1.8.3-fhs.patch | 138 -
compat-gdbm/patches/gdbm-1.8.3-filestruct.patch | 12 -
compat-gdbm/patches/gdbm-1.8.3-ndbmlock.patch | 94 -
compat-gdbm/patches/gdbm-1.8.3-shortread.patch | 113 -
compat-gdbm/patches/gdbm-1.8.3-zeroheaders.patch | 44 -
cpio/cpio.nm | 19 +-
curl/curl.nm | 3 +-
dejagnu/dejagnu.nm | 12 +-
dialog/dialog.nm | 61 -
dialog/patches/dialog-incdir.patch | 23 -
dialog/patches/dialog-libs.patch | 17 -
dialog/patches/dialog-multilib.patch | 32 -
directfb/directfb.nm | 62 -
.../DirectFB-1.5.3-add-missing-davinci-files.patch | 1697 --------
.../DirectFB-1.5.3-gcc-atomics-on-arm.patch | 64 -
directfb/patches/DirectFB-1.5.3-lm.patch | 33 -
dmraid/dmraid.nm | 71 -
dracut/dracut.nm | 70 +-
dracut/ipfire.conf | 18 +-
gdbm/gdbm.nm | 14 +-
gdbm/patches/gdbm-1.10-fedora.patch | 14 -
gdbm/patches/gdbm-1.10-zeroheaders.patch | 33 -
graphviz/graphviz.nm | 69 +
hwloc/hwloc.nm | 66 +
joe/joe.nm | 34 -
libdaq/libdaq.nm | 68 +
libdnet/libdnet.nm | 26 +-
libdnet/patches/libdnet-1.12-shrext.patch | 327 --
librsvg2/librsvg2.nm | 68 -
libunwind/libunwind.nm | 32 +-
libunwind/patches/libunwind-aarch64.patch | 2562 ------------
libunwind/patches/libunwind-disable-setjmp.patch | 185 -
luajit/luajit.nm | 57 +
pixman/pixman.nm => nghttp2/nghttp2.nm | 21 +-
p11-kit/p11-kit.nm | 22 +-
perl/patches/perl-USE_MM_LD_RUN_PATH.patch | 28 +-
perl/patches/perl-disable_test_hosts.patch | 12 -
perl/perl.nm | 4140 +++++++++++++++-----
rhash/rhash.nm | 4 +-
snort/snort.nm | 60 +
sudo/sudo.nm | 10 +-
suricata-update/suricata-update.nm | 40 -
suricata/suricata.conf | 523 ---
suricata/suricata.logrotate | 9 -
suricata/suricata.nm | 100 -
suricata/systemd/suricata.service | 14 -
texinfo/texinfo.nm | 8 +-
transmission/systemd/transmission-daemon.service | 11 -
transmission/transmission.nm | 120 -
tree/tree.nm | 8 +-
.../0001-Fix-CVE-2016-9844-rhbz-1404283.patch | 39 +
...unzip-6.0-COVSCAN-fix-unterminated-string.patch | 131 +
unzip/patches/unzip-6.0-alt-iconv-utf8-print.patch | 381 ++
unzip/patches/unzip-6.0-alt-iconv-utf8.patch | 398 ++
unzip/patches/unzip-6.0-bzip2-configure.patch | 3 +-
unzip/patches/unzip-6.0-caseinsensitive.patch | 131 +
...6.0-nostrip.patch => unzip-6.0-configure.patch} | 2 +-
unzip/patches/unzip-6.0-cve-2014-8139.patch | 79 +
unzip/patches/unzip-6.0-cve-2014-8140.patch | 25 +
unzip/patches/unzip-6.0-cve-2014-8141.patch | 138 +
...-6.0-cve-2018-1000035-heap-based-overflow.patch | 34 +
unzip/patches/unzip-6.0-cve-2018-18384.patch | 35 +
unzip/patches/unzip-6.0-fix-recmatch.patch | 477 +++
.../patches/unzip-6.0-heap-overflow-infloop.patch | 104 +
unzip/patches/unzip-6.0-manpage-fix.patch | 11 +
unzip/patches/unzip-6.0-overflow-long-fsize.patch | 34 +
unzip/patches/unzip-6.0-overflow.patch | 25 +
unzip/patches/unzip-6.0-symlink.patch | 17 +
unzip/patches/unzip-6.0-timestamp.patch | 41 +
unzip/patches/unzip-6.0-valgrind.patch | 26 +
unzip/patches/unzip-6.0-x-option.patch | 28 +
unzip/patches/unzip-gnu89-build.patch | 15 +
unzip/patches/unzip-zipbomb-manpage.patch | 25 +
unzip/patches/unzip-zipbomb-part1.patch | 25 +
unzip/patches/unzip-zipbomb-part2.patch | 349 ++
unzip/patches/unzip-zipbomb-part3.patch | 112 +
unzip/patches/unzip-zipbomb-part4.patch | 25 +
unzip/patches/unzip-zipbomb-part5.patch | 26 +
unzip/patches/unzip-zipbomb-part6.patch | 95 +
unzip/patches/unzip-zipbomb-switch.patch | 215 +
unzip/unzip.nm | 50 +-
vala/vala.nm | 9 +-
93 files changed, 6744 insertions(+), 7933 deletions(-)
delete mode 100644 acpid/patches/acpid-2.0.15-makefile.patch
delete mode 100644 autogen/autogen.nm
delete mode 100644 autogen/patches/autogen-5.9.4-autoopts-config.patch
delete mode 100644 autogen/patches/autogen-5.9.4-pkgconfig.patch
create mode 100644 check/check.nm
delete mode 100644 compat-gdbm/patches/gdbm-1.8.3-fhs.patch
delete mode 100644 compat-gdbm/patches/gdbm-1.8.3-filestruct.patch
delete mode 100644 compat-gdbm/patches/gdbm-1.8.3-ndbmlock.patch
delete mode 100644 compat-gdbm/patches/gdbm-1.8.3-shortread.patch
delete mode 100644 compat-gdbm/patches/gdbm-1.8.3-zeroheaders.patch
delete mode 100644 dialog/dialog.nm
delete mode 100644 dialog/patches/dialog-incdir.patch
delete mode 100644 dialog/patches/dialog-libs.patch
delete mode 100644 dialog/patches/dialog-multilib.patch
delete mode 100644 directfb/directfb.nm
delete mode 100644 directfb/patches/DirectFB-1.5.3-add-missing-davinci-files.patch
delete mode 100644 directfb/patches/DirectFB-1.5.3-gcc-atomics-on-arm.patch
delete mode 100644 directfb/patches/DirectFB-1.5.3-lm.patch
delete mode 100644 dmraid/dmraid.nm
delete mode 100644 gdbm/patches/gdbm-1.10-fedora.patch
delete mode 100644 gdbm/patches/gdbm-1.10-zeroheaders.patch
create mode 100644 graphviz/graphviz.nm
create mode 100644 hwloc/hwloc.nm
delete mode 100644 joe/joe.nm
create mode 100644 libdaq/libdaq.nm
delete mode 100644 libdnet/patches/libdnet-1.12-shrext.patch
delete mode 100644 librsvg2/librsvg2.nm
delete mode 100644 libunwind/patches/libunwind-aarch64.patch
delete mode 100644 libunwind/patches/libunwind-disable-setjmp.patch
create mode 100644 luajit/luajit.nm
copy pixman/pixman.nm => nghttp2/nghttp2.nm (62%)
delete mode 100644 perl/patches/perl-disable_test_hosts.patch
create mode 100644 snort/snort.nm
delete mode 100644 suricata-update/suricata-update.nm
delete mode 100644 suricata/suricata.conf
delete mode 100644 suricata/suricata.logrotate
delete mode 100644 suricata/suricata.nm
delete mode 100644 suricata/systemd/suricata.service
delete mode 100644 transmission/systemd/transmission-daemon.service
delete mode 100644 transmission/transmission.nm
create mode 100644 unzip/patches/0001-Fix-CVE-2016-9844-rhbz-1404283.patch
create mode 100644 unzip/patches/unzip-6.0-COVSCAN-fix-unterminated-string.patch
create mode 100644 unzip/patches/unzip-6.0-alt-iconv-utf8-print.patch
create mode 100644 unzip/patches/unzip-6.0-alt-iconv-utf8.patch
create mode 100644 unzip/patches/unzip-6.0-caseinsensitive.patch
rename unzip/patches/{unzip-6.0-nostrip.patch => unzip-6.0-configure.patch} (93%)
create mode 100644 unzip/patches/unzip-6.0-cve-2014-8139.patch
create mode 100644 unzip/patches/unzip-6.0-cve-2014-8140.patch
create mode 100644 unzip/patches/unzip-6.0-cve-2014-8141.patch
create mode 100644 unzip/patches/unzip-6.0-cve-2018-1000035-heap-based-overflow.patch
create mode 100644 unzip/patches/unzip-6.0-cve-2018-18384.patch
create mode 100644 unzip/patches/unzip-6.0-fix-recmatch.patch
create mode 100644 unzip/patches/unzip-6.0-heap-overflow-infloop.patch
create mode 100644 unzip/patches/unzip-6.0-manpage-fix.patch
create mode 100644 unzip/patches/unzip-6.0-overflow-long-fsize.patch
create mode 100644 unzip/patches/unzip-6.0-overflow.patch
create mode 100644 unzip/patches/unzip-6.0-symlink.patch
create mode 100644 unzip/patches/unzip-6.0-timestamp.patch
create mode 100644 unzip/patches/unzip-6.0-valgrind.patch
create mode 100644 unzip/patches/unzip-6.0-x-option.patch
create mode 100644 unzip/patches/unzip-gnu89-build.patch
create mode 100644 unzip/patches/unzip-zipbomb-manpage.patch
create mode 100644 unzip/patches/unzip-zipbomb-part1.patch
create mode 100644 unzip/patches/unzip-zipbomb-part2.patch
create mode 100644 unzip/patches/unzip-zipbomb-part3.patch
create mode 100644 unzip/patches/unzip-zipbomb-part4.patch
create mode 100644 unzip/patches/unzip-zipbomb-part5.patch
create mode 100644 unzip/patches/unzip-zipbomb-part6.patch
create mode 100644 unzip/patches/unzip-zipbomb-switch.patch
Difference in files:
diff --git a/ImageMagick/ImageMagick.nm b/ImageMagick/ImageMagick.nm
index 92037ffc8..f240d11a7 100644
--- a/ImageMagick/ImageMagick.nm
+++ b/ImageMagick/ImageMagick.nm
@@ -4,12 +4,12 @@
###############################################################################
name = ImageMagick
-version = 6.9.3
+version = 7.1.0
+patchlevel = 56
release = 1
-patchlevel = 7
groups = Application/Multimedia
-url = http://www.imagemagick.org/
+url = https://www.imagemagick.org/
license = ImageMagick
summary = Command line programm to create and convert several image formats.
@@ -21,30 +21,60 @@ end
thisapp = %{name}-%{version}-%{patchlevel}
-source_dl = ftp://ftp.ImageMagick.org/pub/%{name}/
+source_dl = https://imagemagick.org/archive/releases/
sources = %{thisapp}.tar.xz
build
requires
+ bzip2-devel
+ fontconfig-devel
+ freetype-devel
+ ghostscript-devel
+ graphviz-devel
+ lcms2-devel
libjpeg-devel
libpng-devel
- librsvg2-devel
libtiff-devel
libxml2-devel
+ pango-devel
+ xz-devel
+ zlib-devel
+ zstd-devel
end
configure_options += \
- --sysconfdir=/etc \
--enable-shared \
--disable-static \
- --with-threads
+ --with-threads \
+ --with-bzlib=yes \
+ --with-fontconfig=yes \
+ --with-freetype=yes \
+ --with-gslib=yes \
+ --with-gvc=yes \
+ --with-jpeg=yes \
+ --with-lcms=yes \
+ --with-lzma=yes \
+ --with-pango=yes \
+ --with-png=yes \
+ --with-tiff=yes \
+ --with-xml=yes \
+ --with-zlib=yes \
+ --with-zstd=yes
end
packages
package %{name}
+ package %{name}-libs
+ template LIBS
+ end
+
package %{name}-devel
template DEVEL
+
+ requires
+ ImageMagick-libs = %{thisver}
+ end
end
package %{name}-debuginfo
diff --git a/acpid/acpid.nm b/acpid/acpid.nm
index f13dfe406..43d508f18 100644
--- a/acpid/acpid.nm
+++ b/acpid/acpid.nm
@@ -4,16 +4,13 @@
###############################################################################
name = acpid
-version = 2.0.27
+version = 2.0.34
release = 1
-# ACPI is only available on x86 architectures.
-sup_arches = x86_64 i686
-
groups = System/Daemons
-url = http://tedfelix.com/linux/acpid-netlink.html
+url = https://sourceforge.net/projects/acpid2/
license = GPLv2+
-summary = ACPI Event Daemon.
+summary = ACPI Event Daemon
description
acpid is a daemon that dispatches ACPI events to user-space programs.
@@ -32,8 +29,6 @@ end
packages
package %{name}
- groups += Base
-
script postin
/usr/bin/systemctl daemon-reload >/dev/null 2>&1 || :
diff --git a/acpid/patches/acpid-2.0.15-makefile.patch b/acpid/patches/acpid-2.0.15-makefile.patch
deleted file mode 100644
index 0168986a6..000000000
--- a/acpid/patches/acpid-2.0.15-makefile.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up acpid-2.0.15/Makefile.am.mk acpid-2.0.15/Makefile.am
---- acpid-2.0.15/Makefile.am.mk 2012-02-17 04:37:12.109907134 +0100
-+++ acpid-2.0.15/Makefile.am 2012-03-16 11:27:15.127573044 +0100
-@@ -20,7 +20,7 @@ acpi_listen_SOURCES = acpi_listen.c log.
-
- dist_man8_MANS = acpid.8 acpi_listen.8
-
--dist_doc_DATA = COPYING Changelog README TESTPLAN TODO
-+dist_doc_DATA =
-
- # Just docs to add to the dist.
- # One problem with this is that it includes all files in the samples dir
-diff -up acpid-2.0.15/Makefile.in.mk acpid-2.0.15/Makefile.in
---- acpid-2.0.15/Makefile.in.mk 2012-03-16 11:28:53.568421905 +0100
-+++ acpid-2.0.15/Makefile.in 2012-03-16 11:29:21.679378750 +0100
-@@ -276,7 +276,7 @@ acpid_SOURCES = acpid.c acpi_ids.c conne
-
- acpi_listen_SOURCES = acpi_listen.c log.c ud_socket.c
- dist_man8_MANS = acpid.8 acpi_listen.8
--dist_doc_DATA = COPYING Changelog README TESTPLAN TODO
-+dist_doc_DATA =
-
- # Just docs to add to the dist.
- # One problem with this is that it includes all files in the samples dir
diff --git a/apr-util/apr-util.nm b/apr-util/apr-util.nm
index b2ab0233f..ebd24b287 100644
--- a/apr-util/apr-util.nm
+++ b/apr-util/apr-util.nm
@@ -4,13 +4,13 @@
###############################################################################
name = apr-util
-version = 1.5.4
+version = 1.6.1
release = 1
groups = System/Libraries
-url = http://apr.apache.org/
+url = https://apr.apache.org/
license = ASL 2.0
-summary = Apache Portable Runtime library.
+summary = Apache Portable Runtime library
description
The mission of the Apache Portable Runtime (APR) is to provide a
@@ -18,8 +18,7 @@ description
portability layer to as many operating systems as possible.
end
-source_dl = http://www.apache.org/dist/apr/
-
+source_dl = https://www.apache.org/dist/apr/
build
requires
@@ -46,17 +45,6 @@ end
packages
package %{name}
- package %{name}-openssl
- summary = APR utility library OpenSSL crytpo support.
- description = %{summary}
-
- requires
- apr-util = %{thisver}
- end
-
- files = %{libdir}/apr-util*/apr_crypto_openssl*
- end
-
package %{name}-devel
template DEVEL
end
diff --git a/autogen/autogen.nm b/autogen/autogen.nm
deleted file mode 100644
index a8d83aba0..000000000
--- a/autogen/autogen.nm
+++ /dev/null
@@ -1,62 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = autogen
-version = 5.18.12
-release = 1
-
-groups = Development/Tools
-url = http://www.gnu.org/software/autogen/
-license = GPLv3
-summary = Automated text file generator.
-
-description
- AutoGen is a tool designed to simplify the creation and maintenance of
- programs that contain large amounts of repetitious text. It is especially
- valuable in programs that have several blocks of text that must be kept
- synchronised.
-end
-
-source_dl = ftp://ftp.gnu.org/gnu/autogen/rel%{version}/
-
-build
- requires
- guile-devel >= 2.0.9-3
- libtool
- libxml2-devel
- end
-
- export LD_LIBRARY_PATH = %{DIR_APP}/autoopts/.libs
-
- prepare_cmds
- # Fix Libtool to remove rpaths.
- rm -vf libtool
- cp -vf $(which libtool) libtool
-
- # Omit unused direct shared library dependencies.
- sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' ./libtool
- end
-
- test
- make check
- end
-
- install_cmds
- rm -vf %{BUILDROOT}%{datadir}/%{name}/autoopts.m4
- rm -vf %{BUILDROOT}%{datadir}/%{name}/libopts-31.0.6.tar.gz
- end
-end
-
-packages
- package %{name}
-
- package %{name}-libs
- template LIBS
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/autogen/patches/autogen-5.9.4-autoopts-config.patch b/autogen/patches/autogen-5.9.4-autoopts-config.patch
deleted file mode 100644
index 6f63077c9..000000000
--- a/autogen/patches/autogen-5.9.4-autoopts-config.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -urNp autogen-5.9.4.orig/autoopts/autoopts-config.in autogen-5.9.4/autoopts/autoopts-config.in
---- autogen-5.9.4.orig/autoopts/autoopts-config.in 2007-12-24 02:33:16.000000000 +0530
-+++ autogen-5.9.4/autoopts/autoopts-config.in 2008-02-25 00:38:27.000000000 +0530
-@@ -17,17 +17,17 @@
- includedir="@includedir@"
- exec_prefix="@exec_prefix@"
- bindir="@bindir@"
-- libdir="@libdir@"
-- ldopts="@AG_LDFLAGS@"
-+ libdir=""
-+ ldopts=""
- exeext="@EXEEXT@"
- version="@AO_CURRENT@:@AO_REVISION@:@AO_AGE@"
- dotver="@AO_CURRENT@.@AO_REVISION@.@AO_AGE@"
- pkgdatadir="${datadir}/${package}"
- autogen="${bindir}/autogen${exeext}"
-- ldflags="-L${libdir} -lopts"
-+ ldflags="-lopts"
- libs="${ldflags}"
- libsrc="${pkgdatadir}/libopts-${dotver}.tar.gz"
-- static_libs="${libdir}/libopts.a"
-+ static_libs=""
- cflags="-I${includedir}"
- test -n "${ldopts}" && ldflags="${ldopts}${libdir} ${ldflags}"
- test "${includedir}" = "/usr/include" && cflags=""
diff --git a/autogen/patches/autogen-5.9.4-pkgconfig.patch b/autogen/patches/autogen-5.9.4-pkgconfig.patch
deleted file mode 100644
index 087de3447..000000000
--- a/autogen/patches/autogen-5.9.4-pkgconfig.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urNp autogen-5.9.4.orig/autoopts/mk-autoopts-pc.in autogen-5.9.4/autoopts/mk-autoopts-pc.in
---- autogen-5.9.4.orig/autoopts/mk-autoopts-pc.in 2007-12-24 02:33:16.000000000 +0530
-+++ autogen-5.9.4/autoopts/mk-autoopts-pc.in 2008-02-24 21:21:13.000000000 +0530
-@@ -18,7 +18,6 @@
- exec_prefix="@exec_prefix@"
- bindir="@bindir@"
- libdir="@libdir@"
-- ldopts="@AG_LDFLAGS@"
- exeext="@EXEEXT@"
- version="@AO_CURRENT@:@AO_REVISION@:@AO_AGE@"
- dotver="@AO_CURRENT@.@AO_REVISION@.@AO_AGE@"
diff --git a/bash-completion/bash-completion.nm b/bash-completion/bash-completion.nm
index f0c3f51f8..faabcfa62 100644
--- a/bash-completion/bash-completion.nm
+++ b/bash-completion/bash-completion.nm
@@ -4,14 +4,14 @@
###############################################################################
name = bash-completion
-version = 2.4
-release = 3
+version = 2.11
+release = 1
arch = noarch
groups = Development/Languages
url = https://github.com/scop/bash-completion
license = GPLv2+
-summary = Programmable completion for Bash.
+summary = Programmable completion for Bash
description
bash-completion is a collection of shell functions that take advantage
@@ -21,24 +21,19 @@ end
source_dl = https://github.com/scop/bash-completion/releases/download/%{version}/
sources = %{thisapp}.tar.xz
-build
- install_cmds
- rm -rvf %{BUILDROOT}%{datadir}/bash-completion/completions/{cawsay,cowthink}
-
- # Drop files which are provided by util-linux >= 2.28 and 2.34
- rm -rvf %{BUILDROOT}%{datadir}/bash-completion/completions/{mount,umount,rfkill}
-
- install -Dpm 644 %{DIR_SOURCE}/bash-completion-1.99-redefine_filedir.bash \
- %{BUILDROOT}%{sysconfdir}/bash_completion.d/redefine_filedir
- end
-end
-
packages
package %{name}
- groups += Base
-
requires
bash >= 4.1
end
+
+ # Recommend to install this package when bash is being installed
+ supplements
+ bash
+ end
+ end
+
+ package %{name}-devel
+ template DEVEL
end
end
diff --git a/c-ares/c-ares.nm b/c-ares/c-ares.nm
index ff05d531c..d28b8ac7b 100644
--- a/c-ares/c-ares.nm
+++ b/c-ares/c-ares.nm
@@ -4,13 +4,13 @@
###############################################################################
name = c-ares
-version = 1.12.0
+version = 1.18.1
release = 1
groups = System/Libraries
-url = http://c-ares.haxx.se/
+url = https://c-ares.org
license = MIT
-summary = A library that performs asynchronous DNS operations.
+summary = A library that performs asynchronous DNS operations
description
c-ares is a C library that performs DNS requests and name resolves
@@ -18,7 +18,7 @@ description
by Greg Hudson at MIT.
end
-source_dl = http://c-ares.haxx.se/download/
+source_dl = https://c-ares.org/download/
build
configure_options += \
diff --git a/check/check.nm b/check/check.nm
new file mode 100644
index 000000000..f2753c637
--- /dev/null
+++ b/check/check.nm
@@ -0,0 +1,41 @@
+###############################################################################
+# IPFire.org - An Open Source Firewall Solution #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
+###############################################################################
+
+name = check
+version = 0.15.2
+release = 1
+
+groups = System/Libraries
+url = https://github.com/libcheck/check
+license = LGPLv2.1
+summary = A unit testing framework for C
+
+description
+ Check is a unit testing framework for C. It features a simple
+ interface for defining unit tests, putting little in the way of
+ the developer. Tests are run in a separate address space, so
+ Check can catch both assertion failures and code errors that
+ cause segmentation faults or other signals.
+end
+
+source_dl = https://github.com/libcheck/check/releases/download/%{version}/
+
+build
+ test
+ LD_LIBRARY_PATH="%{DIR_APP}/src/.libs" make check
+ end
+end
+
+packages
+ package %{name}
+
+ package %{name}-devel
+ template DEVEL
+ end
+
+ package %{name}-debuginfo
+ template DEBUGINFO
+ end
+end
diff --git a/compat-gdbm/compat-gdbm.nm b/compat-gdbm/compat-gdbm.nm
index e00b58f2f..c86db05db 100644
--- a/compat-gdbm/compat-gdbm.nm
+++ b/compat-gdbm/compat-gdbm.nm
@@ -4,7 +4,7 @@
###############################################################################
name = compat-gdbm
-version = 1.8.3
+version = 1.12
release = 1
thisapp = gdbm-%{version}
@@ -20,39 +20,20 @@ description
retrieved in less time than if it was stored in a text file.
end
-source_dl = http://ftp.gnu.org/gnu/gdbm/
+source_dl = https://ftp.gnu.org/gnu/gdbm/
build
- requires
- autoconf
- automake
- libtool
- end
-
- prepare_cmds
- libtoolize --force --copy
- aclocal
- autoconf
-
- # Don't use flock, because it doesn't work on NFS.
- # Use fcntl instead.
- echo "#undef HAVE_FLOCK" >> autoconf.h.in
- end
-
- PARALLELISMFLAGS = # Not supported.
+ CFLAGS += -fcommon
install
- make install install-compat \
+ make install \
prefix=%{BUILDROOT}%{prefix} \
libdir=%{BUILDROOT}%{libdir} \
includedir=%{BUILDROOT}%{includedir} \
mandir=%{BUILDROOT}%{mandir} \
infodir=%{BUILDROOT}%{infodir}
- mkdir -pv %{BUILDROOT}%{includedir}/gdbm
- ln -svf gdbm/gdbm.h %{BUILDROOT}%{includedir}/gdbm.h
-
- # Remove all man pages provided by gdbm-devel.
+ # Remove all man pages provided by gdbm-devel
rm -rfv %{BUILDROOT}%{mandir}/man3
end
end
diff --git a/compat-gdbm/patches/gdbm-1.8.3-fhs.patch b/compat-gdbm/patches/gdbm-1.8.3-fhs.patch
deleted file mode 100644
index 58ce4de0b..000000000
--- a/compat-gdbm/patches/gdbm-1.8.3-fhs.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-diff -up gdbm-1.8.3/Makefile.in.fhs gdbm-1.8.3/Makefile.in
---- gdbm-1.8.3/Makefile.in.fhs 2002-10-08 18:09:12.000000000 +0200
-+++ gdbm-1.8.3/Makefile.in 2010-03-10 15:41:01.516025096 +0100
-@@ -1,7 +1,7 @@
- #### Start of system configuration section. ####
-
- srcdir = @srcdir@
--top_builddir = .
-+top_builddir = @top_builddir@
- VPATH = @srcdir@
-
- CC = @CC@
-@@ -14,17 +14,13 @@ INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA = @INSTALL_DATA@
-
--# File ownership and group
--BINOWN = bin
--BINGRP = bin
--
- MAKEINFO = makeinfo
- TEXI2DVI = texi2dvi
-
--DEFS =
-+DEFS = @DEFS@
-
- # Where the system [n]dbm routines are...
--LIBS = @LIBS@ -lc
-+LIBS = @LIBS@
-
- CFLAGS = @CFLAGS@
- LDFLAGS = @LDFLAGS@
-@@ -32,16 +28,17 @@ LDFLAGS = @LDFLAGS@
- # Common prefix for installation directories
- prefix = @prefix@
- exec_prefix = @exec_prefix@
--binprefix = $(exec_prefix)
--manprefix = $(prefix)
-+datarootdir = @datarootdir@
-
- # Directory in which to put libgdbm.a.
- libdir = @libdir@
- # The include directory for gdbm.h and dbm.h.
- includedir = @includedir@
-+pkgincludedir = $(includedir)/gdbm
- # Info and man directories.
- infodir = @infodir@
--man3dir = @mandir@/man3
-+mandir = @mandir@
-+man3dir = $(mandir)/man3
- manext = 3
-
- #### End of system configuration section. ####
-@@ -57,7 +54,7 @@ manext = 3
-
- SHELL = /bin/sh
-
--PROGS = libgdbm.la testgdbm testdbm testndbm tndbm tdbm conv2gdbm
-+PROGS = libgdbm.la testgdbm testdbm testndbm conv2gdbm
-
- DBM_CF = dbminit.c delete.c fetch.c store.c seq.c close.c
-
-@@ -127,26 +124,17 @@ all: libgdbm.la libgdbm_compat.la
- progs: $(PROGS)
-
- install: libgdbm.la gdbm.h gdbm.info
-- $(srcdir)/mkinstalldirs $(INSTALL_ROOT)$(libdir) \
-- $(INSTALL_ROOT)$(includedir) $(INSTALL_ROOT)$(man3dir) \
-- $(INSTALL_ROOT)$(infodir)
-- $(LIBTOOL) $(INSTALL) -c libgdbm.la $(INSTALL_ROOT)$(libdir)/libgdbm.la
-- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) gdbm.h \
-- $(INSTALL_ROOT)$(includedir)/gdbm.h
-- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.3 \
-- $(INSTALL_ROOT)$(man3dir)/gdbm.3
-- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.info \
-- $(INSTALL_ROOT)$(infodir)/gdbm.info
-+ $(srcdir)/mkinstalldirs $(libdir) $(pkgincludedir) $(man3dir) $(infodir)
-+ $(LIBTOOL) install install libgdbm.la $(libdir)/libgdbm.la
-+ $(INSTALL_DATA) gdbm.h $(pkgincludedir)/gdbm.h
-+ $(INSTALL_DATA) $(srcdir)/gdbm.3 $(man3dir)/gdbm.3
-+ $(INSTALL_DATA) $(srcdir)/gdbm.info $(infodir)/gdbm.info
-
- install-compat:
-- $(srcdir)/mkinstalldirs $(INSTALL_ROOT)$(libdir) \
-- $(INSTALL_ROOT)$(includedir)
-- $(LIBTOOL) $(INSTALL) -c libgdbm_compat.la \
-- $(INSTALL_ROOT)$(libdir)/libgdbm_compat.la
-- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/dbm.h \
-- $(INSTALL_ROOT)$(includedir)/dbm.h
-- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/ndbm.h \
-- $(INSTALL_ROOT)$(includedir)/ndbm.h
-+ $(srcdir)/mkinstalldirs $(libdir) $(pkgincludedir)
-+ $(LIBTOOL) install install libgdbm_compat.la $(libdir)/libgdbm_compat.la
-+ $(INSTALL_DATA) $(srcdir)/dbm.h $(pkgincludedir)/dbm.h
-+ $(INSTALL_DATA) $(srcdir)/ndbm.h $(pkgincludedir)/ndbm.h
-
- #libgdbm.a: $(OBJS) gdbm.h
- # rm -f libgdbm.a
-@@ -161,7 +149,7 @@ libgdbm.la: $(LOBJS) gdbm.h
- libgdbm_compat.la: $(C_LOBJS) gdbm.h
- rm -f libgdbm_compat.la
- $(LIBTOOL) --mode=link $(CC) -o libgdbm_compat.la -rpath $(libdir) \
-- -version-info $(SHLIB_VER) $(C_LOBJS)
-+ -version-info $(SHLIB_VER) $(C_LOBJS) -lgdbm
-
- gdbm.h: gdbm.proto gdbmerrno.h gdbm.proto2
- rm -f gdbm.h
-@@ -172,10 +160,10 @@ gdbm.h: gdbm.proto gdbmerrno.h gdbm.prot
- chmod -w gdbm.h
-
- testgdbm: testgdbm.o libgdbm.la @LIBOBJS@
-- $(LIBTOOL) $(CC) $(LDFLAGS) -o testgdbm testgdbm.o libgdbm.la @LIBOBJS@
-+ $(LIBTOOL) link $(CC) $(LDFLAGS) -o testgdbm testgdbm.o libgdbm.la @LIBOBJS@
-
- testdbm: testdbm.o libgdbm.la libgdbm_compat.la
-- $(LIBTOOL) $(CC) $(LDFLAGS) -o testdbm testdbm.o libgdbm.la libgdbm_compat.la
-+ $(LIBTOOL) link $(CC) $(LDFLAGS) -o testdbm testdbm.o $(LIBS) libgdbm_compat.la
-
- tdbm: testdbm.o
- $(CC) $(LDFLAGS) -o tdbm testdbm.o $(LIBS)
-@@ -184,7 +172,7 @@ testndbm.o: testndbm.c
- $(CC) -c -I. -I$(srcdir) $(CFLAGS) $(DEFS) -DGNU $(srcdir)/testndbm.c
-
- testndbm: testndbm.o libgdbm.la libgdbm_compat.la
-- $(LIBTOOL) $(CC) $(LDFLAGS) -o testndbm testndbm.o libgdbm.la libgdbm_compat.la
-+ $(LIBTOOL) link $(CC) $(LDFLAGS) -o testndbm testndbm.o libgdbm_compat.la
-
- tndbm.o: testndbm.c
- cp $(srcdir)/testndbm.c ./tndbm.c
-@@ -195,7 +183,7 @@ tndbm: tndbm.o
- $(CC) $(LDFLAGS) -o tndbm tndbm.o $(LIBS)
-
- conv2gdbm: conv2gdbm.o libgdbm.la @LIBOBJS@
-- $(LIBTOOL) $(CC) $(LDFLAGS) -o conv2gdbm conv2gdbm.o $(LIBS) libgdbm.la @LIBOBJS@
-+ $(LIBTOOL) link $(CC) $(LDFLAGS) -o conv2gdbm conv2gdbm.o $(LIBS) libgdbm_compat.la @LIBOBJS@
-
- lintgdbm:
- lint $(DEFS) $(LFLAGS) $(DBM_CF) $(NDBM_CF) $(GDBM_CF) testgdbm.c
diff --git a/compat-gdbm/patches/gdbm-1.8.3-filestruct.patch b/compat-gdbm/patches/gdbm-1.8.3-filestruct.patch
deleted file mode 100644
index 3e27db8ec..000000000
--- a/compat-gdbm/patches/gdbm-1.8.3-filestruct.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up gdbm-1.8.3/gdbm.proto.filestruct gdbm-1.8.3/gdbm.proto
---- gdbm-1.8.3/gdbm.proto.filestruct 2011-01-13 09:54:03.004907454 +0100
-+++ gdbm-1.8.3/gdbm.proto 2011-01-13 09:54:24.881714834 +0100
-@@ -60,7 +60,7 @@ typedef struct {
-
-
- /* The file information header. This is good enough for most applications. */
--typedef struct {int dummy[10];} *GDBM_FILE;
-+typedef struct __GDBM_FILE_STRUC {int dummy[10];} *GDBM_FILE;
-
- /* Determine if the C(++) compiler requires complete function prototype */
- #ifndef __P
diff --git a/compat-gdbm/patches/gdbm-1.8.3-ndbmlock.patch b/compat-gdbm/patches/gdbm-1.8.3-ndbmlock.patch
deleted file mode 100644
index 7bc86c3e9..000000000
--- a/compat-gdbm/patches/gdbm-1.8.3-ndbmlock.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-diff -up gdbm-1.8.3/dbmopen.c.dbmlock gdbm-1.8.3/dbmopen.c
---- gdbm-1.8.3/dbmopen.c.dbmlock 1999-05-19 02:16:05.000000000 +0200
-+++ gdbm-1.8.3/dbmopen.c 2011-01-03 16:17:13.847173371 +0100
-@@ -35,6 +35,28 @@
- #include "gdbmerrno.h"
- #include "extern.h"
-
-+static int
-+get_env_bool(env_var, def)
-+ const char *env_var;
-+ int def;
-+{
-+ const char *v = getenv(env_var);
-+ if (!v)
-+ return def;
-+
-+ if (!strcasecmp(v, "yes") ||
-+ !strcasecmp(v, "true") ||
-+ !strcasecmp(v, "on"))
-+ return 1;
-+
-+ if (!strcasecmp(v, "no") ||
-+ !strcasecmp(v, "false") ||
-+ !strcasecmp(v, "off"))
-+ return 0;
-+
-+ return !!atoi(v);
-+}
-+
- /* Initialize ndbm system. FILE is a pointer to the file name. In
- standard dbm, the database is found in files called FILE.pag and
- FILE.dir. To make gdbm compatable with dbm using the dbminit call,
-@@ -62,7 +84,7 @@ dbm_open (file, flags, mode)
- char* dir_file; /* Used to construct "file.dir". */
- struct stat dir_stat; /* Stat information for "file.dir". */
- gdbm_file_info *temp_dbf; /* Temporary file pointer storage. */
--
-+ int gdbm_mode = 0;
-
- /* Prepare the correct names of "file.pag" and "file.dir". */
- pag_file = (char *) malloc (strlen (file)+5);
-@@ -77,26 +99,22 @@ dbm_open (file, flags, mode)
- strcat (pag_file, ".pag");
- strcpy (dir_file, file);
- strcat (dir_file, ".dir");
--
-+
-+ if (!get_env_bool("NDBM_LOCK", 1))
-+ gdbm_mode |= GDBM_NOLOCK;
-
- /* Call the actual routine, saving the pointer to the file information. */
- flags &= O_RDONLY | O_RDWR | O_CREAT | O_TRUNC;
- if (flags == O_RDONLY)
-- {
-- temp_dbf = gdbm_open (pag_file, 0, GDBM_READER, 0, NULL);
-- }
-+ gdbm_mode |= GDBM_READER;
- else if (flags == (O_RDWR | O_CREAT))
-- {
-- temp_dbf = gdbm_open (pag_file, 0, GDBM_WRCREAT, mode, NULL);
-- }
-- else if ( (flags & O_TRUNC) == O_TRUNC)
-- {
-- temp_dbf = gdbm_open (pag_file, 0, GDBM_NEWDB, mode, NULL);
-- }
-+ gdbm_mode |= GDBM_WRCREAT;
-+ else if ((flags & O_TRUNC) == O_TRUNC)
-+ gdbm_mode |= GDBM_NEWDB;
- else
-- {
-- temp_dbf = gdbm_open (pag_file, 0, GDBM_WRITER, 0, NULL);
-- }
-+ gdbm_mode |= GDBM_WRITER;
-+
-+ temp_dbf = gdbm_open (pag_file, 0, gdbm_mode, mode, NULL);
-
- /* Did we successfully open the file? */
- if (temp_dbf == NULL)
-diff -up gdbm-1.8.3/gdbm.3.dbmlock gdbm-1.8.3/gdbm.3
---- gdbm-1.8.3/gdbm.3.dbmlock 2011-01-03 15:59:15.684729255 +0100
-+++ gdbm-1.8.3/gdbm.3 2011-01-03 16:17:49.957570637 +0100
-@@ -543,7 +543,11 @@ you must link in the \fIgdbm_compat\fR l
- .sp
- gcc -o prog proc.c -lgdbm -lgdbm_compat
-
--.SH BUGS
-+.SH "ENVIRONMENT VARIABLES"
-+\fINDBM_LOCK\fR - When the NDBM interface is used, the database file
-+is locked by default. Locking might degrade performance when used on a
-+NFS share. This environment variable can be set to false to tell GDBM
-+not to lock the database file.
-
- .SH "SEE ALSO"
- dbm, ndbm
diff --git a/compat-gdbm/patches/gdbm-1.8.3-shortread.patch b/compat-gdbm/patches/gdbm-1.8.3-shortread.patch
deleted file mode 100644
index 5b6455bec..000000000
--- a/compat-gdbm/patches/gdbm-1.8.3-shortread.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-05_handle-short-read.patch
-
-diff -urNad a/bucket.c b/bucket.c
---- a/bucket.c 1999-05-19 01:16:05.000000000 +0100
-+++ b/bucket.c 2006-04-24 03:18:01.000000000 +0100
-@@ -31,7 +31,7 @@
- #include "autoconf.h"
-
- #include "gdbmdefs.h"
--
-+#include <errno.h>
-
- /* Initializing a new hash buckets sets all bucket entries to -1 hash value. */
- void
-@@ -68,7 +68,8 @@
- int dir_index;
- {
- off_t bucket_adr; /* The address of the correct hash bucket. */
-- int num_bytes; /* The number of bytes read. */
-+ int num_bytes = 0; /* The total number of bytes read. */
-+ int bytes_read; /* Number of bytes read in this syscall */
- off_t file_pos; /* The return address for lseek. */
- register int index; /* Loop index. */
-
-@@ -111,7 +112,12 @@
- if (file_pos != bucket_adr)
- _gdbm_fatal (dbf, "lseek error");
-
-- num_bytes = read (dbf->desc, dbf->bucket, dbf->header->bucket_size);
-+ do
-+ {
-+ bytes_read = read (dbf->desc, dbf->bucket+num_bytes, dbf->header->bucket_size-num_bytes);
-+ if (bytes_read > 0) num_bytes += bytes_read;
-+ }
-+ while ((bytes_read > 0 || (bytes_read == -1 && errno == EINTR)) && num_bytes < dbf->header->bucket_size);
- if (num_bytes != dbf->header->bucket_size)
- _gdbm_fatal (dbf, "read error");
- }
-diff -urNad a/falloc.c b/falloc.c
---- a/falloc.c 2006-04-24 03:17:54.000000000 +0100
-+++ b/falloc.c 2006-04-24 03:18:01.000000000 +0100
-@@ -31,7 +31,7 @@
- #include "autoconf.h"
-
- #include "gdbmdefs.h"
--
-+#include <errno.h>
-
- /* The forward definitions for this file. See the functions for
- the definition of the function. */
-@@ -174,7 +174,8 @@
- pop_avail_block (dbf)
- gdbm_file_info *dbf;
- {
-- int num_bytes; /* For use with the read system call. */
-+ int num_bytes = 0; /* For use with the read system call. */
-+ int bytes_read; /* For use with the read system call. */
- off_t file_pos; /* For use with the lseek system call. */
- avail_elem new_el;
- avail_block *new_blk;
-@@ -199,7 +200,12 @@
- /* Read the block. */
- file_pos = lseek (dbf->desc, new_el.av_adr, L_SET);
- if (file_pos != new_el.av_adr) _gdbm_fatal (dbf, "lseek error");
-- num_bytes = read (dbf->desc, new_blk, new_el.av_size);
-+ do
-+ {
-+ bytes_read = read (dbf->desc, new_blk+num_bytes, new_el.av_size-num_bytes);
-+ if (bytes_read > 0) num_bytes += bytes_read;
-+ }
-+ while ((bytes_read > 0 || (bytes_read == -1 && errno == EINTR)) && num_bytes < new_el.av_size);
- if (num_bytes != new_el.av_size) _gdbm_fatal (dbf, "read error");
-
- /* Add the elements from the new block to the header. */
-diff -urNad a/findkey.c b/findkey.c
---- a/findkey.c 1999-05-19 01:16:06.000000000 +0100
-+++ b/findkey.c 2006-04-24 03:18:01.000000000 +0100
-@@ -31,6 +31,7 @@
- #include "autoconf.h"
-
- #include "gdbmdefs.h"
-+#include <errno.h>
-
-
- /* Read the data found in bucket entry ELEM_LOC in file DBF and
-@@ -41,11 +42,12 @@
- gdbm_file_info *dbf;
- int elem_loc;
- {
-- int num_bytes; /* For seeking and reading. */
-+ int num_bytes = 0; /* For seeking and reading. */
- int key_size;
- int data_size;
- off_t file_pos;
- data_cache_elem *data_ca;
-+ int bytes_read;
-
- /* Is it already in the cache? */
- if (dbf->cache_entry->ca_data.elem_loc == elem_loc)
-@@ -74,7 +76,12 @@
- dbf->bucket->h_table[elem_loc].data_pointer, L_SET);
- if (file_pos != dbf->bucket->h_table[elem_loc].data_pointer)
- _gdbm_fatal (dbf, "lseek error");
-- num_bytes = read (dbf->desc, data_ca->dptr, key_size+data_size);
-+ do
-+ {
-+ bytes_read = read (dbf->desc, data_ca->dptr+num_bytes, key_size+data_size-num_bytes);
-+ if (bytes_read > 0) num_bytes += bytes_read;
-+ }
-+ while ((bytes_read > 0 || (bytes_read == -1 && errno == EINTR)) && num_bytes < key_size+data_size);
- if (num_bytes != key_size+data_size) _gdbm_fatal (dbf, "read error");
-
- return data_ca->dptr;
diff --git a/compat-gdbm/patches/gdbm-1.8.3-zeroheaders.patch b/compat-gdbm/patches/gdbm-1.8.3-zeroheaders.patch
deleted file mode 100644
index 088956aef..000000000
--- a/compat-gdbm/patches/gdbm-1.8.3-zeroheaders.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-02_zero-headers.patch by Jeff Johnson <jbj(a)redhat.com> and Colin Watson <cjwatson(a)debian.org>
-
-diff -urNad a/falloc.c b/falloc.c
---- a/falloc.c 2001-02-28 06:52:33.000000000 +0000
-+++ b/falloc.c 2003-09-08 23:58:43.000000000 +0100
-@@ -272,7 +272,7 @@
-
-
- /* Split the header block. */
-- temp = (avail_block *) malloc (av_size);
-+ temp = (avail_block *) calloc (1, av_size);
- if (temp == NULL) _gdbm_fatal (dbf, "malloc error");
- /* Set the size to be correct AFTER the pop_avail_block. */
- temp->size = dbf->header->avail.size;
-diff -urNad a/gdbmopen.c b/gdbmopen.c
---- a/gdbmopen.c 2003-09-08 23:58:01.000000000 +0100
-+++ b/gdbmopen.c 2003-09-08 23:58:43.000000000 +0100
-@@ -212,7 +212,7 @@
- file_block_size = block_size;
-
- /* Get space for the file header. */
-- dbf->header = (gdbm_file_header *) malloc (file_block_size);
-+ dbf->header = (gdbm_file_header *) calloc (1, file_block_size);
- if (dbf->header == NULL)
- {
- gdbm_close (dbf);
-@@ -256,7 +256,7 @@
- (dbf->header->block_size - sizeof (hash_bucket))
- / sizeof (bucket_element) + 1;
- dbf->header->bucket_size = dbf->header->block_size;
-- dbf->bucket = (hash_bucket *) malloc (dbf->header->bucket_size);
-+ dbf->bucket = (hash_bucket *) calloc (1, dbf->header->bucket_size);
- if (dbf->bucket == NULL)
- {
- gdbm_close (dbf);
-@@ -420,7 +420,7 @@
- for(index = 0; index < size; index++)
- {
- (dbf->bucket_cache[index]).ca_bucket
-- = (hash_bucket *) malloc (dbf->header->bucket_size);
-+ = (hash_bucket *) calloc (1, dbf->header->bucket_size);
- if ((dbf->bucket_cache[index]).ca_bucket == NULL)
- {
- gdbm_errno = GDBM_MALLOC_ERROR;
diff --git a/cpio/cpio.nm b/cpio/cpio.nm
index af5deca80..c9589b611 100644
--- a/cpio/cpio.nm
+++ b/cpio/cpio.nm
@@ -4,26 +4,27 @@
###############################################################################
name = cpio
-version = 2.12
+version = 2.13
release = 1
groups = System/Packaging
-url = http://www.gnu.org/software/cpio/
+url = https://www.gnu.org/software/cpio/
license = GPLv3+
-summary = A GNU archiving program.
+summary = A GNU archiving program
description
- GNU cpio copies files into or out of a cpio or tar archive. Archives \
- are files which contain a collection of other files plus information \
- about them, such as their file name, owner, timestamps, and access \
- permissions. The archive can be another file on the disk, a magnetic \
+ GNU cpio copies files into or out of a cpio or tar archive. Archives
+ are files which contain a collection of other files plus information
+ about them, such as their file name, owner, timestamps, and access
+ permissions. The archive can be another file on the disk, a magnetic
tape, or a pipe.
end
-source_dl = http://ftp.gnu.org/gnu/cpio/
-sources = %{thisapp}.tar.bz2
+source_dl = https://ftp.gnu.org/gnu/cpio/
build
+ CFLAGS += -fcommon
+
configure_options += \
--libexecdir=/tmp \
--with-rmt=/usr/sbin/rmt
diff --git a/curl/curl.nm b/curl/curl.nm
index 70da50d2b..c0e01165f 100644
--- a/curl/curl.nm
+++ b/curl/curl.nm
@@ -5,7 +5,7 @@
name = curl
version = 7.86.0
-release = 1
+release = 2
groups = Application/Internet
url = https://curl.haxx.se/
@@ -29,6 +29,7 @@ build
libssh2-devel
libtool-devel
net-tools
+ nghttp2-devel
openldap-devel
openssl-devel
zlib-devel
diff --git a/dejagnu/dejagnu.nm b/dejagnu/dejagnu.nm
index d6e0a6e3e..b043d0644 100644
--- a/dejagnu/dejagnu.nm
+++ b/dejagnu/dejagnu.nm
@@ -4,12 +4,12 @@
###############################################################################
name = dejagnu
-version = 1.6
+version = 1.6.3
release = 1
arch = noarch
groups = Development/Tools
-url = http://www.gnu.org/software/dejagnu/
+url = https://www.gnu.org/software/dejagnu/
license = GPLv2+
summary = A front end for testing other programs
@@ -17,24 +17,20 @@ description
DejaGnu is an Expect/Tcl based framework for testing other programs.
end
-source_dl = http://mirror.netcologne.de/gnu/dejagnu/
-sources = %{thisapp}.tar.gz
+source_dl = https://ftp.gnu.org/gnu/dejagnu/
build
requires
bison
expect
end
-
- configure_options += \
- --mandir=/usr/share/man
-
end
packages
package %{name}
requires
expect
+ gawk
tcl
end
end
diff --git a/dialog/dialog.nm b/dialog/dialog.nm
deleted file mode 100644
index 17d5d9f6b..000000000
--- a/dialog/dialog.nm
+++ /dev/null
@@ -1,61 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = dialog
-version = 1.1
-svn_ver = 20111020
-release = 2.%{svn_ver}
-thisapp = %{name}-%{version}-%{svn_ver}
-
-groups = Applications/System
-url = http://invisible-island.net/dialog/dialog.html
-license = LGPLv2
-summary = A utility for creating TTY dialog boxes.
-
-description
- Dialog is a utility that allows you to show dialog boxes (containing
- questions or messages) in TTY (text mode) interfaces. Dialog is called
- from within a shell script. The following dialog boxes are implemented:
- yes/no, menu, input, message, text, info, checklist, radiolist, and
- gauge.
-end
-
-source_dl = ftp://invisible-island.net/dialog/
-sources = %{thisapp}.tgz
-
-build
- requires
- chrpath
- findutils
- gettext
- libtool
- ncurses-devel
- end
-
- configure_options += \
- --enable-nls \
- --with-libtool \
- --with-ncursesw \
- --includedir=/usr/include/dialog
-
- install_cmds
- chmod -v 755 %{BUILDROOT}%{libdir}/libdialog.so.*.*.*
-
- # Remove RPATH.
- chrpath --delete %{BUILDROOT}%{bindir}/dialog
- end
-end
-
-packages
- package %{name}
-
- package %{name}-devel
- template DEVEL
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/dialog/patches/dialog-incdir.patch b/dialog/patches/dialog-incdir.patch
deleted file mode 100644
index f31f57bfb..000000000
--- a/dialog/patches/dialog-incdir.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -up dialog-1.1-20110707/dialog-config.in.incdir dialog-1.1-20110707/dialog-config.in
---- dialog-1.1-20110707/dialog-config.in.incdir 2011-01-06 10:38:03.000000000 +0100
-+++ dialog-1.1-20110707/dialog-config.in 2011-07-26 13:00:02.692038027 +0200
-@@ -35,6 +35,7 @@ bindir="@bindir@"
- libdir="@libdir@"
- datadir="@datadir@"
- mandir="@mandir@"
-+includedir="@includedir@"
-
- THIS="@PACKAGE@"
-
-@@ -67,10 +68,7 @@ while test $# -gt 0; do
- ;;
- # compile/link
- --cflags)
-- INCS=
-- if test "${prefix}/include" != /usr/include ; then
-- INCS="-I${prefix}/include"
-- fi
-+ INCS="-I$includedir"
- sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
- $INCS
- ENDECHO
diff --git a/dialog/patches/dialog-libs.patch b/dialog/patches/dialog-libs.patch
deleted file mode 100644
index 866933640..000000000
--- a/dialog/patches/dialog-libs.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -up dialog-1.1-20110707/makefile.in.libs dialog-1.1-20110707/makefile.in
---- dialog-1.1-20110707/makefile.in.libs 2011-06-25 02:27:56.000000000 +0200
-+++ dialog-1.1-20110707/makefile.in 2011-07-26 13:04:50.389183890 +0200
-@@ -176,11 +176,11 @@ dialog$o \
- $(OBJECTS) : $(srcdir)/dialog.h $(srcdir)/dlg_keys.h dlg_config.h VERSION
-
- $(LIB) : $(LIB_OBJECT)
-- $(LIBTOOL_CREATE) $(LIB) $(LIB_OBJECT)
-+ $(LIBTOOL_CREATE) $(LIB) $(LIB_OBJECT) $(LIBS)
- $(RANLIB) $@
-
- dialog$x : $(LIB) dialog$o @INTLDIR_MAKE@ @INTLLIBS@
-- $(LINK) -o $@ dialog$o -L. -l@PACKAGE@ $(LDFLAGS) $(LIBS)
-+ $(LINK) -o $@ dialog$o -L. -l@PACKAGE@ $(LDFLAGS)
-
- clean \
- distclean \
diff --git a/dialog/patches/dialog-multilib.patch b/dialog/patches/dialog-multilib.patch
deleted file mode 100644
index fc35c76a9..000000000
--- a/dialog/patches/dialog-multilib.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -up dialog-1.1-20110707/dialog-config.in.multilib dialog-1.1-20110707/dialog-config.in
---- dialog-1.1-20110707/dialog-config.in.multilib 2011-07-26 13:01:29.929082616 +0200
-+++ dialog-1.1-20110707/dialog-config.in 2011-07-26 13:01:29.932082618 +0200
-@@ -32,7 +32,7 @@ prefix="@prefix@"
- exec_prefix="@exec_prefix@"
-
- bindir="@bindir@"
--libdir="@libdir@"
-+libdir=
- datadir="@datadir@"
- mandir="@mandir@"
- includedir="@includedir@"
-@@ -75,7 +75,7 @@ ENDECHO
- ;;
- --libs)
- sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
-- -L${exec_prefix}/lib -l${THIS} @LIBS@
-+ -l${THIS}
- ENDECHO
- ;;
- # identification
-diff -up dialog-1.1-20110707/headers-sh.in.multilib dialog-1.1-20110707/headers-sh.in
---- dialog-1.1-20110707/headers-sh.in.multilib 2011-01-06 10:38:25.000000000 +0100
-+++ dialog-1.1-20110707/headers-sh.in 2011-07-26 13:02:44.177120225 +0200
-@@ -127,6 +127,7 @@ EOF
- echo "s,#include <${pkgname}_,#include <${PACKAGE}/${pkgname}_," >>$TMPSED
- fi
-
-+ echo '/_FILE_OFFSET_BITS/d' >>$TMPSED
- # reduce the count if possible, since some old sed's limit is 100 lines
- sort -u $TMPSED >headers.tmp
- mv headers.tmp $TMPSED
diff --git a/directfb/directfb.nm b/directfb/directfb.nm
deleted file mode 100644
index 8867297ba..000000000
--- a/directfb/directfb.nm
+++ /dev/null
@@ -1,62 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = directfb
-version = %{ver_major}.%{ver_minor}
-release = 1
-thisapp = DirectFB-%{version}
-
-ver_major = 1.5
-ver_minor = 3
-
-groups = System/Graphics
-url = http://www.directfb.org/
-license = LGPLv2+
-summary = Graphics abstraction library for the Linux Framebuffer Device.
-
-description
- DirectFB is a thin library that provides hardware graphics acceleration,
- input device handling and abstraction, integrated windowing system with
- support for translucent windows and multiple display layers on top of the
- Linux Framebuffer Device.
-end
-
-source_dl = http://www.directfb.org/download/DirectFBGL/DirectFB-%{ver_major}/
-
-build
- requires
- freetype-devel
- libjpeg-devel
- libVNCServer-devel
- perl
- sysfsutils-devel
- zlib-devel
- end
-
- LDFLAGS += \
- -Wl,-z,relro \
- -Wl,-z,noexecstack
-
- configure_options += \
- --disable-x11 \
- --enable-sdl \
- --enable-video4linux2 \
- --enable-zlib \
- --with-dither-rgb16=advanced \
- --disable-mmx \
- --disable-sse
-end
-
-packages
- package %{name}
-
- package %{name}-devel
- template DEVEL
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/directfb/patches/DirectFB-1.5.3-add-missing-davinci-files.patch b/directfb/patches/DirectFB-1.5.3-add-missing-davinci-files.patch
deleted file mode 100644
index bdea60105..000000000
--- a/directfb/patches/DirectFB-1.5.3-add-missing-davinci-files.patch
+++ /dev/null
@@ -1,1697 +0,0 @@
-diff -urNp DirectFB-1.5.3_orig/gfxdrivers/davinci/davinci_c64x.h DirectFB-1.5.3/gfxdrivers/davinci/davinci_c64x.h
---- DirectFB-1.5.3_orig/gfxdrivers/davinci/davinci_c64x.h 1969-12-31 19:00:00.000000000 -0500
-+++ DirectFB-1.5.3/gfxdrivers/davinci/davinci_c64x.h 2012-05-09 02:20:38.342006623 -0400
-@@ -0,0 +1,935 @@
-+/*
-+ TI Davinci driver - C64X+ DSP Library
-+
-+ (c) Copyright 2008 directfb.org
-+ (c) Copyright 2007 Telio AG
-+
-+ Written by Denis Oliver Kropp <dok(a)directfb.org> and
-+ Olaf Dreesen <olaf(a)directfb.org>.
-+
-+ All rights reserved.
-+
-+ This library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU General Public License
-+ version 2 as published by the Free Software Foundation.
-+
-+ This library is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ General Public License for more details.
-+
-+ You should have received a copy of the GNU General Public
-+ License along with this library; if not, write to the
-+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+ Boston, MA 02111-1307, USA.
-+*/
-+
-+#ifndef __DAVINCI_C64X_H__
-+#define __DAVINCI_C64X_H__
-+
-+#include <unistd.h>
-+
-+#include <directfb.h>
-+
-+#include <direct/messages.h>
-+#include <direct/trace.h>
-+
-+#include <linux/c64x.h>
-+
-+#define mb() __asm__ __volatile__ ("" : : : "memory")
-+
-+/**********************************************************************************************************************/
-+
-+typedef struct {
-+ int magic;
-+
-+ int fd;
-+ c64xTaskControl *ctl;
-+ void *mem;
-+
-+ c64xTask *QueueL;
-+} DavinciC64x;
-+
-+typedef struct {
-+ int magic;
-+ unsigned int max_tasks;
-+ unsigned int num_tasks;
-+ c64xTask *tasks;
-+} DavinciC64xTasks;
-+
-+typedef enum {
-+ C64X_TEF_NONE = 0x0000,
-+ C64X_TEF_RESET = 0x0001
-+} DavinciC64xEmitFlags;
-+
-+/**********************************************************************************************************************/
-+
-+DFBResult davinci_c64x_open ( DavinciC64x *c64x );
-+
-+DFBResult davinci_c64x_close ( DavinciC64x *c64x );
-+
-+DFBResult davinci_c64x_wait_low( DavinciC64x *c64x );
-+
-+/**********************************************************************************************************************/
-+
-+DFBResult davinci_c64x_tasks_init ( DavinciC64xTasks *tasks,
-+ unsigned int size );
-+
-+DFBResult davinci_c64x_tasks_destroy( DavinciC64xTasks *tasks );
-+
-+/**********************************************************************************************************************/
-+
-+DFBResult davinci_c64x_emit_tasks( DavinciC64x *c64x,
-+ DavinciC64xTasks *tasks,
-+ DavinciC64xEmitFlags flags );
-+
-+/**********************************************************************************************************************/
-+
-+static const char *state_names[] = { "DONE", "ERROR", "TODO", "RUNNING" };
-+
-+static inline c64xTask *
-+c64x_get_task( DavinciC64x *c64x )
-+{
-+ c64xTaskControl *ctl = c64x->ctl;
-+ uint32_t idx = ctl->QL_arm;
-+ uint32_t next = (idx + 1) & C64X_QUEUE_MASK;
-+ c64xTask *task = &c64x->QueueL[idx];
-+ int loops = 0;
-+ uint32_t idle = 0;
-+
-+ /* Wait for the entry (and next) to be processed by the DSP (rare case). */
-+ while (task->c64x_flags & C64X_FLAG_TODO || ctl->QL_dsp == next) {
-+ if (loops > 666 || (idle && ctl->idlecounter - idle > 666)) {
-+ c64xTask *dsp_task = &c64x->QueueL[ctl->QL_dsp];
-+
-+ D_PERROR( "Davinci/C64X+: Blocked! [DSP %d / %d (%s), ARM %d / %d (%s)]\n",
-+ ctl->QL_dsp,
-+ (dsp_task->c64x_function >> 2) & 0x3fff,
-+ state_names[dsp_task->c64x_function & 3],
-+ ctl->QL_arm,
-+ (task->c64x_function >> 2) & 0x3fff,
-+ state_names[task->c64x_function & 3] );
-+
-+ break;
-+ }
-+
-+ idle = ctl->idlecounter;
-+
-+ /* Queue is full, waiting 10-20ms should not be too bad. */
-+ if (loops++ > 10)
-+ usleep( 5000 );
-+ }
-+
-+ return task;
-+}
-+
-+static inline void
-+c64x_submit_task( DavinciC64x *c64x, c64xTask *task )
-+{
-+ c64xTaskControl *ctl = c64x->ctl;
-+ uint32_t idx = ctl->QL_arm;
-+ uint32_t next = (idx + 1) & C64X_QUEUE_MASK;
-+
-+ mb();
-+
-+ ctl->QL_arm = next;
-+
-+ mb();
-+}
-+
-+/**********************************************************************************************************************/
-+
-+static inline void
-+davinci_c64x_wb_inv_range( DavinciC64x *c64x,
-+ unsigned long start,
-+ u32 length,
-+ u32 func )
-+{
-+ c64xTask *task = c64x_get_task( c64x );
-+
-+ task->c64x_arg[0] = start;
-+ task->c64x_arg[1] = length;
-+ task->c64x_arg[2] = func;
-+
-+ task->c64x_function = C64X_WB_INV_RANGE | C64X_FLAG_TODO;
-+
-+ c64x_submit_task( c64x, task );
-+}
-+
-+static inline void
-+davinci_c64x_write_back_all( DavinciC64x *c64x )
-+{
-+ c64xTask *task = c64x_get_task( c64x );
-+
-+ task->c64x_function = C64X_WRITE_BACK_ALL | C64X_FLAG_TODO;
-+
-+ c64x_submit_task( c64x, task );
-+}
-+
-+/**********************************************************************************************************************/
-+
-+static inline void
-+davinci_c64x_load_block__L( DavinciC64xTasks *tasks,
-+ unsigned long words,
-+ u32 num,
-+ u32 flags )
-+{
-+ c64xTask *task = &tasks->tasks[tasks->num_tasks];
-+
-+ D_ASSERT( tasks->num_tasks < tasks->max_tasks );
-+
-+ task->c64x_arg[0] = words;
-+ task->c64x_arg[1] = num;
-+ task->c64x_arg[2] = flags;
-+
-+ task->c64x_function = C64X_LOAD_BLOCK | C64X_FLAG_TODO;
-+
-+ tasks->num_tasks++;
-+}
-+
-+static inline void
-+davinci_c64x_load_block( DavinciC64x *c64x,
-+ unsigned long words,
-+ u32 num,
-+ u32 flags )
-+{
-+ c64xTask *task = c64x_get_task( c64x );
-+
-+ task->c64x_arg[0] = words;
-+ task->c64x_arg[1] = num;
-+ task->c64x_arg[2] = flags;
-+
-+ task->c64x_function = C64X_LOAD_BLOCK | C64X_FLAG_TODO;
-+
-+ c64x_submit_task( c64x, task );
-+}
-+
-+static inline void
-+davinci_c64x_fetch_uyvy( DavinciC64x *c64x,
-+ unsigned long dest,
-+ unsigned long source,
-+ u32 pitch,
-+ u32 height,
-+ u32 flags )
-+{
-+ c64xTask *task = c64x_get_task( c64x );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = source;
-+ task->c64x_arg[2] = pitch;
-+ task->c64x_arg[3] = height;
-+ task->c64x_arg[4] = flags;
-+
-+ task->c64x_function = C64X_FETCH_UYVY | C64X_FLAG_TODO;
-+
-+ c64x_submit_task( c64x, task );
-+}
-+
-+static inline void
-+davinci_c64x_mc( DavinciC64x *c64x,
-+ unsigned long dest,
-+ u32 dpitch,
-+ unsigned long source0,
-+ unsigned long source1,
-+ u32 spitch,
-+ u32 height,
-+ int func )
-+{
-+ c64xTask *task = c64x_get_task( c64x );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = dpitch;
-+ task->c64x_arg[2] = source0;
-+ task->c64x_arg[3] = source1;
-+ task->c64x_arg[4] = spitch;
-+ task->c64x_arg[5] = height;
-+
-+ task->c64x_function = func | C64X_FLAG_TODO;
-+
-+ c64x_submit_task( c64x, task );
-+}
-+
-+static inline void
-+davinci_c64x_put_idct_uyvy_16x16__L( DavinciC64xTasks *tasks,
-+ unsigned long dest,
-+ u32 pitch,
-+ u32 flags )
-+{
-+ c64xTask *task = &tasks->tasks[tasks->num_tasks];
-+
-+ D_ASSERT( tasks->num_tasks < tasks->max_tasks );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = pitch;
-+ task->c64x_arg[2] = flags;
-+
-+ task->c64x_function = C64X_PUT_IDCT_UYVY_16x16 | C64X_FLAG_TODO;
-+
-+ tasks->num_tasks++;
-+}
-+
-+static inline void
-+davinci_c64x_put_idct_uyvy_16x16( DavinciC64x *c64x,
-+ unsigned long dest,
-+ u32 pitch,
-+ u32 flags )
-+{
-+ c64xTask *task = c64x_get_task( c64x );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = pitch;
-+ task->c64x_arg[2] = flags;
-+
-+ task->c64x_function = C64X_PUT_IDCT_UYVY_16x16 | C64X_FLAG_TODO;
-+
-+ c64x_submit_task( c64x, task );
-+}
-+
-+static inline void
-+davinci_c64x_put_mc_uyvy_16x16__L( DavinciC64xTasks *tasks,
-+ unsigned long dest,
-+ u32 pitch,
-+ u32 flags )
-+{
-+ c64xTask *task = &tasks->tasks[tasks->num_tasks];
-+
-+ D_ASSERT( tasks->num_tasks < tasks->max_tasks );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = pitch;
-+ task->c64x_arg[2] = flags;
-+
-+ task->c64x_function = C64X_PUT_MC_UYVY_16x16 | C64X_FLAG_TODO;
-+
-+ tasks->num_tasks++;
-+}
-+
-+static inline void
-+davinci_c64x_put_mc_uyvy_16x16( DavinciC64x *c64x,
-+ unsigned long dest,
-+ u32 pitch,
-+ u32 flags )
-+{
-+ c64xTask *task = c64x_get_task( c64x );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = pitch;
-+ task->c64x_arg[2] = flags;
-+
-+ task->c64x_function = C64X_PUT_MC_UYVY_16x16 | C64X_FLAG_TODO;
-+
-+ c64x_submit_task( c64x, task );
-+}
-+
-+static inline void
-+davinci_c64x_put_sum_uyvy_16x16__L( DavinciC64xTasks *tasks,
-+ unsigned long dest,
-+ u32 pitch,
-+ u32 flags )
-+{
-+ c64xTask *task = &tasks->tasks[tasks->num_tasks];
-+
-+ D_ASSERT( tasks->num_tasks < tasks->max_tasks );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = pitch;
-+ task->c64x_arg[2] = flags;
-+
-+ task->c64x_function = C64X_PUT_SUM_UYVY_16x16 | C64X_FLAG_TODO;
-+
-+ tasks->num_tasks++;
-+}
-+
-+static inline void
-+davinci_c64x_put_sum_uyvy_16x16( DavinciC64x *c64x,
-+ unsigned long dest,
-+ u32 pitch,
-+ u32 flags )
-+{
-+ c64xTask *task = c64x_get_task( c64x );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = pitch;
-+ task->c64x_arg[2] = flags;
-+
-+ task->c64x_function = C64X_PUT_SUM_UYVY_16x16 | C64X_FLAG_TODO;
-+
-+ c64x_submit_task( c64x, task );
-+}
-+
-+static inline void
-+davinci_c64x_dva_begin_frame__L( DavinciC64xTasks *tasks,
-+ u32 pitch,
-+ unsigned long current,
-+ unsigned long past,
-+ unsigned long future,
-+ u32 flags )
-+{
-+ c64xTask *task = &tasks->tasks[tasks->num_tasks];
-+
-+ D_ASSERT( tasks->num_tasks < tasks->max_tasks );
-+
-+ task->c64x_arg[0] = pitch;
-+ task->c64x_arg[1] = current;
-+ task->c64x_arg[2] = past;
-+ task->c64x_arg[3] = future;
-+ task->c64x_arg[4] = flags;
-+
-+ task->c64x_function = C64X_DVA_BEGIN_FRAME | C64X_FLAG_TODO;
-+
-+ tasks->num_tasks++;
-+}
-+
-+static inline void
-+davinci_c64x_dva_begin_frame( DavinciC64x *c64x,
-+ u32 pitch,
-+ unsigned long current,
-+ unsigned long past,
-+ unsigned long future,
-+ u32 flags )
-+{
-+ c64xTask *task = c64x_get_task( c64x );
-+
-+ task->c64x_arg[0] = pitch;
-+ task->c64x_arg[1] = current;
-+ task->c64x_arg[2] = past;
-+ task->c64x_arg[3] = future;
-+ task->c64x_arg[4] = flags;
-+
-+ task->c64x_function = C64X_DVA_BEGIN_FRAME | C64X_FLAG_TODO;
-+
-+ c64x_submit_task( c64x, task );
-+}
-+
-+static inline void
-+davinci_c64x_dva_motion_block__L( DavinciC64xTasks *tasks,
-+ unsigned long macroblock )
-+{
-+ c64xTask *task = &tasks->tasks[tasks->num_tasks];
-+
-+ D_ASSERT( tasks->num_tasks < tasks->max_tasks );
-+
-+ task->c64x_arg[0] = macroblock;
-+
-+ task->c64x_function = C64X_DVA_MOTION_BLOCK | C64X_FLAG_TODO;
-+
-+ tasks->num_tasks++;
-+}
-+
-+static inline void
-+davinci_c64x_dva_motion_block( DavinciC64x *c64x,
-+ unsigned long macroblock )
-+{
-+ c64xTask *task = c64x_get_task( c64x );
-+
-+ task->c64x_arg[0] = macroblock;
-+
-+ task->c64x_function = C64X_DVA_MOTION_BLOCK | C64X_FLAG_TODO;
-+
-+ c64x_submit_task( c64x, task );
-+}
-+
-+/**********************************************************************************************************************/
-+
-+static inline void
-+davinci_c64x_dva_idct( DavinciC64x *c64x,
-+ unsigned long dest,
-+ u32 pitch,
-+ unsigned long source )
-+{
-+ c64xTask *task = c64x_get_task( c64x );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = pitch;
-+ task->c64x_arg[2] = source;
-+
-+ task->c64x_function = C64X_DVA_IDCT | C64X_FLAG_TODO;
-+
-+ c64x_submit_task( c64x, task );
-+}
-+
-+/**********************************************************************************************************************/
-+
-+static inline void
-+davinci_c64x_put_uyvy_16x16( DavinciC64x *c64x,
-+ unsigned long dest,
-+ u32 pitch,
-+ unsigned long source,
-+ u32 flags )
-+{
-+ c64xTask *task = c64x_get_task( c64x );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = pitch;
-+ task->c64x_arg[2] = source;
-+ task->c64x_arg[3] = flags;
-+
-+ task->c64x_function = C64X_PUT_UYVY_16x16 | C64X_FLAG_TODO;
-+
-+ c64x_submit_task( c64x, task );
-+}
-+
-+static inline void
-+davinci_c64x_dither_argb__L( DavinciC64xTasks *tasks,
-+ unsigned long dst_rgb,
-+ unsigned long dst_alpha,
-+ u32 dst_pitch,
-+ unsigned long source,
-+ u32 src_pitch,
-+ u32 width,
-+ u32 height )
-+{
-+ c64xTask *task = &tasks->tasks[tasks->num_tasks];
-+
-+ D_ASSERT( tasks->num_tasks < tasks->max_tasks );
-+
-+ task->c64x_arg[0] = dst_rgb;
-+ task->c64x_arg[1] = dst_alpha;
-+ task->c64x_arg[2] = dst_pitch;
-+ task->c64x_arg[3] = source;
-+ task->c64x_arg[4] = src_pitch;
-+ task->c64x_arg[5] = width;
-+ task->c64x_arg[6] = height;
-+
-+ task->c64x_function = C64X_DITHER_ARGB | C64X_FLAG_TODO;
-+
-+ tasks->num_tasks++;
-+}
-+
-+static inline void
-+davinci_c64x_dither_argb( DavinciC64x *c64x,
-+ unsigned long dst_rgb,
-+ unsigned long dst_alpha,
-+ u32 dst_pitch,
-+ unsigned long source,
-+ u32 src_pitch,
-+ u32 width,
-+ u32 height )
-+{
-+ c64xTask *task = c64x_get_task( c64x );
-+
-+ task->c64x_arg[0] = dst_rgb;
-+ task->c64x_arg[1] = dst_alpha;
-+ task->c64x_arg[2] = dst_pitch;
-+ task->c64x_arg[3] = source;
-+ task->c64x_arg[4] = src_pitch;
-+ task->c64x_arg[5] = width;
-+ task->c64x_arg[6] = height;
-+
-+ task->c64x_function = C64X_DITHER_ARGB | C64X_FLAG_TODO;
-+
-+ c64x_submit_task( c64x, task );
-+}
-+
-+static inline void
-+davinci_c64x_fill_16__L( DavinciC64xTasks *tasks,
-+ unsigned long dest,
-+ u32 pitch,
-+ u32 width,
-+ u32 height,
-+ u32 value )
-+{
-+ c64xTask *task = &tasks->tasks[tasks->num_tasks];
-+
-+ D_ASSERT( tasks->num_tasks < tasks->max_tasks );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = pitch;
-+ task->c64x_arg[2] = width;
-+ task->c64x_arg[3] = height;
-+ task->c64x_arg[4] = value;
-+
-+ task->c64x_function = C64X_FILL_16 | C64X_FLAG_TODO;
-+
-+ tasks->num_tasks++;
-+}
-+
-+static inline void
-+davinci_c64x_fill_16( DavinciC64x *c64x,
-+ unsigned long dest,
-+ u32 pitch,
-+ u32 width,
-+ u32 height,
-+ u32 value )
-+{
-+ c64xTask *task = c64x_get_task( c64x );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = pitch;
-+ task->c64x_arg[2] = width;
-+ task->c64x_arg[3] = height;
-+ task->c64x_arg[4] = value;
-+
-+ task->c64x_function = C64X_FILL_16 | C64X_FLAG_TODO;
-+
-+ c64x_submit_task( c64x, task );
-+}
-+
-+static inline void
-+davinci_c64x_fill_32__L( DavinciC64xTasks *tasks,
-+ unsigned long dest,
-+ u32 pitch,
-+ u32 width,
-+ u32 height,
-+ u32 value )
-+{
-+ c64xTask *task = &tasks->tasks[tasks->num_tasks];
-+
-+ D_ASSERT( tasks->num_tasks < tasks->max_tasks );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = pitch;
-+ task->c64x_arg[2] = width;
-+ task->c64x_arg[3] = height;
-+ task->c64x_arg[4] = value;
-+
-+ task->c64x_function = C64X_FILL_32 | C64X_FLAG_TODO;
-+
-+ tasks->num_tasks++;
-+}
-+
-+static inline void
-+davinci_c64x_fill_32( DavinciC64x *c64x,
-+ unsigned long dest,
-+ u32 pitch,
-+ u32 width,
-+ u32 height,
-+ u32 value )
-+{
-+ c64xTask *task = c64x_get_task( c64x );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = pitch;
-+ task->c64x_arg[2] = width;
-+ task->c64x_arg[3] = height;
-+ task->c64x_arg[4] = value;
-+
-+ task->c64x_function = C64X_FILL_32 | C64X_FLAG_TODO;
-+
-+ c64x_submit_task( c64x, task );
-+}
-+
-+static inline void
-+davinci_c64x_blit_16__L( DavinciC64xTasks *tasks,
-+ unsigned long dest,
-+ u32 dpitch,
-+ unsigned long src,
-+ u32 spitch,
-+ u32 width,
-+ u32 height )
-+{
-+ c64xTask *task = &tasks->tasks[tasks->num_tasks];
-+
-+ D_ASSERT( tasks->num_tasks < tasks->max_tasks );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = dpitch;
-+ task->c64x_arg[2] = src;
-+ task->c64x_arg[3] = spitch;
-+ task->c64x_arg[4] = width;
-+ task->c64x_arg[5] = height;
-+
-+ task->c64x_function = C64X_COPY_16 | C64X_FLAG_TODO;
-+
-+ tasks->num_tasks++;
-+}
-+
-+static inline void
-+davinci_c64x_blit_16( DavinciC64x *c64x,
-+ unsigned long dest,
-+ u32 dpitch,
-+ unsigned long src,
-+ u32 spitch,
-+ u32 width,
-+ u32 height )
-+{
-+ c64xTask *task = c64x_get_task( c64x );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = dpitch;
-+ task->c64x_arg[2] = src;
-+ task->c64x_arg[3] = spitch;
-+ task->c64x_arg[4] = width;
-+ task->c64x_arg[5] = height;
-+
-+ task->c64x_function = C64X_COPY_16 | C64X_FLAG_TODO;
-+
-+ c64x_submit_task( c64x, task );
-+}
-+
-+static inline void
-+davinci_c64x_blit_32__L( DavinciC64xTasks *tasks,
-+ unsigned long dest,
-+ u32 dpitch,
-+ unsigned long src,
-+ u32 spitch,
-+ u32 width,
-+ u32 height )
-+{
-+ c64xTask *task = &tasks->tasks[tasks->num_tasks];
-+
-+ D_ASSERT( tasks->num_tasks < tasks->max_tasks );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = dpitch;
-+ task->c64x_arg[2] = src;
-+ task->c64x_arg[3] = spitch;
-+ task->c64x_arg[4] = width;
-+ task->c64x_arg[5] = height;
-+
-+ task->c64x_function = C64X_COPY_32 | C64X_FLAG_TODO;
-+
-+ tasks->num_tasks++;
-+}
-+
-+static inline void
-+davinci_c64x_blit_32( DavinciC64x *c64x,
-+ unsigned long dest,
-+ u32 dpitch,
-+ unsigned long src,
-+ u32 spitch,
-+ u32 width,
-+ u32 height )
-+{
-+ c64xTask *task = c64x_get_task( c64x );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = dpitch;
-+ task->c64x_arg[2] = src;
-+ task->c64x_arg[3] = spitch;
-+ task->c64x_arg[4] = width;
-+ task->c64x_arg[5] = height;
-+
-+ task->c64x_function = C64X_COPY_32 | C64X_FLAG_TODO;
-+
-+ c64x_submit_task( c64x, task );
-+}
-+
-+static inline void
-+davinci_c64x_stretch_32__L( DavinciC64xTasks *tasks,
-+ unsigned long dest,
-+ u32 dpitch,
-+ unsigned long src,
-+ u32 spitch,
-+ u32 dw,
-+ u32 dh,
-+ u32 sw,
-+ u32 sh,
-+ const DFBRegion *clip )
-+{
-+ c64xTask *task = &tasks->tasks[tasks->num_tasks];
-+
-+ D_ASSERT( tasks->num_tasks < tasks->max_tasks );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = src;
-+ task->c64x_arg[2] = dpitch | (spitch << 16);
-+ task->c64x_arg[3] = dh | (dw << 16);
-+ task->c64x_arg[4] = sh | (sw << 16);
-+ task->c64x_arg[5] = clip->x2 | (clip->y2 << 16);
-+ task->c64x_arg[6] = clip->x1 | (clip->y1 << 16);
-+
-+ if (sw > dw && sh > dh)
-+ task->c64x_function = C64X_STRETCH_32_down | C64X_FLAG_TODO;
-+ else
-+ task->c64x_function = C64X_STRETCH_32_up | C64X_FLAG_TODO;
-+
-+ tasks->num_tasks++;
-+}
-+
-+static inline void
-+davinci_c64x_stretch_32( DavinciC64x *c64x,
-+ unsigned long dest,
-+ u32 dpitch,
-+ unsigned long src,
-+ u32 spitch,
-+ u32 dw,
-+ u32 dh,
-+ u32 sw,
-+ u32 sh,
-+ const DFBRegion *clip )
-+{
-+ c64xTask *task = c64x_get_task( c64x );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = src;
-+ task->c64x_arg[2] = dpitch | (spitch << 16);
-+ task->c64x_arg[3] = dh | (dw << 16);
-+ task->c64x_arg[4] = sh | (sw << 16);
-+ task->c64x_arg[5] = clip->x2 | (clip->y2 << 16);
-+ task->c64x_arg[6] = clip->x1 | (clip->y1 << 16);
-+
-+ if (sw > dw && sh > dh)
-+ task->c64x_function = C64X_STRETCH_32_down | C64X_FLAG_TODO;
-+ else
-+ task->c64x_function = C64X_STRETCH_32_up | C64X_FLAG_TODO;
-+
-+ c64x_submit_task( c64x, task );
-+}
-+
-+static inline void
-+davinci_c64x_blit_blend_32__L( DavinciC64xTasks *tasks,
-+ u32 sub_func,
-+ unsigned long dest,
-+ u32 dpitch,
-+ unsigned long src,
-+ u32 spitch,
-+ u32 width,
-+ u32 height,
-+ u32 argb,
-+ u8 alpha )
-+{
-+ c64xTask *task = &tasks->tasks[tasks->num_tasks];
-+
-+ D_ASSERT( tasks->num_tasks < tasks->max_tasks );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = dpitch;
-+ task->c64x_arg[2] = src;
-+ task->c64x_arg[3] = spitch;
-+ task->c64x_arg[4] = width | (height << 16);
-+ task->c64x_arg[5] = argb;
-+ task->c64x_arg[6] = alpha;
-+
-+ task->c64x_function = (sub_func << 16) | C64X_BLEND_32 | C64X_FLAG_TODO;
-+
-+ tasks->num_tasks++;
-+}
-+
-+static inline void
-+davinci_c64x_blit_blend_32( DavinciC64x *c64x,
-+ u32 sub_func,
-+ unsigned long dest,
-+ u32 dpitch,
-+ unsigned long src,
-+ u32 spitch,
-+ u32 width,
-+ u32 height,
-+ u32 argb,
-+ u8 alpha )
-+{
-+ c64xTask *task = c64x_get_task( c64x );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = dpitch;
-+ task->c64x_arg[2] = src;
-+ task->c64x_arg[3] = spitch;
-+ task->c64x_arg[4] = width | (height << 16);
-+ task->c64x_arg[5] = argb;
-+ task->c64x_arg[6] = alpha;
-+
-+ task->c64x_function = (sub_func << 16) | C64X_BLEND_32 | C64X_FLAG_TODO;
-+
-+ c64x_submit_task( c64x, task );
-+}
-+
-+static inline void
-+davinci_c64x_blit_keyed_16__L( DavinciC64xTasks *tasks,
-+ unsigned long dest,
-+ u32 dpitch,
-+ unsigned long src,
-+ u32 spitch,
-+ u32 width,
-+ u32 height,
-+ u32 key,
-+ u32 mask )
-+{
-+ c64xTask *task = &tasks->tasks[tasks->num_tasks];
-+
-+ D_ASSERT( tasks->num_tasks < tasks->max_tasks );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = (dpitch << 16) | (spitch & 0xffff);
-+ task->c64x_arg[2] = src;
-+ task->c64x_arg[3] = width;
-+ task->c64x_arg[4] = height;
-+ task->c64x_arg[5] = key;
-+ task->c64x_arg[6] = mask;
-+
-+ task->c64x_function = C64X_COPY_KEYED_16 | C64X_FLAG_TODO;
-+
-+ tasks->num_tasks++;
-+}
-+
-+static inline void
-+davinci_c64x_blit_keyed_16( DavinciC64x *c64x,
-+ unsigned long dest,
-+ u32 dpitch,
-+ unsigned long src,
-+ u32 spitch,
-+ u32 width,
-+ u32 height,
-+ u32 key,
-+ u32 mask )
-+{
-+ c64xTask *task = c64x_get_task( c64x );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = (dpitch << 16) | (spitch & 0xffff);
-+ task->c64x_arg[2] = src;
-+ task->c64x_arg[3] = width;
-+ task->c64x_arg[4] = height;
-+ task->c64x_arg[5] = key;
-+ task->c64x_arg[6] = mask;
-+
-+ task->c64x_function = C64X_COPY_KEYED_16 | C64X_FLAG_TODO;
-+
-+ c64x_submit_task( c64x, task );
-+}
-+
-+static inline void
-+davinci_c64x_blit_keyed_32__L( DavinciC64xTasks *tasks,
-+ unsigned long dest,
-+ u32 dpitch,
-+ unsigned long src,
-+ u32 spitch,
-+ u32 width,
-+ u32 height,
-+ u32 key,
-+ u32 mask )
-+{
-+ c64xTask *task = &tasks->tasks[tasks->num_tasks];
-+
-+ D_ASSERT( tasks->num_tasks < tasks->max_tasks );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = (dpitch << 16) | (spitch & 0xffff);
-+ task->c64x_arg[2] = src;
-+ task->c64x_arg[3] = width;
-+ task->c64x_arg[4] = height;
-+ task->c64x_arg[5] = key;
-+ task->c64x_arg[6] = mask;
-+
-+ task->c64x_function = C64X_COPY_KEYED_32 | C64X_FLAG_TODO;
-+
-+ tasks->num_tasks++;
-+}
-+
-+static inline void
-+davinci_c64x_blit_keyed_32( DavinciC64x *c64x,
-+ unsigned long dest,
-+ u32 dpitch,
-+ unsigned long src,
-+ u32 spitch,
-+ u32 width,
-+ u32 height,
-+ u32 key,
-+ u32 mask )
-+{
-+ c64xTask *task = c64x_get_task( c64x );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = (dpitch << 16) | (spitch & 0xffff);
-+ task->c64x_arg[2] = src;
-+ task->c64x_arg[3] = width;
-+ task->c64x_arg[4] = height;
-+ task->c64x_arg[5] = key;
-+ task->c64x_arg[6] = mask;
-+
-+ task->c64x_function = C64X_COPY_KEYED_32 | C64X_FLAG_TODO;
-+
-+ c64x_submit_task( c64x, task );
-+}
-+
-+#endif
-+
-diff -urNp DirectFB-1.5.3_orig/gfxdrivers/davinci/davincifb.h DirectFB-1.5.3/gfxdrivers/davinci/davincifb.h
---- DirectFB-1.5.3_orig/gfxdrivers/davinci/davincifb.h 1969-12-31 19:00:00.000000000 -0500
-+++ DirectFB-1.5.3/gfxdrivers/davinci/davincifb.h 2012-05-09 02:20:07.271230380 -0400
-@@ -0,0 +1,581 @@
-+/*
-+ * Copyright (C) 2006 Texas Instruments Inc
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option)any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ *
-+ * File: davincifb.h
-+ */
-+
-+#ifndef DAVINVI_VPBE_H
-+#define DAVINVI_VPBE_H
-+
-+/* include Linux files */
-+#include <linux/fb.h>
-+
-+/* define the custom FBIO_WAITFORVSYNC ioctl */
-+#define FBIO_WAITFORVSYNC _IOW('F', 0x20, u_int32_t)
-+#define FBIO_SETATTRIBUTE _IOW('F', 0x21, struct fb_fillrect)
-+
-+/* Backported IOCTLS. */
-+#define FBIO_SETPOSX _IOW('F', 0x22, u_int32_t)
-+#define FBIO_SETPOSY _IOW('F', 0x23, u_int32_t)
-+#define FBIO_SETZOOM _IOW('F', 0x24, struct zoom_params)
-+#define FBIO_GETSTD _IOR('F', 0x25, u_int32_t)
-+#define FBIO_RESIZER _IOW('F', 0x26, struct vpfe_resizer_params)
-+#define FBIO_SYNC _IOW('F', 0x27, u_int32_t)
-+
-+typedef struct zoom_params {
-+ u_int32_t window_id;
-+ u_int32_t zoom_h;
-+ u_int32_t zoom_v;
-+} zoom_params_t;
-+
-+typedef struct vpfe_resizer_params
-+{
-+ u_int32_t rsz_cnt; //busy-lock
-+ u_int32_t out_size; //busy-lock
-+ u_int32_t in_start; //busy-lock
-+ u_int32_t in_size; //busy-lock
-+ u_int32_t sdr_inadd; //shadowed
-+ u_int32_t sdr_inoff; //shadowed
-+ u_int32_t sdr_outadd; //shadowed
-+ u_int32_t sdr_outoff; //shadowed
-+ u_int32_t hfilt[16]; //busy-lock
-+ u_int32_t vfilt[16]; //busy-lock
-+ u_int32_t yenh; //busy-lock
-+} vpfe_resizer_params_t;
-+
-+typedef struct fb_set_start {
-+ int offset; /* offset from smem_start */
-+ unsigned long physical; /* absolute physical address when offset < 0 */
-+
-+ u_int64_t sync; /* input: target sync counter for change or 0 for no sync at all,
-+ output: sync counter of actual change or 0 if still pending */
-+} fb_set_start_t;
-+
-+
-+#ifdef _IOC_TYPECHECK
-+#undef _IOC_TYPECHECK
-+#define _IOC_TYPECHECK(x) (sizeof(x))
-+#endif
-+
-+#define RAM_CLUT_SIZE 256*3
-+#define FBIO_ENABLE_DISABLE_WIN \
-+ _IOW('F', 0x30, unsigned char)
-+#define FBIO_SET_BITMAP_BLEND_FACTOR \
-+ _IOW('F', 0x31, vpbe_bitmap_blend_params_t)
-+#define FBIO_SET_BITMAP_WIN_RAM_CLUT \
-+ _IOW('F', 0x32, unsigned char)*RAM_CLUT_SIZE)
-+#define FBIO_ENABLE_DISABLE_ATTRIBUTE_WIN \
-+ _IOW('F', 0x33, unsigned int)
-+#define FBIO_GET_BLINK_INTERVAL \
-+ _IOR('F', 0x34, vpbe_blink_option_t)
-+#define FBIO_SET_BLINK_INTERVAL \
-+ _IOW('F', 0x35, vpbe_blink_option_t)
-+#define FBIO_GET_VIDEO_CONFIG_PARAMS \
-+ _IOR('F', 0x36, vpbe_video_config_params_t)
-+#define FBIO_SET_VIDEO_CONFIG_PARAMS \
-+ _IOW('F', 0x37, vpbe_video_config_params_t)
-+#define FBIO_GET_BITMAP_CONFIG_PARAMS \
-+ _IOR('F', 0x38, vpbe_bitmap_config_params_t)
-+#define FBIO_SET_BITMAP_CONFIG_PARAMS \
-+ _IOW('F', 0x39, vpbe_bitmap_config_params_t)
-+#define FBIO_SET_DCLK \
-+ _IOW('F', 0x40, vpbe_dclk_t)
-+#define FBIO_SET_INTERFACE \
-+ _IOW('F', 0x41, unsigned char)
-+#define FBIO_GET_INTERFACE \
-+ _IOR('F', 0x42, unsigned char)
-+#define FBIO_QUERY_TIMING \
-+ _IOWR('F', 0x43, struct vpbe_mode_info)
-+#define FBIO_SET_TIMING \
-+ _IOW('F', 0x44, struct vpbe_fb_videomode)
-+#define FBIO_GET_TIMING \
-+ _IOR('F', 0x45, struct vpbe_fb_videomode)
-+#define FBIO_SET_VENC_CLK_SOURCE \
-+ _IOW('F', 0x46, unsigned char)
-+#define FBIO_SET_BACKG_COLOR \
-+ _IOW('F', 0x47, vpbe_backg_color_t)
-+#define FBIO_ENABLE_DISPLAY \
-+ _IOW('F', 0x48, unsigned char)
-+#define FBIO_SETPOS \
-+ _IOW('F', 0x49, u_int32_t)
-+#define FBIO_SET_CURSOR \
-+ _IOW('F', 0x50, struct fb_cursor)
-+#define FBIO_SET_START \
-+ _IOW('F', 0x66, struct fb_set_start)
-+
-+/*
-+ * Defines and Constants
-+ */
-+#ifdef __KERNEL__
-+#define DAVINCIFB_DEVICE "davincifb"
-+#define DAVINCIFB_DRIVER "davincifb"
-+
-+#define MULTIPLE_BUFFERING 1
-+
-+#ifdef MULTIPLE_BUFFERING
-+#define DOUBLE_BUF 2
-+#define TRIPLE_BUF 3
-+#else
-+#define DOUBLE_BUF 1
-+#define TRIPLE_BUF 1
-+#endif
-+
-+/* usage: if (is_win(info->fix.id, OSD0)) ... */
-+#define is_win(name, x) ((strcmp(name, x ## _FBNAME) == 0) ? 1 : 0)
-+
-+/*
-+ * display controller register I/O routines
-+ */
-+u32 dispc_reg_in(u32 offset);
-+u32 dispc_reg_out(u32 offset, u32 val);
-+u32 dispc_reg_merge(u32 offset, u32 val, u32 mask);
-+
-+#endif /*__KERNEL__*/
-+
-+/* Error return codes */
-+#define VPBE_INVALID_PARA_VALUE 700
-+#define VPBE_WRONG_WINDOW_ID 701
-+#define VPBE_CURRENTLY_IN_REQUIRED_MODE 702
-+#define VPBE_INSUFFICIENT_CLUT_VALUES 703
-+#define VPBE_CLUT_WRITE_TIMEOUT 704
-+#define VPBE_VID0_BUF_ADR_NULL 705
-+#define VPBE_WINDOW_NOT_DISABLED 706
-+#define VPBE_WINDOW_NOT_ENABLED 707
-+
-+#ifndef __KERNEL__
-+/* Window ID definations */
-+#define OSD0 0
-+#define VID0 1
-+#define OSD1 2
-+#define VID1 3
-+#endif
-+
-+/* There are 4 framebuffers, each represented by an fb_info and
-+ * a dm_win_info structure */
-+#define OSD0_FBNAME "dm_osd0_fb"
-+#define OSD1_FBNAME "dm_osd1_fb"
-+#define VID0_FBNAME "dm_vid0_fb"
-+#define VID1_FBNAME "dm_vid1_fb"
-+
-+/* FIXME: Digital LCD RGB matrix coefficients */
-+#define DLCD_DGY_VAL 0
-+#define DLCD_DRV_VAL 0
-+#define DLCD_DGU_VAL 0
-+#define DLCD_DBU_VAL 0
-+
-+/* Defines for bitmap format */
-+#define VPBE_BITMAP_BIT_1 1
-+#define VPBE_BITMAP_BIT_2 2
-+#define VPBE_BITMAP_BIT_4 4
-+#define VPBE_BITMAP_BIT_8 8
-+#define VPBE_BITMAP_RGB565 16
-+#define VPBE_VIDEO_YUV422 16
-+#define VPBE_VIDEO_RGB888 24
-+
-+/* Defines foe cursor parameter validation*/
-+#define MAX_CURSOR_WIDTH 0x3FF
-+#define MAX_CURSOR_HEIGHT 0x1FF
-+#define MAX_CURSOR_LINEWIDTH 7
-+
-+#define BASEX 0x80
-+#define BASEY 0x12
-+#define BASEX_DLCD 0x59
-+#define BASEY_DLCD 0x22
-+
-+/*
-+ * Enumerations
-+ */
-+/* Enum for blending factor */
-+typedef enum vpbe_blend_factor {
-+ OSD_CONTRIBUTION_ZERO = 0,
-+ OSD_CONTRIBUTION_1_BY_8 = 1,
-+ OSD_CONTRIBUTION_2_BY_8 = 2,
-+ OSD_CONTRIBUTION_3_BY_8 = 3,
-+ OSD_CONTRIBUTION_4_BY_8 = 4,
-+ OSD_CONTRIBUTION_5_BY_8 = 5,
-+ OSD_CONTRIBUTION_6_BY_8 = 6,
-+ OSD_CONTRIBUTION_ONE = 7
-+} vpbe_blend_factor_t;
-+
-+/* Enum for Boolean variables */
-+typedef enum {
-+ SET_0 = 0,
-+ SET_1 = 1
-+} CB_CR_ORDER, ATTRIBUTE, ROM_RAM_CLUT;
-+
-+/* Defines for Display Interface */
-+#define PRGB 0
-+#define COMPOSITE 1
-+#define SVIDEO 2
-+#define COMPONENT 3
-+#define RGB 4
-+#define YCC16 5
-+#define YCC8 6
-+#define SRGB 7
-+#define EPSON 8
-+#define CASIO1G 9
-+#define UDISP 10
-+#define STN 11
-+#define VPBE_MAX_INTERFACES 12
-+
-+/* Defines for Display Mode */
-+#define LCD 0
-+#define NTSC 1
-+#define PAL 2
-+#define P525 3
-+#define P625 4
-+
-+#define DEFAULT_MODE 0
-+#define P480 0
-+#define P400 1
-+#define P350 2
-+#define NON_EXISTING_MODE 255
-+/* Enable/Disable enum */
-+typedef enum {
-+ VPBE_DISABLE = 0,
-+ VPBE_ENABLE = 1
-+} ATTENUATION, TRANSPARENCY, EXPANSION, BLINKING;
-+
-+typedef enum clk_source {
-+ CLK_SOURCE_CLK27 = 0,
-+ CLK_SOURCE_CLK54 = 1,
-+ CLK_SOURCE_VPBECLK = 2
-+} CLK_SOURCE;
-+
-+/*
-+ * Structures and Union Definitions
-+ */
-+
-+/* Structure for transparency and the blending factor for the bitmap window */
-+typedef struct vpbe_bitmap_blend_params {
-+ unsigned int colorkey; /* color key to be blend */
-+ unsigned int enable_colorkeying; /* enable color keying */
-+ unsigned int bf; /* valid range from 0 to 7 only. */
-+} vpbe_bitmap_blend_params_t;
-+
-+/* Structure for window expansion */
-+typedef struct vpbe_win_expansion {
-+ EXPANSION horizontal;
-+ EXPANSION vertical; /* 1: Enable 0:disable */
-+} vpbe_win_expansion_t;
-+
-+/* Structure for OSD window blinking options */
-+typedef struct vpbe_blink_option {
-+ BLINKING blinking; /* 1: Enable blinking 0: Disable */
-+ unsigned int interval; /* Valid only if blinking is 1 */
-+} vpbe_blink_option_t;
-+
-+/* Structure for DCLK parameters */
-+typedef struct vpbe_dclk {
-+ unsigned char dclk_pattern_width;
-+ unsigned int dclk_pattern0;
-+ unsigned int dclk_pattern1;
-+ unsigned int dclk_pattern2;
-+ unsigned int dclk_pattern3;
-+} vpbe_dclk_t;
-+
-+/* Structure for display format */
-+typedef struct vpbe_display_format {
-+ unsigned char interface; /* Output interface type */
-+ unsigned char mode; /* output mode */
-+} vpbe_display_format_t;
-+
-+/* Structure for background color */
-+typedef struct vpbe_backg_color {
-+ unsigned char clut_select; /* 2: RAM CLUT 1:ROM1 CLUT 0:ROM0 CLUT */
-+ unsigned char color_offset; /* index of color */
-+} vpbe_backg_color_t;
-+
-+/* Structure for Video window configurable parameters */
-+typedef struct vpbe_video_config_params {
-+ CB_CR_ORDER cb_cr_order; /*Cb/Cr order in input data for a pixel. */
-+ /* 0: cb cr 1: cr cb */
-+ vpbe_win_expansion_t exp_info; /* HZ/VT Expansion enable disable */
-+} vpbe_video_config_params_t;
-+
-+/*Union of structures giving the CLUT index for the 1, 2, 4 bit bitmap values.*/
-+typedef union vpbe_clut_idx {
-+ struct _for_4bit_bimap {
-+ unsigned char bitmap_val_0;
-+ unsigned char bitmap_val_1;
-+ unsigned char bitmap_val_2;
-+ unsigned char bitmap_val_3;
-+ unsigned char bitmap_val_4;
-+ unsigned char bitmap_val_5;
-+ unsigned char bitmap_val_6;
-+ unsigned char bitmap_val_7;
-+ unsigned char bitmap_val_8;
-+ unsigned char bitmap_val_9;
-+ unsigned char bitmap_val_10;
-+ unsigned char bitmap_val_11;
-+ unsigned char bitmap_val_12;
-+ unsigned char bitmap_val_13;
-+ unsigned char bitmap_val_14;
-+ unsigned char bitmap_val_15;
-+ } for_4bit_bimap;
-+ struct _for_2bit_bimap {
-+ unsigned char bitmap_val_0;
-+ unsigned char dummy0[4];
-+ unsigned char bitmap_val_1;
-+ unsigned char dummy1[4];
-+ unsigned char bitmap_val_2;
-+ unsigned char dummy2[4];
-+ unsigned char bitmap_val_3;
-+ } for_2bit_bimap;
-+ struct _for_1bit_bimap {
-+ unsigned char bitmap_val_0;
-+ unsigned char dummy0[14];
-+ unsigned char bitmap_val_1;
-+ } for_1bit_bimap;
-+} vpbe_clut_idx_t;
-+
-+/* Structure for bitmap window configurable parameters */
-+typedef struct vpbe_bitmap_config_params {
-+ /* Only for bitmap width = 1,2,4 bits */
-+ vpbe_clut_idx_t clut_idx;
-+ /* Attenuation value for YUV o/p for bitmap window */
-+ unsigned char attenuation_enable;
-+ /* 0: ROM DM270, 1:ROM DM320, 2:RAM CLUT */
-+ unsigned char clut_select;
-+} vpbe_bitmap_config_params_t;
-+
-+/* Unioun for video/OSD configuration parameters */
-+typedef union vpbe_conf_params {
-+
-+ struct vpbe_video_params {
-+ CB_CR_ORDER cb_cr_order;
-+ /* HZ/VT Expansion enable disable */
-+ vpbe_win_expansion_t exp_info;
-+ } video_params;
-+
-+ struct vpbe_bitmap_params {
-+ /* Attenuation value for YUV o/p */
-+ ATTENUATION attenuation_enable;
-+ /* 0: ROM DM270, 1: ROM DM320, 2:RAM CLUT */
-+ unsigned char clut_select;
-+ /* Only for bitmap width = 1,2,4 bits */
-+ vpbe_clut_idx_t clut_idx;
-+ /* 0: OSD window is bitmap window */
-+ /* 1: OSD window is attribute window */
-+ ATTRIBUTE enable_attribute;
-+ /* To hold bps value.
-+ Used to switch back from attribute to bitmap. */
-+ unsigned int stored_bits_per_pixel;
-+ /* Blending information */
-+ vpbe_bitmap_blend_params_t blend_info;
-+ /* OSD Blinking information */
-+ vpbe_blink_option_t blink_info;
-+ } bitmap_params;
-+
-+} vpbe_conf_params_t;
-+
-+typedef struct vpbe_video_params vpbe_video_params_t;
-+typedef struct vpbe_bitmap_params vpbe_bitmap_params_t;
-+
-+/* Structure to hold window position */
-+typedef struct vpbe_window_position {
-+ unsigned int xpos; /* X position of the window */
-+ unsigned int ypos; /* Y position of the window */
-+} vpbe_window_position_t;
-+
-+#ifdef __KERNEL__
-+/* Structure for each window */
-+typedef struct vpbe_dm_win_info {
-+ struct fb_info info;
-+ vpbe_window_position_t win_pos; /* X,Y position of window */
-+ /* Size of window is already there in var_info structure. */
-+
-+ dma_addr_t fb_base_phys; /*framebuffer area */
-+ unsigned int fb_base; /*window memory pointer */
-+ unsigned int fb_size; /*memory size */
-+ unsigned int pseudo_palette[17];
-+ int alloc_fb_mem;
-+ /*flag to identify if framebuffer area is fixed or not */
-+ unsigned long sdram_address;
-+ struct vpbe_dm_info *dm;
-+ unsigned char window_enable; /*Additions for all windows */
-+ zoom_params_t zoom; /*Zooming parameters */
-+ unsigned char field_frame_select; /*To select Field or frame */
-+ unsigned char numbufs; /*Number of buffers valid 2 or 3 */
-+ vpbe_conf_params_t conf_params;
-+ /*window configuration parameter union pointer */
-+} vpbe_dm_win_info_t;
-+#endif /*__KERNEL__*/
-+
-+/*
-+ * Videmode structure for display interface and mode settings
-+ */
-+typedef struct vpbe_fb_videomode {
-+ unsigned char name[10]; /* Mode name ( NTSC , PAL) */
-+ unsigned int vmode; /* FB_MODE_INTERLACED or FB_MODE_NON_INTERLACED */
-+ unsigned int xres; /* X Resolution of the display */
-+ unsigned int yres; /* Y Resolution of the display */
-+ unsigned int fps; /* frames per second */
-+ /* Timing Parameters applicable for std = 0 only */
-+ unsigned int left_margin;
-+ unsigned int right_margin;
-+ unsigned int upper_margin;
-+ unsigned int lower_margin;
-+ unsigned int hsync_len;
-+ unsigned int vsync_len;
-+ unsigned int sync; /* 0: hsync -ve/vsync -ve */
-+ /*1: hsync -ve/vsync +ve */
-+ /*2: hsync +ve/vsync -ve */
-+ /*3: hsync +ve/vsync +ve */
-+ unsigned int basepx; /* Display x,y start position */
-+ unsigned int basepy;
-+/* 1= Mode s available in modelist 0=Mode is not available in modelist */
-+ unsigned int std;
-+} vpbe_fb_videomode_t;
-+
-+/* Structure to interface videomode to application*/
-+typedef struct vpbe_mode_info {
-+ vpbe_fb_videomode_t vid_mode;
-+ unsigned char interface;
-+ unsigned char mode_idx;
-+} vpbe_mode_info_t;
-+
-+#ifdef __KERNEL__
-+/*
-+ * Structure for the driver holding information of windows,
-+ * memory base addresses etc.
-+ */
-+typedef struct vpbe_dm_info {
-+ vpbe_dm_win_info_t *osd0;
-+ vpbe_dm_win_info_t *osd1;
-+ vpbe_dm_win_info_t *vid0;
-+ vpbe_dm_win_info_t *vid1;
-+
-+/* to map the registers */
-+ dma_addr_t mmio_base_phys;
-+ unsigned int mmio_base;
-+ unsigned int mmio_size;
-+
-+ wait_queue_head_t vsync_wait;
-+ unsigned int vsync_cnt;
-+ int timeout;
-+
-+ /* this is the function that configures the output device (NTSC/PAL/LCD)
-+ * for the required output format (composite/s-video/component/rgb)
-+ */
-+ void (*output_device_config) (void);
-+
-+ struct device *dev;
-+
-+ vpbe_backg_color_t backg; /* background color */
-+ vpbe_dclk_t dclk; /*DCLK parameters */
-+ vpbe_display_format_t display; /*Display interface and mode */
-+ vpbe_fb_videomode_t videomode; /*Cuurent videomode */
-+ char ram_clut[256][3]; /*RAM CLUT array */
-+ struct fb_cursor cursor; /* cursor config params from fb.h */
-+/*Flag that indicates whether any of the display is enabled or not*/
-+ int display_enable;
-+} vpbe_dm_info_t;
-+
-+/*
-+ * Functions Definitions for 'davincifb' module
-+ */
-+int vpbe_mem_alloc_window_buf(vpbe_dm_win_info_t *);
-+int vpbe_mem_release_window_buf(vpbe_dm_win_info_t *);
-+void init_display_function(vpbe_display_format_t *);
-+int vpbe_mem_alloc_struct(vpbe_dm_win_info_t **);
-+void set_vid0_default_conf(void);
-+void set_vid1_default_conf(void);
-+void set_osd0_default_conf(void);
-+void set_osd1_default_conf(void);
-+void set_cursor_default_conf(void);
-+void set_dm_default_conf(void);
-+void set_win_enable(char *, unsigned int);
-+int within_vid0_limits(u32, u32, u32, u32);
-+void vpbe_set_display_default(void);
-+#ifdef __KERNEL__
-+void set_win_position(char *, u32, u32, u32, u32);
-+void change_win_param(int);
-+void set_interlaced(char *, unsigned int);
-+#endif /* __KERNEL__ */
-+
-+/*
-+ * Function definations for 'osd' module
-+ */
-+
-+int vpbe_enable_window(vpbe_dm_win_info_t *);
-+int vpbe_disable_window(vpbe_dm_win_info_t *);
-+int vpbe_vid_osd_select_field_frame(u8 *, u8);
-+int vpbe_bitmap_set_blend_factor(u8 *, vpbe_bitmap_blend_params_t *);
-+int vpbe_bitmap_set_ram_clut(void);
-+int vpbe_enable_disable_attribute_window(u32);
-+int vpbe_get_blinking(u8 *, vpbe_blink_option_t *);
-+int vpbe_set_blinking(u8 *, vpbe_blink_option_t *);
-+int vpbe_set_vid_params(u8 *, vpbe_video_config_params_t *);
-+int vpbe_get_vid_params(u8 *, vpbe_video_config_params_t *);
-+int vpbe_bitmap_get_params(u8 *, vpbe_bitmap_config_params_t *);
-+int vpbe_bitmap_set_params(u8 *, vpbe_bitmap_config_params_t *);
-+int vpbe_set_cursor_params(struct fb_cursor *);
-+int vpbe_set_vid_expansion(vpbe_win_expansion_t *);
-+int vpbe_set_dclk(vpbe_dclk_t *);
-+int vpbe_set_display_format(vpbe_display_format_t *);
-+int vpbe_set_backg_color(vpbe_backg_color_t *);
-+int vpbe_set_interface(u8);
-+int vpbe_query_mode(vpbe_mode_info_t *);
-+int vpbe_set_mode(struct vpbe_fb_videomode *);
-+int vpbe_set_venc_clk_source(u8);
-+void set_vid0_default_conf(void);
-+void set_osd0_default_conf(void);
-+void set_vid1_default_conf(void);
-+void set_osd1_default_conf(void);
-+void set_cursor_default_conf(void);
-+void set_dm_default_conf(void);
-+/*
-+ * Function definations for 'venc' module
-+ */
-+
-+void davincifb_ntsc_composite_config(void);
-+void davincifb_ntsc_svideo_config(void);
-+void davincifb_ntsc_component_config(void);
-+void davincifb_pal_composite_config(void);
-+void davincifb_pal_svideo_config(void);
-+void davincifb_pal_component_config(void);
-+
-+void vpbe_davincifb_ntsc_rgb_config(void);
-+void vpbe_davincifb_pal_rgb_config(void);
-+void vpbe_davincifb_525p_component_config(void);
-+void vpbe_davincifb_625p_component_config(void);
-+
-+void vpbe_enable_venc(int);
-+void vpbe_enable_dacs(int);
-+/*
-+ * Function definations for 'dlcd' module
-+ */
-+void vpbe_davincifb_480p_prgb_config(void);
-+void vpbe_davincifb_400p_prgb_config(void);
-+void vpbe_davincifb_350p_prgb_config(void);
-+void vpbe_set_display_timing(struct vpbe_fb_videomode *);
-+
-+void vpbe_enable_lcd(int);
-+/*
-+ * Following functions are not implemented
-+ */
-+void vpbe_davincifb_default_ycc16_config(void);
-+void vpbe_davincifb_default_ycc8_config(void);
-+void vpbe_davincifb_default_srgb_config(void);
-+void vpbe_davincifb_default_epson_config(void);
-+void vpbe_davincifb_default_casio_config(void);
-+void vpbe_davincifb_default_UDISP_config(void);
-+void vpbe_davincifb_default_STN_config(void);
-+#endif /*__KERNEL__*/
-+
-+#endif /* End of #ifndef DAVINCI_VPBE_H */
-diff -urNp DirectFB-1.5.3_orig/gfxdrivers/davinci/davinci_gfxdriver.h DirectFB-1.5.3/gfxdrivers/davinci/davinci_gfxdriver.h
---- DirectFB-1.5.3_orig/gfxdrivers/davinci/davinci_gfxdriver.h 1969-12-31 19:00:00.000000000 -0500
-+++ DirectFB-1.5.3/gfxdrivers/davinci/davinci_gfxdriver.h 2012-05-09 02:19:40.797421031 -0400
-@@ -0,0 +1,169 @@
-+/*
-+ TI Davinci driver - Graphics Driver
-+
-+ (c) Copyright 2007 Telio AG
-+
-+ Written by Denis Oliver Kropp <dok(a)directfb.org>
-+
-+ Code is derived from VMWare driver.
-+
-+ (c) Copyright 2001-2009 The world wide DirectFB Open Source Community (directfb.org)
-+ (c) Copyright 2000-2004 Convergence (integrated media) GmbH
-+
-+ All rights reserved.
-+
-+ This library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Lesser General Public
-+ License as published by the Free Software Foundation; either
-+ version 2 of the License, or (at your option) any later version.
-+
-+ This library is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ Lesser General Public License for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with this library; if not, write to the
-+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+ Boston, MA 02111-1307, USA.
-+*/
-+
-+#ifndef __DAVINCI_GFXDRIVER_H__
-+#define __DAVINCI_GFXDRIVER_H__
-+
-+#include <sys/ioctl.h>
-+#include <davincifb.h>
-+
-+#include <core/surface_buffer.h>
-+
-+#include "davincifb.h"
-+
-+#include "davinci_c64x.h"
-+
-+
-+typedef struct {
-+ /* validation flags */
-+ int v_flags;
-+
-+ /* cached/computed values */
-+ void *dst_addr;
-+ unsigned long dst_phys;
-+ unsigned int dst_size;
-+ unsigned long dst_pitch;
-+ DFBSurfacePixelFormat dst_format;
-+ unsigned long dst_bpp;
-+
-+ void *src_addr;
-+ unsigned long src_phys;
-+ unsigned long src_pitch;
-+ DFBSurfacePixelFormat src_format;
-+ unsigned long src_bpp;
-+
-+ unsigned long source_mult;
-+
-+ unsigned long fillcolor;
-+
-+ int blit_blend_sub_function;
-+ int draw_blend_sub_function;
-+
-+ DFBColor color;
-+ unsigned long color_argb;
-+ unsigned long colorkey;
-+
-+ DFBSurfaceBlittingFlags blitting_flags;
-+
-+ DFBRegion clip;
-+
-+ /** Add shared data here... **/
-+ struct fb_fix_screeninfo fix[4];
-+
-+ CoreSurfacePool *osd_pool;
-+ CoreSurfacePool *video_pool;
-+
-+ bool synced;
-+} DavinciDeviceData;
-+
-+
-+typedef struct {
-+ int num;
-+ int fd;
-+ void *mem;
-+ int size;
-+} DavinciFB;
-+
-+typedef struct {
-+ DavinciDeviceData *ddev;
-+
-+ CoreDFB *core;
-+
-+ CoreScreen *screen;
-+ CoreLayer *osd;
-+ CoreLayer *video;
-+
-+ DavinciFB fb[4];
-+
-+ DavinciC64x c64x;
-+ bool c64x_present;
-+
-+ DavinciC64xTasks tasks;
-+} DavinciDriverData;
-+
-+
-+static inline DFBResult
-+davincifb_pan_display( const DavinciFB *fb,
-+ struct fb_var_screeninfo *var,
-+ const CoreSurfaceBufferLock *lock,
-+ DFBSurfaceFlipFlags flags,
-+ int x,
-+ int y )
-+{
-+ int ret;
-+
-+ if (lock) {
-+#ifdef FBIO_SET_START
-+ CoreSurfaceBuffer *buffer = lock->buffer;
-+ struct fb_set_start set_start;
-+
-+ /* physical mode */
-+ set_start.offset = -1;
-+ set_start.sync = (flags & DSFLIP_ONSYNC) ? 1 : 0;
-+
-+ /* life's so easy */
-+ set_start.physical = lock->phys + DFB_BYTES_PER_LINE( buffer->format, x ) + y * lock->pitch;
-+
-+ ret = ioctl( fb->fd, FBIO_SET_START, &set_start );
-+ if (ret < 0)
-+ D_DEBUG( "FBIO_SET_START (0x%08lx, sync %llu) failed!\n",
-+ set_start.physical, set_start.sync );
-+
-+ if (ret == 0) {
-+ if (flags & DSFLIP_WAIT)
-+ ioctl( fb->fd, FBIO_WAITFORVSYNC );
-+
-+ return DFB_OK;
-+ }
-+
-+ /* fallback */
-+#endif
-+ var->xoffset = x; /* poor version */
-+ var->yoffset = y + lock->offset / lock->pitch;
-+ }
-+ else {
-+ var->xoffset = x;
-+ var->yoffset = y;
-+ }
-+
-+ var->activate = /*(flags & DSFLIP_ONSYNC) ? FB_ACTIVATE_VBL :*/ FB_ACTIVATE_NOW;
-+
-+ ret = ioctl( fb->fd, FBIOPAN_DISPLAY, var );
-+ if (ret)
-+ D_PERROR( "Davinci/FB: FBIOPAN_DISPLAY (fb%d - %d,%d) failed!\n",
-+ fb->num, var->xoffset, var->yoffset );
-+
-+ if (flags & DSFLIP_WAIT)
-+ ioctl( fb->fd, FBIO_WAITFORVSYNC );
-+
-+ return DFB_OK;
-+}
-+
-+#endif
diff --git a/directfb/patches/DirectFB-1.5.3-gcc-atomics-on-arm.patch b/directfb/patches/DirectFB-1.5.3-gcc-atomics-on-arm.patch
deleted file mode 100644
index 1f488e952..000000000
--- a/directfb/patches/DirectFB-1.5.3-gcc-atomics-on-arm.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- DirectFB-1.5.3_orig/lib/direct/atomic.h 2011-07-31 14:51:06.000000000 -0400
-+++ DirectFB-1.5.3/lib/direct/atomic.h 2012-05-09 01:24:02.692169840 -0400
-@@ -185,20 +185,13 @@
-
- #if defined(ARCH_ARM) && !defined(ARCH_IWMMXT)
-
--static inline int _D__atomic_cmpxchg(volatile int *ptr, int old, int new)
-+static inline int _D__atomic_cmpxchg(volatile int *ptr, int old, int _new)
- {
-- unsigned long oldval, res;
-
-- do {
-- __asm__ __volatile__("@ atomic_cmpxchg\n"
-- "ldrex %1, [%2]\n"
-- "mov %0, #0\n"
-- "teq %1, %3\n"
-- "strexeq %0, %4, [%2]\n"
-- : "=&r" (res), "=&r" (oldval)
-- : "r" (ptr), "Ir" (old), "r" (new)
-- : "cc");
-- } while (res);
-+ unsigned long oldval = old;
-+
-+ __atomic_compare_exchange_n(ptr, &oldval, _new,
-+ false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST);
-
- return oldval;
- }
-@@ -220,24 +213,14 @@ static inline int _D__atomic_cmpxchg(vol
-
- static inline int _D__atomic_add_return(int i, volatile int *v)
- {
-- unsigned long tmp;
-- int result;
-
-- __asm__ __volatile__("@ atomic_add_return\n"
--"1: ldrex %0, [%2]\n"
--" add %0, %0, %3\n"
--" strex %1, %0, [%2]\n"
--" teq %1, #0\n"
--" bne 1b"
-- : "=&r" (result), "=&r" (tmp)
-- : "r" (v), "Ir" (i)
-- : "cc");
-+ int result = __atomic_add_fetch(v, i, __ATOMIC_SEQ_CST);
-
- return result;
- }
-
- #define D_SYNC_ADD_AND_FETCH( ptr, value ) \
-- (_D__atomic_add_return( (int) (value), (void*) (ptr) ))
-+ (_D__atomic_add_return( (int) (value), (volatile int*) (ptr) ))
-
- #endif
-
-@@ -308,7 +291,7 @@ static inline int _D__atomic_add_return(
- }
-
- #define D_SYNC_ADD_AND_FETCH( ptr, value ) \
-- (_D__atomic_add_return( (int) (value), (void*) (ptr) ))
-+ (_D__atomic_add_return( (int) (value), (volatile int*) (ptr) ))
-
- #endif
-
diff --git a/directfb/patches/DirectFB-1.5.3-lm.patch b/directfb/patches/DirectFB-1.5.3-lm.patch
deleted file mode 100644
index 440213764..000000000
--- a/directfb/patches/DirectFB-1.5.3-lm.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -up DirectFB-1.5.3/tests/Makefile.am.lm DirectFB-1.5.3/tests/Makefile.am
---- DirectFB-1.5.3/tests/Makefile.am.lm 2011-08-23 23:43:18.208040936 +0200
-+++ DirectFB-1.5.3/tests/Makefile.am 2011-08-23 23:46:11.940784728 +0200
-@@ -98,11 +98,11 @@ dfbtest_gl1_LDADD = $(libdirectfb) $(l
-
- dfbtest_gl2_SOURCES = dfbtest_gl2.c
- dfbtest_gl2_CFLAGS = $(GLES2_CFLAGS)
--dfbtest_gl2_LDADD = $(libdirectfb) $(libvoodoo) $(libfusion) $(libdirect) $(GLES2_LIBS)
-+dfbtest_gl2_LDADD = $(libdirectfb) $(libvoodoo) $(libfusion) $(libdirect) $(GLES2_LIBS) -lm
-
- dfbtest_gl3_SOURCES = dfbtest_gl3.c
- dfbtest_gl3_CFLAGS = $(GLES2_CFLAGS)
--dfbtest_gl3_LDADD = $(libdirectfb) $(libvoodoo) $(libfusion) $(libdirect) $(GLES2_LIBS)
-+dfbtest_gl3_LDADD = $(libdirectfb) $(libvoodoo) $(libfusion) $(libdirect) $(GLES2_LIBS) -lm
-
- dfbtest_mirror_SOURCES = dfbtest_mirror.c
- dfbtest_mirror_LDADD = $(libdirectfb) $(libvoodoo) $(libfusion) $(libdirect)
-diff -up DirectFB-1.5.3/tests/Makefile.in.lm DirectFB-1.5.3/tests/Makefile.in
---- DirectFB-1.5.3/tests/Makefile.in.lm 2011-08-07 10:17:49.000000000 +0200
-+++ DirectFB-1.5.3/tests/Makefile.in 2011-08-23 23:46:54.616981247 +0200
-@@ -575,10 +575,10 @@ dfbtest_gl1_CFLAGS = $(GLES2_CFLAGS)
- dfbtest_gl1_LDADD = $(libdirectfb) $(libvoodoo) $(libfusion) $(libdirect) $(GLES2_LIBS)
- dfbtest_gl2_SOURCES = dfbtest_gl2.c
- dfbtest_gl2_CFLAGS = $(GLES2_CFLAGS)
--dfbtest_gl2_LDADD = $(libdirectfb) $(libvoodoo) $(libfusion) $(libdirect) $(GLES2_LIBS)
-+dfbtest_gl2_LDADD = $(libdirectfb) $(libvoodoo) $(libfusion) $(libdirect) $(GLES2_LIBS) -lm
- dfbtest_gl3_SOURCES = dfbtest_gl3.c
- dfbtest_gl3_CFLAGS = $(GLES2_CFLAGS)
--dfbtest_gl3_LDADD = $(libdirectfb) $(libvoodoo) $(libfusion) $(libdirect) $(GLES2_LIBS)
-+dfbtest_gl3_LDADD = $(libdirectfb) $(libvoodoo) $(libfusion) $(libdirect) $(GLES2_LIBS) -lm
- dfbtest_mirror_SOURCES = dfbtest_mirror.c
- dfbtest_mirror_LDADD = $(libdirectfb) $(libvoodoo) $(libfusion) $(libdirect)
- dfbtest_reinit_SOURCES = dfbtest_reinit.c
diff --git a/dmraid/dmraid.nm b/dmraid/dmraid.nm
deleted file mode 100644
index 5581d0344..000000000
--- a/dmraid/dmraid.nm
+++ /dev/null
@@ -1,71 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = dmraid
-version = 1.0.0.rc16
-release = 1
-
-groups = System/Filesystems
-url = http://people.redhat.com/heinzm/sw/dmraid
-license = GPLv2+
-summary = Device-mapper RAID tool and library.
-
-description
- DMRAID supports RAID device discovery, RAID set activation, creation,
- removal, rebuild and display of properties for ATARAID/DDF1 metadata on
- Linux >= 2.4 using device-mapper.
-end
-
-source_dl = http://people.redhat.com/heinzm/sw/dmraid/src/old/
-sources = %{thisapp}.tar.bz2
-
-build
- requires
- libdevmapper-devel >= 2.02.166
- end
-
- DIR_APP = %{DIR_SRC}/%{name}/%{version}
- PARALLELISMFLAGS = # Disabled
-
- make_install_targets += sbindir=%{BUILDROOT}%{sbindir}
-
- configure_options += \
- --disable-static \
- --disable-static_link
-
- # Dmraid doesn't automatically build and install a versioned library
- # so we do it on or own.
- build_cmds
- make -C lib libdmraid.so
- end
-
- test
- # Package does not offer any kind of testsuite.
- end
-
- install_cmds
- # Install development headers.
- mkdir -pv %{BUILDROOT}%{includedir}/dmraid
- install -m 644 include/dmraid/*.h %{BUILDROOT}%{includedir}/dmraid/
-
- # Manually install versioned library and create symlinks.
- mkdir -pv %{BUILDROOT}%{libdir}
- install -m 755 lib/libdmraid.so %{BUILDROOT}%{libdir}/libdmraid.so.%{version}
- ln -sv libdmraid.so.%{version} %{BUILDROOT}%{libdir}/libdmraid.so.1
- ln -sv libdmraid.so.%{version} %{BUILDROOT}%{libdir}/libdmraid.so
- end
-end
-
-packages
- package %{name}
-
- package %{name}-devel
- template DEVEL
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/dracut/dracut.nm b/dracut/dracut.nm
index abd0323c8..195e3f555 100644
--- a/dracut/dracut.nm
+++ b/dracut/dracut.nm
@@ -5,12 +5,12 @@
name = dracut
version = 048
-release = 3
+release = 8
groups = System/Boot
url = http://sourceforge.net/apps/trac/dracut/wiki
license = GPLv2+
-summary = Initramfs generator using udev.
+summary = Initramfs generator using udev
description
dracut is a new, event-driven initramfs infrastructure based around udev.
@@ -45,18 +45,34 @@ build
mandir=%{mandir}
install_cmds
+ # Remove unneeded/unsupported modules
+ rm -rfv \
+ %{BUILDROOT}%{dracutlibdir}/modules.d/00dash \
+ %{BUILDROOT}%{dracutlibdir}/modules.d/00systemd-network-management \
+ %{BUILDROOT}%{dracutlibdir}/modules.d/01fips \
+ %{BUILDROOT}%{dracutlibdir}/modules.d/05busybox \
+ %{BUILDROOT}%{dracutlibdir}/modules.d/35network-* \
+ %{BUILDROOT}%{dracutlibdir}/modules.d/40network \
+ %{BUILDROOT}%{dracutlibdir}/modules.d/45url-lib \
+ %{BUILDROOT}%{dracutlibdir}/modules.d/45ifcfg \
+ %{BUILDROOT}%{dracutlibdir}/modules.d/50gensplash \
+ %{BUILDROOT}%{dracutlibdir}/modules.d/62bluetooth \
+ %{BUILDROOT}%{dracutlibdir}/modules.d/95fcoe* \
+ %{BUILDROOT}%{dracutlibdir}/modules.d/95iscsi \
+ %{BUILDROOT}%{dracutlibdir}/modules.d/95nbd \
+ %{BUILDROOT}%{dracutlibdir}/modules.d/95nfs \
+ %{BUILDROOT}%{dracutlibdir}/modules.d/95znet
+
# Install local configuration
- mkdir -pv %{BUILDROOT}/etc/dracut.conf.d
- cp -vf %{DIR_SOURCE}/ipfire.conf %{BUILDROOT}/etc/dracut.conf.d/ipfire.conf
+ mkdir -pv %{BUILDROOT}%{dracutlibdir}/dracut.conf.d
+ install -v -m 644 %{DIR_SOURCE}/ipfire.conf \
+ %{BUILDROOT}%{dracutlibdir}/dracut.conf.d/ipfire.conf
# Save package version
mkdir -pv %{BUILDROOT}/%{dracutlibdir}/dracut
echo "DRACUT_VERSION=%{version}-%{release}" > \
%{BUILDROOT}/%{dracutlibdir}/dracut/dracut-version.sh
- # Remove Gentoo specific module
- rm -rvf %{BUILDROOT}%{dracutlibdir}/modules.d/50gensplash
-
mkdir -pv %{BUILDROOT}/boot/dracut
mkdir -pv %{BUILDROOT}/var/lib/dracut/overlay
mkdir -pv %{BUILDROOT}/var/lib/initramfs
@@ -75,7 +91,7 @@ packages
bzip2
cpio
coreutils
- dmraid
+ device-mapper
e2fsprogs
eject
findutils
@@ -84,7 +100,6 @@ packages
kbd
kpartx
less
- lvm2
mdadm
sysvinit
systemd >= 187
@@ -92,42 +107,11 @@ packages
udev
util-linux
which
+ zstd
end
end
- package %{name}-network
- summary = Network support for the initramdisk.
- description
- This package requires everything which is needed to build a generic
- all purpose initramfs with network support with dracut.
- end
-
- requires
- dhclient
- iproute2
- nfs-utils
- end
-
- files
- /usr/lib/dracut/modules.d/40network
- /usr/lib/dracut/modules.d/95fcoe
- /usr/lib/dracut/modules.d/95iscsi
- /usr/lib/dracut/modules.d/95nbd
- /usr/lib/dracut/modules.d/95nfs
- /usr/lib/dracut/modules.d/45ifcfg
- /usr/lib/dracut/modules.d/95znet
- end
- end
-
- package %{name}-utils
- summary = Command line utils for dracut.
- description = %{summary}
-
- files
- /boot/dracut
- /usr/bin/dracut-*
- /usr/share/man/man8/dracut-*
- /var/lib/dracut
- end
+ package %{name}-debuginfo
+ template DEBUGINFO
end
end
diff --git a/dracut/ipfire.conf b/dracut/ipfire.conf
index a6b717c60..0f866c6d2 100644
--- a/dracut/ipfire.conf
+++ b/dracut/ipfire.conf
@@ -1,13 +1,7 @@
-# Dracut config file customized for IPFire.
+# Dracut config file customized for IPFire
-# i18n
-i18n_vars="/etc/vconsole.conf:KEYTABLE-KEYMAP,SYSFONT-FONT,FONTACM-FONT_MAP,FONT_UNIMAP"
-#add_dracutmodules+=" "
-stdloglvl=3
-prefix="/"
-systemdutildir=/usr/lib/systemd
-systemdsystemunitdir=/usr/lib/systemd/system
-udevdir=/usr/lib/udev
-add_dracutmodules+=" systemd "
-realinitpath="/usr/lib/systemd/systemd"
-kernel_cmdline+=" rd.auto=1 "
+# Load microcode for the CPU early
+early_microcode="yes"
+
+# Compress using Zstandard
+compress="zstd"
diff --git a/gdbm/gdbm.nm b/gdbm/gdbm.nm
index 29cd94e8e..41502010b 100644
--- a/gdbm/gdbm.nm
+++ b/gdbm/gdbm.nm
@@ -4,22 +4,22 @@
###############################################################################
name = gdbm
-version = 1.12
+version = 1.23
release = 1
groups = Development/Tools
-url = http://www.gnu.org/software/gdbm/
+url = https://www.gnu.org.ua/software/gdbm/
license = GPLv3+
-summary = The GDBM package contains the GNU Database Manager.
+summary = The GDBM package contains the GNU Database Manager
description
- The GDBM package contains the GNU Database Manager. This is a disk file \
- format database which stores key/data-pairs in single files. The actual \
- data of any record being stored is indexed by a unique key, which can be \
+ The GDBM package contains the GNU Database Manager. This is a disk file
+ format database which stores key/data-pairs in single files. The actual
+ data of any record being stored is indexed by a unique key, which can be
retrieved in less time than if it was stored in a text file.
end
-source_dl = http://ftp.gnu.org/gnu/gdbm/
+source_dl = https://ftp.gnu.org/gnu/gdbm/
build
requires
diff --git a/gdbm/patches/gdbm-1.10-fedora.patch b/gdbm/patches/gdbm-1.10-fedora.patch
deleted file mode 100644
index 18a4d5e01..000000000
--- a/gdbm/patches/gdbm-1.10-fedora.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up gdbm-1.10/NOTE-WARNING.fedora gdbm-1.10/NOTE-WARNING
---- gdbm-1.10/NOTE-WARNING.fedora 2011-11-14 17:43:41.267566501 +0100
-+++ gdbm-1.10/NOTE-WARNING 2011-11-14 17:47:53.312549265 +0100
-@@ -12,8 +12,8 @@ systems where it is not the default. `L
- when a system uses 64bit file offsets. Gdbm has, of course, supported `large
- files' on systems where it was the default for a very long time.
-
--On some systems, such as Solaris, this functionality is not enabled by
--default. Gdbm will now enable it. THIS MEANS THAT GDBM 1.9 MAY NOT BE
-+On some systems this functionality is not enabled by default. To enable it,
-+build rpm with option --with=largefile. THIS MEANS THAT GDBM 1.9 MAY NOT BE
- ABLE TO ACCESS DATABASES CREATED BY PREVIOUS VERIONS ON THE SAME SYSTEM.
-
- Running the `configure' script with the `--disable-largefile' flag should
diff --git a/gdbm/patches/gdbm-1.10-zeroheaders.patch b/gdbm/patches/gdbm-1.10-zeroheaders.patch
deleted file mode 100644
index a268f6bdf..000000000
--- a/gdbm/patches/gdbm-1.10-zeroheaders.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -up gdbm-1.10/src/falloc.c.zeroheaders gdbm-1.10/src/falloc.c
---- gdbm-1.10/src/falloc.c.zeroheaders 2011-11-11 11:59:11.000000000 +0100
-+++ gdbm-1.10/src/falloc.c 2011-11-14 17:34:32.487604027 +0100
-@@ -255,7 +255,7 @@ push_avail_block (GDBM_FILE dbf)
-
-
- /* Split the header block. */
-- temp = (avail_block *) malloc (av_size);
-+ temp = (avail_block *) calloc (1, av_size);
- if (temp == NULL) _gdbm_fatal (dbf, _("malloc error"));
- /* Set the size to be correct AFTER the pop_avail_block. */
- temp->size = dbf->header->avail.size;
-diff -up gdbm-1.10/src/gdbmopen.c.zeroheaders gdbm-1.10/src/gdbmopen.c
---- gdbm-1.10/src/gdbmopen.c.zeroheaders 2011-11-11 19:39:42.000000000 +0100
-+++ gdbm-1.10/src/gdbmopen.c 2011-11-14 17:33:24.867608650 +0100
-@@ -264,7 +264,7 @@ gdbm_open (const char *file, int block_s
- (dbf->header->block_size - sizeof (hash_bucket))
- / sizeof (bucket_element) + 1;
- dbf->header->bucket_size = dbf->header->block_size;
-- dbf->bucket = (hash_bucket *) malloc (dbf->header->bucket_size);
-+ dbf->bucket = (hash_bucket *) calloc (1, dbf->header->bucket_size);
- if (dbf->bucket == NULL)
- {
- gdbm_close (dbf);
-@@ -456,7 +456,7 @@ _gdbm_init_cache(GDBM_FILE dbf, size_t s
- for(index = 0; index < size; index++)
- {
- (dbf->bucket_cache[index]).ca_bucket
-- = (hash_bucket *) malloc (dbf->header->bucket_size);
-+ = (hash_bucket *) calloc (1, dbf->header->bucket_size);
- if ((dbf->bucket_cache[index]).ca_bucket == NULL)
- {
- gdbm_errno = GDBM_MALLOC_ERROR;
diff --git a/graphviz/graphviz.nm b/graphviz/graphviz.nm
new file mode 100644
index 000000000..625c554b2
--- /dev/null
+++ b/graphviz/graphviz.nm
@@ -0,0 +1,69 @@
+###############################################################################
+# IPFire.org - An Open Source Firewall Solution #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
+###############################################################################
+
+name = graphviz
+version = 7.0.4
+release = 1
+
+groups = Development/Tools
+url = https://gitlab.com/graphviz/graphviz
+license = EPL
+summary = Graph Visualization Tools
+
+description
+ Graph visualization is a way of representing structural information
+ as diagrams of abstract graphs and networks. It has important
+ applications in networking, bioinformatics, software engineering,
+ database and web design, machine learning, and in visual interfaces
+ for other technical domains.
+end
+
+source_dl = https://gitlab.com/graphviz/graphviz/-/archive/%{version}/
+sources = %{thisapp}.tar.bz2
+
+build
+ requires
+ autoconf
+ automake
+ bison
+ cairo-devel
+ flex
+ fontconfig-devel
+ ghostscript-devel
+ libjpeg-devel
+ libpng-devel
+ libtool
+ pango-devel
+ end
+
+ prepare_cmds
+ ./autogen.sh
+ end
+
+ test
+ make check
+ end
+end
+
+packages
+ package %{name}
+
+ package %{name}-libs
+ template LIBS
+ end
+
+ package %{name}-devel
+ template DEVEL
+
+ requires
+ graphviz = %{thisver}
+ graphviz-libs = %{thisver}
+ end
+ end
+
+ package %{name}-debuginfo
+ template DEBUGINFO
+ end
+end
diff --git a/hwloc/hwloc.nm b/hwloc/hwloc.nm
new file mode 100644
index 000000000..a8b8b6137
--- /dev/null
+++ b/hwloc/hwloc.nm
@@ -0,0 +1,66 @@
+###############################################################################
+# IPFire.org - An Open Source Firewall Solution #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
+###############################################################################
+
+name = hwloc
+version = %{ver_maj}.0
+ver_maj = 2.9
+release = 1
+
+groups = System/Libraries
+url = https://www.open-mpi.org/projects/hwloc/
+license = BSD
+summary = Portable Hardware Locality
+
+description
+ The Portable Hardware Locality (hwloc) software package provides
+ a portable abstraction (across OS, versions, architectures, ...)
+ of the hierarchical topology of modern architectures, including NUMA
+ memory nodes, sockets, shared caches, cores and simultaneous
+ multithreading. It also gathers various system attributes such as
+ cache and memory information as well as the locality of I/O devices
+ such as network interfaces, InfiniBand HCAs or GPUs.
+end
+
+source_dl = https://download.open-mpi.org/release/hwloc/v%{ver_maj}
+
+build
+ requires
+ cairo-devel
+ diffutils
+ libpciaccess-devel
+ libtool
+ libudev-devel
+ libxml2-devel
+ pciutils
+ end
+
+ configure_options += \
+ --enable-plugins
+
+ test
+ LD_LIBRARY_PATH="%{DIR_APP}/hwloc/.libs" \
+ make check XFAIL_TESTS="test-gather-topology.sh"
+ end
+end
+
+packages
+ package %{name}
+
+ package %{name}-libs
+ template LIBS
+ end
+
+ package %{name}-devel
+ template DEVEL
+
+ requires
+ hwloc-libs = %{thisver}
+ end
+ end
+
+ package %{name}-debuginfo
+ template DEBUGINFO
+ end
+end
diff --git a/libdaq/libdaq.nm b/libdaq/libdaq.nm
new file mode 100644
index 000000000..80c27f1a8
--- /dev/null
+++ b/libdaq/libdaq.nm
@@ -0,0 +1,68 @@
+###############################################################################
+# IPFire.org - An Open Source Firewall Solution #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
+###############################################################################
+
+name = libdaq
+version = 3.0.10
+release = 2
+
+groups = System/Libraries
+url = https://github.com/snort3/libdaq
+license = GPLv2
+summary = LibDAQ: The Data AcQuisition Library
+
+description
+ LibDAQ is a pluggable abstraction layer for interacting with a data
+ source (traditionally a network interface or network data plane).
+ Applications using LibDAQ use the library API defined in daq.h to load,
+ configure, and interact with pluggable DAQ modules.
+end
+
+source_dl = https://github.com/snort3/libdaq/archive/refs/tags/v%{version}.tar.gz#/
+
+build
+ requires
+ autoconf
+ automake
+ cmocka-devel
+ libdnet-devel
+ libmnl-devel
+ libnetfilter_queue-devel
+ libpcap-devel
+ libtool
+ end
+
+ prepare_cmds
+ ./bootstrap
+ end
+
+ configure_options += \
+ --disable-static
+
+ # TODO Sadly the testsuite does not compile:
+ # /usr/bin/ld: ../api/.libs/libdaq.a(libdaq_la-daq_base.o): in function `daq_load_dynamic_module':
+ # /usr/src/debug/libdaq-3.0.10/api/daq_base.c:207: undefined reference to `__wrap_stat'
+
+ test
+ make check || :
+ end
+
+ install_cmds
+ # Remove all static libraries
+ rm -rvf %{BUILDROOT}%{libdir}/*.a
+ rm -rvf %{BUILDROOT}%{libdir}/pkgconfig/libdaq_static*.pc
+ end
+end
+
+packages
+ package %{name}
+
+ package %{name}-devel
+ template DEVEL
+ end
+
+ package %{name}-debuginfo
+ template DEBUGINFO
+ end
+end
diff --git a/libdnet/libdnet.nm b/libdnet/libdnet.nm
index 65036b393..3d7065341 100644
--- a/libdnet/libdnet.nm
+++ b/libdnet/libdnet.nm
@@ -4,39 +4,35 @@
###############################################################################
name = libdnet
-version = 1.12
+version = 1.16.1
release = 1
+thisapp = libdnet-libdnet-%{version}
groups = System/Libraries
-url = http://code.google.com/p/libdnet/
+url = https://github.com/ofalk/libdnet
license = BSD
-summary = Simple portable interface to lowlevel networking routines.
+summary = Simple portable interface to lowlevel networking routines
description
- libdnet provides a simplified, portable interface to several \
- low-level networking routines, including network address \
- manipulation, kernel arp(4) cache and route(4) table lookup and \
- manipulation, network firewalling (IP filter, ipfw, ipchains, \
- pf, ...), network interface lookup and manipulation, raw IP \
+ libdnet provides a simplified, portable interface to several
+ low-level networking routines, including network address
+ manipulation, kernel arp(4) cache and route(4) table lookup and
+ manipulation, network firewalling (IP filter, ipfw, ipchains,
+ pf, ...), network interface lookup and manipulation, raw IP
packet and Ethernet frame, and data transmission.
end
-source_dl =
-sources = %{thisapp}.tgz
+source_dl = https://github.com/ofalk/libdnet/archive/refs/tags/libdnet-%{version}.tar.g…
build
requires
+ check-devel
gcc-c++
end
-
- configure_options += \
- --sbindir=/sbin \
- --mandir=/usr/share
end
packages
package %{name}
- end
package %{name}-devel
template DEVEL
diff --git a/libdnet/patches/libdnet-1.12-shrext.patch b/libdnet/patches/libdnet-1.12-shrext.patch
deleted file mode 100644
index 6d8df2319..000000000
--- a/libdnet/patches/libdnet-1.12-shrext.patch
+++ /dev/null
@@ -1,327 +0,0 @@
-diff -urN libdnet-1.12/configure libdnet-1.12-patched/configure
---- libdnet-1.12/configure 2007-01-20 05:39:54.000000000 -0600
-+++ libdnet-1.12-patched/configure 2007-02-15 09:06:27.000000000 -0600
-@@ -7053,7 +7053,7 @@
- # Tell ltmain to make .lib files, not .a files.
- libext=lib
- # Tell ltmain to make .dll files, not .so files.
-- shrext=".dll"
-+ shrext_cmds=".dll"
- # FIXME: Setting linknames here is a bad hack.
- archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll${_S_}linknames='
- # The linker will automatically build a .lib file if we build a DLL.
-@@ -7580,7 +7580,7 @@
- library_names_spec=
- libname_spec='lib$name'
- soname_spec=
--shrext=".so"
-+shrext_cmds=".so"
- postinstall_cmds=
- postuninstall_cmds=
- finish_cmds=
-@@ -7693,7 +7693,7 @@
-
- cygwin* | mingw* | pw32*)
- version_type=windows
-- shrext=".dll"
-+ shrext_cmds=".dll"
- need_version=no
- need_lib_prefix=no
-
-@@ -7761,7 +7761,7 @@
- soname_spec='${libname}${release}${major}$shared_ext'
- shlibpath_overrides_runpath=yes
- shlibpath_var=DYLD_LIBRARY_PATH
-- shrext='$(test .$module = .yes && echo .so || echo .dylib)'
-+ shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
- if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -7830,7 +7830,7 @@
- need_version=no
- case "$host_cpu" in
- ia64*)
-- shrext='.so'
-+ shrext_cmds='.so'
- hardcode_into_libs=yes
- dynamic_linker="$host_os dld.so"
- shlibpath_var=LD_LIBRARY_PATH
-@@ -7845,7 +7845,7 @@
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
- ;;
- hppa*64*)
-- shrext='.sl'
-+ shrext_cmds='.sl'
- hardcode_into_libs=yes
- dynamic_linker="$host_os dld.sl"
- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -7856,7 +7856,7 @@
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
- ;;
- *)
-- shrext='.sl'
-+ shrext_cmds='.sl'
- dynamic_linker="$host_os dld.sl"
- shlibpath_var=SHLIB_PATH
- shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -7992,7 +7992,7 @@
-
- os2*)
- libname_spec='$name'
-- shrext=".dll"
-+ shrext_cmds=".dll"
- need_lib_prefix=no
- library_names_spec='$libname${shared_ext} $libname.a'
- dynamic_linker='OS/2 ld.exe'
-@@ -9201,7 +9201,7 @@
- libext="$libext"
-
- # Shared library suffix (normally ".so").
--shrext='$shrext'
-+shrext_cmds='$shrext_cmds'
-
- # Executable file suffix (normally "").
- exeext="$exeext"
-@@ -11257,7 +11257,7 @@
- library_names_spec=
- libname_spec='lib$name'
- soname_spec=
--shrext=".so"
-+shrext_cmds=".so"
- postinstall_cmds=
- postuninstall_cmds=
- finish_cmds=
-@@ -11370,7 +11370,7 @@
-
- cygwin* | mingw* | pw32*)
- version_type=windows
-- shrext=".dll"
-+ shrext_cmds=".dll"
- need_version=no
- need_lib_prefix=no
-
-@@ -11438,7 +11438,7 @@
- soname_spec='${libname}${release}${major}$shared_ext'
- shlibpath_overrides_runpath=yes
- shlibpath_var=DYLD_LIBRARY_PATH
-- shrext='$(test .$module = .yes && echo .so || echo .dylib)'
-+ shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
- if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -11507,7 +11507,7 @@
- need_version=no
- case "$host_cpu" in
- ia64*)
-- shrext='.so'
-+ shrext_cmds='.so'
- hardcode_into_libs=yes
- dynamic_linker="$host_os dld.so"
- shlibpath_var=LD_LIBRARY_PATH
-@@ -11522,7 +11522,7 @@
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
- ;;
- hppa*64*)
-- shrext='.sl'
-+ shrext_cmds='.sl'
- hardcode_into_libs=yes
- dynamic_linker="$host_os dld.sl"
- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -11533,7 +11533,7 @@
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
- ;;
- *)
-- shrext='.sl'
-+ shrext_cmds='.sl'
- dynamic_linker="$host_os dld.sl"
- shlibpath_var=SHLIB_PATH
- shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -11669,7 +11669,7 @@
-
- os2*)
- libname_spec='$name'
-- shrext=".dll"
-+ shrext_cmds=".dll"
- need_lib_prefix=no
- library_names_spec='$libname${shared_ext} $libname.a'
- dynamic_linker='OS/2 ld.exe'
-@@ -12751,7 +12751,7 @@
- libext="$libext"
-
- # Shared library suffix (normally ".so").
--shrext='$shrext'
-+shrext_cmds='$shrext_cmds'
-
- # Executable file suffix (normally "").
- exeext="$exeext"
-@@ -13832,7 +13832,7 @@
- # Tell ltmain to make .lib files, not .a files.
- libext=lib
- # Tell ltmain to make .dll files, not .so files.
-- shrext=".dll"
-+ shrext_cmds=".dll"
- # FIXME: Setting linknames here is a bad hack.
- archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll${_S_}linknames='
- # The linker will automatically build a .lib file if we build a DLL.
-@@ -14359,7 +14359,7 @@
- library_names_spec=
- libname_spec='lib$name'
- soname_spec=
--shrext=".so"
-+shrext_cmds=".so"
- postinstall_cmds=
- postuninstall_cmds=
- finish_cmds=
-@@ -14472,7 +14472,7 @@
-
- cygwin* | mingw* | pw32*)
- version_type=windows
-- shrext=".dll"
-+ shrext_cmds=".dll"
- need_version=no
- need_lib_prefix=no
-
-@@ -14540,7 +14540,7 @@
- soname_spec='${libname}${release}${major}$shared_ext'
- shlibpath_overrides_runpath=yes
- shlibpath_var=DYLD_LIBRARY_PATH
-- shrext='$(test .$module = .yes && echo .so || echo .dylib)'
-+ shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
- if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -14609,7 +14609,7 @@
- need_version=no
- case "$host_cpu" in
- ia64*)
-- shrext='.so'
-+ shrext_cmds='.so'
- hardcode_into_libs=yes
- dynamic_linker="$host_os dld.so"
- shlibpath_var=LD_LIBRARY_PATH
-@@ -14624,7 +14624,7 @@
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
- ;;
- hppa*64*)
-- shrext='.sl'
-+ shrext_cmds='.sl'
- hardcode_into_libs=yes
- dynamic_linker="$host_os dld.sl"
- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14635,7 +14635,7 @@
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
- ;;
- *)
-- shrext='.sl'
-+ shrext_cmds='.sl'
- dynamic_linker="$host_os dld.sl"
- shlibpath_var=SHLIB_PATH
- shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14771,7 +14771,7 @@
-
- os2*)
- libname_spec='$name'
-- shrext=".dll"
-+ shrext_cmds=".dll"
- need_lib_prefix=no
- library_names_spec='$libname${shared_ext} $libname.a'
- dynamic_linker='OS/2 ld.exe'
-@@ -15047,7 +15047,7 @@
- libext="$libext"
-
- # Shared library suffix (normally ".so").
--shrext='$shrext'
-+shrext_cmds='$shrext_cmds'
-
- # Executable file suffix (normally "").
- exeext="$exeext"
-@@ -16130,7 +16130,7 @@
- # Tell ltmain to make .lib files, not .a files.
- libext=lib
- # Tell ltmain to make .dll files, not .so files.
-- shrext=".dll"
-+ shrext_cmds=".dll"
- # FIXME: Setting linknames here is a bad hack.
- archive_cmds_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll${_S_}linknames='
- # The linker will automatically build a .lib file if we build a DLL.
-@@ -16657,7 +16657,7 @@
- library_names_spec=
- libname_spec='lib$name'
- soname_spec=
--shrext=".so"
-+shrext_cmds=".so"
- postinstall_cmds=
- postuninstall_cmds=
- finish_cmds=
-@@ -16770,7 +16770,7 @@
-
- cygwin* | mingw* | pw32*)
- version_type=windows
-- shrext=".dll"
-+ shrext_cmds=".dll"
- need_version=no
- need_lib_prefix=no
-
-@@ -16838,7 +16838,7 @@
- soname_spec='${libname}${release}${major}$shared_ext'
- shlibpath_overrides_runpath=yes
- shlibpath_var=DYLD_LIBRARY_PATH
-- shrext='$(test .$module = .yes && echo .so || echo .dylib)'
-+ shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
- if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -16907,7 +16907,7 @@
- need_version=no
- case "$host_cpu" in
- ia64*)
-- shrext='.so'
-+ shrext_cmds='.so'
- hardcode_into_libs=yes
- dynamic_linker="$host_os dld.so"
- shlibpath_var=LD_LIBRARY_PATH
-@@ -16922,7 +16922,7 @@
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
- ;;
- hppa*64*)
-- shrext='.sl'
-+ shrext_cmds='.sl'
- hardcode_into_libs=yes
- dynamic_linker="$host_os dld.sl"
- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -16933,7 +16933,7 @@
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
- ;;
- *)
-- shrext='.sl'
-+ shrext_cmds='.sl'
- dynamic_linker="$host_os dld.sl"
- shlibpath_var=SHLIB_PATH
- shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17069,7 +17069,7 @@
-
- os2*)
- libname_spec='$name'
-- shrext=".dll"
-+ shrext_cmds=".dll"
- need_lib_prefix=no
- library_names_spec='$libname${shared_ext} $libname.a'
- dynamic_linker='OS/2 ld.exe'
-@@ -18151,7 +18151,7 @@
- libext="$libext"
-
- # Shared library suffix (normally ".so").
--shrext='$shrext'
-+shrext_cmds='$shrext_cmds'
-
- # Executable file suffix (normally "").
- exeext="$exeext"
-@@ -18595,7 +18595,7 @@
- libext="$libext"
-
- # Shared library suffix (normally ".so").
--shrext='$shrext'
-+shrext_cmds='$shrext_cmds'
-
- # Executable file suffix (normally "").
- exeext="$exeext"
diff --git a/librsvg2/librsvg2.nm b/librsvg2/librsvg2.nm
deleted file mode 100644
index ca36275fd..000000000
--- a/librsvg2/librsvg2.nm
+++ /dev/null
@@ -1,68 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = librsvg2
-version = 2.40.15
-major_ver = 2.40
-release = 2
-
-groups = System/Libraries
-url =
-license = LGPLv2+
-summary = A SVG library based on cairo.
-
-description
- librsvg is a SVG library based on cairo.
-end
-
-thisapp = librsvg-%{version}
-
-source_dl = http://download.gnome.org/sources/librsvg/%{major_ver}/
-sources = %{thisapp}.tar.xz
-
-build
- requires
- cairo-devel
- cairo-gobject-devel
- gdk-pixbuf2-devel
- gobject-introspection-devel
- libcroco-devel
- libxml2-devel
- pango-devel
- end
-
- export GDK_PIXBUF_QUERYLOADERS=%{bindir}/gdk-pixbuf-query-loaders
- export LD_LIBRARY_PATH = %{DIR_APP}/.libs
-
- configure_options += \
- --disable-static \
- --disable-gtk-theme \
- --disable-gtk-doc \
- enable_pixbuf_loader=yes
-end
-
-packages
- package %{name}
- script postin
- gdk-pixbuf-query-loaders --update-cache || :
- end
-
- script postun
- gdk-pixbuf-query-loaders --update-cache || :
- end
-
- script postup
- gdk-pixbuf-query-loaders --update-cache || :
- end
- end
-
- package %{name}-devel
- template DEVEL
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/libunwind/libunwind.nm b/libunwind/libunwind.nm
index 3ae49ecc7..80e5851b4 100644
--- a/libunwind/libunwind.nm
+++ b/libunwind/libunwind.nm
@@ -4,19 +4,19 @@
###############################################################################
name = libunwind
-version = 1.1
+version = 1.4.0
release = 1
groups = Development/Debuggers
-url = http://savannah.nongnu.org/projects/libunwind
+url = https://savannah.nongnu.org/projects/libunwind
license = BSD
-summary = An unwinding library.
+summary = An unwinding library
description
Libunwind provides a C ABI to determine the call-chain of a program.
end
-source_dl = http://download.savannah.gnu.org/releases/libunwind/
+source_dl = https://download.savannah.gnu.org/releases/libunwind/
build
requires
@@ -25,32 +25,16 @@ build
libtool
end
- prepare_cmds
- aclocal
- libtoolize --force
- autoheader
- automake --add-missing
- autoconf
+ CFLAGS += -fcommon
- # for aarch64
- for i in $(find . -name config.guess -or -name config.sub); do
- cp -vf %{datadir}/automake-*/config.{guess,sub} $(dirname ${i})
- done
- end
+ export LD_LIBRARY_PATH = %{DIR_APP}/src/.libs
configure_options += \
--enable-static \
--enable-shared
- keep_libraries = %{libdir}/libunwind-ptrace.a
-
- # Does not work very well.
- #test
- # make check
- #end
-
- install_cmds
- rm -vf %{BUILDROOT}%{libdir}/libunwind-ptrace.so*
+ test
+ make check || :
end
end
diff --git a/libunwind/patches/libunwind-aarch64.patch b/libunwind/patches/libunwind-aarch64.patch
deleted file mode 100644
index c8816b0d3..000000000
--- a/libunwind/patches/libunwind-aarch64.patch
+++ /dev/null
@@ -1,2562 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index d7278df..e24fe1e 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -2,6 +2,9 @@ include_HEADERS = include/libunwind-dynamic.h \
- include/libunwind-ptrace.h \
- include/libunwind-coredump.h
-
-+if ARCH_AARCH64
-+include_HEADERS += include/libunwind-aarch64.h
-+endif
- if ARCH_ARM
- include_HEADERS += include/libunwind-arm.h
- endif
-@@ -41,6 +44,9 @@ SUBDIRS = src tests doc
- noinst_HEADERS = include/dwarf.h include/dwarf_i.h include/dwarf-eh.h \
- include/compiler.h include/libunwind_i.h include/mempool.h \
- include/remote.h \
-+ include/tdep-aarch64/dwarf-config.h \
-+ include/tdep-aarch64/jmpbuf.h \
-+ include/tdep-aarch64/libunwind_i.h \
- include/tdep-arm/dwarf-config.h include/tdep-arm/ex_tables.h \
- include/tdep-arm/jmpbuf.h include/tdep-arm/libunwind_i.h \
- include/tdep-ia64/jmpbuf.h include/tdep-ia64/rse.h \
-diff --git a/README b/README
-index 71a631f..511fb0c 100644
---- a/README
-+++ b/README
-@@ -9,6 +9,7 @@ several architecture/operating-system combinations:
- Linux/IA-64: Fully tested and supported.
- Linux/PARISC: Works well, but C library missing unwind-info.
- HP-UX/IA-64: Mostly works but known to have some serious limitations.
-+ Linux/AArch64: Newly added.
- Linux/PPC64: Newly added.
- Linux/SuperH: Newly added.
- FreeBSD/i386: Newly added.
-diff --git a/configure.ac b/configure.ac
-index cffe19b..096ca7b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -104,7 +104,7 @@ SET_ARCH([$target_cpu],[target_arch])
-
- AC_ARG_ENABLE(coredump,
- AS_HELP_STRING([--enable-coredump],[building libunwind-coredump library]),,
-- [AS_CASE([$host_arch], [arm*|mips*|sh*|x86*], [enable_coredump=yes], [enable_coredump=no])]
-+ [AS_CASE([$host_arch], [aarch64*|arm*|mips*|sh*|x86*], [enable_coredump=yes], [enable_coredump=no])]
- )
-
- AC_MSG_CHECKING([if we should build libunwind-coredump])
-@@ -121,6 +121,7 @@ AC_MSG_RESULT([$target_os])
-
- AM_CONDITIONAL(BUILD_COREDUMP, test x$enable_coredump = xyes)
- AM_CONDITIONAL(REMOTE_ONLY, test x$target_arch != x$host_arch)
-+AM_CONDITIONAL(ARCH_AARCH64, test x$target_arch = xaarch64)
- AM_CONDITIONAL(ARCH_ARM, test x$target_arch = xarm)
- AM_CONDITIONAL(ARCH_IA64, test x$target_arch = xia64)
- AM_CONDITIONAL(ARCH_HPPA, test x$target_arch = xhppa)
-@@ -137,7 +138,7 @@ AM_CONDITIONAL(OS_FREEBSD, expr x$target_os : xfreebsd >/dev/null)
- AC_MSG_CHECKING([for ELF helper width])
- case "${target_arch}" in
- (arm|hppa|ppc32|x86|sh) use_elf32=yes; AC_MSG_RESULT([32]);;
--(ia64|ppc64|x86_64) use_elf64=yes; AC_MSG_RESULT([64]);;
-+(aarch64|ia64|ppc64|x86_64) use_elf64=yes; AC_MSG_RESULT([64]);;
- (mips) use_elfxx=yes; AC_MSG_RESULT([xx]);;
- *) AC_MSG_ERROR([Unknown ELF target: ${target_arch}])
- esac
-@@ -186,6 +187,7 @@ AS_HELP_STRING([--enable-cxx-exceptions],[use libunwind to handle C++ exceptions
- # C++ exception handling doesn't work too well on x86
- case $target_arch in
- x86*) enable_cxx_exceptions=no;;
-+ aarch64*) enable_cxx_exceptions=no;;
- arm*) enable_cxx_exceptions=no;;
- mips*) enable_cxx_exceptions=no;;
- *) enable_cxx_exceptions=yes;;
-diff --git a/include/libunwind-aarch64.h b/include/libunwind-aarch64.h
-new file mode 100644
-index 0000000..d50da8f
---- /dev/null
-+++ b/include/libunwind-aarch64.h
-@@ -0,0 +1,187 @@
-+/* libunwind - a platform-independent unwind library
-+ Copyright (C) 2001-2004 Hewlett-Packard Co
-+ Contributed by David Mosberger-Tang <davidm(a)hpl.hp.com>
-+ Copyright (C) 2013 Linaro Limited
-+
-+This file is part of libunwind.
-+
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+"Software"), to deal in the Software without restriction, including
-+without limitation the rights to use, copy, modify, merge, publish,
-+distribute, sublicense, and/or sell copies of the Software, and to
-+permit persons to whom the Software is furnished to do so, subject to
-+the following conditions:
-+
-+The above copyright notice and this permission notice shall be
-+included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
-+
-+#ifndef LIBUNWIND_H
-+#define LIBUNWIND_H
-+
-+#if defined(__cplusplus) || defined(c_plusplus)
-+extern "C" {
-+#endif
-+
-+#include <inttypes.h>
-+#include <stddef.h>
-+#include <ucontext.h>
-+
-+#define UNW_TARGET aarch64
-+#define UNW_TARGET_AARCH64 1
-+
-+#define _U_TDEP_QP_TRUE 0 /* see libunwind-dynamic.h */
-+
-+/* This needs to be big enough to accommodate "struct cursor", while
-+ leaving some slack for future expansion. Changing this value will
-+ require recompiling all users of this library. Stack allocation is
-+ relatively cheap and unwind-state copying is relatively rare, so we
-+ want to err on making it rather too big than too small. */
-+
-+#define UNW_TDEP_CURSOR_LEN 4096
-+
-+typedef uint64_t unw_word_t;
-+typedef int64_t unw_sword_t;
-+
-+typedef long double unw_tdep_fpreg_t;
-+
-+typedef struct
-+ {
-+ /* no aarch64-specific auxiliary proc-info */
-+ }
-+unw_tdep_proc_info_t;
-+
-+typedef enum
-+ {
-+ /* 64-bit general registers. */
-+ UNW_AARCH64_X0,
-+ UNW_AARCH64_X1,
-+ UNW_AARCH64_X2,
-+ UNW_AARCH64_X3,
-+ UNW_AARCH64_X4,
-+ UNW_AARCH64_X5,
-+ UNW_AARCH64_X6,
-+ UNW_AARCH64_X7,
-+ UNW_AARCH64_X8,
-+
-+ /* Temporary registers. */
-+ UNW_AARCH64_X9,
-+ UNW_AARCH64_X10,
-+ UNW_AARCH64_X11,
-+ UNW_AARCH64_X12,
-+ UNW_AARCH64_X13,
-+ UNW_AARCH64_X14,
-+ UNW_AARCH64_X15,
-+
-+ /* Intra-procedure-call temporary registers. */
-+ UNW_AARCH64_X16,
-+ UNW_AARCH64_X17,
-+
-+ /* Callee-saved registers. */
-+ UNW_AARCH64_X18,
-+ UNW_AARCH64_X19,
-+ UNW_AARCH64_X20,
-+ UNW_AARCH64_X21,
-+ UNW_AARCH64_X22,
-+ UNW_AARCH64_X23,
-+ UNW_AARCH64_X24,
-+ UNW_AARCH64_X25,
-+ UNW_AARCH64_X26,
-+ UNW_AARCH64_X27,
-+ UNW_AARCH64_X28,
-+
-+ /* 64-bit frame pointer. */
-+ UNW_AARCH64_X29,
-+
-+ /* 64-bit link register. */
-+ UNW_AARCH64_X30,
-+
-+ /* 64-bit stack pointer. */
-+ UNW_AARCH64_SP = 31,
-+ UNW_AARCH64_PC,
-+ UNW_AARCH64_PSTATE,
-+
-+ /* 128-bit FP/Advanced SIMD registers. */
-+ UNW_AARCH64_V0 = 64,
-+ UNW_AARCH64_V1,
-+ UNW_AARCH64_V2,
-+ UNW_AARCH64_V3,
-+ UNW_AARCH64_V4,
-+ UNW_AARCH64_V5,
-+ UNW_AARCH64_V6,
-+ UNW_AARCH64_V7,
-+ UNW_AARCH64_V8,
-+ UNW_AARCH64_V9,
-+ UNW_AARCH64_V10,
-+ UNW_AARCH64_V11,
-+ UNW_AARCH64_V12,
-+ UNW_AARCH64_V13,
-+ UNW_AARCH64_V14,
-+ UNW_AARCH64_V15,
-+ UNW_AARCH64_V16,
-+ UNW_AARCH64_V17,
-+ UNW_AARCH64_V18,
-+ UNW_AARCH64_V19,
-+ UNW_AARCH64_V20,
-+ UNW_AARCH64_V21,
-+ UNW_AARCH64_V22,
-+ UNW_AARCH64_V23,
-+ UNW_AARCH64_V24,
-+ UNW_AARCH64_V25,
-+ UNW_AARCH64_V26,
-+ UNW_AARCH64_V27,
-+ UNW_AARCH64_V28,
-+ UNW_AARCH64_V29,
-+ UNW_AARCH64_V30,
-+ UNW_AARCH64_V31,
-+
-+ UNW_AARCH64_FPSR,
-+ UNW_AARCH64_FPCR,
-+
-+ /* For AArch64, the CFA is the value of SP (x31) at the call site of the
-+ previous frame. */
-+ UNW_AARCH64_CFA = UNW_AARCH64_SP,
-+
-+ UNW_TDEP_LAST_REG = UNW_AARCH64_FPCR,
-+
-+ UNW_TDEP_IP = UNW_AARCH64_X30,
-+ UNW_TDEP_SP = UNW_AARCH64_SP,
-+ UNW_TDEP_EH = UNW_AARCH64_X0,
-+
-+ }
-+aarch64_regnum_t;
-+
-+/* Use R0 through R3 to pass exception handling information. */
-+#define UNW_TDEP_NUM_EH_REGS 4
-+
-+typedef struct unw_tdep_save_loc
-+ {
-+ /* Additional target-dependent info on a save location. */
-+ }
-+unw_tdep_save_loc_t;
-+
-+
-+/* On AArch64, we can directly use ucontext_t as the unwind context. */
-+typedef ucontext_t unw_tdep_context_t;
-+
-+#include "libunwind-common.h"
-+#include "libunwind-dynamic.h"
-+
-+#define unw_tdep_getcontext(uc) (getcontext (uc), 0)
-+#define unw_tdep_is_fpreg UNW_ARCH_OBJ(is_fpreg)
-+
-+extern int unw_tdep_is_fpreg (int);
-+
-+#if defined(__cplusplus) || defined(c_plusplus)
-+}
-+#endif
-+
-+#endif /* LIBUNWIND_H */
-diff --git a/include/libunwind.h.in b/include/libunwind.h.in
-index 25c4e3b..64b1457 100644
---- a/include/libunwind.h.in
-+++ b/include/libunwind.h.in
-@@ -3,7 +3,9 @@
-
- #ifndef UNW_REMOTE_ONLY
-
--#if defined __arm__
-+#if defined __aarch64__
-+#include "libunwind-aarch64.h"
-+#elif defined __arm__
- # include "libunwind-arm.h"
- #elif defined __hppa__
- # include "libunwind-hppa.h"
-diff --git a/include/tdep-aarch64/dwarf-config.h b/include/tdep-aarch64/dwarf-config.h
-new file mode 100644
-index 0000000..c3bbed5
---- /dev/null
-+++ b/include/tdep-aarch64/dwarf-config.h
-@@ -0,0 +1,52 @@
-+/* libunwind - a platform-independent unwind library
-+ Copyright (C) 2008 CodeSourcery
-+ Copyright (C) 2012 Tommi Rantala <tt.rantala(a)gmail.com>
-+ Copyright (C) 2013 Linaro Limited
-+
-+This file is part of libunwind.
-+
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+"Software"), to deal in the Software without restriction, including
-+without limitation the rights to use, copy, modify, merge, publish,
-+distribute, sublicense, and/or sell copies of the Software, and to
-+permit persons to whom the Software is furnished to do so, subject to
-+the following conditions:
-+
-+The above copyright notice and this permission notice shall be
-+included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
-+
-+#ifndef dwarf_config_h
-+#define dwarf_config_h
-+
-+/* This matches the value udes by GCC (see
-+ gcc/config/aarch64/aarch64.h:DWARF_FRAME_REGISTERS. */
-+#define DWARF_NUM_PRESERVED_REGS 97
-+
-+/* Return TRUE if the ADDR_SPACE uses big-endian byte-order. */
-+#define dwarf_is_big_endian(addr_space) 0
-+
-+#define dwarf_to_unw_regnum(reg) (((reg) <= UNW_AARCH64_V31) ? (reg) : 0)
-+
-+/* Convert a pointer to a dwarf_cursor structure to a pointer to
-+ unw_cursor_t. */
-+#define dwarf_to_cursor(c) ((unw_cursor_t *) (c))
-+
-+typedef struct dwarf_loc
-+ {
-+ unw_word_t val;
-+#ifndef UNW_LOCAL_ONLY
-+ unw_word_t type; /* see DWARF_LOC_TYPE_* macros. */
-+#endif
-+ }
-+dwarf_loc_t;
-+
-+#endif /* dwarf_config_h */
-diff --git a/include/tdep-aarch64/jmpbuf.h b/include/tdep-aarch64/jmpbuf.h
-new file mode 100644
-index 0000000..2eb53a7
---- /dev/null
-+++ b/include/tdep-aarch64/jmpbuf.h
-@@ -0,0 +1,33 @@
-+/* libunwind - a platform-independent unwind library
-+ Copyright (C) 2008 CodeSourcery
-+ Copyright (C) 2013 Linaro Limited
-+
-+This file is part of libunwind.
-+
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+"Software"), to deal in the Software without restriction, including
-+without limitation the rights to use, copy, modify, merge, publish,
-+distribute, sublicense, and/or sell copies of the Software, and to
-+permit persons to whom the Software is furnished to do so, subject to
-+the following conditions:
-+
-+The above copyright notice and this permission notice shall be
-+included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
-+
-+/* Use glibc's jump-buffer indices; NPTL peeks at SP: */
-+
-+/* FIXME for AArch64 */
-+
-+#define JB_SP 13
-+#define JB_RP 14
-+#define JB_MASK_SAVED 15
-+#define JB_MASK 16
-diff --git a/include/tdep-aarch64/libunwind_i.h b/include/tdep-aarch64/libunwind_i.h
-new file mode 100644
-index 0000000..28943db
---- /dev/null
-+++ b/include/tdep-aarch64/libunwind_i.h
-@@ -0,0 +1,294 @@
-+/* libunwind - a platform-independent unwind library
-+ Copyright (C) 2001-2005 Hewlett-Packard Co
-+ Contributed by David Mosberger-Tang <davidm(a)hpl.hp.com>
-+ Copyright (C) 2013 Linaro Limited
-+
-+This file is part of libunwind.
-+
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+"Software"), to deal in the Software without restriction, including
-+without limitation the rights to use, copy, modify, merge, publish,
-+distribute, sublicense, and/or sell copies of the Software, and to
-+permit persons to whom the Software is furnished to do so, subject to
-+the following conditions:
-+
-+The above copyright notice and this permission notice shall be
-+included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
-+
-+#ifndef AARCH64_LIBUNWIND_I_H
-+#define AARCH64_LIBUNWIND_I_H
-+
-+/* Target-dependent definitions that are internal to libunwind but need
-+ to be shared with target-independent code. */
-+
-+#include <stdlib.h>
-+#include <libunwind.h>
-+
-+#include "elf64.h"
-+#include "mempool.h"
-+#include "dwarf.h"
-+
-+typedef struct
-+ {
-+ /* no aarch64-specific fast trace */
-+ }
-+unw_tdep_frame_t;
-+
-+#ifdef UNW_LOCAL_ONLY
-+
-+typedef unw_word_t aarch64_loc_t;
-+
-+#else /* !UNW_LOCAL_ONLY */
-+
-+typedef struct aarch64_loc
-+ {
-+ unw_word_t w0, w1;
-+ }
-+aarch64_loc_t;
-+
-+#endif /* !UNW_LOCAL_ONLY */
-+
-+struct unw_addr_space
-+ {
-+ struct unw_accessors acc;
-+ int big_endian;
-+ unw_caching_policy_t caching_policy;
-+#ifdef HAVE_ATOMIC_OPS_H
-+ AO_t cache_generation;
-+#else
-+ uint32_t cache_generation;
-+#endif
-+ unw_word_t dyn_generation; /* see dyn-common.h */
-+ unw_word_t dyn_info_list_addr; /* (cached) dyn_info_list_addr */
-+ struct dwarf_rs_cache global_cache;
-+ struct unw_debug_frame_list *debug_frames;
-+ };
-+
-+struct cursor
-+ {
-+ struct dwarf_cursor dwarf; /* must be first */
-+ enum
-+ {
-+ AARCH64_SCF_NONE,
-+ AARCH64_SCF_LINUX_RT_SIGFRAME,
-+ }
-+ sigcontext_format;
-+ unw_word_t sigcontext_addr;
-+ unw_word_t sigcontext_sp;
-+ unw_word_t sigcontext_pc;
-+ };
-+
-+#define DWARF_GET_LOC(l) ((l).val)
-+
-+#ifdef UNW_LOCAL_ONLY
-+# define DWARF_NULL_LOC DWARF_LOC (0, 0)
-+# define DWARF_IS_NULL_LOC(l) (DWARF_GET_LOC (l) == 0)
-+# define DWARF_LOC(r, t) ((dwarf_loc_t) { .val = (r) })
-+# define DWARF_IS_REG_LOC(l) 0
-+# define DWARF_REG_LOC(c,r) (DWARF_LOC((unw_word_t) \
-+ tdep_uc_addr((c)->as_arg, (r)), 0))
-+# define DWARF_MEM_LOC(c,m) DWARF_LOC ((m), 0)
-+# define DWARF_FPREG_LOC(c,r) (DWARF_LOC((unw_word_t) \
-+ tdep_uc_addr((c)->as_arg, (r)), 0))
-+
-+static inline int
-+dwarf_getfp (struct dwarf_cursor *c, dwarf_loc_t loc, unw_fpreg_t *val)
-+{
-+ if (!DWARF_GET_LOC (loc))
-+ return -1;
-+ *val = *(unw_fpreg_t *) DWARF_GET_LOC (loc);
-+ return 0;
-+}
-+
-+static inline int
-+dwarf_putfp (struct dwarf_cursor *c, dwarf_loc_t loc, unw_fpreg_t val)
-+{
-+ if (!DWARF_GET_LOC (loc))
-+ return -1;
-+ *(unw_fpreg_t *) DWARF_GET_LOC (loc) = val;
-+ return 0;
-+}
-+
-+static inline int
-+dwarf_get (struct dwarf_cursor *c, dwarf_loc_t loc, unw_word_t *val)
-+{
-+ if (!DWARF_GET_LOC (loc))
-+ return -1;
-+ *val = *(unw_word_t *) DWARF_GET_LOC (loc);
-+ return 0;
-+}
-+
-+static inline int
-+dwarf_put (struct dwarf_cursor *c, dwarf_loc_t loc, unw_word_t val)
-+{
-+ if (!DWARF_GET_LOC (loc))
-+ return -1;
-+ *(unw_word_t *) DWARF_GET_LOC (loc) = val;
-+ return 0;
-+}
-+
-+#else /* !UNW_LOCAL_ONLY */
-+# define DWARF_LOC_TYPE_FP (1 << 0)
-+# define DWARF_LOC_TYPE_REG (1 << 1)
-+# define DWARF_NULL_LOC DWARF_LOC (0, 0)
-+# define DWARF_IS_NULL_LOC(l) \
-+ ({ dwarf_loc_t _l = (l); _l.val == 0 && _l.type == 0; })
-+# define DWARF_LOC(r, t) ((dwarf_loc_t) { .val = (r), .type = (t) })
-+# define DWARF_IS_REG_LOC(l) (((l).type & DWARF_LOC_TYPE_REG) != 0)
-+# define DWARF_IS_FP_LOC(l) (((l).type & DWARF_LOC_TYPE_FP) != 0)
-+# define DWARF_REG_LOC(c,r) DWARF_LOC((r), DWARF_LOC_TYPE_REG)
-+# define DWARF_MEM_LOC(c,m) DWARF_LOC ((m), 0)
-+# define DWARF_FPREG_LOC(c,r) DWARF_LOC((r), (DWARF_LOC_TYPE_REG \
-+ | DWARF_LOC_TYPE_FP))
-+
-+static inline int
-+dwarf_getfp (struct dwarf_cursor *c, dwarf_loc_t loc, unw_fpreg_t *val)
-+{
-+ char *valp = (char *) &val;
-+ unw_word_t addr;
-+ int ret;
-+
-+ if (DWARF_IS_NULL_LOC (loc))
-+ return -UNW_EBADREG;
-+
-+ if (DWARF_IS_REG_LOC (loc))
-+ return (*c->as->acc.access_fpreg) (c->as, DWARF_GET_LOC (loc),
-+ val, 0, c->as_arg);
-+
-+ addr = DWARF_GET_LOC (loc);
-+ if ((ret = (*c->as->acc.access_mem) (c->as, addr + 0, (unw_word_t *) valp,
-+ 0, c->as_arg)) < 0)
-+ return ret;
-+
-+ return (*c->as->acc.access_mem) (c->as, addr + 4, (unw_word_t *) valp + 1, 0,
-+ c->as_arg);
-+}
-+
-+static inline int
-+dwarf_putfp (struct dwarf_cursor *c, dwarf_loc_t loc, unw_fpreg_t val)
-+{
-+ char *valp = (char *) &val;
-+ unw_word_t addr;
-+ int ret;
-+
-+ if (DWARF_IS_NULL_LOC (loc))
-+ return -UNW_EBADREG;
-+
-+ if (DWARF_IS_REG_LOC (loc))
-+ return (*c->as->acc.access_fpreg) (c->as, DWARF_GET_LOC (loc),
-+ &val, 1, c->as_arg);
-+
-+ addr = DWARF_GET_LOC (loc);
-+ if ((ret = (*c->as->acc.access_mem) (c->as, addr + 0, (unw_word_t *) valp,
-+ 1, c->as_arg)) < 0)
-+ return ret;
-+
-+ return (*c->as->acc.access_mem) (c->as, addr + 4, (unw_word_t *) valp + 1,
-+ 1, c->as_arg);
-+}
-+
-+static inline int
-+dwarf_get (struct dwarf_cursor *c, dwarf_loc_t loc, unw_word_t *val)
-+{
-+ if (DWARF_IS_NULL_LOC (loc))
-+ return -UNW_EBADREG;
-+
-+ /* If a code-generator were to save a value of type unw_word_t in a
-+ floating-point register, we would have to support this case. I
-+ suppose it could happen with MMX registers, but does it really
-+ happen? */
-+ assert (!DWARF_IS_FP_LOC (loc));
-+
-+ if (DWARF_IS_REG_LOC (loc))
-+ return (*c->as->acc.access_reg) (c->as, DWARF_GET_LOC (loc), val,
-+ 0, c->as_arg);
-+ else
-+ return (*c->as->acc.access_mem) (c->as, DWARF_GET_LOC (loc), val,
-+ 0, c->as_arg);
-+}
-+
-+static inline int
-+dwarf_put (struct dwarf_cursor *c, dwarf_loc_t loc, unw_word_t val)
-+{
-+ if (DWARF_IS_NULL_LOC (loc))
-+ return -UNW_EBADREG;
-+
-+ /* If a code-generator were to save a value of type unw_word_t in a
-+ floating-point register, we would have to support this case. I
-+ suppose it could happen with MMX registers, but does it really
-+ happen? */
-+ assert (!DWARF_IS_FP_LOC (loc));
-+
-+ if (DWARF_IS_REG_LOC (loc))
-+ return (*c->as->acc.access_reg) (c->as, DWARF_GET_LOC (loc), &val,
-+ 1, c->as_arg);
-+ else
-+ return (*c->as->acc.access_mem) (c->as, DWARF_GET_LOC (loc), &val,
-+ 1, c->as_arg);
-+}
-+
-+#endif /* !UNW_LOCAL_ONLY */
-+
-+
-+
-+#define tdep_getcontext_trace unw_getcontext
-+#define tdep_init_done UNW_OBJ(init_done)
-+#define tdep_init UNW_OBJ(init)
-+/* Platforms that support UNW_INFO_FORMAT_TABLE need to define
-+ tdep_search_unwind_table. */
-+#define tdep_search_unwind_table dwarf_search_unwind_table
-+#define tdep_find_unwind_table dwarf_find_unwind_table
-+#define tdep_uc_addr UNW_OBJ(uc_addr)
-+#define tdep_get_elf_image UNW_ARCH_OBJ(get_elf_image)
-+#define tdep_access_reg UNW_OBJ(access_reg)
-+#define tdep_access_fpreg UNW_OBJ(access_fpreg)
-+#define tdep_fetch_frame(c,ip,n) do {} while(0)
-+#define tdep_cache_frame(c,rs) do {} while(0)
-+#define tdep_reuse_frame(c,rs) do {} while(0)
-+#define tdep_stash_frame(c,rs) do {} while(0)
-+#define tdep_trace(cur,addr,n) (-UNW_ENOINFO)
-+
-+#ifdef UNW_LOCAL_ONLY
-+# define tdep_find_proc_info(c,ip,n) \
-+ dwarf_find_proc_info((c)->as, (ip), &(c)->pi, (n), \
-+ (c)->as_arg)
-+# define tdep_put_unwind_info(as,pi,arg) \
-+ dwarf_put_unwind_info((as), (pi), (arg))
-+#else
-+# define tdep_find_proc_info(c,ip,n) \
-+ (*(c)->as->acc.find_proc_info)((c)->as, (ip), &(c)->pi, (n), \
-+ (c)->as_arg)
-+# define tdep_put_unwind_info(as,pi,arg) \
-+ (*(as)->acc.put_unwind_info)((as), (pi), (arg))
-+#endif
-+
-+#define tdep_get_as(c) ((c)->dwarf.as)
-+#define tdep_get_as_arg(c) ((c)->dwarf.as_arg)
-+#define tdep_get_ip(c) ((c)->dwarf.ip)
-+#define tdep_big_endian(as) ((as)->big_endian)
-+
-+extern int tdep_init_done;
-+
-+extern void tdep_init (void);
-+extern int tdep_search_unwind_table (unw_addr_space_t as, unw_word_t ip,
-+ unw_dyn_info_t *di, unw_proc_info_t *pi,
-+ int need_unwind_info, void *arg);
-+extern void *tdep_uc_addr (unw_tdep_context_t *uc, int reg);
-+extern int tdep_get_elf_image (struct elf_image *ei, pid_t pid, unw_word_t ip,
-+ unsigned long *segbase, unsigned long *mapoff,
-+ char *path, size_t pathlen);
-+extern int tdep_access_reg (struct cursor *c, unw_regnum_t reg,
-+ unw_word_t *valp, int write);
-+extern int tdep_access_fpreg (struct cursor *c, unw_regnum_t reg,
-+ unw_fpreg_t *valp, int write);
-+
-+#endif /* AARCH64_LIBUNWIND_I_H */
-diff --git a/include/tdep/dwarf-config.h b/include/tdep/dwarf-config.h
-index 1da268b..5b09fc1 100644
---- a/include/tdep/dwarf-config.h
-+++ b/include/tdep/dwarf-config.h
-@@ -1,7 +1,9 @@
- /* Provide a real file - not a symlink - as it would cause multiarch conflicts
- when multiple different arch releases are installed simultaneously. */
-
--#if defined __arm__
-+#if defined __aarch64__
-+# include "tdep-aarch64/dwarf-config.h"
-+#elif defined __arm__
- # include "tdep-arm/dwarf-config.h"
- #elif defined __hppa__
- # include "tdep-hppa/dwarf-config.h"
-diff --git a/include/tdep/jmpbuf.h b/include/tdep/jmpbuf.h
-index 7d04a42..684d0d9 100644
---- a/include/tdep/jmpbuf.h
-+++ b/include/tdep/jmpbuf.h
-@@ -3,6 +3,8 @@
-
- #ifndef UNW_REMOTE_ONLY
-
-+#if defined __aarch64__
-+# include "tdep-aarch64/jmpbuf.h"
- #if defined __arm__
- # include "tdep-arm/jmpbuf.h"
- #elif defined __hppa__
-diff --git a/include/tdep/libunwind_i.h.in b/include/tdep/libunwind_i.h.in
-index 2ad6269..475f828 100644
---- a/include/tdep/libunwind_i.h.in
-+++ b/include/tdep/libunwind_i.h.in
-@@ -3,7 +3,9 @@
-
- #ifndef UNW_REMOTE_ONLY
-
--#if defined __arm__
-+#if defined __aarch64__
-+# include "tdep-aarch64/libunwind_i.h"
-+#elif defined __arm__
- # include "tdep-arm/libunwind_i.h"
- #elif defined __hppa__
- # include "tdep-hppa/libunwind_i.h"
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 08d2870..f104214 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -170,6 +170,28 @@ libunwind_elfxx_la_SOURCES = elfxx.c
- noinst_LTLIBRARIES += $(LIBUNWIND_ELF)
- libunwind_la_LIBADD += $(LIBUNWIND_ELF)
-
-+# The list of files that go into libunwind and libunwind-aarch64:
-+noinst_HEADERS += aarch64/init.h aarch64/offsets.h aarch64/unwind_i.h
-+libunwind_la_SOURCES_aarch64_common = $(libunwind_la_SOURCES_common) \
-+ aarch64/is_fpreg.c aarch64/regname.c
-+
-+# The list of files that go into libunwind:
-+libunwind_la_SOURCES_aarch64 = $(libunwind_la_SOURCES_aarch64_common) \
-+ $(libunwind_la_SOURCES_local) \
-+ aarch64/Lcreate_addr_space.c aarch64/Lget_proc_info.c \
-+ aarch64/Lget_save_loc.c aarch64/Lglobal.c aarch64/Linit.c \
-+ aarch64/Linit_local.c aarch64/Linit_remote.c \
-+ aarch64/Lis_signal_frame.c aarch64/Lregs.c aarch64/Lresume.c \
-+ aarch64/Lstep.c
-+
-+libunwind_aarch64_la_SOURCES_aarch64 = $(libunwind_la_SOURCES_aarch64_common) \
-+ $(libunwind_la_SOURCES_generic) \
-+ aarch64/Gcreate_addr_space.c aarch64/Gget_proc_info.c \
-+ aarch64/Gget_save_loc.c aarch64/Gglobal.c aarch64/Ginit.c \
-+ aarch64/Ginit_local.c aarch64/Ginit_remote.c \
-+ aarch64/Gis_signal_frame.c aarch64/Gregs.c aarch64/Gresume.c \
-+ aarch64/Gstep.c
-+
- # The list of files that go into libunwind and libunwind-arm:
- noinst_HEADERS += arm/init.h arm/offsets.h arm/unwind_i.h
- libunwind_la_SOURCES_arm_common = $(libunwind_la_SOURCES_common) \
-@@ -418,6 +440,18 @@ if OS_FREEBSD
- libunwind_coredump_la_SOURCES += coredump/_UCD_access_reg_freebsd.c
- endif
-
-+if ARCH_AARCH64
-+ lib_LTLIBRARIES += libunwind-aarch64.la
-+ libunwind_la_SOURCES = $(libunwind_la_SOURCES_aarch64)
-+ libunwind_aarch64_la_SOURCES = $(libunwind_aarch64_la_SOURCES_aarch64)
-+ libunwind_aarch64_la_LDFLAGS = $(COMMON_SO_LDFLAGS) -version-info $(SOVERSION)
-+ libunwind_aarch64_la_LIBADD = libunwind-dwarf-generic.la
-+ libunwind_aarch64_la_LIBADD += libunwind-elf64.la
-+if !REMOTE_ONLY
-+ libunwind_aarch64_la_LIBADD += libunwind.la -lc
-+endif
-+# libunwind_setjmp_la_SOURCES += aarch64/siglongjmp.S
-+else
- if ARCH_ARM
- lib_LTLIBRARIES += libunwind-arm.la
- libunwind_la_SOURCES = $(libunwind_la_SOURCES_arm)
-@@ -545,6 +579,7 @@ endif # ARCH_MIPS
- endif # ARCH_HPPA
- endif # ARCH_IA64
- endif # ARCH_ARM
-+endif # ARCH_AARCH64
-
- # libunwind-setjmp depends on libunwind-$(arch). Therefore must be added
- # at the end.
-@@ -567,7 +602,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/include/tdep-$(arch) -I.
- AM_CCASFLAGS = $(AM_CPPFLAGS)
- noinst_HEADERS += unwind/unwind-internal.h
-
--EXTRA_DIST = $(libunwind_la_SOURCES_arm) \
-+EXTRA_DIST = $(libunwind_la_SOURCES_aarch64) \
-+ $(libunwind_la_SOURCES_arm) \
- $(libunwind_la_SOURCES_hppa) \
- $(libunwind_la_SOURCES_ia64) \
- $(libunwind_la_SOURCES_mips) \
-@@ -579,6 +615,7 @@ EXTRA_DIST = $(libunwind_la_SOURCES_arm) \
- $(libunwind_la_SOURCES_common) \
- $(libunwind_la_SOURCES_local) \
- $(libunwind_la_SOURCES_generic) \
-+ $(libunwind_aarch64_la_SOURCES_aarch64) \
- $(libunwind_arm_la_SOURCES_arm) \
- $(libunwind_hppa_la_SOURCES_hppa) \
- $(libunwind_ia64_la_SOURCES_ia64) \
-diff --git a/src/aarch64/Gcreate_addr_space.c b/src/aarch64/Gcreate_addr_space.c
-new file mode 100644
-index 0000000..b0f2b04
---- /dev/null
-+++ b/src/aarch64/Gcreate_addr_space.c
-@@ -0,0 +1,60 @@
-+/* libunwind - a platform-independent unwind library
-+ Copyright (C) 2012 Tommi Rantala <tt.rantala(a)gmail.com>
-+ Copyright (C) 2013 Linaro Limited
-+
-+This file is part of libunwind.
-+
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+"Software"), to deal in the Software without restriction, including
-+without limitation the rights to use, copy, modify, merge, publish,
-+distribute, sublicense, and/or sell copies of the Software, and to
-+permit persons to whom the Software is furnished to do so, subject to
-+the following conditions:
-+
-+The above copyright notice and this permission notice shall be
-+included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
-+
-+#include <string.h>
-+#include <stdlib.h>
-+
-+#include "unwind_i.h"
-+
-+PROTECTED unw_addr_space_t
-+unw_create_addr_space (unw_accessors_t *a, int byte_order)
-+{
-+#ifdef UNW_LOCAL_ONLY
-+ return NULL;
-+#else
-+ unw_addr_space_t as;
-+
-+ /* AArch64 supports little-endian and big-endian. */
-+ if (byte_order != 0 && byte_order != __LITTLE_ENDIAN
-+ && byte_order != __BIG_ENDIAN)
-+ return NULL;
-+
-+ as = malloc (sizeof (*as));
-+ if (!as)
-+ return NULL;
-+
-+ memset (as, 0, sizeof (*as));
-+
-+ as->acc = *a;
-+
-+ /* Default to little-endian for AArch64. */
-+ if (byte_order == 0 || byte_order == __LITTLE_ENDIAN)
-+ as->big_endian = 0;
-+ else
-+ as->big_endian = 1;
-+
-+ return as;
-+#endif
-+}
-diff --git a/src/aarch64/Gget_proc_info.c b/src/aarch64/Gget_proc_info.c
-new file mode 100644
-index 0000000..de9199f
---- /dev/null
-+++ b/src/aarch64/Gget_proc_info.c
-@@ -0,0 +1,39 @@
-+/* libunwind - a platform-independent unwind library
-+ Copyright (C) 2008 CodeSourcery
-+
-+This file is part of libunwind.
-+
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+"Software"), to deal in the Software without restriction, including
-+without limitation the rights to use, copy, modify, merge, publish,
-+distribute, sublicense, and/or sell copies of the Software, and to
-+permit persons to whom the Software is furnished to do so, subject to
-+the following conditions:
-+
-+The above copyright notice and this permission notice shall be
-+included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
-+
-+#include "unwind_i.h"
-+
-+PROTECTED int
-+unw_get_proc_info (unw_cursor_t *cursor, unw_proc_info_t *pi)
-+{
-+ struct cursor *c = (struct cursor *) cursor;
-+ int ret;
-+
-+ ret = dwarf_make_proc_info (&c->dwarf);
-+ if (ret < 0)
-+ return ret;
-+
-+ *pi = c->dwarf.pi;
-+ return 0;
-+}
-diff --git a/src/aarch64/Gget_save_loc.c b/src/aarch64/Gget_save_loc.c
-new file mode 100644
-index 0000000..c76eb9c
---- /dev/null
-+++ b/src/aarch64/Gget_save_loc.c
-@@ -0,0 +1,100 @@
-+/* libunwind - a platform-independent unwind library
-+ Copyright (C) 2008 CodeSourcery
-+ Copyright (C) 2012 Tommi Rantala <tt.rantala(a)gmail.com>
-+ Copyright (C) 2013 Linaro Limited
-+
-+This file is part of libunwind.
-+
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+"Software"), to deal in the Software without restriction, including
-+without limitation the rights to use, copy, modify, merge, publish,
-+distribute, sublicense, and/or sell copies of the Software, and to
-+permit persons to whom the Software is furnished to do so, subject to
-+the following conditions:
-+
-+The above copyright notice and this permission notice shall be
-+included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
-+
-+#include "unwind_i.h"
-+
-+PROTECTED int
-+unw_get_save_loc (unw_cursor_t *cursor, int reg, unw_save_loc_t *sloc)
-+{
-+ struct cursor *c = (struct cursor *) cursor;
-+ dwarf_loc_t loc;
-+
-+ switch (reg)
-+ {
-+ case UNW_AARCH64_X0:
-+ case UNW_AARCH64_X1:
-+ case UNW_AARCH64_X2:
-+ case UNW_AARCH64_X3:
-+ case UNW_AARCH64_X4:
-+ case UNW_AARCH64_X5:
-+ case UNW_AARCH64_X6:
-+ case UNW_AARCH64_X7:
-+ case UNW_AARCH64_X8:
-+ case UNW_AARCH64_X9:
-+ case UNW_AARCH64_X10:
-+ case UNW_AARCH64_X11:
-+ case UNW_AARCH64_X12:
-+ case UNW_AARCH64_X13:
-+ case UNW_AARCH64_X14:
-+ case UNW_AARCH64_X15:
-+ case UNW_AARCH64_X16:
-+ case UNW_AARCH64_X17:
-+ case UNW_AARCH64_X18:
-+ case UNW_AARCH64_X19:
-+ case UNW_AARCH64_X20:
-+ case UNW_AARCH64_X21:
-+ case UNW_AARCH64_X22:
-+ case UNW_AARCH64_X23:
-+ case UNW_AARCH64_X24:
-+ case UNW_AARCH64_X25:
-+ case UNW_AARCH64_X26:
-+ case UNW_AARCH64_X27:
-+ case UNW_AARCH64_X28:
-+ case UNW_AARCH64_X29:
-+ case UNW_AARCH64_X30:
-+ case UNW_AARCH64_SP:
-+ case UNW_AARCH64_PC:
-+ case UNW_AARCH64_PSTATE:
-+ loc = c->dwarf.loc[reg];
-+ break;
-+
-+ default:
-+ loc = DWARF_NULL_LOC; /* default to "not saved" */
-+ break;
-+ }
-+
-+ memset (sloc, 0, sizeof (*sloc));
-+
-+ if (DWARF_IS_NULL_LOC (loc))
-+ {
-+ sloc->type = UNW_SLT_NONE;
-+ return 0;
-+ }
-+
-+#if !defined(UNW_LOCAL_ONLY)
-+ if (DWARF_IS_REG_LOC (loc))
-+ {
-+ sloc->type = UNW_SLT_REG;
-+ sloc->u.regnum = DWARF_GET_LOC (loc);
-+ }
-+ else
-+#endif
-+ {
-+ sloc->type = UNW_SLT_MEMORY;
-+ sloc->u.addr = DWARF_GET_LOC (loc);
-+ }
-+ return 0;
-+}
-diff --git a/src/aarch64/Gglobal.c b/src/aarch64/Gglobal.c
-new file mode 100644
-index 0000000..b0a7e26
---- /dev/null
-+++ b/src/aarch64/Gglobal.c
-@@ -0,0 +1,57 @@
-+/* libunwind - a platform-independent unwind library
-+ Copyright (C) 2008 CodeSourcery
-+ Copyright (C) 2012 Tommi Rantala <tt.rantala(a)gmail.com>
-+ Copyright (C) 2013 Linaro Limited
-+
-+This file is part of libunwind.
-+
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+"Software"), to deal in the Software without restriction, including
-+without limitation the rights to use, copy, modify, merge, publish,
-+distribute, sublicense, and/or sell copies of the Software, and to
-+permit persons to whom the Software is furnished to do so, subject to
-+the following conditions:
-+
-+The above copyright notice and this permission notice shall be
-+included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
-+
-+#include "unwind_i.h"
-+#include "dwarf_i.h"
-+
-+HIDDEN define_lock (aarch64_lock);
-+HIDDEN int tdep_init_done;
-+
-+HIDDEN void
-+tdep_init (void)
-+{
-+ intrmask_t saved_mask;
-+
-+ sigfillset (&unwi_full_mask);
-+
-+ lock_acquire (&aarch64_lock, saved_mask);
-+ {
-+ if (tdep_init_done)
-+ /* another thread else beat us to it... */
-+ goto out;
-+
-+ mi_init ();
-+
-+ dwarf_init ();
-+
-+#ifndef UNW_REMOTE_ONLY
-+ aarch64_local_addr_space_init ();
-+#endif
-+ tdep_init_done = 1; /* signal that we're initialized... */
-+ }
-+ out:
-+ lock_release (&aarch64_lock, saved_mask);
-+}
-diff --git a/src/aarch64/Ginit.c b/src/aarch64/Ginit.c
-new file mode 100644
-index 0000000..449b417
---- /dev/null
-+++ b/src/aarch64/Ginit.c
-@@ -0,0 +1,187 @@
-+/* libunwind - a platform-independent unwind library
-+ Copyright (C) 2008 CodeSourcery
-+ Copyright (C) 2012 Tommi Rantala <tt.rantala(a)gmail.com>
-+ Copyright (C) 2013 Linaro Limited
-+
-+This file is part of libunwind.
-+
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+"Software"), to deal in the Software without restriction, including
-+without limitation the rights to use, copy, modify, merge, publish,
-+distribute, sublicense, and/or sell copies of the Software, and to
-+permit persons to whom the Software is furnished to do so, subject to
-+the following conditions:
-+
-+The above copyright notice and this permission notice shall be
-+included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
-+
-+#include <stdlib.h>
-+#include <string.h>
-+
-+#include "unwind_i.h"
-+
-+#ifdef UNW_REMOTE_ONLY
-+
-+/* unw_local_addr_space is a NULL pointer in this case. */
-+PROTECTED unw_addr_space_t unw_local_addr_space;
-+
-+#else /* !UNW_REMOTE_ONLY */
-+
-+static struct unw_addr_space local_addr_space;
-+
-+PROTECTED unw_addr_space_t unw_local_addr_space = &local_addr_space;
-+
-+static inline void *
-+uc_addr (ucontext_t *uc, int reg)
-+{
-+ if (reg >= UNW_AARCH64_X0 && reg <= UNW_AARCH64_V31)
-+ return &uc->uc_mcontext.regs[reg];
-+ else
-+ return NULL;
-+}
-+
-+# ifdef UNW_LOCAL_ONLY
-+
-+HIDDEN void *
-+tdep_uc_addr (ucontext_t *uc, int reg)
-+{
-+ return uc_addr (uc, reg);
-+}
-+
-+# endif /* UNW_LOCAL_ONLY */
-+
-+HIDDEN unw_dyn_info_list_t _U_dyn_info_list;
-+
-+/* XXX fix me: there is currently no way to locate the dyn-info list
-+ by a remote unwinder. On ia64, this is done via a special
-+ unwind-table entry. Perhaps something similar can be done with
-+ DWARF2 unwind info. */
-+
-+static void
-+put_unwind_info (unw_addr_space_t as, unw_proc_info_t *proc_info, void *arg)
-+{
-+ /* it's a no-op */
-+}
-+
-+static int
-+get_dyn_info_list_addr (unw_addr_space_t as, unw_word_t *dyn_info_list_addr,
-+ void *arg)
-+{
-+ *dyn_info_list_addr = (unw_word_t) &_U_dyn_info_list;
-+ return 0;
-+}
-+
-+static int
-+access_mem (unw_addr_space_t as, unw_word_t addr, unw_word_t *val, int write,
-+ void *arg)
-+{
-+ if (write)
-+ {
-+ Debug (16, "mem[%x] <- %x\n", addr, *val);
-+ *(unw_word_t *) addr = *val;
-+ }
-+ else
-+ {
-+ *val = *(unw_word_t *) addr;
-+ Debug (16, "mem[%x] -> %x\n", addr, *val);
-+ }
-+ return 0;
-+}
-+
-+static int
-+access_reg (unw_addr_space_t as, unw_regnum_t reg, unw_word_t *val, int write,
-+ void *arg)
-+{
-+ unw_word_t *addr;
-+ ucontext_t *uc = arg;
-+
-+ if (unw_is_fpreg (reg))
-+ goto badreg;
-+
-+ if (!(addr = uc_addr (uc, reg)))
-+ goto badreg;
-+
-+ if (write)
-+ {
-+ *(unw_word_t *) addr = *val;
-+ Debug (12, "%s <- %x\n", unw_regname (reg), *val);
-+ }
-+ else
-+ {
-+ *val = *(unw_word_t *) addr;
-+ Debug (12, "%s -> %x\n", unw_regname (reg), *val);
-+ }
-+ return 0;
-+
-+ badreg:
-+ Debug (1, "bad register number %u\n", reg);
-+ return -UNW_EBADREG;
-+}
-+
-+static int
-+access_fpreg (unw_addr_space_t as, unw_regnum_t reg, unw_fpreg_t *val,
-+ int write, void *arg)
-+{
-+ ucontext_t *uc = arg;
-+ unw_fpreg_t *addr;
-+
-+ if (!unw_is_fpreg (reg))
-+ goto badreg;
-+
-+ if (!(addr = uc_addr (uc, reg)))
-+ goto badreg;
-+
-+ if (write)
-+ {
-+ Debug (12, "%s <- %08lx.%08lx.%08lx\n", unw_regname (reg),
-+ ((long *)val)[0], ((long *)val)[1], ((long *)val)[2]);
-+ *(unw_fpreg_t *) addr = *val;
-+ }
-+ else
-+ {
-+ *val = *(unw_fpreg_t *) addr;
-+ Debug (12, "%s -> %08lx.%08lx.%08lx\n", unw_regname (reg),
-+ ((long *)val)[0], ((long *)val)[1], ((long *)val)[2]);
-+ }
-+ return 0;
-+
-+ badreg:
-+ Debug (1, "bad register number %u\n", reg);
-+ /* attempt to access a non-preserved register */
-+ return -UNW_EBADREG;
-+}
-+
-+static int
-+get_static_proc_name (unw_addr_space_t as, unw_word_t ip,
-+ char *buf, size_t buf_len, unw_word_t *offp,
-+ void *arg)
-+{
-+ return _Uelf64_get_proc_name (as, getpid (), ip, buf, buf_len, offp);
-+}
-+
-+HIDDEN void
-+aarch64_local_addr_space_init (void)
-+{
-+ memset (&local_addr_space, 0, sizeof (local_addr_space));
-+ local_addr_space.caching_policy = UNW_CACHE_GLOBAL;
-+ local_addr_space.acc.find_proc_info = dwarf_find_proc_info;
-+ local_addr_space.acc.put_unwind_info = put_unwind_info;
-+ local_addr_space.acc.get_dyn_info_list_addr = get_dyn_info_list_addr;
-+ local_addr_space.acc.access_mem = access_mem;
-+ local_addr_space.acc.access_reg = access_reg;
-+ local_addr_space.acc.access_fpreg = access_fpreg;
-+ local_addr_space.acc.resume = aarch64_local_resume;
-+ local_addr_space.acc.get_proc_name = get_static_proc_name;
-+ unw_flush_cache (&local_addr_space, 0, 0);
-+}
-+
-+#endif /* !UNW_REMOTE_ONLY */
-diff --git a/src/aarch64/Ginit_local.c b/src/aarch64/Ginit_local.c
-new file mode 100644
-index 0000000..dee6fd3
---- /dev/null
-+++ b/src/aarch64/Ginit_local.c
-@@ -0,0 +1,55 @@
-+/* libunwind - a platform-independent unwind library
-+ Copyright (C) 2008 CodeSourcery
-+ Copyright (C) 2011-2013 Linaro Limited
-+
-+This file is part of libunwind.
-+
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+"Software"), to deal in the Software without restriction, including
-+without limitation the rights to use, copy, modify, merge, publish,
-+distribute, sublicense, and/or sell copies of the Software, and to
-+permit persons to whom the Software is furnished to do so, subject to
-+the following conditions:
-+
-+The above copyright notice and this permission notice shall be
-+included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
-+
-+#include "unwind_i.h"
-+#include "init.h"
-+
-+#ifdef UNW_REMOTE_ONLY
-+
-+PROTECTED int
-+unw_init_local (unw_cursor_t *cursor, unw_context_t *uc)
-+{
-+ return -UNW_EINVAL;
-+}
-+
-+#else /* !UNW_REMOTE_ONLY */
-+
-+PROTECTED int
-+unw_init_local (unw_cursor_t *cursor, unw_context_t *uc)
-+{
-+ struct cursor *c = (struct cursor *) cursor;
-+
-+ if (!tdep_init_done)
-+ tdep_init ();
-+
-+ Debug (1, "(cursor=%p)\n", c);
-+
-+ c->dwarf.as = unw_local_addr_space;
-+ c->dwarf.as_arg = uc;
-+
-+ return common_init (c, 1);
-+}
-+
-+#endif /* !UNW_REMOTE_ONLY */
-diff --git a/src/aarch64/Ginit_remote.c b/src/aarch64/Ginit_remote.c
-new file mode 100644
-index 0000000..f284e99
---- /dev/null
-+++ b/src/aarch64/Ginit_remote.c
-@@ -0,0 +1,45 @@
-+/* libunwind - a platform-independent unwind library
-+ Copyright (C) 2008 CodeSourcery
-+
-+This file is part of libunwind.
-+
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+"Software"), to deal in the Software without restriction, including
-+without limitation the rights to use, copy, modify, merge, publish,
-+distribute, sublicense, and/or sell copies of the Software, and to
-+permit persons to whom the Software is furnished to do so, subject to
-+the following conditions:
-+
-+The above copyright notice and this permission notice shall be
-+included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
-+
-+#include "init.h"
-+#include "unwind_i.h"
-+
-+PROTECTED int
-+unw_init_remote (unw_cursor_t *cursor, unw_addr_space_t as, void *as_arg)
-+{
-+#ifdef UNW_LOCAL_ONLY
-+ return -UNW_EINVAL;
-+#else /* !UNW_LOCAL_ONLY */
-+ struct cursor *c = (struct cursor *) cursor;
-+
-+ if (!tdep_init_done)
-+ tdep_init ();
-+
-+ Debug (1, "(cursor=%p)\n", c);
-+
-+ c->dwarf.as = as;
-+ c->dwarf.as_arg = as_arg;
-+ return common_init (c, 0);
-+#endif /* !UNW_LOCAL_ONLY */
-+}
-diff --git a/src/aarch64/Gis_signal_frame.c b/src/aarch64/Gis_signal_frame.c
-new file mode 100644
-index 0000000..53e32de
---- /dev/null
-+++ b/src/aarch64/Gis_signal_frame.c
-@@ -0,0 +1,64 @@
-+/* libunwind - a platform-independent unwind library
-+ Copyright (C) 2012 Tommi Rantala <tt.rantala(a)gmail.com>
-+ Copyright (C) 2013 Linaro Limited
-+
-+This file is part of libunwind.
-+
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+"Software"), to deal in the Software without restriction, including
-+without limitation the rights to use, copy, modify, merge, publish,
-+distribute, sublicense, and/or sell copies of the Software, and to
-+permit persons to whom the Software is furnished to do so, subject to
-+the following conditions:
-+
-+The above copyright notice and this permission notice shall be
-+included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
-+
-+#include "unwind_i.h"
-+
-+/* The restorer stub will always have the form:
-+
-+ d2801168 movz x8, #0x8b
-+ d4000001 svc #0x0
-+*/
-+
-+PROTECTED int
-+unw_is_signal_frame (unw_cursor_t *cursor)
-+{
-+#ifdef __linux__
-+ struct cursor *c = (struct cursor *) cursor;
-+ unw_word_t w0, ip;
-+ unw_addr_space_t as;
-+ unw_accessors_t *a;
-+ void *arg;
-+ int ret;
-+
-+ as = c->dwarf.as;
-+ a = unw_get_accessors (as);
-+ arg = c->dwarf.as_arg;
-+
-+ ip = c->dwarf.ip;
-+
-+ ret = (*a->access_mem) (as, ip, &w0, 0, arg);
-+ if (ret < 0)
-+ return ret;
-+
-+ /* FIXME: distinguish 32bit insn vs 64bit registers. */
-+ if (w0 != 0xd4000001d2801168)
-+ return 0;
-+
-+ return 1;
-+
-+#else
-+ return -UNW_ENOINFO;
-+#endif
-+}
-diff --git a/src/aarch64/Gregs.c b/src/aarch64/Gregs.c
-new file mode 100644
-index 0000000..0f6b9c6
---- /dev/null
-+++ b/src/aarch64/Gregs.c
-@@ -0,0 +1,113 @@
-+/* libunwind - a platform-independent unwind library
-+ Copyright (C) 2008 CodeSourcery
-+ Copyright (C) 2012 Tommi Rantala <tt.rantala(a)gmail.com>
-+ Copyright (C) 2013 Linaro Limited
-+
-+This file is part of libunwind.
-+
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+"Software"), to deal in the Software without restriction, including
-+without limitation the rights to use, copy, modify, merge, publish,
-+distribute, sublicense, and/or sell copies of the Software, and to
-+permit persons to whom the Software is furnished to do so, subject to
-+the following conditions:
-+
-+The above copyright notice and this permission notice shall be
-+included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
-+
-+#include "unwind_i.h"
-+
-+HIDDEN int
-+tdep_access_reg (struct cursor *c, unw_regnum_t reg, unw_word_t *valp,
-+ int write)
-+{
-+ dwarf_loc_t loc = DWARF_NULL_LOC;
-+ unsigned int mask;
-+
-+ switch (reg)
-+ {
-+ case UNW_AARCH64_X0:
-+ case UNW_AARCH64_X1:
-+ case UNW_AARCH64_X2:
-+ case UNW_AARCH64_X3:
-+ mask = 1 << reg;
-+ if (write)
-+ {
-+ c->dwarf.eh_args[reg] = *valp;
-+ c->dwarf.eh_valid_mask |= mask;
-+ return 0;
-+ }
-+ else if ((c->dwarf.eh_valid_mask & mask) != 0)
-+ {
-+ *valp = c->dwarf.eh_args[reg];
-+ return 0;
-+ }
-+ else
-+ loc = c->dwarf.loc[reg];
-+ break;
-+
-+ case UNW_AARCH64_X4:
-+ case UNW_AARCH64_X5:
-+ case UNW_AARCH64_X6:
-+ case UNW_AARCH64_X7:
-+ case UNW_AARCH64_X8:
-+ case UNW_AARCH64_X9:
-+ case UNW_AARCH64_X10:
-+ case UNW_AARCH64_X11:
-+ case UNW_AARCH64_X12:
-+ case UNW_AARCH64_X13:
-+ case UNW_AARCH64_X14:
-+ case UNW_AARCH64_X15:
-+ case UNW_AARCH64_X16:
-+ case UNW_AARCH64_X17:
-+ case UNW_AARCH64_X18:
-+ case UNW_AARCH64_X19:
-+ case UNW_AARCH64_X20:
-+ case UNW_AARCH64_X21:
-+ case UNW_AARCH64_X22:
-+ case UNW_AARCH64_X23:
-+ case UNW_AARCH64_X24:
-+ case UNW_AARCH64_X25:
-+ case UNW_AARCH64_X26:
-+ case UNW_AARCH64_X27:
-+ case UNW_AARCH64_X28:
-+ case UNW_AARCH64_X29:
-+ case UNW_AARCH64_X30:
-+ case UNW_AARCH64_PC:
-+ case UNW_AARCH64_PSTATE:
-+ loc = c->dwarf.loc[reg];
-+ break;
-+
-+ case UNW_AARCH64_SP:
-+ if (write)
-+ return -UNW_EREADONLYREG;
-+ *valp = c->dwarf.cfa;
-+ return 0;
-+
-+ default:
-+ Debug (1, "bad register number %u\n", reg);
-+ return -UNW_EBADREG;
-+ }
-+
-+ if (write)
-+ return dwarf_put (&c->dwarf, loc, *valp);
-+ else
-+ return dwarf_get (&c->dwarf, loc, valp);
-+}
-+
-+HIDDEN int
-+tdep_access_fpreg (struct cursor *c, unw_regnum_t reg, unw_fpreg_t *valp,
-+ int write)
-+{
-+ Debug (1, "bad register number %u\n", reg);
-+ return -UNW_EBADREG;
-+}
-diff --git a/src/aarch64/Gresume.c b/src/aarch64/Gresume.c
-new file mode 100644
-index 0000000..908646b
---- /dev/null
-+++ b/src/aarch64/Gresume.c
-@@ -0,0 +1,177 @@
-+/* libunwind - a platform-independent unwind library
-+ Copyright (C) 2008 CodeSourcery
-+ Copyright (C) 2011-2013 Linaro Limited
-+ Copyright (C) 2012 Tommi Rantala <tt.rantala(a)gmail.com>
-+
-+This file is part of libunwind.
-+
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+"Software"), to deal in the Software without restriction, including
-+without limitation the rights to use, copy, modify, merge, publish,
-+distribute, sublicense, and/or sell copies of the Software, and to
-+permit persons to whom the Software is furnished to do so, subject to
-+the following conditions:
-+
-+The above copyright notice and this permission notice shall be
-+included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
-+
-+#include "unwind_i.h"
-+#include "offsets.h"
-+
-+#ifndef UNW_REMOTE_ONLY
-+
-+HIDDEN inline int
-+aarch64_local_resume (unw_addr_space_t as, unw_cursor_t *cursor, void *arg)
-+{
-+#ifdef __linux__
-+ struct cursor *c = (struct cursor *) cursor;
-+ unw_tdep_context_t *uc = c->dwarf.as_arg;
-+
-+ if (c->sigcontext_format == AARCH64_SCF_NONE)
-+ {
-+ /* Since there are no signals involved here we restore the non scratch
-+ registers only. */
-+ unsigned long regs[11];
-+ regs[0] = uc->uc_mcontext.regs[19];
-+ regs[1] = uc->uc_mcontext.regs[20];
-+ regs[2] = uc->uc_mcontext.regs[21];
-+ regs[3] = uc->uc_mcontext.regs[22];
-+ regs[4] = uc->uc_mcontext.regs[23];
-+ regs[5] = uc->uc_mcontext.regs[24];
-+ regs[6] = uc->uc_mcontext.regs[25];
-+ regs[7] = uc->uc_mcontext.regs[26];
-+ regs[8] = uc->uc_mcontext.regs[27];
-+ regs[9] = uc->uc_mcontext.regs[28];
-+ regs[10] = uc->uc_mcontext.regs[30]; /* LR */
-+ unsigned long sp = uc->uc_mcontext.sp;
-+
-+ struct regs_overlay {
-+ char x[sizeof(regs)];
-+ };
-+
-+ asm volatile (
-+ "ldp x19, x20, [%0]\n"
-+ "ldp x21, x22, [%0,16]\n"
-+ "ldp x23, x24, [%0,32]\n"
-+ "ldp x25, x26, [%0,48]\n"
-+ "ldp x27, x28, [%0,64]\n"
-+ "ldr x30, [%0,80]\n"
-+ "mov sp, %1\n"
-+ "ret \n"
-+ :
-+ : "r" (regs),
-+ "r" (sp),
-+ "m" (*(struct regs_overlay *)regs)
-+ );
-+ }
-+ else
-+ {
-+ struct sigcontext *sc = (struct sigcontext *) c->sigcontext_addr;
-+
-+ if (c->dwarf.eh_valid_mask & 0x1) sc->regs[0] = c->dwarf.eh_args[0];
-+ if (c->dwarf.eh_valid_mask & 0x2) sc->regs[1] = c->dwarf.eh_args[1];
-+ if (c->dwarf.eh_valid_mask & 0x4) sc->regs[2] = c->dwarf.eh_args[2];
-+ if (c->dwarf.eh_valid_mask & 0x8) sc->regs[3] = c->dwarf.eh_args[3];
-+
-+ sc->regs[4] = uc->uc_mcontext.regs[4];
-+ sc->regs[5] = uc->uc_mcontext.regs[5];
-+ sc->regs[6] = uc->uc_mcontext.regs[6];
-+ sc->regs[7] = uc->uc_mcontext.regs[7];
-+ sc->regs[8] = uc->uc_mcontext.regs[8];
-+ sc->regs[9] = uc->uc_mcontext.regs[9];
-+ sc->regs[10] = uc->uc_mcontext.regs[10];
-+ sc->regs[11] = uc->uc_mcontext.regs[11];
-+ sc->regs[12] = uc->uc_mcontext.regs[12];
-+ sc->regs[13] = uc->uc_mcontext.regs[13];
-+ sc->regs[14] = uc->uc_mcontext.regs[14];
-+ sc->regs[15] = uc->uc_mcontext.regs[15];
-+ sc->regs[16] = uc->uc_mcontext.regs[16];
-+ sc->regs[17] = uc->uc_mcontext.regs[17];
-+ sc->regs[18] = uc->uc_mcontext.regs[18];
-+ sc->regs[19] = uc->uc_mcontext.regs[19];
-+ sc->regs[20] = uc->uc_mcontext.regs[20];
-+ sc->regs[21] = uc->uc_mcontext.regs[21];
-+ sc->regs[22] = uc->uc_mcontext.regs[22];
-+ sc->regs[23] = uc->uc_mcontext.regs[23];
-+ sc->regs[24] = uc->uc_mcontext.regs[24];
-+ sc->regs[25] = uc->uc_mcontext.regs[25];
-+ sc->regs[26] = uc->uc_mcontext.regs[26];
-+ sc->regs[27] = uc->uc_mcontext.regs[27];
-+ sc->regs[28] = uc->uc_mcontext.regs[28];
-+ sc->regs[29] = uc->uc_mcontext.regs[29];
-+ sc->regs[30] = uc->uc_mcontext.regs[30];
-+ sc->sp = uc->uc_mcontext.sp;
-+ sc->pc = uc->uc_mcontext.pc;
-+ sc->pstate = uc->uc_mcontext.pstate;
-+
-+ asm volatile (
-+ "mov sp, %0\n"
-+ "ret %1\n"
-+ : : "r" (c->sigcontext_sp), "r" (c->sigcontext_pc)
-+ );
-+ }
-+ __builtin_unreachable();
-+#else
-+ printf ("%s: implement me\n", __FUNCTION__);
-+#endif
-+ return -UNW_EINVAL;
-+}
-+
-+#endif /* !UNW_REMOTE_ONLY */
-+
-+static inline void
-+establish_machine_state (struct cursor *c)
-+{
-+ unw_addr_space_t as = c->dwarf.as;
-+ void *arg = c->dwarf.as_arg;
-+ unw_fpreg_t fpval;
-+ unw_word_t val;
-+ int reg;
-+
-+ Debug (8, "copying out cursor state\n");
-+
-+ for (reg = 0; reg <= UNW_AARCH64_PSTATE; ++reg)
-+ {
-+ Debug (16, "copying %s %d\n", unw_regname (reg), reg);
-+ if (unw_is_fpreg (reg))
-+ {
-+ if (tdep_access_fpreg (c, reg, &fpval, 0) >= 0)
-+ as->acc.access_fpreg (as, reg, &fpval, 1, arg);
-+ }
-+ else
-+ {
-+ if (tdep_access_reg (c, reg, &val, 0) >= 0)
-+ as->acc.access_reg (as, reg, &val, 1, arg);
-+ }
-+ }
-+}
-+
-+PROTECTED int
-+unw_resume (unw_cursor_t *cursor)
-+{
-+ struct cursor *c = (struct cursor *) cursor;
-+
-+ Debug (1, "(cursor=%p)\n", c);
-+
-+ if (!c->dwarf.ip)
-+ {
-+ /* This can happen easily when the frame-chain gets truncated
-+ due to bad or missing unwind-info. */
-+ Debug (1, "refusing to resume execution at address 0\n");
-+ return -UNW_EINVAL;
-+ }
-+
-+ establish_machine_state (c);
-+
-+ return (*c->dwarf.as->acc.resume) (c->dwarf.as, (unw_cursor_t *) c,
-+ c->dwarf.as_arg);
-+}
-diff --git a/src/aarch64/Gstep.c b/src/aarch64/Gstep.c
-new file mode 100644
-index 0000000..4aa15d1
---- /dev/null
-+++ b/src/aarch64/Gstep.c
-@@ -0,0 +1,129 @@
-+/* libunwind - a platform-independent unwind library
-+ Copyright (C) 2008 CodeSourcery
-+ Copyright (C) 2011-2013 Linaro Limited
-+ Copyright (C) 2012 Tommi Rantala <tt.rantala(a)gmail.com>
-+
-+This file is part of libunwind.
-+
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+"Software"), to deal in the Software without restriction, including
-+without limitation the rights to use, copy, modify, merge, publish,
-+distribute, sublicense, and/or sell copies of the Software, and to
-+permit persons to whom the Software is furnished to do so, subject to
-+the following conditions:
-+
-+The above copyright notice and this permission notice shall be
-+included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
-+
-+#include "unwind_i.h"
-+#include "offsets.h"
-+
-+PROTECTED int
-+unw_handle_signal_frame (unw_cursor_t *cursor)
-+{
-+ struct cursor *c = (struct cursor *) cursor;
-+ int ret;
-+ unw_word_t sc_addr, sp, sp_addr = c->dwarf.cfa;
-+ struct dwarf_loc sp_loc = DWARF_LOC (sp_addr, 0);
-+
-+ if ((ret = dwarf_get (&c->dwarf, sp_loc, &sp)) < 0)
-+ return -UNW_EUNSPEC;
-+
-+ ret = unw_is_signal_frame (cursor);
-+ Debug(1, "unw_is_signal_frame()=%d\n", ret);
-+
-+ /* Save the SP and PC to be able to return execution at this point
-+ later in time (unw_resume). */
-+ c->sigcontext_sp = c->dwarf.cfa;
-+ c->sigcontext_pc = c->dwarf.ip;
-+
-+ if (ret)
-+ {
-+ c->sigcontext_format = AARCH64_SCF_LINUX_RT_SIGFRAME;
-+ sc_addr = sp_addr + sizeof (siginfo_t) + LINUX_UC_MCONTEXT_OFF;
-+ }
-+ else
-+ return -UNW_EUNSPEC;
-+
-+ c->sigcontext_addr = sc_addr;
-+
-+ /* Update the dwarf cursor.
-+ Set the location of the registers to the corresponding addresses of the
-+ uc_mcontext / sigcontext structure contents. */
-+ c->dwarf.loc[UNW_AARCH64_X0] = DWARF_LOC (sc_addr + LINUX_SC_X0_OFF, 0);
-+ c->dwarf.loc[UNW_AARCH64_X1] = DWARF_LOC (sc_addr + LINUX_SC_X1_OFF, 0);
-+ c->dwarf.loc[UNW_AARCH64_X2] = DWARF_LOC (sc_addr + LINUX_SC_X2_OFF, 0);
-+ c->dwarf.loc[UNW_AARCH64_X3] = DWARF_LOC (sc_addr + LINUX_SC_X3_OFF, 0);
-+ c->dwarf.loc[UNW_AARCH64_X4] = DWARF_LOC (sc_addr + LINUX_SC_X4_OFF, 0);
-+ c->dwarf.loc[UNW_AARCH64_X5] = DWARF_LOC (sc_addr + LINUX_SC_X5_OFF, 0);
-+ c->dwarf.loc[UNW_AARCH64_X6] = DWARF_LOC (sc_addr + LINUX_SC_X6_OFF, 0);
-+ c->dwarf.loc[UNW_AARCH64_X7] = DWARF_LOC (sc_addr + LINUX_SC_X7_OFF, 0);
-+ c->dwarf.loc[UNW_AARCH64_X8] = DWARF_LOC (sc_addr + LINUX_SC_X8_OFF, 0);
-+ c->dwarf.loc[UNW_AARCH64_X9] = DWARF_LOC (sc_addr + LINUX_SC_X9_OFF, 0);
-+ c->dwarf.loc[UNW_AARCH64_X10] = DWARF_LOC (sc_addr + LINUX_SC_X10_OFF, 0);
-+ c->dwarf.loc[UNW_AARCH64_X11] = DWARF_LOC (sc_addr + LINUX_SC_X11_OFF, 0);
-+ c->dwarf.loc[UNW_AARCH64_X12] = DWARF_LOC (sc_addr + LINUX_SC_X12_OFF, 0);
-+ c->dwarf.loc[UNW_AARCH64_X13] = DWARF_LOC (sc_addr + LINUX_SC_X13_OFF, 0);
-+ c->dwarf.loc[UNW_AARCH64_X14] = DWARF_LOC (sc_addr + LINUX_SC_X14_OFF, 0);
-+ c->dwarf.loc[UNW_AARCH64_X15] = DWARF_LOC (sc_addr + LINUX_SC_X15_OFF, 0);
-+ c->dwarf.loc[UNW_AARCH64_X16] = DWARF_LOC (sc_addr + LINUX_SC_X16_OFF, 0);
-+ c->dwarf.loc[UNW_AARCH64_X17] = DWARF_LOC (sc_addr + LINUX_SC_X17_OFF, 0);
-+ c->dwarf.loc[UNW_AARCH64_X18] = DWARF_LOC (sc_addr + LINUX_SC_X18_OFF, 0);
-+ c->dwarf.loc[UNW_AARCH64_X19] = DWARF_LOC (sc_addr + LINUX_SC_X19_OFF, 0);
-+ c->dwarf.loc[UNW_AARCH64_X20] = DWARF_LOC (sc_addr + LINUX_SC_X20_OFF, 0);
-+ c->dwarf.loc[UNW_AARCH64_X21] = DWARF_LOC (sc_addr + LINUX_SC_X21_OFF, 0);
-+ c->dwarf.loc[UNW_AARCH64_X22] = DWARF_LOC (sc_addr + LINUX_SC_X22_OFF, 0);
-+ c->dwarf.loc[UNW_AARCH64_X23] = DWARF_LOC (sc_addr + LINUX_SC_X23_OFF, 0);
-+ c->dwarf.loc[UNW_AARCH64_X24] = DWARF_LOC (sc_addr + LINUX_SC_X24_OFF, 0);
-+ c->dwarf.loc[UNW_AARCH64_X25] = DWARF_LOC (sc_addr + LINUX_SC_X25_OFF, 0);
-+ c->dwarf.loc[UNW_AARCH64_X26] = DWARF_LOC (sc_addr + LINUX_SC_X26_OFF, 0);
-+ c->dwarf.loc[UNW_AARCH64_X27] = DWARF_LOC (sc_addr + LINUX_SC_X27_OFF, 0);
-+ c->dwarf.loc[UNW_AARCH64_X28] = DWARF_LOC (sc_addr + LINUX_SC_X28_OFF, 0);
-+ c->dwarf.loc[UNW_AARCH64_X29] = DWARF_LOC (sc_addr + LINUX_SC_X29_OFF, 0);
-+ c->dwarf.loc[UNW_AARCH64_X30] = DWARF_LOC (sc_addr + LINUX_SC_X30_OFF, 0);
-+ c->dwarf.loc[UNW_AARCH64_SP] = DWARF_LOC (sc_addr + LINUX_SC_SP_OFF, 0);
-+ c->dwarf.loc[UNW_AARCH64_PC] = DWARF_LOC (sc_addr + LINUX_SC_PC_OFF, 0);
-+ c->dwarf.loc[UNW_AARCH64_PSTATE] = DWARF_LOC (sc_addr + LINUX_SC_PSTATE_OFF, 0);
-+
-+ /* Set SP/CFA and PC/IP. */
-+ dwarf_get (&c->dwarf, c->dwarf.loc[UNW_AARCH64_SP], &c->dwarf.cfa);
-+ dwarf_get (&c->dwarf, c->dwarf.loc[UNW_AARCH64_PC], &c->dwarf.ip);
-+
-+ c->dwarf.pi_valid = 0;
-+
-+ return 1;
-+}
-+
-+PROTECTED int
-+unw_step (unw_cursor_t *cursor)
-+{
-+ struct cursor *c = (struct cursor *) cursor;
-+ int ret;
-+
-+ Debug (1, "(cursor=%p, ip=0x%016lx, cfa=0x%016lx))\n",
-+ c, c->dwarf.ip, c->dwarf.cfa);
-+
-+ /* Check if this is a signal frame. */
-+ if (unw_is_signal_frame (cursor))
-+ return unw_handle_signal_frame (cursor);
-+
-+ ret = dwarf_step (&c->dwarf);
-+ Debug(1, "dwarf_step()=%d\n", ret);
-+
-+ if (unlikely (ret == -UNW_ESTOPUNWIND))
-+ return ret;
-+
-+ if (unlikely (ret < 0))
-+ return 0;
-+
-+ return (c->dwarf.ip == 0) ? 0 : 1;
-+}
-diff --git a/src/aarch64/Lcreate_addr_space.c b/src/aarch64/Lcreate_addr_space.c
-new file mode 100644
-index 0000000..0f2dc6b
---- /dev/null
-+++ b/src/aarch64/Lcreate_addr_space.c
-@@ -0,0 +1,5 @@
-+#define UNW_LOCAL_ONLY
-+#include <libunwind.h>
-+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
-+#include "Gcreate_addr_space.c"
-+#endif
-diff --git a/src/aarch64/Lget_proc_info.c b/src/aarch64/Lget_proc_info.c
-new file mode 100644
-index 0000000..69028b0
---- /dev/null
-+++ b/src/aarch64/Lget_proc_info.c
-@@ -0,0 +1,5 @@
-+#define UNW_LOCAL_ONLY
-+#include <libunwind.h>
-+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
-+#include "Gget_proc_info.c"
-+#endif
-diff --git a/src/aarch64/Lget_save_loc.c b/src/aarch64/Lget_save_loc.c
-new file mode 100644
-index 0000000..9ea048a
---- /dev/null
-+++ b/src/aarch64/Lget_save_loc.c
-@@ -0,0 +1,5 @@
-+#define UNW_LOCAL_ONLY
-+#include <libunwind.h>
-+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
-+#include "Gget_save_loc.c"
-+#endif
-diff --git a/src/aarch64/Lglobal.c b/src/aarch64/Lglobal.c
-new file mode 100644
-index 0000000..6d7b489
---- /dev/null
-+++ b/src/aarch64/Lglobal.c
-@@ -0,0 +1,5 @@
-+#define UNW_LOCAL_ONLY
-+#include <libunwind.h>
-+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
-+#include "Gglobal.c"
-+#endif
-diff --git a/src/aarch64/Linit.c b/src/aarch64/Linit.c
-new file mode 100644
-index 0000000..e9abfdd
---- /dev/null
-+++ b/src/aarch64/Linit.c
-@@ -0,0 +1,5 @@
-+#define UNW_LOCAL_ONLY
-+#include <libunwind.h>
-+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
-+#include "Ginit.c"
-+#endif
-diff --git a/src/aarch64/Linit_local.c b/src/aarch64/Linit_local.c
-new file mode 100644
-index 0000000..68a1687
---- /dev/null
-+++ b/src/aarch64/Linit_local.c
-@@ -0,0 +1,5 @@
-+#define UNW_LOCAL_ONLY
-+#include <libunwind.h>
-+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
-+#include "Ginit_local.c"
-+#endif
-diff --git a/src/aarch64/Linit_remote.c b/src/aarch64/Linit_remote.c
-new file mode 100644
-index 0000000..58cb04a
---- /dev/null
-+++ b/src/aarch64/Linit_remote.c
-@@ -0,0 +1,5 @@
-+#define UNW_LOCAL_ONLY
-+#include <libunwind.h>
-+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
-+#include "Ginit_remote.c"
-+#endif
-diff --git a/src/aarch64/Lis_signal_frame.c b/src/aarch64/Lis_signal_frame.c
-new file mode 100644
-index 0000000..b9a7c4f
---- /dev/null
-+++ b/src/aarch64/Lis_signal_frame.c
-@@ -0,0 +1,5 @@
-+#define UNW_LOCAL_ONLY
-+#include <libunwind.h>
-+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
-+#include "Gis_signal_frame.c"
-+#endif
-diff --git a/src/aarch64/Lregs.c b/src/aarch64/Lregs.c
-new file mode 100644
-index 0000000..2c9c75c
---- /dev/null
-+++ b/src/aarch64/Lregs.c
-@@ -0,0 +1,5 @@
-+#define UNW_LOCAL_ONLY
-+#include <libunwind.h>
-+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
-+#include "Gregs.c"
-+#endif
-diff --git a/src/aarch64/Lresume.c b/src/aarch64/Lresume.c
-new file mode 100644
-index 0000000..41a8cf0
---- /dev/null
-+++ b/src/aarch64/Lresume.c
-@@ -0,0 +1,5 @@
-+#define UNW_LOCAL_ONLY
-+#include <libunwind.h>
-+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
-+#include "Gresume.c"
-+#endif
-diff --git a/src/aarch64/Lstep.c b/src/aarch64/Lstep.c
-new file mode 100644
-index 0000000..c1ac3c7
---- /dev/null
-+++ b/src/aarch64/Lstep.c
-@@ -0,0 +1,5 @@
-+#define UNW_LOCAL_ONLY
-+#include <libunwind.h>
-+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
-+#include "Gstep.c"
-+#endif
-diff --git a/src/aarch64/gen-offsets.c b/src/aarch64/gen-offsets.c
-new file mode 100644
-index 0000000..eadc237
---- /dev/null
-+++ b/src/aarch64/gen-offsets.c
-@@ -0,0 +1,68 @@
-+#include <stdio.h>
-+#include <stddef.h>
-+#include <ucontext.h>
-+#include <asm/sigcontext.h>
-+
-+#define UC(N,X) \
-+ printf ("#define LINUX_UC_" N "_OFF\t0x%X\n", offsetof (ucontext_t, X))
-+
-+#define SC(N,X) \
-+ printf ("#define LINUX_SC_" N "_OFF\t0x%X\n", offsetof (struct sigcontext, X))
-+
-+int
-+main (void)
-+{
-+ printf (
-+"/* Linux-specific definitions: */\n\n"
-+
-+"/* Define various structure offsets to simplify cross-compilation. */\n\n"
-+
-+"/* Offsets for AArch64 Linux \"ucontext_t\": */\n\n");
-+
-+ UC ("FLAGS", uc_flags);
-+ UC ("LINK", uc_link);
-+ UC ("STACK", uc_stack);
-+ UC ("MCONTEXT", uc_mcontext);
-+ UC ("SIGMASK", uc_sigmask);
-+
-+ printf ("\n/* Offsets for AArch64 Linux \"struct sigcontext\": */\n\n");
-+
-+ SC ("R0", regs[0]);
-+ SC ("R1", regs[1]);
-+ SC ("R2", regs[2]);
-+ SC ("R3", regs[3]);
-+ SC ("R4", regs[4]);
-+ SC ("R5", regs[5]);
-+ SC ("R6", regs[6]);
-+ SC ("R7", regs[7]);
-+ SC ("R8", regs[8]);
-+ SC ("R9", regs[9]);
-+ SC ("R10", regs[10]);
-+ SC ("R11", regs[11]);
-+ SC ("R12", regs[12]);
-+ SC ("R13", regs[13]);
-+ SC ("R14", regs[14]);
-+ SC ("R15", regs[15]);
-+ SC ("R16", regs[16]);
-+ SC ("R17", regs[17]);
-+ SC ("R18", regs[18]);
-+ SC ("R19", regs[19]);
-+ SC ("R20", regs[20]);
-+ SC ("R21", regs[21]);
-+ SC ("R22", regs[22]);
-+ SC ("R23", regs[23]);
-+ SC ("R24", regs[24]);
-+ SC ("R25", regs[25]);
-+ SC ("R26", regs[26]);
-+ SC ("R27", regs[27]);
-+ SC ("R28", regs[28]);
-+ SC ("R29", regs[29]);
-+ SC ("R30", regs[30]);
-+ SC ("R31", regs[31]);
-+
-+ SC ("PC", pc);
-+ SC ("SP", sp);
-+ SC ("Fault", fault_address);
-+ SC ("state", pstate);
-+ return 0;
-+}
-diff --git a/src/aarch64/init.h b/src/aarch64/init.h
-new file mode 100644
-index 0000000..0cedc1a
---- /dev/null
-+++ b/src/aarch64/init.h
-@@ -0,0 +1,127 @@
-+/* libunwind - a platform-independent unwind library
-+ Copyright (C) 2012 Tommi Rantala <tt.rantala(a)gmail.com>
-+ Copyright (C) 2013 Linaro Limited
-+
-+This file is part of libunwind.
-+
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+"Software"), to deal in the Software without restriction, including
-+without limitation the rights to use, copy, modify, merge, publish,
-+distribute, sublicense, and/or sell copies of the Software, and to
-+permit persons to whom the Software is furnished to do so, subject to
-+the following conditions:
-+
-+The above copyright notice and this permission notice shall be
-+included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
-+
-+#include "unwind_i.h"
-+
-+static inline int
-+common_init (struct cursor *c, unsigned use_prev_instr)
-+{
-+ int ret, i;
-+
-+ c->dwarf.loc[UNW_AARCH64_X0] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X0);
-+ c->dwarf.loc[UNW_AARCH64_X1] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X1);
-+ c->dwarf.loc[UNW_AARCH64_X2] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X2);
-+ c->dwarf.loc[UNW_AARCH64_X3] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X3);
-+ c->dwarf.loc[UNW_AARCH64_X4] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X4);
-+ c->dwarf.loc[UNW_AARCH64_X5] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X5);
-+ c->dwarf.loc[UNW_AARCH64_X6] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X6);
-+ c->dwarf.loc[UNW_AARCH64_X7] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X7);
-+ c->dwarf.loc[UNW_AARCH64_X8] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X8);
-+ c->dwarf.loc[UNW_AARCH64_X9] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X9);
-+ c->dwarf.loc[UNW_AARCH64_X10] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X10);
-+ c->dwarf.loc[UNW_AARCH64_X11] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X11);
-+ c->dwarf.loc[UNW_AARCH64_X12] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X12);
-+ c->dwarf.loc[UNW_AARCH64_X13] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X13);
-+ c->dwarf.loc[UNW_AARCH64_X14] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X14);
-+ c->dwarf.loc[UNW_AARCH64_X15] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X15);
-+ c->dwarf.loc[UNW_AARCH64_X16] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X16);
-+ c->dwarf.loc[UNW_AARCH64_X17] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X17);
-+ c->dwarf.loc[UNW_AARCH64_X18] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X18);
-+ c->dwarf.loc[UNW_AARCH64_X19] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X19);
-+ c->dwarf.loc[UNW_AARCH64_X20] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X20);
-+ c->dwarf.loc[UNW_AARCH64_X21] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X21);
-+ c->dwarf.loc[UNW_AARCH64_X22] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X22);
-+ c->dwarf.loc[UNW_AARCH64_X23] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X23);
-+ c->dwarf.loc[UNW_AARCH64_X24] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X24);
-+ c->dwarf.loc[UNW_AARCH64_X25] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X25);
-+ c->dwarf.loc[UNW_AARCH64_X26] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X26);
-+ c->dwarf.loc[UNW_AARCH64_X27] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X27);
-+ c->dwarf.loc[UNW_AARCH64_X28] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X28);
-+ c->dwarf.loc[UNW_AARCH64_X29] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X29);
-+ c->dwarf.loc[UNW_AARCH64_X30] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X30);
-+ c->dwarf.loc[UNW_AARCH64_SP] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_SP);
-+ c->dwarf.loc[UNW_AARCH64_PC] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_PC);
-+ c->dwarf.loc[UNW_AARCH64_PSTATE] = DWARF_REG_LOC (&c->dwarf,
-+ UNW_AARCH64_PSTATE);
-+ c->dwarf.loc[UNW_AARCH64_V0] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V0);
-+ c->dwarf.loc[UNW_AARCH64_V1] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V1);
-+ c->dwarf.loc[UNW_AARCH64_V2] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V2);
-+ c->dwarf.loc[UNW_AARCH64_V3] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V3);
-+ c->dwarf.loc[UNW_AARCH64_V4] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V4);
-+ c->dwarf.loc[UNW_AARCH64_V5] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V5);
-+ c->dwarf.loc[UNW_AARCH64_V6] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V6);
-+ c->dwarf.loc[UNW_AARCH64_V7] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V7);
-+ c->dwarf.loc[UNW_AARCH64_V8] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V8);
-+ c->dwarf.loc[UNW_AARCH64_V9] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V9);
-+ c->dwarf.loc[UNW_AARCH64_V10] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V10);
-+ c->dwarf.loc[UNW_AARCH64_V11] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V11);
-+ c->dwarf.loc[UNW_AARCH64_V12] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V12);
-+ c->dwarf.loc[UNW_AARCH64_V13] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V13);
-+ c->dwarf.loc[UNW_AARCH64_V14] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V14);
-+ c->dwarf.loc[UNW_AARCH64_V15] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V15);
-+ c->dwarf.loc[UNW_AARCH64_V16] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V16);
-+ c->dwarf.loc[UNW_AARCH64_V17] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V17);
-+ c->dwarf.loc[UNW_AARCH64_V18] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V18);
-+ c->dwarf.loc[UNW_AARCH64_V19] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V19);
-+ c->dwarf.loc[UNW_AARCH64_V20] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V20);
-+ c->dwarf.loc[UNW_AARCH64_V21] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V21);
-+ c->dwarf.loc[UNW_AARCH64_V22] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V22);
-+ c->dwarf.loc[UNW_AARCH64_V23] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V23);
-+ c->dwarf.loc[UNW_AARCH64_V24] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V24);
-+ c->dwarf.loc[UNW_AARCH64_V25] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V25);
-+ c->dwarf.loc[UNW_AARCH64_V26] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V26);
-+ c->dwarf.loc[UNW_AARCH64_V27] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V27);
-+ c->dwarf.loc[UNW_AARCH64_V28] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V28);
-+ c->dwarf.loc[UNW_AARCH64_V29] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V29);
-+ c->dwarf.loc[UNW_AARCH64_V30] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V30);
-+ c->dwarf.loc[UNW_AARCH64_V31] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V31);
-+
-+ for (i = UNW_AARCH64_PSTATE + 1; i < UNW_AARCH64_V0; ++i)
-+ c->dwarf.loc[i] = DWARF_NULL_LOC;
-+
-+ ret = dwarf_get (&c->dwarf, c->dwarf.loc[UNW_AARCH64_PC], &c->dwarf.ip);
-+ if (ret < 0)
-+ return ret;
-+
-+ ret = dwarf_get (&c->dwarf, c->dwarf.loc[UNW_AARCH64_SP], &c->dwarf.cfa);
-+ if (ret < 0)
-+ return ret;
-+
-+ c->sigcontext_format = AARCH64_SCF_NONE;
-+ c->sigcontext_addr = 0;
-+ c->sigcontext_sp = 0;
-+ c->sigcontext_pc = 0;
-+
-+ c->dwarf.args_size = 0;
-+ c->dwarf.ret_addr_column = 0;
-+ c->dwarf.stash_frames = 0;
-+ c->dwarf.use_prev_instr = use_prev_instr;
-+ c->dwarf.pi_valid = 0;
-+ c->dwarf.pi_is_dynamic = 0;
-+ c->dwarf.hint = 0;
-+ c->dwarf.prev_rs = 0;
-+
-+ return 0;
-+}
-diff --git a/src/aarch64/is_fpreg.c b/src/aarch64/is_fpreg.c
-new file mode 100644
-index 0000000..7c32693
---- /dev/null
-+++ b/src/aarch64/is_fpreg.c
-@@ -0,0 +1,32 @@
-+/* libunwind - a platform-independent unwind library
-+ Copyright (C) 2008 CodeSourcery
-+ Copyright (C) 2013 Linaro Limited
-+
-+This file is part of libunwind.
-+
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+"Software"), to deal in the Software without restriction, including
-+without limitation the rights to use, copy, modify, merge, publish,
-+distribute, sublicense, and/or sell copies of the Software, and to
-+permit persons to whom the Software is furnished to do so, subject to
-+the following conditions:
-+
-+The above copyright notice and this permission notice shall be
-+included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
-+
-+#include "libunwind_i.h"
-+
-+PROTECTED int
-+unw_is_fpreg (int regnum)
-+{
-+ return (regnum >= UNW_AARCH64_V0 && regnum <= UNW_AARCH64_V31);
-+}
-diff --git a/src/aarch64/offsets.h b/src/aarch64/offsets.h
-new file mode 100644
-index 0000000..81aa74f
---- /dev/null
-+++ b/src/aarch64/offsets.h
-@@ -0,0 +1,49 @@
-+/* Linux-specific definitions: */
-+
-+/* Define various structure offsets to simplify cross-compilation. */
-+
-+/* Offsets for AArch64 Linux "ucontext_t": */
-+
-+#define LINUX_UC_FLAGS_OFF 0x0
-+#define LINUX_UC_LINK_OFF 0x8
-+#define LINUX_UC_STACK_OFF 0x10
-+#define LINUX_UC_SIGMASK_OFF 0x28
-+#define LINUX_UC_MCONTEXT_OFF 0xb0
-+
-+/* Offsets for AArch64 Linux "struct sigcontext": */
-+
-+#define LINUX_SC_FAULTADDRESS_OFF 0x00
-+#define LINUX_SC_X0_OFF 0x008
-+#define LINUX_SC_X1_OFF 0x010
-+#define LINUX_SC_X2_OFF 0x018
-+#define LINUX_SC_X3_OFF 0x020
-+#define LINUX_SC_X4_OFF 0x028
-+#define LINUX_SC_X5_OFF 0x030
-+#define LINUX_SC_X6_OFF 0x038
-+#define LINUX_SC_X7_OFF 0x040
-+#define LINUX_SC_X8_OFF 0x048
-+#define LINUX_SC_X9_OFF 0x050
-+#define LINUX_SC_X10_OFF 0x058
-+#define LINUX_SC_X11_OFF 0x060
-+#define LINUX_SC_X12_OFF 0x068
-+#define LINUX_SC_X13_OFF 0x070
-+#define LINUX_SC_X14_OFF 0x078
-+#define LINUX_SC_X15_OFF 0x080
-+#define LINUX_SC_X16_OFF 0x088
-+#define LINUX_SC_X17_OFF 0x090
-+#define LINUX_SC_X18_OFF 0x098
-+#define LINUX_SC_X19_OFF 0x0a0
-+#define LINUX_SC_X20_OFF 0x0a8
-+#define LINUX_SC_X21_OFF 0x0b0
-+#define LINUX_SC_X22_OFF 0x0b8
-+#define LINUX_SC_X23_OFF 0x0c0
-+#define LINUX_SC_X24_OFF 0x0c8
-+#define LINUX_SC_X25_OFF 0x0d0
-+#define LINUX_SC_X26_OFF 0x0d8
-+#define LINUX_SC_X27_OFF 0x0e0
-+#define LINUX_SC_X28_OFF 0x0e8
-+#define LINUX_SC_X29_OFF 0x0f0
-+#define LINUX_SC_X30_OFF 0x0f8
-+#define LINUX_SC_SP_OFF 0x100
-+#define LINUX_SC_PC_OFF 0x108
-+#define LINUX_SC_PSTATE_OFF 0x110
-diff --git a/src/aarch64/regname.c b/src/aarch64/regname.c
-new file mode 100644
-index 0000000..8c97342
---- /dev/null
-+++ b/src/aarch64/regname.c
-@@ -0,0 +1,106 @@
-+/* libunwind - a platform-independent unwind library
-+ Copyright (C) 2012 Tommi Rantala <tt.rantala(a)gmail.com>
-+ Copyright (C) 2013 Linaro Limited
-+
-+This file is part of libunwind.
-+
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+"Software"), to deal in the Software without restriction, including
-+without limitation the rights to use, copy, modify, merge, publish,
-+distribute, sublicense, and/or sell copies of the Software, and to
-+permit persons to whom the Software is furnished to do so, subject to
-+the following conditions:
-+
-+The above copyright notice and this permission notice shall be
-+included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
-+
-+#include "unwind_i.h"
-+
-+static const char *const regname[] =
-+ {
-+ [UNW_AARCH64_X0] = "x0",
-+ [UNW_AARCH64_X1] = "x1",
-+ [UNW_AARCH64_X2] = "x2",
-+ [UNW_AARCH64_X3] = "x3",
-+ [UNW_AARCH64_X4] = "x4",
-+ [UNW_AARCH64_X5] = "x5",
-+ [UNW_AARCH64_X6] = "x6",
-+ [UNW_AARCH64_X7] = "x7",
-+ [UNW_AARCH64_X8] = "x8",
-+ [UNW_AARCH64_X9] = "x9",
-+ [UNW_AARCH64_X10] = "x10",
-+ [UNW_AARCH64_X11] = "x11",
-+ [UNW_AARCH64_X12] = "x12",
-+ [UNW_AARCH64_X13] = "x13",
-+ [UNW_AARCH64_X14] = "x14",
-+ [UNW_AARCH64_X15] = "x15",
-+ [UNW_AARCH64_X16] = "ip0",
-+ [UNW_AARCH64_X17] = "ip1",
-+ [UNW_AARCH64_X18] = "x18",
-+ [UNW_AARCH64_X19] = "x19",
-+ [UNW_AARCH64_X20] = "x20",
-+ [UNW_AARCH64_X21] = "x21",
-+ [UNW_AARCH64_X22] = "x22",
-+ [UNW_AARCH64_X23] = "x23",
-+ [UNW_AARCH64_X24] = "x24",
-+ [UNW_AARCH64_X25] = "x25",
-+ [UNW_AARCH64_X26] = "x26",
-+ [UNW_AARCH64_X27] = "x27",
-+ [UNW_AARCH64_X28] = "x28",
-+ [UNW_AARCH64_X29] = "fp",
-+ [UNW_AARCH64_X30] = "lr",
-+ [UNW_AARCH64_SP] = "sp",
-+ [UNW_AARCH64_PC] = "pc",
-+ [UNW_AARCH64_V0] = "v0",
-+ [UNW_AARCH64_V1] = "v1",
-+ [UNW_AARCH64_V2] = "v2",
-+ [UNW_AARCH64_V3] = "v3",
-+ [UNW_AARCH64_V4] = "v4",
-+ [UNW_AARCH64_V5] = "v5",
-+ [UNW_AARCH64_V6] = "v6",
-+ [UNW_AARCH64_V7] = "v7",
-+ [UNW_AARCH64_V8] = "v8",
-+ [UNW_AARCH64_V9] = "v9",
-+ [UNW_AARCH64_V10] = "v10",
-+ [UNW_AARCH64_V11] = "v11",
-+ [UNW_AARCH64_V12] = "v12",
-+ [UNW_AARCH64_V13] = "v13",
-+ [UNW_AARCH64_V14] = "v14",
-+ [UNW_AARCH64_V15] = "v15",
-+ [UNW_AARCH64_V16] = "v16",
-+ [UNW_AARCH64_V17] = "v17",
-+ [UNW_AARCH64_V18] = "v18",
-+ [UNW_AARCH64_V19] = "v19",
-+ [UNW_AARCH64_V20] = "v20",
-+ [UNW_AARCH64_V21] = "v21",
-+ [UNW_AARCH64_V22] = "v22",
-+ [UNW_AARCH64_V23] = "v23",
-+ [UNW_AARCH64_V24] = "v24",
-+ [UNW_AARCH64_V25] = "v25",
-+ [UNW_AARCH64_V26] = "v26",
-+ [UNW_AARCH64_V27] = "v27",
-+ [UNW_AARCH64_V28] = "v28",
-+ [UNW_AARCH64_V29] = "v29",
-+ [UNW_AARCH64_V30] = "v30",
-+ [UNW_AARCH64_V31] = "v31",
-+ [UNW_AARCH64_FPSR] = "fpsr",
-+ [UNW_AARCH64_FPCR] = "fpcr",
-+ };
-+
-+PROTECTED const char *
-+unw_regname (unw_regnum_t reg)
-+{
-+ if (reg < (unw_regnum_t) ARRAY_SIZE (regname) && regname[reg] != NULL)
-+ return regname[reg];
-+ else
-+ return "???";
-+}
-diff --git a/src/aarch64/siglongjmp.S b/src/aarch64/siglongjmp.S
-new file mode 100644
-index 0000000..9985c4b
---- /dev/null
-+++ b/src/aarch64/siglongjmp.S
-@@ -0,0 +1,12 @@
-+ /* Dummy implementation for now. */
-+
-+ .global _UI_siglongjmp_cont
-+ .global _UI_longjmp_cont
-+
-+_UI_siglongjmp_cont:
-+_UI_longjmp_cont:
-+ ret
-+#ifdef __linux__
-+ /* We do not need executable stack. */
-+ .section .note.GNU-stack,"",%progbits
-+#endif
-diff --git a/src/aarch64/unwind_i.h b/src/aarch64/unwind_i.h
-new file mode 100644
-index 0000000..e4947a3
---- /dev/null
-+++ b/src/aarch64/unwind_i.h
-@@ -0,0 +1,43 @@
-+/* libunwind - a platform-independent unwind library
-+ Copyright (C) 2008 CodeSourcery
-+ Copyright (C) 2013 Linaro Limited
-+
-+This file is part of libunwind.
-+
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+"Software"), to deal in the Software without restriction, including
-+without limitation the rights to use, copy, modify, merge, publish,
-+distribute, sublicense, and/or sell copies of the Software, and to
-+permit persons to whom the Software is furnished to do so, subject to
-+the following conditions:
-+
-+The above copyright notice and this permission notice shall be
-+included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
-+
-+#ifndef unwind_i_h
-+#define unwind_i_h
-+
-+#include <stdint.h>
-+
-+#include <libunwind-aarch64.h>
-+
-+#include "libunwind_i.h"
-+
-+#define aarch64_lock UNW_OBJ(lock)
-+#define aarch64_local_resume UNW_OBJ(local_resume)
-+#define aarch64_local_addr_space_init UNW_OBJ(local_addr_space_init)
-+
-+extern void aarch64_local_addr_space_init (void);
-+extern int aarch64_local_resume (unw_addr_space_t as, unw_cursor_t *cursor,
-+ void *arg);
-+
-+#endif /* unwind_i_h */
-diff --git a/src/coredump/_UCD_access_reg_linux.c b/src/coredump/_UCD_access_reg_linux.c
-index bc360ad..9dc0904 100644
---- a/src/coredump/_UCD_access_reg_linux.c
-+++ b/src/coredump/_UCD_access_reg_linux.c
-@@ -39,7 +39,10 @@ _UCD_access_reg (unw_addr_space_t as,
- return -UNW_EINVAL;
- }
-
--#if defined(UNW_TARGET_ARM)
-+#if defined(UNW_TARGET_AARCH64)
-+ if (regnum < 0 || regnum >= UNW_AARCH64_FPCR)
-+ goto badreg;
-+#elif defined(UNW_TARGET_ARM)
- if (regnum < 0 || regnum >= 16)
- goto badreg;
- #elif defined(UNW_TARGET_SH)
-diff --git a/src/ptrace/_UPT_reg_offset.c b/src/ptrace/_UPT_reg_offset.c
-index 765f7d5..ced4896 100644
---- a/src/ptrace/_UPT_reg_offset.c
-+++ b/src/ptrace/_UPT_reg_offset.c
-@@ -1,6 +1,7 @@
- /* libunwind - a platform-independent unwind library
- Copyright (C) 2003-2004 Hewlett-Packard Co
- Contributed by David Mosberger-Tang <davidm(a)hpl.hp.com>
-+ Copyright (C) 2013 Linaro Limited
-
- This file is part of libunwind.
-
-@@ -501,6 +502,41 @@ const int _UPT_reg_offset[UNW_REG_LAST + 1] =
- [UNW_ARM_R15] = 0x3c,
- #elif defined(UNW_TARGET_MIPS)
- #elif defined(UNW_TARGET_SH)
-+#elif defined(UNW_TARGET_AARCH64)
-+ [UNW_AARCH64_X0] = 0x00,
-+ [UNW_AARCH64_X1] = 0x08,
-+ [UNW_AARCH64_X2] = 0x10,
-+ [UNW_AARCH64_X3] = 0x18,
-+ [UNW_AARCH64_X4] = 0x20,
-+ [UNW_AARCH64_X5] = 0x28,
-+ [UNW_AARCH64_X6] = 0x30,
-+ [UNW_AARCH64_X7] = 0x38,
-+ [UNW_AARCH64_X8] = 0x40,
-+ [UNW_AARCH64_X9] = 0x48,
-+ [UNW_AARCH64_X10] = 0x50,
-+ [UNW_AARCH64_X11] = 0x58,
-+ [UNW_AARCH64_X12] = 0x60,
-+ [UNW_AARCH64_X13] = 0x68,
-+ [UNW_AARCH64_X14] = 0x70,
-+ [UNW_AARCH64_X15] = 0x78,
-+ [UNW_AARCH64_X16] = 0x80,
-+ [UNW_AARCH64_X17] = 0x88,
-+ [UNW_AARCH64_X18] = 0x90,
-+ [UNW_AARCH64_X19] = 0x98,
-+ [UNW_AARCH64_X20] = 0xa0,
-+ [UNW_AARCH64_X21] = 0xa8,
-+ [UNW_AARCH64_X22] = 0xb0,
-+ [UNW_AARCH64_X23] = 0xb8,
-+ [UNW_AARCH64_X24] = 0xc0,
-+ [UNW_AARCH64_X25] = 0xc8,
-+ [UNW_AARCH64_X26] = 0xd0,
-+ [UNW_AARCH64_X27] = 0xd8,
-+ [UNW_AARCH64_X28] = 0xe0,
-+ [UNW_AARCH64_X29] = 0xe8,
-+ [UNW_AARCH64_X30] = 0xf0,
-+ [UNW_AARCH64_SP] = 0xf8,
-+ [UNW_AARCH64_PC] = 0x100,
-+ [UNW_AARCH64_PSTATE] = 0x108
- #else
- # error Fix me.
- #endif
diff --git a/libunwind/patches/libunwind-disable-setjmp.patch b/libunwind/patches/libunwind-disable-setjmp.patch
deleted file mode 100644
index a463f49bf..000000000
--- a/libunwind/patches/libunwind-disable-setjmp.patch
+++ /dev/null
@@ -1,185 +0,0 @@
-At least x86_64 version cannot work, src/setjmp/setjmp.c and
-src/setjmp/sigsetjmp.c are not even compiled, src/x86_64/longjmp.S does not
-match src/setjmp/setjmp.c + include/tdep-x86_64/jmpbuf.h .
-
-google-perftools link only with libunwind.so.7 .
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index adfbef3..08d2870 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -1,5 +1,5 @@
- SOVERSION=8:1:0 # See comments at end of file.
--SETJMP_SO_VERSION=0:0:0
-+#SETJMP_SO_VERSION=0:0:0
- COREDUMP_SO_VERSION=0:0:0
- #
- # Don't link with start-files since we don't use any constructors/destructors:
-@@ -22,8 +22,8 @@ pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = libunwind-generic.pc
-
- if !REMOTE_ONLY
--pkgconfig_DATA += unwind/libunwind.pc ptrace/libunwind-ptrace.pc \
-- setjmp/libunwind-setjmp.pc
-+pkgconfig_DATA += unwind/libunwind.pc ptrace/libunwind-ptrace.pc
-+# setjmp/libunwind-setjmp.pc
- endif
-
- if BUILD_COREDUMP
-@@ -61,8 +61,8 @@ libunwind_coredump_la_LDFLAGS = $(COMMON_SO_LDFLAGS) \
- noinst_HEADERS += coredump/_UCD_internal.h
-
- ### libunwind-setjmp:
--libunwind_setjmp_la_LDFLAGS = $(COMMON_SO_LDFLAGS) \
-- -version-info $(SETJMP_SO_VERSION)
-+#libunwind_setjmp_la_LDFLAGS = $(COMMON_SO_LDFLAGS) \
-+# -version-info $(SETJMP_SO_VERSION)
-
- if USE_ELF32
- LIBUNWIND_ELF = libunwind-elf32.la
-@@ -74,12 +74,12 @@ if USE_ELFXX
- LIBUNWIND_ELF = libunwind-elfxx.la
- endif
-
--libunwind_setjmp_la_LIBADD = $(LIBUNWIND_ELF) \
-- libunwind-$(arch).la \
-- libunwind.la -lc
--libunwind_setjmp_la_SOURCES = setjmp/longjmp.c \
-- setjmp/siglongjmp.c
--noinst_HEADERS += setjmp/setjmp_i.h
-+#libunwind_setjmp_la_LIBADD = $(LIBUNWIND_ELF) \
-+# libunwind-$(arch).la \
-+# libunwind.la -lc
-+#libunwind_setjmp_la_SOURCES = setjmp/longjmp.c \
-+# setjmp/siglongjmp.c
-+#noinst_HEADERS += setjmp/setjmp_i.h
-
- ### libunwind:
- libunwind_la_LIBADD =
-@@ -428,7 +428,7 @@ if ARCH_ARM
- if !REMOTE_ONLY
- libunwind_arm_la_LIBADD += libunwind.la -lc
- endif
-- libunwind_setjmp_la_SOURCES += arm/siglongjmp.S
-+# libunwind_setjmp_la_SOURCES += arm/siglongjmp.S
- else
- if ARCH_IA64
- BUILT_SOURCES = Gcursor_i.h Lcursor_i.h
-@@ -449,8 +449,8 @@ Lcursor_i.h: mk_Lcursor_i.s
- if !REMOTE_ONLY
- libunwind_ia64_la_LIBADD += libunwind.la -lc
- endif
-- libunwind_setjmp_la_SOURCES += ia64/setjmp.S ia64/sigsetjmp.S \
-- ia64/longjmp.S ia64/siglongjmp.S
-+# libunwind_setjmp_la_SOURCES += ia64/setjmp.S ia64/sigsetjmp.S \
-+# ia64/longjmp.S ia64/siglongjmp.S
- else
- if ARCH_HPPA
- lib_LTLIBRARIES += libunwind-hppa.la
-@@ -462,7 +462,7 @@ if ARCH_HPPA
- if !REMOTE_ONLY
- libunwind_hppa_la_LIBADD += libunwind.la -lc
- endif
-- libunwind_setjmp_la_SOURCES += hppa/siglongjmp.S
-+# libunwind_setjmp_la_SOURCES += hppa/siglongjmp.S
- else
- if ARCH_MIPS
- lib_LTLIBRARIES += libunwind-mips.la
-@@ -474,7 +474,7 @@ if ARCH_MIPS
- if !REMOTE_ONLY
- libunwind_mips_la_LIBADD += libunwind.la -lc
- endif
-- libunwind_setjmp_la_SOURCES += mips/siglongjmp.S
-+# libunwind_setjmp_la_SOURCES += mips/siglongjmp.S
- else
- if ARCH_X86
- lib_LTLIBRARIES += libunwind-x86.la
-@@ -486,7 +486,7 @@ if ARCH_X86
- if !REMOTE_ONLY
- libunwind_x86_la_LIBADD += libunwind.la -lc
- endif
-- libunwind_setjmp_la_SOURCES += x86/longjmp.S x86/siglongjmp.S
-+# libunwind_setjmp_la_SOURCES += x86/longjmp.S x86/siglongjmp.S
- else
- if ARCH_X86_64
- lib_LTLIBRARIES += libunwind-x86_64.la
-@@ -498,7 +498,7 @@ if ARCH_X86_64
- if !REMOTE_ONLY
- libunwind_x86_64_la_LIBADD += libunwind.la -lc
- endif
-- libunwind_setjmp_la_SOURCES += x86_64/longjmp.S x86_64/siglongjmp.S
-+# libunwind_setjmp_la_SOURCES += x86_64/longjmp.S x86_64/siglongjmp.S
- else
- if ARCH_PPC32
- lib_LTLIBRARIES += libunwind-ppc32.la
-@@ -510,7 +510,7 @@ if ARCH_PPC32
- if !REMOTE_ONLY
- libunwind_ppc32_la_LIBADD += libunwind.la -lc
- endif
-- libunwind_setjmp_la_SOURCES += ppc/longjmp.S ppc/siglongjmp.S
-+# libunwind_setjmp_la_SOURCES += ppc/longjmp.S ppc/siglongjmp.S
- else
- if ARCH_PPC64
- lib_LTLIBRARIES += libunwind-ppc64.la
-@@ -522,7 +522,7 @@ if ARCH_PPC64
- if !REMOTE_ONLY
- libunwind_ppc64_la_LIBADD += libunwind.la -lc
- endif
-- libunwind_setjmp_la_SOURCES += ppc/longjmp.S ppc/siglongjmp.S
-+# libunwind_setjmp_la_SOURCES += ppc/longjmp.S ppc/siglongjmp.S
- else
- if ARCH_SH
- lib_LTLIBRARIES += libunwind-sh.la
-@@ -534,7 +534,7 @@ if ARCH_SH
- if !REMOTE_ONLY
- libunwind_sh_la_LIBADD += libunwind.la -lc
- endif
-- libunwind_setjmp_la_SOURCES += sh/siglongjmp.S
-+# libunwind_setjmp_la_SOURCES += sh/siglongjmp.S
-
- endif # ARCH_SH
- endif # ARCH_PPC64
-@@ -549,7 +549,7 @@ endif # ARCH_ARM
- # libunwind-setjmp depends on libunwind-$(arch). Therefore must be added
- # at the end.
- if !REMOTE_ONLY
--lib_LTLIBRARIES += libunwind-setjmp.la
-+#lib_LTLIBRARIES += libunwind-setjmp.la
- endif
-
- #
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index a367eed..3f47e80 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -45,7 +45,7 @@ endif #!ARCH_IA64
- Gtest-dyn1 Ltest-dyn1 \
- Gtest-trace Ltest-trace \
- test-async-sig test-flush-cache test-init-remote \
-- test-mem test-setjmp test-ptrace Ltest-varargs \
-+ test-mem test-ptrace Ltest-varargs \
- Ltest-nomalloc Ltest-nocalloc Lrs-race
- noinst_PROGRAMS_cdep = forker crasher mapper test-ptrace-misc \
- Gperf-simple Lperf-simple
-@@ -134,8 +134,8 @@ if USE_ELFXX
- LIBUNWIND_ELF = $(top_builddir)/src/libunwind-elfxx.la
- endif
-
--LIBUNWIND_setjmp = $(top_builddir)/src/libunwind-setjmp.la \
-- $(LIBUNWIND_ELF) $(LIBUNWIND)
-+#LIBUNWIND_setjmp = $(top_builddir)/src/libunwind-setjmp.la \
-+# $(LIBUNWIND_ELF) $(LIBUNWIND)
-
- test_async_sig_LDADD = $(LIBUNWIND_local) -lpthread
- test_flush_cache_LDADD = $(LIBUNWIND_local)
-@@ -172,8 +172,8 @@ Lperf_simple_LDADD = $(LIBUNWIND_local)
- Ltest_trace_LDADD = $(LIBUNWIND_local)
- Lperf_trace_LDADD = $(LIBUNWIND_local)
-
--test_setjmp_LDADD = $(LIBUNWIND_setjmp)
--ia64_test_setjmp_LDADD = $(LIBUNWIND_setjmp)
-+#test_setjmp_LDADD = $(LIBUNWIND_setjmp)
-+#ia64_test_setjmp_LDADD = $(LIBUNWIND_setjmp)
-
- if BUILD_COREDUMP
- test_coredump_unwind_LDADD = $(LIBUNWIND_coredump) $(LIBUNWIND)
diff --git a/luajit/luajit.nm b/luajit/luajit.nm
new file mode 100644
index 000000000..ac94acd63
--- /dev/null
+++ b/luajit/luajit.nm
@@ -0,0 +1,57 @@
+###############################################################################
+# IPFire.org - An Open Source Firewall Solution #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
+###############################################################################
+
+name = luajit
+version = 2.1.0
+release = 0.1-beta3-%{commit}
+thisapp = luajit-2.0-%{commit}
+
+# LuaJIT no longer tags releases:
+# https://github.com/LuaJIT/LuaJIT/issues/665#issuecomment-784452583
+commit = a04480e
+
+groups = System/Libraries
+url = https://luajit.org/
+license = MIT
+summary = A Just-In-Time Compiler for Lua
+
+description
+ LuaJIT is a Just-In-Time Compiler (JIT) for the Lua programming language.
+ Lua is a powerful, dynamic and light-weight programming language.
+ It may be embedded or used as a general-purpose, stand-alone language.
+end
+
+source_dl = https://repo.or.cz/luajit-2.0.git/snapshot/
+sources = %{commit}.tar.gz
+
+build
+ build
+ make amalg PREFIX="%{prefix}" BUILDMODE=dynamic TARGET_STRIP=" @:"
+ end
+
+ install
+ make install \
+ DESTDIR="%{BUILDROOT}" \
+ PREFIX="%{prefix}" \
+ INSTALL_BIN="%{BUILDROOT}%{bindir}" \
+ INSTALL_LIB="%{BUILDROOT}%{libdir}" \
+ INSTALL_SHARE="%{BUILDROOT}%{datadir}" \
+ INSTALL_DEFINC="%{BUILDROOT}%{includedir}/luajit-2.1"
+
+ ln -svf luajit-2.1.0-beta3 "%{BUILDROOT}%{bindir}/luajit"
+ end
+end
+
+packages
+ package %{name}
+
+ package %{name}-devel
+ template DEVEL
+ end
+
+ package %{name}-debuginfo
+ template DEBUGINFO
+ end
+end
diff --git a/joe/joe.nm b/nghttp2/nghttp2.nm
similarity index 50%
rename from joe/joe.nm
rename to nghttp2/nghttp2.nm
index f11a48d11..261012ef3 100644
--- a/joe/joe.nm
+++ b/nghttp2/nghttp2.nm
@@ -3,31 +3,34 @@
# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
###############################################################################
-name = joe
-version = 4.3
+name = nghttp2
+version = 1.51.0
release = 1
-groups = Applications/Editors
-url = http://joe-editor.sourceforge.net/
-license = GPLv2+
-summary = A small text editor similar to wordstar in matter of usage.
+groups = System/Libraries
+url = https://nghttp2.org/
+license = MIT
+summary = Framing layer of HTTP/2 is implemented as a reusable C library
description
- Joe is a small and friendly text editor which provides the look \
- and feel of the good old wordstar.
+ nghttp2 is an implementation of HTTP/2 and its header compression
+ algorithm HPACK in C.
end
-source_dl = https://sourceforge.net/projects/joe-editor/files/JOE%20sources/%{thisapp}/
+source_dl = https://github.com/nghttp2/nghttp2/releases/download/v%{version}/
build
- requires
- ncurses-devel
- end
+ configure_options += \
+ --enable-lib-only
end
packages
package %{name}
+ package %{name}-devel
+ template DEVEL
+ end
+
package %{name}-debuginfo
template DEBUGINFO
end
diff --git a/p11-kit/p11-kit.nm b/p11-kit/p11-kit.nm
index 3b5945c59..5470a6136 100644
--- a/p11-kit/p11-kit.nm
+++ b/p11-kit/p11-kit.nm
@@ -4,13 +4,13 @@
###############################################################################
name = p11-kit
-version = 0.23.2
+version = 0.24.1
release = 1
groups = System/Libraries
-url = http://p11-glue.freedesktop.org/p11-kit.html
+url = https://p11-glue.github.io/p11-glue/p11-kit.html
license = BSD
-summary = Provides a way to load and enumerate PKCS#11 modules.
+summary = Provides a way to load and enumerate PKCS#11 modules
description
Provides a way to load and enumerate PKCS#11 modules. Provides a standard
@@ -21,12 +21,26 @@ description
components or libraries living in the same process.
end
-source_dl = http://p11-glue.freedesktop.org/releases/
+source_dl = https://github.com/p11-glue/p11-kit/releases/download/%{version}/
+sources = %{thisapp}.tar.xz
build
requires
+ bash-completion-devel
libffi-devel >= 3.0.0
libtasn1-devel >= 2.3
+ meson
+ ninja
+ systemd-devel
+ end
+
+ build
+ %{meson}
+ %{meson_build}
+ end
+
+ install
+ %{meson_install}
end
end
diff --git a/perl/patches/perl-USE_MM_LD_RUN_PATH.patch b/perl/patches/perl-USE_MM_LD_RUN_PATH.patch
index 5b86af84e..c982eb4d9 100644
--- a/perl/patches/perl-USE_MM_LD_RUN_PATH.patch
+++ b/perl/patches/perl-USE_MM_LD_RUN_PATH.patch
@@ -1,7 +1,7 @@
diff -up perl-5.14.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm.usem perl-5.14.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm
--- perl-5.14.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm.usem 2011-05-08 05:10:08.000000000 +0200
+++ perl-5.14.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm 2011-05-17 11:14:22.169115984 +0200
-@@ -88,6 +88,11 @@ libraries. LD_RUN_PATH is a colon separ
+@@ -89,6 +89,11 @@ libraries. LD_RUN_PATH is a colon separ
in LDLOADLIBS. It is passed as an environment variable to the process
that links the shared library.
@@ -16,16 +16,16 @@ diff -up perl-5.14.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm.usem perl-5
diff -up perl-5.14.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm.usem perl-5.14.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm
--- perl-5.14.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm.usem 2011-05-08 05:10:08.000000000 +0200
+++ perl-5.14.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm 2011-05-17 13:39:26.912586030 +0200
-@@ -278,7 +278,7 @@ sub full_setup {
- PERL_SRC PERM_DIR PERM_RW PERM_RWX MAGICXS
- PL_FILES PM PM_FILTER PMLIBDIRS PMLIBPARENTDIRS POLLUTE PPM_INSTALL_EXEC PPM_UNINSTALL_EXEC
- PPM_INSTALL_SCRIPT PPM_UNINSTALL_SCRIPT PREREQ_FATAL PREREQ_PM PREREQ_PRINT PRINT_PREREQ
-- SIGN SKIP TEST_REQUIRES TYPEMAPS UNINST VERSION VERSION_FROM XS XSOPT XSPROTOARG
-+ SIGN SKIP TEST_REQUIRES TYPEMAPS UNINST USE_MM_LD_RUN_PATH VERSION VERSION_FROM XS XSOPT XSPROTOARG
- XS_VERSION clean depend dist dynamic_lib linkext macro realclean
- tool_autosplit
+@@ -317,7 +317,7 @@ sub full_setup {
+ PERM_DIR PERM_RW PERM_RWX MAGICXS
+ PL_FILES PM PM_FILTER PMLIBDIRS PMLIBPARENTDIRS POLLUTE
+ PREREQ_FATAL PREREQ_PM PREREQ_PRINT PRINT_PREREQ PUREPERL_ONLY
+- SIGN SKIP TEST_REQUIRES TYPEMAPS UNINST VERSION VERSION_FROM XS
++ SIGN SKIP TEST_REQUIRES TYPEMAPS UNINST USE_MM_LD_RUN_PATH VERSION VERSION_FROM XS
+ XSBUILD XSMULTI XSOPT XSPROTOARG XS_VERSION
+ clean depend dist dynamic_lib linkext macro realclean tool_autosplit
-@@ -422,7 +422,27 @@ sub new {
+@@ -501,7 +501,27 @@ sub new {
# PRINT_PREREQ is RedHatism.
if ("@ARGV" =~ /\bPRINT_PREREQ\b/) {
$self->_PRINT_PREREQ;
@@ -53,8 +53,8 @@ diff -up perl-5.14.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm.usem perl
+ };
print "MakeMaker (v$VERSION)\n" if $Verbose;
- if (-f "MANIFEST" && ! -f "Makefile" && ! $ENV{PERL_CORE}){
-@@ -2352,6 +2372,40 @@ precedence. A typemap in the current di
+ if (-f "MANIFEST" && ! -f "Makefile" && ! $UNDER_CORE){
+@@ -2821,6 +2841,40 @@ precedence. A typemap in the current di
precedence, even if it isn't listed in TYPEMAPS. The default system
typemap has lowest precedence.
@@ -98,12 +98,12 @@ diff -up perl-5.14.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm.usem perl
diff -up perl-5.14.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm.usem perl-5.14.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
--- perl-5.14.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm.usem 2011-05-08 05:10:08.000000000 +0200
+++ perl-5.14.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm 2011-05-17 11:14:22.172115972 +0200
-@@ -944,7 +944,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $
+@@ -1045,7 +1045,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $
}
my $ld_run_path_shell = "";
- if ($self->{LD_RUN_PATH} ne "") {
+ if (($self->{LD_RUN_PATH} ne "") && ($self->{USE_MM_LD_RUN_PATH})) {
- $ld_run_path_shell = 'LD_RUN_PATH="$(LD_RUN_PATH)" ';
+ $ld_run_path_shell = 'LD_RUN_PATH="$(LD_RUN_PATH)" ';
}
diff --git a/perl/patches/perl-disable_test_hosts.patch b/perl/patches/perl-disable_test_hosts.patch
deleted file mode 100644
index dc86a3462..000000000
--- a/perl/patches/perl-disable_test_hosts.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up perl-5.12.0/cpan/libnet/Net/Config.pm.disable perl-5.12.0/cpan/libnet/Net/Config.pm
---- perl-5.12.0/cpan/libnet/Net/Config.pm.disable 2010-01-18 19:52:49.000000000 +0100
-+++ perl-5.12.0/cpan/libnet/Net/Config.pm 2010-04-13 16:03:50.090770813 +0200
-@@ -29,7 +29,7 @@ eval { local $SIG{__DIE__}; require Net:
- ftp_firewall => undef,
- ftp_ext_passive => 1,
- ftp_int_passive => 1,
-- test_hosts => 1,
-+ test_hosts => 0,
- test_exist => 1,
- );
-
diff --git a/perl/perl.nm b/perl/perl.nm
index 71537a217..3216986fa 100644
--- a/perl/perl.nm
+++ b/perl/perl.nm
@@ -4,12 +4,15 @@
###############################################################################
name = perl
-version = 5.20.3
+ver_major = 5
+ver_minor = 36
+ver_plevel = 0
+version = %{ver_major}.%{ver_minor}.%{ver_plevel}
+
# Never reset release in this package, just increase.
-release = 15
+release = 1
-perl_epoch = 2
-thisver = %{perl_epoch}:%{version}-%{_release}
+thisver = %{version}-%{_release}
maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
groups = Development/Languages
@@ -33,6 +36,7 @@ source_dl = http://www.cpan.org/src/5.0/
build
requires
+ bzip2-devel
gcc-c++
gdbm-devel
iana-etc
@@ -47,6 +51,11 @@ build
# So we need to pass it explicitely.
CFLAGS += -fstack-protector-all
+ export FILTER_PERL_REQUIRES = \
+ VMS:: \
+ Mac:: \
+ unicore::Name
+
prepare_cmds
sed -i 's/command /command[ -]/' makedepend.SH
end
@@ -66,17 +75,17 @@ build
-Dcf_by="%{DISTRO_VENDOR}" \
-Dprefix=/usr \
-Dvendorprefix=/usr \
- -Dsiteprefix="/usr/local" \
- -Dsitelib="/usr/local/share/perl5" \
- -Dsitearch="/usr/local/lib/perl5" \
- -Dprivlib="/usr/share/perl5" \
- -Dvendorlib="/usr/share/perl5/vendor_perl" \
+ -Dsiteprefix="%{libdir}" \
+ -Dsitelib="%{libdir}/perl5/site_perl" \
+ -Dsitearch="%{libdir}/perl5/site_perl" \
+ -Dprivlib="%{datadir}/perl5" \
+ -Dvendorlib="%{datadir}/perl5/vendor_perl" \
-Darchlib="%{libdir}/perl5" \
-Dvendorarch="%{libdir}/perl5/vendor_perl" \
-Darchname=%{arch}-linux-thread-multi \
- -Dpager="/usr/bin/less -isr" \
- -Dman1dir=/usr/share/man/man1 \
- -Dman3dir=/usr/share/man/man3 \
+ -Dpager="%{bindir}/less -isr" \
+ -Dman1dir=%{mandir}/man1 \
+ -Dman3dir=%{mandir}/man3 \
-Duseshrplib \
-Dusethreads \
-Duseithreads \
@@ -99,26 +108,37 @@ build
-Ud_setprotoent_r_proto \
-Ud_endservent_r_proto \
-Ud_setservent_r_proto \
- -Dscriptdir="/usr/bin"
+ -Dscriptdir="%{bindir}"
if "%{DISTRO_ARCH}" == "x86_64"
configure_options += \
- -Dlibpth="/usr/local/lib64 /lib64 %{prefix}/lib64"
+ -Dlibpth="/lib64 %{prefix}/lib64"
end
build
+ # Do not use internal compressing libraries.
+ export BUILD_ZLIB=False
+ export BUILD_BZIP2=0
+
+ # Configure Compress::Zlib to use system zlib
sed -i -e "s|BUILD_ZLIB\s*= True|BUILD_ZLIB = False|" \
-e "s|INCLUDE\s*= ./zlib-src|INCLUDE = /usr/include|" \
-e "s|LIB\s*= ./zlib-src|LIB = %{libdir}|" \
cpan/Compress-Raw-Zlib/config.in
+ # Ensure that we never accidentally bundle zlib or bzip2
+ rm -rf cpan/Compress-Raw-Zlib/zlib-src
+ rm -rf cpan/Compress-Raw-Bzip2/bzip2-src
+ sed -i '/\(bzip2\|zlib\)-src/d' MANIFEST
+
sh ./Configure %{configure_options}
make %{PARALLELISMFLAGS}
end
test
- make test || true
+ # Net::Ping test is known to fail.
+ #make test || true
end
install_cmds
@@ -129,7 +149,6 @@ end
quality-agent
whitelist_rpath
- /%{lib}
%{libdir}
%{libdir}/perl5/CORE
end
@@ -137,23 +156,27 @@ end
# This variable contains the constant version string
# of this perl package.
-perl_requires := %{name} = %{thisver}
+perl_version = %{ver_major}.%{ver_minor}.%{ver_plevel}
packages
package perl
- # Increase epoch because of automatic dependencies.
- epoch = 2
-
requires
perl-libs = %{version}-%{_release}
end
+ conflicts
+ perl = 2:5.20.3-15
+ end
+
+ obsoletes
+ perl = 2:5.20.3-15
+ end
+
provides
+ perl(%{ver_major})
+
# Compat provides
- perl(:MODULE_COMPAT_5.20.3)
- perl(:MODULE_COMPAT_5.20.2)
- perl(:MODULE_COMPAT_5.20.1)
- perl(:MODULE_COMPAT_5.20.0)
+ perl(:MODULE_COMPAT_5.36.0)
# Threading provides
perl(:WITH_ITHREADS)
@@ -166,67 +189,43 @@ packages
perl(:WITH_PERLIO)
# File provides
- perl(abbrev.pl)
- perl(assert.pl)
- perl(bigfloat.pl)
- perl(bigint.pl)
- perl(bigrat.pl)
- perl(bytes_heavy.pl)
- perl(cacheout.pl)
- perl(complete.pl)
- perl(ctime.pl)
- perl(dotsh.pl)
- perl(dumpvar.pl)
- perl(exceptions.pl)
- perl(fastcwd.pl)
- perl(find.pl)
- perl(finddepth.pl)
- perl(flush.pl)
- perl(ftp.pl)
- perl(getcwd.pl)
- perl(getopt.pl)
- perl(getopts.pl)
- perl(hostname.pl)
- perl(importenv.pl)
- perllook.pl)
- perl(newgetopt.pl)
- perl(open2.pl)
- perl(open3.pl)
- perl(perl5db.pl)
- perl(pwd.pl)
- perl(shellwords.pl)
- perl(stat.pl)
- perl(syslog.pl)
- perl(tainted.pl)
- perl(termcap.pl)
- perl(timelocal.pl)
- perl(utf8_heavy.pl)
- perl(validate.pl)
- perl(File::Basename)
- perl(strict)
- perl(vars)
- end
-
- filter_requires
- DBIx
- InternetConfig
- Mac::
- NDBM_File
- Tk
- unicore::Name
- VMS::
- end
-
- obsoletes
- perl-Archive-Extract
- perl-Class-ISA
- perl-CPANPLUS
- perl-Log-Message
- perl-Log-Message-Simple
- perl-Module-Plugable
- perl-Object-Accessor
- perl-Term-UI
- perl-Version-Requirements
+ #perl(abbrev.pl)
+ #perl(assert.pl)
+ #perl(bigfloat.pl)
+ #perl(bigint.pl)
+ #perl(bigrat.pl)
+ #perl(bytes_heavy.pl)
+ #perl(cacheout.pl)
+ #perl(complete.pl)
+ #perl(ctime.pl)
+ #perl(dotsh.pl)
+ #perl(dumpvar.pl)
+ #perl(exceptions.pl)
+ #perl(fastcwd.pl)
+ #perl(find.pl)
+ #perl(finddepth.pl)
+ #perl(flush.pl)
+ #perl(ftp.pl)
+ #perl(getcwd.pl)
+ #perl(getopt.pl)
+ #perl(getopts.pl)
+ #perl(hostname.pl)
+ #perl(importenv.pl)
+ #perl(look.pl)
+ #perl(newgetopt.pl)
+ #perl(open2.pl)
+ #perl(open3.pl)
+ #perl(perl5db.pl)
+ #perl(pwd.pl)
+ #perl(shellwords.pl)
+ #perl(stat.pl)
+ #perl(syslog.pl)
+ #perl(tainted.pl)
+ #perl(termcap.pl)
+ #perl(timelocal.pl)
+ #perl(utf8_heavy.pl)
+ #perl(validate.pl)
+ #perl(strict)
end
end
@@ -238,6 +237,7 @@ packages
end
files
+ %{libdir}/libperl.*
%{libdir}/perl5/CORE/libperl.so
end
end
@@ -245,104 +245,60 @@ packages
package perl-devel
template DEVEL
- files
- /usr/bin/enc2xs
- /usr/share/man/man1/enc2xs*
- /usr/share/perl5/Encode/
- /usr/bin/h2xs
- /usr/share/man/man1/h2xs*
- /usr/bin/libnetcfg
- /usr/share/man/man1/libnetcfg*
- /usr/bin/perlivp
- /usr/share/man/man1/perlivp*
- %{libdir}/perl5/CORE/*.h
- /usr/bin/xsubpp
- /usr/share/man/man1/xsubpp*
- /usr/share/man/man1/perlxs*
- end
- end
-
- #package perl-tests
- # summary = Testsuite to check your Perl installation.
- # description-perl-tests
- # This package contains the test suite included with perl %{thisver}.
- # Install this if you want to test your Perl installation (binary and core
- # modules).
- # end
- #
- # files
- # %{libdir}/perl5-tests
- # end
- #end
-
- package perl-App-a2p
- epoch = 0
- version = 1.000
-
- summary = Awk to Perl translator.
- description
- This package delivers a2p tool which takes an awk script specified on the
- command line and produces a comparable Perl script.
- end
-
- requires
- %{perl_requires}
- end
-
- files
- %{bindir}/a2p
- %{datadir}/perl5/pod/a2p.pod
- %{mandir}/man1/a2p.1*
- end
- end
-
- package perl-App-find2perl
- epoch = 0
- version = 0.001
- arch = noarch
-
- summary = Translate find command lines to Perl code.
- description
- This package delivers find2perl tool which is a little translator to convert
- find command lines to equivalent Perl code.
- end
-
requires
- %{perl_requires}
+ perl = %{perl_version}
end
files
- %{bindir}/find2perl
- %{mandir}/man1/find2perl.1*
+ %{bindir}/enc2xs
+ %{mandir}/man1/enc2xs*
+ %{datadir}/perl5/Encode/
+ %{datadir}/perl5/ExtUtils
+ %{bindir}/h2xs
+ %{mandir}/man1/h2xs*
+ %{bindir}/libnetcfg
+ %{mandir}/man1/libnetcfg*
+ %{bindir}/perlivp
+ %{mandir}/man1/perlivp*
+ %{libdir}/perl5/CORE/*.h
+ %{bindir}/xsubpp
+ %{mandir}/man1/xsubpp*
+ %{mandir}/man1/perlxs*
end
end
- package perl-App-s2p
- epoch = 0
- version = 1.000
+ package perl-utils
+ version = %{perl_version}
arch = noarch
- summary = Convert sed scripts to Perl programm.
+ summary = Utilities packaged with the Perl distribution.
description
- This package delivers the s2p tool, which converts sed scripts to
- Perl programms.
+ Several utilities which come with Perl distribution like h2ph, perlbug,
+ perlthanks, and pl2pm. Some utilities are provided by more specific
+ packages like perldoc by perl-Pod-Perldoc and splain by perl-diagnostics.
end
requires
- %{perl_requires}
+ perl = %{perl_version}
+ perl-libs = %{thisver}
end
files
- %{bindir}/psed
- %{bindir}/s2p
- %{mandir}/man1/psed.1*
- %{mandir}/man1/s2p.1*
+ %{bindir}/h2ph
+ %{bindir}/perlbug
+ %{bindir}/perlthanks
+ %{bindir}/pl2pm
+ %{datadir}/perl5/pod/perlutil.pod
+ %{mandir}/man1/h2ph.*
+ %{mandir}/man1/perlbug.*
+ %{mandir}/man1/perlthanks.*
+ %{mandir}/man1/perlutil.*
+ %{mandir}/man1/pl2pm.*
end
end
package perl-Archive-Tar
- epoch = 0
- version = 1.96
+ version = 2.40
arch = noarch
summary = A module for Perl manipulation of .tar files.
@@ -355,7 +311,7 @@ packages
end
requires
- %{perl_requires}
+ perl = %{perl_version}
perl(IO::Zlib) >= 1.01
perl(IO::Compress::Bzip2) >= 2.015
perl(IO::Uncompress::Bunzip2) >= 2.015
@@ -374,9 +330,31 @@ packages
end
end
+ package perl-Attribute-Handlers
+ version = 1.02
+ arch = noarch
+
+ summary = Simpler definition of attribute handlers.
+ description
+ This Perl module, when inherited by a package, allows that package's class to
+ define attribute handler subroutines for specific attributes. Variables and
+ subroutines subsequently defined in that package, or in packages derived from
+ that package may be given attributes with the same names as the attribute
+ handler subroutines, which will then be called in one of the compilation
+ phases (i.e. in a "BEGIN", "CHECK", "INIT", or "END" block).
+ end
+
+ requires += \
+ perl = %{perl_version}
+
+ files
+ %{datadir}/perl5/Attribute/
+ %{mandir}/man3/Attribute::Handlers.*
+ end
+ end
+
package perl-autodie
- epoch = 0
- version = 2.23
+ version = 2.34
arch = noarch
summary = Replace functions with ones that succeed or die.
@@ -390,7 +368,7 @@ packages
end
requires
- %{perl_requires}
+ perl = %{perl_version}
perl(B)
perl(Fcntl)
perl(overload)
@@ -407,111 +385,267 @@ packages
end
end
- package perl-B-Debug
- epoch = 0
- version = 1.19
+ package perl-AutoLoader
+ version = 5.74
arch = noarch
- summary = Walk Perl syntax tree, print debug information about op-codes.
+ summary = Load subroutines only on demand
description
- Walk Perl syntax tree and print debug information about op-codes. See
- B::Concise and B::Terse for other details.
+ The AutoLoader module works with the AutoSplit module and the "__END__" token
+ to defer the loading of some subroutines until they are used rather than
+ loading them all at once
end
requires
- %{perl_requires}
+ perl = %{perl_version}
+ perl(Carp)
end
files
- %{datadir}/perl5/B/Debug.pm
- %{mandir}/man3/B::Debug.3*
+ %{datadir}/perl5/AutoLoader.pm
+ %{mandir}/man3/AutoLoader.3*
end
end
- package perl-Compress-Raw-Bzip2
- epoch = 0
- version = 2.064
+ package perl-AutoSplit
+ version = 5.74
+ arch = noarch
- summary = Low-Level Interface to bzip2 compression library.
+ summary = Split a package for automatic loading
description
- This module provides a Perl interface to the bzip2 compression library.
- It is used by IO::Compress::Bzip2.
+ Split up your program into files that the AutoLoader module can handle. It is
+ used by both the standard Perl libraries and by the ExtUtils::MakeMaker
+ utility, to automatically configure libraries for automatic loading.
end
requires
- %{perl_requires}
- perl(Exporter)
- perl(File::Temp)
+ perl = %{perl_version}
+ perl(Carp)
end
files
- %{libdir}/perl5/Compress/Raw/Bzip2.pm
- %{libdir}/perl5/auto/Compress/Raw/Bzip2
- %{mandir}/man3/Compress::Raw::Bzip2*
+ %{datadir}/perl5/AutoSplit.pm
+ %{mandir}/AutoSplit.3*
end
end
- package perl-Compress-Raw-Zlib
- epoch = 0
- version = 2.065
+ package perl-autouse
+ version = 1.11
+ arch = noarch
- summary = Low-Level Interface to the zlib compression library.
+ summary = Postpone load of modules until a function is used
description
- This module provides a Perl interface to the zlib compression library.
- It is used by IO::Compress::Zlib.
+ If a module is not loaded yet, then the autouse declaration declares functions
+ in the current package. When these functions are called, they load the package
+ and substitute themselves with the correct definitions.
end
requires
- %{perl_requires}
+ perl = %{perl_version}
+ perl(Carp)
+ perl(warnings)
end
files
- %{libdir}/perl5/Compress/Raw/Zlib.pm
- %{libdir}/perl5/auto/Compress/Raw/Zlib
- %{mandir}/man3/Compress::Raw::Zlib*
+ %{datadir}/perl5/autouse.pm
+ %{mandir}/man3/autouse.3*
end
end
- package perl-CGI
- epoch = 0
- version = 3.63
+ package perl-B
+ version = 1.83
arch = noarch
- summary = Handle Common Gateway Interface requests and responses
+ summary = Perl compiler backend
description
- CGI.pm is a stable, complete and mature solution for processing and preparing
- HTTP requests and responses. Major features including processing form
- submissions, file uploads, reading and writing cookies, query string generation
- and manipulation, and processing and preparing HTTP headers. Some HTML
- generation utilities are included as well.
+ The "B" module supplies classes which allow a Perl program to delve into its
+ own innards. It is the module used to implement the backends of the Perl
+ compiler.
+ end
+
+ requires
+ perl = %{perl_version}
+ perl(Data::Dumper)
+ perl(overloading)
+ perl(XSLoader)
+ end
+
+ files
+ %{libdir}/perl5/auto/B
+ %{libdir}/perl5/B
+ %{libdir}/perl5/B.pm
+ %{libdir}/perl5/O.pm
+ %{datadir}/perl5/B
+ %{mandir}/man3/B.*
+ %{mandir}/man3/B::*
+ %{mandir}/man3/O.*
+ end
+ end
+
+ package perl-base
+ version = 2.27
+ arch = noarch
- CGI.pm performs very well in in a vanilla CGI.pm environment and also comes
- with built-in support for mod_perl and mod_perl2 as well as FastCGI.
+ summary = Establish an ISA relationship with base classes at compile time.
+ description
+ "base" module allows you to both load one or more modules, while setting up
+ inheritance from those modules at the same time. Unless you are using the
+ "fields" pragma, consider this module discouraged in favor of the
+ lighter-weight "parent".
end
requires
- %{perl_requires}
+ perl = %{perl_version}
+ perl(Carp)
end
- provides
- perl(CGI)=%{version}
+ files
+ %{datadir}/perl5/base.pm
+ %{mandir}/man3/base.3*
+ end
+ end
+
+ package perl-Benchmark
+ version = 1.23
+ arch = noarch
+
+ summary = Benchmark running times of Perl code
+ description
+ The Benchmark module encapsulates a number of routines to help you figure out
+ how long it takes to execute some code.
+ end
+
+ requires
+ perl = %{perl_version}
+ end
+
+ files
+ %{datadir}/perl5/Benchmark.pm
+ %{mandir}/man3/Benchmark.*
+ end
+ end
+
+ package perl-bignum
+ version = 0.65
+ arch = noarch
+
+ summary = Transparent big number support for Perl.
+ description
+ This package attempts to make it easier to write scripts that use BigInts and
+ BigFloats in a transparent way.
+ end
+
+ requires
+ perl = %{perl_version}
+ perl(Carp)
+ perl(Math::BigRat)
+ perl(warnings)
+ end
+
+ files
+ %{datadir}/perl5/bigfloat.pm
+ %{datadir}/perl5/bigint.pm
+ %{datadir}/perl5/bignum.pm
+ %{datadir}/perl5/bigrat.pm
+ %{datadir}/perl5/Math/BigFloat
+ %{datadir}/perl5/Math/BigInt
+ %{datadir}/perl5/Math/BigInt/Trace.pm
+ %{datadir}/perl5/Math/BigRat
+ %{datadir}/perl5/Math/BigRat/Trace.pm
+ %{mandir}/man3/bigfloat.*
+ %{mandir}/man3/bigint.*
+ %{mandir}/man3/bignum.*
+ %{mandir}/man3/bigrat.*
+ end
+ end
+
+ package perl-blib
+ version = 1.07
+ arch = noarch
+
+ summary = Use uninstalled version of a package.
+ description
+ This module looks for MakeMaker-like "blib" directory structure starting in
+ given or current directory and working back up to five levels of directories.
+ It is intended for use on command line with -M option as a way of testing
+ arbitrary scripts against an uninstalled version of a package.
+ end
+
+ requires
+ perl = %{perl_version}
+ end
+
+ files
+ %{datadir}/perl5/blib.pm
+ %{mandir}/man3/blib.*
+ end
+ end
+
+ package perl-Class-Struct
+ version = 0.66
+ arch = noarch
+
+ summary = Declare struct-like data types as Perl classes.
+ description
+ Class::Struct module exports a single function struct(). Given a list of
+ element names and types, and optionally a class name, struct() creates a
+ Perl 5 class that implements a struct-like data structure.
+ end
+
+ requires
+ perl = %{perl_version}
+ end
+
+ files
+ %{datadir}/perl5/Class
+ %{mandir}/man3/Class::Struct.*
+ end
+ end
+
+ package perl-Compress-Raw-Bzip2
+ version = 2.103
+
+ summary = Low-Level Interface to bzip2 compression library.
+ description
+ This module provides a Perl interface to the bzip2 compression library.
+ It is used by IO::Compress::Bzip2.
+ end
+
+ requires
+ perl = %{perl_version}
+ perl(Exporter)
+ perl(File::Temp)
+ end
+
+ files
+ %{libdir}/perl5/Compress/Raw/Bzip2.pm
+ %{libdir}/perl5/auto/Compress/Raw/Bzip2
+ %{mandir}/man3/Compress::Raw::Bzip2*
+ end
+ end
+
+ package perl-Compress-Raw-Zlib
+ version = 2.105
+
+ summary = Low-Level Interface to the zlib compression library.
+ description
+ This module provides a Perl interface to the zlib compression library.
+ It is used by IO::Compress::Zlib.
end
- filter_requires
- FCGI
+ requires
+ perl = %{perl_version}
end
files
- /usr/share/perl5/CGI
- /usr/share/perl5/CGI.pm
- /usr/share/man/man3/CGI.3*
- /usr/share/man/man3/CGI::*.3*
+ %{libdir}/perl5/Compress/Raw/Zlib.pm
+ %{libdir}/perl5/auto/Compress/Raw/Zlib
+ %{mandir}/man3/Compress::Raw::Zlib*
end
end
package perl-CPAN
- epoch = 0
- version = 2.05
+ version = 2.33
arch = noarch
summary = Query, download and build perl modules from CPAN sites.
@@ -520,30 +654,30 @@ packages
end
requires
- %{perl_requires}
+ make
+ perl = %{perl_version}
perl(Digest::SHA)
end
provides
cpan
- cpan=$(version-perl-CPAN)
- end
-
- filter_requires
- Mac::BuildTools
+ cpan = %{version}
end
files
- /usr/bin/cpan
- /usr/share/perl5/CPAN*
- /usr/share/man/man1/cpan.1*
- /usr/share/man/man3/CPAN*
+ %{bindir}/cpan
+ %{datadir}/perl5/App/Cpan.pm
+ %{datadir}/perl5/CPAN
+ %{datadir}/perl5/CPAN.pm
+ %{mandir}/man1/cpan.1*
+ %{mandir}/man3/App::Cpan.*
+ %{mandir}/man3/CPAN.*
+ %{mandir}/man3/CPAN:*
end
end
package perl-CPAN-Meta
- epoch = 0
- version = 2.140640
+ version = 2.150010
arch = noarch
summary = Distribution metadata for a CPAN dist.
@@ -556,25 +690,24 @@ packages
end
requires
- %{perl_requires}
+ perl = %{perl_version}
end
files
- /usr/share/perl5/CPAN/Meta.pm
- /usr/share/perl5/CPAN/Meta
- /usr/share/perl5/CPAN/Meta/Converter.pm
- /usr/share/perl5/CPAN/Meta/Feature.pm
- /usr/share/perl5/CPAN/Meta/History.pm
- /usr/share/perl5/CPAN/Meta/Prereqs.pm
- /usr/share/perl5/CPAN/Meta/Spec.pm
- /usr/share/perl5/CPAN/Meta/Validator.pm
- /usr/share/man/man5/CPAN::Meta.*
+ %{datadir}/perl5/CPAN/Meta.pm
+ %{datadir}/perl5/CPAN/Meta
+ %{datadir}/perl5/CPAN/Meta/Converter.pm
+ %{datadir}/perl5/CPAN/Meta/Feature.pm
+ %{datadir}/perl5/CPAN/Meta/History.pm
+ %{datadir}/perl5/CPAN/Meta/Prereqs.pm
+ %{datadir}/perl5/CPAN/Meta/Spec.pm
+ %{datadir}/perl5/CPAN/Meta/Validator.pm
+ %{mandir}/man5/CPAN::Meta.*
end
end
package perl-CPAN-Meta-Requirements
- epoch = 0
- version = 2.122
+ version = 2.140
arch = noarch
summary = Set of version requirements for a CPAN dist.
@@ -586,7 +719,7 @@ packages
end
requires
- %{perl_requires}
+ perl = %{perl_version}
end
files
@@ -596,8 +729,7 @@ packages
end
package perl-CPAN-Meta-YAML
- epoch = 0
- version = 0.012
+ version = 0.018
arch = noarch
summary = Read and write a subset of YAML for CPAN Meta files.
@@ -608,17 +740,16 @@ packages
end
requires
- %{perl_requires}
+ perl = %{perl_version}
end
files
- /usr/share/perl5/CPAN/Meta/YAML.pm
- /usr/share/man/man5/CPAN::Meta::YAML*
+ %{datadir}/perl5/CPAN/Meta/YAML.pm
+ %{mandir}/man5/CPAN::Meta::YAML*
end
end
package perl-Carp
- epoch = 0
version = 1.33.01
arch = noarch
@@ -634,7 +765,7 @@ packages
end
requires
- %{perl_requires}
+ perl = %{perl_version}
end
provides
@@ -642,18 +773,15 @@ packages
perl(Carp::Heavy) = %{version}
end
- # Do not export unversioned module
- #filter_provides = ^perl\(Carp\)\s*$
-
files
- /usr/share/perl5/Carp*
- /usr/share/man3/Carp*
+ %{datadir}/perl5/Carp*
+ %{datadir}/perl5/Carp
+ %{mandir}3/Carp*
end
end
package perl-constant
- epoch = 0
- version = 1.31
+ version = 1.33
arch = noarch
summary = Perl pragma to declare constants.
@@ -662,7 +790,7 @@ packages
end
requires
- %{perl_requires}
+ perl = %{perl_version}
end
files
@@ -672,8 +800,7 @@ packages
end
package perl-Data-Dumper
- epoch = 0
- version = 2.151
+ version = 2.184
summary = Stringify perl data structures, suitable for printing and eval.
description
@@ -684,7 +811,7 @@ packages
end
requires
- %{perl_requires}
+ perl = %{perl_version}
perl(Scalar::Util)
perl(XSLoader)
end
@@ -697,8 +824,7 @@ packages
end
package perl-DB_File
- epoch = 0
- version = 1.831
+ version = 1.857
summary = Perl5 access to Berkeley DB version 1.x.
description
@@ -709,7 +835,7 @@ packages
end
requires
- %{perl_requires}
+ perl = %{perl_version}
perl(Fcntl)
perl(XSLoader)
end
@@ -721,9 +847,54 @@ packages
end
end
+ package perl-DBM_Filter
+ version = 0.06
+ arch = noarch
+
+ summary = Filter DBM keys and values
+ description
+ This module provides an interface that allows filters to be applied to tied
+ hashes associated with DBM files.
+ end
+
+ requires
+ perl = %{perl_version}
+ perl(Compress::Zlib)
+ perl(Encode)
+ end
+
+ files
+ %{datadir}/perl5/DBM_Filter
+ %{datadir}/perl5/DBM_Filter.pm
+ %{mandir}/man3/DBM_Filter.*
+ %{mandir}/man3/DBM_Filter::*
+ end
+ end
+
+ package perl-Devel-Peek
+ version = 1.32
+
+ summary = A data debugging tool for the XS programmer
+ description
+ Devel::Peek contains functions which allows raw Perl data types to be
+ manipulated from a Perl script. This is used by those who do XS programming to
+ check that the data they are sending from C to Perl looks as they think it
+ should look.
+ end
+
+ requires
+ perl = %{perl_version}
+ end
+
+ files
+ %{libdir}/perl5/Devel/Peek.pm
+ %{libidr}/perl5/auto/Devel/Peek
+ %{mandir}/man3/Devel::Peek.*
+ end
+ end
+
package perl-Devel-PPPort
- epoch = 0
- version = 3.21
+ version = 3.68
summary = Perl Pollution Portability header generator.
description
@@ -736,7 +907,7 @@ packages
end
requires
- %{perl_requires}
+ perl = %{perl_version}
end
files
@@ -746,9 +917,30 @@ packages
end
end
+ package perl-Devel-SelfStubber
+ version = 1.06
+ arch = noarch
+
+ summary = Generate stubs for a SelfLoading module
+ description
+ Devel::SelfStubber prints the stubs you need to put in the module before the
+ __DATA__ token (or you can get it to print the entire module with stubs
+ correctly placed). The stubs ensure that if a method is called, it will get
+ loaded. They are needed specifically for inherited autoloaded methods.
+ end
+
+ requires
+ perl = %{perl_version}
+ end
+
+ files
+ %{datadir}/perl5/Devel/SelfStubber.pm
+ %{mandir}/man3/Devel::SelfStubber.*
+ end
+ end
+
package perl-Digest
- epoch = 0
- version = 1.17
+ version = 1.20
arch = noarch
summary = Modules that calculate message digests.
@@ -761,25 +953,24 @@ packages
end
requires
- %{perl_requires}
+ perl = %{perl_version}
perl(MIME::Base64)
end
files
%{libdir}/perl5/Digest
!%{libdir}/perl5/Digest/*
- /usr/share/perl5/Digest.pm
- /usr/share/perl5/Digest/base.pm
- /usr/share/perl5/Digest/file.pm
- /usr/share/man/man3/Digest.3*
- /usr/share/man/man3/Digest::base.3*
- /usr/share/man/man3/Digest::file.3*
+ %{datadir}/perl5/Digest.pm
+ %{datadir}/perl5/Digest/base.pm
+ %{datadir}/perl5/Digest/file.pm
+ %{mandir}/man3/Digest.3*
+ %{mandir}/man3/Digest::base.3*
+ %{mandir}/man3/Digest::file.3*
end
end
package perl-Digest-MD5
- epoch = 0
- version = 2.53
+ version = 2.58
summary = Perl Interface to the MD5 Algorithm.
description
@@ -790,20 +981,19 @@ packages
end
requires
- %{perl_requires}
+ perl = %{perl_version}
perl(Digest::base)>=1.00
end
files
%{libdir}/perl5/Digest/MD5.pm
%{libdir}/perl5/auto/Digest/MD5
- /usr/share/man/man3/Digest::MD5.3*
+ %{mandir}/man3/Digest::MD5.3*
end
end
package perl-Digest-SHA
- epoch = 0
- version = 5.88
+ version = 6.02
summary = Perl extension for SHA-1/224/256/384/512.
description
@@ -814,118 +1004,253 @@ packages
end
requires
- %{perl_requires}
+ perl = %{perl_version}
perl(Digest::base)
perl(MIME::Base64)
end
files
- /usr/bin/shasum
+ %{bindir}/shasum
%{libdir}/perl5/Digest/SHA*
- %{libdir}/perl5/auto/Digest/SHA*
- /usr/share/perl5/Digest/SHA*
- /usr/share/man/man1/shasum.1*
- /usr/share/man/man3/Digest::SHA.3*
+ %{libdir}/perl5/auto/Digest/SHA
+ %{datadir}/perl5/Digest/SHA*
+ %{mandir}/man1/shasum.1*
+ %{mandir}/man3/Digest::SHA.3*
end
end
- package perl-Encode
- epoch = 0
- version = 2.60
+ package perl-Dumpvalue
+ version = 2.27
+ arch = noarch
- summary = Character encodings in Perl.
+ summary = Sceen dump of Perl data
description
- The Encode module provides the interface between Perl strings and the rest
- of the system. Perl strings are sequences of characters.
+ Dumpvalue module enables you to print a content of variables and other Perl
+ data structures.
end
requires
- %{perl_requires}
+ perl = %{perl_version}
+ end
+
+ recommends
+ perl(Devel::Peek)
end
files
- %{bindir}/piconv
- %{libdir}/perl5/Encode*
- %{libdir}/perl5/auto/Encode*
- %{datadir}/perl5/Encode
- !%{datadir}/perl5/Encode/*.e2x
- !%{datadir}/perl5/Encode/encode.h
- %{mandir}/man1/piconv.1*
- %{mandir}/man3/Encode*.3*
+ %{datadir}/perl5/Dumpvalue.pm
+ %{mandir}/man3/Dumpvalue.3*
end
end
- package perl-Env
- epoch = 0
- version = 1.04
- arch = noarch
+ package perl-DynaLoader
+ version = 1.52
- summary = Perl module that imports environment variables as scalars or arrays.
+ summary = Dynamically load C libraries into Perl code
description
- Perl maintains environment variables in a special hash named %%ENV. For when
- this access method is inconvenient, the Perl module Env allows environment
- variables to be treated as scalar or array variables.
+ The DynaLoader module defines a standard generic interface to the dynamic
+ linking mechanisms available on many platforms. Its primary purpose is to
+ implement automatic dynamic loading of Perl modules. For a simpler interface,
+ see XSLoader module.
end
requires
- %{perl_requires}
+ perl = %{perl_version}
+ perl(Carp)
end
files
- %{datadir}/perl5/Env.pm
- %{mandir}/man3/Env.3*
+ %{libdir}/perl5/DynaLoader.pm
+ %{mandir}/man3/DynaLoader.3*
end
end
- package perl-experimental
- epoch = 0
- version = 0.007
+ package perl-doc
+ version = %{perl_version}
arch = noarch
- summary = Experimental features made easy.
+ summary = Perl language documentation
description
- This pragma provides an easy and convenient way to enable or disable
- experimental features.
+ This package contains the documentation for the Perl language.
+ It is provides in POD and manual page format.
end
requires
- %{perl_requires}
+ perl = %{perl_version}
end
files
- %{datadir}/perl5/experimental*
- %{mandir}/man3/experimental*
+ %{datadir}/perl5/pod/*.pod
+ %{mandir}/man1/perl*.*
end
end
- package perl-Exporter
- epoch = 0
- version = 5.71
- arch = noarch
+ package perl-Encode
+ version = 3.17
- summary = Implements default import method for modules.
+ summary = Character encodings in Perl.
description
- The Exporter module implements an import method which allows a module to
- export functions and variables to its users' name spaces. Many modules use
- Exporter rather than implementing their own import method because Exporter
- provides a highly flexible interface, with an implementation optimized for
+ The Encode module provides the interface between Perl strings and the rest
+ of the system. Perl strings are sequences of characters.
+ end
+
+ requires
+ perl = %{perl_version}
+ end
+
+ files
+ %{bindir}/piconv
+ %{libdir}/perl5/Encode
+ %{libdir}/perl5/Encode*
+ %{libdir}/perl5/auto/Encode*
+ %{libdir}/perl5/auto/Encode
+ %{datadir}/perl5/Encode
+ !%{datadir}/perl5/Encode/*.e2x
+ !%{datadir}/perl5/Encode/encode.h
+ %{mandir}/man1/piconv.1*
+ %{mandir}/man3/Encode*.3*
+ end
+ end
+
+ package perl-encoding
+ version = 3.00
+
+ summary = Write your Perl script in non-ASCII or non-UTF-8.
+ description
+ With the encoding pragma, you can write your Perl script in any encoding you
+ like (so long as the Encode module supports it) and still enjoy Unicode
+ support.
+
+ This module is deprecated under perl 5.18 and may be removed in a future version.
+
+ The easiest and best alternative is to write your scripts in UTF-8.
+ end
+
+ requires
+ perl = %{perl_version}
+ perl(Carp)
+ perl(Filter::Util::Call)
+ perl(utf8)
+ end
+
+ files
+ %{libdir}/perl5/encoding.pm
+ %{mandir}/man3/encoding.3*
+ end
+ end
+
+ package perl-encoding-warnings
+ version = 0.13
+ arch = noarch
+
+ summary = Warn on implicit encoding conversions.
+ descripton
+ As of Perl 5.26.0, this module has no effect. The internal Perl feature that
+ was used to implement this module has been removed. Hence, if you load this
+ module on Perl 5.26.0, you will get one warning that the module is no longer
+ supported; and the module will do nothing thereafter.
+ end
+
+ requires
+ perl = %{perl_version}
+ perl(Carp)
+ end
+
+ files
+ %{datadir}/perl5/encoding
+ %{datadir}/perl5/encoding/warnings.pm
+ %{mandir}/man3/encoding::warnings.3*
+ end
+ end
+
+ package perl-English
+ version = 1.11
+ arch = noarch
+
+ summary = Nice English or awk names for ugly punctuation variables.
+ description
+ This module provides aliases for the built-in variables whose names no one
+ seems to like to read.
+ end
+
+ requires
+ perl = %{perl_version}
+ end
+
+ files
+ %{datadir}/perl5/English.pm
+ %{mandir}/man3/English.3*
+ end
+ end
+
+ package perl-Env
+ version = 1.05
+ arch = noarch
+
+ summary = Perl module that imports environment variables as scalars or arrays.
+ description
+ Perl maintains environment variables in a special hash named %%ENV. For when
+ this access method is inconvenient, the Perl module Env allows environment
+ variables to be treated as scalar or array variables.
+ end
+
+ requires
+ perl = %{perl_version}
+ end
+
+ files
+ %{datadir}/perl5/Env.pm
+ %{mandir}/man3/Env.3*
+ end
+ end
+
+ package perl-experimental
+ version = 0.028
+ arch = noarch
+
+ summary = Experimental features made easy.
+ description
+ This pragma provides an easy and convenient way to enable or disable
+ experimental features.
+ end
+
+ requires
+ perl = %{perl_version}
+ end
+
+ files
+ %{datadir}/perl5/experimental*
+ %{mandir}/man3/experimental*
+ end
+ end
+
+ package perl-Exporter
+ version = 5.77
+ arch = noarch
+
+ summary = Implements default import method for modules.
+ description
+ The Exporter module implements an import method which allows a module to
+ export functions and variables to its users' name spaces. Many modules use
+ Exporter rather than implementing their own import method because Exporter
+ provides a highly flexible interface, with an implementation optimized for
the common case.
end
requires
- %{perl_requires}
+ perl = %{perl_version}
perl(Carp) >= 1.05
end
files
+ %{datadir}/perl5/Exporter
%{datadir}/perl5/Exporter*
%{mandir}/man3/Exporter*
end
end
package perl-ExtUtils-CBuilder
- epoch = 0
- version = 0.280217
+ version = 0.280236
arch = noarch
summary = Compile and link C code for Perl modules.
@@ -937,19 +1262,47 @@ packages
end
requires
- %{perl_requires}
+ perl = %{perl_version}
+ gcc
+ gcc-c++
perl-devel
+ perl(DynaLoader)
+ perl(ExtUtils::Mksymlists)
+ perl(File::Spec)
+ perl(Perl::OSType)
+ end
+
+ files
+ %{datadir}/perl5/ExtUtils/CBuilder
+ %{mandir}/man3/ExtUtils::CBuilder*
+ end
+ end
+
+ package perl-ExtUtils-Constant
+ version = 0.25
+ arch = noarch
+
+ summary = Generate XS code to import C header constants
+ description
+ ExtUtils::Constant facilitates generating C and XS wrapper code to allow
+ Perl modules to AUTOLOAD constants defined in C library header files.
+ end
+
+ requires
+ perl = %{perl_version}
+ perl(Data::Dumper)
end
files
- /usr/share/perl5/ExtUtils/CBuilder*
- /usr/share/man/man3/ExtUtils::CBuilder*
+ %{datadir}/perl5/ExtUtils/Constant
+ %{datadir}/perl5/ExtUtils/Constant.pm
+ %{mandir}/man3/ExtUtils::Constant::*
+ %{mandir}/man3/ExtUtils::Constant.3*
end
end
package perl-ExtUtils-Command
- epoch = 0
- version = 1.18
+ version = 7.64
arch = noarch
summary = Perl routines to replace common UNIX commands in Makefiles.
@@ -960,7 +1313,7 @@ packages
end
requires
- %{perl_requires}
+ perl = %{perl_version}
perl(File::Find)
end
@@ -971,8 +1324,7 @@ packages
end
package perl-ExtUtils-Embed
- epoch = 0
- version = 1.32
+ version = 1.35
arch = noarch
summary = Utilities for embedding Perl in C/C++ applications.
@@ -981,19 +1333,18 @@ packages
end
requires
- %{perl_requires}
+ perl = %{perl_version}
perl-devel
end
files
- /usr/share/perl5/ExtUtils/Embed*
- /usr/share/man/man3/ExtUtils::Embed*
+ %{datadir}/perl5/ExtUtils/Embed*
+ %{mandir}/man3/ExtUtils::Embed*
end
end
package perl-ExtUtils-Install
- epoch = 0
- version = 1.67
+ version = 2.20
arch = noarch
summary = Install files from here to there.
@@ -1003,13 +1354,12 @@ packages
end
requires
- %{perl_requires}
+ perl = %{perl_version}
perl-devel
+ perl(AutoSplit)
perl(Data::Dumper)
- end
-
- filter_requires
- VMS::Filespec
+ perl(File::Compare)
+ perl(POSIX)
end
files
@@ -1023,8 +1373,7 @@ packages
end
package perl-ExtUtils-MakeMaker
- epoch = 0
- version = 6.98
+ version = 7.64
arch = noarch
summary = Create a module Makefile.
@@ -1033,52 +1382,51 @@ packages
end
requires
- %{perl_requires}
- /usr/bin/xsubpp
+ perl = %{perl_version}
perl-devel
perl(Data::Dumper)
+ perl(DynaLoader)
perl(ExtUtils::Command)
perl(ExtUtils::Install)
perl(ExtUtils::Manifest)
perl(File::Find)
perl(Getopt::Long)
+ perl(Pod::Man)
perl(Test::Harness)
- end
-
- filter_requires
- VMS::Filespec
+ perl(version)
+ perl-ExtUtils-ParseXS
end
files
- /usr/bin/instmodsh
- /usr/share/perl5/ExtUtils/Command/
- /usr/share/perl5/ExtUtils/Liblist/
- /usr/share/perl5/ExtUtils/Liblist.pm
- /usr/share/perl5/ExtUtils/MakeMaker/
- /usr/share/perl5/ExtUtils/MakeMaker.pm
- /usr/share/perl5/ExtUtils/MANIFEST.SKIP
- /usr/share/perl5/ExtUtils/MM*.pm
- /usr/share/perl5/ExtUtils/MY.pm
- /usr/share/perl5/ExtUtils/Manifest.pm
- /usr/share/perl5/ExtUtils/Mkbootstrap.pm
- /usr/share/perl5/ExtUtils/Packlist.pm
- /usr/share/perl5/ExtUtils/testlib.pm
- /usr/share/man/man1/instmodsh.1*
- /usr/share/man/man3/ExtUtils::Command::MM*
- /usr/share/man/man3/ExtUtils::Liblist.3*
- /usr/share/man/man3/ExtUtils::MM*
- /usr/share/man/man3/ExtUtils::MY.3*
- /usr/share/man/man3/ExtUtils::MakeMaker*
- /usr/share/man/man3/ExtUtils::Manifest.3*
- /usr/share/man/man3/ExtUtils::Mkbootstrap.3*
- /usr/share/man/man3/ExtUtils::Mksymlists.3*
- /usr/share/man/man3/ExtUtils::testlib.3*
+ %{bindir}/instmodsh
+ %{datadir}/perl5/ExtUtils/Command/
+ %{datadir}/perl5/ExtUtils/Liblist/
+ %{datadir}/perl5/ExtUtils/Liblist.pm
+ %{datadir}/perl5/ExtUtils/MakeMaker/
+ %{datadir}/perl5/ExtUtils/MakeMaker.pm
+ %{datadir}/perl5/ExtUtils/MANIFEST.SKIP
+ %{datadir}/perl5/ExtUtils/MM
+ %{datadir}/perl5/ExtUtils/MM*.pm
+ %{datadir}/perl5/ExtUtils/MY.pm
+ %{datadir}/perl5/ExtUtils/Manifest.pm
+ %{datadir}/perl5/ExtUtils/Mkbootstrap.pm
+ %{datadir}/perl5/ExtUtils/Packlist.pm
+ %{datadir}/perl5/ExtUtils/testlib.pm
+ %{mandir}/man1/instmodsh.1*
+ %{mandir}/man3/ExtUtils::Command::MM*
+ %{mandir}/man3/ExtUtils::Liblist.3*
+ %{mandir}/man3/ExtUtils::MM*
+ %{mandir}/man3/ExtUtils::MY.3*
+ %{mandir}/man3/ExtUtils::MakeMaker*
+ %{mandir}/man3/ExtUtils::Manifest.3*
+ %{mandir}/man3/ExtUtils::Mkbootstrap.3*
+ %{mandir}/man3/ExtUtils::Mksymlists.3*
+ %{mandir}/man3/ExtUtils::testlib.3*
end
end
package perl-ExtUtils-Manifest
- epoch = 0
- version = 1.63
+ version = 1.73
arch = noarch
summary = Utilities to write and check a MANIFEST file.
@@ -1087,7 +1435,8 @@ packages
end
requires
- %{perl_requires}
+ perl = %{perl_version}
+ perl(File::Path)
end
files
@@ -1098,8 +1447,7 @@ packages
end
package perl-ExtUtils-Miniperl
- epoch = 0
- version = 1.01
+ version = 1.11
arch = noarch
summary = Write the C code for perlmain.c.
@@ -1114,7 +1462,7 @@ packages
end
requires
- %{perl_requires}
+ perl = %{perl_version}
perl-devel
end
@@ -1124,9 +1472,30 @@ packages
end
end
+ package perl-ExtUtils-MM-Utils
+ version = 7.44
+ arch = noarch
+
+ summary = ExtUtils::MM methods without dependency on ExtUtils::MakeMaker
+ description
+ This is a collection of ExtUtils::MM subroutines that are used by many
+ other modules but that do not need full-featured ExtUtils::MakeMaker. The
+ issue with ExtUtils::MakeMaker is it pulls in Perl header files and that
+ is an overkill for small subroutines.
+ end
+
+ requires
+ perl = %{perl_version}
+ end
+
+ files
+ %{datadir}/perl5/ExtUtils/MM/Utils.pm
+ %{mandir}/man3/ExtUtils::MM::Utils.*
+ end
+ end
+
package perl-ExtUtils-ParseXS
- epoch = 0
- version = 3.24
+ version = 3.45
arch = noarch
summary = Module and a script for converting Perl XS code into C code.
@@ -1137,7 +1506,7 @@ packages
end
requires
- %{perl_requires}
+ perl = %{perl_version}
perl-devel
end
@@ -1168,1136 +1537,2577 @@ packages
end
end
- package perl-File-Fetch
- epoch = 1
- version = 0.48
+ package perl-Fcntl
+ version = 1.15
arch = noarch
- summary = Generic file fetching mechanism.
+ summary = File operation options.
description
- File::Fetch is a generic file fetching mechanism.
+ Fcntl module provides file operation related options.
end
requires
- %{perl_requires}
- perl(IPC::Cmd)>=0.36
- perl(Module::Load::Conditional)>=0.04
- perl(Params::Check)>=0.07
+ perl = %{perl_version}
end
files
- /usr/share/perl5/File/Fetch.pm
- /usr/share/man/man3/File::Fetch.3*
+ %{libdir}/perl5/Fcntl.pm
+ %{libdir}/perl5/auto/Fcntl
+ %{mandir}/man3/Fcntl.3*
end
end
- package perl-File-Path
- epoch = 0
- version = 2.09
+ package perl-fields
+ version = 2.27
arch = noarch
- summary = Create or remove directory trees.
+ summary = Compile-time class fields.
description
- This module provides a convenient way to create directories of arbitrary
- depth and to delete an entire directory subtree from the file system.
+ The "fields" pragma enables compile-time and run-time verified class fields.
end
requires
- %{perl_requires}
+ perl = %{perl_version}
+ perl(base)
perl(Carp)
+ perl(Hash::Util)
end
files
- %{datadir}/perl5/File/Path.pm
- %{mandir}/man3/File::Path.3*
+ %{datadir}/perl5/fields.pm
+ %{mandir}/man3/fields.3*
end
end
- package perl-File-Temp
- epoch = 0
- version = 0.23.04
+ package perl-File-Basename
+ version = 2.85
arch = noarch
- summary = Return name and handle of a temporary file safely.
+ summary = Parse file paths into directory, file name, and suffix
description
- File::Temp can be used to create and open temporary files in a safe way.
- There is both a function interface and an object-oriented interface. The
- File::Temp constructor or the tempfile() function can be used to return the
- name and the open file handle of a temporary file. The tempdir() function
- can be used to create a temporary directory.
+ These routines allow you to parse file paths into their directory, file name,
+ and suffix.
end
requires
- %{perl_requires}
- perl(File::Path) >= 2.06
- perl(POSIX)
- end
-
- filter_requires
- VMS::Stdio
+ perl = %{perl_version}
+ perl(Carp)
+ perl(re)
end
files
- %{datadir}/perl5/File/Temp.pm
- %{mandir}/man3/File::Temp.3*
+ %{datadir}/perl5/File/Basename.pm
+ %{mandir}/man3/File::Basename.3*
end
end
- package perl-Filter
- epoch = 0
- version = 1.49
+ package perl-File-Compare
+ version = 1.100.700
+ arch = noarch
- summary = Perl source filters.
+ summary = Compare files or file handles
description
- Source filters alter the program text of a module before Perl sees it, much as
- a C preprocessor alters the source text of a C program before the compiler
- sees it.
+ A File::Compare Perl module provides functions for comparing a content of two
+ files specified by a file name or a file handle.
end
requires
- %{perl_requires}
+ perl = %{perl_version}
+ perl(Carp)
end
files
- %{libdir}/perl5/auto/Filter/Util
- %{libdir}/perl5/Filter/Util
- %{datadir}/perl5/pod/perlfilter.pod
- %{mandir}/man1/perlfilter.*
- %{mandir}/man3/Filter::Util::*
+ %{datadir}/perl5/File/Compare.pm
+ %{mandir}/man3/File::Compare.3*
end
end
- package perl-Filter-Simple
- epoch = 0
- version = 0.91
+ package perl-File-Copy
+ version = 2.39
arch = noarch
- summary = Simplified Perl source filtering.
+ summary = Copy files or file handles
description
- The Filter::Simple Perl module provides a simplified interface to
- Filter::Util::Call; one that is sufficient for most common cases.
+ A File::Copy module provides two basic functions, copy and move, which are
+ useful for getting the contents of a file from one place to another.
end
requires
- %{perl_requires}
- perl(Text::Balanced) >= 1.97
+ perl = %{perl_version}
+ perl(Carp)
+ perl(File::Basename)
end
files
- %{datadir}/perl5/Filter/Simple.pm
- %{mandir}/man3/Filter::Simple.3*
+ %{datadir}/perl5/File/Copy.pm
+ %{mandir}/man3/File::Copy.3*
end
end
- package perl-Getopt-Long
- epoch = 0
- version = 2.42
- arch = noarch
+ package perl-File-DosGlob
+ version = 1.12
- summary = Extended processing of command line options.
+ summary = DOS-like globbing
description
- The Getopt::Long module implements an extended getopt function called
- GetOptions(). It parses the command line from @ARGV, recognizing and removing
- specified options and their possible values.
+ This Perl module implements DOS-like globbing with a few enhancements. It
+ is largely compatible with perlglob.exe in all but one respect--it understands
+ wild cards in directory components.
end
requires
- %{perl_requires}
+ perl = %{perl_version}
perl(Text::ParseWords)
- perl(Pod::Usage) >= 1.14
end
files
- %{datadir}/perl5/Getopt/Long.pm
- %{mandir}/man3/Getopt::Long.3*
+ %{libdir}/perl5/File/DosGlob.pm
+ %{libdir}/perl5/auto/File/DosGlob
+ %{mandir}/man3/File::DosGlob.3*
end
end
- package perl-HTTP-Tiny
- epoch = 0
- version = 0.043
+ package perl-File-Fetch
+ version = 1.04
arch = noarch
- summary = A small, simple, correct HTTP/1.1 client.
+ summary = Generic file fetching mechanism.
description
- This is a very simple HTTP/1.1 client, designed primarily for doing simple GET
- requests without the overhead of a large framework like LWP::UserAgent.
- It is more correct and more complete than HTTP::Lite. It supports proxies
- (currently only non-authenticating ones) and redirection. It also correctly
- resumes after EINTR.
+ File::Fetch is a generic file fetching mechanism.
end
requires
- %{perl_requires}
- perl(Carp)
- perl(IO::Socket)
+ perl = %{perl_version}
+ perl(IPC::Cmd)>=0.36
+ perl(Module::Load::Conditional)>=0.04
+ perl(Params::Check)>=0.07
end
files
- /usr/share/perl5/HTTP/Tiny.pm
- /usr/share/man/man5/HTTP::Tiny*
+ %{datadir}/perl5/File/Fetch.pm
+ %{mandir}/man3/File::Fetch.3*
end
end
- package perl-IO-Compress
- epoch = 0
- version = 2.064
+ package perl-File-Find
+ version = 1.40
arch = noarch
- summary = IO::Compress wrapper for modules.
+ summary = Travers a directory tree
description
- This module is the base class for all IO::Compress and IO::Uncompress
- modules. This module is not intended for direct use in application code.
- Its sole purpose is to to be sub-classed by IO::Compress modules.
+ These are functions for searching through directory trees doing work on each
+ file found similar to the Unix find command.
end
requires
- %{perl_requires}
- end
-
- provides
- perl(IO::Uncompress::Bunzip2)
+ perl = %{perl_version}
+ perl(Scalar::Util)
end
files
- /usr/share/perl5/Compress/Zlib.pm
- %{libdir}/perl5/auto/Compress/Zlib/
- /usr/share/man/man3/Compress::Zlib*
- /usr/share/perl5/File/GlobMapper.pm
- /usr/share/perl5/IO/Compress/Base/
- /usr/share/perl5/IO/Compress/Base.pm
- /usr/share/perl5/IO/Uncompress/AnyUncompress.pm
- /usr/share/perl5/IO/Uncompress/Base.pm
- /usr/share/man/man3/File::GlobMapper.*
- /usr/share/man/man3/IO::Compress::Base.*
- /usr/share/man/man3/IO::Uncompress::AnyUncompress.*
- /usr/share/man/man3/IO::Uncompress::Base.*
+ %{datadir}/perl5/File/Find.pm
+ %{mandir}/man3/File::Find.3*
end
end
- package perl-IO-Socket-IP
- epoch = 0
- version = 0.29
+ package perl-File-Path
+ version = 2.18
arch = noarch
- summary = Drop-in replacement for IO::Socket::INET supporting both IPv4 and IPv6.
+ summary = Create or remove directory trees.
description
- This module provides a protocol-independent way to use IPv4 and IPv6
- sockets, as a drop-in replacement for IO::Socket::INET. Most constructor
- arguments and methods are provided in a backward-compatible way.
+ This module provides a convenient way to create directories of arbitrary
+ depth and to delete an entire directory subtree from the file system.
end
requires
- %{perl_requires}
+ perl = %{perl_version}
+ perl(Carp)
end
files
- %{datadir}/perl5/IO/Socket/IP.pm
- %{mandir}/man3/IO::Socket::IP.*
+ %{datadir}/perl5/File/Path.pm
+ %{mandir}/man3/File::Path.3*
end
end
- package perl-IO-Zlib
- epoch = 0
- version = 1.10
+ package perl-File-stat
+ version = 1.12
arch = noarch
- summary = Perl IO:: style interface to Compress::Zlib.
+ summary = By-Name interface to Perl build-in stat functions
description
- This modules provides an IO:: style interface to the Compress::Zlib
- package. The main advantage is that you can use an IO::Zlib object in much
- the same way as an IO::File object so you can have common code that doesn't
- know which sort of file it is using.
+ This module overrides the core stat() and lstat() functions, replacing them
+ with versions that return File::stat objects. This object has methods that
+ return the similarly named structure field name from the stat(2) function.
end
requires
- %{perl_requires}
- perl(Compress::Zlib)
+ perl = %{perl_version}
+ perl(Symbol)
end
files
- /usr/share/perl5/IO/Zlib.pm
- /usr/share/man/man3/IO::Zlib.*
+ %{datadir}/perl5/File/stat.pm
+ %{mandir}/man3/File::stat.3*
end
end
- package perl-IPC-Cmd
- epoch = 0
- version = 0.92
+ package perl-File-Temp
+ version = 0.231.100
arch = noarch
- summary = Finding and running system commands made easy.
+ summary = Return name and handle of a temporary file safely.
description
- IPC::Cmd allows you to run commands, interactively if desired, in a
- platform independent way, but have them still work.
+ File::Temp can be used to create and open temporary files in a safe way.
+ There is both a function interface and an object-oriented interface. The
+ File::Temp constructor or the tempfile() function can be used to return the
+ name and the open file handle of a temporary file. The tempdir() function
+ can be used to create a temporary directory.
end
requires
- %{perl_requires}
- perl(ExtUtils::MakeMaker)
+ perl = %{perl_version}
+ perl(File::Path) >= 2.06
+ perl(POSIX)
end
files
- /usr/share/perl5/IPC/Cmd.pm
- /usr/share/man/man3/IPC::Cmd.3*
+ %{datadir}/perl5/File/Temp.pm
+ %{mandir}/man3/File::Temp.3*
end
end
- package perl-JSON-PP
- epoch = 0
- version = 2.27203
+ package perl-FileCache
+ version = 1.10
arch = noarch
- summary = JSON::XS compatible pure-Perl module.
+ summary = Keep more files open than the system permits.
description
- JSON::XS is the fastest and most proper JSON module on CPAN. It is written by
- Marc Lehmann in C, so must be compiled and installed in the used environment.
- JSON::PP is a pure-Perl module and is compatible with JSON::XS.
+ The "cacheout" function will make sure that there's a file handle open
+ for reading or writing available as the path name you give it. It
+ automatically closes and re-opens files if you exceed your system
+ maximum number of file descriptors, or the suggested maximum.
end
requires
- %{perl_requires}
+ perl = %{perl_version}
end
files
- /usr/bin/json_pp
- /usr/share/perl5/JSON/PP
- /usr/share/perl5/JSON/PP.pm
- /usr/share/man/man1/json_pp.1*
- /usr/share/man/man3/JSON::PP.3*
- /usr/share/man/man3/JSON::PP::Boolean.3pm*
+ %{datadir}/perl5/FileCache.pm
+ %{mandir}/man3/FileCache.3*
end
end
- package perl-Locale-Codes
- epoch = 0
- version = 3.25
+ package perl-FileHandle
+ version = 2.03
arch = noarch
- summary = Distribution of modules to handle locale codes.
+ summary = Object methods for file handles.
description
- Locale-Codes is a distribution containing a set of modules. The modules
- each deal with different types of codes which identify parts of the locale
- including languages, countries, currency, etc.
+ This is an object-oriented interface for opening files and performing
+ input/output operations on them.
end
requires
- %{perl_requires}
+ perl = %{perl_version}
+ perl(Exporter)
+ perl(Fcntl)
end
- filter_requires
- Locale::Codes::Country_Retired
- Locale::Codes::LangFam_Retired
- Locale::Codes::Script_Retired
- Locale::Codes::LangExt_Codes
- Locale::Codes::LangFam_Codes
- Locale::Codes::Script_Codes
- Locale::Codes::Language_Codes
- Locale::Codes::LangExt_Retired
- Locale::Codes::Currency_Codes
- Locale::Codes::LangVar_Retired
- Locale::Codes::Language_Retired
- Locale::Codes::Country_Codes
- Locale::Codes::LangVar_Codes
- Locale::Codes::Currency_Retired
+ files
+ %{datadir}/perl5/FileHandle.pm
+ %{mandir}/man3/FileHandle.3*
end
+ end
- provides
- perl(Locale::Codes) = %{version}
+ package perl-filetest
+ version = 1.03
+ arch = noarch
+
+ summary = Perl pragma to control the filetest permission operators.
+ description
+ The default behavior of file test operators (e.g. "-r") is to use the simple
+ mode bits as returned by the stat() family of system calls. However, many
+ operating systems have additional features to define more complex access
+ rights, for example ACLs (Access Control Lists). For such environments, "use
+ filetest" may help the permission operators to return results more consistent
+ with other tools.
+ end
+
+ requires
+ perl = %{perl_version}
end
files
- %{datadir}/perl5/Locale/Codes
- %{datadir}/perl5/Locale/Codes.*
- %{datadir}/perl5/Locale/Country.*
- %{datadir}/perl5/Locale/Currency.*
- %{datadir}/perl5/Locale/Language.*
- %{datadir}/perl5/Locale/Script.*
- %{mandir}/man3/Locale::Codes::*
- %{mandir}/man3/Locale::Codes.*
- %{mandir}/man3/Locale::Country.*
- %{mandir}/man3/Locale::Currency.*
- %{mandir}/man3/Locale::Language.*
- %{mandir}/man3/Locale::Script.*
+ %{datadir}/perl5/filetest.pm
+ %{mandir}/man3/filetest.3*
end
end
- package perl-Locale-Maketext
- epoch = 0
- version = 1.25
- arch = noarch
+ package perl-Filter
+ version = 1.60
- summary = Framework for localization.
+ summary = Perl source filters.
description
- It is a common feature of applications (whether run directly, or via the Web)
- for them to be "localized" -- i.e., for them to present an English interface
- to an English-speaker, a German interface to a German-speaker, and so on for
- all languages it's programmed with. Locale::Maketext is a framework for
- software localization; it provides you with the tools for organizing and
- accessing the bits of text and text-processing code that you need for
- producing localized applications.
+ Source filters alter the program text of a module before Perl sees it, much as
+ a C preprocessor alters the source text of a C program before the compiler
+ sees it.
end
requires
- %{perl_requires}
+ perl = %{perl_version}
end
files
- %{datadir}/perl5//Locale/Maketext.*
- %{datadir}/perl5/Locale/Maketext/Cookbook.*
- %{datadir}/perl5/Locale/Maketext/Guts.*
- %{datadir}/perl5/Locale/Maketext/GutsLoader.*
- %{datadir}/perl5/Locale/Maketext/TPJ13.*
- %{mandir}/man3/Locale::Maketext.*
- %{mandir}/man3/Locale::Maketext::Cookbook.*
- %{mandir}/man3/Locale::Maketext::Guts.*
- %{mandir}/man3/Locale::Maketext::GutsLoader.*
- %{mandir}/man3/Locale::Maketext::TPJ13.*
+ %{libdir}/perl5/auto/Filter/Util
+ %{libdir}/perl5/Filter/Util
+ %{datadir}/perl5/pod/perlfilter.pod
+ %{mandir}/man1/perlfilter.*
+ %{mandir}/man3/Filter::Util::*
end
end
- package perl-Locale-Maketext-Simple
- epoch = 0
- version = 0.21
+ package perl-Filter-Simple
+ version = 0.96
arch = noarch
- license = MIT
- summary = Simple interface to Locale::Maketext::Lexicon.
+ summary = Simplified Perl source filtering.
description
- This module is a simple wrapper around Locale::Maketext::Lexicon, designed
- to alleviate the need of creating Language Classes for module authors.
+ The Filter::Simple Perl module provides a simplified interface to
+ Filter::Util::Call; one that is sufficient for most common cases.
end
requires
- %{perl_requires}
+ perl = %{perl_version}
+ perl(Text::Balanced) >= 1.97
end
files
- %{datadir}/perl5/Locale/Maketext/Simple.pm
- %{mandir}/man3/Locale::Maketext::Simple.*
+ %{datadir}/perl5/Filter/Simple.pm
+ %{mandir}/man3/Filter::Simple.3*
end
end
- package perl-Module-Build
- epoch = 0
- version = 0.42.05
+ package perl-FindBin
+ version = 1.53
arch = noarch
- summary = Perl module for building and installing Perl modules.
+ summary = Locate a directory of an original Perl script
description
- Module::Build is a system for building, testing, and installing Perl modules.
- It is meant to be an alternative to ExtUtils::MakeMaker. Developers may alter
- the behavior of the module through subclassing in a much more straightforward
- way than with MakeMaker. It also does not require a make on your system - most
- of the Module::Build code is pure-perl and written in a very cross-platform
- way. In fact, you don't even need a shell, so even platforms like MacOS
- (traditional) can use it fairly easily. Its only prerequisites are modules that
- are included with perl 5.6.0, and it works fine on perl 5.005 if you can
- install a few additional modules.
+ Locates the full path to the script bin directory to allow the use of paths
+ relative to the bin directory.
end
requires
- %{perl_requires}
- perl(Archive::Tar)>=1.08
- perl(CPAN::Meta)>=2.110420
- perl(ExtUtils::CBuilder)>=0.15
- perl(ExtUtils::ParseXS)>=1.02
+ perl = %{perl_version}
end
files
- %{bindir}/config_data
- %{datadir}/perl5/inc/
- %{datadir}/perl5/Module/Build*
- %{mandir}/man1/config_data.1*
- %{mandir}/man3/Module::Build*
- %{mandir}/man3/inc::latest.3*
+ %{datadir}/perl5/FindBin.pm
+ %{mandir}/man3/FindBin.*
end
end
- package perl-Module-CoreList
- epoch = 0
- version = 5.20150214
- arch = noarch
+ package perl-GDBM_File
+ version = 1.23
- summary = Perl core modules indexed by perl versions.
+ summary = Perl5 access to the gdbm library.
description
- Module::CoreList contains the hash of hashes %Module::CoreList::version, this
- is keyed on perl version as indicated in $]. The second level hash is module
- => version pairs.
+ GDBM_File is a module which allows Perl programs to make use of the facilities
+ provided by the GNU gdbm library.
end
requires
- %{perl_requires}
+ perl = %{perl_version}
end
files
- %{datadir}/perl5/Module/CoreList
- %{datadir}/perl5/Module/CoreList.pm
- %{datadir}/perl5/Module/CoreList.pod
- %{mandir}/man3/Module::CoreList*
+ %{libdir}/perl5/GDBM_File.pm
+ %{libdir}/perl5/auto/GDBM_File
+ %{mandir}/man3/GDBM_File.3*
end
end
- package perl-Module-CoreList-tools
- epoch = 0
- version = 5.020001
+ package perl-Getopt-Long
+ version = 2.52
arch = noarch
- summary = Tool for listing modules shipped with perl.
+ summary = Extended processing of command line options.
description
- This package provides a corelist(1) tool which can be used to query what
- modules were shipped with given perl version.
+ The Getopt::Long module implements an extended getopt function called
+ GetOptions(). It parses the command line from @ARGV, recognizing and removing
+ specified options and their possible values.
end
requires
- %{perl_requires}
- perl-Module-CoreList
+ perl = %{perl_version}
+ perl(Text::ParseWords)
+ perl(Pod::Usage) >= 1.14
end
files
- %{bindir}/corelist
- %{mandir}/man1/corelist*
+ %{datadir}/perl5/Getopt/Long.pm
+ %{mandir}/man3/Getopt::Long.3*
end
end
- package perl-Module-Load
- epoch = 0
- version = 0.32
+ package perl-Getopt-Std
+ version = 1.13
arch = noarch
- summary = Runtime require of both modules and files.
+ summary = Process single-character switches with switch clustering
description
- Module::Load eliminates the need to know whether you are trying to require
- either a file or a module.
+ The Getopt::Std module provides functions for processing single-character
+ switches with switch clustering. Pass one argument which is a string
+ containing all switches to be recognized.
end
requires
- %{perl_requires}
+ perl = %{perl_version}
end
files
- %{datadir}/perl5/Module/Load.pm
- %{mandir}/man3/Module::Load.*
+ %{datadir}/perl5/Getopt/Std.pm
+ %{mandir}/man3/Getopt::Std.3*
end
end
- package perl-Module-Load-Conditional
- epoch = 0
- version = 0.62
- arch = noarch
+ package perl-Hash-Util
+ version = 0.28
- summary = Looking up module information / loading at runtime.
+ summary = General-utility hash subroutines
description
- Module::Load::Conditional provides simple ways to query and possibly load
- any of the modules you have installed on your system during runtime.
+ Hash::Util contains special functions for manipulating hashes that don't
+ really warrant a keyword.
end
requires
- %{perl_requires}
+ perl = %{perl_version}
+ perl(Hash::Util::FieldHash)
+ perl(XSLoader)
end
files
- %{datadir}/perl5/Module/Load/
- %{mandir}/man3/Module::Load::Conditional*
+ %{libdir}/perl5/Hash/Util.pm
+ %{libdir}/perl5/auto/Hash/Util
+ %{libdir}/perl5/auto/Hash/Util/Util.so
+ %{mandir}/man3/Hash::Util.3*
end
end
- package perl-Module-Loaded
- epoch = 0
- version = 0.08
- arch = noarch
+ package perl-Hash-Util-FieldHash
+ version = 1.26
- summary = Mark modules as loaded or unloaded.
+ summary = Support for inside-out classes
description
- When testing applications, often you find yourself needing to provide
- functionality in your test environment that would usually be provided by
- external modules. Rather than munging the %INC by hand to mark these external
- modules as loaded, so they are not attempted to be loaded by perl, this module
- offers you a very simple way to mark modules as loaded and/or unloaded.
+ Hash::Util::FieldHash offers a number of functions in support of the
+ inside-out technique of class construction.
end
requires
- %{perl_requires}
+ perl = %{perl_version}
+ perl(XSLoader)
end
files
- %{datadir}/perl5/Module/Loaded.pm
- %{mandir}/man3/Module::Loaded*
+ %{libdir}/perl5/auto/Hash/Util/FieldHash
+ %{libdir}/perl5/Hash/Util/FieldHash.pm
+ %{mandir}/man3/Hash::Util::FieldHash.3*
end
end
- package perl-Module-Metadata
- epoch = 0
- version = 1.000019
+ package perl-HTTP-Tiny
+ version = 0.080
arch = noarch
- summary = Gather package and POD information from perl module files.
+ summary = A small, simple, correct HTTP/1.1 client.
description
- Gather package and POD information from perl module files.
+ This is a very simple HTTP/1.1 client, designed primarily for doing simple GET
+ requests without the overhead of a large framework like LWP::UserAgent.
+ It is more correct and more complete than HTTP::Lite. It supports proxies
+ (currently only non-authenticating ones) and redirection. It also correctly
+ resumes after EINTR.
end
requires
- %{perl_requires}
+ perl = %{perl_version}
+ perl(Carp)
+ perl(IO::Socket)
+ perl(Time::Local)
end
files
- /usr/share/perl5/Module/Metadata.pm
- /usr/share/man/man3/Module::Metadata.3pm*
+ %{datadir}/perl5/HTTP/Tiny.pm
+ %{mandir}/man5/HTTP::Tiny*
end
end
- package perl-Package-Constants
- epoch = 0
- version = 0.04
+ package perl-if
+ version = 0.61.000
arch = noarch
- summary = List all constants declared in a package.
+ summary = Use a Perl module if a condition holds
description
- Package::Constants lists all the constants defined in a certain package. This
- can be useful for, among others, setting up an autogenerated @EXPORT/@EXPORT_OK
- for a Constants.pm file.
+ The "if" module is used to conditionally load another module.
end
requires
- %{perl_requires}
+ perl = %{perl_version}
end
files
- /usr/share/perl5/Package/
- /usr/share/man/man3/Package::Constants*
+ %{datadir}/perl5/if.pm
+ %{mandir}/man3/if.3*
end
end
- package perl-Params-Check
- epoch = 0
- version = 0.38
+ package perl-IO
+ version = 1.50
+
+ summary = Perl input/output modules
+ description
+ This is a collection of Perl input/output modules.
+ end
+
+ requires
+ perl = %{perl_version}
+ end
+
+ files
+ %{datadir}/perl5/IO
+ %{datadir}/perl5/IO.pm
+ %{datadir}/perl5/IO/Dir.pm
+ %{datadir}/perl5/IO/File.pm
+ %{datadir}/perl5/IO/Handle.pm
+ %{datadir}/perl5/IO/Pipe.pm
+ %{datadir}/perl5/IO/Poll.pm
+ %{datadir}/perl5/IO/Seekable.pm
+ %{datadir}/perl5/IO/Select.pm
+ %{datadir}/perl5/IO/Socket
+ %{datadir}/perl5/IO/Socket/INET.pm
+ %{datadir}/perl5/IO/Socket/UNIX.pm
+ %{datadir}/perl5/IO/Socket.pm
+ %{datadir}/perl5/auto/IO
+ %{datadir}/perl5/auto/IO/IO.so
+ %{mandir}/man3/IO.*
+ %{mandir}/man3/IO::Dir.*
+ %{mandir}/man3/IO::File.*
+ %{mandir}/man3/IO::Handle.*
+ %{mandir}/man3/IO::Pipe.*
+ %{mandir}/man3/IO::Poll.*
+ %{mandir}/man3/IO::Seekable.*
+ %{mandir}/man3/IO::Select.*
+ %{mandir}/man3/IO::Socket::INET.*
+ %{mandir}/man3/IO::Socket::UNIX.*
+ %{mandir}/man3/IO::Socket.*
+ end
+ end
+
+ package perl-IO-Compress
+ version = 2.106
arch = noarch
- summary = Generic input parsing/checking mechanism.
+ summary = IO::Compress wrapper for modules.
description
- Params::Check is a generic input parsing/checking mechanism.
+ This module is the base class for all IO::Compress and IO::Uncompress
+ modules. This module is not intended for direct use in application code.
+ Its sole purpose is to to be sub-classed by IO::Compress modules.
end
requires
- %{perl_requires}
+ perl = %{perl_version}
end
provides
- perl(Params::Check)
+ perl(IO::Uncompress::Bunzip2)
end
files
- /usr/share/perl5/Params/
- /usr/share/man/man3/Params::Check*
+ %{datadir}/perl5/Compress/Zlib.pm
+ %{libdir}/perl5/auto/Compress/Zlib/
+ %{mandir}/man3/Compress::Zlib*
+ %{datadir}/perl5/File/GlobMapper.pm
+ %{datadir}/perl5/IO/Compress/Base/
+ %{datadir}/perl5/IO/Compress/Base.pm
+ %{datadir}/perl5/IO/Uncompress/AnyUncompress.pm
+ %{datadir}/perl5/IO/Uncompress/Base.pm
+ %{mandir}/man3/File::GlobMapper.*
+ %{mandir}/man3/IO::Compress::Base.*
+ %{mandir}/man3/IO::Uncompress::AnyUncompress.*
+ %{mandir}/man3/IO::Uncompress::Base.*
end
end
- package perl-Parse-CPAN-Meta
- epoch = 0
- version = 1.4414
+ package perl-IO-Socket-IP
+ version = 0.41
arch = noarch
- summary = Parse META.yml and other similar CPAN metadata files.
+ summary = Drop-in replacement for IO::Socket::INET supporting both IPv4 and IPv6.
description
- Parse::CPAN::Meta is a parser for META.yml files, based on the parser half of
- YAML::Tiny.
+ This module provides a protocol-independent way to use IPv4 and IPv6
+ sockets, as a drop-in replacement for IO::Socket::INET. Most constructor
+ arguments and methods are provided in a backward-compatible way.
end
requires
- %{perl_requires}
+ perl = %{perl_version}
end
files
- /usr/share/perl5/Parse/CPAN/Meta.pm
- /usr/share/man/man3/Parse::CPAN::Meta.3*
+ %{datadir}/perl5/IO/Socket/IP.pm
+ %{mandir}/man3/IO::Socket::IP.*
end
end
- package perl-Path-Tools
- epoch = 0
- version = 3.48
- license = (GPL+ or Artistic) and BSD
+ package perl-IO-Zlib
+ version = 1.11
+ arch = noarch
- summary = PathTools Perl module (Cwd, File::Spec).
+ summary = Perl IO:: style interface to Compress::Zlib.
description
- PathTools Perl module (Cwd, File::Spec).
+ This modules provides an IO:: style interface to the Compress::Zlib
+ package. The main advantage is that you can use an IO::Zlib object in much
+ the same way as an IO::File object so you can have common code that doesn't
+ know which sort of file it is using.
end
requires
- %{perl_requires}
+ perl = %{perl_version}
+ perl(Compress::Zlib)
+ end
+
+ files
+ %{datadir}/perl5/IO/Zlib.pm
+ %{mandir}/man3/IO::Zlib.*
+ end
+ end
+
+ package perl-IPC-Cmd
+ version = 1.04
+ arch = noarch
+
+ summary = Finding and running system commands made easy.
+ description
+ IPC::Cmd allows you to run commands, interactively if desired, in a
+ platform independent way, but have them still work.
end
- filter_requires
- VMS::Filespec
+ requires
+ perl = %{perl_version}
+ perl(ExtUtils::MakeMaker)
end
files
- %{libdir}/perl5/Cwd.pm
- %{libdir}/perl5/File/Spec*
- /usr/share/man/man3/Cwd*
- /usr/share/man/man3/File::Spec*
+ %{datadir}/perl5/IPC/Cmd.pm
+ %{mandir}/man3/IPC::Cmd.3*
end
end
- package perl-Perl-OSType
- epoch = 0
- version = 1.007
+ package perl-IPC-Open3
+ version = 1.22
arch = noarch
- summary = Map perl operating system names to generic types.
+ summary = Open a process for reading, writing, and error handling.
description
- Modules that provide OS-specific behaviors often need to know if the current
- operating system matches a more generic type of operating systems. For example,
- 'linux' is a type of 'Unix' operating system and so is 'freebsd'.
- This module provides a mapping between an operating system name as given by $^O
- and a more generic type. The initial version is based on the OS type mappings
- provided in Module::Build and ExtUtils::CBuilder (thus, Microsoft operating
- systems are given the type 'Windows' rather than 'Win32').
+ These are functions that spawn a given command and connects the standard
+ output of the command for reading, standard output for writing, and standard
+ error output for handling the errors.
end
requires
- %{perl_requires}
+ perl = %{perl_version}
+ perl(Fcntl)
+ perl(IO::Pipe)
+ perl(POSIX)
+ perl(warnings)
end
files
- /usr/share/perl5/Perl/OSType.pm
- /usr/share/man/man3/Perl::OSType.3pm*
+ %{datadir}/perl5/IPC/Open2.pm
+ %{datadir}/perl5/IPC/Open3.pm
+ %{mandir}/man3/IPC::Open2.3*
+ %{mandir}/man3/IPC::Open3.3*
end
end
- package perl-Pod-Checker
- epoch = 0
- version = 1.60
+ package perl-IPC-SysV
+ version = 2.08
+
+ summary = Object interface to System V IPC.
+ description
+ This is an object interface for System V messages, semaphores, and
+ inter-process calls.
+ end
+
+ requires
+ perl = %{perl_version}
+ perl(DynaLoader)
+ end
+
+ files
+ %{libdir}/perl5/auto/IPC
+ %{libdir}/perl5/IPC
+ %{libdir}/perl5/IPC/Msg.pm
+ %{libdir}/perl5/IPC/Semaphore.pm
+ %{libdir}/perl5/IPC/SharedMem.pm
+ %{libdir}/perl5/IPC/SysV.pm
+ %{mandir}/man3/IPC::Msg.*
+ %{mandir}/man3/IPC::Semaphore.*
+ %{mandir}/man3/IPC::SharedMem.*
+ %{mandir}/man3/IPC::SysV.*
+ end
+ end
+
+ package perl-I18N-Collate
+ version = 1.02
arch = noarch
- summary = Check POD documents for syntax errors.
+ summary = Compare 8-bit scalar data according to the current locale
description
- Module and tools to verify POD documentation contents for compliance with the
- Plain Old Documentation format specifications.
+ This module provides you with objects that will collate according to your
+ national character set. This module is deprecated. See the perllocale manual
+ page for further information.
end
requires
- %{perl_requires}
+ perl = %{perl_version}
end
files
- %{bindir}/podchecker
- %{datadir}/perl5/Pod/Checker.pm
- %{mandir}/man1/podchecker.*
- %{mandir}/man3/Pod::Checker.*
+ %{datadir}/perl5/I18N/Collate.pm
+ %{mandir}/man3/I18N::Collate.*
end
end
- package perl-Pod-Escapes
- epoch = 0
- version = 1.06
+ package perl-I18N-Langinfo
+ version = 0.21
arch = noarch
- summary = Perl module for resolving POD escape sequences.
+ summary = Query locale information
description
- This module provides things that are useful in decoding Pod E<...> sequences.
- Presumably, it should be used only by Pod parsers and/or formatters.
+ The langinfo() function queries various locale information that can be used to
+ localize output and user interfaces. It uses the current underlying locale,
+ regardless of whether or not it was called from within the scope of "use
+ locale".
end
requires
- %{perl_requires}
+ perl = %{perl_version}
end
files
- /usr/share/perl5/Pod/Escapes.pm
- /usr/share/man/man3/Pod::Escapes.*
+ %{libdir}/perl5/auto/I18N
+ %{libdir}/perl5/I18N
+ %{mandir}/man3/I18N::Langinfo.*
end
end
- package perl-Pod-Parser
- epoch = 0
- version = 1.62
+ package perl-I18N-LangTags
+ version = 0.45
arch = noarch
- summary = Basic perl modules for handling Plain Old Documentation (POD).
+ summary = Functions for dealing with RFC 3066 language tags.
description
- This software distribution contains the packages for using Perl5 POD (Plain
- Old Documentation). See the "perlpod" and "perlsyn" manual pages from your
- Perl5 distribution for more information about POD.
+ Language tags are a formalism, described in RFC 3066, for declaring what
+ language form (language and possibly dialect) a given chunk of information is
+ in. This library provides functions for common tasks involving language tags
+ as they are needed in a variety of protocols and applications.
end
requires
- %{perl_requires}
+ perl = %{perl_version}
+ perl(integer)
+ perl(warnings)
end
files
- %{bindir}/podselect
- %{datadir}/perl5/Pod/Find.pm
- %{datadir}/perl5/Pod/InputObjects.pm
- %{datadir}/perl5/Pod/ParseUtils.pm
- %{datadir}/perl5/Pod/Parser.pm
- %{datadir}/perl5/Pod/PlainText.pm
- %{datadir}/perl5/Pod/Select.pm
- %{mandir}/man1/podselect.1*
- %{mandir}/man3/Pod::Find.*
- %{mandir}/man3/Pod::InputObjects.*
- %{mandir}/man3/Pod::ParseUtils.*
- %{mandir}/man3/Pod::Parser.*
- %{mandir}/man3/Pod::PlainText.*
- %{mandir}/man3/Pod::Select.*
+ %{datadir}/perl5/I18N/LangTags
+ %{datadir}/perl5/I18N/LangTags.pm
+ %{mandir}/man3/I18N::LangTags.*
+ %{mandir}/man3/I18N::LangTags::*
end
end
- package perl-Pod-Perldoc
- epoch = 0
- version = 3.23
+ package perl-JSON-PP
+ version = 4.07
arch = noarch
- summary = Look up Perl documentation in Pod format.
+ summary = JSON::XS compatible pure-Perl module.
description
- perldoc looks up a piece of documentation in .pod format that is embedded
- in the perl installation tree or in a perl script, and displays it via
- "groff -man | $PAGER". This is primarily used for the documentation for
- the perl library modules.
+ JSON::XS is the fastest and most proper JSON module on CPAN. It is written by
+ Marc Lehmann in C, so must be compiled and installed in the used environment.
+ JSON::PP is a pure-Perl module and is compatible with JSON::XS.
+ end
+
+ requires
+ perl = %{perl_version}
+ perl(Data::Dumper)
+ perl(Encode)
+ perl(Math::BigFloat)
+ perl(Math::BigInt)
+ perl(Scalar::Util)
+ perl(subs)
+ end
+
+ files
+ %{bindir}/json_pp
+ %{datadir}/perl5/JSON/PP
+ %{datadir}/perl5/JSON/PP.pm
+ %{mandir}/man1/json_pp.1*
+ %{mandir}/man3/JSON::PP.3*
+ %{mandir}/man3/JSON::PP::Boolean.3pm*
+ end
+ end
+
+ package perl-libnet
+ version = 3.14
+ arch = noarch
+
+ summary = Perl clients for various network protocols
+ description
+ This is a collection of Perl modules which provides a simple and
+ consistent programming interface (API) to the client side of various
+ protocols used in the internet community.
+ end
+
+ requires
+ perl = %{perl_version}
+ perl(File::Basename)
+ perl(IO::Socket) >= 1.05
+ perl(IO::Socket::IP) >= 0.20
+ perl(POSIX)
+ perl(Socket) >= 2.016
+ perl(utf8)
+ end
+
+ files
+ %{datadir}/perl5/Net/Cmd.pm
+ %{datadir}/perl5/Net/Config.pm
+ %{datadir}/perl5/Net/Domain.pm
+ %{datadir}/perl5/Net/FTP
+ %{datadir}/perl5/Net/FTP.pm
+ %{datadir}/perl5/Net/libnetFAQ.pod
+ %{datadir}/perl5/Net/NNTP.pm
+ %{datadir}/perl5/Net/Netrc.pm
+ %{datadir}/perl5/Net/POP3.pm
+ %{datadir}/perl5/Net/SMTP.pm
+ %{datadir}/perl5/Net/Time.pm
+ %{mandir}/man3/Net::Cmd.*
+ %{mandir}/man3/Net::Config.*
+ %{mandir}/man3/Net::Domain.*
+ %{mandir}/man3/Net::FTP.*
+ %{mandir}/man3/Net::libnetFAQ.*
+ %{mandir}/man3/Net::NNTP.*
+ %{mandir}/man3/Net::Netrc.*
+ %{mandir}/man3/Net::POP3.*
+ %{mandir}/man3/Net::SMTP.*
+ %{mandir}/man3/Net::Time.*
+ end
+ end
+
+ package perl-libnetcfg
+ version = %{perl_version}
+ arch = noarch
+
+ summary = Configure libnet
+ description
+ The libnetcfg utility can be used to configure the libnet.
+ end
+
+ requires
+ perl = %{perl_version}
+ end
+
+ files
+ %{bindir}/libnetcfg
+ %{mandir}/man1/libnetcfg*
+ end
+ end
+
+ package perl-locale
+ version = 1.10
+ arch = noarch
+
+ summary = Pragma to use or avoid POSIX locales for built-in operations.
+ description
+ This pragma tells the compiler to enable (or disable) the use of POSIX locales
+ for built-in operations (for example, LC_CTYPE for regular expressions,
+ LC_COLLATE for string comparison, and LC_NUMERIC for number formatting). Each
+ "use locale" or "no locale" affects statements to the end of the enclosing
+ block.
+ end
+
+ requires
+ perl = %{perl_version}
+ perl(Carp)
+ perl(POSIX)
+ end
+
+ files
+ %{datadir}/perl5/locale.pm
+ %{mandir}/man3/locale.*
+ end
+ end
+
+ package perl-Locale-Maketext
+ version = 1.31
+ arch = noarch
+
+ summary = Framework for localization.
+ description
+ It is a common feature of applications (whether run directly, or via the Web)
+ for them to be "localized" -- i.e., for them to present an English interface
+ to an English-speaker, a German interface to a German-speaker, and so on for
+ all languages it's programmed with. Locale::Maketext is a framework for
+ software localization; it provides you with the tools for organizing and
+ accessing the bits of text and text-processing code that you need for
+ producing localized applications.
+ end
+
+ requires
+ perl = %{perl_version}
+ end
+
+ files
+ %{datadir}/perl5/Locale/Maketext.*
+ %{datadir}/perl5/Locale/Maketext/Cookbook.*
+ %{datadir}/perl5/Locale/Maketext/Guts.*
+ %{datadir}/perl5/Locale/Maketext/GutsLoader.*
+ %{datadir}/perl5/Locale/Maketext/TPJ13.*
+ %{mandir}/man3/Locale::Maketext.*
+ %{mandir}/man3/Locale::Maketext::Cookbook.*
+ %{mandir}/man3/Locale::Maketext::Guts.*
+ %{mandir}/man3/Locale::Maketext::GutsLoader.*
+ %{mandir}/man3/Locale::Maketext::TPJ13.*
+ end
+ end
+
+ package perl-Locale-Maketext-Simple
+ version = 0.21
+ arch = noarch
+ license = MIT
+
+ summary = Simple interface to Locale::Maketext::Lexicon.
+ description
+ This module is a simple wrapper around Locale::Maketext::Lexicon, designed
+ to alleviate the need of creating Language Classes for module authors.
+ end
+
+ requires
+ perl = %{perl_version}
+ end
+
+ files
+ %{datadir}/perl5/Locale/Maketext/Simple.pm
+ %{mandir}/man3/Locale::Maketext::Simple.*
+ end
+ end
+
+ package perl-Math-BigInt
+ version = 1.9998.30
+ arch = noarch
+
+ summary = Arbitrary-size integer and float mathematics.
+ description
+ This provides Perl modules for arbitrary-size integer and float mathematics.
+ end
+
+ requires
+ perl = %{perl_version}
+ perl(Carp)
+ end
+
+ files
+ %{datadir}/perl5/Math/BigFloat.pm
+ %{datadir}/perl5/Math/BigInt.pm
+ %{datadir}/perl5/Math/BigInt
+ %{datadir}/perl5/Math/BigInt/Calc.pm
+ %{datadir}/perl5/Math/BigInt/Lib.pm
+ %{mandir}/man3/Math::BigFloat.*
+ %{mandir}/man3/Math::BigInt.*
+ %{mandir}/man3/Math::BigInt::Calc.*
+ %{mandir}/man3/Math::BigInt::Lib.*
+ end
+ end
+
+ package perl-Math-BigInt-FastCalc
+ version = 0.501.200
+
+ summary = Math::BigInt::Calc XS implementation
+ description
+ This package provides support for faster big integer calculations.
+ end
+
+ requires
+ perl = %{perl_version}
+ end
+
+ files
+ %{libdir}/perl5/Math
+ %{libdir}/perl5/auto/Math
+ %{mandir}/man3/Math::BigInt::FastCalc.*
+ end
+ end
+
+ package perl-Math-BigRat
+ version = 0.2621
+ arch = noarch
+
+ summary = Arbitrary big rational numbers
+ description
+ Math::BigRat complements Math::BigInt and Math::BigFloat by providing support
+ for arbitrary big rational numbers.
+ end
+
+ requires
+ perl = %{perl_version}
+ perl(Math::BigInt)
+ end
+
+ files
+ %{datadir}/perl5/Math/BigRat.pm
+ %{mandir}/man3/Math::BigRat.*
+ end
+ end
+
+ package perl-Math-Complex
+ version = 1.59
+ arch = noarch
+
+ summary = Complex numbers and trigonometric functions.
+ description
+ This package lets you create and manipulate complex numbers. By default, Perl
+ limits itself to real numbers, but an extra "use" statement brings full
+ complex support, along with a full set of mathematical functions typically
+ associated with and/or extended to complex numbers.
+ end
+
+ requires
+ perl = %{perl_version}
+ end
+
+ files
+ %{datadir}/perl5/Math/Complex.pm
+ %{datadir}/perl5/Math/Trig.pm
+ %{mandir}/man3/Math::Complex.*
+ %{mandir}/man3/Math::Trig.*
+ end
+ end
+
+ package perl-Memoize
+ version = 1.03
+ arch = noarch
+
+ summary = Transparently speed up functions by caching return values.
+ description
+ Memoizing a function makes it faster by trading space for time. It does
+ this by caching the return values of the function in a table. If you call
+ the function again with the same arguments, memoize jumps in and gives
+ you the value out of the table, instead of letting the function compute
+ the value all over again.
+ end
+
+ requires
+ perl = %{perl_version}
+ end
+
+ files
+ %{datadir}/perl5/Memoize
+ %{datadir}/perl5/Memoize.pm
+ %{mandir}/man3/Memoize::*
+ %{mandir}/man3/Memoize.*
+ end
+ end
+
+ package perl-meta-notation
+ version = %{perl_version}
+ arch = noarch
+
+ summary = Change nonprintable characters below 0x100 into printables.
+ description
+ Returns a copy of the input string with the nonprintable characters below
+ 0x100 changed into printables. Any ASCII printables or above 0xFF are
+ unchanged.
+ end
+
+ requires
+ perl = %{perl_version}
+ end
+
+ files
+ %{datadir}/perl5/meta_notation.pm
+ end
+ end
+
+ package perl-MIME-Base64
+ version = 3.16
+
+ summary = Encoding and decoding of Base64 and quoted-printable strings.
+ description
+ This package contains a Base64 encoder/decoder and a quoted-printable
+ encoder/decoder. These encoding methods are specified in RFC 2045 - MIME
+ (Multipurpose Internet Mail Extensions).
+ end
+
+ requires
+ perl = %{perl_version}
+ end
+
+ files
+ %{libdir}/perl5/auto/MIME
+ %{libdir}/perl5/MIME
+ %{mandir}/man3/MIME::*
+ end
+ end
+
+ package perl-Module-CoreList
+ version = 5.20220520
+ arch = noarch
+
+ summary = Perl core modules indexed by perl versions.
+ description
+ Module::CoreList contains the hash of hashes %Module::CoreList::version, this
+ is keyed on perl version as indicated in $]. The second level hash is module
+ => version pairs.
+ end
+
+ requires
+ perl = %{perl_version}
+ end
+
+ files
+ %{datadir}/perl5/Module/CoreList
+ %{datadir}/perl5/Module/CoreList.pm
+ %{datadir}/perl5/Module/CoreList.pod
+ %{mandir}/man3/Module::CoreList*
+ end
+ end
+
+ package perl-Module-CoreList-tools
+ version = 5.20220520
+ arch = noarch
+
+ summary = Tool for listing modules shipped with perl.
+ description
+ This package provides a corelist(1) tool which can be used to query what
+ modules were shipped with given perl version.
+ end
+
+ requires
+ perl = %{perl_version}
+ perl-Module-CoreList
+ end
+
+ files
+ %{bindir}/corelist
+ %{mandir}/man1/corelist*
+ end
+ end
+
+ package perl-Module-Load
+ version = 0.36
+ arch = noarch
+
+ summary = Runtime require of both modules and files.
+ description
+ Module::Load eliminates the need to know whether you are trying to require
+ either a file or a module.
+ end
+
+ requires
+ perl = %{perl_version}
+ end
+
+ files
+ %{datadir}/perl5/Module/Load.pm
+ %{mandir}/man3/Module::Load.*
+ end
+ end
+
+ package perl-Module-Load-Conditional
+ version = 0.74
+ arch = noarch
+
+ summary = Looking up module information / loading at runtime.
+ description
+ Module::Load::Conditional provides simple ways to query and possibly load
+ any of the modules you have installed on your system during runtime.
+ end
+
+ requires
+ perl = %{perl_version}
+ end
+
+ files
+ %{datadir}/perl5/Module/Load/
+ %{mandir}/man3/Module::Load::Conditional*
+ end
+ end
+
+ package perl-Module-Loaded
+ version = 0.08
+ arch = noarch
+
+ summary = Mark modules as loaded or unloaded.
+ description
+ When testing applications, often you find yourself needing to provide
+ functionality in your test environment that would usually be provided by
+ external modules. Rather than munging the %INC by hand to mark these external
+ modules as loaded, so they are not attempted to be loaded by perl, this module
+ offers you a very simple way to mark modules as loaded and/or unloaded.
+ end
+
+ requires
+ perl = %{perl_version}
+ end
+
+ files
+ %{datadir}/perl5/Module/Loaded.pm
+ %{mandir}/man3/Module::Loaded*
+ end
+ end
+
+ package perl-Module-Metadata
+ version = 1.000037
+ arch = noarch
+
+ summary = Gather package and POD information from perl module files.
+ description
+ Gather package and POD information from perl module files.
+ end
+
+ requires
+ perl = %{perl_version}
+ end
+
+ files
+ %{datadir}/perl5/Module/Metadata.pm
+ %{mandir}/man3/Module::Metadata.3pm*
+ end
+ end
+
+ package perl-mro
+ version = 1.26
+
+ summary = Method resolution order
+ description
+ The "mro" name space provides several utilities for dealing with method
+ resolution order and method caching in general.
+ end
+
+ requires
+ perl = %{perl_version}
+ end
+
+ files
+ %{libdir}/perl5/auto/mro
+ %{libdir}/perl5/mro.pm
+ %{mandir}/man3/mro.3*
+ end
+ end
+
+ package perl-NDBM_File
+ version = 1.15
+
+ summary = Tied access to ndbm files.
+ description
+ NDBM_File establishes a connection between a Perl hash variable and a file in
+ ndbm format. You can manipulate the data in the file just as if it were in
+ a Perl hash, but when your program exits, the data will remain in the file, to
+ be used the next time your program runs.
+ end
+
+ requires
+ perl = %{perl_version}
+ end
+
+ files
+ %{libdir}/perl5/NDBM_File.pm
+ %{libdir}/perl5/auto/NDBM_File
+ %{mandir}/man3/NDBM_File.3*
+ end
+ end
+
+ package perl-Net
+ version = 1.03
+ arch = noarch
+
+ summary = By-name interface to Perl built-in network resolver.
+ description
+ This package provide object-oriented interface to Perl built-in gethost*(),
+ getnet*(), getproto*(), and getserv*() functions.
+ end
+
+ requires
+ perl = %{perl_version}
+ perl(Socket)
+ end
+
+ files
+ %{datadir}/perl5/Net/hostent.pm
+ %{datadir}/perl5/Net/netent.pm
+ %{datadir}/perl5/Net/protoent.pm
+ %{datadir}/perl5/Net/servent.pm
+ %{mandir}/man3/Net::hostent.3*
+ %{mandir}/man3/Net::netent.3*
+ %{mandir}/man3/Net::protoent.3*
+ %{mandir}/man3/Net::servent.3*
+ end
+ end
+
+ package perl-Net-Ping
+ version = 2.74
+ arch = noarch
+
+ summary = Check a remote host for reachability.
+ description
+ Net::Ping module contains methods to test the reachability of remote hosts on
+ a network.
+ end
+
+ requires
+ perl = %{perl_version}
+ perl(IO::Socket::INET)
+ end
+
+ # Keep Net::Ping::External optional
+ suggests
+ perl(Net::Ping::External)
+ end
+
+ files
+ %{datadir}/perl5/Net/Ping.pm
+ %{mandir}/man3/Net::Ping.*
+ end
+ end
+
+ package perl-NEXT
+ version = 0.69
+ arch = noarch
+
+ summary = Pseudo-class that allows method redispatch.
+ description
+ The NEXT module adds a pseudo-class named "NEXT" to any program that uses it.
+ If a method "m" calls "$self->NEXT::m()", the call to "m" is redispatched as
+ if the calling method had not originally been found.
+ end
+
+ requires
+ perl = %{perl_version}
+ end
+
+ files
+ %{datadir}/perl5/NEXT.pm
+ %{mandir}/man3/NEXT.*
+ end
+ end
+
+ package perl-ODBM_File
+ version = 1.17
+
+ summary = Tied access to odbm files
+ description
+ ODBM_File establishes a connection between a Perl hash variable and a file in
+ odbm format. You can manipulate the data in the file just as if it were in
+ a Perl hash, but when your program exits, the data will remain in the file, to
+ be used the next time your program runs.
+ end
+
+ requires
+ perl = %{perl_version}
+ end
+
+ files
+ %{libdir}/perl5/ODBM_File.pm
+ %{libdir}/perl5/auto/ODBM_File
+ %{mandir}/man3/ODBM_File.3*
+ end
+ end
+
+ package perl-Opcode
+ version = 1.57
+
+ summary = Disable named opcodes when compiling a perl code.
+ description
+ The Opcode module allows you to define an operator mask to be in effect when
+ perl next compiles any code. Attempting to compile code which contains
+ a masked opcode will cause the compilation to fail with an error. The code
+ will not be executed.
+ end
+
+ requires
+ perl = %{perl_version}
+ end
+
+ files
+ %{libdir}/perl5/auto/Opcode
+ %{libdir}/perl5/Opcode.pm
+ %{libdir}/perl5/ops.pm
+ %{mandir}/man3/Opcode.3*
+ %{mandir}/man3/ops.3*
+ end
+ end
+
+ package perl-open
+ version = 1.13
+ arch = noarch
+
+ summary = Perl pragma to set default PerlIO layers for input and output.
+ description
+ The "open" pragma serves as one of the interfaces to declare default "layers"
+ (also known as "disciplines") for all I/O.
+ end
+
+ requires
+ perl = %{perl_version}
+ perl(Carp)
+ perl(Encode)
+ perl(encoding)
+ end
+
+ files
+ %{datadir}/perl5/open.pm
+ %{mandir}/man3/open.3*
+ end
+ end
+
+ package perl-overload
+ version = 1.35
+ arch = noarch
+
+ summary = Overloading Perl operations.
+ description
+ The "overload" pragma allows overloading of Perl operators for a class. To
+ overload built-in functions, see "Overriding Built-in Functions" in perlsub
+ POD instead.
+ end
+
+ requires
+ perl = %{perl_version}
+ perl(mro)
+ perl(Scalar::Util)
+ perl(overloading)
+ end
+
+ files
+ %{datadir}/perl5/overload.pm
+ %{mandir}/man3/overload.3*
+ end
+ end
+
+ package perl-overloading
+ version = 0.02
+ arch = noarch
+
+ summary = Perl pragma to lexically control overloading.
+ description
+ Overloading pragma allows you to lexically disable or enable overloading.
+ end
+
+ requires
+ perl = %{perl_version}
+ perl(Carp)
+ end
+
+ files
+ %{datadir}/perl5/overload/numbers.pm
+ %{datadir}/perl5/overloading.pm
+ %{mandir}/man3/overloading.3*
+ end
+ end
+
+ package perl-Params-Check
+ version = 0.38
+ arch = noarch
+
+ summary = Generic input parsing/checking mechanism.
+ description
+ Params::Check is a generic input parsing/checking mechanism.
+ end
+
+ requires
+ perl = %{perl_version}
+ end
+
+ provides
+ perl(Params::Check)
+ end
+
+ files
+ %{datadir}/perl5/Params/
+ %{mandir}/man3/Params::Check*
+ end
+ end
+
+ package perl-Parse-CPAN-Meta
+ version = 1.4414
+ arch = noarch
+
+ summary = Parse META.yml and other similar CPAN metadata files.
+ description
+ Parse::CPAN::Meta is a parser for META.yml files, based on the parser half of
+ YAML::Tiny.
+ end
+
+ requires
+ perl = %{perl_version}
+ end
+
+ files
+ %{datadir}/perl5/Parse/CPAN/Meta.pm
+ %{mandir}/man3/Parse::CPAN::Meta.3*
+ end
+ end
+
+ package perl-Path-Tools
+ version = 3.84
+ license = (GPL+ or Artistic) and BSD
+
+ summary = PathTools Perl module (Cwd, File::Spec).
+ description
+ PathTools Perl module (Cwd, File::Spec).
+ end
+
+ requires
+ perl = %{perl_version}
+ perl(Carp)
+ perl(Errno)
+ perl(Scalar::Util)
+ perl(XSLoader)
+ end
+
+ files
+ %{libdir}/perl5/Cwd.pm
+ %{libdir}/perl5/File/Spec
+ %{libdir}/perl5/File/Spec*
+ %{libdir}/perl5/auto/Cwd
+ %{mandir}/man3/Cwd*
+ %{mandir}/man3/File::Spec*
+ end
+ end
+
+ package perl-PerlIO-via-QuotedPrint
+ version = 0.09
+ arch = noarch
+
+ summary = PerlIO layer for quoted-printable strings.
+ description
+ This module implements a PerlIO layer that works on files encoded in the
+ quoted-printable format. It will decode from quoted-printable while
+ reading from a handle, and it will encode as quoted-printable while
+ writing to a handle.
+ end
+
+ requires
+ perl = %{perl_version}
+ end
+
+ files
+ %{datadir}/perl5/PerlIO/via/
+ %{datadir}/perl5/PerlIO/via/QuotedPrint.pm
+ %{mandir}/man3/PerlIO::via::QuotedPrint.*
+ end
+ end
+
+ package perl-Perl-OSType
+ version = 1.010
+ arch = noarch
+
+ summary = Map perl operating system names to generic types.
+ description
+ Modules that provide OS-specific behaviors often need to know if the current
+ operating system matches a more generic type of operating systems. For example,
+ 'linux' is a type of 'Unix' operating system and so is 'freebsd'.
+ This module provides a mapping between an operating system name as given by $^O
+ and a more generic type. The initial version is based on the OS type mappings
+ provided in Module::Build and ExtUtils::CBuilder (thus, Microsoft operating
+ systems are given the type 'Windows' rather than 'Win32').
+ end
+
+ requires
+ perl = %{perl_version}
+ end
+
+ files
+ %{datadir}/perl5/Perl/OSType.pm
+ %{mandir}/man3/Perl::OSType.3pm*
+ end
+ end
+
+ package perl-ph
+ version = %{perl_version}
+
+ summary = Selected system header files converted to Perl headers.
+ description
+ Contemporary Perl still refers to some Perl header (ph) files although it does
+ not build them anymore. This is a prebuilt collection of the referred files.
+ If you miss other ones, you can generate them with h2ph tool from perl-utils
+ package.
+ end
+
+ provides
+ perl(sys/ioctl.ph) = %{perl_version}
+ perl(sys/syscall.ph) = %{perl_version}
+ perl(syscall.ph) = %{perl_version}
+ end
+
+ requires
+ perl = %{perl_version}
+ perl-libs = %{perl_version}
+ perl(warnings)
+ end
+
+ files
+ %{libdir}/perl5/asm
+ %{libdir}/perl5/asm-generic
+ %{libdir}/perl5/bits
+ %{libdir}/perl5/features*.ph
+ %{libdir}/perl5/gnu
+ %{libdir}/perl5/_h2ph_pre.ph
+ %{libdir}/perl5/linux
+ %{libdir}/perl5/stdc-predef.ph
+ %{libdir}/perl5/sys
+ %{libdir}/perl5/syscall.ph
+ end
+ end
+
+ package perl-Pod-Checker
+ version = 1.74
+ arch = noarch
+
+ summary = Check POD documents for syntax errors.
+ description
+ Module and tools to verify POD documentation contents for compliance with the
+ Plain Old Documentation format specifications.
+ end
+
+ requires
+ perl = %{perl_version}
+ end
+
+ files
+ %{bindir}/podchecker
+ %{datadir}/perl5/Pod/Checker.pm
+ %{mandir}/man1/podchecker.*
+ %{mandir}/man3/Pod::Checker.*
+ end
+ end
+
+ package perl-Pod-Escapes
+ version = 1.07
+ arch = noarch
+
+ summary = Perl module for resolving POD escape sequences.
+ description
+ This module provides things that are useful in decoding Pod E<...> sequences.
+ Presumably, it should be used only by Pod parsers and/or formatters.
+ end
+
+ requires
+ perl = %{perl_version}
+ end
+
+ files
+ %{datadir}/perl5/Pod/Escapes.pm
+ %{mandir}/man3/Pod::Escapes.*
+ end
+ end
+
+ package perl-Pod-Functions
+ version = 1.14
+ arch = noarch
+
+ summary = Group Perl functions as in perlfunc POD.
+ description
+ This module enumerates the Perl functions that are documented in perlfunc POD.
+ end
+
+ requires
+ perl = %{perl_version}
+ perl-libs = %{perl_version}
+ end
+
+ files
+ %{datadir}/perl5/Pod/Functions.pm
+ end
+ end
+
+ package perl-Pod-HTML
+ version = 1.33
+ arch = noarch
+
+ summary = Convert POD files to HTML.
+ description
+ This package converts files from POD format (see perlpod) to HTML format. It
+ can automatically generate indexes and cross-references, and it keeps a cache
+ of things it knows how to cross-reference.
+ end
+
+ requires
+ perl = %{perl_version}
+ end
+
+ files
+ %{bindir}/pod2html
+ %{datadir}/perl5/Pod/Html
+ %{datadir}/perl5/Pod/Html.pm
+ %{mandir}/man1/pod2html.1*
+ %{mandir}/man3/Pod::Html*
+ end
+ end
+
+ package perl-Pod-Perldoc
+ version = 3.28.1
+ arch = noarch
+
+ summary = Look up Perl documentation in Pod format.
+ description
+ perldoc looks up a piece of documentation in .pod format that is embedded
+ in the perl installation tree or in a perl script, and displays it via
+ "groff -man | $PAGER". This is primarily used for the documentation for
+ the perl library modules.
+ end
+
+ requires
+ perl = %{perl_version}
+ end
+
+ files
+ %{bindir}/perldoc
+ %{datadir}/perl5/pod/perldoc.pod
+ %{datadir}/perl5/Pod/Perldoc
+ %{datadir}/perl5/Pod/Perldoc.pm
+ %{mandir}/man1/perldoc.1*
+ %{mandir}/man3/Pod::Perldoc*
+ end
+ end
+
+ package perl-Pod-Simple
+ version = 3.43
+ arch = noarch
+
+ summary = Framework for parsing POD documentation.
+ description
+ Pod::Simple is a Perl library for parsing text in the Pod (plain old
+ documentation) markup language that is typically used for writing
+ documentation for Perl and for Perl modules.
+ end
+
+ requires
+ perl = %{perl_version}
+ end
+
+ files
+ %{datadir}/perl5/Pod/Simple/
+ %{datadir}/perl5/Pod/Simple.pm
+ %{datadir}/perl5/Pod/Simple.pod
+ %{mandir}/man3/Pod::Simple*
+ end
+ end
+
+ package perl-Pod-Usage
+ version = 2.01
+ arch = noarch
+
+ summary = Print a usage message from embedded pod documentation.
+ description
+ pod2usage will print a usage message for the invoking script (using its
+ embedded POD documentation) and then exit the script with the desired exit
+ status. The usage message printed may have any one of three levels of
+ "verboseness": If the verbose level is 0, then only a synopsis is printed.
+ If the verbose level is 1, then the synopsis is printed along with a
+ description (if present) of the command line options and arguments. If the
+ verbose level is 2, then the entire manual page is printed.
+ end
+
+ requires
+ perl = %{perl_version}
+ perl(Pod::Text)
+ end
+
+ files
+ %{bindir}/pod2usage
+ %{datadir}/perl5/Pod/Usage.pm
+ %{mandir}/man1/pod2usage.*
+ %{mandir}/man3/Pod::Usage.*
+ end
+ end
+
+ package perl-parent
+ version = 0.238
+ arch = noarch
+
+ summary = Establish an ISA relationship with base classes at compile time.
+ description
+ parent allows you to both load one or more modules, while setting up
+ inheritance from those modules at the same time.
+ end
+
+ requires
+ perl = %{perl_version}
+ end
+
+ files
+ %{datadir}/perl5/parent.pm
+ %{mandir}/man3/parent.3*
+ end
+ end
+
+ package perl-podlators
+ version = 4.14
+ arch = noarch
+
+ summary = Format POD source into various output formats.
+ description
+ This package contains Pod::Man and Pod::Text modules which convert POD input
+ to *roff source output, suitable for man pages, or plain text. It also
+ includes several sub-classes of Pod::Text for formatted output to terminals
+ with various capabilities.
+ end
+
+ requires += \
+ perl = %{perl_version} \
+ perl(File::Spec) >= 0.8 \
+ perl(Pod::Simple) >= 3.06
+
+ files
+ %{bindir}/pod2man
+ %{bindir}/pod2text
+ %{datadir}/perl5/pod/perlpodstyle.pod
+ %{datadir}/perl5/Pod/Man.pm
+ %{datadir}/perl5/Pod/ParseLink.pm
+ %{datadir}/perl5/Pod/Text
+ %{datadir}/perl5/Pod/Text.pm
+ %{mandir}/man1/pod2man.1*
+ %{mandir}/man1/pod2text.1*
+ %{mandir}/man1/perlpodstyle.1*
+ %{mandir}/man3/Pod::Man*
+ %{mandir}/man3/Pod::ParseLink*
+ %{mandir}/man3/Pod::Text*
+ end
+ end
+
+ package perl-POSIX
+ version = 2.03
+
+ summary = Perl interface to IEEE Std 1003.1.
+ description
+ The POSIX module permits you to access all (or nearly all) the standard POSIX
+ 1003.1 identifiers. Many of these identifiers have been given Perl interfaces.
+ end
+
+ requires
+ perl = %{perl_version}
+ end
+
+ files
+ %{libdir}/perl5/auto/POSIX
+ %{libdir}/perl5/POSIX.*
+ %{mandir}/man3/POSIX.*
+ end
+ end
+
+ package perl-Safe
+ version = 2.43
+ arch = noarch
+
+ summary = Compile and execute code in restricted compartments.
+ description
+ The Safe extension module allows the creation of compartments in which Perl
+ code can be evaluated. Please note that the restriction is not suitable for
+ security purposes.
+ end
+
+ requires
+ perl = %{perl_version}
+ end
+
+ files
+ %{datadir}/perl5/Safe.pm
+ %{mandir}/man3/Safe.*
+ end
+ end
+
+ package perl-Scalar-List-Utils
+ version = 1.62
+
+ summary = A selection of general-utility scalar and list subroutines.
+ description
+ Scalar::Util and List::Util contain a selection of subroutines that people have
+ expressed would be nice to have in the perl core, but the usage would not
+ really be high enough to warrant the use of a keyword, and the size so small
+ such that being individual extensions would be wasteful.
+ end
+
+ requires
+ perl = %{perl_version}
+ end
+
+ files
+ %{libdir}/perl5/List
+ %{libdir}/perl5/Scalar
+ %{libdir}/perl5/Sub
+ %{libdir}/perl5/auto/List
+ %{mandir}/man3/List::Util*
+ %{mandir}/man3/Scalar::Util*
+ %{mandir}/man3/Sub::Util*
+ end
+ end
+
+ package perl-Search-Dict
+ version = 1.07
+ arch = noarch
+
+ summary = Search for a key in a dictionary file.
+ description
+ This module sets file position in a file handle to be first line greater than
+ or equal (string-wise) to a key.
+ end
+
+ requires
+ perl = %{perl_version}
+ end
+
+ files
+ %{datadir}/perl5/Search
+ %{mandir}/man3/Search::*
+ end
+ end
+
+ package perl-SelectSaver
+ version = 1.02
+ arch = noarch
+
+ summary = Save and restore selected file handle.
+ description
+ A "SelectSaver" object contains a reference to the file handle that was
+ selected when it was created. When the object is destroyed, it re-selects the
+ file handle that was selected when it was created.
+ end
+
+ requires
+ perl = %{perl_version}
+ end
+
+ files
+ %{datadir}/perl5/SelectSaver.pm
+ %{mandir}/man3/SelectSaver.*
+ end
+ end
+
+ package perl-SelfLoader
+ version = 1.26
+ arch = noarch
+
+ summary = Load functions only on demand.
+ description
+ This Perl module tells its users that functions in a package are to be
+ autoloaded from after the "__DATA__" token. See also "Autoloading" in
+ perlsub.
+ end
+
+ requires
+ perl = %{perl_version}
+ perl(Carp)
+ end
+
+ files
+ %{datadir}/perl5/SelfLoader.pm
+ %{mandir}/man3/SelfLoader.*
+ end
+ end
+
+ package perl-sigtrap
+ version = 1.10
+ arch = noarch
+
+ summary = Perl pragma to enable simple signal handling.
+ description
+ The sigtrap pragma is a simple interface for installing signal handlers.
+ end
+
+ requires
+ perl = %{perl_version}
+ perl(Symbol)
+ end
+
+ files
+ %{datadir}/perl5/sigtrap.pm
+ %{mandir}/man3/sigtrap.*
+ end
+ end
+
+ package perl-Socket
+ version = 2.033
+
+ summary = C socket.h defines and structure manipulators.
+ description
+ This module is just a translation of the C socket.h file. Unlike the old
+ mechanism of requiring a translated socket.ph file, this uses the h2xs program
+ (see the Perl source distribution) and your native C compiler. This means
+ that it has a far more likely chance of getting the numbers right. This
+ includes all of the commonly used pound-defines like AF_INET, SOCK_STREAM, etc.
+ end
+
+ requires
+ perl = %{perl_version}
+ perl(Carp)
+ perl(warnings)
+ end
+
+ files
+ %{libdir}/perl5/auto/Socket/Socket.*
+ %{libdir}/perl5/Socket.pm
+ %{mandir}/man3/Socket.3*
+ end
+ end
+
+ package perl-sort
+ version = 2.05
+ arch = noarch
+
+ summary = Perl pragma to control sort() behavior.
+ description
+ With the "sort" pragma you can control the behavior of the builtin "sort()"
+ function.
+ end
+
+ requires
+ perl = %{perl_version}
+ perl(Carp)
+ perl(warnings)
+ end
+
+ files
+ %{datadir}/perl5/sort.pm
+ %{mandir}/man3/sort.*
+ end
+ end
+
+ package perl-Storable
+ version = 3.26
+
+ summary = Persistence for Perl data structures.
+ description
+ The Storable package brings persistence to your Perl data structures
+ containing scalar, array, hash or reference objects, i.e. anything that
+ can be conveniently stored to disk and retrieved at a later time.
+ end
+
+ requires
+ perl = %{perl_version}
+ perl(Carp)
+ perl(Fcntl)
+ perl(IO::File)
+ end
+
+ files
+ %{libdir}/perl5/Storable.pm
+ %{libdir}/perl5/auto/Storable
+ %{mandir}/man3/Storable.*
+ end
+ end
+
+ package perl-subs
+ version = 1.04
+ arch = noarch
+
+ summary = Perl pragma to predeclare subroutine names.
+ description
+ This will predeclare all the subroutines whose names are in the list,
+ allowing you to use them without parentheses (as list operators) even
+ before they're declared.
+ end
+
+ requires
+ perl = %{perl_version}
+ end
+
+ files
+ %{datadir}/perl5/subs.pm
+ %{mandir}/man3/subs.*
+ end
+ end
+
+ package perl-Symbol
+ version = 1.09
+ arch = noarch
+
+ summary = Manipulate Perl symbols and their names.
+ description
+ The Symbol module provides functions for manipulating Perl symbols.
+ end
+
+ requires
+ perl = %{perl_version}
+ end
+
+ files
+ %{datadir}/perl5/Symbol.pm
+ %{mandir}/man3/Symbol.*
+ end
+ end
+
+ package perl-Sys-Hostname
+ version = 1.24
+
+ summary = Try every conceivable way to get a hostname.
+ description
+ It attempts several methods of getting the system hostname and then caches the
+ result.
+ end
+
+ requires
+ perl = %{perl_version}
+ perl(POSIX)
+ perl(XSLoader)
+ end
+
+ files
+ %{libdir}/perl5/auto/Sys/Hostname
+ %{libdir}/perl5/Sys/Hostname.pm
+ %{mandir}/man3/Sys::Hostname.*
+ end
+ end
+
+ package perl-Sys-Syslog
+ version = 0.36
+
+ summary = Perl interface to the UNIX syslog(3) calls.
+ description
+ Sys::Syslog is an interface to the UNIX syslog(3) function. Call syslog() with
+ a string priority and a list of printf() arguments just like at syslog(3).
+ end
+
+ requires
+ perl = %{perl_version}
+ perl(XSLoader)
+ end
+
+ files
+ %{libdir}/perl5/Sys/Syslog.pm
+ %{libdir}/perl5/auto/Sys/Syslog
+ %{mandir}/man3/Sys::Syslog.*
+ end
+ end
+
+ package perl-Term-ANSIColor
+ version = 5.01
+ arch = noarch
+
+ summary = Color screen output using ANSI escape sequences.
+ description
+ This module has two interfaces, one through color() and colored() and the
+ other through constants. It also offers the utility functions uncolor(),
+ colorstrip(), colorvalid(), and coloralias(), which have to be explicitly
+ imported to be used.
+ end
+
+ requires
+ perl = %{perl_version}
+ perl(Carp)
+ end
+
+ files
+ %{datadir}/perl5/Term/ANSIColor.pm
+ %{mandir}/man3/Term::ANSIColor*
+ end
+ end
+
+ package perl-Term-Cap
+ version = 2.27
+ arch = noarch
+
+ summary = Perl termcap interface.
+ description
+ These are low-level functions to extract and use capabilities from a terminal
+ capability (termcap) database.
+ end
+
+ requires
+ perl = %{perl_version}
+ perl(Carp)
+ ncurses
+ end
+
+ files
+ %{datadir}/perl5/Term/Cap.pm
+ %{mandir}/man3/Term::Cap.*
+ end
+ end
+
+ package perl-Term-Complete
+ version = 1.403
+ arch = noarch
+
+ summary = Perl word completion.
+ description
+ "Complete" routine provides word completion on a list of words in the array.
+ end
+
+ requires
+ perl = %{perl_version}
+ end
+
+ files
+ %{datadir}/perl5/Term/Complete.pm
+ %{mandir}/man3/Term::Complete.*
+ end
+ end
+
+ package perl-Term-ReadLine
+ version = 1.17
+ arch = noarch
+
+ summary = Perl interface to various read-line packages.
+ description
+ This package is just a front end to some other packages. It's a stub to
+ set up a common interface to the various read-line implementations found
+ on CPAN (under the "Term::ReadLine::*" name space).
+ end
+
+ requires
+ perl = %{perl_version}
+ perl(Term::Cap)
+ end
+
+ files
+ %{datadir}/perl5/Term/ReadLine.pm
+ %{mandir}/man3/Term::ReadLine.*
+ end
+ end
+
+ package perl-Test
+ version = 1.31
+ arch = noarch
+
+ summary = Simple framework for writing test scripts.
+ description
+ The Test Perl module simplifies the task of writing test files for Perl modules,
+ such that their output is in the format that Test::Harness expects to see.
end
requires
- %{perl_requires}
+ perl = %{perl_version}
+ perl(File::Temp)
end
files
- %{bindir}/perldoc
- %{datadir}/perl5/pod/perldoc.pod
- %{datadir}/perl5/Pod/Perldoc
- %{datadir}/perl5/Pod/Perldoc.pm
- %{mandir}/man1/perldoc.1*
- %{mandir}/man3/Pod::Perldoc*
+ %{datadir}/perl5/Test.pm
+ %{mandir}/man3/Test.*
end
end
- package perl-Pod-Simple
- epoch = 0
- version = 3.28
+ package perl-Test-Harness
+ version = 3.44
arch = noarch
- summary = Framework for parsing POD documentation.
+ summary = Run Perl standard test scripts with statistics.
description
- Pod::Simple is a Perl library for parsing text in the Pod (plain old
- documentation) markup language that is typically used for writing
- documentation for Perl and for Perl modules.
+ Run Perl standard test scripts with statistics.
+ Use TAP::Parser, Test::Harness package was whole rewritten.
end
requires
- %{perl_requires}
+ perl = %{perl_version}
end
files
- /usr/share/perl5/Pod/Simple/
- /usr/share/perl5/Pod/Simple.pm
- /usr/share/perl5/Pod/Simple.pod
- /usr/share/man/man3/Pod::Simple*
+ %{bindir}/prove
+ %{datadir}/perl5/App/Prove
+ %{datadir}/perl5/App/Prove*
+ %{datadir}/perl5/TAP
+ %{datadir}/perl5/TAP*
+ %{datadir}/perl5/Test/Harness*
+ %{mandir}/man1/prove.1*
+ %{mandir}/man3/App::Prove*
+ %{mandir}/man3/TAP*
+ %{mandir}/man3/Test::Harness*
end
end
- package perl-Pod-Usage
- epoch = 0
- version = 1.63
+ package perl-Test-Simple
+ version = 1.302190
arch = noarch
- summary = Print a usage message from embedded pod documentation.
+ summary = Basic utilities for writing tests.
description
- pod2usage will print a usage message for the invoking script (using its
- embedded POD documentation) and then exit the script with the desired exit
- status. The usage message printed may have any one of three levels of
- "verboseness": If the verbose level is 0, then only a synopsis is printed.
- If the verbose level is 1, then the synopsis is printed along with a
- description (if present) of the command line options and arguments. If the
- verbose level is 2, then the entire manual page is printed.
+ Basic utilities for writing tests.
end
requires
- %{perl_requires}
- perl(Pod::Text)
+ perl = %{perl_version}
+ perl(Data::Dumper)
end
files
- %{bindir}/pod2usage
- %{datadir}/perl5/Pod/Usage.pm
- %{mandir}/man1/pod2usage.*
- %{mandir}/man3/Pod::Usage.*
+ !%{datadir}/perl5/Test/Harness*
+ !%{mandir}/man3/Test::Harness*
+ %{datadir}/perl5/ok*
+ %{datadir}/perl5/Test
+ %{datadir}/perl5/Test2*
+ %{datadir}/perl5/Test2
+ %{mandir}/man3/ok*
+ %{mandir}/man3/Test::*
+ %{mandir}/man3/Test2*
end
end
- package perl-parent
- epoch = 0
- version = 0.228
+ package perl-Text-Abbrev
+ version = 1.02
arch = noarch
- summary = Establish an ISA relationship with base classes at compile time.
+ summary = Create an abbreviation table from a list.
description
- parent allows you to both load one or more modules, while setting up
- inheritance from those modules at the same time.
+ It stores all unambiguous truncations of each element of a list as keys in
+ an associative array. The values are the original list elements.
end
requires
- %{perl_requires}
+ perl = %{perl_version}
end
files
- %{datadir}/perl5/parent.pm
- %{mandir}/man3/parent.3*
+ %{datadir}/perl5/Text/Abbrev.pm
+ %{mandir}/man3/Text::Abbrev.*
end
end
- package perl-podlators
- epoch = 0
- version = 2.5.1
+ package perl-Text-Balanced
+ version = 2.04
arch = noarch
- summary = Format POD source into various output formats.
+ summary = Extract delimited text sequences from strings.
description
- This package contains Pod::Man and Pod::Text modules which convert POD input
- to *roff source output, suitable for man pages, or plain text. It also
- includes several sub-classes of Pod::Text for formatted output to terminals
- with various capabilities.
+ These Perl subroutines may be used to extract a delimited substring, possibly
+ after skipping a specified prefix string.
end
requires
- %{perl_requires}
- perl(File::Spec) >= 0.8
- perl(Pod::Simple) >= 3.06
+ perl = %{perl_version}
end
files
- %{bindir}/pod2man
- %{bindir}/pod2text
- %{datadir}/perl5/pod/perlpodstyle.pod
- %{datadir}/perl5/Pod/Man.pm
- %{datadir}/perl5/Pod/ParseLink.pm
- %{datadir}/perl5/Pod/Text
- %{datadir}/perl5/Pod/Text.pm
- %{mandir}/man1/pod2man.1*
- %{mandir}/man1/pod2text.1*
- %{mandir}/man1/perlpodstyle.1*
- %{mandir}/man3/Pod::Man*
- %{mandir}/man3/Pod::ParseLink*
- %{mandir}/man3/Pod::Text*
+ %{datadir}/perl5/Text/Balanced.pm
+ %{mandir}/man3/Text::Balanced.*
end
end
- package perl-Scalar-List-Utils
- epoch = 0
- version = 1.28
+ package perl-Text-ParseWords
+ version = 3.31
+ arch = noarch
- summary = A selection of general-utility scalar and list subroutines.
+ summary = Parse text into an array of tokens or array of arrays.
description
- Scalar::Util and List::Util contain a selection of subroutines that people have
- expressed would be nice to have in the perl core, but the usage would not
- really be high enough to warrant the use of a keyword, and the size so small
- such that being individual extensions would be wasteful.
+ Parse text into an array of tokens or array of arrays.
end
requires
- %{perl_requires}
+ perl = %{perl_version}
+ perl(Carp)
end
files
- %{libdir}/perl5/List
- %{libdir}/perl5/Scalar
- %{libdir}/perl5/auto/List
- /usr/share/man/man3/List::Util*
- /usr/share/man/man3/Scalar::Util*
+ %{datadir}/perl5/Text/ParseWords.pm
+ %{mandir}/man3/Text::ParseWords.*
end
end
- package perl-Socket
- epoch = 0
- version = 2.013
+ package perl-Text-Tabs+Wrap
+ version = 2021.0814
+ arch = noarch
- summary = C socket.h defines and structure manipulators.
+ summary = Expand tabs and do simple line wrapping.
description
- This module is just a translation of the C socket.h file. Unlike the old
- mechanism of requiring a translated socket.ph file, this uses the h2xs program
- (see the Perl source distribution) and your native C compiler. This means
- that it has a far more likely chance of getting the numbers right. This
- includes all of the commonly used pound-defines like AF_INET, SOCK_STREAM, etc.
+ Text::Tabs performs the same job that the UNIX expand(1) and unexpand(1)
+ commands do: adding or removing tabs from a document.
+
+ Text::Wrap::wrap() will reformat lines into paragraphs. All it does is break
+ up long lines, it will not join short lines together.
end
requires
- %{perl_requires}
+ perl = %{perl_version}
end
files
- %{libdir}/perl5/auto/Socket/Socket.*
- %{libdir}/perl5/Socket.pm
- %{mandir}/man3/Socket.3*
+ %{datadir}/perl5/Text/Tabs.pm
+ %{datadir}/perl5/Text/Wrap.pm
+ %{mandir}/man3/Text::Tabs.*
+ %{mandir}/man3/Text::Wrap.*
end
end
- package perl-Storable
- epoch = 0
- version = 2.49
+ package perl-Thread
+ version = 3.05
+ arch = noarch
- summary = Persistence for Perl data structures.
+ summary = Manipulate threads in Perl (for old code only).
description
- The Storable package brings persistence to your Perl data structures
- containing scalar, array, hash or reference objects, i.e. anything that
- can be conveniently stored to disk and retrieved at a later time.
+ This Thread module served as the front end to the old-style thread model,
+ called 5005threads, that has been removed in version 5.10.
+
+ For old code and interim backwards compatibility, the Thread module has been
+ reworked to function as a front end for the new interpreter threads (ithreads)
+ model.
end
requires
- %{perl_requires}
- perl(Carp)
- perl(Fcntl)
- perl(IO::File)
+ perl = %{perl_version}
end
files
- %{libdir}/perl5/Storable.pm
- %{libdir}/perl5/auto/Storable
- %{mandir}/man3/Storable.*
+ %{datadir}/perl5/Thread.pm
+ %{mandir}/man3/Thread.*
end
end
- package perl-Sys-Syslog
- epoch = 0
- version = 0.33
+ package perl-Thread-Queue
+ version = 3.14
+ arch = noarch
- summary = Perl interface to the UNIX syslog(3) calls.
+ summary = Thread-safe queues.
description
- Sys::Syslog is an interface to the UNIX syslog(3) function. Call syslog() with
- a string priority and a list of printf() arguments just like at syslog(3).
+ This module provides thread-safe FIFO queues that can be accessed safely by
+ any number of threads.
end
requires
- %{perl_requires}
+ perl = %{perl_version}
+ perl(Carp)
end
files
- %{libdir}/perl5/Sys/Syslog.pm
- %{libdir}/perl5/auto/Sys/Syslog
- %{mandir}/man3/Sys::Syslog.*
+ %{datadir}/perl5/Thread/Queue.pm
+ %{mandir}/man3/Thread::Queue.*
end
end
- package perl-Term-ANSIColor
- epoch = 0
- version = 4.02
+ package perl-Tie
+ version = 4.6
arch = noarch
- summary = Color screen output using ANSI escape sequences.
+ summary = Base classes for tying variables.
description
- This module has two interfaces, one through color() and colored() and the
- other through constants. It also offers the utility functions uncolor(),
- colorstrip(), colorvalid(), and coloralias(), which have to be explicitly
- imported to be used.
+ These are Perl modules that helps connecting classes with arrays, hashes,
+ handles, and scalars.
end
requires
- %{perl_requires}
+ perl = %{perl_version}
end
files
- %{datadir}/perl5/Term/ANSIColor.pm
- %{mandir}/man3/Term::ANSIColor*
+ %{datadir}/perl5/Tie/Array.pm
+ %{datadir}/perl5/Tie/Handle.pm
+ %{datadir}/perl5/Tie/Scalar.pm
+ %{datadir}/perl5/Tie/StdHandle.pm
+ %{datadir}/perl5/Tie/SubstrHash.pm
+ %{mandir}/man3/Tie::Array.*
+ %{mandir}/man3/Tie::Handle.*
+ %{mandir}/man3/Tie::Scalar.*
+ %{mandir}/man3/Tie::StdHandle.*
+ %{mandir}/man3/Tie::SubstrHash.*
end
end
- package perl-Test-Harness
- epoch = 0
- version = 3.30
+ package perl-Tie-File
+ version = 1.06
arch = noarch
- summary = Run Perl standard test scripts with statistics.
+ summary = Access the lines of a disk file via a Perl array.
description
- Run Perl standard test scripts with statistics.
- Use TAP::Parser, Test::Harness package was whole rewritten.
+ Tie::File represents a regular text file as a Perl array. Each element in the
+ array corresponds to a record in the file. The first line of the file is
+ element 0 of the array; the second line is element 1, and so on. The file is
+ not loaded into memory, so this will work even for gigantic files. Changes to
+ the array are reflected in the file immediately.
end
requires
- %{perl_requires}
+ perl = %{perl_version}
end
files
- /usr/bin/prove
- /usr/share/perl5/App*
- /usr/share/perl5/TAP*
- /usr/share/perl5/Test/Harness*
- /usr/share/man/man1/prove.1*
- /usr/share/man/man3/App*
- /usr/share/man/man3/TAP*
- /usr/share/man/man3/Test::Harness*
+ %{datadir}/perl5/Tie/File.pm
+ %{mandir}/man3/Tie::File.*
end
end
- package perl-Test-Simple
- epoch = 0
- version = 1.001002
+ package perl-Tie-Memoize
+ version = 1.1
arch = noarch
- summary = Basic utilities for writing tests.
+ summary = Add data to a hash when needed.
description
- Basic utilities for writing tests.
+ This package allows a tied hash to load its values automatically on the first
+ access, and to use the cached value on the following accesses.
end
requires
- %{perl_requires}
- perl(Data::Dumper)
+ perl = %{perl_version}
+ perl(Carp)
+ perl(Tie::ExtraHash)
end
files
- /usr/share/perl5/Test/More*
- /usr/share/perl5/Test/Builder*
- /usr/share/perl5/Test/Simple*
- /usr/share/perl5/Test/Tutorial*
- /usr/share/man/man3/Test::More*
- /usr/share/man/man3/Test::Builder*
- /usr/share/man/man3/Test::Simple*
- /usr/share/man/man3/Test::Tutorial*
+ %{datadir}/perl5/Tie/Memoize.pm
+ %{mandir}/man3/Tie::Memoize.*
end
end
- package perl-Text-ParseWords
- epoch = 0
- version = 3.29
+ package perl-Tie-RefHash
+ version = 1.40
arch = noarch
- summary = Parse text into an array of tokens or array of arrays.
+ summary = Use references as hash keys.
description
- Parse text into an array of tokens or array of arrays.
+ This module provides the ability to use references as hash keys if you first
+ "tie" the hash variable to this module. Normally, only the keys of the tied
+ hash itself are preserved as references; to use references as keys in
+ hashes-of-hashes, use Tie::RefHash::Nestable, included as part of
+ Tie::RefHash.
end
requires
- %{perl_requires}
- perl(Carp)
+ perl = %{perl_version}
+ perl(overload)
+ perl(Scalar::Util)
end
files
- %{datadir}/perl5/Text/ParseWords.pm
- %{mandir}/man3/Text::ParseWords.*
+ %{datadir}/perl5/Tie/RefHash.pm
+ %{mandir}/man3/Tie::RefHash.*
end
end
- package perl-Thread-Queue
- epoch = 0
- version = 3.05
+ package perl-Time
+ version = 1.03
arch = noarch
- summary = Thread-safe queues.
+ summary = By-name interface to Perl built-in time functions.
description
- This module provides thread-safe FIFO queues that can be accessed safely by
- any number of threads.
+ This package provides an object-oriented interface to Perl built-in gmtime()
+ and localtime () functions.
end
requires
- %{perl_requires}
- perl(Carp)
+ perl = %{perl_version}
end
files
- %{datadir}/perl5/Thread/Queue.pm
- %{mandir}/man3/Thread::Queue.*
+ %{datadir}/perl5/Time/gmtime.pm
+ %{datadir}/perl5/Time/localtime.pm
+ %{datadir}/perl5/Time/tm.pm
+ %{mandir}/man3/Time::gmtime.*
+ %{mandir}/man3/Time::localtime.*
+ %{mandir}/man3/Time::tm.*
end
end
package perl-Time-HiRes
- epoch = 0
- version = 1.9726
+ version = 1.9770
summary = High resolution alarm, sleep, gettimeofday, interval timers.
description
@@ -2307,7 +4117,7 @@ packages
end
requires
- %{perl_requires}
+ perl = %{perl_version}
perl(Carp)
end
@@ -2319,8 +4129,7 @@ packages
end
package perl-Time-Local
- epoch = 0
- version = 1.2300
+ version = 1.300
arch = noarch
summary = Efficiently compute time from local and GMT time.
@@ -2334,7 +4143,7 @@ packages
end
requires
- %{perl_requires}
+ perl = %{perl_version}
end
files
@@ -2344,8 +4153,7 @@ packages
end
package perl-Time-Piece
- epoch = 0
- version = 1.27
+ version = 1.3401
summary = Time objects from localtime and gmtime.
description
@@ -2356,21 +4164,20 @@ packages
end
requires
- %{perl_requires}
+ perl = %{perl_version}
end
files
%{libdir}/perl5/Time/Piece.pm
%{libdir}/perl5/Time/Seconds.pm
%{libdir}/perl5/auto/Time/Piece/
- /usr/share/man/man3/Time::Piece.3*
- /usr/share/man/man3/Time::Seconds.3*
+ %{mandir}/man3/Time::Piece.3*
+ %{mandir}/man3/Time::Seconds.3*
end
end
package perl-threads
- epoch = 0
- version = 1.93
+ version = 2.27
summary = Perl interpreter-based threads.
description
@@ -2384,19 +4191,18 @@ packages
end
requires
- %{perl_requires}
+ perl = %{perl_version}
end
files
%{libdir}/perl5/auto/threads/threads*
%{libdir}/perl5/threads.pm
- /usr/share/man/man3/threads.3*
+ %{mandir}/man3/threads.3*
end
end
package perl-threads-shared
- epoch = 0
- version = 1.46
+ version = 1.64
summary = Perl extension for sharing data structures between threads.
description
@@ -2409,19 +4215,156 @@ packages
end
requires
- %{perl_requires}
+ perl = %{perl_version}
end
files
- %{libdir}/perl5/auto/threads/shared*
+ %{libdir}/perl5/auto/threads/shared
%{libdir}/perl5/threads/shared*
- /usr/share/man/man3/threads::shared*
+ %{mandir}/man3/threads::shared*
+ end
+ end
+
+ package perl-Thread-Semaphore
+ version = 2.13
+ arch = noarch
+
+ summary = Thread-safe semaphores.
+ description
+ Semaphores provide a mechanism to regulate access to resources. Unlike locks,
+ semaphores aren't tied to particular scalars, and so may be used to control
+ access to anything you care to use them for. Semaphores don't limit their
+ values to zero and one, so they can be used to control access to some resource
+ that there may be more than one of (e.g., file handles). Increment and
+ decrement amounts aren't fixed at one either, so threads can reserve or return
+ multiple resources at once.
+ end
+
+ requires
+ perl = %{perl_version}
+ perl(Carp)
+ end
+
+ files
+ %{datadir}/perl5/Thread/Semaphore.pm
+ %{mandir}/man3/Thread::Semaphore.*
+ end
+ end
+
+ package perl-Unicode-Collate
+ version = 1.31
+
+ summary = Unicode Collation Algorithm.
+ description
+ This package is Perl implementation of Unicode Technical Standard #10 (Unicode
+ Collation Algorithm).
+ end
+
+ requires
+ perl = %{perl_version}
+ perl(Unicode::Normalize)
+ end
+
+ files
+ %{libdir}/perl5/auto/Unicode/Collate
+ %{libdir}/perl5/Unicode/Collate
+ %{libdir}/perl5/Unicode/Collate.pm
+ %{datadir}/perl5/Unicode/Collate
+ %{mandir}/man3/Unicode::Collate.*
+ %{mandir}/man3/Unicode::Collate::*
+ end
+ end
+
+ package perl-Unicode-Normalize
+ version = 1.31
+
+ summary = Unicode Normalization Forms.
+ description
+ This package provides Perl functions that can convert strings into various
+ Unicode normalization forms as defined in Unicode Standard Annex #15.
+ end
+
+ requires
+ perl = %{perl_version}
+ end
+
+ files
+ %{libdir}/perl5/auto/Unicode/Normalize
+ %{libdir}/perl5/Unicode/Normalize.pm
+ %{mandir}/man3/Unicode::Normalize.*
+ end
+ end
+
+ package perl-Unicode-UCD
+ version = 0.78
+ arch = noarch
+
+ summary = Unicode character database.
+ description
+ The Unicode::UCD module offers a series of functions that provide a simple
+ interface to the Unicode Character Database.
+ end
+
+ requires
+ perl = %{perl_version}
+ perl(Storable)
+ end
+
+ files
+ %{datadir}/perl5/Unicode/UCD.pm
+ %{mandir}/man3/Unicode::UCD.*
+ end
+ end
+
+ package perl-User-pwent
+ version = 1.03
+ arch = noarch
+
+ summary = By-name interface to Perl built-in user name resolver.
+ description
+ This package provides an object-oriented interface to Perl build-in getgr*()
+ and getpw*() functions.
+ end
+
+ requires
+ perl = %{perl_version}
+ end
+
+ files
+ %{datadir}/perl5/User
+ %{mandir}/man3/User::*
+ end
+ end
+
+ package perl-vars
+ version = 1.05
+ arch = noarch
+
+ summary = Perl pragma to predeclare global variable names.
+ description
+ This pragma will predeclare all the variables whose names are in the
+ list, allowing you to use them under "use strict", and disabling any
+ typo warnings for them.
+
+ For use with variables in the current package for a single scope, the
+ functionality provided by this pragma has been superseded by "our"
+ declarations, available in Perl v5.6.0 or later, and use of this pragma is
+ discouraged.
+ end
+
+ requires
+ perl = %{perl_version}
+ perl(Carp)
+ end
+
+ files
+ %{datadir}/perl5/vars.pm
+ %{mandir}/man3/vars.*
end
end
package perl-version
- epoch = 0
- version = 0.99.09
+ version = 0.99.29
arch = noarch
summary = Perl extension for Version Objects.
@@ -2430,21 +4373,39 @@ packages
end
requires
- %{perl_requires}
+ perl = %{perl_version}
end
files
- /usr/share/perl5/version.pm
- /usr/share/perl5/version.pod
- /usr/share/perl5/version/
- /usr/share/man/man3/version.3*
- /usr/share/man/man3/version::Internals.3*
+ %{datadir}/perl5/version.pm
+ %{datadir}/perl5/version.pod
+ %{datadir}/perl5/version/
+ %{mandir}/man3/version.3*
+ %{mandir}/man3/version::Internals.3*
end
end
- package perl-core
- epoch = 0
+ package perl-vmsish
+ version = 1.04
+ arch = noarch
+
+ summary = Perl pragma to control VMS-specific language features.
+ description
+ The "vmsish" pragma control VMS-specific features of the Perl language. If
+ you're not running VMS, this module does nothing.
+ end
+ requires
+ perl = %{perl_version}
+ end
+
+ files
+ %{datadir}/perl5/vmsish.pm
+ %{mandir}/man3/vmsish.*
+ end
+ end
+
+ package perl-core
summary = Base perl metapackage.
description
A metapackage which requires all of the perl bits and modules in the upstream
@@ -2452,94 +4413,183 @@ packages
end
requires
- %{perl_requires}
+ perl = %{perl_version}
perl-libs
perl-devel
- perl-App-a2p
- perl-App-find2perl
- perl-App-s2p
perl-Archive-Tar
- perl-autodie
+ perl-Attribute-Handlers
+ perl-autodie,
+ perl-AutoLoader
+ perl-AutoSplit
+ perl-autouse,
+ perl-B
+ perl-base
+ perl-Benchmark
+ perl-bignum
+ perl-blib,
+ perl-Carp
+ perl-Class-Struct
perl-Compress-Raw-Bzip2
- perl-Compress-Raw-Zlib
- perl-CGI
+ perl-Compress-Raw-Zlib,
+ perl-constant
perl-CPAN
perl-CPAN-Meta
- perl-CPAN-Meta-YAML
perl-CPAN-Meta-Requirements
- perl-Carp
- perl-constant
+ perl-CPAN-Meta-YAML
perl-Data-Dumper
perl-DB_File
+ perl-DBM_Filter
+ perl-Devel-Peek
perl-Devel-PPPort
+ perl-Devel-SelfStubber
perl-Digest
perl-Digest-MD5
perl-Digest-SHA
+ perl-doc
+ perl-Dumpvalue
+ perl-DynaLoader
perl-Encode
+ perl-encoding
+ perl-encoding-warnings
+ perl-English
perl-Env
+ perl-experimental
perl-Exporter
perl-ExtUtils-CBuilder
+ perl-ExtUtils-Constant
perl-ExtUtils-Command
perl-ExtUtils-Embed
perl-ExtUtils-Install
perl-ExtUtils-MakeMaker
perl-ExtUtils-Manifest
perl-ExtUtils-Miniperl
+ perl-ExtUtils-MM-Utils
perl-ExtUtils-ParseXS
- perl-experimental
+ perl-Fcntl
+ perl-fields
+ perl-File-Basename
+ perl-File-Compare
+ perl-File-Copy
+ perl-File-DosGlob
perl-File-Fetch
+ perl-File-Find
perl-File-Path
+ perl-File-stat
perl-File-Temp
+ perl-FileCache
+ perl-FileHandle
+ perl-filetest
perl-Filter
perl-Filter-Simple
+ perl-FindBin
+ perl-GDBM_File
perl-Getopt-Long
+ perl-Getopt-Std
+ perl-Hash-Util
+ perl-Hash-Util-FieldHash
perl-HTTP-Tiny
+ perl-if
+ perl-IO
perl-IO-Compress
perl-IO-Socket-IP
perl-IO-Zlib
perl-IPC-Cmd
+ perl-IPC-Open3
+ perl-IPC-SysV
+ perl-I18N-Collate
+ perl-I18N-Langinfo
+ perl-I18N-LangTags
perl-JSON-PP
- perl-Locale-Codes
+ perl-libnet
+ perl-libnetcfg
+ perl-locale
perl-Locale-Maketext
perl-Locale-Maketext-Simple
- perl-Module-Build
+ perl-Math-BigInt
+ perl-Math-BigInt-FastCalc
+ perl-Math-BigRat
+ perl-Math-Complex
+ perl-Memoize
+ perl-MIME-Base64
perl-Module-CoreList
perl-Module-CoreList-tools
perl-Module-Load
perl-Module-Load-Conditional
perl-Module-Loaded
perl-Module-Metadata
- perl-Package-Constants
+ perl-mro
+ perl-NDBM_File
+ perl-Net
+ perl-Net-Ping
+ perl-NEXT
+ perl-ODBM_File
+ perl-Opcode
+ perl-open
+ perl-overload
+ perl-overloading
+ perl-parent
+ perl-Path-Tools
perl-Params-Check
- perl-Parse-CPAN-Meta
+ perl-PerlIO-via-QuotedPrint
perl-Perl-OSType
- perl-Path-Tools
+ perl-ph
perl-Pod-Checker
- perl-Pod-Parser
+ perl-Pod-Escapes
+ perl-Pod-Functions
+ perl-Pod-HTML
perl-Pod-Perldoc
perl-Pod-Simple
perl-Pod-Usage
- perl-parent
perl-podlators
+ perl-POSIX
+ perl-Safe
perl-Scalar-List-Utils
+ perl-Search-Dict
+ perl-SelectSaver
+ perl-SelfLoader
+ perl-sigtrap
perl-Socket
+ perl-sort
perl-Storable
+ perl-subs
+ perl-Symbol
+ perl-Sys-Hostname
perl-Sys-Syslog
perl-Term-ANSIColor
+ perl-Term-Cap
+ perl-Term-Complete
+ perl-Term-ReadLine
+ perl-Test
perl-Test-Harness
perl-Test-Simple
+ perl-Text-Abbrev
+ perl-Text-Balanced
perl-Text-ParseWords
+ perl-Text-Tabs+Wrap
+ perl-Thread
perl-Thread-Queue
+ perl-Thread-Semaphore
+ perl-threads
+ perl-threads-shared
+ perl-Tie
+ perl-Tie-File
+ perl-Tie-Memoize
+ perl-Tie-RefHash
+ perl-Time
perl-Time-HiRes
perl-Time-Local
perl-Time-Piece
- perl-threads
- perl-threads-shared
+ perl-Unicode-Collate
+ perl-Unicode-Normalize
+ perl-Unicode-UCD
+ perl-User-pwent
+ perl-vars
perl-version
+ perl-vmsish
end
- # Nothing. Nada. Zilch. Zarro. Uh uh. Nope. Sorry.
files
+ # Nothing. Nada. Zilch. Zarro. Uh uh. Nope. Sorry.
end
end
diff --git a/rhash/rhash.nm b/rhash/rhash.nm
index ddb420dcd..534a2aa6b 100644
--- a/rhash/rhash.nm
+++ b/rhash/rhash.nm
@@ -4,12 +4,12 @@
###############################################################################
name = rhash
-version = 1.3.8
+version = 1.4.3
release = 1
thisapp = RHash-%{version}
groups = Development/Tools
-url = http://rhash.sf.net/
+url = https://rhash.sf.net/
license = BSD
summary = Great utility for computing hash sums
diff --git a/snort/snort.nm b/snort/snort.nm
new file mode 100644
index 000000000..3334d5b9b
--- /dev/null
+++ b/snort/snort.nm
@@ -0,0 +1,60 @@
+###############################################################################
+# IPFire.org - An Open Source Firewall Solution #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
+###############################################################################
+
+name = snort
+version = 3.1.50.0
+release = 1
+thisapp = snort3-%{version}
+
+groups = Networking/Tools
+url = https://github.com/snort3/snort3
+license = GPLv2
+summary = A Network Intrusion Detection/Prevention System
+
+description
+ Snort 3 is the next generation Snort IPS (Intrusion Prevention System).
+end
+
+source_dl = https://github.com/snort3/snort3/archive/refs/tags/%{version}.tar.gz#/
+
+build
+ requires
+ cmake
+ flex-devel >= 2.6.0
+ hwloc-devel
+ libdaq-devel >= 3.0.10
+ libdnet-devel
+ libpcap-devel
+ libtirpc-devel
+ libunwind-devel
+ libuuid-devel
+ luajit-devel
+ openssl-devel
+ pcre-devel
+ xz-devel
+ zlib-devel
+
+ # Hyperscan only exists on x86_64
+ (hyperscan-devel if arch(x86_64))
+ end
+
+ build
+ %{cmake} .
+
+ make %{PARALLELISMFLAGS}
+ end
+end
+
+packages
+ package %{name}
+
+ package %{name}-devel
+ template DEVEL
+ end
+
+ package %{name}-debuginfo
+ template DEBUGINFO
+ end
+end
diff --git a/sudo/sudo.nm b/sudo/sudo.nm
index 4cfedd29f..1ccd04f3c 100644
--- a/sudo/sudo.nm
+++ b/sudo/sudo.nm
@@ -4,13 +4,13 @@
###############################################################################
name = sudo
-version = 1.8.20p2
+version = 1.9.12p1
release = 1
groups = Applications/System
-url = http://www.sudo.ws/
+url = https://www.sudo.ws/
license = BSD
-summary = Allows restricted root access for specified users.
+summary = Allows restricted root access for specified users
description
Sudo (superuser do) allows a system administrator to give certain
@@ -24,7 +24,7 @@ description
on many different machines.
end
-source_dl = http://www.sudo.ws/sudo/dist/
+source_dl = https://www.sudo.ws/sudo/dist/
build
requires
@@ -66,8 +66,6 @@ end
packages
package %{name}
- groups += Base
-
configfiles
%{sysconfdir}/sudoers
end
diff --git a/suricata-update/suricata-update.nm b/suricata-update/suricata-update.nm
deleted file mode 100644
index 35bd9599d..000000000
--- a/suricata-update/suricata-update.nm
+++ /dev/null
@@ -1,40 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = suricata-update
-version = 1.0.5
-release = 1
-thisapp = %{name}-%{version}
-arch = noarch
-
-groups = Development/Tools
-url = https://github.com/OISF/suricata-update
-license = LGPLv2+
-summary = A tool for updating Suricata rules.
-
-description
- This package contains a Python written tool to update the used rules for
- suricata.
-end
-
-source_dl = https://github.com/OISF/%{name}/archive/%{version}.tar.gz#/
-
-build
- build
- %{python3} setup.py build
- end
-
- install
- %{python3} setup.py install --root=%{BUILDROOT}
- end
-end
-
-packages
- package %{name}
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/suricata/suricata.conf b/suricata/suricata.conf
deleted file mode 100644
index 3fc11c704..000000000
--- a/suricata/suricata.conf
+++ /dev/null
@@ -1,523 +0,0 @@
-%YAML 1.1
----
-# Suricata Emergingthreats Pro Open Rulesets Recommended
-reference-config-file: /etc/suricata/rules/reference.config
-
-# Number of packets allowed to be processed simultaneously. Default is a
-# conservative 50. a higher number will make sure CPU's/CPU cores will be
-# more easily kept busy, but will negatively impact caching.
-#
-# If you are using the CUDA pattern matcher (b2g_cuda below), different rules
-# apply. In that case try something like 4000 or more. This is because the CUDA
-# pattern matcher scans many packets in parallel.
-#max-pending-packets: 50
-
-# Set the order of alerts bassed on actions
-# The default order is pass, drop, reject, alert
-action-order:
- - pass
- - drop
- - reject
- - alert
-
-
-# The default logging directory. Any log or output file will be
-# placed here if its not specified with a full path name. This can be
-# overridden with the -l command line parameter.
-default-log-dir: /var/log/suricata
-
-# Configure the type of alert (and other) logging you would like.
-outputs:
-
- # a line based alerts log similar to Snort's fast.log
- - fast:
- enabled: yes
- filename: fast.log
-
- # log output for use with Barnyard
- - unified-log:
- enabled: no
- filename: unified.log
-
- #limit: 32mb
-
- # alert output for use with Barnyard
- - unified-alert:
- enabled: no
- filename: unified.alert
-
- #limit: 32mb
-
- # alert output for use with Barnyard2
- - unified2-alert:
- enabled: no
- filename: unified2.alert
-
- #limit: 32mb
-
- # a line based log of HTTP requests (no alerts)
- - http-log:
- enabled: yes
- filename: http.log
-
- # a full alerts log containing much information for signature writers
- # or for investigating suspected false positives.
- - alert-debug:
- enabled: no
- filename: alert-debug.log
-
- # alert output to prelude (http://www.prelude-technologies.com/) only
- # available if Suricata has been compiled with --enable-prelude
- - alert-prelude:
- enabled: no
- profile: suricata
-
-defrag:
- max-frags: 65535
- prealloc: yes
- timeout: 60
-
-# You can specify a threshold config file by setting "threshold-file"
-# to the path of the threshold config file:
-# threshold-file: /etc/suricata/threshold.config
-
-# The detection engine builds internal groups of signatures. The engine
-# allow us to specify the profile to use for them, to manage memory on an
-# efficient way keeping a good performance. For the profile keyword you
-# can use the words "low", "medium", "high" or "custom". If you use custom
-# make sure to define the values at "- custom-values" as your convenience.
-# Usually you would prefer medium/high/low
-detect-engine:
- - profile: medium
- - custom-values:
- toclient_src_groups: 2
- toclient_dst_groups: 2
- toclient_sp_groups: 2
- toclient_dp_groups: 3
- toserver_src_groups: 2
- toserver_dst_groups: 4
- toserver_sp_groups: 2
- toserver_dp_groups: 25
-
-# Suricata is multi-threaded. Here the threading can be influenced.
-threading:
- # On some cpu's/architectures it is beneficial to tie individual threads
- # to specific CPU's/CPU cores. In this case all threads are tied to CPU0,
- # and each extra CPU/core has one "detect" thread.
- #
- # On Intel Core2 and Nehalem CPU's enabling this will degrade performance.
- #
- set_cpu_affinity: no
- #
- # By default Suricata creates one "detect" thread per available CPU/CPU core.
- # This setting allows controlling this behaviour. A ratio setting of 2 will
- # create 2 detect threads for each CPU/CPU core. So for a dual core CPU this
- # will result in 4 detect threads. If values below 1 are used, less threads
- # are created. So on a dual core CPU a setting of 0.5 results in 1 detect
- # thread being created. Regardless of the setting at a minimum 1 detect
- # thread will always be created.
- #
- detect_thread_ratio: 1.5
-
-# Select the cuda device to use. The device_id identifies the device to be used
-# if one has multiple devices on the system. To find out device_id associated
-# with the card(s) on the system run "suricata --list-cuda-cards".
-cuda:
- device_id: 0
-
-# Select the multi pattern algorithm you want to run for scan/search the
-# in the engine. The supported algorithms are b2g, b3g and wumanber.
-#
-# There is also a CUDA pattern matcher (only available if Suricata was
-# compiled with --enable-cuda: b2g_cuda. Make sure to update your
-# max-pending-packets setting above as well if you use b2g_cuda.
-
-mpm-algo: b2g
-
-# The memory settings for hash size of these algorithms can vary from lowest
-# (2048) - low (4096) - medium (8192) - high (16384) - highest (32768) - max
-# (65536). The bloomfilter sizes of these algorithms can vary from low (512) -
-# medium (1024) - high (2048).
-#
-# For B2g/B3g algorithms, there is a support for two different scan/search
-# algorithms. For B2g the scan algorithms are B2gScan & B2gScanBNDMq, and
-# search algorithms are B2gSearch & B2gSearchBNDMq. For B3g scan algorithms
-# are B3gScan & B3gScanBNDMq, and search algorithms are B3gSearch &
-# B3gSearchBNDMq.
-#
-# For B2g the different scan/search algorithms and, hash and bloom
-# filter size settings. For B3g the different scan/search algorithms and, hash
-# and bloom filter size settings. For wumanber the hash and bloom filter size
-# settings.
-
-pattern-matcher:
- - b2g:
- scan_algo: B2gScanBNDMq
- search_algo: B2gSearchBNDMq
- hash_size: low
- bf_size: medium
- - b3g:
- scan_algo: B3gScanBNDMq
- search_algo: B3gSearchBNDMq
- hash_size: low
- bf_size: medium
- - wumanber:
- hash_size: low
- bf_size: medium
-
-# Flow settings:
-# By default, the reserved memory (memcap) for flows is 32MB. This is the limit
-# for flow allocation inside the engine. You can change this value to allow
-# more memory usage for flows.
-# The hash_size determine the size of the hash used to identify flows inside
-# the engine, and by default the value is 65536.
-# At the startup, the engine can preallocate a number of flows, to get a better
-# performance. The number of flows preallocated is 10000 by default.
-# emergency_recovery is the percentage of flows that the engine need to
-# prune before unsetting the emergency state. The emergency state is activated
-# when the memcap limit is reached, allowing to create new flows, but
-# prunning them with the emergency timeouts (they are defined below).
-# If the memcap is reached, the engine will try to prune prune_flows
-# with the default timeouts. If it doens't find a flow to prune, it will set
-# the emergency bit and it will try again with more agressive timeouts.
-# If that doesn't work, then it will try to kill the last time seen flows
-# not in use.
-
-flow:
- memcap: 33554432
- hash_size: 65536
- prealloc: 10000
- emergency_recovery: 30
- prune_flows: 5
-
-# Specific timeouts for flows. Here you can specify the timeouts that the
-# active flows will wait to transit from the current state to another, on each
-# protocol. The value of "new" determine the seconds to wait after a hanshake or
-# stream startup before the engine free the data of that flow it doesn't
-# change the state to established (usually if we don't receive more packets
-# of that flow). The value of "established" is the amount of
-# seconds that the engine will wait to free the flow if it spend that amount
-# without receiving new packets or closing the connection. "closed" is the
-# amount of time to wait after a flow is closed (usually zero).
-#
-# There's an emergency mode that will become active under attack circumstances,
-# making the engine to check flow status faster. This configuration variables
-# use the prefix "emergency_" and work similar as the normal ones.
-# Some timeouts doesn't apply to all the protocols, like "closed", for udp and
-# icmp.
-
-flow-timeouts:
-
- default:
- new: 30
- established: 300
- closed: 0
- emergency_new: 10
- emergency_established: 100
- emergency_closed: 0
- tcp:
- new: 60
- established: 3600
- closed: 120
- emergency_new: 10
- emergency_established: 300
- emergency_closed: 20
- udp:
- new: 30
- established: 300
- emergency_new: 10
- emergency_established: 100
- icmp:
- new: 30
- established: 300
- emergency_new: 10
- emergency_established: 100
-
-# Stream engine settings. Here the TCP stream tracking and reaasembly
-# engine is configured.
-#
-# stream:
-# memcap: 33554432 # 32mb tcp session memcap
-# checksum_validation: yes # To validate the checksum of received
- # packet. If csum validation is specified as
- # "yes", then packet with invalid csum will not
- # be processed by the engine stream/app layer.
-# max_sessions: 262144 # 256k concurrent sessions
-# prealloc_sessions: 32768 # 32k sessions prealloc'd
-# midstream: false # don't allow midstream session pickups
-# async_oneside: false # don't enable async stream handling
-# reassembly:
-# memcap: 67108864 # 64mb tcp reassembly memcap
-# depth: 1048576 # 1 MB reassembly depth
-stream:
- memcap: 33554432
- checksum_validation: yes
- inline: yes
- reassembly:
- memcap: 67108864
- depth: 1048576
-
-# Logging configuration. This is not about logging IDS alerts, but
-# IDS output about what its doing, errors, etc.
-logging:
-
- # The default log level, can be overridden in an output section.
- # Note that debug level logging will only be emitted if Suricata was
- # compiled with the --enable-debug configure option.
- #
- # This value is overriden by the SC_LOG_LEVEL env var.
- default-log-level: info
-
- # The default output format. Optional parameter, should default to
- # something reasonable if not provided. Can be overriden in an
- # output section. You can leave this out to get the default.
- #
- # This value is overriden by the SC_LOG_FORMAT env var.
- #default-log-format: "[%i] %t - (%f:%l) <%d> (%n) -- "
-
- # A regex to filter output. Can be overridden in an output section.
- # Defaults to empty (no filter).
- #
- # This value is overriden by the SC_LOG_OP_FILTER env var.
- default-output-filter:
-
- # Define your logging outputs. If none are defined, or they are all
- # disabled you will get the default - console output.
- outputs:
- - console:
- enabled: yes
- - file:
- enabled: yes
- filename: /var/log/suricata.log
- - syslog:
- enabled: no
- facility: local5
- format: "[%i] <%d> -- "
- - drop:
- enabled: yes
- filename: drop.log
- append: yes
-
-nfq:
- mode: repeat
- repeat_mark: 1
- repeat_mask: 1
-
-# PF_RING configuration. for use with native PF_RING support
-# for more info see http://www.ntop.org/PF_RING.html
-pfring:
-
- # Default interface we will listen on.
- interface: eth0
-
- # Default clusterid. PF_RING will load balance packets based on flow.
- # All threads/processes that will participate need to have the same
- # clusterid.
- cluster-id: 99
-
- # Default PF_RING cluster type. PF_RING can load balance per flow or per hash.
- # This is only supported in versions of PF_RING > 4.1.1.
- cluster-type: cluster_round_robin
-
-# For FreeBSD ipfw(8) divert(4) support.
-# Please make sure you have ipfw_load="YES" and ipdivert_load="YES"
-# in /etc/loader.conf or kldload'ing the appropriate kernel modules.
-# Additionally, you need to have an ipfw rule for the engine to see
-# the packets from ipfw. For Example:
-#
-# ipfw add 100 divert 8000 ip from any to any
-#
-# The 8000 above should be the same number you passed on the command
-# line, i.e. -d 8000
-#
-ipfw:
-
- # Reinject packets at the specified ipfw rule number. This config
- # option is the ipfw rule number AT WHICH rule processing continues
- # in the ipfw processing system after the engine has finished
- # inspecting the packet for acceptance. If no rule number is specified,
- # accepted packets are reinjected at the divert rule which they entered
- # and IPFW rule processing continues. No check is done to verify
- # this will rule makes sense so care must be taken to avoid loops in ipfw.
- #
- ## The following example tells the engine to reinject packets
- # back into the ipfw firewall AT rule number 5500:
- #
- # ipfw-reinjection-rule-number: 5500
-
-# Set the default rule path here to search for the files.
-# if not set, it will look at the current working dir
-default-rule-path: /etc/suricata/rules/
-rule-files:
-# - emerging-ftp.rules
-# - emerging-policy.rules
-# - emerging-trojan.rules
-# - emerging-games.rules
-# - emerging-pop3.rules
-# - emerging-user_agents.rules
-# - emerging-activex.rules
-# - emerging-rpc.rules
-# - emerging-virus.rules
-# - emerging-attack_response.rules
-# - emerging-icmp.rules
-# - emerging-scan.rules
-# - emerging-scada.rules
-# - emerging-voip.rules
-# - emerging-chat.rules
-# - emerging-icmp_info.rules
-# - emerging-shellcode.rules
-# - emerging-web_client.rules
-# - emerging-imap.rules
-# - emerging-web_server.rules
-# - emerging-current_events.rules
-# - emerging-inappropriate.rules
-# - emerging-smtp.rules
-# - emerging-web_specific_apps.rules
-# - emerging-deleted.rules
-# - emerging-malware.rules
-# - emerging-snmp.rules
-# - emerging-worm.rules
-# - emerging-dns.rules
-# - emerging-misc.rules
-# - emerging-sql.rules
-# - emerging-dos.rules
-# - emerging-netbios.rules
-# - emerging-telnet.rules
-# - emerging-exploit.rules
-# - emerging-p2p.rules
-# - emerging-tftp.rules
-# - emerging-botcc.rules
-# - emerging-compromised.rules
-# - emerging-drop.rules
-# - emerging-dshield.rules
-# - emerging-rbn.rules
-# - emerging-rbn-malvertisers.rules
-# - emerging-tor.rules
-# - emerging-mobile_malware.rules
-
-classification-file: /etc/suricata/rules/classification.config
-
-# Holds variables that would be used by the engine.
-vars:
-
- # Holds the address group vars that would be passed in a Signature.
- # These would be retrieved during the Signature address parsing stage.
- address-groups:
-
- HOME_NET: "[192.168.0.0/16,10.0.0.0/8,172.16.0.0/12]"
-
- EXTERNAL_NET: any
-
- HTTP_SERVERS: "$HOME_NET"
-
- SMTP_SERVERS: "$HOME_NET"
-
- SQL_SERVERS: "$HOME_NET"
-
- DNS_SERVERS: "$HOME_NET"
-
- TELNET_SERVERS: "$HOME_NET"
-
- AIM_SERVERS: any
-
-#These vars are required if you're using the Digitalbond Scada signatures in the scada.rules category
-# DNP3_SERVER: "$HOME_NET"
-# DNP3_CLIENT: "$HOME_NET"
-# MODBUS_CLIENT: "$HOME_NET"
-# MODBUS_SERVER: "$HOME_NET"
-# ENIP_CLIENT: "$HOME_NET"
-# ENIP_SERVER: "$HOME_NET"
-
-
- # Holds the port group vars that would be passed in a Signature.
- # These would be retrieved during the Signature port parsing stage.
- port-groups:
-
- HTTP_PORTS: "80"
-
- SHELLCODE_PORTS: "!80"
-
- ORACLE_PORTS: 1521
-
- SSH_PORTS: 22
-
-# DNP3_PORTS: 20000
-
-# Host specific policies for defragmentation and TCP stream
-# reassembly. The host OS lookup is done using a radix tree, just
-# like a routing table so the most specific entry matches.
-host-os-policy:
- # Make the default policy windows.
- windows: [0.0.0.0/0]
- bsd: []
- bsd_right: []
- old_linux: []
- linux: [10.0.0.0/8, 192.168.1.100, "8762:2352:6241:7245:E000:0000:0000:0000"]
- old_solaris: []
- solaris: ["::1"]
- hpux10: []
- hpux11: []
- irix: []
- macos: []
- vista: []
- windows2k3: []
-
-###########################################################################
-# Configure libhtp.
-#
-#
-# default-config: Used when no server-config matches
-# personality: List of personalities used by default
-#
-# server-config: List of server configurations to use if address matches
-# address: List of ip addresses or networks for this block
-# personalitiy: List of personalities used by this block
-#
-# Currently Available Personalities:
-# Minimal
-# Generic
-# IDS (default)
-# IIS_4_0
-# IIS_5_0
-# IIS_5_1
-# IIS_6_0
-# IIS_7_0
-# IIS_7_5
-# Apache
-# Apache_2_2
-###########################################################################
-libhtp:
-
- default-config:
- personality: IDS
-
- server-config:
-
- - apache:
- address: [192.168.1.0/24, 127.0.0.0/8, "::1"]
- personality: Apache_2_2
-
- - iis7:
- address:
- - 192.168.0.0/24
- - 192.168.10.0/24
- personality: IIS_7_0
-
-# rule profiling settings. Only effective if Suricata has been built with the
-# the --enable-profiling configure flag.
-#
-profiling:
-
- rules:
-
- # Profiling can be disabled here, but it will still have a
- # performance impact if compiled in.
- enabled: yes
-
- # Sort options: ticks, avgticks, checks, matches
- sort: avgticks
-
- # Limit the number of items printed at exit.
- limit: 100
-
-
diff --git a/suricata/suricata.logrotate b/suricata/suricata.logrotate
deleted file mode 100644
index c4ece8c08..000000000
--- a/suricata/suricata.logrotate
+++ /dev/null
@@ -1,9 +0,0 @@
-/var/log/suricata/*.log {
- daily
- missingok
- rotate 5
- compress
- delaycompress
- copytruncate
- minsize 500k
-}
diff --git a/suricata/suricata.nm b/suricata/suricata.nm
deleted file mode 100644
index 4825612e2..000000000
--- a/suricata/suricata.nm
+++ /dev/null
@@ -1,100 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = suricata
-version = 4.0.6
-release = 3
-
-groups = Networking/IDS
-url = http://www.openinfosecfoundation.org/
-license = GPLv2
-summary = Open Source Next Generation Intrusion Detection and Prevention Engine.
-
-description
- The suricata engine is not intended to just replace or emulate the
- existing tools in the industry, but provides new ideas and
- technologies.
-end
-
-source_dl = http://www.openinfosecfoundation.org/download/
-
-build
- requires
- file-devel
- libcap-ng-devel
- libnfnetlink-devel
- libnetfilter_queue-devel
- libnet-devel
- libpcap-devel
- libyaml-devel
- libhtp-devel >= 0.5.20
- pcre-devel
- pkg-config
- zlib-devel >= 1.2.5-2
- end
-
- configure_options += \
- --enable-gccprotect \
- --enable-nfqueue \
- --disable-gccmarch-native \
- --disable-static \
- --enable-non-bundled-htp \
- --with-libhtp-includes=%{includedir}/htp \
- --with-libhtp-libraries=%{libdir}
-
- # Enable hyperscan only on x86
- if "%{DISTRO_PLATFORM}" == "x86"
- requires += hyperscan-devel
- configure_options += --enable-hyperscan
- end
-
- install_cmds
- mkdir -pv %{BUILDROOT}%{sysconfdir}
- mkdir -pv %{BUILDROOT}%{sysconfdir}/suricata
- mkdir -pv %{BUILDROOT}%{sysconfdir}/suricata/rules
- cp -vf %{DIR_SOURCE}/%{name}.conf %{BUILDROOT}%{sysconfdir}/suricata
- mkdir -pv %{BUILDROOT}%{localstatedir}/log/suricata
- end
-
-end
-
-
-packages
- package %{name}
-
- prerquires = systemd-units
-
- configfiles
- %{sysconfdir}/suricata/suricata.conf
- end
-
- script postin
- systemctl daemon-reload >/dev/null 2>&1 || :
- end
-
- script preun
- systemctl --no-reload disable suricata.service >/dev/null 2>&1 || :
- systemctl stop suricata.service >/dev/null 2>&1 || :
- end
-
- script postun
- systemctl daemon-reload >/dev/null 2>&1 || :
- end
-
- script postup
- systemctl daemon-reload >/dev/null 2>&1 || :
- systemctl try-restart suricata.service >/dev/null 2>&1 || :
- end
-
- end
-
- package %{name}-devel
- template DEVEL
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/suricata/systemd/suricata.service b/suricata/systemd/suricata.service
deleted file mode 100644
index 24cfa98cc..000000000
--- a/suricata/systemd/suricata.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Open Source Next Generation Intrusion Detection and Prevention Engine
-After=syslog.target network.target
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/suricata -c /etc/suricata/suricata.conf -q 0 -q 1 -D
-ExecStartPost=/sbin/iptables -I INPUT -mark ! --mark 1/1 -j NFQUEUE -–queue-balance 0:1
-ExecReload=/bin/kill -HUP $MAINPID
-ExecStop=/sbin/iptables -D INPUT -j NFQUEUE -–queue-balance 0:1
-ExecStopPost=/bin/kill $MAINPID
-
-[Install]
-WantedBy=multi-user.target
diff --git a/texinfo/texinfo.nm b/texinfo/texinfo.nm
index b1b6d821c..166d68e1d 100644
--- a/texinfo/texinfo.nm
+++ b/texinfo/texinfo.nm
@@ -4,11 +4,11 @@
###############################################################################
name = texinfo
-version = 6.1
-release = 2
+version = 7.0.1
+release = 1
groups = Applications/Publishing
-url = http://www.gnu.org/software/texinfo/
+url = https://www.gnu.org/software/texinfo/
license = GPLv3
summary = Tools needed to create Texinfo format documentation files.
@@ -18,7 +18,7 @@ description
Project uses the Texinfo file format for most of its documentation.
end
-source_dl = http://ftp.gnu.org/gnu/texinfo/
+source_dl = https://ftp.gnu.org/gnu/texinfo/
build
requires
diff --git a/transmission/systemd/transmission-daemon.service b/transmission/systemd/transmission-daemon.service
deleted file mode 100644
index 8692007ef..000000000
--- a/transmission/systemd/transmission-daemon.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Transmission Daemon
-After=network.target
-
-[Service]
-User=transmission
-ExecStart=/usr/bin/transmission-daemon -f --blocklist -g /var/lib/transmission/.config/transmission
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/transmission/transmission.nm b/transmission/transmission.nm
deleted file mode 100644
index 8790aca2b..000000000
--- a/transmission/transmission.nm
+++ /dev/null
@@ -1,120 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = transmission
-version = 2.84
-release = 1
-
-groups = Internet/P2P
-url = https://trac.transmissionbt.com
-license = GPLv3
-summary = A BitTorrent client.
-
-description
- Transmission is a BitTorrent client which features a simple
- interface on top of a cross-platform back-end.
-end
-
-source_dl = http://download.transmissionbt.com/files/
-sources = %{thisapp}.tar.xz
-
-build
- requires
- intltool
- libcurl-devel
- libevent-devel
- openssl-devel
- shadow-utils
- zlib-devel
- end
-
- prepare_cmds
- # Create transmission user and group.
- %{create_user}
- end
-
- install_cmds
- # Create missing folders and set correct ownership.
- mkdir -pv %{BUILDROOT}%{sharedstatedir}/transmission
- chown transmission:transmission %{BUILDROOT}%{sharedstatedir}/transmission
- end
-end
-
-create_user
- getent group transmission >/dev/null || groupadd -r transmission
- getent passwd transmission >/dev/null || \
- useradd -r -g transmission -d %{sharedstatedir}/transmission -s /sbin/nologin \
- -c "transmission daemon" transmission
-end
-
-packages
- package %{name}
-
- package %{name}-cli
- summary = Transmission command line implementation.
- description
- Command line version of Transmission BitTorrent client.
- end
-
- requires
- transmission = %{thisver}
- end
-
- files
- %{bindir}/transmission-cli
- %{mandir}/man1/transmission-cli*
- end
- end
-
- package %{name}-daemon
- summary = Transmission daemon.
- description
- Transmission BitTorrent client daemon.
- end
-
- prerequires += shadow-utils
-
- requires
- transmission = %{thisver}
- end
-
- datadir
- %{sharedstatedir}/transmission
- end
-
- files
- %{bindir}/transmission-daemon
- %{mandir}/man1/transmission-daemon*
- %{unitdir}/transmission-daemon.service
- %{sharedstatedir}/transmission
- end
-
- script prein
- %{create_user}
- end
-
- script postin
- systemctl daemon-reload >/dev/null 2>&1 || :
- end
-
- script preun
- systemctl --no-reload disable transmission-daemon.service >/dev/null 2>&1 || :
- systemctl stop transmission-daemon.service >/dev/null 2>&1 || :
- end
-
- script postun
- systemctl daemon-reload >/dev/null 2>&1 || :
- end
-
- script postup
- systemctl daemon-reload >/dev/null 2>&1 || :
- systemctl try-restart transmission-daemon.service >/dev/null 2>&1 || :
- end
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/tree/tree.nm b/tree/tree.nm
index 7a7352e38..5c3cb32b1 100644
--- a/tree/tree.nm
+++ b/tree/tree.nm
@@ -4,11 +4,11 @@
###############################################################################
name = tree
-version = 1.7.0
-release = 2
+version = 2.1.0
+release = 1
groups = Applications/File
-url = http://mama.indstate.edu/users/ice/tree/
+url = https://mama.indstate.edu/users/ice/tree/
license = GPLv2+
summary = File system tree viewer.
@@ -18,7 +18,7 @@ description
utility.
end
-source_dl = ftp://mama.indstate.edu/linux/tree/
+source_dl = https://mama.indstate.edu/users/ice/tree/src/
sources = %{thisapp}.tgz
build
diff --git a/unzip/patches/0001-Fix-CVE-2016-9844-rhbz-1404283.patch b/unzip/patches/0001-Fix-CVE-2016-9844-rhbz-1404283.patch
new file mode 100644
index 000000000..0e4a17339
--- /dev/null
+++ b/unzip/patches/0001-Fix-CVE-2016-9844-rhbz-1404283.patch
@@ -0,0 +1,39 @@
+From 754137e70cf58a64ad524b704a86b651ba0cde07 Mon Sep 17 00:00:00 2001
+From: Petr Stodulka <pstodulk(a)redhat.com>
+Date: Wed, 14 Dec 2016 16:30:36 +0100
+Subject: [PATCH] Fix CVE-2016-9844 (rhbz#1404283)
+
+Fixes buffer overflow in zipinfo in similar way like fix for
+CVE-2014-9913 provided by upstream.
+---
+ zipinfo.c | 14 +++++++++++++-
+ 1 file changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/zipinfo.c b/zipinfo.c
+index c03620e..accca2a 100644
+--- a/zipinfo.c
++++ b/zipinfo.c
+@@ -1984,7 +1984,19 @@ static int zi_short(__G) /* return PK-type error code */
+ ush dnum=(ush)((G.crec.general_purpose_bit_flag>>1) & 3);
+ methbuf[3] = dtype[dnum];
+ } else if (methnum >= NUM_METHODS) { /* unknown */
+- sprintf(&methbuf[1], "%03u", G.crec.compression_method);
++ /* 2016-12-05 SMS.
++ * https://launchpad.net/bugs/1643750
++ * Unexpectedly large compression methods overflow
++ * &methbuf[]. Use the old, three-digit decimal format
++ * for values which fit. Otherwise, sacrifice the "u",
++ * and use four-digit hexadecimal.
++ */
++ if (G.crec.compression_method <= 999) {
++ sprintf( &methbuf[ 1], "%03u", G.crec.compression_method);
++ } else {
++ sprintf( &methbuf[ 0], "%04X", G.crec.compression_method);
++ }
++
+ }
+
+ for (k = 0; k < 15; ++k)
+--
+2.5.5
+
diff --git a/unzip/patches/unzip-6.0-COVSCAN-fix-unterminated-string.patch b/unzip/patches/unzip-6.0-COVSCAN-fix-unterminated-string.patch
new file mode 100644
index 000000000..717377119
--- /dev/null
+++ b/unzip/patches/unzip-6.0-COVSCAN-fix-unterminated-string.patch
@@ -0,0 +1,131 @@
+From 06d1b08aef94984256cad3c5a54cedb10295681f Mon Sep 17 00:00:00 2001
+From: Jakub Martisko <jamartis(a)redhat.com>
+Date: Thu, 8 Nov 2018 09:31:18 +0100
+Subject: [PATCH] Possible unterminated string fix
+
+---
+ unix/unix.c | 4 +++-
+ unix/unxcfg.h | 2 +-
+ unzip.c | 12 ++++++++----
+ zipinfo.c | 12 ++++++++----
+ 4 files changed, 20 insertions(+), 10 deletions(-)
+
+diff --git a/unix/unix.c b/unix/unix.c
+index 59b622d..cd57f80 100644
+--- a/unix/unix.c
++++ b/unix/unix.c
+@@ -1945,7 +1945,9 @@ void init_conversion_charsets()
+ for(i = 0; i < sizeof(dos_charset_map)/sizeof(CHARSET_MAP); i++)
+ if(!strcasecmp(local_charset, dos_charset_map[i].local_charset)) {
+ strncpy(OEM_CP, dos_charset_map[i].archive_charset,
+- sizeof(OEM_CP));
++ MAX_CP_NAME - 1);
++
++ OEM_CP[MAX_CP_NAME - 1] = '\0';
+ break;
+ }
+ }
+diff --git a/unix/unxcfg.h b/unix/unxcfg.h
+index 8729de2..9ee8cfe 100644
+--- a/unix/unxcfg.h
++++ b/unix/unxcfg.h
+@@ -228,7 +228,7 @@ typedef struct stat z_stat;
+ /* and notfirstcall are used by do_wild(). */
+
+
+-#define MAX_CP_NAME 25
++#define MAX_CP_NAME 25 + 1
+
+ #ifdef SETLOCALE
+ # undef SETLOCALE
+diff --git a/unzip.c b/unzip.c
+index 2d94a38..a485f2b 100644
+--- a/unzip.c
++++ b/unzip.c
+@@ -1561,7 +1561,8 @@ int uz_opts(__G__ pargc, pargv)
+ "error: a valid character encoding should follow the -I argument"));
+ return(PK_PARAM);
+ }
+- strncpy(ISO_CP, s, sizeof(ISO_CP));
++ strncpy(ISO_CP, s, MAX_CP_NAME - 1);
++ ISO_CP[MAX_CP_NAME - 1] = '\0';
+ } else { /* -I charset */
+ ++argv;
+ if(!(--argc > 0 && *argv != NULL && **argv != '-')) {
+@@ -1570,7 +1571,8 @@ int uz_opts(__G__ pargc, pargv)
+ return(PK_PARAM);
+ }
+ s = *argv;
+- strncpy(ISO_CP, s, sizeof(ISO_CP));
++ strncpy(ISO_CP, s, MAX_CP_NAME - 1);
++ ISO_CP[MAX_CP_NAME - 1] = '\0';
+ }
+ while(*(++s)); /* No params straight after charset name */
+ }
+@@ -1665,7 +1667,8 @@ int uz_opts(__G__ pargc, pargv)
+ "error: a valid character encoding should follow the -I argument"));
+ return(PK_PARAM);
+ }
+- strncpy(OEM_CP, s, sizeof(OEM_CP));
++ strncpy(OEM_CP, s, MAX_CP_NAME - 1);
++ OEM_CP[MAX_CP_NAME - 1] = '\0';
+ } else { /* -O charset */
+ ++argv;
+ if(!(--argc > 0 && *argv != NULL && **argv != '-')) {
+@@ -1674,7 +1677,8 @@ int uz_opts(__G__ pargc, pargv)
+ return(PK_PARAM);
+ }
+ s = *argv;
+- strncpy(OEM_CP, s, sizeof(OEM_CP));
++ strncpy(OEM_CP, s, MAX_CP_NAME - 1);
++ OEM_CP[MAX_CP_NAME - 1] = '\0';
+ }
+ while(*(++s)); /* No params straight after charset name */
+ }
+diff --git a/zipinfo.c b/zipinfo.c
+index accca2a..cb7e08d 100644
+--- a/zipinfo.c
++++ b/zipinfo.c
+@@ -519,7 +519,8 @@ int zi_opts(__G__ pargc, pargv)
+ "error: a valid character encoding should follow the -I argument"));
+ return(PK_PARAM);
+ }
+- strncpy(ISO_CP, s, sizeof(ISO_CP));
++ strncpy(ISO_CP, s, MAX_CP_NAME - 1);
++ ISO_CP[MAX_CP_NAME - 1] = '\0';
+ } else { /* -I charset */
+ ++argv;
+ if(!(--argc > 0 && *argv != NULL && **argv != '-')) {
+@@ -528,7 +529,8 @@ int zi_opts(__G__ pargc, pargv)
+ return(PK_PARAM);
+ }
+ s = *argv;
+- strncpy(ISO_CP, s, sizeof(ISO_CP));
++ strncpy(ISO_CP, s, MAX_CP_NAME - 1);
++ ISO_CP[MAX_CP_NAME - 1] = '\0';
+ }
+ while(*(++s)); /* No params straight after charset name */
+ }
+@@ -568,7 +570,8 @@ int zi_opts(__G__ pargc, pargv)
+ "error: a valid character encoding should follow the -I argument"));
+ return(PK_PARAM);
+ }
+- strncpy(OEM_CP, s, sizeof(OEM_CP));
++ strncpy(OEM_CP, s, MAX_CP_NAME - 1);
++ OEM_CP[MAX_CP_NAME - 1] = '\0';
+ } else { /* -O charset */
+ ++argv;
+ if(!(--argc > 0 && *argv != NULL && **argv != '-')) {
+@@ -577,7 +580,8 @@ int zi_opts(__G__ pargc, pargv)
+ return(PK_PARAM);
+ }
+ s = *argv;
+- strncpy(OEM_CP, s, sizeof(OEM_CP));
++ strncpy(OEM_CP, s, MAX_CP_NAME - 1);
++ OEM_CP[MAX_CP_NAME - 1] = '\0';
+ }
+ while(*(++s)); /* No params straight after charset name */
+ }
+--
+2.14.5
+
diff --git a/unzip/patches/unzip-6.0-alt-iconv-utf8-print.patch b/unzip/patches/unzip-6.0-alt-iconv-utf8-print.patch
new file mode 100644
index 000000000..0b0153ba5
--- /dev/null
+++ b/unzip/patches/unzip-6.0-alt-iconv-utf8-print.patch
@@ -0,0 +1,381 @@
+From ca0212ba19b64488b9e8459a762c11ecd6e7d0bd Mon Sep 17 00:00:00 2001
+From: Petr Stodulka <pstodulk(a)redhat.com>
+Date: Tue, 24 Nov 2015 17:56:11 +0100
+Subject: [PATCH] print correctly non-ascii filenames
+
+---
+ extract.c | 289 ++++++++++++++++++++++++++++++++++++++++++++++++--------------
+ unzpriv.h | 7 ++
+ 2 files changed, 233 insertions(+), 63 deletions(-)
+
+diff --git a/extract.c b/extract.c
+index 0ee4e93..741b7e0 100644
+--- a/extract.c
++++ b/extract.c
+@@ -2648,8 +2648,21 @@ static void set_deferred_symlink(__G__ slnk_entry)
+ } /* end function set_deferred_symlink() */
+ #endif /* SYMLINKS */
+
++/*
++ * If Unicode is supported, assume we have what we need to do this
++ * check using wide characters, avoiding MBCS issues.
++ */
+
+-
++#ifndef UZ_FNFILTER_REPLACECHAR
++ /* A convenient choice for the replacement of unprintable char codes is
++ * the "single char wildcard", as this character is quite unlikely to
++ * appear in filenames by itself. The following default definition
++ * sets the replacement char to a question mark as the most common
++ * "single char wildcard"; this setting should be overridden in the
++ * appropiate system-specific configuration header when needed.
++ */
++# define UZ_FNFILTER_REPLACECHAR '?'
++#endif
+
+ /*************************/
+ /* Function fnfilter() */ /* here instead of in list.c for SFX */
+@@ -2661,48 +2674,168 @@ char *fnfilter(raw, space, size) /* convert name to safely printable form */
+ extent size;
+ {
+ #ifndef NATIVE /* ASCII: filter ANSI escape codes, etc. */
+- ZCONST uch *r=(ZCONST uch *)raw;
++ ZCONST uch *r; // =(ZCONST uch *)raw;
+ uch *s=space;
+ uch *slim=NULL;
+ uch *se=NULL;
+ int have_overflow = FALSE;
+
+- if (size > 0) {
+- slim = space + size
+-#ifdef _MBCS
+- - (MB_CUR_MAX - 1)
+-#endif
+- - 4;
++# if defined( UNICODE_SUPPORT) && defined( _MBCS)
++/* If Unicode support is enabled, and we have multi-byte characters,
++ * then do the isprint() checks by first converting to wide characters
++ * and checking those. This avoids our having to parse multi-byte
++ * characters for ourselves. After the wide-char replacements have been
++ * made, the wide string is converted back to the local character set.
++ */
++ wchar_t *wstring; /* wchar_t version of raw */
++ size_t wslen; /* length of wstring */
++ wchar_t *wostring; /* wchar_t version of output string */
++ size_t woslen; /* length of wostring */
++ char *newraw; /* new raw */
++
++ /* 2012-11-06 SMS.
++ * Changed to check the value returned by mbstowcs(), and bypass the
++ * Unicode processing if it fails. This seems to fix a problem
++ * reported in the SourceForge forum, but it's not clear that we
++ * should be doing any Unicode processing without some evidence that
++ * the name actually is Unicode. (Check bit 11 in the flags before
++ * coming here?)
++ * http://sourceforge.net/p/infozip/bugs/40/
++ */
++
++ if (MB_CUR_MAX <= 1)
++ {
++ /* There's no point to converting multi-byte chars if there are
++ * no multi-byte chars.
++ */
++ wslen = (size_t)-1;
+ }
+- while (*r) {
+- if (size > 0 && s >= slim && se == NULL) {
+- se = s;
++ else
++ {
++ /* Get Unicode wide character count (for storage allocation). */
++ wslen = mbstowcs( NULL, raw, 0);
++ }
++
++ if (wslen != (size_t)-1)
++ {
++ /* Apparently valid Unicode. Allocate wide-char storage. */
++ wstring = (wchar_t *)malloc((wslen + 1) * sizeof(wchar_t));
++ if (wstring == NULL) {
++ strcpy( (char *)space, raw);
++ return (char *)space;
+ }
+-#ifdef QDOS
+- if (qlflag & 2) {
+- if (*r == '/' || *r == '.') {
++ wostring = (wchar_t *)malloc(2 * (wslen + 1) * sizeof(wchar_t));
++ if (wostring == NULL) {
++ free(wstring);
++ strcpy( (char *)space, raw);
++ return (char *)space;
++ }
++
++ /* Convert the multi-byte Unicode to wide chars. */
++ wslen = mbstowcs(wstring, raw, wslen + 1);
++
++ /* Filter the wide-character string. */
++ fnfilterw( wstring, wostring, (2 * (wslen + 1) * sizeof(wchar_t)));
++
++ /* Convert filtered wide chars back to multi-byte. */
++ woslen = wcstombs( NULL, wostring, 0);
++ if ((newraw = malloc(woslen + 1)) == NULL) {
++ free(wstring);
++ free(wostring);
++ strcpy( (char *)space, raw);
++ return (char *)space;
++ }
++ woslen = wcstombs( newraw, wostring, (woslen * MB_CUR_MAX) + 1);
++
++ if (size > 0) {
++ slim = space + size - 4;
++ }
++ r = (ZCONST uch *)newraw;
++ while (*r) {
++ if (size > 0 && s >= slim && se == NULL) {
++ se = s;
++ }
++# ifdef QDOS
++ if (qlflag & 2) {
++ if (*r == '/' || *r == '.') {
++ if (se != NULL && (s > (space + (size-3)))) {
++ have_overflow = TRUE;
++ break;
++ }
++ ++r;
++ *s++ = '_';
++ continue;
++ }
++ } else
++# endif
++ {
+ if (se != NULL && (s > (space + (size-3)))) {
+ have_overflow = TRUE;
+ break;
+ }
+- ++r;
+- *s++ = '_';
+- continue;
++ *s++ = *r++;
+ }
+- } else
++ }
++ if (have_overflow) {
++ strcpy((char *)se, "...");
++ } else {
++ *s = '\0';
++ }
++
++ free(wstring);
++ free(wostring);
++ free(newraw);
++ }
++ else
++# endif /* defined( UNICODE_SUPPORT) && defined( _MBCS) */
++ {
++ /* No Unicode support, or apparently invalid Unicode. */
++ r = (ZCONST uch *)raw;
++
++ if (size > 0) {
++ slim = space + size
++#ifdef _MBCS
++ - (MB_CUR_MAX - 1)
++#endif
++ - 4;
++ }
++ while (*r) {
++ if (size > 0 && s >= slim && se == NULL) {
++ se = s;
++ }
++#ifdef QDOS
++ if (qlflag & 2) {
++ if (*r == '/' || *r == '.') {
++ if (se != NULL && (s > (space + (size-3)))) {
++ have_overflow = TRUE;
++ break;
++ }
++ ++r;
++ *s++ = '_';
++ continue;
++ }
++ } else
+ #endif
+ #ifdef HAVE_WORKING_ISPRINT
+-# ifndef UZ_FNFILTER_REPLACECHAR
+- /* A convenient choice for the replacement of unprintable char codes is
+- * the "single char wildcard", as this character is quite unlikely to
+- * appear in filenames by itself. The following default definition
+- * sets the replacement char to a question mark as the most common
+- * "single char wildcard"; this setting should be overridden in the
+- * appropiate system-specific configuration header when needed.
+- */
+-# define UZ_FNFILTER_REPLACECHAR '?'
+-# endif
+- if (!isprint(*r)) {
++ if (!isprint(*r)) {
++ if (*r < 32) {
++ /* ASCII control codes are escaped as "^{letter}". */
++ if (se != NULL && (s > (space + (size-4)))) {
++ have_overflow = TRUE;
++ break;
++ }
++ *s++ = '^', *s++ = (uch)(64 + *r++);
++ } else {
++ /* Other unprintable codes are replaced by the
++ * placeholder character. */
++ if (se != NULL && (s > (space + (size-3)))) {
++ have_overflow = TRUE;
++ break;
++ }
++ *s++ = UZ_FNFILTER_REPLACECHAR;
++ INCSTR(r);
++ }
++#else /* !HAVE_WORKING_ISPRINT */
+ if (*r < 32) {
+ /* ASCII control codes are escaped as "^{letter}". */
+ if (se != NULL && (s > (space + (size-4)))) {
+@@ -2710,47 +2843,30 @@ char *fnfilter(raw, space, size) /* convert name to safely printable form */
+ break;
+ }
+ *s++ = '^', *s++ = (uch)(64 + *r++);
++#endif /* ?HAVE_WORKING_ISPRINT */
+ } else {
+- /* Other unprintable codes are replaced by the
+- * placeholder character. */
++#ifdef _MBCS
++ unsigned i = CLEN(r);
++ if (se != NULL && (s > (space + (size-i-2)))) {
++ have_overflow = TRUE;
++ break;
++ }
++ for (; i > 0; i--)
++ *s++ = *r++;
++#else
+ if (se != NULL && (s > (space + (size-3)))) {
+ have_overflow = TRUE;
+ break;
+ }
+- *s++ = UZ_FNFILTER_REPLACECHAR;
+- INCSTR(r);
+- }
+-#else /* !HAVE_WORKING_ISPRINT */
+- if (*r < 32) {
+- /* ASCII control codes are escaped as "^{letter}". */
+- if (se != NULL && (s > (space + (size-4)))) {
+- have_overflow = TRUE;
+- break;
+- }
+- *s++ = '^', *s++ = (uch)(64 + *r++);
+-#endif /* ?HAVE_WORKING_ISPRINT */
+- } else {
+-#ifdef _MBCS
+- unsigned i = CLEN(r);
+- if (se != NULL && (s > (space + (size-i-2)))) {
+- have_overflow = TRUE;
+- break;
+- }
+- for (; i > 0; i--)
+ *s++ = *r++;
+-#else
+- if (se != NULL && (s > (space + (size-3)))) {
+- have_overflow = TRUE;
+- break;
+- }
+- *s++ = *r++;
+ #endif
+- }
+- }
+- if (have_overflow) {
+- strcpy((char *)se, "...");
+- } else {
+- *s = '\0';
++ }
++ }
++ if (have_overflow) {
++ strcpy((char *)se, "...");
++ } else {
++ *s = '\0';
++ }
+ }
+
+ #ifdef WINDLL
+@@ -2772,6 +2888,53 @@ char *fnfilter(raw, space, size) /* convert name to safely printable form */
+ } /* end function fnfilter() */
+
+
++#if defined( UNICODE_SUPPORT) && defined( _MBCS)
++
++/****************************/
++/* Function fnfilter[w]() */ /* (Here instead of in list.c for SFX.) */
++/****************************/
++
++/* fnfilterw() - Convert wide name to safely printable form. */
++
++/* fnfilterw() - Convert wide-character name to safely printable form. */
++
++wchar_t *fnfilterw( src, dst, siz)
++ ZCONST wchar_t *src; /* Pointer to source char (string). */
++ wchar_t *dst; /* Pointer to destination char (string). */
++ extent siz; /* Not used (!). */
++{
++ wchar_t *dsx = dst;
++
++ /* Filter the wide chars. */
++ while (*src)
++ {
++ if (iswprint( *src))
++ {
++ /* Printable code. Copy it. */
++ *dst++ = *src;
++ }
++ else
++ {
++ /* Unprintable code. Substitute something printable for it. */
++ if (*src < 32)
++ {
++ /* Replace ASCII control code with "^{letter}". */
++ *dst++ = (wchar_t)'^';
++ *dst++ = (wchar_t)(64 + *src);
++ }
++ else
++ {
++ /* Replace other unprintable code with the placeholder. */
++ *dst++ = (wchar_t)UZ_FNFILTER_REPLACECHAR;
++ }
++ }
++ src++;
++ }
++ *dst = (wchar_t)0; /* NUL-terminate the destination string. */
++ return dsx;
++} /* fnfilterw(). */
++
++#endif /* defined( UNICODE_SUPPORT) && defined( _MBCS) */
+
+
+ #ifdef SET_DIR_ATTRIB
+diff --git a/unzpriv.h b/unzpriv.h
+index 22d3923..e48a652 100644
+--- a/unzpriv.h
++++ b/unzpriv.h
+@@ -1212,6 +1212,7 @@
+ # ifdef UNICODE_WCHAR
+ # if !(defined(_WIN32_WCE) || defined(POCKET_UNZIP))
+ # include <wchar.h>
++# include <wctype.h>
+ # endif
+ # endif
+ # ifndef _MBCS /* no need to include <locale.h> twice, see below */
+@@ -2410,6 +2411,12 @@ int memflush OF((__GPRO__ ZCONST uch *rawbuf, ulg size));
+ char *fnfilter OF((ZCONST char *raw, uch *space,
+ extent size));
+
++# if defined( UNICODE_SUPPORT) && defined( _MBCS)
++wchar_t *fnfilterw OF((ZCONST wchar_t *src, wchar_t *dst,
++ extent siz));
++#endif
++
++
+ /*---------------------------------------------------------------------------
+ Decompression functions:
+ ---------------------------------------------------------------------------*/
+--
+2.4.3
+
diff --git a/unzip/patches/unzip-6.0-alt-iconv-utf8.patch b/unzip/patches/unzip-6.0-alt-iconv-utf8.patch
new file mode 100644
index 000000000..b9e37774e
--- /dev/null
+++ b/unzip/patches/unzip-6.0-alt-iconv-utf8.patch
@@ -0,0 +1,398 @@
+From: Giovanni Scafora <giovanni.archlinux.org>
+Subject: unzip files encoded with non-latin, non-unicode file names
+Last-Update: 2015-02-11
+
+Updated 2015-02-11 by Marc Deslauriers <marc.deslauriers(a)canonical.com>
+to fix buffer overflow in charset_to_intern()
+
+Index: unzip-6.0/unix/unix.c
+===================================================================
+--- unzip-6.0.orig/unix/unix.c 2015-02-11 08:46:43.675324290 -0500
++++ unzip-6.0/unix/unix.c 2015-02-11 09:18:04.902081319 -0500
+@@ -30,6 +30,9 @@
+ #define UNZIP_INTERNAL
+ #include "unzip.h"
+
++#include <iconv.h>
++#include <langinfo.h>
++
+ #ifdef SCO_XENIX
+ # define SYSNDIR
+ #else /* SCO Unix, AIX, DNIX, TI SysV, Coherent 4.x, ... */
+@@ -1874,3 +1877,102 @@
+ }
+ }
+ #endif /* QLZIP */
++
++
++typedef struct {
++ char *local_charset;
++ char *archive_charset;
++} CHARSET_MAP;
++
++/* A mapping of local <-> archive charsets used by default to convert filenames
++ * of DOS/Windows Zip archives. Currently very basic. */
++static CHARSET_MAP dos_charset_map[] = {
++ { "ANSI_X3.4-1968", "CP850" },
++ { "ISO-8859-1", "CP850" },
++ { "CP1252", "CP850" },
++ { "UTF-8", "CP866" },
++ { "KOI8-R", "CP866" },
++ { "KOI8-U", "CP866" },
++ { "ISO-8859-5", "CP866" }
++};
++
++char OEM_CP[MAX_CP_NAME] = "";
++char ISO_CP[MAX_CP_NAME] = "";
++
++/* Try to guess the default value of OEM_CP based on the current locale.
++ * ISO_CP is left alone for now. */
++void init_conversion_charsets()
++{
++ const char *local_charset;
++ int i;
++
++ /* Make a guess only if OEM_CP not already set. */
++ if(*OEM_CP == '\0') {
++ local_charset = nl_langinfo(CODESET);
++ for(i = 0; i < sizeof(dos_charset_map)/sizeof(CHARSET_MAP); i++)
++ if(!strcasecmp(local_charset, dos_charset_map[i].local_charset)) {
++ strncpy(OEM_CP, dos_charset_map[i].archive_charset,
++ sizeof(OEM_CP));
++ break;
++ }
++ }
++}
++
++/* Convert a string from one encoding to the current locale using iconv().
++ * Be as non-intrusive as possible. If error is encountered during covertion
++ * just leave the string intact. */
++static void charset_to_intern(char *string, char *from_charset)
++{
++ iconv_t cd;
++ char *s,*d, *buf;
++ size_t slen, dlen, buflen;
++ const char *local_charset;
++
++ if(*from_charset == '\0')
++ return;
++
++ buf = NULL;
++ local_charset = nl_langinfo(CODESET);
++
++ if((cd = iconv_open(local_charset, from_charset)) == (iconv_t)-1)
++ return;
++
++ slen = strlen(string);
++ s = string;
++
++ /* Make sure OUTBUFSIZ + 1 never ends up smaller than FILNAMSIZ
++ * as this function also gets called with G.outbuf in fileio.c
++ */
++ buflen = FILNAMSIZ;
++ if (OUTBUFSIZ + 1 < FILNAMSIZ)
++ {
++ buflen = OUTBUFSIZ + 1;
++ }
++
++ d = buf = malloc(buflen);
++ if(!d)
++ goto cleanup;
++
++ bzero(buf,buflen);
++ dlen = buflen - 1;
++
++ if(iconv(cd, &s, &slen, &d, &dlen) == (size_t)-1)
++ goto cleanup;
++ strncpy(string, buf, buflen);
++
++ cleanup:
++ free(buf);
++ iconv_close(cd);
++}
++
++/* Convert a string from OEM_CP to the current locale charset. */
++inline void oem_intern(char *string)
++{
++ charset_to_intern(string, OEM_CP);
++}
++
++/* Convert a string from ISO_CP to the current locale charset. */
++inline void iso_intern(char *string)
++{
++ charset_to_intern(string, ISO_CP);
++}
+Index: unzip-6.0/unix/unxcfg.h
+===================================================================
+--- unzip-6.0.orig/unix/unxcfg.h 2015-02-11 08:46:43.675324290 -0500
++++ unzip-6.0/unix/unxcfg.h 2015-02-11 08:46:43.671324260 -0500
+@@ -228,4 +228,30 @@
+ /* wild_dir, dirname, wildname, matchname[], dirnamelen, have_dirname, */
+ /* and notfirstcall are used by do_wild(). */
+
++
++#define MAX_CP_NAME 25
++
++#ifdef SETLOCALE
++# undef SETLOCALE
++#endif
++#define SETLOCALE(category, locale) setlocale(category, locale)
++#include <locale.h>
++
++#ifdef _ISO_INTERN
++# undef _ISO_INTERN
++#endif
++#define _ISO_INTERN(str1) iso_intern(str1)
++
++#ifdef _OEM_INTERN
++# undef _OEM_INTERN
++#endif
++#ifndef IZ_OEM2ISO_ARRAY
++# define IZ_OEM2ISO_ARRAY
++#endif
++#define _OEM_INTERN(str1) oem_intern(str1)
++
++void iso_intern(char *);
++void oem_intern(char *);
++void init_conversion_charsets(void);
++
+ #endif /* !__unxcfg_h */
+Index: unzip-6.0/unzip.c
+===================================================================
+--- unzip-6.0.orig/unzip.c 2015-02-11 08:46:43.675324290 -0500
++++ unzip-6.0/unzip.c 2015-02-11 08:46:43.675324290 -0500
+@@ -327,11 +327,21 @@
+ -2 just filenames but allow -h/-t/-z -l long Unix \"ls -l\" format\n\
+ -v verbose, multi-page format\n";
+
++#ifndef UNIX
+ static ZCONST char Far ZipInfoUsageLine3[] = "miscellaneous options:\n\
+ -h print header line -t print totals for listed files or for all\n\
+ -z print zipfile comment -T print file times in sortable decimal format\
+ \n -C be case-insensitive %s\
+ -x exclude filenames that follow from listing\n";
++#else /* UNIX */
++static ZCONST char Far ZipInfoUsageLine3[] = "miscellaneous options:\n\
++ -h print header line -t print totals for listed files or for all\n\
++ -z print zipfile comment %c-T%c print file times in sortable decimal format\
++\n %c-C%c be case-insensitive %s\
++ -x exclude filenames that follow from listing\n\
++ -O CHARSET specify a character encoding for DOS, Windows and OS/2 archives\n\
++ -I CHARSET specify a character encoding for UNIX and other archives\n";
++#endif /* !UNIX */
+ #ifdef MORE
+ static ZCONST char Far ZipInfoUsageLine4[] =
+ " -M page output through built-in \"more\"\n";
+@@ -664,6 +674,17 @@
+ -U use escapes for all non-ASCII Unicode -UU ignore any Unicode fields\n\
+ -C match filenames case-insensitively -L make (some) names \
+ lowercase\n %-42s -V retain VMS version numbers\n%s";
++#elif (defined UNIX)
++static ZCONST char Far UnzipUsageLine4[] = "\
++modifiers:\n\
++ -n never overwrite existing files -q quiet mode (-qq => quieter)\n\
++ -o overwrite files WITHOUT prompting -a auto-convert any text files\n\
++ -j junk paths (do not make directories) -aa treat ALL files as text\n\
++ -U use escapes for all non-ASCII Unicode -UU ignore any Unicode fields\n\
++ -C match filenames case-insensitively -L make (some) names \
++lowercase\n %-42s -V retain VMS version numbers\n%s\
++ -O CHARSET specify a character encoding for DOS, Windows and OS/2 archives\n\
++ -I CHARSET specify a character encoding for UNIX and other archives\n\n";
+ #else /* !VMS */
+ static ZCONST char Far UnzipUsageLine4[] = "\
+ modifiers:\n\
+@@ -802,6 +823,10 @@
+ #endif /* UNICODE_SUPPORT */
+
+
++#ifdef UNIX
++ init_conversion_charsets();
++#endif
++
+ #if (defined(__IBMC__) && defined(__DEBUG_ALLOC__))
+ extern void DebugMalloc(void);
+
+@@ -1335,6 +1360,11 @@
+ argc = *pargc;
+ argv = *pargv;
+
++#ifdef UNIX
++ extern char OEM_CP[MAX_CP_NAME];
++ extern char ISO_CP[MAX_CP_NAME];
++#endif
++
+ while (++argv, (--argc > 0 && *argv != NULL && **argv == '-')) {
+ s = *argv + 1;
+ while ((c = *s++) != 0) { /* "!= 0": prevent Turbo C warning */
+@@ -1516,6 +1546,35 @@
+ }
+ break;
+ #endif /* MACOS */
++#ifdef UNIX
++ case ('I'):
++ if (negative) {
++ Info(slide, 0x401, ((char *)slide,
++ "error: encodings can't be negated"));
++ return(PK_PARAM);
++ } else {
++ if(*s) { /* Handle the -Icharset case */
++ /* Assume that charsets can't start with a dash to spot arguments misuse */
++ if(*s == '-') {
++ Info(slide, 0x401, ((char *)slide,
++ "error: a valid character encoding should follow the -I argument"));
++ return(PK_PARAM);
++ }
++ strncpy(ISO_CP, s, sizeof(ISO_CP));
++ } else { /* -I charset */
++ ++argv;
++ if(!(--argc > 0 && *argv != NULL && **argv != '-')) {
++ Info(slide, 0x401, ((char *)slide,
++ "error: a valid character encoding should follow the -I argument"));
++ return(PK_PARAM);
++ }
++ s = *argv;
++ strncpy(ISO_CP, s, sizeof(ISO_CP));
++ }
++ while(*(++s)); /* No params straight after charset name */
++ }
++ break;
++#endif /* ?UNIX */
+ case ('j'): /* junk pathnames/directory structure */
+ if (negative)
+ uO.jflag = FALSE, negative = 0;
+@@ -1591,6 +1650,35 @@
+ } else
+ ++uO.overwrite_all;
+ break;
++#ifdef UNIX
++ case ('O'):
++ if (negative) {
++ Info(slide, 0x401, ((char *)slide,
++ "error: encodings can't be negated"));
++ return(PK_PARAM);
++ } else {
++ if(*s) { /* Handle the -Ocharset case */
++ /* Assume that charsets can't start with a dash to spot arguments misuse */
++ if(*s == '-') {
++ Info(slide, 0x401, ((char *)slide,
++ "error: a valid character encoding should follow the -I argument"));
++ return(PK_PARAM);
++ }
++ strncpy(OEM_CP, s, sizeof(OEM_CP));
++ } else { /* -O charset */
++ ++argv;
++ if(!(--argc > 0 && *argv != NULL && **argv != '-')) {
++ Info(slide, 0x401, ((char *)slide,
++ "error: a valid character encoding should follow the -O argument"));
++ return(PK_PARAM);
++ }
++ s = *argv;
++ strncpy(OEM_CP, s, sizeof(OEM_CP));
++ }
++ while(*(++s)); /* No params straight after charset name */
++ }
++ break;
++#endif /* ?UNIX */
+ case ('p'): /* pipes: extract to stdout, no messages */
+ if (negative) {
+ uO.cflag = FALSE;
+Index: unzip-6.0/unzpriv.h
+===================================================================
+--- unzip-6.0.orig/unzpriv.h 2015-02-11 08:46:43.675324290 -0500
++++ unzip-6.0/unzpriv.h 2015-02-11 08:46:43.675324290 -0500
+@@ -3008,7 +3008,7 @@
+ !(((islochdr) || (isuxatt)) && \
+ ((hostver) == 25 || (hostver) == 26 || (hostver) == 40))) || \
+ (hostnum) == FS_HPFS_ || \
+- ((hostnum) == FS_NTFS_ && (hostver) == 50)) { \
++ ((hostnum) == FS_NTFS_ /* && (hostver) == 50 */ )) { \
+ _OEM_INTERN((string)); \
+ } else { \
+ _ISO_INTERN((string)); \
+Index: unzip-6.0/zipinfo.c
+===================================================================
+--- unzip-6.0.orig/zipinfo.c 2015-02-11 08:46:43.675324290 -0500
++++ unzip-6.0/zipinfo.c 2015-02-11 08:46:43.675324290 -0500
+@@ -457,6 +457,10 @@
+ int tflag_slm=TRUE, tflag_2v=FALSE;
+ int explicit_h=FALSE, explicit_t=FALSE;
+
++#ifdef UNIX
++ extern char OEM_CP[MAX_CP_NAME];
++ extern char ISO_CP[MAX_CP_NAME];
++#endif
+
+ #ifdef MACOS
+ uO.lflag = LFLAG; /* reset default on each call */
+@@ -501,6 +505,35 @@
+ uO.lflag = 0;
+ }
+ break;
++#ifdef UNIX
++ case ('I'):
++ if (negative) {
++ Info(slide, 0x401, ((char *)slide,
++ "error: encodings can't be negated"));
++ return(PK_PARAM);
++ } else {
++ if(*s) { /* Handle the -Icharset case */
++ /* Assume that charsets can't start with a dash to spot arguments misuse */
++ if(*s == '-') {
++ Info(slide, 0x401, ((char *)slide,
++ "error: a valid character encoding should follow the -I argument"));
++ return(PK_PARAM);
++ }
++ strncpy(ISO_CP, s, sizeof(ISO_CP));
++ } else { /* -I charset */
++ ++argv;
++ if(!(--argc > 0 && *argv != NULL && **argv != '-')) {
++ Info(slide, 0x401, ((char *)slide,
++ "error: a valid character encoding should follow the -I argument"));
++ return(PK_PARAM);
++ }
++ s = *argv;
++ strncpy(ISO_CP, s, sizeof(ISO_CP));
++ }
++ while(*(++s)); /* No params straight after charset name */
++ }
++ break;
++#endif /* ?UNIX */
+ case 'l': /* longer form of "ls -l" type listing */
+ if (negative)
+ uO.lflag = -2, negative = 0;
+@@ -521,6 +554,35 @@
+ G.M_flag = TRUE;
+ break;
+ #endif
++#ifdef UNIX
++ case ('O'):
++ if (negative) {
++ Info(slide, 0x401, ((char *)slide,
++ "error: encodings can't be negated"));
++ return(PK_PARAM);
++ } else {
++ if(*s) { /* Handle the -Ocharset case */
++ /* Assume that charsets can't start with a dash to spot arguments misuse */
++ if(*s == '-') {
++ Info(slide, 0x401, ((char *)slide,
++ "error: a valid character encoding should follow the -I argument"));
++ return(PK_PARAM);
++ }
++ strncpy(OEM_CP, s, sizeof(OEM_CP));
++ } else { /* -O charset */
++ ++argv;
++ if(!(--argc > 0 && *argv != NULL && **argv != '-')) {
++ Info(slide, 0x401, ((char *)slide,
++ "error: a valid character encoding should follow the -O argument"));
++ return(PK_PARAM);
++ }
++ s = *argv;
++ strncpy(OEM_CP, s, sizeof(OEM_CP));
++ }
++ while(*(++s)); /* No params straight after charset name */
++ }
++ break;
++#endif /* ?UNIX */
+ case 's': /* default: shorter "ls -l" type listing */
+ if (negative)
+ uO.lflag = -2, negative = 0;
diff --git a/unzip/patches/unzip-6.0-bzip2-configure.patch b/unzip/patches/unzip-6.0-bzip2-configure.patch
index 9cf006b8c..b99bb4e44 100644
--- a/unzip/patches/unzip-6.0-bzip2-configure.patch
+++ b/unzip/patches/unzip-6.0-bzip2-configure.patch
@@ -19,7 +19,7 @@ diff -up unzip60/unix/configure.bzip2-configure unzip60/unix/configure
+ $CC $CFLAGS -o conftest conftest.c -lbz2 > /dev/null 2>/dev/null
+ if test $? -eq 0; then
+ echo "-- OS supports bzip2 - linking in bzip2"
-+ D_USE_BZ2="-DBZIP2_SUPPORT"
++ D_USE_BZ2="-DUSE_BZIP2"
+ L_BZ2="${BZLF} -lbz2"
+ else
+ echo "-- Either bzlib.h or libbz2.a not found - no bzip2"
@@ -27,3 +27,4 @@ diff -up unzip60/unix/configure.bzip2-configure unzip60/unix/configure
fi
fi
+
\ No newline at end of file
diff --git a/unzip/patches/unzip-6.0-caseinsensitive.patch b/unzip/patches/unzip-6.0-caseinsensitive.patch
new file mode 100644
index 000000000..3cb68450b
--- /dev/null
+++ b/unzip/patches/unzip-6.0-caseinsensitive.patch
@@ -0,0 +1,131 @@
+diff --git a/match.c b/match.c
+index 6cd656f..4e569f5 100644
+--- a/match.c
++++ b/match.c
+@@ -190,10 +190,10 @@ char *___tmp_ptr;
+
+ #endif
+
+-static int recmatch(p, s, cs)
++static int recmatch(p, s, ci)
+ ZCONST char *p; /* sh pattern to match */
+ ZCONST char *s; /* string to match it to */
+-int cs; /* flag: force case-sensitive matching */
++int ci; /* flag: force case-insensitive matching */
+ /* Recursively compare the sh pattern p with the string s and return 1 if
+ they match, and 0 or 2 if they don't or if there is a syntax error in the
+ pattern. This routine recurses on itself no deeper than the number of
+@@ -214,7 +214,7 @@ int cs; /* flag: force case-sensitive matching */
+ if (CLEN(p) == 2) {
+ if (CLEN(s) == 2) {
+ return (*p == *s && *(p+1) == *(s+1)) ?
+- recmatch(p + 2, s + 2, cs) : 0;
++ recmatch(p + 2, s + 2, ci) : 0;
+ } else {
+ return 0;
+ }
+@@ -230,9 +230,9 @@ int cs; /* flag: force case-sensitive matching */
+ /* '?' (or '%' or '#') matches any character (but not an empty string) */
+ if (c == WILDCHR_SINGLE) {
+ if (wild_stop_at_dir)
+- return (*s && *s != DIRSEP_CHR) ? recmatch(p, s + CLEN(s), cs) : 0;
++ return (*s && *s != DIRSEP_CHR) ? recmatch(p, s + CLEN(s), ci) : 0;
+ else
+- return *s ? recmatch(p, s + CLEN(s), cs) : 0;
++ return *s ? recmatch(p, s + CLEN(s), ci) : 0;
+ }
+
+ /* WILDCHR_MULTI ('*') matches any number of characters, including zero */
+@@ -253,14 +253,14 @@ int cs; /* flag: force case-sensitive matching */
+ # endif /* ?AMIGA */
+ /* Single WILDCHR_MULTI ('*'): this doesn't match slashes */
+ for (; *s && *s != DIRSEP_CHR; INCSTR(s))
+- if ((c = recmatch(p, s, cs)) != 0)
++ if ((c = recmatch(p, s, ci)) != 0)
+ return c;
+ /* end of pattern: matched if at end of string, else continue */
+ if (*p == 0)
+ return (*s == 0);
+ /* continue to match if at DIRSEP_CHR in pattern, else give up */
+ return (*p == DIRSEP_CHR || (*p == '\\' && p[1] == DIRSEP_CHR))
+- ? recmatch(p, s, cs) : 2;
++ ? recmatch(p, s, ci) : 2;
+ }
+ /* Two consecutive WILDCHR_MULTI ("**"): this matches DIRSEP_CHR ('/') */
+ p++; /* move p past the second WILDCHR_MULTI */
+@@ -308,17 +308,17 @@ int cs; /* flag: force case-sensitive matching */
+ */
+ if (q != srest)
+ return 0;
+- return ((cs ? strcmp(p, q) : namecmp(p, q)) == 0);
++ return ((!ci ? strcmp(p, q) : namecmp(p, q)) == 0);
+ }
+ #else /* !_MBCS */
+- return ((cs ? strcmp(p, srest) : namecmp(p, srest)) == 0);
++ return ((!ci ? strcmp(p, srest) : namecmp(p, srest)) == 0);
+ #endif /* ?_MBCS */
+ }
+ else
+ {
+ /* pattern contains more wildcards, continue with recursion... */
+ for (; *s; INCSTR(s))
+- if ((c = recmatch(p, s, cs)) != 0)
++ if ((c = recmatch(p, s, ci)) != 0)
+ return c;
+ return 2; /* 2 means give up--shmatch will return false */
+ }
+@@ -353,17 +353,17 @@ int cs; /* flag: force case-sensitive matching */
+ c = *(p-1);
+ else
+ {
+- uch cc = (cs ? (uch)*s : case_map((uch)*s));
++ uch cc = (!ci ? (uch)*s : to_up((uch)*s));
+ uch uc = (uch) c;
+ if (*(p+1) != '-')
+ for (uc = uc ? uc : (uch)*p; uc <= (uch)*p; uc++)
+ /* compare range */
+- if ((cs ? uc : case_map(uc)) == cc)
+- return r ? 0 : recmatch(q + CLEN(q), s + CLEN(s), cs);
++ if ((!ci ? uc : to_up(uc)) == cc)
++ return r ? 0 : recmatch(q + CLEN(q), s + CLEN(s), ci);
+ c = e = 0; /* clear range, escape flags */
+ }
+ }
+- return r ? recmatch(q + CLEN(q), s + CLEN(s), cs) : 0;
++ return r ? recmatch(q + CLEN(q), s + CLEN(s), ci) : 0;
+ /* bracket match failed */
+ }
+ #endif /* !VMS */
+@@ -382,18 +382,18 @@ int cs; /* flag: force case-sensitive matching */
+ {
+ /* Match "...]" with "]". Continue after "]" in both. */
+ if ((*(p+ 2* CLEN( p)) == ']') && (*s == ']'))
+- return recmatch( (p+ 3* CLEN( p)), (s+ CLEN( s)), cs);
++ return recmatch( (p+ 3* CLEN( p)), (s+ CLEN( s)), ci);
+
+ /* Else, look for a reduced match in s, until "]" in or end of s. */
+ for (; *s && (*s != ']'); INCSTR(s))
+ if (*s == '.')
+ /* If reduced match, then continue after "..." in p, "." in s. */
+- if ((c = recmatch( (p+ CLEN( p)), s, cs)) != 0)
++ if ((c = recmatch( (p+ CLEN( p)), s, ci)) != 0)
+ return (int)c;
+
+ /* Match "...]" with "]". Continue after "]" in both. */
+ if ((*(p+ 2* CLEN( p)) == ']') && (*s == ']'))
+- return recmatch( (p+ 3* CLEN( p)), (s+ CLEN( s)), cs);
++ return recmatch( (p+ 3* CLEN( p)), (s+ CLEN( s)), ci);
+
+ /* No reduced match. Quit. */
+ return 2;
+@@ -402,8 +402,8 @@ int cs; /* flag: force case-sensitive matching */
+ #endif /* def VMS */
+
+ /* Just a character--compare it */
+- return (cs ? c == *s : case_map((uch)c) == case_map((uch)*s)) ?
+- recmatch(p, s + CLEN(s), cs) : 0;
++ return (!ci ? c == *s : to_up((uch)c) == to_up((uch)*s)) ?
++ recmatch(p, s + CLEN(s), ci) : 0;
+ }
+
+
diff --git a/unzip/patches/unzip-6.0-nostrip.patch b/unzip/patches/unzip-6.0-configure.patch
similarity index 93%
rename from unzip/patches/unzip-6.0-nostrip.patch
rename to unzip/patches/unzip-6.0-configure.patch
index 71c263f69..9eead4227 100644
--- a/unzip/patches/unzip-6.0-nostrip.patch
+++ b/unzip/patches/unzip-6.0-configure.patch
@@ -6,7 +6,7 @@ diff -up unzip60/unix/configure.nostrip unzip60/unix/configure
CFLAGS="${CFLAGS} -I. -DUNIX"
LFLAGS1=""
-LFLAGS2="-s"
-+LFLAGS2=""
++LFLAGS2="${LFLAGS2}"
LN="ln -s"
CFLAGS_OPT=''
diff --git a/unzip/patches/unzip-6.0-cve-2014-8139.patch b/unzip/patches/unzip-6.0-cve-2014-8139.patch
new file mode 100644
index 000000000..226b35ac6
--- /dev/null
+++ b/unzip/patches/unzip-6.0-cve-2014-8139.patch
@@ -0,0 +1,79 @@
+diff --git a/extract.c b/extract.c
+index 9ef80b3..c741b5f 100644
+--- a/extract.c
++++ b/extract.c
+@@ -1,5 +1,5 @@
+ /*
+- Copyright (c) 1990-2009 Info-ZIP. All rights reserved.
++ Copyright (c) 1990-2014 Info-ZIP. All rights reserved.
+
+ See the accompanying file LICENSE, version 2009-Jan-02 or later
+ (the contents of which are also included in unzip.h) for terms of use.
+@@ -298,6 +298,8 @@ char ZCONST Far TruncNTSD[] =
+ #ifndef SFX
+ static ZCONST char Far InconsistEFlength[] = "bad extra-field entry:\n \
+ EF block length (%u bytes) exceeds remaining EF data (%u bytes)\n";
++ static ZCONST char Far TooSmallEBlength[] = "bad extra-field entry:\n \
++ EF block length (%u bytes) invalid (< %d)\n";
+ static ZCONST char Far InvalidComprDataEAs[] =
+ " invalid compressed data for EAs\n";
+ # if (defined(WIN32) && defined(NTSD_EAS))
+@@ -2020,7 +2022,8 @@ static int TestExtraField(__G__ ef, ef_len)
+ ebID = makeword(ef);
+ ebLen = (unsigned)makeword(ef+EB_LEN);
+
+- if (ebLen > (ef_len - EB_HEADSIZE)) {
++ if (ebLen > (ef_len - EB_HEADSIZE))
++ {
+ /* Discovered some extra field inconsistency! */
+ if (uO.qflag)
+ Info(slide, 1, ((char *)slide, "%-22s ",
+@@ -2155,11 +2158,29 @@ static int TestExtraField(__G__ ef, ef_len)
+ }
+ break;
+ case EF_PKVMS:
+- if (makelong(ef+EB_HEADSIZE) !=
+- crc32(CRCVAL_INITIAL, ef+(EB_HEADSIZE+4),
+- (extent)(ebLen-4)))
+- Info(slide, 1, ((char *)slide,
+- LoadFarString(BadCRC_EAs)));
++ /* 2015-01-30 SMS. Added sufficient-bytes test/message
++ * here. (Removed defective ebLen test above.)
++ *
++ * If sufficient bytes (EB_PKVMS_MINLEN) are available,
++ * then compare the stored CRC value with the calculated
++ * CRC for the remainder of the data (and complain about
++ * a mismatch).
++ */
++ if (ebLen < EB_PKVMS_MINLEN)
++ {
++ /* Insufficient bytes available. */
++ Info( slide, 1,
++ ((char *)slide, LoadFarString( TooSmallEBlength),
++ ebLen, EB_PKVMS_MINLEN));
++ }
++ else if (makelong(ef+ EB_HEADSIZE) !=
++ crc32(CRCVAL_INITIAL,
++ (ef+ EB_HEADSIZE+ EB_PKVMS_MINLEN),
++ (extent)(ebLen- EB_PKVMS_MINLEN)))
++ {
++ Info(slide, 1, ((char *)slide,
++ LoadFarString(BadCRC_EAs)));
++ }
+ break;
+ case EF_PKW32:
+ case EF_PKUNIX:
+diff --git a/unzpriv.h b/unzpriv.h
+index 005cee0..5c83a6e 100644
+--- a/unzpriv.h
++++ b/unzpriv.h
+@@ -1806,6 +1806,8 @@
+ #define EB_NTSD_VERSION 4 /* offset of NTSD version byte */
+ #define EB_NTSD_MAX_VER (0) /* maximum version # we know how to handle */
+
++#define EB_PKVMS_MINLEN 4 /* minimum data length of PKVMS extra block */
++
+ #define EB_ASI_CRC32 0 /* offset of ASI Unix field's crc32 checksum */
+ #define EB_ASI_MODE 4 /* offset of ASI Unix permission mode field */
+
+
diff --git a/unzip/patches/unzip-6.0-cve-2014-8140.patch b/unzip/patches/unzip-6.0-cve-2014-8140.patch
new file mode 100644
index 000000000..b9eba92b1
--- /dev/null
+++ b/unzip/patches/unzip-6.0-cve-2014-8140.patch
@@ -0,0 +1,25 @@
+diff --git a/extract.c b/extract.c
+index c741b5f..e4a4c7b 100644
+--- a/extract.c
++++ b/extract.c
+@@ -2240,10 +2240,17 @@ static int test_compr_eb(__G__ eb, eb_size, compr_offset, test_uc_ebdata)
+ if (compr_offset < 4) /* field is not compressed: */
+ return PK_OK; /* do nothing and signal OK */
+
++ /* Return no/bad-data error status if any problem is found:
++ * 1. eb_size is too small to hold the uncompressed size
++ * (eb_ucsize). (Else extract eb_ucsize.)
++ * 2. eb_ucsize is zero (invalid). 2014-12-04 SMS.
++ * 3. eb_ucsize is positive, but eb_size is too small to hold
++ * the compressed data header.
++ */
+ if ((eb_size < (EB_UCSIZE_P + 4)) ||
+- ((eb_ucsize = makelong(eb+(EB_HEADSIZE+EB_UCSIZE_P))) > 0L &&
+- eb_size <= (compr_offset + EB_CMPRHEADLEN)))
+- return IZ_EF_TRUNC; /* no compressed data! */
++ ((eb_ucsize = makelong( eb+ (EB_HEADSIZE+ EB_UCSIZE_P))) == 0L) ||
++ ((eb_ucsize > 0L) && (eb_size <= (compr_offset + EB_CMPRHEADLEN))))
++ return IZ_EF_TRUNC; /* no/bad compressed data! */
+
+ method = makeword(eb + (EB_HEADSIZE + compr_offset));
+ if ((method == STORED) && (eb_size != compr_offset + EB_CMPRHEADLEN + eb_ucsize))
diff --git a/unzip/patches/unzip-6.0-cve-2014-8141.patch b/unzip/patches/unzip-6.0-cve-2014-8141.patch
new file mode 100644
index 000000000..584c576f7
--- /dev/null
+++ b/unzip/patches/unzip-6.0-cve-2014-8141.patch
@@ -0,0 +1,138 @@
+diff --git a/fileio.c b/fileio.c
+index 03fc4be..2a61a30 100644
+--- a/fileio.c
++++ b/fileio.c
+@@ -176,6 +176,8 @@ static ZCONST char Far FilenameTooLongTrunc[] =
+ #endif
+ static ZCONST char Far ExtraFieldTooLong[] =
+ "warning: extra field too long (%d). Ignoring...\n";
++static ZCONST char Far ExtraFieldCorrupt[] =
++ "warning: extra field (type: 0x%04x) corrupt. Continuing...\n";
+
+ #ifdef WINDLL
+ static ZCONST char Far DiskFullQuery[] =
+@@ -2300,7 +2302,13 @@ int do_string(__G__ length, option) /* return PK-type error code */
+ length = length2;
+ }
+ /* Looks like here is where extra fields are read */
+- getZip64Data(__G__ G.extra_field, length);
++ if (getZip64Data(__G__ G.extra_field, length) != PK_COOL)
++ {
++ Info(slide, 0x401, ((char *)slide,
++ LoadFarString( ExtraFieldCorrupt), EF_PKSZ64));
++ error = PK_WARN;
++ }
++
+ #ifdef UNICODE_SUPPORT
+ G.unipath_filename = NULL;
+ if (G.UzO.U_flag < 2) {
+diff --git a/process.c b/process.c
+index be6e006..0d57ab4 100644
+--- a/process.c
++++ b/process.c
+@@ -1,5 +1,5 @@
+ /*
+- Copyright (c) 1990-2009 Info-ZIP. All rights reserved.
++ Copyright (c) 1990-2014 Info-ZIP. All rights reserved.
+
+ See the accompanying file LICENSE, version 2009-Jan-02 or later
+ (the contents of which are also included in unzip.h) for terms of use.
+@@ -1894,48 +1894,83 @@ int getZip64Data(__G__ ef_buf, ef_len)
+ and a 4-byte version of disk start number.
+ Sets both local header and central header fields. Not terribly clever,
+ but it means that this procedure is only called in one place.
++
++ 2014-12-05 SMS.
++ Added checks to ensure that enough data are available before calling
++ makeint64() or makelong(). Replaced various sizeof() values with
++ simple ("4" or "8") constants. (The Zip64 structures do not depend
++ on our variable sizes.) Error handling is crude, but we should now
++ stay within the buffer.
+ ---------------------------------------------------------------------------*/
+
++#define Z64FLGS 0xffff
++#define Z64FLGL 0xffffffff
++
+ if (ef_len == 0 || ef_buf == NULL)
+ return PK_COOL;
+
+ Trace((stderr,"\ngetZip64Data: scanning extra field of length %u\n",
+ ef_len));
+
+- while (ef_len >= EB_HEADSIZE) {
++ while (ef_len >= EB_HEADSIZE)
++ {
+ eb_id = makeword(EB_ID + ef_buf);
+ eb_len = makeword(EB_LEN + ef_buf);
+
+- if (eb_len > (ef_len - EB_HEADSIZE)) {
+- /* discovered some extra field inconsistency! */
++ if (eb_len > (ef_len - EB_HEADSIZE))
++ {
++ /* Extra block length exceeds remaining extra field length. */
+ Trace((stderr,
+ "getZip64Data: block length %u > rest ef_size %u\n", eb_len,
+ ef_len - EB_HEADSIZE));
+ break;
+ }
+- if (eb_id == EF_PKSZ64) {
+
++ if (eb_id == EF_PKSZ64)
++ {
+ int offset = EB_HEADSIZE;
+
+- if (G.crec.ucsize == 0xffffffff || G.lrec.ucsize == 0xffffffff){
+- G.lrec.ucsize = G.crec.ucsize = makeint64(offset + ef_buf);
+- offset += sizeof(G.crec.ucsize);
++ if ((G.crec.ucsize == Z64FLGL) || (G.lrec.ucsize == Z64FLGL))
++ {
++ if (offset+ 8 > ef_len)
++ return PK_ERR;
++
++ G.crec.ucsize = G.lrec.ucsize = makeint64(offset + ef_buf);
++ offset += 8;
+ }
+- if (G.crec.csize == 0xffffffff || G.lrec.csize == 0xffffffff){
+- G.csize = G.lrec.csize = G.crec.csize = makeint64(offset + ef_buf);
+- offset += sizeof(G.crec.csize);
++
++ if ((G.crec.csize == Z64FLGL) || (G.lrec.csize == Z64FLGL))
++ {
++ if (offset+ 8 > ef_len)
++ return PK_ERR;
++
++ G.csize = G.crec.csize = G.lrec.csize = makeint64(offset + ef_buf);
++ offset += 8;
+ }
+- if (G.crec.relative_offset_local_header == 0xffffffff){
++
++ if (G.crec.relative_offset_local_header == Z64FLGL)
++ {
++ if (offset+ 8 > ef_len)
++ return PK_ERR;
++
+ G.crec.relative_offset_local_header = makeint64(offset + ef_buf);
+- offset += sizeof(G.crec.relative_offset_local_header);
++ offset += 8;
+ }
+- if (G.crec.disk_number_start == 0xffff){
++
++ if (G.crec.disk_number_start == Z64FLGS)
++ {
++ if (offset+ 4 > ef_len)
++ return PK_ERR;
++
+ G.crec.disk_number_start = (zuvl_t)makelong(offset + ef_buf);
+- offset += sizeof(G.crec.disk_number_start);
++ offset += 4;
+ }
++#if 0
++ break; /* Expect only one EF_PKSZ64 block. */
++#endif /* 0 */
+ }
+
+- /* Skip this extra field block */
++ /* Skip this extra field block. */
+ ef_buf += (eb_len + EB_HEADSIZE);
+ ef_len -= (eb_len + EB_HEADSIZE);
+ }
diff --git a/unzip/patches/unzip-6.0-cve-2018-1000035-heap-based-overflow.patch b/unzip/patches/unzip-6.0-cve-2018-1000035-heap-based-overflow.patch
new file mode 100644
index 000000000..8ca713865
--- /dev/null
+++ b/unzip/patches/unzip-6.0-cve-2018-1000035-heap-based-overflow.patch
@@ -0,0 +1,34 @@
+--- a/fileio.c 2014-12-05 05:06:05 -0600
++++ b/fileio.c 2017-11-14 01:06:28 -0600
+@@ -1,5 +1,5 @@
+ /*
+- Copyright (c) 1990-2009 Info-ZIP. All rights reserved.
++ Copyright (c) 1990-2017 Info-ZIP. All rights reserved.
+
+ See the accompanying file LICENSE, version 2009-Jan-02 or later
+ (the contents of which are also included in unzip.h) for terms of use.
+@@ -1582,6 +1582,8 @@
+ int r = IZ_PW_ENTERED;
+ char *m;
+ char *prompt;
++ char *ep;
++ char *zp;
+
+ #ifndef REENTRANT
+ /* tell picky compilers to shut up about "unused variable" warnings */
+@@ -1590,9 +1592,12 @@
+
+ if (*rcnt == 0) { /* First call for current entry */
+ *rcnt = 2;
+- if ((prompt = (char *)malloc(2*FILNAMSIZ + 15)) != (char *)NULL) {
+- sprintf(prompt, LoadFarString(PasswPrompt),
+- FnFilter1(zfn), FnFilter2(efn));
++ zp = FnFilter1( zfn);
++ ep = FnFilter2( efn);
++ prompt = (char *)malloc( /* Slightly too long (2* "%s"). */
++ sizeof( PasswPrompt)+ strlen( zp)+ strlen( ep));
++ if (prompt != (char *)NULL) {
++ sprintf(prompt, LoadFarString(PasswPrompt), zp, ep);
+ m = prompt;
+ } else
+ m = (char *)LoadFarString(PasswPrompt2);
diff --git a/unzip/patches/unzip-6.0-cve-2018-18384.patch b/unzip/patches/unzip-6.0-cve-2018-18384.patch
new file mode 100644
index 000000000..54d4b8cb6
--- /dev/null
+++ b/unzip/patches/unzip-6.0-cve-2018-18384.patch
@@ -0,0 +1,35 @@
+--- unzip60/list.c
++++ unzip60/list.c
+@@ -97,7 +97,7 @@ int list_files(__G) /* return PK-type
+ {
+ int do_this_file=FALSE, cfactor, error, error_in_archive=PK_COOL;
+ #ifndef WINDLL
+- char sgn, cfactorstr[13];
++ char sgn, cfactorstr[1+10+1+1]; /* <sgn><int>%NUL */
+ int longhdr=(uO.vflag>1);
+ #endif
+ int date_format;
+@@ -389,9 +389,9 @@ int list_files(__G) /* return PK-type
+ }
+ #else /* !WINDLL */
+ if (cfactor == 100)
+- sprintf(cfactorstr, LoadFarString(CompFactor100));
++ snprintf(cfactorstr, sizeof(cfactorstr), LoadFarString(CompFactor100));
+ else
+- sprintf(cfactorstr, LoadFarString(CompFactorStr), sgn, cfactor);
++ snprintf(cfactorstr, sizeof(cfactorstr), LoadFarString(CompFactorStr), sgn, cfactor);
+ if (longhdr)
+ Info(slide, 0, ((char *)slide, LoadFarString(LongHdrStats),
+ FmZofft(G.crec.ucsize, "8", "u"), methbuf,
+@@ -471,9 +471,9 @@ int list_files(__G) /* return PK-type
+
+ #else /* !WINDLL */
+ if (cfactor == 100)
+- sprintf(cfactorstr, LoadFarString(CompFactor100));
++ snprintf(cfactorstr, sizeof(cfactorstr), LoadFarString(CompFactor100));
+ else
+- sprintf(cfactorstr, LoadFarString(CompFactorStr), sgn, cfactor);
++ snprintf(cfactorstr, sizeof(cfactorstr), LoadFarString(CompFactorStr), sgn, cfactor);
+ if (longhdr) {
+ Info(slide, 0, ((char *)slide, LoadFarString(LongFileTrailer),
+ FmZofft(tot_ucsize, "8", "u"), FmZofft(tot_csize, "8", "u"),
diff --git a/unzip/patches/unzip-6.0-fix-recmatch.patch b/unzip/patches/unzip-6.0-fix-recmatch.patch
new file mode 100644
index 000000000..2a8583c8c
--- /dev/null
+++ b/unzip/patches/unzip-6.0-fix-recmatch.patch
@@ -0,0 +1,477 @@
+diff -up unzip60/match.c.recmatch unzip60/match.c
+--- unzip60/match.c.recmatch 2005-08-14 13:00:36.000000000 -0400
++++ unzip60/match.c 2013-05-28 10:29:57.949077543 -0400
+@@ -27,16 +27,14 @@
+
+ ---------------------------------------------------------------------------
+
+- Copyright on recmatch() from Zip's util.c (although recmatch() was almost
+- certainly written by Mark Adler...ask me how I can tell :-) ):
++ Copyright on recmatch() from Zip's util.c
++ Copyright (c) 1990-2005 Info-ZIP. All rights reserved.
+
+- Copyright (C) 1990-1992 Mark Adler, Richard B. Wales, Jean-loup Gailly,
+- Kai Uwe Rommel and Igor Mandrichenko.
++ See the accompanying file LICENSE, version 2004-May-22 or later
++ for terms of use.
++ If, for some reason, both of these files are missing, the Info-ZIP license
++ also may be found at: ftp://ftp.info-zip.org/pub/infozip/license.html
+
+- Permission is granted to any individual or institution to use, copy,
+- or redistribute this software so long as all of the original files are
+- included unmodified, that it is not sold for profit, and that this copy-
+- right notice is retained.
+
+ ---------------------------------------------------------------------------
+
+@@ -53,7 +51,7 @@
+
+ A set is composed of characters or ranges; a range looks like ``character
+ hyphen character'' (as in 0-9 or A-Z). [0-9a-zA-Z_] is the minimal set of
+- characters allowed in the [..] pattern construct. Other characters are
++ characters ALlowed in the [..] pattern construct. Other characters are
+ allowed (i.e., 8-bit characters) if your system will support them.
+
+ To suppress the special syntactic significance of any of ``[]*?!^-\'', in-
+@@ -101,8 +99,32 @@
+ # define WILDCHAR '?'
+ # define BEG_RANGE '['
+ # define END_RANGE ']'
++# define WILDCHR_SINGLE '?'
++# define DIRSEP_CHR '/'
++# define WILDCHR_MULTI '*'
+ #endif
+
++#ifdef WILD_STOP_AT_DIR
++ int wild_stop_at_dir = 1; /* default wildcards do not include / in matches */
++#else
++ int wild_stop_at_dir = 0; /* default wildcards do include / in matches */
++#endif
++
++
++
++/*
++ * case mapping functions. case_map is used to ignore case in comparisons,
++ * to_up is used to force upper case even on Unix (for dosify option).
++ */
++#ifdef USE_CASE_MAP
++# define case_map(c) upper[(c) & 0xff]
++# define to_up(c) upper[(c) & 0xff]
++#else
++# define case_map(c) (c)
++# define to_up(c) ((c) >= 'a' && (c) <= 'z' ? (c)-'a'+'A' : (c))
++#endif /* USE_CASE_MAP */
++
++
+ #if 0 /* GRR: add this to unzip.h someday... */
+ #if !(defined(MSDOS) && defined(DOSWILD))
+ #ifdef WILD_STOP_AT_DIR
+@@ -114,8 +136,8 @@ int recmatch OF((ZCONST uch *pattern, ZC
+ int ignore_case __WDLPRO));
+ #endif
+ #endif /* 0 */
+-static int recmatch OF((ZCONST uch *pattern, ZCONST uch *string,
+- int ignore_case __WDLPRO));
++static int recmatch OF((ZCONST char *, ZCONST char *,
++ int));
+ static char *isshexp OF((ZCONST char *p));
+ static int namecmp OF((ZCONST char *s1, ZCONST char *s2));
+
+@@ -154,192 +176,240 @@ int match(string, pattern, ignore_case _
+ }
+ dospattern[j-1] = '\0'; /* nuke the end "." */
+ }
+- j = recmatch((uch *)dospattern, (uch *)string, ignore_case __WDL);
++ j = recmatch(dospattern, string, ignore_case);
+ free(dospattern);
+ return j == 1;
+ } else
+ #endif /* MSDOS && DOSWILD */
+- return recmatch((uch *)pattern, (uch *)string, ignore_case __WDL) == 1;
++ return recmatch(pattern, string, ignore_case) == 1;
+ }
+
++#ifdef _MBCS
++
++char *___tmp_ptr;
+
++#endif
+
+-static int recmatch(p, s, ic __WDL)
+- ZCONST uch *p; /* sh pattern to match */
+- ZCONST uch *s; /* string to which to match it */
+- int ic; /* true for case insensitivity */
+- __WDLDEF /* directory sepchar for WildStopAtDir mode, or 0 */
++static int recmatch(p, s, cs)
++ZCONST char *p; /* sh pattern to match */
++ZCONST char *s; /* string to match it to */
++int cs; /* flag: force case-sensitive matching */
+ /* Recursively compare the sh pattern p with the string s and return 1 if
+- * they match, and 0 or 2 if they don't or if there is a syntax error in the
+- * pattern. This routine recurses on itself no more deeply than the number
+- * of characters in the pattern. */
++ they match, and 0 or 2 if they don't or if there is a syntax error in the
++ pattern. This routine recurses on itself no deeper than the number of
++ characters in the pattern. */
+ {
+- unsigned int c; /* pattern char or start of range in [-] loop */
++ int c; /* pattern char or start of range in [-] loop */
++ /* Get first character, the pattern for new recmatch calls follows */
++ /* borrowed from Zip's global.c */
++ int no_wild = 0;
++ int allow_regex=1;
++ /* This fix provided by akt(a)m5.dion.ne.jp for Japanese.
++ See 21 July 2006 mail.
++ It only applies when p is pointing to a doublebyte character and
++ things like / and wildcards are not doublebyte. This probably
++ should not be needed. */
+
+- /* Get first character, the pattern for new recmatch calls follows */
+- c = *p; INCSTR(p);
++#ifdef _MBCS
++ if (CLEN(p) == 2) {
++ if (CLEN(s) == 2) {
++ return (*p == *s && *(p+1) == *(s+1)) ?
++ recmatch(p + 2, s + 2, cs) : 0;
++ } else {
++ return 0;
++ }
++ }
++#endif /* ?_MBCS */
+
+- /* If that was the end of the pattern, match if string empty too */
+- if (c == 0)
+- return *s == 0;
++ c = *POSTINCSTR(p);
+
+- /* '?' (or '%') matches any character (but not an empty string). */
+- if (c == WILDCHAR)
+-#ifdef WILD_STOP_AT_DIR
+- /* If uO.W_flag is non-zero, it won't match '/' */
+- return (*s && (!sepc || *s != (uch)sepc))
+- ? recmatch(p, s + CLEN(s), ic, sepc) : 0;
+-#else
+- return *s ? recmatch(p, s + CLEN(s), ic) : 0;
+-#endif
++ /* If that was the end of the pattern, match if string empty too */
++ if (c == 0)
++ return *s == 0;
++
++ /* '?' (or '%' or '#') matches any character (but not an empty string) */
++ if (c == WILDCHR_SINGLE) {
++ if (wild_stop_at_dir)
++ return (*s && *s != DIRSEP_CHR) ? recmatch(p, s + CLEN(s), cs) : 0;
++ else
++ return *s ? recmatch(p, s + CLEN(s), cs) : 0;
++ }
+
+- /* '*' matches any number of characters, including zero */
++ /* WILDCHR_MULTI ('*') matches any number of characters, including zero */
+ #ifdef AMIGA
+- if (c == '#' && *p == '?') /* "#?" is Amiga-ese for "*" */
+- c = '*', p++;
++ if (!no_wild && c == '#' && *p == '?') /* "#?" is Amiga-ese for "*" */
++ c = WILDCHR_MULTI, p++;
+ #endif /* AMIGA */
+- if (c == '*') {
+-#ifdef WILD_STOP_AT_DIR
+- if (sepc) {
+- /* check for single "*" or double "**" */
+-# ifdef AMIGA
+- if ((c = p[0]) == '#' && p[1] == '?') /* "#?" is Amiga-ese for "*" */
+- c = '*', p++;
+- if (c != '*') {
+-# else /* !AMIGA */
+- if (*p != '*') {
+-# endif /* ?AMIGA */
+- /* single "*": this doesn't match the dirsep character */
+- for (; *s && *s != (uch)sepc; INCSTR(s))
+- if ((c = recmatch(p, s, ic, sepc)) != 0)
+- return (int)c;
+- /* end of pattern: matched if at end of string, else continue */
+- if (*p == '\0')
+- return (*s == 0);
+- /* continue to match if at sepc in pattern, else give up */
+- return (*p == (uch)sepc || (*p == '\\' && p[1] == (uch)sepc))
+- ? recmatch(p, s, ic, sepc) : 2;
+- }
+- /* "**": this matches slashes */
+- ++p; /* move p behind the second '*' */
+- /* and continue with the non-W_flag code variant */
+- }
+-#endif /* WILD_STOP_AT_DIR */
++ if (!no_wild && c == WILDCHR_MULTI)
++ {
++ if (wild_stop_at_dir) {
++ /* Check for an immediately following WILDCHR_MULTI */
++# ifdef AMIGA
++ if ((c = p[0]) == '#' && p[1] == '?') /* "#?" is Amiga-ese for "*" */
++ c = WILDCHR_MULTI, p++;
++ if (c != WILDCHR_MULTI) {
++# else /* !AMIGA */
++ if (*p != WILDCHR_MULTI) {
++# endif /* ?AMIGA */
++ /* Single WILDCHR_MULTI ('*'): this doesn't match slashes */
++ for (; *s && *s != DIRSEP_CHR; INCSTR(s))
++ if ((c = recmatch(p, s, cs)) != 0)
++ return c;
++ /* end of pattern: matched if at end of string, else continue */
+ if (*p == 0)
+- return 1;
+- if (isshexp((ZCONST char *)p) == NULL) {
+- /* Optimization for rest of pattern being a literal string:
+- * If there are no other shell expression chars in the rest
+- * of the pattern behind the multi-char wildcard, then just
+- * compare the literal string tail.
+- */
+- ZCONST uch *srest;
+-
+- srest = s + (strlen((ZCONST char *)s) - strlen((ZCONST char *)p));
+- if (srest - s < 0)
+- /* remaining literal string from pattern is longer than rest
+- * of test string, there can't be a match
+- */
+- return 0;
+- else
+- /* compare the remaining literal pattern string with the last
+- * bytes of the test string to check for a match
+- */
++ return (*s == 0);
++ /* continue to match if at DIRSEP_CHR in pattern, else give up */
++ return (*p == DIRSEP_CHR || (*p == '\\' && p[1] == DIRSEP_CHR))
++ ? recmatch(p, s, cs) : 2;
++ }
++ /* Two consecutive WILDCHR_MULTI ("**"): this matches DIRSEP_CHR ('/') */
++ p++; /* move p past the second WILDCHR_MULTI */
++ /* continue with the normal non-WILD_STOP_AT_DIR code */
++ } /* wild_stop_at_dir */
++
++ /* Not wild_stop_at_dir */
++ if (*p == 0)
++ return 1;
++ if (!isshexp((char *)p))
++ {
++ /* optimization for rest of pattern being a literal string */
++
++ /* optimization to handle patterns like *.txt */
++ /* if the first char in the pattern is '*' and there */
++ /* are no other shell expression chars, i.e. a literal string */
++ /* then just compare the literal string at the end */
++
++ ZCONST char *srest;
++
++ srest = s + (strlen(s) - strlen(p));
++ if (srest - s < 0)
++ /* remaining literal string from pattern is longer than rest of
++ test string, there can't be a match
++ */
++ return 0;
++ else
++ /* compare the remaining literal pattern string with the last bytes
++ of the test string to check for a match */
+ #ifdef _MBCS
+- {
+- ZCONST uch *q = s;
++ {
++ ZCONST char *q = s;
+
+- /* MBCS-aware code must not scan backwards into a string from
+- * the end.
+- * So, we have to move forward by character from our well-known
+- * character position s in the test string until we have
+- * advanced to the srest position.
+- */
+- while (q < srest)
+- INCSTR(q);
+- /* In case the byte *srest is a trailing byte of a multibyte
+- * character in the test string s, we have actually advanced
+- * past the position (srest).
+- * For this case, the match has failed!
+- */
+- if (q != srest)
+- return 0;
+- return ((ic
+- ? namecmp((ZCONST char *)p, (ZCONST char *)q)
+- : strcmp((ZCONST char *)p, (ZCONST char *)q)
+- ) == 0);
+- }
++ /* MBCS-aware code must not scan backwards into a string from
++ * the end.
++ * So, we have to move forward by character from our well-known
++ * character position s in the test string until we have advanced
++ * to the srest position.
++ */
++ while (q < srest)
++ INCSTR(q);
++ /* In case the byte *srest is a trailing byte of a multibyte
++ * character, we have actually advanced past the position (srest).
++ * For this case, the match has failed!
++ */
++ if (q != srest)
++ return 0;
++ return ((cs ? strcmp(p, q) : namecmp(p, q)) == 0);
++ }
+ #else /* !_MBCS */
+- return ((ic
+- ? namecmp((ZCONST char *)p, (ZCONST char *)srest)
+- : strcmp((ZCONST char *)p, (ZCONST char *)srest)
+- ) == 0);
++ return ((cs ? strcmp(p, srest) : namecmp(p, srest)) == 0);
+ #endif /* ?_MBCS */
+- } else {
+- /* pattern contains more wildcards, continue with recursion... */
+- for (; *s; INCSTR(s))
+- if ((c = recmatch(p, s, ic __WDL)) != 0)
+- return (int)c;
+- return 2; /* 2 means give up--match will return false */
+- }
+ }
+-
+- /* Parse and process the list of characters and ranges in brackets */
+- if (c == BEG_RANGE) {
+- int e; /* flag true if next char to be taken literally */
+- ZCONST uch *q; /* pointer to end of [-] group */
+- int r; /* flag true to match anything but the range */
+-
+- if (*s == 0) /* need a character to match */
+- return 0;
+- p += (r = (*p == '!' || *p == '^')); /* see if reverse */
+- for (q = p, e = 0; *q; INCSTR(q)) /* find closing bracket */
+- if (e)
+- e = 0;
+- else
+- if (*q == '\\') /* GRR: change to ^ for MS-DOS, OS/2? */
+- e = 1;
+- else if (*q == END_RANGE)
+- break;
+- if (*q != END_RANGE) /* nothing matches if bad syntax */
+- return 0;
+- for (c = 0, e = (*p == '-'); p < q; INCSTR(p)) {
+- /* go through the list */
+- if (!e && *p == '\\') /* set escape flag if \ */
+- e = 1;
+- else if (!e && *p == '-') /* set start of range if - */
+- c = *(p-1);
+- else {
+- unsigned int cc = Case(*s);
+-
+- if (*(p+1) != '-')
+- for (c = c ? c : *p; c <= *p; c++) /* compare range */
+- if ((unsigned)Case(c) == cc) /* typecast for MSC bug */
+- return r ? 0 : recmatch(q + 1, s + 1, ic __WDL);
+- c = e = 0; /* clear range, escape flags */
+- }
+- }
+- return r ? recmatch(q + CLEN(q), s + CLEN(s), ic __WDL) : 0;
+- /* bracket match failed */
++ else
++ {
++ /* pattern contains more wildcards, continue with recursion... */
++ for (; *s; INCSTR(s))
++ if ((c = recmatch(p, s, cs)) != 0)
++ return c;
++ return 2; /* 2 means give up--shmatch will return false */
+ }
++ }
+
+- /* if escape ('\\'), just compare next character */
+- if (c == '\\' && (c = *p++) == 0) /* if \ at end, then syntax error */
+- return 0;
++#ifndef VMS /* No bracket matching in VMS */
++ /* Parse and process the list of characters and ranges in brackets */
++ if (!no_wild && allow_regex && c == '[')
++ {
++ int e; /* flag true if next char to be taken literally */
++ ZCONST char *q; /* pointer to end of [-] group */
++ int r; /* flag true to match anything but the range */
++
++ if (*s == 0) /* need a character to match */
++ return 0;
++ p += (r = (*p == '!' || *p == '^')); /* see if reverse */
++ for (q = p, e = 0; *q; q++) /* find closing bracket */
++ if (e)
++ e = 0;
++ else
++ if (*q == '\\')
++ e = 1;
++ else if (*q == ']')
++ break;
++ if (*q != ']') /* nothing matches if bad syntax */
++ return 0;
++ for (c = 0, e = *p == '-'; p < q; p++) /* go through the list */
++ {
++ if (e == 0 && *p == '\\') /* set escape flag if \ */
++ e = 1;
++ else if (e == 0 && *p == '-') /* set start of range if - */
++ c = *(p-1);
++ else
++ {
++ uch cc = (cs ? (uch)*s : case_map((uch)*s));
++ uch uc = (uch) c;
++ if (*(p+1) != '-')
++ for (uc = uc ? uc : (uch)*p; uc <= (uch)*p; uc++)
++ /* compare range */
++ if ((cs ? uc : case_map(uc)) == cc)
++ return r ? 0 : recmatch(q + CLEN(q), s + CLEN(s), cs);
++ c = e = 0; /* clear range, escape flags */
++ }
++ }
++ return r ? recmatch(q + CLEN(q), s + CLEN(s), cs) : 0;
++ /* bracket match failed */
++ }
++#endif /* !VMS */
+
+- /* just a character--compare it */
+-#ifdef QDOS
+- return QMatch(Case((uch)c), Case(*s)) ?
+- recmatch(p, s + CLEN(s), ic __WDL) : 0;
+-#else
+- return Case((uch)c) == Case(*s) ?
+- recmatch(p, s + CLEN(s), ic __WDL) : 0;
+-#endif
++ /* If escape ('\'), just compare next character */
++ if (!no_wild && c == '\\')
++ if ((c = *p++) == '\0') /* if \ at end, then syntax error */
++ return 0;
++
++#ifdef VMS
++ /* 2005-11-06 SMS.
++ Handle "..." wildcard in p with "." or "]" in s.
++ */
++ if ((c == '.') && (*p == '.') && (*(p+ CLEN( p)) == '.') &&
++ ((*s == '.') || (*s == ']')))
++ {
++ /* Match "...]" with "]". Continue after "]" in both. */
++ if ((*(p+ 2* CLEN( p)) == ']') && (*s == ']'))
++ return recmatch( (p+ 3* CLEN( p)), (s+ CLEN( s)), cs);
++
++ /* Else, look for a reduced match in s, until "]" in or end of s. */
++ for (; *s && (*s != ']'); INCSTR(s))
++ if (*s == '.')
++ /* If reduced match, then continue after "..." in p, "." in s. */
++ if ((c = recmatch( (p+ CLEN( p)), s, cs)) != 0)
++ return (int)c;
++
++ /* Match "...]" with "]". Continue after "]" in both. */
++ if ((*(p+ 2* CLEN( p)) == ']') && (*s == ']'))
++ return recmatch( (p+ 3* CLEN( p)), (s+ CLEN( s)), cs);
++
++ /* No reduced match. Quit. */
++ return 2;
++ }
++
++#endif /* def VMS */
++
++ /* Just a character--compare it */
++ return (cs ? c == *s : case_map((uch)c) == case_map((uch)*s)) ?
++ recmatch(p, s + CLEN(s), cs) : 0;
++}
+
+-} /* end function recmatch() */
+
+
+
++/*************************************************************************************************/
+ static char *isshexp(p)
+ ZCONST char *p;
+ /* If p is a sh expression, a pointer to the first special character is
diff --git a/unzip/patches/unzip-6.0-heap-overflow-infloop.patch b/unzip/patches/unzip-6.0-heap-overflow-infloop.patch
new file mode 100644
index 000000000..b517c403e
--- /dev/null
+++ b/unzip/patches/unzip-6.0-heap-overflow-infloop.patch
@@ -0,0 +1,104 @@
+From bdd4a0cecd745cb4825e4508b5bdf2579731086a Mon Sep 17 00:00:00 2001
+From: Petr Stodulka <pstodulk(a)redhat.com>
+Date: Mon, 14 Sep 2015 18:23:17 +0200
+Subject: [PATCH 1/3] upstream fix for heap overflow
+
+https://bugzilla.redhat.com/attachment.cgi?id=1073002
+---
+ crypt.c | 12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/crypt.c b/crypt.c
+index 784e411..a8975f2 100644
+--- a/crypt.c
++++ b/crypt.c
+@@ -465,7 +465,17 @@ int decrypt(__G__ passwrd)
+ GLOBAL(pInfo->encrypted) = FALSE;
+ defer_leftover_input(__G);
+ for (n = 0; n < RAND_HEAD_LEN; n++) {
+- b = NEXTBYTE;
++ /* 2012-11-23 SMS. (OUSPG report.)
++ * Quit early if compressed size < HEAD_LEN. The resulting
++ * error message ("unable to get password") could be improved,
++ * but it's better than trying to read nonexistent data, and
++ * then continuing with a negative G.csize. (See
++ * fileio.c:readbyte()).
++ */
++ if ((b = NEXTBYTE) == (ush)EOF)
++ {
++ return PK_ERR;
++ }
+ h[n] = (uch)b;
+ Trace((stdout, " (%02x)", h[n]));
+ }
+--
+2.4.6
+
+
+From 4b48844661ff9569f2ecf582a387d46a5775b5d8 Mon Sep 17 00:00:00 2001
+From: Kamil Dudka <kdudka(a)redhat.com>
+Date: Mon, 14 Sep 2015 18:24:56 +0200
+Subject: [PATCH 2/3] fix infinite loop when extracting empty bzip2 data
+
+Bug: https://sourceforge.net/p/infozip/patches/23/
+---
+ extract.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/extract.c b/extract.c
+index 7134bfe..29db027 100644
+--- a/extract.c
++++ b/extract.c
+@@ -2733,6 +2733,12 @@ __GDEF
+ int repeated_buf_err;
+ bz_stream bstrm;
+
++ if (G.incnt <= 0 && G.csize <= 0L) {
++ /* avoid an infinite loop */
++ Trace((stderr, "UZbunzip2() got empty input\n"));
++ return 2;
++ }
++
+ #if (defined(DLL) && !defined(NO_SLIDE_REDIR))
+ if (G.redirect_slide)
+ wsize = G.redirect_size, redirSlide = G.redirect_buffer;
+--
+2.4.6
+
+
+From bd150334fb4084f5555a6be26b015a0671cb5b74 Mon Sep 17 00:00:00 2001
+From: Kamil Dudka <kdudka(a)redhat.com>
+Date: Tue, 22 Sep 2015 18:52:23 +0200
+Subject: [PATCH 3/3] extract: prevent unsigned overflow on invalid input
+
+Suggested-by: Stefan Cornelius
+---
+ extract.c | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/extract.c b/extract.c
+index 29db027..b9ae667 100644
+--- a/extract.c
++++ b/extract.c
+@@ -1257,8 +1257,17 @@ static int extract_or_test_entrylist(__G__ numchunk,
+ if (G.lrec.compression_method == STORED) {
+ zusz_t csiz_decrypted = G.lrec.csize;
+
+- if (G.pInfo->encrypted)
++ if (G.pInfo->encrypted) {
++ if (csiz_decrypted < 12) {
++ /* handle the error now to prevent unsigned overflow */
++ Info(slide, 0x401, ((char *)slide,
++ LoadFarStringSmall(ErrUnzipNoFile),
++ LoadFarString(InvalidComprData),
++ LoadFarStringSmall2(Inflate)));
++ return PK_ERR;
++ }
+ csiz_decrypted -= 12;
++ }
+ if (G.lrec.ucsize != csiz_decrypted) {
+ Info(slide, 0x401, ((char *)slide,
+ LoadFarStringSmall2(WrnStorUCSizCSizDiff),
+--
+2.5.2
+
diff --git a/unzip/patches/unzip-6.0-manpage-fix.patch b/unzip/patches/unzip-6.0-manpage-fix.patch
new file mode 100644
index 000000000..ec06516bb
--- /dev/null
+++ b/unzip/patches/unzip-6.0-manpage-fix.patch
@@ -0,0 +1,11 @@
+--- unzip60/man/unzip.1 2011-01-11 11:59:59.000000000 +0000
++++ unzip60/man/unzip_new 2011-02-05 18:45:55.000000000 +0000
+@@ -424,7 +424,7 @@
+ .\" Amiga support possible eventually, but not yet
+ [MS-DOS, OS/2, NT] restore the volume label if the extraction medium is
+ removable (e.g., a diskette). Doubling the option (\fB\-$$\fP) allows fixed
+-media (hard disks) to be labelled as well. By default, volume labels are
++media (hard disks) to be labeled as well. By default, volume labels are
+ ignored.
+ .IP \fB\-/\fP\ \fIextensions\fP
+ [Acorn only] overrides the extension list supplied by Unzip$Ext environment
diff --git a/unzip/patches/unzip-6.0-overflow-long-fsize.patch b/unzip/patches/unzip-6.0-overflow-long-fsize.patch
new file mode 100644
index 000000000..80cd708f3
--- /dev/null
+++ b/unzip/patches/unzip-6.0-overflow-long-fsize.patch
@@ -0,0 +1,34 @@
+diff --git a/list.c b/list.c
+index f7359c3..4c3d703 100644
+--- a/list.c
++++ b/list.c
+@@ -97,7 +97,7 @@ int list_files(__G) /* return PK-type error code */
+ {
+ int do_this_file=FALSE, cfactor, error, error_in_archive=PK_COOL;
+ #ifndef WINDLL
+- char sgn, cfactorstr[10];
++ char sgn, cfactorstr[13];
+ int longhdr=(uO.vflag>1);
+ #endif
+ int date_format;
+@@ -339,7 +339,19 @@ int list_files(__G) /* return PK-type error code */
+ G.crec.compression_method == ENHDEFLATED) {
+ methbuf[5] = dtype[(G.crec.general_purpose_bit_flag>>1) & 3];
+ } else if (methnum >= NUM_METHODS) {
+- sprintf(&methbuf[4], "%03u", G.crec.compression_method);
++ /* 2013-02-26 SMS.
++ * http://sourceforge.net/tracker/?func=detail
++ * &aid=2861648&group_id=118012&atid=679786
++ * Unexpectedly large compression methods overflow
++ * &methbuf[]. Use the old, three-digit decimal format
++ * for values which fit. Otherwise, sacrifice the
++ * colon, and use four-digit hexadecimal.
++ */
++ if (G.crec.compression_method <= 999) {
++ sprintf( &methbuf[ 4], "%03u", G.crec.compression_method);
++ } else {
++ sprintf( &methbuf[ 3], "%04X", G.crec.compression_method);
++ }
+ }
+
+ #if 0 /* GRR/Euro: add this? */
diff --git a/unzip/patches/unzip-6.0-overflow.patch b/unzip/patches/unzip-6.0-overflow.patch
new file mode 100644
index 000000000..228c28377
--- /dev/null
+++ b/unzip/patches/unzip-6.0-overflow.patch
@@ -0,0 +1,25 @@
+diff --git a/extract.c b/extract.c
+index a0a4929..9ef80b3 100644
+--- a/extract.c
++++ b/extract.c
+@@ -2214,6 +2214,7 @@ static int test_compr_eb(__G__ eb, eb_size, compr_offset, test_uc_ebdata)
+ ulg eb_ucsize;
+ uch *eb_ucptr;
+ int r;
++ ush method;
+
+ if (compr_offset < 4) /* field is not compressed: */
+ return PK_OK; /* do nothing and signal OK */
+@@ -2223,6 +2224,12 @@ static int test_compr_eb(__G__ eb, eb_size, compr_offset, test_uc_ebdata)
+ eb_size <= (compr_offset + EB_CMPRHEADLEN)))
+ return IZ_EF_TRUNC; /* no compressed data! */
+
++ method = makeword(eb + (EB_HEADSIZE + compr_offset));
++ if ((method == STORED) && (eb_size != compr_offset + EB_CMPRHEADLEN + eb_ucsize))
++ return PK_ERR; /* compressed & uncompressed
++ * should match in STORED
++ * method */
++
+ if (
+ #ifdef INT_16BIT
+ (((ulg)(extent)eb_ucsize) != eb_ucsize) ||
diff --git a/unzip/patches/unzip-6.0-symlink.patch b/unzip/patches/unzip-6.0-symlink.patch
new file mode 100644
index 000000000..d7eaf160b
--- /dev/null
+++ b/unzip/patches/unzip-6.0-symlink.patch
@@ -0,0 +1,17 @@
+diff --git a/process.c b/process.c
+index 1e9a1e1..905732b 100644
+--- a/process.c
++++ b/process.c
+@@ -1751,6 +1751,12 @@ int process_cdir_file_hdr(__G) /* return PK-type error code */
+ = (G.crec.general_purpose_bit_flag & (1 << 11)) == (1 << 11);
+ #endif
+
++#ifdef SYMLINKS
++ /* Initialize the symlink flag, may be set by the platform-specific
++ mapattr function. */
++ G.pInfo->symlink = 0;
++#endif
++
+ return PK_COOL;
+
+ } /* end function process_cdir_file_hdr() */
diff --git a/unzip/patches/unzip-6.0-timestamp.patch b/unzip/patches/unzip-6.0-timestamp.patch
new file mode 100644
index 000000000..2aa9424eb
--- /dev/null
+++ b/unzip/patches/unzip-6.0-timestamp.patch
@@ -0,0 +1,41 @@
+From: "Steven M. Schweda" <sms(a)antinode.info>
+Subject: Do not ignore extra fields containing Unix Timestamps
+Bug-Debian: https://bugs.debian.org/842993
+X-Debian-version: 6.0-21
+
+--- a/process.c
++++ b/process.c
+@@ -2914,10 +2914,13 @@
+ break;
+
+ case EF_IZUNIX2:
+- if (have_new_type_eb == 0) {
+- flags &= ~0x0ff; /* ignore any previous IZUNIX field */
++ if (have_new_type_eb == 0) { /* (< 1) */
+ have_new_type_eb = 1;
+ }
++ if (have_new_type_eb <= 1) {
++ /* Ignore any prior (EF_IZUNIX/EF_PKUNIX) UID/GID. */
++ flags &= 0x0ff;
++ }
+ #ifdef IZ_HAVE_UXUIDGID
+ if (have_new_type_eb > 1)
+ break; /* IZUNIX3 overrides IZUNIX2 e.f. block ! */
+@@ -2933,6 +2936,8 @@
+ /* new 3rd generation Unix ef */
+ have_new_type_eb = 2;
+
++ /* Ignore any prior EF_IZUNIX/EF_PKUNIX/EF_IZUNIX2 UID/GID. */
++ flags &= 0x0ff;
+ /*
+ Version 1 byte version of this extra field, currently 1
+ UIDSize 1 byte Size of UID field
+@@ -2953,8 +2958,6 @@
+ uid_size = *((EB_HEADSIZE + 1) + ef_buf);
+ gid_size = *((EB_HEADSIZE + uid_size + 2) + ef_buf);
+
+- flags &= ~0x0ff; /* ignore any previous UNIX field */
+-
+ if ( read_ux3_value((EB_HEADSIZE + 2) + ef_buf,
+ uid_size, &z_uidgid[0])
+ &&
diff --git a/unzip/patches/unzip-6.0-valgrind.patch b/unzip/patches/unzip-6.0-valgrind.patch
new file mode 100644
index 000000000..41a752023
--- /dev/null
+++ b/unzip/patches/unzip-6.0-valgrind.patch
@@ -0,0 +1,26 @@
+diff --git a/fileio.c b/fileio.c
+index ba0a1d0..03fc4be 100644
+--- a/fileio.c
++++ b/fileio.c
+@@ -2006,6 +2006,7 @@ int do_string(__G__ length, option) /* return PK-type error code */
+ unsigned comment_bytes_left;
+ unsigned int block_len;
+ int error=PK_OK;
++ unsigned int length2;
+ #ifdef AMIGA
+ char tmp_fnote[2 * AMIGA_FILENOTELEN]; /* extra room for squozen chars */
+ #endif
+@@ -2292,8 +2293,12 @@ int do_string(__G__ length, option) /* return PK-type error code */
+ seek_zipf(__G__ G.cur_zipfile_bufstart - G.extra_bytes +
+ (G.inptr-G.inbuf) + length);
+ } else {
+- if (readbuf(__G__ (char *)G.extra_field, length) == 0)
++ if ((length2 = readbuf(__G__ (char *)G.extra_field, length)) == 0)
+ return PK_EOF;
++ if(length2 < length) {
++ memset (__G__ (char *)G.extra_field+length2, 0 , length-length2);
++ length = length2;
++ }
+ /* Looks like here is where extra fields are read */
+ getZip64Data(__G__ G.extra_field, length);
+ #ifdef UNICODE_SUPPORT
diff --git a/unzip/patches/unzip-6.0-x-option.patch b/unzip/patches/unzip-6.0-x-option.patch
new file mode 100644
index 000000000..72c77aeb7
--- /dev/null
+++ b/unzip/patches/unzip-6.0-x-option.patch
@@ -0,0 +1,28 @@
+--- ./process.c.orig 2009-03-06 02:25:10.000000000 +0100
++++ ./process.c 2013-09-12 10:51:16.000000000 +0200
+@@ -2901,9 +2901,9 @@
+ */
+
+ #ifdef IZ_HAVE_UXUIDGID
+- if (eb_len >= EB_UX3_MINLEN
+- && z_uidgid != NULL
+- && (*((EB_HEADSIZE + 0) + ef_buf) == 1)
++ if ((eb_len >= EB_UX3_MINLEN)
++ && (z_uidgid != NULL)
++ && ((*((EB_HEADSIZE + 0) + ef_buf) == 1)))
+ /* only know about version 1 */
+ {
+ uch uid_size;
+@@ -2915,10 +2915,10 @@
+ flags &= ~0x0ff; /* ignore any previous UNIX field */
+
+ if ( read_ux3_value((EB_HEADSIZE + 2) + ef_buf,
+- uid_size, z_uidgid[0])
++ uid_size, &z_uidgid[0])
+ &&
+ read_ux3_value((EB_HEADSIZE + uid_size + 3) + ef_buf,
+- gid_size, z_uidgid[1]) )
++ gid_size, &z_uidgid[1]) )
+ {
+ flags |= EB_UX2_VALID; /* signal success */
+ }
diff --git a/unzip/patches/unzip-gnu89-build.patch b/unzip/patches/unzip-gnu89-build.patch
new file mode 100644
index 000000000..706f12531
--- /dev/null
+++ b/unzip/patches/unzip-gnu89-build.patch
@@ -0,0 +1,15 @@
+unzip uses C89-only features, so it needs to be built in C89 mode.
+
+diff --git a/unix/Makefile b/unix/Makefile
+index ab32270cf4b9b2cf..5eabbe13095e1f58 100644
+--- a/unix/Makefile
++++ b/unix/Makefile
+@@ -545,7 +545,7 @@ generic: flags # now try autoconfigure first
+ # make $(MAKEF) unzips CF="${CF} `cat flags`"
+
+ generic_gcc:
+- $(MAKE) $(MAKEF) generic CC=gcc IZ_BZIP2="$(IZ_BZIP2)"
++ $(MAKE) $(MAKEF) generic CC="gcc -std=gnu89" IZ_BZIP2="$(IZ_BZIP2)"
+
+ # extensions to perform SVR4 package-creation after compilation
+ generic_pkg: generic svr4package
diff --git a/unzip/patches/unzip-zipbomb-manpage.patch b/unzip/patches/unzip-zipbomb-manpage.patch
new file mode 100644
index 000000000..bcee827a0
--- /dev/null
+++ b/unzip/patches/unzip-zipbomb-manpage.patch
@@ -0,0 +1,25 @@
+From 6fe72291a5563cdbcd2bdd87e36528537b7cdcfb Mon Sep 17 00:00:00 2001
+From: Jakub Martisko <jamartis(a)redhat.com>
+Date: Mon, 18 Nov 2019 14:17:46 +0100
+Subject: [PATCH] update the man page
+
+---
+ man/unzip.1 | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/man/unzip.1 b/man/unzip.1
+index 21816d1..4d66073 100644
+--- a/man/unzip.1
++++ b/man/unzip.1
+@@ -850,6 +850,8 @@ the specified zipfiles were not found.
+ invalid options were specified on the command line.
+ .IP 11
+ no matching files were found.
++.IP 12
++invalid zip file with overlapped components (possible zip-bomb). The zip-bomb checks can be disabled by using the UNZIP_DISABLE_ZIPBOMB_DETECTION=TRUE environment variable.
+ .IP 50
+ the disk is (or was) full during extraction.
+ .IP 51
+--
+2.23.0
+
diff --git a/unzip/patches/unzip-zipbomb-part1.patch b/unzip/patches/unzip-zipbomb-part1.patch
new file mode 100644
index 000000000..35cf85652
--- /dev/null
+++ b/unzip/patches/unzip-zipbomb-part1.patch
@@ -0,0 +1,25 @@
+From 41beb477c5744bc396fa1162ee0c14218ec12213 Mon Sep 17 00:00:00 2001
+From: Mark Adler <madler(a)alumni.caltech.edu>
+Date: Mon, 27 May 2019 08:20:32 -0700
+Subject: [PATCH] Fix bug in undefer_input() that misplaced the input state.
+
+---
+ fileio.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/fileio.c b/fileio.c
+index c042987..bc00d74 100644
+--- a/fileio.c
++++ b/fileio.c
+@@ -530,8 +530,10 @@ void undefer_input(__G)
+ * This condition was checked when G.incnt_leftover was set > 0 in
+ * defer_leftover_input(), and it is NOT allowed to touch G.csize
+ * before calling undefer_input() when (G.incnt_leftover > 0)
+- * (single exception: see read_byte()'s "G.csize <= 0" handling) !!
++ * (single exception: see readbyte()'s "G.csize <= 0" handling) !!
+ */
++ if (G.csize < 0L)
++ G.csize = 0L;
+ G.incnt = G.incnt_leftover + (int)G.csize;
+ G.inptr = G.inptr_leftover - (int)G.csize;
+ G.incnt_leftover = 0;
diff --git a/unzip/patches/unzip-zipbomb-part2.patch b/unzip/patches/unzip-zipbomb-part2.patch
new file mode 100644
index 000000000..903c84576
--- /dev/null
+++ b/unzip/patches/unzip-zipbomb-part2.patch
@@ -0,0 +1,349 @@
+From 47b3ceae397d21bf822bc2ac73052a4b1daf8e1c Mon Sep 17 00:00:00 2001
+From: Mark Adler <madler(a)alumni.caltech.edu>
+Date: Tue, 11 Jun 2019 22:01:18 -0700
+Subject: [PATCH] Detect and reject a zip bomb using overlapped entries.
+
+This detects an invalid zip file that has at least one entry that
+overlaps with another entry or with the central directory to the
+end of the file. A Fifield zip bomb uses overlapped local entries
+to vastly increase the potential inflation ratio. Such an invalid
+zip file is rejected.
+
+See https://www.bamsoftware.com/hacks/zipbomb/ for David Fifield's
+analysis, construction, and examples of such zip bombs.
+
+The detection maintains a list of covered spans of the zip files
+so far, where the central directory to the end of the file and any
+bytes preceding the first entry at zip file offset zero are
+considered covered initially. Then as each entry is decompressed
+or tested, it is considered covered. When a new entry is about to
+be processed, its initial offset is checked to see if it is
+contained by a covered span. If so, the zip file is rejected as
+invalid.
+
+This commit depends on a preceding commit: "Fix bug in
+undefer_input() that misplaced the input state."
+---
+ extract.c | 190 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ globals.c | 1 +
+ globals.h | 3 +
+ process.c | 11 ++++
+ unzip.h | 1 +
+ 5 files changed, 205 insertions(+), 1 deletion(-)
+
+diff --git a/extract.c b/extract.c
+index 1acd769..0973a33 100644
+--- a/extract.c
++++ b/extract.c
+@@ -319,6 +319,125 @@ static ZCONST char Far UnsupportedExtraField[] =
+ "\nerror: unsupported extra-field compression type (%u)--skipping\n";
+ static ZCONST char Far BadExtraFieldCRC[] =
+ "error [%s]: bad extra-field CRC %08lx (should be %08lx)\n";
++static ZCONST char Far NotEnoughMemCover[] =
++ "error: not enough memory for bomb detection\n";
++static ZCONST char Far OverlappedComponents[] =
++ "error: invalid zip file with overlapped components (possible zip bomb)\n";
++
++
++
++
++
++/* A growable list of spans. */
++typedef zoff_t bound_t;
++typedef struct {
++ bound_t beg; /* start of the span */
++ bound_t end; /* one past the end of the span */
++} span_t;
++typedef struct {
++ span_t *span; /* allocated, distinct, and sorted list of spans */
++ size_t num; /* number of spans in the list */
++ size_t max; /* allocated number of spans (num <= max) */
++} cover_t;
++
++/*
++ * Return the index of the first span in cover whose beg is greater than val.
++ * If there is no such span, then cover->num is returned.
++ */
++static size_t cover_find(cover, val)
++ cover_t *cover;
++ bound_t val;
++{
++ size_t lo = 0, hi = cover->num;
++ while (lo < hi) {
++ size_t mid = (lo + hi) >> 1;
++ if (val < cover->span[mid].beg)
++ hi = mid;
++ else
++ lo = mid + 1;
++ }
++ return hi;
++}
++
++/* Return true if val lies within any one of the spans in cover. */
++static int cover_within(cover, val)
++ cover_t *cover;
++ bound_t val;
++{
++ size_t pos = cover_find(cover, val);
++ return pos > 0 && val < cover->span[pos - 1].end;
++}
++
++/*
++ * Add a new span to the list, but only if the new span does not overlap any
++ * spans already in the list. The new span covers the values beg..end-1. beg
++ * must be less than end.
++ *
++ * Keep the list sorted and merge adjacent spans. Grow the allocated space for
++ * the list as needed. On success, 0 is returned. If the new span overlaps any
++ * existing spans, then 1 is returned and the new span is not added to the
++ * list. If the new span is invalid because beg is greater than or equal to
++ * end, then -1 is returned. If the list needs to be grown but the memory
++ * allocation fails, then -2 is returned.
++ */
++static int cover_add(cover, beg, end)
++ cover_t *cover;
++ bound_t beg;
++ bound_t end;
++{
++ size_t pos;
++ int prec, foll;
++
++ if (beg >= end)
++ /* The new span is invalid. */
++ return -1;
++
++ /* Find where the new span should go, and make sure that it does not
++ overlap with any existing spans. */
++ pos = cover_find(cover, beg);
++ if ((pos > 0 && beg < cover->span[pos - 1].end) ||
++ (pos < cover->num && end > cover->span[pos].beg))
++ return 1;
++
++ /* Check for adjacencies. */
++ prec = pos > 0 && beg == cover->span[pos - 1].end;
++ foll = pos < cover->num && end == cover->span[pos].beg;
++ if (prec && foll) {
++ /* The new span connects the preceding and following spans. Merge the
++ following span into the preceding span, and delete the following
++ span. */
++ cover->span[pos - 1].end = cover->span[pos].end;
++ cover->num--;
++ memmove(cover->span + pos, cover->span + pos + 1,
++ (cover->num - pos) * sizeof(span_t));
++ }
++ else if (prec)
++ /* The new span is adjacent only to the preceding span. Extend the end
++ of the preceding span. */
++ cover->span[pos - 1].end = end;
++ else if (foll)
++ /* The new span is adjacent only to the following span. Extend the
++ beginning of the following span. */
++ cover->span[pos].beg = beg;
++ else {
++ /* The new span has gaps between both the preceding and the following
++ spans. Assure that there is room and insert the span. */
++ if (cover->num == cover->max) {
++ size_t max = cover->max == 0 ? 16 : cover->max << 1;
++ span_t *span = realloc(cover->span, max * sizeof(span_t));
++ if (span == NULL)
++ return -2;
++ cover->span = span;
++ cover->max = max;
++ }
++ memmove(cover->span + pos + 1, cover->span + pos,
++ (cover->num - pos) * sizeof(span_t));
++ cover->num++;
++ cover->span[pos].beg = beg;
++ cover->span[pos].end = end;
++ }
++ return 0;
++}
+
+
+
+@@ -374,6 +493,29 @@ int extract_or_test_files(__G) /* return PK-type error code */
+ }
+ #endif /* !SFX || SFX_EXDIR */
+
++ /* One more: initialize cover structure for bomb detection. Start with a
++ span that covers the central directory though the end of the file. */
++ if (G.cover == NULL) {
++ G.cover = malloc(sizeof(cover_t));
++ if (G.cover == NULL) {
++ Info(slide, 0x401, ((char *)slide,
++ LoadFarString(NotEnoughMemCover)));
++ return PK_MEM;
++ }
++ ((cover_t *)G.cover)->span = NULL;
++ ((cover_t *)G.cover)->max = 0;
++ }
++ ((cover_t *)G.cover)->num = 0;
++ if ((G.extra_bytes != 0 &&
++ cover_add((cover_t *)G.cover, 0, G.extra_bytes) != 0) ||
++ cover_add((cover_t *)G.cover,
++ G.extra_bytes + G.ecrec.offset_start_central_directory,
++ G.ziplen) != 0) {
++ Info(slide, 0x401, ((char *)slide,
++ LoadFarString(NotEnoughMemCover)));
++ return PK_MEM;
++ }
++
+ /*---------------------------------------------------------------------------
+ The basic idea of this function is as follows. Since the central di-
+ rectory lies at the end of the zipfile and the member files lie at the
+@@ -591,7 +733,8 @@ int extract_or_test_files(__G) /* return PK-type error code */
+ if (error > error_in_archive)
+ error_in_archive = error;
+ /* ...and keep going (unless disk full or user break) */
+- if (G.disk_full > 1 || error_in_archive == IZ_CTRLC) {
++ if (G.disk_full > 1 || error_in_archive == IZ_CTRLC ||
++ error == PK_BOMB) {
+ /* clear reached_end to signal premature stop ... */
+ reached_end = FALSE;
+ /* ... and cancel scanning the central directory */
+@@ -1060,6 +1203,11 @@ static int extract_or_test_entrylist(__G__ numchunk,
+
+ /* seek_zipf(__G__ pInfo->offset); */
+ request = G.pInfo->offset + G.extra_bytes;
++ if (cover_within((cover_t *)G.cover, request)) {
++ Info(slide, 0x401, ((char *)slide,
++ LoadFarString(OverlappedComponents)));
++ return PK_BOMB;
++ }
+ inbuf_offset = request % INBUFSIZ;
+ bufstart = request - inbuf_offset;
+
+@@ -1591,6 +1739,18 @@ static int extract_or_test_entrylist(__G__ numchunk,
+ return IZ_CTRLC; /* cancel operation by user request */
+ }
+ #endif
++ error = cover_add((cover_t *)G.cover, request,
++ G.cur_zipfile_bufstart + (G.inptr - G.inbuf));
++ if (error < 0) {
++ Info(slide, 0x401, ((char *)slide,
++ LoadFarString(NotEnoughMemCover)));
++ return PK_MEM;
++ }
++ if (error != 0) {
++ Info(slide, 0x401, ((char *)slide,
++ LoadFarString(OverlappedComponents)));
++ return PK_BOMB;
++ }
+ #ifdef MACOS /* MacOS is no preemptive OS, thus call event-handling by hand */
+ UserStop();
+ #endif
+@@ -1992,6 +2152,34 @@ static int extract_or_test_member(__G) /* return PK-type error code */
+ }
+
+ undefer_input(__G);
++
++ if ((G.lrec.general_purpose_bit_flag & 8) != 0) {
++ /* skip over data descriptor (harder than it sounds, due to signature
++ * ambiguity)
++ */
++# define SIG 0x08074b50
++# define LOW 0xffffffff
++ uch buf[12];
++ unsigned shy = 12 - readbuf((char *)buf, 12);
++ ulg crc = shy ? 0 : makelong(buf);
++ ulg clen = shy ? 0 : makelong(buf + 4);
++ ulg ulen = shy ? 0 : makelong(buf + 8); /* or high clen if ZIP64 */
++ if (crc == SIG && /* if not SIG, no signature */
++ (G.lrec.crc32 != SIG || /* if not SIG, have signature */
++ (clen == SIG && /* if not SIG, no signature */
++ ((G.lrec.csize & LOW) != SIG || /* if not SIG, have signature */
++ (ulen == SIG && /* if not SIG, no signature */
++ (G.zip64 ? G.lrec.csize >> 32 : G.lrec.ucsize) != SIG
++ /* if not SIG, have signature */
++ )))))
++ /* skip four more bytes to account for signature */
++ shy += 4 - readbuf((char *)buf, 4);
++ if (G.zip64)
++ shy += 8 - readbuf((char *)buf, 8); /* skip eight more for ZIP64 */
++ if (shy)
++ error = PK_ERR;
++ }
++
+ return error;
+
+ } /* end function extract_or_test_member() */
+diff --git a/globals.c b/globals.c
+index fa8cca5..1e0f608 100644
+--- a/globals.c
++++ b/globals.c
+@@ -181,6 +181,7 @@ Uz_Globs *globalsCtor()
+ # if (!defined(NO_TIMESTAMPS))
+ uO.D_flag=1; /* default to '-D', no restoration of dir timestamps */
+ # endif
++ G.cover = NULL; /* not allocated yet */
+ #endif
+
+ uO.lflag=(-1);
+diff --git a/globals.h b/globals.h
+index 11b7215..2bdcdeb 100644
+--- a/globals.h
++++ b/globals.h
+@@ -260,12 +260,15 @@ typedef struct Globals {
+ ecdir_rec ecrec; /* used in unzip.c, extract.c */
+ z_stat statbuf; /* used by main, mapname, check_for_newer */
+
++ int zip64; /* true if Zip64 info in extra field */
++
+ int mem_mode;
+ uch *outbufptr; /* extract.c static */
+ ulg outsize; /* extract.c static */
+ int reported_backslash; /* extract.c static */
+ int disk_full;
+ int newfile;
++ void **cover; /* used in extract.c for bomb detection */
+
+ int didCRlast; /* fileio static */
+ ulg numlines; /* fileio static: number of lines printed */
+diff --git a/process.c b/process.c
+index 1e9a1e1..d2e4dc3 100644
+--- a/process.c
++++ b/process.c
+@@ -637,6 +637,13 @@ void free_G_buffers(__G) /* releases all memory allocated in global vars */
+ }
+ #endif
+
++ /* Free the cover span list and the cover structure. */
++ if (G.cover != NULL) {
++ free(*(G.cover));
++ free(G.cover);
++ G.cover = NULL;
++ }
++
+ } /* end function free_G_buffers() */
+
+
+@@ -1890,6 +1897,8 @@ int getZip64Data(__G__ ef_buf, ef_len)
+ #define Z64FLGS 0xffff
+ #define Z64FLGL 0xffffffff
+
++ G.zip64 = FALSE;
++
+ if (ef_len == 0 || ef_buf == NULL)
+ return PK_COOL;
+
+@@ -1927,6 +1936,8 @@ int getZip64Data(__G__ ef_buf, ef_len)
+ #if 0
+ break; /* Expect only one EF_PKSZ64 block. */
+ #endif /* 0 */
++
++ G.zip64 = TRUE;
+ }
+
+ /* Skip this extra field block. */
+diff --git a/unzip.h b/unzip.h
+index 5b2a326..ed24a5b 100644
+--- a/unzip.h
++++ b/unzip.h
+@@ -645,6 +645,7 @@ typedef struct _Uzp_cdir_Rec {
+ #define PK_NOZIP 9 /* zipfile not found */
+ #define PK_PARAM 10 /* bad or illegal parameters specified */
+ #define PK_FIND 11 /* no files found */
++#define PK_BOMB 12 /* likely zip bomb */
+ #define PK_DISK 50 /* disk full */
+ #define PK_EOF 51 /* unexpected EOF */
+
diff --git a/unzip/patches/unzip-zipbomb-part3.patch b/unzip/patches/unzip-zipbomb-part3.patch
new file mode 100644
index 000000000..3b8d67b77
--- /dev/null
+++ b/unzip/patches/unzip-zipbomb-part3.patch
@@ -0,0 +1,112 @@
+From 6d351831be705cc26d897db44f878a978f4138fc Mon Sep 17 00:00:00 2001
+From: Mark Adler <madler(a)alumni.caltech.edu>
+Date: Thu, 25 Jul 2019 20:43:17 -0700
+Subject: [PATCH] Do not raise a zip bomb alert for a misplaced central
+ directory.
+
+There is a zip-like file in the Firefox distribution, omni.ja,
+which is a zip container with the central directory placed at the
+start of the file instead of after the local entries as required
+by the zip standard. This commit marks the actual location of the
+central directory, as well as the end of central directory records,
+as disallowed locations. This now permits such containers to not
+raise a zip bomb alert, where in fact there are no overlaps.
+---
+ extract.c | 25 +++++++++++++++++++------
+ process.c | 6 ++++++
+ unzpriv.h | 10 ++++++++++
+ 3 files changed, 35 insertions(+), 6 deletions(-)
+
+diff --git a/extract.c b/extract.c
+index 0973a33..1b73cb0 100644
+--- a/extract.c
++++ b/extract.c
+@@ -493,8 +493,11 @@ int extract_or_test_files(__G) /* return PK-type error code */
+ }
+ #endif /* !SFX || SFX_EXDIR */
+
+- /* One more: initialize cover structure for bomb detection. Start with a
+- span that covers the central directory though the end of the file. */
++ /* One more: initialize cover structure for bomb detection. Start with
++ spans that cover any extra bytes at the start, the central directory,
++ the end of central directory record (including the Zip64 end of central
++ directory locator, if present), and the Zip64 end of central directory
++ record, if present. */
+ if (G.cover == NULL) {
+ G.cover = malloc(sizeof(cover_t));
+ if (G.cover == NULL) {
+@@ -506,15 +509,25 @@ int extract_or_test_files(__G) /* return PK-type error code */
+ ((cover_t *)G.cover)->max = 0;
+ }
+ ((cover_t *)G.cover)->num = 0;
+- if ((G.extra_bytes != 0 &&
+- cover_add((cover_t *)G.cover, 0, G.extra_bytes) != 0) ||
+- cover_add((cover_t *)G.cover,
++ if (cover_add((cover_t *)G.cover,
+ G.extra_bytes + G.ecrec.offset_start_central_directory,
+- G.ziplen) != 0) {
++ G.extra_bytes + G.ecrec.offset_start_central_directory +
++ G.ecrec.size_central_directory) != 0) {
+ Info(slide, 0x401, ((char *)slide,
+ LoadFarString(NotEnoughMemCover)));
+ return PK_MEM;
+ }
++ if ((G.extra_bytes != 0 &&
++ cover_add((cover_t *)G.cover, 0, G.extra_bytes) != 0) ||
++ (G.ecrec.have_ecr64 &&
++ cover_add((cover_t *)G.cover, G.ecrec.ec64_start,
++ G.ecrec.ec64_end) != 0) ||
++ cover_add((cover_t *)G.cover, G.ecrec.ec_start,
++ G.ecrec.ec_end) != 0) {
++ Info(slide, 0x401, ((char *)slide,
++ LoadFarString(OverlappedComponents)));
++ return PK_BOMB;
++ }
+
+ /*---------------------------------------------------------------------------
+ The basic idea of this function is as follows. Since the central di-
+diff --git a/process.c b/process.c
+index d2e4dc3..d75d405 100644
+--- a/process.c
++++ b/process.c
+@@ -1408,6 +1408,10 @@ static int find_ecrec64(__G__ searchlen) /* return PK-class error */
+
+ /* Now, we are (almost) sure that we have a Zip64 archive. */
+ G.ecrec.have_ecr64 = 1;
++ G.ecrec.ec_start -= ECLOC64_SIZE+4;
++ G.ecrec.ec64_start = ecrec64_start_offset;
++ G.ecrec.ec64_end = ecrec64_start_offset +
++ 12 + makeint64(&byterec[ECREC64_LENGTH]);
+
+ /* Update the "end-of-central-dir offset" for later checks. */
+ G.real_ecrec_offset = ecrec64_start_offset;
+@@ -1542,6 +1546,8 @@ static int find_ecrec(__G__ searchlen) /* return PK-class error */
+ makelong(&byterec[OFFSET_START_CENTRAL_DIRECTORY]);
+ G.ecrec.zipfile_comment_length =
+ makeword(&byterec[ZIPFILE_COMMENT_LENGTH]);
++ G.ecrec.ec_start = G.real_ecrec_offset;
++ G.ecrec.ec_end = G.ecrec.ec_start + 22 + G.ecrec.zipfile_comment_length;
+
+ /* Now, we have to read the archive comment, BEFORE the file pointer
+ is moved away backwards to seek for a Zip64 ECLOC64 structure.
+diff --git a/unzpriv.h b/unzpriv.h
+index dc9eff5..297b3c7 100644
+--- a/unzpriv.h
++++ b/unzpriv.h
+@@ -2185,6 +2185,16 @@ typedef struct VMStimbuf {
+ int have_ecr64; /* valid Zip64 ecdir-record exists */
+ int is_zip64_archive; /* Zip64 ecdir-record is mandatory */
+ ush zipfile_comment_length;
++ zusz_t ec_start, ec_end; /* offsets of start and end of the
++ end of central directory record,
++ including if present the Zip64
++ end of central directory locator,
++ which immediately precedes the
++ end of central directory record */
++ zusz_t ec64_start, ec64_end; /* if have_ecr64 is true, then these
++ are the offsets of the start and
++ end of the Zip64 end of central
++ directory record */
+ } ecdir_rec;
+
+
diff --git a/unzip/patches/unzip-zipbomb-part4.patch b/unzip/patches/unzip-zipbomb-part4.patch
new file mode 100644
index 000000000..beffa2c99
--- /dev/null
+++ b/unzip/patches/unzip-zipbomb-part4.patch
@@ -0,0 +1,25 @@
+From 5e2efcd633a4a1fb95a129a75508e7d769e767be Mon Sep 17 00:00:00 2001
+From: Mark Adler <madler(a)alumni.caltech.edu>
+Date: Sun, 9 Feb 2020 20:36:28 -0800
+Subject: [PATCH] Fix bug in UZbunzip2() that incorrectly updated G.incnt.
+
+The update assumed a full buffer, which is not always full. This
+could result in a false overlapped element detection when a small
+bzip2-compressed file was unzipped. This commit remedies that.
+---
+ extract.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/extract.c b/extract.c
+index d9866f9..0cb7bfc 100644
+--- a/extract.c
++++ b/extract.c
+@@ -3010,7 +3010,7 @@ __GDEF
+ #endif
+
+ G.inptr = (uch *)bstrm.next_in;
+- G.incnt = (G.inbuf + INBUFSIZ) - G.inptr; /* reset for other routines */
++ G.incnt -= G.inptr - G.inbuf; /* reset for other routines */
+
+ uzbunzip_cleanup_exit:
+ err = BZ2_bzDecompressEnd(&bstrm);
diff --git a/unzip/patches/unzip-zipbomb-part5.patch b/unzip/patches/unzip-zipbomb-part5.patch
new file mode 100644
index 000000000..ca6a43a7c
--- /dev/null
+++ b/unzip/patches/unzip-zipbomb-part5.patch
@@ -0,0 +1,26 @@
+From 5c572555cf5d80309a07c30cf7a54b2501493720 Mon Sep 17 00:00:00 2001
+From: Mark Adler <madler(a)alumni.caltech.edu>
+Date: Sun, 9 Feb 2020 21:39:09 -0800
+Subject: [PATCH] Fix bug in UZinflate() that incorrectly updated G.incnt.
+
+The update assumed a full buffer, which is not always full. This
+could result in a false overlapped element detection when a small
+deflate-compressed file was unzipped using an old zlib. This
+commit remedies that.
+---
+ inflate.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/inflate.c b/inflate.c
+index 2f5a015..70e3cc0 100644
+--- a/inflate.c
++++ b/inflate.c
+@@ -700,7 +700,7 @@ int UZinflate(__G__ is_defl64)
+ G.dstrm.total_out));
+
+ G.inptr = (uch *)G.dstrm.next_in;
+- G.incnt = (G.inbuf + INBUFSIZ) - G.inptr; /* reset for other routines */
++ G.incnt -= G.inptr - G.inbuf; /* reset for other routines */
+
+ uzinflate_cleanup_exit:
+ err = inflateReset(&G.dstrm);
diff --git a/unzip/patches/unzip-zipbomb-part6.patch b/unzip/patches/unzip-zipbomb-part6.patch
new file mode 100644
index 000000000..3dce6e342
--- /dev/null
+++ b/unzip/patches/unzip-zipbomb-part6.patch
@@ -0,0 +1,95 @@
+From 122050bac16fae82a460ff739fb1ca0f106e9d85 Mon Sep 17 00:00:00 2001
+From: Mark Adler <madler(a)alumni.caltech.edu>
+Date: Sat, 2 Jan 2021 13:09:34 -0800
+Subject: [PATCH] Determine Zip64 status entry-by-entry instead of for entire
+ file.
+
+Fixes a bug for zip files with mixed Zip64 and not Zip64 entries,
+which resulted in an incorrect data descriptor length. The bug is
+seen when a Zip64 entry precedes a non-Zip64 entry, in which case
+the data descriptor would have been assumed to be larger than it
+is, resulting in an incorrect bomb warning due to a perceived
+overlap with the next entry. This commit determines and saves the
+Zip64 status for each entry based on the central directory, and
+then computes the length of each data descriptor accordingly.
+---
+ extract.c | 5 +++--
+ globals.h | 2 --
+ process.c | 4 +---
+ unzpriv.h | 1 +
+ 4 files changed, 5 insertions(+), 7 deletions(-)
+
+diff --git a/extract.c b/extract.c
+index 504afd6..878817d 100644
+--- a/extract.c
++++ b/extract.c
+@@ -658,6 +658,7 @@ int extract_or_test_files(__G) /* return PK-type error code */
+ break;
+ }
+ }
++ G.pInfo->zip64 = FALSE;
+ if ((error = do_string(__G__ G.crec.extra_field_length,
+ EXTRA_FIELD)) != 0)
+ {
+@@ -2187,12 +2188,12 @@ static int extract_or_test_member(__G) /* return PK-type error code */
+ (clen == SIG && /* if not SIG, no signature */
+ ((G.lrec.csize & LOW) != SIG || /* if not SIG, have signature */
+ (ulen == SIG && /* if not SIG, no signature */
+- (G.zip64 ? G.lrec.csize >> 32 : G.lrec.ucsize) != SIG
++ (G.pInfo->zip64 ? G.lrec.csize >> 32 : G.lrec.ucsize) != SIG
+ /* if not SIG, have signature */
+ )))))
+ /* skip four more bytes to account for signature */
+ shy += 4 - readbuf((char *)buf, 4);
+- if (G.zip64)
++ if (G.pInfo->zip64)
+ shy += 8 - readbuf((char *)buf, 8); /* skip eight more for ZIP64 */
+ if (shy)
+ error = PK_ERR;
+diff --git a/globals.h b/globals.h
+index f9c6daf..a883c90 100644
+--- a/globals.h
++++ b/globals.h
+@@ -261,8 +261,6 @@ typedef struct Globals {
+ ecdir_rec ecrec; /* used in unzip.c, extract.c */
+ z_stat statbuf; /* used by main, mapname, check_for_newer */
+
+- int zip64; /* true if Zip64 info in extra field */
+-
+ int mem_mode;
+ uch *outbufptr; /* extract.c static */
+ ulg outsize; /* extract.c static */
+diff --git a/process.c b/process.c
+index d75d405..d643c6f 100644
+--- a/process.c
++++ b/process.c
+@@ -1903,8 +1903,6 @@ int getZip64Data(__G__ ef_buf, ef_len)
+ #define Z64FLGS 0xffff
+ #define Z64FLGL 0xffffffff
+
+- G.zip64 = FALSE;
+-
+ if (ef_len == 0 || ef_buf == NULL)
+ return PK_COOL;
+
+@@ -1943,7 +1941,7 @@ int getZip64Data(__G__ ef_buf, ef_len)
+ break; /* Expect only one EF_PKSZ64 block. */
+ #endif /* 0 */
+
+- G.zip64 = TRUE;
++ G.pInfo->zip64 = TRUE;
+ }
+
+ /* Skip this extra field block. */
+diff --git a/unzpriv.h b/unzpriv.h
+index 09f288e..75b3359 100644
+--- a/unzpriv.h
++++ b/unzpriv.h
+@@ -2034,6 +2034,7 @@ typedef struct min_info {
+ #ifdef UNICODE_SUPPORT
+ unsigned GPFIsUTF8: 1; /* crec gen_purpose_flag UTF-8 bit 11 is set */
+ #endif
++ unsigned zip64: 1; /* true if entry has Zip64 extra block */
+ #ifndef SFX
+ char Far *cfilname; /* central header version of filename */
+ #endif
diff --git a/unzip/patches/unzip-zipbomb-switch.patch b/unzip/patches/unzip-zipbomb-switch.patch
new file mode 100644
index 000000000..c6d33c026
--- /dev/null
+++ b/unzip/patches/unzip-zipbomb-switch.patch
@@ -0,0 +1,215 @@
+From 5b44c818b96193b3e240f38f61985fa2bc780eb7 Mon Sep 17 00:00:00 2001
+From: Jakub Martisko <jamartis(a)redhat.com>
+Date: Tue, 30 Nov 2021 15:42:17 +0100
+Subject: [PATCH] Add an option to disable the zipbomb detection
+
+This can be done by settting a newly introduced environment variable
+UNZIP_DISABLE_ZIPBOMB_DETECTION to {TRUE,True,true}. If the variable is unset, or
+set to any other value the zipbomb detection is left enabled.
+
+Example:
+ UNZIP_DISABLE_ZIPBOMB_DETECTION=True unzip ./zbsm.zip -d ./test
+---
+ extract.c | 85 ++++++++++++++++++++++++++++++-------------------------
+ unzip.c | 15 ++++++++--
+ unzip.h | 1 +
+ 3 files changed, 60 insertions(+), 41 deletions(-)
+
+diff --git a/extract.c b/extract.c
+index 878817d..3e58071 100644
+--- a/extract.c
++++ b/extract.c
+@@ -322,7 +322,8 @@ static ZCONST char Far BadExtraFieldCRC[] =
+ static ZCONST char Far NotEnoughMemCover[] =
+ "error: not enough memory for bomb detection\n";
+ static ZCONST char Far OverlappedComponents[] =
+- "error: invalid zip file with overlapped components (possible zip bomb)\n";
++ "error: invalid zip file with overlapped components (possible zip bomb)\n \
++To unzip the file anyway, rerun the command with UNZIP_DISABLE_ZIPBOMB_DETECTION=TRUE environmnent variable\n";
+
+
+
+@@ -502,35 +503,37 @@ int extract_or_test_files(__G) /* return PK-type error code */
+ the end of central directory record (including the Zip64 end of central
+ directory locator, if present), and the Zip64 end of central directory
+ record, if present. */
+- if (G.cover == NULL) {
++ if (uO.zipbomb == TRUE) {
++ if (G.cover == NULL) {
+ G.cover = malloc(sizeof(cover_t));
+ if (G.cover == NULL) {
+- Info(slide, 0x401, ((char *)slide,
+- LoadFarString(NotEnoughMemCover)));
+- return PK_MEM;
++ Info(slide, 0x401, ((char *)slide,
++ LoadFarString(NotEnoughMemCover)));
++ return PK_MEM;
+ }
+ ((cover_t *)G.cover)->span = NULL;
+ ((cover_t *)G.cover)->max = 0;
+- }
+- ((cover_t *)G.cover)->num = 0;
+- if (cover_add((cover_t *)G.cover,
+- G.extra_bytes + G.ecrec.offset_start_central_directory,
+- G.extra_bytes + G.ecrec.offset_start_central_directory +
+- G.ecrec.size_central_directory) != 0) {
++ }
++ ((cover_t *)G.cover)->num = 0;
++ if (cover_add((cover_t *)G.cover,
++ G.extra_bytes + G.ecrec.offset_start_central_directory,
++ G.extra_bytes + G.ecrec.offset_start_central_directory +
++ G.ecrec.size_central_directory) != 0) {
+ Info(slide, 0x401, ((char *)slide,
+- LoadFarString(NotEnoughMemCover)));
++ LoadFarString(NotEnoughMemCover)));
+ return PK_MEM;
+- }
+- if ((G.extra_bytes != 0 &&
+- cover_add((cover_t *)G.cover, 0, G.extra_bytes) != 0) ||
+- (G.ecrec.have_ecr64 &&
+- cover_add((cover_t *)G.cover, G.ecrec.ec64_start,
+- G.ecrec.ec64_end) != 0) ||
+- cover_add((cover_t *)G.cover, G.ecrec.ec_start,
+- G.ecrec.ec_end) != 0) {
++ }
++ if ((G.extra_bytes != 0 &&
++ cover_add((cover_t *)G.cover, 0, G.extra_bytes) != 0) ||
++ (G.ecrec.have_ecr64 &&
++ cover_add((cover_t *)G.cover, G.ecrec.ec64_start,
++ G.ecrec.ec64_end) != 0) ||
++ cover_add((cover_t *)G.cover, G.ecrec.ec_start,
++ G.ecrec.ec_end) != 0) {
+ Info(slide, 0x401, ((char *)slide,
+- LoadFarString(OverlappedComponents)));
++ LoadFarString(OverlappedComponents)));
+ return PK_BOMB;
++ }
+ }
+
+ /*---------------------------------------------------------------------------
+@@ -1222,10 +1225,12 @@ static int extract_or_test_entrylist(__G__ numchunk,
+
+ /* seek_zipf(__G__ pInfo->offset); */
+ request = G.pInfo->offset + G.extra_bytes;
+- if (cover_within((cover_t *)G.cover, request)) {
++ if (uO.zipbomb == TRUE) {
++ if (cover_within((cover_t *)G.cover, request)) {
+ Info(slide, 0x401, ((char *)slide,
+- LoadFarString(OverlappedComponents)));
++ LoadFarString(OverlappedComponents)));
+ return PK_BOMB;
++ }
+ }
+ inbuf_offset = request % INBUFSIZ;
+ bufstart = request - inbuf_offset;
+@@ -1758,17 +1763,19 @@ reprompt:
+ return IZ_CTRLC; /* cancel operation by user request */
+ }
+ #endif
+- error = cover_add((cover_t *)G.cover, request,
+- G.cur_zipfile_bufstart + (G.inptr - G.inbuf));
+- if (error < 0) {
++ if (uO.zipbomb == TRUE) {
++ error = cover_add((cover_t *)G.cover, request,
++ G.cur_zipfile_bufstart + (G.inptr - G.inbuf));
++ if (error < 0) {
+ Info(slide, 0x401, ((char *)slide,
+- LoadFarString(NotEnoughMemCover)));
++ LoadFarString(NotEnoughMemCover)));
+ return PK_MEM;
+- }
+- if (error != 0) {
++ }
++ if (error != 0) {
+ Info(slide, 0x401, ((char *)slide,
+- LoadFarString(OverlappedComponents)));
++ LoadFarString(OverlappedComponents)));
+ return PK_BOMB;
++ }
+ }
+ #ifdef MACOS /* MacOS is no preemptive OS, thus call event-handling by hand */
+ UserStop();
+@@ -2171,8 +2178,8 @@ static int extract_or_test_member(__G) /* return PK-type error code */
+ }
+
+ undefer_input(__G);
+-
+- if ((G.lrec.general_purpose_bit_flag & 8) != 0) {
++ if (uO.zipbomb == TRUE) {
++ if ((G.lrec.general_purpose_bit_flag & 8) != 0) {
+ /* skip over data descriptor (harder than it sounds, due to signature
+ * ambiguity)
+ */
+@@ -2189,16 +2196,16 @@ static int extract_or_test_member(__G) /* return PK-type error code */
+ ((G.lrec.csize & LOW) != SIG || /* if not SIG, have signature */
+ (ulen == SIG && /* if not SIG, no signature */
+ (G.pInfo->zip64 ? G.lrec.csize >> 32 : G.lrec.ucsize) != SIG
+- /* if not SIG, have signature */
++ /* if not SIG, have signature */
+ )))))
+- /* skip four more bytes to account for signature */
+- shy += 4 - readbuf((char *)buf, 4);
++ /* skip four more bytes to account for signature */
++ shy += 4 - readbuf((char *)buf, 4);
+ if (G.pInfo->zip64)
+- shy += 8 - readbuf((char *)buf, 8); /* skip eight more for ZIP64 */
++ shy += 8 - readbuf((char *)buf, 8); /* skip eight more for ZIP64 */
+ if (shy)
+- error = PK_ERR;
++ error = PK_ERR;
++ }
+ }
+-
+ return error;
+
+ } /* end function extract_or_test_member() */
+diff --git a/unzip.c b/unzip.c
+index 8dbfc95..abb3644 100644
+--- a/unzip.c
++++ b/unzip.c
+@@ -1329,10 +1329,9 @@ int uz_opts(__G__ pargc, pargv)
+ int *pargc;
+ char ***pargv;
+ {
+- char **argv, *s;
++ char **argv, *s, *zipbomb_envar;
+ int argc, c, error=FALSE, negative=0, showhelp=0;
+
+-
+ argc = *pargc;
+ argv = *pargv;
+
+@@ -1923,6 +1922,18 @@ opts_done: /* yes, very ugly...but only used by UnZipSFX with -x xlist */
+ else
+ G.extract_flag = TRUE;
+
++ /* Disable the zipbomb detection, this is the only option set only via the shell variables but it should at least not clash with something in the future. */
++ zipbomb_envar = getenv("UNZIP_DISABLE_ZIPBOMB_DETECTION");
++ uO.zipbomb = TRUE;
++ if (zipbomb_envar != NULL) {
++ /* strcasecmp might be a better approach here but it is POSIX-only */
++ if ((strcmp ("TRUE", zipbomb_envar) == 0)
++ || (strcmp ("True", zipbomb_envar) == 0)
++ || (strcmp ("true",zipbomb_envar) == 0)) {
++ uO.zipbomb = FALSE;
++ }
++ }
++
+ *pargc = argc;
+ *pargv = argv;
+ return PK_OK;
+diff --git a/unzip.h b/unzip.h
+index ed24a5b..e7665e8 100644
+--- a/unzip.h
++++ b/unzip.h
+@@ -559,6 +559,7 @@ typedef struct _UzpOpts {
+ #ifdef UNIX
+ int cflxflag; /* -^: allow control chars in extracted filenames */
+ #endif
++ int zipbomb;
+ #endif /* !FUNZIP */
+ } UzpOpts;
+
+--
+2.33.0
+
diff --git a/unzip/unzip.nm b/unzip/unzip.nm
index ea4581544..664790074 100644
--- a/unzip/unzip.nm
+++ b/unzip/unzip.nm
@@ -5,10 +5,11 @@
name = unzip
version = 6.0
-release = 5
+release = 6
+thisapp = %{name}60
groups = Applications/Archiving
-url = ftp://ftp.info-zip.org/pub/infozip/src/
+url = https://infozip.sourceforge.net/UnZip.html
license = BSD
summary = A utility for unpacking zip files.
@@ -21,14 +22,53 @@ description
in some respects.
end
-thisapp = %{name}60
-source_dl += ftp://ftp.info-zip.org/pub/infozip/src/
-sources = %{thisapp}.tgz
+source_dl += https://downloads.sourceforge.net/infozip/
+
+patches
+ unzip-6.0-bzip2-configure.patch
+ unzip-6.0-exec-shield.patch
+ unzip-6.0-close.patch
+ unzip-6.0-attribs-overflow.patch
+ unzip-6.0-configure.patch
+ unzip-6.0-manpage-fix.patch
+ unzip-6.0-fix-recmatch.patch
+ unzip-6.0-symlink.patch
+ unzip-6.0-caseinsensitive.patch
+ unzip-6.0-format-secure.patch
+ unzip-6.0-valgrind.patch
+ unzip-6.0-x-option.patch
+ unzip-6.0-overflow.patch
+ unzip-6.0-cve-2014-8139.patch
+ unzip-6.0-cve-2014-8140.patch
+ unzip-6.0-cve-2014-8141.patch
+ unzip-6.0-overflow-long-fsize.patch
+ unzip-6.0-heap-overflow-infloop.patch
+ unzip-6.0-alt-iconv-utf8.patch
+ unzip-6.0-alt-iconv-utf8-print.patch
+ 0001-Fix-CVE-2016-9844-rhbz-1404283.patch
+ unzip-6.0-timestamp.patch
+ unzip-6.0-cve-2018-1000035-heap-based-overflow.patch
+ unzip-6.0-cve-2018-18384.patch
+ unzip-6.0-COVSCAN-fix-unterminated-string.patch
+ unzip-zipbomb-part1.patch
+ unzip-zipbomb-part2.patch
+ unzip-zipbomb-part3.patch
+ unzip-zipbomb-manpage.patch
+ unzip-zipbomb-part4.patch
+ unzip-zipbomb-part5.patch
+ unzip-zipbomb-part6.patch
+ unzip-zipbomb-switch.patch
+ unzip-gnu89-build.patch
+end
CFLAGS += -D_LARGEFILE64_SOURCE
build
+ requires
+ bzip2-devel
+ end
+
DIR_APP = %{DIR_SRC}/%{thisapp}
build
diff --git a/vala/vala.nm b/vala/vala.nm
index fac47145e..e11bf0194 100644
--- a/vala/vala.nm
+++ b/vala/vala.nm
@@ -4,15 +4,15 @@
###############################################################################
name = vala
-ver_major = 0.32
-ver_minor = 0
+ver_major = 0.56
+ver_minor = 3
version = %{ver_major}.%{ver_minor}
release = 1
groups = Development/Languages
url = http://live.gnome.org/Vala
license = LGPLv2+ and BSD
-summary = A modern programming language.
+summary = A modern programming language
description
Vala is a new programming language that aims to bring modern
@@ -21,7 +21,7 @@ description
ABI compared to applications and libraries written in C.
end
-source_dl = http://artfiles.org/gnome.org/sources/vala/0.32/
+source_dl = https://download.gnome.org/sources/vala/%{ver_major}/
sources = %{thisapp}.tar.xz
build
@@ -30,6 +30,7 @@ build
dbus
dbus-glib-devel
flex
+ graphviz-devel
pkg-config
end
hooks/post-receive
--
IPFire 3.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 511d6e416afea895d6125b5f4a835fbe2531e5ba
by Peter Müller 27 Dec '22
by Peter Müller 27 Dec '22
27 Dec '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 511d6e416afea895d6125b5f4a835fbe2531e5ba (commit)
via c4cbb74cb380f9185a5237f463340c04a1019a11 (commit)
via de663df0a89c9b805eed915306a4cae6bf5475ed (commit)
via 6c88ad32af0d571ed565b412f6917798ce6fe2b7 (commit)
via 3dc46659e43a9bbddde6feda286aa494f379ccdc (commit)
via c4cd2b213ea1f5dfe04e949fe6d8e5696e2eeb2d (commit)
via e866427e8a73ed38c7b763ccff220b585baa7876 (commit)
via 7c138067d9316cf02f34e5746cdb4e19c4438f14 (commit)
via 6f0e52c6c4d15c9f1dbf28fe9365544f7bb73c16 (commit)
via b2f108fea78e1e6bd5befc87299e56a8405476cb (commit)
via 99cac3e9a7c6bf159018c8ee7bd5159235d00156 (commit)
via 53e4353ceecd63f54f535fc001c7f0f863005276 (commit)
via c1f9d9e86fc4d09016ff8f2d594adecfa8acadd8 (commit)
via f43be66179662a073a3c54d6a97fe9a5ac5dc343 (commit)
via cfb7cf5e03c0bb4d77e0a9749a7a1aa0b8fb6cd4 (commit)
via e8ed38e875fef0de2fd6b6759ec422ce94d2bfb0 (commit)
via e36f341ee554eec800dcaca954c0ee8f4972464e (commit)
via 7fa435b3bb5923f2b71866072c941eebf222c1fd (commit)
via 51b99dc3d1525e91cbb3163ea883975e5288e10f (commit)
via cdb071978dfacac9ba47d9972565b2bb8fdb0d05 (commit)
via 1d3c8995e50d712f831e7cb60e87dc138c0c5b79 (commit)
via 2a269f26ccfac34291e5166c2c372863160895d8 (commit)
via 56002c9886c6e97a522ed2cc93425527a226c840 (commit)
via b0025e53ffd68680b71514c5deeb84769745f6da (commit)
from e043f7b78759ee9aa130e29ff0f6f11413dc7557 (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 511d6e416afea895d6125b5f4a835fbe2531e5ba
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Tue Dec 27 20:44:38 2022 +0000
libqmi: Update rootfile
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit c4cbb74cb380f9185a5237f463340c04a1019a11
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Tue Dec 27 20:44:04 2022 +0000
expat: Update rootfile
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit de663df0a89c9b805eed915306a4cae6bf5475ed
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Tue Dec 27 20:43:10 2022 +0000
aprutil: Update rootfile
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 6c88ad32af0d571ed565b412f6917798ce6fe2b7
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Tue Dec 27 20:41:32 2022 +0000
glib: Update rootfile
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 3dc46659e43a9bbddde6feda286aa494f379ccdc
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Tue Dec 27 16:37:00 2022 +0000
Core Update 173: Ship xz
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit c4cd2b213ea1f5dfe04e949fe6d8e5696e2eeb2d
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Sat Dec 17 13:14:27 2022 +0100
xz: Update to version 5.4.0
- Update from version 5.2.8 to 5.4.0
- Update of rootfile
- Changelog
5.4.0 (2022-12-13)
This bumps the minor version of liblzma because new features were
added. The API and ABI are still backward compatible with liblzma
5.2.x and 5.0.x.
Since 5.3.5beta:
* All fixes from 5.2.10.
* The ARM64 filter is now stable. The xz option is now --arm64.
Decompression requires XZ Utils 5.4.0. In the future the ARM64
filter will be supported by XZ for Java, XZ Embedded (including
the version in Linux), LZMA SDK, and 7-Zip.
* Translations:
- Updated Catalan, Croatian, German, Romanian, and Turkish
translations.
- Updated German man page translations.
- Added Romanian man page translations.
Summary of new features added in the 5.3.x development releases:
* liblzma:
- Added threaded .xz decompressor lzma_stream_decoder_mt().
It can use multiple threads with .xz files that have multiple
Blocks with size information in Block Headers. The threaded
encoder in xz has always created such files.
Single-threaded encoder cannot store the size information in
Block Headers even if one used LZMA_FULL_FLUSH to create
multiple Blocks, so this threaded decoder cannot use multiple
threads with such files.
If there are multiple Streams (concatenated .xz files), one
Stream will be decompressed completely before starting the
next Stream.
- A new decoder flag LZMA_FAIL_FAST was added. It makes the
threaded decompressor report errors soon instead of first
flushing all pending data before the error location.
- New Filter IDs:
* LZMA_FILTER_ARM64 is for ARM64 binaries.
* LZMA_FILTER_LZMA1EXT is for raw LZMA1 streams that don't
necessarily use the end marker.
- Added lzma_str_to_filters(), lzma_str_from_filters(), and
lzma_str_list_filters() to convert a preset or a filter chain
string to a lzma_filter[] and vice versa. These should make
it easier to write applications that allow users to specify
custom compression options.
- Added lzma_filters_free() which can be convenient for freeing
the filter options in a filter chain (an array of lzma_filter
structures).
- lzma_file_info_decoder() to makes it a little easier to get
the Index field from .xz files. This helps in getting the
uncompressed file size but an easy-to-use random access
API is still missing which has existed in XZ for Java for
a long time.
- Added lzma_microlzma_encoder() and lzma_microlzma_decoder().
It is used by erofs-utils and may be used by others too.
The MicroLZMA format is a raw LZMA stream (without end marker)
whose first byte (always 0x00) has been replaced with
bitwise-negation of the LZMA properties (lc/lp/pb). It was
created for use in EROFS but may be used in other contexts
as well where it is important to avoid wasting bytes for
stream headers or footers. The format is also supported by
XZ Embedded (the XZ Embedded version in Linux got MicroLZMA
support in Linux 5.16).
The MicroLZMA encoder API in liblzma can compress into a
fixed-sized output buffer so that as much data is compressed
as can be fit into the buffer while still creating a valid
MicroLZMA stream. This is needed for EROFS.
- Added lzma_lzip_decoder() to decompress the .lz (lzip) file
format version 0 and the original unextended version 1 files.
Also lzma_auto_decoder() supports .lz files.
- lzma_filters_update() can now be used with the multi-threaded
encoder (lzma_stream_encoder_mt()) to change the filter chain
after LZMA_FULL_BARRIER or LZMA_FULL_FLUSH.
- In lzma_options_lzma, allow nice_len = 2 and 3 with the match
finders that require at least 3 or 4. Now it is internally
rounded up if needed.
- CLMUL-based CRC64 on x86-64 and E2K with runtime processor
detection. On 32-bit x86 it currently isn't available unless
--disable-assembler is used which can make the non-CLMUL
CRC64 slower; this might be fixed in the future.
- Building with --disable-threads --enable-small
is now thread-safe if the compiler supports
__attribute__((__constructor__)).
* xz:
- Using -T0 (--threads=0) will now use multi-threaded encoder
even on a single-core system. This is to ensure that output
from the same xz binary is identical on both single-core and
multi-core systems.
- --threads=+1 or -T+1 is now a way to put xz into
multi-threaded mode while using only one worker thread.
The + is ignored if the number is not 1.
- A default soft memory usage limit is now used for compression
when -T0 is used and no explicit limit has been specified.
This soft limit is used to restrict the number of threads
but if the limit is exceeded with even one thread then xz
will continue with one thread using the multi-threaded
encoder and this limit is ignored. If the number of threads
is specified manually then no default limit will be used;
this affects only -T0.
This change helps on systems that have very many cores and
using all of them for xz makes no sense. Previously xz -T0
could run out of memory on such systems because it attempted
to reserve memory for too many threads.
This also helps with 32-bit builds which don't have a large
amount of address space that would be required for many
threads. The default soft limit for -T0 is at most 1400 MiB
on all 32-bit platforms.
- Previously a low value in --memlimit-compress wouldn't cause
xz to switch from multi-threaded mode to single-threaded mode
if the limit cannot otherwise be met; xz failed instead. Now
xz can switch to single-threaded mode and then, if needed,
scale down the LZMA2 dictionary size too just like it already
did when it was started in single-threaded mode.
- The option --no-adjust no longer prevents xz from scaling down
the number of threads as that doesn't affect the compressed
output (only performance). Now --no-adjust only prevents
adjustments that affect compressed output, that is, with
--no-adjust xz won't switch from multi-threaded mode to
single-threaded mode and won't scale down the LZMA2
dictionary size.
- Added a new option --memlimit-mt-decompress=LIMIT. This is
used to limit the number of decompressor threads (possibly
falling back to single-threaded mode) but it will never make
xz refuse to decompress a file. This has a system-specific
default value because without any limit xz could end up
allocating memory for the whole compressed input file, the
whole uncompressed output file, multiple thread-specific
decompressor instances and so on. Basically xz could
attempt to use an insane amount of memory even with fairly
common files. The system-specific default value is currently
the same as the one used for compression with -T0.
The new option works together with the existing option
--memlimit-decompress=LIMIT. The old option sets a hard limit
that must not be exceeded (xz will refuse to decompress)
while the new option only restricts the number of threads.
If the limit set with --memlimit-mt-decompress is greater
than the limit set with --memlimit-compress, then the latter
value is used also for --memlimit-mt-decompress.
- Added new information to the output of xz --info-memory and
new fields to the output of xz --robot --info-memory.
- In --lzma2=nice=NUMBER allow 2 and 3 with all match finders
now that liblzma handles it.
- Don't mention endianness for ARM and ARM-Thumb filters in
--long-help. The filters only work for little endian
instruction encoding but modern ARM processors using
big endian data access still use little endian
instruction encoding. So the help text was misleading.
In contrast, the PowerPC filter is only for big endian
32/64-bit PowerPC code. Little endian PowerPC would need
a separate filter.
- Added decompression support for the .lz (lzip) file format
version 0 and the original unextended version 1. It is
autodetected by default. See also the option --format on
the xz man page.
- Sandboxing enabled by default:
* Capsicum (FreeBSD)
* pledge(2) (OpenBSD)
* Scripts now support the .lz format using xz.
* A few new tests were added.
* The liblzma-specific tests are now supported in CMake-based
builds too ("make test").
5.2.10 (2022-12-13)
* xz: Don't modify argv[] when parsing the --memlimit* and
--block-list command line options. This fixes confusing
arguments in process listing (like "ps auxf").
* GNU/Linux only: Use __has_attribute(__symver__) to detect if
that attribute is supported. This fixes build on Mandriva where
Clang is patched to define __GNUC__ to 11 by default (instead
of 4 as used by Clang upstream).
5.2.9 (2022-11-30)
* liblzma:
- Fixed an infinite loop in LZMA encoder initialization
if dict_size >= 2 GiB. (The encoder only supports up
to 1536 MiB.)
- Fixed two cases of invalid free() that can happen if
a tiny allocation fails in encoder re-initialization
or in lzma_filters_update(). These bugs had some
similarities with the bug fixed in 5.2.7.
- Fixed lzma_block_encoder() not allowing the use of
LZMA_SYNC_FLUSH with lzma_code() even though it was
documented to be supported. The sync-flush code in
the Block encoder was already used internally via
lzma_stream_encoder(), so this was just a missing flag
in the lzma_block_encoder() API function.
- GNU/Linux only: Don't put symbol versions into static
liblzma as it breaks things in some cases (and even if
it didn't break anything, symbol versions in static
libraries are useless anyway). The downside of the fix
is that if the configure options --with-pic or --without-pic
are used then it's not possible to build both shared and
static liblzma at the same time on GNU/Linux anymore;
with those options --disable-static or --disable-shared
must be used too.
* New email address for bug reports is <xz(a)tukaani.org> which
forwards messages to Lasse Collin and Jia Tan.
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
commit e866427e8a73ed38c7b763ccff220b585baa7876
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Tue Dec 27 16:36:31 2022 +0000
Core Update 173: Ship nano
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 7c138067d9316cf02f34e5746cdb4e19c4438f14
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Sat Dec 17 13:14:24 2022 +0100
nano: Update to version 7.1
- Update from version 7.0 to 7.1
- Update of rootfile not required
- Changelog
2022.12.14 - GNU nano 7.1 "And the devices shall be made of wood"
• When --autoindent and --breaklonglines are combined, pressing
<Enter> at a specific position no longer eats characters.
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 6f0e52c6c4d15c9f1dbf28fe9365544f7bb73c16
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Tue Dec 27 16:34:59 2022 +0000
Core Update 173: Ship libmpc
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit b2f108fea78e1e6bd5befc87299e56a8405476cb
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Sat Dec 17 13:14:23 2022 +0100
libmpc: Update to version 1.3.1
- Update from version 1.2.1 to 1.3.1
- Update of rootfile
- Changelog
Changes in version 1.3.1, released in December 2022:
- Bug fix: It is again possible to include mpc.h without including
stdio.h.
Changes in version 1.3.0 ("Ipomoea batatas"), released in December 2022:
- New function: mpc_agm
- New rounding modes "away from zero", indicated by the letter "A" and
corresponding to MPFR_RNDA on the designated real or imaginary part.
- New experimental ball arithmetic.
- New experimental function: mpc_eta_fund
- Bug fixes:
- mpc_asin for asin(z) with small |Re(z)| and tiny |Im(z)|
- mpc_pow_fr: sign of zero part of result when the base has up to sign
the same real and imaginary part, and the exponent is an even
positive integer
- mpc_fma: the returned 'int' value was incorrect in some cases (indicating
whether the rounded real/imaginary parts were smaller/equal/greater
than the exact values), but the computed complex value was correct.
- Remove the unmaintained Makefile.vc; build files for Visual Studio
can be found at https://github.com/BrianGladman/mpc .
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 99cac3e9a7c6bf159018c8ee7bd5159235d00156
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Tue Dec 27 16:32:01 2022 +0000
Core Update 173: Ship logrotate
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 53e4353ceecd63f54f535fc001c7f0f863005276
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Thu Dec 15 17:35:53 2022 +0100
logrotate: Update to 3.21.0
For details see:
https://github.com/logrotate/logrotate/releases/tag/3.21.0
"add ignoreduplicates directive to allow duplicate file matches (#473)
add --wait-for-state-lock option to wait for lock on the state file (#457)
avoid failure when an anonymous non-privileged user runs logrotate (#463)
support home dir expansion in olddir (#454)
reduce unnecessary rename operations with start N where N > 1 (#450)
unify handling of log levels (#239 #449)
do not print error: when exit code is unaffected (#448)"
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
commit c1f9d9e86fc4d09016ff8f2d594adecfa8acadd8
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Tue Dec 27 16:31:27 2022 +0000
Core Update 173: Ship pcre2
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit f43be66179662a073a3c54d6a97fe9a5ac5dc343
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Thu Dec 15 17:32:20 2022 +0100
pcre2: Update to 10.42
See:
https://github.com/PCRE2Project/pcre2/releases/tag/pcre2-10.41
and
https://github.com/PCRE2Project/pcre2/releases/tag/pcre2-10.42
Excerpts from changelogs:
"Version 10.41 06-December-2022
------------------------------
1. Add fflush() before and after a fork callout in pcre2grep to get its output
to be the same on all systems. (There were previously ordering differences in
Alpine Linux).
2. Merged patch from @carenas (GitHub #110) for pthreads support in CMake.
3. SSF scorecards grumbled about possible overflow in an expression in
pcre2test. It never would have overflowed in practice, but some casts have been
added and at the some time there's been some tidying of fprints that output
size_t values.
4. PR #94 showed up an unused enum in pcre2_convert.c, which is now removed.
5. Minor code re-arrangement to remove gcc warning about realloc() in
pcre2test.
6. Change a number of int variables that hold buffer and line lengths in
pcre2grep to PCRE2_SIZE (aka size_t).
7. Added an #ifdef to cut out a call to PRIV(jit_free) when JIT is not
supported (even though that function would do nothing in that case) at the
request of a user who doesn't even want to link with pcre_jit_compile.o. Also
tidied up an untidy #ifdef arrangement in pcre2test.
8. Fixed an issue in the backtracking optimization of character repeats in
JIT. Furthermore optimize star repetitions, not just plus repetitions.
9. Removed the use of an initial backtracking frames vector on the system stack
in pcre2_match() so that it now always uses the heap. (In a multi-thread
environment with very small stacks there had been an issue.) This also is
tidier for JIT matching, which didn't need that vector. The heap vector is now
remembered in the match data block and re-used if that block itself is re-used.
It is freed with the match data block.
10. Adjusted the find_limits code in pcre2test to work with change 9 above.
11. Added find_limits_noheap to pcre2test, because the heap limits are now
different in different environments and so cannot be included in the standard
tests.
12. Created a test for pcre2_match() heap processing that is not part of the
tests run by 'make check', but can be run manually. The current output is from
a 64-bit system.
13. Implemented -Z aka --null in pcre2grep.
14. A minor change to pcre2test and the addition of several new pcre2grep tests
have improved LCOV coverage statistics. At the same time, code in pcre2grep and
elsewhere that can never be obeyed in normal testing has been excluded from
coverage.
15. Fixed a bug in pcre2grep that could cause an extra newline to be written
after output generaed by --output.
16. If a file has a .bz2 extension but is not in fact compressed, pcre2grep
should process it as a plain text file. A bug stopped this happening; now fixed
and added to the tests.
17. When pcre2grep was running not in UTF mode, if a string specified by
--output or obtained from a callout in a pattern contained a character (byte)
greater than 127, it was incorrectly output in UTF-8 format.
18. Added some casts after warnings from Clang sanitize.
19. Merged patch from cbouc (GitHub #139): 4 function prototypes were missing
PCRE2_CALL_CONVENTION in src/pcre2posix.h. All function prototypes returning
pointers had out of place PCRE2_CALL_CONVENTION in src/pcre2.h.*. These
produced errors when building for Windows with #define PCRE2_CALL_CONVENTION
__stdcall.
20. A negative repeat value in a pcre2test subject line was not being
diagnosed, leading to infinite looping.
21. Updated RunGrepTest to discard the warning that Bash now gives when setting
LC_CTYPE to a bad value (because older versions didn't).
22. Updated pcre2grep so that it behaves like GNU grep when matching more than
one pattern and a later pattern matches at an earlier point in the subject when
the matched substrings are being identified by colour or by offsets.
23. Updated the PrepareRelease script so that the man page that it makes for
the pcre2demo demonstration program is more standard and does not cause errors
when processed by lexgrog or mandb -c (GitHub issue #160).
24. The JIT compiler was updated."
Version 10.42 11-December-2022
------------------------------
"This release is mainly to fix a problem with 10.41, which is broken for
programs that include pcre2posix.h but not pcre2.h. Some other minor fixes
are included.
1. Change 19 of 10.41 wasn't quite right; it put the definition of a default,
empty value for PCRE2_CALL_CONVENTION in src/pcre2posix.c instead of
src/pcre2posix.h, which meant that programs that included pcre2posix.h but not
pcre2.h failed to compile.
2. To catch similar issues to the above in future, a new small test program
that includes pcre2posix.h but not pcre2.h has been added to the test suite.
3. When the -S option of pcre2test was used to set a stack size greater than
the allowed maximum, the error message displayed the hard limit incorrectly.
This was pointed out on GitHub pull request #171, but the suggested patch
didn't cope with all cases. Some further modification was required.
4. Supplying an ovector count of more than 65535 to pcre2_match_data_create()
caused a crash because the field in the match data block is only 16 bits. A
maximum of 65535 is now silently applied.
5. Merged @carenas patch #175 which fixes #86 - segfault on aarch64 (ARM),"
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
commit cfb7cf5e03c0bb4d77e0a9749a7a1aa0b8fb6cd4
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Sun Dec 11 13:33:29 2022 +0100
libtalloc: Update to version 2.3.4
- Update from version 2.3.1 to 2.3.4
- Update of rootfile
- No Changelog available in the source tarball or on the website. talloc uses the samba
technical mailing list for any communications but there was no announcement for the
updated versions found.
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
commit e8ed38e875fef0de2fd6b6759ec422ce94d2bfb0
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Tue Dec 27 12:59:57 2022 +0100
libexif: Update to version 0.6.24
- Update from version 0.6.22 to 0.6.24
- Update of rootfile not required
- source file no longer provided in xz format - changed to bz2
- Changelog (Two CVE's fixed in 0.6.23)
libexif-0.6.24 (2021-11-25):
* Translation updates: sr, vi, pl, uk, french
* fixed regression in exif_data_load_data which could not load EXIF in JPEG data anymore
* Decode lots of Canon tag names
* removed empty strings from translation (empty string would translate to the PO info header)
* various warning removals and code improvements
* added sample "persistent" afl fuzzer (100x faster than normal afl fuzzer)
libexif-0.6.23 (2021-09-12):
* Translation updates: es, pl, uk, fr
* EXIF_TAG_SENSITIVITY_TYPE decoder added, added some more Exif 2.3 tags:
- EXIF_TAG_STANDARD_OUTPUT_SENSITIVITY
- EXIF_TAG_RECOMMENDED_EXPOSURE_INDEX
- EXIF_TAG_ISO_SPEED
- EXIF_TAG_ISO_SPEEDLatitudeYYY
- EXIF_TAG_ISO_SPEEDLatitudeZZZ
- EXIF_TAG_OFFSET_TIME
- EXIF_TAG_OFFSET_TIME_ORIGINAL
- EXIF_TAG_OFFSET_TIME_DIGITIZED
- EXIF_TAG_IMAGE_DEPTH
* be more relaxed to out of order JPG / EXIF dataheaders in files generated by some tools
* default GPS IFD table added
* Decode more Nikon Makernote tag names
* Added Apple iOS Makernote
* Security fixes:
* CVE-2020-0198: unsigned integer overflow in exif_data_load_data_content
* CVE-2020-0452: compiler optimization could remove an a
bufferoverflow check, making a buffer overflow possible with some
EXIF tags
* some more denial of service (compute time or stack exhaustion) counter-measures
added that avoid minutes of decoding time with malformed files found
by OSS-Fuzz
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
commit e36f341ee554eec800dcaca954c0ee8f4972464e
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Tue Dec 27 16:26:26 2022 +0000
Core Update 173: Ship libffi
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 7fa435b3bb5923f2b71866072c941eebf222c1fd
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Tue Dec 27 12:59:58 2022 +0100
libffi: Update to version 3.4.4
- Update from version 3.4.2 to 3.4.4
- Update of rootfile
- Changelog
3.4.4 Oct-23-2022
Important aarch64 fixes, including support for linux builds
with Link Time Optimization (-flto).
Fix x86 stdcall stack alignment.
Fix x86 Windows msvc assembler compatibility.
Fix moxie and or1k small structure args.
3.4.3 Sep-19-22
All struct args are passed by value, regardless of size, as per ABIs.
Enable static trampolines for Cygwin.
Add support for Loongson's LoongArch64 architecture.
Fix x32 static trampolines.
Fix 32-bit x86 stdcall stack corruption.
Fix ILP32 aarch64 support.
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 51b99dc3d1525e91cbb3163ea883975e5288e10f
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Tue Dec 27 16:25:52 2022 +0000
Core Update 173: Ship libidn
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit cdb071978dfacac9ba47d9972565b2bb8fdb0d05
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Tue Dec 27 13:00:00 2022 +0100
libidn: Update to version 1.41
- Update from version 1.38 to 1.41
- Update of rootfile
- Changelog
* Noteworthy changes in release 1.41 (2022-06-25) [stable]
** Bump LT_REVISION for new release.
It was mistakenly left at the same value since 1.38.
** Add version number related self-checks.
* Noteworthy changes in release 1.40 (2022-06-20) [stable]
** lib: Bump STRINGPREP_VERSION to 1.40.
It was mistakenly left at 1.38 in the 1.39 release.
* Noteworthy changes in release 1.39 (2022-06-20) [stable]
** lib: Code detecting current locale broken since 1.36.
The code always returned ASCII. The precise cause is complicated to
track down but likely boils down to the new autotools/gettext
bootstrapping sequence introduced in release 1.36. Reported by Богдан
Пилипенко <bogdan.pylypenko107(a)gmail.com>.
** maint: Java JAR archive no longer included in source tarball.
** Minor fixes: typos, makefiles, indentation, gnulib update, etc.
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 1d3c8995e50d712f831e7cb60e87dc138c0c5b79
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Tue Dec 27 16:25:20 2022 +0000
Core Update 173: Ship libinih
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 2a269f26ccfac34291e5166c2c372863160895d8
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Tue Dec 27 13:00:01 2022 +0100
libinih: Update to version r56
- Update from version r55 to r56
- Update of rootfile not required
- Changelog
version 56
Fix redundant cast-to-int when INI_USE_STACK!=0
Make inline comments work on subsequent lines of multiline values
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 56002c9886c6e97a522ed2cc93425527a226c840
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Tue Dec 27 16:24:34 2022 +0000
Core Update 173: Ship libjpeg
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit b0025e53ffd68680b71514c5deeb84769745f6da
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Tue Dec 27 13:00:02 2022 +0100
libjpeg: Update to version 2.1.4
- Update from version 2.0.4 to 2.1.4
- Update of rootfile
- Changelog
2.1.4
### Significant changes relative to 2.1.3
1. Fixed a regression introduced in 2.1.3 that caused build failures with
Visual Studio 2010.
2. The `tjDecompressHeader3()` function in the TurboJPEG C API and the
`TJDecompressor.setSourceImage()` method in the TurboJPEG Java API now accept
"abbreviated table specification" (AKA "tables-only") datastreams, which can be
used to prime the decompressor with quantization and Huffman tables that can be
used when decompressing subsequent "abbreviated image" datastreams.
3. libjpeg-turbo now performs run-time detection of AltiVec instructions on
OS X/PowerPC systems if AltiVec instructions are not enabled at compile time.
This allows both AltiVec-equipped (PowerPC G4 and G5) and non-AltiVec-equipped
(PowerPC G3) CPUs to be supported using the same build of libjpeg-turbo.
4. Fixed an error ("Bogus virtual array access") that occurred when attempting
to decompress a progressive JPEG image with a height less than or equal to one
iMCU (8 * the vertical sampling factor) using buffered-image mode with
interblock smoothing enabled. This was a regression introduced by
2.1 beta1[6(b)].
5. Fixed two issues that prevented partial image decompression from working
properly with buffered-image mode:
- Attempting to call `jpeg_crop_scanline()` after
`jpeg_start_decompress()` but before `jpeg_start_output()` resulted in an error
("Improper call to JPEG library in state 207".)
- Attempting to use `jpeg_skip_scanlines()` resulted in an error ("Bogus
virtual array access") under certain circumstances.
2.1.3
### Significant changes relative to 2.1.2
1. Fixed a regression introduced by 2.0 beta1[7] whereby cjpeg compressed PGM
input files into full-color JPEG images unless the `-grayscale` option was
used.
2. cjpeg now automatically compresses GIF and 8-bit BMP input files into
grayscale JPEG images if the input files contain only shades of gray.
3. The build system now enables the intrinsics implementation of the AArch64
(Arm 64-bit) Neon SIMD extensions by default when using GCC 12 or later.
4. Fixed a segfault that occurred while decompressing a 4:2:0 JPEG image using
the merged (non-fancy) upsampling algorithms (that is, with
`cinfo.do_fancy_upsampling` set to `FALSE`) along with `jpeg_crop_scanline()`.
Specifically, the segfault occurred if the number of bytes remaining in the
output buffer was less than the number of bytes required to represent one
uncropped scanline of the output image. For that reason, the issue could only
be reproduced using the libjpeg API, not using djpeg.
2.1.2
### Significant changes relative to 2.1.1
1. Fixed a regression introduced by 2.1 beta1[13] that caused the remaining
GAS implementations of AArch64 (Arm 64-bit) Neon SIMD functions (which are used
by default with GCC for performance reasons) to be placed in the `.rodata`
section rather than in the `.text` section. This caused the GNU linker to
automatically place the `.rodata` section in an executable segment, which
prevented libjpeg-turbo from working properly with other linkers and also
represented a potential security risk.
2. Fixed an issue whereby the `tjTransform()` function incorrectly computed the
MCU block size for 4:4:4 JPEG images with non-unary sampling factors and thus
unduly rejected some cropping regions, even though those regions aligned with
8x8 MCU block boundaries.
3. Fixed a regression introduced by 2.1 beta1[13] that caused the build system
to enable the Arm Neon SIMD extensions when targetting Armv6 and other legacy
architectures that do not support Neon instructions.
4. libjpeg-turbo now performs run-time detection of AltiVec instructions on
FreeBSD/PowerPC systems if AltiVec instructions are not enabled at compile
time. This allows both AltiVec-equipped and non-AltiVec-equipped CPUs to be
supported using the same build of libjpeg-turbo.
5. cjpeg now accepts a `-strict` argument similar to that of djpeg and
jpegtran, which causes the compressor to abort if an LZW-compressed GIF input
image contains incomplete or corrupt image data.
2.1.1
### Significant changes relative to 2.1.0
1. Fixed a regression introduced in 2.1.0 that caused build failures with
non-GCC-compatible compilers for Un*x/Arm platforms.
2. Fixed a regression introduced by 2.1 beta1[13] that prevented the Arm 32-bit
(AArch32) Neon SIMD extensions from building unless the C compiler flags
included `-mfloat-abi=softfp` or `-mfloat-abi=hard`.
3. Fixed an issue in the AArch32 Neon SIMD Huffman encoder whereby reliance on
undefined C compiler behavior led to crashes ("SIGBUS: illegal alignment") on
Android systems when running AArch32/Thumb builds of libjpeg-turbo built with
recent versions of Clang.
4. Added a command-line argument (`-copy icc`) to jpegtran that causes it to
copy only the ICC profile markers from the source file and discard any other
metadata.
5. libjpeg-turbo should now build and run on CHERI-enabled architectures, which
use capability pointers that are larger than the size of `size_t`.
6. Fixed a regression (CVE-2021-37972) introduced by 2.1 beta1[5] that caused a
segfault in the 64-bit SSE2 Huffman encoder when attempting to losslessly
transform a specially-crafted malformed JPEG image.
2.1.0
### Significant changes relative to 2.1 beta1
1. Fixed a regression introduced by 2.1 beta1[6(b)] whereby attempting to
decompress certain progressive JPEG images with one or more component planes of
width 8 or less caused a buffer overrun.
2. Fixed a regression introduced by 2.1 beta1[6(b)] whereby attempting to
decompress a specially-crafted malformed progressive JPEG image caused the
block smoothing algorithm to read from uninitialized memory.
3. Fixed an issue in the Arm Neon SIMD Huffman encoders that caused the
encoders to generate incorrect results when using the Clang compiler with
Visual Studio.
4. Fixed a floating point exception (CVE-2021-20205) that occurred when
attempting to compress a specially-crafted malformed GIF image with a specified
image width of 0 using cjpeg.
5. Fixed a regression introduced by 2.0 beta1[15] whereby attempting to
generate a progressive JPEG image on an SSE2-capable CPU using a scan script
containing one or more scans with lengths divisible by 32 and non-zero
successive approximation low bit positions would, under certain circumstances,
result in an error ("Missing Huffman code table entry") and an invalid JPEG
image.
6. Introduced a new flag (`TJFLAG_LIMITSCANS` in the TurboJPEG C API and
`TJ.FLAG_LIMIT_SCANS` in the TurboJPEG Java API) and a corresponding TJBench
command-line argument (`-limitscans`) that causes the TurboJPEG decompression
and transform functions/operations to return/throw an error if a progressive
JPEG image contains an unreasonably large number of scans. This allows
applications that use the TurboJPEG API to guard against an exploit of the
progressive JPEG format described in the report
["Two Issues with the JPEG Standard"](https://libjpeg-turbo.org/pmwiki/uploads/About/TwoIssueswiththeJPEGStandard.pdf).
7. The PPM reader now throws an error, rather than segfaulting (due to a buffer
overrun) or generating incorrect pixels, if an application attempts to use the
`tjLoadImage()` function to load a 16-bit binary PPM file (a binary PPM file
with a maximum value greater than 255) into a grayscale image buffer or to load
a 16-bit binary PGM file into an RGB image buffer.
8. Fixed an issue in the PPM reader that caused incorrect pixels to be
generated when using the `tjLoadImage()` function to load a 16-bit binary PPM
file into an extended RGB image buffer.
9. Fixed an issue whereby, if a JPEG buffer was automatically re-allocated by
one of the TurboJPEG compression or transform functions and an error
subsequently occurred during compression or transformation, the JPEG buffer
pointer passed by the application was not updated when the function returned.
2.0.90 (2.1 beta1)
### Significant changes relative to 2.0.6:
1. The build system, x86-64 SIMD extensions, and accelerated Huffman codec now
support the x32 ABI on Linux, which allows for using x86-64 instructions with
32-bit pointers. The x32 ABI is generally enabled by adding `-mx32` to the
compiler flags.
Caveats:
- CMake 3.9.0 or later is required in order for the build system to
automatically detect an x32 build.
- Java does not support the x32 ABI, and thus the TurboJPEG Java API will
automatically be disabled with x32 builds.
2. Added Loongson MMI SIMD implementations of the RGB-to-grayscale, 4:2:2 fancy
chroma upsampling, 4:2:2 and 4:2:0 merged chroma upsampling/color conversion,
and fast integer DCT/IDCT algorithms. Relative to libjpeg-turbo 2.0.x, this
speeds up:
- the compression of RGB source images into grayscale JPEG images by
approximately 20%
- the decompression of 4:2:2 JPEG images by approximately 40-60% when
using fancy upsampling
- the decompression of 4:2:2 and 4:2:0 JPEG images by approximately
15-20% when using merged upsampling
- the compression of RGB source images by approximately 30-45% when using
the fast integer DCT
- the decompression of JPEG images into RGB destination images by
approximately 2x when using the fast integer IDCT
The overall decompression speedup for RGB images is now approximately
2.3-3.7x (compared to 2-3.5x with libjpeg-turbo 2.0.x.)
3. 32-bit (Armv7 or Armv7s) iOS builds of libjpeg-turbo are no longer
supported, and the libjpeg-turbo build system can no longer be used to package
such builds. 32-bit iOS apps cannot run in iOS 11 and later, and the App Store
no longer allows them.
4. 32-bit (i386) OS X/macOS builds of libjpeg-turbo are no longer supported,
and the libjpeg-turbo build system can no longer be used to package such
builds. 32-bit Mac applications cannot run in macOS 10.15 "Catalina" and
later, and the App Store no longer allows them.
5. The SSE2 (x86 SIMD) and C Huffman encoding algorithms have been
significantly optimized, resulting in a measured average overall compression
speedup of 12-28% for 64-bit code and 22-52% for 32-bit code on various Intel
and AMD CPUs, as well as a measured average overall compression speedup of
0-23% on platforms that do not have a SIMD-accelerated Huffman encoding
implementation.
6. The block smoothing algorithm that is applied by default when decompressing
progressive Huffman-encoded JPEG images has been improved in the following
ways:
- The algorithm is now more fault-tolerant. Previously, if a particular
scan was incomplete, then the smoothing parameters for the incomplete scan
would be applied to the entire output image, including the parts of the image
that were generated by the prior (complete) scan. Visually, this had the
effect of removing block smoothing from lower-frequency scans if they were
followed by an incomplete higher-frequency scan. libjpeg-turbo now applies
block smoothing parameters to each iMCU row based on which scan generated the
pixels in that row, rather than always using the block smoothing parameters for
the most recent scan.
- When applying block smoothing to DC scans, a Gaussian-like kernel with a
5x5 window is used to reduce the "blocky" appearance.
7. Added SIMD acceleration for progressive Huffman encoding on Arm platforms.
This speeds up the compression of full-color progressive JPEGs by about 30-40%
on average (relative to libjpeg-turbo 2.0.x) when using modern Arm CPUs.
8. Added configure-time and run-time auto-detection of Loongson MMI SIMD
instructions, so that the Loongson MMI SIMD extensions can be included in any
MIPS64 libjpeg-turbo build.
9. Added fault tolerance features to djpeg and jpegtran, mainly to demonstrate
methods by which applications can guard against the exploits of the JPEG format
described in the report
["Two Issues with the JPEG Standard"](https://libjpeg-turbo.org/pmwiki/uploads/About/TwoIssueswiththeJPEGStandard.pdf).
- Both programs now accept a `-maxscans` argument, which can be used to
limit the number of allowable scans in the input file.
- Both programs now accept a `-strict` argument, which can be used to
treat all warnings as fatal.
10. CMake package config files are now included for both the libjpeg and
TurboJPEG API libraries. This facilitates using libjpeg-turbo with CMake's
`find_package()` function. For example:
find_package(libjpeg-turbo CONFIG REQUIRED)
add_executable(libjpeg_program libjpeg_program.c)
target_link_libraries(libjpeg_program PUBLIC libjpeg-turbo::jpeg)
add_executable(libjpeg_program_static libjpeg_program.c)
target_link_libraries(libjpeg_program_static PUBLIC
libjpeg-turbo::jpeg-static)
add_executable(turbojpeg_program turbojpeg_program.c)
target_link_libraries(turbojpeg_program PUBLIC
libjpeg-turbo::turbojpeg)
add_executable(turbojpeg_program_static turbojpeg_program.c)
target_link_libraries(turbojpeg_program_static PUBLIC
libjpeg-turbo::turbojpeg-static)
11. Since the Unisys LZW patent has long expired, cjpeg and djpeg can now
read/write both LZW-compressed and uncompressed GIF files (feature ported from
jpeg-6a and jpeg-9d.)
12. jpegtran now includes the `-wipe` and `-drop` options from jpeg-9a and
jpeg-9d, as well as the ability to expand the image size using the `-crop`
option. Refer to jpegtran.1 or usage.txt for more details.
13. Added a complete intrinsics implementation of the Arm Neon SIMD extensions,
thus providing SIMD acceleration on Arm platforms for all of the algorithms
that are SIMD-accelerated on x86 platforms. This new implementation is
significantly faster in some cases than the old GAS implementation--
depending on the algorithms used, the type of CPU core, and the compiler. GCC,
as of this writing, does not provide a full or optimal set of Neon intrinsics,
so for performance reasons, the default when building libjpeg-turbo with GCC is
to continue using the GAS implementation of the following algorithms:
- 32-bit RGB-to-YCbCr color conversion
- 32-bit fast and accurate inverse DCT
- 64-bit RGB-to-YCbCr and YCbCr-to-RGB color conversion
- 64-bit accurate forward and inverse DCT
- 64-bit Huffman encoding
A new CMake variable (`NEON_INTRINSICS`) can be used to override this
default.
Since the new intrinsics implementation includes SIMD acceleration
for merged upsampling/color conversion, 1.5.1[5] is no longer necessary and has
been reverted.
14. The Arm Neon SIMD extensions can now be built using Visual Studio.
15. The build system can now be used to generate a universal x86-64 + Armv8
libjpeg-turbo SDK package for both iOS and macOS.
2.0.6
### Significant changes relative to 2.0.5:
1. Fixed "using JNI after critical get" errors that occurred on Android
platforms when using any of the YUV encoding/compression/decompression/decoding
methods in the TurboJPEG Java API.
2. Fixed or worked around multiple issues with `jpeg_skip_scanlines()`:
- Fixed segfaults or "Corrupt JPEG data: premature end of data segment"
errors in `jpeg_skip_scanlines()` that occurred when decompressing 4:2:2 or
4:2:0 JPEG images using merged (non-fancy) upsampling/color conversion (that
is, when setting `cinfo.do_fancy_upsampling` to `FALSE`.) 2.0.0[6] was a
similar fix, but it did not cover all cases.
- `jpeg_skip_scanlines()` now throws an error if two-pass color
quantization is enabled. Two-pass color quantization never worked properly
with `jpeg_skip_scanlines()`, and the issues could not readily be fixed.
- Fixed an issue whereby `jpeg_skip_scanlines()` always returned 0 when
skipping past the end of an image.
3. The Arm 64-bit (Armv8) Neon SIMD extensions can now be built using MinGW
toolchains targetting Arm64 (AArch64) Windows binaries.
4. Fixed unexpected visual artifacts that occurred when using
`jpeg_crop_scanline()` and interblock smoothing while decompressing only the DC
scan of a progressive JPEG image.
5. Fixed an issue whereby libjpeg-turbo would not build if 12-bit-per-component
JPEG support (`WITH_12BIT`) was enabled along with libjpeg v7 or libjpeg v8
API/ABI emulation (`WITH_JPEG7` or `WITH_JPEG8`.)
2.0.5
### Significant changes relative to 2.0.4:
1. Worked around issues in the MIPS DSPr2 SIMD extensions that caused failures
in the libjpeg-turbo regression tests. Specifically, the
`jsimd_h2v1_downsample_dspr2()` and `jsimd_h2v2_downsample_dspr2()` functions
in the MIPS DSPr2 SIMD extensions are now disabled until/unless they can be
fixed, and other functions that are incompatible with big endian MIPS CPUs are
disabled when building libjpeg-turbo for such CPUs.
2. Fixed an oversight in the `TJCompressor.compress(int)` method in the
TurboJPEG Java API that caused an error ("java.lang.IllegalStateException: No
source image is associated with this instance") when attempting to use that
method to compress a YUV image.
3. Fixed an issue (CVE-2020-13790) in the PPM reader that caused a buffer
overrun in cjpeg, TJBench, or the `tjLoadImage()` function if one of the values
in a binary PPM/PGM input file exceeded the maximum value defined in the file's
header and that maximum value was less than 255. libjpeg-turbo 1.5.0 already
included a similar fix for binary PPM/PGM files with maximum values greater
than 255.
4. The TurboJPEG API library's global error handler, which is used in functions
such as `tjBufSize()` and `tjLoadImage()` that do not require a TurboJPEG
instance handle, is now thread-safe on platforms that support thread-local
storage.
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/aprutil | 7 +-
config/rootfiles/common/expat | 1 +
config/rootfiles/common/glib | 55 +++++
config/rootfiles/common/libffi | 2 +-
config/rootfiles/common/libidn | 2 +-
config/rootfiles/common/libjpeg | 5 +
config/rootfiles/common/libmpc | 2 +-
config/rootfiles/common/libqmi | 2 +
config/rootfiles/common/pcre2 | 226 ++++++++++-----------
config/rootfiles/common/xz | 32 ++-
.../{oldcore/155 => core/173}/filelists/libffi | 0
.../{oldcore/106 => core/173}/filelists/libidn | 0
.../{oldcore/168 => core/173}/filelists/libinih | 0
.../{oldcore/107 => core/173}/filelists/libjpeg | 0
.../{oldcore/100 => core/173}/filelists/libmpc | 0
.../{oldcore/111 => core/173}/filelists/logrotate | 0
.../{oldcore/167 => core/173}/filelists/nano | 0
.../{oldcore/155 => core/173}/filelists/pcre2 | 0
.../{oldcore/100 => core/173}/filelists/xz | 0
config/rootfiles/packages/libtalloc | 2 +-
lfs/libexif | 10 +-
lfs/libffi | 6 +-
lfs/libidn | 6 +-
lfs/libinih | 8 +-
lfs/libjpeg | 6 +-
lfs/libmpc | 6 +-
lfs/libtalloc | 8 +-
lfs/logrotate | 4 +-
lfs/nano | 4 +-
lfs/pcre2 | 6 +-
lfs/xz | 6 +-
31 files changed, 252 insertions(+), 154 deletions(-)
copy config/rootfiles/{oldcore/155 => core/173}/filelists/libffi (100%)
copy config/rootfiles/{oldcore/106 => core/173}/filelists/libidn (100%)
copy config/rootfiles/{oldcore/168 => core/173}/filelists/libinih (100%)
copy config/rootfiles/{oldcore/107 => core/173}/filelists/libjpeg (100%)
copy config/rootfiles/{oldcore/100 => core/173}/filelists/libmpc (100%)
copy config/rootfiles/{oldcore/111 => core/173}/filelists/logrotate (100%)
copy config/rootfiles/{oldcore/167 => core/173}/filelists/nano (100%)
copy config/rootfiles/{oldcore/155 => core/173}/filelists/pcre2 (100%)
copy config/rootfiles/{oldcore/100 => core/173}/filelists/xz (100%)
Difference in files:
diff --git a/config/rootfiles/common/aprutil b/config/rootfiles/common/aprutil
index 8bc51ed00..dba4fa678 100644
--- a/config/rootfiles/common/aprutil
+++ b/config/rootfiles/common/aprutil
@@ -34,11 +34,16 @@ usr/bin/apu-1-config
#usr/include/apr-1/apu_errno.h
#usr/include/apr-1/apu_version.h
#usr/include/apr-1/apu_want.h
-#usr/include/apr-1/expat.h
#usr/lib/apr-util-1
usr/lib/apr-util-1/apr_crypto_openssl-1.so
#usr/lib/apr-util-1/apr_crypto_openssl.la
usr/lib/apr-util-1/apr_crypto_openssl.so
+usr/lib/apr-util-1/apr_dbd_sqlite3-1.so
+#usr/lib/apr-util-1/apr_dbd_sqlite3.la
+usr/lib/apr-util-1/apr_dbd_sqlite3.so
+usr/lib/apr-util-1/apr_dbm_gdbm-1.so
+#usr/lib/apr-util-1/apr_dbm_gdbm.la
+usr/lib/apr-util-1/apr_dbm_gdbm.so
#usr/lib/aprutil.exp
#usr/lib/libaprutil-1.la
#usr/lib/libaprutil-1.so
diff --git a/config/rootfiles/common/expat b/config/rootfiles/common/expat
index 5b25d63b8..233c46283 100644
--- a/config/rootfiles/common/expat
+++ b/config/rootfiles/common/expat
@@ -2,6 +2,7 @@
#usr/include/expat.h
#usr/include/expat_config.h
#usr/include/expat_external.h
+#usr/lib/cmake
#usr/lib/cmake/expat-2.5.0
#usr/lib/cmake/expat-2.5.0/expat-config-version.cmake
#usr/lib/cmake/expat-2.5.0/expat-config.cmake
diff --git a/config/rootfiles/common/glib b/config/rootfiles/common/glib
index 0b2e4b268..6b73dd42f 100644
--- a/config/rootfiles/common/glib
+++ b/config/rootfiles/common/glib
@@ -327,6 +327,7 @@ usr/lib/libgthread-2.0.so.0.7101.0
#usr/share/bash-completion/completions/gio
#usr/share/bash-completion/completions/gresource
#usr/share/bash-completion/completions/gsettings
+#usr/share/gdb
#usr/share/gdb/auto-load
#usr/share/gdb/auto-load/usr
#usr/share/gdb/auto-load/usr/lib
@@ -363,7 +364,11 @@ usr/lib/libgthread-2.0.so.0.7101.0
#usr/share/locale/an
#usr/share/locale/an/LC_MESSAGES
#usr/share/locale/an/LC_MESSAGES/glib20.mo
+#usr/share/locale/ar
+#usr/share/locale/ar/LC_MESSAGES
#usr/share/locale/ar/LC_MESSAGES/glib20.mo
+#usr/share/locale/as
+#usr/share/locale/as/LC_MESSAGES
#usr/share/locale/as/LC_MESSAGES/glib20.mo
#usr/share/locale/ast/LC_MESSAGES/glib20.mo
#usr/share/locale/az
@@ -374,28 +379,42 @@ usr/lib/libgthread-2.0.so.0.7101.0
#usr/share/locale/be@latin/LC_MESSAGES
#usr/share/locale/be(a)latin/LC_MESSAGES/glib20.mo
#usr/share/locale/bg/LC_MESSAGES/glib20.mo
+#usr/share/locale/bn
+#usr/share/locale/bn/LC_MESSAGES
#usr/share/locale/bn/LC_MESSAGES/glib20.mo
+#usr/share/locale/bn_IN
+#usr/share/locale/bn_IN/LC_MESSAGES
#usr/share/locale/bn_IN/LC_MESSAGES/glib20.mo
+#usr/share/locale/bs
+#usr/share/locale/bs/LC_MESSAGES
#usr/share/locale/bs/LC_MESSAGES/glib20.mo
#usr/share/locale/ca/LC_MESSAGES/glib20.mo
#usr/share/locale/ca@valencia
#usr/share/locale/ca@valencia/LC_MESSAGES
#usr/share/locale/ca(a)valencia/LC_MESSAGES/glib20.mo
#usr/share/locale/cs/LC_MESSAGES/glib20.mo
+#usr/share/locale/cy
+#usr/share/locale/cy/LC_MESSAGES
#usr/share/locale/cy/LC_MESSAGES/glib20.mo
#usr/share/locale/da/LC_MESSAGES/glib20.mo
#usr/share/locale/de/LC_MESSAGES/glib20.mo
+#usr/share/locale/dz
+#usr/share/locale/dz/LC_MESSAGES
#usr/share/locale/dz/LC_MESSAGES/glib20.mo
#usr/share/locale/el/LC_MESSAGES/glib20.mo
#usr/share/locale/en@shaw
#usr/share/locale/en@shaw/LC_MESSAGES
#usr/share/locale/en(a)shaw/LC_MESSAGES/glib20.mo
+#usr/share/locale/en_CA
+#usr/share/locale/en_CA/LC_MESSAGES
#usr/share/locale/en_CA/LC_MESSAGES/glib20.mo
#usr/share/locale/en_GB/LC_MESSAGES/glib20.mo
#usr/share/locale/eo/LC_MESSAGES/glib20.mo
#usr/share/locale/es/LC_MESSAGES/glib20.mo
#usr/share/locale/et/LC_MESSAGES/glib20.mo
#usr/share/locale/eu/LC_MESSAGES/glib20.mo
+#usr/share/locale/fa
+#usr/share/locale/fa/LC_MESSAGES
#usr/share/locale/fa/LC_MESSAGES/glib20.mo
#usr/share/locale/fi/LC_MESSAGES/glib20.mo
#usr/share/locale/fr/LC_MESSAGES/glib20.mo
@@ -407,8 +426,14 @@ usr/lib/libgthread-2.0.so.0.7101.0
#usr/share/locale/gd/LC_MESSAGES
#usr/share/locale/gd/LC_MESSAGES/glib20.mo
#usr/share/locale/gl/LC_MESSAGES/glib20.mo
+#usr/share/locale/gu
+#usr/share/locale/gu/LC_MESSAGES
#usr/share/locale/gu/LC_MESSAGES/glib20.mo
+#usr/share/locale/he
+#usr/share/locale/he/LC_MESSAGES
#usr/share/locale/he/LC_MESSAGES/glib20.mo
+#usr/share/locale/hi
+#usr/share/locale/hi/LC_MESSAGES
#usr/share/locale/hi/LC_MESSAGES/glib20.mo
#usr/share/locale/hr/LC_MESSAGES/glib20.mo
#usr/share/locale/hu/LC_MESSAGES/glib20.mo
@@ -423,26 +448,44 @@ usr/lib/libgthread-2.0.so.0.7101.0
#usr/share/locale/ja/LC_MESSAGES/glib20.mo
#usr/share/locale/ka/LC_MESSAGES/glib20.mo
#usr/share/locale/kk/LC_MESSAGES/glib20.mo
+#usr/share/locale/kn
+#usr/share/locale/kn/LC_MESSAGES
#usr/share/locale/kn/LC_MESSAGES/glib20.mo
#usr/share/locale/ko/LC_MESSAGES/glib20.mo
+#usr/share/locale/ku
+#usr/share/locale/ku/LC_MESSAGES
#usr/share/locale/ku/LC_MESSAGES/glib20.mo
#usr/share/locale/lt/LC_MESSAGES/glib20.mo
#usr/share/locale/lv/LC_MESSAGES/glib20.mo
#usr/share/locale/mai
#usr/share/locale/mai/LC_MESSAGES
#usr/share/locale/mai/LC_MESSAGES/glib20.mo
+#usr/share/locale/mg
+#usr/share/locale/mg/LC_MESSAGES
#usr/share/locale/mg/LC_MESSAGES/glib20.mo
+#usr/share/locale/mk
+#usr/share/locale/mk/LC_MESSAGES
#usr/share/locale/mk/LC_MESSAGES/glib20.mo
+#usr/share/locale/ml
+#usr/share/locale/ml/LC_MESSAGES
#usr/share/locale/ml/LC_MESSAGES/glib20.mo
#usr/share/locale/mn
#usr/share/locale/mn/LC_MESSAGES
#usr/share/locale/mn/LC_MESSAGES/glib20.mo
+#usr/share/locale/mr
+#usr/share/locale/mr/LC_MESSAGES
#usr/share/locale/mr/LC_MESSAGES/glib20.mo
#usr/share/locale/ms/LC_MESSAGES/glib20.mo
#usr/share/locale/nb/LC_MESSAGES/glib20.mo
+#usr/share/locale/nds
+#usr/share/locale/nds/LC_MESSAGES
#usr/share/locale/nds/LC_MESSAGES/glib20.mo
+#usr/share/locale/ne
+#usr/share/locale/ne/LC_MESSAGES
#usr/share/locale/ne/LC_MESSAGES/glib20.mo
#usr/share/locale/nl/LC_MESSAGES/glib20.mo
+#usr/share/locale/nn
+#usr/share/locale/nn/LC_MESSAGES
#usr/share/locale/nn/LC_MESSAGES/glib20.mo
#usr/share/locale/oc
#usr/share/locale/oc/LC_MESSAGES
@@ -450,6 +493,8 @@ usr/lib/libgthread-2.0.so.0.7101.0
#usr/share/locale/or
#usr/share/locale/or/LC_MESSAGES
#usr/share/locale/or/LC_MESSAGES/glib20.mo
+#usr/share/locale/pa
+#usr/share/locale/pa/LC_MESSAGES
#usr/share/locale/pa/LC_MESSAGES/glib20.mo
#usr/share/locale/pl/LC_MESSAGES/glib20.mo
#usr/share/locale/ps
@@ -470,12 +515,20 @@ usr/lib/libgthread-2.0.so.0.7101.0
#usr/share/locale/sr@ije
#usr/share/locale/sr@ije/LC_MESSAGES
#usr/share/locale/sr(a)ije/LC_MESSAGES/glib20.mo
+#usr/share/locale/sr@latin
+#usr/share/locale/sr@latin/LC_MESSAGES
#usr/share/locale/sr(a)latin/LC_MESSAGES/glib20.mo
#usr/share/locale/sv/LC_MESSAGES/glib20.mo
#usr/share/locale/ta/LC_MESSAGES/glib20.mo
+#usr/share/locale/te
+#usr/share/locale/te/LC_MESSAGES
#usr/share/locale/te/LC_MESSAGES/glib20.mo
+#usr/share/locale/tg
+#usr/share/locale/tg/LC_MESSAGES
#usr/share/locale/tg/LC_MESSAGES/glib20.mo
#usr/share/locale/th/LC_MESSAGES/glib20.mo
+#usr/share/locale/tl
+#usr/share/locale/tl/LC_MESSAGES
#usr/share/locale/tl/LC_MESSAGES/glib20.mo
#usr/share/locale/tr/LC_MESSAGES/glib20.mo
#usr/share/locale/tt
@@ -489,6 +542,8 @@ usr/lib/libgthread-2.0.so.0.7101.0
#usr/share/locale/wa
#usr/share/locale/wa/LC_MESSAGES
#usr/share/locale/wa/LC_MESSAGES/glib20.mo
+#usr/share/locale/xh
+#usr/share/locale/xh/LC_MESSAGES
#usr/share/locale/xh/LC_MESSAGES/glib20.mo
#usr/share/locale/yi
#usr/share/locale/yi/LC_MESSAGES
diff --git a/config/rootfiles/common/libffi b/config/rootfiles/common/libffi
index 7b5ed1248..02c161e54 100644
--- a/config/rootfiles/common/libffi
+++ b/config/rootfiles/common/libffi
@@ -4,7 +4,7 @@
#usr/lib/libffi.la
#usr/lib/libffi.so
usr/lib/libffi.so.8
-usr/lib/libffi.so.8.1.0
+usr/lib/libffi.so.8.1.2
#usr/lib/pkgconfig/libffi.pc
#usr/share/info/libffi.info
#usr/share/man/man3/ffi.3
diff --git a/config/rootfiles/common/libidn b/config/rootfiles/common/libidn
index c959f6c65..e2e2cd96a 100644
--- a/config/rootfiles/common/libidn
+++ b/config/rootfiles/common/libidn
@@ -9,7 +9,7 @@ usr/bin/idn
#usr/lib/libidn.la
#usr/lib/libidn.so
usr/lib/libidn.so.12
-usr/lib/libidn.so.12.6.3
+usr/lib/libidn.so.12.6.4
#usr/lib/pkgconfig/libidn.pc
#usr/share/emacs
#usr/share/emacs/site-lisp
diff --git a/config/rootfiles/common/libjpeg b/config/rootfiles/common/libjpeg
index eb74d2c50..74c101854 100644
--- a/config/rootfiles/common/libjpeg
+++ b/config/rootfiles/common/libjpeg
@@ -9,6 +9,11 @@
#usr/include/jmorecfg.h
#usr/include/jpeglib.h
#usr/include/turbojpeg.h
+#usr/lib/cmake/libjpeg-turbo
+#usr/lib/cmake/libjpeg-turbo/libjpeg-turboConfig.cmake
+#usr/lib/cmake/libjpeg-turbo/libjpeg-turboConfigVersion.cmake
+#usr/lib/cmake/libjpeg-turbo/libjpeg-turboTargets-release.cmake
+#usr/lib/cmake/libjpeg-turbo/libjpeg-turboTargets.cmake
#usr/lib/libjpeg.so
usr/lib/libjpeg.so.8
usr/lib/libjpeg.so.8.2.2
diff --git a/config/rootfiles/common/libmpc b/config/rootfiles/common/libmpc
index 382f669a8..298a52a09 100644
--- a/config/rootfiles/common/libmpc
+++ b/config/rootfiles/common/libmpc
@@ -3,5 +3,5 @@
#usr/lib/libmpc.la
#usr/lib/libmpc.so
usr/lib/libmpc.so.3
-usr/lib/libmpc.so.3.2.1
+usr/lib/libmpc.so.3.3.1
#usr/share/info/mpc.info
diff --git a/config/rootfiles/common/libqmi b/config/rootfiles/common/libqmi
index ba26300c3..2f639b870 100644
--- a/config/rootfiles/common/libqmi
+++ b/config/rootfiles/common/libqmi
@@ -63,6 +63,8 @@ usr/lib/libqmi-glib.so.5.8.0
#usr/lib/pkgconfig/qmi-glib.pc
usr/libexec/qmi-proxy
#usr/share/bash-completion/completions/qmicli
+#usr/share/gtk-doc
+#usr/share/gtk-doc/html
#usr/share/gtk-doc/html/libqmi-glib
#usr/share/gtk-doc/html/libqmi-glib/QmiClient.html
#usr/share/gtk-doc/html/libqmi-glib/QmiClientDms.html
diff --git a/config/rootfiles/common/pcre2 b/config/rootfiles/common/pcre2
index 716f23661..925efb675 100644
--- a/config/rootfiles/common/pcre2
+++ b/config/rootfiles/common/pcre2
@@ -6,132 +6,132 @@
#usr/lib/libpcre2-16.la
#usr/lib/libpcre2-16.so
usr/lib/libpcre2-16.so.0
-usr/lib/libpcre2-16.so.0.11.0
+usr/lib/libpcre2-16.so.0.11.2
#usr/lib/libpcre2-32.la
#usr/lib/libpcre2-32.so
usr/lib/libpcre2-32.so.0
-usr/lib/libpcre2-32.so.0.11.0
+usr/lib/libpcre2-32.so.0.11.2
#usr/lib/libpcre2-8.la
#usr/lib/libpcre2-8.so
usr/lib/libpcre2-8.so.0
-usr/lib/libpcre2-8.so.0.11.0
+usr/lib/libpcre2-8.so.0.11.2
#usr/lib/libpcre2-posix.la
#usr/lib/libpcre2-posix.so
usr/lib/libpcre2-posix.so.3
-usr/lib/libpcre2-posix.so.3.0.2
+usr/lib/libpcre2-posix.so.3.0.4
#usr/lib/pkgconfig/libpcre2-16.pc
#usr/lib/pkgconfig/libpcre2-32.pc
#usr/lib/pkgconfig/libpcre2-8.pc
#usr/lib/pkgconfig/libpcre2-posix.pc
-#usr/share/doc/pcre-pcre2-10.40
-#usr/share/doc/pcre-pcre2-10.40/AUTHORS
-#usr/share/doc/pcre-pcre2-10.40/COPYING
-#usr/share/doc/pcre-pcre2-10.40/ChangeLog
-#usr/share/doc/pcre-pcre2-10.40/LICENCE
-#usr/share/doc/pcre-pcre2-10.40/NEWS
-#usr/share/doc/pcre-pcre2-10.40/README
-#usr/share/doc/pcre-pcre2-10.40/html
-#usr/share/doc/pcre-pcre2-10.40/html/NON-AUTOTOOLS-BUILD.txt
-#usr/share/doc/pcre-pcre2-10.40/html/README.txt
-#usr/share/doc/pcre-pcre2-10.40/html/index.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2-config.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_callout_enumerate.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_code_copy.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_code_copy_with_tables.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_code_free.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_compile.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_compile_context_copy.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_compile_context_create.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_compile_context_free.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_config.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_convert_context_copy.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_convert_context_create.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_convert_context_free.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_converted_pattern_free.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_dfa_match.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_general_context_copy.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_general_context_create.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_general_context_free.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_get_error_message.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_get_mark.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_get_match_data_size.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_get_ovector_count.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_get_ovector_pointer.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_get_startchar.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_jit_compile.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_jit_free_unused_memory.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_jit_match.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_jit_stack_assign.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_jit_stack_create.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_jit_stack_free.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_maketables.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_maketables_free.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_match.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_match_context_copy.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_match_context_create.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_match_context_free.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_match_data_create.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_match_data_create_from_pattern.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_match_data_free.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_pattern_convert.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_pattern_info.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_serialize_decode.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_serialize_encode.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_serialize_free.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_serialize_get_number_of_codes.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_set_bsr.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_set_callout.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_set_character_tables.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_set_compile_extra_options.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_set_compile_recursion_guard.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_set_depth_limit.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_set_glob_escape.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_set_glob_separator.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_set_heap_limit.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_set_match_limit.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_set_max_pattern_length.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_set_newline.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_set_offset_limit.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_set_parens_nest_limit.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_set_recursion_limit.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_set_recursion_memory_management.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_set_substitute_callout.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_substitute.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_substring_copy_byname.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_substring_copy_bynumber.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_substring_free.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_substring_get_byname.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_substring_get_bynumber.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_substring_length_byname.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_substring_length_bynumber.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_substring_list_free.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_substring_list_get.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_substring_nametable_scan.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2_substring_number_from_name.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2api.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2build.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2callout.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2compat.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2convert.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2demo.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2grep.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2jit.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2limits.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2matching.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2partial.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2pattern.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2perform.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2posix.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2sample.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2serialize.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2syntax.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2test.html
-#usr/share/doc/pcre-pcre2-10.40/html/pcre2unicode.html
-#usr/share/doc/pcre-pcre2-10.40/pcre2-config.txt
-#usr/share/doc/pcre-pcre2-10.40/pcre2.txt
-#usr/share/doc/pcre-pcre2-10.40/pcre2grep.txt
-#usr/share/doc/pcre-pcre2-10.40/pcre2test.txt
+#usr/share/doc/pcre-pcre2-10.42
+#usr/share/doc/pcre-pcre2-10.42/AUTHORS
+#usr/share/doc/pcre-pcre2-10.42/COPYING
+#usr/share/doc/pcre-pcre2-10.42/ChangeLog
+#usr/share/doc/pcre-pcre2-10.42/LICENCE
+#usr/share/doc/pcre-pcre2-10.42/NEWS
+#usr/share/doc/pcre-pcre2-10.42/README
+#usr/share/doc/pcre-pcre2-10.42/html
+#usr/share/doc/pcre-pcre2-10.42/html/NON-AUTOTOOLS-BUILD.txt
+#usr/share/doc/pcre-pcre2-10.42/html/README.txt
+#usr/share/doc/pcre-pcre2-10.42/html/index.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2-config.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_callout_enumerate.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_code_copy.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_code_copy_with_tables.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_code_free.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_compile.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_compile_context_copy.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_compile_context_create.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_compile_context_free.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_config.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_convert_context_copy.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_convert_context_create.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_convert_context_free.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_converted_pattern_free.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_dfa_match.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_general_context_copy.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_general_context_create.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_general_context_free.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_get_error_message.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_get_mark.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_get_match_data_size.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_get_ovector_count.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_get_ovector_pointer.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_get_startchar.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_jit_compile.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_jit_free_unused_memory.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_jit_match.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_jit_stack_assign.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_jit_stack_create.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_jit_stack_free.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_maketables.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_maketables_free.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_match.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_match_context_copy.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_match_context_create.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_match_context_free.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_match_data_create.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_match_data_create_from_pattern.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_match_data_free.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_pattern_convert.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_pattern_info.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_serialize_decode.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_serialize_encode.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_serialize_free.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_serialize_get_number_of_codes.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_set_bsr.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_set_callout.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_set_character_tables.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_set_compile_extra_options.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_set_compile_recursion_guard.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_set_depth_limit.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_set_glob_escape.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_set_glob_separator.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_set_heap_limit.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_set_match_limit.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_set_max_pattern_length.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_set_newline.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_set_offset_limit.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_set_parens_nest_limit.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_set_recursion_limit.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_set_recursion_memory_management.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_set_substitute_callout.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_substitute.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_substring_copy_byname.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_substring_copy_bynumber.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_substring_free.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_substring_get_byname.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_substring_get_bynumber.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_substring_length_byname.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_substring_length_bynumber.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_substring_list_free.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_substring_list_get.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_substring_nametable_scan.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2_substring_number_from_name.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2api.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2build.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2callout.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2compat.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2convert.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2demo.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2grep.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2jit.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2limits.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2matching.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2partial.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2pattern.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2perform.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2posix.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2sample.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2serialize.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2syntax.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2test.html
+#usr/share/doc/pcre-pcre2-10.42/html/pcre2unicode.html
+#usr/share/doc/pcre-pcre2-10.42/pcre2-config.txt
+#usr/share/doc/pcre-pcre2-10.42/pcre2.txt
+#usr/share/doc/pcre-pcre2-10.42/pcre2grep.txt
+#usr/share/doc/pcre-pcre2-10.42/pcre2test.txt
#usr/share/man/man1/pcre2-config.1
#usr/share/man/man1/pcre2grep.1
#usr/share/man/man1/pcre2test.1
diff --git a/config/rootfiles/common/xz b/config/rootfiles/common/xz
index d2f1d44cc..1e4a43729 100644
--- a/config/rootfiles/common/xz
+++ b/config/rootfiles/common/xz
@@ -41,7 +41,7 @@ usr/bin/xzmore
#usr/lib/liblzma.la
usr/lib/liblzma.so
usr/lib/liblzma.so.5
-usr/lib/liblzma.so.5.2.8
+usr/lib/liblzma.so.5.4.0
#usr/lib/pkgconfig/liblzma.pc
#usr/share/doc/xz
#usr/share/doc/xz/AUTHORS
@@ -93,6 +93,9 @@ usr/lib/liblzma.so.5.2.8
#usr/share/man/de/man1/lzcat.1
#usr/share/man/de/man1/lzcmp.1
#usr/share/man/de/man1/lzdiff.1
+#usr/share/man/de/man1/lzegrep.1
+#usr/share/man/de/man1/lzfgrep.1
+#usr/share/man/de/man1/lzgrep.1
#usr/share/man/de/man1/lzless.1
#usr/share/man/de/man1/lzma.1
#usr/share/man/de/man1/lzmadec.1
@@ -104,6 +107,9 @@ usr/lib/liblzma.so.5.2.8
#usr/share/man/de/man1/xzcmp.1
#usr/share/man/de/man1/xzdec.1
#usr/share/man/de/man1/xzdiff.1
+#usr/share/man/de/man1/xzegrep.1
+#usr/share/man/de/man1/xzfgrep.1
+#usr/share/man/de/man1/xzgrep.1
#usr/share/man/de/man1/xzless.1
#usr/share/man/de/man1/xzmore.1
#usr/share/man/fr
@@ -147,3 +153,27 @@ usr/lib/liblzma.so.5.2.8
#usr/share/man/man1/xzgrep.1
#usr/share/man/man1/xzless.1
#usr/share/man/man1/xzmore.1
+#usr/share/man/ro
+#usr/share/man/ro/man1
+#usr/share/man/ro/man1/lzcat.1
+#usr/share/man/ro/man1/lzcmp.1
+#usr/share/man/ro/man1/lzdiff.1
+#usr/share/man/ro/man1/lzegrep.1
+#usr/share/man/ro/man1/lzfgrep.1
+#usr/share/man/ro/man1/lzgrep.1
+#usr/share/man/ro/man1/lzless.1
+#usr/share/man/ro/man1/lzma.1
+#usr/share/man/ro/man1/lzmadec.1
+#usr/share/man/ro/man1/lzmore.1
+#usr/share/man/ro/man1/unlzma.1
+#usr/share/man/ro/man1/unxz.1
+#usr/share/man/ro/man1/xz.1
+#usr/share/man/ro/man1/xzcat.1
+#usr/share/man/ro/man1/xzcmp.1
+#usr/share/man/ro/man1/xzdec.1
+#usr/share/man/ro/man1/xzdiff.1
+#usr/share/man/ro/man1/xzegrep.1
+#usr/share/man/ro/man1/xzfgrep.1
+#usr/share/man/ro/man1/xzgrep.1
+#usr/share/man/ro/man1/xzless.1
+#usr/share/man/ro/man1/xzmore.1
diff --git a/config/rootfiles/core/173/filelists/libffi b/config/rootfiles/core/173/filelists/libffi
new file mode 120000
index 000000000..c391acd0c
--- /dev/null
+++ b/config/rootfiles/core/173/filelists/libffi
@@ -0,0 +1 @@
+../../../common/libffi
\ No newline at end of file
diff --git a/config/rootfiles/core/173/filelists/libidn b/config/rootfiles/core/173/filelists/libidn
new file mode 120000
index 000000000..7e3548957
--- /dev/null
+++ b/config/rootfiles/core/173/filelists/libidn
@@ -0,0 +1 @@
+../../../common/libidn
\ No newline at end of file
diff --git a/config/rootfiles/core/173/filelists/libinih b/config/rootfiles/core/173/filelists/libinih
new file mode 120000
index 000000000..7f703bed7
--- /dev/null
+++ b/config/rootfiles/core/173/filelists/libinih
@@ -0,0 +1 @@
+../../../common/libinih
\ No newline at end of file
diff --git a/config/rootfiles/core/173/filelists/libjpeg b/config/rootfiles/core/173/filelists/libjpeg
new file mode 120000
index 000000000..3b1a782fb
--- /dev/null
+++ b/config/rootfiles/core/173/filelists/libjpeg
@@ -0,0 +1 @@
+../../../common/libjpeg
\ No newline at end of file
diff --git a/config/rootfiles/core/173/filelists/libmpc b/config/rootfiles/core/173/filelists/libmpc
new file mode 120000
index 000000000..88840fc30
--- /dev/null
+++ b/config/rootfiles/core/173/filelists/libmpc
@@ -0,0 +1 @@
+../../../common/libmpc
\ No newline at end of file
diff --git a/config/rootfiles/core/173/filelists/logrotate b/config/rootfiles/core/173/filelists/logrotate
new file mode 120000
index 000000000..bc192c05d
--- /dev/null
+++ b/config/rootfiles/core/173/filelists/logrotate
@@ -0,0 +1 @@
+../../../common/logrotate
\ No newline at end of file
diff --git a/config/rootfiles/core/173/filelists/nano b/config/rootfiles/core/173/filelists/nano
new file mode 120000
index 000000000..2f07279c0
--- /dev/null
+++ b/config/rootfiles/core/173/filelists/nano
@@ -0,0 +1 @@
+../../../common/nano
\ No newline at end of file
diff --git a/config/rootfiles/core/173/filelists/pcre2 b/config/rootfiles/core/173/filelists/pcre2
new file mode 120000
index 000000000..4482caeae
--- /dev/null
+++ b/config/rootfiles/core/173/filelists/pcre2
@@ -0,0 +1 @@
+../../../common/pcre2
\ No newline at end of file
diff --git a/config/rootfiles/core/173/filelists/xz b/config/rootfiles/core/173/filelists/xz
new file mode 120000
index 000000000..734e926c7
--- /dev/null
+++ b/config/rootfiles/core/173/filelists/xz
@@ -0,0 +1 @@
+../../../common/xz
\ No newline at end of file
diff --git a/config/rootfiles/packages/libtalloc b/config/rootfiles/packages/libtalloc
index ef80efcea..dd7fa75c2 100644
--- a/config/rootfiles/packages/libtalloc
+++ b/config/rootfiles/packages/libtalloc
@@ -1,5 +1,5 @@
#usr/include/talloc.h
#usr/lib/libtalloc.so
usr/lib/libtalloc.so.2
-usr/lib/libtalloc.so.2.3.1
+usr/lib/libtalloc.so.2.3.4
#usr/lib/pkgconfig/talloc.pc
diff --git a/lfs/libexif b/lfs/libexif
index c23dfd573..c89232b1c 100644
--- a/lfs/libexif
+++ b/lfs/libexif
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 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,15 +26,15 @@ include Config
SUMMARY = An EXIF Tag Parsing Library for Digital Cameras
-VER = 0.6.22
+VER = 0.6.24
THISAPP = libexif-$(VER)
-DL_FILE = $(THISAPP).tar.xz
+DL_FILE = $(THISAPP).tar.bz2
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = libexif
-PAK_VER = 2
+PAK_VER = 3
DEPS =
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 3771dcf2d6a9d9a63e2d3fcdd49487bec7af45d1d18aef1bf3d427893b0cfc464fab37adfbfa549571a58540c7c1eb402724afe05c36baa51a6b7f19ee17ed2b
+$(DL_FILE)_BLAKE2 = 75d3a2b4fefd7b7706226e70d31250ef7e99eeb81a4839ddc36cc9e3180534542d8a02851f8e6fd5034bbc925a616ead8c4bfb0cce8bc5886c3ec54811914a6b
install : $(TARGET)
diff --git a/lfs/libffi b/lfs/libffi
index f34ce36ae..bfd02b57f 100644
--- a/lfs/libffi
+++ b/lfs/libffi
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 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 #
@@ -24,7 +24,7 @@
include Config
-VER = 3.4.2
+VER = 3.4.4
THISAPP = libffi-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = a8137bc895b819f949fd7705e405be627219c6d1fdef280253330f7407d4a548bb057d7bb0e9225d1767d42f9bf5f0ab3c455db1c3470d7cc876bb7b7d55d308
+$(DL_FILE)_BLAKE2 = 189fe1ffe9507f204581b0ab09995dc7e7b761bb4eac7e338e9f5ff81431aebcef6c182c1839c9f9acb2706697a260c67e6d1351cf7e2aed7c4eb5d694f6f8fd
install : $(TARGET)
diff --git a/lfs/libidn b/lfs/libidn
index 408d74976..4ce55a0a4 100644
--- a/lfs/libidn
+++ b/lfs/libidn
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2020 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 #
@@ -24,7 +24,7 @@
include Config
-VER = 1.38
+VER = 1.41
THISAPP = libidn-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 92059e87554338a3565ee4b517fa1ba7bd3e9d57d8be7d71aee377220f50b597e529469c6ddc7c9e7c25b9e83c76f652457256dd32249c3e1cd97df8867723a1
+$(DL_FILE)_BLAKE2 = 6c632c2010f024792fd55d3c8e6f68e81152fa7421a4f65b6835d0dfd788707727381270c57bf46c6e252777e07ead501fdabdc55961c5c1604e81c53be5ab2b
install : $(TARGET)
diff --git a/lfs/libinih b/lfs/libinih
index 0b4793d5d..6cd9d353a 100644
--- a/lfs/libinih
+++ b/lfs/libinih
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 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 #
@@ -24,9 +24,9 @@
include Config
-VER = r55
+VER = 56
-THISAPP = inih-$(VER)
+THISAPP = inih-r$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 28b5e04e54e31b3e0392b44799a2c2e75c1fe00527491a857480b7e960302f2438d29652b131dae5147487c863d93f577b67aeff3ab5f863546d3661628d8236
+$(DL_FILE)_BLAKE2 = 51935959a9eb4e393b17302f0932a232963883680f10d404c63d5f2ebbd3bf0b740f44edfa1b2541d0e130016eb853ebedf68a1c40797f658496e2a8c966af3d
install : $(TARGET)
diff --git a/lfs/libjpeg b/lfs/libjpeg
index 6808640a4..b9c9d3cd8 100644
--- a/lfs/libjpeg
+++ b/lfs/libjpeg
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2020 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 #
@@ -24,7 +24,7 @@
include Config
-VER = 2.0.4
+VER = 2.1.4
THISAPP = libjpeg-turbo-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 9be870a5bafaae279646941b848b69fdf7c95ec08a686b01674f473ef33fe5923a04ba8a2d57df84384530308ca46fc3880a404c0eff769129417a553faed3bb
+$(DL_FILE)_BLAKE2 = 80ffd77d58a37eae0bdc1868d994f34ea52c13e2624c720b1d0b6ec4d6d14b16911163ccd4009c8d6eda214f31e1fff78bb7eb4739ae6589d0fd8c7008c0e972
install : $(TARGET)
diff --git a/lfs/libmpc b/lfs/libmpc
index 8d1f65aba..7c90e40f9 100644
--- a/lfs/libmpc
+++ b/lfs/libmpc
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 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 #
@@ -24,7 +24,7 @@
include Config
-VER = 1.2.1
+VER = 1.3.1
THISAPP = mpc-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 9cd03c6a71839e4cdb3c1f18d718cc4d3097c3f8ec307a5c756bd5df27c68aa013755156b3b156efee1acabfee2269602c6a3a358092ef0d522271c9c56c133d
+$(DL_FILE)_BLAKE2 = 76434e6f8830af3571836d51576bfebbc9701e9bbb5c4686f134081cd96cd90ae02f7ff42bf9e3957c7a7ba92b6b2d9cdabe18f0269271147521cd7f6a2d551c
install : $(TARGET)
diff --git a/lfs/libtalloc b/lfs/libtalloc
index 524aceca0..0aa165b23 100644
--- a/lfs/libtalloc
+++ b/lfs/libtalloc
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 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 = Samba talloc Library
-VER = 2.3.1
+VER = 2.3.4
THISAPP = talloc-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = libtalloc
-PAK_VER = 1
+PAK_VER = 2
DEPS =
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 3d014a47639434c65f5dda2c51da3c6c28d5d60dbc9afdaca27b8ec903cde3433a8fa4ca33305750ff60911f7e43171d0d932d98c2d30ea38494aa532d6d9626
+$(DL_FILE)_BLAKE2 = 1fac0a45a4ba16c7741e6d810e1a1e56352c04f266b99de62770177c1218a8c8253be2d5d1793aae67ce61e6a1159cbcd4888a49702822e6817b86eb7a1fea31
install : $(TARGET)
diff --git a/lfs/logrotate b/lfs/logrotate
index 0e66a68e9..eb0f2de3f 100644
--- a/lfs/logrotate
+++ b/lfs/logrotate
@@ -24,7 +24,7 @@
include Config
-VER = 3.20.1
+VER = 3.21.0
THISAPP = logrotate-$(VER)
DL_FILE = logrotate-$(VER).tar.gz
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 52f1b1991f6e17d04dee3b795bd6621be707b9386cb966f1434b00f4e6d9e8242c17a88642f98db720f8eeda6c1e38d25f050eb9e9be48a8323f84c9e408cf71
+$(DL_FILE)_BLAKE2 = bd801aa8daed19213720ef36af8070277c3b36df2b866ab921bc5ff85afe97871638f4a690061ba752f16b2df53acc76373097bf95b6a7fd2821c20574a444d8
install : $(TARGET)
diff --git a/lfs/nano b/lfs/nano
index 89167b2af..7ec2eca48 100644
--- a/lfs/nano
+++ b/lfs/nano
@@ -24,7 +24,7 @@
include Config
-VER = 7.0
+VER = 7.1
THISAPP = nano-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 5212aa2a65cc7bccb33ebd66934e53ea7c6bd739ceae94796397bd193698453417eae2a5cf63c995e90aa077795f9bcf70568a35208716a09c9a6d89d75ff409
+$(DL_FILE)_BLAKE2 = cc606a04b34e723da01326d617b50f79711d0b35034b3e75f410fa7e277ba3eddbb1a408a80255533d2fa953f23fee745979363d5621b63a79bd89b29d8d528e
install : $(TARGET)
diff --git a/lfs/pcre2 b/lfs/pcre2
index b57af0971..4c23f9021 100644
--- a/lfs/pcre2
+++ b/lfs/pcre2
@@ -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 #
@@ -24,7 +24,7 @@
include Config
-VER = 10.40
+VER = 10.42
THISAPP = pcre2-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -54,7 +54,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 627a204585b92238eda81b4befc88757a81d75b0d9fa26ea6d51afcdd93f7e2d102a2245bf3c8e1f5f9ddf69a316c419c948b741a64442bb567480015543e49b
+$(DL_FILE)_BLAKE2 = 40aa096745548c489a00ead87a191a4d24ecd924a5b8f00401c1273176de15ccb23510882467c8e2b5c1256b97db46fba5fcdfbd9f0d61d86a29d74bb4bca7a0
install : $(TARGET)
diff --git a/lfs/xz b/lfs/xz
index 83a724e1a..1e4020dde 100644
--- a/lfs/xz
+++ b/lfs/xz
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2020 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 #
@@ -24,7 +24,7 @@
include Config
-VER = 5.2.8
+VER = 5.4.0
THISAPP = xz-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 44d1ddd783b2527f3b17481fc277b671808eb5639c10d31bfaca9fd29ac4413628654ecb9e207955a9477c83eb30f61cf5607cd9a49dd71732707731e4444ace
+$(DL_FILE)_BLAKE2 = 8896044ae2761561161f4dcfc1e8e0bc6a58a2a7784567156b23e589cdb80028b37655af65802a20d2631ef05c209e406424f061c0293458a41b16dbf75a4f29
install : $(TARGET)
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, next, updated. e043f7b78759ee9aa130e29ff0f6f11413dc7557
by Peter Müller 27 Dec '22
by Peter Müller 27 Dec '22
27 Dec '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 e043f7b78759ee9aa130e29ff0f6f11413dc7557 (commit)
via b000e8e46680558c7415952a53779d5dc09bccd3 (commit)
via 83104495ee8a55ffa641bdc508aa47964933f076 (commit)
via 1d087b0bc0f0d980255430c670d4d4ca7b232ce6 (commit)
via 4652d382070f1395bbfddab4ac0adb3a9ba006e4 (commit)
via bdfe67598735ad28aa2ed705d3de7ebfad4930fc (commit)
via aadc6c8a655b881fc3ea8dd96400cff53fdaa4b7 (commit)
via 75b473e2d667fe6718b07472d3c761e3a8b066e1 (commit)
via 199217cfc96a18787b63575b7326314d4218a904 (commit)
via a39a7ffdadd898d69a1f6b746708aea3eec4a5af (commit)
via c567d55e58ecdf044fc3858c5e784157f8ee0a7b (commit)
via 8e93f8a545c077ba5da6412cd1249e2eb8fd4cd9 (commit)
via 01e65b0902270179c807f4cc8ebf61ad7b397e83 (commit)
via 776419475f3067b0861f3d0180bb5a7f06bf1dd2 (commit)
via 6d144d259f90c1591a1f53deee665207fc7f4f1f (commit)
via a32aad7548c0d162ea5de9fbf0ebb01d51529367 (commit)
via 0da1e37ada91a4b1d580c551877582585c118d3a (commit)
via 15214970e65ae371852305c97743205803d0847e (commit)
via 53dae68c59059705338cae6a60b227d3fd94c192 (commit)
via e10a8583ae069c075429634188fdc619a3cf1758 (commit)
via 09bf147878a16af6949969bcfd24620067ddb257 (commit)
via 410dcc25ca1b38a47f8799bfdec32789e0ac553e (commit)
via 1302f0cde8ed3225841a51c75e341698460c41fa (commit)
via 349fc481b81bbaaaff9a46100384f61858377019 (commit)
via d78ff61511fe2ea540d5cfa87cd9a8120ce232da (commit)
via f2171fc9d6106ecf0a2ce796ee9e725832168690 (commit)
via 366bae41ff322b42e58e920cadb3b406b000fe4b (commit)
via 5e1db85c4f5f7a0287ee390f3a1522dc0a948ed7 (commit)
via 9f39e8c13ecb7931e9cfaebae0fd20df0bc11b32 (commit)
via 5d34a9171ce66443bf777d22b364714788b3760e (commit)
via a5e11a4cc26fa0185e9e9f24b5470ddaf8301640 (commit)
via 15e496e4964ef2e059912c5cbea9178c41a2aaa7 (commit)
via 6202651723f744d44c8536a94f02fe27ccbf1f57 (commit)
via 883ec31e3c3e7ec9fa27e65a6c15e2c9effd7e9f (commit)
via 3392be3a57cb8f642d9d0d25690015510655154e (commit)
via 5b5facc3ca025d648bbfc7161e4b6bbab787acce (commit)
via b1ff8adbf0271c37139303441f30a485ea0c85b9 (commit)
via 580c249a5b8d5800d62c98ca50f8936e7a906452 (commit)
via 8d09028b69202788d92631655764b78f70b6dc23 (commit)
via 86ba5ce3161d2fce3a7190e761ba72dee63889ae (commit)
via ece96c6f5648421a1adf79770d7c92a12e963a64 (commit)
via e3da49123860f1247affe903f3425f2af4afd33c (commit)
via 1f568cc0edabca40d07add4e160ca642070a4678 (commit)
via cb4b6f433ea588cd1e79f0ce90e56b7acc511981 (commit)
via c2e2c2824ac01c37639091d881df4601c007cd8b (commit)
via 7a67f77f10c05436960a3a9097e8019a34f07167 (commit)
via 4ffd18a7747b43c00df00e0cd0b914beaf785833 (commit)
via ccf36e9e8c1361b8addf1508444276e79310afe0 (commit)
via 261727435df172b80ebf940c9bdd5e8cef9c1179 (commit)
via 36914cce704b95445acf565d5e2ede01e05e513b (commit)
via 11f6226f6553e893c4b3530c0ce193f13485f46d (commit)
via a22e3c8ec7e0411a6976fcc43dc132395e5cf0f7 (commit)
via effe5c73394138fd86587a1eaecec1f151e1986b (commit)
via f28d5fa8cc95be27ee836c63ed53e39926fd80f9 (commit)
via 7c3369a623d3fe7bf9191bc9bc9d1b2d7407521d (commit)
via 80989cc935682e637b55d262e8e0e0a0077937c3 (commit)
via 38f02ae3a1647630008be14dba7f4a0b94c9af9a (commit)
via a0918657c93766809ef442543932240a2ae225f3 (commit)
via 957863f754deb9351bd1c53c16f53ef84ac86add (commit)
via c6551e73c23d4661f70a7e4f342035bc6f901a86 (commit)
via 33d2aa6d02693d9354cc55c9adaa9361cd6a43f4 (commit)
via 177ec16705ccbaf8755124a0038ab123477cbfa6 (commit)
via 1d66c3509f1c74c9960715bc1e2e3860e7801711 (commit)
via 47a57621b0adf2506515d3602a1177a71afcb9e5 (commit)
via a8dcce1aad19a5bbeadc5544acd59ef8d6087322 (commit)
from 9ea8de7c39ee35d6fcabc3bfca4a7754344e6610 (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 e043f7b78759ee9aa130e29ff0f6f11413dc7557
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Mon Dec 26 08:56:31 2022 +0000
Core Update 173: Ship psmisc
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit b000e8e46680558c7415952a53779d5dc09bccd3
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Sat Dec 17 13:14:25 2022 +0100
psmisc: Update to version 23.6
- Update from version 23.4 to 23.6
- Update of rootfile
- Changelog
Changes in 23.6
* buildsys: Fix DEJAGNU work-around Debian #1015089
* killall: Use kill if pidfd_send_signal fails Debian #1015228
* fuser: Do not mention nonexistent - reset option #42
* fuser: Use modern statn where possible
* pstree: Better AppArmor support !30
Changes in 23.5
* killall: Check truncated names !28
* killall: Use openat and pidfd_send_signal #37
* killall: Don't check paths of sockets #35
* pstree: Check for process with show_parents #38
* pstree: Don't disable compaction with show pgids #34
* pstree: Fix storage leak !29
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 83104495ee8a55ffa641bdc508aa47964933f076
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Mon Dec 26 08:54:16 2022 +0000
Core Update 173: Ship iproute2
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 1d087b0bc0f0d980255430c670d4d4ca7b232ce6
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Sat Dec 17 13:14:20 2022 +0100
iproute2: Update to version 6.1.0
- Update from version 6.0.0 to 6.1.0
- Update of rootfile not required
- Changelog is only available from the commits in the git repositry
https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/log/
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 4652d382070f1395bbfddab4ac0adb3a9ba006e4
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Mon Dec 26 08:53:46 2022 +0000
Core Update 173: Ship libarchive
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit bdfe67598735ad28aa2ed705d3de7ebfad4930fc
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Sat Dec 17 13:14:22 2022 +0100
libarchive: Update to version 3.6.2
- Update from version 3.6.1 to 3.6.2
- Update of rootfile
- patch to fix glibc 2.36 headers is now part of the source code
- Changelog
Libarchive 3.6.2 is a bugfix and security release.
Important bug fixes:
include ZSTD in Windows builds (#1688)
SSL fixes on Windows (#1714, #1723, #1724)
rar5 reader: fix possible garbled output with bsdtar -O (#1745)
mtree reader: support reading mtree files with tabs (#1783)
various small fixes for issues found by CodeQL
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
commit aadc6c8a655b881fc3ea8dd96400cff53fdaa4b7
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Mon Dec 26 08:49:55 2022 +0000
Core Update 173: Ship krb5
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 75b473e2d667fe6718b07472d3c761e3a8b066e1
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Sat Dec 17 13:14:21 2022 +0100
krb5: Update to version 1.20.1
- Update from version 1.20 to 1.20.1
- Update of rootfile not required
- Changelog
Major changes in 1.20.1 (2022-11-15)
Fix integer overflows in PAC parsing [CVE-2022-42898].
Fix null deref in KDC when decoding invalid NDR.
Fix memory leak in OTP kdcpreauth module.
Fix PKCS11 module path search.
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 199217cfc96a18787b63575b7326314d4218a904
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Mon Dec 26 08:48:43 2022 +0000
Core Update 173: Ship libstatgrab
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit a39a7ffdadd898d69a1f6b746708aea3eec4a5af
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Sun Dec 11 13:33:28 2022 +0100
libstatgrab: Update to version 0.92.1
- Update from vesrion 0.92 to 0.92.1
- Update of rootfile
- Changelog
libstatgrab 0.92.1 (27 July 2021)
* Fix build with autoconf 2.70+.
* Fix CPU stats on older Linux kernels.
* Make sure to count processes in an unknown state.
* Check if -ltinfo is needed when linking ncurses.
* Fixes to build when cross-compiling.
* Fix build with -DNDEBUG.
* Handle vmmeter changes in FreeBSD 12.
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
commit c567d55e58ecdf044fc3858c5e784157f8ee0a7b
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Mon Dec 26 08:46:39 2022 +0000
Core Update 173: Ship libssh
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 8e93f8a545c077ba5da6412cd1249e2eb8fd4cd9
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Sun Dec 11 13:33:27 2022 +0100
libssh: Update to version 0.10.4
- Update from version 0.9.6 to 0.10.4
- Update of rootfile
- Changelog
version 0.10.4 (released 2022-09-07)
* Fixed issues with KDF on big endian
version 0.10.3 (released 2022-09-05)
* Fixed possible infinite loop in known hosts checking
version 0.10.2 (released 2022-09-02)
* Fixed tilde expansion when handling include directives
* Fixed building the shared torture library
* Made rekey test more robust (fixes running on i586 build systems e.g koji)
version 0.10.1 (released 2022-08-30)
* Fixed proxycommand support
* Fixed musl libc support
version 0.10.0 (released 2022-08-26)
* Added support for OpenSSL 3.0
* Added support for mbedTLS 3
* Added support for Smart Cards (through openssl pkcs11 engine)
* Added support for chacha20-poly1305(a)openssh.com with libgcrypt
* Added support ed25519 keys in PEM files
* Added support for sk-ecdsa and sk-ed25519 (server side)
* Added support for limiting RSA key sizes and not accepting small one by
default
* Added support for ssh-agent on Windows
* Added ssh_userauth_publickey_auto_get_current_identity() API
* Added ssh_vlog() API
* Added ssh_send_issue_banner() API
* Added ssh_session_set_disconnect_message() API
* Added new configuration options:
+ IdentityAgent
+ ModuliFile
* Provided X11 client example
* Disabled DSA support at build time by default (will be removed in the next
release)
* Deprecated the SCP API!
* Deprecated old pubkey, privatekey API
* Avoided some needless large stack buffers to minimize memory footprint
* Removed support for OpenSSL < 1.0.1
* Fixed parsing username@host in login name
* Free global init mutex in the destructor on Windows
* Fixed PEM parsing in mbedtls to support both legacy and new PKCS8 formats
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 01e65b0902270179c807f4cc8ebf61ad7b397e83
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Sun Dec 11 13:33:26 2022 +0100
libshout: Update to version 2.4.6
- Update from version 2.4.3 to 2.4.6
- Update of rootfile
- Changelog
libshout 2.4.6 (20220410)
* Fixed pkg-config file (#2329)
* Made vorbis an optional codec
* Do not pass to small headers to libspeex
(see also the same mirror-patch in Icecast)
* Updated documentation, mostly in regard of making it clearer
which functions are now obsoleted
* General code cleanup
* Added compiler warnings about obsoleted functions and
ignored return values
* Replaced old shout_set_metadata() with new shout_set_metadata_utf8()
* Added support for plain text streaming
* Fixed shout_set_metadata*() sometimes returning SHOUTERR_RETRY (#2328)
* Workaround old clients by emulating SHOUTERR_RETRY with SHOUTERR_BUSY (#2316)
* Remove our re-implementation of X509_check_host()
* Allow to disable building tools (#2331)
libshout 2.4.5 (20201219)
* Improved shout.h for reading, and understanding.
* Marked dumpfile support as obsolete (as SHOUT_PROTOCOL_XAUDIOCAST already is).
* Added Support for setting the content language.
* Avoid the use of obsolete functions (#2317).
* Several small fixes for non-blocking mode (#2321, #2315).
* Corrected detection of libogg (mostly for windows targets).
* Now accept TLS mode "auto" when build without TLS support.
* Added new tool shout(1).
libshout 2.4.4 (20201001)
* Fixed handling of blocking/non-blocking mode
* Fixed ICY port increment
* Fixed reusing of handles
* Fixed error handling of Ogg sync layer
* Fixed Passing of errors between connection and instance layer
Without this fix died connections were not correctly detected.
* Fixed and improved build scripts
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 776419475f3067b0861f3d0180bb5a7f06bf1dd2
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Sun Dec 11 13:33:25 2022 +0100
libpciaccess: Update to version 0.17
- Update from version 0.16 to 0.17
- Update of rootfile not required
- bz2 source file no longer available - xz supplied
- Changelog is available in the source file and lists each of the commits that have been
added between version 0.16 and 0.17 A bit too long to include fully here.
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 6d144d259f90c1591a1f53deee665207fc7f4f1f
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Sun Dec 11 13:33:23 2022 +0100
dbus: Update to version 1.14.4
- Update from version 1.14.0 to 1.14.4
- Update of rootfile
- Changelog
dbus 1.14.4 (2022-10-05)
This is a security update for the dbus 1.14.x stable branch, fixing
denial-of-service issues (CVE-2022-42010, -42011, -42012) and applying
security hardening (dbus#416).
Behaviour changes:
• On Linux, dbus-daemon and other uses of DBusServer now create a
path-based Unix socket, unix:path=..., when asked to listen on a
unix:tmpdir=... address. This makes unix:tmpdir=... equivalent to
unix:dir=... on all platforms.
Previous versions would have created an abstract socket, unix:abstract=...,
in this situation.
This change primarily affects the well-known session bus when run via
dbus-launch(1) or dbus-run-session(1). The user bus, enabled by configuring
dbus with --enable-user-session and running it on a systemd system,
already used path-based Unix sockets and is unaffected by this change.
This behaviour change prevents a sandbox escape via the session bus socket
in sandboxing frameworks that can share the network namespace with the host
system, such as Flatpak.
This change might cause a regression in situations where the abstract socket
is intentionally shared between the host system and a chroot or container,
such as some use-cases of schroot(1). That regression can be resolved by
using a bind-mount to share either the D-Bus socket, or the whole /tmp
directory, with the chroot or container.
(dbus#416, Simon McVittie)
Denial of service fixes:
Evgeny Vereshchagin discovered several ways in which an authenticated
local attacker could cause a crash (denial of service) in
dbus-daemon --system or a custom DBusServer. In uncommon configurations
these could potentially be carried out by an authenticated remote attacker.
• An invalid array of fixed-length elements where the length of the array
is not a multiple of the length of the element would cause an assertion
failure in debug builds or an out-of-bounds read in production builds.
This was a regression in version 1.3.0.
(dbus#413, CVE-2022-42011; Simon McVittie)
• A syntactically invalid type signature with incorrectly nested parentheses
and curly brackets would cause an assertion failure in debug builds.
Similar messages could potentially result in a crash or incorrect message
processing in a production build, although we are not aware of a practical
example. (dbus#418, CVE-2022-42010; Simon McVittie)
• A message in non-native endianness with out-of-band Unix file descriptors
would cause a use-after-free and possible memory corruption in production
builds, or an assertion failure in debug builds. This was a regression in
version 1.3.0. (dbus#417, CVE-2022-42012; Simon McVittie)
dbus 1.14.2 (2022-09-26)
Fixes:
• Fix build failure on FreeBSD (dbus!277, Alex Richardson)
• Fix build failure on macOS with launchd enabled
(dbus!287, Dawid Wróbel)
• Preserve errno on failure to open /proc/self/oom_score_adj
(dbus!285, Gentoo#834725; Mike Gilbert)
• On Linux, don't log warnings if oom_score_adj is read-only but does not
need to be changed (dbus!291, Simon McVittie)
• Slightly improve error-handling for inotify
(dbus!235, Simon McVittie)
• Don't crash if dbus-daemon is asked to watch more than 128 directories
for changes (dbus!302, Jan Tojnar)
• Autotools build system fixes:
· Don't treat --with-x or --with-x=yes as a request to disable X11,
fixing a regression in 1.13.20. Instead, require X11 libraries and
fail if they cannot be detected. (dbus!263, Lars Wendler)
· When a CMake project uses an Autotools-built libdbus in a
non-standard prefix, find dbus-arch-deps.h successfully
(dbus#314, Simon McVittie)
· Don't include generated XML catalog in source releases
(dbus!317, Jan Tojnar)
· Improve robustness of detecting gcc __sync atomic builtins
(dbus!320, Alex Richardson)
• CMake build system fixes:
· Detect endianness correctly, fixing interoperability with other D-Bus
implementations on big-endian systems (dbus#375, Ralf Habacker)
· When building for Unix, install session and system bus setup
in the intended locations
(dbus!267, dbus!297; Ralf Habacker, Alex Richardson)
· Detect setresuid() and getresuid() (dbus!319, Alex Richardson)
· Detect backtrace() on FreeBSD (dbus!281, Alex Richardson)
· Don't include headers from parent directory (dbus!282, Alex Richardson)
· Distinguish between host and target TMPDIR when cross-compiling
(dbus!279, Alex Richardson)
· Fix detection of atomic operations (dbus!306, Alex Richardson)
Tests and CI enhancements:
• On Unix, skip tests that switch uid if run in a container that is
unable to do so, instead of failing (dbus#407, Simon McVittie)
• Use the latest MSYS2 packages for CI
(Ralf Habacker, Simon McVittie)
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
commit a32aad7548c0d162ea5de9fbf0ebb01d51529367
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Mon Dec 26 08:42:52 2022 +0000
Core Update 173: Ship hwdata
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 0da1e37ada91a4b1d580c551877582585c118d3a
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Sun Dec 11 13:33:24 2022 +0100
hwdata: Update of pci and usb ids files
- Update pci.ids from version 2022.03.22 to 2022.12.04
- Update usb.ids from version 2022.03.18 to 2022.12.09
- No update of rootfile
- No change to lfs
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 15214970e65ae371852305c97743205803d0847e
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Sun Dec 11 13:33:22 2022 +0100
avahi: Fix bug #13017 - - dbus[n]: Unknown group "netdev" in message bus configuration file
- add command into avahi install.sh paks file to add netdev group if it doesn't exist
- Update avahi PAK_VER to ensure that change is shipped
Tested-by: Jon Murphy <jon.murphy(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 53dae68c59059705338cae6a60b227d3fd94c192
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Mon Dec 26 08:41:09 2022 +0000
Core Update 173: Ship libyang
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit e10a8583ae069c075429634188fdc619a3cf1758
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Fri Dec 9 22:48:25 2022 +0100
libyang: Update to version 2.1.4
- Update from version 2.0.194 to 2.1.4
- Update of rootfile
- Changelog
Version 2.1.4 Latest
Main changes of this release are:
large extensions refactoring
increased ext plugin API version
new callbacks and capabilities of plugins
changes in the parsed and compiled ext instance structures
native support for structure extension
error path logging improvements
fixed unions with leafrefs
yanglint schema mount support
huge number of other fixes and improvements
Version 2.0.231
Main changes of this release are:
XPath axes support
schema-mount fixes
many other fixes in various parts of the library
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 09bf147878a16af6949969bcfd24620067ddb257
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Mon Dec 26 08:40:29 2022 +0000
Core Update 173: Ship libxslt
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 410dcc25ca1b38a47f8799bfdec32789e0ac553e
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Fri Dec 9 22:48:14 2022 +0100
libxslt: Update to version 1.1.37
- Update from version 1.1.35 to 1.1.37
- Update of rootfile
- Changelog
v1.1.37: Aug 29 2022
### Improvements
- Don't use deprecated libxml2 macros
- Don't mess with xmlDefaultSAXHandler
### Build system
- Require automake-1.16.3 or later
- Remove generated files from distribution
- Add missing compile definition for static builds to Autotools (Mike Dalessio)
v1.1.36: Aug 17 2022
### Removals and deprecations
- Remove SVN keyword anchors
- Remove CVS and SVN-related code
- Remove README.cvs-commits
- Remove ChangeLog
- Remove xsltwin32config.h
### Improvements
- Simplify xsltexports.h and exsltexports.h
- Don't overlink executables with gcrypt
- Fix quadratic behavior with variables and parameters
- Remove case labels with XPointer location types
- Add configure~ to .gitignore
- Stop calling deprecated libxml2 functions
### Portability
- Use portable python shebangs (David Seifert)
- Remove useless __CYGWIN__ checks
- Remove cruft from win32config.h
- crypto.c: Silence a compiler warning on Windows (Chun-wei Fan)
### Build system
- Add missing compile definition for static builds to CMake
- Avoid obsolescent `test -a` constructs (David Seifert)
- Only link libxml2 statically in purely static build
- Set AC_CONFIG_MACRO_DIR
- Allow AM_MAINTAINER_MODE to be disabled
- Streamline and fix documentation installation
- Don't try to recreate COPYING symlink
- Remove special configuration for certain maintainers
- configure.ac: produce tar.xz only (GNOME policy) (David Seifert)
- Detect libm using libtool's macros (David Seifert)
- configure.ac: disable static libraries by default (David Seifert)
- python/Makefile.am: nest python docs in $(docdir) (David Seifert)
- python/Makefile.am: rely on global AM_INIT_AUTOMAKE (David Seifert)
- configure.ac: remove useless AC_SUBST (David Seifert)
- Use AM_PATH_PYTHON/PKG_CHECK_MODULES for python bindings (David Seifert)
- Change libxml2 Python config
- Don't check for standard C89 library functions
- Don't check for standard C89 headers
- Remove --with-html-dir option
- Also check for glibtoolize in autogen.sh
- Rework documentation build system
- Remove old website
- CMake: Relax check for enabling crypto support on Windows (Chun-wei Fan)
- Remove obsolete AC_HEADER_STDC autoconf macro (Vadim Zeitlin)
- Remove special configuration for old maintainers
### Test suite, CI
- Remove test involving XPointer range-to function
- Test recursion in EXSLT dynamic functions
- Add CI job for static build
### Documentation
- Move tutorial images
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 1302f0cde8ed3225841a51c75e341698460c41fa
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Fri Dec 9 22:48:02 2022 +0100
libvirt: Update version to 8.10.0
- Update from version 8.9.0 to 8.10.0
- Update of rootfile
- Changelog
v8.10.0 (2022-12-01)
**New features**
* Tool for validating SEV firmware boot measurement of QEMU VMs
The ``virt-qemu-sev-validate`` program will compare a reported SEV/SEV-ES
domain launch measurement, to a computed launch measurement. This
determines whether the domain has been tampered with during launch.
* Support for SGX EPC (enclave page cache)
Users can add a ``<memory model='sgx-epc'>`` device to lauch a VM with
``Intel Software Guard Extensions``.
* Support migration of vTPM state of QEMU vms on shared storage
Pass ``--migration`` option if appropriate in order for ``swtpm`` to
properly migrate on shared storage.
**Improvements**
* Mark close callback (un-)register API as high priority
High priority APIs use a separate thread pool thus can help in eliminating
problems with stuck VMs. Marking the close callback API as high priority
allows ``virsh`` to properly connect to the daemon in case the normal
priority workers are stuck allowing other high priority API usage.
* Updated x86 CPU features
The following features for the x86 platform were added:
``v-vmsave-vmload``, ``vgif``, ``avx512-vp2intersect``, ``avx512-fp16``,
``serialize``, ``tsx-ldtrk``, ``arch-lbr``, ``xfd``, ``intel-pt-lip``,
``avic``, ``sgx``, ``sgxlc``, ``sgx-exinfo``, ``sgx1``, ``sgx2``,
``sgx-debug``, ``sgx-mode64``, ``sgx-provisionkey``, ``sgx-tokenkey``,
``sgx-kss``, ``bus-lock-detect``, ``pks``, ``amx``.
* Add support for ``hv-avic`` Hyper-V enlightenment
``qemu-6.2`` introduced support for the ``hv-avic`` enlightenment which
allows to use Hyper-V SynIC with hardware APICv/AVIC enabled.
* qemu: Run memory preallocation with numa-pinned threads
Run the thread allocating memory in the proper NUMA node to reduce overhead.
* RPM packaging changes
- add optional dependancy of ``libvirt-daemon`` on ``libvirt-client``
The ``libvirt-guests.`` tool requires the ``virsh`` client to work
properly, but we don't want to require the installation of the daemon
if the tool is not used.
- relax required ``python3-libvirt`` version for ``libvirt-client-qemu``
The ``virt-qemu-qmp-proxy`` tool requires python but doesn't strictly
need the newest version. Remove the strict versioning requirement in
order to prevent cyclic dependency when building.
**Bug fixes**
* Skip initialization of ``cache`` capabilities if host doesn't support them
Hypervisor drivers would fail to initialize on ``aarch64`` hosts with
following error ::
virStateInitialize:657 : Initialisation of cloud-hypervisor state driver failed: no error
which prevented the startup of the daemon.
* Allow incoming connections to guests on routed networks w/firewalld
A change in handling of implicit rules in ``firewalld 1.0.0`` broke
incomming connections to VMs when using ``routed`` network. This is fixed
by adding a new ``libvirt-routed`` zone configured to once again allow
incoming sessions to guests on routed networks.
* Fix infinite loop in nodedev driver
Certain udev entries might be of a size that makes libudev emit EINVAL
which caused a busy loop burning CPU. Fix it by ignoring the return code.
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 349fc481b81bbaaaff9a46100384f61858377019
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Fri Dec 9 22:47:51 2022 +0100
libusbredir: Update to version 0.13.0
- Update from version 0.8.0 to 0.13.0
- Update of rootfile
- bz2 version no longer supplied only xz version
- Build changed from autotyools to meson/ninja
- Changelog
# usbredir-0.13.0 - 01 Aug 2022
- !61 Fix regression on unserialize data
- !59 Removes usbredirserver
- !58 Improved header length checks when unserialising data
- !62 Fix usage of command line argument in usbredirect
- !57 Fix small memory leak on usbredirect
# usbredir-0.12.0 - 12 Nov 2021
- !47 Implement dropping packets from isochronous devices
when buffer is owned by usbredirparser library
- !50 Use packet size limit on deserialization
- !54 Fix possible bad state in deserialization logic
- !48 Fix possible memory leak in serialization logic
- !45 Fix (un)serialization with empty write buffers
- !42 !46 !52 Improvements to usbredirparserfuzz
# usbredir-0.11.0 - 10 Aug 2021
- !40 Fixes use-after-free on usbredirparser serialization
- !25 Fixes memory leak in usbredirparser
- !32 Fixes build in MacOS related to visibility of exported symbols
- !36 Adds usbredirfilter_free function
- !29 Adds Fuzzing for Filters
- !34 Improvements to usbredirfilter_string_to_rules()
# usbredir-0.10.0 - 27 May 2021
- !23 Fixes 0.9.0 regression in bulk transfer message size
- !20 Drops autotools, only meson is supported now
- !15, !16, !18, !21 Improves fuzzing code base and meson builds
- !17 Fixes libusbredirhost.pc when generated by meson
# usbredir-0.9.0 - 02 Apr 2021
- !2 Add usbredirect tool with feature parity with usbredirserver
- !6 Add fuzzer for usbredirparser
- !12 Add MSI installer for usbredirect tool
- !11 Add meson build: autotool will be removed in a future release
- !5 Limit packet's length to 65 kB
- !4 Fix wrong up-cast when checking for package's length
- Require LLVM's compiler-rt (optional: for fuzzer)
- Require glib2 >= 2.44 (optional: for usbredirect)
- Deprecate usbredirserver in favor of usbredirect
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
commit d78ff61511fe2ea540d5cfa87cd9a8120ce232da
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Mon Dec 26 08:36:20 2022 +0000
Core Update 173: Ship libusb
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit f2171fc9d6106ecf0a2ce796ee9e725832168690
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Fri Dec 9 22:47:38 2022 +0100
libusb: Update to version 1.0.26
- Update from version 1.0.25 to 1.0.26
- Update of rootfile not required
- Changelog
2022-04-10: v1.0.26
* Fix regression with transfer free's after closing device
* Fix regression with destroyed context if API is misused
* Workaround for applications using missing default context
* Fix hotplog enumeration regression
* Fix Windows isochronous transfer regression since 1.0.24
* Fix macOS exit crash in some multi-context cases
* Build fixes for various platforms and configurations
* Fix Windows HID multi-interface product string retrieval
* Update isochronous OUT packet actual lengths on Windows
* Add interface bound checking for broken devices
* Add umockdev tests on Linux
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 366bae41ff322b42e58e920cadb3b406b000fe4b
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Mon Dec 26 08:34:23 2022 +0000
Core Update 173: Ship mpfr
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 5e1db85c4f5f7a0287ee390f3a1522dc0a948ed7
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Thu Dec 1 22:21:02 2022 +0100
mpfr: Update to version 4.1.1 with patch 1
- Update from version 4.1.0 with patch set 1 to 13 to 4.1.1 with aptch set 1 to 1
- Update of rootfile
- Changelog
Changes from version 4.1.0 to version 4.1.1:
- Bug fixes (see <https://www.mpfr.org/mpfr-4.1.0/#fixed> and/or the
ChangeLog file), in particular for macros implementing functions.
- Improved manual formatting.
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 9f39e8c13ecb7931e9cfaebae0fd20df0bc11b32
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Mon Dec 26 08:30:49 2022 +0000
Core Update 173: Ship libconfig
Note to self: Does the filesystem cleanup routine called in update.sh
handle the rootfile changes of this properly?
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 5d34a9171ce66443bf777d22b364714788b3760e
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sun Dec 18 16:30:23 2022 +0100
libconfig: Update to 1.7.3
...it just came my way...
For details see:
https://github.com/hyperrealm/libconfig/releases/tag/v1.7.3
This release includes some bugfixes and enhancements.
Fixed a memory access violation bug in config_clear()
Various fixes to CMake and Visual Studio build files
Added a Setting::isString() method
Fixed a bug in config_setting_lookup() where the setting itself
(instead of NULL) would be returned if the path was not found.
Renamed all remaining internal methods that lacked a 'libconfig_'
prefix.
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit a5e11a4cc26fa0185e9e9f24b5470ddaf8301640
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Mon Dec 26 08:29:36 2022 +0000
Run ./make.sh update-contributors
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 15e496e4964ef2e059912c5cbea9178c41a2aaa7
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Fri Dec 23 09:41:27 2022 +0000
make.sh: Commit leftovers
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 6202651723f744d44c8536a94f02fe27ccbf1f57
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Wed Dec 21 07:30:08 2022 +0000
make.sh: Fix build order to build glib properly
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 883ec31e3c3e7ec9fa27e65a6c15e2c9effd7e9f
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Fri Oct 21 16:15:20 2022 +0200
QMI: Update red/iface file when using QMI.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
commit 3392be3a57cb8f642d9d0d25690015510655154e
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sat Dec 17 17:25:21 2022 +0000
Core Update 173: Ship QMI-related changes
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 5b5facc3ca025d648bbfc7161e4b6bbab787acce
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Dec 1 17:23:18 2022 +0000
make.sh: Build some dependencies for glib earlier
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit b1ff8adbf0271c37139303441f30a485ea0c85b9
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Dec 1 17:23:17 2022 +0000
network: Silence any output during the QMI setup
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 580c249a5b8d5800d62c98ca50f8936e7a906452
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Dec 1 17:23:16 2022 +0000
network: Assign "static" MAC addresses to QMI interfaces
This is really badly hacky, but I do not know a better way to solve this
with our existing "setup" program which would be a nightmare to extend.
So we are using the device number to generate a static MAC address which
can then be used as usual. I doubt many people will have more than one
device.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 8d09028b69202788d92631655764b78f70b6dc23
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Dec 1 17:23:15 2022 +0000
network: Force dhcpcd to ask for an IP address
So since all this static nonsense wasn't feeling right, I opened a
ticket upstream and got a lead how to actually get some proper DHCP
working.
https://github.com/NetworkConfiguration/dhcpcd/issues/129
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 86ba5ce3161d2fce3a7190e761ba72dee63889ae
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Dec 1 17:23:14 2022 +0000
dhcpcd.exe: Add a safety net to make sure we always have a route
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit ece96c6f5648421a1adf79770d7c92a12e963a64
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Dec 1 17:23:13 2022 +0000
dhcpcd.exe: Ignore some events
We don't want any log messages printed.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit e3da49123860f1247affe903f3425f2af4afd33c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Dec 1 17:23:12 2022 +0000
dhcpcd.exe: Reformat the reason dispatcher
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 1f568cc0edabca40d07add4e160ca642070a4678
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Dec 1 17:23:11 2022 +0000
network: dhcpcd fails to check link state for QMI interfaces
When acquiring an IP address, dhcpcd seems to think that the interface
is down or does not work properly for some reason. It will
subsequentially decide to exit which is not what we want here.
Therefore this patch tells dhcpcd to ignore the link state and keep
happily running.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit cb4b6f433ea588cd1e79f0ce90e56b7acc511981
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Dec 1 17:23:10 2022 +0000
dhcpcd.exe: Fix typo in configuring DNS server
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit c2e2c2824ac01c37639091d881df4601c007cd8b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Dec 1 17:23:09 2022 +0000
dhcpcd.exe: Run everything no matter how RED is configured
This could potentially create problems when we abuse these functions to
launch the DHCP client on IPTV interfaces. This would have to be tested
and confirmed or potentially we would need some more changes to keep
supporting that use-case, too.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 7a67f77f10c05436960a3a9097e8019a34f07167
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Dec 1 17:23:08 2022 +0000
dhcpcd.exe: Only touch /var/ipfire/red/active once
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 4ffd18a7747b43c00df00e0cd0b914beaf785833
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Dec 1 17:23:07 2022 +0000
dhcpcd.exe: Do not overwrite the default gateway when empty
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit ccf36e9e8c1361b8addf1508444276e79310afe0
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Dec 1 17:23:06 2022 +0000
dhcpcd.exe: Use DNS servers from QMI
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 261727435df172b80ebf940c9bdd5e8cef9c1179
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Dec 1 17:23:05 2022 +0000
dhcpcd.exe: Store the default gateway when in QMI mode
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 36914cce704b95445acf565d5e2ede01e05e513b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Dec 1 17:23:04 2022 +0000
dhcpcd.exe: Only set gateway when we have received one
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 11f6226f6553e893c4b3530c0ce193f13485f46d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Dec 1 17:23:03 2022 +0000
dhcpcd.exe: Actually use the received MTU
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit a22e3c8ec7e0411a6976fcc43dc132395e5cf0f7
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Dec 1 17:23:02 2022 +0000
dhcpcd.exe: Flush any configured IP addresses on shutdown
This allows us to start with a fresh interface every time dhcpcd is
being restarted.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit effe5c73394138fd86587a1eaecec1f151e1986b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Dec 1 17:23:01 2022 +0000
dhcpcd: Only try to obtain an IP address for IPv4
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit f28d5fa8cc95be27ee836c63ed53e39926fd80f9
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Dec 1 17:23:00 2022 +0000
network: Remove --debug switch for dhcpcd in QMI mode
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 7c3369a623d3fe7bf9191bc9bc9d1b2d7407521d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Dec 1 17:22:59 2022 +0000
pppsetup.cgi: Move authentication above MTU
I feel that authentication is more important.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 80989cc935682e637b55d262e8e0e0a0077937c3
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Dec 1 17:22:58 2022 +0000
pppsetup.cgi: Add support for QMI profiles
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 38f02ae3a1647630008be14dba7f4a0b94c9af9a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Dec 1 17:22:57 2022 +0000
pppsetup.cgi: Add support for QMI profiles
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit a0918657c93766809ef442543932240a2ae225f3
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Dec 1 17:22:56 2022 +0000
network: Drop any traces of ISDN
This has been removed a long time ago and we should probably spend a
little bit more time on keeping the networking code tidy :)
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 957863f754deb9351bd1c53c16f53ef84ac86add
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Dec 1 17:22:55 2022 +0000
network: Add support for QMI modems
QMI is a proprietary interface from Qualcomm which are absolute pioneers
when it comes to interfacing with modems. I don't think there would be
any way to make this any more complicated and bloated.
So, bascially we will put the modem into a raw IP mode which changes the
interface into Point-to-Point mode.
We then configure the provider settings using qmicli. After that, the
modem will try to connect to the provider and obtain an IP address.
We will then start a DHCP client which does not do any DHCP-ing because
implementing that would be too complicated. Instead we do something even
*more* complicated where we would launch a custom script which asks the
modem for the allocated IP address and will configure it into the
device. The DHCP client then reads that IP address from the device and
pretends it came up with it by itself. Such an easy way to do this.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit c6551e73c23d4661f70a7e4f342035bc6f901a86
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Dec 1 17:22:54 2022 +0000
network: Allow passing custom options to dhcpcd
This is useful for debugging.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 33d2aa6d02693d9354cc55c9adaa9361cd6a43f4
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Dec 1 17:22:53 2022 +0000
dhcpcd.exe: Allow using the DHCP setup scripts when RED is not configured as DHCP
This is useful for dial-up methods that use DHCP, but when RED_TYPE is
configured as PPP.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 177ec16705ccbaf8755124a0038ab123477cbfa6
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Dec 1 17:22:52 2022 +0000
dhcpcd: Log any unhandled client events
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 1d66c3509f1c74c9960715bc1e2e3860e7801711
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Dec 1 17:22:51 2022 +0000
libqmi: New package
This library implements the QMI modem protocol.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 47a57621b0adf2506515d3602a1177a71afcb9e5
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Dec 1 17:22:50 2022 +0000
libgudev: New package
This is required for libqmi.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit a8dcce1aad19a5bbeadc5544acd59ef8d6087322
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sat Dec 17 17:19:13 2022 +0000
Start Core Update 173
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/dhcpc/dhcpcd.conf | 3 +
config/rootfiles/common/configroot | 2 -
config/rootfiles/common/libarchive | 2 +-
config/rootfiles/common/libconfig | 4 +-
config/rootfiles/common/libgudev | 13 +
config/rootfiles/common/libqmi | 468 +++
config/rootfiles/common/libssh | 2 +-
config/rootfiles/common/libstatgrab | 2 +-
config/rootfiles/common/libxslt | 117 +-
config/rootfiles/common/libyang | 16 +-
config/rootfiles/common/mpfr | 2 +-
config/rootfiles/common/psmisc | 44 +-
config/rootfiles/core/{172 => 173}/core-files | 0
config/rootfiles/core/{172 => 173}/exclude | 0
.../core/{172 => 173}/filelists/core-files | 0
config/rootfiles/core/173/filelists/files | 7 +
.../{oldcore/132 => core/173}/filelists/hwdata | 0
.../rootfiles/core/{172 => 173}/filelists/iproute2 | 0
.../{oldcore/169 => core/173}/filelists/krb5 | 0
.../{oldcore/104 => core/173}/filelists/libarchive | 0
.../{oldcore/126 => core/173}/filelists/libconfig | 0
config/rootfiles/core/173/filelists/libgudev | 1 +
config/rootfiles/core/173/filelists/libqmi | 1 +
.../{oldcore/137 => core/173}/filelists/libssh | 0
.../159 => core/173}/filelists/libstatgrab | 0
.../{oldcore/145 => core/173}/filelists/libusb | 0
.../{oldcore/157 => core/173}/filelists/libxslt | 0
.../{oldcore/164 => core/173}/filelists/libyang | 0
.../{oldcore/101 => core/173}/filelists/mpfr | 0
.../{oldcore/167 => core/173}/filelists/psmisc | 0
.../rootfiles/{oldcore/152 => core/173}/update.sh | 12 +-
config/rootfiles/{core => oldcore}/172/core-files | 0
config/rootfiles/{core => oldcore}/172/exclude | 0
.../{core => oldcore}/172/filelists/aarch64/u-boot | 0
.../{core => oldcore}/172/filelists/apache2 | 0
.../{core => oldcore}/172/filelists/armv6l/python3 | 0
.../{core => oldcore}/172/filelists/armv6l/u-boot | 0
.../rootfiles/{core => oldcore}/172/filelists/bash | 0
.../rootfiles/{core => oldcore}/172/filelists/bind | 0
.../172/filelists/ca-certificates | 0
.../172/filelists/conntrack-tools | 0
.../{core => oldcore}/172/filelists/core-files | 0
.../rootfiles/{core => oldcore}/172/filelists/curl | 0
.../{core => oldcore}/172/filelists/elinks | 0
.../{core => oldcore}/172/filelists/ethtool | 0
.../{core => oldcore}/172/filelists/expat | 0
.../{core => oldcore}/172/filelists/files | 0
.../{core => oldcore}/172/filelists/iana-etc | 0
.../{core => oldcore}/172/filelists/iproute2 | 0
.../rootfiles/{core => oldcore}/172/filelists/kmod | 0
.../{core => oldcore}/172/filelists/libedit | 0
.../{core => oldcore}/172/filelists/libhtp | 0
.../{core => oldcore}/172/filelists/libloc | 0
.../172/filelists/libnetfilter_conntrack | 0
.../{core => oldcore}/172/filelists/libpng | 0
.../{core => oldcore}/172/filelists/libtasn1 | 0
.../{core => oldcore}/172/filelists/libtiff | 0
.../{core => oldcore}/172/filelists/libuv | 0
.../{core => oldcore}/172/filelists/libxcrypt | 0
.../{core => oldcore}/172/filelists/libxml2 | 0
.../rootfiles/{core => oldcore}/172/filelists/lsof | 0
.../rootfiles/{core => oldcore}/172/filelists/nano | 0
.../{core => oldcore}/172/filelists/openssh | 0
.../{core => oldcore}/172/filelists/openssl | 0
.../{core => oldcore}/172/filelists/openvpn | 0
.../{core => oldcore}/172/filelists/pciutils | 0
.../{core => oldcore}/172/filelists/poppler | 0
.../{core => oldcore}/172/filelists/python3 | 0
.../{core => oldcore}/172/filelists/python3-daemon | 0
.../172/filelists/python3-setuptools-rust | 0
.../{core => oldcore}/172/filelists/readline | 0
.../rootfiles/{core => oldcore}/172/filelists/sed | 0
.../{core => oldcore}/172/filelists/sqlite | 0
.../{core => oldcore}/172/filelists/strongswan | 0
.../rootfiles/{core => oldcore}/172/filelists/sudo | 0
.../{core => oldcore}/172/filelists/suricata | 0
.../{core => oldcore}/172/filelists/sysstat | 0
.../{core => oldcore}/172/filelists/tzdata | 0
.../rootfiles/{core => oldcore}/172/filelists/udev | 0
.../{core => oldcore}/172/filelists/unbound | 0
.../{core => oldcore}/172/filelists/usbutils | 0
.../{core => oldcore}/172/filelists/vnstat | 0
.../172/filelists/x86_64/intel-microcode | 0
.../rootfiles/{core => oldcore}/172/filelists/xz | 0
.../rootfiles/{core => oldcore}/172/filelists/zlib | 0
config/rootfiles/{core => oldcore}/172/update.sh | 0
config/rootfiles/packages/dbus | 2 +-
config/rootfiles/packages/libshout | 2 +
config/rootfiles/packages/libusbredir | 12 +-
config/rootfiles/packages/libvirt | 10 +-
config/udev/network-hotplug-rename | 9 +
doc/language_issues.de | 8 +-
doc/language_issues.en | 3 +
doc/language_issues.es | 4 +-
doc/language_issues.fr | 8 +-
doc/language_issues.it | 8 +-
doc/language_issues.nl | 8 +-
doc/language_issues.pl | 8 +-
doc/language_issues.ru | 8 +-
doc/language_issues.tr | 8 +-
doc/language_missings | 24 +
html/cgi-bin/credits.cgi | 6 +-
html/cgi-bin/pppsetup.cgi | 80 +-
langs/de/cgi-bin/de.pl | 5 -
langs/en/cgi-bin/en.pl | 8 +-
langs/es/cgi-bin/es.pl | 1 -
langs/fr/cgi-bin/fr.pl | 5 -
langs/it/cgi-bin/it.pl | 5 -
langs/nl/cgi-bin/nl.pl | 5 -
langs/pl/cgi-bin/pl.pl | 5 -
langs/ru/cgi-bin/ru.pl | 5 -
langs/tr/cgi-bin/tr.pl | 5 -
lfs/avahi | 4 +-
lfs/configroot | 4 +-
lfs/dbus | 6 +-
lfs/iproute2 | 6 +-
lfs/krb5 | 4 +-
lfs/libarchive | 7 +-
lfs/libconfig | 6 +-
lfs/{glib => libgudev} | 12 +-
lfs/libpciaccess | 10 +-
lfs/{libsodium => libqmi} | 8 +-
lfs/libshout | 8 +-
lfs/libssh | 6 +-
lfs/libstatgrab | 6 +-
lfs/libusb | 4 +-
lfs/libusbredir | 18 +-
lfs/libvirt | 6 +-
lfs/libxslt | 6 +-
lfs/libyang | 6 +-
lfs/mpfr | 8 +-
lfs/psmisc | 4 +-
make.sh | 28 +-
src/hwdata/pci.ids | 1112 +++++++-
src/hwdata/usb.ids | 181 +-
src/initscripts/networking/dhcpcd.exe | 84 +-
src/initscripts/networking/functions.network | 118 +-
src/initscripts/networking/red | 39 +
src/paks/avahi/install.sh | 1 +
.../libarchive-3.6-fix-glibc-2.36-headers.patch | 41 -
.../mpfr-4.1.0-cumulative-patches-1-to-13.patch | 2976 --------------------
.../mpfr-4.1.1-cumulative-patches-1-to-1.patch | 83 +
src/ppp/ip-up | 5 -
143 files changed, 2235 insertions(+), 3520 deletions(-)
create mode 100644 config/rootfiles/common/libgudev
create mode 100644 config/rootfiles/common/libqmi
copy config/rootfiles/core/{172 => 173}/core-files (100%)
copy config/rootfiles/core/{172 => 173}/exclude (100%)
copy config/rootfiles/core/{172 => 173}/filelists/core-files (100%)
create mode 100644 config/rootfiles/core/173/filelists/files
copy config/rootfiles/{oldcore/132 => core/173}/filelists/hwdata (100%)
copy config/rootfiles/core/{172 => 173}/filelists/iproute2 (100%)
copy config/rootfiles/{oldcore/169 => core/173}/filelists/krb5 (100%)
copy config/rootfiles/{oldcore/104 => core/173}/filelists/libarchive (100%)
copy config/rootfiles/{oldcore/126 => core/173}/filelists/libconfig (100%)
create mode 120000 config/rootfiles/core/173/filelists/libgudev
create mode 120000 config/rootfiles/core/173/filelists/libqmi
copy config/rootfiles/{oldcore/137 => core/173}/filelists/libssh (100%)
copy config/rootfiles/{oldcore/159 => core/173}/filelists/libstatgrab (100%)
copy config/rootfiles/{oldcore/145 => core/173}/filelists/libusb (100%)
copy config/rootfiles/{oldcore/157 => core/173}/filelists/libxslt (100%)
copy config/rootfiles/{oldcore/164 => core/173}/filelists/libyang (100%)
copy config/rootfiles/{oldcore/101 => core/173}/filelists/mpfr (100%)
copy config/rootfiles/{oldcore/167 => core/173}/filelists/psmisc (100%)
copy config/rootfiles/{oldcore/152 => core/173}/update.sh (93%)
rename config/rootfiles/{core => oldcore}/172/core-files (100%)
rename config/rootfiles/{core => oldcore}/172/exclude (100%)
rename config/rootfiles/{core => oldcore}/172/filelists/aarch64/u-boot (100%)
rename config/rootfiles/{core => oldcore}/172/filelists/apache2 (100%)
rename config/rootfiles/{core => oldcore}/172/filelists/armv6l/python3 (100%)
rename config/rootfiles/{core => oldcore}/172/filelists/armv6l/u-boot (100%)
rename config/rootfiles/{core => oldcore}/172/filelists/bash (100%)
rename config/rootfiles/{core => oldcore}/172/filelists/bind (100%)
rename config/rootfiles/{core => oldcore}/172/filelists/ca-certificates (100%)
rename config/rootfiles/{core => oldcore}/172/filelists/conntrack-tools (100%)
rename config/rootfiles/{core => oldcore}/172/filelists/core-files (100%)
rename config/rootfiles/{core => oldcore}/172/filelists/curl (100%)
rename config/rootfiles/{core => oldcore}/172/filelists/elinks (100%)
rename config/rootfiles/{core => oldcore}/172/filelists/ethtool (100%)
rename config/rootfiles/{core => oldcore}/172/filelists/expat (100%)
rename config/rootfiles/{core => oldcore}/172/filelists/files (100%)
rename config/rootfiles/{core => oldcore}/172/filelists/iana-etc (100%)
rename config/rootfiles/{core => oldcore}/172/filelists/iproute2 (100%)
rename config/rootfiles/{core => oldcore}/172/filelists/kmod (100%)
rename config/rootfiles/{core => oldcore}/172/filelists/libedit (100%)
rename config/rootfiles/{core => oldcore}/172/filelists/libhtp (100%)
rename config/rootfiles/{core => oldcore}/172/filelists/libloc (100%)
rename config/rootfiles/{core => oldcore}/172/filelists/libnetfilter_conntrack (100%)
rename config/rootfiles/{core => oldcore}/172/filelists/libpng (100%)
rename config/rootfiles/{core => oldcore}/172/filelists/libtasn1 (100%)
rename config/rootfiles/{core => oldcore}/172/filelists/libtiff (100%)
rename config/rootfiles/{core => oldcore}/172/filelists/libuv (100%)
rename config/rootfiles/{core => oldcore}/172/filelists/libxcrypt (100%)
rename config/rootfiles/{core => oldcore}/172/filelists/libxml2 (100%)
rename config/rootfiles/{core => oldcore}/172/filelists/lsof (100%)
rename config/rootfiles/{core => oldcore}/172/filelists/nano (100%)
rename config/rootfiles/{core => oldcore}/172/filelists/openssh (100%)
rename config/rootfiles/{core => oldcore}/172/filelists/openssl (100%)
rename config/rootfiles/{core => oldcore}/172/filelists/openvpn (100%)
rename config/rootfiles/{core => oldcore}/172/filelists/pciutils (100%)
rename config/rootfiles/{core => oldcore}/172/filelists/poppler (100%)
rename config/rootfiles/{core => oldcore}/172/filelists/python3 (100%)
rename config/rootfiles/{core => oldcore}/172/filelists/python3-daemon (100%)
rename config/rootfiles/{core => oldcore}/172/filelists/python3-setuptools-rust (100%)
rename config/rootfiles/{core => oldcore}/172/filelists/readline (100%)
rename config/rootfiles/{core => oldcore}/172/filelists/sed (100%)
rename config/rootfiles/{core => oldcore}/172/filelists/sqlite (100%)
rename config/rootfiles/{core => oldcore}/172/filelists/strongswan (100%)
rename config/rootfiles/{core => oldcore}/172/filelists/sudo (100%)
rename config/rootfiles/{core => oldcore}/172/filelists/suricata (100%)
rename config/rootfiles/{core => oldcore}/172/filelists/sysstat (100%)
rename config/rootfiles/{core => oldcore}/172/filelists/tzdata (100%)
rename config/rootfiles/{core => oldcore}/172/filelists/udev (100%)
rename config/rootfiles/{core => oldcore}/172/filelists/unbound (100%)
rename config/rootfiles/{core => oldcore}/172/filelists/usbutils (100%)
rename config/rootfiles/{core => oldcore}/172/filelists/vnstat (100%)
rename config/rootfiles/{core => oldcore}/172/filelists/x86_64/intel-microcode (100%)
rename config/rootfiles/{core => oldcore}/172/filelists/xz (100%)
rename config/rootfiles/{core => oldcore}/172/filelists/zlib (100%)
rename config/rootfiles/{core => oldcore}/172/update.sh (100%)
copy lfs/{glib => libgudev} (91%)
copy lfs/{libsodium => libqmi} (92%)
delete mode 100644 src/patches/libarchive-3.6-fix-glibc-2.36-headers.patch
delete mode 100644 src/patches/mpfr-4.1.0-cumulative-patches-1-to-13.patch
create mode 100644 src/patches/mpfr-4.1.1-cumulative-patches-1-to-1.patch
Difference in files:
diff --git a/config/dhcpc/dhcpcd.conf b/config/dhcpc/dhcpcd.conf
index 29f10d1c9..062e3c975 100644
--- a/config/dhcpc/dhcpcd.conf
+++ b/config/dhcpc/dhcpcd.conf
@@ -1,6 +1,9 @@
# A sample configuration for dhcpcd.
# See dhcpcd.conf(5) for details.
+# Only obtain an IP address for IPv4
+ipv4only
+
# Allow users of this group to interact with dhcpcd via the control socket.
#controlgroup wheel
diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot
index 4d631cea5..bc979cf2c 100644
--- a/config/rootfiles/common/configroot
+++ b/config/rootfiles/common/configroot
@@ -85,8 +85,6 @@ var/ipfire/ipblocklist-functions.pl
var/ipfire/ipblocklist
#var/ipfire/ipblocklist/modified
#var/ipfire/ipblocklist/settings
-var/ipfire/isdn
-#var/ipfire/isdn/settings
var/ipfire/key
var/ipfire/lang.pl
var/ipfire/langs
diff --git a/config/rootfiles/common/libarchive b/config/rootfiles/common/libarchive
index d6860041b..df0ab03c4 100644
--- a/config/rootfiles/common/libarchive
+++ b/config/rootfiles/common/libarchive
@@ -6,7 +6,7 @@
#usr/lib/libarchive.la
#usr/lib/libarchive.so
usr/lib/libarchive.so.13
-usr/lib/libarchive.so.13.6.1
+usr/lib/libarchive.so.13.6.2
#usr/lib/pkgconfig/libarchive.pc
#usr/share/man/man1/bsdcat.1
#usr/share/man/man1/bsdcpio.1
diff --git a/config/rootfiles/common/libconfig b/config/rootfiles/common/libconfig
index 633e1baf9..6c1e245ca 100644
--- a/config/rootfiles/common/libconfig
+++ b/config/rootfiles/common/libconfig
@@ -9,12 +9,12 @@
#usr/lib/libconfig++.la
#usr/lib/libconfig++.so
usr/lib/libconfig++.so.11
-usr/lib/libconfig++.so.11.0.2
+usr/lib/libconfig++.so.11.1.0
#usr/lib/libconfig.a
#usr/lib/libconfig.la
#usr/lib/libconfig.so
usr/lib/libconfig.so.11
-usr/lib/libconfig.so.11.0.2
+usr/lib/libconfig.so.11.1.0
#usr/lib/pkgconfig/libconfig++.pc
#usr/lib/pkgconfig/libconfig.pc
#usr/share/info/libconfig.info
diff --git a/config/rootfiles/common/libgudev b/config/rootfiles/common/libgudev
new file mode 100644
index 000000000..2caf7f2c8
--- /dev/null
+++ b/config/rootfiles/common/libgudev
@@ -0,0 +1,13 @@
+#usr/include/gudev-1.0
+#usr/include/gudev-1.0/gudev
+#usr/include/gudev-1.0/gudev/gudev.h
+#usr/include/gudev-1.0/gudev/gudevclient.h
+#usr/include/gudev-1.0/gudev/gudevdevice.h
+#usr/include/gudev-1.0/gudev/gudevenumerator.h
+#usr/include/gudev-1.0/gudev/gudevenums.h
+#usr/include/gudev-1.0/gudev/gudevenumtypes.h
+#usr/include/gudev-1.0/gudev/gudevtypes.h
+#usr/lib/libgudev-1.0.so
+usr/lib/libgudev-1.0.so.0
+usr/lib/libgudev-1.0.so.0.3.0
+#usr/lib/pkgconfig/gudev-1.0.pc
diff --git a/config/rootfiles/common/libqmi b/config/rootfiles/common/libqmi
new file mode 100644
index 000000000..ba26300c3
--- /dev/null
+++ b/config/rootfiles/common/libqmi
@@ -0,0 +1,468 @@
+usr/bin/qmi-firmware-update
+usr/bin/qmi-network
+usr/bin/qmicli
+#usr/include/libqmi-glib
+#usr/include/libqmi-glib/libqmi-glib.h
+#usr/include/libqmi-glib/qmi-client.h
+#usr/include/libqmi-glib/qmi-compat.h
+#usr/include/libqmi-glib/qmi-device.h
+#usr/include/libqmi-glib/qmi-dms.h
+#usr/include/libqmi-glib/qmi-dpm.h
+#usr/include/libqmi-glib/qmi-dsd.h
+#usr/include/libqmi-glib/qmi-enum-types.h
+#usr/include/libqmi-glib/qmi-enums-dms.h
+#usr/include/libqmi-glib/qmi-enums-dsd.h
+#usr/include/libqmi-glib/qmi-enums-gas.h
+#usr/include/libqmi-glib/qmi-enums-loc.h
+#usr/include/libqmi-glib/qmi-enums-nas.h
+#usr/include/libqmi-glib/qmi-enums-oma.h
+#usr/include/libqmi-glib/qmi-enums-pbm.h
+#usr/include/libqmi-glib/qmi-enums-pdc.h
+#usr/include/libqmi-glib/qmi-enums-pds.h
+#usr/include/libqmi-glib/qmi-enums-private.h
+#usr/include/libqmi-glib/qmi-enums-qos.h
+#usr/include/libqmi-glib/qmi-enums-sar.h
+#usr/include/libqmi-glib/qmi-enums-uim.h
+#usr/include/libqmi-glib/qmi-enums-voice.h
+#usr/include/libqmi-glib/qmi-enums-wda.h
+#usr/include/libqmi-glib/qmi-enums-wds.h
+#usr/include/libqmi-glib/qmi-enums-wms.h
+#usr/include/libqmi-glib/qmi-enums.h
+#usr/include/libqmi-glib/qmi-error-types.h
+#usr/include/libqmi-glib/qmi-errors.h
+#usr/include/libqmi-glib/qmi-flags64-dms.h
+#usr/include/libqmi-glib/qmi-flags64-dsd.h
+#usr/include/libqmi-glib/qmi-flags64-loc.h
+#usr/include/libqmi-glib/qmi-flags64-nas.h
+#usr/include/libqmi-glib/qmi-flags64-types.h
+#usr/include/libqmi-glib/qmi-flags64-wds.h
+#usr/include/libqmi-glib/qmi-gas.h
+#usr/include/libqmi-glib/qmi-gms.h
+#usr/include/libqmi-glib/qmi-loc.h
+#usr/include/libqmi-glib/qmi-message-context.h
+#usr/include/libqmi-glib/qmi-message.h
+#usr/include/libqmi-glib/qmi-nas.h
+#usr/include/libqmi-glib/qmi-oma.h
+#usr/include/libqmi-glib/qmi-pbm.h
+#usr/include/libqmi-glib/qmi-pdc.h
+#usr/include/libqmi-glib/qmi-pds.h
+#usr/include/libqmi-glib/qmi-proxy.h
+#usr/include/libqmi-glib/qmi-qos.h
+#usr/include/libqmi-glib/qmi-sar.h
+#usr/include/libqmi-glib/qmi-uim.h
+#usr/include/libqmi-glib/qmi-utils.h
+#usr/include/libqmi-glib/qmi-version.h
+#usr/include/libqmi-glib/qmi-voice.h
+#usr/include/libqmi-glib/qmi-wda.h
+#usr/include/libqmi-glib/qmi-wds.h
+#usr/include/libqmi-glib/qmi-wms.h
+#usr/lib/libqmi-glib.la
+#usr/lib/libqmi-glib.so
+usr/lib/libqmi-glib.so.5
+usr/lib/libqmi-glib.so.5.8.0
+#usr/lib/pkgconfig/qmi-glib.pc
+usr/libexec/qmi-proxy
+#usr/share/bash-completion/completions/qmicli
+#usr/share/gtk-doc/html/libqmi-glib
+#usr/share/gtk-doc/html/libqmi-glib/QmiClient.html
+#usr/share/gtk-doc/html/libqmi-glib/QmiClientDms.html
+#usr/share/gtk-doc/html/libqmi-glib/QmiClientDpm.html
+#usr/share/gtk-doc/html/libqmi-glib/QmiClientDsd.html
+#usr/share/gtk-doc/html/libqmi-glib/QmiClientGas.html
+#usr/share/gtk-doc/html/libqmi-glib/QmiClientGms.html
+#usr/share/gtk-doc/html/libqmi-glib/QmiClientLoc.html
+#usr/share/gtk-doc/html/libqmi-glib/QmiClientNas.html
+#usr/share/gtk-doc/html/libqmi-glib/QmiClientOma.html
+#usr/share/gtk-doc/html/libqmi-glib/QmiClientPbm.html
+#usr/share/gtk-doc/html/libqmi-glib/QmiClientPdc.html
+#usr/share/gtk-doc/html/libqmi-glib/QmiClientPds.html
+#usr/share/gtk-doc/html/libqmi-glib/QmiClientQos.html
+#usr/share/gtk-doc/html/libqmi-glib/QmiClientSar.html
+#usr/share/gtk-doc/html/libqmi-glib/QmiClientUim.html
+#usr/share/gtk-doc/html/libqmi-glib/QmiClientVoice.html
+#usr/share/gtk-doc/html/libqmi-glib/QmiClientWda.html
+#usr/share/gtk-doc/html/libqmi-glib/QmiClientWds.html
+#usr/share/gtk-doc/html/libqmi-glib/QmiClientWms.html
+#usr/share/gtk-doc/html/libqmi-glib/QmiDevice.html
+#usr/share/gtk-doc/html/libqmi-glib/QmiMessageContext.html
+#usr/share/gtk-doc/html/libqmi-glib/QmiProxy.html
+#usr/share/gtk-doc/html/libqmi-glib/annotation-glossary.html
+#usr/share/gtk-doc/html/libqmi-glib/api-index-1-0.html
+#usr/share/gtk-doc/html/libqmi-glib/api-index-1-10.html
+#usr/share/gtk-doc/html/libqmi-glib/api-index-1-12.html
+#usr/share/gtk-doc/html/libqmi-glib/api-index-1-14.html
+#usr/share/gtk-doc/html/libqmi-glib/api-index-1-16.html
+#usr/share/gtk-doc/html/libqmi-glib/api-index-1-18.html
+#usr/share/gtk-doc/html/libqmi-glib/api-index-1-20.html
+#usr/share/gtk-doc/html/libqmi-glib/api-index-1-22-4.html
+#usr/share/gtk-doc/html/libqmi-glib/api-index-1-22.html
+#usr/share/gtk-doc/html/libqmi-glib/api-index-1-24-6.html
+#usr/share/gtk-doc/html/libqmi-glib/api-index-1-24.html
+#usr/share/gtk-doc/html/libqmi-glib/api-index-1-26-2.html
+#usr/share/gtk-doc/html/libqmi-glib/api-index-1-26-6.html
+#usr/share/gtk-doc/html/libqmi-glib/api-index-1-26.html
+#usr/share/gtk-doc/html/libqmi-glib/api-index-1-28-6.html
+#usr/share/gtk-doc/html/libqmi-glib/api-index-1-28.html
+#usr/share/gtk-doc/html/libqmi-glib/api-index-1-30-2.html
+#usr/share/gtk-doc/html/libqmi-glib/api-index-1-30-8.html
+#usr/share/gtk-doc/html/libqmi-glib/api-index-1-30.html
+#usr/share/gtk-doc/html/libqmi-glib/api-index-1-4.html
+#usr/share/gtk-doc/html/libqmi-glib/api-index-1-6.html
+#usr/share/gtk-doc/html/libqmi-glib/api-index-1-8.html
+#usr/share/gtk-doc/html/libqmi-glib/api-index-deprecated.html
+#usr/share/gtk-doc/html/libqmi-glib/api-index-full.html
+#usr/share/gtk-doc/html/libqmi-glib/ch01.html
+#usr/share/gtk-doc/html/libqmi-glib/ch02.html
+#usr/share/gtk-doc/html/libqmi-glib/ch02s02.html
+#usr/share/gtk-doc/html/libqmi-glib/ch03.html
+#usr/share/gtk-doc/html/libqmi-glib/ch03s02.html
+#usr/share/gtk-doc/html/libqmi-glib/ch04.html
+#usr/share/gtk-doc/html/libqmi-glib/ch04s02.html
+#usr/share/gtk-doc/html/libqmi-glib/ch05.html
+#usr/share/gtk-doc/html/libqmi-glib/ch05s02.html
+#usr/share/gtk-doc/html/libqmi-glib/ch06.html
+#usr/share/gtk-doc/html/libqmi-glib/ch06s02.html
+#usr/share/gtk-doc/html/libqmi-glib/ch07.html
+#usr/share/gtk-doc/html/libqmi-glib/ch07s02.html
+#usr/share/gtk-doc/html/libqmi-glib/ch08.html
+#usr/share/gtk-doc/html/libqmi-glib/ch09.html
+#usr/share/gtk-doc/html/libqmi-glib/ch09s02.html
+#usr/share/gtk-doc/html/libqmi-glib/ch10.html
+#usr/share/gtk-doc/html/libqmi-glib/ch10s02.html
+#usr/share/gtk-doc/html/libqmi-glib/ch11.html
+#usr/share/gtk-doc/html/libqmi-glib/ch12.html
+#usr/share/gtk-doc/html/libqmi-glib/ch12s02.html
+#usr/share/gtk-doc/html/libqmi-glib/ch13.html
+#usr/share/gtk-doc/html/libqmi-glib/ch13s02.html
+#usr/share/gtk-doc/html/libqmi-glib/ch14.html
+#usr/share/gtk-doc/html/libqmi-glib/ch14s02.html
+#usr/share/gtk-doc/html/libqmi-glib/ch15.html
+#usr/share/gtk-doc/html/libqmi-glib/ch16.html
+#usr/share/gtk-doc/html/libqmi-glib/ch17.html
+#usr/share/gtk-doc/html/libqmi-glib/ch18.html
+#usr/share/gtk-doc/html/libqmi-glib/ch19.html
+#usr/share/gtk-doc/html/libqmi-glib/ch20.html
+#usr/share/gtk-doc/html/libqmi-glib/home.png
+#usr/share/gtk-doc/html/libqmi-glib/index.html
+#usr/share/gtk-doc/html/libqmi-glib/left-insensitive.png
+#usr/share/gtk-doc/html/libqmi-glib/left.png
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-Common-enumerations-and-flags.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-Common-utilities.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DMS-Activate-Automatic-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DMS-Activate-Manual-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DMS-Delete-Stored-Image-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DMS-Event-Report-indication.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DMS-Foxconn-Change-Device-Mode-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DMS-Foxconn-Get-Firmware-Version-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DMS-Foxconn-Set-FCC-Authentication-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DMS-Foxconn-Set-FCC-Authentication-v2-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DMS-Get-Activation-State-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DMS-Get-Alt-Net-Config-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DMS-Get-Band-Capabilities-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DMS-Get-Boot-Image-Download-Mode-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DMS-Get-Capabilities-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DMS-Get-Factory-SKU-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DMS-Get-Firmware-Preference-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DMS-Get-Hardware-Revision-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DMS-Get-IDs-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DMS-Get-MAC-Address-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DMS-Get-MSISDN-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DMS-Get-Manufacturer-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DMS-Get-Model-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DMS-Get-Operating-Mode-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DMS-Get-PRL-Version-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DMS-Get-Power-State-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DMS-Get-Revision-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DMS-Get-Software-Version-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DMS-Get-Stored-Image-Info-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DMS-Get-Supported-Messages-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DMS-Get-Time-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DMS-Get-User-Lock-State-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DMS-HP-Change-Device-Mode-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DMS-List-Stored-Images-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DMS-Read-ERI-File-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DMS-Read-User-Data-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DMS-Reset-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DMS-Restore-Factory-Defaults-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DMS-Set-Alt-Net-Config-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DMS-Set-Boot-Image-Download-Mode-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DMS-Set-Event-Report-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DMS-Set-FCC-Authentication-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DMS-Set-Firmware-ID-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DMS-Set-Firmware-Preference-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DMS-Set-Operating-Mode-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DMS-Set-Service-Programming-Code-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DMS-Set-Time-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DMS-Set-User-Lock-Code-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DMS-Set-User-Lock-State-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DMS-Swi-Get-Current-Firmware-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DMS-Swi-Get-USB-Composition-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DMS-Swi-Set-USB-Composition-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DMS-UIM-Change-PIN-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DMS-UIM-Get-CK-Status-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DMS-UIM-Get-ICCID-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DMS-UIM-Get-IMSI-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DMS-UIM-Get-PIN-Status-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DMS-UIM-Get-State-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DMS-UIM-Set-CK-Protection-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DMS-UIM-Set-PIN-Protection-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DMS-UIM-Unblock-CK-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DMS-UIM-Unblock-PIN-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DMS-UIM-Verify-PIN-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DMS-Validate-Service-Programming-Code-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DMS-Write-User-Data-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DMS-enumerations-and-flags.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DPM-Close-Port-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DPM-Open-Port-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DSD-Get-APN-Info-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DSD-Set-APN-Type-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-DSD-enumerations-and-flags.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-Deprecated-Interface.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-Errors.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-GAS-DMS-Get-Firmware-List-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-GAS-DMS-Set-Active-Firmware-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-GAS-enumerations-and-flags.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-GMS-Test-Get-Value-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-GMS-Test-Set-Value-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-LOC-Delete-Assistance-Data-indication.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-LOC-Delete-Assistance-Data-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-LOC-Engine-State-indication.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-LOC-Fix-Recurrence-Type-indication.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-LOC-GNSS-Sv-Info-indication.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-LOC-Get-Engine-Lock-indication.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-LOC-Get-Engine-Lock-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-LOC-Get-NMEA-Types-indication.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-LOC-Get-NMEA-Types-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-LOC-Get-Operation-Mode-indication.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-LOC-Get-Operation-Mode-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-LOC-Get-Predicted-Orbits-Data-Source-indication.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-LOC-Get-Predicted-Orbits-Data-Source-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-LOC-Get-Server-indication.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-LOC-Get-Server-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-LOC-Inject-Predicted-Orbits-Data-indication.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-LOC-Inject-Predicted-Orbits-Data-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-LOC-Inject-Xtra-Data-indication.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-LOC-Inject-Xtra-Data-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-LOC-NMEA-indication.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-LOC-Position-Report-indication.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-LOC-Register-Events-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-LOC-Set-Engine-Lock-indication.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-LOC-Set-Engine-Lock-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-LOC-Set-NMEA-Types-indication.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-LOC-Set-NMEA-Types-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-LOC-Set-Operation-Mode-indication.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-LOC-Set-Operation-Mode-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-LOC-Set-Server-indication.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-LOC-Set-Server-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-LOC-Start-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-LOC-Stop-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-LOC-enumerations-and-flags.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-NAS-Attach-Detach-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-NAS-Config-Signal-Info-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-NAS-Event-Report-indication.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-NAS-Force-Network-Search-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-NAS-Get-CDMA-Position-Info-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-NAS-Get-Cell-Location-Info-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-NAS-Get-DRX-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-NAS-Get-Home-Network-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-NAS-Get-LTE-Cphy-CA-Info-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-NAS-Get-Operator-Name-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-NAS-Get-PLMN-Name-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-NAS-Get-Preferred-Networks-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-NAS-Get-RF-Band-Information-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-NAS-Get-Serving-System-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-NAS-Get-Signal-Info-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-NAS-Get-Signal-Strength-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-NAS-Get-Supported-Messages-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-NAS-Get-System-Info-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-NAS-Get-System-Selection-Preference-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-NAS-Get-Technology-Preference-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-NAS-Get-Tx-Rx-Info-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-NAS-Initiate-Network-Register-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-NAS-Network-Reject-indication.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-NAS-Network-Scan-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-NAS-Network-Time-indication.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-NAS-Operator-Name-indication.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-NAS-Register-Indications-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-NAS-Reset-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-NAS-Serving-System-indication.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-NAS-Set-Event-Report-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-NAS-Set-Preferred-Networks-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-NAS-Set-System-Selection-Preference-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-NAS-Set-Technology-Preference-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-NAS-Signal-Info-indication.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-NAS-Swi-Get-Status-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-NAS-System-Info-indication.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-NAS-enumerations-and-flags.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-OMA-Cancel-Session-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-OMA-Event-Report-indication.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-OMA-Get-Feature-Setting-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-OMA-Get-Session-Info-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-OMA-Reset-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-OMA-Send-Selection-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-OMA-Set-Event-Report-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-OMA-Set-Feature-Setting-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-OMA-Start-Session-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-OMA-enumerations-and-flags.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-PBM-Get-All-Capabilities-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-PBM-Get-Capabilities-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-PBM-Indication-Register-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-PBM-enumerations-and-flags.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-PDC-Activate-Config-indication.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-PDC-Activate-Config-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-PDC-Config-Change-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-PDC-Deactivate-Config-indication.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-PDC-Deactivate-Config-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-PDC-Delete-Config-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-PDC-Get-Config-Info-indication.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-PDC-Get-Config-Info-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-PDC-Get-Config-Limits-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-PDC-Get-Default-Config-Info-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-PDC-Get-Selected-Config-indication.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-PDC-Get-Selected-Config-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-PDC-List-Configs-indication.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-PDC-List-Configs-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-PDC-Load-Config-indication.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-PDC-Load-Config-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-PDC-Register-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-PDC-Reset-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-PDC-Set-Selected-Config-indication.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-PDC-Set-Selected-Config-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-PDC-enumerations-and-flags.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-PDS-Event-Report-indication.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-PDS-Get-AGPS-Config-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-PDS-Get-Auto-Tracking-State-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-PDS-Get-Default-Tracking-Session-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-PDS-Get-GPS-Service-State-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-PDS-Reset-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-PDS-Set-AGPS-Config-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-PDS-Set-Auto-Tracking-State-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-PDS-Set-Default-Tracking-Session-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-PDS-Set-Event-Report-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-PDS-Set-GPS-Service-State-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-PDS-enumerations-and-flags.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-QOS-Flow-Status-indication.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-QOS-Get-Flow-Status-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-QOS-Get-Network-Status-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-QOS-Network-Status-indication.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-QOS-Reset-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-QOS-Swi-Read-Data-Stats-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-QOS-enumerations-and-flags.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-QmiMessage.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-SAR-RF-Get-State-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-SAR-RF-Set-State-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-SAR-enumerations-and-flags.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-UIM-Card-Status-indication.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-UIM-Change-PIN-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-UIM-Change-Provisioning-Session-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-UIM-Depersonalization-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-UIM-Get-Card-Status-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-UIM-Get-Configuration-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-UIM-Get-File-Attributes-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-UIM-Get-Slot-Status-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-UIM-Get-Supported-Messages-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-UIM-Power-Off-SIM-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-UIM-Power-On-SIM-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-UIM-Read-Record-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-UIM-Read-Transparent-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-UIM-Refresh-Complete-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-UIM-Refresh-Register-All-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-UIM-Refresh-Register-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-UIM-Refresh-indication.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-UIM-Register-Events-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-UIM-Reset-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-UIM-Set-PIN-Protection-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-UIM-Slot-Status-indication.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-UIM-Switch-Slot-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-UIM-Unblock-PIN-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-UIM-Verify-PIN-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-UIM-enumerations-and-flags.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-VOICE-All-Call-Status-indication.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-VOICE-Answer-Call-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-VOICE-Answer-USSD-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-VOICE-Cancel-USSD-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-VOICE-Dial-Call-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-VOICE-End-Call-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-VOICE-Get-All-Call-Info-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-VOICE-Get-Call-Waiting-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-VOICE-Get-Config-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-VOICE-Get-Supported-Messages-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-VOICE-Indication-Register-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-VOICE-Manage-Calls-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-VOICE-Originate-USSD-No-Wait-indication.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-VOICE-Originate-USSD-No-Wait-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-VOICE-Originate-USSD-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-VOICE-Release-USSD-indication.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-VOICE-Set-Supplementary-Service-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-VOICE-Supplementary-Service-indication.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-VOICE-USSD-indication.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-Version-and-feature-checks.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-Voice-enumerations-and-flags.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-WDA-Get-Data-Format-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-WDA-Get-Supported-Messages-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-WDA-Set-Data-Format-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-WDA-enumerations-and-flags.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-WDS-Bind-Data-Port-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-WDS-Bind-Mux-Data-Port-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-WDS-Create-Profile-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-WDS-Delete-Profile-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-WDS-Event-Report-indication.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-WDS-Get-Autoconnect-Settings-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-WDS-Get-Channel-Rates-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-WDS-Get-Current-Data-Bearer-Technology-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-WDS-Get-Current-Settings-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-WDS-Get-Data-Bearer-Technology-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-WDS-Get-Default-Profile-Number-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-WDS-Get-Default-Settings-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-WDS-Get-Dormancy-Status-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-WDS-Get-LTE-Attach-PDN-List-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-WDS-Get-LTE-Attach-Parameters-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-WDS-Get-Max-LTE-Attach-PDN-Number-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-WDS-Get-PDN-Throttle-Info-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-WDS-Get-Packet-Service-Status-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-WDS-Get-Packet-Statistics-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-WDS-Get-Profile-List-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-WDS-Get-Profile-Settings-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-WDS-Get-Supported-Messages-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-WDS-Go-Active-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-WDS-Go-Dormant-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-WDS-Modify-Profile-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-WDS-Packet-Service-Status-indication.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-WDS-Reset-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-WDS-Set-Autoconnect-Settings-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-WDS-Set-Default-Profile-Number-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-WDS-Set-Event-Report-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-WDS-Set-IP-Family-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-WDS-Set-LTE-Attach-PDN-List-indication.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-WDS-Set-LTE-Attach-PDN-List-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-WDS-Start-Network-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-WDS-Stop-Network-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-WDS-Swi-Create-Profile-Indexed-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-WDS-enumerations-and-flags.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-WMS-Delete-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-WMS-Event-Report-indication.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-WMS-Get-Message-Protocol-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-WMS-Get-Routes-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-WMS-Get-Supported-Messages-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-WMS-List-Messages-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-WMS-Modify-Tag-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-WMS-Raw-Read-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-WMS-Raw-Send-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-WMS-Raw-Write-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-WMS-Reset-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-WMS-SMSC-Address-indication.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-WMS-Send-Ack-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-WMS-Send-From-Memory-Storage-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-WMS-Set-Event-Report-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-WMS-Set-Routes-request.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib-WMS-enumerations-and-flags.html
+#usr/share/gtk-doc/html/libqmi-glib/libqmi-glib.devhelp2
+#usr/share/gtk-doc/html/libqmi-glib/object-tree.html
+#usr/share/gtk-doc/html/libqmi-glib/right-insensitive.png
+#usr/share/gtk-doc/html/libqmi-glib/right.png
+#usr/share/gtk-doc/html/libqmi-glib/style.css
+#usr/share/gtk-doc/html/libqmi-glib/up-insensitive.png
+#usr/share/gtk-doc/html/libqmi-glib/up.png
+#usr/share/man/man1/qmi-firmware-update.1
+#usr/share/man/man1/qmi-network.1
+#usr/share/man/man1/qmicli.1
diff --git a/config/rootfiles/common/libssh b/config/rootfiles/common/libssh
index ffb5ad59e..464bf28c2 100644
--- a/config/rootfiles/common/libssh
+++ b/config/rootfiles/common/libssh
@@ -13,5 +13,5 @@
#usr/lib/cmake/libssh/libssh-config.cmake
#usr/lib/libssh.so
usr/lib/libssh.so.4
-usr/lib/libssh.so.4.8.7
+usr/lib/libssh.so.4.9.4
#usr/lib/pkgconfig/libssh.pc
diff --git a/config/rootfiles/common/libstatgrab b/config/rootfiles/common/libstatgrab
index 8f0b15296..b1a4d2eb8 100644
--- a/config/rootfiles/common/libstatgrab
+++ b/config/rootfiles/common/libstatgrab
@@ -7,7 +7,7 @@ usr/bin/statgrab
#usr/lib/libstatgrab.la
#usr/lib/libstatgrab.so
usr/lib/libstatgrab.so.10
-usr/lib/libstatgrab.so.10.0.1
+usr/lib/libstatgrab.so.10.0.2
#usr/lib/pkgconfig/libstatgrab.pc
#usr/share/doc/libstatgrab
#usr/share/doc/libstatgrab/AUTHORS
diff --git a/config/rootfiles/common/libxslt b/config/rootfiles/common/libxslt
index eae4b26bd..a41c536b4 100644
--- a/config/rootfiles/common/libxslt
+++ b/config/rootfiles/common/libxslt
@@ -37,106 +37,31 @@ usr/lib/libexslt.so.0.8.20
#usr/lib/libxslt.la
#usr/lib/libxslt.so
usr/lib/libxslt.so.1
-usr/lib/libxslt.so.1.1.35
+usr/lib/libxslt.so.1.1.37
#usr/lib/pkgconfig/libexslt.pc
#usr/lib/pkgconfig/libxslt.pc
#usr/lib/xsltConf.sh
#usr/share/aclocal/libxslt.m4
-#usr/share/doc/libxslt-1.1.35
-#usr/share/doc/libxslt-1.1.35/html
-#usr/share/doc/libxslt-1.1.35/html/API.html
-#usr/share/doc/libxslt-1.1.35/html/APIchunk0.html
-#usr/share/doc/libxslt-1.1.35/html/APIchunk1.html
-#usr/share/doc/libxslt-1.1.35/html/APIchunk10.html
-#usr/share/doc/libxslt-1.1.35/html/APIchunk11.html
-#usr/share/doc/libxslt-1.1.35/html/APIchunk12.html
-#usr/share/doc/libxslt-1.1.35/html/APIchunk2.html
-#usr/share/doc/libxslt-1.1.35/html/APIchunk3.html
-#usr/share/doc/libxslt-1.1.35/html/APIchunk4.html
-#usr/share/doc/libxslt-1.1.35/html/APIchunk5.html
-#usr/share/doc/libxslt-1.1.35/html/APIchunk6.html
-#usr/share/doc/libxslt-1.1.35/html/APIchunk7.html
-#usr/share/doc/libxslt-1.1.35/html/APIchunk8.html
-#usr/share/doc/libxslt-1.1.35/html/APIchunk9.html
-#usr/share/doc/libxslt-1.1.35/html/APIconstructors.html
-#usr/share/doc/libxslt-1.1.35/html/APIfiles.html
-#usr/share/doc/libxslt-1.1.35/html/APIfunctions.html
-#usr/share/doc/libxslt-1.1.35/html/APIsymbols.html
-#usr/share/doc/libxslt-1.1.35/html/EXSLT
-#usr/share/doc/libxslt-1.1.35/html/EXSLT/APIchunk0.html
-#usr/share/doc/libxslt-1.1.35/html/EXSLT/APIconstructors.html
-#usr/share/doc/libxslt-1.1.35/html/EXSLT/APIfiles.html
-#usr/share/doc/libxslt-1.1.35/html/EXSLT/APIfunctions.html
-#usr/share/doc/libxslt-1.1.35/html/EXSLT/APIsymbols.html
-#usr/share/doc/libxslt-1.1.35/html/EXSLT/bugs.html
-#usr/share/doc/libxslt-1.1.35/html/EXSLT/docs.html
-#usr/share/doc/libxslt-1.1.35/html/EXSLT/downloads.html
-#usr/share/doc/libxslt-1.1.35/html/EXSLT/exslt.html
-#usr/share/doc/libxslt-1.1.35/html/EXSLT/help.html
-#usr/share/doc/libxslt-1.1.35/html/EXSLT/index.html
-#usr/share/doc/libxslt-1.1.35/html/EXSLT/intro.html
-#usr/share/doc/libxslt-1.1.35/html/FAQ.html
-#usr/share/doc/libxslt-1.1.35/html/Libxslt-Logo-180x168.gif
-#usr/share/doc/libxslt-1.1.35/html/Libxslt-Logo-90x34.gif
-#usr/share/doc/libxslt-1.1.35/html/bugs.html
-#usr/share/doc/libxslt-1.1.35/html/contexts.gif
-#usr/share/doc/libxslt-1.1.35/html/contribs.html
-#usr/share/doc/libxslt-1.1.35/html/docbook.html
-#usr/share/doc/libxslt-1.1.35/html/docs.html
-#usr/share/doc/libxslt-1.1.35/html/downloads.html
-#usr/share/doc/libxslt-1.1.35/html/extensions.html
-#usr/share/doc/libxslt-1.1.35/html/help.html
-#usr/share/doc/libxslt-1.1.35/html/html
-#usr/share/doc/libxslt-1.1.35/html/html/book1.html
-#usr/share/doc/libxslt-1.1.35/html/html/home.png
-#usr/share/doc/libxslt-1.1.35/html/html/index.html
-#usr/share/doc/libxslt-1.1.35/html/html/left.png
-#usr/share/doc/libxslt-1.1.35/html/html/libxslt-attributes.html
-#usr/share/doc/libxslt-1.1.35/html/html/libxslt-documents.html
-#usr/share/doc/libxslt-1.1.35/html/html/libxslt-extensions.html
-#usr/share/doc/libxslt-1.1.35/html/html/libxslt-extra.html
-#usr/share/doc/libxslt-1.1.35/html/html/libxslt-functions.html
-#usr/share/doc/libxslt-1.1.35/html/html/libxslt-imports.html
-#usr/share/doc/libxslt-1.1.35/html/html/libxslt-keys.html
-#usr/share/doc/libxslt-1.1.35/html/html/libxslt-lib.html
-#usr/share/doc/libxslt-1.1.35/html/html/libxslt-namespaces.html
-#usr/share/doc/libxslt-1.1.35/html/html/libxslt-numbersInternals.html
-#usr/share/doc/libxslt-1.1.35/html/html/libxslt-pattern.html
-#usr/share/doc/libxslt-1.1.35/html/html/libxslt-preproc.html
-#usr/share/doc/libxslt-1.1.35/html/html/libxslt-security.html
-#usr/share/doc/libxslt-1.1.35/html/html/libxslt-templates.html
-#usr/share/doc/libxslt-1.1.35/html/html/libxslt-transform.html
-#usr/share/doc/libxslt-1.1.35/html/html/libxslt-variables.html
-#usr/share/doc/libxslt-1.1.35/html/html/libxslt-xslt.html
-#usr/share/doc/libxslt-1.1.35/html/html/libxslt-xsltInternals.html
-#usr/share/doc/libxslt-1.1.35/html/html/libxslt-xsltexports.html
-#usr/share/doc/libxslt-1.1.35/html/html/libxslt-xsltlocale.html
-#usr/share/doc/libxslt-1.1.35/html/html/libxslt-xsltutils.html
-#usr/share/doc/libxslt-1.1.35/html/html/right.png
-#usr/share/doc/libxslt-1.1.35/html/html/up.png
-#usr/share/doc/libxslt-1.1.35/html/index.html
-#usr/share/doc/libxslt-1.1.35/html/internals.html
-#usr/share/doc/libxslt-1.1.35/html/intro.html
-#usr/share/doc/libxslt-1.1.35/html/news.html
-#usr/share/doc/libxslt-1.1.35/html/node.gif
-#usr/share/doc/libxslt-1.1.35/html/object.gif
-#usr/share/doc/libxslt-1.1.35/html/processing.gif
-#usr/share/doc/libxslt-1.1.35/html/python.html
-#usr/share/doc/libxslt-1.1.35/html/redhat.gif
-#usr/share/doc/libxslt-1.1.35/html/smallfootonly.gif
-#usr/share/doc/libxslt-1.1.35/html/stylesheet.gif
-#usr/share/doc/libxslt-1.1.35/html/templates.gif
-#usr/share/doc/libxslt-1.1.35/html/tutorial
-#usr/share/doc/libxslt-1.1.35/html/tutorial/libxslt_tutorial.c
-#usr/share/doc/libxslt-1.1.35/html/tutorial/libxslttutorial.html
-#usr/share/doc/libxslt-1.1.35/html/tutorial/libxslttutorial.xml
-#usr/share/doc/libxslt-1.1.35/html/tutorial2
-#usr/share/doc/libxslt-1.1.35/html/tutorial2/libxslt_pipes.c
-#usr/share/doc/libxslt-1.1.35/html/tutorial2/libxslt_pipes.html
-#usr/share/doc/libxslt-1.1.35/html/tutorial2/libxslt_pipes.xml
-#usr/share/doc/libxslt-1.1.35/html/xslt.html
-#usr/share/doc/libxslt-1.1.35/html/xsltproc.html
-#usr/share/doc/libxslt-1.1.35/html/xsltproc2.html
+#usr/share/doc/libxslt
+#usr/share/doc/libxslt/tutorial
+#usr/share/doc/libxslt/tutorial/images
+#usr/share/doc/libxslt/tutorial/images/callouts
+#usr/share/doc/libxslt/tutorial/images/callouts/1.png
+#usr/share/doc/libxslt/tutorial/images/callouts/10.png
+#usr/share/doc/libxslt/tutorial/images/callouts/2.png
+#usr/share/doc/libxslt/tutorial/images/callouts/3.png
+#usr/share/doc/libxslt/tutorial/images/callouts/4.png
+#usr/share/doc/libxslt/tutorial/images/callouts/5.png
+#usr/share/doc/libxslt/tutorial/images/callouts/6.png
+#usr/share/doc/libxslt/tutorial/images/callouts/7.png
+#usr/share/doc/libxslt/tutorial/images/callouts/8.png
+#usr/share/doc/libxslt/tutorial/images/callouts/9.png
+#usr/share/doc/libxslt/tutorial/libxslt_tutorial.c
+#usr/share/doc/libxslt/tutorial/libxslttutorial.html
+#usr/share/doc/libxslt/tutorial2
+#usr/share/doc/libxslt/tutorial2/libxslt_pipes.c
+#usr/share/doc/libxslt/tutorial2/libxslt_pipes.html
+#usr/share/doc/libxslt/xsltproc.html
#usr/share/gtk-doc/html/libexslt
#usr/share/gtk-doc/html/libexslt/general.html
#usr/share/gtk-doc/html/libexslt/home.png
diff --git a/config/rootfiles/common/libyang b/config/rootfiles/common/libyang
index 898160158..b0dd54cda 100644
--- a/config/rootfiles/common/libyang
+++ b/config/rootfiles/common/libyang
@@ -7,13 +7,12 @@
#usr/include/libyang/in.h
#usr/include/libyang/libyang.h
#usr/include/libyang/log.h
+#usr/include/libyang/metadata.h
#usr/include/libyang/out.h
#usr/include/libyang/parser_data.h
#usr/include/libyang/parser_schema.h
#usr/include/libyang/plugins.h
#usr/include/libyang/plugins_exts.h
-#usr/include/libyang/plugins_exts_compile.h
-#usr/include/libyang/plugins_exts_print.h
#usr/include/libyang/plugins_types.h
#usr/include/libyang/printer_data.h
#usr/include/libyang/printer_schema.h
@@ -25,7 +24,18 @@
#usr/include/libyang/version.h
#usr/lib/libyang.so
usr/lib/libyang.so.2
-usr/lib/libyang.so.2.20.15
+usr/lib/libyang.so.2.25.4
#usr/lib/pkgconfig/libyang.pc
#usr/share/man/man1/yanglint.1
#usr/share/man/man1/yangre.1
+#usr/share/yang
+#usr/share/yang/modules
+#usr/share/yang/modules/libyang
+#usr/share/yang/modules/libyang/ietf-datastores(a)2018-02-14.yang
+#usr/share/yang/modules/libyang/ietf-inet-types(a)2013-07-15.yang
+#usr/share/yang/modules/libyang/ietf-yang-library(a)2019-01-04.yang
+#usr/share/yang/modules/libyang/ietf-yang-metadata(a)2016-08-05.yang
+#usr/share/yang/modules/libyang/ietf-yang-schema-mount(a)2019-01-14.yang
+#usr/share/yang/modules/libyang/ietf-yang-structure-ext(a)2020-06-17.yang
+#usr/share/yang/modules/libyang/ietf-yang-types(a)2013-07-15.yang
+#usr/share/yang/modules/libyang/yang(a)2022-06-16.yang
diff --git a/config/rootfiles/common/mpfr b/config/rootfiles/common/mpfr
index ae0701d0f..2b2a04257 100644
--- a/config/rootfiles/common/mpfr
+++ b/config/rootfiles/common/mpfr
@@ -4,7 +4,7 @@
#usr/lib/libmpfr.la
#usr/lib/libmpfr.so
usr/lib/libmpfr.so.6
-usr/lib/libmpfr.so.6.1.0
+usr/lib/libmpfr.so.6.1.1
#usr/lib/pkgconfig/mpfr.pc
#usr/share/doc/mpfr
#usr/share/doc/mpfr/AUTHORS
diff --git a/config/rootfiles/common/psmisc b/config/rootfiles/common/psmisc
index 759e7f0ab..8a658fd1c 100644
--- a/config/rootfiles/common/psmisc
+++ b/config/rootfiles/common/psmisc
@@ -5,20 +5,38 @@ bin/killall
#bin/pslog
usr/bin/pstree
#usr/bin/pstree.x11
+#usr/share/man/da
+#usr/share/man/da/man1
+#usr/share/man/da/man1/prtstat.1
+#usr/share/man/da/man1/pslog.1
#usr/share/man/de/man1/fuser.1
#usr/share/man/de/man1/killall.1
#usr/share/man/de/man1/peekfd.1
#usr/share/man/de/man1/prtstat.1
#usr/share/man/de/man1/pslog.1
#usr/share/man/de/man1/pstree.1
-#usr/share/man/fr
-#usr/share/man/fr/man1
#usr/share/man/fr/man1/fuser.1
#usr/share/man/fr/man1/killall.1
#usr/share/man/fr/man1/peekfd.1
#usr/share/man/fr/man1/prtstat.1
#usr/share/man/fr/man1/pslog.1
#usr/share/man/fr/man1/pstree.1
+#usr/share/man/hr
+#usr/share/man/hr/man1
+#usr/share/man/hr/man1/fuser.1
+#usr/share/man/hr/man1/killall.1
+#usr/share/man/hr/man1/peekfd.1
+#usr/share/man/hr/man1/prtstat.1
+#usr/share/man/hr/man1/pslog.1
+#usr/share/man/hr/man1/pstree.1
+#usr/share/man/ko
+#usr/share/man/ko/man1
+#usr/share/man/ko/man1/fuser.1
+#usr/share/man/ko/man1/killall.1
+#usr/share/man/ko/man1/peekfd.1
+#usr/share/man/ko/man1/prtstat.1
+#usr/share/man/ko/man1/pslog.1
+#usr/share/man/ko/man1/pstree.1
#usr/share/man/man1/fuser.1
#usr/share/man/man1/killall.1
#usr/share/man/man1/peekfd.1
@@ -33,6 +51,12 @@ usr/bin/pstree
#usr/share/man/pt_BR/man1/prtstat.1
#usr/share/man/pt_BR/man1/pslog.1
#usr/share/man/pt_BR/man1/pstree.1
+#usr/share/man/ro/man1/fuser.1
+#usr/share/man/ro/man1/killall.1
+#usr/share/man/ro/man1/peekfd.1
+#usr/share/man/ro/man1/prtstat.1
+#usr/share/man/ro/man1/pslog.1
+#usr/share/man/ro/man1/pstree.1
#usr/share/man/ru
#usr/share/man/ru/man1
#usr/share/man/ru/man1/fuser.1
@@ -41,6 +65,22 @@ usr/bin/pstree
#usr/share/man/ru/man1/prtstat.1
#usr/share/man/ru/man1/pslog.1
#usr/share/man/ru/man1/pstree.1
+#usr/share/man/sr
+#usr/share/man/sr/man1
+#usr/share/man/sr/man1/fuser.1
+#usr/share/man/sr/man1/killall.1
+#usr/share/man/sr/man1/peekfd.1
+#usr/share/man/sr/man1/prtstat.1
+#usr/share/man/sr/man1/pslog.1
+#usr/share/man/sr/man1/pstree.1
+#usr/share/man/sv
+#usr/share/man/sv/man1
+#usr/share/man/sv/man1/fuser.1
+#usr/share/man/sv/man1/killall.1
+#usr/share/man/sv/man1/peekfd.1
+#usr/share/man/sv/man1/prtstat.1
+#usr/share/man/sv/man1/pslog.1
+#usr/share/man/sv/man1/pstree.1
#usr/share/man/uk
#usr/share/man/uk/man1
#usr/share/man/uk/man1/fuser.1
diff --git a/config/rootfiles/core/172/core-files b/config/rootfiles/core/173/core-files
similarity index 100%
rename from config/rootfiles/core/172/core-files
rename to config/rootfiles/core/173/core-files
diff --git a/config/rootfiles/core/172/exclude b/config/rootfiles/core/173/exclude
similarity index 100%
rename from config/rootfiles/core/172/exclude
rename to config/rootfiles/core/173/exclude
diff --git a/config/rootfiles/core/172/filelists/core-files b/config/rootfiles/core/173/filelists/core-files
similarity index 100%
rename from config/rootfiles/core/172/filelists/core-files
rename to config/rootfiles/core/173/filelists/core-files
diff --git a/config/rootfiles/core/173/filelists/files b/config/rootfiles/core/173/filelists/files
new file mode 100644
index 000000000..2d8353e65
--- /dev/null
+++ b/config/rootfiles/core/173/filelists/files
@@ -0,0 +1,7 @@
+etc/ppp/ip-up
+etc/rc.d/init.d/networking/dhcpcd.exe
+etc/rc.d/init.d/networking/functions.network
+etc/rc.d/init.d/networking/red
+lib/udev/network-hotplug-rename
+srv/web/ipfire/cgi-bin/pppsetup.cgi
+var/ipfire/dhcpc/dhcpcd.conf
diff --git a/config/rootfiles/core/173/filelists/hwdata b/config/rootfiles/core/173/filelists/hwdata
new file mode 120000
index 000000000..ced911666
--- /dev/null
+++ b/config/rootfiles/core/173/filelists/hwdata
@@ -0,0 +1 @@
+../../../common/hwdata
\ No newline at end of file
diff --git a/config/rootfiles/core/172/filelists/iproute2 b/config/rootfiles/core/173/filelists/iproute2
similarity index 100%
rename from config/rootfiles/core/172/filelists/iproute2
rename to config/rootfiles/core/173/filelists/iproute2
diff --git a/config/rootfiles/core/173/filelists/krb5 b/config/rootfiles/core/173/filelists/krb5
new file mode 120000
index 000000000..082c3cbcd
--- /dev/null
+++ b/config/rootfiles/core/173/filelists/krb5
@@ -0,0 +1 @@
+../../../common/krb5
\ No newline at end of file
diff --git a/config/rootfiles/core/173/filelists/libarchive b/config/rootfiles/core/173/filelists/libarchive
new file mode 120000
index 000000000..551f1f743
--- /dev/null
+++ b/config/rootfiles/core/173/filelists/libarchive
@@ -0,0 +1 @@
+../../../common/libarchive
\ No newline at end of file
diff --git a/config/rootfiles/core/173/filelists/libconfig b/config/rootfiles/core/173/filelists/libconfig
new file mode 120000
index 000000000..6e4e0678f
--- /dev/null
+++ b/config/rootfiles/core/173/filelists/libconfig
@@ -0,0 +1 @@
+../../../common/libconfig
\ No newline at end of file
diff --git a/config/rootfiles/core/173/filelists/libgudev b/config/rootfiles/core/173/filelists/libgudev
new file mode 120000
index 000000000..c30335fa7
--- /dev/null
+++ b/config/rootfiles/core/173/filelists/libgudev
@@ -0,0 +1 @@
+../../../common/libgudev
\ No newline at end of file
diff --git a/config/rootfiles/core/173/filelists/libqmi b/config/rootfiles/core/173/filelists/libqmi
new file mode 120000
index 000000000..20df7b9c2
--- /dev/null
+++ b/config/rootfiles/core/173/filelists/libqmi
@@ -0,0 +1 @@
+../../../common/libqmi
\ No newline at end of file
diff --git a/config/rootfiles/core/173/filelists/libssh b/config/rootfiles/core/173/filelists/libssh
new file mode 120000
index 000000000..ecbb67053
--- /dev/null
+++ b/config/rootfiles/core/173/filelists/libssh
@@ -0,0 +1 @@
+../../../common/libssh
\ No newline at end of file
diff --git a/config/rootfiles/core/173/filelists/libstatgrab b/config/rootfiles/core/173/filelists/libstatgrab
new file mode 120000
index 000000000..17109d85a
--- /dev/null
+++ b/config/rootfiles/core/173/filelists/libstatgrab
@@ -0,0 +1 @@
+../../../common/libstatgrab
\ No newline at end of file
diff --git a/config/rootfiles/core/173/filelists/libusb b/config/rootfiles/core/173/filelists/libusb
new file mode 120000
index 000000000..edbe8c215
--- /dev/null
+++ b/config/rootfiles/core/173/filelists/libusb
@@ -0,0 +1 @@
+../../../common/libusb
\ No newline at end of file
diff --git a/config/rootfiles/core/173/filelists/libxslt b/config/rootfiles/core/173/filelists/libxslt
new file mode 120000
index 000000000..bf9d76609
--- /dev/null
+++ b/config/rootfiles/core/173/filelists/libxslt
@@ -0,0 +1 @@
+../../../common/libxslt
\ No newline at end of file
diff --git a/config/rootfiles/core/173/filelists/libyang b/config/rootfiles/core/173/filelists/libyang
new file mode 120000
index 000000000..50c26d048
--- /dev/null
+++ b/config/rootfiles/core/173/filelists/libyang
@@ -0,0 +1 @@
+../../../common/libyang
\ No newline at end of file
diff --git a/config/rootfiles/core/173/filelists/mpfr b/config/rootfiles/core/173/filelists/mpfr
new file mode 120000
index 000000000..c8468bf42
--- /dev/null
+++ b/config/rootfiles/core/173/filelists/mpfr
@@ -0,0 +1 @@
+../../../common/mpfr
\ No newline at end of file
diff --git a/config/rootfiles/core/173/filelists/psmisc b/config/rootfiles/core/173/filelists/psmisc
new file mode 120000
index 000000000..0b07b1bf5
--- /dev/null
+++ b/config/rootfiles/core/173/filelists/psmisc
@@ -0,0 +1 @@
+../../../common/psmisc
\ No newline at end of file
diff --git a/config/rootfiles/core/173/update.sh b/config/rootfiles/core/173/update.sh
new file mode 100644
index 000000000..c72971226
--- /dev/null
+++ b/config/rootfiles/core/173/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=173
+
+# 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
+
+# Extract files
+extract_files
+
+# update linker config
+ldconfig
+
+# Remove files
+
+# 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/172/core-files b/config/rootfiles/oldcore/172/core-files
new file mode 100644
index 000000000..0dec37e53
--- /dev/null
+++ b/config/rootfiles/oldcore/172/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/172/exclude b/config/rootfiles/oldcore/172/exclude
new file mode 100644
index 000000000..378c2d563
--- /dev/null
+++ b/config/rootfiles/oldcore/172/exclude
@@ -0,0 +1,34 @@
+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
+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/172/filelists/aarch64/u-boot b/config/rootfiles/oldcore/172/filelists/aarch64/u-boot
similarity index 100%
rename from config/rootfiles/core/172/filelists/aarch64/u-boot
rename to config/rootfiles/oldcore/172/filelists/aarch64/u-boot
diff --git a/config/rootfiles/core/172/filelists/apache2 b/config/rootfiles/oldcore/172/filelists/apache2
similarity index 100%
rename from config/rootfiles/core/172/filelists/apache2
rename to config/rootfiles/oldcore/172/filelists/apache2
diff --git a/config/rootfiles/core/172/filelists/armv6l/python3 b/config/rootfiles/oldcore/172/filelists/armv6l/python3
similarity index 100%
rename from config/rootfiles/core/172/filelists/armv6l/python3
rename to config/rootfiles/oldcore/172/filelists/armv6l/python3
diff --git a/config/rootfiles/core/172/filelists/armv6l/u-boot b/config/rootfiles/oldcore/172/filelists/armv6l/u-boot
similarity index 100%
rename from config/rootfiles/core/172/filelists/armv6l/u-boot
rename to config/rootfiles/oldcore/172/filelists/armv6l/u-boot
diff --git a/config/rootfiles/core/172/filelists/bash b/config/rootfiles/oldcore/172/filelists/bash
similarity index 100%
rename from config/rootfiles/core/172/filelists/bash
rename to config/rootfiles/oldcore/172/filelists/bash
diff --git a/config/rootfiles/core/172/filelists/bind b/config/rootfiles/oldcore/172/filelists/bind
similarity index 100%
rename from config/rootfiles/core/172/filelists/bind
rename to config/rootfiles/oldcore/172/filelists/bind
diff --git a/config/rootfiles/core/172/filelists/ca-certificates b/config/rootfiles/oldcore/172/filelists/ca-certificates
similarity index 100%
rename from config/rootfiles/core/172/filelists/ca-certificates
rename to config/rootfiles/oldcore/172/filelists/ca-certificates
diff --git a/config/rootfiles/core/172/filelists/conntrack-tools b/config/rootfiles/oldcore/172/filelists/conntrack-tools
similarity index 100%
rename from config/rootfiles/core/172/filelists/conntrack-tools
rename to config/rootfiles/oldcore/172/filelists/conntrack-tools
diff --git a/config/rootfiles/oldcore/172/filelists/core-files b/config/rootfiles/oldcore/172/filelists/core-files
new file mode 120000
index 000000000..709d6c14c
--- /dev/null
+++ b/config/rootfiles/oldcore/172/filelists/core-files
@@ -0,0 +1 @@
+../core-files
\ No newline at end of file
diff --git a/config/rootfiles/core/172/filelists/curl b/config/rootfiles/oldcore/172/filelists/curl
similarity index 100%
rename from config/rootfiles/core/172/filelists/curl
rename to config/rootfiles/oldcore/172/filelists/curl
diff --git a/config/rootfiles/core/172/filelists/elinks b/config/rootfiles/oldcore/172/filelists/elinks
similarity index 100%
rename from config/rootfiles/core/172/filelists/elinks
rename to config/rootfiles/oldcore/172/filelists/elinks
diff --git a/config/rootfiles/core/172/filelists/ethtool b/config/rootfiles/oldcore/172/filelists/ethtool
similarity index 100%
rename from config/rootfiles/core/172/filelists/ethtool
rename to config/rootfiles/oldcore/172/filelists/ethtool
diff --git a/config/rootfiles/core/172/filelists/expat b/config/rootfiles/oldcore/172/filelists/expat
similarity index 100%
rename from config/rootfiles/core/172/filelists/expat
rename to config/rootfiles/oldcore/172/filelists/expat
diff --git a/config/rootfiles/core/172/filelists/files b/config/rootfiles/oldcore/172/filelists/files
similarity index 100%
rename from config/rootfiles/core/172/filelists/files
rename to config/rootfiles/oldcore/172/filelists/files
diff --git a/config/rootfiles/core/172/filelists/iana-etc b/config/rootfiles/oldcore/172/filelists/iana-etc
similarity index 100%
rename from config/rootfiles/core/172/filelists/iana-etc
rename to config/rootfiles/oldcore/172/filelists/iana-etc
diff --git a/config/rootfiles/oldcore/172/filelists/iproute2 b/config/rootfiles/oldcore/172/filelists/iproute2
new file mode 120000
index 000000000..05f0f71fb
--- /dev/null
+++ b/config/rootfiles/oldcore/172/filelists/iproute2
@@ -0,0 +1 @@
+../../../common/iproute2
\ No newline at end of file
diff --git a/config/rootfiles/core/172/filelists/kmod b/config/rootfiles/oldcore/172/filelists/kmod
similarity index 100%
rename from config/rootfiles/core/172/filelists/kmod
rename to config/rootfiles/oldcore/172/filelists/kmod
diff --git a/config/rootfiles/core/172/filelists/libedit b/config/rootfiles/oldcore/172/filelists/libedit
similarity index 100%
rename from config/rootfiles/core/172/filelists/libedit
rename to config/rootfiles/oldcore/172/filelists/libedit
diff --git a/config/rootfiles/core/172/filelists/libhtp b/config/rootfiles/oldcore/172/filelists/libhtp
similarity index 100%
rename from config/rootfiles/core/172/filelists/libhtp
rename to config/rootfiles/oldcore/172/filelists/libhtp
diff --git a/config/rootfiles/core/172/filelists/libloc b/config/rootfiles/oldcore/172/filelists/libloc
similarity index 100%
rename from config/rootfiles/core/172/filelists/libloc
rename to config/rootfiles/oldcore/172/filelists/libloc
diff --git a/config/rootfiles/core/172/filelists/libnetfilter_conntrack b/config/rootfiles/oldcore/172/filelists/libnetfilter_conntrack
similarity index 100%
rename from config/rootfiles/core/172/filelists/libnetfilter_conntrack
rename to config/rootfiles/oldcore/172/filelists/libnetfilter_conntrack
diff --git a/config/rootfiles/core/172/filelists/libpng b/config/rootfiles/oldcore/172/filelists/libpng
similarity index 100%
rename from config/rootfiles/core/172/filelists/libpng
rename to config/rootfiles/oldcore/172/filelists/libpng
diff --git a/config/rootfiles/core/172/filelists/libtasn1 b/config/rootfiles/oldcore/172/filelists/libtasn1
similarity index 100%
rename from config/rootfiles/core/172/filelists/libtasn1
rename to config/rootfiles/oldcore/172/filelists/libtasn1
diff --git a/config/rootfiles/core/172/filelists/libtiff b/config/rootfiles/oldcore/172/filelists/libtiff
similarity index 100%
rename from config/rootfiles/core/172/filelists/libtiff
rename to config/rootfiles/oldcore/172/filelists/libtiff
diff --git a/config/rootfiles/core/172/filelists/libuv b/config/rootfiles/oldcore/172/filelists/libuv
similarity index 100%
rename from config/rootfiles/core/172/filelists/libuv
rename to config/rootfiles/oldcore/172/filelists/libuv
diff --git a/config/rootfiles/core/172/filelists/libxcrypt b/config/rootfiles/oldcore/172/filelists/libxcrypt
similarity index 100%
rename from config/rootfiles/core/172/filelists/libxcrypt
rename to config/rootfiles/oldcore/172/filelists/libxcrypt
diff --git a/config/rootfiles/core/172/filelists/libxml2 b/config/rootfiles/oldcore/172/filelists/libxml2
similarity index 100%
rename from config/rootfiles/core/172/filelists/libxml2
rename to config/rootfiles/oldcore/172/filelists/libxml2
diff --git a/config/rootfiles/core/172/filelists/lsof b/config/rootfiles/oldcore/172/filelists/lsof
similarity index 100%
rename from config/rootfiles/core/172/filelists/lsof
rename to config/rootfiles/oldcore/172/filelists/lsof
diff --git a/config/rootfiles/core/172/filelists/nano b/config/rootfiles/oldcore/172/filelists/nano
similarity index 100%
rename from config/rootfiles/core/172/filelists/nano
rename to config/rootfiles/oldcore/172/filelists/nano
diff --git a/config/rootfiles/core/172/filelists/openssh b/config/rootfiles/oldcore/172/filelists/openssh
similarity index 100%
rename from config/rootfiles/core/172/filelists/openssh
rename to config/rootfiles/oldcore/172/filelists/openssh
diff --git a/config/rootfiles/core/172/filelists/openssl b/config/rootfiles/oldcore/172/filelists/openssl
similarity index 100%
rename from config/rootfiles/core/172/filelists/openssl
rename to config/rootfiles/oldcore/172/filelists/openssl
diff --git a/config/rootfiles/core/172/filelists/openvpn b/config/rootfiles/oldcore/172/filelists/openvpn
similarity index 100%
rename from config/rootfiles/core/172/filelists/openvpn
rename to config/rootfiles/oldcore/172/filelists/openvpn
diff --git a/config/rootfiles/core/172/filelists/pciutils b/config/rootfiles/oldcore/172/filelists/pciutils
similarity index 100%
rename from config/rootfiles/core/172/filelists/pciutils
rename to config/rootfiles/oldcore/172/filelists/pciutils
diff --git a/config/rootfiles/core/172/filelists/poppler b/config/rootfiles/oldcore/172/filelists/poppler
similarity index 100%
rename from config/rootfiles/core/172/filelists/poppler
rename to config/rootfiles/oldcore/172/filelists/poppler
diff --git a/config/rootfiles/core/172/filelists/python3 b/config/rootfiles/oldcore/172/filelists/python3
similarity index 100%
rename from config/rootfiles/core/172/filelists/python3
rename to config/rootfiles/oldcore/172/filelists/python3
diff --git a/config/rootfiles/core/172/filelists/python3-daemon b/config/rootfiles/oldcore/172/filelists/python3-daemon
similarity index 100%
rename from config/rootfiles/core/172/filelists/python3-daemon
rename to config/rootfiles/oldcore/172/filelists/python3-daemon
diff --git a/config/rootfiles/core/172/filelists/python3-setuptools-rust b/config/rootfiles/oldcore/172/filelists/python3-setuptools-rust
similarity index 100%
rename from config/rootfiles/core/172/filelists/python3-setuptools-rust
rename to config/rootfiles/oldcore/172/filelists/python3-setuptools-rust
diff --git a/config/rootfiles/core/172/filelists/readline b/config/rootfiles/oldcore/172/filelists/readline
similarity index 100%
rename from config/rootfiles/core/172/filelists/readline
rename to config/rootfiles/oldcore/172/filelists/readline
diff --git a/config/rootfiles/core/172/filelists/sed b/config/rootfiles/oldcore/172/filelists/sed
similarity index 100%
rename from config/rootfiles/core/172/filelists/sed
rename to config/rootfiles/oldcore/172/filelists/sed
diff --git a/config/rootfiles/core/172/filelists/sqlite b/config/rootfiles/oldcore/172/filelists/sqlite
similarity index 100%
rename from config/rootfiles/core/172/filelists/sqlite
rename to config/rootfiles/oldcore/172/filelists/sqlite
diff --git a/config/rootfiles/core/172/filelists/strongswan b/config/rootfiles/oldcore/172/filelists/strongswan
similarity index 100%
rename from config/rootfiles/core/172/filelists/strongswan
rename to config/rootfiles/oldcore/172/filelists/strongswan
diff --git a/config/rootfiles/core/172/filelists/sudo b/config/rootfiles/oldcore/172/filelists/sudo
similarity index 100%
rename from config/rootfiles/core/172/filelists/sudo
rename to config/rootfiles/oldcore/172/filelists/sudo
diff --git a/config/rootfiles/core/172/filelists/suricata b/config/rootfiles/oldcore/172/filelists/suricata
similarity index 100%
rename from config/rootfiles/core/172/filelists/suricata
rename to config/rootfiles/oldcore/172/filelists/suricata
diff --git a/config/rootfiles/core/172/filelists/sysstat b/config/rootfiles/oldcore/172/filelists/sysstat
similarity index 100%
rename from config/rootfiles/core/172/filelists/sysstat
rename to config/rootfiles/oldcore/172/filelists/sysstat
diff --git a/config/rootfiles/core/172/filelists/tzdata b/config/rootfiles/oldcore/172/filelists/tzdata
similarity index 100%
rename from config/rootfiles/core/172/filelists/tzdata
rename to config/rootfiles/oldcore/172/filelists/tzdata
diff --git a/config/rootfiles/core/172/filelists/udev b/config/rootfiles/oldcore/172/filelists/udev
similarity index 100%
rename from config/rootfiles/core/172/filelists/udev
rename to config/rootfiles/oldcore/172/filelists/udev
diff --git a/config/rootfiles/core/172/filelists/unbound b/config/rootfiles/oldcore/172/filelists/unbound
similarity index 100%
rename from config/rootfiles/core/172/filelists/unbound
rename to config/rootfiles/oldcore/172/filelists/unbound
diff --git a/config/rootfiles/core/172/filelists/usbutils b/config/rootfiles/oldcore/172/filelists/usbutils
similarity index 100%
rename from config/rootfiles/core/172/filelists/usbutils
rename to config/rootfiles/oldcore/172/filelists/usbutils
diff --git a/config/rootfiles/core/172/filelists/vnstat b/config/rootfiles/oldcore/172/filelists/vnstat
similarity index 100%
rename from config/rootfiles/core/172/filelists/vnstat
rename to config/rootfiles/oldcore/172/filelists/vnstat
diff --git a/config/rootfiles/core/172/filelists/x86_64/intel-microcode b/config/rootfiles/oldcore/172/filelists/x86_64/intel-microcode
similarity index 100%
rename from config/rootfiles/core/172/filelists/x86_64/intel-microcode
rename to config/rootfiles/oldcore/172/filelists/x86_64/intel-microcode
diff --git a/config/rootfiles/core/172/filelists/xz b/config/rootfiles/oldcore/172/filelists/xz
similarity index 100%
rename from config/rootfiles/core/172/filelists/xz
rename to config/rootfiles/oldcore/172/filelists/xz
diff --git a/config/rootfiles/core/172/filelists/zlib b/config/rootfiles/oldcore/172/filelists/zlib
similarity index 100%
rename from config/rootfiles/core/172/filelists/zlib
rename to config/rootfiles/oldcore/172/filelists/zlib
diff --git a/config/rootfiles/core/172/update.sh b/config/rootfiles/oldcore/172/update.sh
similarity index 100%
rename from config/rootfiles/core/172/update.sh
rename to config/rootfiles/oldcore/172/update.sh
diff --git a/config/rootfiles/packages/dbus b/config/rootfiles/packages/dbus
index 82817a942..3f752c21e 100644
--- a/config/rootfiles/packages/dbus
+++ b/config/rootfiles/packages/dbus
@@ -40,7 +40,7 @@ usr/bin/dbus-uuidgen
#usr/lib/libdbus-1.la
#usr/lib/libdbus-1.so
usr/lib/libdbus-1.so.3
-usr/lib/libdbus-1.so.3.32.0
+usr/lib/libdbus-1.so.3.32.1
#usr/lib/pkgconfig/dbus-1.pc
usr/libexec/dbus-daemon-launch-helper
#usr/share/dbus-1
diff --git a/config/rootfiles/packages/libshout b/config/rootfiles/packages/libshout
index ed781ffdf..411b786b9 100644
--- a/config/rootfiles/packages/libshout
+++ b/config/rootfiles/packages/libshout
@@ -1,3 +1,4 @@
+#usr/bin/shout
#usr/include/shout
#usr/include/shout/shout.h
#usr/lib/ckport
@@ -16,3 +17,4 @@ usr/lib/libshout.so.3.2.0
#usr/share/doc/libshout/README
#usr/share/doc/libshout/example.c
#usr/share/doc/libshout/nonblocking.c
+#usr/share/man/man1/shout.1
diff --git a/config/rootfiles/packages/libusbredir b/config/rootfiles/packages/libusbredir
index d5f8817f2..cc8f5dc8e 100644
--- a/config/rootfiles/packages/libusbredir
+++ b/config/rootfiles/packages/libusbredir
@@ -1,18 +1,14 @@
+#usr/bin/usbredirect
#usr/include/usbredirfilter.h
#usr/include/usbredirhost.h
#usr/include/usbredirparser.h
#usr/include/usbredirproto.h
-#usr/lib/libusbredirhost.a
-#usr/lib/libusbredirhost.la
usr/lib/libusbredirhost.so
usr/lib/libusbredirhost.so.1
-usr/lib/libusbredirhost.so.1.0.1
-#usr/lib/libusbredirparser.a
-#usr/lib/libusbredirparser.la
+usr/lib/libusbredirhost.so.1.0.3
usr/lib/libusbredirparser.so
usr/lib/libusbredirparser.so.1
-usr/lib/libusbredirparser.so.1.0.1
+usr/lib/libusbredirparser.so.1.2.1
#usr/lib/pkgconfig/libusbredirhost.pc
#usr/lib/pkgconfig/libusbredirparser-0.5.pc
-#usr/sbin/usbredirserver
-#usr/share/man/man1/usbredirserver.1
+#usr/share/man/man1/usbredirect.1
diff --git a/config/rootfiles/packages/libvirt b/config/rootfiles/packages/libvirt
index 5682b73c8..8b3819aa5 100644
--- a/config/rootfiles/packages/libvirt
+++ b/config/rootfiles/packages/libvirt
@@ -60,6 +60,7 @@ usr/bin/virt-pki-query-dn
usr/bin/virt-pki-validate
usr/bin/virt-qemu-qmp-proxy
usr/bin/virt-qemu-run
+usr/bin/virt-qemu-sev-validate
usr/bin/virt-ssh-helper
usr/bin/virt-xml-validate
#usr/include/libvirt
@@ -84,16 +85,16 @@ usr/bin/virt-xml-validate
#usr/lib/libvirt
#usr/lib/libvirt-admin.so
usr/lib/libvirt-admin.so.0
-usr/lib/libvirt-admin.so.0.8009.0
+usr/lib/libvirt-admin.so.0.8010.0
#usr/lib/libvirt-lxc.so
usr/lib/libvirt-lxc.so.0
-usr/lib/libvirt-lxc.so.0.8009.0
+usr/lib/libvirt-lxc.so.0.8010.0
#usr/lib/libvirt-qemu.so
usr/lib/libvirt-qemu.so.0
-usr/lib/libvirt-qemu.so.0.8009.0
+usr/lib/libvirt-qemu.so.0.8010.0
#usr/lib/libvirt.so
usr/lib/libvirt.so.0
-usr/lib/libvirt.so.0.8009.0
+usr/lib/libvirt.so.0.8010.0
#usr/lib/libvirt/connection-driver
usr/lib/libvirt/connection-driver/libvirt_driver_ch.so
usr/lib/libvirt/connection-driver/libvirt_driver_interface.so
@@ -317,6 +318,7 @@ usr/share/libvirt/schemas/nodedev.rng
usr/share/libvirt/schemas/nwfilter.rng
usr/share/libvirt/schemas/nwfilter_params.rng
usr/share/libvirt/schemas/nwfilterbinding.rng
+usr/share/libvirt/schemas/privatedata.rng
usr/share/libvirt/schemas/secret.rng
usr/share/libvirt/schemas/storagecommon.rng
usr/share/libvirt/schemas/storagepool.rng
diff --git a/config/udev/network-hotplug-rename b/config/udev/network-hotplug-rename
index 73e811e94..7c81bdb78 100644
--- a/config/udev/network-hotplug-rename
+++ b/config/udev/network-hotplug-rename
@@ -19,6 +19,8 @@
# #
###############################################################################
+. /etc/rc.d/init.d/networking/functions.network
+
# Check if all appropriate variables are set
[ -n "${INTERFACE}" ] || exit 2
@@ -44,6 +46,13 @@ if [ ! -r "/var/ipfire/ethernet/settings" ]; then
exit 1
fi
+# Change MAC addresses of QMI interface
+if [ -d "/sys/class/net/${INTERFACE}/qmi" ]; then
+ if ! qmi_assign_address "${INTERFACE}"; then
+ exit 1
+ fi
+fi
+
# Read network settings
eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
diff --git a/doc/language_issues.de b/doc/language_issues.de
index c3db84863..88c7879be 100644
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -376,7 +376,6 @@ WARNING: translation string unused: host deny
WARNING: translation string unused: hostname and domain already in use
WARNING: translation string unused: hour-graph
WARNING: translation string unused: hours2
-WARNING: translation string unused: ibod for dual isdn only
WARNING: translation string unused: icmp selected but no type
WARNING: translation string unused: icmp type
WARNING: translation string unused: id
@@ -424,10 +423,6 @@ WARNING: translation string unused: ipblocklist category scanner
WARNING: translation string unused: ipfire side
WARNING: translation string unused: ipsec no connections
WARNING: translation string unused: iptable rules
-WARNING: translation string unused: isdn
-WARNING: translation string unused: isdn settings
-WARNING: translation string unused: isdn1
-WARNING: translation string unused: isdn2
WARNING: translation string unused: javascript menu error1
WARNING: translation string unused: javascript menu error2
WARNING: translation string unused: kernel version
@@ -868,6 +863,9 @@ WARNING: translation string unused: zoneconf val vlan amount assignment error
WARNING: translation string unused: zoneconf val vlan tag assignment error
WARNING: translation string unused: zoneconf val vlan tag range error
WARNING: translation string unused: zoneconf val zoneslave amount error
+WARNING: untranslated string: access point name = Access Point Name
+WARNING: untranslated string: access point name is invalid = Access Point Name is invalid
+WARNING: untranslated string: access point name is required = Access Point Name is required
WARNING: untranslated string: aliases default interface = - Default Interface -
WARNING: untranslated string: cake profile bridged-llcsnap 32 = Bridged LLC SNAP (32 bytes)
WARNING: untranslated string: cake profile bridged-ptm 19 = Bridged PTM (19 bytes)
diff --git a/doc/language_issues.en b/doc/language_issues.en
index 0bf7bf977..c29e3bed6 100644
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -89,6 +89,9 @@ WARNING: untranslated string: a ca certificate with this name already exists = A
WARNING: untranslated string: a connection with this common name already exists = A connection with this common name already exists.
WARNING: untranslated string: a connection with this name already exists = A connection with this name already exists.
WARNING: untranslated string: abort = abort
+WARNING: untranslated string: access point name = Access Point Name
+WARNING: untranslated string: access point name is invalid = Access Point Name is invalid
+WARNING: untranslated string: access point name is required = Access Point Name is required
WARNING: untranslated string: acpitemp = ACPI - Temperatures
WARNING: untranslated string: action = Action
WARNING: untranslated string: activate = Activate
diff --git a/doc/language_issues.es b/doc/language_issues.es
index 2254e484f..0bd390d5d 100644
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -415,7 +415,6 @@ WARNING: translation string unused: host deny
WARNING: translation string unused: hostname and domain already in use
WARNING: translation string unused: hour-graph
WARNING: translation string unused: hours2
-WARNING: translation string unused: ibod for dual isdn only
WARNING: translation string unused: icmp selected but no type
WARNING: translation string unused: icmp type
WARNING: translation string unused: id
@@ -939,6 +938,9 @@ WARNING: translation string unused: zoneconf val zoneslave amount error
WARNING: untranslated string: Captive ACTIVATE = unknown string
WARNING: untranslated string: Captive clients = unknown string
WARNING: untranslated string: Scan for Songs = unknown string
+WARNING: untranslated string: access point name = Access Point Name
+WARNING: untranslated string: access point name is invalid = Access Point Name is invalid
+WARNING: untranslated string: access point name is required = Access Point Name is required
WARNING: untranslated string: bytes = unknown string
WARNING: untranslated string: cpu frequency = CPU frequency
WARNING: untranslated string: dns servers = DNS Servers
diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 1a6a877d7..56d69d86e 100644
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -404,7 +404,6 @@ WARNING: translation string unused: host deny
WARNING: translation string unused: hostname and domain already in use
WARNING: translation string unused: hour-graph
WARNING: translation string unused: hours2
-WARNING: translation string unused: ibod for dual isdn only
WARNING: translation string unused: icmp selected but no type
WARNING: translation string unused: icmp type
WARNING: translation string unused: id
@@ -454,10 +453,6 @@ WARNING: translation string unused: ipblocklist category scanner
WARNING: translation string unused: ipfire side
WARNING: translation string unused: ipsec no connections
WARNING: translation string unused: iptable rules
-WARNING: translation string unused: isdn
-WARNING: translation string unused: isdn settings
-WARNING: translation string unused: isdn1
-WARNING: translation string unused: isdn2
WARNING: translation string unused: javascript menu error1
WARNING: translation string unused: javascript menu error2
WARNING: translation string unused: kernel version
@@ -910,6 +905,9 @@ WARNING: translation string unused: zoneconf val vlan amount assignment error
WARNING: translation string unused: zoneconf val vlan tag assignment error
WARNING: translation string unused: zoneconf val vlan tag range error
WARNING: translation string unused: zoneconf val zoneslave amount error
+WARNING: untranslated string: access point name = Access Point Name
+WARNING: untranslated string: access point name is invalid = Access Point Name is invalid
+WARNING: untranslated string: access point name is required = Access Point Name is required
WARNING: untranslated string: advproxy errmsg invalid url = Invalid URL
WARNING: untranslated string: core notice 3 = available.
WARNING: untranslated string: dh = Diffie-Hellman-Parameter
diff --git a/doc/language_issues.it b/doc/language_issues.it
index e0c87ea2c..9999f947c 100644
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -372,7 +372,6 @@ WARNING: translation string unused: host deny
WARNING: translation string unused: hostname and domain already in use
WARNING: translation string unused: hour-graph
WARNING: translation string unused: hours2
-WARNING: translation string unused: ibod for dual isdn only
WARNING: translation string unused: icmp selected but no type
WARNING: translation string unused: icmp type
WARNING: translation string unused: id
@@ -417,10 +416,6 @@ WARNING: translation string unused: ip address in use
WARNING: translation string unused: ipfire side
WARNING: translation string unused: ipsec no connections
WARNING: translation string unused: iptable rules
-WARNING: translation string unused: isdn
-WARNING: translation string unused: isdn settings
-WARNING: translation string unused: isdn1
-WARNING: translation string unused: isdn2
WARNING: translation string unused: javascript menu error1
WARNING: translation string unused: javascript menu error2
WARNING: translation string unused: kernel version
@@ -888,6 +883,9 @@ WARNING: untranslated string: Captive wrong ext = Uploaded file has wrong filety
WARNING: untranslated string: MTU settings = MTU settings:
WARNING: untranslated string: Number of Countries for the pie chart = Number of Countries for the pie chart
WARNING: untranslated string: Scan for Songs = unknown string
+WARNING: untranslated string: access point name = Access Point Name
+WARNING: untranslated string: access point name is invalid = Access Point Name is invalid
+WARNING: untranslated string: access point name is required = Access Point Name is required
WARNING: untranslated string: acpitemp = ACPI - Temperatures
WARNING: untranslated string: administrator password = Administrator password
WARNING: untranslated string: administrator username = Administrator username
diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index da08fb913..14a7b420e 100644
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -374,7 +374,6 @@ WARNING: translation string unused: host deny
WARNING: translation string unused: hostname and domain already in use
WARNING: translation string unused: hour-graph
WARNING: translation string unused: hours2
-WARNING: translation string unused: ibod for dual isdn only
WARNING: translation string unused: icmp selected but no type
WARNING: translation string unused: icmp type
WARNING: translation string unused: id
@@ -419,10 +418,6 @@ WARNING: translation string unused: ip address in use
WARNING: translation string unused: ipfire side
WARNING: translation string unused: ipsec no connections
WARNING: translation string unused: iptable rules
-WARNING: translation string unused: isdn
-WARNING: translation string unused: isdn settings
-WARNING: translation string unused: isdn1
-WARNING: translation string unused: isdn2
WARNING: translation string unused: javascript menu error1
WARNING: translation string unused: javascript menu error2
WARNING: translation string unused: kernel version
@@ -888,6 +883,9 @@ WARNING: untranslated string: Captive wrong ext = Uploaded file has wrong filety
WARNING: untranslated string: MTU settings = MTU settings:
WARNING: untranslated string: Number of Countries for the pie chart = Number of Countries for the pie chart
WARNING: untranslated string: Scan for Songs = unknown string
+WARNING: untranslated string: access point name = Access Point Name
+WARNING: untranslated string: access point name is invalid = Access Point Name is invalid
+WARNING: untranslated string: access point name is required = Access Point Name is required
WARNING: untranslated string: acpitemp = ACPI - Temperatures
WARNING: untranslated string: administrator password = Administrator password
WARNING: untranslated string: administrator username = Administrator username
diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 5de989453..a53a208d9 100644
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -315,7 +315,6 @@ WARNING: translation string unused: host deny
WARNING: translation string unused: hostname and domain already in use
WARNING: translation string unused: hour-graph
WARNING: translation string unused: hours2
-WARNING: translation string unused: ibod for dual isdn only
WARNING: translation string unused: icmp selected but no type
WARNING: translation string unused: icmp type
WARNING: translation string unused: id
@@ -359,10 +358,6 @@ WARNING: translation string unused: invert
WARNING: translation string unused: ip address in use
WARNING: translation string unused: ipfire side
WARNING: translation string unused: iptable rules
-WARNING: translation string unused: isdn
-WARNING: translation string unused: isdn settings
-WARNING: translation string unused: isdn1
-WARNING: translation string unused: isdn2
WARNING: translation string unused: javascript menu error1
WARNING: translation string unused: javascript menu error2
WARNING: translation string unused: kernel version
@@ -808,6 +803,9 @@ WARNING: untranslated string: MB written = MB written
WARNING: untranslated string: MTU settings = MTU settings:
WARNING: untranslated string: Number of Countries for the pie chart = Number of Countries for the pie chart
WARNING: untranslated string: Scan for Songs = unknown string
+WARNING: untranslated string: access point name = Access Point Name
+WARNING: untranslated string: access point name is invalid = Access Point Name is invalid
+WARNING: untranslated string: access point name is required = Access Point Name is required
WARNING: untranslated string: acpitemp = ACPI - Temperatures
WARNING: untranslated string: addons = Add-Ons
WARNING: untranslated string: administrator password = Administrator password
diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 81a492358..c5dc1aa61 100644
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -312,7 +312,6 @@ WARNING: translation string unused: host configuration
WARNING: translation string unused: host deny
WARNING: translation string unused: hostname and domain already in use
WARNING: translation string unused: hours2
-WARNING: translation string unused: ibod for dual isdn only
WARNING: translation string unused: icmp selected but no type
WARNING: translation string unused: icmp type
WARNING: translation string unused: id
@@ -356,10 +355,6 @@ WARNING: translation string unused: invert
WARNING: translation string unused: ip address in use
WARNING: translation string unused: ipfire side
WARNING: translation string unused: iptable rules
-WARNING: translation string unused: isdn
-WARNING: translation string unused: isdn settings
-WARNING: translation string unused: isdn1
-WARNING: translation string unused: isdn2
WARNING: translation string unused: javascript menu error1
WARNING: translation string unused: javascript menu error2
WARNING: translation string unused: kernel version
@@ -804,6 +799,9 @@ WARNING: untranslated string: MB written = MB written
WARNING: untranslated string: MTU settings = MTU settings:
WARNING: untranslated string: Number of Countries for the pie chart = Number of Countries for the pie chart
WARNING: untranslated string: Scan for Songs = unknown string
+WARNING: untranslated string: access point name = Access Point Name
+WARNING: untranslated string: access point name is invalid = Access Point Name is invalid
+WARNING: untranslated string: access point name is required = Access Point Name is required
WARNING: untranslated string: acpitemp = ACPI - Temperatures
WARNING: untranslated string: addons = Add-Ons
WARNING: untranslated string: administrator password = Administrator password
diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index d1bd0f4e9..552082a96 100644
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -398,7 +398,6 @@ WARNING: translation string unused: host deny
WARNING: translation string unused: hostname and domain already in use
WARNING: translation string unused: hour-graph
WARNING: translation string unused: hours2
-WARNING: translation string unused: ibod for dual isdn only
WARNING: translation string unused: icmp selected but no type
WARNING: translation string unused: icmp type
WARNING: translation string unused: id
@@ -443,10 +442,6 @@ WARNING: translation string unused: ip address in use
WARNING: translation string unused: ipfire side
WARNING: translation string unused: ipsec no connections
WARNING: translation string unused: iptable rules
-WARNING: translation string unused: isdn
-WARNING: translation string unused: isdn settings
-WARNING: translation string unused: isdn1
-WARNING: translation string unused: isdn2
WARNING: translation string unused: javascript menu error1
WARNING: translation string unused: javascript menu error2
WARNING: translation string unused: kernel version
@@ -882,6 +877,9 @@ WARNING: translation string unused: yearly firewallhits
WARNING: untranslated string: Captive clients = unknown string
WARNING: untranslated string: Captive delete logo = Delete Logo
WARNING: untranslated string: Scan for Songs = unknown string
+WARNING: untranslated string: access point name = Access Point Name
+WARNING: untranslated string: access point name is invalid = Access Point Name is invalid
+WARNING: untranslated string: access point name is required = Access Point Name is required
WARNING: untranslated string: acpitemp = ACPI - Temperatures
WARNING: untranslated string: advproxy asbased anomaly detection = Anomaly detections based on Autonomous Systems information
WARNING: untranslated string: advproxy errmsg invalid url = Invalid URL
diff --git a/doc/language_missings b/doc/language_missings
index 47b314981..65d38b422 100644
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -1,6 +1,9 @@
############################################################################
# Checking cgi-bin translations for language: de #
############################################################################
+< access point name
+< access point name is invalid
+< access point name is required
< advproxy update information
< aliases default interface
< ansi t1.483
@@ -94,6 +97,9 @@
############################################################################
# Checking cgi-bin translations for language: es #
############################################################################
+< access point name
+< access point name is invalid
+< access point name is required
< addon
< cpu frequency
< dns servers
@@ -106,6 +112,9 @@
############################################################################
# Checking cgi-bin translations for language: fr #
############################################################################
+< access point name
+< access point name is invalid
+< access point name is required
< advproxy errmsg invalid url
< ansi t1.483
< bewan adsl pci st
@@ -123,6 +132,9 @@
# Checking cgi-bin translations for language: it #
############################################################################
< 24 hours
+< access point name
+< access point name is invalid
+< access point name is required
< acpitemp
< addon
< administrator password
@@ -622,6 +634,9 @@
# Checking cgi-bin translations for language: nl #
############################################################################
< 24 hours
+< access point name
+< access point name is invalid
+< access point name is required
< acpitemp
< administrator password
< administrator username
@@ -1149,6 +1164,9 @@
# Checking cgi-bin translations for language: pl #
############################################################################
< 24 hours
+< access point name
+< access point name is invalid
+< access point name is required
< acpitemp
< addon
< addons
@@ -2121,6 +2139,9 @@
# Checking cgi-bin translations for language: ru #
############################################################################
< 24 hours
+< access point name
+< access point name is invalid
+< access point name is required
< acpitemp
< Add a route
< addon
@@ -3099,6 +3120,9 @@
############################################################################
# Checking cgi-bin translations for language: tr #
############################################################################
+< access point name
+< access point name is invalid
+< access point name is required
< acpitemp
< addon
< advproxy asbased anomaly detection
diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi
index f4a7fee9f..4d88eb5f2 100644
--- a/html/cgi-bin/credits.cgi
+++ b/html/cgi-bin/credits.cgi
@@ -82,14 +82,14 @@ Peter Pfeiffer,
Daniel Glanzmann,
Heiner Schmeling,
Stephan Feddersen,
-Stéphane Pautrel,
Robin Roevens,
+Stéphane Pautrel,
Tim FitzGeorge,
Jan Lentfer,
Marcus Scholz,
Ersan Yildirim,
-Jörn-Ingo Weigert,
Jon Murphy,
+Jörn-Ingo Weigert,
Alexander Koch,
Wolfgang Apolinarski,
Alfred Haas,
@@ -100,6 +100,7 @@ Bernhard Bitsch,
Ronald Wiesinger,
Florian Bührle,
Justin Luth,
+Mathew McBride,
Michael Eitelwein,
Rob Brewer,
Alex Koch,
@@ -137,7 +138,6 @@ Kay-Michael Köhler,
Kim Wölfel,
Logan Schmidt,
Markus Untersee,
-Mathew McBride,
Nico Prenzel,
Oliver Fuhrer,
Osmar Gonzalez,
diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi
index 7fbb46a77..ef9a4b3f0 100644
--- a/html/cgi-bin/pppsetup.cgi
+++ b/html/cgi-bin/pppsetup.cgi
@@ -32,7 +32,6 @@ require "${General::swroot}/header.pl";
our %pppsettings=();
my %temppppsettings=();
our %modemsettings=();
-our %isdnsettings=();
our %netsettings=();
my %selected=();
my %checked=();
@@ -63,7 +62,7 @@ if ($pppsettings{'ACTION'} ne '' &&
&General::readhash("${General::swroot}/ppp/settings", \%pppsettings);}
elsif ($pppsettings{'ACTION'} eq $Lang::tr{'refresh'})
{
- unless ($pppsettings{'TYPE'} =~ /^(modem|serial|isdn|pppoe|pptp|vdsl|pppoeatm|pptpatm)$/) {
+ unless ($pppsettings{'TYPE'} =~ /^(modem|serial|pppoe|pptp|vdsl|pppoeatm|pptpatm)$/) {
$errormessage = $Lang::tr{'invalid input'};
goto ERROR; }
my $type = $pppsettings{'TYPE'};
@@ -72,10 +71,10 @@ elsif ($pppsettings{'ACTION'} eq $Lang::tr{'refresh'})
}
elsif ($pppsettings{'ACTION'} eq $Lang::tr{'save'})
{
- if ($pppsettings{'TYPE'} =~ /^(modem|serial|isdn)$/ && $pppsettings{'COMPORT'} !~ /^(ttyS0|ttyS1|ttyS2|ttyS3|ttyS4|ttyACM[0-9]|ttyUSB[0-9]|rfcomm0|rfcomm1|isdn1|isdn2)$/) {
+ if ($pppsettings{'TYPE'} =~ /^(modem|serial)$/ && $pppsettings{'COMPORT'} !~ /^(ttyS0|ttyS1|ttyS2|ttyS3|ttyS4|ttyACM[0-9]|ttyUSB[0-9]|rfcomm0|rfcomm1)$/) {
$errormessage = $Lang::tr{'invalid input'};
goto ERROR; }
- if ($pppsettings{'TYPE'} =~ /^(modem|serial|isdn)$/ && $pppsettings{'MONPORT'} !~ /^(|ttyACM[0-9]|ttyUSB[0-9]|rfcomm0|rfcomm1)$/) {
+ if ($pppsettings{'TYPE'} =~ /^(modem|serial)$/ && $pppsettings{'MONPORT'} !~ /^(|ttyACM[0-9]|ttyUSB[0-9]|rfcomm0|rfcomm1)$/) {
$errormessage = $Lang::tr{'invalid input'};
goto ERROR; }
if ($pppsettings{'TYPE'} =~ /^(modem|serial)$/ && $pppsettings{'DTERATE'} !~ /^(9600|19200|38400|57600|115200|230400|460800|921600)$/) {
@@ -88,12 +87,22 @@ elsif ($pppsettings{'ACTION'} eq $Lang::tr{'save'})
$errormessage = $Lang::tr{'invalid input'};
goto ERROR;
}
+ if ($pppsettings{'TYPE'} eq "qmi") {
+ # APN cannot be empty
+ if ($pppsettings{'APN'} eq "") {
+ $errormessage = $Lang::tr{'access point name is required'};
+ goto ERROR;
+ } elsif (!&General::validdomainname($pppsettings{'APN'})) {
+ $errormessage = $Lang::tr{'access point name is invalid'};
+ goto ERROR;
+ }
+ }
if ($pppsettings{'PROFILENAME'} eq '') {
$errormessage = $Lang::tr{'profile name not given'};
$pppsettings{'PROFILENAME'} = '';
goto ERROR; }
- if ($pppsettings{'TYPE'} =~ /^(modem|isdn)$/) {
+ if ($pppsettings{'TYPE'} =~ /^(modem)$/) {
if ($pppsettings{'TELEPHONE'} eq '') {
$errormessage = $Lang::tr{'telephone not set'};
goto ERROR; }
@@ -524,6 +533,7 @@ print <<END
<option value='pppoe' $selected{'TYPE'}{'pppoe'}>PPPoE</option>
<option value='pptp' $selected{'TYPE'}{'pptp'}>PPTP</option>
<option value='vdsl' $selected{'TYPE'}{'vdsl'}>VDSL</option>
+ <option value='qmi' $selected{'TYPE'}{'qmi'}>QMI</option>
END
;
@@ -720,7 +730,8 @@ END
;
}
-print <<END
+if ($pppsettings{'TYPE'} ne "qmi") {
+ print <<END
<tr>
<td colspan='3' width='75%'>$Lang::tr{'idle timeout'} <img src='/blob.gif' alt='*' /></td>
<td width='25%'><input type='text' name='TIMEOUT' value='$pppsettings{'TIMEOUT'}' /></td>
@@ -739,8 +750,7 @@ print <<END
</tr>
END
;
-if ($pppsettings{'TYPE'} ne 'isdn') {
-print <<END
+ print <<END
<tr>
<td colspan='4' width='100%'><input type='radio' name='RECONNECTION' value='persistent' $checked{'RECONNECTION'}{'persistent'}>$Lang::tr{'persistent'}</td>
</tr>
@@ -755,11 +765,7 @@ END
print <<END
</select></td>
</tr>
-END
-;
-}
-print <<END
- <tr>
+<tr>
<td colspan='3' width='75%'>$Lang::tr{'dod for dns'}</td>
<td width='25%'><input type='checkbox' name='DIALONDEMANDDNS' $checked{'DIALONDEMANDDNS'}{'on'} /></td>
</tr>
@@ -773,6 +779,7 @@ print <<END
</tr>
END
;
+}
if ($pppsettings{'TYPE'} eq 'pptp')
{
@@ -892,28 +899,30 @@ END
;
}
-print <<END
+print <<END;
<tr><td colspan='4' width='100%'><br></br></td></tr>
<tr>
- <td bgcolor='$color{'color20'}' colspan='4' width='100%'><b>MTU/MRU</b></td>
-</tr>
-<tr>
-<tr>
- <td width='25%'>MTU:</td>
- <td width='25%'><input type='text' name='MTU' value='$pppsettings{'MTU'}' /></td>
-</tr>
-<tr>
- <td width='25%'>MRU:</td>
- <td width='25%'><input type='text' name='MRU' value='$pppsettings{'MRU'}' /></td>
+ <td bgcolor='$color{'color20'}' colspan='4' width='100%'><b>$Lang::tr{'authentication'}</b></td>
</tr>
END
-;
+
+# Ask for the APN for QMI
+if ($pppsettings{'TYPE'} eq 'qmi') {
+ print <<END;
+ <tr>
+ <td width="25%">
+ $Lang::tr{'access point name'}
+
+ <img src='/blob.gif' alt='*'/>
+ </td>
+ <td colspan="3" width="75%">
+ <input type="text" name="APN" value="$pppsettings{'APN'}" />
+ </td>
+ </tr>
+END
+}
print <<END
-<tr><td colspan='4' width='100%'><br></br></td></tr>
-<tr>
- <td bgcolor='$color{'color20'}' colspan='4' width='100%'><b>$Lang::tr{'authentication'}</b></td>
-</tr>
<tr>
<td width='25%'>$Lang::tr{'username'} <img src='/blob.gif' alt='*' /></td>
<td width='25%'><input type='text' name='USERNAME' value='$pppsettings{'USERNAME'}' /></td>
@@ -941,6 +950,19 @@ print <<END
<td width='25%'>$Lang::tr{'script name'}</td>
<td width='25%'><input type='text' name='LOGINSCRIPT' value='$pppsettings{'LOGINSCRIPT'}' /></td>
</tr>
+<tr><td colspan='4' width='100%'><br></br></td></tr>
+<tr>
+ <td bgcolor='$color{'color20'}' colspan='4' width='100%'><b>MTU/MRU</b></td>
+</tr>
+<tr>
+<tr>
+ <td width='25%'>MTU:</td>
+ <td width='25%'><input type='text' name='MTU' value='$pppsettings{'MTU'}' /></td>
+</tr>
+<tr>
+ <td width='25%'>MRU:</td>
+ <td width='25%'><input type='text' name='MRU' value='$pppsettings{'MRU'}' /></td>
+</tr>
<tr><td colspan='4' width='100%'><br></br><hr></hr><br></br></td></tr>
<tr>
<td width='25%'>$Lang::tr{'profile name'} <img src='/blob.gif' alt='*' /></td>
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 457a7108c..5fbab2ff8 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1366,7 +1366,6 @@
'hour-graph' => 'Stunde',
'hours' => 'Stunden',
'hours2' => 'Stunden',
-'ibod for dual isdn only' => 'iBOD kann nur bei ISDN-Kanalbündelung genutzt werden.',
'icmp selected but no type' => 'ICMP wurde zwar als Protokoll gewählt, es wurde aber kein ICMP-Typ angegeben.',
'icmp type' => 'ICMP-Typ',
'id' => 'ID',
@@ -1579,10 +1578,6 @@
'iptmangles' => 'IPTable Mangles',
'iptnats' => 'IPTable Network Address Translation',
'ipts' => 'iptables',
-'isdn' => 'ISDN',
-'isdn settings' => 'Zusätzliche ISDN-Einstellungen:',
-'isdn1' => 'Einfaches ISDN',
-'isdn2' => 'ISDN-Kanalbündelung',
'itlb multihit' => 'iTLB MultiHit',
'january' => 'Januar',
'javascript menu error1' => 'Wenn die Drop-down-Menus nicht funktionieren, deaktivieren Sie Javascript auf der',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 72cef9a11..80753b841 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -129,6 +129,9 @@
'a connection with this name already exists' => 'A connection with this name already exists.',
'abort' => 'abort',
'access allowed' => 'Access allowed from:',
+'access point name' => 'Access Point Name',
+'access point name is invalid' => 'Access Point Name is invalid',
+'access point name is required' => 'Access Point Name is required',
'access refused with this oinkcode' => 'Access refused with this Oink Code',
'accounting' => 'Accounting',
'accounting user nonpdc' => 'Accounting - none PDC Mode',
@@ -1411,7 +1414,6 @@
'hour-graph' => 'Hour',
'hours' => 'Hours',
'hours2' => 'Hours',
-'ibod for dual isdn only' => 'iBOD can only be used with Dual ISDN.',
'icmp selected but no type' => 'ICMP selected for protocol, but no ICMP type specified.',
'icmp type' => 'ICMP Type',
'id' => 'ID',
@@ -1628,10 +1630,6 @@
'iptmangles' => 'IPTable Mangles',
'iptnats' => 'IPTable Network Address Translation',
'ipts' => 'iptables',
-'isdn' => 'ISDN',
-'isdn settings' => 'Additional ISDN settings:',
-'isdn1' => 'Single ISDN',
-'isdn2' => 'Dual ISDN',
'itlb multihit' => 'iTLB MultiHit',
'january' => 'January',
'javascript menu error1' => 'If the drop down menus aren\'t working, disable javascript on the',
diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl
index 022d390fa..3daca873c 100644
--- a/langs/es/cgi-bin/es.pl
+++ b/langs/es/cgi-bin/es.pl
@@ -1420,7 +1420,6 @@
'hour-graph' => 'Hora',
'hours' => 'horas',
'hours2' => 'Horas',
-'ibod for dual isdn only' => 'iBPD sólo puede usarse con ISDN dual',
'icmp selected but no type' => 'ICMP seleccionado como protocolo, pero no se ha seleccionado tipo de ICMP.',
'icmp type' => 'Tipo de ICMP',
'id' => 'ID',
diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl
index bfd3f9b5e..aa0697efc 100644
--- a/langs/fr/cgi-bin/fr.pl
+++ b/langs/fr/cgi-bin/fr.pl
@@ -1411,7 +1411,6 @@
'hour-graph' => 'Heure',
'hours' => 'heure(s)',
'hours2' => 'Heures',
-'ibod for dual isdn only' => 'iBOD peut seulement être utilisé avec un double ISDN.',
'icmp selected but no type' => 'ICMP est le protocole sélectionné, mais il n\'y a aucun type ICMP spécifié.',
'icmp type' => 'Type ICMP',
'id' => 'ID',
@@ -1631,10 +1630,6 @@
'iptmangles' => 'Table IP Mangle ',
'iptnats' => 'Traduction d\'adresses réseaux table IP ',
'ipts' => 'Tables IP ',
-'isdn' => 'RNIS',
-'isdn settings' => 'Réglages RNIS supplémentaires :',
-'isdn1' => 'RNIS unique',
-'isdn2' => 'RNIS double',
'itlb multihit' => 'ITLB - erreur vérification machine',
'january' => 'Janvier',
'javascript menu error1' => 'Si les menus déroulants ne fonctionnent pas, désactivez le Javascript sur la',
diff --git a/langs/it/cgi-bin/it.pl b/langs/it/cgi-bin/it.pl
index 40575b404..7526d67ad 100644
--- a/langs/it/cgi-bin/it.pl
+++ b/langs/it/cgi-bin/it.pl
@@ -1204,7 +1204,6 @@
'hour-graph' => 'Ora',
'hours' => 'Ore',
'hours2' => 'Ore',
-'ibod for dual isdn only' => 'iBOD can only be used with Dual ISDN.',
'icmp selected but no type' => 'ICMP selected for protocol, but no ICMP type specified.',
'icmp type' => 'ICMP Type',
'id' => 'ID',
@@ -1339,10 +1338,6 @@
'iptmangles' => 'IPTable Mangles',
'iptnats' => 'IPTable Network Address Translation',
'ipts' => 'iptables',
-'isdn' => 'ISDN',
-'isdn settings' => 'Additional ISDN settings:',
-'isdn1' => 'Single ISDN',
-'isdn2' => 'Dual ISDN',
'january' => 'Gennaio',
'javascript menu error1' => 'If the drop down menus aren\'t working, disable javascript on the',
'javascript menu error2' => 'page.',
diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl
index 865cfc5b3..4da924a74 100644
--- a/langs/nl/cgi-bin/nl.pl
+++ b/langs/nl/cgi-bin/nl.pl
@@ -1200,7 +1200,6 @@
'hour-graph' => 'Uur',
'hours' => 'uren',
'hours2' => 'Uren',
-'ibod for dual isdn only' => 'iBOD kan alleen gebruikt worden met Dual ISDN.',
'icmp selected but no type' => 'ICMP als protocol geselecteerd, maar er is geen ICMP type gespecificeerd.',
'icmp type' => 'ICMP Type',
'id' => 'ID',
@@ -1333,10 +1332,6 @@
'iptmangles' => 'IPTable Mangles',
'iptnats' => 'IPTable Network Adrestranslatie',
'ipts' => 'iptables',
-'isdn' => 'ISDN',
-'isdn settings' => 'Extra ISDN instellingen:',
-'isdn1' => 'Single ISDN',
-'isdn2' => 'Dual ISDN',
'january' => 'Januari',
'javascript menu error1' => 'Als de menu\'s niet werken, schakel dan javascript uit op de',
'javascript menu error2' => 'pagina.',
diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl
index eba6fd098..6ff2dab7b 100644
--- a/langs/pl/cgi-bin/pl.pl
+++ b/langs/pl/cgi-bin/pl.pl
@@ -912,7 +912,6 @@
'hour-graph' => 'Godzina',
'hours' => 'Godziny',
'hours2' => 'Godziny',
-'ibod for dual isdn only' => 'iBOD can only be used with Dual ISDN.',
'icmp selected but no type' => 'Wybrano protokół ICMP, ale nie określono typu ICMP.',
'icmp type' => 'Typ ICMP',
'id' => 'ID',
@@ -1038,10 +1037,6 @@
'iptmangles' => 'IPTable Mangles',
'iptnats' => 'IPTable Network Address Translation',
'ipts' => 'iptables',
-'isdn' => 'ISDN',
-'isdn settings' => 'Dodatkowe ustawienia ISDN:',
-'isdn1' => 'Pojedynczy ISDN',
-'isdn2' => 'Podwójny ISDN',
'january' => 'Styczeń',
'javascript menu error1' => 'Jeżeli rozwijane menu nie działają poprawnie wyłącz javascript na',
'javascript menu error2' => 'stronie.',
diff --git a/langs/ru/cgi-bin/ru.pl b/langs/ru/cgi-bin/ru.pl
index 9e2b02d71..78a43c7d6 100644
--- a/langs/ru/cgi-bin/ru.pl
+++ b/langs/ru/cgi-bin/ru.pl
@@ -906,7 +906,6 @@
'hour' => 'Час',
'hours' => 'Часы',
'hours2' => 'Часы',
-'ibod for dual isdn only' => 'iBOD can only be used with Dual ISDN.',
'icmp selected but no type' => 'ICMP selected for protocol, but no ICMP type specified.',
'icmp type' => 'ICMP Type',
'id' => 'ID',
@@ -1031,10 +1030,6 @@
'iptmangles' => 'IPTable Mangles',
'iptnats' => 'IPTable Network Address Translation',
'ipts' => 'iptables',
-'isdn' => 'ISDN',
-'isdn settings' => 'Additional ISDN settings:',
-'isdn1' => 'Single ISDN',
-'isdn2' => 'Dual ISDN',
'january' => 'Январь',
'javascript menu error1' => 'If the drop down menus aren\'t working, disable javascript on the',
'javascript menu error2' => 'page.',
diff --git a/langs/tr/cgi-bin/tr.pl b/langs/tr/cgi-bin/tr.pl
index ad5567ce1..45fc16144 100644
--- a/langs/tr/cgi-bin/tr.pl
+++ b/langs/tr/cgi-bin/tr.pl
@@ -1317,7 +1317,6 @@
'hour-graph' => 'saat',
'hours' => 'saat',
'hours2' => 'saat',
-'ibod for dual isdn only' => 'iBOD yalnızca çift ISDN ile kullanılabilir.',
'icmp selected but no type' => 'ICMP kuralı için seçildi ancak ICMP türü belirtildi.',
'icmp type' => 'ICMP Türü',
'id' => 'Kimlik Numarası (ID)',
@@ -1457,10 +1456,6 @@
'iptmangles' => 'IPTablo sıkıştırmaları',
'iptnats' => 'IPTablo ağ adres çevrimi',
'ipts' => 'IPTablolar',
-'isdn' => 'ISDN',
-'isdn settings' => 'Ek ISDN ayarları:',
-'isdn1' => 'Tek ISDN',
-'isdn2' => 'Çift ISDN',
'january' => 'Ocak',
'javascript menu error1' => 'Eğer aşağı açılır listeler çalışmıyorsa javascript seçeneğini devre dışı bırakın',
'javascript menu error2' => 'sayfa.',
diff --git a/lfs/avahi b/lfs/avahi
index 1628fe17b..17857bfe3 100644
--- a/lfs/avahi
+++ b/lfs/avahi
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 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 = avahi
-PAK_VER = 10
+PAK_VER = 11
DEPS = dbus libdaemon
diff --git a/lfs/configroot b/lfs/configroot
index ef92f5f08..2c09ae4a8 100644
--- a/lfs/configroot
+++ b/lfs/configroot
@@ -51,7 +51,7 @@ $(TARGET) :
# Create all directories
for i in addon-lang auth backup ca captive certs connscheduler crls ddns dhcp dhcpc dns dnsforward \
- ethernet extrahd/bin fwlogs fwhosts firewall ipblocklist isdn key langs logging mac main \
+ ethernet extrahd/bin fwlogs fwhosts firewall ipblocklist key langs logging mac main \
menu.d modem optionsfw \
ovpn patches pakfire portfw ppp private proxy/advanced/cre \
proxy/calamaris/bin qos/bin red remote sensors suricata time \
@@ -66,7 +66,7 @@ $(TARGET) :
dhcp/fixleases dhcp/advoptions dhcp/dhcpd.conf.local dns/settings dns/servers dnsforward/config ethernet/aliases ethernet/settings ethernet/known_nics ethernet/scanned_nics \
ethernet/wireless extrahd/scan extrahd/devices extrahd/partitions extrahd/settings firewall/settings firewall/config firewall/locationblock firewall/input firewall/outgoing \
fwhosts/customnetworks fwhosts/customhosts fwhosts/customgroups fwhosts/customservicegrp fwhosts/customlocationgrp fwlogs/ipsettings fwlogs/portsettings ipblocklist/modified \
- ipblocklist/settings isdn/settings mac/settings main/hosts main/routing main/security main/settings optionsfw/settings \
+ ipblocklist/settings mac/settings main/hosts main/routing main/security main/settings optionsfw/settings \
ovpn/ccd.conf ovpn/ccdroute ovpn/ccdroute2 pakfire/settings portfw/config ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \
ppp/settings-5 ppp/settings proxy/settings proxy/squid.conf proxy/advanced/settings proxy/advanced/cre/enable remote/settings qos/settings qos/classes qos/subclasses qos/level7config qos/portconfig \
qos/tosconfig suricata/settings vpn/config vpn/settings vpn/ipsec.conf \
diff --git a/lfs/dbus b/lfs/dbus
index 9e80718e4..9aceceb08 100644
--- a/lfs/dbus
+++ b/lfs/dbus
@@ -26,7 +26,7 @@ include Config
SUMMARY = D-Bus Message Bus System
-VER = 1.14.0
+VER = 1.14.4
THISAPP = dbus-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = dbus
-PAK_VER = 7
+PAK_VER = 8
DEPS =
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = ae0ebc2779e840e2d83f633029f81fba0e35969648dddce0280640dd9bee3f9508aa7fb6aef696d1c4c56d40f91b754941f847525afaee5cc3170ad23a7eddbf
+$(DL_FILE)_BLAKE2 = 7da5cd8f09eaef7a64f35f8ccbeb81c5687b3fad02d6ac05dd4c232e0f731dbcf4c76c36b615e6216815c8f8631bf9cb32543665440153a1199b1b35922cdda4
install : $(TARGET)
diff --git a/lfs/iproute2 b/lfs/iproute2
index 825b071c3..62d3483d9 100644
--- a/lfs/iproute2
+++ b/lfs/iproute2
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2020 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 #
@@ -24,7 +24,7 @@
include Config
-VER = 6.0.0
+VER = 6.1.0
THISAPP = iproute2-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 1cfb9b5a7892dec2b35e0eadbd957083e95fdc5077a1aa193329801ff25f9ed90a1fc4152756547be1fab8fe18d9a399001a4c3a61e951f64946156af6a90bae
+$(DL_FILE)_BLAKE2 = 38249703e0a9ba74405aebdb97560b286deefa959a9c3f0e0893962b6966f5da2da46199dda6a0f9584bb473f8ba529440643d97f66e9b7619df029e3091d163
install : $(TARGET)
diff --git a/lfs/krb5 b/lfs/krb5
index ce7d52d11..0b4dae8cc 100644
--- a/lfs/krb5
+++ b/lfs/krb5
@@ -26,7 +26,7 @@ include Config
SUMMARY = Kerberos
-VER = 1.20
+VER = 1.20.1
THISAPP = krb5-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = fdaaab6c16dbe073c4308f312e321536b582b75fad10e5450be66b6b828825c8c775e56f5287d4a7df819d20889e5c0d9cc1d179d861c9caba185332c0db7387
+$(DL_FILE)_BLAKE2 = ead16f8b1aec8bba3776628b74257c9aec891770c1fa6d5c5e66275db5f078ca59c9944cd2b017453b777ce080f8e5a322f735fab77691479cfad7b881b92830
install : $(TARGET)
diff --git a/lfs/libarchive b/lfs/libarchive
index c6531ce12..f88753017 100644
--- a/lfs/libarchive
+++ b/lfs/libarchive
@@ -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 #
@@ -24,7 +24,7 @@
include Config
-VER = 3.6.1
+VER = 3.6.2
THISAPP = libarchive-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -41,7 +41,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = e7b79e97545dabeac164069e87adbd2081d3bd75c22f80b3797c6e487a477b3f6347b6fc14c76668eb69f2f2e5dcdd5a33a694e0a292ce426b8d0d93435218cf
+$(DL_FILE)_BLAKE2 = 355b5d402e352dee802513485ce7e047af58d6de5b9bf6a49f3fd8d7b94117007598820ac979585c0da79747e8b63b70ab151131182368a11f97a047cf9029d4
install : $(TARGET)
@@ -74,7 +74,6 @@ $(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) && patch -Np1 < $(DIR_SRC)/src/patches/libarchive-3.6-fix-glibc-2.36-headers.patch
cd $(DIR_APP) && ./configure --prefix=/usr --disable-static
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
diff --git a/lfs/libconfig b/lfs/libconfig
index 58dbd8bff..4a34a878e 100644
--- a/lfs/libconfig
+++ b/lfs/libconfig
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 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 #
@@ -24,7 +24,7 @@
include Config
-VER = 1.7.2
+VER = 1.7.3
THISAPP = libconfig-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 1b8bc54857feff506d5cd62312a35f0f8a123380567881bdb8241f2232c5281399e4283687a3254b8f43a92b8f7d5ff3f72ec4fd875bf1b9d5d6c7703014cc3c
+$(DL_FILE)_BLAKE2 = 05d43022a937ed5ba35120170eca506051310cd7386b0a6a6c2f30186a079a02803c3d7ecb8dd49b50b5a706b282704605c250a306ada76b5241788eb1c575e6
install : $(TARGET)
diff --git a/lfs/libgudev b/lfs/libgudev
new file mode 100644
index 000000000..bf0fec9b8
--- /dev/null
+++ b/lfs/libgudev
@@ -0,0 +1,80 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2021 IPFire Team <info(a)ipfire.org> #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 237
+
+THISAPP = libgudev-$(VER)
+DL_FILE = $(THISAPP).tar.xz
+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 = 5d39d4d26d8c8b3fa877319c294036294dbda96b340d2d04d7a35449d91b58de876b96b5e3d9423cdf3e1d3e2a94f5a861b1ac1e74a610637e0fc66248c68309
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+b2 : $(subst %,%_BLAKE2,$(objects))
+
+###############################################################################
+# 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 axf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && meson --prefix=/usr \
+ --sysconfdir=/etc \
+ --buildtype=release \
+ builddir/
+ cd $(DIR_APP) && ninja -C builddir/ $(MAKETUNING)
+ cd $(DIR_APP) && ninja -C builddir/ install
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/libpciaccess b/lfs/libpciaccess
index 15b662c70..576c722f9 100644
--- a/lfs/libpciaccess
+++ b/lfs/libpciaccess
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 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,15 +26,15 @@ include Config
SUMMARY = Generic PCI access library
-VER = 0.16
+VER = 0.17
THISAPP = libpciaccess-$(VER)
-DL_FILE = $(THISAPP).tar.bz2
+DL_FILE = $(THISAPP).tar.xz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = libpciaccess
-PAK_VER = 2
+PAK_VER = 3
DEPS =
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = aab7d49887f7f21e0a6abf1e2aedc50159a47c7aef67eb8605a30e246463a14f9a9993db9cbd2705ef59c93d1ff41080668f8f3723557a927ab4d1edb5dfa4ad
+$(DL_FILE)_BLAKE2 = 41539b3d6385fe7c42b562c7602f87b07730bbbeea7d65d3cc8e5af974ed5f9985b0779d51891493dd241a36bb171a3744e3b1f3fd30bee8a19bb5bd785f4c5f
install : $(TARGET)
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
diff --git a/lfs/libqmi b/lfs/libqmi
new file mode 100644
index 000000000..146c497aa
--- /dev/null
+++ b/lfs/libqmi
@@ -0,0 +1,80 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2019 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.30.8
+
+THISAPP = libqmi-$(VER)
+DL_FILE = $(THISAPP).tar.xz
+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 = c8d98106783eb22571ee82c0012e1ce7ed79e94818350134b80853e16fa287c77bafb34d2913690ae593d02112dc5d2b0ff77606a24c4ce63733fd64245961a1
+
+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 axf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && ./configure --prefix=/usr --disable-static
+ cd $(DIR_APP) && make $(MAKETUNING)
+ cd $(DIR_APP) && make install
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/libshout b/lfs/libshout
index d48918e04..3058a9af5 100644
--- a/lfs/libshout
+++ b/lfs/libshout
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2020 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 = Library for communcating with Icecast servers
-VER = 2.4.3
+VER = 2.4.6
THISAPP = libshout-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = libshout
-PAK_VER = 2
+PAK_VER = 3
DEPS =
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 30d982fcf52507e07af23113560cfc9e43ca4ce37c286854326ea09215dc30c3c0d57320dce46dd4faec43b3d473df2f7882ad759479fb023166cec3f24327c5
+$(DL_FILE)_BLAKE2 = 68a24ecd3fa8c1057883d2d9013b18b9b7507d0ee79876efe79c8ad1ae32c408421879340968b77c3d6bf6e8eb3c3c87a8ee5447f351fd871f13683fcbb5ab52
install : $(TARGET)
diff --git a/lfs/libssh b/lfs/libssh
index e172f6230..36ff9f176 100644
--- a/lfs/libssh
+++ b/lfs/libssh
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2020 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 #
@@ -24,7 +24,7 @@
include Config
-VER = 0.9.6
+VER = 0.10.4
THISAPP = libssh-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = e8565279a430786b8877386a26700a39386e908546a209815b135a2bf4ef42c37b9890dc29cda9ce6c8bfe3f3bae4942097dc794302aec767d106a45c44b811d
+$(DL_FILE)_BLAKE2 = 9349a688bdbd7c0d3bc93d6d0d6d55122ae9f918b922baeae8a7c6d4ae3ec340e6607afdd8a47055176f31531aefa94b6cc2bda25d59625fe1a7f83823dd75f9
install : $(TARGET)
diff --git a/lfs/libstatgrab b/lfs/libstatgrab
index 997880efc..50de9b490 100644
--- a/lfs/libstatgrab
+++ b/lfs/libstatgrab
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 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 #
@@ -24,7 +24,7 @@
include Config
-VER = 0.92
+VER = 0.92.1
THISAPP = libstatgrab-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = d8ca538f01d9e0b1d5c459c9c0da6df5b6806e02649d726c3ee8a2f69233a7183df6dda95980a8e6f8b438478ec28f4baa9d623d5372e5e3e28ea4909e905872
+$(DL_FILE)_BLAKE2 = 5315772da07a9229f7f5d85dc7563333892e2a7293d7b331bd65edbebc08841103e6cf695d8faf25b83135545dda767bfc358517afa866981657dc8205d319be
install : $(TARGET)
diff --git a/lfs/libusb b/lfs/libusb
index 82bc3169e..89b8a51fe 100644
--- a/lfs/libusb
+++ b/lfs/libusb
@@ -24,7 +24,7 @@
include Config
-VER = 1.0.25
+VER = 1.0.26
THISAPP = libusb-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 3aecfbf9fc068fdfb8e612918bb895988f8400dc2c3ffd96a81792ab844d632f0c098947200512ddc37cfa9003956f8454c1d0362973a5d646a225f81cc2923b
+$(DL_FILE)_BLAKE2 = 0cc397ecf4de0066abbff9b286a9e4fcd48658698d5e0d6b736abf56b48c1b55a05f15fff7be53fd33f767621e0c25d87275a47e05a4bcb44c4b8ac9221cd081
install : $(TARGET)
diff --git a/lfs/libusbredir b/lfs/libusbredir
index e1df9c4a8..531420ea4 100644
--- a/lfs/libusbredir
+++ b/lfs/libusbredir
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2020 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,15 +26,15 @@ include Config
SUMMARY = USB Network Redirection protocol
-VER = 0.8.0
+VER = 0.13.0
THISAPP = usbredir-$(VER)
-DL_FILE = $(THISAPP).tar.bz2
+DL_FILE = $(THISAPP).tar.xz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = libusbredir
-PAK_VER = 2
+PAK_VER = 3
DEPS =
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 0190b4ab35cd554c13b65d30756b7b018e7ce82c72e7dddbaf05b8a704bd8a25724c4ac4759e1b86dfadb64ad7ade75c05365ab9ae3152f8fa60e909bc5e183b
+$(DL_FILE)_BLAKE2 = 20a1e28be290d59d3ef25f432d6bbd4b50b40f5df434efb9013a39df77ce1aa563e7dec1cdf6abbfa703bb9c4b32dd05258011b5ce8e79812e89203f51f41f8f
install : $(TARGET)
@@ -80,9 +80,9 @@ $(subst %,%_BLAKE2,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && ./configure --prefix=/usr
- cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
- cd $(DIR_APP) && make install
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && meson --prefix=/usr builddir/
+ cd $(DIR_APP) && ninja -C builddir/ $(MAKETUNING)
+ cd $(DIR_APP) && ninja -C builddir/ install
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/libvirt b/lfs/libvirt
index aa28ef2dc..bb7abbb28 100644
--- a/lfs/libvirt
+++ b/lfs/libvirt
@@ -26,7 +26,7 @@ include Config
SUMMARY = Server side daemon and supporting files for libvirt
-VER = 8.9.0
+VER = 8.10.0
THISAPP = libvirt-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -35,7 +35,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
SUP_ARCH = x86_64 aarch64
PROG = libvirt
-PAK_VER = 30
+PAK_VER = 31
DEPS = ebtables libpciaccess libtirpc libyajl ncat qemu
@@ -49,7 +49,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 537b6badb6171110e99561613fb1318144991107139401296248afb747ae6f9cfafcd17b2292b8d8dcc9188ff4206035ea814efa6c129bae50c0518f61be9b81
+$(DL_FILE)_BLAKE2 = 6c99428dd74ae1e535d0918bb48da0a851b03e9dfc38f96fca060a33b6be6c23c8b4a789695e8cf930536c156c8a893e18753a58c8a827f464b83a61b47c4846
install : $(TARGET)
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
diff --git a/lfs/libxslt b/lfs/libxslt
index 21767b2e3..710088418 100644
--- a/lfs/libxslt
+++ b/lfs/libxslt
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 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 #
@@ -24,7 +24,7 @@
include Config
-VER = 1.1.35
+VER = 1.1.37
THISAPP = libxslt-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 9667a93e61f50098a512c1351bce2ee937fc5d29488d010b525122d28ffedc73e0930402f3df2d378161a031dc016a15f0f03bdc343f0c4aa5d0b5c454f8002d
+$(DL_FILE)_BLAKE2 = 096d93dd7178bf4483207514b1435f5bf426eea4952ffab7cc00c3e85aa736534c4acb5377af9647aa77a0cd793205194509d997a7bb5cae692f65e326566cd8
install : $(TARGET)
diff --git a/lfs/libyang b/lfs/libyang
index f97cd0742..ae807fa8a 100644
--- a/lfs/libyang
+++ b/lfs/libyang
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 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 #
@@ -24,7 +24,7 @@
include Config
-VER = 2.0.194
+VER = 2.1.4
THISAPP = libyang-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = aa323b39752ac426f35e1ef17ca4a61d726c48916b740511ed03b06b8132747207dd4620842f9730ff1d05f216086310bc1634f393163067c119f5eec0aa91b1
+$(DL_FILE)_BLAKE2 = 0322d5c9003b4ae49a91da981c3c7063ebc783c1ddc964b9ec89a1f75f512fadda1664a8e2add63a81ed694bd10dda1fcdc70f7a31cc947b2835d210e8e454f5
install : $(TARGET)
diff --git a/lfs/mpfr b/lfs/mpfr
index 221c9c527..f0c0109b2 100644
--- a/lfs/mpfr
+++ b/lfs/mpfr
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 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 #
@@ -24,7 +24,7 @@
include Config
-VER = 4.1.0
+VER = 4.1.1
THISAPP = mpfr-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 41d1be0c4b557760f12a4525ad3a84b6e2cd6f0927c935fcfba577ac0490e582d1ae4b581dce58e21e705cf9d7c88373054d7fb7a94bb32c69b339f99a25dc68
+$(DL_FILE)_BLAKE2 = ce20baee2f060acb28b877ffe6fc40c5619cf6af231bd54ca6cfb3e42ef2d74a4ffbab96cf0b5dd6a162e558099a54701d42f34f5bf2256f256fe6f5ae2505d0
install : $(TARGET)
@@ -70,7 +70,7 @@ $(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) && patch -Np1 < $(DIR_SRC)/src/patches/mpfr-4.1.0-cumulative-patches-1-to-13.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/mpfr-4.1.1-cumulative-patches-1-to-1.patch
cd $(DIR_APP) && $(CONFIGURE_ARGS) ./configure --prefix=/usr \
--enable-thread-safe
cd $(DIR_APP) && make $(MAKETUNING)
diff --git a/lfs/psmisc b/lfs/psmisc
index 4ca6b6810..3340879c3 100644
--- a/lfs/psmisc
+++ b/lfs/psmisc
@@ -24,7 +24,7 @@
include Config
-VER = 23.4
+VER = 23.6
THISAPP = psmisc-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = e762171c4d3252421a49b352fadb3e892f66862f003a313a0cc692f973364b06d2652a51d331314462784d94ad55189e74c4d7a023d5d7c917c5e5c05009f46b
+$(DL_FILE)_BLAKE2 = 468bf4e84695efcedb832f890b6201b7bc4aca7c5aabaf30e67f4471671421897ee7cd67f01d4b3d60c3e1c63752eb7384e627e75fa7db290cd749da08e2f788
install : $(TARGET)
diff --git a/make.sh b/make.sh
index 7d9a278b5..ae1ebb5af 100755
--- a/make.sh
+++ b/make.sh
@@ -23,7 +23,7 @@ NAME="IPFire" # Software name
SNAME="ipfire" # Short name
# If you update the version don't forget to update backupiso and add it to core update
VERSION="2.27" # Version number
-CORE="172" # Core Level (Filename)
+CORE="173" # Core Level (Filename)
SLOGAN="www.ipfire.org" # Software slogan
CONFIG_ROOT=/var/ipfire # Configuration rootdir
MAX_RETRIES=1 # prefetch/check loop
@@ -1176,15 +1176,25 @@ buildipfire() {
lfsmake2 xradio KCFG=""
lfsmake2 linux-initrd KCFG=""
+ lfsmake2 expat
+ lfsmake2 libconfig
+ lfsmake2 json-c
+ lfsmake2 tcl
+ lfsmake2 libffi
+ lfsmake2 gdbm
+ lfsmake2 sqlite
+ lfsmake2 python3
+ lfsmake2 python3-setuptools
+ lfsmake2 ninja
+ lfsmake2 meson
+ lfsmake2 glib
+ lfsmake2 libgudev
lfsmake2 libgpg-error
lfsmake2 libgcrypt
lfsmake2 libassuan
lfsmake2 nettle
lfsmake2 libsodium
- lfsmake2 json-c
- lfsmake2 libconfig
lfsmake2 libevent2
- lfsmake2 expat
lfsmake2 apr
lfsmake2 aprutil
lfsmake2 unbound
@@ -1195,14 +1205,10 @@ buildipfire() {
lfsmake2 dhcpcd
lfsmake2 boost
lfsmake2 linux-atm
- lfsmake2 gdbm
+ lfsmake2 libqmi
lfsmake2 pam
lfsmake2 c-ares
lfsmake2 curl
- lfsmake2 tcl
- lfsmake2 sqlite
- lfsmake2 libffi
- lfsmake2 python3
lfsmake2 rust
lfsmake2 rust-dissimilar
lfsmake2 rust-cfg-if
@@ -1321,8 +1327,6 @@ buildipfire() {
lfsmake2 nasm
lfsmake2 libarchive
lfsmake2 cmake
- lfsmake2 ninja
- lfsmake2 meson
lfsmake2 libjpeg
lfsmake2 openjpeg
lfsmake2 libexif
@@ -1417,11 +1421,9 @@ buildipfire() {
lfsmake2 perl-Crypt-PasswdMD5
lfsmake2 perl-Net-Telnet
lfsmake2 perl-JSON
- lfsmake2 python3-setuptools
lfsmake2 python3-inotify
lfsmake2 python3-docutils
lfsmake2 python3-daemon
- lfsmake2 glib
lfsmake2 ntp
lfsmake2 openssh
lfsmake2 fontconfig
diff --git a/src/hwdata/pci.ids b/src/hwdata/pci.ids
index 19832a58b..97220fd5c 100644
--- a/src/hwdata/pci.ids
+++ b/src/hwdata/pci.ids
@@ -1,8 +1,8 @@
#
# List of PCI ID's
#
-# Version: 2022.03.22
-# Date: 2022-03-22 03:15:02
+# Version: 2022.12.04
+# Date: 2022-12-04 03:15:02
#
# Maintained by Albert Pool, Martin Mares, and other volunteers from
# the PCI ID Project at https://pci-ids.ucw.cz/.
@@ -70,11 +70,15 @@
018a LevelOne
0106 FPC-0106TX misprogrammed [RTL81xx]
01de Oxide Computer Company
+ 0000 Propolis NVMe Controller
+ 0001 Propolis xHCI Controller
+ 0002 Propolis PCI-PCI Bridge
# probably misprogrammed Intel Atom C2338 on Dell 0K8Y0N board
0200 Dell (wrong ID)
# 021b is not Compaq but there is a board misprogrammed
021b Compaq Computer Corporation
8139 HNE-300 (RealTek RTL8139c) [iPaq Networking]
+025e Solidigm
0270 Hauppauge computer works Inc. (Wrong ID)
0291 Davicom Semiconductor, Inc. (Wrong ID)
# SpeedStream is Efficient Networks, Inc, a Siemens Company
@@ -103,6 +107,14 @@
0731 7212 JM7200
0731 7214 JM7500
0731 7215 JM7200
+ 9100 JM9100
+ 0731 9101 JM9100
+ 0731 9102 JM9100-I
+ 0731 9103 JM9100M
+ 910a JH910
+ 0731 910a JH910
+ 0731 910b JH910-I
+ 0731 910c JH910-M
9200 JM9200
920a JH920
0731 920a JH920
@@ -123,6 +135,7 @@
930a JH930-I
0731 930a JH930-I
0731 930b JH930-M
+ 0731 930c JH930
930b JH930-M
0777 Ubiquiti Networks, Inc.
0795 Wired Inc.
@@ -147,6 +160,7 @@
0905 R1T3 Single T3 Digital Telephony Card
0906 RCB24FXX 24-channel modular analog telephony card
0a06 RCB672FXX 672-channel modular analog telephony card
+0bae Bachmann electronic GmbH
0ccd Preferred Networks, Inc.
0e11 Compaq Computer Corporation
0001 PCI to EISA Bridge
@@ -251,7 +265,9 @@
b1a4 NC7131 Gigabit Server Adapter
b200 Memory Hot-Plug Controller
b203 Integrated Lights Out Controller
+ 103c 3305 iLO2
b204 Integrated Lights Out Processor
+ 103c 3305 iLO2
c000 Remote Insight Lights-Out Edition
f130 NetFlex-3/P ThunderLAN 1.0
f150 NetFlex-3/P ThunderLAN 2.3
@@ -480,6 +496,7 @@
1028 1f4f PERC H730P Slim
1028 1f54 PERC FD33xD
1028 1fd1 PERC H730P MX
+ 1734 11f6 PRAID EP400i
17aa 1052 ThinkServer RAID 720i
17aa 1053 ThinkServer RAID 720ix
1bd4 0014 12G SAS3108 2G
@@ -547,6 +564,7 @@
1014 040e ServeRAID H1110
0071 MR SAS HBA 2004
0072 SAS2008 PCI-Express Fusion-MPT SAS-2 [Falcon]
+ 1000 3020 9211-8i
1000 3040 9210-8i
1000 3080 9200-8e [LSI SAS 6Gb/s SAS/SATA PCIe x8 External HBA]
1000 30b0 9200-8e [LSI SAS 6Gb/s SAS/SATA PCIe x8 External HBA]
@@ -668,6 +686,7 @@
1000 3050 SAS9217-8i
1000 3060 SAS9217-4i4e
1014 0472 N2125 External Host Bus Adapter
+ 1014 047a N2115 Internal Host Bus Adapter
1590 0041 H220i
1590 0042 H221 / 9207-8e
1590 0044 H220i
@@ -725,18 +744,23 @@
1000 46a0 MegaRAID 9660-24i Tri-Mode Storage Adapter
1000 46c0 eHBA 9680W-16e Tri-Mode Storage Adapter
1000 46d0 eHBA 9600-8i8e Tri-Mode Storage Adapter
- 1028 2114 PERC H965 Adapter
- 1028 2115 PERC H965 Front
- 1028 2117 PERC H965 MX
+# eHBA 9602W-16e Tri-Mode Storage Adapter
+ 1000 46e0 eHBA 9602W-16e Tri-Mode Storage Adapter
+ 1028 2114 PERC H965i Adapter
+ 1028 2115 PERC H965i Front
+ 1028 2117 PERC H965i MX
1028 213a PERC H965e Adapter
- 1028 213b PERC H765 Adapter
- 1028 213c PERC H765 Front
+ 1028 213b PERC H765i Adapter
+ 1028 213c PERC H765i Front
1028 213d PERC H765N Front
- 1028 213e PERC H765 MX
- 1028 213f PERC H365 Adapter
- 1028 2140 PERC H365 Front
- 1028 2141 PERC H360 MX
- 1028 2142 HBA 465e Adapter
+ 1028 213e PERC H765i MX
+ 1028 213f PERC H365i Adapter
+ 1028 2140 PERC H365i Front
+ 1028 2141 PERC H365i MX
+ 1028 2142 HBA465e Adapter
+ 1028 2209 HBA465i Adapter
+ 1028 220a HBA465i Front
+ 1d49 020a ThinkSystem 450W-16e SAS/SATA PCIe Gen4 24Gb HBA
00ab SAS3516 Fusion-MPT Tri-Mode RAID On Chip (ROC)
# 8 Internal and 8 External port channel 9400 HBA
1000 3040 HBA 9400-8i8e
@@ -834,6 +858,7 @@
1028 2170 HBA350i MM
1028 2175 HBA350i Adapter
1028 2197 HBA350i MM LP
+ 1028 2212 HBA355e-s Adapter
1d49 0205 ThinkSystem 440-16i SAS/SATA PCIe Gen4 12Gb Internal HBA
1d49 0206 ThinkSystem 440-16e SAS/SATA PCIe Gen4 12Gb HBA
1d49 0207 ThinkSystem 440-8i SAS/SATA PCIe Gen4 12Gb HBA
@@ -855,6 +880,8 @@
1d49 0002 ThinkSystem 810-4P NVMe Switch Adapter
02b1 Virtual Endpoint on PCIe Switch (9749)
1d49 0004 ThinkSystem 1610-8P NVMe Switch Adapter
+# Virtual endpoint used in Broadcom synthetic PCIe switches for resource reservation
+ 02b2 Virtual PCIe Placeholder Endpoint
0407 MegaRAID
1000 0530 MegaRAID 530 SCSI 320-0X RAID Controller
1000 0531 MegaRAID 531 SCSI 320-4X RAID Controller
@@ -975,6 +1002,7 @@
10e4 MegaRAID 12GSAS/PCIe Unsupported SAS38xx
10e5 MegaRAID 12GSAS/PCIe SAS38xx
10e6 MegaRAID 12GSAS/PCIe Secure SAS38xx
+ 1000 40e0 MegaRAID 9540-2M2
1028 2172 PERC H355 Adapter
1028 2173 PERC H355 Front
1028 2174 PERC H350 Mini
@@ -998,10 +1026,29 @@
8086 0523 MegaRAID RAID Controller SRCS16
3050 SAS2008 PCI-Express Fusion-MPT SAS-2
6001 DX1 Multiformat Broadcast HD/SD Encoder/Decoder
- c010 PEX88048 50 lane, 50 port, PCI Express Gen 4.0 ExpressFabric Platform
+ c010 PEX880xx PCIe Gen 4 Switch
+ 1000 100b PEX88000 PCIe Gen 4 Virtual Upstream/Downstream Port
+ 1000 2004 PEX88000 Virtual PCIe TWC/NT2 Endpoint
+ 1000 2005 PEX88000 Virtual PCIe gDMA Endpoint
+ 1000 a024 PEX88024 24 lane/port PCIe Gen 4.0 Switch
+ 1000 a032 PEX88032 32 lane/port PCIe Gen 4 Switch
+ 1000 a048 PEX88048 50 lane/port PCIe Gen 4.0 Switch
+ 1000 a064 PEX88064 64 lane/port PCIe Gen 4 Switch
+ 1000 a080 PEX88080 80 lane/port PCIe Gen 4 Switch
+ 1000 a096 PEX88096 98 lane/port PCIe Gen 4.0 Switch
c012 PEX880xx PCIe Gen 4 Switch
1d49 0003 ThinkSystem 1611-8P PCIe Gen4 NVMe Switch Adapter
c030 PEX890xx PCIe Gen 5 Switch
+ 1000 0024 PEX89024 PCIe Gen 5 24 port/lane Switch Upstream/Downstream Port
+ 1000 0032 PEX89032 PCIe Gen 5 32 port/lane Switch Upstream/Downstream Port
+ 1000 0048 PEX89048 PCIe Gen 5 48 port/lane Switch Upstream/Downstream Port
+ 1000 0072 PEX89072 PCIe Gen 5 36 port/72 lane Switch Upstream/Downstream Port
+ 1000 0088 PEX89088 PCIe Gen 5 44 port/88 lane Switch Upstream/Downstream Port
+ 1000 0104 PEX89104 PCIe Gen 5 52 port/104 lane Switch Upstream/Downstream Port
+ 1000 0144 PEX89144 PCIe Gen 5 72 port/144 lane Switch Upstream/Downstream Port
+ 1000 100b PEX89000 PCIe Gen 5 Virtual Upstream/Downstream Port
+ 1000 2004 PEX89000 Virtual PCIe TWC/NT 2.0 Endpoint
+ 1000 2005 PEX89000 Virtual PCIe gDMA Endpoint
1001 Kolter Electronic
0010 PCI 1616 Measurement card with 32 digital I/O lines
0011 OPTO-PCI Opto-Isolated digital I/O board
@@ -1041,16 +1088,19 @@
131b Kaveri [Radeon R4 Graphics]
131c Kaveri [Radeon R7 Graphics]
131d Kaveri [Radeon R6 Graphics]
- 13e9 Ariel
- 13fe Cyan Skillfish
+ 13e9 Ariel/Navi10Lite
+ 13f9 Oberon/Navi12Lite
+ 13fe Cyan Skillfish [BC-250]
1478 Navi 10 XL Upstream Port of PCI Express Switch
1479 Navi 10 XL Downstream Port of PCI Express Switch
+ 1506 Mendocino
154c Kryptos [Radeon RX 350]
1462 7c28 MS-7C28 Motherboard
154e Garfield
1551 Arlene
1552 Pooky
1561 Anubis
+ 15bf Phoenix
15d8 Picasso/Raven 2 [Radeon Vega Series / Radeon Vega Mobile Series]
103c 8615 Pavilion Laptop 15-cw1xxx
17aa 3181 ThinkCentre M75n IoT
@@ -1074,10 +1124,15 @@
1607 Arden
1636 Renoir
1637 Renoir Radeon High Definition Audio Controller
- 1638 Cezanne
- 163f VanGogh
+ 1638 Cezanne [Radeon Vega Series / Radeon Vega Mobile Series]
+ 1043 16c2 Radeon Vega 8
+# Used in the Steam Deck
+ 163f VanGogh [AMD Custom GPU 0405]
+ 1640 Rembrandt Radeon High Definition Audio Controller
164c Lucienne
164d Rembrandt
+ 164e Raphael
+ 164f Phoenix
1681 Rembrandt [Radeon 680M]
1714 BeaverCreek HDMI Audio [Radeon HD 6500D and 6400G-6600G series]
103c 168b ProBook 4535s
@@ -1594,6 +1649,7 @@
1028 00bb Latitude CPx
1179 ff00 Satellite 1715XCDS laptop
13bd 1019 PC-AR10
+ 4c4e Rage Mobility L AGP 2x
4c50 Rage 3 LT [3D Rage LT PRO PCI]
1002 4c50 Rage LT Pro
4c52 M1 [Rage Mobility-M1 PCI]
@@ -1756,6 +1812,7 @@
1028 0225 PowerEdge T105 Embedded ATI ES1000
1028 023c PowerEdge R200 Embedded ATI ES1000
103c 1304 Integrity iLO2 Advanced KVM VGA [AD307A]
+ 103c 31fb ProLiant DL360 G5
15d9 8680 X7DVL-E-O motherboard
15d9 9680 X7DBN Motherboard
8086 3476 S5000PSLSATA Server Board
@@ -1877,7 +1934,7 @@
5964 RV280 [Radeon 9200 SE]
1002 5964 Radeon 9200 SE, 64-bit 128MB DDR, 200/166MHz
1043 c006 Radeon 9200 SE / TD / 128M
- 1458 4018 R92S128T (Radeon 9200 SE 128MB)
+ 1458 4018 R92S128T [Radeon 9200 SE 128MB]
1458 4032 Radeon 9200 SE 128MB
147b 6191 R9200SE-DT
148c 2073 CN-AG92E
@@ -2052,6 +2109,7 @@
148c 7340 Radeon R7 340
1682 7240 R7 240 2048 MB
1dcf 3000 Oland PRO [Radeon R7 240/340 / Radeon 520]
+ 6617 Oland LE [Radeon R7 240]
6631 Oland
6640 Saturn XT [FirePro M6100]
106b 014b Tropo XT [Radeon R9 M380 Mac Edition]
@@ -2651,7 +2709,7 @@
# FX-797A-TNBC
1682 3213 HD 7970 Black Edition
1682 3214 Double D HD 7970
- 1787 201c HD 7970 IceQ X²
+ 1787 201c HD 7970 IceQ X²
# Radeon HD 7970 X2
1787 2317 Radeon HD 7990
1787 3000 Tahiti XT2 [Radeon HD 7970 GHz Edition]
@@ -2714,7 +2772,7 @@
174b e282 Vapor-X R9 290X Tri-X OC
174b e285 R9 290X Tri-X OC
174b e324 Grenada XT2 [Radeon R9 390X]
- 1787 2020 R9 290X IceQ X² Turbo
+ 1787 2020 R9 290X IceQ X² Turbo
1787 2357 Grenada XT [Radeon R9 390X]
67b1 Hawaii PRO [Radeon R9 290/390]
1043 04dd STRIX R9 390
@@ -3030,20 +3088,20 @@
144d c0c7 Radeon HD 7550M
6842 Thames LE [Radeon HD 7000M Series]
6843 Thames [Radeon HD 7670M]
- 6860 Vega 10 [Radeon Instinct MI25]
+ 6860 Vega 10 [Instinct MI25/MI25x2/V340/V320]
1002 0c35 Radeon PRO V320
1002 6c75 Radeon PRO V320
106b 017c Radeon Pro Vega 64
6861 Vega 10 XT [Radeon PRO WX 9100]
6862 Vega 10 XT [Radeon PRO SSG]
6863 Vega 10 XTX [Radeon Vega Frontier Edition]
- 6864 Vega 10 [Radeon Pro V340]
+ 6864 Vega 10 [Radeon Pro V340/Instinct MI25x2]
6867 Vega 10 XL [Radeon Pro Vega 56]
6868 Vega 10 [Radeon PRO WX 8100/8200]
6869 Vega 10 XGA [Radeon Pro Vega 48]
686a Vega 10 LEA
686b Vega 10 XTXA [Radeon Pro Vega 64X]
- 686c Vega 10 [Radeon Instinct MI25 MxGPU]
+ 686c Vega 10 [Instinct MI25 MxGPU/MI25x2 MxGPU/V340 MxGPU/V340L MxGPU]
686d Vega 10 GLXTA
686e Vega 10 GLXLA
687f Vega 10 XL/XT [Radeon RX Vega 56/64]
@@ -3064,7 +3122,7 @@
688c Cypress XT GL [FireStream 9370]
688d Cypress PRO GL [FireStream 9350]
6898 Cypress XT [Radeon HD 5870]
- 1002 0b00 Radeon HD 5870 Eyefinity⁶ Edition
+ 1002 0b00 Radeon HD 5870 Eyefinity Edition
106b 00d0 Radeon HD 5870 Mac Edition
# R5870-PM2D1G
1462 8032 Radeon HD 5870 1 GB GDDR5
@@ -3605,7 +3663,7 @@
1002 0322 All-in-Wonder X1800XL
1002 0d02 Radeon X1800 CrossFire Edition
710a R520 [Radeon X1800 GTO]
- 1002 0b12 Radeon X1800 GTO²
+ 1002 0b12 Radeon X1800 GTO²
710b R520 [Radeon X1800 GTO]
710e R520 GL [FireGL V7300]
13cc 3d0c MXRT-5150
@@ -3740,48 +3798,72 @@
7310 Navi 10 [Radeon Pro W5700X]
7312 Navi 10 [Radeon Pro W5700]
7314 Navi 10 USB
+ 731e TDC-150
731f Navi 10 [Radeon RX 5600 OEM/5600 XT / 5700/5700 XT]
1002 0b36 Reference RX 5700 XT
1458 2313 Radeon RX 5700 XT Gaming OC
+ 148c 2398 AXRX 5700 XT 8GBD6-3DHE/OC [PowerColor Red Devil Radeon RX 5700 XT]
1682 5701 RX 5700 XT RAW II
1849 5120 Radeon RX 5600 XT
1da2 e409 Sapphire Technology Limited Navi 10 [Radeon RX 5600 OEM/5600 XT / 5700/5700 XT]
+ 1da2 e410 Sapphire NITRO+ RX 5700 XT
1da2 e411 Radeon RX 5600 XT
7340 Navi 14 [Radeon RX 5500/5500M / Pro 5500M]
7341 Navi 14 [Radeon Pro W5500]
7347 Navi 14 [Radeon Pro W5500M]
734f Navi 14 [Radeon Pro W5300M]
- 7360 Navi 12 [Radeon Pro 5600M / V520]
- 7362 Navi 12 [Radeon Pro V520]
+ 7360 Navi 12 [Radeon Pro 5600M/V520/BC-160]
+ 7362 Navi 12 [Radeon Pro V520/V540]
7388 Arcturus GL-XL
738c Arcturus GL-XL [Instinct MI100]
738e Arcturus GL-XL [Instinct MI100]
+ 73a1 Navi 21 [Radeon Pro V620]
73a2 Navi 21 Pro-XTA [Radeon Pro W6900X]
73a3 Navi 21 GL-XL [Radeon PRO W6800]
73a4 Navi 21 USB
73a5 Navi 21 [Radeon RX 6950 XT]
+ 1da2 441d Navi 21 [Sapphire Nitro+ Radeon RX 6950 XT]
73ab Navi 21 Pro-XLA [Radeon Pro W6800X/Radeon Pro W6800X Duo]
+ 73ae Navi 21 [Radeon Pro V620 MxGPU]
73af Navi 21 [Radeon RX 6900 XT]
148c 2414 Navi 21 XTXH [PowerColor Red Devil RX 6900 XT Ultimate]
73bf Navi 21 [Radeon RX 6800/6800 XT / 6900 XT]
1002 0e3a Radeon RX 6900 XT
148c 2408 Red Devil AMD Radeon RX 6900 XT
- 1eae 6701 XFX Speedster MERC 319 AMD Radeon RX 6800 XT Black
+ 1da2 440f TOXIC RX 6900 XT
+ 1eae 6701 Speedster MERC 319 AMD Radeon RX 6800 XT Black
+ 1eae 6901 Speedster MERC 319 AMD Radeon RX 6900 XT Black
73c3 Navi 22
73c4 Navi 22 USB
+ 73ce Navi22-XL SRIOV MxGPU
73df Navi 22 [Radeon RX 6700/6700 XT/6750 XT / 6800M]
+ 1043 16c2 Radeon RX 6800M
+ 1458 2408 Radeon RX 6750 XT GAMING OC 12G
+ 1849 5219 Radeon RX 6700 XT Challenger D
+ 1da2 e445 Sapphire Radeon RX 6700
+ 1eae 6601 Speedster QICK 319 RX 6700 XT
73e0 Navi 23
73e1 Navi 23 WKS-XM [Radeon PRO W6600M]
73e3 Navi 23 WKS-XL [Radeon PRO W6600]
73e4 Navi 23 USB
73ef Navi 23 [Radeon RX 6650 XT]
+ 1002 73ef Navi 23 [Radeon RX 6700S / 6800S / 6650 XT]
+ 1458 2405 Navi 23 [Radeon RX 6650 XT]
73ff Navi 23 [Radeon RX 6600/6600 XT/6600M]
+ 1462 5022 RX 6600 MECH 2X
148c 2412 PowerColor Red Devil RX 6600 XT
- 7408 Aldebaran
- 740c Aldebaran
- 740f Aldebaran
- 743f Navi 24 [Radeon RX 6400 / 6500 XT]
+# This is the non-XT version
+ 1849 5218 Radeon RX 6600 Challenger ITX 8GB
+ 7408 Aldebaran/MI200 [Instinct MI250X]
+ 740c Aldebaran/MI200 [Instinct MI250X/MI250]
+ 740f Aldebaran/MI200 [Instinct MI210]
+ 7421 Navi 24 [Radeon PRO W6500M]
+ 7422 Navi 24 [Radeon PRO W6400]
+ 7423 Navi 24 [Radeon PRO W6300/W6300M]
+ 7424 Navi 24 [Radeon RX 6300]
+ 743f Navi 24 [Radeon RX 6400/6500 XT/6500M]
1da2 e457 PULSE AMD Radeon RX 6500 XT
+ 744c Navi 31 [Radeon RX 7900 XT/7900 XTX]
7833 RS350 Host Bridge
7834 RS350 [Radeon 9100 PRO/XT IGP]
7835 RS350M [Mobility Radeon 9000 IGP]
@@ -4834,6 +4916,7 @@
1481 Starship/Matisse IOMMU
1482 Starship/Matisse PCIe Dummy Host Bridge
1483 Starship/Matisse GPP Bridge
+ 01de fff9 Gimlet Baseboard
1484 Starship/Matisse Internal PCIe GPP Bridge 0 to bus[E:B]
1485 Starship/Matisse Reserved SPP
1486 Starship/Matisse Cryptographic Coprocessor PSPCPP
@@ -4863,6 +4946,12 @@
149c Matisse USB 3.0 Host Controller
1462 7c37 X570-A PRO motherboard
149d Vangogh CVIP
+ 14b5 Family 17h-19h PCIe Root Complex
+ 14b6 Family 17h-19h IOMMU
+ 14b7 Family 17h-19h PCIe Dummy Host Bridge
+ 14b9 Family 17h-19h Internal PCIe GPP Bridge
+ 14ba Family 17h-19h PCIe GPP Bridge
+ 14cd Family 19h USB4/Thunderbolt PCIe tunnel
1510 Family 14h Processor Root Complex
174b 1001 PURE Fusion Mini
1512 Family 14h Processor Root Port
@@ -4959,6 +5048,8 @@
ea50 ce19 mCOM10-L1900
15d4 FireFlight USB 3.1
15d5 FireFlight USB 3.1
+ 15d6 Rembrandt USB4 XHCI controller #5
+ 15d7 Rembrandt USB4 XHCI controller #6
15da Raven/Raven2 PCIe Dummy Host Bridge
15db Raven/Raven2 Internal PCIe GPP Bridge 0 to Bus A
ea50 ce19 mCOM10-L1900
@@ -5031,6 +5122,12 @@
160d Arden Device 18h: Function 5
160e Arden Device 18h: Function 6
160f Arden Device 18h: Function 7
+ 161a Rembrandt USB4 XHCI controller #1
+ 161b Rembrandt USB4 XHCI controller #2
+ 161c Rembrandt USB4 XHCI controller #7
+ 161d Rembrandt USB4 XHCI controller #3
+ 161e Rembrandt USB4 XHCI controller #4
+ 161f Rembrandt USB4 XHCI controller #8
1620 Anubis HT Configuration
1621 Anubis Address Maps
1622 Anubis DRAM Configuration
@@ -5043,6 +5140,9 @@
1629 Arden PCIe GPP Bridge
162a Arden Internal PCIe GPP Bridge 0 to bus X
162b Arden PCIe Non-Transparent Bridge
+ 162c VanGogh USB2
+ 162e Rembrandt USB4/Thunderbolt NHI controller #1
+ 162f Rembrandt USB4/Thunderbolt NHI controller #2
1630 Renoir/Cezanne Root Complex
1631 Renoir/Cezanne IOMMU
1632 Renoir PCIe Dummy Host Bridge
@@ -5060,7 +5160,10 @@
1642 Renoir WLAN
1643 Renoir BT
1644 Renoir I2S
- 1648 VanGogh Root Complex
+ 1645 VanGogh Root Complex
+ 1646 VanGogh IOMMU
+ 1647 VanGogh PCIe GPP Bridge
+ 1648 VanGogh Internal PCIe GPP Bridge to Bus
1649 VanGogh PSP/CCP
164f Milan IOMMU
1650 Milan Data Fabric; Function 0
@@ -5071,6 +5174,14 @@
1655 Milan Data Fabric; Function 5
1656 Milan Data Fabric; Function 6
1657 Milan Data Fabric; Function 7
+ 1660 VanGogh Data Fabric; Function 0
+ 1661 VanGogh Data Fabric; Function 1
+ 1662 VanGogh Data Fabric; Function 2
+ 1663 VanGogh Data Fabric; Function 3
+ 1664 VanGogh Data Fabric; Function 4
+ 1665 VanGogh Data Fabric; Function 5
+ 1666 VanGogh Data Fabric; Function 6
+ 1667 VanGogh Data Fabric; Function 7
166a Cezanne Data Fabric; Function 0
166b Cezanne Data Fabric; Function 1
166c Cezanne Data Fabric; Function 2
@@ -5079,6 +5190,14 @@
166f Cezanne Data Fabric; Function 5
1670 Cezanne Data Fabric; Function 6
1671 Cezanne Data Fabric; Function 7
+ 1679 Rembrandt Data Fabric: Device 18h; Function 0
+ 167a Rembrandt Data Fabric: Device 18h; Function 1
+ 167b Rembrandt Data Fabric: Device 18h; Function 2
+ 167c Rembrandt Data Fabric: Device 18h; Function 3
+ 167d Rembrandt Data Fabric: Device 18h; Function 4
+ 167e Rembrandt Data Fabric: Device 18h; Function 5
+ 167f Rembrandt Data Fabric: Device 18h; Function 6
+ 1680 Rembrandt Data Fabric: Device 18h; Function 7
1700 Family 12h/14h Processor Function 0
1701 Family 12h/14h Processor Function 1
1702 Family 12h/14h Processor Function 2
@@ -5388,7 +5507,7 @@
9910 CyberBlade/XP
9930 CyberBlade/XPm
9960 CyberBlade XP2
-1024 Zenith Data Systems
+1024 Beijing Dajia Internet Information Technology Co.
1025 Acer Incorporated [ALI]
1435 M1435
1445 M1445
@@ -5492,6 +5611,12 @@
1028 1f24 PERC S300 Controller
# NV-RAM Adapter used in Dell DR appliances
0073 NV-RAM Adapter
+ 1028 PCIe Bridge riser
+ 2600 ENT NVMe RT1
+ 1028 215e ENT NVMe RT1 RI 3.84TB
+ 1028 215f ENT NVMe RT1 RI 7.68TB
+ 1028 2160 ENT NVMe RT1 FIPS RI 3.84TB
+ 1028 2161 ENT NVMe RT1 FIPS RI 7.68TB
1029 Siemens Nixdorf IS
102a LSI Logic
0000 HYDRA
@@ -6741,6 +6866,7 @@
90a3 Aeolia Memory (DDR3/SPM)
90a4 Aeolia USB 3.0 xHCI Host Controller
90bc SxS Pro+ memory card
+ 90c0 PCIe x8 XAVC Codec Board
90c8 Belize ACPI
90c9 Belize Ethernet Controller
90ca Belize SATA AHCI Controller
@@ -6806,6 +6932,8 @@
3505 SH7751 PCI Controller (PCIC)
350e SH7751R PCI Controller (PCIC)
1055 Microchip Technology / SMSC
+ 7430 LAN7430
+ 7431 LAN7431
9130 SLC90E66 [Victory66] IDE
9460 SLC90E66 [Victory66] ISA
9462 SLC90E66 [Victory66] USB
@@ -7312,7 +7440,7 @@
1077 02f2 QLogic 1x32Gb QLE2770 FC HBA
1077 02f3 QLogic 2x32Gb QLE2772 FC HBA
1590 02d3 SN1610Q - 1P Enhanced 32GFC Single Port Fibre Channel Host Bus Adapter
- 1590 02d4 SN1610Q – 2P Enhanced 32GFC Dual Port Fibre Channel Host Bus Adapter
+ 1590 02d4 SN1610Q – 2P Enhanced 32GFC Dual Port Fibre Channel Host Bus Adapter
2289 ISP2852-based 64/32G Fibre Channel to PCIe Controller with StorCryption
1077 02e9 QLE2882 Dual Port 64GFC PCIe Gen4 x8 Adapter with StorCryption
1077 02eb QLE2782 Dual Port 32GFC PCIe Gen4 x8 Adapter with StorCryption
@@ -7560,7 +7688,7 @@
0022 ATM Adapter
108e Oracle/SUN
0001 EBUS
- 1000 EBUS
+ 1000 STP2003QFP [PCIO] EBUS
1001 Happy Meal 10/100 Ethernet [hme]
1100 RIO EBUS
108e 1100 RIO EBUS on Blade 100 motherboard
@@ -8915,10 +9043,10 @@
10b5 3334 Cambridge Pixel HPx Radar Input Card
10b5 3352 Alpermann+Velte PCL PCIe HD: Timecode Reader Board
10b5 3353 Alpermann+Velte PCL PCIe D: Timecode Reader Board
- 10b5 3354 Alpermann+Velte PCL PCIe LV: Timecode Reader Board
- 10b5 3355 Alpermann+Velte PCL PCIe L: Timecode Reader Board
- 10b5 3415 Alpermann+Velte PCIe TS: Time Synchronisation Board
- 10b5 3493 Alpermann+Velte PCL PCIe 3G: Timecode Reader Board
+ 10b5 3354 Plura PCL PCIe LV: Timecode Reader Board
+ 10b5 3355 Plura PCL PCIe L: Timecode Reader Board
+ 10b5 3415 Plura PCIe TS: Time Synchronisation Board
+ 10b5 3493 Plura PCL PCIe 3G: Timecode Reader Board
10b5 3565 Cambridge Pixel HPx Radar Output Card
1369 c001 LX6464ES
1369 c201 LX1616ES
@@ -11381,7 +11509,7 @@
# GRID K1 USM
0fe7 GK107GL [GRID K100 vGPU]
10de 101e GRID K100
- 0fe8 GK107M
+ 0fe8 GK107M [N14P-GS]
0fe9 GK107M [GeForce GT 750M Mac Edition]
0fea GK107M [GeForce GT 755M Mac Edition]
0fec GK107M [GeForce 710A]
@@ -11908,6 +12036,7 @@
11a3 GK104M [GeForce GTX 680MX]
106b 010d iMac 13,2
11a7 GK104M [GeForce GTX 675MX]
+ 11a8 GK104GLM [Quadro K5100M]
11a9 GK104M [GeForce GTX 870M]
11af GK104GLM [GRID IceCube]
11b0 GK104GL [GRID K240Q / K260Q vGPU]
@@ -12170,6 +12299,7 @@
1aec TU116 USB 3.1 Host Controller
1aed TU116 USB Type-C UCSI Controller
1aef GA102 High Definition Audio Controller
+ 1af1 GA100 [A100 NVSwitch]
1b00 GP102 [TITAN X]
1b01 GP102 [GeForce GTX 1080 Ti 10GB]
1b02 GP102 [TITAN Xp]
@@ -12301,11 +12431,13 @@
10de 131d Tesla V100-SXM3-32GB-H
1dba GV100GL [Quadro GV100]
10de 12eb TITAN V CEO Edition
+ 1dbe GV100 Engineering Sample
1df0 GV100GL [Tesla PG500-216]
1df2 GV100GL [Tesla PG503-216]
1df5 GV100GL [Tesla V100 SXM2 16GB]
1df6 GV100GL [Tesla V100S PCIe 32GB]
1e02 TU102 [TITAN RTX]
+ 1e03 TU102 [GeForce RTX 2080 Ti 12GB]
1e04 TU102 [GeForce RTX 2080 Ti]
1e07 TU102 [GeForce RTX 2080 Ti Rev. A]
1462 3715 RTX 2080 Ti GAMING X TRIO
@@ -12336,7 +12468,7 @@
1e91 TU104M [GeForce RTX 2070 SUPER Mobile / Max-Q]
1e93 TU104M [GeForce RTX 2080 SUPER Mobile / Max-Q]
1eab TU104M
- 1eae TU104M
+ 1eae TU104M [GeForce GTX 2080 Engineering Sample]
1eb0 TU104GL [Quadro RTX 5000]
1eb1 TU104GL [Quadro RTX 4000]
1eb4 TU104GL [T4G]
@@ -12377,6 +12509,7 @@
1f76 TU106GLM [Quadro RTX 3000 Mobile Refresh]
1f81 TU117
1f82 TU117 [GeForce GTX 1650]
+ 1f83 TU117 [GeForce GTX 1630]
1f91 TU117M [GeForce GTX 1650 Mobile / Max-Q]
1f92 TU117M [GeForce GTX 1650 Mobile]
1f94 TU117M [GeForce GTX 1650 Mobile]
@@ -12390,11 +12523,13 @@
# via Lenovo 496.90
1f9f TU117M [GeForce MX550]
1fa0 TU117M [GeForce MX550]
+ 1fa1 TU117M
1fae TU117GL
1fb0 TU117GLM [Quadro T1000 Mobile]
1fb1 TU117GL [T600]
1fb2 TU117GLM [Quadro T400 Mobile]
1fb6 TU117GLM [T600 Laptop GPU]
+ 1028 0b10 Precision 3571
1fb7 TU117GLM [T550 Laptop GPU]
1fb8 TU117GLM [Quadro T2000 Mobile / Max-Q]
1fb9 TU117GLM [Quadro T1000 Mobile]
@@ -12416,6 +12551,8 @@
20b5 GA100 [A100 PCIe 80GB]
20b6 GA100GL [PG506-232]
20b7 GA100GL [A30 PCIe]
+ 20b8 GA100 [A100X]
+ 20b9 GA100 [A30X]
20bb GA100 [DRIVE A100 PROD]
20be GA100 [GRID A100A]
20bf GA100 [GRID A100B]
@@ -12423,6 +12560,9 @@
20f0 GA100 [A100-PG506-207]
20f1 GA100 [A100 PCIe 40GB]
20f2 GA100 [A100-PG506-217]
+ 20f3 GA100 [A800-SXM4-80GB]
+ 20f5 GA100 [A800 80GB PCIe]
+ 20f6 GA100 [A800 40GB PCIe]
2182 TU116 [GeForce GTX 1660 Ti]
2183 TU116
2184 TU116 [GeForce GTX 1660]
@@ -12437,6 +12577,7 @@
21c4 TU116 [GeForce GTX 1660 SUPER]
21d1 TU116BM [GeForce GTX 1660 Ti Mobile]
2200 GA102
+ 2203 GA102 [GeForce RTX 3090 Ti]
2204 GA102 [GeForce RTX 3090]
147d 10de NVIDIA Geforce RTX 3090 Founders Edition
2205 GA102 [GeForce RTX 3080 Ti 20GB]
@@ -12444,6 +12585,7 @@
10de 1467 GA102 [GeForce RTX 3080]
10de 146d GA102 [GeForce RTX 3080 20GB]
1462 3892 RTX 3080 10GB GAMING X TRIO
+ 2207 GA102 [GeForce RTX 3070 Ti]
2208 GA102 [GeForce RTX 3080 Ti]
220a GA102 [GeForce RTX 3080 12GB]
220d GA102 [CMP 90HX]
@@ -12460,9 +12602,14 @@
2238 GA102GL [A10M]
223f GA102GL
228b GA104 High Definition Audio Controller
+ 228e GA106 High Definition Audio Controller
2296 Tegra PCIe Endpoint Virtual Network
- 2302 GA103
- 2321 GA103
+ 2302 GH100
+ 2321 GH100
+ 2322 GH100 [H800]
+ 2330 GH100[H100 SXM5 80GB]
+ 2331 GH100 [H100 PCIe]
+ 2336 GH100 [H100 96GB]
2414 GA103 [GeForce RTX 3060 Ti]
2420 GA103M [GeForce RTX 3080 Ti Mobile]
2438 GA103GLM [RTX A5500 Laptop GPU]
@@ -12473,6 +12620,7 @@
10de 146b GA104 [GeForce RTX 3070]
10de 14ae GA104 [GeForce RTX 3070 16GB]
2486 GA104 [GeForce RTX 3060 Ti]
+ 19da 6630 ZT-A30610H-10M [RTX 3060 Ti Twin Edge OC]
2487 GA104 [GeForce RTX 3060]
2488 GA104 [GeForce RTX 3070 Lite Hash Rate]
2489 GA104 [GeForce RTX 3060 Ti Lite Hash Rate]
@@ -12481,10 +12629,12 @@
249d GA104M [GeForce RTX 3070 Mobile / Max-Q]
249f GA104M
24a0 GA104 [Geforce RTX 3070 Ti Laptop GPU]
+ 24a4 GA104M
24ac GA104 [GeForce RTX 30x0 Engineering Sample]
24ad GA104 [GeForce RTX 3060 Engineering Sample]
24af GA104 [GeForce RTX 3070 Engineering Sample]
24b0 GA104GL [RTX A4000]
+ 24b1 GA104GL [RTX A4000H]
24b6 GA104GLM [RTX A5000 Mobile]
24b7 GA104GLM [RTX A4000 Mobile]
24b8 GA104GLM [RTX A3000 Mobile]
@@ -12492,8 +12642,10 @@
24ba GA104GLM [RTX A4500 Laptop GPU]
24bb GA104GLM [RTX A3000 Laptop GPU]
24bf GA104 [GeForce RTX 3070 Engineering Sample]
+ 24c9 GA104 [GeForce RTX 3060 Ti]
24dc GA104M [GeForce RTX 3080 Mobile / Max-Q 8GB/16GB]
24dd GA104M [GeForce RTX 3070 Mobile / Max-Q]
+ 24df GA104M
24e0 GA104M [Geforce RTX 3070 Ti Laptop GPU]
24fa GA104 [RTX A4500 Embedded GPU ]
2501 GA106 [GeForce RTX 3060]
@@ -12501,21 +12653,31 @@
2504 GA106 [GeForce RTX 3060 Lite Hash Rate]
2505 GA106
2507 GA106 [Geforce RTX 3050]
+ 2508 GA106 [GeForce RTX 3050 OEM]
+ 2509 GA106 [GeForce RTX 3060 12GB Rev. 2]
2520 GA106M [GeForce RTX 3060 Mobile / Max-Q]
+ 2521 GA106M [GeForce RTX 3060 Laptop GPU]
2523 GA106M [GeForce RTX 3050 Ti Mobile / Max-Q]
252f GA106 [GeForce RTX 3060 Engineering Sample]
2531 GA106 [RTX A2000]
+ 2544 GA106 [GeForce RTX 3060]
2560 GA106M [GeForce RTX 3060 Mobile / Max-Q]
+ 2561 GA106M [GeForce RTX 3060 Laptop GPU]
2563 GA106M [GeForce RTX 3050 Ti Mobile / Max-Q]
2571 GA106 [RTX A2000 12GB]
+ 2582 GA107 [GeForce RTX 3050]
2583 GA107 [GeForce RTX 3050]
25a0 GA107M [GeForce RTX 3050 Ti Mobile]
25a2 GA107M [GeForce RTX 3050 Mobile]
+ 25a3 GA107
25a4 GA107
25a5 GA107M [GeForce RTX 3050 Mobile]
25a6 GA107M [GeForce MX570]
25a7 GA107M [GeForce MX570]
25a9 GA107M [GeForce RTX 2050]
+ 25aa GA107M [GeForce MX570 A]
+# GN20-P0 Refresh
+ 25ac GN20-P0-R-K2
25af GA107 [GeForce RTX 3050 Engineering Sample]
25b5 GA107GLM [RTX A4 Mobile]
# A16 - 25B6 10DE 14A9 / A2 - 25B6 10DE 157E
@@ -12523,11 +12685,33 @@
25b8 GA107GLM [RTX A2000 Mobile]
25b9 GA107GLM [RTX A1000 Laptop GPU]
25ba GA107GLM [RTX A2000 8GB Laptop GPU]
+ 25bb GA107GLM [RTX A500 Laptop GPU]
25e0 GA107BM [GeForce RTX 3050 Ti Mobile]
25e2 GA107BM [GeForce RTX 3050 Mobile]
25e5 GA107BM [GeForce RTX 3050 Mobile]
+# GN20-P0 Refresh
+ 25ec GN20-P0-R-K2
25f9 GA107 [RTX A1000 Embedded GPU ]
25fa GA107 [RTX A2000 Embedded GPU]
+ 25fb GA107 [RTX A500 Embedded GPU]
+ 2684 AD102 [GeForce RTX 4090]
+ 26b1 AD102GL [L6000 / RTX 6000 Ada Generation]
+ 26b5 AD102GL [L40]
+ 26b8 AD102GL [L40G]
+ 26f5 AD102GL [L40 CNX]
+ 2704 AD103 [GeForce RTX 4080]
+ 2717 GN21-X11
+ 2757 GN21-X11
+ 2785 AD104
+ 27a0 GN21-X9
+ 27b8 AD104GL [L4]
+ 27e0 GN21-X9
+ 2820 GN21-X6
+ 2860 GN21-X6
+ 28a0 GN21-X4
+ 28a1 GN21-X2
+ 28e0 GN21-X4
+ 28e1 GN21-X2
10df Emulex Corporation
0720 OneConnect NIC (Skyhawk)
103c 1934 FlexFabric 20Gb 2-port 650M Adapter
@@ -12568,6 +12752,7 @@
e300 LPe31000/LPe32000 Series 16Gb/32Gb Fibre Channel Adapter
1014 0614 PCIe3 4-Port 16Gb Fibre Channel Adapter for POWER (FC EN1C/EN1D; CCIN 578E)
1014 0615 PCIe3 2-Port 32Gb Fibre Channel Adapter for POWER (FC EN1A/EN1B; CCIN 578F)
+ 1014 06a0 PCIe3 2-Port 16Gb Fibre Channel Adapter for POWER (FC EN1L/EN1M; CCIN 2CFC)
10df e300 LPe32002-M2 2-Port 32Gb Fibre Channel Adapter
10df e301 LPe32000-M2 1-Port 32Gb Fibre Channel Adapter
10df e310 LPe31002-M6 2-Port 16Gb Fibre Channel Adapter
@@ -12621,9 +12806,13 @@
10df f411 LPe35000-M2-D 1-Port 32Gb Fibre Channel Adapter
10df f418 LPe35000-M2-L 1-Port 32Gb PCIe Fibre Channel Adapter
10df f419 LPe35002-M2-L 2-Port 32Gb PCIe Fibre Channel Adapter
+ 10df f421 LPe36002-M2-L 2-Port 64Gb PCIe Fibre Channel Adapter
+ 10df f422 LPe36002-M64-D 2-Port 64Gb Fibre Channel Adapter
1590 02d5 StoreFabric SN1610E 1-Port 32Gb Fibre Channel Adapter
1590 02d6 StoreFabric SN1610E 2-Port 32Gb Fibre Channel Adapter
f500 LPe37000/LPe38000 Series 32Gb/64Gb Fibre Channel Adapter
+ 1014 06c1 PCIe4 4-Port 32Gb Fibre Channel Adapter for POWER (FC EN1L/EN1M; CCIN 2CFC)
+ 1014 06c2 PCIe4 2-Port 64Gb Fibre Channel Adapter for POWER (FC EN1N/EN1P; CCIN 2CFD)
f700 LP7000 Fibre Channel Host Adapter
f701 LP7000 Fibre Channel Host Adapter Alternate ID (JX1:2-3, JX2:1-2)
f800 LP8000 Fibre Channel Host Adapter
@@ -12756,6 +12945,7 @@
1028 06e4 XPS 15 9550
1028 06e6 Latitude 11 5175 2-in-1
1028 09be Latitude 7410
+ 1028 0b10 Precision 3571
17aa 224f ThinkPad X1 Carbon 5th Gen
5260 RTS5260 PCI Express Card Reader
5261 RTS5261 PCI Express Card Reader
@@ -12860,6 +13050,7 @@
103c 2a6f Asus IPIBL-LB Motherboard
103c 825b OMEN-17-w001nv
103c 8615 Pavilion Laptop 15-cw1xxx
+ 103c 86d4 Pavilion Laptop 15-ec0xxx
# Rev 29, uses r8169 Driver on Linux
103c 8882 HP ProDesk 405 G8 Desktop Mini PC
1043 11f5 Notebook motherboard (one of many models)
@@ -12950,7 +13141,7 @@
10ec 8739 Dell Wireless 1801
17aa b736 Z50-75
b822 RTL8822BE 802.11a/b/g/n/ac WiFi adapter
- 103c 831b Realtek RTL8822BE 802.11ac 2 × 2 Wi-Fi + Bluetooth 4.2 Combo Adapter (MU-MIMO supported)
+ 103c 831b Realtek RTL8822BE 802.11ac 2 × 2 Wi-Fi + Bluetooth 4.2 Combo Adapter (MU-MIMO supported)
17aa 5124 ThinkPad E595
17aa b023 ThinkPad E595
c821 RTL8821CE 802.11ac PCIe Wireless Network Adapter
@@ -12977,13 +13168,37 @@
3fc4 RME Digi9652 (Hammerfall)
3fc5 RME Hammerfall DSP
3fc6 RME Hammerfall DSP MADI
+# Reference: https://xilinx.github.io/Alveo-Cards/master/management-specification/append…
+ 5000 Alveo U200 XDMA Platform
+# Reference: https://xilinx.github.io/Alveo-Cards/master/management-specification/append…
+ 5004 Alveo U250 XDMA Platform
5005 Alveo U250
+# Reference: https://xilinx.github.io/Alveo-Cards/master/management-specification/append…
+ 500c Alveo U280 XDMA Platform
+# Reference: https://xilinx.github.io/Alveo-Cards/master/management-specification/append…
+ 5020 Alveo U50 XMDA Platform
+# Reference: https://xilinx.github.io/Alveo-Cards/master/management-specification/append…
+ 505c Alveo U55C
+ 6987 SmartSSD
+ 6988 SmartSSD
+ 7011 7-Series FPGA Hard PCIe block (AXI/debug)
7038 FPGA Card XC7VX690T
17aa 402f FPGA XC7VX690T-3FFG1157E
8019 Memory controller
1eec 0201 VSEC10232X Dual-port 100Gb/s Etherent PCIe
8380 Ellips ProfiXpress Profibus Master
8381 Ellips Santos Frame Grabber
+ 9134 SmartSSD
+ 9234 SmartSSD
+ 9434 SmartSSD
+# Reference: https://xilinx.github.io/Alveo-Cards/master/management-specification/append…
+ d000 Alveo U200 Golden Image
+# Reference: https://xilinx.github.io/Alveo-Cards/master/management-specification/append…
+ d004 Alveo U250 Golden Image
+# Reference: https://xilinx.github.io/Alveo-Cards/master/management-specification/append…
+ d00c Alveo U280 Golden Image
+# Reference: https://xilinx.github.io/Alveo-Cards/master/management-specification/append…
+ d020 Alveo U50 Golden Image
d154 Copley Controls CAN card (PCI-CAN-02)
# SED is assigned Xilinx PCI device IDs ebf0 through ebff
ebf0 SED Systems Modulator/Demodulator
@@ -13146,8 +13361,9 @@
000b EMU20k2 [Sound Blaster X-Fi Titanium Series]
1102 0041 SB0880 [SoundBlaster X-Fi Titanium PCI-e]
1102 0062 SB1270 [SoundBlaster X-Fi Titanium HD]
- 0012 Sound Core3D [Sound Blaster Recon3D / Z-Series]
+ 0012 CA0132 Sound Core3D [Sound Blaster Recon3D / Z-Series / Sound BlasterX AE-5 Plus]
1102 0010 SB1570 SB Audigy Fx
+ 1102 0191 CA0132 Sound Core3D - CA0113 [ Sound BlasterX AE-5 Plus]
4001 SB Audigy FireWire Port
1102 0010 SB Audigy FireWire Port
7002 SB Live! Game Port
@@ -13220,6 +13436,7 @@
3320 RocketRAID 3320
4310 RocketRaid 4310
7505 SSD7505 PCIe Gen4 x16 4-Port M.2 NVMe RAID Controller
+ 7540 SSD7540 PCIe Gen4 x16 8-Port M.2 NVMe RAID Controller
1104 RasterOps Corp.
1105 Sigma Designs, Inc.
1105 REALmagic Xcard MPEG 1/2/3/4 DVD Decoder
@@ -14106,7 +14323,7 @@
1129 Firmworks
112a Hermes Electronics Company, Ltd.
# nee Linotype - Hell AG
-112b Heidelberger Druckmaschinen AGHeidelberger Druckmaschinen AG
+112b Heidelberger Druckmaschinen AG
112c Zenith Data Systems
112d Ravicad
112e Infomedia Microelectronics Inc.
@@ -14954,6 +15171,8 @@
0113 BG3 NVMe SSD Controller
1179 0001 Toshiba KBG30ZMS128G 128GB NVMe SSD
0115 XG4 NVMe SSD Controller
+ 0116 XG5 NVMe SSD Controller
+ 1179 0001 XG5 NVMe SSD Controller
011a XG6 NVMe SSD Controller
0404 DVD Decoder card
0406 Tecra Video Capture device
@@ -15877,6 +16096,7 @@
8534 PM8534 PFX 64xG3 PCIe Fanout Switch
8535 PM8535 PFX 80xG3 PCIe Fanout Switch
8536 PM8536 PFX 96xG3 PCIe Fanout Switch
+ 1bd4 0081 PM8536 PFX 96xG3 PCIe Fanout Switch
8546 PM8546 B-FEIP PSX 96xG3 PCIe Storage Switch
8562 PM8562 Switchtec PFX-L 32xG3 Fanout-Lite PCIe Gen3 Switch
11f9 I-Cube Inc
@@ -16679,6 +16899,7 @@
1299 Knowledge Technology Lab.
129a VMetro, inc.
0615 PBT-615 PCI-X Bus Analyzer
+ 0715 cPCI Bus Analyzer
1100 PMC-FPGA05
1106 XMC-FPGA05F, PCI interface
1107 XMC-FPGA05F, PCIe interface
@@ -17187,6 +17408,64 @@
5190 9200 ECO NVMe SSD
5191 9200 PRO NVMe SSD
5192 9200 MAX NVMe SSD
+ 51a2 7300 PRO NVMe SSD
+ 1344 2000 960GB U.2
+ 1344 3000 1920GB U.2
+ 1344 4000 3480GB U.2
+ 1344 5000 7680GB U.2
+ 51a3 7300 MAX NVMe SSD
+ 1344 1100 400GB M.2
+ 1344 2000 800GB U.2
+ 1344 2100 800GB M.2
+ 1344 3000 1600GB U.2
+ 1344 4000 3200GB U.2
+ 1344 5000 6400GB U.2
+ 51b1 9300 PRO NVMe SSD
+ 1344 4000 3.84TB U.2
+ 1344 5000 7.68TB U.2
+ 1344 6000 15.36TB U.2
+ 51b2 9300 MAX NVMe SSD
+ 1344 4000 3.2TB U.2
+ 1344 5000 6.4 TB U.2
+ 1344 6000 12.8TB U.2
+ 51c0 7400 PRO NVMe SSD
+ 1028 2162 EC NVMe OPAL 7400 RI M.2 480GB
+ 1028 2163 EC NVMe OPAL 7400 RI M.2 960GB
+ 1028 2164 EC NVMe ISE 7400 RI M.2 480GB
+ 1028 2165 EC NVMe ISE 7400 RI M.2 960GB
+ 1028 216c EC NVMe ISE 7400 RI M.2 110 1.92TB
+ 1028 216d EC NVMe ISE 7400 RI M.2 110 3.84TB
+ 1028 216e EC NVMe OPAL 7400 RI M.2 110 1.92TB
+ 1028 216f EC NVMe OPAL 7400 RI M.2 110 3.84TB
+ 1028 2197 EC NVMe OPAL 7400 RI M.2 110 960GB
+ 1028 224d EC NVMe ISE 7400 RI M.2 110 960GB
+ 1344 1100 M.2 480GB
+ 1344 2000 U.3 960GB
+ 1344 2100 M.2 960GB
+ 1344 2600 E1.S 960GB
+ 1344 2b00 M.2 1920GB
+ 1344 2d00 E1.2 1920GB
+ 1344 3000 U.3 1920GB
+ 1344 3e00 M.2 3840GB
+ 1344 3f00 E1.S 3840GB
+ 1344 4000 U.3 3840GB
+ 1344 5000 U.3 7680GB
+ 51c1 7400 MAX NVMe SSD
+ 1028 216a EC NVMe ISE 7400 MU M.2 80 800GB
+ 1028 216b EC NVMe OPAL 7400 MU M.2 80 800GB
+ 1344 1100 M.2 400GB
+ 1344 2000 U.3 800GB
+ 1344 2100 M.2 800GB
+ 1344 2600 E1.S 800GB
+ 1344 2b00 M.2 1600GB
+ 1344 2d00 E1.S 1600GB
+ 1344 3000 U.3 1600GB
+ 1344 3e00 M.2 3200GB
+ 1344 3f00 E1.S 3200GB
+ 1344 4000 U.3 3200GB
+ 1344 5000 U.3 6400GB
+ 51c3 7450 PRO NVMe SSD
+ 51c4 7450 MAX NVMe SSD
1345 Arescom Inc
1347 Odetics
1349 Sumitomo Electric Industries, Ltd.
@@ -17932,6 +18211,7 @@
0002 MN-130 (ADMtek Centaur-P based)
# Virtual Video Card Device for Windows Remote Desktop (RDP)
008c Basic Render Driver
+ 008e Basic Render Driver
5353 Hyper-V virtual VGA
5801 XMA Decoder (Xenon)
5802 SATA Controller - CdRom (Xenon)
@@ -18703,6 +18983,8 @@
6088 T62100-6088 Unified Wire Ethernet Controller
6089 T62100-6089 Unified Wire Ethernet Controller
608a T62100-608a Unified Wire Ethernet Controller
+ 6092 T62100-KR Unified Wire Ethernet Controller
+ 01de fff9 Gimlet Baseboard
6401 T6225-CR Unified Wire Ethernet Controller
6402 T6225-SO-CR Unified Wire Ethernet Controller
6403 T6425-CR Unified Wire Ethernet Controller
@@ -18727,6 +19009,8 @@
6488 T62100-6088 Unified Wire Ethernet Controller
6489 T62100-6089 Unified Wire Ethernet Controller
648a T62100-608a Unified Wire Ethernet Controller
+ 6492 T62100-KR Unified Wire Ethernet Controller
+ 01de fff9 Gimlet Baseboard
6501 T6225-CR Unified Wire Storage Controller
6502 T6225-SO-CR Unified Wire Storage Controller
6503 T6425-CR Unified Wire Storage Controller
@@ -18751,6 +19035,7 @@
6588 T62100-6088 Unified Wire Storage Controller
6589 T62100-6089 Unified Wire Storage Controller
658a T62100-608a Unified Wire Storage Controller
+ 6592 T62100-KR Unified Wire Storage Controller
6601 T6225-CR Unified Wire Storage Controller
6602 T6225-SO-CR Unified Wire Storage Controller
6603 T6425-CR Unified Wire Storage Controller
@@ -18775,6 +19060,7 @@
6688 T62100-6088 Unified Wire Storage Controller
6689 T62100-6089 Unified Wire Storage Controller
668a T62100-608a Unified Wire Storage Controller
+ 6692 T62100-KR Unified Wire Storage Controller
6801 T6225-CR Unified Wire Ethernet Controller [VF]
6802 T6225-SO-CR Unified Wire Ethernet Controller [VF]
6803 T6425-CR Unified Wire Ethernet Controller [VF]
@@ -18876,7 +19162,7 @@
a804 NVMe SSD Controller SM961/PM961/SM963
144d a801 SM963 2.5" NVMe PCIe SSD
a808 NVMe SSD Controller SM981/PM981/PM983
- 144d a801 SSD 970 EVO Plus 1TB
+ 144d a801 SSD 970 EVO Plus
1d49 403b Thinksystem U.2 PM983 NVMe SSD
a809 NVMe SSD Controller 980
a80a NVMe SSD Controller PM9A1/PM9A3/980PRO
@@ -18889,6 +19175,7 @@
0128 2168 DC NVMe PM9A3 RI 80M.2 480GB
0128 2169 DC NVMe PM9A3 RI 80M.2 960GB
144d a813 General DC NVMe PM9A3
+ a80b NVMe SSD Controller PM9B1
a820 NVMe SSD Controller 171X
1028 1f95 Express Flash NVMe XS1715 SSD 400GB
1028 1f96 Express Flash NVMe XS1715 SSD 800GB
@@ -19052,6 +19339,7 @@
148b INNOMEDIALOGIC Inc.
148c Tul Corporation / PowerColor
2391 Radeon RX 590 [Red Devil]
+ 2398 AXRX 5700 XT 8GBD6-3DHE/OC [PowerColor Red Devil Radeon RX 5700 XT]
148d DIGICOM Systems, Inc.
1003 HCF 56k Data/Fax Modem
148e OSI Plus Corporation
@@ -19154,7 +19442,7 @@
103c 1240 Myrinet M2L-PCI64/2-3.0 LANai 7.4 (HP OEM)
14c2 DTK Computer
14c3 MEDIATEK Corp.
- 0608 RZ608 Wi-Fi 6E 80MHz
+ 0608 MT7921K (RZ608) Wi-Fi 6E 80MHz
0616 MT7922 802.11ax PCI Express Wireless Network Adapter
7612 MT7612E 802.11acbgn PCI Express Wireless Network Adapter
7615 MT7615E 802.11ac PCI Express Wireless Network Adapter
@@ -19266,6 +19554,8 @@
1609 BCM5745X NetXtreme-E Ethernet Virtual Function
1612 BCM70012 Video Decoder [Crystal HD]
1614 BCM57454 NetXtreme-E 10Gb/25Gb/40Gb/50Gb/100Gb Ethernet
+ 14e4 d140 NetXtreme-E Quad-port 10GBASE-T Ethernet PCIe Adapter (BCM957454-P410SDBT)
+ 14e4 d340 NetXtreme-E Quad-port 10GBASE-T Ethernet OCP 3.0 Adapter (BCM957454-N410SDBT)
1615 BCM70015 Video Decoder [Crystal HD]
1639 NetXtreme II BCM5709 Gigabit Ethernet
1028 0235 PowerEdge R710 BCM5709 Gigabit Ethernet
@@ -19404,6 +19694,7 @@
103c 22be Ethernet 1Gb 4-port 331i Adapter
103c 3383 Ethernet 1Gb 4-port 331T Adapter
14e4 1904 4-port 1Gb Ethernet Adapter
+ 193d 1025 NIC-ETH330T-LP-4P
1659 NetXtreme BCM5721 Gigabit Ethernet PCI Express
1014 02c6 eServer xSeries server mainboard
1028 01e6 PowerEdge 860
@@ -19675,12 +19966,16 @@
16d4 BCM57402 NetXtreme-E Ethernet Partition
16d5 BCM57407 NetXtreme-E 10GBase-T Ethernet Controller
16d6 BCM57412 NetXtreme-E 10Gb RDMA Ethernet Controller
+ 117c 00cd FastFrame N4S2 Dual-port 10Gb Ethernet Adapter
14e4 1202 BCM957412M4122C OCP 1x25G Type1 wRoCE
14e4 4120 NetXtreme E-Series Advanced Dual-port 10Gb SFP+ Ethernet Network Daughter Card
14e4 4126 NetXtreme-E Dual-port 10G SFP+ Ethernet OCP 3.0 Adapter (BCM957412N4120C)
152d 8b20 BCM57412 NetXtreme-E 10Gb RDMA Ethernet Controller
152d 8b22 BCM57412 NetXtreme-E 25Gb RDMA Ethernet Controller
+# NIC-ETH531F-LP-2P BCM57412 2 x 10G SFP+ Ethernet PCIe Card
+ 193d 1024 NIC-ETH531F-LP-2P
16d7 BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller
+ 117c 00cc FastFrame N422 Dual-port 25Gb Ethernet Adapter
14e4 1402 BCM957414A4142CC 10Gb/25Gb Ethernet PCIe
14e4 1404 BCM957414M4142C OCP 2x25G Type1 wRoCE
14e4 4140 NetXtreme E-Series Advanced Dual-port 25Gb SFP28 Network Daughter Card
@@ -19689,9 +19984,13 @@
14e4 4146 NetXtreme-E Dual-port 25G SFP28 Ethernet OCP 3.0 Adapter (BCM957414N4140C)
1590 020e Ethernet 25Gb 2-port 631SFP28 Adapter
1590 0211 Ethernet 25Gb 2-port 631FLR-SFP28 Adapter
- 1eec 0101 VSE250231S Dual-port 10Gb/25Gb Ethernet PCIe
+ 1bd4 008e ENFB2251-SP2
+ 1bd4 008f ENPB2251-SP2
+# VSE-225-31S Dual-port 10Gb/25Gb Ethernet PCIe
+ 1eec 0101 VSE-225-31S Dual-port 10Gb/25Gb Ethernet PCIe
16d8 BCM57416 NetXtreme-E Dual-Media 10G RDMA Ethernet Controller
1028 1feb NetXtreme-E 10Gb SFP+ Adapter
+ 117c 00ce FastFrame N4T2 Dual-port 10GBASE-T Ethernet Adapter
14e4 4163 NetXtreme-E Dual-port 10GBASE-T Ethernet OCP 2.0 Adapter (BCM957416M4163C)
14e4 4166 NetXtreme-E Dual-port 10GBASE-T Ethernet OCP 3.0 Adapter (BCM957416N4160C)
1590 020c Ethernet 10Gb 2-port 535T Adapter
@@ -19743,13 +20042,16 @@
103c 30c0 Compaq 6710b
17aa 3a23 IdeaPad S10e
1750 BCM57508 NetXtreme-E 10Gb/25Gb/40Gb/50Gb/100Gb/200Gb Ethernet
+ 117c 00cf FastFrame N412 Dual-port 100Gb Ethernet Adapter
14e4 2100 NetXtreme-E Dual-port 100G QSFP56 Ethernet PCIe4.0 x16 Adapter (BCM957508-P2100G)
14e4 5208 NetXtreme-E Dual-port 100G QSFP56 Ethernet OCP 3.0 Adapter (BCM957508-N2100G)
14e4 d124 NetXtreme-E P2100D BCM57508 2x100G QSFP PCIE
- 14e4 df24 BCM57508 NetXtreme-E NGM2100D 2x100G KR Mezz Ethernet
+ 14e4 df24 NetXtreme-E NGM2100D BCM57508 2x100G KR Mezz Ethernet
1751 BCM57504 NetXtreme-E 10Gb/25Gb/40Gb/50Gb/100Gb/200Gb Ethernet
1028 09d4 PowerEdge XR11/XR12 LOM
14e4 5045 NetXtreme-E BCM57504 4x25G OCP3.0
+ 14e4 5100 NetXtreme-E Single-port 100G QSFP56 Ethernet OCP 3.0 Adapter (BCM957504-N1100G)
+ 14e4 5105 NetXtreme-E Single-port 100G DSFP Ethernet OCP 3.0 Adapter (BCM957504-N1100GD)
14e4 5250 NetXtreme-E BCM57504 4x25G KR Mezz
14e4 d142 NetXtreme-E P425D BCM57504 4x25G SFP28 PCIE
1752 BCM57502 NetXtreme-E 10Gb/25Gb/40Gb/50Gb Ethernet
@@ -20028,11 +20330,18 @@
5850 BCM5850 Crypto Accelerator
5e87 Valkyrie offload engine
5e88 Viper Offload Engine
+# bluetooth PCI function of the BRCM4378 Wireless Network Adapter
+ 5f69 BRCM4378 Bluetooth Controller
+# Bluetooth PCI function of the BRCM4387 Wireless Network Adapter
+ 5f71 BRCM4387 Bluetooth Controller
+# Bluetooth PCI function of the BRCM4377 Wireless Network Adapter
+ 5fa0 BRCM4377 Bluetooth Controller
8602 BCM7400/BCM7405 Serial ATA Controller
9026 CN99xx [ThunderX2] Integrated USB 3.0 xHCI Host Controller
9027 CN99xx [ThunderX2] Integrated AHCI/SATA 3 Host Controller
a8d8 BCM43224/5 Wireless Network Adapter
aa52 BCM43602 802.11ac Wireless LAN SoC
+ b080 BCM56080 Firelight2 Switch ASIC
b302 BCM56302 StrataXGS 24x1GE 2x10GE Switch Controller
b334 BCM56334 StrataXGS 24x1GE 4x10GE Switch Controller
b370 BCM56370 Switch ASIC
@@ -20068,6 +20377,8 @@
14e4 8028 Stingray Dual-Port 25Gb Ethernet PCIe SmartNIC w8GB DRAM (Part No BCM958802A8048C)
1bb0 0021 HPE SimpliVity Accelerator
d804 BCM58804 Stingray 100Gb Ethernet SoC
+# Trident5-X12 Switch ASIC
+ f800 BCM78800 switch ASIC for f800
14e5 Pixelfusion Ltd
14e6 SHINING Technology Inc
14e7 3CX
@@ -20729,6 +21040,7 @@
15b0 Zoltrix International Ltd
15b1 Source Technology Inc
15b2 Mosaid Technologies Inc
+# now NVIDIA
15b3 Mellanox Technologies
0191 MT25408 [ConnectX IB Flash Recovery]
01f6 MT27500 Family [ConnectX-3 Flash Recovery]
@@ -20768,6 +21080,10 @@
0257 Quantum-2 in Flash Recovery Mode
0258 Quantum-2 RMA
0259 Abir Chiplet
+ 025b Quantum-3 in Flash Recovery Mode
+ 025c Quantum-3 RMA
+ 025d Quantum-3CPO in Flash Recovery Mode
+ 025e Quantum-3CPO RMA
0262 MT27710 [ConnectX-4 Lx Programmable] EN
0263 MT27710 [ConnectX-4 Lx Programmable Virtual Function] EN
0264 Innova-2 Flex Burn image
@@ -20777,6 +21093,8 @@
0275 Spectrum-4C RMA
0277 Spectrum-4TOR RMA
0281 NPS-600 Flash Recovery
+ 0282 ArcusE Flash recovery
+ 0283 ArcusE RMA
1002 MT25400 Family [ConnectX-2 Virtual Function]
1003 MT27500 Family [ConnectX-3]
1014 04b5 PCIe3 40GbE RoCE Converged Host Bus Adapter for Power
@@ -20788,6 +21106,7 @@
15b3 0025 ConnectX-3 IB QDR Dual Port Mezzanine Card
15b3 0026 ConnectX-3 IB FDR Dual Port Mezzanine Card
15b3 0028 ConnectX-3 VPI Dual QSFP+ Port QDR Infiniband 40Gb/s or 10Gb Ethernet
+ 15b3 0055 ConnectX-3 10 GbE Single Port SFP+ Adapter
15b3 0059 ConnectX-3 VPI IB FDR/40 GbE Single Port QSFP+ Mezzanine Card
15b3 0064 ConnectX-3 EN 10/40 GbE Single Port QSFP+ Adapter (MCX313A-BCBT)
15b3 0065 ConnectX-3 VPI IB FDR/40 GbE Dual Port QSFP+ Adapter
@@ -20855,10 +21174,10 @@
193d 1084 NIC-ETH540F-3S-2P
1016 MT27710 Family [ConnectX-4 Lx Virtual Function]
1017 MT27800 Family [ConnectX-5]
- 15b3 0006 ConnectX®-5 EN network interface card, 100GbE single-port QSFP28, PCIe3.0 x16, tall bracket; MCX515A-CCAT
- 15b3 0007 Mellanox ConnectX®-5 MCX516A-CCAT
- 15b3 0020 ConnectX®-5 EN network interface card, 10/25GbE dual-port SFP28, PCIe3.0 x8, tall bracket ; MCX512A-ACAT
- 15b3 0068 ConnectX®-5 EN network interface card for OCP2.0, Type 1, with host management, 25GbE dual-port SFP28, PCIe3.0 x8, no bracket Halogen free ; MCX542B-ACAN
+ 15b3 0006 ConnectX®-5 EN network interface card, 100GbE single-port QSFP28, PCIe3.0 x16, tall bracket; MCX515A-CCAT
+ 15b3 0007 Mellanox ConnectX®-5 MCX516A-CCAT
+ 15b3 0020 ConnectX®-5 EN network interface card, 10/25GbE dual-port SFP28, PCIe3.0 x8, tall bracket ; MCX512A-ACAT
+ 15b3 0068 ConnectX®-5 EN network interface card for OCP2.0, Type 1, with host management, 25GbE dual-port SFP28, PCIe3.0 x8, no bracket Halogen free ; MCX542B-ACAN
193d 1051 NIC-IB1040i-Mb-2P
1018 MT27800 Family [ConnectX-5 Virtual Function]
1019 MT28800 Family [ConnectX-5 Ex]
@@ -20950,6 +21269,7 @@
a2dd BF4 Family Crypto enabled [BlueField-4 SoC Crypto enabled]
a2de BF4 Family Crypto disabled [BlueField-4 SoC Crypto disabled]
a2df BF4 Family integrated network controller [BlueField-4 integrated network controller]
+ b200 ArcusE
c2d2 MT416842 BlueField SoC management interfac
c2d3 MT42822 BlueField-2 SoC Management Interface
c2d4 MT43162 BlueField-3 Lx SoC Management Interface
@@ -20971,6 +21291,8 @@
cf84 Spectrum-4C
d2f0 Quantum HDR (200Gbps) switch
d2f2 Quantum-2 NDR (400Gbps) switch
+ d2f4 Quantum-3
+ d2f6 Quantum-3CPO
15b4 CCI/TRIAD
15b5 Cimetrics Inc
15b6 Texas Memory Systems Inc
@@ -21051,7 +21373,7 @@
15cd Dreamtech Co Ltd
15ce Genrad Inc
# https://www.hilscher.com/imprint/
-15cf Hilscher Gesellschaft für Systemautomation mbH
+15cf Hilscher Gesellschaft für Systemautomation mbH
0000 CIFX PCI/PCIe
15d1 Infineon Technologies AG
15d2 FIC (First International Computer Inc)
@@ -21062,6 +21384,7 @@
15d7 Rockwell-Collins Inc
15d8 Cybernetics Technology Co Ltd
15d9 Super Micro Computer Inc
+ 1b67 AOC-S3916L-H16iR-32DD
15da Cyberfirm Inc
15db Applied Computing Systems Inc
15dc Litronic Inc
@@ -21521,14 +21844,14 @@
002e AR9287 Wireless Network Adapter (PCI-Express)
105b e034 T77H167.00
0030 AR93xx Wireless Network Adapter
- 103c 1627 AR9380/HB112 802.11abgn 3×3 Wi-Fi Adapter
+ 103c 1627 AR9380/HB112 802.11abgn 3×3 Wi-Fi Adapter
106b 009a AirPort Extreme
1186 3a7e DWA-566 Wireless N 300 Dual Band PCIe Desktop Adapter
1a56 2000 Killer Wireless-N 1102 Half-size Mini PCIe Card [AR9382]
1a56 2001 Killer Wireless-N 1103 Half-size Mini PCIe Card [AR9380]
0032 AR9485 Wireless Network Adapter
1028 0208 Wireless 1506 WLAN Half Mini-Card
- 103c 1838 AR9485/HB125 802.11bgn 1×1 Wi-Fi Adapter
+ 103c 1838 AR9485/HB125 802.11bgn 1×1 Wi-Fi Adapter
105b e044 Unex DHXA-225
144d 410e AR9485WB-EG 802.11b/g/n mini-PCIe card on a series 3 laptop
1a3b 1186 AW-NE186H
@@ -22053,8 +22376,8 @@
0400 Datacenter Technologies QDF2432 PCI Express Root Port
0401 Datacenter Technologies QDF2400 PCI Express Root Port
1000 QCS405 PCIe Root Complex
- 1101 QCA6390 Wireless Network Adapter [AX500-DBS (2x2)]
- 1103 Atheros QCNFA765
+ 1101 QCA6390 Wireless Network Adapter
+ 1103 QCNFA765 Wireless Network Adapter
1104 QCN6024/9024/9074 Wireless Network Adapter
17cc NetChip Technology, Inc
2280 USB 2.0
@@ -22099,6 +22422,10 @@
17d3 1883 ARC-1883 8/12/16/24 Port PCIe 3.0 to SAS/SATA 12Gb RAID Controller
1884 ARC-1884 series PCIe 3.0 to SAS/SATA 12/6Gb RAID Controller
188a ARC-1886 series PCIe 4.0 to NVMe/SAS/SATA 16/12/6Gb RAID Controller
+ 17d3 1217 ARC-1217 4-Port PCIe 4.0 to SAS/SATA 12/6Gb RAID Controller
+ 17d3 1227 ARC-1227 8-Port PCIe 4.0 to SAS/SATA 12/6Gb RAID Controller
+ 17d3 1686 ARC-1686 PCIe 4.0 to SAS/SATA 12/6Gb Tape drive Controller
+ 17d3 1886 ARC-1886 PCIe 4.0 to NVMe/SAS/SATA 16/12/6Gb RAID Controller
# nee Neterion Inc., previously S2io Inc.
17d5 Exar Corp.
5731 Xframe 10-Gigabit Ethernet PCI-X
@@ -22541,6 +22868,7 @@
01c5 NT200A02 Network Adapter
01d5 NT50B01 Network Adapter
01e5 NT100A01 Network Adapter
+ 0225 NT40A11 Network Adapter
18f6 NextIO
1000 [Nexsis] Switch Virtual P2P PCIe Bridge
1001 [Texsis] Switch Virtual P2P PCIe Bridge
@@ -23084,6 +23412,10 @@
0212 Hi1822 Family (2*8G FC)
19e5 d303 Hi1822 SP522 (2*8G FC)
19e5 d306 Hi1822 SP523 (2*8G FC)
+ 0222 Hi1822 Family
+ 19e5 0051 Hi1822 SP681 (2*25/10GE)
+ 19e5 0052 Hi1822 SP680 (4*25/10GE)
+ 19e5 00a1 Hi1822 SP670 (2*100GE)
1710 iBMA Virtual Network Adapter
1711 Hi171x Series [iBMC Intelligent Management system chip w/VGA support]
1822 Hi1822 Family (4*25GE)
@@ -23105,7 +23437,9 @@
19e5 6214 NVMe SSD ES3500P V6 7680GB 2.5" U.2
19e5 6215 NVMe SSD ES3500P V6 15360GB 2.5" U.2
375e Hi1822 Family Virtual Function
+ 375f Hi1822 Family Virtual Function
379e Hi1822 Family Virtual Function
+ 379f Hi1822 Family Virtual Function
a120 HiSilicon PCIe Root Port with Gen4
a121 HiSilicon PCI-PCI Bridge
a122 HiSilicon Embedded DMA Engine
@@ -23268,7 +23602,11 @@
000d SEL-3390S8 Serial Adapter
000e SEL-3390E4 Ethernet Adapter
0014 SEL-3390T Time and Ethernet Adapter
+ 0015 SEL-3350 Mainboard
+ 0016 SEL-3350 Serial Expansion Board
+ 0017 SEL-3350 GPIO Expansion Board
0018 SEL-3390E4 Ethernet Adapter
+ 001c SEL-3390E4 Ethernet Adapter
1aae Global Velocity, Inc.
1ab4 Distributed Management Task Force, Inc. (DMTF)
1ab6 CalDigit, Inc.
@@ -23292,6 +23630,8 @@
13c2 3016 TT-budget S2-4200 Twin
4254 0552 S952 v3
1ae0 Google, Inc.
+# NVMe drive in GCP
+ 001f NVMe device
0042 Compute Engine Virtual Ethernet [gVNIC]
abcd Airbrush Combined Paintbox IPU/Oscar Edge TPU [Pixel Neural Core]
1ae3 SANBlaze Technology, Inc.
@@ -23393,7 +23733,9 @@
# nee Qumranet, Inc.
1af4 Red Hat, Inc.
1000 Virtio network device
+ 01de fffb Propolis Virtio network device
1001 Virtio block device
+ 01de fffa Propolis Virtio block device
1002 Virtio memory balloon
1003 Virtio console
1004 Virtio SCSI
@@ -23424,6 +23766,7 @@
1af4 1100 QEMU Virtual Machine
1af5 Netezza Corp.
1afa J & W Electronics Co., Ltd.
+1b00 Montage Technology Co., Ltd.
1b03 Magnum Semiconductor, Inc,
6100 DXT/DXTPro Multiformat Broadcast HD/SD Encoder/Decoder/Transcoder
7000 D7 Multiformat Broadcast HD/SD Encoder/Decoder/Transcoder
@@ -23437,6 +23780,7 @@
0611 ASM1061 SATA IDE Controller
0612 ASM1062 Serial ATA Controller
1849 0612 Motherboard
+ 0625 106x SATA/RAID Controller
1040 ASM1040 XHCI Controller
1042 ASM1042 SuperSpeed USB Host Controller
1043 1059 K53SM motherboard
@@ -23454,7 +23798,7 @@
1242 ASM1142 USB 3.1 Host Controller
1343 ASM1143 USB 3.1 Host Controller
1812 ASM1812 6-Port PCIe x4 Gen2 Packet Switch
- 2142 ASM2142 USB 3.1 Host Controller
+ 2142 ASM2142/ASM3142 USB 3.1 Host Controller
1462 7a72 H270 PC MATE
2824 ASM2824 PCIe Gen3 Packet Switch
3242 ASM3242 USB 3.2 Host Controller
@@ -23531,6 +23875,7 @@
1028 2113 BOSS-N1 Modular
1028 2151 BOSS-N1 Modular ET
1028 2196 ROR-N100
+ 1b4b 2241 Santa Cruz NVMe Host Adapter
1d49 0306 ThinkSystem M.2 NVMe 2-Bay RAID Enablement Kit
1d49 0307 ThinkSystem 7mm NVMe 2-Bay Rear RAID Enablement Kit
9120 88SE9120 SATA 6Gb/s Controller
@@ -23556,6 +23901,8 @@
1028 1fdf BOSS-S1 Modular
1028 1fe2 BOSS-S1 Adapter
1028 2010 BOSS-S2 Adapter
+ 1028 2260 BOSS-S1 Modular
+ 1028 2261 BOSS-S2 Adapter
# RS0200L6R2iM2
1bd4 0073 RS0200L6R2iM2
1d49 0300 ThinkSystem M.2 with Mirroring Enablement Kit
@@ -23684,6 +24031,38 @@
1bb1 0157 Nytro 5050M 7mm
# Nytro 5050M (Ebonhawk Mainstream Performance) TCG - 7mm
1bb1 0158 Nytro 5050M TCG 7mm
+# Nytro 5060M (Rocinante Mainstream Performance) - 15mm
+ 1bb1 0159 Nytro 5060M
+# Nytro 5050M TCG (Rocinante Mainstream Performance) - 15mm
+ 1bb1 0160 Nytro 5060M TCG
+# Nytro 5060M 7mm (Rocinante Mainstream Performance)
+ 1bb1 0161 Nytro 5060M 7mm
+# Nytro 5060M TCG (Rocinante Mainstream Performance) - 7mm
+ 1bb1 0162 Nytro 5060M TCG 7mm
+# Nytro 5060H (Rocinante High Performance)
+ 1bb1 0163 Nytro 5060H
+# Nytro 5060H TCG (Rocinante High Performance)
+ 1bb1 0164 Nytro 5060H TCG
+# Nytro 5060H (Rocinante - High Performance) - E3.S 1T
+ 1bb1 0165 Nytro 5060H E3.S 1T
+# Nytro 5060H (Rocinante - High Performance) - E3.S 1T TCG
+ 1bb1 0166 Nytro 5060H E3.S 1T TCG
+# Nytro 5060H (Rocinante - High Performance) - E3.L 1T
+ 1bb1 0167 Nytro 5060H E3.L 1T
+# Nytro 5060H (Rocinante - High Performance) - E3.L 1T TCG
+ 1bb1 0168 Nytro 5060H E3.L 1T TCG
+# Nytro 5060M (Rocinante Mainstream Performance) - E3.S 1T
+ 1bb1 0169 Nytro 5060M E3.S 1T
+# Nytro 5060M (Rocinante Mainstream Performance) - E3.S 1T TCG
+ 1bb1 0170 Nytro 5060M E3.S 1T TCG
+# Nytro 5060M (Rocinante Mainstream Performance) - E3.L 1T
+ 1bb1 0171 Nytro 5060M E3.L 1T
+# Nytro 5060M (Rocinante Mainstream Performance) - E3.L 1T TCG
+ 1bb1 0172 Nytro 5060M E3.L 1T TCG
+# Nytro 5060M (Rocinante Mainstream Performance) - E1.S
+ 1bb1 0173 Nytro 5060M E1.S
+# Nytro 5060M (Rocinante Mainstream Performance) - E1.S TCG
+ 1bb1 0174 Nytro 5060M E1.S TCG
1bb1 01a1 Nytro XP7102
5012 FireCuda 510 SSD
5016 FireCuda 520 SSD
@@ -23723,6 +24102,8 @@
1007 AB3000 Series Rugged Computer (Series N)
1008 ME1000 mPCIe Avionics Interface Card
100a NG1 Series Avionics Converter
+ 100b LE5 429 Databus Interface Card
+ 100c LE5 1553 Databus Interface Card
1101 OmniBus II PCIe Multi-Protocol Interface Card
1102 OmniBusBox II Multi-Protocol Interface Core
1103 OmniBus II cPCIe/PXIe Multi-Protocol Interface Card
@@ -23763,6 +24144,7 @@
001c FD922
001d Vega
001f FD940
+ 0020 FD2110
1c28 Lite-On IT Corp. / Plextor
0122 M6e PCI Express SSD [Marvell 88SS9183]
# previously Fiberblaze
@@ -23785,6 +24167,8 @@
00e5 PacketMover 2x10Gb [Corfu]
1000 SmartNIC N5010 4x100Gb
1001 SmartNIC N5011 w/2xE810 4x100Gb
+ 1002 SmartNIC N5013 4x100Gb
+ 1003 SmartNIC N5014 w/2xE810 4x100Gb
a000 FBC2CGG3 Capture 2x40Gb [Mango_02]
a001 FBC2CGG3 Capture 2x100Gb [Mango_02]
a003 FBC2CGG3 Capture 16x10Gb [Mango]
@@ -23826,9 +24210,10 @@
1285 PC300 NVMe Solid State Drive 1TB
1327 BC501 NVMe Solid State Drive
1339 BC511
- 1504 SC300 512GB M.2 2280 SATA Solid State Drive
+ 1504 PC400 NVMe SSD
1527 PC401 NVMe Solid State Drive 256GB
- 174a Gold P31 SSD
+ 174a Gold P31/PC711 NVMe Solid State Drive
+ 2204 960GB TLC PCIe Gen3 x4 NVMe M.2 22110
243b PE6110 NVMe Solid State Drive
1c5c 0100 PE6110 NVMe Solid State Drive
2839 PE8000 Series NVMe Solid State Drive
@@ -23842,8 +24227,17 @@
1028 214a DC NVMe PE8010 RI U.2 7.68TB
1c5c 0100 PE8000 Series NVMe Solid State Drive
2849 PE81x0 U.2/3 NVMe Solid State Drive
+ 1c5c 0101 PE81x0 U.2/3 NVMe Solid State Drive
1c5f Beijing Memblaze Technology Co. Ltd.
000d PBlaze5 520/526
+ 1c5f 0220 NVMe SSD PBlaze5 520 1920G AIC
+ 1c5f 0221 NVMe SSD PBlaze5 520 1920G 2.5" U.2
+ 1c5f 0230 NVMe SSD PBlaze5 520 3840G AIC
+ 1c5f 0231 NVMe SSD PBlaze5 520 3840G 2.5" U.2
+ 1c5f 4220 NVMe SSD PBlaze5 526 1600G AIC
+ 1c5f 4221 NVMe SSD PBlaze5 526 1600G 2.5" U.2
+ 1c5f 4230 NVMe SSD PBlaze5 526 3200G AIC
+ 1c5f 4231 NVMe SSD PBlaze5 526 3200G 2.5" U.2
000e PBlaze6 6530
1c5f 0b20 NVMe SSD PBlaze6 6530 1920G AIC
1c5f 0b21 NVMe SSD PBlaze6 6530 1920G 2.5" U.2
@@ -23851,13 +24245,25 @@
1c5f 0b31 NVMe SSD PBlaze6 6530 3840G 2.5" U.2
1c5f 0b40 NVMe SSD PBlaze6 6530 7680G AIC
1c5f 0b41 NVMe SSD PBlaze6 6530 7680G 2.5" U.2
- 1c5f 4b20 NVMe SSD PBlaze6 6530 1600G AIC
- 1c5f 4b21 NVMe SSD PBlaze6 6530 1600G 2.5" U.2
- 1c5f 4b30 NVMe SSD PBlaze6 6530 3200G AIC
- 1c5f 4b31 NVMe SSD PBlaze6 6530 3200G 2.5" U.2
- 1c5f 4b40 NVMe SSD PBlaze6 6530 6400G AIC
- 1c5f 4b41 NVMe SSD PBlaze6 6530 6400G 2.5" U.2
+ 1c5f 1331 NVMe SSD PBlaze6 6531 3840G 2.5" U.2
+ 1c5f 1341 NVMe SSD PBlaze6 6531 7680G 2.5" U.2
+ 1c5f 4b20 NVMe SSD PBlaze6 6536 1600G AIC
+ 1c5f 4b21 NVMe SSD PBlaze6 6536 1600G 2.5" U.2
+ 1c5f 4b30 NVMe SSD PBlaze6 6536 3200G AIC
+ 1c5f 4b31 NVMe SSD PBlaze6 6536 3200G 2.5" U.2
+ 1c5f 4b40 NVMe SSD PBlaze6 6536 6400G AIC
+ 1c5f 4b41 NVMe SSD PBlaze6 6536 6400G 2.5" U.2
+ 1c5f 5331 NVMe SSD PBlaze6 6537 3200G 2.5" U.2
+ 1c5f 5341 NVMe SSD PBlaze6 6537 6400G 2.5" U.2
003d PBlaze5 920/926
+ 1c5f 0a30 NVMe SSD PBlaze5 920 3840G AIC
+ 1c5f 0a31 NVMe SSD PBlaze5 920 3840G 2.5" U.2
+ 1c5f 0a40 NVMe SSD PBlaze5 920 7680G AIC
+ 1c5f 0a41 NVMe SSD PBlaze5 920 7680G 2.5" U.2
+ 1c5f 4a30 NVMe SSD PBlaze5 926 3200G AIC
+ 1c5f 4a31 NVMe SSD PBlaze5 926 3200G 2.5" U.2
+ 1c5f 4a40 NVMe SSD PBlaze5 926 6400G AIC
+ 1c5f 4a41 NVMe SSD PBlaze5 926 6400G 2.5" U.2
003e PBlaze6 6920
1c5f 0a31 NVMe SSD PBlaze6 6920 3840GB 2.5" U.2
1c5f 0a41 NVMe SSD PBlaze6 6920 7680GB 2.5" U.2
@@ -23905,10 +24311,12 @@
0002 Clarett
1cb8 Dawning Information Industry Co., Ltd.
1cc1 ADATA Technology Co., Ltd.
+ 33f8 IM2P33F8ABR1 NVMe SSD
+ 5350 XPG GAMMIX S50 NVMe SSD
# 256GB NVMe SSD
5766 ADATA XPG GAMMIXS1 1L Media
8201 XPG SX8200 Pro PCIe Gen3x4 M.2 2280 Solid State Drive
-1cc4 Union Memory (Shenzhen)
+1cc4 Shenzhen Unionmemory Information System Ltd.
1203 NVMe SSD Controller UHXXXa series
1cc4 a121 NVMe SSD UHXXXa series U.2 960GB
1cc4 a122 NVMe SSD UHXXXa series U.2 1920GB
@@ -23919,10 +24327,14 @@
1cc4 a212 NVMe SSD UHXXXa series U.2 1600GB
1cc4 a213 NVMe SSD UHXXXa series U.2 3200GB
1cc4 a214 NVMe SSD UHXXXa series U.2 6400GB
+ 1cc4 e122 VNMe SSD UH711a series U.2 1920GB
+ 1cc4 e123 VNMe SSD UH711a series U.2 3840GB
+ 1cc4 e124 VNMe SSD UH711a series U.2 7680GB
17ab NVMe 256G SSD device
6303 AM630 PCIe 4.0 x4 NVMe SSD Controller
1cc5 Embedded Intelligence, Inc.
- 0100 CAN-PCIe-02
+ 0100 PCIe-CAN-02 Dual CAN bus (9-pin male). PCI Express x1.
+ 0101 PCIe-CAN-01 Single CAN bus (9-pin male). PCI Express x1.
1cc7 Radian Memory Systems Inc.
0200 RMS-200
0250 RMS-250
@@ -23966,11 +24378,16 @@
1d00 Pure Storage
1d05 Tongfang Hongkong Limited
1d0f Amazon.com, Inc.
+ 7064 NeuronDevice (Inferentia)
+ 7164 NeuronDevice (Trainium)
+ 1d0f 0000 Trainium
+ 7264 NeuronDevice (Inferentia2)
8061 NVMe EBS Controller
cd01 NVMe SSD Controller
ec20 Elastic Network Adapter (ENA)
efa0 Elastic Fabric Adapter (EFA)
efa1 Elastic Fabric Adapter (EFA)
+ efa2 Elastic Fabric Adapter (EFA)
1d17 Zhaoxin
070f ZX-100 PCI Express Root Port
0710 ZX-100/ZX-200 PCI Express Root Port
@@ -23980,14 +24397,14 @@
0714 ZX-100/ZX-200 PCI Express Root Port
0715 ZX-100/ZX-200 PCI Express Root Port
0716 ZX-D PCI Express Root Port
- 0717 ZX-D/ZX-E PCI Express Root Port
- 0718 ZX-D/ZX-E PCI Express Root Port
- 0719 ZX-D/ZX-E PCI Express Root Port
- 071a ZX-D/ZX-E PCI Express Root Port
- 071b ZX-D/ZX-E PCI Express Root Port
- 071c ZX-D/ZX-E PCI Express Root Port
- 071d ZX-D/ZX-E PCI Express Root Port
- 071e ZX-D/ZX-E PCI Express Root Port
+ 0717 KX-5000/KX-6000/KX-6000G Express Root Port
+ 0718 KX-5000/KX-6000/KX-6000G Express Root Port
+ 0719 KX-5000/KX-6000/KX-6000G Express Root Port
+ 071a KX-5000/KX-6000/KX-6000G Express Root Port
+ 071b KX-5000/KX-6000/KX-6000G Express Root Port
+ 071c KX-5000/KX-6000/KX-6000G Express Root Port
+ 071d KX-5000/KX-6000/KX-6000G Express Root Port
+ 071e KX-5000/KX-6000/KX-6000G Express Root Port
071f ZX-200 Upstream Port of PCI Express Switch
0720 ZX-200 PCIE RC6 controller
0721 ZX-200 Downstream Port of PCI Express Switch
@@ -23995,42 +24412,47 @@
1000 ZX-D Standard Host Bridge
1001 ZX-D/ZX-E Miscellaneous Bus
1003 ZX-E Standard Host Bridge
+ 1006 KX-6000G Standard Host Bridge
3001 ZX-100 Standard Host Bridge
300a ZX-100 Miscellaneous Bus
- 3038 ZX-100/ZX-200/ZX-E Standard Universal PCI to USB Host Controller
- 3104 ZX-100/ZX-200/ZX-E Standard Enhanced PCI to USB Host Controller
- 31b0 ZX-100/ZX-D Standard Host Bridge
- 31b1 ZX-100/ZX-D Standard Host Bridge
- 31b2 ZX-100/ZX-D DRAM Controller
- 31b3 ZX-100/ZX-D Power Management Controller
- 31b4 ZX-100/ZX-D I/O APIC
- 31b5 ZX-100/ZX-D Scratch Device
- 31b7 ZX-100/ZX-D/ZX-E Standard Host Bridge
+ 3038 ZX-100/ZX-200/KX-6000/KX-6000G Standard Universal PCI to USB Host Controller
+ 3104 ZX-100/ZX-200/KX-6000/KX-6000G Standard Enhanced PCI to USB Host Controller
+ 31b0 ZX-100/KX-5000/KX-6000/KX-6000G Standard Host Bridge
+ 31b1 ZX-100/KX-5000/KX-6000/KX-6000G Standard Host Bridge
+ 31b2 ZX-100/KX-5000/KX-6000/KX-6000G DRAM Controller
+ 31b3 ZX-100/KX-5000/KX-6000/KX-6000G Power Management Controller
+ 31b4 ZX-100/KX-5000/KX-6000/KX-6000G I/O APIC
+ 31b5 ZX-100/KX-5000/KX-6000/KX-6000G Scratch Device
+ 31b7 ZX-100/KX-5000/KX-6000/KX-6000G Standard Host Bridge
31b8 ZX-100/ZX-D PCI to PCI Bridge
- 3288 ZX-100/ZX-D/ZX-E High Definition Audio Controller
- 345b ZX-100/ZX-D/ZX-E Miscellaneous Bus
+ 3288 ZX-100/KX-5000/KX-6000/KX-6000G High Definition Audio Controller
+ 345b ZX-100/KX-5000/KX-6000/KX-6000G Miscellaneous Bus
3a02 ZX-100 C-320 GPU
3a03 ZX-D C-860 GPU
3a04 ZX-E C-960 GPU
+ 3c02 KX-6000G DRAM Controller
+ 3d01 KX-6000G C-1080 GPU
9002 ZX-100/ZX-200 EIDE Controller
- 9003 ZX-100/ZX-E EIDE Controller
+ 9003 ZX-100/KX-6000/KX-6000G EIDE Controller
+ 9043 KX-6000G RAID Controller
9045 ZX-100/ZX-D/ZX-E RAID Accelerator 0
9046 ZX-D/ZX-E RAID Accelerator 1
- 9083 ZX-100/ZX-200/ZX-E StorX AHCI Controller
+ 9083 ZX-100/ZX-200/KX-6000/KX-6000G StorX AHCI Controller
9084 ZX-100 StorX AHCI Controller
9100 ZX-200 Cross bus
9101 ZX-200 Traffic Controller
9141 ZX-100 High Definition Audio Controller
9142 ZX-D High Definition Audio Controller
9144 ZX-E High Definition Audio Controller
+ 9145 KX-6000G High Definition Audio Controller
9180 ZX-200 Networking Gigabit Ethernet Adapter
9202 ZX-100 USB eXtensible Host Controller
9203 ZX-200 USB eXtensible Host Controller
- 9204 ZX-E USB eXtensible Host Controller
+ 9204 KX-6000/KX-6000G USB eXtensible Host Controller
9286 ZX-D eMMC Host Controller
- 9300 ZX-D/ZX-E eSPI Host Controller
+ 9300 ZX-100/KX-5000/KX-6000/KX-6000G eSPI Host Controller
95d0 ZX-100 Universal SD Host Controller
- f410 ZX-100/ZX-D/ZX-E PCI Com Port
+ f410 ZX-100/KX-5000/KX-6000/KX-6000G PCI Com Port
1d18 RME
0001 Fireface UFX+
# acquired by Intel
@@ -24076,10 +24498,16 @@
0001 AQC107 NBase-T/IEEE 802.3bz Ethernet Controller [AQtion]
00b1 AQC100 10G Ethernet MAC controller [AQtion]
07b1 AQC107 NBase-T/IEEE 802.3bz Ethernet Controller [AQtion]
+# Older revision of QNAP QM2 M.2 2280 PCIe SSD & 10GbE Expansion Card
+ 1baa 07b1 QM2-2P10G1TA [QXG 10GbE Network Adapter]
+# Newer revision of QNAP QM2 M.2 2280 PCIe SSD & 10GbE Expansion Card
+ 1baa 07b2 QM2-2P10G1TA [QM2 Expansion Adapter]
08b1 AQC108 NBase-T/IEEE 802.3bz Ethernet Controller [AQtion]
11b1 AQC111 NBase-T/IEEE 802.3bz Ethernet Controller [AQtion]
12b1 AQC112 NBase-T/IEEE 802.3bz Ethernet Controller [AQtion]
87b1 AQC107 NBase-T/IEEE 802.3bz Ethernet Controller [AQtion]
+ 94c0 AQC113CS NBase-T/IEEE 802.3bz Ethernet Controller [AQtion]
+ 1043 87f5 ProArt X570-CREATOR WIFI
d107 AQC107 NBase-T/IEEE 802.3bz Ethernet Controller [AQtion]
1043 8741 XG-C100C
d108 AQC108 NBase-T/IEEE 802.3bz Ethernet Controller [AQtion]
@@ -24117,6 +24545,10 @@
101d AR-ARK-NIC [Arkville ArkNIC Kernel Path Device]
101e AR-ARKA-FX1 [Arkville 64B DPDK Data Mover for Agilex R-Tile]
101f AR-TK242 [2x100GbE Packet Capture Device]
+ 1020 AR-GP-PF [General-Purpose Physical Function]
+ 1021 AR-MGMT-PF [Board-Generic Management Physical Function]
+ 1022 AR-ARKA-FX2 [Arkville 128B DPDK Data Mover for Agilex]
+ 1023 AR-BD-FX1 [BufferDirect Zero-Bounce Data Motion Endpoint]
4200 A5PL-E1-10GETI [10 GbE Ethernet Traffic Instrument]
1d72 Xiaomi
1d78 DERA Storage
@@ -24133,6 +24565,52 @@
1d78 3103 D5457 U.2 1.6TB NVMe SSD
1d78 3105 D5457 U.2 3.2TB NVMe SSD
1d78 3107 D5457 U.2 6.4TB NVMe SSD
+ 1d78 3108 D5437 U.2 7.68TB NVMe SSD
+ 1d78 5003 D5447 HHHL 1.6TB NVMe SSD
+ 1d78 5004 D5427 HHHL 1.92TB NVMe SSD
+ 1d78 5005 D5447 HHHL 3.2TB NVMe SSD
+ 1d78 5006 D5427 HHHL 3.84TB NVMe SSD
+ 1d78 5007 D5447 HHHL 6.4TB NVMe SSD
+ 1d78 5008 D5427 HHHL 7.68TB NVMe SSD
+ 1d78 5103 D5447 U.2 1.6TB NVMe SSD
+ 1d78 5105 D5447 U.2 3.2TB NVMe SSD
+ 1d78 5106 AF3UP34DTCUN3T8B SSD
+ 1d78 5107 D5447 U.2 6.4TB NVMe SSD
+ 1d78 5114 D5427 U.2 1.92TB NVMe SSD
+ 1d78 5116 D5427 U.2 3.84TB NVMe SSD
+ 1d78 5118 D5427 U.2 7.68TB NVMe SSD
+ 1d78 8107 D5457 U.2 6.4TB NVMe SSD
+ 1513 DERA MENG NVMe Controller
+ 1d78 6015 D6456 HHHL 3.2TB NVMe SSD
+ 1d78 6016 D6436 HHHL 3.84TB NVMe SSD
+ 1d78 6017 D6456 HHHL 6.4TB NVMe SSD
+ 1d78 6018 D6436 HHHL 7.68TB NVMe SSD
+ 1d78 6105 D6457 U.2 3.2TB NVMe SSD
+ 1d78 6106 D6437 U.2 3.84TB NVMe SSD
+ 1d78 6107 D6457 U.2 6.4TB NVMe SSD
+ 1d78 6108 D6437 U.2 7.68TB NVMe SSD
+ 1d78 6115 D6456 U.2 3.2TB NVMe SSD
+ 1d78 6116 D6436 U.2 3.84TB NVMe SSD
+ 1d78 6117 D6456 U.2 6.4TB NVMe SSD
+ 1d78 6118 D6436 U.2 7.68TB NVMe SSD
+ 1515 DERA EMEI NVMe Controller
+ 1d78 7002 D7436 HHHL 1.92TB NVMe SSD
+ 1d78 7003 D7456 HHHL 1.6TB NVMe SSD
+ 1d78 7004 D7436 HHHL 3.84TB NVMe SSD
+ 1d78 7005 D7456 HHHL 3.2TB NVMe SSD
+ 1d78 7007 D7456 HHHL 6.4TB NVMe SSD
+ 1d78 7008 D7436 HHHL 7.68TB NVMe SSD
+ 1d78 7009 D7456 HHHL 12.8TB NVMe SSD
+ 1d78 700a D7436 HHHL 15.36TB NVMe SSD
+ 1d78 7102 D7436 U.2 15mm 1.92TB NVMe SSD
+ 1d78 7103 D7456 U.2 15mm 1.6TB NVMe SSD
+ 1d78 7104 D7436 U.2 15mm 3.84TB NVMe SSD
+ 1d78 7105 D7456 U.2 15mm 3.2TB NVMe SSD
+ 1d78 7107 D7456 U.2 15mm 6.4TB NVMe SSD
+ 1d78 7108 D7436 U.2 15mm 7.68TB NVMe SSD
+ 1d78 7109 D7456 U.2 15mm 12.8TB NVMe SSD
+ 1d78 710a D7436 U.2 15mm 15.36TB NVMe SSD
+1d79 Transcend Information, Inc.
1d7c Aerotech, Inc.
# Fiber-optic HyperWire motion control bus from Aerotech.
0001 HyperWire Adapter
@@ -24145,6 +24623,7 @@
0100 RK3399 PCI Express Root Port
1808 RK1808 Neural Network Processor Card
3566 RK3568 Remote Signal Processor
+ 3588 RK3588
1d89 YEESTOR Microelectronics Co., Ltd
0280 PCIe NVMe SSD
1d8f Enyx
@@ -24191,12 +24670,18 @@
1da1 Teko Telecom S.r.l.
1da2 Sapphire Technology Limited
e26a Radeon R7 250
+ e445 Sapphire Radeon RX 6700
1da3 Habana Labs Ltd.
0001 HL-1000 AI Inference Accelerator [Goya]
+# PCIe accelerator card for Deep Learning inference tasks
+ 0030 Greco AI Inference Accelerator
# PCIe accelerator card for Deep Learning training tasks
1000 HL-2000 AI Training Accelerator [Gaudi]
# PCIe accelerator card for Deep Learning training tasks with secured firmware
1010 HL-2000 AI Training Accelerator [Gaudi secured]
+# PCIe accelerator card for Deep Learning training tasks
+ 1020 Gaudi2 AI Training Accelerator
+1da8 Corigine, Inc.
1dad Fungible
1db2 ATP ELECTRONICS INC
1db7 Phytium Technology Co., Ltd.
@@ -24204,6 +24689,7 @@
dc21 VPU Controller [X100 Series]
dc22 DC Controller [X100 Series]
dc23 I2S/DMA Controller [X100 Series]
+ dc24 NPU Controller [X100 Series]
dc26 SATA Controller [X100 Series]
dc27 USB Controller [X100 Series]
dc29 NANDFLASH Controller [X100 Series]
@@ -24222,12 +24708,20 @@
dc3a SWITCH Controller [X100 Series]
dc3c GPU_DMA Controller [X100 Series]
1dbb NGD Systems, Inc.
+1dbe INNOGRIT Corporation
+ 5636 NVMe DC SSD IG5636
+ 1dbe 0001 DONGTING-N1 DC SSD U.2
+ 1dbe 1001 DONGHU-Z1 DC ZNS SSD U.2
+ 5638 NVMe DC SSD IG5638
+ 1dbe 2001 DONGTING-N1 DC SSD U.2
+ 1dbe 3001 DONGHU-Z1 DC ZNS SSD U.2
1dbf Guizhou Huaxintong Semiconductor Technology Co., Ltd
0401 StarDragon4800 PCI Express Root Port
1dc5 FADU Inc.
1dcd Liqid Inc.
1dcf Beijing Sinead Technology Co., Ltd.
1dd3 Sage Microelectronics Corp.
+1dd4 Swissbit AG
1dd8 Pensando Systems
0002 DSC2 Elba Upstream Port
1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card
@@ -24418,6 +24912,7 @@
1dfc JSC NT-COM
1181 TDM 8 Port E1/T1/J1 Adapter
1e0f KIOXIA Corporation
+ 0001 NVMe SSD Controller BG4
0007 NVMe SSD Controller Cx6
1028 2078 DC NVMe CD6 RI 960GB
1028 2079 DC NVMe CD6 RI 1.92TB
@@ -24452,6 +24947,9 @@
1028 2190 DC NVMe CD7 RI 7.68TB
1028 2191 DC NVMe SED CD7 RI 15.36TB
1028 2192 DC NVMe CD7 RI 15.36TB
+ 1028 2193 NVMe CD7 E3.S 1.92TB
+ 1028 2194 NVMe CD7 E3.S 3.84TB
+ 1028 2195 NVMe CD7 E3.S 7.68TB
1e17 Arnold & Richter Cine Technik GmbH & Co. Betriebs KG
1e24 Squirrels Research Labs
0101 Acorn CLE-101
@@ -24543,7 +25041,9 @@
1e3b 008b Enterprise NVMe SSD HHHL 1.6TB (H3900)
1e3b 0091 Enterprise NVMe SSD HHHL 0.75TB (H3900)
1e3d Burlywood, Inc
+1e44 Valve Software
1e49 Yangtze Memory Technologies Co.,Ltd
+ 0021 ZHITAI TiPro5000 NVMe SSD
0041 ZHITAI TiPro7000
# YMTC PCIe/NVMe SSD
1013 PC210
@@ -24558,6 +25058,7 @@
# Associative Processing Unit (APU)
0010 APU [Leda]
1e4c 0120 SE120
+1e50 IP3 Tech (HK) Limited
1e57 Beijing Panyi Technology Co., Ltd
0100 The device has already been deleted.
0000 0100 PY8800 64GB Accelerator
@@ -24568,35 +25069,43 @@
7010 AI controller A7010
1e60 Hailo Technologies Ltd.
2864 Hailo-8 AI Processor
+1e67 Untether AI
+ 0002 runAI200 AI Inference Accelerator
1e68 Jiangsu Xinsheng Intelligent Technology Co., Ltd
1e6b Axiado Corp.
1e7b Dataland
1e7c Brainchip Inc
bca1 AKD1000 Neural Network Coprocessor [Akida]
+1e7e 9034 Pliops-Data Processor [XDP1.0]
1e81 Ramaxel Technology(Shenzhen) Limited
1203 NVMe SSD Controller UHXXXa series
1e81 a121 NVMe SSD UHXXXa series U.2 960GB
1e81 a122 NVMe SSD UHXXXa series U.2 1920GB
- 1e81 a123 NVMe SSD UHXXXa series U.2 3840GB
- 1e81 a124 NVMe SSD UHXXXa series U.2 7680GB
+ 1e81 a123 NVMe SSD UHXXXa series U.2 3840GBÂ
+ 1e81 a124 NVMe SSD UHXXXa series U.2 7680GBÂ
1e81 a125 NVMe SSD UHXXXa series U.2 15360GB
- 1e81 a211 NVMe SSD UHXXXa series U.2 800GBÂ
- 1e81 a212 NVMe SSD UHXXXa series U.2 1600GB
- 1e81 a213 NVMe SSD UHXXXa series U.2 3200GB
- 1e81 a214 NVMe SSD UHXXXa series U.2 6400GB
+ 1e81 a211 NVMe SSD UHXXXa series U.2 800GBÂÂ
+ 1e81 a212 NVMe SSD UHXXXa series U.2 1600GBÂ
+ 1e81 a213 NVMe SSD UHXXXa series U.2 3200GBÂ
+ 1e81 a214 NVMe SSD UHXXXa series U.2 6400GBÂ
+ 1e81 f123 NVMe SSD TP6500 series U.2 3840GB
+1e83 Huaqin Technology Co.Ltd
1e85 Heitec AG
1e89 ID Quantique SA
0002 Quantis-PCIe-40M
0003 Quantis-PCIe-240M
+1e93 Beijing Bytedance Network Technology Co., Ltd.
# aka SED Systems
1e94 Calian SED
1e95 Solid State Storage Technology Corporation
- 1002 NVMe Datacenter LJ1 SSD [3DNAND, Rainier Controller]
+ 1002 NVMe SSD [3DNAND] 2.5" U.2 (LJ1)
+ 1e95 1101 NVMe SSD [3DNAND] 2.5" U.2 (LJ1)
1ea0 5636 TP1500 Series U.2 NVMe Datacenter SSD
1e9f Lynxi Technologies Co., Ltd.
1ea0 Tencent Technology (Shenzhen) Company Limited
2a16 Cloud Intelligent Inference Controller
2a18 Video Transcode Controller
+ 2a20 Cloud Intelligent Inference and Training Controller
1ea7 Intelliprop, Inc
223a Typhon+ PCIe to Gen-Z Bridge
224a IPA-PE224A CXL to Gen-Z Bridge [Sphinx]
@@ -24613,19 +25122,71 @@
3401 SSD Contoller
1ebd EMERGETECH Company Ltd.
0101 Seirios 2063 Video Codec
+1ec8 Innosilicon Co Ltd
+ 8800 Fantasy I
+ 1ec8 12a2 Fantasy I Device
+ 9800 Fantasy II
+ 1ec8 12a2 Fantasy II Device
+ 9802 Fantasy II
+ 1ec8 12a2 Fantasy II Device
+ 9804 Fantasy II
+ 1ec8 12a2 Fantasy II Device
+1ec9 Wingtech Group(HongKong)Limited
1ed2 FuriosaAI, Inc.
0000 Warboy
1ed3 Yeston
1ed5 Moore Threads Technology Co.,Ltd
0100 MTT S10
- 0101 MTT S30
+ 0101 MTT S10
+ 0102 MTT S30
+ 0105 MTT S50
+ 0106 MTT S60
+ 0111 MTT S100
+ 0121 MTT S1000M
+ 0122 MTT S1000
+ 0123 MTT S2000
+ 01ff MTT HDMI/DP Audio
+ 0200 MTT S80 Engineering Sample
+ 0201 MTT S80
+ 0202 MTT S70
+ 0203 G2D10
+ 0211 G2D40
+ 0221 G2S80
+ 0222 MTT S3000
+ 0223 G2S4
+ 0251 G2N10
+ 02ff MTT HDMI/DP Audio
1ed8 Digiteq Automotive
0101 FG4 PCIe Frame Grabber
1ed9 Myrtle.ai
+1ee1 Suzhou Kuhan Information Technologies
+ 0050 Aurora NVMe SSD Controller
+ 1ee1 0009 Airglow A430 NVMe SSD U.2 1.6TB
+ 1ee1 000a Airglow A430 NVMe SSD U.2 3.2TB
+ 1ee1 000b Airglow A430 NVMe SSD U.2 4.8TB
+1ee4 PETAIO INC
+ 1180 P8118 U.2 Single Port SSD
1ee9 SUSE LLC
1eec Viscore Technologies Ltd
0102 VSE250231S Dual-port 10Gb/25Gb Ethernet PCIe
1eec VSE250231S Dual-port 10Gb/25Gb Ethernet PCIe
+1eed XDX Computing Technology Ltd.
+ 10a0 XDX110 Graphic/VGA Controller
+ 10a1 XDX110 Audio Controller
+ 1140 XDX120 Graphic/VGA Controller
+ 1141 XDX120 Audio Controller
+ 1320 XDX150 Graphic/VGA Controller
+ 1321 XDX150 Audio Controller
+ 13c0 XDX160 Graphic/VGA Controller
+ 13c1 XDX160 Audio Controller
+ 13d0 XDX161 Graphic/VGA Controller
+ 13d1 XDX161 Audio Controller
+ 1500 XDX180 Graphic/VGA Controller
+ 1501 XDX180 Audio Controller
+ 15a0 XDX190 Graphic/VGA Controller
+ 15a1 XDX190 Audio Controller
+1ef6 GrAI Matter Labs
+1ef7 Shenzhen Gunnir Technology Development Co., Ltd
1efb Flexxon Pte Ltd
1f02 Beijing Dayu Technology
1f03 Shenzhen Shichuangyi Electronics Co., Ltd
@@ -24636,6 +25197,10 @@
5220 IG5220-Based NVMe SSD
5236 IG5236-Based NVMe SSD
5636 IG5636-Based NVMe SSD
+1f24 xFusion Digital Technologies Co., Ltd.
+ 1058 EP500/EP600 NVMe SSD
+ 1f24 1114 EP500 NVMe SSD(RI)
+ 1f24 1115 EP600 NVMe SSD(MU)
1f2f China Mobile (Hangzhou) Information Technology Co.Ltd.
1513 DERA MENG NVMe Controller
1f2f 6113 KM660 U.2 1.6TB NVMe SSD
@@ -24643,6 +25208,54 @@
1f2f 6115 KM660 U.2 3.2TB NVMe SSD
1f2f 6116 KM560 U.2 3.84TB NVMe SSD
1f2f 6118 KM560 U.2 7.68TB NVMe SSD
+1f3f 3SNIC Ltd
+ 2100 SSSRAID SAS/SATA HBA
+ 1f3f 0120 HBA 32 Ports
+ 1f3f 0125 HBA 40 Ports
+ 1f3f 0180 HBA 16 Ports
+ 1f3f 0185 HBA 8 Ports
+ 2200 SSSRAID RAID controller
+ 1f3f 0185 RAID Controller 16 Ports with 2G Cache
+ 1f3f 01a1 RAID Controller 40 Ports with 2G Cache
+ 1f3f 01a4 RAID Controller 16 Ports with 4G Cache
+ 1f3f 01a8 RAID Controller 32 Ports with 4G Cache
+ 1f3f 01ad RAID Controller 40 Ports with 4G Cache
+ 9001 SSSNIC Ethernet VF
+ 1f3f 1000 Ethernet VF
+ 9002 SSSNIC Ethernet VF Hyper-V
+ 1f3f 1000 Ethernet VF Hyper-V
+ 9003 SSSNIC Ethernet SDI VF
+ 1f3f 1000 Ethernet SDI VF
+ 9004 SSSNIC Ethernet SDI VF Hyper-V
+ 1f3f 1000 Ethernet SDI VF Hyper-V
+ 9008 SSSFC VF
+ 1f3f 1000 3SFC VF
+ 9009 SSSFC VF Hyper-V
+ 1f3f 1000 3SFC VF Hyper-V
+ 9010 SSSFC FC Controller
+ 1f3f 0041 Dual Port 16GE FC to PCIe Gen4 x16 Adapter
+ 1f3f 0061 Dual Port 32GE FC to PCIe Gen4 x16 Adapter
+ 9020 SSSNIC Ethernet Network Adapter
+ 1f3f 0051 Dual Port 25GE Ethernet Network Adapter
+ 1f3f 0052 Quad Port 25GE Ethernet Network Adapter
+ 1f3f 00a1 Dual Port 100GE Ethernet Network Adapter
+ 9030 SSSNIC IPU
+ 1f3f 0051 Dual Port 25GE IPU
+ 9031 SSSNIC SDI5.0
+ 1f3f 0051 Dual Port 25GE SDI5.0lite
+ 1f3f 00a1 Dual Port 100GE SDI5.0
+ 9032 SSSNIC SDI5.1
+ 1f3f 00a1 Dual Port 100GE SDI5.1
+1f40 Netac Technology Co.,Ltd
+1f44 VVDN Technologies Private Limited
+1f4b Axera Semiconductor Co., Ltd
+1f52 MangoBoost Inc.
+1f60 Accelecom
+ 0001 XELE-NIC 25K5
+ 0054 XELE-NIC 25K5
+1faa Hexaflake (Shanghai) Information Technology Co., Ltd.
+ 0c10 Compass C10 PF
+ 0c11 Compass C10 VF
1fab Unifabrix Ltd.
0000 Nexus Alpha IVPU
# nee Tumsan Oy
@@ -25156,6 +25769,8 @@
0d10 SB-365x Motion Feedback Device
2f00 SB-3642 Motion Feedback Device
3000 SB-3644 Motion Feedback Device
+4e58 Nutanix, Inc.
+ 0001 Virtual NVMe Controller
5045 University of Toronto
4243 BLASTbus PCI Interface Card v1
5046 GemTek Technology Corporation
@@ -25388,9 +26003,11 @@
1800 CooVOX TDM BRI Module
6766 Glenfly Tech Co., Ltd.
3d00 Arise-GT-10C0
- 3d02 Arise 1020
+ 3d02 Arise1020
+ 3d03 Arise-GT-1040
+ 3d04 Arise1010
3d40 Arise-GT-10C0 High Definition Audio Controller
- 3d41 Arise 1020 High Definition Audio Controller
+ 3d41 Arise1020 High Definition Audio Controller
6899 ZT Systems
# nee Qumranet
6900 Red Hat, Inc.
@@ -25401,6 +26018,7 @@
7284 HT OMEGA Inc.
7357 IOxOS Technologies SA
7910 7910 [Althea]
+7377 Shenzhen Colorful Yugong Technology and Development Co.
7401 EndRun Technologies
e100 PTP3100 PCIe PTP Slave Clock
7470 TP-LINK Technologies Co., Ltd.
@@ -25408,6 +26026,7 @@
0082 HQ SSD 1TB
0083 HQ SSD 2TB M.2 NVMe
7604 O.N. Electronic Co Ltd.
+78c0 Herrick Technology Laboratories, Inc. [HTL]
7bde MIDAC Corporation
7fed PowerTV
8008 Quancom Electronic GmbH
@@ -25702,6 +26321,7 @@
# uninitialized SRCU32 RAID Controller
061f 80303 I/O Processor
0684 H470 Chipset LPC/eSPI Controller
+ 0685 Z490 Chipset LPC/eSPI Controller
0687 Q470 Chipset LPC/eSPI Controller
068d Comet Lake LPC Controller
06a3 Comet Lake PCH SMBus Controller
@@ -25712,6 +26332,8 @@
06ab Comet Lake PCH Serial IO SPI Controller #1
06ac Comet Lake PCI Express Root Port #21
06b0 Comet Lake PCI Express Root Port #9
+ 06ba Comet Lake PCI Express Root Port #1
+ 06bb Comet Lake PCI Express Root Port #4
06bd Comet Lake PCIe Port #6
06c0 Comet Lake PCI Express Root Port #17
06c8 Comet Lake PCH cAVS
@@ -26131,6 +26753,14 @@
0960 80960RP (i960RP) Microprocessor/Bridge
0962 80960RM (i960RM) Bridge
0964 80960RP (i960RP) Microprocessor/Bridge
+ 0998 Ice Lake IEH
+ 09a2 Ice Lake Memory Map/VT-d
+ 09a3 Ice Lake RAS
+ 09a4 Ice Lake Mesh 2 PCIe
+ 09a6 Ice Lake MSM
+ 09a7 Ice Lake PMON MSM
+ 09ab RST VMD Managed Controller
+ 09c4 PAC with Intel Arria 10 GX FPGA
0a03 Haswell-ULT Thermal Subsystem
0a04 Haswell-ULT DRAM Controller
17aa 2214 ThinkPad X240
@@ -26204,8 +26834,10 @@
1028 1fe7 Express Flash NVMe 3.2TB 2.5" U.2 (P4600)
1028 1fe8 Express Flash NVMe 2.0TB HHHL AIC (P4600)
1028 1fe9 Express Flash NVMe 4.0TB HHHL AIC (P4600)
+ 0b00 Ice Lake CBDMA [QuickData Technology]
0b26 Thunderbolt 4 Bridge [Goshen Ridge 2020]
0b27 Thunderbolt 4 USB Controller [Goshen Ridge 2020]
+ 0b2b PAC with Intel Stratix 10 SX FPGA [FPGA PAC D5005]
0b60 NVMe DC SSD [3DNAND, Sentinel Rock Controller]
1028 2060 NVMe SED MU U.2 1.6TB (P5600)
1028 2061 NVMe SED MU U.2 3.2TB (P5600)
@@ -26324,6 +26956,7 @@
0d36 Crystal Well Integrated Graphics Controller
0d4c Ethernet Connection (11) I219-LM
0d4d Ethernet Connection (11) I219-V
+ 8086 0d4d Ethernet Connection (11) I219-V
0d4e Ethernet Connection (10) I219-LM
0d4f Ethernet Connection (10) I219-V
0d53 Ethernet Connection (12) I219-LM
@@ -26340,8 +26973,10 @@
8086 0010 Ethernet Network Adapter I710-T4L for OCP 3.0
8086 401a Ethernet Network Adapter I710-T4L
8086 401b Ethernet Network Adapter I710-T4L for OCP 3.0
+ 0dd5 Ethernet Adaptive Virtual Function
0dda Ethernet Connection X722 for 10GbE SFP+
- 1bd4 0076 Ethernet Connection X722 for 10GbE SFP+
+ 1bd4 0076 Ethernet Connection F102IX722 for 10GbE SFP
+ 1bd4 0082 Ethernet Connection F102IX722 for 10GbE SFP
0e00 Xeon E7 v2/Xeon E5 v2/Core i7 DMI2
1028 04f7 Xeon E5 v2 on PowerEdge R320 server
15d9 066b X9SRL-F
@@ -27265,6 +27900,7 @@
1234 430MX - 82371MX Mobile PCI I/O IDE Xcelerator (MPIIX)
1235 430MX - 82437MX Mob. System Ctrlr (MTSC) & 82438MX Data Path (MTDP)
1237 440FX - 82441FX PMC [Natoma]
+ 01de fffe Propolis Virtual 440FX
1af4 1100 Qemu virtual machine
1239 82371FB PIIX IDE Interface
123b 82380PB PCI to PCI Docking Bridge
@@ -27279,6 +27915,8 @@
124e Ethernet Connection E823-L/X557-AT 10GBASE-T
124f Ethernet Connection E823-L 1GbE
1250 430HX - 82439HX TXC [Triton II]
+ 125b Ethernet Controller I226-LM
+ 125c Ethernet Controller I226-V
1360 82806AA PCI64 Hub PCI Bridge
1361 82806AA PCI64 Hub Controller (HRes)
8086 1361 82806AA PCI64 Hub Controller (HRes)
@@ -27371,6 +28009,8 @@
1bd4 001d 1G base-T QP EP014Ti1 Adapter
1bd4 0035 1G base-T QP EP014Ti1 Adapter
1bd4 0066 F014I350
+ 1bd4 008a F012I350
+ 1bd4 008d ENFI1100-T4
8086 0001 Ethernet Server Adapter I350-T4
8086 0002 Ethernet Server Adapter I350-T2
8086 0003 Ethernet Network Adapter I350-T4 for OCP NIC 3.0
@@ -27444,7 +28084,10 @@
1093 7706 Compact Vision System Ethernet Adapter
10a9 802c UV300 BaseIO single-port GbE
10a9 802d UV3000 BaseIO GbE Network
+ 17aa 1059 I210 Gigabit Network Connection
17aa 1100 ThinkServer Ethernet Server Adapter
+ 17aa 1509 I210 Gigabit Network Connection
+ 17aa 404d I210 PCIe 1Gb 1-Port RJ45 LOM
8086 0001 Ethernet Server Adapter I210-T1
8086 0002 Ethernet Server Adapter I210-T1
1536 I210 Gigabit Fiber Network Connection
@@ -27491,7 +28134,7 @@
8086 0001 Ethernet Server Bypass Adapter X520-SR2
8086 0002 Ethernet Server Bypass Adapter X520-LR2
1560 Ethernet Controller X540
- 1563 Ethernet Controller 10G X550T
+ 1563 Ethernet Controller X550
1028 1fa8 Ethernet 10G 4P X550/I350 rNDC
1028 1fa9 Ethernet 10G 4P X550 rNDC
1137 02b2 X550-TX 10 Gig LOM
@@ -27551,6 +28194,7 @@
1bd4 0056 Ethernet Network Adapter X710-BM2 for OCP NIC 3.0
1bd4 0065 F102IX710
1bd4 0074 Ethernet Network Adapter X710-BM2 for lldp
+ 1bd4 008b F102IX710
8086 0000 Ethernet Converged Network Adapter X710
8086 0001 Ethernet Converged Network Adapter X710-4
8086 0002 Ethernet Converged Network Adapter X710-4
@@ -27676,8 +28320,11 @@
8086 0008 Ethernet Network Adapter OCP XXV710-1
8086 0009 Ethernet 25G 2P XXV710 Adapter
8086 000a Ethernet 25G 2P XXV710 OCP
+ 8086 000c Ethernet Network Adapter XXV710-DA2 for OCP 3.0
+ 8086 000d Ethernet 25G 2P XXV710 OCP
8086 4001 Ethernet Network Adapter XXV710-2
1591 Ethernet Controller E810-C for backplane
+ 8086 bcce Ethernet Controller E810-C for Intel(R) Open FPGA Stack
1592 Ethernet Controller E810-C for QSFP
1137 02bf E810CQDA2 2x100 GbE QSFP28 PCIe NIC
193d 1050 NIC-ETH1060F-LP-2P 2x100GbE Ethernet PCIe Card
@@ -27692,9 +28339,14 @@
8086 000c Ethernet 100G 2P E810-C OCP
8086 000d Ethernet Network Adapter E810-L-Q2 for OCP 3.0
8086 000e Ethernet Network Adapter E810-2C-Q2
+ 8086 000f Ethernet Network Adapter E810-C-Q2T
8086 0010 Ethernet 100G 2P E810-C-stg Adapter
+ 8086 0011 Ethernet Network Adapter E810-C-Q1 for OCP3.0
+ 8086 0012 Ethernet 100G 2P E810-C-st Adapter
1593 Ethernet Controller E810-C for SFP
1137 02c3 E810XXVDA4 4x25/10 GbE SFP28 PCIe NIC
+ 1137 02e9 E810XXVDA4TG 4x25/10 GbE SFP28 PCIe NIC
+ 1137 02ea E810XXVDA4T 4x25/10 GbE SFP28 PCIe NIC
8086 0002 Ethernet Network Adapter E810-L-2
8086 0005 Ethernet Network Adapter E810-XXV-4
8086 0006 Ethernet Network Adapter E810-XXV-4
@@ -27707,6 +28359,8 @@
8086 000e Ethernet Network Adapter E810-XXV-4T
8086 000f Ethernet 25G 4P E810-XXV-stg Adapter
8086 0010 Ethernet 25G 4P E810-XXV-st Adapter
+ 8086 4010 Ethernet Network Adapter E810-XXV-4
+ 8086 4013 Ethernet Network Adapter E810-XXV-4 for OCP 3.0
1599 Ethernet Controller E810-XXV for backplane
8086 0001 Ethernet 25G 2P E810-XXV-k Mezz
159a Ethernet Controller E810-XXV for QSFP
@@ -27715,7 +28369,8 @@
1bd4 0057 Ethernet Network Adapter E810-XXVAM2
1bd4 0058 Ethernet Network Adapter E810-XXVAM2 for OCP 3.0
1bd4 006e Ethernet Network Adapter E810-XXVAM2 for BD
- 1eec 0102 VSE250241E Dual-port 10Gb/25Gb Ethernet PCIe
+ 1bd4 0083 Ethernet Network Adapter E810-XXVAM2 for lldp
+ 1eec 0102 VSE-225-41E Dual-port 10Gb/25Gb Etherent PCIe
8086 0001 Ethernet 25G 2P E810-XXV OCP
8086 0002 Ethernet 25G 2P E810-XXV Adapter
8086 0003 Ethernet Network Adapter E810-XXV-2
@@ -27723,6 +28378,7 @@
8086 4001 Ethernet Network Adapter E810-XXV-2
8086 4002 Ethernet Network Adapter E810-XXV-2 for OCP 3.0
8086 4003 Ethernet Network Adapter E810-XXV-2
+ 8086 4015 Ethernet Network Adapter E810-XXV-2 for OCP 3.0
15a0 Ethernet Connection (2) I218-LM
15a1 Ethernet Connection (2) I218-V
15a2 Ethernet Connection (3) I218-LM
@@ -27835,6 +28491,7 @@
8086 000a Ethernet Network Adapter X710-T4L for OCP 3.0
8086 000b Ethernet Network Adapter X710-T2L for OCP 3.0
8086 000c Ethernet Network Adapter X710-T2L for OCP 3.0
+ 8086 000d Ethernet 10G 2P X710-T2L-t OCP
8086 000f Ethernet Network Adapter X710-T2L for OCP 3.0
8086 4009 Ethernet Network Adapter X710-T2L
8086 4012 Ethernet Network Adapter X710-T4L for OCP 3.0
@@ -27879,6 +28536,12 @@
163d Broadwell-U Integrated Graphics
163e Broadwell-U Integrated Graphics
1889 Ethernet Adaptive Virtual Function
+ 188a Ethernet Connection E823-C for backplane
+ 188b Ethernet Connection E823-C for QSFP
+ 188c Ethernet Connection E823-C for SFP
+ 1028 0abd Ethernet Connection 25G 4P E823-C LOM
+ 188d Ethernet Connection E823-C/X557-AT 10GBASE-T
+ 188e Ethernet Connection E823-C 1GbE
1890 Ethernet Connection E822-C for backplane
1891 Ethernet Connection E822-C for QSFP
1892 Ethernet Connection E822-C for SFP
@@ -27914,6 +28577,7 @@
17aa 382a B51-80 Laptop
1908 Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor Host Bridge/DRAM Registers
1909 Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor PCIe Controller (x4)
+ 190b HD Graphics 510
190c Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor Host Bridge/DRAM Registers
1028 06d6 Latitude 7275 tablet
1028 06e6 Latitude 11 5175 2-in-1
@@ -27947,6 +28611,7 @@
1028 06e6 Latitude 11 5175 2-in-1
191f Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor Host Bridge/DRAM Registers
1921 HD Graphics 520
+ 1923 HD Graphics 535
1926 Iris Graphics 540
1927 Iris Graphics 550
192b Iris Graphics 555
@@ -28034,6 +28699,7 @@
1a1c Ethernet Connection (17) I219-LM
1a1d Ethernet Connection (17) I219-V
1a1e Ethernet Connection (16) I219-LM
+ 1028 0b10 Precision 3571
1a1f Ethernet Connection (16) I219-V
1a21 82840 840 [Carmel] Chipset Host Bridge (Hub A)
1a23 82840 840 [Carmel] Chipset AGP Bridge
@@ -29500,6 +30166,7 @@
25d4 5000V Chipset Memory Controller Hub
15d9 8680 X7DVL-E-O motherboard
25d8 5000P Chipset Memory Controller Hub
+ 103c 31fd ProLiant DL360 G5
15d9 9680 X7DBN Motherboard
8086 3476 S5000PSLSATA Server Board
25e2 5000 Series Chipset PCI Express x4 Port 2
@@ -29510,27 +30177,27 @@
25e7 5000 Series Chipset PCI Express x4 Port 7
25f0 5000 Series Chipset FSB Registers
1028 01bb PowerEdge 1955 FSB Registers
- 103c 31fd ProLiant DL140 G3
+ 103c 31fd ProLiant DL140 G3, DL360 G5
15d9 8680 X7DVL-E-O motherboard
15d9 9680 X7DBN Motherboard
8086 3476 S5000PSLSATA Server Board
25f1 5000 Series Chipset Reserved Registers
- 103c 31fd ProLiant DL140 G3
+ 103c 31fd ProLiant DL140 G3, DL360 G5
15d9 8680 X7DVL-E-O motherboard
15d9 9680 X7DBN Motherboard
8086 3476 S5000PSLSATA Server Board
25f3 5000 Series Chipset Reserved Registers
- 103c 31fd ProLiant DL140 G3
+ 103c 31fd ProLiant DL140 G3, DL360 G5
15d9 8680 X7DVL-E-O motherboard
15d9 9680 X7DBN Motherboard
8086 3476 S5000PSLSATA Server Board
25f5 5000 Series Chipset FBD Registers
- 103c 31fd ProLiant DL140 G3
+ 103c 31fd ProLiant DL140 G3, DL360 G5
15d9 8680 X7DVL-E-O motherboard
15d9 9680 X7DBN Motherboard
8086 3476 S5000PSLSATA Server Board
25f6 5000 Series Chipset FBD Registers
- 103c 31fd ProLiant DL140 G3
+ 103c 31fd ProLiant DL140 G3, DL360 G5
15d9 8680 X7DVL-E-O motherboard
15d9 9680 X7DBN Motherboard
8086 3476 S5000PSLSATA Server Board
@@ -29764,31 +30431,32 @@
2688 631xESB/632xESB/3100 Chipset UHCI USB Controller #1
1028 01bb PowerEdge 1955 onboard USB
1028 01f0 PowerEdge R900 onboard USB
- 103c 31fe ProLiant DL140 G3
+ 103c 31fe ProLiant DL140 G3, DL360 G5
15d9 8680 X7DVL-E-O motherboard
15d9 9680 X7DBN Motherboard
8086 3476 S5000PSLSATA Server Board
2689 631xESB/632xESB/3100 Chipset UHCI USB Controller #2
1028 01bb PowerEdge 1955 onboard USB
1028 01f0 PowerEdge R900 onboard USB
- 103c 31fe ProLiant DL140 G3
+ 103c 31fe ProLiant DL140 G3, DL360 G5
15d9 8680 X7DVL-E-O motherboard
15d9 9680 X7DBN Motherboard
8086 3476 S5000PSLSATA Server Board
268a 631xESB/632xESB/3100 Chipset UHCI USB Controller #3
1028 01f0 PowerEdge R900 onboard USB
- 103c 31fe ProLiant DL140 G3
+ 103c 31fe ProLiant DL140 G3, DL360 G5
15d9 8680 X7DVL-E-O motherboard
15d9 9680 X7DBN Motherboard
8086 3476 S5000PSLSATA Server Board
268b 631xESB/632xESB/3100 Chipset UHCI USB Controller #4
1028 01f0 PowerEdge R900 onboard USB
+ 103c 31fe ProLiant DL360 G5
15d9 8680 X7DVL-E-O motherboard
8086 3476 S5000PSLSATA Server Board
268c 631xESB/632xESB/3100 Chipset EHCI USB2 Controller
1028 01bb PowerEdge 1955 onboard USB
1028 01f0 PowerEdge R900 onboard USB
- 103c 31fe ProLiant DL140 G3
+ 103c 31fe ProLiant DL140 G3, DL360 G5
15d9 8680 X7DVL-E-O motherboard
15d9 9680 X7DBN Motherboard
8086 3476 S5000PSLSATA Server Board
@@ -29808,7 +30476,7 @@
15d9 9680 X7DBN Motherboard
8086 3476 S5000PSLSATA Server Board
269e 631xESB/632xESB IDE Controller
- 103c 31fe ProLiant DL140 G3
+ 103c 31fe ProLiant DL140 G3, DL360 G5
15d9 8680 X7DVL-E-O motherboard
15d9 9680 X7DBN Motherboard
2700 Optane SSD 900P Series
@@ -29822,7 +30490,7 @@
8086 3904 NVMe Datacenter SSD [Optane] x4 AIC (P4800X)
8086 3905 NVMe Datacenter SSD [Optane] 15mm 2.5" U.2 (P4800X)
2723 Wi-Fi 6 AX200
- 1a56 1654 Killer™ Wi-Fi 6 AX1650x (AX200NGW)
+ 1a56 1654 Killerâ„¢ Wi-Fi 6 AX1650x (AX200NGW)
8086 0084 Wi-Fi 6 AX200NGW
2725 Wi-Fi 6 AX210/AX211/AX411 160MHz
8086 0020 Wi-Fi 6 AX210 160MHz
@@ -31319,8 +31987,14 @@
31a2 Celeron/Pentium Silver Processor Integrated Sensor Solution
31a8 Celeron/Pentium Silver Processor USB 3.0 xHCI Controller
1849 31a8 Celeron/Pentium Silver Processor USB 3.0 xHCI Controller
- 31ac Celeron/Pentium Silver Processor Serial IO I2C Host Controller
- 31ae Celeron/Pentium Silver Processor Serial IO I2C Host Controller
+ 31ac Celeron/Pentium Silver Processor I2C 0
+ 31ae Celeron/Pentium Silver Processor I2C 1
+ 31b0 Celeron/Pentium Silver Processor I2C 2
+ 31b2 Celeron/Pentium Silver Processor I2C 3
+ 31b4 Celeron/Pentium Silver Processor I2C 4
+ 31b6 Celeron/Pentium Silver Processor I2C 5
+ 31b8 Celeron/Pentium Silver Processor I2C 6
+ 31ba Celeron/Pentium Silver Processor I2C 7
31bc Celeron/Pentium Silver Processor Serial IO UART Host Controller
31be Celeron/Pentium Silver Processor Serial IO UART Host Controller
31c0 Celeron/Pentium Silver Processor Serial IO UART Host Controller
@@ -31417,6 +32091,9 @@
3432 5520/5500/X58 Chipset QuickData Technology Device
3433 5520/5500/X58 Chipset QuickData Technology Device
3438 7500/5520/5500/X58 I/O Hub Throttle Registers
+ 3440 Ice Lake UPI Misc
+ 3441 Ice Lake UPI Link/Phy0
+ 3456 Ice Lake NorthPeak
347e Ice Lake Xeon Non-Transparent Bridge
3482 Ice Lake-LP LPC Controller
34a3 Ice Lake-LP SMBus Controller
@@ -31429,6 +32106,7 @@
34b7 Ice Lake-LP PCI Express Root Port #16
34ba Ice Lake-LP PCI Express Root Port #3
34bc Ice Lake-LP PCI Express Root Port #5
+ 34c4 Ice Lake-LP SD Host Controller
34c5 Ice Lake-LP Serial IO I2c Controller #4
34c6 Ice Lake-LP Serial IO I2c Controller #5
34c8 Ice Lake-LP Smart Sound Technology Audio Controller
@@ -32068,12 +32746,19 @@
3e92 CoffeeLake-S GT2 [UHD Graphics 630]
1028 0869 Vostro 3470
3e93 CoffeeLake-S GT1 [UHD Graphics 610]
+ 3e94 Coffee Lake-S GT2 [UHD Graphics P630]
3e96 CoffeeLake-S GT2 [UHD Graphics P630]
3e98 CoffeeLake-S GT2 [UHD Graphics 630]
+ 3e9a Coffee Lake-S GT2 [UHD Graphics P630]
3e9b CoffeeLake-H GT2 [UHD Graphics 630]
+ 3e9c Coffee Lake-S GT1 [UHD Graphics 610]
3ea0 WhiskeyLake-U GT2 [UHD Graphics 620]
1028 089e Inspiron 5482
+ 3ea1 Whiskey Lake-U GT1 [UHD Graphics 610]
3ea5 CoffeeLake-U GT3e [Iris Plus Graphics 655]
+ 3ea6 Coffee Lake-U GT3 [Iris Plus Graphics 645]
+ 3ea8 Coffee Lake-U GT3 [Iris Plus Graphics 655]
+ 3ea9 Coffee Lake-U GT2 [UHD Graphics 620]
3ec2 8th Gen Core Processor Host Bridge/DRAM Registers
1028 0869 Vostro 3470
1043 8694 PRIME H310M-D
@@ -32219,6 +32904,7 @@
43c8 Tiger Lake-H HD Audio Controller
43e0 Tiger Lake-H Management Engine Interface
43e8 Tiger Lake-H Serial IO I2C Controller #0
+ 43e9 Tiger Lake-H Serial IO I2C Controller #1
43ed Tiger Lake-H USB 3.2 Gen 2x1 xHCI Host Controller
43ef Tiger Lake-H Shared SRAM
43f0 Tiger Lake PCH CNVi WiFi
@@ -32226,36 +32912,68 @@
8086 0074 Wi-Fi 6 AX201 160MHz
8086 0264 Wireless-AC 9461
8086 02a4 Wireless-AC 9462
+ 43fc Tiger Lake-H Integrated Sensor Hub
444e Turbo Memory Controller
+ 4555 Elkhart Lake [UHD Graphics Gen11 16EU]
+ 4571 Elkhart Lake [UHD Graphics Gen11 32EU]
460d 12th Gen Core Processor PCI Express x16 Controller #1
461d Alder Lake Innovation Platform Framework Processor Participant
+ 1028 0b10 Precision 3571
461e Alder Lake-P Thunderbolt 4 USB Controller
+ 1028 0b10 Precision 3571
461f Alder Lake-P Thunderbolt 4 PCI Express Root Port #3
4626 Alder Lake-P Integrated Graphics Controller
+ 4628 Alder Lake-UP3 GT2 [UHD Graphics]
4629 12th Gen Core Processor Host Bridge/DRAM Registers
+ 462a AlderLake-P [UHD Graphics]
462f Alder Lake-P Thunderbolt 4 PCI Express Root Port #2
+ 4636 AlderLake-P [UHD Graphics]
+ 4638 AlderLake-P [UHD Graphics]
+ 463a AlderLake-P [UHD Graphics]
463d 12th Gen Core Processor PCI Express x4 Controller #2
463e Alder Lake-P Thunderbolt 4 NHI #0
+ 1028 0b10 Precision 3571
463f Alder Lake-P Thunderbolt 4 PCI Express Root Port #1
4641 12th Gen Core Processor Host Bridge/DRAM Registers
+ 1028 0b10 Precision 3571
464d 12th Gen Core Processor PCI Express x4 Controller #0
464f 12th Gen Core Processor Gaussian & Neural Accelerator
+ 1028 0b10 Precision 3571
4660 12th Gen Core Processor Host Bridge/DRAM Registers
+ 4668 12th Gen Core Processor Host Bridge/DRAM Registers
466d Alder Lake-P Thunderbolt 4 NHI #1
466e Alder Lake-P Thunderbolt 4 PCI Express Root Port #0
467d Platform Monitoring Technology
467f Volume Management Device NVMe RAID Controller
4680 AlderLake-S GT1
+ 4682 Alder Lake-S GT1 [UHD Graphics 730]
+ 4688 Alder Lake-HX GT1 [UHD Graphics 770]
+ 468a Alder Lake-S [UHD Graphics]
+ 468b Alder Lake-S [UHD Graphics]
+ 4690 Alder Lake-S GT1 [UHD Graphics 770]
+ 4692 Alder Lake-S GT1 [UHD Graphics 730]
+ 4693 Alder Lake-S GT1 [UHD Graphics 710]
46a0 AlderLake-P GT2
46a1 UHD Graphics
46a3 Alder Lake-P GT1 [UHD Graphics]
46a6 Alder Lake-P Integrated Graphics Controller
+ 46a8 Alder Lake-UP3 GT2 [Iris Xe Graphics]
+ 46aa Alder Lake-UP4 GT2 [Iris Xe Graphics]
+ 46b0 AlderLake-P [Iris Xe Graphics]
+ 46b1 AlderLake-P [Iris Xe Graphics]
+ 46b3 Alder Lake-UP3 GT1 [UHD Graphics]
+ 46b6 AlderLake-P [Iris Xe Graphics]
+ 46b8 AlderLake-P [Iris Xe Graphics]
+ 46ba AlderLake-P [Iris Xe Graphics]
46c0 AlderLake-M GT1
+ 46c1 AlderLake-M [Iris Xe Graphics]
+ 46c3 Alder Lake-UP4 GT1 [UHD Graphics]
4905 DG1 [Iris Xe MAX Graphics]
4906 DG1 [Iris Xe Pod]
4907 SG1 [Server GPU SG-18M]
193d 4000 UN-GPU-XG310-32GB-FHFL
4908 DG1 [Iris Xe Graphics]
+ 4909 DG1 [Iris Xe MAX 100]
4c3d Volume Management Device NVMe RAID Controller
4c8a RocketLake-S GT1 [UHD Graphics 750]
4c8b RocketLake-S GT1 [UHD Graphics 730]
@@ -32325,33 +33043,66 @@
504c EP80579 Integrated Processor with QuickAssist TDM
5181 Alder Lake PCH-P LPC/eSPI Controller
5182 Alder Lake PCH eSPI Controller
+ 1028 0b10 Precision 3571
51a3 Alder Lake PCH-P SMBus Host Controller
+ 1028 0b10 Precision 3571
51a4 Alder Lake-P PCH SPI Controller
+ 1028 0b10 Precision 3571
51a8 Alder Lake PCH UART #0
51a9 Alder Lake PCH UART #1
+ 51b1 Alder Lake PCI Express x1 Root Port #10
51bf Alder Lake PCH-P PCI Express Root Port #9
51c5 Alder Lake-P Serial IO I2C Controller #0
51c6 Alder Lake-P Serial IO I2C Controller #1
51c8 Alder Lake PCH-P High Definition Audio Controller
+ 1028 0b10 Precision 3571
51d3 Alder Lake-P SATA AHCI Controller
+ 1028 0b10 Precision 3571
+ 51d8 Alder Lake-P Serial IO I2C Controller #2
+ 51d9 Alder Lake-P Serial IO I2C Controller #3
51e0 Alder Lake PCH HECI Controller
+ 1028 0b10 Precision 3571
+ 51e3 Alder Lake AMT SOL Redirection
+ 1028 0b10 Precision 3571
51e8 Alder Lake PCH Serial IO I2C Controller #0
+ 1028 0b10 Precision 3571
51e9 Alder Lake PCH Serial IO I2C Controller #1
+ 1028 0b10 Precision 3571
51ea Alder Lake PCH Serial IO I2C Controller #2
51eb Alder Lake PCH Serial IO I2C Controller #3
51ed Alder Lake PCH USB 3.2 xHCI Host Controller
+ 1028 0b10 Precision 3571
51ef Alder Lake PCH Shared SRAM
+ 1028 0b10 Precision 3571
51f0 Alder Lake-P PCH CNVi WiFi
8086 0034 Wireless-AC 9560 160MHz
8086 0070 Wi-Fi 6 AX201 160MHz
8086 0074 Wi-Fi 6 AX201 160MHz
8086 4070 Wi-Fi 6 AX201 160MHz
+ 8086 4090 Wi-Fi 6E AX211 160MHz
+ 51fc Alder Lake-P Integrated Sensor Hub
+ 1028 0b10 Precision 3571
5200 EtherExpress PRO/100 Intelligent Server PCI Bridge
5201 EtherExpress PRO/100 Intelligent Server Fast Ethernet Controller
8086 0001 EtherExpress PRO/100 Server Ethernet Adapter
530d 80310 (IOP) IO Processor
5502 Ethernet Controller (2) I225-LMvP
- 5504 Ethernet Controller I226-K
+ 1ab6 0225 TS4 On-Board 2.5GbE Ethernet Adaptor
+ 5690 DG2 [Arc A770M]
+ 5691 DG2 [Arc A730M]
+ 5692 DG2 [Arc A550M]
+ 5693 DG2 [Arc A370M]
+ 5694 DG2 [Arc A350M]
+ 5695 DG2 [Iris Xe MAX A200M]
+ 56a0 DG2 [Arc A770]
+ 56a1 DG2 [Arc A750]
+ 56a2 DG2 [Arc A580]
+ 56a5 DG2 [Arc A380]
+ 56a6 DG2 [Arc A310]
+ 56b0 DG2 [Arc Pro A30M]
+ 56b1 DG2 [Arc Pro A40/A50]
+ 56c0 Data Center GPU Flex 170
+ 56c1 Data Center GPU Flex 140
5845 QEMU NVM Express Controller
1af4 1100 QEMU Virtual Machine
5900 Xeon E3-1200 v6/7th Gen Core Processor Host Bridge/DRAM Registers
@@ -32362,7 +33113,9 @@
17aa 2247 ThinkPad T570
17aa 224f ThinkPad X1 Carbon 5th Gen
5905 Xeon E3-1200 v6/7th Gen Core Processor PCIe Controller (x8)
+ 5906 HD Graphics 610
5909 Xeon E3-1200 v6/7th Gen Core Processor PCIe Controller (x4)
+ 590b HD Graphics 610
590c Xeon E3-1200 v6/7th Gen Core Processor Host Bridge/DRAM Registers
590f Xeon E3-1200 v6/7th Gen Core Processor Host Bridge/DRAM Registers
1462 7a68 B250 KRAIT GAMING (MS-7A68)
@@ -32385,10 +33138,11 @@
591d HD Graphics P630
591e HD Graphics 615
591f Xeon E3-1200 v6/7th Gen Core Processor Host Bridge/DRAM Registers
+ 5921 HD Graphics 620
5923 HD Graphics 635
5926 Iris Plus Graphics 640
5927 Iris Plus Graphics 650
- 5a84 Celeron N3350/Pentium N4200/Atom E3900 Series Integrated Graphics Controller
+ 5a84 Apollo Lake [HD Graphics 505]
5a85 HD Graphics 500
5a88 Celeron N3350/Pentium N4200/Atom E3900 Series Imaging Unit
5a98 Celeron N3350/Pentium N4200/Atom E3900 Series Audio Cluster
@@ -32625,6 +33379,7 @@
6ffd Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Caching Agent
6ffe Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Caching Agent
7000 82371SB PIIX3 ISA [Natoma/Triton II]
+ 01de fffd Propolis Virtual PIIX3 ISA Controller
1af4 1100 Qemu virtual machine
7010 82371SB PIIX3 IDE [Natoma/Triton II]
1af4 1100 Qemu virtual machine
@@ -32642,6 +33397,7 @@
15ad 1976 Virtual Machine Chipset
1af4 1100 QEMU Virtual Machine
7113 82371AB/EB/MB PIIX4 ACPI
+ 01de fffc Propolis Virtual PIIX4 PM Controller
15ad 1976 Virtual Machine Chipset
1af4 1100 Qemu virtual machine
7120 82810 GMCH (Graphics Memory Controller Hub)
@@ -32698,6 +33454,7 @@
71a2 440GX - 82443GX Host bridge (AGP disabled)
4c53 1000 CC7/CR7/CP7/VC7/VP7/VR7 mainboard
7360 XMM7360 LTE Advanced Modem
+ 7560 XMM7560 LTE Advanced Pro Modem
7600 82372FB PIIX5 ISA
7601 82372FB PIIX5 IDE
7602 82372FB PIIX5 USB
@@ -32715,15 +33472,56 @@
7aa3 Alder Lake-S PCH SMBus Controller
7aa4 Alder Lake-S PCH SPI Controller
7aa7 Alder Lake-S PCH Shared SRAM
+ 7aa8 Alder Lake-S PCH Serial IO UART #0
+ 7aab Alder Lake-S PCH Serial IO SPI Controller #1
+ 7ab0 Alder Lake-S PCH PCI Express Root Port #9
7ab4 Alder Lake-S PCH PCI Express Root Port #13
+ 7ab8 Alder Lake-S PCH PCI Express Root Port #1
+ 7ab9 Alder Lake-S PCH PCI Express Root Port #2
+ 7abc Alder Lake-S PCH PCI Express Root Port #5
7abd Alder Lake-S PCH PCI Express Root Port #6
- 7acc Alder Lake-S PCH I2C Controller #0
+ 7abf Alder Lake-S PCH PCI Express Root Port #8
+ 7acc Alder Lake-S PCH Serial IO I2C Controller #0
+ 7acd Alder Lake-S PCH Serial IO I2C Controller #1
+ 7ace Alder Lake-S PCH Serial IO I2C Controller #2
+ 7acf Alder Lake-S PCH Serial IO I2C Controller #3
7ad0 Alder Lake-S HD Audio Controller
7ae0 Alder Lake-S PCH USB 3.2 Gen 2x2 XHCI Controller
7ae2 Alder Lake-S PCH SATA Controller [AHCI Mode]
7ae8 Alder Lake-S PCH HECI Controller #1
7af0 Alder Lake-S PCH CNVi WiFi
+ 8086 0034 Wireless-AC 9560
+ 8086 0070 Wi-Fi 6 AX201 160MHz
8086 0094 Wi-Fi 6 AX201 160MHz
+ 7afc Alder Lake-S PCH Serial IO I2C Controller #4
+ 7afd Alder Lake-S PCH Serial IO I2C Controller #5
+ 7d0b Volume Management Device NVMe RAID Controller Intel Corporation
+ 7e01 Meteor Lake-P LPC/eSPI Controller
+ 7e22 Meteor Lake-P SMBus Controller
+ 7e23 Meteor Lake-P SPI Controller
+ 7e24 Meteor Lake-P Trace Hub
+ 7e25 Meteor Lake-P Serial IO UART Controller #0
+ 7e26 Meteor Lake-P Serial IO UART Controller #1
+ 7e27 Meteor Lake-P Serial IO SPI Controller #0
+ 7e28 Meteor Lake-P HD Audio Controller
+ 7e30 Meteor Lake-P Serial IO SPI Controller #1
+ 7e46 Meteor Lake-P Serial IO SPI Controller #2
+ 7e50 Meteor Lake-P Serial IO I2C Controller #4
+ 7e51 Meteor Lake-P Serial IO I2C Controller #5
+ 7e52 Meteor Lake-P Serial IO UART Controller #2
+ 7e78 Meteor Lake-P Serial IO I2C Controller #0
+ 7e79 Meteor Lake-P Serial IO I2C Controller #1
+ 7e7a Meteor Lake-P Serial IO I2C Controller #2
+ 7e7b Meteor Lake-P Serial IO I2C Controller #3
+ 7e7d Meteor Lake-P USB 3.2 Gen 2x1 xHCI Host Controller
+ 7e7e Meteor Lake-P USB Device Controller
+ 7ec0 Meteor Lake-P Thunderbolt 4 USB Controller
+ 7ec2 Meteor Lake-P Thunderbolt 4 NHI #0
+ 7ec3 Meteor Lake-P Thunderbolt 4 NHI #1
+ 7ec4 Meteor Lake-P Thunderbolt 4 PCI Express Root Port #0
+ 7ec5 Meteor Lake-P Thunderbolt 4 PCI Express Root Port #1
+ 7ec6 Meteor Lake-P Thunderbolt 4 PCI Express Root Port #2
+ 7ec7 Meteor Lake-P Thunderbolt 4 PCI Express Root Port #3
8002 Trusted Execution Technology Registers
8003 Trusted Execution Technology Registers
8100 US15W/US15X SCH [Poulsbo] Host Bridge
@@ -32767,6 +33565,7 @@
1993 0def mGuard-PCI AV#0
8603 Ice Lake-LP Dynamic Tuning Processor Participant
87c0 UHD Graphics 617
+ 87ca UHD Graphics 617
8800 Platform Controller Hub EG20T PCI Express Port
8801 Platform Controller Hub EG20T Packet Hub
8802 Platform Controller Hub EG20T Gigabit Ethernet Controller
@@ -32793,7 +33592,9 @@
8817 Platform Controller Hub EG20T I2C Controller
8818 Platform Controller Hub EG20T Controller Area Network (CAN) Controller
8819 Platform Controller Hub EG20T IEEE 1588 Hardware Assist
+ 8a03 Processor Power and Thermal Controller
8a0d Ice Lake Thunderbolt 3 NHI #1
+ 8a11 GNA Scoring Accelerator Module
8a12 Ice Lake-LP Processor Host Bridge/DRAM Registers
8a13 Ice Lake Thunderbolt 3 USB Controller
8a14 Ice Lake Processor Host Bridge/DRAM Registers
@@ -32805,7 +33606,9 @@
8a23 Ice Lake Thunderbolt 3 PCI Express Root Port #3
8a51 Iris Plus Graphics G7 (Ice Lake)
8a52 Iris Plus Graphics G7
+ 8a53 Iris Plus Graphics G7
8a56 Iris Plus Graphics G1 (Ice Lake)
+ 8a58 Ice Lake-Y GT1 [UHD Graphics G1]
8a5a Iris Plus Graphics G4 (Ice Lake)
8a5c Iris Plus Graphics G4 (Ice Lake)
8c00 8 Series/C220 Series Chipset Family 4-port SATA Controller 1 [IDE mode]
@@ -33054,6 +33857,8 @@
9622 Integrated RAID
9641 Integrated RAID
96a1 Integrated RAID
+ 9840 Lakefield GT2 [UHD Graphics]
+ 9841 Lakefield GT1.5 [UHD Graphics]
9a01 11th Gen Core Processor PCIe Controller #1
9a03 TigerLake-LP Dynamic Tuning Processor Participant
9a09 11th Gen Core Processor PCIe Controller
@@ -33079,13 +33884,18 @@
9a31 Tiger Lake-H Thunderbolt 4 PCI Express Root Port #3
9a33 Tiger Lake Trace Hub
9a36 11th Gen Core Processor Host Bridge/DRAM Registers
+ 9a40 Tiger Lake-UP4 GT2 [Iris Xe Graphics]
9a49 TigerLake-LP GT2 [Iris Xe Graphics]
9a60 TigerLake-H GT1 [UHD Graphics]
9a68 TigerLake-H GT1 [UHD Graphics]
+ 9a70 Tiger Lake-H GT1 [UHD Graphics]
+ 9a78 Tiger Lake-LP GT2 [UHD Graphics G4]
+ 9b21 Comet Lake-U GT2 [UHD Graphics 620]
9b33 Comet Lake-S 6c Host Bridge/DRAM Controller
9b41 CometLake-U GT2 [UHD Graphics]
1028 09bd Latitude 7310
1028 09be Latitude 7410
+ 9b43 10th Gen Core Processor Host Bridge/DRAM Registers
9b44 10th Gen Core Processor Host Bridge/DRAM Registers
9b53 Comet Lake-S 6c Host Bridge/DRAM Controller
9b54 10th Gen Core Processor Host Bridge/DRAM Registers
@@ -33093,11 +33903,18 @@
1028 09be Latitude 7410
9b63 10th Gen Core Processor Host Bridge/DRAM Registers
9b64 10th Gen Core Processor Host Bridge/DRAM Registers
+ 9ba4 Comet Lake-H GT1 [UHD Graphics 610]
9ba8 CometLake-S GT1 [UHD Graphics 610]
+ 9baa Comet Lake UHD Graphics
+ 9bac Comet Lake UHD Graphics
9bc4 CometLake-H GT2 [UHD Graphics]
9bc5 CometLake-S GT2 [UHD Graphics 630]
+ 9bc6 Comet Lake-S GT2 [UHD Graphics P630]
9bc8 CometLake-S GT2 [UHD Graphics 630]
9bca Comet Lake UHD Graphics
+ 9bcc Comet Lake UHD Graphics
+ 9be6 Comet Lake-S GT2 [UHD Graphics P630]
+ 9bf6 Coffee Lake-S GT2 [UHD Graphics P630]
9c00 8 Series SATA Controller 1 [IDE mode]
9c01 8 Series SATA Controller 1 [IDE mode]
9c02 8 Series SATA Controller 1 [AHCI mode]
@@ -33410,6 +34227,8 @@
a0c5 Tiger Lake-LP Serial IO I2C Controller #4
a0c6 Tiger Lake-LP Serial IO I2C Controller #5
a0c8 Tiger Lake-LP Smart Sound Technology Audio Controller
+# SATA controller on Intel Tiger Lake based mobile platforms in AHCI mode. Could be found on Panasonic Let's Note CF-SV2.
+ a0d3 Tiger Lake-LP SATA Controller
a0e0 Tiger Lake-LP Management Engine Interface
a0e3 Tiger Lake-LP Active Management Technology - SOL
a0e8 Tiger Lake-LP Serial IO I2C Controller #0
@@ -33734,7 +34553,17 @@
a3eb Comet Lake PCI Express Root Port #21
a3f0 Comet Lake PCH-V cAVS
a620 6400/6402 Advanced Memory Buffer (AMB)
+ a77f Volume Management Device NVMe RAID Controller Intel Corporation
+ a780 Raptor Lake-S UHD Graphics
+ a781 Raptor Lake-S UHD Graphics
+ a782 Raptor Lake-S UHD Graphics
+ a783 Raptor Lake-S UHD Graphics
+ a788 Raptor Lake-S UHD Graphics
+ a789 Raptor Lake-S UHD Graphics
+ a78a Raptor Lake-S UHD Graphics
+ a78b Raptor Lake-S UHD Graphics
abc0 Omni-Path Fabric Switch Silicon 100 Series
+ ad0b Volume Management Device NVMe RAID Controller Intel Corporation
b152 21152 PCI-to-PCI Bridge
8086 b152 21152 PCI-to-PCI Bridge
# observed, and documented in Intel revision note; new mask of 1011:0026
@@ -33825,6 +34654,8 @@
011b WX1860AL1 Gigabit Ethernet Controller Virtual Function
1000 Ethernet Controller RP1000 Virtual Function for 10GbE SFP+
1001 Ethernet Controller RP1000 for 10GbE SFP+
+ 1bd4 0084 Ethernet Controller RP1000 for 10GbE SFP+(lldp)
+ 1bd4 0085 Ethernet Controller SP1000A for 10GBASE-T
8088 0000 Ethernet Network Adaptor RP1000 for 10GbE SFP+
2000 Ethernet Controller RP2000 Virtual Function for 10GbE SFP+
2001 Ethernet Controller RP2000 for 10GbE SFP+
@@ -33843,6 +34674,15 @@
2008 Video assistant component
8820 Stryker Corporation
2724 Mako Front Side Motor Controller [cPCI]
+# Wuxi Micro Innovation Integrated Circuit Design Co.,Ltd.
+8848 MUCSE
+ 1000 Ethernet Controller N10 Series for 10GbE or 40GbE (Dual-port)
+ 1001 Ethernet Controller N400 Series for 1GbE (Dual-port)
+ 1020 Ethernet Controller N10 Series for 10GbE (Quad-port)
+ 1021 Ethernet Controller N400 Series for 1GbE (Quad-port)
+ 1060 Ethernet Controller N10 Series for 10GbE (8-port)
+ 1080 Ethernet Controller N10 Series Virtual Function
+ 1081 Ethernet Controller N400 Series Virtual Function
8866 T-Square Design Inc.
8888 Silicon Magic
8912 TRX
@@ -34215,6 +35055,14 @@
1bd4 0070 RS0800M5E24i
1bd4 0071 RS0800M5H16i
1bd4 0072 RS0800M5E16i
+ 1bd4 0077 RS0800M5E16iM
+ 1bd4 0078 RS0800M5E24iM
+ 1bd4 0079 RS0800M5H24iM
+ 1bd4 0080 RS0804M5R16iM
+ 1bd4 0086 RT0800M7E
+ 1bd4 0087 RT0800M7H
+ 1bd4 0088 RT0804M7R
+ 1bd4 0089 RT0808M7R
1cc4 0101 Ramaxel FBGF-RAD PM8204
1cc4 0201 Ramaxel FBGF-RAD PM8222
1d49 0220 ThinkSystem 4350-8i SAS/SATA 12Gb HBA
@@ -34265,11 +35113,17 @@
9005 1462 HBA 1200-8i
9005 1471 SmartRAID 3254-16i /e
9005 1472 SmartRAID 3258-16i /e
+ 9005 1475 SmartRAID 3254-16e /e
9005 14a0 SmartRAID 3254-8i
9005 14a1 SmartRAID 3204-8i
9005 14a2 SmartRAID 3252-8i
+ 9005 14a4 SmartRAID 3254-8i /e
+ 9005 14a5 SmartRAID 3252-8i /e
+ 9005 14a6 SmartRAID 3204-8i /e
9005 14c0 SmartHBA 2200-16i
9005 14c1 HBA 1200-16i
+ 9005 14c3 HBA 1200-16e
+ 9005 14c4 HBA 1200-8e
0410 AIC-9410W SAS (Razor HBA RAID)
9005 0410 ASC-48300(Spirit RAID)
9005 0411 ASC-58300 (Oakmont RAID)
@@ -34377,7 +35231,7 @@
# 2-port Serial 1-port Parallel Adaptor
9912 PCIe 9912 Multi-I/O Controller
9922 MCS9922 PCIe Multi-I/O Controller
- 9990 MCS9990 PCIe to 4‐Port USB 2.0 Host Controller
+ 9990 MCS9990 PCIe to 4â€Port USB 2.0 Host Controller
# Subsystem ID on a 3c985B-SX network card
9850 3Com (wrong ID)
9902 Stargen Inc.
@@ -34392,6 +35246,11 @@
1202 STAR1200I NVMe SSD
1203 STAR1200L NVMe SSD
1204 STAR1200E NVMe SSD
+ 1500 STAR1500 PCIe NVMe SSD Controller
+ 1501 STAR1500C NVMe SSD
+ 1502 STAR1500E NVMe SSD
+ 2000 STAR2000 NVMe Controller
+ 2001 STAR2000E NVMe SSD
a000 Asix Electronics Corporation (Wrong ID)
a0a0 AOPEN Inc.
a0f1 UNISYS Corporation
@@ -34481,6 +35340,7 @@ bdbd Blackmagic Design
c001 TSI Telsys
c0a9 Micron/Crucial Technology
2263 P1 NVMe PCIe SSD
+ 5407 P5 Plus NVMe PCIe SSD
540a P2 NVMe PCIe SSD
c0de Motorola
c0fe Motion Engineering, Inc.
@@ -34505,6 +35365,7 @@ cddd Tyzx, Inc.
ceba KEBA AG
cf86 Spectrum-4TOR
0276 Spectrum-4TOR in Flash Recovery Mode
+d063 SolidRun
d161 Digium, Inc.
0120 Wildcard TE120P single-span T1/E1/J1 card
0205 Wildcard TE205P/TE207P dual-span T1/E1/J1 card 5.0V
@@ -34844,7 +35705,6 @@ C 05 Memory controller
01 FLASH memory
02 CXL
00 CXL Memory Device - vendor specific
-# Devices compliant to CXL spec
10 CXL Memory Device (CXL 2.x)
80 Memory controller
C 06 Bridge
diff --git a/src/hwdata/usb.ids b/src/hwdata/usb.ids
index d02e59f5e..368571b5e 100644
--- a/src/hwdata/usb.ids
+++ b/src/hwdata/usb.ids
@@ -9,8 +9,8 @@
# The latest version can be obtained from
# http://www.linux-usb.org/usb.ids
#
-# Version: 2022.03.18
-# Date: 2022-03-18 20:34:09
+# Version: 2022.12.09
+# Date: 2022-12-09 20:34:10
#
# Vendors, devices and interfaces. Please keep sorted.
@@ -24,10 +24,14 @@
7778 Counterfeit flash drive [Kingston]
0002 Ingram
0002 passport00
+ 7007 HPRT XT300
0003 Club Mac
0004 Nebraska Furniture Mart
0011 Unknown
7788 counterfeit flash drive
+0040 Anyware Corporation
+ 073d Mini Multimedia 2.4GHz Wireless Keyboard with Touch Pad
+0042 DMT
0053 Planex
5301 GW-US54ZGL 802.11bg
0078 Microntek
@@ -60,6 +64,7 @@
6026 CBM1180 Flash drive controller
0218 Hangzhou Worlde
0301 MIDI Port
+0231 Sonuus Limited
02ad HUMAX Co., Ltd.
138c PVR Mass Storage
0303 Mini Automation Controller
@@ -72,6 +77,8 @@
0001 PSX for USB Converter
03c3 ZWO
120e ASI120MC-S Planetary Camera
+ 1f10 EFF
+ 294f ASI294MC Pro
03d9 Shenzhen Sinote Tech-Electron Co., Ltd
0499 SE340D PC Remote Control
03da Bernd Walter Computer Technology
@@ -227,7 +234,7 @@
0218 APOLLO P2500/2600
0221 StreamSmart 400 [F2235AA]
0223 Digital Drive Flash Reader
- 022a Laserjet CP1525nw
+ 022a LaserJet CP1525nw/x
0241 Link-5 micro dongle
0304 DeskJet 810c/812c
0305 ScanJet 4300c
@@ -277,6 +284,7 @@
0805 HP4470C
0811 OfficeJet K80xi
0817 LaserJet 3300
+ 0853 ENVY 5000 series
0901 ScanJet 2300c
0904 DeskJet 845c
0912 Printing Support
@@ -457,6 +465,7 @@
2d05 Scanjet 7000
2d11 OfficeJet 6110
2d17 Printing Support
+ 2d2a LaserJet Pro MFP M225dw
2e11 PSC 1000
2e17 LaserJet 2600n
2e24 LP2275w Monitor Hub
@@ -522,6 +531,7 @@
3d11 OfficeJet 4215
3d17 LaserJet P1005
3e02 PhotoSmart 7550
+ 3e07 x755w Flash Drive
3e17 LaserJet P1006
3f02 PhotoSmart 7550~
3f11 PSC-1315/PSC-1317
@@ -552,6 +562,7 @@
4611 PhotoSmart 2700
4717 Color LaserJet CP1215
4811 PSC 1600
+ 484a Elite Dock G4
4911 PSC 2350
4b11 OfficeJet 6200
4c11 PSC 1500 series
@@ -805,7 +816,8 @@
6011 FT4232H Quad HS USB-UART/FIFO IC
6014 FT232H Single HS USB-UART/FIFO IC
6015 Bridge(I2C/SPI/UART/FIFO)
- 601f Myriad-RF LimeSDR-Mini
+ 601e FT600 16-bit FIFO IC
+ 601f FT601 32-bit FIFO IC
6ee0 EZO Carrier Board
6f70 HB-RF-USB
7be8 FT232R
@@ -895,6 +907,7 @@
d38f Xsens serial converter
d491 Zolix Omni 1509 monochromator
d578 Accesio USB-COM-4SM
+ d678 GammaScout
d6f8 UNI Black BOX
d738 Propox JTAGcable II
d739 Propox ISPcable III
@@ -1204,7 +1217,9 @@
040c VTech Computers, Ltd
040d VIA Technologies, Inc.
3184 VNT VT6656 USB-802.11 Wireless LAN Adapter
+ 340b FX-Audio DAC-X6
340f Audinst HUD-mx2
+ 6204 Vectro VT6204 IDE bridge
6205 USB 2.0 Card Reader
040e MCCI
040f Echo Speech Corp.
@@ -1341,7 +1356,7 @@
7721 Memory Stick Reader/Writer
7722 Memory Stick Reader/Writer
7723 SD Card Reader
- b23c KT108 keyboard
+ b23c Gaming Keyboard
c141 Barcode Scanner
0417 Symbios Logic
0418 AST Research
@@ -1382,6 +1397,7 @@
3020 SoundBlaster Audigy 2 NX
3030 SB External Composite Device
3040 SoundBlaster Live! 24-bit External SB0490
+ 3042 Sound Blaster X-Fi Surround 5.1
3060 Sound Blaster Audigy 2 ZS External
3061 SoundBlaster Audigy 2 ZS Video Editor
3090 Sound Blaster Digital Music SX
@@ -1398,6 +1414,7 @@
3f02 E-Mu 0202
3f04 E-Mu 0404
3f07 E-Mu Xmidi 1x1
+ 3f0a E-Mu Tracker Pre
3f0e Xmidi 1x1 Tab
4003 VideoBlaster Webcam Go Plus [W9967CF]
4004 Nomad II MG
@@ -1459,7 +1476,7 @@
4087 Live! Cam Socialize HD 1080 [VF0680]
4088 Live! Cam Chat HD [VF0700]
4095 Live! Cam Sync HD [VF0770]
- 4097 Live! Cam Chat HD [VF0700]
+ 4097 Live! Cam Chat HD [VF0700/VF0790]
4099 Creative VF0800 [RealSense Camera SR300]
4100 Nomad Jukebox 2
4101 Nomad Jukebox 3
@@ -1667,6 +1684,7 @@
1237 Andromeda Hub
0424 Microchip Technology, Inc. (formerly SMSC)
0001 Integrated Hub
+ 0007 ULPI Transciever [USB3320]
0140 LPC47M14x hub
0acd Sitecom Internal Multi Memory reader/writer MD-005
0fdc Floppy
@@ -1758,6 +1776,7 @@
0083 109 Japanese Keyboard
00a2 Type 7 Keyboard
0100 3-button Mouse
+ 0406 KVM Switch
0502 Panasonic CF-19 HID Touch Panel
100e 24.1" LCD Monitor v4 / FID-638 Mouse
36ba Bus Powered Hub
@@ -1932,6 +1951,7 @@
010f 6500 series
0142 X3650 (Printer, Scanner, Copier)
01fa S310 series
+ 020e RICOH Aficio SP 4410SF
4303 Xerox WorkCentre Pro 412
043e LG Electronics USA, Inc.
3001 AN-WF100 802.11abgn Wireless Adapter [Broadcom BCM4323]
@@ -2095,6 +2115,9 @@
0454 Vobis Microcomputer AG
0455 Telematics International, Inc.
0456 Analog Devices, Inc.
+ 7031 FX2 SPI/I2C Interface
+ b672 Libiio based instrument [ADALM2000]
+ b673 LibIIO based AD9363 Software Defined Radio [ADALM-PLUTO]
f000 FT2232 JTAG ICE [gnICE]
f001 FT2232H Hi-Speed JTAG ICE [gnICE+]
0457 Silicon Integrated Systems Corp.
@@ -2196,6 +2219,7 @@
7020 Sim 321C
7025 Eye 311Q Camera
7029 Genius Look 320s (SN9C201 + HV7131R)
+ 702c Trek 320R Camera
702f Genius Slim 322
7035 i-Look 325T Camera
7045 Genius Look 1320 V2
@@ -2340,7 +2364,7 @@
028b Xbox360 DVD Emulator
028d Xbox360 Memory Unit 64MB
028e Xbox360 Controller
- 028f Xbox360 Wireless Controller
+ 028f Xbox360 Wireless Controller via Plug & Charge Cable
0290 Xbox360 Performance Pipe (PIX)
0291 Xbox 360 Wireless Receiver for Windows
0292 Xbox360 Wireless Networking Adapter
@@ -2361,10 +2385,13 @@
02d1 Xbox One Controller
02d5 Xbox One Digital TV Tuner
02dd Xbox One Controller (Firmware 2015)
+ 02e0 Xbox One Wireless Controller
02e3 Xbox One Elite Controller
02e6 Wireless XBox Controller Dongle
02ea Xbox One S Controller
02fd Xbox One S Controller [Bluetooth]
+ 02fe Xbox Wireless Adapter for Windows
+ 02ff Xbox One S Controller [Bluetooth]
0400 Windows Powered Pocket PC 2002
0401 Windows Powered Pocket PC 2002
0402 Windows Powered Pocket PC 2002
@@ -2553,9 +2580,15 @@
0927 RTL8153B GigE [Surface Ethernet Adapter]
0955 Hub
0957 Hub
+ 097a Generic Superspeed Hub [Azure Kinect]
+ 097b Generic Hub [Azure Kinect]
+ 097c Azure Kinect Depth Camera
+ 097d Azure Kinect 4K Camera
+ 097e Azure Kinect Microphone Array
09a0 RTL8153B GigE [Surface Ethernet Adapter]
09c0 Surface Type Cover
- 0a00 Lumia 950 Dual SIM (RM-1118)
+ 0a00 Lumia 950 (RM-1104/RM-1118)
+ 0b00 Xbox Elite Series 2 Controller (model 1797)
0b12 Xbox Wireless Controller (model 1914)
930a ISOUSB.SYS Intel 82930 Isochronous IO Test Board
ffca Catalina
@@ -2621,6 +2654,7 @@
4d2e Optical Mobile Mouse (HID)
4d51 0Y357C PMX-MMOCZUL (B) [Dell Laser Mouse]
4d62 HP Laser Mobile Mini Mouse
+ 4d64 Asus wired optical mouse - Model MOEWUO
4d75 Rocketfish RF-FLBTAD Bluetooth Adapter
4d81 Dell N889 Optical Mouse
4d8a HP Multimedia Keyboard
@@ -2631,6 +2665,7 @@
4de7 webcam
4e04 Lenovo Keyboard KB1021
4e22 Dell Mouse, 2 Buttons, Modell: MS111-P
+ 4e26 Asus wired keyboard - model KB73211
4e6f Acer Wired Keyboard Model KBAY211
4e72 Acer Wired Keyboard Model KBAY211
0463 MGE UPS Systems
@@ -2656,14 +2691,42 @@
003d Raptor Gaming Keyboard Integrated Hub
003e SmartTerminal ST-2xxx
0041 G86 6240 Keyboard
+ 0076 MX-Board 3.0 G80-3850
+ 0077 MX BOARD 3.0S FL NBL Keyboard
+ 0079 MX BOARD 3.0S FL RGB Keyboard
0080 eHealth Terminal ST 1503
0081 eHealth Keyboard G87 1504
+ 0083 MX BOARD 3.0S FL RGB (KOREAN) Keyboard
+ 0084 eHealth Terminal ST1506
+ 0085 eHealth PIN-Pad PP1516
00a1 SmartCard Reader Keyboard KC 1000 SC
+ 00ab MX 1.0 FL BL Keyboard
+ 00ac MX BOARD 1.0 TKL RGB Keyboard
+ 00b7 MX BOARD 8.0 TKL RGB Keyboard
+ 00bb MX BOARD 10.0 FL RGB Keyboard
+ 00c3 G80 3000 TKL NBL Keyboard
+ 00c4 MX BOARD 2.0S FL RGB Keyboard
+ 00c5 G80 3000 TKL RGB Keyboard
+ 00c7 MV BOARD 3.0 FL RGB
+ 00c9 CCF MX 8.0 TKL BL Keyboard
+ 00ca CCF MX 1.0 TKL BL Keyboard
+ 00cb CCF MX 1.0 TKL NBL Keyboard
+ 00cd G80 3000 TKL NBL (KOREAN) Keyboard
+ 00ce MX BOARD 2.0S FL NBL Keyboard
+ 00d2 MX 1.0 FL NBL Keyboard
+ 00d3 MX 1.0 FL RGB Keyboard
+ 00dd G80-3000N RGB TKL Keyboard
+ 00de G80-3000N FL RGB Keyboard
+ 00df MX BOARD 10.0N FL RGB Keyboard
0106 R-300 Wireless Mouse Receiver
010d MX-Board 3.0 Keyboard
0180 Strait 3.0
+ 01a4 MC 2.1 Mouse
+ 01a6 MX BOARD 2.0S FL RGB DE Keyboard
b090 Keyboard
b091 Mouse
+ c099 Stream Keyboard TKL
+ c110 KC 4500 Ergo Keyboard
046b American Megatrends, Inc.
0001 Keyboard
0101 PS/2 Keyboard, Mouse & Joystick Ports
@@ -2707,6 +2770,8 @@
0830 QuickClip
0836 B525 HD Webcam
0837 BCC950 ConferenceCam
+ 0838 BCC950 ConferenceCam audio
+ 0839 BCC950 ConferenceCam integated hub
0840 QuickCam Express
0843 Webcam C930e
0845 ConferenceCam CC3000e Camera
@@ -2718,6 +2783,7 @@
0857 Logi Group Speakerphone
085c C922 Pro Stream Webcam
085e BRIO Ultra HD Webcam
+ 086b BRIO 4K Stream Edition
0870 QuickCam Express
0882 Logi Group Speakerphone
0890 QuickCam Traveler
@@ -2829,10 +2895,12 @@
0a44 Headset H390
0a45 960 Headset
0a4d G430 Surround Sound Gaming Headset
+ 0a4f MINI BOOM
0a5b G933 Wireless Headset Dongle
0a5d G933 Headset Battery Charger
0a66 [G533 Wireless Headset Dongle]
0a8f H390 headset with microphone
+ 0a90 Zone Receiver
0aaa Logitech G PRO X Gaming Headset
0b02 C-UV35 [Bluetooth Mini-Receiver] (HID proxy mode)
8801 Video Camera
@@ -2912,6 +2980,7 @@
c080 G303 Gaming Mouse
c083 G403 Prodigy Gaming Mouse
c084 G203 Gaming Mouse
+ c088 G Pro Wireless gaming mouse (wired mode)
c08b G502 SE HERO Gaming Mouse
c092 G102/G203 LIGHTSYNC Gaming Mouse
c101 UltraX Media Remote
@@ -3062,9 +3131,11 @@
c532 Unifying Receiver
c534 Unifying Receiver
c537 Cordless Mouse Receiver
- c539 Cordless Mouse Receiver
+ c539 Lightspeed Receiver
c53a PowerPlay Wireless Charging System
c53d G631 Keyboard
+ c542 M185 compact wireless mouse
+ c548 Logi Bolt Receiver
c603 3Dconnexion Spacemouse Plus XT
c605 3Dconnexion CADman
c606 3Dconnexion Spacemouse Classic
@@ -3363,10 +3434,12 @@
aa05 DA45
ac01 Savi 7xx
ad01 GameCom 777 5.1 Headset
+ af00 DA70
af01 DA80
c008 Audio 655 DSP
c00e Blackwire C310 headset
c03b HD1
+ c053 Blackwire C5220 headset (remote control and 3.5mm audio adapter)
ca01 Calisto 800 Series
da60 DA60
0480 Toshiba America Inc
@@ -3412,6 +3485,12 @@
069b ECOSYS M2635dn
06b4 ECOSYS M5526cdw
0483 STMicroelectronics
+ 0102 Remote NDIS Network device with Android debug (ADB)
+ 0103 Remote NDIS Network device
+ 0104 MTP device with Android debug (ADB)
+ 0105 MTP device
+ 0106 PTP device with Android debug (ADB)
+ 0107 PTP device
0137 BeWAN ADSL USB ST (blue or green)
0138 Unicorn II (ST70138B + MTC-20174TQ chipset)
0adb Android Debug Bridge (ADB) device
@@ -3451,6 +3530,7 @@
91d1 Sensor Hub
a171 ThermaData WiFi
a2e0 BMeasure instrument
+ a43f inbed.io - Unified Controller (Gen 2)
df11 STM Device in DFU Mode
ff10 Swann ST56 Modem
0484 Specialix
@@ -3475,6 +3555,9 @@
e042 Broadcom BCM20702 Bluetooth
e04d Atheros AR3012 Bluetooth
e055 BCM43142A0 broadcom bluetooth
+ e07a Broadcom BCM20702A1 Bluetooth
+ e0c8 MediaTek MT7921 Bluetooth
+ e0cd MediaTek Bluetooth Adapter
048a S-MOS Systems, Inc.
048c Alps Electric Ireland, Ltd
048d Integrated Technology Express, Inc.
@@ -3483,6 +3566,8 @@
1234 Chipsbank CBM2199 Flash Drive
1336 SD/MMC Cardreader
1345 Multi Cardreader
+ 5702 RGB LED Controller
+ 6008 8291 RGB keyboard backlight controller
8297 IT8297 RGB LED Controller
9006 IT9135 BDA Afatech DVB-T HDTV Dongle
9009 Zolid HD DVD Maker
@@ -3691,6 +3776,7 @@
0180 Hub Type P
0181 HID Monitor Controls
04a7 Visioneer
+ 0063 Visioneer DocuMate 152i
0100 StrobePro
0101 Strobe Pro Scanner (1.01)
0102 StrobePro Scanner
@@ -4429,6 +4515,7 @@
32d4 Powershot ELPH 185 / IXUS 185 / IXY 200
32d5 PowerShot SX430 IS
32db SELPHY CP1300
+ 3302 SELPHY CP1500
04aa DaeWoo Telecom, Ltd
04ab Chromatic Research
04ac Micro Audiometrics Corp.
@@ -4508,6 +4595,7 @@
0429 D5100
042a D800 (ptp)
0430 D7100
+ 0434 D610
0436 D810
043f D5600
0f03 PD-10 Wireless Printer Adapter
@@ -4524,6 +4612,7 @@
301a 2-port low-power hub
301b SK-8815 Keyboard
301c Enhanced Performance Keyboard
+ 301e Keyboard with UltraNav (SK-8845RC)
3020 Enhanced Performance Keyboard
3025 NetVista Full Width Keyboard
3100 NetVista Mouse
@@ -4797,6 +4886,7 @@
0893 EP-774A
0e03 Thermal Receipt Printer [TM-T20]
1114 XP-440 [Expression Home Small-in-One Printer]
+ 1115 ES-0133 [Expression Home XP-342]
1129 ET-4750 [WorkForce ET-4750 EcoTank All-in-One]
1168 Workforce WF-7820/7840 Series
04b9 Rainbow Technologies, Inc.
@@ -4937,6 +5027,7 @@
004b Keyboard
004f SK-9020 keyboard
008a Acer Wired Mouse Model SM-9023
+ 00f9 Multimedia Keyboard
1766 HID Monitor Controls
2004 Bluetooth 4.0 [Broadcom BCM20702A0]
2006 Broadcom BCM43142A0 Bluetooth Device
@@ -4951,6 +5042,7 @@
7025 HP HD Webcam
7046 TOSHIBA Web Camera - HD
7054 HP HD Webcam
+ 705a HD Webcam (960×540)
9304 Hub
f01c TT1280DA DVB-T TV Tuner
04cb Fuji Photo Film Co., Ltd
@@ -5086,6 +5178,8 @@
04d4 LSI Logic, Inc.
04d5 Forte Technologies, Inc.
04d6 Mentor Graphics
+ e301 Bio-Key TouchLock XL All Weather Keyless Bio-Lock with Fingerprint Recognition
+ e302 ZC3202 [4GB Green Book Digital Quran Reading Pen For Home Teaching Quran]
04d7 Oki Semiconductor
1be4 Bluetooth Device
04d8 Microchip Technology, Inc.
@@ -5096,6 +5190,7 @@
0032 PICkit1
0033 PICkit2
0036 PICkit Serial Analyzer
+ 00dd MCP2221(a) UART/I2C Bridge
00e0 PIC32 Starter Board
04cd 28Cxxx EEPROM Programmer
0a04 AGP LIN Serial Analyzer
@@ -5111,6 +5206,9 @@
9015 ICD 4 In-Circuit Debugger
c001 PicoLCD 20x4
e11c TL866CS EEPROM Programmer [MiniPRO]
+ e72e YuanCon
+ e7ee travisgeis.com Bike Light
+ ec72 Joystick with Rotary Switch Creative Electronics Ltd
ed16 BeamiRC 2.0 CNC remote controller analoge
edb4 micro PLC (ATSAMD51G19A) [Black Brix ECU II]
edb5 ATMEGA32U4 [Black Brix ECU]
@@ -5136,6 +5234,8 @@
0006 Wired Keyboard (78/79 key) [RPI Wired Keyboard 5]
0022 Portable Keyboard
0129 Keyboard [KBPV8000]
+ 0169 Keyboard
+ 0198 Keyboard
0348 Keyboard
0407 Keyboard [TEX Shinobi]
048e Optical Mouse
@@ -5559,7 +5659,7 @@
685c GT-I9250 Phone [Galaxy Nexus] (Mass storage mode)
685d GT-I9100 Phone [Galaxy S II] (Download mode)
685e GT-I9100 / GT-C3350 Phones (USB Debugging mode)
- 6860 Galaxy A5 (MTP)
+ 6860 Galaxy series, misc. (MTP mode)
6863 Galaxy series, misc. (tethering mode)
6864 GT-I9070 (network tethering, USB debugging enabled)
6865 Galaxy (PTP mode)
@@ -5717,6 +5817,8 @@
b5db HP Webcam
b604 Integrated Camera (1280x720@30)
b681 ThinkPad T490 Webcam
+ b71a Integrated IR Camera
+ b76b SunplusIT Inc [HP HD Camera]
04f3 Elan Microelectronics Corp.
000a Touchscreen
0103 ActiveJet K-2024 Multimedia Keyboard
@@ -5734,6 +5836,7 @@
0381 Touchscreen
04a0 Dream Cheeky Stress/Panic Button
0c28 fingerprint sensor [FeinTech FPS00200]
+ 0c3d Elan:Fingerprint
2234 Touchscreen
04f4 Harting Elektronik, Inc.
04f5 Fujitsu-ICL Systems, Inc.
@@ -5998,6 +6101,7 @@
0240 MFC-J950DN
0245 MFC-9560CDW
0248 DCP-7055 scanner/printer
+ 024a DCP-7065DN
024e MFC-7460DN
0253 DCP-J125
0254 DCP-J315W
@@ -6274,6 +6378,7 @@
2043 QL-710W Label Printer
2044 QL-720NW Label Printer
204d QL-720NW Label Printer (mass storage mode)
+ 2060 PT-E550W P-touch Label Printer
2061 PT-P700 P-touch Label Printer
2064 PT-P700 P-touch Label Printer RemovableDisk
2074 PT-D600 P-touch Label Printer
@@ -6597,6 +6702,7 @@
0535 LIH TZU Electric Co., Ltd
0536 Hand Held Products (Welch Allyn, Inc.)
01a0 PDT
+ 01ca IT4800 Area Imager
0537 Inventec Corp.
0538 Caldera International, Inc. (SCO)
0539 Shyh Shiun Terminals Co., Ltd
@@ -6870,7 +6976,9 @@
0485 MHS-PM5 HD camcorder
04cb WALKMAN NWZ-E354
0541 DSC-HX100V [Cybershot Digital Still Camera]
+ 0568 DSC-H100 in Mass Storage mode
05c4 DualShock 4 [CUH-ZCT1x]
+ 0643 DSC-H100 in PTP/MTP mode
0689 Walkman NWZ-B173F
06bb WALKMAN NWZ-F805
06c3 RC-S380
@@ -6884,7 +6992,9 @@
088c Portable Headphone Amplifier
08b7 ILCE-6000 (aka Alpha-6000) in MTP mode
094e ILCE-6000 (aka Alpha-6000) in PC Remote mode
+ 098d Walkman NWZ-B183F
0994 ILCE-6000 (aka Alpha-6000) in charging mode
+ 09c2 D33021 Storage
09cc DualShock 4 [CUH-ZCT2x]
0ba0 Dualshock4 Wireless Adaptor
0bb5 Headset MDR-1000X
@@ -7255,8 +7365,12 @@
039d DTH-W1320 [MobileStudio Pro 16] internal hub
03aa DTH-W1620 [MobileStudio Pro 16] tablet
03ac DTH-W1620 [MobileStudio Pro 16] touchscreen
+ 03b2 DTH167 [Cintiq Pro 16] tablet
+ 03b3 DTH167 [Cintiq Pro 16] touchscreen
03c5 CTL-4100WL [Intuos BT (S)]
03c7 CTL-6100WL [Intuos BT (M)]
+ 03dc PTH-460 [Intuos Pro (S)] tablet
+ 03dd PTH-460 [Intuos Pro BT (S)] tablet
0400 PenPartner 4x5
4001 TPC4001
4004 TPC4004
@@ -7430,6 +7544,7 @@
1300 SoftK56 Data Fax Voice CARP
1301 Modem Enumerator
1328 TrendNet TFM-561 modem
+ 1340 CX93010 ACF Modem
1804 HP Dock Audio
2000 SoftGate 802.11 Adapter
2002 SoftGate 802.11 Adapter
@@ -7558,9 +7673,10 @@
057e Nintendo Co., Ltd
0300 USB-EXI Adapter (GCP-2000)
0304 RVT-H Reader
- 0305 Broadcom BCM2045A Bluetooth Radio [Nintendo Wii]
+ 0305 Broadcom BCM2045A Bluetooth Radio [Nintendo Wii/Wii U]
0306 Wii Remote Controller RVL-003
0337 Wii U GameCube Controller Adapter
+ 0341 DRH GamePad Host [Nintendo Wii U]
2000 Switch
2006 Joy-Con L
2007 Joy-Con R
@@ -7810,6 +7926,7 @@
0304 U2SCX-LVD (SCSI Converter)
b000 REX-USB60
b020 REX-USB60F
+ b022 RTX-USB60F
0585 FlashPoint Technology, Inc.
0001 Digital Camera
0002 Digital Camera
@@ -8043,6 +8160,7 @@
106b Rugged Mini HDD
106d Porsche Design Mobile Drive
106e Porsche Design Desktop Drive
+ 1093 Rugged
1094 Rugged THB
1095 Rugged
a601 HardDrive
@@ -8075,6 +8193,7 @@
0003 CVA124E Cable Voice Adapter (WDM)
0004 CVA122E Cable Voice Adapter (WDM)
0008 STA1520 Tuning Adapter
+ 0009 Console
0a00 Integrated Management Controller Hub
0a01 Virtual Keyboard/Mouse
0a02 Virtual Mass Storage
@@ -8085,7 +8204,7 @@
4002 Bluetooth Headset Series 2
4003 Bluetooth Headset Series 2 in DFU mode
400d SoundLink Color II speaker in DFU mode
- 40fe SoundLink Color II speaker
+ 40fe SoundLink Color II / Flex
bc50 SoundLink Wireless Mobile speaker
bc51 SoundLink Wireless Mobile speaker in DFU mode
05a8 Spacetec IMC Corp.
@@ -8202,6 +8321,8 @@
1003 Hub in Pro Keyboard [Mitsumi, A1048]
1006 Hub in Aluminum Keyboard
1008 Mini DisplayPort to Dual-Link DVI Adapter
+ 1009 iBus Hub
+ 100c Nova Hub
1101 Speakers
1105 Audio in LED Cinema Display
1107 Thunderbolt Display Audio
@@ -8245,18 +8366,24 @@
1299 iPod Touch 3.Gen
129a iPad
129c iPhone 4(CDMA)
+ 129d iPhone
129e iPod Touch 4.Gen
129f iPad 2
12a0 iPhone 4S
+ 12a1 iPhone
12a2 iPad 2 (3G; 64GB)
12a3 iPad 2 (CDMA)
12a4 iPad 3 (wifi)
12a5 iPad 3 (CDMA)
12a6 iPad 3 (3G, 16 GB)
- 12a8 iPhone 5/5C/5S/6/SE
+ 12a7 TV Device
+ 12a8 iPhone 5/5C/5S/6/SE/7/8/X
12a9 iPad 2
12aa iPod Touch 5.Gen [A1421]
12ab iPad 4/Mini1
+ 12ac iPhone
+ 12af Watch
+ 12b0 HomePod
1300 iPod Shuffle
1301 iPod Shuffle 2.Gen
1302 iPod Shuffle 3.Gen
@@ -8267,7 +8394,12 @@
1398 Smart Battery Case
1401 Modem
1402 Ethernet Adapter [A1277]
+ 1460 Digital AV Multiport Adapter
+ 1461 VGA Multiport Adapter
+ 1463 HDMI Adapter
1500 SuperDrive [A1379]
+ 1624 Nova
+ 1625 iBus
8005 OHCI Root Hub Simulation
8006 EHCI Root Hub Simulation
8007 XHCI Root Hub USB 2.0 Simulation
@@ -8295,6 +8427,7 @@
8286 Bluetooth Host Controller
8289 Bluetooth Host Controller
828c Bluetooth Host Controller
+ 828d Bluetooth Host Controller
8290 Bluetooth Host Controller
8300 Built-in iSight (no firmware loaded)
8403 Internal Memory Card Reader
@@ -8434,6 +8567,7 @@
03b1 Webcam
03bc HP Wide Vision HD Integrated Webcam
03cb HP Wide Vision HD Integrated Webcam
+ 03d2 HP TrueVision HD Camera
0403 Webcam
041b HP 2.0MP High Definition Webcam
05c9 Semtech Corp.
@@ -8724,6 +8858,7 @@
b018 Multi-Card Reader
b047 SDHC Reader [RW047-7000]
b051 microSD RDR UHS-I Card Reader [LRWM03U-7000]
+ b054 Dual-Slot Reader [LRW400U]
ba02 Workflow CFR1
ba0a Workflow DD512
c753 JumpDrive TwistTurn
@@ -8930,7 +9065,7 @@
00f2 Keyboard (Labtec Ultra Flat Keyboard)
1002 Mobius actioncam (webcam mode)
6871 Mouse
- 8611 NTK96550 based camera
+ 8611 NTK96550-based camera (mass storage mode)
0604 Jean Co., Ltd
0605 Anchor C&C Co., Ltd
0606 Royal Information Electronics Co., Ltd
@@ -14964,6 +15099,10 @@
0e23 Liou Yuane Enterprise Co., Ltd
0e25 VinChip Systems, Inc.
0e26 J-Phone East Co., Ltd
+0e2e Brady Worldwide, Inc.
+ 000b BMP 51
+ 000c BMP 61
+ 000d BMP 41
0e30 HeartMath LLC
0e34 Micro Computer Control Corp.
0e35 3Pea Technologies, Inc.
@@ -17291,7 +17430,7 @@
a001 Bandit Action Camera Batt-Stick
1391 IdealTEK, Inc.
1000 URTC-1000
-1395 Sennheiser Communications
+1395 DSEA A/S
0025 Headset [PC 8]
0026 SC230
0027 SC260
@@ -17333,7 +17472,7 @@
0065 MB 660
0066 SP 20 D UC
0067 SP 20 D MS
- 006b SC5x5 MS
+ 006b SC6x5
0072 Headset
3556 USB Headset
1397 BEHRINGER International GmbH
@@ -21548,6 +21687,12 @@
061d PCTV Deluxe (NTSC) Device
061e PCTV Deluxe (PAL) Device
2304 1689
+2309 TimeLink Technology Co., Ltd
+ 1001 Touch Device(hid)
+ 1005 Touch Device
+ 1006 Touch Device(2)
+ 1007 MulTouch Device(hid)
+ 1009 Touch Device(hid)
230d Teracom
0103 Huwaii 3g wireless modem
2314 INQ Mobile
@@ -22323,13 +22468,15 @@
5440 TimVideos' HDMI2USB Opsis (FX2) - Unconfigured device
5441 TimVideos' HDMI2USB Opsis (FX2) - Firmware load/upgrade
5442 TimVideos' HDMI2USB Opsis (FX2) - HDMI/DVI Capture Device
-2a1d Oxford Nanopore Technologies, Ltd
+2a1d Oxford Nanopore Technologies plc
0000 MinION
0001 MinION
0010 VolTRAX
0011 VolTRAX
0020 GridION
0021 GridION
+ 0120 GridION Mk1 Bay
+ 0121 GridION Mk1 Bay
2a37 RTD Embedded Technologies, Inc.
5110 UPS35110/UPS25110
2a39 RME
diff --git a/src/initscripts/networking/dhcpcd.exe b/src/initscripts/networking/dhcpcd.exe
index c243ce1a7..c8a79999d 100644
--- a/src/initscripts/networking/dhcpcd.exe
+++ b/src/initscripts/networking/dhcpcd.exe
@@ -20,6 +20,7 @@
. /etc/sysconfig/rc
. $rc_functions
+. /etc/init.d/networking/functions.network
eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
@@ -33,39 +34,42 @@ dhcpcd_up()
exit 0;
fi
- # Only if RED_TYPE=DHCP update /var/ipfire/red
- if [ "$RED_TYPE" == "DHCP" ]; then
- # Check if we have to restart the services at update
- [ ! -e "/var/ipfire/red/active" ] && update=1;
- if [ "$old_domain_name_service" != "$new_domain_name_service" ]; then
- update=1;
- fi
- if [ "$old_ip_address" != "$new_ip_address" ]; then
- update=1;
- fi
- if [ "$old_routers" != "$new_routers" ]; then
- update=1;
- fi
+ # Check if we have to restart the services at update
+ [ ! -e "/var/ipfire/red/active" ] && update=1;
+ if [ "$old_domain_name_service" != "$new_domain_name_service" ]; then
+ update=1;
+ fi
+ if [ "$old_ip_address" != "$new_ip_address" ]; then
+ update=1;
+ fi
+ if [ "$old_routers" != "$new_routers" ]; then
+ update=1;
+ fi
- # Get DNS from dhcp
- /etc/rc.d/helper/getdnsfromdhcpc.pl 1 > /var/run/dns1
- /etc/rc.d/helper/getdnsfromdhcpc.pl 2 > /var/run/dns2
+ # Get DNS from dhcp
+ /etc/rc.d/helper/getdnsfromdhcpc.pl 1 > /var/run/dns1
+ /etc/rc.d/helper/getdnsfromdhcpc.pl 2 > /var/run/dns2
- #Get IP Address
- echo -n "$new_ip_address" > /var/ipfire/red/local-ipaddress
+ #Get IP Address
+ echo -n "$new_ip_address" > /var/ipfire/red/local-ipaddress
- #Get default gateway
+ # Get default gateway
+ if [ -n "${new_routers}" ]; then
grep -v -E "\<gateway\>" /etc/hosts > /tmp/hosts
echo "$new_routers gateway" >> /tmp/hosts
mv /tmp/hosts /etc/hosts
-
fi
+
if [ $update ]; then
- [ -e "/var/ipfire/red/active" ] || touch /var/ipfire/red/active
- echo -n "$new_routers" > /var/ipfire/red/remote-ipaddress
+ # Consider RED being active
+ touch /var/ipfire/red/active
+
+ if [ -n "${new_routers}" ]; then
+ echo -n "${new_routers}" > /var/ipfire/red/remote-ipaddress
+ fi
+
logger -p local0.info -t dhcpcd.exe[$$] "$interface has been (re)configured with IP=$new_ip_address"
run_subdir ${rc_base}/init.d/networking/red.up/
- touch /var/ipfire/red/active
fi
}
@@ -77,17 +81,31 @@ dhcpcd_down()
# Remove DNS servers
rm -f /var/run/dns1 /var/run/dns2
- # Only if RED_TYPE=DHCP update /var/ipfire/red
- if [ "$RED_TYPE" == "DHCP" ]; then
- rm -f /var/ipfire/red/active
- if [ ! $reason == "PREINIT" ]; then
- logger -p local0.info -t dhcpcd.exe[$$] "${interface} has been brought down ($reason)"
- run_subdir ${rc_base}/init.d/networking/red.down/
- fi
+ # Consider RED to be no longer active
+ rm -f /var/ipfire/red/active
+
+ if [ ! $reason == "PREINIT" ]; then
+ logger -p local0.info -t dhcpcd.exe[$$] "${interface} has been brought down ($reason)"
+ run_subdir ${rc_base}/init.d/networking/red.down/
fi
+
+ # Remove any configured IP address from the device
+ ip addr flush dev "${interface}" &>/dev/null
+
+ return 0
}
-case "$reason" in
-BOUND|INFORM|REBIND|REBOOT|RENEW|TIMEOUT|STATIC) dhcpcd_up;;
-PREINIT|EXPIRE|FAIL|IPV4LL|NAK|RELEASE|STOP) dhcpcd_down;;
+case "${reason}" in
+ BOUND|INFORM|REBIND|REBOOT|RENEW|TIMEOUT|STATIC)
+ dhcpcd_up
+ ;;
+ PREINIT|EXPIRE|FAIL|IPV4LL|NAK|RELEASE|STOP)
+ dhcpcd_down
+ ;;
+ # Ignored events where we do not need to do anything
+ STOPPED|CARRIER|NOCARRIER)
+ ;;
+ *)
+ logger -p "local0.info" -t "dhcpcd.exe[$$]" "Unhandled DHCP event: ${reason}"
+ ;;
esac
diff --git a/src/initscripts/networking/functions.network b/src/initscripts/networking/functions.network
index eae4a7b7c..36541eb13 100644
--- a/src/initscripts/networking/functions.network
+++ b/src/initscripts/networking/functions.network
@@ -59,8 +59,9 @@ dhcpcd_is_running() {
dhcpcd_start() {
# This function will start a dhcpcd on a speciefied device.
-
local device="$1"
+ shift
+
local dhcp_start=()
boot_mesg -n "Starting dhcpcd on the ${device} interface..."
@@ -84,6 +85,9 @@ dhcpcd_start() {
dhcp_start+=( "--static" "mtu=${RED_DHCP_FORCE_MTU}" )
fi
+ # Append any further command line options
+ dhcp_start+=( $@ )
+
# Start dhcpcd.
/sbin/dhcpcd "${dhcp_start[@]}" ${device} >/dev/null 2>&1
ret="$?"
@@ -165,3 +169,115 @@ dhcpcd_stop() {
echo_failure
fi
}
+
+# QMI stuff
+
+qmi_find_device() {
+ local intf="${1}"
+ local _intf
+
+ local path
+ for path in /dev/cdc-*; do
+ if [ -c "${path}" ]; then
+ _intf="$(qmi_find_interface "${path}")"
+
+ # Check if the interface matches
+ if [ "${intf}" = "${_intf}" ]; then
+ echo "${path}"
+ return 0
+ fi
+ fi
+ done
+
+ # Nothing found
+ return 1
+}
+
+qmi_find_interface() {
+ local device="${1}"
+
+ qmicli --device="${device}" --device-open-proxy --get-wwan-iface
+}
+
+qmi_enable_rawip_mode() {
+ local intf="${1}"
+
+ # Shut down the device first
+ ip link set "${intf}" down &>/dev/null
+
+ echo "Y" > "/sys/class/net/${intf}/qmi/raw_ip"
+}
+
+qmi_configure_apn() {
+ local device="${1}"
+
+ # APN settings
+ local apn="${2}"
+ local auth="${3}"
+ local username="${4}"
+ local password="${5}"
+
+ local args=(
+ # We only support IPv4 right now
+ "ip-type=4"
+ )
+
+ # Set APN
+ if [ -n "${apn}" ]; then
+ args+=( "apn=${apn}" )
+ fi
+
+ # Set auth
+ case "${auth}" in
+ PAP|CHAP)
+ args+=( "auth=${auth}" )
+ ;;
+ esac
+
+ # Set username
+ if [ -n "${username}" ]; then
+ args+=( "username=${username}" )
+ fi
+
+ # Set password
+ if [ -n "${password}" ]; then
+ args+=( "password=${password}" )
+ fi
+
+ local _args
+
+ local arg
+ for arg in ${args[@]}; do
+ if [ -n "${_args}" ]; then
+ _args="${_args},"
+ fi
+ _args="${_args}${arg}"
+ done
+
+ qmicli --device="${device}" --device-open-proxy \
+ --wds-start-network="${_args}" \
+ --client-no-release-cid &>/dev/null
+}
+
+qmi_reset() {
+ local device="${1}"
+
+ qmicli --device="${device}" --device-open-proxy \
+ --wds-reset &>/dev/null
+}
+
+# Assigns a "static" MAC address
+qmi_assign_address() {
+ local intf="${1}"
+
+ # Find the device
+ local device="$(qmi_find_device "${intf}")"
+
+ local address
+
+ # Generate a "random" MAC address using the device number
+ printf -v address "02:ff:ff:ff:ff:%02x" "${device:12}"
+
+ # Change the MAC address
+ ip link set "${intf}" address "${address}"
+}
diff --git a/src/initscripts/networking/red b/src/initscripts/networking/red
index fc10e077a..16d48f3ac 100644
--- a/src/initscripts/networking/red
+++ b/src/initscripts/networking/red
@@ -210,6 +210,30 @@ case "${1}" in
if [ "$TYPE" == "pptpatm" ]; then
TYPE="pptp"
fi
+
+ # QMI
+ elif [ "$TYPE" = "qmi" ]; then
+ DEVICE="$(qmi_find_device "${RED_DEV}")"
+
+ boot_mesg "Bringing up QMI on ${RED_DEV} (${DEVICE})..."
+
+ # Enable RAW-IP mode
+ qmi_enable_rawip_mode "${RED_DEV}"
+
+ # Configure APN
+ qmi_configure_apn "${DEVICE}" "${APN}" "${AUTH}" "${USERNAME}" "${PASSWORD}"
+
+ # Set up the interface
+ ip link set "${RED_DEV}" up &>/dev/null
+
+ # Write red device name to the corresponding file.
+ echo -n "${RED_DEV}" > /var/ipfire/red/iface
+
+ # Start the DHCP client
+ dhcpcd_start "${RED_DEV}" --dhcp
+
+ # Done
+ exit 0
fi
if [ "$TYPE" == "vdsl" ]; then
@@ -477,6 +501,21 @@ case "${1}" in
run_subdir ${rc_base}/init.d/networking/red.down/
elif [ "$TYPE" == "PPPOE" ]; then
+ eval $(/usr/local/bin/readhash /var/ipfire/ppp/settings)
+
+ if [ "${TYPE}" = "qmi" ]; then
+ boot_mesg "Bringing down the QMI interface ${RED_DEV}..."
+ DEVICE="$(qmi_find_device "${RED_DEV}")"
+
+ # Stop the DHCP client on RED
+ dhcpcd_stop "${RED_DEV}"
+
+ # Reset any QMI settings
+ qmi_reset "${DEVICE}"
+
+ exit 0
+ fi
+
boot_mesg "Bringing down the PPP interface ..."
rm -f /var/ipfire/red/keepconnected
killall -w -s TERM /usr/sbin/pppd 2>/dev/null
diff --git a/src/paks/avahi/install.sh b/src/paks/avahi/install.sh
index 9ec3050a1..63627a4db 100644
--- a/src/paks/avahi/install.sh
+++ b/src/paks/avahi/install.sh
@@ -28,6 +28,7 @@ getent group avahi >/dev/null || groupadd -r avahi
getent passwd avahi >/dev/null || \
useradd -r -g avahi -d /var/run/avahi-daemon -s /sbin/nologin \
-c "Avahi mDNS daemon" avahi
+getent group netdev > /dev/null || groupadd -r netdev
extract_files
ln -svf ../init.d/avahi /etc/rc.d/rc3.d/S65avahi
diff --git a/src/patches/libarchive-3.6-fix-glibc-2.36-headers.patch b/src/patches/libarchive-3.6-fix-glibc-2.36-headers.patch
deleted file mode 100644
index 7c88ca1b1..000000000
--- a/src/patches/libarchive-3.6-fix-glibc-2.36-headers.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From a2f68263a1da5ad227bcb9cd8fa91b93c8b6c99f Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem(a)gmail.com>
-Date: Mon, 25 Jul 2022 10:56:53 -0700
-Subject: [PATCH] libarchive: Do not include sys/mount.h when linux/fs.h is
- present
-
-These headers are in conflict and only one is needed by
-archive_read_disk_posix.c therefore include linux/fs.h if it exists
-otherwise include sys/mount.h
-
-It also helps compiling with glibc 2.36
-where sys/mount.h conflicts with linux/mount.h see [1]
-
-[1] https://sourceware.org/glibc/wiki/Release/2.36
----
- libarchive/archive_read_disk_posix.c | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/libarchive/archive_read_disk_posix.c b/libarchive/archive_read_disk_posix.c
-index 2b39e672b..a96008db7 100644
---- a/libarchive/archive_read_disk_posix.c
-+++ b/libarchive/archive_read_disk_posix.c
-@@ -34,9 +34,6 @@ __FBSDID("$FreeBSD$");
- #ifdef HAVE_SYS_PARAM_H
- #include <sys/param.h>
- #endif
--#ifdef HAVE_SYS_MOUNT_H
--#include <sys/mount.h>
--#endif
- #ifdef HAVE_SYS_STAT_H
- #include <sys/stat.h>
- #endif
-@@ -54,6 +51,8 @@ __FBSDID("$FreeBSD$");
- #endif
- #ifdef HAVE_LINUX_FS_H
- #include <linux/fs.h>
-+#elif HAVE_SYS_MOUNT_H
-+#include <sys/mount.h>
- #endif
- /*
- * Some Linux distributions have both linux/ext2_fs.h and ext2fs/ext2_fs.h.
diff --git a/src/patches/mpfr-4.1.0-cumulative-patches-1-to-13.patch b/src/patches/mpfr-4.1.0-cumulative-patches-1-to-13.patch
deleted file mode 100644
index 3ecb16f1b..000000000
--- a/src/patches/mpfr-4.1.0-cumulative-patches-1-to-13.patch
+++ /dev/null
@@ -1,2976 +0,0 @@
-diff -Naurd mpfr-4.1.0-a/PATCHES mpfr-4.1.0-b/PATCHES
---- mpfr-4.1.0-a/PATCHES 2021-02-11 12:40:40.079363480 +0000
-+++ mpfr-4.1.0-b/PATCHES 2021-02-11 12:40:40.119363040 +0000
-@@ -0,0 +1 @@
-+decimal128-conv
-diff -Naurd mpfr-4.1.0-a/VERSION mpfr-4.1.0-b/VERSION
---- mpfr-4.1.0-a/VERSION 2020-07-10 11:52:33.000000000 +0000
-+++ mpfr-4.1.0-b/VERSION 2021-02-11 12:40:40.119363040 +0000
-@@ -1 +1 @@
--4.1.0
-+4.1.0-p1
-diff -Naurd mpfr-4.1.0-a/src/get_d128.c mpfr-4.1.0-b/src/get_d128.c
---- mpfr-4.1.0-a/src/get_d128.c 2020-04-08 22:39:35.000000000 +0000
-+++ mpfr-4.1.0-b/src/get_d128.c 2021-02-11 12:40:40.103363216 +0000
-@@ -40,22 +40,21 @@
- static _Decimal128
- get_decimal128_nan (void)
- {
-- return (_Decimal128) MPFR_DBL_NAN;
-+ return 0.0dl / 0.0dl;
- }
-
- /* construct the decimal128 Inf with given sign */
- static _Decimal128
- get_decimal128_inf (int negative)
- {
-- return (_Decimal128) (negative ? MPFR_DBL_INFM : MPFR_DBL_INFP);
-+ return negative ? - 1.0dl / 0.0dl : 1.0dl / 0.0dl;
- }
-
- /* construct the decimal128 zero with given sign */
- static _Decimal128
- get_decimal128_zero (int negative)
- {
-- _Decimal128 zero = 0;
-- return (_Decimal128) (negative ? -zero : zero);
-+ return negative ? - 0.0dl : 0.0dl;
- }
-
- /* construct the decimal128 smallest non-zero with given sign:
-diff -Naurd mpfr-4.1.0-a/src/mpfr.h mpfr-4.1.0-b/src/mpfr.h
---- mpfr-4.1.0-a/src/mpfr.h 2020-07-10 11:52:33.000000000 +0000
-+++ mpfr-4.1.0-b/src/mpfr.h 2021-02-11 12:40:40.115363084 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 4
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "4.1.0"
-+#define MPFR_VERSION_STRING "4.1.0-p1"
-
- /* User macros:
- MPFR_USE_FILE: Define it to make MPFR define functions dealing
-diff -Naurd mpfr-4.1.0-a/src/version.c mpfr-4.1.0-b/src/version.c
---- mpfr-4.1.0-a/src/version.c 2020-07-10 11:52:33.000000000 +0000
-+++ mpfr-4.1.0-b/src/version.c 2021-02-11 12:40:40.119363040 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
-- return "4.1.0";
-+ return "4.1.0-p1";
- }
-diff -Naurd mpfr-4.1.0-a/PATCHES mpfr-4.1.0-b/PATCHES
---- mpfr-4.1.0-a/PATCHES 2021-02-11 12:43:51.761257868 +0000
-+++ mpfr-4.1.0-b/PATCHES 2021-02-11 12:43:51.801257430 +0000
-@@ -0,0 +1 @@
-+random_deviate
-diff -Naurd mpfr-4.1.0-a/VERSION mpfr-4.1.0-b/VERSION
---- mpfr-4.1.0-a/VERSION 2021-02-11 12:40:40.119363040 +0000
-+++ mpfr-4.1.0-b/VERSION 2021-02-11 12:43:51.801257430 +0000
-@@ -1 +1 @@
--4.1.0-p1
-+4.1.0-p2
-diff -Naurd mpfr-4.1.0-a/src/mpfr.h mpfr-4.1.0-b/src/mpfr.h
---- mpfr-4.1.0-a/src/mpfr.h 2021-02-11 12:40:40.115363084 +0000
-+++ mpfr-4.1.0-b/src/mpfr.h 2021-02-11 12:43:51.801257430 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 4
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "4.1.0-p1"
-+#define MPFR_VERSION_STRING "4.1.0-p2"
-
- /* User macros:
- MPFR_USE_FILE: Define it to make MPFR define functions dealing
-diff -Naurd mpfr-4.1.0-a/src/random_deviate.c mpfr-4.1.0-b/src/random_deviate.c
---- mpfr-4.1.0-a/src/random_deviate.c 2020-01-08 18:11:13.000000000 +0000
-+++ mpfr-4.1.0-b/src/random_deviate.c 2021-02-11 12:43:51.789257562 +0000
-@@ -289,6 +289,7 @@
- mpfr_random_size_t p = mpfr_get_prec (z); /* Number of bits in result */
- mpz_t t;
- int inex;
-+ mpfr_exp_t negxe;
-
- if (n == 0)
- {
-@@ -370,14 +371,22 @@
- mpz_setbit (t, 0); /* Set the trailing bit so result is always inexact */
- if (neg)
- mpz_neg (t, t);
-- /* Is -x->e representable as a mpfr_exp_t? */
-- MPFR_ASSERTN (x->e <= (mpfr_uexp_t)(-1) >> 1);
-+ /* Portable version of the negation of x->e, with a check of overflow. */
-+ if (MPFR_UNLIKELY (x->e > MPFR_EXP_MAX))
-+ {
-+ /* Overflow, except when x->e = MPFR_EXP_MAX + 1 = - MPFR_EXP_MIN. */
-+ MPFR_ASSERTN (MPFR_EXP_MIN + MPFR_EXP_MAX == -1 &&
-+ x->e == (mpfr_random_size_t) MPFR_EXP_MAX + 1);
-+ negxe = MPFR_EXP_MIN;
-+ }
-+ else
-+ negxe = - (mpfr_exp_t) x->e;
- /*
- * Let mpfr_set_z_2exp do all the work of rounding to the requested
- * precision, setting overflow/underflow flags, and returning the right
- * inexact value.
- */
-- inex = mpfr_set_z_2exp (z, t, -x->e, rnd);
-+ inex = mpfr_set_z_2exp (z, t, negxe, rnd);
- mpz_clear (t);
- return inex;
- }
-diff -Naurd mpfr-4.1.0-a/src/version.c mpfr-4.1.0-b/src/version.c
---- mpfr-4.1.0-a/src/version.c 2021-02-11 12:40:40.119363040 +0000
-+++ mpfr-4.1.0-b/src/version.c 2021-02-11 12:43:51.801257430 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
-- return "4.1.0-p1";
-+ return "4.1.0-p2";
- }
-diff -Naurd mpfr-4.1.0-a/PATCHES mpfr-4.1.0-b/PATCHES
---- mpfr-4.1.0-a/PATCHES 2021-02-11 12:46:49.075316772 +0000
-+++ mpfr-4.1.0-b/PATCHES 2021-02-11 12:46:49.115316335 +0000
-@@ -0,0 +1 @@
-+set_z_2exp-overflow
-diff -Naurd mpfr-4.1.0-a/VERSION mpfr-4.1.0-b/VERSION
---- mpfr-4.1.0-a/VERSION 2021-02-11 12:43:51.801257430 +0000
-+++ mpfr-4.1.0-b/VERSION 2021-02-11 12:46:49.115316335 +0000
-@@ -1 +1 @@
--4.1.0-p2
-+4.1.0-p3
-diff -Naurd mpfr-4.1.0-a/src/mpfr.h mpfr-4.1.0-b/src/mpfr.h
---- mpfr-4.1.0-a/src/mpfr.h 2021-02-11 12:43:51.801257430 +0000
-+++ mpfr-4.1.0-b/src/mpfr.h 2021-02-11 12:46:49.115316335 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 4
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "4.1.0-p2"
-+#define MPFR_VERSION_STRING "4.1.0-p3"
-
- /* User macros:
- MPFR_USE_FILE: Define it to make MPFR define functions dealing
-diff -Naurd mpfr-4.1.0-a/src/set_z_exp.c mpfr-4.1.0-b/src/set_z_exp.c
---- mpfr-4.1.0-a/src/set_z_exp.c 2020-01-08 18:11:13.000000000 +0000
-+++ mpfr-4.1.0-b/src/set_z_exp.c 2021-02-11 12:46:49.103316466 +0000
-@@ -28,10 +28,11 @@
- int
- mpfr_set_z_2exp (mpfr_ptr f, mpz_srcptr z, mpfr_exp_t e, mpfr_rnd_t rnd_mode)
- {
-- mp_size_t fn, zn, dif, en;
-+ mp_size_t fn, zn, dif;
- int k, sign_z, inex;
- mp_limb_t *fp, *zp;
-- mpfr_exp_t exp;
-+ mpfr_exp_t exp, nmax;
-+ mpfr_uexp_t uexp;
-
- sign_z = mpz_sgn (z);
- if (MPFR_UNLIKELY (sign_z == 0)) /* ignore the exponent for 0 */
-@@ -43,10 +44,15 @@
- MPFR_ASSERTD (sign_z == MPFR_SIGN_POS || sign_z == MPFR_SIGN_NEG);
-
- zn = ABSIZ(z); /* limb size of z */
-- /* compute en = floor(e/GMP_NUMB_BITS) */
-- en = (e >= 0) ? e / GMP_NUMB_BITS : (e + 1) / GMP_NUMB_BITS - 1;
- MPFR_ASSERTD (zn >= 1);
-- if (MPFR_UNLIKELY (zn + en > MPFR_EMAX_MAX / GMP_NUMB_BITS + 1))
-+ nmax = MPFR_EMAX_MAX / GMP_NUMB_BITS + 1;
-+ /* Detect early overflow with zn + en > nmax,
-+ where en = floor(e / GMP_NUMB_BITS).
-+ This is checked without an integer overflow (even assuming some
-+ future version of GMP, where limitations may be removed). */
-+ if (MPFR_UNLIKELY (e >= 0 ?
-+ zn > nmax - e / GMP_NUMB_BITS :
-+ zn + (e + 1) / GMP_NUMB_BITS - 1 > nmax))
- return mpfr_overflow (f, rnd_mode, sign_z);
- /* because zn + en >= MPFR_EMAX_MAX / GMP_NUMB_BITS + 2
- implies (zn + en) * GMP_NUMB_BITS >= MPFR_EMAX_MAX + GMP_NUMB_BITS + 1
-@@ -64,8 +70,21 @@
- and exp = zn * GMP_NUMB_BITS + e - k
- <= (zn + en) * GMP_NUMB_BITS - k + GMP_NUMB_BITS - 1
- <= MPFR_EMAX_MAX + 2 * GMP_NUMB_BITS - 1 */
-- exp = (mpfr_prec_t) zn * GMP_NUMB_BITS + e - k;
-+ /* We need to compute exp = zn * GMP_NUMB_BITS + e - k with well-defined
-+ operations (no integer overflows / no implementation-defined results).
-+ The mathematical result of zn * GMP_NUMB_BITS may be larger than
-+ the largest value of mpfr_exp_t while exp could still be less than
-+ __gmpfr_emax. Thanks to early overflow detection, we can compute the
-+ result in modular arithmetic, using mpfr_uexp_t, and convert it to
-+ mpfr_exp_t. */
-+ uexp = (mpfr_uexp_t) zn * GMP_NUMB_BITS + (mpfr_uexp_t) e - k;
-+
-+ /* Convert to signed in a portable way (see doc/README.dev).
-+ On most platforms, this can be optimized to identity (no-op). */
-+ exp = uexp > MPFR_EXP_MAX ? -1 - (mpfr_exp_t) ~uexp : (mpfr_exp_t) uexp;
-+
- /* The exponent will be exp or exp + 1 (due to rounding) */
-+
- if (MPFR_UNLIKELY (exp > __gmpfr_emax))
- return mpfr_overflow (f, rnd_mode, sign_z);
- if (MPFR_UNLIKELY (exp + 1 < __gmpfr_emin))
-diff -Naurd mpfr-4.1.0-a/src/version.c mpfr-4.1.0-b/src/version.c
---- mpfr-4.1.0-a/src/version.c 2021-02-11 12:43:51.801257430 +0000
-+++ mpfr-4.1.0-b/src/version.c 2021-02-11 12:46:49.115316335 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
-- return "4.1.0-p2";
-+ return "4.1.0-p3";
- }
-diff -Naurd mpfr-4.1.0-a/tests/tset_z_exp.c mpfr-4.1.0-b/tests/tset_z_exp.c
---- mpfr-4.1.0-a/tests/tset_z_exp.c 2020-01-08 18:11:13.000000000 +0000
-+++ mpfr-4.1.0-b/tests/tset_z_exp.c 2021-02-11 12:46:49.103316466 +0000
-@@ -97,49 +97,149 @@
- mpfr_get_si is a rather indirect test of a low level routine. */
-
- static void
--check (long i, mpfr_rnd_t rnd)
-+check (long i, mpfr_rnd_t rnd, int reduced)
- {
-- mpfr_t f;
-+ mpfr_t f1, f2, f3;
- mpz_t z;
-- mpfr_exp_t e;
-+ mpfr_exp_t e, old_emin, old_emax;
- int inex;
-+ mpfr_flags_t flags;
-+
-+ old_emin = mpfr_get_emin ();
-+ old_emax = mpfr_get_emax ();
-
- /* using CHAR_BIT * sizeof(long) bits of precision ensures that
- mpfr_set_z_2exp is exact below */
-- mpfr_init2 (f, CHAR_BIT * sizeof(long));
-+ mpfr_inits2 (CHAR_BIT * sizeof(long), f1, f2, f3, (mpfr_ptr) 0);
- mpz_init (z);
- mpz_set_ui (z, i);
- /* the following loop ensures that no overflow occurs */
- do
- e = randexp ();
- while (e > mpfr_get_emax () - CHAR_BIT * sizeof(long));
-- inex = mpfr_set_z_2exp (f, z, e, rnd);
-- if (inex != 0)
-+
-+ mpfr_clear_flags ();
-+ inex = mpfr_set_z_2exp (f1, z, e, rnd);
-+ flags = __gmpfr_flags;
-+
-+ if (inex != 0 || flags != 0 ||
-+ (mpfr_div_2si (f2, f1, e, rnd), mpfr_get_si (f2, MPFR_RNDZ) != i))
- {
-- printf ("Error in mpfr_set_z_2exp for i=%ld, e=%ld,"
-- " wrong ternary value\n", i, (long) e);
-- printf ("expected 0, got %d\n", inex);
-+ printf ("Error in mpfr_set_z_2exp for i=%ld e=%" MPFR_EXP_FSPEC
-+ "d rnd_mode=%d\n", i, (mpfr_eexp_t) e, rnd);
-+ mpfr_set_si_2exp (f2, i, e, MPFR_RNDN);
-+ printf ("expected "); mpfr_dump (f2);
-+ printf ("with inex = %d and flags =", 0);
-+ flags_out (0);
-+ printf ("got "); mpfr_dump (f1);
-+ printf ("with inex = %d and flags =", inex);
-+ flags_out (flags);
- exit (1);
- }
-- mpfr_div_2si (f, f, e, rnd);
-- if (mpfr_get_si (f, MPFR_RNDZ) != i)
-+
-+ if (reduced)
- {
-- printf ("Error in mpfr_set_z_2exp for i=%ld e=", i);
-- if (e < LONG_MIN)
-- printf ("(<LONG_MIN)");
-- else if (e > LONG_MAX)
-- printf ("(>LONG_MAX)");
-- else
-- printf ("%ld", (long) e);
-- printf (" rnd_mode=%d\n", rnd);
-- printf ("expected %ld\n", i);
-- printf ("got "); mpfr_dump (f);
-- exit (1);
-+ mpfr_exp_t ef, emin, emax;
-+ int inex2, inex3;
-+ mpfr_flags_t flags2, flags3;
-+
-+ ef = i == 0 ? 0 : mpfr_get_exp (f1);
-+ for (emin = ef - 2; emin <= ef + 2; emin++)
-+ for (emax = emin; emax <= ef + 2; emax++)
-+ {
-+ inex3 = mpfr_set (f3, f1, rnd);
-+ MPFR_ASSERTN (inex3 == 0);
-+ mpfr_set_emin (emin);
-+ mpfr_set_emax (emax);
-+ mpfr_clear_flags ();
-+ inex2 = mpfr_set_z_2exp (f2, z, e, rnd);
-+ flags2 = __gmpfr_flags;
-+ mpfr_clear_flags ();
-+ inex3 = mpfr_check_range (f3, 0, rnd);
-+ flags3 = __gmpfr_flags;
-+ if (!(mpfr_equal_p (f2, f3) &&
-+ SAME_SIGN (inex2, inex3) &&
-+ flags2 == flags3))
-+ {
-+ printf ("Error in mpfr_set_z_2exp for i=%ld e=%"
-+ MPFR_EXP_FSPEC "d rnd_mode=%d\nand emin=%"
-+ MPFR_EXP_FSPEC "d emax=%" MPFR_EXP_FSPEC
-+ "d\n", i, (mpfr_eexp_t) e, rnd,
-+ (mpfr_eexp_t) emin, (mpfr_eexp_t) emax);
-+ printf ("expected "); mpfr_dump (f3);
-+ printf ("with inex = %d and flags =", inex3);
-+ flags_out (flags3);
-+ printf ("got "); mpfr_dump (f2);
-+ printf ("with inex = %d and flags =", inex2);
-+ flags_out (flags2);
-+ exit (1);
-+ }
-+ }
-+ mpfr_set_emin (old_emin);
-+ mpfr_set_emax (old_emax);
- }
-- mpfr_clear (f);
-+
-+ mpfr_clears (f1, f2, f3, (mpfr_ptr) 0);
- mpz_clear (z);
- }
-
-+static void
-+check_huge (void)
-+{
-+ if (getenv ("MPFR_CHECK_LARGEMEM") != NULL)
-+ {
-+ mpfr_t x;
-+ mpz_t z;
-+ long e;
-+
-+ /* Increase tests_memory_limit to the maximum in order to avoid
-+ an obvious failure due to insufficient memory. */
-+ tests_memory_limit = (size_t) -1; /* no memory limit */
-+
-+ mpfr_init2 (x, 32);
-+
-+ /* In r14140, with a 32-bit ABI (GCC's -m32):
-+ - With UBsan (-fsanitize=undefined -fno-sanitize-recover),
-+ this fails with:
-+ set_z_2exp.c:71:26: runtime error: signed integer overflow:
-+ 67108864 * 32 cannot be represented in type 'long int'
-+ - With -D_MPFR_EXP_FORMAT=4, this fails with:
-+ Expected 0.10001000000000000000000000000000E5
-+ Got 0
-+ */
-+ mpz_init_set_ui (z, 17);
-+ e = 0x7ffffff0;
-+ mpz_mul_2exp (z, z, e);
-+ mpz_add_ui (z, z, 1);
-+ mpfr_set_z_2exp (x, z, -e, MPFR_RNDN);
-+ if (mpfr_cmp_ui0 (x, 17) != 0)
-+ {
-+ printf ("Error 1 in check_huge\n");
-+ printf ("Expected 0.10001000000000000000000000000000E5\n");
-+ printf ("Got ");
-+ mpfr_dump (x);
-+ exit (1);
-+ }
-+ mpz_clear (z);
-+
-+ mpz_init_set_ui (z, 17);
-+ mpz_mul_2exp (z, z, 0xffffffb0);
-+ mpz_add_ui (z, z, 1);
-+ mpfr_set_z_2exp (x, z, -1, MPFR_RNDN);
-+ if (! MPFR_IS_INF (x) || MPFR_IS_NEG (x))
-+ {
-+ printf ("Error 2 in check_huge\n");
-+ printf ("Expected @Inf@\n");
-+ printf ("Got ");
-+ mpfr_dump (x);
-+ exit (1);
-+ }
-+ mpz_clear (z);
-+
-+ mpfr_clear (x);
-+ }
-+}
-+
- int
- main (int argc, char *argv[])
- {
-@@ -147,11 +247,13 @@
-
- tests_start_mpfr ();
-
-- check (0, MPFR_RNDN);
-+ check (0, MPFR_RNDN, 0);
- for (j = 0; j < 200000; j++)
-- check (randlimb () & LONG_MAX, RND_RAND ());
-+ check (randlimb () & LONG_MAX, RND_RAND (), j < 200);
- check0 ();
-
-+ check_huge ();
-+
- tests_end_mpfr ();
-
- return 0;
-diff -Naurd mpfr-4.1.0-a/PATCHES mpfr-4.1.0-b/PATCHES
---- mpfr-4.1.0-a/PATCHES 2021-02-11 12:48:27.322243271 +0000
-+++ mpfr-4.1.0-b/PATCHES 2021-02-11 12:48:27.370242746 +0000
-@@ -0,0 +1 @@
-+prototypes
-diff -Naurd mpfr-4.1.0-a/VERSION mpfr-4.1.0-b/VERSION
---- mpfr-4.1.0-a/VERSION 2021-02-11 12:46:49.115316335 +0000
-+++ mpfr-4.1.0-b/VERSION 2021-02-11 12:48:27.370242746 +0000
-@@ -1 +1 @@
--4.1.0-p3
-+4.1.0-p4
-diff -Naurd mpfr-4.1.0-a/src/atan.c mpfr-4.1.0-b/src/atan.c
---- mpfr-4.1.0-a/src/atan.c 2020-04-22 15:27:07.000000000 +0000
-+++ mpfr-4.1.0-b/src/atan.c 2021-02-11 12:48:27.354242922 +0000
-@@ -56,7 +56,7 @@
- };
-
- static void
--set_table (mpfr_t y, const mp_limb_t x[3])
-+set_table (mpfr_ptr y, const mp_limb_t x[3])
- {
- mpfr_prec_t p = MPFR_PREC(y);
- mp_size_t n = MPFR_PREC2LIMBS(p);
-diff -Naurd mpfr-4.1.0-a/src/const_euler.c mpfr-4.1.0-b/src/const_euler.c
---- mpfr-4.1.0-a/src/const_euler.c 2020-01-08 18:11:13.000000000 +0000
-+++ mpfr-4.1.0-b/src/const_euler.c 2021-02-11 12:48:27.354242922 +0000
-@@ -181,7 +181,7 @@
- }
-
- int
--mpfr_const_euler_internal (mpfr_t x, mpfr_rnd_t rnd)
-+mpfr_const_euler_internal (mpfr_ptr x, mpfr_rnd_t rnd)
- {
- mpfr_const_euler_bs_t sum;
- mpz_t t, u, v;
-diff -Naurd mpfr-4.1.0-a/src/eint.c mpfr-4.1.0-b/src/eint.c
---- mpfr-4.1.0-a/src/eint.c 2020-03-09 15:31:45.000000000 +0000
-+++ mpfr-4.1.0-b/src/eint.c 2021-02-11 12:48:27.354242922 +0000
-@@ -36,7 +36,7 @@
- Return PREC(y) when the truncated series does not converge.
- */
- static mpfr_exp_t
--mpfr_eint_aux (mpfr_t y, mpfr_srcptr x)
-+mpfr_eint_aux (mpfr_ptr y, mpfr_srcptr x)
- {
- mpfr_t eps; /* dynamic (absolute) error bound on t */
- mpfr_t erru, errs;
-diff -Naurd mpfr-4.1.0-a/src/erandom.c mpfr-4.1.0-b/src/erandom.c
---- mpfr-4.1.0-a/src/erandom.c 2020-01-08 18:11:13.000000000 +0000
-+++ mpfr-4.1.0-b/src/erandom.c 2021-02-11 12:48:27.354242922 +0000
-@@ -80,7 +80,7 @@
-
- /* return an exponential random deviate with mean 1 as a MPFR */
- int
--mpfr_erandom (mpfr_t z, gmp_randstate_t r, mpfr_rnd_t rnd)
-+mpfr_erandom (mpfr_ptr z, gmp_randstate_t r, mpfr_rnd_t rnd)
- {
- mpfr_random_deviate_t x, p, q;
- int inex;
-diff -Naurd mpfr-4.1.0-a/src/fpif.c mpfr-4.1.0-b/src/fpif.c
---- mpfr-4.1.0-a/src/fpif.c 2020-01-08 18:11:13.000000000 +0000
-+++ mpfr-4.1.0-b/src/fpif.c 2021-02-11 12:48:27.354242922 +0000
-@@ -291,7 +291,8 @@
- * until one has integer types larger than 128 bits).
- */
- static unsigned char*
--mpfr_fpif_store_exponent (unsigned char *buffer, size_t *buffer_size, mpfr_t x)
-+mpfr_fpif_store_exponent (unsigned char *buffer, size_t *buffer_size,
-+ mpfr_ptr x)
- {
- unsigned char *result;
- mpfr_uexp_t uexp;
-@@ -372,7 +373,7 @@
- * than 128 bits).
- */
- static int
--mpfr_fpif_read_exponent_from_file (mpfr_t x, FILE * fh)
-+mpfr_fpif_read_exponent_from_file (mpfr_ptr x, FILE * fh)
- {
- mpfr_exp_t exponent;
- mpfr_uexp_t uexp;
-@@ -456,7 +457,7 @@
- * format
- */
- static unsigned char*
--mpfr_fpif_store_limbs (unsigned char *buffer, size_t *buffer_size, mpfr_t x)
-+mpfr_fpif_store_limbs (unsigned char *buffer, size_t *buffer_size, mpfr_ptr x)
- {
- unsigned char *result;
- mpfr_prec_t precision;
-@@ -492,7 +493,7 @@
- * Assume buffer is not NULL.
- */
- static void
--mpfr_fpif_read_limbs (mpfr_t x, unsigned char *buffer, size_t nb_byte)
-+mpfr_fpif_read_limbs (mpfr_ptr x, unsigned char *buffer, size_t nb_byte)
- {
- size_t mp_bytes_per_limb;
- size_t nb_partial_byte;
-@@ -522,7 +523,7 @@
- * return 0 if successful
- */
- int
--mpfr_fpif_export (FILE *fh, mpfr_t x)
-+mpfr_fpif_export (FILE *fh, mpfr_ptr x)
- {
- int status;
- unsigned char *buf;
-@@ -582,7 +583,7 @@
- * Return 0 if the import was successful.
- */
- int
--mpfr_fpif_import (mpfr_t x, FILE *fh)
-+mpfr_fpif_import (mpfr_ptr x, FILE *fh)
- {
- int status;
- mpfr_prec_t precision;
-diff -Naurd mpfr-4.1.0-a/src/li2.c mpfr-4.1.0-b/src/li2.c
---- mpfr-4.1.0-a/src/li2.c 2020-01-08 18:11:13.000000000 +0000
-+++ mpfr-4.1.0-b/src/li2.c 2021-02-11 12:48:27.354242922 +0000
-@@ -31,7 +31,7 @@
- for determinating the relative error.
- */
- static int
--li2_series (mpfr_t sum, mpfr_srcptr z, mpfr_rnd_t rnd_mode)
-+li2_series (mpfr_ptr sum, mpfr_srcptr z, mpfr_rnd_t rnd_mode)
- {
- int i;
- mpfr_t s, u, v, w;
-diff -Naurd mpfr-4.1.0-a/src/lngamma.c mpfr-4.1.0-b/src/lngamma.c
---- mpfr-4.1.0-a/src/lngamma.c 2020-01-08 18:11:13.000000000 +0000
-+++ mpfr-4.1.0-b/src/lngamma.c 2021-02-11 12:48:27.354242922 +0000
-@@ -31,7 +31,7 @@
- precision should be >= 4.
- */
- static void
--mpfr_gamma_alpha (mpfr_t s, mpfr_prec_t p)
-+mpfr_gamma_alpha (mpfr_ptr s, mpfr_prec_t p)
- {
- MPFR_LOG_FUNC
- (("p=%Pu", p),
-diff -Naurd mpfr-4.1.0-a/src/mpfr-impl.h mpfr-4.1.0-b/src/mpfr-impl.h
---- mpfr-4.1.0-a/src/mpfr-impl.h 2020-06-10 21:50:12.000000000 +0000
-+++ mpfr-4.1.0-b/src/mpfr-impl.h 2021-02-11 12:48:27.354242922 +0000
-@@ -2474,7 +2474,8 @@
- __MPFR_DECLSPEC mpz_srcptr mpfr_bernoulli_cache (unsigned long);
- __MPFR_DECLSPEC void mpfr_bernoulli_freecache (void);
-
--__MPFR_DECLSPEC int mpfr_sincos_fast (mpfr_t, mpfr_t, mpfr_srcptr, mpfr_rnd_t);
-+__MPFR_DECLSPEC int mpfr_sincos_fast (mpfr_ptr, mpfr_ptr, mpfr_srcptr,
-+ mpfr_rnd_t);
-
- __MPFR_DECLSPEC double mpfr_scale2 (double, int);
-
-@@ -2485,7 +2486,7 @@
- mpfr_prec_t);
-
- __MPFR_DECLSPEC void mpfr_mpz_init (mpz_ptr);
--__MPFR_DECLSPEC void mpfr_mpz_init2 (mpz_t, mp_bitcnt_t);
-+__MPFR_DECLSPEC void mpfr_mpz_init2 (mpz_ptr, mp_bitcnt_t);
- __MPFR_DECLSPEC void mpfr_mpz_clear (mpz_ptr);
-
- __MPFR_DECLSPEC int mpfr_odd_p (mpfr_srcptr);
-diff -Naurd mpfr-4.1.0-a/src/mpfr.h mpfr-4.1.0-b/src/mpfr.h
---- mpfr-4.1.0-a/src/mpfr.h 2021-02-11 12:46:49.115316335 +0000
-+++ mpfr-4.1.0-b/src/mpfr.h 2021-02-11 12:48:27.366242791 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 4
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "4.1.0-p3"
-+#define MPFR_VERSION_STRING "4.1.0-p4"
-
- /* User macros:
- MPFR_USE_FILE: Define it to make MPFR define functions dealing
-@@ -781,8 +781,8 @@
- __MPFR_DECLSPEC int mpfr_strtofr (mpfr_ptr, const char *, char **, int,
- mpfr_rnd_t);
-
--__MPFR_DECLSPEC void mpfr_round_nearest_away_begin (mpfr_t);
--__MPFR_DECLSPEC int mpfr_round_nearest_away_end (mpfr_t, int);
-+__MPFR_DECLSPEC void mpfr_round_nearest_away_begin (mpfr_ptr);
-+__MPFR_DECLSPEC int mpfr_round_nearest_away_end (mpfr_ptr, int);
-
- __MPFR_DECLSPEC size_t mpfr_custom_get_size (mpfr_prec_t);
- __MPFR_DECLSPEC void mpfr_custom_init (void *, mpfr_prec_t);
-@@ -1080,10 +1080,12 @@
- #define mpfr_set_uj_2exp __gmpfr_set_uj_2exp
- #define mpfr_get_sj __gmpfr_mpfr_get_sj
- #define mpfr_get_uj __gmpfr_mpfr_get_uj
--__MPFR_DECLSPEC int mpfr_set_sj (mpfr_t, intmax_t, mpfr_rnd_t);
--__MPFR_DECLSPEC int mpfr_set_sj_2exp (mpfr_t, intmax_t, intmax_t, mpfr_rnd_t);
--__MPFR_DECLSPEC int mpfr_set_uj (mpfr_t, uintmax_t, mpfr_rnd_t);
--__MPFR_DECLSPEC int mpfr_set_uj_2exp (mpfr_t, uintmax_t, intmax_t, mpfr_rnd_t);
-+__MPFR_DECLSPEC int mpfr_set_sj (mpfr_ptr, intmax_t, mpfr_rnd_t);
-+__MPFR_DECLSPEC int mpfr_set_sj_2exp (mpfr_ptr, intmax_t, intmax_t,
-+ mpfr_rnd_t);
-+__MPFR_DECLSPEC int mpfr_set_uj (mpfr_ptr, uintmax_t, mpfr_rnd_t);
-+__MPFR_DECLSPEC int mpfr_set_uj_2exp (mpfr_ptr, uintmax_t, intmax_t,
-+ mpfr_rnd_t);
- __MPFR_DECLSPEC intmax_t mpfr_get_sj (mpfr_srcptr, mpfr_rnd_t);
- __MPFR_DECLSPEC uintmax_t mpfr_get_uj (mpfr_srcptr, mpfr_rnd_t);
-
-diff -Naurd mpfr-4.1.0-a/src/nrandom.c mpfr-4.1.0-b/src/nrandom.c
---- mpfr-4.1.0-a/src/nrandom.c 2020-01-08 18:11:13.000000000 +0000
-+++ mpfr-4.1.0-b/src/nrandom.c 2021-02-11 12:48:27.354242922 +0000
-@@ -155,7 +155,7 @@
-
- /* return a normal random deviate with mean 0 and variance 1 as a MPFR */
- int
--mpfr_nrandom (mpfr_t z, gmp_randstate_t r, mpfr_rnd_t rnd)
-+mpfr_nrandom (mpfr_ptr z, gmp_randstate_t r, mpfr_rnd_t rnd)
- {
- mpfr_random_deviate_t x, p, q;
- int inex;
-diff -Naurd mpfr-4.1.0-a/src/pool.c mpfr-4.1.0-b/src/pool.c
---- mpfr-4.1.0-a/src/pool.c 2020-01-08 18:11:13.000000000 +0000
-+++ mpfr-4.1.0-b/src/pool.c 2021-02-11 12:48:27.354242922 +0000
-@@ -35,7 +35,7 @@
- static MPFR_THREAD_ATTR __mpz_struct mpz_tab[MPFR_POOL_NENTRIES];
-
- MPFR_HOT_FUNCTION_ATTR void
--mpfr_mpz_init (mpz_t z)
-+mpfr_mpz_init (mpz_ptr z)
- {
- if (MPFR_LIKELY (n_alloc > 0))
- {
-@@ -54,7 +54,7 @@
- }
-
- MPFR_HOT_FUNCTION_ATTR void
--mpfr_mpz_init2 (mpz_t z, mp_bitcnt_t n)
-+mpfr_mpz_init2 (mpz_ptr z, mp_bitcnt_t n)
- {
- /* The condition on n is used below as the argument n will be ignored if
- the mpz_t is obtained from the MPFR stack of previously used mpz_t.
-@@ -82,7 +82,7 @@
-
-
- MPFR_HOT_FUNCTION_ATTR void
--mpfr_mpz_clear (mpz_t z)
-+mpfr_mpz_clear (mpz_ptr z)
- {
- /* We only put objects with at most MPFR_POOL_MAX_SIZE in the mpz_t pool,
- to avoid it takes too much memory (and anyway the speedup is mainly
-diff -Naurd mpfr-4.1.0-a/src/random_deviate.c mpfr-4.1.0-b/src/random_deviate.c
---- mpfr-4.1.0-a/src/random_deviate.c 2021-02-11 12:43:51.789257562 +0000
-+++ mpfr-4.1.0-b/src/random_deviate.c 2021-02-11 12:48:27.354242922 +0000
-@@ -64,7 +64,7 @@
-
- /* allocate and set to (0,1) */
- void
--mpfr_random_deviate_init (mpfr_random_deviate_t x)
-+mpfr_random_deviate_init (mpfr_random_deviate_ptr x)
- {
- mpz_init (x->f);
- x->e = 0;
-@@ -72,21 +72,22 @@
-
- /* reset to (0,1) */
- void
--mpfr_random_deviate_reset (mpfr_random_deviate_t x)
-+mpfr_random_deviate_reset (mpfr_random_deviate_ptr x)
- {
- x->e = 0;
- }
-
- /* deallocate */
- void
--mpfr_random_deviate_clear (mpfr_random_deviate_t x)
-+mpfr_random_deviate_clear (mpfr_random_deviate_ptr x)
- {
- mpz_clear (x->f);
- }
-
- /* swap two random deviates */
- void
--mpfr_random_deviate_swap (mpfr_random_deviate_t x, mpfr_random_deviate_t y)
-+mpfr_random_deviate_swap (mpfr_random_deviate_ptr x,
-+ mpfr_random_deviate_ptr y)
- {
- mpfr_random_size_t s;
- unsigned long t;
-@@ -107,7 +108,7 @@
-
- /* ensure x has at least k bits */
- static void
--random_deviate_generate (mpfr_random_deviate_t x, mpfr_random_size_t k,
-+random_deviate_generate (mpfr_random_deviate_ptr x, mpfr_random_size_t k,
- gmp_randstate_t r, mpz_t t)
- {
- /* Various compile time checks on mpfr_random_deviate_t */
-@@ -223,7 +224,7 @@
-
- /* return position of leading bit, counting from 1 */
- static mpfr_random_size_t
--random_deviate_leading_bit (mpfr_random_deviate_t x, gmp_randstate_t r)
-+random_deviate_leading_bit (mpfr_random_deviate_ptr x, gmp_randstate_t r)
- {
- mpfr_random_size_t l;
- random_deviate_generate (x, W, r, 0);
-@@ -243,7 +244,7 @@
-
- /* return kth bit of fraction, representing 2^-k */
- int
--mpfr_random_deviate_tstbit (mpfr_random_deviate_t x, mpfr_random_size_t k,
-+mpfr_random_deviate_tstbit (mpfr_random_deviate_ptr x, mpfr_random_size_t k,
- gmp_randstate_t r)
- {
- if (k == 0)
-@@ -256,7 +257,8 @@
-
- /* compare two random deviates, x < y */
- int
--mpfr_random_deviate_less (mpfr_random_deviate_t x, mpfr_random_deviate_t y,
-+mpfr_random_deviate_less (mpfr_random_deviate_ptr x,
-+ mpfr_random_deviate_ptr y,
- gmp_randstate_t r)
- {
- mpfr_random_size_t k = 1;
-@@ -280,7 +282,7 @@
- /* set mpfr_t z = (neg ? -1 : 1) * (n + x) */
- int
- mpfr_random_deviate_value (int neg, unsigned long n,
-- mpfr_random_deviate_t x, mpfr_t z,
-+ mpfr_random_deviate_ptr x, mpfr_ptr z,
- gmp_randstate_t r, mpfr_rnd_t rnd)
- {
- /* r is used to add as many bits as necessary to match the precision of z */
-diff -Naurd mpfr-4.1.0-a/src/random_deviate.h mpfr-4.1.0-b/src/random_deviate.h
---- mpfr-4.1.0-a/src/random_deviate.h 2020-01-08 18:11:13.000000000 +0000
-+++ mpfr-4.1.0-b/src/random_deviate.h 2021-02-11 12:48:27.354242922 +0000
-@@ -76,7 +76,7 @@
- /* set mpfr_t z = (neg ? -1 : 1) * (n + x) */
- __MPFR_DECLSPEC int
- mpfr_random_deviate_value (int, unsigned long,
-- mpfr_random_deviate_ptr, mpfr_t,
-+ mpfr_random_deviate_ptr, mpfr_ptr,
- gmp_randstate_t, mpfr_rnd_t);
-
- #if defined(__cplusplus)
-diff -Naurd mpfr-4.1.0-a/src/rndna.c mpfr-4.1.0-b/src/rndna.c
---- mpfr-4.1.0-a/src/rndna.c 2020-01-08 18:11:13.000000000 +0000
-+++ mpfr-4.1.0-b/src/rndna.c 2021-02-11 12:48:27.354242922 +0000
-@@ -61,7 +61,7 @@
- and prepares rop to give it one more bit of precision
- and to save its old value within it. */
- void
--mpfr_round_nearest_away_begin (mpfr_t rop)
-+mpfr_round_nearest_away_begin (mpfr_ptr rop)
- {
- mpfr_t tmp;
- mp_size_t xsize;
-@@ -129,7 +129,7 @@
- copying it back the result of the applied function
- and performing additional roundings. */
- int
--mpfr_round_nearest_away_end (mpfr_t rop, int inex)
-+mpfr_round_nearest_away_end (mpfr_ptr rop, int inex)
- {
- mpfr_t tmp;
- mp_size_t xsize;
-diff -Naurd mpfr-4.1.0-a/src/set_sj.c mpfr-4.1.0-b/src/set_sj.c
---- mpfr-4.1.0-a/src/set_sj.c 2020-06-01 10:39:52.000000000 +0000
-+++ mpfr-4.1.0-b/src/set_sj.c 2021-02-11 12:48:27.354242922 +0000
-@@ -26,13 +26,13 @@
- #ifdef _MPFR_H_HAVE_INTMAX_T
-
- int
--mpfr_set_sj (mpfr_t x, intmax_t j, mpfr_rnd_t rnd)
-+mpfr_set_sj (mpfr_ptr x, intmax_t j, mpfr_rnd_t rnd)
- {
- return mpfr_set_sj_2exp (x, j, 0, rnd);
- }
-
- int
--mpfr_set_sj_2exp (mpfr_t x, intmax_t j, intmax_t e, mpfr_rnd_t rnd)
-+mpfr_set_sj_2exp (mpfr_ptr x, intmax_t j, intmax_t e, mpfr_rnd_t rnd)
- {
- if (j >= 0)
- return mpfr_set_uj_2exp (x, j, e, rnd);
-diff -Naurd mpfr-4.1.0-a/src/set_str.c mpfr-4.1.0-b/src/set_str.c
---- mpfr-4.1.0-a/src/set_str.c 2020-01-08 18:11:13.000000000 +0000
-+++ mpfr-4.1.0-b/src/set_str.c 2021-02-11 12:48:27.354242922 +0000
-@@ -23,7 +23,7 @@
- #include "mpfr-impl.h"
-
- int
--mpfr_set_str (mpfr_t x, const char *str, int base, mpfr_rnd_t rnd)
-+mpfr_set_str (mpfr_ptr x, const char *str, int base, mpfr_rnd_t rnd)
- {
- char *p;
-
-diff -Naurd mpfr-4.1.0-a/src/set_uj.c mpfr-4.1.0-b/src/set_uj.c
---- mpfr-4.1.0-a/src/set_uj.c 2020-06-01 10:39:52.000000000 +0000
-+++ mpfr-4.1.0-b/src/set_uj.c 2021-02-11 12:48:27.354242922 +0000
-@@ -29,13 +29,13 @@
- #define uintmaxpml (sizeof(uintmax_t) / sizeof(mp_limb_t))
-
- int
--mpfr_set_uj (mpfr_t x, uintmax_t j, mpfr_rnd_t rnd)
-+mpfr_set_uj (mpfr_ptr x, uintmax_t j, mpfr_rnd_t rnd)
- {
- return mpfr_set_uj_2exp (x, j, 0, rnd);
- }
-
- int
--mpfr_set_uj_2exp (mpfr_t x, uintmax_t j, intmax_t e, mpfr_rnd_t rnd)
-+mpfr_set_uj_2exp (mpfr_ptr x, uintmax_t j, intmax_t e, mpfr_rnd_t rnd)
- {
- int cnt, inex;
- mp_size_t i, k;
-diff -Naurd mpfr-4.1.0-a/src/sin_cos.c mpfr-4.1.0-b/src/sin_cos.c
---- mpfr-4.1.0-a/src/sin_cos.c 2020-01-08 18:11:13.000000000 +0000
-+++ mpfr-4.1.0-b/src/sin_cos.c 2021-02-11 12:48:27.354242922 +0000
-@@ -463,7 +463,7 @@
- Return err such that the relative error is bounded by 2^err ulps.
- */
- static int
--sincos_aux (mpfr_t s, mpfr_t c, mpfr_srcptr x, mpfr_rnd_t rnd_mode)
-+sincos_aux (mpfr_ptr s, mpfr_ptr c, mpfr_srcptr x, mpfr_rnd_t rnd_mode)
- {
- mpfr_prec_t prec_s, sh;
- mpz_t Q, S, C, Q2, S2, C2, y;
-@@ -577,7 +577,7 @@
- Assumes s differs from c.
- */
- int
--mpfr_sincos_fast (mpfr_t s, mpfr_t c, mpfr_srcptr x, mpfr_rnd_t rnd)
-+mpfr_sincos_fast (mpfr_ptr s, mpfr_ptr c, mpfr_srcptr x, mpfr_rnd_t rnd)
- {
- int inexs, inexc;
- mpfr_t x_red, ts, tc;
-diff -Naurd mpfr-4.1.0-a/src/strtofr.c mpfr-4.1.0-b/src/strtofr.c
---- mpfr-4.1.0-a/src/strtofr.c 2020-01-08 18:11:13.000000000 +0000
-+++ mpfr-4.1.0-b/src/strtofr.c 2021-02-11 12:48:27.354242922 +0000
-@@ -226,7 +226,7 @@
- BUT if it returns 0 (NAN or INF), the ternary value is also '0'
- (ie NAN and INF are exact) */
- static int
--parse_string (mpfr_t x, struct parsed_string *pstr,
-+parse_string (mpfr_ptr x, struct parsed_string *pstr,
- const char **string, int base)
- {
- const char *str = *string;
-@@ -451,7 +451,7 @@
- and the precision of x.
- Returns the ternary value. */
- static int
--parsed_string_to_mpfr (mpfr_t x, struct parsed_string *pstr, mpfr_rnd_t rnd)
-+parsed_string_to_mpfr (mpfr_ptr x, struct parsed_string *pstr, mpfr_rnd_t rnd)
- {
- mpfr_prec_t precx, prec, ysize_bits, pstr_size;
- mpfr_exp_t exp;
-@@ -934,7 +934,7 @@
- }
-
- int
--mpfr_strtofr (mpfr_t x, const char *string, char **end, int base,
-+mpfr_strtofr (mpfr_ptr x, const char *string, char **end, int base,
- mpfr_rnd_t rnd)
- {
- int res;
-diff -Naurd mpfr-4.1.0-a/src/vasprintf.c mpfr-4.1.0-b/src/vasprintf.c
---- mpfr-4.1.0-a/src/vasprintf.c 2020-06-01 10:39:52.000000000 +0000
-+++ mpfr-4.1.0-b/src/vasprintf.c 2021-02-11 12:48:27.354242922 +0000
-@@ -963,7 +963,7 @@
- #define NDIGITS 8
-
- MPFR_RETURNS_NONNULL static char *
--mpfr_get_str_wrapper (mpfr_exp_t *exp, int base, size_t n, const mpfr_t op,
-+mpfr_get_str_wrapper (mpfr_exp_t *exp, int base, size_t n, mpfr_srcptr op,
- const struct printf_spec spec)
- {
- size_t ndigits;
-diff -Naurd mpfr-4.1.0-a/src/version.c mpfr-4.1.0-b/src/version.c
---- mpfr-4.1.0-a/src/version.c 2021-02-11 12:46:49.115316335 +0000
-+++ mpfr-4.1.0-b/src/version.c 2021-02-11 12:48:27.370242746 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
-- return "4.1.0-p3";
-+ return "4.1.0-p4";
- }
-diff -Naurd mpfr-4.1.0-a/src/zeta.c mpfr-4.1.0-b/src/zeta.c
---- mpfr-4.1.0-a/src/zeta.c 2020-01-08 18:11:13.000000000 +0000
-+++ mpfr-4.1.0-b/src/zeta.c 2021-02-11 12:48:27.354242922 +0000
-@@ -35,7 +35,7 @@
- sum(tc[i]*product((s+2j)*(s+2j-1)/n^2,j=1..i-1), i=1..p)*s*n^(-s-1)
- */
- static void
--mpfr_zeta_part_b (mpfr_t b, mpfr_srcptr s, int n, int p, mpfr_t *tc)
-+mpfr_zeta_part_b (mpfr_ptr b, mpfr_srcptr s, int n, int p, mpfr_t *tc)
- {
- mpfr_t s1, d, u;
- unsigned long n2;
-@@ -130,7 +130,7 @@
- n - an integer
- Output: sum - a floating-point number approximating sum(1/i^s, i=1..n-1) */
- static void
--mpfr_zeta_part_a (mpfr_t sum, mpfr_srcptr s, int n)
-+mpfr_zeta_part_a (mpfr_ptr sum, mpfr_srcptr s, int n)
- {
- mpfr_t u, s1;
- int i;
-@@ -158,7 +158,7 @@
- Output: z - Zeta(s) rounded to the precision of z with direction rnd_mode
- */
- static int
--mpfr_zeta_pos (mpfr_t z, mpfr_srcptr s, mpfr_rnd_t rnd_mode)
-+mpfr_zeta_pos (mpfr_ptr z, mpfr_srcptr s, mpfr_rnd_t rnd_mode)
- {
- mpfr_t b, c, z_pre, f, s1;
- double beta, sd, dnep;
-@@ -356,8 +356,8 @@
- At input, p is Pi rounded down.
- The comments in the code are for rnd = RNDD. */
- static void
--mpfr_reflection_overflow (mpfr_t z, mpfr_t s1, const mpfr_t s, mpfr_t y,
-- mpfr_t p, mpfr_rnd_t rnd)
-+mpfr_reflection_overflow (mpfr_ptr z, mpfr_ptr s1, mpfr_srcptr s, mpfr_ptr y,
-+ mpfr_ptr p, mpfr_rnd_t rnd)
- {
- mpz_t sint;
-
-@@ -432,7 +432,7 @@
- }
-
- int
--mpfr_zeta (mpfr_t z, mpfr_srcptr s, mpfr_rnd_t rnd_mode)
-+mpfr_zeta (mpfr_ptr z, mpfr_srcptr s, mpfr_rnd_t rnd_mode)
- {
- mpfr_t z_pre, s1, y, p;
- long add;
-diff -Naurd mpfr-4.1.0-a/tests/tcmp2.c mpfr-4.1.0-b/tests/tcmp2.c
---- mpfr-4.1.0-a/tests/tcmp2.c 2020-01-08 18:11:13.000000000 +0000
-+++ mpfr-4.1.0-b/tests/tcmp2.c 2021-02-11 12:48:27.350242965 +0000
-@@ -24,7 +24,7 @@
-
- /* set bit n of x to b, where bit 0 is the most significant one */
- static void
--set_bit (mpfr_t x, unsigned int n, int b)
-+set_bit (mpfr_ptr x, unsigned int n, int b)
- {
- unsigned l;
- mp_size_t xn;
-diff -Naurd mpfr-4.1.0-a/tests/tdiv.c mpfr-4.1.0-b/tests/tdiv.c
---- mpfr-4.1.0-a/tests/tdiv.c 2020-01-08 18:11:13.000000000 +0000
-+++ mpfr-4.1.0-b/tests/tdiv.c 2021-02-11 12:48:27.350242965 +0000
-@@ -369,7 +369,7 @@
- /* given y = o(x/u), x, u, find the inexact flag by
- multiplying y by u */
- static int
--get_inexact (mpfr_t y, mpfr_t x, mpfr_t u)
-+get_inexact (mpfr_ptr y, mpfr_ptr x, mpfr_ptr u)
- {
- mpfr_t xx;
- int inex;
-diff -Naurd mpfr-4.1.0-a/tests/teq.c mpfr-4.1.0-b/tests/teq.c
---- mpfr-4.1.0-a/tests/teq.c 2020-01-08 18:11:13.000000000 +0000
-+++ mpfr-4.1.0-b/tests/teq.c 2021-02-11 12:48:27.350242965 +0000
-@@ -23,7 +23,7 @@
- #include "mpfr-test.h"
-
- static void
--teq (mpfr_t x)
-+teq (mpfr_ptr x)
- {
- mpfr_t y;
- unsigned long k, px, mx;
-diff -Naurd mpfr-4.1.0-a/tests/terandom_chisq.c mpfr-4.1.0-b/tests/terandom_chisq.c
---- mpfr-4.1.0-a/tests/terandom_chisq.c 2020-01-08 18:11:13.000000000 +0000
-+++ mpfr-4.1.0-b/tests/terandom_chisq.c 2021-02-11 12:48:27.350242965 +0000
-@@ -26,7 +26,7 @@
- * exponential distribution. We only take differences of this function so the
- * offset doesn't matter; here Phi(0) = 0. */
- static void
--exponential_cumulative (mpfr_t z, mpfr_t x, mpfr_rnd_t rnd)
-+exponential_cumulative (mpfr_ptr z, mpfr_ptr x, mpfr_rnd_t rnd)
- {
- mpfr_neg (z, x, rnd);
- mpfr_expm1 (z, z, rnd);
-@@ -43,7 +43,7 @@
- * TAOCP, Vol 2, 3.3.1, Table 1. It more accurate than the similar formula,
- * DLMF 8.11.10. */
- static void
--chisq_prob (mpfr_t q, long nu, mpfr_t chisqp)
-+chisq_prob (mpfr_ptr q, long nu, mpfr_ptr chisqp)
- {
- mpfr_t t;
- mpfr_rnd_t rnd;
-@@ -170,7 +170,7 @@
- * this function. low precision means prec = 2, 3, or 4. High values of
- * precision will result in integer overflow. */
- static long
--sequential (mpfr_t x)
-+sequential (mpfr_ptr x)
- {
- long expt, prec;
-
-diff -Naurd mpfr-4.1.0-a/tests/tfmma.c mpfr-4.1.0-b/tests/tfmma.c
---- mpfr-4.1.0-a/tests/tfmma.c 2020-03-24 13:47:38.000000000 +0000
-+++ mpfr-4.1.0-b/tests/tfmma.c 2021-02-11 12:48:27.350242965 +0000
-@@ -24,7 +24,7 @@
-
- /* check both mpfr_fmma and mpfr_fmms */
- static void
--random_test (mpfr_t a, mpfr_t b, mpfr_t c, mpfr_t d, mpfr_rnd_t rnd)
-+random_test (mpfr_ptr a, mpfr_ptr b, mpfr_ptr c, mpfr_ptr d, mpfr_rnd_t rnd)
- {
- mpfr_t ref, res, ab, cd;
- int inex_ref, inex_res;
-diff -Naurd mpfr-4.1.0-a/tests/tfmod.c mpfr-4.1.0-b/tests/tfmod.c
---- mpfr-4.1.0-a/tests/tfmod.c 2020-01-08 18:11:13.000000000 +0000
-+++ mpfr-4.1.0-b/tests/tfmod.c 2021-02-11 12:48:27.350242965 +0000
-@@ -62,8 +62,8 @@
- }
-
- static void
--test_failed (mpfr_t erem, mpfr_t grem, int eret, int gret, mpfr_t x, mpfr_t y,
-- mpfr_rnd_t rnd)
-+test_failed (mpfr_ptr erem, mpfr_ptr grem, int eret, int gret,
-+ mpfr_ptr x, mpfr_ptr y, mpfr_rnd_t rnd)
- {
- printf ("error: mpfr_fmod (r, x, y, rnd)\n x = ");
- mpfr_out_str (stdout, 10, 0, x, MPFR_RNDD);
-@@ -83,7 +83,7 @@
- }
-
- static void
--check (mpfr_t r0, mpfr_t x, mpfr_t y, mpfr_rnd_t rnd)
-+check (mpfr_ptr r0, mpfr_ptr x, mpfr_ptr y, mpfr_rnd_t rnd)
- {
- int inex0, inex1;
- mpfr_t r1;
-diff -Naurd mpfr-4.1.0-a/tests/tfprintf.c mpfr-4.1.0-b/tests/tfprintf.c
---- mpfr-4.1.0-a/tests/tfprintf.c 2020-06-01 10:39:52.000000000 +0000
-+++ mpfr-4.1.0-b/tests/tfprintf.c 2021-02-11 12:48:27.350242965 +0000
-@@ -65,7 +65,7 @@
- const int prec_max_printf = 5000;
-
- static void
--check (FILE *fout, const char *fmt, mpfr_t x)
-+check (FILE *fout, const char *fmt, mpfr_ptr x)
- {
- if (mpfr_fprintf (fout, fmt, x) == -1)
- {
-diff -Naurd mpfr-4.1.0-a/tests/tgamma.c mpfr-4.1.0-b/tests/tgamma.c
---- mpfr-4.1.0-a/tests/tgamma.c 2020-06-01 00:15:37.000000000 +0000
-+++ mpfr-4.1.0-b/tests/tgamma.c 2021-02-11 12:48:27.350242965 +0000
-@@ -890,7 +890,7 @@
- computing with a working precision p2. Assume that x is not an
- integer <= 2. */
- static void
--exp_lgamma (mpfr_t x, mpfr_prec_t p1, mpfr_prec_t p2)
-+exp_lgamma (mpfr_ptr x, mpfr_prec_t p1, mpfr_prec_t p2)
- {
- mpfr_t yd, yu, zd, zu;
- int inexd, inexu, sign;
-diff -Naurd mpfr-4.1.0-a/tests/tnrandom_chisq.c mpfr-4.1.0-b/tests/tnrandom_chisq.c
---- mpfr-4.1.0-a/tests/tnrandom_chisq.c 2020-01-08 18:11:13.000000000 +0000
-+++ mpfr-4.1.0-b/tests/tnrandom_chisq.c 2021-02-11 12:48:27.350242965 +0000
-@@ -26,7 +26,7 @@
- * for the normal distribution. We only take differences of this function so
- * the offset doesn't matter; here Phi(0) = 0. */
- static void
--normal_cumulative (mpfr_t z, mpfr_t x, mpfr_rnd_t rnd)
-+normal_cumulative (mpfr_ptr z, mpfr_ptr x, mpfr_rnd_t rnd)
- {
- mpfr_sqrt_ui (z, 2, rnd);
- mpfr_div (z, x, z, rnd);
-@@ -44,7 +44,7 @@
- * TAOCP, Vol 2, 3.3.1, Table 1. It more accurate than the similar formula,
- * DLMF 8.11.10. */
- static void
--chisq_prob (mpfr_t q, long nu, mpfr_t chisqp)
-+chisq_prob (mpfr_ptr q, long nu, mpfr_ptr chisqp)
- {
- mpfr_t t;
- mpfr_rnd_t rnd;
-@@ -166,7 +166,7 @@
- * this function. low precision means prec = 2, 3, or 4. High values of
- * precision will result in integer overflow. */
- static long
--sequential (mpfr_t x)
-+sequential (mpfr_ptr x)
- {
- long expt, prec;
-
-diff -Naurd mpfr-4.1.0-a/tests/tprintf.c mpfr-4.1.0-b/tests/tprintf.c
---- mpfr-4.1.0-a/tests/tprintf.c 2020-06-01 10:39:52.000000000 +0000
-+++ mpfr-4.1.0-b/tests/tprintf.c 2021-02-11 12:48:27.350242965 +0000
-@@ -74,7 +74,7 @@
- int stdout_redirect;
-
- static void
--check (const char *fmt, mpfr_t x)
-+check (const char *fmt, mpfr_ptr x)
- {
- if (mpfr_printf (fmt, x) == -1)
- {
-diff -Naurd mpfr-4.1.0-a/tests/trint.c mpfr-4.1.0-b/tests/trint.c
---- mpfr-4.1.0-a/tests/trint.c 2020-02-12 13:04:50.000000000 +0000
-+++ mpfr-4.1.0-b/tests/trint.c 2021-02-11 12:48:27.350242965 +0000
-@@ -367,7 +367,7 @@
- #endif
-
- static void
--err (const char *str, mp_size_t s, mpfr_t x, mpfr_t y, mpfr_prec_t p,
-+err (const char *str, mp_size_t s, mpfr_ptr x, mpfr_ptr y, mpfr_prec_t p,
- mpfr_rnd_t r, int trint, int inexact)
- {
- printf ("Error: %s\ns = %u, p = %u, r = %s, trint = %d, inexact = %d\nx = ",
-diff -Naurd mpfr-4.1.0-a/tests/tsinh_cosh.c mpfr-4.1.0-b/tests/tsinh_cosh.c
---- mpfr-4.1.0-a/tests/tsinh_cosh.c 2020-01-08 18:11:13.000000000 +0000
-+++ mpfr-4.1.0-b/tests/tsinh_cosh.c 2021-02-11 12:48:27.350242965 +0000
-@@ -23,7 +23,7 @@
- #include "mpfr-test.h"
-
- static void
--failed (mpfr_t x, mpfr_t esh, mpfr_t gsh, mpfr_t ech, mpfr_t gch)
-+failed (mpfr_ptr x, mpfr_ptr esh, mpfr_ptr gsh, mpfr_ptr ech, mpfr_ptr gch)
- {
- printf ("error : mpfr_sinh_cosh (x) x = ");
- mpfr_out_str (stdout, 10, 0, x, MPFR_RNDD);
-@@ -43,7 +43,7 @@
-
- /* check against sinh, cosh */
- static void
--check (mpfr_t x, mpfr_rnd_t rnd)
-+check (mpfr_ptr x, mpfr_rnd_t rnd)
- {
- mpfr_t s, c, sx, cx;
- int isc, is, ic;
-diff -Naurd mpfr-4.1.0-a/tests/tsqr.c mpfr-4.1.0-b/tests/tsqr.c
---- mpfr-4.1.0-a/tests/tsqr.c 2020-01-08 18:11:13.000000000 +0000
-+++ mpfr-4.1.0-b/tests/tsqr.c 2021-02-11 12:48:27.350242965 +0000
-@@ -33,7 +33,7 @@
-
- static void
- error1 (mpfr_rnd_t rnd, mpfr_prec_t prec,
-- mpfr_t in, mpfr_t outmul, mpfr_t outsqr)
-+ mpfr_t in, mpfr_ptr outmul, mpfr_ptr outsqr)
- {
- printf("ERROR: for %s and prec=%lu\nINPUT=", mpfr_print_rnd_mode(rnd),
- (unsigned long) prec);
-@@ -44,7 +44,7 @@
- }
-
- static void
--error2 (mpfr_rnd_t rnd, mpfr_prec_t prec, mpfr_t in, mpfr_t out,
-+error2 (mpfr_rnd_t rnd, mpfr_prec_t prec, mpfr_ptr in, mpfr_ptr out,
- int inexactmul, int inexactsqr)
- {
- printf("ERROR: for %s and prec=%lu\nINPUT=", mpfr_print_rnd_mode(rnd),
-diff -Naurd mpfr-4.1.0-a/tests/tsum.c mpfr-4.1.0-b/tests/tsum.c
---- mpfr-4.1.0-a/tests/tsum.c 2020-01-08 18:11:13.000000000 +0000
-+++ mpfr-4.1.0-b/tests/tsum.c 2021-02-11 12:48:27.350242965 +0000
-@@ -59,7 +59,7 @@
- }
-
- static void
--get_exact_sum (mpfr_t sum, mpfr_t *tab, int n)
-+get_exact_sum (mpfr_ptr sum, mpfr_t *tab, int n)
- {
- int i;
-
-@@ -1198,7 +1198,7 @@
- }
-
- static int
--mpfr_sum_naive (mpfr_t s, mpfr_t *x, int n, mpfr_rnd_t rnd)
-+mpfr_sum_naive (mpfr_ptr s, mpfr_t *x, int n, mpfr_rnd_t rnd)
- {
- int ret, i;
- switch (n)
-diff -Naurd mpfr-4.1.0-a/PATCHES mpfr-4.1.0-b/PATCHES
---- mpfr-4.1.0-a/PATCHES 2021-02-11 12:50:22.384987438 +0000
-+++ mpfr-4.1.0-b/PATCHES 2021-02-11 12:50:22.424987002 +0000
-@@ -0,0 +1 @@
-+digamma-hugemem
-diff -Naurd mpfr-4.1.0-a/VERSION mpfr-4.1.0-b/VERSION
---- mpfr-4.1.0-a/VERSION 2021-02-11 12:48:27.370242746 +0000
-+++ mpfr-4.1.0-b/VERSION 2021-02-11 12:50:22.424987002 +0000
-@@ -1 +1 @@
--4.1.0-p4
-+4.1.0-p5
-diff -Naurd mpfr-4.1.0-a/src/digamma.c mpfr-4.1.0-b/src/digamma.c
---- mpfr-4.1.0-a/src/digamma.c 2020-06-18 17:17:18.000000000 +0000
-+++ mpfr-4.1.0-b/src/digamma.c 2021-02-11 12:50:22.412987133 +0000
-@@ -214,19 +214,27 @@
- (("x[%Pu]=%.*Rg rnd=%d", mpfr_get_prec(x), mpfr_log_prec, x, rnd_mode),
- ("y[%Pu]=%.*Rg inexact=%d", mpfr_get_prec(y), mpfr_log_prec, y, inex));
-
-- /* compute a precision q such that x+1 is exact */
-- if (MPFR_PREC(x) < MPFR_GET_EXP(x))
-- q = MPFR_EXP(x);
-- else
-- q = MPFR_PREC(x) + 1;
--
-- /* for very large x, use |digamma(x) - log(x)| < 1/x < 2^(1-EXP(x)) */
-- if (MPFR_PREC(y) + 10 < MPFR_EXP(x))
-+ /* For very large x, use |digamma(x) - log(x)| < 1/x < 2^(1-EXP(x)).
-+ However, for a fixed value of GUARD, MPFR_CAN_ROUND() might fail
-+ with probability 1/2^GUARD, in which case the default code will
-+ fail since it requires x+1 to be exact, thus a huge precision if
-+ x is huge. There are two workarounds:
-+ * either perform a Ziv's loop, by increasing GUARD at each step.
-+ However, this might fail if x is moderately large, in which case
-+ more terms of the asymptotic expansion would be needed.
-+ * implement a full asymptotic expansion (with Ziv's loop). */
-+#define GUARD 30
-+ if (MPFR_PREC(y) + GUARD < MPFR_EXP(x))
- {
- /* this ensures EXP(x) >= 3, thus x >= 4, thus log(x) > 1 */
-- mpfr_init2 (t, MPFR_PREC(y) + 10);
-- mpfr_log (t, x, MPFR_RNDZ);
-- if (MPFR_CAN_ROUND (t, MPFR_PREC(y) + 10, MPFR_PREC(y), rnd_mode))
-+ mpfr_init2 (t, MPFR_PREC(y) + GUARD);
-+ mpfr_log (t, x, MPFR_RNDN);
-+ /* |t - digamma(x)| <= 1/2*ulp(t) + |digamma(x) - log(x)|
-+ <= 1/2*ulp(t) + 2^(1-EXP(x))
-+ <= 1/2*ulp(t) + 2^(-PREC(y)-GUARD)
-+ <= ulp(t)
-+ since |t| >= 1 thus ulp(t) >= 2^(1-PREC(y)-GUARD) */
-+ if (MPFR_CAN_ROUND (t, MPFR_PREC(y) + GUARD, MPFR_PREC(y), rnd_mode))
- {
- inex = mpfr_set (y, t, rnd_mode);
- mpfr_clear (t);
-@@ -235,6 +243,21 @@
- mpfr_clear (t);
- }
-
-+ /* compute a precision q such that x+1 is exact */
-+ if (MPFR_PREC(x) < MPFR_GET_EXP(x))
-+ {
-+ /* The goal of the first assertion is to let the compiler ignore
-+ the second one when MPFR_EMAX_MAX <= MPFR_PREC_MAX. */
-+ MPFR_ASSERTD (MPFR_EXP(x) <= MPFR_EMAX_MAX);
-+ MPFR_ASSERTN (MPFR_EXP(x) <= MPFR_PREC_MAX);
-+ q = MPFR_EXP(x);
-+ }
-+ else
-+ q = MPFR_PREC(x) + 1;
-+
-+ /* FIXME: q can be much too large, e.g. equal to the maximum exponent! */
-+ MPFR_LOG_MSG (("q=%Pu\n", q));
-+
- mpfr_init2 (x_plus_j, q);
-
- mpfr_init2 (t, p);
-diff -Naurd mpfr-4.1.0-a/src/mpfr.h mpfr-4.1.0-b/src/mpfr.h
---- mpfr-4.1.0-a/src/mpfr.h 2021-02-11 12:48:27.366242791 +0000
-+++ mpfr-4.1.0-b/src/mpfr.h 2021-02-11 12:50:22.424987002 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 4
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "4.1.0-p4"
-+#define MPFR_VERSION_STRING "4.1.0-p5"
-
- /* User macros:
- MPFR_USE_FILE: Define it to make MPFR define functions dealing
-diff -Naurd mpfr-4.1.0-a/src/version.c mpfr-4.1.0-b/src/version.c
---- mpfr-4.1.0-a/src/version.c 2021-02-11 12:48:27.370242746 +0000
-+++ mpfr-4.1.0-b/src/version.c 2021-02-11 12:50:22.424987002 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
-- return "4.1.0-p4";
-+ return "4.1.0-p5";
- }
-diff -Naurd mpfr-4.1.0-a/tests/tdigamma.c mpfr-4.1.0-b/tests/tdigamma.c
---- mpfr-4.1.0-a/tests/tdigamma.c 2020-06-18 17:17:18.000000000 +0000
-+++ mpfr-4.1.0-b/tests/tdigamma.c 2021-02-11 12:50:22.412987133 +0000
-@@ -49,12 +49,54 @@
- mpfr_clear (y);
- }
-
-+/* With some GMP_CHECK_RANDOMIZE values, test_generic triggers an error
-+ tests_addsize(): too much memory (576460752303432776 bytes)
-+ Each time on prec = 200, n = 3, xprec = 140.
-+ The following test is a more general testcase.
-+*/
-+static void
-+bug20210206 (void)
-+{
-+#define NPREC 4
-+ mpfr_t x, y[NPREC], z;
-+ mpfr_exp_t emin, emax;
-+ int i, precx, precy[NPREC] = { 200, 400, 520, 1416 };
-+
-+ emin = mpfr_get_emin ();
-+ emax = mpfr_get_emax ();
-+ set_emin (MPFR_EMIN_MIN);
-+ set_emax (MPFR_EMAX_MAX);
-+
-+ for (i = 0; i < NPREC; i++)
-+ mpfr_init2 (y[i], precy[i]);
-+ mpfr_init2 (z, precy[0]);
-+
-+ for (precx = MPFR_PREC_MIN; precx < 150; precx++)
-+ {
-+ mpfr_init2 (x, precx);
-+ mpfr_setmax (x, __gmpfr_emax);
-+ for (i = 0; i < NPREC; i++)
-+ mpfr_digamma (y[i], x, MPFR_RNDA);
-+ mpfr_set (z, y[1], MPFR_RNDA);
-+ MPFR_ASSERTN (mpfr_equal_p (y[0], z));
-+ mpfr_clear (x);
-+ }
-+
-+ for (i = 0; i < NPREC; i++)
-+ mpfr_clear (y[i]);
-+ mpfr_clear (z);
-+
-+ set_emin (emin);
-+ set_emax (emax);
-+}
-+
- int
- main (int argc, char *argv[])
- {
- tests_start_mpfr ();
-
- special ();
-+ bug20210206 ();
-
- test_generic (MPFR_PREC_MIN, 200, 20);
-
-diff -Naurd mpfr-4.1.0-a/PATCHES mpfr-4.1.0-b/PATCHES
---- mpfr-4.1.0-a/PATCHES 2021-02-11 12:52:52.519350662 +0000
-+++ mpfr-4.1.0-b/PATCHES 2021-02-11 12:52:52.563350183 +0000
-@@ -0,0 +1 @@
-+digamma-interm-zero
-diff -Naurd mpfr-4.1.0-a/VERSION mpfr-4.1.0-b/VERSION
---- mpfr-4.1.0-a/VERSION 2021-02-11 12:50:22.424987002 +0000
-+++ mpfr-4.1.0-b/VERSION 2021-02-11 12:52:52.563350183 +0000
-@@ -1 +1 @@
--4.1.0-p5
-+4.1.0-p6
-diff -Naurd mpfr-4.1.0-a/src/digamma.c mpfr-4.1.0-b/src/digamma.c
---- mpfr-4.1.0-a/src/digamma.c 2021-02-11 12:50:22.412987133 +0000
-+++ mpfr-4.1.0-b/src/digamma.c 2021-02-11 12:52:52.547350357 +0000
-@@ -296,21 +296,26 @@
- errt = mpfr_digamma_approx (t, x_plus_j);
- expt = MPFR_GET_EXP (t);
- mpfr_sub (t, t, u, MPFR_RNDN);
-- if (MPFR_GET_EXP (t) < expt)
-- errt += expt - MPFR_EXP(t);
-- /* Warning: if u is zero (which happens when x_plus_j >= min at the
-- beginning of the while loop above), EXP(u) is not defined.
-- In this case we have no error from u. */
-- if (MPFR_NOTZERO(u) && MPFR_GET_EXP (t) < MPFR_GET_EXP (u))
-- erru += MPFR_EXP(u) - MPFR_EXP(t);
-- if (errt > erru)
-- errt = errt + 1;
-- else if (errt == erru)
-- errt = errt + 2;
-- else
-- errt = erru + 1;
-- if (MPFR_CAN_ROUND (t, p - errt, MPFR_PREC(y), rnd_mode))
-- break;
-+ /* Warning! t may be zero (more likely in small precision). Note
-+ that in this case, this is an exact zero, not an underflow. */
-+ if (MPFR_NOTZERO(t))
-+ {
-+ if (MPFR_GET_EXP (t) < expt)
-+ errt += expt - MPFR_EXP(t);
-+ /* Warning: if u is zero (which happens when x_plus_j >= min at the
-+ beginning of the while loop above), EXP(u) is not defined.
-+ In this case we have no error from u. */
-+ if (MPFR_NOTZERO(u) && MPFR_GET_EXP (t) < MPFR_GET_EXP (u))
-+ erru += MPFR_EXP(u) - MPFR_EXP(t);
-+ if (errt > erru)
-+ errt = errt + 1;
-+ else if (errt == erru)
-+ errt = errt + 2;
-+ else
-+ errt = erru + 1;
-+ if (MPFR_CAN_ROUND (t, p - errt, MPFR_PREC(y), rnd_mode))
-+ break;
-+ }
- MPFR_ZIV_NEXT (loop, p);
- mpfr_set_prec (t, p);
- mpfr_set_prec (u, p);
-diff -Naurd mpfr-4.1.0-a/src/mpfr.h mpfr-4.1.0-b/src/mpfr.h
---- mpfr-4.1.0-a/src/mpfr.h 2021-02-11 12:50:22.424987002 +0000
-+++ mpfr-4.1.0-b/src/mpfr.h 2021-02-11 12:52:52.559350226 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 4
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "4.1.0-p5"
-+#define MPFR_VERSION_STRING "4.1.0-p6"
-
- /* User macros:
- MPFR_USE_FILE: Define it to make MPFR define functions dealing
-diff -Naurd mpfr-4.1.0-a/src/version.c mpfr-4.1.0-b/src/version.c
---- mpfr-4.1.0-a/src/version.c 2021-02-11 12:50:22.424987002 +0000
-+++ mpfr-4.1.0-b/src/version.c 2021-02-11 12:52:52.559350226 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
-- return "4.1.0-p5";
-+ return "4.1.0-p6";
- }
-diff -Naurd mpfr-4.1.0-a/tests/tdigamma.c mpfr-4.1.0-b/tests/tdigamma.c
---- mpfr-4.1.0-a/tests/tdigamma.c 2021-02-11 12:50:22.412987133 +0000
-+++ mpfr-4.1.0-b/tests/tdigamma.c 2021-02-11 12:52:52.547350357 +0000
-@@ -90,6 +90,26 @@
- set_emax (emax);
- }
-
-+/* another test that fails with GMP_CHECK_RANDOMIZE=1612741376857003
-+ on revision 14398 */
-+static void
-+bug20210208 (void)
-+{
-+ mpfr_t x, y;
-+ int inex;
-+
-+ mpfr_init2 (x, 73);
-+ mpfr_init2 (y, 1);
-+ mpfr_set_str (x, "1.4613470547060071827450", 10, MPFR_RNDN);
-+ mpfr_clear_flags ();
-+ inex = mpfr_digamma (y, x, MPFR_RNDU);
-+ MPFR_ASSERTN (mpfr_cmp_si_2exp (y, -1, -12) == 0);
-+ MPFR_ASSERTN (inex > 0);
-+ MPFR_ASSERTN (__gmpfr_flags == MPFR_FLAGS_INEXACT);
-+ mpfr_clear (x);
-+ mpfr_clear (y);
-+}
-+
- int
- main (int argc, char *argv[])
- {
-@@ -97,6 +117,7 @@
-
- special ();
- bug20210206 ();
-+ bug20210208 ();
-
- test_generic (MPFR_PREC_MIN, 200, 20);
-
-diff -Naurd mpfr-4.1.0-a/PATCHES mpfr-4.1.0-b/PATCHES
---- mpfr-4.1.0-a/PATCHES 2021-02-11 12:53:38.382850990 +0000
-+++ mpfr-4.1.0-b/PATCHES 2021-02-11 12:53:38.426850512 +0000
-@@ -0,0 +1 @@
-+jn-interm-zero
-diff -Naurd mpfr-4.1.0-a/VERSION mpfr-4.1.0-b/VERSION
---- mpfr-4.1.0-a/VERSION 2021-02-11 12:52:52.563350183 +0000
-+++ mpfr-4.1.0-b/VERSION 2021-02-11 12:53:38.426850512 +0000
-@@ -1 +1 @@
--4.1.0-p6
-+4.1.0-p7
-diff -Naurd mpfr-4.1.0-a/src/jyn_asympt.c mpfr-4.1.0-b/src/jyn_asympt.c
---- mpfr-4.1.0-a/src/jyn_asympt.c 2020-07-10 10:33:32.000000000 +0000
-+++ mpfr-4.1.0-b/src/jyn_asympt.c 2021-02-11 12:53:38.410850685 +0000
-@@ -69,6 +69,8 @@
- MPFR_ZIV_INIT (loop, w);
- for (;;)
- {
-+ int ok = 1;
-+
- mpfr_set_prec (c, w);
- mpfr_init2 (s, w);
- mpfr_init2 (P, w);
-@@ -92,6 +94,13 @@
- /* now s approximates sin(z)+cos(z), and c approximates sin(z)-cos(z),
- with total absolute error bounded by 2^(1-w). */
-
-+ /* if s or c is zero, MPFR_GET_EXP will fail below */
-+ if (MPFR_IS_ZERO(s) || MPFR_IS_ZERO(c))
-+ {
-+ ok = 0;
-+ goto clear;
-+ }
-+
- /* precompute 1/(8|z|) */
- mpfr_si_div (iz, MPFR_IS_POS(z) ? 1 : -1, z, MPFR_RNDN); /* err <= 1 */
- mpfr_div_2ui (iz, iz, 3, MPFR_RNDN);
-@@ -257,6 +266,9 @@
- err = (err >= err2) ? err + 1 : err2 + 1;
- /* the absolute error on c is bounded by 2^(err - w) */
-
-+ err -= MPFR_GET_EXP (c);
-+
-+ clear:
- mpfr_clear (s);
- mpfr_clear (P);
- mpfr_clear (Q);
-@@ -266,8 +278,7 @@
- mpfr_clear (err_s);
- mpfr_clear (err_u);
-
-- err -= MPFR_GET_EXP (c);
-- if (MPFR_LIKELY (MPFR_CAN_ROUND (c, w - err, MPFR_PREC(res), r)))
-+ if (ok && MPFR_LIKELY (MPFR_CAN_ROUND (c, w - err, MPFR_PREC(res), r)))
- break;
- if (diverge != 0)
- {
-diff -Naurd mpfr-4.1.0-a/src/mpfr.h mpfr-4.1.0-b/src/mpfr.h
---- mpfr-4.1.0-a/src/mpfr.h 2021-02-11 12:52:52.559350226 +0000
-+++ mpfr-4.1.0-b/src/mpfr.h 2021-02-11 12:53:38.422850555 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 4
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "4.1.0-p6"
-+#define MPFR_VERSION_STRING "4.1.0-p7"
-
- /* User macros:
- MPFR_USE_FILE: Define it to make MPFR define functions dealing
-diff -Naurd mpfr-4.1.0-a/src/version.c mpfr-4.1.0-b/src/version.c
---- mpfr-4.1.0-a/src/version.c 2021-02-11 12:52:52.559350226 +0000
-+++ mpfr-4.1.0-b/src/version.c 2021-02-11 12:53:38.426850512 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
-- return "4.1.0-p6";
-+ return "4.1.0-p7";
- }
-diff -Naurd mpfr-4.1.0-a/tests/tj0.c mpfr-4.1.0-b/tests/tj0.c
---- mpfr-4.1.0-a/tests/tj0.c 2020-01-08 18:11:13.000000000 +0000
-+++ mpfr-4.1.0-b/tests/tj0.c 2021-02-11 12:53:38.410850685 +0000
-@@ -27,6 +27,25 @@
- #define REDUCE_EMAX 262143 /* otherwise arg. reduction is too expensive */
- #include "tgeneric.c"
-
-+/* bug found in revision 14399 with GMP_CHECK_RANDOMIZE=1612721106588971 */
-+static void
-+bug20210208 (void)
-+{
-+ mpfr_t x, y;
-+ int inex;
-+
-+ mpfr_init2 (x, 79);
-+ mpfr_init2 (y, 1);
-+ mpfr_set_str (x, "2.552495117262005805960565e+02", 10, MPFR_RNDN);
-+ mpfr_clear_flags ();
-+ inex = mpfr_j0 (y, x, MPFR_RNDZ);
-+ MPFR_ASSERTN (mpfr_cmp_si_2exp (y, -1, -5) == 0);
-+ MPFR_ASSERTN (inex > 0);
-+ MPFR_ASSERTN (__gmpfr_flags == MPFR_FLAGS_INEXACT);
-+ mpfr_clear (x);
-+ mpfr_clear (y);
-+}
-+
- int
- main (int argc, char *argv[])
- {
-@@ -35,6 +54,8 @@
-
- tests_start_mpfr ();
-
-+ bug20210208 ();
-+
- mpfr_init (x);
- mpfr_init (y);
-
-diff -Naurd mpfr-4.1.0-a/PATCHES mpfr-4.1.0-b/PATCHES
---- mpfr-4.1.0-a/PATCHES 2021-02-17 17:22:34.594973310 +0000
-+++ mpfr-4.1.0-b/PATCHES 2021-02-17 17:22:34.702972090 +0000
-@@ -0,0 +1 @@
-+digamma-interm-zero2
-diff -Naurd mpfr-4.1.0-a/VERSION mpfr-4.1.0-b/VERSION
---- mpfr-4.1.0-a/VERSION 2021-02-11 12:53:38.426850512 +0000
-+++ mpfr-4.1.0-b/VERSION 2021-02-17 17:22:34.702972090 +0000
-@@ -1 +1 @@
--4.1.0-p7
-+4.1.0-p8
-diff -Naurd mpfr-4.1.0-a/src/digamma.c mpfr-4.1.0-b/src/digamma.c
---- mpfr-4.1.0-a/src/digamma.c 2021-02-11 12:52:52.547350357 +0000
-+++ mpfr-4.1.0-b/src/digamma.c 2021-02-17 17:22:34.690972226 +0000
-@@ -173,16 +173,19 @@
- mpfr_digamma (v, u, MPFR_RNDN); /* error <= 1/2 ulp */
- expv = MPFR_GET_EXP (v);
- mpfr_sub (v, v, t, MPFR_RNDN);
-- if (MPFR_GET_EXP (v) < MPFR_GET_EXP (t))
-- e1 += MPFR_EXP(t) - MPFR_EXP(v); /* scale error for t wrt new v */
-- /* now take into account the 1/2 ulp error for v */
-- if (expv - MPFR_EXP(v) - 1 > e1)
-- e1 = expv - MPFR_EXP(v) - 1;
-- else
-- e1 ++;
-- e1 ++; /* rounding error for mpfr_sub */
-- if (MPFR_CAN_ROUND (v, p - e1, MPFR_PREC(y), rnd_mode))
-- break;
-+ if (MPFR_NOTZERO(v))
-+ {
-+ if (MPFR_GET_EXP (v) < MPFR_GET_EXP (t))
-+ e1 += MPFR_EXP(t) - MPFR_EXP(v); /* scale error for t wrt new v */
-+ /* now take into account the 1/2 ulp error for v */
-+ if (expv - MPFR_EXP(v) - 1 > e1)
-+ e1 = expv - MPFR_EXP(v) - 1;
-+ else
-+ e1 ++;
-+ e1 ++; /* rounding error for mpfr_sub */
-+ if (MPFR_CAN_ROUND (v, p - e1, MPFR_PREC(y), rnd_mode))
-+ break;
-+ }
- MPFR_ZIV_NEXT (loop, p);
- mpfr_set_prec (t, p);
- mpfr_set_prec (v, p);
-@@ -416,10 +419,8 @@
- }
- }
-
-- if (MPFR_IS_NEG(x))
-- inex = mpfr_digamma_reflection (y, x, rnd_mode);
- /* if x < 1/2 we use the reflection formula */
-- else if (MPFR_EXP(x) < 0)
-+ if (MPFR_IS_NEG(x) || MPFR_EXP(x) < 0)
- inex = mpfr_digamma_reflection (y, x, rnd_mode);
- else
- inex = mpfr_digamma_positive (y, x, rnd_mode);
-diff -Naurd mpfr-4.1.0-a/src/mpfr.h mpfr-4.1.0-b/src/mpfr.h
---- mpfr-4.1.0-a/src/mpfr.h 2021-02-11 12:53:38.422850555 +0000
-+++ mpfr-4.1.0-b/src/mpfr.h 2021-02-17 17:22:34.702972090 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 4
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "4.1.0-p7"
-+#define MPFR_VERSION_STRING "4.1.0-p8"
-
- /* User macros:
- MPFR_USE_FILE: Define it to make MPFR define functions dealing
-diff -Naurd mpfr-4.1.0-a/src/version.c mpfr-4.1.0-b/src/version.c
---- mpfr-4.1.0-a/src/version.c 2021-02-11 12:53:38.426850512 +0000
-+++ mpfr-4.1.0-b/src/version.c 2021-02-17 17:22:34.702972090 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
-- return "4.1.0-p7";
-+ return "4.1.0-p8";
- }
-diff -Naurd mpfr-4.1.0-a/tests/tdigamma.c mpfr-4.1.0-b/tests/tdigamma.c
---- mpfr-4.1.0-a/tests/tdigamma.c 2021-02-11 12:52:52.547350357 +0000
-+++ mpfr-4.1.0-b/tests/tdigamma.c 2021-02-17 17:22:34.690972226 +0000
-@@ -110,6 +110,26 @@
- mpfr_clear (y);
- }
-
-+/* another test that fails with GMP_CHECK_RANDOMIZE=1613197421465830
-+ on revision 14429 */
-+static void
-+bug20210215 (void)
-+{
-+ mpfr_t x, y;
-+ int inex;
-+
-+ mpfr_init2 (x, 510);
-+ mpfr_init2 (y, 4);
-+ mpfr_set_str (x, "-8.2923051438433494998166335341807999322052669984208422481227138906096000469898717007386115912802685588348601663465077353194268894939972221117314512518182580e+35", 10, MPFR_RNDN);
-+ mpfr_clear_flags ();
-+ inex = mpfr_digamma (y, x, MPFR_RNDU);
-+ MPFR_ASSERTN (mpfr_cmp_ui0 (y, 88) == 0);
-+ MPFR_ASSERTN (inex > 0);
-+ MPFR_ASSERTN (__gmpfr_flags == MPFR_FLAGS_INEXACT);
-+ mpfr_clear (x);
-+ mpfr_clear (y);
-+}
-+
- int
- main (int argc, char *argv[])
- {
-@@ -118,6 +138,7 @@
- special ();
- bug20210206 ();
- bug20210208 ();
-+ bug20210215 ();
-
- test_generic (MPFR_PREC_MIN, 200, 20);
-
-diff -Naurd mpfr-4.1.0-a/PATCHES mpfr-4.1.0-b/PATCHES
---- mpfr-4.1.0-a/PATCHES 2021-02-17 17:25:46.396981483 +0000
-+++ mpfr-4.1.0-b/PATCHES 2021-02-17 17:25:46.440981068 +0000
-@@ -0,0 +1 @@
-+jyn_asympt-interm-zero
-diff -Naurd mpfr-4.1.0-a/VERSION mpfr-4.1.0-b/VERSION
---- mpfr-4.1.0-a/VERSION 2021-02-17 17:22:34.702972090 +0000
-+++ mpfr-4.1.0-b/VERSION 2021-02-17 17:25:46.440981068 +0000
-@@ -1 +1 @@
--4.1.0-p8
-+4.1.0-p9
-diff -Naurd mpfr-4.1.0-a/src/jyn_asympt.c mpfr-4.1.0-b/src/jyn_asympt.c
---- mpfr-4.1.0-a/src/jyn_asympt.c 2021-02-11 12:53:38.410850685 +0000
-+++ mpfr-4.1.0-b/src/jyn_asympt.c 2021-02-17 17:25:46.424981219 +0000
-@@ -69,7 +69,7 @@
- MPFR_ZIV_INIT (loop, w);
- for (;;)
- {
-- int ok = 1;
-+ int ok = 0;
-
- mpfr_set_prec (c, w);
- mpfr_init2 (s, w);
-@@ -96,10 +96,7 @@
-
- /* if s or c is zero, MPFR_GET_EXP will fail below */
- if (MPFR_IS_ZERO(s) || MPFR_IS_ZERO(c))
-- {
-- ok = 0;
-- goto clear;
-- }
-+ goto clear; /* with ok=0 */
-
- /* precompute 1/(8|z|) */
- mpfr_si_div (iz, MPFR_IS_POS(z) ? 1 : -1, z, MPFR_RNDN); /* err <= 1 */
-@@ -227,6 +224,9 @@
- mpfr_sub (s, c, s, MPFR_RNDN);
- #endif
- }
-+ if (MPFR_IS_ZERO(s))
-+ goto clear; /* with ok=0 */
-+ ok = 1;
- if ((n & 2) != 0)
- mpfr_neg (s, s, MPFR_RNDN);
- if (MPFR_GET_EXP (s) > err)
-diff -Naurd mpfr-4.1.0-a/src/mpfr.h mpfr-4.1.0-b/src/mpfr.h
---- mpfr-4.1.0-a/src/mpfr.h 2021-02-17 17:22:34.702972090 +0000
-+++ mpfr-4.1.0-b/src/mpfr.h 2021-02-17 17:25:46.436981105 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 4
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "4.1.0-p8"
-+#define MPFR_VERSION_STRING "4.1.0-p9"
-
- /* User macros:
- MPFR_USE_FILE: Define it to make MPFR define functions dealing
-diff -Naurd mpfr-4.1.0-a/src/version.c mpfr-4.1.0-b/src/version.c
---- mpfr-4.1.0-a/src/version.c 2021-02-17 17:22:34.702972090 +0000
-+++ mpfr-4.1.0-b/src/version.c 2021-02-17 17:25:46.440981068 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
-- return "4.1.0-p8";
-+ return "4.1.0-p9";
- }
-diff -Naurd mpfr-4.1.0-a/tests/mpfr-test.h mpfr-4.1.0-b/tests/mpfr-test.h
---- mpfr-4.1.0-a/tests/mpfr-test.h 2020-06-29 13:57:32.000000000 +0000
-+++ mpfr-4.1.0-b/tests/mpfr-test.h 2021-02-17 17:25:46.424981219 +0000
-@@ -191,6 +191,8 @@
-
- #define mpfr_cmp0(x,y) (MPFR_ASSERTN (!MPFR_IS_NAN (x) && !MPFR_IS_NAN (y)), mpfr_cmp (x,y))
- #define mpfr_cmp_ui0(x,i) (MPFR_ASSERTN (!MPFR_IS_NAN (x)), mpfr_cmp_ui (x,i))
-+#define mpfr_cmp_si_2exp0(x,i,e) (MPFR_ASSERTN (!MPFR_IS_NAN (x)), \
-+ mpfr_cmp_si_2exp (x,i,e))
-
- /* define CHECK_EXTERNAL if you want to check mpfr against another library
- with correct rounding. You'll probably have to modify mpfr_print_raw()
-diff -Naurd mpfr-4.1.0-a/tests/tj1.c mpfr-4.1.0-b/tests/tj1.c
---- mpfr-4.1.0-a/tests/tj1.c 2020-01-08 18:11:13.000000000 +0000
-+++ mpfr-4.1.0-b/tests/tj1.c 2021-02-17 17:25:46.424981219 +0000
-@@ -55,14 +55,14 @@
- /* since |x| is just above 2^e, |j1(x)| is just above 2^(e-1),
- thus y should be 2^(e-1) and the inexact flag should be
- of opposite sign of x */
-- MPFR_ASSERTN(mpfr_cmp_si_2exp (y, sign, e - 1) == 0);
-+ MPFR_ASSERTN(mpfr_cmp_si_2exp0 (y, sign, e - 1) == 0);
- MPFR_ASSERTN(VSIGN (inex) * sign < 0);
- }
- else
- {
- /* here |y| should be 0.5*2^emin and the inexact flag should
- have the sign of x */
-- MPFR_ASSERTN(mpfr_cmp_si_2exp (y, sign, e) == 0);
-+ MPFR_ASSERTN(mpfr_cmp_si_2exp0 (y, sign, e) == 0);
- MPFR_ASSERTN(VSIGN (inex) * sign > 0);
- }
- }
-@@ -72,6 +72,26 @@
- mpfr_clear (y);
- }
-
-+/* a test that fails with GMP_CHECK_RANDOMIZE=1613146232984428
-+ on revision 14429 */
-+static void
-+bug20210215 (void)
-+{
-+ mpfr_t x, y;
-+ int inex;
-+
-+ mpfr_init2 (x, 221);
-+ mpfr_init2 (y, 1);
-+ mpfr_set_str (x, "1.6484611511696130037307738844228498447763863563070374544054791168614e+01", 10, MPFR_RNDN);
-+ mpfr_clear_flags ();
-+ inex = mpfr_j1 (y, x, MPFR_RNDZ);
-+ MPFR_ASSERTN (mpfr_cmp_si_2exp0 (y, -1, -9) == 0);
-+ MPFR_ASSERTN (inex > 0);
-+ MPFR_ASSERTN (__gmpfr_flags == MPFR_FLAGS_INEXACT);
-+ mpfr_clear (x);
-+ mpfr_clear (y);
-+}
-+
- int
- main (int argc, char *argv[])
- {
-@@ -79,6 +99,8 @@
-
- tests_start_mpfr ();
-
-+ bug20210215 ();
-+
- test_small ();
-
- mpfr_init (x);
-diff -Naurd mpfr-4.1.0-a/PATCHES mpfr-4.1.0-b/PATCHES
---- mpfr-4.1.0-a/PATCHES 2021-03-09 13:55:43.183158946 +0000
-+++ mpfr-4.1.0-b/PATCHES 2021-03-09 13:55:43.223158508 +0000
-@@ -0,0 +1 @@
-+macros
-diff -Naurd mpfr-4.1.0-a/VERSION mpfr-4.1.0-b/VERSION
---- mpfr-4.1.0-a/VERSION 2021-02-17 17:25:46.440981068 +0000
-+++ mpfr-4.1.0-b/VERSION 2021-03-09 13:55:43.223158508 +0000
-@@ -1 +1 @@
--4.1.0-p9
-+4.1.0-p10
-diff -Naurd mpfr-4.1.0-a/doc/mpfr.info mpfr-4.1.0-b/doc/mpfr.info
---- mpfr-4.1.0-a/doc/mpfr.info 2020-07-10 11:59:13.000000000 +0000
-+++ mpfr-4.1.0-b/doc/mpfr.info 2021-03-09 13:55:51.167071327 +0000
-@@ -3217,7 +3217,11 @@
-
- Each function in this interface is also implemented as a macro for
- efficiency reasons: for example ‘mpfr_custom_init (s, p)’ uses the
--macro, while ‘(mpfr_custom_init) (s, p)’ uses the function.
-+macro, while ‘(mpfr_custom_init) (s, p)’ uses the function. Note that
-+the macro may evaluate arguments multiple times (or none). Moreover,
-+macros implementing functions with the ‘void’ return type may not be
-+used in contexts where an expression is expected, e.g., inside
-+‘for(...)’ or before a comma operator.
-
- Note 1: MPFR functions may still initialize temporary floating-point
- numbers using ‘mpfr_init’ and similar functions. See Custom Allocation
-@@ -4579,13 +4583,13 @@
- (line 115)
- * mpfr_csch: Transcendental Functions.
- (line 180)
--* mpfr_custom_get_exp: Custom Interface. (line 76)
--* mpfr_custom_get_kind: Custom Interface. (line 66)
--* mpfr_custom_get_significand: Custom Interface. (line 71)
--* mpfr_custom_get_size: Custom Interface. (line 37)
--* mpfr_custom_init: Custom Interface. (line 41)
--* mpfr_custom_init_set: Custom Interface. (line 48)
--* mpfr_custom_move: Custom Interface. (line 85)
-+* mpfr_custom_get_exp: Custom Interface. (line 80)
-+* mpfr_custom_get_kind: Custom Interface. (line 70)
-+* mpfr_custom_get_significand: Custom Interface. (line 75)
-+* mpfr_custom_get_size: Custom Interface. (line 41)
-+* mpfr_custom_init: Custom Interface. (line 45)
-+* mpfr_custom_init_set: Custom Interface. (line 52)
-+* mpfr_custom_move: Custom Interface. (line 89)
- * MPFR_DECL_INIT: Initialization Functions.
- (line 77)
- * mpfr_digamma: Transcendental Functions.
-@@ -5165,19 +5169,19 @@
- Node: Memory Handling Functions155904
- Node: Compatibility with MPF157792
- Node: Custom Interface160961
--Node: Internals165592
--Node: API Compatibility167136
--Node: Type and Macro Changes169084
--Node: Added Functions172267
--Node: Changed Functions177074
--Node: Removed Functions184433
--Node: Other Changes185163
--Node: MPFR and the IEEE 754 Standard186864
--Node: Contributors189481
--Node: References192620
--Node: GNU Free Documentation License194501
--Node: Concept Index217095
--Node: Function and Type Index223168
-+Node: Internals165852
-+Node: API Compatibility167396
-+Node: Type and Macro Changes169344
-+Node: Added Functions172527
-+Node: Changed Functions177334
-+Node: Removed Functions184693
-+Node: Other Changes185423
-+Node: MPFR and the IEEE 754 Standard187124
-+Node: Contributors189741
-+Node: References192880
-+Node: GNU Free Documentation License194761
-+Node: Concept Index217355
-+Node: Function and Type Index223428
-
- End Tag Table
-
-diff -Naurd mpfr-4.1.0-a/doc/mpfr.texi mpfr-4.1.0-b/doc/mpfr.texi
---- mpfr-4.1.0-a/doc/mpfr.texi 2020-07-10 11:52:33.000000000 +0000
-+++ mpfr-4.1.0-b/doc/mpfr.texi 2021-03-09 13:55:43.211158639 +0000
-@@ -3817,6 +3817,12 @@
- Each function in this interface is also implemented as a macro for
- efficiency reasons: for example @code{mpfr_custom_init (s, p)}
- uses the macro, while @code{(mpfr_custom_init) (s, p)} uses the function.
-+Note that the macro may evaluate arguments multiple times (or none).
-+Moreover, macros implementing functions with the @code{void} return type
-+may not be used in contexts where an expression is expected, e.g., inside
-+@code{for(...)} or before a comma operator.
-+@c These limitations with macros cannot be avoided in a C90 compatible way.
-+@c In the future, inline functions could be used.
-
- Note 1: MPFR functions may still initialize temporary floating-point numbers
- using @code{mpfr_init} and similar functions. See Custom Allocation (GNU MP)@.
-diff -Naurd mpfr-4.1.0-a/src/mpfr.h mpfr-4.1.0-b/src/mpfr.h
---- mpfr-4.1.0-a/src/mpfr.h 2021-02-17 17:25:46.436981105 +0000
-+++ mpfr-4.1.0-b/src/mpfr.h 2021-03-09 13:55:43.223158508 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 4
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "4.1.0-p9"
-+#define MPFR_VERSION_STRING "4.1.0-p10"
-
- /* User macros:
- MPFR_USE_FILE: Define it to make MPFR define functions dealing
-@@ -833,23 +833,39 @@
- even if it produces faster and smaller code. */
- #ifndef MPFR_USE_NO_MACRO
-
--/* Inlining these functions is both faster and smaller */
--#define mpfr_nan_p(_x) ((_x)->_mpfr_exp == __MPFR_EXP_NAN)
--#define mpfr_inf_p(_x) ((_x)->_mpfr_exp == __MPFR_EXP_INF)
--#define mpfr_zero_p(_x) ((_x)->_mpfr_exp == __MPFR_EXP_ZERO)
--#define mpfr_regular_p(_x) ((_x)->_mpfr_exp > __MPFR_EXP_INF)
-+/* In the implementation of these macros, we need to make sure that the
-+ arguments are evaluated one time exactly and that type conversion is
-+ done as it would be with a function. Tests should be added to ensure
-+ that.
-+ Note that the macros for the custom interface are not concerned; the
-+ MPFR manual has been clarified. */
-+
-+/* Prevent x from being used as an lvalue.
-+ Thanks to Wojtek Lerch and Tim Rentsch for the idea. */
-+#define MPFR_VALUE_OF(x) (0 ? (x) : (x))
-+
-+/* The following macro converts the argument to mpfr_srcptr, as in type
-+ conversion for function parameters. But it will detect disallowed
-+ implicit conversions, e.g. when the argument has an integer type. */
-+#define MPFR_SRCPTR(x) ((mpfr_srcptr) (0 ? (x) : (mpfr_srcptr) (x)))
-+#define MPFR_GET_SIGN(_x) MPFR_VALUE_OF(MPFR_SIGN(MPFR_SRCPTR(_x)))
-+
-+#define mpfr_nan_p(_x) (MPFR_SRCPTR(_x)->_mpfr_exp == __MPFR_EXP_NAN)
-+#define mpfr_inf_p(_x) (MPFR_SRCPTR(_x)->_mpfr_exp == __MPFR_EXP_INF)
-+#define mpfr_zero_p(_x) (MPFR_SRCPTR(_x)->_mpfr_exp == __MPFR_EXP_ZERO)
-+#define mpfr_regular_p(_x) (MPFR_SRCPTR(_x)->_mpfr_exp > __MPFR_EXP_INF)
-+
-+/* mpfr_sgn is documented as a macro, thus the following code is fine.
-+ But it would be safer to regard it as a function in some future
-+ MPFR version. */
- #define mpfr_sgn(_x) \
- ((_x)->_mpfr_exp < __MPFR_EXP_INF ? \
- (mpfr_nan_p (_x) ? mpfr_set_erangeflag () : (mpfr_void) 0), 0 : \
- MPFR_SIGN (_x))
-
--/* Prevent them from using as lvalues */
--#define MPFR_VALUE_OF(x) (0 ? (x) : (x))
--#define mpfr_get_prec(_x) MPFR_VALUE_OF((_x)->_mpfr_prec)
--#define mpfr_get_exp(_x) MPFR_VALUE_OF((_x)->_mpfr_exp)
--/* Note 1: If need be, the MPFR_VALUE_OF can be used for other expressions
-- (of any type). Thanks to Wojtek Lerch and Tim Rentsch for the idea.
-- Note 2: Defining mpfr_get_exp() as a macro has the effect to disable
-+#define mpfr_get_prec(_x) MPFR_VALUE_OF(MPFR_SRCPTR(_x)->_mpfr_prec)
-+#define mpfr_get_exp(_x) MPFR_VALUE_OF(MPFR_SRCPTR(_x)->_mpfr_exp)
-+/* Note: Defining mpfr_get_exp() as a macro has the effect to disable
- the check that the argument is a pure FP number (done in the function);
- this increases the risk of undetected error and makes debugging more
- complex. Is it really worth in practice? (Potential FIXME) */
-@@ -861,11 +877,17 @@
-
- #define mpfr_cmp_ui(b,i) mpfr_cmp_ui_2exp((b),(i),0)
- #define mpfr_cmp_si(b,i) mpfr_cmp_si_2exp((b),(i),0)
--#define mpfr_set(a,b,r) mpfr_set4(a,b,r,MPFR_SIGN(b))
-+#if __GNUC__ > 2 || __GNUC_MINOR__ >= 95
-+#define mpfr_set(a,b,r) \
-+ __extension__ ({ \
-+ mpfr_srcptr _p = (b); \
-+ mpfr_set4(a,_p,r,MPFR_SIGN(_p)); \
-+ })
-+#endif
- #define mpfr_abs(a,b,r) mpfr_set4(a,b,r,1)
--#define mpfr_copysign(a,b,c,r) mpfr_set4(a,b,r,MPFR_SIGN(c))
-+#define mpfr_copysign(a,b,c,r) mpfr_set4(a,b,r,MPFR_GET_SIGN(c))
- #define mpfr_setsign(a,b,s,r) mpfr_set4(a,b,r,(s) ? -1 : 1)
--#define mpfr_signbit(x) (MPFR_SIGN(x) < 0)
-+#define mpfr_signbit(x) (MPFR_GET_SIGN(x) < 0)
- #define mpfr_cmp(b, c) mpfr_cmp3(b, c, 1)
- #define mpfr_mul_2exp(y,x,n,r) mpfr_mul_2ui((y),(x),(n),(r))
- #define mpfr_div_2exp(y,x,n,r) mpfr_div_2ui((y),(x),(n),(r))
-diff -Naurd mpfr-4.1.0-a/src/ubf.c mpfr-4.1.0-b/src/ubf.c
---- mpfr-4.1.0-a/src/ubf.c 2020-02-12 01:38:57.000000000 +0000
-+++ mpfr-4.1.0-b/src/ubf.c 2021-03-09 13:55:43.211158639 +0000
-@@ -78,7 +78,7 @@
- mpfr_get_prec (b), mpfr_log_prec, b,
- mpfr_get_prec (c), mpfr_log_prec, c),
- ("a[%Pu]=%.*Rg",
-- mpfr_get_prec (a), mpfr_log_prec, a));
-+ mpfr_get_prec ((mpfr_ptr) a), mpfr_log_prec, a));
-
- MPFR_ASSERTD ((mpfr_ptr) a != b);
- MPFR_ASSERTD ((mpfr_ptr) a != c);
-diff -Naurd mpfr-4.1.0-a/src/version.c mpfr-4.1.0-b/src/version.c
---- mpfr-4.1.0-a/src/version.c 2021-02-17 17:25:46.440981068 +0000
-+++ mpfr-4.1.0-b/src/version.c 2021-03-09 13:55:43.223158508 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
-- return "4.1.0-p9";
-+ return "4.1.0-p10";
- }
-diff -Naurd mpfr-4.1.0-a/tests/mpfr-test.h mpfr-4.1.0-b/tests/mpfr-test.h
---- mpfr-4.1.0-a/tests/mpfr-test.h 2021-02-17 17:25:46.424981219 +0000
-+++ mpfr-4.1.0-b/tests/mpfr-test.h 2021-03-09 13:55:43.211158639 +0000
-@@ -92,6 +92,32 @@
- #define STRINGIZE(S) #S
- #define MAKE_STR(S) STRINGIZE(S)
-
-+/* In C (but not C++), mpfr_ptr and mpfr_srcptr arguments can be provided
-+ in a different pointer type, such as void *. For functions implemented
-+ as macros, the type conversion for the function parameters will not be
-+ done by the compiler, which means potential bugs in these implementations
-+ if we forget to take these unusual cases into account. So we need to test
-+ such arguments, in order to make sure that the arguments are converted to
-+ the expected type when needed.
-+
-+ However, at least when the function is not implemented as a macro (which
-+ is the case when MPFR_USE_NO_MACRO is defined), such tests with void *
-+ arguments are not valid in C++; therefore, we will not do the cast to
-+ void * if the __cplusplus macro is defined. And with GCC compilers (and
-+ compatible), we will ignore the -Wc++-compat option around these tests.
-+
-+ Note: in the future, inline functions could be used instead of macros,
-+ and such tests would become useless (except to detect compiler bugs).
-+*/
-+#if defined (__cplusplus)
-+#define VOIDP_CAST(X) (X)
-+#else
-+#define VOIDP_CAST(X) ((void *) (X))
-+#if defined (__GNUC__)
-+#define IGNORE_CPP_COMPAT
-+#endif
-+#endif
-+
- #if defined (__cplusplus)
- extern "C" {
- #endif
-diff -Naurd mpfr-4.1.0-a/tests/tcopysign.c mpfr-4.1.0-b/tests/tcopysign.c
---- mpfr-4.1.0-a/tests/tcopysign.c 2020-01-08 18:11:13.000000000 +0000
-+++ mpfr-4.1.0-b/tests/tcopysign.c 2021-03-09 13:55:43.211158639 +0000
-@@ -26,26 +26,72 @@
- copysign_variant (mpfr_ptr z, mpfr_srcptr x, mpfr_srcptr y,
- mpfr_rnd_t rnd_mode, int k)
- {
-+ mpfr_srcptr p;
-+ int a = 0, b = 0, c = 0;
-+
-+ /* invalid sign, to test that the sign is always correctly set */
-+ MPFR_SIGN (z) = 0;
-+
-+ if (k >= 8)
-+ {
-+ MPFR_ASSERTN (MPFR_PREC (z) >= MPFR_PREC (x));
-+ mpfr_set (z, x, MPFR_RNDN);
-+ p = z;
-+ k -= 8;
-+ }
-+ else
-+ p = x;
-+
- mpfr_clear_flags ();
- switch (k)
- {
- case 0:
-- mpfr_copysign (z, x, y, MPFR_RNDN);
-+ mpfr_copysign (z, p, y, rnd_mode);
- return;
- case 1:
-- (mpfr_copysign) (z, x, y, MPFR_RNDN);
-+ (mpfr_copysign) (z, p, y, rnd_mode);
- return;
- case 2:
-- mpfr_setsign (z, x, mpfr_signbit (y), MPFR_RNDN);
-+#ifdef IGNORE_CPP_COMPAT
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wc++-compat"
-+#endif
-+ mpfr_copysign ((a++, VOIDP_CAST(z)),
-+ (b++, VOIDP_CAST(p)),
-+ (c++, VOIDP_CAST(y)), rnd_mode);
-+#ifdef IGNORE_CPP_COMPAT
-+#pragma GCC diagnostic pop
-+#endif
-+ MPFR_ASSERTN (a == 1);
-+ MPFR_ASSERTN (b == 1);
-+ MPFR_ASSERTN (c == 1);
- return;
- case 3:
-- mpfr_setsign (z, x, (mpfr_signbit) (y), MPFR_RNDN);
-+ mpfr_setsign (z, p, mpfr_signbit (y), rnd_mode);
- return;
- case 4:
-- (mpfr_setsign) (z, x, mpfr_signbit (y), MPFR_RNDN);
-+ mpfr_setsign (z, p, (mpfr_signbit) (y), rnd_mode);
- return;
- case 5:
-- (mpfr_setsign) (z, x, (mpfr_signbit) (y), MPFR_RNDN);
-+ (mpfr_setsign) (z, p, mpfr_signbit (y), rnd_mode);
-+ return;
-+ case 6:
-+ (mpfr_setsign) (z, p, (mpfr_signbit) (y), rnd_mode);
-+ return;
-+ case 7:
-+#ifdef IGNORE_CPP_COMPAT
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wc++-compat"
-+#endif
-+ mpfr_setsign ((a++, VOIDP_CAST(z)),
-+ (b++, VOIDP_CAST(p)),
-+ mpfr_signbit ((c++, VOIDP_CAST(y))), rnd_mode);
-+#ifdef IGNORE_CPP_COMPAT
-+#pragma GCC diagnostic pop
-+#endif
-+ MPFR_ASSERTN (a == 1);
-+ MPFR_ASSERTN (b == 1);
-+ MPFR_ASSERTN (c == 1);
- return;
- }
- }
-@@ -64,7 +110,7 @@
-
- for (i = 0; i <= 1; i++)
- for (j = 0; j <= 1; j++)
-- for (k = 0; k <= 5; k++)
-+ for (k = 0; k < 16; k++)
- {
- mpfr_set_nan (x);
- i ? MPFR_SET_NEG (x) : MPFR_SET_POS (x);
-diff -Naurd mpfr-4.1.0-a/tests/texceptions.c mpfr-4.1.0-b/tests/texceptions.c
---- mpfr-4.1.0-a/tests/texceptions.c 2020-01-08 18:11:13.000000000 +0000
-+++ mpfr-4.1.0-b/tests/texceptions.c 2021-03-09 13:55:43.211158639 +0000
-@@ -103,10 +103,26 @@
- check_get_prec (void)
- {
- mpfr_t x;
-+ int i = 0;
-
- mpfr_init2 (x, 17);
-- if (mpfr_get_prec (x) != 17 || (mpfr_get_prec)(x) != 17)
-+
-+ if (mpfr_get_prec (x) != 17 || (mpfr_get_prec) (x) != 17)
- PRINT_ERROR ("mpfr_get_prec");
-+
-+#ifdef IGNORE_CPP_COMPAT
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wc++-compat"
-+#endif
-+
-+ if (mpfr_get_prec ((i++, VOIDP_CAST(x))) != 17)
-+ PRINT_ERROR ("mpfr_get_prec (2)");
-+
-+#ifdef IGNORE_CPP_COMPAT
-+#pragma GCC diagnostic pop
-+#endif
-+
-+ MPFR_ASSERTN (i == 1);
- mpfr_clear (x);
- }
-
-diff -Naurd mpfr-4.1.0-a/tests/tisnan.c mpfr-4.1.0-b/tests/tisnan.c
---- mpfr-4.1.0-a/tests/tisnan.c 2020-01-08 18:11:13.000000000 +0000
-+++ mpfr-4.1.0-b/tests/tisnan.c 2021-03-09 13:55:43.211158639 +0000
-@@ -27,180 +27,235 @@
- main (void)
- {
- mpfr_t x;
-+ int i = 0, j = 0;
-+
-+ /* We need to check that when the function is implemented by a macro,
-+ it behaves correctly. */
-+#define ARG (i++, VOIDP_CAST(x))
-+#define CHECK MPFR_ASSERTN (i == ++j)
-
- tests_start_mpfr ();
-
- mpfr_init (x);
-
-+#if 0
-+ /* The following should yield a compilation error when the functions
-+ are implemented as macros. Change 0 to 1 above in order to test. */
-+ (void) (mpfr_nan_p (1L));
-+ (void) (mpfr_inf_p (1L));
-+ (void) (mpfr_number_p (1L));
-+ (void) (mpfr_zero_p (1L));
-+ (void) (mpfr_regular_p (1L));
-+#endif
-+
-+#ifdef IGNORE_CPP_COMPAT
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wc++-compat"
-+#endif
-+
- /* check +infinity gives non-zero for mpfr_inf_p only */
- mpfr_set_ui (x, 1L, MPFR_RNDZ);
- mpfr_div_ui (x, x, 0L, MPFR_RNDZ);
-- if (mpfr_nan_p (x) || (mpfr_nan_p) (x) )
-+ if (mpfr_nan_p (x) || (mpfr_nan_p) (x) || mpfr_nan_p (ARG))
- {
- printf ("Error: mpfr_nan_p(+Inf) gives non-zero\n");
- exit (1);
- }
-- if (mpfr_inf_p (x) == 0)
-+ CHECK;
-+ if (!mpfr_inf_p (x) || !(mpfr_inf_p) (x) || !mpfr_inf_p (ARG))
- {
- printf ("Error: mpfr_inf_p(+Inf) gives zero\n");
- exit (1);
- }
-- if (mpfr_number_p (x) || (mpfr_number_p) (x) )
-+ CHECK;
-+ if (mpfr_number_p (x) || (mpfr_number_p) (x) || mpfr_number_p (ARG))
- {
- printf ("Error: mpfr_number_p(+Inf) gives non-zero\n");
- exit (1);
- }
-- if (mpfr_zero_p (x) || (mpfr_zero_p) (x) )
-+ CHECK;
-+ if (mpfr_zero_p (x) || (mpfr_zero_p) (x) || mpfr_zero_p (ARG))
- {
- printf ("Error: mpfr_zero_p(+Inf) gives non-zero\n");
- exit (1);
- }
-- if (mpfr_regular_p (x) || (mpfr_regular_p) (x) )
-+ CHECK;
-+ if (mpfr_regular_p (x) || (mpfr_regular_p) (x) || mpfr_regular_p (ARG))
- {
- printf ("Error: mpfr_regular_p(+Inf) gives non-zero\n");
- exit (1);
- }
-+ CHECK;
-
- /* same for -Inf */
- mpfr_neg (x, x, MPFR_RNDN);
-- if (mpfr_nan_p (x) || (mpfr_nan_p(x)))
-+ if (mpfr_nan_p (x) || (mpfr_nan_p) (x) || mpfr_nan_p (ARG))
- {
- printf ("Error: mpfr_nan_p(-Inf) gives non-zero\n");
- exit (1);
- }
-- if (mpfr_inf_p (x) == 0)
-+ CHECK;
-+ if (!mpfr_inf_p (x) || !(mpfr_inf_p) (x) || !mpfr_inf_p (ARG))
- {
- printf ("Error: mpfr_inf_p(-Inf) gives zero\n");
- exit (1);
- }
-- if (mpfr_number_p (x) || (mpfr_number_p)(x) )
-+ CHECK;
-+ if (mpfr_number_p (x) || (mpfr_number_p) (x) || mpfr_number_p (ARG))
- {
- printf ("Error: mpfr_number_p(-Inf) gives non-zero\n");
- exit (1);
- }
-- if (mpfr_zero_p (x) || (mpfr_zero_p)(x) )
-+ CHECK;
-+ if (mpfr_zero_p (x) || (mpfr_zero_p) (x) || mpfr_zero_p (ARG))
- {
- printf ("Error: mpfr_zero_p(-Inf) gives non-zero\n");
- exit (1);
- }
-- if (mpfr_regular_p (x) || (mpfr_regular_p) (x) )
-+ CHECK;
-+ if (mpfr_regular_p (x) || (mpfr_regular_p) (x) || mpfr_regular_p (ARG))
- {
- printf ("Error: mpfr_regular_p(-Inf) gives non-zero\n");
- exit (1);
- }
-+ CHECK;
-
- /* same for NaN */
- mpfr_sub (x, x, x, MPFR_RNDN);
-- if (mpfr_nan_p (x) == 0)
-+ if (!mpfr_nan_p (x) || !(mpfr_nan_p) (x) || !mpfr_nan_p (ARG))
- {
- printf ("Error: mpfr_nan_p(NaN) gives zero\n");
- exit (1);
- }
-- if (mpfr_inf_p (x) || (mpfr_inf_p)(x) )
-+ CHECK;
-+ if (mpfr_inf_p (x) || (mpfr_inf_p) (x) || mpfr_inf_p (ARG))
- {
- printf ("Error: mpfr_inf_p(NaN) gives non-zero\n");
- exit (1);
- }
-- if (mpfr_number_p (x) || (mpfr_number_p) (x) )
-+ CHECK;
-+ if (mpfr_number_p (x) || (mpfr_number_p) (x) || mpfr_number_p (ARG))
- {
- printf ("Error: mpfr_number_p(NaN) gives non-zero\n");
- exit (1);
- }
-- if (mpfr_zero_p (x) || (mpfr_zero_p)(x) )
-+ CHECK;
-+ if (mpfr_zero_p (x) || (mpfr_zero_p) (x) || mpfr_zero_p (ARG))
- {
- printf ("Error: mpfr_number_p(NaN) gives non-zero\n");
- exit (1);
- }
-- if (mpfr_regular_p (x) || (mpfr_regular_p) (x) )
-+ CHECK;
-+ if (mpfr_regular_p (x) || (mpfr_regular_p) (x) || mpfr_regular_p (ARG))
- {
- printf ("Error: mpfr_regular_p(NaN) gives non-zero\n");
- exit (1);
- }
-+ CHECK;
-
- /* same for a regular number */
- mpfr_set_ui (x, 1, MPFR_RNDN);
-- if (mpfr_nan_p (x) || (mpfr_nan_p)(x))
-+ if (mpfr_nan_p (x) || (mpfr_nan_p) (x) || mpfr_nan_p (ARG))
- {
- printf ("Error: mpfr_nan_p(1) gives non-zero\n");
- exit (1);
- }
-- if (mpfr_inf_p (x) || (mpfr_inf_p)(x) )
-+ CHECK;
-+ if (mpfr_inf_p (x) || (mpfr_inf_p) (x) || mpfr_inf_p (ARG))
- {
- printf ("Error: mpfr_inf_p(1) gives non-zero\n");
- exit (1);
- }
-- if (mpfr_number_p (x) == 0)
-+ CHECK;
-+ if (!mpfr_number_p (x) || !(mpfr_number_p) (x) || !mpfr_number_p (ARG))
- {
- printf ("Error: mpfr_number_p(1) gives zero\n");
- exit (1);
- }
-- if (mpfr_zero_p (x) || (mpfr_zero_p) (x) )
-+ CHECK;
-+ if (mpfr_zero_p (x) || (mpfr_zero_p) (x) || mpfr_zero_p (ARG))
- {
- printf ("Error: mpfr_zero_p(1) gives non-zero\n");
- exit (1);
- }
-- if (mpfr_regular_p (x) == 0 || (mpfr_regular_p) (x) == 0)
-+ CHECK;
-+ if (!mpfr_regular_p (x) || !(mpfr_regular_p) (x) || !mpfr_regular_p (ARG))
- {
- printf ("Error: mpfr_regular_p(1) gives zero\n");
- exit (1);
- }
-+ CHECK;
-
- /* Same for +0 */
- mpfr_set_ui (x, 0, MPFR_RNDN);
-- if (mpfr_nan_p (x) || (mpfr_nan_p)(x))
-+ if (mpfr_nan_p (x) || (mpfr_nan_p) (x) || mpfr_nan_p (ARG))
- {
- printf ("Error: mpfr_nan_p(+0) gives non-zero\n");
- exit (1);
- }
-- if (mpfr_inf_p (x) || (mpfr_inf_p)(x) )
-+ CHECK;
-+ if (mpfr_inf_p (x) || (mpfr_inf_p) (x) || mpfr_inf_p (ARG))
- {
- printf ("Error: mpfr_inf_p(+0) gives non-zero\n");
- exit (1);
- }
-- if (mpfr_number_p (x) == 0)
-+ CHECK;
-+ if (!mpfr_number_p (x) || !(mpfr_number_p) (x) || !mpfr_number_p (ARG))
- {
- printf ("Error: mpfr_number_p(+0) gives zero\n");
- exit (1);
- }
-- if (mpfr_zero_p (x) == 0 )
-+ CHECK;
-+ if (!mpfr_zero_p (x) || !(mpfr_zero_p) (x) || !mpfr_zero_p (ARG))
- {
- printf ("Error: mpfr_zero_p(+0) gives zero\n");
- exit (1);
- }
-- if (mpfr_regular_p (x) || (mpfr_regular_p) (x) )
-+ CHECK;
-+ if (mpfr_regular_p (x) || (mpfr_regular_p) (x) || mpfr_regular_p (ARG))
- {
- printf ("Error: mpfr_regular_p(+0) gives non-zero\n");
- exit (1);
- }
-+ CHECK;
-
- /* Same for -0 */
- mpfr_set_ui (x, 0, MPFR_RNDN);
- mpfr_neg (x, x, MPFR_RNDN);
-- if (mpfr_nan_p (x) || (mpfr_nan_p)(x))
-+ if (mpfr_nan_p (x) || (mpfr_nan_p) (x) || mpfr_nan_p (ARG))
- {
- printf ("Error: mpfr_nan_p(-0) gives non-zero\n");
- exit (1);
- }
-- if (mpfr_inf_p (x) || (mpfr_inf_p)(x) )
-+ CHECK;
-+ if (mpfr_inf_p (x) || (mpfr_inf_p) (x) || mpfr_inf_p (ARG))
- {
- printf ("Error: mpfr_inf_p(-0) gives non-zero\n");
- exit (1);
- }
-- if (mpfr_number_p (x) == 0)
-+ CHECK;
-+ if (!mpfr_number_p (x) || !(mpfr_number_p) (x) || !mpfr_number_p (ARG))
- {
- printf ("Error: mpfr_number_p(-0) gives zero\n");
- exit (1);
- }
-- if (mpfr_zero_p (x) == 0 )
-+ CHECK;
-+ if (!mpfr_zero_p (x) || !(mpfr_zero_p) (x) || !mpfr_zero_p (ARG))
- {
- printf ("Error: mpfr_zero_p(-0) gives zero\n");
- exit (1);
- }
-- if (mpfr_regular_p (x) || (mpfr_regular_p) (x) )
-+ CHECK;
-+ if (mpfr_regular_p (x) || (mpfr_regular_p) (x) || mpfr_regular_p (ARG))
- {
- printf ("Error: mpfr_regular_p(-0) gives non-zero\n");
- exit (1);
- }
-+ CHECK;
-+
-+#ifdef IGNORE_CPP_COMPAT
-+#pragma GCC diagnostic pop
-+#endif
-
- mpfr_clear (x);
-
-diff -Naurd mpfr-4.1.0-a/tests/tset.c mpfr-4.1.0-b/tests/tset.c
---- mpfr-4.1.0-a/tests/tset.c 2020-01-08 18:11:13.000000000 +0000
-+++ mpfr-4.1.0-b/tests/tset.c 2021-03-09 13:55:43.207158683 +0000
-@@ -207,7 +207,7 @@
- static void
- check_ternary_value (void)
- {
-- int p, q, rnd;
-+ int k, p, q, rnd;
- int inexact, cmp;
- mpfr_t x, y;
-
-@@ -226,28 +226,45 @@
- {
- if (rnd == MPFR_RNDF) /* the test below makes no sense */
- continue;
-- inexact = mpfr_set (y, x, (mpfr_rnd_t) rnd);
-- cmp = mpfr_cmp (y, x);
-- if (((inexact == 0) && (cmp != 0)) ||
-- ((inexact > 0) && (cmp <= 0)) ||
-- ((inexact < 0) && (cmp >= 0)))
-- {
-- printf ("Wrong ternary value in mpfr_set for %s: expected"
-- " %d, got %d\n",
-- mpfr_print_rnd_mode ((mpfr_rnd_t) rnd), cmp,
-- inexact);
-- exit (1);
-- }
-- /* Test mpfr_set function too */
-- inexact = (mpfr_set) (y, x, (mpfr_rnd_t) rnd);
-- cmp = mpfr_cmp (y, x);
-- if (((inexact == 0) && (cmp != 0)) ||
-- ((inexact > 0) && (cmp <= 0)) ||
-- ((inexact < 0) && (cmp >= 0)))
-+ for (k = 0; k < 3; k++)
- {
-- printf ("Wrong ternary value in mpfr_set(2): expected %d,"
-- " got %d\n", cmp, inexact);
-- exit (1);
-+ int a = 0, b = 0, c = 0;
-+
-+ switch (k)
-+ {
-+ case 0:
-+ inexact = mpfr_set (y, x, (mpfr_rnd_t) rnd);
-+ break;
-+ case 1:
-+ inexact = (mpfr_set) (y, x, (mpfr_rnd_t) rnd);
-+ break;
-+ case 2:
-+#ifdef IGNORE_CPP_COMPAT
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wc++-compat"
-+#endif
-+ inexact = mpfr_set ((a++, VOIDP_CAST(y)),
-+ (b++, VOIDP_CAST(x)),
-+ (c++, (mpfr_rnd_t) rnd));
-+#ifdef IGNORE_CPP_COMPAT
-+#pragma GCC diagnostic pop
-+#endif
-+ MPFR_ASSERTN (a == 1);
-+ MPFR_ASSERTN (b == 1);
-+ MPFR_ASSERTN (c == 1);
-+ break;
-+ }
-+ cmp = mpfr_cmp (y, x);
-+ if (((inexact == 0) && (cmp != 0)) ||
-+ ((inexact > 0) && (cmp <= 0)) ||
-+ ((inexact < 0) && (cmp >= 0)))
-+ {
-+ printf ("Wrong ternary value in mpfr_set for %s (%d):"
-+ " expected %d, got %d\n",
-+ mpfr_print_rnd_mode ((mpfr_rnd_t) rnd),
-+ k, cmp, inexact);
-+ exit (1);
-+ }
- }
- }
- }
-diff -Naurd mpfr-4.1.0-a/tests/tset_exp.c mpfr-4.1.0-b/tests/tset_exp.c
---- mpfr-4.1.0-a/tests/tset_exp.c 2020-01-08 18:11:13.000000000 +0000
-+++ mpfr-4.1.0-b/tests/tset_exp.c 2021-03-09 13:55:43.211158639 +0000
-@@ -28,6 +28,7 @@
- mpfr_t x;
- int ret;
- mpfr_exp_t emin, emax, e;
-+ int i = 0;
-
- tests_start_mpfr ();
-
-@@ -63,6 +64,17 @@
- e = (mpfr_get_exp) (x);
- MPFR_ASSERTN (e == emin);
-
-+#ifdef IGNORE_CPP_COMPAT
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wc++-compat"
-+#endif
-+ e = mpfr_get_exp ((i++, VOIDP_CAST(x)));
-+#ifdef IGNORE_CPP_COMPAT
-+#pragma GCC diagnostic pop
-+#endif
-+ MPFR_ASSERTN (e == emin);
-+ MPFR_ASSERTN (i == 1);
-+
- ret = mpfr_set_exp (x, -1);
- MPFR_ASSERTN (ret == 0 && mpfr_cmp_ui_2exp (x, 1, -2) == 0);
-
-diff -Naurd mpfr-4.1.0-a/PATCHES mpfr-4.1.0-b/PATCHES
---- mpfr-4.1.0-a/PATCHES 2021-03-09 13:58:00.889650773 +0000
-+++ mpfr-4.1.0-b/PATCHES 2021-03-09 13:58:00.937650249 +0000
-@@ -0,0 +1 @@
-+tset_sij
-diff -Naurd mpfr-4.1.0-a/VERSION mpfr-4.1.0-b/VERSION
---- mpfr-4.1.0-a/VERSION 2021-03-09 13:55:43.223158508 +0000
-+++ mpfr-4.1.0-b/VERSION 2021-03-09 13:58:00.937650249 +0000
-@@ -1 +1 @@
--4.1.0-p10
-+4.1.0-p11
-diff -Naurd mpfr-4.1.0-a/src/mpfr.h mpfr-4.1.0-b/src/mpfr.h
---- mpfr-4.1.0-a/src/mpfr.h 2021-03-09 13:55:43.223158508 +0000
-+++ mpfr-4.1.0-b/src/mpfr.h 2021-03-09 13:58:00.933650293 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 4
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "4.1.0-p10"
-+#define MPFR_VERSION_STRING "4.1.0-p11"
-
- /* User macros:
- MPFR_USE_FILE: Define it to make MPFR define functions dealing
-diff -Naurd mpfr-4.1.0-a/src/version.c mpfr-4.1.0-b/src/version.c
---- mpfr-4.1.0-a/src/version.c 2021-03-09 13:55:43.223158508 +0000
-+++ mpfr-4.1.0-b/src/version.c 2021-03-09 13:58:00.933650293 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
-- return "4.1.0-p10";
-+ return "4.1.0-p11";
- }
-diff -Naurd mpfr-4.1.0-a/tests/tset_si.c mpfr-4.1.0-b/tests/tset_si.c
---- mpfr-4.1.0-a/tests/tset_si.c 2020-03-26 11:51:33.000000000 +0000
-+++ mpfr-4.1.0-b/tests/tset_si.c 2021-03-09 13:58:00.917650467 +0000
-@@ -127,27 +127,29 @@
- power of 2 is exact, unless underflow/overflow occurs.
- The tests on the exponent below avoid integer overflows
- (ep[i] may take extreme values). */
-- e = mpfr_get_exp (x1);
- mpfr_clear_flags ();
-- if (j != 0 && ep[i] < __gmpfr_emin - e) /* underflow */
-+ if (j == 0)
-+ goto zero;
-+ e = MPFR_GET_EXP (x1);
-+ if (ep[i] < __gmpfr_emin - e) /* underflow */
- {
- mpfr_rnd_t r =
- (rnd == MPFR_RNDN &&
-- (ep[i] < __gmpfr_emin - mpfr_get_exp (y) - 1 ||
-+ (ep[i] < __gmpfr_emin - MPFR_GET_EXP (y) - 1 ||
- IS_POW2 (sign * j))) ?
- MPFR_RNDZ : (mpfr_rnd_t) rnd;
- inex1 = mpfr_underflow (x1, r, sign);
- flags1 = __gmpfr_flags;
- }
-- else if (j != 0 && ep[i] > __gmpfr_emax - e) /* overflow */
-+ else if (ep[i] > __gmpfr_emax - e) /* overflow */
- {
- inex1 = mpfr_overflow (x1, (mpfr_rnd_t) rnd, sign);
- flags1 = __gmpfr_flags;
- }
- else
- {
-- if (j != 0)
-- mpfr_set_exp (x1, ep[i] + e);
-+ mpfr_set_exp (x1, ep[i] + e);
-+ zero:
- flags1 = inex1 != 0 ? MPFR_FLAGS_INEXACT : 0;
- }
-
-diff -Naurd mpfr-4.1.0-a/tests/tset_sj.c mpfr-4.1.0-b/tests/tset_sj.c
---- mpfr-4.1.0-a/tests/tset_sj.c 2020-06-01 10:39:52.000000000 +0000
-+++ mpfr-4.1.0-b/tests/tset_sj.c 2021-03-09 13:58:00.917650467 +0000
-@@ -225,27 +225,29 @@
- power of 2 is exact, unless underflow/overflow occurs.
- The tests on the exponent below avoid integer overflows
- (ep[i] may take extreme values). */
-- e = mpfr_get_exp (x1);
- mpfr_clear_flags ();
-- if (j != 0 && ep[i] < __gmpfr_emin - e) /* underflow */
-+ if (j == 0)
-+ goto zero;
-+ e = MPFR_GET_EXP (x1);
-+ if (ep[i] < __gmpfr_emin - e) /* underflow */
- {
- mpfr_rnd_t r =
- (rnd == MPFR_RNDN &&
-- (ep[i] < __gmpfr_emin - mpfr_get_exp (y) - 1 ||
-+ (ep[i] < __gmpfr_emin - MPFR_GET_EXP (y) - 1 ||
- IS_POW2 (sign * j))) ?
- MPFR_RNDZ : (mpfr_rnd_t) rnd;
- inex1 = mpfr_underflow (x1, r, sign);
- flags1 = __gmpfr_flags;
- }
-- else if (j != 0 && ep[i] > __gmpfr_emax - e) /* overflow */
-+ else if (ep[i] > __gmpfr_emax - e) /* overflow */
- {
- inex1 = mpfr_overflow (x1, (mpfr_rnd_t) rnd, sign);
- flags1 = __gmpfr_flags;
- }
- else
- {
-- if (j != 0)
-- mpfr_set_exp (x1, ep[i] + e);
-+ mpfr_set_exp (x1, ep[i] + e);
-+ zero:
- flags1 = inex1 != 0 ? MPFR_FLAGS_INEXACT : 0;
- }
- }
-diff -Naurd mpfr-4.1.0-a/PATCHES mpfr-4.1.0-b/PATCHES
---- mpfr-4.1.0-a/PATCHES 2021-04-23 09:49:34.648281897 +0000
-+++ mpfr-4.1.0-b/PATCHES 2021-04-23 09:49:34.696281616 +0000
-@@ -0,0 +1 @@
-+get_str_ndigits
-diff -Naurd mpfr-4.1.0-a/VERSION mpfr-4.1.0-b/VERSION
---- mpfr-4.1.0-a/VERSION 2021-03-09 13:58:00.937650249 +0000
-+++ mpfr-4.1.0-b/VERSION 2021-04-23 09:49:34.696281616 +0000
-@@ -1 +1 @@
--4.1.0-p11
-+4.1.0-p12
-diff -Naurd mpfr-4.1.0-a/src/get_str.c mpfr-4.1.0-b/src/get_str.c
---- mpfr-4.1.0-a/src/get_str.c 2020-06-18 17:17:18.000000000 +0000
-+++ mpfr-4.1.0-b/src/get_str.c 2021-04-23 09:49:34.680281710 +0000
-@@ -2484,6 +2484,8 @@
- size_t
- mpfr_get_str_ndigits (int b, mpfr_prec_t p)
- {
-+ MPFR_SAVE_EXPO_DECL (expo);
-+
- MPFR_ASSERTN (2 <= b && b <= 62);
-
- /* deal first with power of two bases, since even for those, mpfr_ceil_mul
-@@ -2497,17 +2499,26 @@
- return 1 + (p + k - 2) / k;
- }
-
-+ MPFR_SAVE_EXPO_MARK (expo);
-+
- /* the value returned by mpfr_ceil_mul is guaranteed to be
- 1 + ceil(p*log(2)/log(b)) for p < 186564318007 (it returns one more
- for p=186564318007 and b=7 or 49) */
- MPFR_STAT_STATIC_ASSERT (MPFR_PREC_BITS >= 64 || MPFR_PREC_BITS <= 32);
-+ if
- #if MPFR_PREC_BITS >= 64
- /* 64-bit numbers are supported by the C implementation, so that we can
- use the large constant below. If MPFR_PREC_BITS <= 32, the condition
- is always satisfied, so that we do not need any test. */
-- if (MPFR_LIKELY (p < 186564318007))
-+ (MPFR_LIKELY (p < 186564318007))
-+#else
-+ (1)
- #endif
-- return 1 + mpfr_ceil_mul (IS_POW2(b) ? p - 1 : p, b, 1);
-+ {
-+ size_t ret = 1 + mpfr_ceil_mul (IS_POW2(b) ? p - 1 : p, b, 1);
-+ MPFR_SAVE_EXPO_FREE (expo);
-+ return ret;
-+ }
-
- /* Now p is large and b is not a power of two. The code below works for any
- value of p and b, as long as b is not a power of two. Indeed, in such a
-@@ -2541,6 +2552,8 @@
- mpfr_clear (d);
- mpfr_clear (u);
- }
-+
-+ MPFR_SAVE_EXPO_FREE (expo);
- return 1 + ret;
- }
- }
-diff -Naurd mpfr-4.1.0-a/src/mpfr.h mpfr-4.1.0-b/src/mpfr.h
---- mpfr-4.1.0-a/src/mpfr.h 2021-03-09 13:58:00.933650293 +0000
-+++ mpfr-4.1.0-b/src/mpfr.h 2021-04-23 09:49:34.692281639 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 4
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "4.1.0-p11"
-+#define MPFR_VERSION_STRING "4.1.0-p12"
-
- /* User macros:
- MPFR_USE_FILE: Define it to make MPFR define functions dealing
-diff -Naurd mpfr-4.1.0-a/src/version.c mpfr-4.1.0-b/src/version.c
---- mpfr-4.1.0-a/src/version.c 2021-03-09 13:58:00.933650293 +0000
-+++ mpfr-4.1.0-b/src/version.c 2021-04-23 09:49:34.696281616 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
-- return "4.1.0-p11";
-+ return "4.1.0-p12";
- }
-diff -Naurd mpfr-4.1.0-a/tests/tget_str.c mpfr-4.1.0-b/tests/tget_str.c
---- mpfr-4.1.0-a/tests/tget_str.c 2020-01-08 18:11:13.000000000 +0000
-+++ mpfr-4.1.0-b/tests/tget_str.c 2021-04-23 09:49:34.680281710 +0000
-@@ -1311,6 +1311,33 @@
- mpfr_clear (x);
- }
-
-+static void
-+test_ndigits_aux (int b, mpfr_prec_t p, size_t expected_m)
-+{
-+ size_t m;
-+ mpfr_exp_t old_emin, old_emax, e[] = { MPFR_EMIN_MIN, 0, MPFR_EMAX_MAX };
-+ mpfr_flags_t flags;
-+ int i;
-+
-+ old_emin = mpfr_get_emin ();
-+ old_emax = mpfr_get_emax ();
-+
-+ i = randlimb () % (numberof (e) + 1);
-+ if (i < numberof (e))
-+ {
-+ set_emin (e[i]);
-+ set_emax (e[i]);
-+ }
-+
-+ __gmpfr_flags = flags = randlimb () & MPFR_FLAGS_ALL;
-+ m = mpfr_get_str_ndigits (b, p);
-+ MPFR_ASSERTN (m == expected_m);
-+ MPFR_ASSERTN (__gmpfr_flags == flags);
-+
-+ set_emin (old_emin);
-+ set_emax (old_emax);
-+}
-+
- /* test of mpfr_get_str_ndigits */
- static void
- test_ndigits (void)
-@@ -1319,61 +1346,61 @@
-
- /* for b=2, we have 1 + ceil((p-1)*log(2)/log(b)) = p */
- for (p = MPFR_PREC_MIN; p <= 1024; p++)
-- MPFR_ASSERTN(mpfr_get_str_ndigits (2, p) == p);
-+ test_ndigits_aux (2, p, p);
-
- /* for b=4, we have 1 + ceil((p-1)*log(2)/log(b)) = 1 + ceil((p-1)/2)
- = 1 + floor(p/2) */
- for (p = MPFR_PREC_MIN; p <= 1024; p++)
-- MPFR_ASSERTN(mpfr_get_str_ndigits (4, p) == 1 + (p / 2));
-+ test_ndigits_aux (4, p, 1 + (p / 2));
-
- /* for b=8, we have 1 + ceil((p-1)*log(2)/log(b)) = 1 + ceil((p-1)/3)
- = 1 + floor((p+1)/3) */
- for (p = MPFR_PREC_MIN; p <= 1024; p++)
-- MPFR_ASSERTN(mpfr_get_str_ndigits (8, p) == 1 + ((p + 1) / 3));
-+ test_ndigits_aux (8, p, 1 + ((p + 1) / 3));
-
- /* for b=16, we have 1 + ceil((p-1)*log(2)/log(b)) = 1 + ceil((p-1)/4)
- = 1 + floor((p+2)/4) */
- for (p = MPFR_PREC_MIN; p <= 1024; p++)
-- MPFR_ASSERTN(mpfr_get_str_ndigits (16, p) == 1 + ((p + 2) / 4));
-+ test_ndigits_aux (16, p, 1 + ((p + 2) / 4));
-
- /* for b=32, we have 1 + ceil((p-1)*log(2)/log(b)) = 1 + ceil((p-1)/5)
- = 1 + floor((p+3)/5) */
- for (p = MPFR_PREC_MIN; p <= 1024; p++)
-- MPFR_ASSERTN(mpfr_get_str_ndigits (32, p) == 1 + ((p + 3) / 5));
-+ test_ndigits_aux (32, p, 1 + ((p + 3) / 5));
-
- /* error < 1e-3 */
-- MPFR_ASSERTN(mpfr_get_str_ndigits (57, 35) == 8);
-+ test_ndigits_aux (57, 35, 8);
-
- /* error < 1e-4 */
-- MPFR_ASSERTN(mpfr_get_str_ndigits (31, 649) == 133);
-+ test_ndigits_aux (31, 649, 133);
-
- /* error < 1e-5 */
-- MPFR_ASSERTN(mpfr_get_str_ndigits (43, 5041) == 931);
-+ test_ndigits_aux (43, 5041, 931);
-
- /* error < 1e-6 */
-- MPFR_ASSERTN(mpfr_get_str_ndigits (41, 17771) == 3319);
-+ test_ndigits_aux (41, 17771, 3319);
-
- /* 20th convergent of log(2)/log(3) */
-- MPFR_ASSERTN(mpfr_get_str_ndigits (3, 630138897) == 397573381);
-+ test_ndigits_aux (3, 630138897, 397573381);
-
- #if MPFR_PREC_BITS >= 64
- /* 21st convergent of log(2)/log(3) */
-- MPFR_ASSERTN(mpfr_get_str_ndigits (3, 9809721694) == 6189245292);
-+ test_ndigits_aux (3, 9809721694, 6189245292);
-
- /* 22nd convergent of log(2)/log(3) */
-- MPFR_ASSERTN(mpfr_get_str_ndigits (3, 10439860591) == 6586818672);
-+ test_ndigits_aux (3, 10439860591, 6586818672);
-
- /* 23rd convergent of log(2)/log(3) */
-- MPFR_ASSERTN(mpfr_get_str_ndigits (3, 103768467013) == 65470613322);
-+ test_ndigits_aux (3, 103768467013, 65470613322);
-
- /* 24th convergent of log(2)/log(3) */
-- MPFR_ASSERTN(mpfr_get_str_ndigits (3, 217976794617) == 137528045314);
-+ test_ndigits_aux (3, 217976794617, 137528045314);
-
-- MPFR_ASSERTN(mpfr_get_str_ndigits (3, 1193652440098) == 753110839882);
-+ test_ndigits_aux (3, 1193652440098, 753110839882);
-
-- MPFR_ASSERTN(mpfr_get_str_ndigits (3, 683381996816440) == 431166034846569);
-+ test_ndigits_aux (3, 683381996816440, 431166034846569);
-
-- MPFR_ASSERTN(mpfr_get_str_ndigits (7, 186564318007) == 66455550933);
-+ test_ndigits_aux (7, 186564318007, 66455550933);
- #endif
- }
-
-diff -Naurd mpfr-4.1.0-a/PATCHES mpfr-4.1.0-b/PATCHES
---- mpfr-4.1.0-a/PATCHES 2021-05-17 16:09:00.574477185 +0000
-+++ mpfr-4.1.0-b/PATCHES 2021-05-17 16:09:00.754476587 +0000
-@@ -0,0 +1 @@
-+vasprintf-prec-zero
-diff -Naurd mpfr-4.1.0-a/VERSION mpfr-4.1.0-b/VERSION
---- mpfr-4.1.0-a/VERSION 2021-04-23 09:49:34.696281616 +0000
-+++ mpfr-4.1.0-b/VERSION 2021-05-17 16:09:00.754476587 +0000
-@@ -1 +1 @@
--4.1.0-p12
-+4.1.0-p13
-diff -Naurd mpfr-4.1.0-a/src/mpfr.h mpfr-4.1.0-b/src/mpfr.h
---- mpfr-4.1.0-a/src/mpfr.h 2021-04-23 09:49:34.692281639 +0000
-+++ mpfr-4.1.0-b/src/mpfr.h 2021-05-17 16:09:00.754476587 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 4
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "4.1.0-p12"
-+#define MPFR_VERSION_STRING "4.1.0-p13"
-
- /* User macros:
- MPFR_USE_FILE: Define it to make MPFR define functions dealing
-diff -Naurd mpfr-4.1.0-a/src/vasprintf.c mpfr-4.1.0-b/src/vasprintf.c
---- mpfr-4.1.0-a/src/vasprintf.c 2021-02-11 12:48:27.354242922 +0000
-+++ mpfr-4.1.0-b/src/vasprintf.c 2021-05-17 16:09:00.598477107 +0000
-@@ -635,7 +635,13 @@
- static int
- buffer_cat (struct string_buffer *b, const char *s, size_t len)
- {
-- MPFR_ASSERTD (len > 0);
-+ /* If len == 0, which is possible when outputting an integer 0
-+ (either a native one or mpfr_prec_t) with precision field = 0,
-+ do nothing. This test is not necessary since the code below is
-+ valid for len == 0, but this is safer, just in case. */
-+ if (len == 0)
-+ return 0;
-+
- MPFR_ASSERTD (len <= strlen (s));
-
- if (buffer_incr_len (b, len))
-diff -Naurd mpfr-4.1.0-a/src/version.c mpfr-4.1.0-b/src/version.c
---- mpfr-4.1.0-a/src/version.c 2021-04-23 09:49:34.696281616 +0000
-+++ mpfr-4.1.0-b/src/version.c 2021-05-17 16:09:00.754476587 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
-- return "4.1.0-p12";
-+ return "4.1.0-p13";
- }
-diff -Naurd mpfr-4.1.0-a/tests/tsprintf.c mpfr-4.1.0-b/tests/tsprintf.c
---- mpfr-4.1.0-a/tests/tsprintf.c 2020-04-08 22:39:35.000000000 +0000
-+++ mpfr-4.1.0-b/tests/tsprintf.c 2021-05-17 16:09:00.598477107 +0000
-@@ -193,6 +193,10 @@
- sprintf (buf, "%d", i);
- check_vsprintf (buf, "%d", i);
-
-+ check_vsprintf ("0", "%d", 0);
-+ check_vsprintf ("", "%.d", 0);
-+ check_vsprintf ("", "%.0d", 0);
-+
- sprintf (buf, "%e", d);
- check_vsprintf (buf, "%e", d);
-
-@@ -227,9 +231,6 @@
- mpfr_prec_t p = 128;
- mpfr_t x, y, z;
-
-- mpfr_init (z);
-- mpfr_init2 (x, p);
--
- /* specifier 'P' for precision */
- check_vsprintf ("128", "%Pu", p);
- check_vsprintf ("00128", "%.5Pu", p);
-@@ -247,9 +248,19 @@
- check_vsprintf ("0200:", "%0#+ -Po:", p);
- check_vsprintf ("+0000128 :", "%0+ *.*Pd:", -9, 7, p);
- check_vsprintf ("+12345 :", "%0+ -*.*Pd:", -9, -3, (mpfr_prec_t) 12345);
-+ check_vsprintf ("0", "%Pu", (mpfr_prec_t) 0);
- /* Do not add a test like "%05.1Pd" as MS Windows is buggy: when
- a precision is given, the '0' flag must be ignored. */
-
-+ /* specifier 'P' with precision field 0 */
-+ check_vsprintf ("128", "%.Pu", p);
-+ check_vsprintf ("128", "%.0Pd", p);
-+ /* check_vsprintf ("", "%.Pu", (mpfr_prec_t) 0); */
-+ check_vsprintf ("", "%.0Pd", (mpfr_prec_t) 0);
-+
-+ mpfr_init (z);
-+ mpfr_init2 (x, 128);
-+
- /* special numbers */
- mpfr_set_inf (x, 1);
- check_sprintf (pinf_str, "%Re", x);
diff --git a/src/patches/mpfr-4.1.1-cumulative-patches-1-to-1.patch b/src/patches/mpfr-4.1.1-cumulative-patches-1-to-1.patch
new file mode 100644
index 000000000..0566c80b3
--- /dev/null
+++ b/src/patches/mpfr-4.1.1-cumulative-patches-1-to-1.patch
@@ -0,0 +1,83 @@
+diff -Naurd mpfr-4.1.1-a/PATCHES mpfr-4.1.1-b/PATCHES
+--- mpfr-4.1.1-a/PATCHES 2022-11-23 11:45:26.800476079 +0000
++++ mpfr-4.1.1-b/PATCHES 2022-11-23 11:45:26.844475966 +0000
+@@ -0,0 +1 @@
++mpfr_custom_get_kind
+diff -Naurd mpfr-4.1.1-a/VERSION mpfr-4.1.1-b/VERSION
+--- mpfr-4.1.1-a/VERSION 2022-11-17 13:28:44.000000000 +0000
++++ mpfr-4.1.1-b/VERSION 2022-11-23 11:45:26.844475966 +0000
+@@ -1 +1 @@
+-4.1.1
++4.1.1-p1
+diff -Naurd mpfr-4.1.1-a/src/mpfr.h mpfr-4.1.1-b/src/mpfr.h
+--- mpfr-4.1.1-a/src/mpfr.h 2022-11-17 13:28:44.000000000 +0000
++++ mpfr-4.1.1-b/src/mpfr.h 2022-11-23 11:45:26.840475978 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 4
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 1
+-#define MPFR_VERSION_STRING "4.1.1"
++#define MPFR_VERSION_STRING "4.1.1-p1"
+
+ /* User macros:
+ MPFR_USE_FILE: Define it to make MPFR define functions dealing
+@@ -1027,7 +1027,7 @@
+ #if __GNUC__ > 2 || __GNUC_MINOR__ >= 95
+ #define mpfr_custom_get_kind(x) \
+ __extension__ ({ \
+- mpfr_ptr _x = (x); \
++ mpfr_srcptr _x = (x); \
+ _x->_mpfr_exp > __MPFR_EXP_INF ? \
+ (mpfr_int) MPFR_REGULAR_KIND * MPFR_SIGN (_x) \
+ : _x->_mpfr_exp == __MPFR_EXP_INF ? \
+diff -Naurd mpfr-4.1.1-a/src/version.c mpfr-4.1.1-b/src/version.c
+--- mpfr-4.1.1-a/src/version.c 2022-11-17 13:28:44.000000000 +0000
++++ mpfr-4.1.1-b/src/version.c 2022-11-23 11:45:26.844475966 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+- return "4.1.1";
++ return "4.1.1-p1";
+ }
+diff -Naurd mpfr-4.1.1-a/tests/tstckintc.c mpfr-4.1.1-b/tests/tstckintc.c
+--- mpfr-4.1.1-a/tests/tstckintc.c 2022-05-06 13:47:17.000000000 +0000
++++ mpfr-4.1.1-b/tests/tstckintc.c 2022-11-23 11:45:26.836475987 +0000
+@@ -295,14 +295,16 @@
+ test_nan_inf_zero (void)
+ {
+ mpfr_ptr val;
++ mpfr_srcptr sval; /* for compilation error checking */
+ int sign;
+ int kind;
+
+ reset_stack ();
+
+ val = new_mpfr (MPFR_PREC_MIN);
++ sval = val;
+ mpfr_set_nan (val);
+- kind = (mpfr_custom_get_kind) (val);
++ kind = (mpfr_custom_get_kind) (sval);
+ if (kind != MPFR_NAN_KIND)
+ {
+ printf ("mpfr_custom_get_kind error: ");
+@@ -380,7 +382,8 @@
+ dummy_set_si (long si)
+ {
+ mpfr_t x;
+- long * r = dummy_new ();
++ mpfr_srcptr px; /* for compilation error checking */
++ long *r = dummy_new ();
+ int i1, i2, i3, i4, i5;
+
+ /* Check that the type "void *" can be used, like with the function.
+@@ -405,7 +408,8 @@
+ MPFR_ASSERTN (i5 == 1);
+
+ mpfr_set_si (x, si, MPFR_RNDN);
+- r[0] = mpfr_custom_get_kind (x);
++ px = x;
++ r[0] = mpfr_custom_get_kind (px);
+
+ /* Check that the type "void *" can be used in C, like with the function
+ (forbidden in C++). Also check side effects. */
diff --git a/src/ppp/ip-up b/src/ppp/ip-up
index ee1683fdd..2e636e72d 100644
--- a/src/ppp/ip-up
+++ b/src/ppp/ip-up
@@ -24,11 +24,6 @@
eval $(/usr/local/bin/readhash /var/ipfire/ppp/settings)
-if [ "$TYPE" = "isdn" ]; then
- DNS1="${MS_DNS1}"
- DNS2="${MS_DNS2}"
-fi
-
# Write DNS servers to configuration
echo "${DNS1}" > /var/run/dns1
echo "${DNS2}" > /var/run/dns2
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree tag, v2.27-core172, created. 9ea8de7c39ee35d6fcabc3bfca4a7754344e6610
by Michael Tremer 27 Dec '22
by Michael Tremer 27 Dec '22
27 Dec '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 tag, v2.27-core172 has been created
at 9ea8de7c39ee35d6fcabc3bfca4a7754344e6610 (commit)
- Log -----------------------------------------------------------------
commit 9ea8de7c39ee35d6fcabc3bfca4a7754344e6610
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sat Dec 17 14:48:00 2022 +0000
Revert "lsof: Update to version 4.96.4"
This reverts commit 80274cc875304fa2c1e83b9e25ca8cbcb9805e33.
See: #13015
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
-----------------------------------------------------------------------
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, core172, created. 9ea8de7c39ee35d6fcabc3bfca4a7754344e6610
by Michael Tremer 27 Dec '22
by Michael Tremer 27 Dec '22
27 Dec '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, core172 has been created
at 9ea8de7c39ee35d6fcabc3bfca4a7754344e6610 (commit)
- Log -----------------------------------------------------------------
commit 9ea8de7c39ee35d6fcabc3bfca4a7754344e6610
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sat Dec 17 14:48:00 2022 +0000
Revert "lsof: Update to version 4.96.4"
This reverts commit 80274cc875304fa2c1e83b9e25ca8cbcb9805e33.
See: #13015
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit bbbb0b9e01d342a5a5b4db14a37641a427786844
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sat Dec 17 14:46:32 2022 +0000
backup(.pl): Replace OpenVPN DH parameter with ffdhe4096
This ensures restoring a backup won't silently bring back an insecure
Diffie-Hellman parameter (which could also not be inspected through the
web interface anymore).
Reported-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit ee7944fe32e49c73abcaeb2509c1f1630b645b32
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sat Dec 17 14:44:49 2022 +0000
Core Updatr 172: Properly replace DH parameter in /var/ipfire/ovpn/n2nconf/*/*.conf
https://lists.ipfire.org/pipermail/development/2022-December/015001.html
Reported-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 6619aed611693d4bca7c009867c838b2fbaf85ac
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Tue Dec 13 15:27:30 2022 +0000
Revert "openvpn-authenticator: Avoid infinite loop when losing socket connection"
This reverts commit 92a9ce54bc63ebea153fc46365a1aa299856fbbe.
commit 6d4110d214cd2b7bae59a560f01a3ed3501a98c8
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Tue Dec 13 15:26:45 2022 +0000
Revert "openvpn-authenticator: Break read loop when daemon goes away"
This reverts commit 7ec3664c320707b51407fce854e19b6254eb4836.
commit 4acb701b84f2f6a950e0d03d8e2234018bacb9df
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sun Dec 11 11:57:34 2022 +0000
Tor: Update to 0.4.7.12
Full changelog:
Changes in version 0.4.7.12 - 2022-12-06
This version contains a major change that is a new key for moria1. Also, new
metrics are exported on the MetricsPort for the congestion control
subsystem.
o Directory authority changes (moria1):
- Rotate the relay identity key and v3 identity key for moria1. They
have been online for more than a decade and refreshing keys
periodically is good practice. Advertise new ports too, to avoid
confusion. Closes ticket 40722.
o Minor feature (Congestion control metrics):
- Add additional metricsport relay metrics for congestion control.
Closes ticket 40724.
o Minor features (fallbackdir):
- Regenerate fallback directories generated on December 06, 2022.
o Minor features (geoip data):
- Update the geoip files to match the IPFire Location Database, as
retrieved on 2022/12/06.
o Minor bugfixes (cpuworker, relay):
- Fix an off by one overload calculation on the number of CPUs being
used by our thread pool. Fixes bug 40719; bugfix on 0.3.5.1-alpha.
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 7ec3664c320707b51407fce854e19b6254eb4836
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 6 10:01:44 2022 +0000
openvpn-authenticator: Break read loop when daemon goes away
Fixes: #12963
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit d7618ccba8ba312916593e6ebbadee1d90575c0f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 6 10:01:43 2022 +0000
openvpn-authenticator: Drop some dead code
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 92a9ce54bc63ebea153fc46365a1aa299856fbbe
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 6 10:01:42 2022 +0000
openvpn-authenticator: Avoid infinite loop when losing socket connection
This patch will gracefully terminate the daemon when it loses its
connection to the OpenVPN daemon.
Fixes: #12963
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 9e7d4102b84c17e7f743e0c8ce6aae92ae0d53d8
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Mon Dec 5 09:40:15 2022 +0100
Language files update:
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 19a417c2a10df279b2aa0e0644838bf892410a07
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Mon Dec 5 09:40:14 2022 +0100
ovpnmain.cgi: Fix for bug in WUI menu on CU172 Testing
- On CU172 Testing Build: master/eb9e29f9 when selecting the OpenVPN menu it showed the
Diffie-Hellman info and pressing back took you to the same DH page.
- Tested patch suggestion from Erik on vm testbed and confirmed that it worked.
Suggested-by: Erik Kapfer <erik.kapfer(a)ipfire.org>
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit e9062718d1247375422920a7d69ca8fd00b8b949
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 6 10:07:19 2022 +0000
Revert "Core Update 172: Remove powertop add-on, if installed"
This reverts commit d3a4fcc7097a3df6e45f4d2b15960ccb61f0152f.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 7a22b050fa84ffef05dff3b145282ecfbfea9734
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 6 10:05:47 2022 +0000
Revert "Drop powertop"
This reverts commit f7b0247e02ed5af880f03932807d039ef9008d91.
https://community.ipfire.org/t/will-the-powertop-add-on-be-available-in-fut…
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit eb9e29f9a742d5472180371b99c2e17b966852f1
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sat Dec 3 11:57:18 2022 +0100
Core Update 172: Extract files before removing any
Note to self: Also do this in further Core Updates.
Suggested-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 41dfd30c9a34faeff8d8cd549e5583ad2919ce4f
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sat Dec 3 11:39:25 2022 +0100
Core Update 172: Do not delete liblzma.so.5.2.5
Again, xz currently present on an IPFire machine is linked
against this. Thus, deleting this file causes the unpack
routine to fail, which is why we should have never deleted
it in the first place.
Reported-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit ebcb8d53c440d0454a14514d5284ce32770e8025
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sat Dec 3 11:38:58 2022 +0100
Core Update 172: Ship packages that miss dependencies
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit dc9f7554c13ebdadb45f27c8f38f14b9d16468d2
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Fri Dec 2 17:43:04 2022 +0100
Core Update 172: Zut alors, keep libhistory.so.8.1 around as well
My fault, again. :-/
Reported-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit a3e3e6c3d1c61e59f83aebc030e430014b10a796
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Fri Dec 2 09:56:49 2022 +0100
Core Update 172: Do not delete libreadline.so.8.1
Doing so causes the shell in which the update script is currently
executed to crash before extracting files, which results in a
completely broken system.
See also: https://community.ipfire.org/t/core-172-testing-fails/9002/1
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 509bde09ae1277a948d18605bd51fd01e5a5bf2b
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Thu Dec 1 18:01:28 2022 +0100
Core Update 172: Ship ca-certificates
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 8d1f604b4a635f3fc4d62283cd262cd21d5a1765
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Thu Dec 1 10:46:57 2022 +0100
ca-certificates: Remove TrustCor Systems root CAs
On November 30, 2022, Mozilla decided to take the following
actions as a response to the concerns raised about the merits
of this root CA operator (excerpt taken from
https://groups.google.com/a/mozilla.org/g/dev-security-policy/c/oxX69KFvsm4…):
> 1. Set "Distrust for TLS After Date" and "Distrust for S/MIME
> After Date" to November 30, 2022, for the 3 TrustCor root
> certificates (TrustCor RootCert CA-1, TrustCor ECA-1,
> TrustCor RootCert CA-2) that are currently included in
> Mozilla's root store.
>
> 2. Remove those root certificates from Mozilla's root store
> after the existing end-entity TLS certificates have expired.
As far as the latter is concerned, the offending certificates
have these expiry dates set:
- TrustCor RootCert CA-1: Mon, 31 Dec 2029 17:23:16 GMT
- TrustCor RootCert CA-2: Sun, 31 Dec 2034 17:26:39 GMT
- TrustCor ECA-1: Mon, 31 Dec 2029 17:28:07 GMT
The way IPFire 2 currently processes Mozilla's trust store
does not feature a way of incorporate a "Distrust for XYZ After
Date" attribute. This means that despite TrustCor Systems root
CAs are no longer trusted by browsers using Mozilla's trust
store, IPFire would still accept certificates directly or
indirectly issued by this CA until December 2029 or December 2034.
To protect IPFire users, this patch therefore suggests to
patch our copy of Mozilla's trust store in order to remove
TrustCor Systems' root CAs: The vast majority of HTTPS connections
established from an IPFire machine take place in a non-interactive
context, so there is no security benefit from a "Distrust After
Date" information. Instead, if we do not want IPFire installations
to trust this CA, we have no other option other than remove it
unilaterally from our copy of Mozilla's trust store.
See also: https://lists.ipfire.org/pipermail/development/2022-November/014681.html
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 1e83347070b96f08ca22c0a40db9a423e371edbe
Author: Jon Murphy <jon.murphy(a)ipfire.org>
Date: Tue Nov 29 19:10:00 2022 -0600
Language files update: Fix for bug 13007
- Update en.pl, it.pl, pl.pl, and ru.pl to replace "e-mail: ipfire(a)foo.org" with "email: ipfire(a)foo.org"
Signed-off-by: Jon Murphy <jon.murphy(a)ipfire.org>
Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 986d1bca1118c1bee96758a7241ba95e14fa56a0
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Tue Nov 29 17:23:29 2022 +0100
samba: Update aarch64 rootfile
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 78e0fef411974834040b6f668560b0ddd4aee63f
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Tue Nov 29 14:41:00 2022 +0100
Core Update 172: Ship and restart Suricata
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 2b990133770045bb8ef3a081ad27b8a0813ac24e
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Tue Nov 29 14:38:49 2022 +0100
libhtp: Update to 0.5.42
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 959fe5103b4c72725476657d9e5f42f3abc2f534
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Tue Nov 29 14:32:57 2022 +0100
suricata: Update to 6.0.9
Full changelog:
Security #5710: smb: crash inside of streaming buffer Grow() (6.0.x backport)
Security #5694: smtp/base64: crash / memory corruption (6.0.x backport)
Security #5688: decoder/tunnel: tunnel depth not limited properly (6.0.x backport)
Security #5600: ips: encapsulated packet logged as dropped, but not actually dropped (6.0.x backport)
Bug #5715: smb: file not tracked on smb2 async (6.0.x backport)
Bug #5714: SMB2 async responses are not matched with its request (6.0.x backport)
Bug #5709: HTTP/2 decompression bug (6.0.x backport)
Bug #5696: Integer overflow at dcerpc.rs:846 (6.0.x backport)
Bug #5695: readthedocs: not showing pdf download option for recent versions (6.0.x backport)
Bug #5683: FlowSwapFileFlags function is incorrect (6.0.x backport)
Bug #5635: track by_rule|by_both incorrectly rejected for global thresholds (6.0.x backport)
Bug #5633: Pass rules on 6.0.8 are generating alert events when passing tunneled traffic
Bug #5608: base64: skip over all invalid characters for RFC 2045 mode (6.0.x backport)
Bug #5607: base64_decode does not populate base64_data buffer once hitting non-base64 chars (6.0.x backport)
Bug #5602: dcerpc: rust integer underflow (6.0.x backport)
Bug #5599: eve: mac address logging for packet records reverses direction (6.0.x backport)
Bug #5598: detect/tag: timeout handling issues on windows (6.0.x backport)
Bug #5594: ips/tap: in layer 2 ips/tap setups, warn that mixed usage of ips and tap will be removed in 8.0 (6.0.x backport)
Bug #4883: Netmap configuration -- need a configuration option for non-standard library locations (6.0.x backport)
Feature #5478: Support for RFC2231 (6.0.x backport)
Task #5698: libhtp 0.5.42
Task #5570: transversal: update references to suricata webpage version 2 (backport 6.0.x)
Task #4852: netmap: new API version (14) supports multi-ring software mode (6.0.x backport)
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 73955514ac319aa4758cdfc56467f2ba47b66935
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Mon Nov 28 18:24:55 2022 +0100
shairport-sync: ship package due to new ffmpeg version
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 96f000490bca314e36788e05cfcb0075310d3382
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Mon Nov 28 18:24:54 2022 +0100
mpd: ship package due to new ffmpeg version
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit fab147214ff98593c02a16081fd8aee9ddca804b
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Mon Nov 28 18:24:53 2022 +0100
minidlna: ship package due to new ffmpeg version
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 08c5fc0a6757d890deafa41bde349b36034a63e7
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Fri Nov 25 18:38:25 2022 +0100
flac: Update to version 1.4.2
- Update from version 1.3.3 to 1.4.2
- Update of rootfile
- several libraries with so bump. Checked with find-dependencies - nothing flagged
- Changelog
This changelog is not exhaustive, review [the git commit log
(https://github.com/xiph/flac/commits) for an exhaustive list of changes.
## FLAC 1.4.2 (22-Oct-2022)
Once again, this release only has a few changes. A problem with FLAC playback in GStreamer (and possibly other libFLAC users) was the reason for the short time since the last release
* General
* Remove xmms plugin (Martijn van Beurden, TokyoBlackHole)
* Remove all pure assembler, removing build dependency on nasm
* Made console output more uniform across different platforms and CPUs
* Improve ability to tune compile for a certain system (for example with -march=native) when combining with --disable-asm-optimizations: plain C functions can now be better optimized
* Build system
* Default CFLAGS are now prepended instead of dropped when user CFLAGS are set
* -msse2 is no longer added by default (was only applicable to x86)
* Fix cross-compiling and out-of-tree building when pandoc and doxygen are not available
* Fix issue with Clang not compiling functions with intrinsics
* Fix detection of bswap intrinsics (Ozkan Sezer)
* Improve search for libssp on MinGW (Ozkan Sezer, Martijn van Beurden)
* libFLAC
* Fix issue when the libFLAC user seeks in a file instead of libFLAC itself
## FLAC 1.4.1 (22-Sep-2022)
This release only has a few changes. It was triggered by a problem in the 1.4.0 tarball: man pages were empty and api documentation missing
* CMake fixes (Tomasz Kłoczko)
* Add checks that man pages and api docs end up in tarball
* Enable installation of prebuilt man pages and api docs
* Fix compiler warnings (Johannes Kauffmann, Ozkan Sezer)
* Fix format specifier (manxorist)
* Enable building on Universal Windows Platform (Steve Lhomme)
* Fix versioning from git
## FLAC 1.4.0 (09-Sep-2022)
As there have been changes to the library interfaces, the libFLAC version number is incremented to 12, the libFLAC++ version number is incremented to 10. As some changes were breaking, the version age numbers (see [libtool versioning](https://www.gnu.org/software/libtool/manual/libtool.html#Libtoo…) have been reset to 0. For more details on the changes to the API, see the [porting guide](https://xiph.org/flac/api/group__porting__1__3__4__to__1__4__0.html).
The XMMS plugin and 'common' plugin code (used only by the XMMS plugin) are deprecated, they will be removed in a future release.
* General:
* It is now possible to limit the minimum bitrate of a FLAC file generated by libFLAC and with the `flac` tool to 1 bit/sample. This function can be used to aid live streaming, for example for internet radio
* Encoding files with sample rates up to 1'048'575Hz is now possible. (Con Kolivas)
* Compression of preset -3 through -8 was slightly improved at the cost of a small decrease in encoding speed by increasing the precision with which autocorrelation was calculated (Martijn van Beurden)
* Encoding speed of preset -0, -1 and -2 was slightly improved
* Compression of presets -1 and -4 was slighly improved on certain material by changing the adaptive mid-side heuristics
* Speedups specifically targeting 64-bit ARMv8 devices using NEON were integrated (Ronen Gvili, Martijn van Beurden)
* Speedups for x86_64 CPUs having the FMA instruction set extention are added
* Encoding and decoding of 32-bit PCM is now possible
* (Ogg) FLAC format:
* The FLAC format document is being rewritten by the IETF CELLAR working group. The latest draft can be found on [https://datatracker.ietf.org/doc/draft-ietf-cellar-flac/](https://datatrack…
* The FLAC format document specifies no bounds for the residual. In other to match current decoder implementations, it is proposed to bound the residual to the range provided by a 32-bit int signed two's complement. This limit must be checked by FLAC encoders as to keep FLAC decoders free from the complexity of being to decode a residual exceeding a 32-bit int.
* There is now a set of files available to test whether a FLAC decoder implements the format correctly. This FLAC decoder testbench can be found at [https://github.com/ietf-wg-cellar/flac-test-files](https://github.com/ietf-…. Also, results of testing hard- and software can be found here at [https://wiki.hydrogenaud.io/index.php?title=FLAC_decoder_testbench](https:/….
* flac:
* The option --limit-min-bitrate was added to aid streaming, see [github #264](https://github.com/xiph/flac/pull/264)
* The option --keep-foreign-metadata-if-present is added. This option works the same as --keep-foreign-metadata, but does return a warning instead of an error if no foreign metadata was found to store or restore
* The warning returned by the foreign metadata handling is now clearer in case a user tries to restore foreign metadata of the wrong type, for example decoding a FLAC file containing AIFF foreign metadata to a WAV file
* A problem when using the analyse function causing the first frame to have a wrong size and offset was fixed
* Fix bug where channel mask of a file is unintentionally reused when several files are processed with one command
* The order of compression-related commands is no longer important, i.e. -8ep gives the same result as -ep8. Previously, a compression level (like -8) would override a more specific setting (like -e or -p). This is no longer the case
* flac now checks the block-align property of WAV files to ensure non-standard WAV files (for which flac has no handling) are not mangled
* metaflac:
* (none)
* build system:
* MSVC and Makefile.lite build system files have been removed. Building with MSVC (Visual Studio) can be done by using CMake
* Various CMake improvements, especially for creating MSVC build files (Martijn van Beurden, martinRenou, CookiePLMonster, David Callu, Tyler Dunn, Cameron Cawley)
* Various fixes for MinGW (Martijn van Beurden, Cameron Cawley)
* Removed obsolete autotools macro's to silence warnings
* Fixes for FreeBSD PowerPC (pkubaj)
* Fixed some compiler warnings (Martijn van Beurden, Tyler Dunn)
* Fix building with uclibc (Fabrice Fontaine)
* testing/validation:
* Addition of new encoder fuzzer, adding fuzzing for 8, 24 and 32-bit inputs
* Addition of new decoder fuzzer, adding coverage of seeking code
* Addition of metadata fuzzer, adding coverage of metadata APIs
* Various improvements to fuzzers to improve code coverage, fuzzing speed and stability
* Many changes to test suite to improve cross-platform compatibility (Rosen Penev)
* Windows CI now also builds the whole test suite
* Clang-format file added (Rosen Penev)
* Add warning on using v141_xp platform toolset with /MT (Martijn van Beurden, Paul Sanders)
* libraries:
* Various seeking fixes (Martijn van Beurden, Robert Kausch)
* Various bugs fixed found by fuzzing
* On decoding, it is now checked whether residuals can be contained by a 32-bit int, preventing integer overflow
* Add check that samples supplied to libFLAC actually fall within the bps set
* Add checks when parsing metadata blocks to not allocate excessive amounts of memory and not overread
* Undocumented Windows-only utf8 functions are no longer exported to the DLL interface
* Removed all assembler and intrinsics code from the decoder to improve fuzzing, as they provided only a small speed benefit
* The bitwriter buffer is limited in size to 2^24 bytes, so it cannot write excessively large files. This is a backup in case another bug in this area creeps (back) in.
* The metadata iterations should now never return a vorbiscomment entry with NULL as an entry, now always at least an empty string is returned
* documentation:
* Removed html documentation and generate man pages from markdown
* Interface changes:
* libFLAC:
* Addition of FLAC__stream_encoder_set_limit_min_bitrate() and FLAC__stream_encoder_get_limit_min_bitrate(), see [github #264](https://github.com/xiph/flac/pull/264)
* get_client_data_from_decoder is renamed FLAC__get_decoder_client_data(), see [github #124](https://github.com/xiph/flac/pull/124)
* All API functions taking a filename as an argument now take UTF-8 filenames on Windows, and no longer accept filenames using the current codepage
* FLAC__Frame struct has changed: warmup samples are now stored in FLAC__int64 instead of FLAC__int32 types, and verbatim samples can now be stored in either FLAC__int32 or FLAC__int64 depending on whether samples fix the former or latter
* The FLAC__StreamMetadata struct now has a tag, so it can be forward declared
* libFLAC++:
* Addition of ::set_limit_min_bitrate() and ::get_limit_min_bitrate(), see [github #264](https://github.com/xiph/flac/pull/264)
* All API functions taking a filename as an argument now take UTF-8 filenames on Windows, and no longer accept filenames using the current codepage
* The ::FLAC__Frame struct has changed, see the libFLAC interface change.
## FLAC 1.3.4 (20-Feb-2022)
This release mostly fixes (security related) bugs. When building with MSVC, using CMake is preferred, see the README under "Building with CMake" for more information. Building with MSVC using solution files is deprecated and these files will be removed in the future. As there have been no changes to the library interfaces, the libFLAC version number remains 11, and libFLAC++ version number remains 9.
* General:
* Fix 12 decoder bugs found by oss-fuzz, including CVE-2020-0499 (erikd, Martijn van Beurden)
* Fix encoder bug CVE-2021-0561 (NeelkamalSemwal)
* Integrate oss-fuzzers (erikd, Guido Vranken)
* Seeking fixes (NeelkamalSemwal, Robert Kausch)
* Various fixes and improvements (Andrei Astafev, Rosen Penev, Håkan Kvist, oreo639, erikd, Tamás Zahola, Ulrik Mikaelsson, Tyler Dunn, tmkk)
* FLAC format:
* (none)
* Ogg FLAC format:
* (none)
* flac:
* Various fixes and improvements (Andrei Astafev, Martijn van Beurden)
* metaflac:
* (none)
* build system:
* CMake improvements (evpobr, Vitaliy Kirsanov, erikd, Ozkan Sezer, Tyler Dunn, tg-m DeadSix27, ericLemanissier, Chocobo1).
* Fixes for MinGW and MSVC (Ozkan Sezer).
* Fix for clang (Ozkan Sezer)
* Fix for PowerPC (Peter Seiderer, Thomas BERNARD)
* Fix for FreeBSD PowerPC (pkubaj).
* testing/validation:
* Add Windows target to CI, improve logging (Ralph Giles)
* CI improvements (Ralph Giles, Ewout ter Hoeven)
* documentation:
* Doxygen fixes (Tyler Dunn)
* Fix typos (Tim Gates, maxz)
* Interface changes:
* libFLAC:
* (none)
* libFLAC++:
* (none)
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 1985774f80b285b26e1bc6264e8e8724fc7afb91
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Mon Nov 28 14:24:15 2022 +0100
make.sh: Update check for static linked qemu files
- In Arch Linux the file -L command comes up with "static-pie linked" instead of
"statically linked"
- This patch makes the grep look for either one of those strings.
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit dc3a5d19aca2ca1c4804ae24d7b6a5f680b7f080
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Tue Nov 29 13:43:08 2022 +0100
Core Update 172: Ship sysstat
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 8005b23bc4fd1d6a6225b67718330a5c3471893a
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Mon Nov 28 14:24:00 2022 +0100
sysstat: Update to version 12.7.1
- Update from version 12.5.4 to 12.7.1
- Update of rootfile
- Changelog
2022/11/06: Version 12.7.1:
Fix possible overflow in sa_common.c (GHSL-2022-074) [12.6.1].
sadf: Add support for option -t with SVG output to make it possible to display timestamps in the same locale as that of the file creator.
sadf: Print timezone instead of UTC in true time mode. Timezone is also displayed in local time.
sadf: PCP: Fix timestamps written to PCP archive file.
sar: Add new environment variable S_REPEAT_HEADER.
pidstat: Return exit code of the process that was monitored with option -e.
mpstat: Add option -H to handle vCPU physical hotplug.
Add local, xlocal and debug targets to iconfig script.
Turn off gcc's tree-slp-vectorize option which was making sadf crash in some situations.
sa_conv.c: Make size of statistics structures from older sysstat versions immutable [12.6.1].
[Bernhard M. Wiedemann]: Declare sadc dependency on libsyscom.a [12.6.1].
[Steve Kay]: Fix gcc v11.2 warnings [12.6.1].
[Steve Kay]: Various cosmetic fixes [12.6.1].
[Jan Christoph Uhde]: sar: Remove `-I int_list` from man-page and help [12.6.1].
[Frank Dana]: Consolidate systemctl commands in README file [12.6.1].
[Rong Tao]: Remove whitespace characters at the end of lines [12.6.1].
Update configure file to deal with newer autoconf version. configure.in file is renamed to configure.ac.
Update DTD and XSD documents.
sar and sysstat manual pages updated.
NLS updated. Add new Georgian translation.
Non regression tests updated.
2022/05/29: Version 12.6.0:
sar: Fix maximum value for A_IRQ activity.
sar/sadf: A_NET_SOFT: Add new metric softnet network backlog.
sadc: A_NET_SOFT: Use CPU id from /proc/net/softnet_stat.
Update DTD and XSD documents (softnet backlog).
[Chris Bagwell]: sar/sadf: Convert 64-bit time value to time_t as needed.
sadf: Add basic colorization to sadf's output.
sadf: Add sanity checks on values read from file.
sadf: PCP: Fix multiple metrics name problems.
sa_common.c: Remove unneeded variable assignment.
[Lukáš Zaoral]: Take into account LDFLAGS passer to configure script.
Various janitorial fixes and updated.
Update FAQ.
Update sar manual page.
Update NLS translations.
Update non regression tests.
2022/02/28: Version 12.5.6:
sar/sadc: Rewrite code used to collect and display interrupts statistics. Statistics are now collected from /proc/interrupts (instead of /proc/stat) and are displayed for each installed CPU.
sar/sadf: Add new "--int=" option to enter a list of interrupts on the command line.
sadf: Update the various output formats to deal with the new per-CPU interrupts statistics.
Update DTD and XSD documents. CPU elements may be non-existent when all selected CPU are offline.
Update sar and sadf manual pages.
mpstat: Create its own function to read the total number of interrupts from /proc/stat file.
mpstat: Remove unneeded "aligned" attribute from struct stats_irqcpu definition.
sar: Fix index value used in online_cpu_bitmap array.
sar/sadf: Make sure that datafiles with unknown activities can be read by sar and sadf [12.4.5].
sar/sadf: Don't reallocate buffers for activities not present in file [12.4.5].
sar: Make sure that all buffers are copied in copy_structures() function [12.4.5].
PCP: Fix flow_limit_count metric's unit (A_NET_SOFT activity).
PCP: Fix instance names for getattr call (A_NET_NFS(D) activities).
Use sizeof() macro instead of hard-coded values with snprintf() functions.
rndr_stats.c: Use NOVAL instead of NULL as last argument for cons() function.
Use strings definitions whenever possible.
Add new non regression tests. Update some existing ones.
Various cosmetic fixes.
2021/12/05: Version 12.5.5:
iostat: Add --compact option.
iostat: Always display persistent names with option -j [12.4.4].
iostat: Fix how device mapper names are taken into account when entered on the command line [12.4.4].
iostat: Update manual page.
mpstat: Don't display offline CPU [12.4.4].
mpstat: Fix values displayed when an offline CPU goes back online [12.4.4].
mpstat: Fix untrusted loop bound [12.4.4].
mpstat: Update non regression tests [12.4.4].
sar: Tell the user to convert the file when needed.
sadc: Reuse count results for sub-items.
[Ville Skyttä]: Use `grep -E` instead of deprecated `egrep` [12.4.4].
[Ville Skyttä]: Spelling and grammar fixes [12.4.4].
Update FAQ.
[Nathan Naze]: Update man pages with correct spelling of "JavaScript" [12.4.4].
Update non regression tests.
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 28c939b78f0a282bc2389e127edf9f898284940a
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Mon Nov 28 14:23:49 2022 +0100
samba: Update to version 4.17.3
- Update from version 4.17.0 to 4.17.3
- Update of rootfile (x86_64) - other architectures will need to be adjusted.
- Changelog
Release Notes for Samba 4.17.3
This is a security release in order to address the following defects:
o CVE-2022-42898: Samba's Kerberos libraries and AD DC failed to guard against
integer overflows when parsing a PAC on a 32-bit system, which
allowed an attacker with a forged PAC to corrupt the heap.
https://www.samba.org/samba/security/CVE-2022-42898.html
o Joseph Sutton <josephsutton(a)catalyst.net.nz>
* BUG 15203: CVE-2022-42898
o Nicolas Williams <nico(a)twosigma.com>
* BUG 15203: CVE-2022-42898
Release Notes for Samba 4.17.2
This is a security release in order to address the following defects:
o CVE-2022-3437: There is a limited write heap buffer overflow in the GSSAPI
unwrap_des() and unwrap_des3() routines of Heimdal (included
in Samba).
https://www.samba.org/samba/security/CVE-2022-3437.html
o CVE-2022-3592: A malicious client can use a symlink to escape the exported
directory.
https://www.samba.org/samba/security/CVE-2022-3592.html
o Volker Lendecke <vl(a)samba.org>
* BUG 15207: CVE-2022-3592.
o Joseph Sutton <josephsutton(a)catalyst.net.nz>
* BUG 15134: CVE-2022-3437.
Release Notes for Samba 4.17.1
o Jeremy Allison <jra(a)samba.org>
* BUG 14611: CVE-2021-20251 [SECURITY] Bad password count not incremented
atomically.
* BUG 15174: smbXsrv_connection_shutdown_send result leaked.
* BUG 15182: Flush on a named stream never completes.
* BUG 15195: Permission denied calling SMBC_getatr when file not exists.
o Douglas Bagnall <douglas.bagnall(a)catalyst.net.nz>
* BUG 15189: Samba 4.5 sometimes cannot be upgraded to Samba 4.6 or later
over DRS: WERROR_DS_DRA_MISSING_PARENT due to faulty GET_ANC.
* BUG 15191: pytest: add file removal helpers for TestCaseInTempDir.
o Andrew Bartlett <abartlet(a)samba.org>
* BUG 14611: CVE-2021-20251 [SECURITY] Bad password count not incremented
atomically.
* BUG 15189: Samba 4.5 sometimes cannot be upgraded to Samba 4.6 or later.
over DRS: WERROR_DS_DRA_MISSING_PARENT due to faulty GET_ANC.
o Ralph Boehme <slow(a)samba.org>
* BUG 15182: Flush on a named stream never completes.
o Volker Lendecke <vl(a)samba.org>
* BUG 15151: vfs_gpfs silently garbles timestamps > year 2106.
o Gary Lockyer <gary(a)catalyst.net.nz>
* BUG 14611: CVE-2021-20251 [SECURITY] Bad password count not incremented
atomically.
o Stefan Metzmacher <metze(a)samba.org>
* BUG 15200: multi-channel socket passing may hit a race if one of the
involved processes already existed.
* BUG 15201: memory leak on temporary of struct imessaging_post_state and
struct tevent_immediate on struct imessaging_context (in
rpcd_spoolss and maybe others).
o Noel Power <noel.power(a)suse.com>
* BUG 15205: Since popt1.19 various use after free errors using result of
poptGetArg are now exposed.
o Anoop C S <anoopcs(a)samba.org>
* BUG 15192: Remove special case for O_CREAT in SMB_VFS_OPENAT from
vfs_glusterfs.
o Andreas Schneider <asn(a)samba.org>
* BUG 15169: GETPWSID in memory cache grows indefinetly with each NTLM auth.
o Joseph Sutton <josephsutton(a)catalyst.net.nz>
* BUG 14611: CVE-2021-20251 [SECURITY] Bad password count not incremented
atomically.
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit bf81d068067bd4369feb0bcc647effba50a22c0d
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Mon Nov 28 14:23:38 2022 +0100
rsync: Update to version 3.2.7
- Update from version 3.2.6 to 3.2.7
- Update of rootfile not required
- Changelog
# NEWS for rsync 3.2.7 (20 Oct 2022)
### BUG FIXES:
- Fixed the client-side validating of the remote sender's filtering behavior.
- More fixes for the "unrequested file-list name" name, including a copy of
"/" with `--relative` enabled and a copy with a lot of related paths with
`--relative` enabled (often derived from a `--files-from` list).
- When rsync gets an unpack error on an ACL, mention the filename.
- Avoid over-setting sanitize_paths when a daemon is serving "/" (even if
"use chroot" is false).
### ENHANCEMENTS:
- Added negotiated daemon-auth support that allows a stronger checksum digest
to be used to validate a user's login to the daemon. Added SHA512, SHA256,
and SHA1 digests to MD5 & MD4. These new digests are at the highest priority
in the new daemon-auth negotiation list.
- Added support for the SHA1 digest in file checksums. While this tends to be
overkill, it is available if someone really needs it. This overly-long
checksum is at the lowest priority in the normal checksum negotiation list.
See [`--checksum-choice`](rsync.1#opt) (`--cc`) and the `RSYNC_CHECKSUM_LIST`
environment var for how to customize this.
- Improved the xattr hash table to use a 64-bit key without slowing down the
key's computation. This should make extra sure that a hash collision doesn't
happen.
- If the `--version` option is repeated (e.g. `-VV`) then the information is
output in a (still readable) JSON format. Client side only.
- The script `support/json-rsync-version` is available to get the JSON style
version output from any rsync. The script accepts either text on stdin
**or** an arg that specifies an rsync executable to run with a doubled
`--version` option. If the text we get isn't already in JSON format, it is
converted. Newer rsync versions will provide more complete json info than
older rsync versions. Various tweaks are made to keep the flag names
consistent across versions.
- The [`use chroot`](rsyncd.conf.5#) daemon parameter now defaults to "unset"
so that rsync can use chroot when it works and a sanitized copy when chroot
is not supported (e.g., for a non-root daemon). Explicitly setting the
parameter to true or false (on or off) behaves the same way as before.
- The `--fuzzy` option was optimized a bit to try to cut down on the amount of
computations when considering a big pool of files. The simple heuristic from
Kenneth Finnegan resuled in about a 2x speedup.
- If rsync is forced to use protocol 29 or before (perhaps due to talking to an
rsync before 3.0.0), the modify time of a file is limited to 4-bytes. Rsync
now interprets this value as an unsigned integer so that a current year past
2038 can continue to be represented. This does mean that years prior to 1970
cannot be represented in an older protocol, but this trade-off seems like the
right choice given that (1) 2038 is very rapidly approaching, and (2) newer
protocols support a much wider range of old and new dates.
- The rsync client now treats an empty destination arg as an error, just like
it does for an empty source arg. This doesn't affect a `host:` arg (which is
treated the same as `host:.`) since the arg is not completely empty. The use
of [`--old-args`](rsync.1#opt) (including via `RSYNC_OLD_ARGS`) allows the
prior behavior of treating an empty destination arg as a ".".
### PACKAGING RELATED:
- The checksum code now uses openssl's EVP methods, which gets rid of various
deprecation warnings and makes it easy to support more digest methods. On
newer systems, the MD4 digest is marked as legacy in the openssl code, which
makes openssl refuse to support it via EVP. You can choose to ignore this
and allow rsync's MD4 code to be used for older rsync connections (when
talking to an rsync prior to 3.0.0) or you can choose to configure rsync to
tell openssl to enable legacy algorithms (see below).
- A simple openssl config file is supplied that can be installed for rsync to
use. If you install packaging/openssl-rsync.cnf to a public spot (such as
`/etc/ssl/openssl-rsync.cnf`) and then run configure with the option
`--with-openssl-conf=/path/name.cnf`, this will cause rsync to export the
configured path in the OPENSSL_CONF environment variable (when the variable
is not already set). This will enable openssl's MD4 code for rsync to use.
- The packager may wish to include an explicit "use chroot = true" in the top
section of their supplied /etc/rsyncd.conf file if the daemon is being
installed to run as the root user (though rsync should behave the same even
with the value unset, a little extra paranoia doesn't hurt).
- I've noticed that some packagers haven't installed support/nameconvert for
users to use in their chrooted rsync configs. Even if it is not installed
as an executable script (to avoid a python3 dependency) it would be good to
install it with the other rsync-related support scripts.
- It would be good to add support/json-rsync-version to the list of installed
support scripts.
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit c2eb7f254cac0c6f079432f9e5ab1b2a72b82646
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Tue Nov 29 13:41:44 2022 +0100
Core Update 172: Ship poppler
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 47b5dd080a01c21c3f78e366624c5f2e644dc889
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Mon Nov 28 14:23:27 2022 +0100
poppler: Update to version 22.11.0
- Update from 22.04.0 to 22.11.0
- Update of rootfile
- Changelog
Release 22.11.0:
core:
* CairoOutputDev: Update font after restore
* Protect against broken files
* Small code refactoring
Release 22.10.0:
core:
* SplashOutputDev::tilingPatternFill: Properly restore CTM on failure. Issue #1292
* Protect against malformed files
* Refactor code to not use strndup
* Other small code refactoring
utils:
* pdftoppm: Avoid round-off errors when determining raster dimensions
* pdftocairo: Avoid round-off errors when determining raster dimensions
* pdftotext: Simplify memory handling
qt:
* Take into account flagNoView when getting/setting the visible status. KDE bug #456313
build system:
* Fix sed invocation
Release 22.09.0:
core:
* Splash: Do not truncate line dash patterns with more than 20 entries. Issue #1281
* Various signature related improvements
* Fix FormField::getFullyQualifiedName in some scenarios
* Splash: Small optimization on dash pattern handling
* JBIG2Stream::readHalftoneRegionSeg: Fix potential memory leak
* Fix crashes on malformed files. Including CVE-2022-38784
* Fix string formatting in error reporting
glib:
* Fix two potential memory leaks in poppler_document_create_dests_tree
utils:
* pdfsig: List signature field names when listing signature information
* pdfsig: Add support for specifying signature by field name
* pdfunite: Fix crashes on malformed files
* pdfunite: Fix potential memory leak of docs
Release 22.08.0:
core:
* Fix rendering text on some forms
* CairoOutputDev: Support Type3 charprocs having Resources
* Fix crashes on malformed files
Release 22.07.0:
core:
* Fix crash when filling in forms in some files. Issue #1258
* Fix first lines of Annotations sometimes being cut off. Issue #1246
* Signatures: Don't crash if the signature doesn't have a common name
* CairoFontEngine: increment font_face reference when retrieving from the cache
* Add ToUnicode support for lessorequalslant and greaterorequalslant
glib:
* Add support for stamp annotation
build system:
* Tweaks on how gperf is run
Release 22.06.0:
core:
* Forms: Fix crash in forms with their own DR
* Refactor CairoFontEngine caching
* CairoOutputDev: preserve text color when drawing type 3 glyphs
* Windows: font code simplification
* Minor code improvements
cpp:
* Add missing header
utils:
* pdfattach: Assume filename is utf8 encoded
* pdftohtml: Fix type 3 font size calculation
Release 22.05.0:
core:
* Annotations: Make sure we embed fonts for the FreeText annots
* Forms: Make sure we embedd fonts as needed
* Signatures: Make sure we embed the needed fonts
* CairoOutputDev: color type 3 fonts
* fix two bugs in multiline find_text()
* code improvements
utils:
* pdftotext: added TSV mode
* HtmlOutputDev: don't use png.h
cpp:
* Use time_t for time
* Add page_transition::durationReal
qt:
* Pass leftFontSize down to `FormWidgetSignature::signDocumentWithAppearence`
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit d1ade1d63f14c2095f0501ac2dc28882f54f45fe
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Mon Nov 28 14:23:14 2022 +0100
meson: Update to version 0.64.1
- Update from version 0.62.1 to 0.64.1
- Update of rootfile
- Changelog is too long to include here. Details can be found at
0.63.0 https://mesonbuild.com/Release-notes-for-0-63-0.html
0.64.0 https://mesonbuild.com/Release-notes-for-0-64-0.html
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 9ee4dd21a95a9dc14adb574004c8a150936ab3cf
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Tue Nov 29 13:39:39 2022 +0100
Core Update 172: Ship lsof
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 80274cc875304fa2c1e83b9e25ca8cbcb9805e33
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Mon Nov 28 14:22:49 2022 +0100
lsof: Update to version 4.96.4
- Update from version 4.95.0 to 4.96.4
- Update of rootfile not required
- bz2 version of source tarball is no longer provided.
- Changelog
4.96.4 October 18, 2022
[FreeBSD] sys/files.h no longer needs _KERNEL defined to
include it (bsdimp #256)
docs: Describe fd number truncation in output (#261)
4.96.3 September 16, 2022
[FreeBSD] Fix kqueue compat for releases < 14
4.96.2 September 16, 2022
[FreeBSD] fix FreeBSD < 14
4.96.1 September 16, 2022
[FreeBSD] Unconditionally define HASKQUEUE (mjguzik)
4.96.0 September 16, 2022
[linux] fix hash functions used for finding local tcp/udp IPCs
There were typos in the code calculating hash values. The typos might
break the flatness of hashtables where the endpoint information about
locally used tcp/udp was stored. Theoretically, this fix may improve
the performance of lsof with [+|-]E option.
Inspired by the issue #206 reported by Tomasz Kłoczko (@kloczek).
Show copyright notice in --version output.
[linux] compile with -Wall option
[linux] Avoid some easy collissions for udp/udp6 sockets when hashing
[linux] Changing the number of ipcbuckets to 4096
[darwin] fix build with -fno-common (Cfp redefinition)
gcc-10 and llvm-11 changed the default from -fcommon to -fno-common:
https://gcc.gnu.org/PR85678
As a result build fails as:
duplicate symbol '_Cfp' in: ddev.o dfile.o
Cfp is already explicitly defined in dstore.c. The change turns
header definition into declaration.
Provided by Sergei Trofimovich (@trofi) in #221. The same fix is
applied to libproc backend by Jiajie Chen (@jiegec) in #226.
[linux] Make build reproducible by checking SOURCE_DATE_EPOCH
and considering LSOF_{HOST,LOGNAME,SYSINFO,USER} as "none" when
it is set.
Provided by Danilo Spinella in #217
[darwin] remove /usr/include prefix from include for Darwin 19+
The /usr/include path is missing since macOS Catalina.
Fixes issue #234.
Provided by Jiajie Chen in #235
[linux] obtain correct information of memory-mapped file.
Provided by Teng Hu in #239
[FreeBSD] configure: suggest variable to set if FreeBSD sys not found
submitted by @emaste
Updated 00FAQ with lookup to open files via mountpoint
Provided by Jacob Chapman in #240
[FreeBSD] modernize API usage and remove legacy FreeBSD releases
Contributor DamjanJovanovic (#184) Ed Maste (#250, #251, #252),
Warner Losh (#253)
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit a0751fde7894fb1f352caab56be8720861ce1c34
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Tue Nov 29 13:37:45 2022 +0100
Core Update 172: Ship libtasn1 and libtiff
My fault, again. :-/
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 366cd034015c6b52f74a90e7cd293a2c05b6b3a1
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Tue Nov 29 13:31:55 2022 +0100
Core Update 172: Remove gnu-netcat addon
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit a8b3a69b9dea078d216b0065b49889624736689e
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Mon Nov 28 18:24:21 2022 +0100
gnu-netcat: Removal of package
- gnu-netcat was last updated in 2004 and is not used as a dependency for any IPFire
addon.
- IPFire has ncat which is used as a dependency for ipfire-netboot, libshout, libvirt
and squid. gnu-netcat not being required for libvcirt was confirmed by Jonatan.
- nmap/ncat is being actively updated.
- Based on the above this patch is removing gnu-netcat from IPFire.
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 47c2e4c0aab69ff7f629e03d40e8e59f845ce3d3
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Mon Nov 28 18:24:36 2022 +0100
sdl2: Update to version 2.26.0
- Update from version 2.0.22 to 2.26.0
- Update of rootfile
- Changelog
2.26.0:
General:
* Updated OpenGL headers to the latest API from The Khronos Group Inc.
* Added SDL_GetWindowSizeInPixels() to get the window size in pixels, which may differ from the window coordinate size for windows with high-DPI support
* Added simulated vsync synchronization for the software renderer
* Added the mouse position to SDL_MouseWheelEvent
* Added SDL_ResetHints() to reset all hints to their default values
* Added SDL_GetJoystickGUIDInfo() to get device information encoded in a joystick GUID
* Added the hint SDL_HINT_JOYSTICK_HIDAPI_XBOX_360 to control whether the HIDAPI driver for XBox 360 controllers should be used
* Added the hint SDL_HINT_JOYSTICK_HIDAPI_XBOX_360_PLAYER_LED to control whether the player LEDs should be lit to indicate which player is associated with an Xbox 360 controller
* Added the hint SDL_HINT_JOYSTICK_HIDAPI_XBOX_360_WIRELESS to control whether the HIDAPI driver for XBox 360 wireless controllers should be used
* Added the hint SDL_HINT_JOYSTICK_HIDAPI_XBOX_ONE to control whether the HIDAPI driver for XBox One controllers should be used
* Added the hint SDL_HINT_JOYSTICK_HIDAPI_XBOX_ONE_HOME_LED to control the brightness of the XBox One guide button LED
* Added support for PS3 controllers to the HIDAPI driver, enabled by default on macOS, controlled by the SDL_HINT_JOYSTICK_HIDAPI_PS3 hint
* Added support for Nintendo Wii controllers to the HIDAPI driver, not enabled by default, controlled by the SDL_HINT_JOYSTICK_HIDAPI_WII hint
* Added the hint SDL_HINT_JOYSTICK_HIDAPI_WII_PLAYER_LED to control whether the player LED should be lit on the Nintendo Wii controllers
* Added the hint SDL_HINT_JOYSTICK_HIDAPI_VERTICAL_JOY_CONS to control whether Nintendo Switch Joy-Con controllers will be in vertical mode when using the HIDAPI driver
* Added access to the individual left and right gyro sensors of the combined Joy-Cons controller
* Added a microsecond timestamp to SDL_SensorEvent and SDL_ControllerSensorEvent, when the hardware provides that information
* Added SDL_SensorGetDataWithTimestamp() and SDL_GameControllerGetSensorDataWithTimestamp() to retrieve the last sensor data with the associated microsecond timestamp
* Added the hint SDL_HINT_HIDAPI_IGNORE_DEVICES to have the SDL HID API ignore specific devices
* SDL_GetRevision() now includes more information about the SDL build, including the git commit hash if available
Windows:
* Added the hint SDL_HINT_MOUSE_RELATIVE_SYSTEM_SCALE to control whether the system mouse acceleration curve is used for relative mouse motion
macOS:
* Implemented vsync synchronization on macOS 12
Linux:
* Added SDL_SetPrimarySelectionText(), SDL_GetPrimarySelectionText(), and SDL_HasPrimarySelectionText() to interact with the X11 primary selection clipboard
* Added the hint SDL_HINT_VIDEO_WAYLAND_EMULATE_MOUSE_WARP to control whether mouse pointer warp emulation is enabled under Wayland
Android:
* Enabled IME soft keyboard input
* Added version checking to make sure the SDL Java and C code are compatible
2.24.0:
General:
* New version numbering scheme, similar to GLib and Flatpak.
* An even number in the minor version (second component) indicates a production-ready stable release such as 2.24.0, which would have been 2.0.24 under the old system.
* The patchlevel (micro version, third component) indicates a bugfix-only update: for example, 2.24.1 would be a bugfix-only release to fix bugs in 2.24.0, without adding new features.
* An odd number in the minor version indicates a prerelease such as 2.23.0. Stable distributions should not use these prereleases.
* The patchlevel indicates successive prereleases, for example 2.23.1 and 2.23.2 would be prereleases during development of the SDL 2.24.0 stable release.
* Added SDL_GetPointDisplayIndex() and SDL_GetRectDisplayIndex() to get the display associated with a point and rectangle in screen space
* Added SDL_bsearch(), SDL_crc16(), and SDL_utf8strnlen() to the stdlib routines
* Added SDL_CPUPauseInstruction() as a macro in SDL_atomic.h
* Added SDL_size_mul_overflow() and SDL_size_add_overflow() for better size overflow protection
* Added SDL_ResetHint() to reset a hint to the default value
* Added SDL_ResetKeyboard() to reset SDL's internal keyboard state, generating key up events for all currently pressed keys
* Added the hint SDL_HINT_MOUSE_RELATIVE_WARP_MOTION to control whether mouse warping generates motion events in relative mode. This hint defaults off.
* Added the hint SDL_HINT_TRACKPAD_IS_TOUCH_ONLY to control whether trackpads are treated as touch devices or mice. By default touchpads are treated as mouse input.
* The hint SDL_HINT_JOYSTICK_HIDAPI_JOY_CONS now defaults on
* Added support for mini-gamepad mode for Nintendo Joy-Con controllers using the HIDAPI driver
* Added the hint SDL_HINT_JOYSTICK_HIDAPI_COMBINE_JOY_CONS to control whether Joy-Con controllers are automatically merged into a unified gamepad when using the HIDAPI driver. This hint defaults on.
* The hint SDL_HINT_JOYSTICK_HIDAPI_SWITCH_HOME_LED can be set to a floating point value to set the brightness of the Home LED on Nintendo Switch controllers
* Added the hint SDL_HINT_JOYSTICK_HIDAPI_JOYCON_HOME_LED to set the Home LED brightness for the Nintendo Joy-Con controllers. By default the Home LED is not modified.
* Added the hint SDL_HINT_JOYSTICK_HIDAPI_SWITCH_PLAYER_LED to control whether the player LED should be lit on the Nintendo Joy-Con controllers
* Added support for Nintendo Online classic controllers using the HIDAPI driver
* Added the hint SDL_HINT_JOYSTICK_HIDAPI_NINTENDO_CLASSIC to control whether the HIDAPI driver for Nintendo Online classic controllers should be used
* Added support for the NVIDIA Shield Controller to the HIDAPI driver, supporting rumble and battery status
* Added support for NVIDIA SHIELD controller to the HIDAPI driver, and a hint SDL_HINT_JOYSTICK_HIDAPI_SHIELD to control whether this is used
* Added functions to get the platform dependent name for a joystick or game controller:
* SDL_JoystickPathForIndex()
* SDL_JoystickPath()
* SDL_GameControllerPathForIndex()
* SDL_GameControllerPath()
* Added SDL_GameControllerGetFirmwareVersion() and SDL_JoystickGetFirmwareVersion(), currently implemented for DualSense(tm) Wireless Controllers using HIDAPI
* Added SDL_JoystickAttachVirtualEx() for extended virtual controller support
* Added joystick event SDL_JOYBATTERYUPDATED for when battery status changes
* Added SDL_GUIDToString() and SDL_GUIDFromString() to convert between SDL GUID and string
* Added SDL_HasLSX() and SDL_HasLASX() to detect LoongArch SIMD support
* Added SDL_GetOriginalMemoryFunctions()
* Added SDL_GetDefaultAudioInfo() to get the name and format of the default audio device, currently implemented for PipeWire, PulseAudio, WASAPI, and DirectSound
* Added HIDAPI driver for the NVIDIA SHIELD controller (2017 model) to enable support for battery status and rumble
* Added support for opening audio devices with 3 or 5 channels (2.1, 4.1). All channel counts from Mono to 7.1 are now supported.
* Rewrote audio channel converters used by SDL_AudioCVT, based on the channel matrix coefficients used as the default for FAudio voices
* SDL log messages are no longer limited to 4K and can be any length
* Fixed a long-standing calling convention issue with dynapi affecting OpenWatcom or OS/2 builds
Windows:
* Added initial support for building for Windows and Xbox with Microsoft's Game Development Kit (GDK), see docs/README-gdk.md for details
* Added a D3D12 renderer implementation and SDL_RenderGetD3D12Device() to retrieve the D3D12 device associated with it
* Added the hint SDL_HINT_WINDOWS_DPI_AWARENESS to set whether the application is DPI-aware. This hint must be set before initializing the video subsystem
* Added the hint SDL_HINT_WINDOWS_DPI_SCALING to control whether the SDL coordinates are in DPI-scaled points or pixels
* Added the hint SDL_HINT_DIRECTINPUT_ENABLED to control whether the DirectInput driver should be used
* Added support for SDL_GetAudioDeviceSpec to the DirectSound backend
Linux:
* Support for XVidMode has been removed, mode changes are only supported using the XRandR extension
* Added the hint SDL_HINT_VIDEO_WAYLAND_MODE_EMULATION to control whether to expose a set of emulated modes in addition to the native resolution modes available on Wayland
* Added the hint SDL_HINT_KMSDRM_DEVICE_INDEX to specify which KMSDRM device to use if the default is not desired
* Added the hint SDL_HINT_LINUX_DIGITAL_HATS to control whether to treat hats as digital rather than checking to see if they may be analog
* Added the hint SDL_HINT_LINUX_HAT_DEADZONES to control whether to use deadzones on analog hats
macOS:
* Bumped minimum OS deployment version to macOS 10.9
* Added SDL_GL_FLOATBUFFERS to allow Cocoa GL contexts to use EDR
* Added the hint SDL_HINT_MAC_OPENGL_ASYNC_DISPATCH to control whether dispatching OpenGL context updates should block the dispatching thread until the main thread finishes processing. This hint defaults to blocking, which is the safer option on modern macOS.
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 465995c33841a724169d8e8d5068cb735c0de3ed
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Thu Nov 24 14:22:28 2022 +0100
es.pl: Update of Spanish Language file
- Update of Spanish language files provided by Roberto Peña.
- ./make.sh lang run before this commit.
Suggested-by: Roberto Peña <contacto(a)northsecure.es>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Acked-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 2e498d7403713fc8b40db4ca553f73b0e91f0b18
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Nov 27 16:53:18 2022 +0000
core172: add missing armv6 rootfile link for python3
this fix build of core172 for armv6.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 5de05890581d85f8959b0f6ee81b667436df7e03
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Nov 27 20:51:59 2022 +0000
python3-msgpack: update armv6 rootfile
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit d7cb4f6535e224f6875c113b4739c2f919e87985
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Sat Nov 26 14:43:03 2022 +0100
liburcu: Update to version 0.13.2
- Update from version 0.13.0 to 0.13.2
- Update of rootfile
- Changelog
2022-08-18 Userspace RCU 0.13.2
* Revert "Fix: remove type constness in URCU_FORCE_CAST's C++ version"
* Fix: futex.h: include headers outside extern C
* Fix: add missing unused attribute to _rcu_dereference
* Fix: change method used by _rcu_dereference to strip type constness
* Fix: remove type constness in URCU_FORCE_CAST's C++ version
* Move extern "C" down in include/urcu/urcu-bp.h
* fix: ifdef linux specific cpu count compat
* Set git-review branch to stable-0.13
* fix: sysconf(_SC_NPROCESSORS_CONF) can be less than max cpu id
* Fix: revise obsolete command in README.md
* Fix: workqueue: remove unused variable "ret"
* Fix: urcu-qsbr: futex wait: handle spurious futex wakeups
* Fix: urcu: futex wait: handle spurious futex wakeups
* Fix: urcu-wait: futex wait: handle spurious futex wakeups
* Fix: defer_rcu: futex wait: handle spurious futex wakeups
* Fix: call_rcu: futex wait: handle spurious futex wakeups
* Fix: workqueue: futex wait: handle spurious futex wakeups
* Fix: Use %lu rather than %ld to print count
2022-01-05 Userspace RCU 0.13.1
* fix: properly detect 'cmpxchg' on x86-32
* fix: use urcu-tls compat with c++ compiler
* fix: remove autoconf features default value in help message
* fix: add missing pkgconfig file for memb flavour lib
* Make temporary variable in _rcu_dereference non-const
* Fix: x86 and s390: uatomic __hp() macro C++ support
* Fix: x86 and s390: uatomic __hp() macro clang support
* Fix: x86 and s390 uatomic: __hp() macro warning with gcc 11
* Fix: changelog: v0.13.0 was released in 2021
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 8f591d729f209fc1d243a18850a9cd321212f2a4
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Mon Nov 28 13:17:07 2022 +0100
Core Update 172: Ship libtiff
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 194dd04102958403c130791fd4d1dda0de8c12a9
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Sat Nov 26 14:42:49 2022 +0100
libtiff: Update to version 4.4.0
- Update from version 4.3.0 to 4.4.0
- Update of rootfile
- Changelog is too long to include here (~1000 lines). Details can be found in ChangeLog
file in the source tarball. There are at least 31 bug closures in this release.
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 05dd992b96c40e32c955223c93563f8651b237ae
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Mon Nov 28 13:10:37 2022 +0100
Core Update 172: Ship libtasn
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 4bdb98bc2574dd3a5027d7bb33586cbef483594a
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Sat Nov 26 14:42:38 2022 +0100
libtasn1: Update to version 4.19.0
- Update from version 4.18.0 to 4.19.0
- Update of rootfile
- Changelog
* Noteworthy changes in release 4.19.0 (2022-08-23) [stable]
- Clarify libtasn1.map license. Closes: #38.
- Fix ETYPE_OK out of bounds read. Closes: #32.
- Update gnulib files and various maintenance fixes.
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 749537f0d7638ffa6e6c3b6ee082a82d3b5250cb
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Mon Nov 28 13:09:28 2022 +0100
Core Update 172: Ship iproute2
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 4d9cdf1e4f67fa08221b350281879ccc63f71de5
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Sat Nov 26 14:42:22 2022 +0100
iproute2: Update to version 6.0.0
- Update from 5.19.0 to 6.0.0
- Update of rootfile
- Changelog can only be obtained by reviewing the git commits from
https://git.kernel.org/pub/scm/network/iproute2/iproute2.git
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit a6dcf0addcec8944bf3f8ca6da4697a438deb32b
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Mon Nov 28 13:08:43 2022 +0100
Core Update 172: Ship iana-etc
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 2ae0c4b7b4c48326b1c55910c35c084bee6996ce
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Sat Nov 26 14:42:11 2022 +0100
iana-etc: Update to version 20221107
- Update from version 20220414 to 20221107
- Update of rootfile not required
- Update of iana protocols and services info
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 435dcefe08a8665152e58dcb09a3abd579b62437
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Sat Nov 26 14:41:59 2022 +0100
git: Update to version 2.38.1
- Update from version 2.37.1 to 2.38.1
- Update of rootfile
- Changelog
Git v2.38.1 Release Notes
This release merges the security fix that appears in v2.30.6; see
the release notes for that version for details.
Git v2.38 Release Notes
* "git remote show [-n] frotz" now pays attention to negative
pathspec.
* "git push" sometimes performs poorly when reachability bitmaps are
used, even in a repository where other operations are helped by
bitmaps. The push.useBitmaps configuration variable is introduced
to allow disabling use of reachability bitmaps only for "git push".
* "git grep -m<max-hits>" is a way to limit the hits shown per file.
* "git merge-tree" learned a new mode where it takes two commits and
computes a tree that would result in the merge commit, if the
histories leading to these two commits were to be merged.
* "git mv A B" in a sparsely populated working tree can be asked to
move a path between directories that are "in cone" (i.e. expected
to be materialized in the working tree) and "out of cone"
(i.e. expected to be hidden). The handling of such cases has been
improved.
* Earlier, HTTP transport clients learned to tell the server side
what locale they are in by sending Accept-Language HTTP header, but
this was done only for some requests but not others.
* Introduce a safe.barerepository configuration variable that
allows users to forbid discovery of bare repositories.
* Various messages that come from the pack-bitmap codepaths have been
tweaked.
* "git rebase -i" learns to update branches whose tip appear in the
rebased range with "--update-refs" option.
* "git ls-files" learns the "--format" option to tweak its output.
* "git cat-file" learned an option to use the mailmap when showing
commit and tag objects.
* When "git merge" finds that it cannot perform a merge, it should
restore the working tree to the state before the command was
initiated, but in some corner cases it didn't.
* Operating modes like "--batch" of "git cat-file" command learned to
take NUL-terminated input, instead of one-item-per-line.
* "git rm" has become more aware of the sparse-index feature.
* "git rev-list --disk-usage" learned to take an optional value
"human" to show the reported value in human-readable format, like
"3.40MiB".
* The "diagnose" feature to create a zip archive for diagnostic
material has been lifted from "scalar" and made into a feature of
"git bugreport".
* The namespaces used by "log --decorate" from "refs/" hierarchy by
default has been tightened.
* "git rev-list --ancestry-path=C A..B" is a natural extension of
"git rev-list A..B"; instead of choosing a subset of A..B to those
that have ancestry relationship with A, it lets a subset with
ancestry relationship with C.
* "scalar" now enables built-in fsmonitor on enlisted repositories,
when able.
* The bash prompt (in contrib/) learned to optionally indicate when
the index is unmerged.
* "git clone" command learned the "--bundle-uri" option to coordinate
with hosting sites the use of pre-prepared bundle files.
* "git range-diff" learned to honor pathspec argument if given.
* "git format-patch --from=<ident>" can be told to add an in-body
"From:" line even for commits that are authored by the given
<ident> with "--force-in-body-from" option.
* The built-in fsmonitor refuses to work on a network mounted
repositories; a configuration knob for users to override this has
been introduced.
* The "scalar" addition from Microsoft is now part of the core Git
installation.
* Collection of what is referenced by objects in promisor packs have
been optimized to inspect these objects in the in-pack order.
* Introduce a helper to see if a branch is already being worked on
(hence should not be newly checked out in a working tree), which
performs much better than the existing find_shared_symref() to
replace many uses of the latter.
* Teach "git archive" to (optionally and then by default) avoid
spawning an external "gzip" process when creating ".tar.gz" (and
".tgz") archives.
* Allow large objects read from a packstream to be streamed into a
loose object file straight, without having to keep it in-core as a
whole.
* Further preparation to turn git-submodule.sh into a builtin
continues.
* Apply Coccinelle rule to turn raw memmove() into MOVE_ARRAY() cpp
macro, which would improve maintainability and readability.
* Teach "make all" to build gitweb as well.
* Tweak tests so that they still work when the "git init" template
did not create .git/info directory.
* Add Coccinelle rules to detect the pattern of initializing and then
finalizing a structure without using it in between at all, which
happens after code restructuring and the compilers fail to
recognize as an unused variable.
* The code to convert between GPG trust level strings and internal
constants we use to represent them have been cleaned up.
* Support for libnettle as SHA256 implementation has been added.
* The way "git multi-pack" uses parse-options API has been improved.
* A Coccinelle rule (in contrib/) to encourage use of COPY_ARRAY
macro has been improved.
* API tweak to make it easier to run fuzz testing on commit-graph parser.
* Omit fsync-related trace2 entries when their values are all zero.
* The codepath to write multi-pack index has been taught to release a
large chunk of memory that holds an array of objects in the packs,
as soon as it is done with the array, to reduce memory consumption.
* Add a level of redirection to array allocation API in xdiff part,
to make it easier to share with the libgit2 project.
* "git fetch" client logs the partial clone filter used in the trace2
output.
* The "bundle URI" design gets documented.
* The common ancestor negotiation exchange during a "git fetch"
session now leaves trace log.
* Test portability improvements.
(merge 4d1d843be7 mt/rot13-in-c later to maint).
* The "subcommand" mode is introduced to parse-options API and update
the command line parser of Git commands with subcommands.
* The pack bitmap file gained a bitmap-lookup table to speed up
locating the necessary bitmap for a given commit.
* The assembly version of SHA-1 implementation for PPC has been
removed.
* The server side that responds to "git fetch" and "git clone"
request has been optimized by allowing it to send objects in its
object store without recomputing and validating the object names.
* Annotate function parameters that are not used (but cannot be
removed for structural reasons), to prepare us to later compile
with -Wunused warning turned on.
* Share the text used to explain configuration variables used by "git
<subcmd>" in "git help <subcmd>" with the text from "git help config".
* "git mv A B" in a sparsely populated working tree can be asked to
move a path from a directory that is "in cone" to another directory
that is "out of cone". Handling of such a case has been improved.
* The chainlint script for our tests has been revamped.
* Rewrite of "git add -i" in C that appeared in Git 2.25 didn't
correctly record a removed file to the index, which was fixed.
* Certain diff options are currently ignored when combined-diff is
shown; mark them as incompatible with the feature.
* Adjust technical/bitmap-format to be formatted by AsciiDoc, and
add some missing information to the documentation.
* Fixes for tests when the source directory has unusual characters in
its path, e.g. whitespaces, double-quotes, etc.
* "git mktree --missing" lazily fetched objects that are missing from
the local object store, which was totally unnecessary for the purpose
of creating the tree object(s) from its input.
* Give _() markings to fatal/warning/usage: labels that are shown in
front of these messages.
* References to commands-to-be-typed-literally in "git rebase"
documentation mark-up have been corrected.
* In a non-bare repository, the behavior of Git when the
core.worktree configuration variable points at a directory that has
a repository as its subdirectory, regressed in Git 2.27 days.
* Recent update to vimdiff layout code has been made more robust
against different end-user vim settings.
* Plug various memory leaks, both in the main code and in test-tool
commands.
* Fixes a long-standing corner case bug around directory renames in
the merge-ort strategy.
* The resolve-undo information in the index was not protected against
GC, which has been corrected.
* A corner case bug where lazily fetching objects from a promisor
remote resulted in infinite recursion has been corrected.
* "git clone" from a repository with some ref whose HEAD is unborn
did not set the HEAD in the resulting repository correctly, which
has been corrected.
* An earlier attempt to plug leaks placed a clean-up label to jump to
at a bogus place, which as been corrected.
* Variable quoting fix in the vimdiff driver of "git mergetool"
* "git shortlog -n" relied on the underlying qsort() to be stable,
which shouldn't have. Fixed.
* A fix for a regression in test framework.
* mkstemp() emulation on Windows has been improved.
* Add missing documentation for "include" and "includeIf" features in
"git config" file format, which incidentally teaches the command
line completion to include them in its offerings.
* Avoid "white/black-list" in documentation and code comments.
* Workaround for a compiler warning against use of die() in
osx-keychain (in contrib/).
* Workaround for a false positive compiler warning.
* "git p4" working on UTF-16 files on Windows did not implement
CRLF-to-LF conversion correctly, which has been corrected.
* "git p4" did not handle non-ASCII client name well, which has been
corrected.
* "rerere-train" script (in contrib/) used to honor commit.gpgSign
while recreating the throw-away merges.
* "git checkout" miscounted the paths it updated, which has been
corrected.
* Fix for a bug that makes write-tree to fail to write out a
non-existent index as a tree, introduced in 2.37.
* There was a bug in the codepath to upgrade generation information
in commit-graph from v1 to v2 format, which has been corrected.
* Gitweb had legacy URL shortener that is specific to the way
projects hosted on kernel.org used to (but no longer) work, which
has been removed.
* Fix build procedure for Windows that uses CMake so that it can pick
up the shell interpreter from local installation location.
* Conditionally allow building Python interpreter on Windows
* Fix to lstat() emulation on Windows.
* Older gcc with -Wall complains about the universal zero initializer
"struct s = { 0 };" idiom, which makes developers' lives
inconvenient (as -Werror is enabled by DEVELOPER=YesPlease). The
build procedure has been tweaked to help these compilers.
* Plug memory leaks in the failure code path in the "merge-ort" merge
strategy backend.
* "git symbolic-ref symref non..sen..se" is now diagnosed as an error.
* A follow-up fix to a fix for a regression in 2.36 around hooks.
* Avoid repeatedly running getconf to ask libc version in the test
suite, and instead just as it once per script.
* Platform-specific code that determines if a directory is OK to use
as a repository has been taught to report more details, especially
on Windows.
* "vimdiff3" regression fix.
* "git fsck" reads mode from tree objects but canonicalizes the mode
before passing it to the logic to check object sanity, which has
hid broken tree objects from the checking logic. This has been
corrected, but to help existing projects with broken tree objects
that they cannot fix retroactively, the severity of anomalies this
code detects has been demoted to "info" for now.
* Fixes to sparse index compatibility work for "reset" and "checkout"
commands.
* An earlier optimization discarded a tree-object buffer that is
still in use, which has been corrected.
* Fix deadlocks between main Git process and subprocess spawned via
the pipe_command() API, that can kill "git add -p" that was
reimplemented in C recently.
* The sequencer machinery translated messages left in the reflog by
mistake, which has been corrected.
* xcalloc(), imitating calloc(), takes "number of elements of the
array", and "size of a single element", in this order. A call that
does not follow this ordering has been corrected.
* The preload-index codepath made copies of pathspec to give to
multiple threads, which were left leaked.
* Update the version of Ubuntu used for GitHub Actions CI from 18.04
to 22.04.
* The auto-stashed local changes created by "git merge --autostash"
was mixed into a conflicted state left in the working tree, which
has been corrected.
* Multi-pack index got corrupted when preferred pack changed from one
pack to another in a certain way, which has been corrected.
(merge 99e4d084ff tb/midx-with-changing-preferred-pack-fix later to maint).
* The clean-up of temporary files created via mks_tempfile_dt() was
racy and attempted to unlink() the leading directory when signals
are involved, which has been corrected.
(merge babe2e0559 rs/tempfile-cleanup-race-fix later to maint).
* FreeBSD portability fix for "git maintenance" that spawns "crontab"
to schedule tasks.
(merge ee69e7884e bc/gc-crontab-fix later to maint).
* Those who use diff-so-fancy as the diff-filter noticed a regression
or two in the code that parses the diff output in the built-in
version of "add -p", which has been corrected.
(merge 0a101676e5 js/add-p-diff-parsing-fix later to maint).
* Segfault fix-up to an earlier fix to the topic to teach "git reset"
and "git checkout" work better in a sparse checkout.
(merge 037f8ea6d9 vd/sparse-reset-checkout-fixes later to maint).
* "git diff --no-index A B" managed its the pathnames of its two
input files rather haphazardly, sometimes leaking them. The
command line argument processing has been straightened out to clean
it up.
(merge 2b43dd0eb5 rs/diff-no-index-cleanup later to maint).
* "git rev-list --verify-objects" ought to inspect the contents of
objects and notice corrupted ones, but it didn't when the commit
graph is in use, which has been corrected.
(merge b27ccae34b jk/rev-list-verify-objects-fix later to maint).
* More fixes to "add -p"
(merge 64ec8efb83 js/builtin-add-p-portability-fix later to maint).
* The parser in the script interface to parse-options in "git
rev-parse" has been updated to diagnose a bogus input correctly.
(merge f20b9c36d0 ow/rev-parse-parseopt-fix later to maint).
* The code that manages list-object-filter structure, used in partial
clones, leaked the instances, which has been plugged.
(merge 66eede4a37 jk/plug-list-object-filter-leaks later to maint).
* Fix another UI regression in the reimplemented "add -p".
(merge f6f0ee247f rs/add-p-worktree-mode-prompt-fix later to maint).
* "git fetch" over protocol v2 sent an incorrect ref prefix request
to the server and made "git pull" with configured fetch refspec
that does not cover the remote branch to merge with fail, which has
been corrected.
(merge 49ca2fba39 jk/proto-v2-ref-prefix-fix later to maint).
* A result from opendir() was leaking in the commit-graph expiration
codepath, which has been plugged.
(merge 12f1ae5324 ml/commit-graph-expire-dir-leak-fix later to maint).
* Just like we have coding guidelines, we now have guidelines for
reviewers.
(merge e01b851923 vd/doc-reviewing-guidelines later to maint).
* Other code cleanup, docfix, build fix, etc.
(merge 77b9e85c0f vd/fix-perf-tests later to maint).
(merge 0682bc43f5 jk/test-crontab-fixes later to maint).
(merge b46dd1726c cc/doc-trailer-whitespace-rules later to maint).
Git 2.37.4 Release Notes
This primarily is to backport various fixes accumulated on the 'master'
front since 2.37.3, and also includes the same security fixes as in v2.30.6.
* CVE-2022-39253:
When relying on the `--local` clone optimization, Git dereferences
symbolic links in the source repository before creating hardlinks
(or copies) of the dereferenced link in the destination repository.
This can lead to surprising behavior where arbitrary files are
present in a repository's `$GIT_DIR` when cloning from a malicious
repository.
Git will no longer dereference symbolic links via the `--local`
clone mechanism, and will instead refuse to clone repositories that
have symbolic links present in the `$GIT_DIR/objects` directory.
Additionally, the value of `protocol.file.allow` is changed to be
"user" by default.
Credit for finding CVE-2022-39253 goes to Cory Snider of Mirantis.
The fix was authored by Taylor Blau, with help from Johannes
Schindelin.
* CVE-2022-39260:
An overly-long command string given to `git shell` can result in
overflow in `split_cmdline()`, leading to arbitrary heap writes and
remote code execution when `git shell` is exposed and the directory
`$HOME/git-shell-commands` exists.
`git shell` is taught to refuse interactive commands that are
longer than 4MiB in size. `split_cmdline()` is hardened to reject
inputs larger than 2GiB.
Credit for finding CVE-2022-39260 goes to Kevin Backhouse of
GitHub. The fix was authored by Kevin Backhouse, Jeff King, and
Taylor Blau.
* An earlier optimization discarded a tree-object buffer that is
still in use, which has been corrected.
* Fix deadlocks between main Git process and subprocess spawned via
the pipe_command() API, that can kill "git add -p" that was
reimplemented in C recently.
* xcalloc(), imitating calloc(), takes "number of elements of the
array", and "size of a single element", in this order. A call that
does not follow this ordering has been corrected.
* The preload-index codepath made copies of pathspec to give to
multiple threads, which were left leaked.
* Update the version of Ubuntu used for GitHub Actions CI from 18.04
to 22.04.
* The auto-stashed local changes created by "git merge --autostash"
was mixed into a conflicted state left in the working tree, which
has been corrected.
Also contains other minor documentation updates and code clean-ups.
Git 2.37.3 Release Notes
This primarily is to backport various fixes accumulated on the 'master'
front since 2.37.2.
* The build procedure for Windows that uses CMake has been updated to
pick up the shell interpreter from local installation location.
* Conditionally allow building Python interpreter on Windows
* Fix to lstat() emulation on Windows.
* Older gcc with -Wall complains about the universal zero initializer
"struct s = { 0 };" idiom, which makes developers' lives
inconvenient (as -Werror is enabled by DEVELOPER=YesPlease). The
build procedure has been tweaked to help these compilers.
* Plug memory leaks in the failure code path in the "merge-ort" merge
strategy backend.
* Avoid repeatedly running getconf to ask libc version in the test
suite, and instead just as it once per script.
* Platform-specific code that determines if a directory is OK to use
as a repository has been taught to report more details, especially
on Windows.
* "vimdiff3" regression has been corrected.
* "git fsck" reads mode from tree objects but canonicalizes the mode
before passing it to the logic to check object sanity, which has
hid broken tree objects from the checking logic. This has been
corrected, but to help exiting projects with broken tree objects
that they cannot fix retroactively, the severity of anomalies this
code detects has been demoted to "info" for now.
* Fixes to sparse index compatibility work for "reset" and "checkout"
commands.
* Documentation for "git add --renormalize" has been improved.
Also contains other minor documentation updates and code clean-ups.
Git 2.37.2 Release Notes
This primarily is to backport various fixes accumulated on the 'master'
front since 2.37.1.
* "git shortlog -n" relied on the underlying qsort() to be stable,
which shouldn't have. Fixed.
* Variable quoting fix in the vimdiff driver of "git mergetool".
* An earlier attempt to plug leaks placed a clean-up label to jump to
at a bogus place, which as been corrected.
* Fixes a long-standing corner case bug around directory renames in
the merge-ort strategy.
* Recent update to vimdiff layout code has been made more robust
against different end-user vim settings.
* In a non-bare repository, the behavior of Git when the
core.worktree configuration variable points at a directory that has
a repository as its subdirectory, regressed in Git 2.27 days.
* References to commands-to-be-typed-literally in "git rebase"
documentation mark-up have been corrected.
* Give _() markings to fatal/warning/usage: labels that are shown in
front of these messages.
* "git mktree --missing" lazily fetched objects that are missing from
the local object store, which was totally unnecessary for the purpose
of creating the tree object(s) from its input.
* Fixes for tests when the source directory has unusual characters in
its path, e.g. whitespaces, double-quotes, etc.
* Adjust technical/bitmap-format to be formatted by AsciiDoc, and
add some missing information to the documentation.
* Certain diff options are currently ignored when combined-diff is
shown; mark them as incompatible with the feature.
* "git clone" from a repository with some ref whose HEAD is unborn
did not set the HEAD in the resulting repository correctly, which
has been corrected.
* mkstemp() emulation on Windows has been improved.
* Add missing documentation for "include" and "includeIf" features in
"git config" file format, which incidentally teaches the command
line completion to include them in its offerings.
* Avoid "white/black-list" in documentation and code comments.
* Workaround for a compiler warning against use of die() in
osx-keychain (in contrib/).
* Workaround for a false positive compiler warning.
* The resolve-undo information in the index was not protected against
GC, which has been corrected.
* A corner case bug where lazily fetching objects from a promisor
remote resulted in infinite recursion has been corrected.
* "git p4" working on UTF-16 files on Windows did not implement
CRLF-to-LF conversion correctly, which has been corrected.
* "git p4" did not handle non-ASCII client name well, which has been
corrected.
* "rerere-train" script (in contrib/) used to honor commit.gpgSign
while recreating the throw-away merges.
* "git checkout" miscounted the paths it updated, which has been
corrected.
* Fix for a bug that makes write-tree to fail to write out a
non-existent index as a tree, introduced in 2.37.
* There was a bug in the codepath to upgrade generation information
in commit-graph from v1 to v2 format, which has been corrected.
Also contains minor documentation updates and code clean-ups.
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 90d43e54c21bf7f0c201979f50a25a2660ed62a3
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Sat Nov 26 14:41:25 2022 +0100
fmt: Update to version 9.1.0
- Update from version 9.0.0 to 9.1.0
- Update of rootfile
- Changelog
9.1.0 - 2022-08-27
* ``fmt::formatted_size`` now works at compile time
`#3026 <https://github.com/fmtlib/fmt/pull/3026>`_
For example (`godbolt <https://godbolt.org/z/1MW5rMdf8>`__):
.. code:: c++
#include <fmt/compile.h>
int main() {
using namespace fmt::literals;
constexpr size_t n = fmt::formatted_size("{}"_cf, 42);
fmt::print("{}\n", n); // prints 2
}
* Fixed handling of invalid UTF-8
`#3038 <https://github.com/fmtlib/fmt/pull/3038>`_,
`#3044 <https://github.com/fmtlib/fmt/pull/3044>`_,
`#3056 <https://github.com/fmtlib/fmt/pull/3056>`_
* Improved Unicode support in ``ostream`` overloads of ``print``
`#2994 <https://github.com/fmtlib/fmt/pull/2994>`_,
`#3001 <https://github.com/fmtlib/fmt/pull/3001>`_,
`#3025 <https://github.com/fmtlib/fmt/pull/3025>`_
* Fixed handling of the sign specifier in localized formatting on systems with
32-bit ``wchar_t``
`#3041 <https://github.com/fmtlib/fmt/issues/3041>`_).
* Added support for wide streams to ``fmt::streamed``
`#2994 <https://github.com/fmtlib/fmt/pull/2994>`_
* Added the ``n`` specifier that disables the output of delimiters when
formatting ranges
`#2981 <https://github.com/fmtlib/fmt/pull/2981>`_,
`#2983 <https://github.com/fmtlib/fmt/pull/2983>`_
For example (`godbolt <https://godbolt.org/z/roKqGdj8c>`__):
.. code:: c++
#include <fmt/ranges.h>
#include <vector>
int main() {
auto v = std::vector{1, 2, 3};
fmt::print("{:n}\n", v); // prints 1, 2, 3
}
* Worked around problematic ``std::string_view`` constructors introduced in C++23
`#3030 <https://github.com/fmtlib/fmt/issues/3030>`_,
`#3050 <https://github.com/fmtlib/fmt/issues/3050>`_
* Improve handling (exclusion) of recursive ranges
`#2968 <https://github.com/fmtlib/fmt/issues/2968>`_,
`#2974 <https://github.com/fmtlib/fmt/pull/2974>`_
* Improved error reporting in format string compilation
`#3055 <https://github.com/fmtlib/fmt/issues/3055>`_
* Improved the implementation of
`Dragonbox <https://github.com/jk-jeon/dragonbox>`_, the algorithm used for
the default floating-point formatting
`#2984 <https://github.com/fmtlib/fmt/pull/2984>`_
* Fixed issues with floating-point formatting on exotic platforms.
* Improved the implementation of chrono formatting
`#3010 <https://github.com/fmtlib/fmt/pull/3010>`_
* Improved documentation
`#2966 <https://github.com/fmtlib/fmt/pull/2966>`_,
`#3009 <https://github.com/fmtlib/fmt/pull/3009>`_,
`#3020 <https://github.com/fmtlib/fmt/issues/3020>`_,
`#3037 <https://github.com/fmtlib/fmt/pull/3037>`_
* Improved build configuration
`#2991 <https://github.com/fmtlib/fmt/pull/2991>`_,
`#2995 <https://github.com/fmtlib/fmt/pull/2995>`_,
`#3004 <https://github.com/fmtlib/fmt/issues/3004>`_,
`#3007 <https://github.com/fmtlib/fmt/pull/3007>`_,
`#3040 <https://github.com/fmtlib/fmt/pull/3040>`_
* Fixed various warnings and compilation issues
`#2969 <https://github.com/fmtlib/fmt/issues/2969>`_,
`#2971 <https://github.com/fmtlib/fmt/pull/2971>`_,
`#2975 <https://github.com/fmtlib/fmt/issues/2975>`_,
`#2982 <https://github.com/fmtlib/fmt/pull/2982>`_,
`#2985 <https://github.com/fmtlib/fmt/pull/2985>`_,
`#2988 <https://github.com/fmtlib/fmt/issues/2988>`_,
`#3000 <https://github.com/fmtlib/fmt/issues/3000>`_,
`#3006 <https://github.com/fmtlib/fmt/issues/3006>`_,
`#3014 <https://github.com/fmtlib/fmt/issues/3014>`_,
`#3015 <https://github.com/fmtlib/fmt/issues/3015>`_,
`#3021 <https://github.com/fmtlib/fmt/pull/3021>`_,
`#3023 <https://github.com/fmtlib/fmt/issues/3023>`_,
`#3024 <https://github.com/fmtlib/fmt/pull/3024>`_,
`#3029 <https://github.com/fmtlib/fmt/pull/3029>`_,
`#3043 <https://github.com/fmtlib/fmt/pull/3043>`_,
`#3052 <https://github.com/fmtlib/fmt/issues/3052>`_,
`#3053 <https://github.com/fmtlib/fmt/pull/3053>`_,
`#3054 <https://github.com/fmtlib/fmt/pull/3054>`_
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 670b07b39f4a951da093e6b737629a1c329f6d43
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Fri Nov 25 18:38:12 2022 +0100
mpd: Update to version 0.23.10
- Update from version 0.23.8 to 0.23.10
- Update required to allow successful build with updated ffmpeg
- Update of rootfile not required
- Changelog
ver 0.23.10 (2022/10/14)
* storage
- curl: fix file time stamps
* decoder
- ffmpeg: fix libfmt 9 compiler warning
* encoder
- flac: fix failure when libFLAC is built without Ogg support
* output
- alsa: fix crash bug
* Windows
- log to stdout by default, don't require "log_file" setting
ver 0.23.9 (2022/08/18)
* input
- cdio_paranoia: add options "mode" and "skip"
* decoder
- ffmpeg: support FFmpeg 5.1
* filter
- replay gain: fix delayed volume display with handler=mixer
* output
- pipewire: set app icon
* fix bogus volume levels with multiple partitions
* improve iconv detection
* macOS: fix macOS 10 build problem (0.23.8 regression)
* Android
- load mpd.conf from app data directory
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 4745cff3df93f3c2ca06d91287b8e82d5091008e
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Fri Nov 25 18:38:11 2022 +0100
ffmpeg: Update to version 5.1.2
- Update from version 4.4 to 5.1.2
- Update of rootfile
- avresample has been removed from ffmpeg and so ./configure option had to be removed
- many libraries had an so bump so checked with find-dependencies - nothing flagged
- Changelog
version 5.1.2:
- avcodec/dstdec: Check for overflow in build_filter()
- avformat/spdifdec: Use 64bit to compute bit rate
- avformat/rpl: Use 64bit for duration computation
- avformat/xwma: Use av_rescale() for duration computation
- avformat/sdsdec: Use av_rescale() to avoid intermediate overflow in duration calculation
- avformat/sbgdec: Check ts_int in genrate_intervals
- avformat/sbgdec: clamp end_ts
- avformat/rmdec: check tag_size
- avformat/nutdec: Check fields
- avformat/flvdec: Use 64bit for sum_flv_tag_size
- avformat/jacosubdec: Fix overflow in get_shift()
- avformat/genh: Check nb_channels for IMA ADPCM
- avformat/dxa: avoid bpc overflows
- avformat/dhav: Use 64bit seek_back
- avformat/cafdec: Check that nb_frasmes fits within 64bit
- avformat/asfdec_o: Limit packet offset
- avformat/apm: Use 64bit for bit_rate computation
- avformat/ape: Check frames size
- avformat/icodec: Check nb_pal
- avformat/aiffdec: Use 64bit for block_duration use
- avformat/aiffdec: Check block_duration
- avformat/mxfdec: only probe max run in
- avformat/mxfdec: Check run_in is within 65536
- avcodec/mjpegdec: Check for unsupported bayer case
- avcodec/apedec: Fix integer overflow in filter_3800()
- avcodec/tta: Check 24bit scaling for overflow
- avcodec/mobiclip: Check quantizer for overflow
- avcodec/exr: Check preview psize
- avcodec/tiff: Fix loop detection
- libavformat/hls: Free keys
- avcodec/fmvc: Move frame allocation to a later stage
- avfilter/vf_showinfo: remove backspaces
- avcodec/speedhq: Check width
- avcodec/bink: disallow odd positioned scaled blocks
- avformat/cafenc: derive Opus frame size from the relevant stream parameters
- avformat/dashdec: Fix crash on invalid input/ENOMEM, fix leak
- lavc/videotoolbox: do not pass AVCodecContext to decoder output callback
- lavc/pthread_frame: always transfer stashed hwaccel state
- avcodec/arm/sbcenc: avoid callee preserved vfp registers
- avformat/riffdec: don't unconditionally overwrite WAVEFORMATEXTENSIBLE layout
- avfilter/vf_scale: overwrite the width and height expressions with the original values
- lavc/pthread_frame: avoid leaving stale hwaccel state in worker threads
- avutil/tests/.gitignore: Add channel_layout testtool
version 5.1.1:
- avformat/asfdec_o: limit recursion depth in asf_read_unknown()
- avformat/mov: Check count sums in build_open_gop_key_points()
- doc/git-howto.texi: Document commit signing
- libavcodec/8bps: Check that line lengths fit within the buffer
- avcodec/midivid: Perform lzss_uncompress() before ff_reget_buffer()
- libavformat/iff: Check for overflow in body_end calculation
- avformat/avidec: Prevent entity expansion attacks
- avcodec/h263dec: Sanity check against minimal I/P frame size
- avcodec/hevcdec: Check s->ref in the md5 path similar to hwaccel
- avcodec/mpegaudiodec_template: use unsigned shift in handle_crc()
- avformat/subviewerdec: Make read_ts() more flexible
- avcodec/mjpegdec: bayer and rct are incompatible
- MAINTAINERS: Add ED25519 key for signing my commits in the future
- avcodec/pngdec: Fix APNG_DISPOSE_OP_BACKGROUND
- avcodec/libvpx: fix assembling vp9 packets with alpha channel
- fftools/ffmpeg_opt: try to propagate the requested output channel layout
- avcodec/libsvtav1: properly initialize the flush EbBufferHeaderType struct
- configure: enable the av1_frame_split bsf for the av1 decoder
- swresample/swresample: fill the correct buffer to print the output layout string
- ffprobe: restore reporting error code for failed inputs
- ipfsgateway: Remove default gateway
- avcodec/libspeexdec: Fix use of uninitialized value
- avformat/avisynth: use ch_layout.nb_channels for channel count
- fate/lavf-image: Disable file checksums for exr tests
- tests/fate-run: Allow to skip file checksums for lavf_image
- fate/imf: Rename IMF fate-target
- avcodec/alac: don't fail if channels aren't set during init() when extradata is valid
- configure: properly require libx264 if enabled
version 5.1:
- add ipfs/ipns protocol support
- dialogue enhance audio filter
- dropped obsolete XvMC hwaccel
- pcm-bluray encoder
- DFPWM audio encoder/decoder and raw muxer/demuxer
- SITI filter
- Vizrt Binary Image encoder/decoder
- avsynctest source filter
- feedback video filter
- pixelize video filter
- colormap video filter
- colorchart video source filter
- multiply video filter
- PGS subtitle frame merge bitstream filter
- blurdetect filter
- tiltshelf audio filter
- QOI image format support
- ffprobe -o option
- virtualbass audio filter
- VDPAU AV1 hwaccel
- PHM image format support
- remap_opencl filter
- added chromakey_cuda filter
version 5.0:
- ADPCM IMA Westwood encoder
- Westwood AUD muxer
- ADPCM IMA Acorn Replay decoder
- Argonaut Games CVG demuxer
- Argonaut Games CVG muxer
- Concatf protocol
- afwtdn audio filter
- audio and video segment filters
- Apple Graphics (SMC) encoder
- hsvkey and hsvhold video filters
- adecorrelate audio filter
- atilt audio filter
- grayworld video filter
- AV1 Low overhead bitstream format muxer
- swscale slice threading
- MSN Siren decoder
- scharr video filter
- apsyclip audio filter
- morpho video filter
- amr parser
- (a)latency filters
- GEM Raster image decoder
- asdr audio filter
- speex decoder
- limitdiff video filter
- xcorrelate video filter
- varblur video filter
- huesaturation video filter
- colorspectrum source video filter
- RTP packetizer for uncompressed video (RFC 4175)
- bitpacked encoder
- VideoToolbox VP9 hwaccel
- VideoToolbox ProRes hwaccel
- support loongarch.
- aspectralstats audio filter
- adynamicsmooth audio filter
- libplacebo filter
- vflip_vulkan, hflip_vulkan and flip_vulkan filters
- adynamicequalizer audio filter
- yadif_videotoolbox filter
- VideoToolbox ProRes encoder
- anlmf audio filter
- IMF demuxer (experimental)
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit fd4f8278c4a67cdf5b76bf1bb458682edbbb9301
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Fri Nov 25 18:37:53 2022 +0100
fetchmail: Update to version 6.4.34
- Update from version 6.4.32 to 6.4.34
- Update of rootfile not required.
- Changelog
Fetchmail Release Notes
# ADVANCE WARNING OF FEATURES TO BE REMOVED OR CHANGED IN FUTURE VERSIONS
(There are no plans to remove features from a 6.4.X release, but they may be
removed from a 6.5.0 or newer release.)
* Future fetchmail releases may require compilers and operating systems
that adhere to standards issued 2011 or later.
(Currently, C89 and Single Unix Specification V2 should suffice.)
* Future fetchmail releases may tighten up security and lean towards
it a bit more by, for instance, implementing recommendations from
RFC-7817 or RFC-8314. This may, for instance, require that TLS v1.1
or newer be used.
* The MX and host alias DNS lookups that fetchmail performs in multidrop mode
are based on assumptions that are rarely met in practice, somewhat defective,
deprecated and may be removed from a future fetchmail version.
They have never supported IPv6 (including IPv6-mapped IPv4).
Non-DNS based alias keywords such as "aka" will remain in fetchmail.
* The monitor and interface options may be removed from a future fetchmail
version as they are not reasonably portable across operating systems.
* POP2 is obsolete, support will be removed from a future fetchmail version.
* IMAP2 and IMAP4 (not IMAP4r1) are obsolete, support may be removed from a
future fetchmail version.
* RPOP is obsolete, support will be removed from a future fetchmail release.
* The multidrop To/Cc guessing code along with the fragile duplicate suppressor
is deprecated and may be removed from a future release.
* The "envelope Received" option may be removed from a future release, because
the Received header was never meant to be machine-readable, the format varies
widely, and various other differences in behavior make parsing Received an
unreliable undertaking. The envelope option as such will remain though, in
order to support Delivered-To, X-Envelope-To, X-Original-To and similar.
See also <http://home.pages.de/~mandree/mail/multidrop>.
* The --enable-fallback (fall back to MDA if MTA unavailable) will be removed
from a future fetchmail release, because it makes fetchmail's behavior
inconsistent and confusing.
* The "protocol auto" default inside fetchmail may be removed from a future
fetchmail release. Explicit configuration of the protocol is recommended.
* Kerberos IV support may be removed from a future fetchmail release.
* Kerberos 5 support may be removed from a future fetchmail release.
* The --principal option may be removed from a future fetchmail release.
* SIGHUP wakeup support may be removed from a future fetchmail release and
cause fetchmail to terminate - it was broken for many years.
* Support for operating systems that are not sufficiently POSIX compliant may be
removed or operation on such systems may be suboptimal for future releases.
This means that fetchmail may only continue to work on C99 and POSIX 2001
based systems.
* The maintainer may migrate fetchmail to C++ with STL or C#, and impose further
requirements (dependencies), such as Boost or other class libraries.
* The softbounce option default will change to "false" in the next release.
* The --bsmtp - mode of operation may be removed in a future release.
* SSLv3 support may be removed from a future fetchmail release. It has been
obsolete for many years and found insecure. Use TLS.
* Fetchmailconf is deprecated and will be removed from a future release.
* Fetchmail does not guarantee compatibility with EOL OpenSSL versions. Support
for end-of-life OpenSSL versions may be removed even from patchlevel releases.
* Nonstandard authentication schemes (such as RPA) may be removed from future
fetchmail versions.
* Nonstandard protocol extensions (such as SDPS/*ENV) may be removed from future
fetchmail versions.
* Future fetchmail releases (even minor ones) may change undocumented parts of
the .netrc parser in incompatible ways to enhance compatibility with typical
ftp(1) .netrc parsers.
* Apparently OPIE is dying. I only have this support on FreeBSD, and
FreeBSD 14 (slated for release in 2023) is about to remove it.
# KNOWN BUGS AND WORKAROUNDS
* Fetchmail does not handle messages without Message-ID header well
(See sourceforge.net bug #780933)
* Fetchmail currently uses 31-bit signed integers in several places
where unsigned and/or wider types should have been used, for instance,
for mailbox sizes, and misreports sizes of 2 GibiB and beyond.
Fixing this requires C89 compatibility to be relinquished.
* BSMTP is mostly untested and errors can cause corrupt output.
* Fetchmail does not track pending deletes across crashes.
* The command line interface is sometimes a bit stubborn, for instance,
fetchmail -s doesn't work with a daemon running.
* Linux systems may return duplicates of an IP address in some circumstances if
no or no global IPv6 addresses are configured.
(No workaround. Ubuntu Bug#582585, Novell Bug#606980.)
* Kerberos 5 may be broken, particularly on Heimdal, and provide bogus error
messages. This will not be fixed, because the maintainer has no Kerberos 5
server to test against. Use GSSAPI.
* For IMAP connections, fetchmail will print "will idle after poll" in
verbose mode even though --idle is not given, as an artifact of the 6.4.22
security fixes. Fetchmail means "could idle after poll", but this would
have required another loop through the translators.
* aka ... hostnames are not considered for upstream server X.509 certificate
verification, aka was meant for alias detection with multidrop mailboxes.
* When compiled against wolfSSL, some diagnostics and messages of fetchmail are
hardcoded to read "OpenSSL"; this was found only after the call for
translations had been sent out already.
* FreeBSD's OPIE implementation cannot be found when using a C++ compiler.
This should not affect the normal build, which uses a C compiler.
fetchmail-6.4.34 (released 2022-10-15, 31701 LoC):
# CRITICAL BUG FIXES:
* When an SMTP receiver refuses delivery, a message would be deleted from
the mail store in spite of a softbounce option that is enabled.
Bug report, analysis and patch by Horváth Zsolt. Gitlab, fixes #50.
# BUILD NOTE:
* If you are reusing config.cache from prior builds, this may cause
issues with finding Python or some libraries. In case of trouble,
remove config.cache and retry.
# TRANSLATIONS: language translations were updated by this fine person:
* sr: Мирослав Николић (Miroslav Nikolić) [Serbian]
fetchmail-6.4.33 (released 2022-08-27, 31696 LoC):
# TRANSLATIONS: language translations were updated by this fine person:
* fr: Frédéric Marchal [French]
# CONTRIBUTED SCRIPT CHANGES:
* contrib/fetchsetup improvements by Matěj Cepl
* contrib/runfetchmail improvements by Matěj Cepl
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit c0fc77b0a7caafcb7aa2072155ec235aa79bc446
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Mon Nov 28 13:06:14 2022 +0100
Core Update 172: Ship ethtools
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 504a2df6668a6c4c05849a7c05e8e90f5c11e954
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Fri Nov 25 18:37:41 2022 +0100
ethtool: Update to version 6.0
- Update from version 5.16 to 6.0
- Update of rootfile not required
- Changelog
Version 6.0 - October 10, 2022
* Fix: advertisement modes autoselection by lanes (-s)
Version 5.19 - August 22, 2022
* Feature: get/set tx push (-g and -G)
* Feature: register dump support for TI CPSW (-d)
* Feature: register dump support for lan743x chipset (-d)
* Fix: fix missing sff-8472 output in netlink path (-m)
* Fix: fix EEPROM byte write (-E)
Version 5.18 - June 14, 2022
* Feature: get/set cqe size (-g and -G)
* Fix: fix typo in man page
* Fix: fix help text alignment
* Fix: improve attribute label (--show-fec)
Version 5.17 - April 4, 2022
* Feature: transceiver module power mode (--set-module)
* Feature: transceiver module extended state (--show-module)
* Feature: get/set rx buffer length (-g and -G)
* Feature: tx copybreak buffer size (--get-tunable and --set-tunable)
* Feature: JSON output for features (-k)
* Feature: support OSFP transceiver modules (-m)
* Fix: add missing free() calls (--get-tunable and --set-tunable)
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 55b4bb70ec7e12339d1b37d3a89c7515f4aeef52
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Mon Nov 28 13:05:31 2022 +0100
Core Update 172: Ship elinks
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit bcef2fe0f613bb4e3201f11c2403a54d99a4aed8
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Fri Nov 25 18:37:30 2022 +0100
elinks: Update to version 0.15.1
- Update from version 0.12pre6 (2012) to 0.15.1 (July 2022)
- Update of rootfile
- Original elinks was last updated in 2012. In Jan 2020 a fork was made of the package
and has been maintained since then on an ongoing basis. This new fork is used by Arch
Linux
- elinks has not been an addon since CU141 but the lfs file was still in the addon format
This has been adjusted to make it in line with a core program
- The previous patches related to ssl have been removed as the fixes are now part of the
source tarball.
- Changelog
ELinks 0.15.1 Released on 2022-07-31
* about:config
* option --always-load-config #137
* compilation fixes on Windows #140
* added ui.background_char #142
* sample build scripts and docker files
* experimental DGI support
* DOS port based on links code
* configurable Accept-Header #143
* minor compilation fixes
ELinks 0.15.0 Released on 2021-12-24
* Serbian translation update
ELinks 0.15.0rc2 Released on 2021-12-19
* Serbian translation update
* HOME_ETC
ELinks 0.15.0rc1 Released on 2021-12-04
* removed -Wno-pointer-sign from CFLAGS
* close stdin before calling a background program (sgerwk)
and options related to it #108, #109, #110, #113
* gemini protocol and text/gemini mime type
* changed rendering of blockquote element
* avoid tmpfile in lua (sgerwk) #115, #118
* console.log in js (mtatton) #93
* localstorage (mtatton) #98
* options document.browse.search.beginning_only
document.browse.search.ignore_history
ui.double_esc
* ui.temperature.* to show temperature of CPU
* document.plain.fixup_tables
* enhanced ecmascript code. Added QuickJS
* Notes on ECMAScript:
requires C++ compiler, sqlite3, libxml++5 >= 5.0.1.GIT
and either mozjs78-dev or QuickJS-2021-03-27
Most sites don't work, some crash. Some workarounds were implemented:
a) ECMAScript is disabled by default
b) ~/.elinks/allow.txt and ~/.elinks/disallow.txt with url prefixes
c) Added toggle-ecmascript action. You can bind it to some key
* other small fixes
ELinks 0.14.3 Released on 2021-09-26
* Fix issue with negative value of cells #126
ELinks 0.14.2 Released on 2021-08-29
* crash in nttp #114
* XSS in gopher #125
ELinks 0.14.1 Released on 2021-05-30
* Disable spidermonkey by default #85
* Show error message about libgcrypt-config. #86
* off by two. #88
* Check NULL. #99
* fix error message when no previous search was performed #100
* alert when moving to the next match of a failed search #101
* include unistd.h and errno.h to define safe_read() #107
ELinks 0.14.0 Released on 2020-12-27
No changes since 0.14.0rc2.
ELinks 0.14.0rc2 Released on 2020-12-13
* ~/.elinks/allow.txt - list of allowed url prefixes for js
ELinks 0.14.0rc1 Released on 2020-12-06
* dblatex for pdf. PR #64
* fixes CTRL-Z. #65
* changes in mime handlers. PR #66
* fixes in data protocol. #67, #68, #71, #72, #73
* allow to wrap text in PRE. #69
* pass #fragment to external command. #75
* introduced "document.browse.search.reset". #76
* added meson as alternative build system
* in #77 I'm going to attach static binaries for released versions
* mozjs dependency updated to 52.*
Note that, to compile with javascript support you must compile by g++ with -fpermissive option.
There is a lot of warnings. Unfortunately JS often crashes. Without help from someone familiar
with SpiderMonkey, we won't go far.
As you might notice, I renamed repo to elinks.
Thanks to all involved in this release.
ELinks 0.13.5 Released on 2020-08-30
* added clipboard selection using keyboard. #59
* fixed drawing menus over emoji characters. #60
* encoding to utf-8 and decoding back in python's pre_format_html_hook
This is likely the last release of 0.13.x series.
ELinks 0.13.4: Released on 2020-07-31.
* fixed segfault with gnutls. introduced in 0.13.3
* updated smart and dumb prefixes to https. Thanks Guido Cella. PR #54
* added the st terminal to config options. PR #55
* doc updates PR #57
* also pass the uri as %u to external handler. Thanks sgerwk. PR #58
* added the ui.clipboard_file config option
ELinks 0.13.3: Released on 2020-06-29.
* configure option --with-luapkg=name
You can choose lua version at compilation time. For example: --with-luapkg=luajit
* config option connection.ssl.https_by_default (Thanks Guido Cella)
not enabled by default
* docs updates (Guido Cella)
* fixes related to ui.mouse_disable and xterm-like terminals (Thanks sgerwk)
* show an alert when the search string is not found (sgerwk)
ELinks 0.13.2: Released on 2020-05-31.
* command line option -remote search(...) (thanks sgerwk)
* command line option -bind-address
* config option ui.mouse_disable (sgerwk)
* config option ui.tostop
* config option ui.sessions.fork_on_start
* compatibility (compilability) with lua-5.2 and 5.3
* modified cookies code (not well tested)
ELinks 0.13.1: Released on 2020-01-31.
* Fixed issue with uploading files to local cgi.
* Python scripts in contrib converted to python3.
ELinks 0.13.0: Released on 2019-12-27.
Incompatibilities:
* The protocol.fsp.sort option has been removed. ELinks always sorts.
* bug 1024: Verify the host name or IP address in the server certificate
if connection.ssl.cert_verify is not 0.
Miscellaneous:
* The configure script is no longer part of tarball, you must generate it.
For example running ./autogen.sh
* major bug 181: Slave ELinks processes can now run an external editor.
This used to work in the master process only.
* major bug 722: Filter CSS according to media types. New option
document.css.media.
* bug 638: Propagate the existence of $DISPLAY from slave terminals to
mailcap test commands.
* bugs 762, 1082: Small memory leak in goto_current_link/goto_imgmap
* bug 963: New option document.css.ignore_display_none.
* bug 977: Fixed crash when opening in new tab a non link with onclick
attribute.
* bug 1008: File upload fields in HTML forms now stream the files to
the server, instead of reading them to memory in advance. This lets
you upload larger files. The downsides are that ELinks may use a
cached response even if you have modified a file between requests,
and that ELinks can send inconsistent data if you modify a file
while it is being uploaded.
* bug 1054: Don't abort downloads when closing the terminal from which
they were started. When such a download ends, display the message
in the most recently used terminal. If the user chooses
``Background and Notify'' via the download manager in some terminal,
reassociate the download with that terminal. These changes do not
apply to downloads to external handlers.
* Really retry forever when connection.retries = 0.
* enhancement: Session-specific options. Any options changed with
toggle-* actions no longer affect other tabs or other terminals.
* Do not crash when document.browse.minimum_refresh_time = 0 and
a document has a meta refresh with a delay of 0.
* Properly update link highlighting and status bar information when the
repeat prefix is changed.
* Handle SSL rehandshakes
* Fix compatibility with Ruby >= 1.9
* enhancement 15: Domain-specific options. Use set_domain in
elinks.conf to e.g. disable cookies for google.com. The option
manager window does not yet support this.
* enhancement 867: Use bracketed paste mode on xterm. This requires
xterm patch #228 or later configured with --enable-readline-mouse.
* enhancement 824: Experimental support for combining characters.
See features.conf for details.
* enhancement: Add a new entry Link Info under Link main menu.
* enhancement: Indicate backgrounded downloads using an unused led.
* enhancement: Display the number of ECMAScript interpreters that have
been allocated for documents in the Resources dialog.
* Fedora enhancement 346861: Add support for nss_compat_ossl library
(OpenSSL replacement).
* enhancement: ``elinks --dump'' uses box-drawing characters if supported
by the charset.
* enhancement 1070: Support 256 colors on fbterm-1.4.
* enhancement 1075: Scrolling the entire contents of dialog boxes.
Especially useful for multi-file BitTorrent downloads.
* Report if the Lua function edit_bookmark_dialog receives the wrong
number or types of arguments instead of silently failing.
* enhancement: Add ``Invalidate'' button to the cache manager.
* enhancement: Add ``Search contents'' button to the cache manager with
which one can search through the cache items' data rather than their
metadata.
* enhancement: Add rudimentary support for the HTML5 media elements,
<video> and <audio>.
* enhancement: Add move-half-page-up and move-half-page-down actions.
* enhancement: Add option to change overlap for vertical scrolling.
* enhancement: HTML meta refresh allows semicolons in URLs, and the
syntax is more like in Firefox.
* link against lua51 not lua50
* SpiderMonkey must be mozjs-17.0. This version is latest with C API.
Find it with pkg-config.
* using iconv for some multibyte charsets. It works if the terminal codepage
is UTF-8. More charsets will be added on demand.
* enhancement: support SSL client certificate
* python scripting is Python3 only
* brotli and zstd encodings
* possibility to make use of libevent instead of select for event loop
* terminfo queries for output (not input) as compilation option
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit c5c0decb15b4b105599a63cf7697f068c11650a6
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Fri Nov 25 18:37:17 2022 +0100
ddrescue: Update to version 1.26
- Update from version 1.25 to 1.26
- Update of rootfile not required
- Changelog
Changes in version 1.26:
While writing the mapfile, ddrescue now checks the return value of each call
to 'fprintf' to catch any temporary failure of 'fprintf' not reported by the
system when closing the file. (Hole in mapfile reported by Radomír Tomis).
Domain mapfiles may now contain unordered and overlapping blocks when
'-L, --loose-domain' is specified as long as no block overlaps with other
block of different status. (Suggested by Gábor Katona and Shaya Potter).
Ddrescue now shows the file name in all the diagnostics with a file involved.
(Reported by Radomír Tomis).
Ddrescue now exits with status 1 on fatal read errors.
(Suggested by Marco Marques).
Empty phases are now completely skipped.
Ddrescue now scrolls forward after each pass. This keeps on the screen the
final status of the previous pass, making it easier to estimate the amount
of work done by the current pass. (Based on a suggestion by David Morrison).
In case of error in a numerical argument to a command line option, ddrescue
now shows the name of the option and the range of valid values.
The option synonyms '--*-logfile' and '--pause' have been removed and are no
longer recognized.
Ddrescuelog now can convert between mapfiles and bitmaps of blocks (big and
little endian). The new option '-F, --format' has been added to ddrescuelog.
It selects the input format for '--create-mapfile', or the output format for
'--list-blocks'. (Bitmap format proposed by Florian Sedivy).
Option '-d, --delete-if-done' of ddrescuelog no longer returns an error if
the mapfile is read from standard input. Instead it behaves like
'-D, --done-status' because there is nothing to delete.
'ddrescuelog --show-status' now rounds percentages up to get the sum closer
to 100%.
Three missing '#include <algorithm>' have been added.
(Reported by Richard Burkert).
The description of the algorithm in the manual has been improved.
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit c0fb95848727afa8087ec753bf21d5292cd8a657
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Fri Nov 25 18:37:00 2022 +0100
cups-filters: Update to version 1.28.16
- Update from version 1.28.14 to 1.;28 16
- Update of rootfile not required
- Changelog
CHANGES IN V1.28.16
- imagetoraster, imagetopdf, libcupsfilters: Added support for
reading the resolution of an image from its EXIF data when
loading it. This way we get the image reproduced in its
original size with "print-scaling=none" (Issue #362).
- libcupsfilters: Replaced deprecated data types uint16 and
uint32. The function to read TIFF image files via libtiff in
cupsfilters/image-tiff.c uses the deprecated types uint16
and uint32. The replacements for these types are uint16_t
and uint32_t.
CHANGES IN V1.28.15
- pdftops: In pdftops identify old LaserJets more precisely
for working around PostScript interpreter bugs, older
printers need Poppler, newer models need Ghostscript
(Ubuntu bug #1967816).
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 3a42eaa9b727c9fa85d45fdf03606efe4b6d70a2
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Fri Nov 25 11:59:44 2022 +0000
Core Update 172: Ship sudo
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 24109ebef7e4497959083c58e71f338956d19f26
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Fri Nov 25 09:55:31 2022 +0100
sudo: Update to version 1.9.12p1
- Update from version 1.9.11p3 to 1.9.12p1
- Update of rootfile
- Changelog
What's new in Sudo 1.9.12p1
* Sudo's configure script now does a better job of detecting when
the -fstack-clash-protection compiler option does not work.
GitHub issue #191.
* Fixed CVE-2022-43995, a potential out-of-bounds write for passwords
smaller than 8 characters when passwd authentication is enabled.
This does not affect configurations that use other authentication
methods such as PAM, AIX authentication or BSD authentication.
* Fixed a build error with some configurations compiling host_port.c.
What's new in Sudo 1.9.12
* Fixed a bug in the ptrace-based intercept mode where the current
working directory could include garbage at the end.
* Fixed a compilation error on systems that lack the stdint.h
header. Bug #1035
* Fixed a bug when logging the command's exit status in intercept
mode. The wrong command could be logged with the exit status.
* For ptrace-based intercept mode, sudo will now attempt to
verify that the command path name, arguments and environment
have not changed from the time when they were authorized by the
security policy. The new "intercept_verify" sudoers setting can
be used to control this behavior.
* Fixed running commands with a relative path (e.g. ./foo) in
intercept mode. Previously, this would fail if sudo's current
working directory was different from that of the command.
* Sudo now supports passing the execve(2) system call the NULL
pointer for the `argv` and/or `envp` arguments when in intercept
mode. Linux treats a NULL pointer like an empty array.
* The sudoers LDAP schema now allows sudoUser, sudoRunasUser and
sudoRunasGroup to include UTF-8 characters, not just 7-bit ASCII.
* Fixed a problem with "sudo -i" on SELinux when the target user's
home directory is not searchable by sudo. GitHub issue #160.
* Neovim has been added to the list of visudo editors that support
passing the line number on the command line.
* Fixed a bug in sudo's SHA384 and SHA512 message digest padding.
* Added a new "-N" (--no-update) command line option to sudo which
can be used to prevent sudo from updating the user's cached
credentials. It is now possible to determine whether or not a
user's cached credentials are currently valid by running:
$ sudo -Nnv
and checking the exit value. One use case for this is to indicate
in a shell prompt that sudo is "active" for the user.
* PAM approval modules are no longer invoked when running sub-commands
in intercept mode unless the "intercept_authenticate" option is set.
There is a substantial performance penalty for calling into PAM
for each command run. PAM approval modules are still called for
the initial command.
* Intercept mode on Linux now uses process_vm_readv(2) and
process_vm_writev(2) if available.
* The XDG_CURRENT_DESKTOP environment variable is now preserved
by default. This makes it possible for graphical applications
to choose the correct theme when run via sudo.
* On 64-bit systems, if sudo fails to load a sudoers group plugin,
it will use system-specific heuristics to try to locate a 64-bit
version of the plugin.
* The cvtsudoers manual now documents the JSON and CSV output
formats. GitHub issue #172.
* Fixed a bug where sub-commands were not being logged to a remote
log server when log_subcmds was enabled. GitHub issue #174.
* The new log_stdin, log_stdout, log_stderr, log_ttyin, and log_ttyout
sudoers settings can be used to support more fine-grained I/O logging.
The sudo front-end no longer allocates a pseudo-terminal when running
a command if the I/O logging plugin requests logging of stdin, stdout,
or stderr but not terminal input/output.
* Quieted a libgcrypt run-time initialization warning.
This fixes Debian bug #1019428 and Ubuntu bug #1397663.
* Fixed a bug in visudo that caused literal backslashes to be removed
from the EDITOR environment variable. GitHub issue #179.
* The sudo Python plugin now implements the "find_spec" method instead
of the the deprecated "find_module". This fixes a test failure when
a newer version of setuptools that doesn't include "find_module" is
found on the system.
* Fixed a bug introduced in sudo 1.9.9 where sudo_logsrvd created
the process ID file, usually /var/run/sudo/sudo_logsrvd.pid, as
a directory instead of a plain file. The same bug could result
in I/O log directories that end in six or more X's being created
literally in addition to the name being used as a template for
the mkdtemp(3) function.
* Fixed a long-standing bug where a sudoers rule with a command
line argument of "", which indicates the command may be run with
no arguments, would also match a literal "" on the command line.
GitHub issue #182.
* Added the -I option to visudo which only edits the main sudoers
file. Include files are not edited unless a syntax error is found.
* Fixed "sudo -l -U otheruser" output when the runas list is empty.
Previously, sudo would list the invoking user instead of the
list user. GitHub issue #183.
* Fixed the display of command tags and options in "sudo -l" output
when the RunAs user or group changes. A new line is started for
RunAs changes which means we need to display the command tags
and options again. GitHub issue #184.
* The sesh helper program now uses getopt_long(3) to parse the
command line options.
* The embedded copy of zlib has been updated to version 1.2.13.
* Fixed a bug that prevented event log data from being sent to the
log server when I/O logging was not enabled. This only affected
systems without PAM or configurations where the pam_session and
pam_setcred options were disabled in the sudoers file.
* Fixed a bug where "sudo -l" output included a carriage return
after the newline. This is only needed when displaying to a
terminal in raw mode. Bug #1042.
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 90c1a2758b760e19fa0ff478c6bbdd37467a8d48
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Fri Nov 25 09:55:00 2022 +0100
qemu-ga: Update to version 7.1.0
- Update in line with update of qemu from version 7.0.0 to 7.1.0
- Update of rootfile not required
- Changelog - see changelog info in the qemu update
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 39ff37072ead6719828c4ac5181e40c263149561
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Fri Nov 25 09:54:59 2022 +0100
qemu: Update to version 7.1.0
- Update from 7.0.0 to 7.1.0
- Update of rootfile not required
- Removal of qemu-7.0.0-fix-glibc-headers.patch as an alternative patch approach has been
implemeted into thye source tarball.
- Changelog is too large to include here. Details can be found at
https://wiki.qemu.org/ChangeLog/7.1
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit da0b8e4fb9bf2d0d2a3e9d5c70da8eb7805d2955
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Fri Nov 25 09:54:43 2022 +0100
nginx: Update to version 1.22.1
- Update from version 1.21.6 to 1.22.1
- Update of rootfile not required
- Changelog
Changes with nginx 1.22.1 19 Oct 2022
*) Security: processing of a specially crafted mp4 file by the
ngx_http_mp4_module might cause a worker process crash, worker
process memory disclosure, or might have potential other impact
(CVE-2022-41741, CVE-2022-41742).
Changes with nginx 1.22.0 24 May 2022
*) 1.22.x stable branch.
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 81c3f9e1b9977616259e928468d01a0d84f9e99d
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Fri Nov 25 09:54:24 2022 +0100
libvirt: Update to version 8.9.0
- Update from 7.10.0 to 8.9.0
- Update of rootfile
- Removal of sheepdog_storage option in ./configure as it has been removed from libvirt
- Removal of libvirt-7.10.0-fix-glibc-headers.patch as contents are now built in to source
tarball.
- Changelog is too large to include here. Details can be found in the NEWS.rst file in
the source tarball.
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 4e3a53528f7209162b5e46ff9de3c84e4b5a9a9e
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Fri Nov 25 11:58:03 2022 +0000
Core Update 172: Ship libpng
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 2bfcbac468277beeaebb2d7d976cdc9cedad2bc9
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Fri Nov 25 09:51:56 2022 +0100
libpng: Update to version 1.6.39
- Update from version 1.6.37 to 1.6.39
- Update of rootfile
- Changelog
Version 1.6.39 [November 20, 2022]
Changed the error handler of oversized chunks (i.e. larger than
PNG_USER_CHUNK_MALLOC_MAX) from png_chunk_error to png_benign_error.
Fixed a buffer overflow error in contrib/tools/pngfix.
Fixed a memory leak (CVE-2019-6129) in contrib/tools/pngcp.
Disabled the ARM Neon optimizations by default in the CMake file,
following the default behavior of the configure script.
Allowed configure.ac to work with the trunk version of autoconf.
Removed the support for "install" targets from the legacy makefiles;
removed the obsolete makefile.cegcc.
Cleaned up the code and updated the internal documentation.
Version 1.6.38 [September 14, 2022]
Added configurations and scripts for continuous integration.
Fixed various errors in the handling of tRNS, hIST and eXIf.
Implemented many stability improvements across all platforms.
Updated the internal documentation.
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 92cb2b5573d342d5836e4b7ef98f93a941063a25
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Fri Nov 25 11:57:10 2022 +0000
Core Update 172: Ship libedit
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 6bdf47513b819bb5b50a17cdc637a4722f06bac4
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Fri Nov 25 09:51:43 2022 +0100
libedit: Update to version 20221030-3.1
- Update from 20210910-3.1 to 20221030-3.1
- Update of rootfile
- Changelog
* version-info: 0:70:0
* src/sys.h, src/reallocarr.c: Remove unused sys/cdefs.h include, to compile against musl libc
* version-info: 0:69:0
* src/sys.h: Add __sun guard around sys/types.h in sys.h
* all: sync with upstream source
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 394437551f2ec8506a0c42987a5014a7e67ce804
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Fri Nov 25 11:56:11 2022 +0000
Core Update 172: Ship curl
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 8cb2214c3af990cfec03eb64d70930dbe6b003ca
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Fri Nov 25 09:51:25 2022 +0100
curl: Update to version 7.86.0
- Update from version 7.84.0 to 7.86.0
- Update of rootfile
- curl-7.84.0-easy_lock_h_include_sched_h_if_available_to_fix_build.patch removed as this
is now built into the source tarball version
- Changelog - is too large to inclkude here. The details can be found in the RELEASE_NOTES
file in the source tarballs.
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit f07ddd93938e4fb67ebed9217312dff4f522cc4c
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Fri Nov 25 11:55:16 2022 +0000
Core Update 172: Remove pcmcia files
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit bff0999f031af9e5ea1aaa15fcbc7750a27f54e3
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Wed Nov 23 21:07:38 2022 +0100
pcmciautils: Remove package from IPFire
- Current version is 014 which was released in 2008. The latest version is 018 which was
released in 2011.
- In 2010 pcmcia was acquired by the USB Implementers forum and all work has been focussed
on usb only with nothing on pcmcia.
- pcmcia is only still used as a legacy requirement on industrial computing systems for
machine control etc.
pcmcia was introduced originally for laptop use.
- All new laptops have no pcmcia slot. Searching on amazon for laptop with pcmcia gave
55 results none of which had any pcmcia capability.
- Based on the above the package pcmciautils is being removed from IPFire.
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit ef3feaf566082ae5b160ea1d8cc2c3f556a5f52f
Author: Jon Murphy <jon.murphy(a)ipfire.org>
Date: Wed Nov 23 12:50:48 2022 -0600
pcengines-apu-firmware: Update to version 4.17.0.2
- Update from 4.17.0.1 to 4.17.0.2
- Changelog
v4.17.0.2 - Release date: 2022-07-29
Rebased with official coreboot repository commit df721bd
See: https://github.com/pcengines/coreboot/compare/v4.17.0.1...v4.17.0.2
Signed-off-by: Jon Murphy <jon.murphy(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 7bdda6ae236f5aed480a9ee2167809829308838d
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Wed Nov 23 12:26:14 2022 +0000
Core Update 172: Ship nano
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 437e0a736834730154f2f67f64d23de0bb48eefd
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Mon Nov 21 16:45:07 2022 +0100
nano: Update to 7.0
For details see:
https://www.nano-editor.org/news.php
"2022 November 15 - GNU nano 7.0 "Una existencia simple bajo el sol"
String binds may contain bindable function names between braces.
For example, to move the current line down to after the next one:
bind ^D "{cut}{down}{paste}{up}" main. Of course, braced function
names may be mixed with literal text. If an existing string bind
contains a literal {, replace it with {{}.
Unicode codes can be entered (via M-V) without leading zeroes,
by finishing short codes with <Space> or <Enter>.
Word completion (^]) looks for candidates in all open buffers.
No regular expression matches the final empty line any more."
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 96adb7977219ddc8e7a28bbe7381cf604cbe7397
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Sat Nov 19 22:49:02 2022 +0100
swig: Update to version 4.1.0
- Update from version 4.0.2 to 4.1.0
- Update of rootfile
- Changelog
SWIG-4.1.0 summary:
- Add Javascript Node v12-v18 support, remove support prior to v6.
- Octave 6.0 to 6.4 support added.
- Add PHP 8 support.
- PHP wrapping is now done entirely via PHP's C API - no more .php wrapper.
- Perl 5.8.0 is now the oldest version SWIG supports.
- Python 3.3 is now the oldest Python 3 version SWIG supports.
- Python 3.9-3.11 support added.
- Various memory leak fixes in Python generated code.
- Scilab 5.5-6.1 support improved.
- Many improvements for each and every target language.
- Various preprocessor expression handling improvements.
- Improved C99, C++11, C++14, C++17 support. Start adding C++20 standard.
- Make SWIG much more move semantics friendly.
- Add C++ std::unique_ptr support.
- Few minor C++ template handling improvements.
- Various C++ using declaration fixes.
- Few fixes for handling Doxygen comments.
- GitHub Actions is now used instead of Travis CI for continuous integration.
- Add building SWIG using CMake as a secondary build system.
- Update optional SWIG build dependency for regex support from PCRE to PCRE2.
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit e47370a167869da39c5962ff9f9f032d7bd995ee
Author: Robin Roevens <robin.roevens(a)disroot.org>
Date: Tue Nov 8 21:09:11 2022 +0100
services.cgi: translate "Addon"
* Translate string "Addon" in services.cgi
* Added EN/NL translations
* Correct existing plural DE translation for singular "Add-on"
* Fix usage of the incorrect strings "addon(s)" to correct
hyphenated "add-on(s)" also in other translation strings for
EN/NL/DE
Signed-off-by: Robin Roevens <robin.roevens(a)disroot.org>
commit 819e5e087f02eb4d922d3246110be759fbea59f7
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Mon Nov 21 11:11:45 2022 +0000
Core Update 172: Ship u-boot and regenerate all initrds
The latter is also needed to apply new CPU microcodes on x86_64.
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit afa464fd4aebfab35badb0d4231b492dde1fe728
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Nov 20 09:46:42 2022 +0000
u-boot: create signed bootscript at build time
before this was as binary in git which make no real sense.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
Acked-by: Peter Müller <peter.mueller(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 6163e1b766ec88855a4dd88d79086d671ee4fb51
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Nov 20 08:54:27 2022 +0000
u-boot: update to 2022.10 and arm-trusted-firmware-2.7
this should fix keyboard issues on rpi-4 and many other
problems.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
Acked-by: Peter Müller <peter.mueller(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit ae6eae447de0a839150fcc01a3a9c87d22f00f5f
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Mon Nov 21 11:05:54 2022 +0000
Core Update 172: Ship usbutils
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit a2e50df0fa337b860b4c1075d8f2ac03ddeb2ad2
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Sat Nov 19 22:49:13 2022 +0100
usbutils: Update to version 015
- Update from version 014 to 015
- Update of rootfile not required
- Changelog
usbutils 015
usb-devices: list the root devices in numerical order
usb-devices: use 'local' variable type to handle recursion
lsusb: remove unused wireless check
lsusb: remove wireless descriptor information
usb-devices: fix field width on device speed field
lsusb: fix up Midi Device specification devices
Fix an runtime error reported by undefind sanitizer
lsusb: Improve status display for SuperSpeedPlus hubs
lsusb-t: Fix recursive sorting on child devices.
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit d84dac1555e8373b58ebe2fb9bf084d15f241a37
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Mon Nov 21 11:05:21 2022 +0000
Core Update 172: Ship sed
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 6948b9f7e9b04c1f08b5b099e3d55f92e8fd7af9
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Sat Nov 19 22:48:51 2022 +0100
sed: Update to version 4.9
- Update from version 4.8 to 4.9
- Update of rootfile not required
- Changelog
* Noteworthy changes in release 4.9 (2022-11-06) [stable]
** Bug fixes
'sed --follow-symlinks -i' no longer loops forever when its operand
is a symbolic link cycle.
[bug introduced in sed 4.2]
a program with an execution line longer than 2GB can no longer trigger
an out-of-bounds memory write.
using the R command to read an input line of length longer than 2GB
can no longer trigger an out-of-bounds memory read.
In locales using UTF-8 encoding, the regular expression '.' no
longer sometimes fails to match Unicode characters U+D400 through
U+D7FF (some Hangul Syllables, and Hangul Jamo Extended-B) and
Unicode characters U+108000 through U+10FFFF (half of Supplemental
Private Use Area plane B).
[bug introduced in sed 4.8]
I/O errors involving temp files no longer confuse sed into using a
FILE * pointer after fclosing it, which has undefined behavior in C.
** New Features
The 'r' command now accepts address 0, allowing inserting a file before
the first line.
** Changes in behavior
Sed now prints the less-surprising variant in a corner case of
POSIX-unspecified behavior. Before, this would print "n".
Now, it prints "X":
printf n | sed 'sn\nnXn'; echo
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 363c41724babbb13e670bdbd4cd27a24ec9552dc
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Mon Nov 21 11:04:45 2022 +0000
Core Update 172: Ship openvpn
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit c86225c9448cfe8972f97be6e7c347502487214b
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Sat Nov 19 22:48:37 2022 +0100
openvpn: Update to version 2.5.8
- Update from version 2.5.7 to 2.5.8
- Update of rootfile not required
- Changelog
Version 2.5.8
tls-crypt-v2: bail out if the client key is too small
Remove useless empty line from CR_RESPONSE message
Allow running a default configuration with TLS libraries without BF-CBC
Change command help to match man page and implementation
Fix OpenVPN querying user/password if auth-token with user expires
t_client: Allow to force FAIL on prerequisite fails
t_client.sh: do not require fping6
Preparing release 2.5.8
msvc: add branch name and commit hash to version output
Update the replay-window backtrack log message
Do not skip ERROR:/SUCCESS: response from management interface
Fix auth-token usage with management-def-auth
Allow a few levels of recursion in virtual_output_callback()
Ensure --auth-nocache is handled during renegotiation
Purge auth-token as well while purging passwords
Do not copy auth_token username to itself
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
commit a9aae44d6a2c6192ccb840dddde686f922808ec1
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Mon Nov 21 11:04:14 2022 +0000
Core Update 172: Ship xz
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 6ff6ba85ba0787c54cf5caa82a9171ca8b12e350
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Sat Nov 19 18:52:36 2022 +0100
xz: Update to version 5.2.8
- Update from version 5.2.5 to 5.2.8
- Update of rootfile
- Remove xzgrep-ZDI-CAN-16587 patch as the contents are now integrated into the source
tarball and with an improved quicker method - see changelog below.
- Changelog
5.2.8 (2022-11-13)
* xz:
- If xz cannot remove an input file when it should, this
is now treated as a warning (exit status 2) instead of
an error (exit status 1). This matches GNU gzip and it
is more logical as at that point the output file has
already been successfully closed.
- Fix handling of .xz files with an unsupported check type.
Previously such printed a warning message but then xz
behaved as if an error had occurred (didn't decompress,
exit status 1). Now a warning is printed, decompression
is done anyway, and exit status is 2. This used to work
slightly before 5.0.0. In practice this bug matters only
if xz has been built with some check types disabled. As
instructed in PACKAGERS, such builds should be done in
special situations only.
- Fix "xz -dc --single-stream tests/files/good-0-empty.xz"
which failed with "Internal error (bug)". That is,
--single-stream was broken if the first .xz stream in
the input file didn't contain any uncompressed data.
- Fix displaying file sizes in the progress indicator when
working in passthru mode and there are multiple input files.
Just like "gzip -cdf", "xz -cdf" works like "cat" when the
input file isn't a supported compressed file format. In
this case the file size counters weren't reset between
files so with multiple input files the progress indicator
displayed an incorrect (too large) value.
* liblzma:
- API docs in lzma/container.h:
* Update the list of decoder flags in the decoder
function docs.
* Explain LZMA_CONCATENATED behavior with .lzma files
in lzma_auto_decoder() docs.
- OpenBSD: Use HW_NCPUONLINE to detect the number of
available hardware threads in lzma_physmem().
- Fix use of wrong macro to detect x86 SSE2 support.
__SSE2_MATH__ was used with GCC/Clang but the correct
one is __SSE2__. The first one means that SSE2 is used
for floating point math which is irrelevant here.
The affected SSE2 code isn't used on x86-64 so this affects
only 32-bit x86 builds that use -msse2 without -mfpmath=sse
(there is no runtime detection for SSE2). It improves LZMA
compression speed (not decompression).
- Fix the build with Intel C compiler 2021 (ICC, not ICX)
on Linux. It defines __GNUC__ to 10 but doesn't support
the __symver__ attribute introduced in GCC 10.
* Scripts: Ignore warnings from xz by using --quiet --no-warn.
This is needed if the input .xz files use an unsupported
check type.
* Translations:
- Updated Croatian and Turkish translations.
- One new translations wasn't included because it needed
technical fixes. It will be in upcoming 5.4.0. No new
translations will be added to the 5.2.x branch anymore.
- Renamed the French man page translation file from
fr_FR.po to fr.po and thus also its install directory
(like /usr/share/man/fr_FR -> .../fr).
- Man page translations for upcoming 5.4.0 are now handled
in the Translation Project.
* Update doc/faq.txt a little so it's less out-of-date.
5.2.7 (2022-09-30)
* liblzma:
- Made lzma_filters_copy() to never modify the destination
array if an error occurs. lzma_stream_encoder() and
lzma_stream_encoder_mt() already assumed this. Before this
change, if a tiny memory allocation in lzma_filters_copy()
failed it would lead to a crash (invalid free() or invalid
memory reads) in the cleanup paths of these two encoder
initialization functions.
- Added missing integer overflow check to lzma_index_append().
This affects xz --list and other applications that decode
the Index field from .xz files using lzma_index_decoder().
Normal decompression of .xz files doesn't call this code
and thus most applications using liblzma aren't affected
by this bug.
- Single-threaded .xz decoder (lzma_stream_decoder()): If
lzma_code() returns LZMA_MEMLIMIT_ERROR it is now possible
to use lzma_memlimit_set() to increase the limit and continue
decoding. This was supposed to work from the beginning
but there was a bug. With other decoders (.lzma or
threaded .xz decoder) this already worked correctly.
- Fixed accumulation of integrity check type statistics in
lzma_index_cat(). This bug made lzma_index_checks() return
only the type of the integrity check of the last Stream
when multiple lzma_indexes were concatenated. Most
applications don't use these APIs but in xz it made
xz --list not list all check types from concatenated .xz
files. In xz --list --verbose only the per-file "Check:"
lines were affected and in xz --robot --list only the "file"
line was affected.
- Added ABI compatibility with executables that were linked
against liblzma in RHEL/CentOS 7 or other liblzma builds
that had copied the problematic patch from RHEL/CentOS 7
(xz-5.2.2-compat-libs.patch). For the details, see the
comment at the top of src/liblzma/validate_map.sh.
WARNING: This uses __symver__ attribute with GCC >= 10.
In other cases the traditional __asm__(".symver ...")
is used. Using link-time optimization (LTO, -flto) with
GCC versions older than 10 can silently result in
broken liblzma.so.5 (incorrect symbol versions)! If you
want to use -flto with GCC, you must use GCC >= 10.
LTO with Clang seems to work even with the traditional
__asm__(".symver ...") method.
* xzgrep: Fixed compatibility with old shells that break if
comments inside command substitutions have apostrophes (').
This problem was introduced in 5.2.6.
* Build systems:
- New #define in config.h: HAVE_SYMBOL_VERSIONS_LINUX
- Windows: Fixed liblzma.dll build with Visual Studio project
files. It broke in 5.2.6 due to a change that was made to
improve CMake support.
- Windows: Building liblzma with UNICODE defined should now
work.
- CMake files are now actually included in the release tarball.
They should have been in 5.2.5 already.
- Minor CMake fixes and improvements.
* Added a new translation: Turkish
5.2.6 (2022-08-12)
* xz:
- The --keep option now accepts symlinks, hardlinks, and
setuid, setgid, and sticky files. Previously this required
using --force.
- When copying metadata from the source file to the destination
file, don't try to set the group (GID) if it is already set
correctly. This avoids a failure on OpenBSD (and possibly on
a few other OSes) where files may get created so that their
group doesn't belong to the user, and fchown(2) can fail even
if it needs to do nothing.
- Cap --memlimit-compress to 2000 MiB instead of 4020 MiB on
MIPS32 because on MIPS32 userspace processes are limited
to 2 GiB of address space.
* liblzma:
- Fixed a missing error-check in the threaded encoder. If a
small memory allocation fails, a .xz file with an invalid
Index field would be created. Decompressing such a file would
produce the correct output but result in an error at the end.
Thus this is a "mild" data corruption bug. Note that while
a failed memory allocation can trigger the bug, it cannot
cause invalid memory access.
- The decoder for .lzma files now supports files that have
uncompressed size stored in the header and still use the
end of payload marker (end of stream marker) at the end
of the LZMA stream. Such files are rare but, according to
the documentation in LZMA SDK, they are valid.
doc/lzma-file-format.txt was updated too.
- Improved 32-bit x86 assembly files:
* Support Intel Control-flow Enforcement Technology (CET)
* Use non-executable stack on FreeBSD.
- Visual Studio: Use non-standard _MSVC_LANG to detect C++
standard version in the lzma.h API header. It's used to
detect when "noexcept" can be used.
* xzgrep:
- Fixed arbitrary command injection via a malicious filename
(CVE-2022-1271, ZDI-CAN-16587). A standalone patch for
this was released to the public on 2022-04-07. A slight
robustness improvement has been made since then and, if
using GNU or *BSD grep, a new faster method is now used
that doesn't use the old sed-based construct at all. This
also fixes bad output with GNU grep >= 3.5 (2020-09-27)
when xzgrepping binary files.
This vulnerability was discovered by:
cleemy desu wayo working with Trend Micro Zero Day Initiative
- Fixed detection of corrupt .bz2 files.
- Improved error handling to fix exit status in some situations
and to fix handling of signals: in some situations a signal
didn't make xzgrep exit when it clearly should have. It's
possible that the signal handling still isn't quite perfect
but hopefully it's good enough.
- Documented exit statuses on the man page.
- xzegrep and xzfgrep now use "grep -E" and "grep -F" instead
of the deprecated egrep and fgrep commands.
- Fixed parsing of the options -E, -F, -G, -P, and -X. The
problem occurred when multiple options were specied in
a single argument, for example,
echo foo | xzgrep -Fe foo
treated foo as a filename because -Fe wasn't correctly
split into -F -e.
- Added zstd support.
* xzdiff/xzcmp:
- Fixed wrong exit status. Exit status could be 2 when the
correct value is 1.
- Documented on the man page that exit status of 2 is used
for decompression errors.
- Added zstd support.
* xzless:
- Fix less(1) version detection. It failed if the version number
from "less -V" contained a dot.
* Translations:
- Added new translations: Catalan, Croatian, Esperanto,
Korean, Portuguese, Romanian, Serbian, Spanish, Swedish,
and Ukrainian
- Updated the Brazilian Portuguese translation.
- Added French man page translation. This and the existing
German translation aren't complete anymore because the
English man pages got a few updates and the translators
weren't reached so that they could update their work.
* Build systems:
- Windows: Fix building of resource files when config.h isn't
used. CMake + Visual Studio can now build liblzma.dll.
- Various fixes to the CMake support. Building static or shared
liblzma should work fine in most cases. In contrast, building
the command line tools with CMake is still clearly incomplete
and experimental and should be used for testing only.
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit a0b158da4c72f6d0f9167230f261d9b971a90c72
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Mon Nov 21 11:03:12 2022 +0000
Core Update 172: Ship libxcrypt
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit c81385f7f87b06fe6df6768a967eeaf7baa37e58
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Sat Nov 19 18:52:25 2022 +0100
libxcrypt: Update to version 4.4.33
- Update from version 4.4.28 to 4.4.33
- Update of rootfile not required
- Changelog
Version 4.4.33
* Fix -Werror=sign-conversion in lib/alg-yescrypt-platform.c.
With commit 894aee75433b4dc8d9724b126da6e79fa5f6814b we introduced some
changes to huge page handling, that show this error when building with
GCC v12.2.1, and thus need a small fix.
Version 4.4.32
* Improvements to huge page handling in lib/alg-yescrypt-platform.c.
When explicitly using huge pages, request the 2 MiB page size.
This should fix the issue where on a system configured to use 1 GiB
huge pages we'd fail on munmap() as we're only rounding the size up
to a multiple of 2 MiB. With the fix, we wouldn't use huge pages on
such a system. Unfortunately, now we also wouldn't use huge pages on
Linux kernels too old to have MAP_HUGE_2MB (issue #152).
Version 4.4.31
* Fix -Werror=conversion in lib/alg-yescrypt-opt.c
(issues #161 and #162).
* Add some SHA-2 Maj() optimization in lib/alg-sha256.c.
* Fix issues found by Covscan in test/getrandom-fallback.c.
* Fix -Werror=strict-overflow in lib/crypt-des.c, which is seen
by GCC 12.x (issues #155 and #163).
Version 4.4.30
* configure: Restore ucontext api functionality check.
In c3f01c72b303cbbb0cc8983120677edee2f3fa4b the use of the ucontext api
in the main program was removed, and with it the configure check for it.
However, the ucontext api is still used in the "explicit_bzero" test and
thus this test still needs to be in place.
See also: https://bugs.gentoo.org/838172
* configure: Restore the functionality of the '--disable-symvers' switch.
Without this fix the build was simply broken, if symbol versioning was
disabled for any reason, e.g. whether the compiler nor the linker
supporting it, or if disabled on purpose by the user (issue #142).
* Fix variable name in crypt(3) for a datamember of 'struct crypt_data'
(issue #153).
Version 4.4.29
* Add glibc-on-loongarch-lp64 (Loongson LA464 / LA664) entry to
libcrypt.minver. This was added in GNU libc 2.36.
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit fab890c51874d204f02fbd81c4af465963b92e48
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Mon Nov 21 11:02:29 2022 +0000
Core Update 172: Ship libuv
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit fa3f331a2e8417c631d280713eccbe74b5711421
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Sat Nov 19 18:52:10 2022 +0100
libuv: Update to version 1.44.2
- Update from 1.42.0 to 1.44.2
- Update of rootfile not required.
- Changelog
Version 1.44.2
* Add SHA to ChangeLog (Jameson Nash)
* aix, ibmi: handle server hang when remote sends TCP RST (V-for-Vasili)
* build: make CI a bit noisier (Jameson Nash)
* process: reset the signal mask if the fork fails (Jameson Nash)
* zos: implement cmpxchgi() using assembly (Shuowang (Wayne) Zhang)
* build: AC_SUBST for AM_CFLAGS (Claes Nästén)
* ibmi: Implement UDP disconnect (V-for-Vasili)
* doc: update active maintainers list (Ben Noordhuis)
* build: fix kFreeBSD build (James McCoy)
* build: remove Windows 2016 workflows (Darshan Sen)
* Revert "win,errors: remap ERROR_ACCESS_DENIED to UV_EACCES" (Darshan Sen)
* unix: simplify getpwuid call (Jameson Nash)
* build: filter CI by paths and branches (Jameson Nash)
* build: add iOS to macos CI (Jameson Nash)
* build: re-enable CI for windows changes (Jameson Nash)
* process,iOS: fix build breakage in process.c (Denny C. Dai)
* test: remove unused declarations in tcp_rst test (V-for-Vasili)
* core: add thread-safe strtok implementation (Guilherme Íscaro)
* win: fix incompatible-types warning (twosee)
* test: fix flaky file watcher test (Ben Noordhuis)
* build: fix AIX xlc autotools build (V-for-Vasili)
* unix,win: fix UV_RUN_ONCE + uv_idle_stop loop hang (Ben Noordhuis)
* win: fix unexpected ECONNRESET error on TCP socket (twosee)
* doc: make sample cross-platform build (gengjiawen)
* test: separate some static variables by test cases (Hannah Shi)
* sunos: fs-event callback can be called after uv_close() (Andy Fiddaman)
* uv: re-register interest in a file after change (Shuowang (Wayne) Zhang)
* uv: register UV_RENAME event for _RFIM_UNLINK (Shuowang (Wayne) Zhang)
* uv: register __rfim_event 156 as UV_RENAME (Shuowang (Wayne) Zhang)
* doc: remove smartos from supported platforms (Ben Noordhuis)
* macos: avoid posix_spawnp() cwd bug (Jameson Nash)
* release: check versions of autogen scripts are newer (Jameson Nash)
* test: rewrite embed test (Ben Noordhuis)
* openbsd: use utimensat instead of lutimes (tuftedocelot)
* doc: fix link to uvwget example main() function (blogdaren)
* unix: use MSG_CMSG_CLOEXEC where supported (Ben Noordhuis)
* test: remove disabled callback_order test (Ben Noordhuis)
* win,pipe: fix bugs with pipe resource lifetime management (Jameson Nash)
* loop: better align order-of-events behavior between platforms (Jameson Nash)
* aix,test: uv_backend_fd is not supported by poll (V-for-Vasili)
* kqueue: skip EVFILT_PROC when invalidating fds (chucksilvers)
* darwin: fix atomic-ops.h ppc64 build (Sergey Fedorov)
* zos: don't err when killing a zombie process (Shuowang (Wayne) Zhang)
* zos: avoid fs event callbacks after uv_close() (Shuowang (Wayne) Zhang)
* zos: correctly format interface addresses names (Shuowang (Wayne) Zhang)
* zos: add uv_interface_addresses() netmask support (Shuowang (Wayne) Zhang)
* zos: improve memory management of ip addresses (Shuowang (Wayne) Zhang)
* tcp,pipe: fail `bind` or `listen` after `close` (theanarkh)
* zos: implement uv_available_parallelism() (Shuowang (Wayne) Zhang)
* udp,win: fix UDP compiler warning (Jameson Nash)
* zos: fix early exit of epoll_wait() (Shuowang (Wayne) Zhang)
* unix,tcp: fix errno handling in uv__tcp_bind() (Samuel Cabrero)
* shutdown,unix: reduce code duplication (Jameson Nash)
* unix: fix c99 comments (Ben Noordhuis)
* unix: retry tcgetattr/tcsetattr() on EINTR (Ben Noordhuis)
* docs: update introduction.rst (Ikko Ashimine)
* unix,stream: optimize uv_shutdown() codepath (Jameson Nash)
* zos: delay signal handling until after normal i/o (Shuowang (Wayne) Zhang)
* stream: uv__drain() always needs to stop POLLOUT (Jameson Nash)
* unix,tcp: allow EINVAL errno from setsockopt in uv_tcp_close_reset() (Stacey
Marshall)
* win,shutdown: improve how shutdown is dispatched (Jameson Nash)
Version 1.44.1
* process: simplify uv__write_int calls (Jameson Nash)
* macos: don't use thread-unsafe strtok() (Ben Noordhuis)
* process: fix hang after NOTE_EXIT (Jameson Nash)
Version 1.44.0
* darwin: remove EPROTOTYPE error workaround (Ben Noordhuis)
* doc: fix v1.43.0 changelog entries (cjihrig)
* win: replace CRITICAL_SECTION+Semaphore with SRWLock (David Machaj)
* darwin: translate EPROTOTYPE to ECONNRESET (Ben Noordhuis)
* android: use libc getifaddrs() (Ben Noordhuis)
* unix: fix STATIC_ASSERT to check what it means to check (Jessica Clarke)
* unix: ensure struct msghdr is zeroed in recvmmsg (Ondřej Surý)
* test: test with maximum recvmmsg buffer (Ondřej Surý)
* unix: don't allow too small thread stack size (Ben Noordhuis)
* bsd: ensure mutex is initialized (Ben Noordhuis)
* doc: add gengjiawen as maintainer (gengjiawen)
* process: monitor for exit with kqueue on BSDs (Jeremy Rose)
* test: fix flaky uv_fs_lutime test (Momtchil Momtchev)
* build: fix cmake install locations (Jameson Nash)
* thread,win: fix C90 style nit (ssrlive)
* build: rename CFLAGS to AM_CFLAGS (Jameson Nash)
* doc/guide: update content and sample code (woclass)
* process,bsd: handle kevent NOTE_EXIT failure (Jameson Nash)
* test: remove flaky test ipc_closed_handle (Ben Noordhuis)
* darwin: bump minimum supported version to 10.15 (Ben Noordhuis)
* win: return fractional seconds in uv_uptime() (Luca Adrian L)
* build: export uv_a for cmake (WenTao Ou)
* loop: add pending work to loop-alive check (Jameson Nash)
* win: use GetTickCount64 for uptime again (Jameson Nash)
* win: restrict system DLL load paths (jonilaitinen)
* win,errors: remap ERROR_ACCESS_DENIED to UV_EACCES (Darshan Sen)
* bench: add `uv_queue_work` ping-pong measurement (Momtchil Momtchev)
* build: fix error C4146 on MSVC (UMU)
* test: fix benchmark-ping-udp (Ryan Liptak)
* win,fs: consider broken pipe error a normal EOF (Momtchil Momtchev)
* document the values of enum uv_stdio_flags (Paul Evans)
* win,loop: add missing uv_update_time (twosee)
* win,fs: avoid closing an invalid handle (Jameson Nash)
* fix oopsie from
* doc: clarify android api level (Ben Noordhuis)
* win: fix style nits [NFC] (Jameson Nash)
* test: fix flaky udp_mmsg test (Santiago Gimeno)
* test: fix ipc_send_recv_pipe flakiness (Ben Noordhuis)
* doc: checkout -> check out (wyckster)
* core: change uv_get_password uid/gid to unsigned (Jameson Nash)
* hurd: unbreak build on GNU/Hurd (Vittore F. Scolari)
* freebsd: use copy_file_range() in uv_fs_sendfile() (David Carlier)
* test: use closefd in runner-unix.c (Guilherme Íscaro)
* Reland "macos: use posix_spawn instead of fork" (Jameson Nash)
* android: fix build error when no ifaddrs.h (ssrlive)
* unix,win: add uv_available_parallelism() (Ben Noordhuis)
* process: remove OpenBSD from kevent list (Jameson Nash)
* zos: fix build breakage (Ben Noordhuis)
* process: only use F_DUPFD_CLOEXEC if it is defined (Jameson Nash)
* win,poll: add the MSAFD GUID for AF_UNIX (roflcopter4)
* unix: simplify uv__cloexec_fcntl() (Ben Noordhuis)
* doc: add secondary GPG ID for vtjnash (Jameson Nash)
* unix: remove uv__cloexec_ioctl() (Jameson Nash)
Version 1.43.0
* run test named ip6_sin6_len (Jameson Nash)
* docs: fix wrong information about scheduling (Mohamed Edrah)
* unix: protect fork in uv_spawn from signals (Jameson Nash)
* drop only successfully sent packets post sendmmsg (Supragya Raj)
* test: fix typo in test-tty-escape-sequence-processing.c (Ikko Ashimine)
* cmake: use standard installation layout always (Sylvain Corlay)
* win,spawn: allow UNC path with forward slash (earnal)
* win,fsevent: fix uv_fs_event_stop() assert (Ben Noordhuis)
* unix: remove redundant include in unix.h (Juan José Arboleda)
* doc: mark SmartOS as Tier 3 support (Ben Noordhuis)
* doc: fix broken links for netbsd's sysctl manpage (YAKSH BARIYA)
* misc: adjust stalebot deadline (Ben Noordhuis)
* test: remove `dns-server.c` as it is not used anywhere (Darshan Sen)
* build: fix non-cmake android builds (YAKSH BARIYA)
* doc: replace pyuv with uvloop (Ofek Lev)
* asan: fix some tests (Jameson Nash)
* build: add experimental TSAN configuration (Jameson Nash)
* pipe: remove useless assertion (~locpyl-tidnyd)
* bsd: destroy mutex in uv__process_title_cleanup() (Darshan Sen)
* build: add windows build to CI (Darshan Sen)
* win,fs: fix error code in uv_fs_read() and uv_fs_write() (Darshan Sen)
* build: add macos-latest to ci matrix (Ben Noordhuis)
* udp: fix &/&& typo in macro condition (Evan Miller)
* build: install cmake package module (Petr Menšík)
* win: fix build for mingw32 (Nicolas Noble)
* build: fix build failures with MinGW new headers (erw7)
* build: fix win build with cmake versions before v3.14 (AJ Heller)
* unix: support aarch64 in uv_cpu_info() (Juan José Arboleda)
* linux: work around CIFS EPERM bug (Ben Noordhuis)
* sunos: Oracle Developer Studio support (Stacey Marshall)
* Revert "sunos: Oracle Developer Studio support (cjihrig)
* sunos: Oracle Developer Studio support (Stacey Marshall)
* stream: permit read after seeing EOF (Jameson Nash)
* thread: initialize uv_thread_self for all threads (Jameson Nash)
* kqueue: ignore write-end closed notifications (Jameson Nash)
* macos: fix the cfdata length in uv__get_cpu_speed (Jesper Storm Bache)
* unix,win: add uv_ip_name to get name from sockaddr (Campbell He)
* win,test: fix a few typos (AJ Heller)
* zos: use destructor for uv__threadpool_cleanup() (Wayne Zhang)
* linux: use MemAvailable instead of MemFree (Andrey Hohutkin)
* freebsd: call dlerror() only if necessary (Jameson Nash)
* bsd,windows,zos: fix udp disconnect EINVAL (deal)
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit a8e3499f78edf9aa51503958eae21248d9c65c12
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Sat Nov 19 18:51:48 2022 +0100
libpipeline: Update to version 1.5.7
- Update from 1.5.6 to 1.5.7
- Update of rootfile
- Changelog
Version: 1.5.7
* lib/Makefile.am (libpipeline_la_LDFLAGS): Bump -version-info to 6:7:5.
Make socketpair configure tests compatible with C23
K&R-style zero-argument function definitions will no longer be
permitted.
* m4/pipeline-socketpair.m4 (PIPELINE_SOCKETPAIR_PIPE,
PIPELINE_SOCKETPAIR_MODE): Use `int main(void)`, not `int main()`.
* NEWS.md: Document this.
Update pre-commit hooks
* .pre-commit-config.yaml (pre-commit-hooks): Update to v4.3.0.
(clang-format): Update to v14.0.6.
Update manual page date
* man/libpipeline.3 (.Dd): Update to the date of the last substantial
modification. Leaving this as 2010 suggested more antiquity than we
need to suggest.
Update home page URL
* README.md: Use `https://libpipeline.gitlab.io/libpipeline/`.
* lib/libpipeline.pc.in (URL): Likewise.
web: Update last release
* web/index.html: Update to 1.5.6.
web: Fix last-modified date generation
* .gitlab-ci.yml: Replace `@DATE@` with the current date in
`public/index.html`.
* web/index.html: Use `@DATE@` template.
web: Assorted URL updates
* web/index.html: Update Git URLs to GitLab. Chase various redirects
and/or switch to HTTPS. Remove old Savannah link.
Add GitLab Pages site
* .gitlab-ci.yml (stages): Add deploy.
(pages): New job.
* web/index.html, web/libpipeline-lightning-talk.odp, web/standard.css,
web/white.css: New files.
Transferred Git repository to new group
* README.md: Change GitLab URL to
https://gitlab.com/libpipeline/libpipeline.
* NEWS.md: Document this.
Add notes to libpipeline(3) of when functions were added
* man/libpipeline.3 (DESCRIPTION, ENVIRONMENT): Add various "Added in"
notes.
* NEWS.md: Document this.
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit b830e457e7ca497211dedfb408a3551be2724753
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Sat Nov 19 18:51:35 2022 +0100
libassuan: Update to version 2.5.5
- Update from 2.5.4 to 2.5.5
- Update of rootfile
- Changelog
Release 2.5.5.
Support Unicode when starting servers on Windows.
* src/assuan-socket.c (utf8_to_wchar): Rename to
(_assuan_utf8_to_wchar): this and give global scope.
* src/system-w32.c (__assuan_spawn): Use CreateProcessW.
m4: Update with newer autoconf constructs.
* src/libassuan.m4: Replace AC_HELP_STRING to AS_HELP_STRING.
build: Update to newer autoconf constructs.
* configure.ac: Use AC_CONFIG_HEADERS instead of AM_CONFIG_HEADER.
Use AC_USE_SYSTEM_EXTENSIONS instead of AC_GNU_SOURCE.
Use AS_HELP_STRING instead of AC_HELP_STRING.
(AC_TYPE_SIGNAL): Remove.
(AC_DECL_SYS_SIGLIST): Remove.
* m4/Makefile.am (EXTRA_DIST): Update.
* m4/gnupg-pth.m4: Remove.
* m4/onceonly.m4: Remove.
* m4/socklen.m4: Update from gnulib.
* m4/libtool.m4: Update from libgpg-error.
* m4/gpg-error.m4: Update from libgpg-error.
Fix crash when logging.
* src/assuan-logging.c (_assuan_log_control_channel): Use gpgrt_malloc.
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 7e464d15159e56156e9036c664a189025fc2c977
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Mon Nov 21 10:59:24 2022 +0000
Core Update 172: Ship readline
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit f86ae7d1a6fd6436aa3d285f0a1c2fdc9ce364f6
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Sat Nov 19 15:40:35 2022 +0100
gdb: Patch for building with readline-8.2
- Patch required for successful building with readline-8.2
In readline 8.2 the type of rl_completer_word_break_characters changed to
include const.
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 1ad5a01388970e3349f83702596d83ce44b1a8f4
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Sat Nov 19 15:40:34 2022 +0100
readline: Update to version 8.2 plus patch 1
- Update from version 8.1 to 8.2 plus patch 1
- Update of rootfile
- Changelog
version 8.2
There is a new framework for readline timeouts, including new public
functions to set timeouts and query how much time is remaining before a
timeout hits, and a hook function that can trigger when readline times out.
There is a new state value to indicate a timeout. There is a new option:
`enable-active-region'. This separates control of the active region and
bracketed-paste. It has the same default value as bracketed-paste, and
enabling bracketed paste enables the active region. Users can now turn off
the active region while leaving bracketed paste enabled. Two new bindable
string variables are available; their values are terminal escape sequences
that set the color used to display the active region and turn it off,
respectively. If set, these are used in place of terminal standout mode.
Finally, Readline now checks for changes to locale settings
(LC_ALL/LC_CTYPE/LANG) each time it is called, and modifies the appropriate
locale-specific display and key binding variables when the locale changes.
There are a few bug fixes in the redisplay code when restoring the prompt
after a digit-argument prompt or incremental search back to a prompt that
contains invisible multibyte characters. There are more checks for read
errors, especially in the middle of readline commands; previous versions
could loop or return incorrect data. Full details are below.
GNU Readline is a library which provides programs with an input
facility including command-line editing and history. Editing
commands similar to both emacs and vi are included. The GNU
History library, which provides facilities for managing a list of
previously-typed command lines and an interactive command line
recall facility similar to that provided by csh, is also present.
The history library is built as part of the readline as well as
separately.
1. Changes to Readline
a. Fixed a problem with cleaning up active marks when using callback mode.
b. Fixed a problem with arithmetic comparison operators checking the version.
c. Fixed a problem that could cause readline not to build on systems without
POSIX signal functions.
d. Fixed a bug that could cause readline to crash if the application removed
the callback line handler before readline read all typeahead.
e. Added additional checks for read errors in the middle of readline commands.
f. Fixed a redisplay problem that occurred when switching from the digit-
argument prompt `(arg: N)' back to the regular prompt and the regular
prompt contained invisible characters.
g. Fixed a problem with restoring the prompt when aborting an incremental
search.
h. Fix a problem with characters > 128 not being displayed correctly in certain
single-byte encodings.
i. Fixed a problem with unix-filename-rubout that caused it to delete too much
when applied to a pathname consisting only of one or more slashes.
j. Fixed a display problem that caused the prompt to be wrapped incorrectly if
the screen changed dimensions during a call to readline() and the prompt
became longer than the screen width.
k. Fixed a problem that caused the \r output by turning off bracketed paste
to overwrite the line if terminal echo was disabled.
l. Fixed a bug that could cause colored-completion-prefix to not display if
completion-prefix-display-length was set.
m. Fixed a problem with line wrapping prompts when a group of invisible
characters runs to the right edge of the screen and the prompt extends
longer then the screen width.
n. Fixed a couple problems that could cause rl_end to be set incorrectly by
transpose-words.
o. Prevent some display problems when running a command as the result of a
trap or one bound using `bind -x' and the command generates output.
p. Fixed an issue with multi-line prompt strings that have one or more
invisible characters at the end of a physical line.
q. Fixed an issue that caused a history line's undo list to be cleared when
it should not have been.
r. When replacing a history entry, make sure the existing entry has a non-NULL
timestamp before copying it; it may have been added by the application, not
the history library.
2. New Features in Readline
a. There is now an HS_HISTORY_VERSION containing the version number of the
history library for applications to use.
b. History expansion better understands multiple history expansions that may
contain strings that would ordinarily inhibit history expansion (e.g.,
`abc!$!$').
c. There is a new framework for readline timeouts, including new public
functions to set timeouts and query how much time is remaining before a
timeout hits, and a hook function that can trigger when readline times
out. There is a new state value to indicate a timeout.
d. Automatically bind termcap key sequences for page-up and page-down to
history-search-backward and history-search-forward, respectively.
e. There is a new `fetch-history' bindable command that retrieves the history
entry corresponding to its numeric argument. Negative arguments count back
from the end of the history.
f. `vi-undo' is now a bindable command.
g. There is a new option: `enable-active-region'. This separates control of
the active region and bracketed-paste. It has the same default value as
bracketed-paste, and enabling bracketed paste enables the active region.
Users can now turn off the active region while leaving bracketed paste
enabled.
h. rl_completer_word_break_characters is now `const char *' like
rl_basic_word_break_characters.
i. Readline looks in $LS_COLORS for a custom filename extension
(*.readline-colored-completion-prefix) and uses that as the default color
for the common prefix displayed when `colored-completion-prefix' is set.
j. Two new bindable string variables: active-region-start-color and
active-region-end-color. The first sets the color used to display the
active region; the second turns it off. If set, these are used in place
of terminal standout mode.
k. New readline state (RL_STATE_EOF) and application-visible variable
(rl_eof_found) to allow applications to detect when readline reads EOF
before calling the deprep-terminal hook.
l. There is a new configuration option: --with-shared-termcap-library, which
forces linking the shared readline library with the shared termcap (or
curses/ncurses/termlib) library so applications don't have to do it.
m. Readline now checks for changes to locale settings (LC_ALL/LC_CTYPE/LANG)
each time it is called, and modifies the appropriate locale-specific display
and key binding variables when the locale changes.
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 55ee176bb380f9b0ca57d6a60e74a0efb8c6e087
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Mon Nov 21 10:57:59 2022 +0000
Core Update 172: Ship bash
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 5be71d2a6efbbf1cf48aca6272d28fbf00ce8f12
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Sat Nov 19 15:40:05 2022 +0100
bash: Update to version 5.2 plus patches 1 to 9
- Update from version 5.1.16 to version 5.2 plus patches 1 to 9
- Update of rootfile
- Changelog
This is a terse description of the new features added to bash-5.2 since
the release of bash-5.1. As always, the manual page (doc/bash.1) is
the place to look for complete descriptions.
1. New Features in Bash
a. The bash malloc returns memory that is aligned on 16-byte boundaries.
b. There is a new internal timer framework used for read builtin timeouts.
c. Rewrote the command substitution parsing code to call the parser recursively
and rebuild the command string from the parsed command. This allows better
syntax checking and catches errors much earlier. Along with this, if
command substitution parsing completes with here-documents remaining to be
read, the shell prints a warning message and reads the here-document bodies
from the current input stream.
d. The `ulimit' builtin now treats an operand remaining after all of the options
and arguments are parsed as an argument to the last command specified by
an option. This is for POSIX compatibility.
e. Here-document parsing now handles $'...' and $"..." quoting when reading the
here-document body.
f. The `shell-expand-line' and `history-and-alias-expand-line' bindable readline
commands now understand $'...' and $"..." quoting.
g. There is a new `spell-correct-word' bindable readline command to perform
spelling correction on the current word.
h. The `unset' builtin now attempts to treat arguments as array subscripts
without parsing or expanding the subscript, even when `assoc_expand_once'
is not set.
i. There is a default value for $BASH_LOADABLES_PATH in config-top.h.
j. Associative array assignment and certain instances of referencing (e.g.,
`test -v' now allow `@' and `*' to be used as keys.
k. Bash attempts to expand indexed array subscripts only once when executing
shell constructs and word expansions.
l. The `unset' builtin allows a subscript of `@' or `*' to unset a key with
that value for associative arrays instead of unsetting the entire array
(which you can still do with `unset arrayname'). For indexed arrays, it
removes all elements of the array without unsetting it (like `A=()').
m. Additional builtins (printf/test/read/wait) do a better job of not
parsing array subscripts if array_expand_once is set.
n. New READLINE_ARGUMENT variable set to numeric argument for readline commands
defined using `bind -x'.
o. The new `varredir_close' shell option causes bash to automatically close
file descriptors opened with {var}<fn and other styles of varassign
redirection unless they're arguments to the `exec' builtin.
p. The `$0' special parameter is now set to the name of the script when running
any (non-interactive) startup files such as $BASH_ENV.
q. The `enable' builtin tries to load a loadable builtin using the default
search path if `enable name' (without any options) attempts to enable a
non-existent builtin.
r. The `printf' builtin has a new format specifier: %Q. This acts like %q but
applies any specified precision to the original unquoted argument, then
quotes and outputs the result.
s. The new `noexpand_translations' option controls whether or not the translated
output of $"..." is single-quoted.
t. There is a new parameter transformation operator: @k. This is like @K, but
expands the result to separate words after word splitting.
u. There is an alternate array implementation, selectable at `configure' time,
that optimizes access speed over memory use (use the new configure
--enable-alt-array-implementation option).
v. If an [N]<&WORD- or [N]>&WORD- redirection has WORD expand to the empty
string, treat the redirection as [N]<&- or [N]>&- and close file descriptor
N (default 0).
w. Invalid parameter transformation operators are now invalid word expansions,
and so cause fatal errors in non-interactive shells.
x. New shell option: patsub_replacement. When enabled, a `&' in the replacement
string of the pattern substitution expansion is replaced by the portion of
the string that matched the pattern. Backslash will escape the `&' and
insert a literal `&'.
y. `command -p' no longer looks in the hash table for the specified command.
z. The new `--enable-translatable-strings' option to `configure' allows $"..."
support to be compiled in or out.
aa. The new `globskipdots' shell option forces pathname expansion never to
return `.' or `..' unless explicitly matched. It is enabled by default.
bb. Array references using `@' and `*' that are the value of nameref variables
(declare -n ref='v[@]' ; echo $ref) no longer cause the shell to exit if
set -u is enabled and the array (v) is unset.
cc. There is a new bindable readline command name:
`vi-edit-and-execute-command'.
dd. In posix mode, the `printf' builtin checks for the `L' length modifier and
uses long double for floating point conversion specifiers if it's present,
double otherwise.
ee. The `globbing' completion code now takes the `globstar' option into account.
ff. `suspend -f' now forces the shell to suspend even if job control is not
currently enabled.
gg. Since there is no `declare -' equivalent of `local -', make sure to use
`local -' in the output of `local -p'.
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit ace891f71937c0e08e5b3243565e55c1704c8451
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sat Nov 19 20:20:28 2022 +0000
intel-microcode: Update rootfile
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit a6923c547937c7b12063e34cf68fd58db22d733f
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sat Nov 19 19:27:15 2022 +0000
Core Update 172: Ship sqlite
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit f7e5582a56a4dabc29197ce9a5c3eec19a48585b
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Fri Nov 18 23:52:10 2022 +0100
sqlite: Update to version 3400000
- Update from version 3390200 to 3400000
- Update of rootfile not required
- Changelog
version 3.40.0 On 2022-11-16
Add support for compiling SQLite to WASM and running it in web browsers. NB: The WASM build and its interfaces are considered "beta" and are subject to minor changes if the need arises. We anticipate finalizing the interface for the next release.
Add the recovery extension that might be able to recover some content from a corrupt database file.
Query planner enhancements:
Recognize covering indexes on tables with more than 63 columns where columns beyond the 63rd column are used in the query and/or are referenced by the index.
Extract the values of expressions contained within expression indexes where practical, rather than recomputing the expression.
The NOT NULL and IS NULL operators (and their equivalents) avoid loading the content of large strings and BLOB values from disk.
Avoid materializing a view on which a full scan is performed exactly once. Use and discard the rows of the view as they are computed.
Allow flattening of a subquery that is the right-hand operand of a LEFT JOIN in an aggregate query.
A new typedef named sqlite3_filename is added and used to represent the name of a database file. Various interfaces are modified to use the new typedef instead of "char*". This interface change should be fully backwards compatible, though it might cause (harmless) compiler warnings when rebuilding some legacy applications.
Add the sqlite3_value_encoding() interface.
Security enhancement: SQLITE_DBCONFIG_DEFENSIVE is augmented to prohibit changing the schema_version. The schema_version becomes read-only in defensive mode.
Enhancements to the PRAGMA integrity_check statement:
Columns in non-STRICT tables with TEXT affinity should not contain numeric values.
Columns in non-STRICT tables with NUMERIC affinity should not contain TEXT values that could be converted into numbers.
Verify that the rows of a WITHOUT ROWID table are in the correct order.
Enhance the VACUUM INTO statement so that it honors the PRAGMA synchronous setting.
Enhance the sqlite3_strglob() and sqlite3_strlike() APIs so that they are able to accept NULL pointers for their string parameters and still generate a sensible result.
Provide the new SQLITE_MAX_ALLOCATION_SIZE compile-time option for limiting the size of memory allocations.
Change the algorithm used by SQLite's built-in pseudo-random number generator (PRNG) from RC4 to Chacha20.
Allow two or more indexes to have the same name as long as they are all in separate schemas.
Miscellaneous performance optimizations result in about 1% fewer CPU cycles used on typical workloads.
version 3.39.3 (2022-09-05):
Use a statement journal on DML statement affecting two or more database rows if the statement makes use of a SQL functions that might abort. See forum thread 9b9e4716c0d7bbd1.
Use a mutex to protect the PRAGMA temp_store_directory and PRAGMA data_store_directory statements, even though they are deprecated and documented as not being threadsafe. See forum post 719a11e1314d1c70.
Other bug and warning fixes. See the timeline for details.
version 3.39.4 (2022-09-29):
Fix the build on Windows so that it works with -DSQLITE_OMIT_AUTOINIT
Fix a long-standing problem in the btree balancer that might, in rare cases, cause database corruption if the application uses an application-defined page cache.
Enhance SQLITE_DBCONFIG_DEFENSIVE so that it disallows CREATE TRIGGER statements if one or more of the statements in the body of the trigger write into shadow tables.
Fix a possible integer overflow in the size computation for a memory allocation in FTS3.
Fix a misuse of the sqlite3_set_auxdata() interface in the ICU Extension.
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 418a4fafc659d3444b9651592384eef6c6e9ac6d
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sat Nov 19 19:26:45 2022 +0000
Core Update 172: Ship OpenSSL
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit f30206c39a5a58bf726e9e008e01db1796823b61
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Fri Nov 18 23:51:36 2022 +0100
openssl: Update to version 1.1.1s
- Update from version 1.1.1q to 1.1.1s
- Update of rootfile
- Changelog
Changes between 1.1.1r and 1.1.1s [1 Nov 2022]
*) Fixed a regression introduced in 1.1.1r version not refreshing the
certificate data to be signed before signing the certificate.
Changes between 1.1.1q and 1.1.1r [11 Oct 2022]
*) Fixed the linux-mips64 Configure target which was missing the
SIXTY_FOUR_BIT bn_ops flag. This was causing heap corruption on that
platform.
*) Fixed a strict aliasing problem in bn_nist. Clang-14 optimisation was
causing incorrect results in some cases as a result.
*) Fixed SSL_pending() and SSL_has_pending() with DTLS which were failing to
report correct results in some cases
*) Fixed a regression introduced in 1.1.1o for re-signing certificates with
different key sizes
*) Added the loongarch64 target
*) Fixed a DRBG seed propagation thread safety issue
*) Fixed a memory leak in tls13_generate_secret
*) Fixed reported performance degradation on aarch64. Restored the
implementation prior to commit 2621751 ("aes/asm/aesv8-armx.pl: avoid
32-bit lane assignment in CTR mode") for 64bit targets only, since it is
reportedly 2-17% slower and the silicon errata only affects 32bit targets.
The new algorithm is still used for 32 bit targets.
*) Added a missing header for memcmp that caused compilation failure on some
platforms
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit f299e312faca4fe6bd60052526fdb21783873f82
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Fri Nov 18 23:51:21 2022 +0100
dehydrated: Update to version 0.7.1
- Update from version 0.7.0 to 0.7.1
- Update of rootfile not required
- Changelog
## [0.7.1] - 2022-10-31
## Changed
- `--force` no longer forces domain name revalidation by default, a new argument `--force-validation` has been added for that
- Added support for EC secp521r1 algorithm (works with e.g. zerossl)
- `EC PARAMETERS` are no longer written to privkey.pem (didn't seem necessary and was causing issues with various software)
## Fixed
- Requests resulting in `badNonce` errors are now automatically retried (fixes operation with LE staging servers)
- Deprecated `egrep` usage has been removed
## Added
- Implemented EC for account keys
- Domain list now also read from domains.txt.d subdirectory (behaviour might change, see docs)
- Implemented RFC 8738 (validating/signing certificates for IP addresses instead of domain names) support (this will not work with most public CAs, if any!)
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 1545553c185f2c3aac52010bf6afa3bbcad78cea
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sat Nov 19 19:25:32 2022 +0000
Core Update 172: Ship libnetfilter_conntrack
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 069716d42a2edaf9ceea22887ccce00fe3c560cc
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sat Nov 19 19:24:41 2022 +0000
Core Update 172: Ship conntrack-tools
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit bea1d4aef11f4bb55602cc7448c76972690e5146
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Fri Nov 18 23:50:43 2022 +0100
libnetfilter_conntrack: Update to version 1.0.9
- Update from version 1.0.8 to 1.0.9
- Update of rootfile
- Changelog
1.0.9
This release comes with the new nfct_nlmsg_build_filter() function that
allows to add metadata for kernel-side filtering of conntrack entries
during conntrack table dump.
The nfct_query() API supports the new NFCT_Q_FLUSH_FILTER argument,
it allows to flush only ipv4 or ipv6 entries from the connection
tracking table.
nfct_snprint family of functions have been updated.
SCTP conntrack entries now support 'heartbeat sent/acked' state.
Entries offloaded to hardware include '[HW_OFFLOAD]' in the formatted
output string.
Notable bugs fixed with this release include:
Fix buffer overflows and out-of-bounds accesses in the
nfct_snprintf() functions.
nfct_nlmsg_build() did not work for ICMP flows unless all ICMP attributes
were set in the reply tuple too, this affected the 'conntrack' tool
where updates (e.g. setting the conntrack mark to a different value)
of ICMP flows would not work.
- Detailed Changes
src: Handle negative snprintf return values properly
src: Fix nfexp_snprintf return value docs
conntrack: Replace strncpy with snprintf to improve null byte handling
conntrack: Fix incorrect snprintf size calculation
include: Add ARRAY_SIZE() macro
conntrack: Fix buffer overflow on invalid icmp type in setters
conntrack: Move icmp request>reply type mapping to common file
conntrack: Fix buffer overflow in protocol related snprintf functions
conntrack: Fix buffer overflows in __snprintf_protoinfo* like in *2str fns
examples: check return value of nfct_nlmsg_build()
libnetfilter_conntrack.pc.in: add LIBMNL_LIBS to Libs.Private
conntrack: dccp print function should use dccp state
conntrack: sctp: update states
include: add CTA_STATS_CLASH_RESOLVE
include: sync uapi header with nf-next
src: add support for status dump filter
include: add CTA_STATS_CHAIN_TOOLONG from linux 5.15 uapi
libnetfilter_conntrack: bump version to 1.0.9
build: use the right automake variables
Update .gitignore
build: update obsolete autoconf macros
conntrack: fix invmap_icmpv6 entries
conntrack: Don't use ICMP attrs in decision to build repl tuple
src: add IPS_HW_OFFLOAD flag
conntrack: add flush filter command
build: missing internal/proto.h in Makefile.am
conntrack: add nfct_nlmsg_build_filter() helper
conntrack: don't cancel nest on unknown layer 4 protocols
tests: Fix for missing qa-connlabel.conf in tarball
tests: Add simple tests to TESTS variable
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit b685b5e7e9e2f6d48cae352431d82f3a96962e3d
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Fri Nov 18 23:50:42 2022 +0100
conntrack-tools: Update to version 1.4.7
- Update from 1.4.6 to 1.4.7
- Update of rootfile not required
- Requires update fo libnetfilter_conntrack from 1.0.8 to 1.0.9
- Changelog
conntrack-tools 1.4.7
This release contains new features:
* IPS_HW_OFFLOAD flag specifies that a conntrack entry has been
offloaded into the hardware
* 'clash_resolve' and 'chaintoolong' stats counters
* Default to unspec family if '-f' flag is absent to improve support for
dual-stack setups
* Support filtering events by IP address family
* Support flushing per IP address family
* Add "save" output format representing data in conntrack parameters
* Support loading conntrack commands from a batch file, e.g. generated
by "save" output format
* Annotate portid in events by the program name (if found)
* Accept yes/no as synonyms to on/off in conntrackd.conf
* Support user space helper auto-loading upon daemon startup, relieving
users from manual 'nfct add helper' calls
* Filter dumps by status on kernel side if possible
* Accept to filter for any status other than SEEN_REPLY using
'UNREPLIED'
* Use libmnl internally
* Reuse netlink socket for improved performance with bulk CT entry loads
* Remove '-o userspace' flag and always tag user space triggered events
* Introduce '-A' command, a variant of '-I' which does not fail if the
entry exists already
... and fixes:
* ICMP entry creation would fail when reply data was specified
* Sync zone value also
* Log external inject problems as warning only
* Endianness bug parsing IP addresses
* Ignore conntrack ID when looking up cache entries to allow for stuck
old ones to be replaced eventually
* Broken parsing of IPv6 M-SEARCH requests in ssdp cthelper
* Eliminate the need for lazy binding in nfct
* Fix for use of unknown protocol values
* Sanitize protocol value parsing, catch illegal values
* Ensure unknown protocol values are included in '-o save' dumps
... and documentation updates:
* Fixed examples in manual
* Refer to nf_conntrack sysctl instead of the deprecated ip_conntrack
one
* Misc updates to the manual
* Add an older example script creating an active-active setup using the
cluster match
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 28b9df01a6dc6359e3916984c9d2c5130eae68d2
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sat Nov 19 19:22:01 2022 +0000
linux-firmware: Do not ship firmware for Realtek Bluetooth devices
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit db38a4e9a7931f2d54c0204acfa04fb6f44099d4
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sat Nov 19 19:17:52 2022 +0000
Core Update 172: Do not ship amd-ucode/microcode_amd_fam19h.bin.asc
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit c932dcd7ae2c8398b02313d211a79d831b5d4d29
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sat Nov 19 19:16:07 2022 +0000
Core Update 172: Ship relevant changes of linux-firmware
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 1c609e13dee22191a09307c6a98783859a18248d
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sat Nov 19 11:18:51 2022 +0000
linux-firmware: Update to 20221109
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit d1fc3c7bee2f69814f32ddba16607b358e642b8a
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Fri Nov 18 20:06:27 2022 +0000
Core Update 172: Ship intel-microcode
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit bad01e125741a0bbb6141e733881856cad4ceab8
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Fri Nov 18 20:05:39 2022 +0000
intel-microcode: Update to 20221108
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit afd2a2a7b143ecf69bc7cda9b54199caadc4f7d4
Author: Robin Roevens <robin.roevens(a)disroot.org>
Date: Fri Nov 18 16:42:34 2022 +0100
Rename misleading "check filesystem" reboot option NL translation
Some users assume that "check filesystem" does more than just
trigger a simple "fsck" run. This patch changes the button label to avoid
confusion. - NL translation
Signed-off-by: Robin Roevens <robin.roevens(a)disroot.org>
commit cc7bd1145c0b81201b30e02d303997e176337ed9
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Fri Nov 18 19:55:12 2022 +0000
Core Update 172: Ship bind
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit ae45b1217a86b3733d02e8036d7bf26951f5d5a6
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Fri Nov 18 20:19:26 2022 +0100
bind: Update to 9.16.35
For details for 9.16.35 and 9.16.34 (we skipped the last) see:
https://downloads.isc.org/isc/bind9/9.16.35/doc/arm/html/notes.html#notes-f…
"Notes for BIND 9.16.35
Bug Fixes
A crash was fixed that happened when a dnssec-policy zone that used
NSEC3 was reconfigured to enable inline-signing. [GL #3591]
In certain resolution scenarios, quotas could be erroneously reached
for servers, including any configured forwarders, resulting in SERVFAIL
answers being sent to clients. This has been fixed. [GL #3598]
rpz-ip rules in response-policy zones could be ineffective in some
cases if a query had the CD (Checking Disabled) bit set to 1. This has
been fixed. [GL #3247]
Previously, if Internet connectivity issues were experienced during the
initial startup of named, a BIND resolver with dnssec-validation set to
auto could enter into a state where it would not recover without
stopping named, manually deleting the managed-keys.bind and
managed-keys.bind.jnl files, and starting named again. This has been
fixed. [GL #2895]
The statistics counter representing the current number of clients
awaiting recursive resolution results (RecursClients) could overflow in
certain resolution scenarios. This has been fixed. [GL #3584]
Previously, BIND failed to start on Solaris-based systems with hundreds
of CPUs. This has been fixed. [GL #3563]
When a DNS resource record’s TTL value was equal to the resolver’s
configured prefetch “eligibility” value, the record was erroneously not
treated as eligible for prefetching. This has been fixed. [GL #3603]
...
Notes for BIND 9.16.34
Bug Fixes
Changing just the TSIG key names for primaries in catalog zones’ member
zones was not effective. This has been fixed. [GL #3557]"
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 9d5d747799470e56fcceb30458c5c87769a2f85b
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Fri Nov 18 19:45:35 2022 +0000
dtc: Update rootfile
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit e044bc2422216610680bf3656d732dcc840de9d1
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Fri Nov 11 12:15:37 2022 +0000
Core Update 172: Ship and apply OpenVPN Diffie-Hellman changes
Inspired by https://git.ipfire.org/?p=people/ummeegge/ipfire-2.x.git;a=commit;h=2ccc799….
Cc: Erik Kapfer <erik.kapfer(a)ipfire.org>
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit bc6227963efe10575cdb7aadfc807bd3bd968e9d
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Fri Nov 11 12:15:03 2022 +0000
OpenSSL: Add ffdhe4096 Diffie-Hellman parameter
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 35494eac83dda575ec4e9998f8295809bf9a280d
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Fri Nov 11 12:14:37 2022 +0000
OpenVPN: Replace existing Diffie-Hellman parameter with ffdhe4096
Initial patch: https://git.ipfire.org/?p=people/ummeegge/ipfire-2.x.git;a=commit;h=2ccc799…
Minor adjustments to make it apply to the current state of "next", and
removal of chown operation in OpenSSL's LFS file, which would have lead
to the Diffie-Hellman group file being writable by nobody, for which
there is no necessity.
Fixes: #12632
From: Erik Kapfer <erik.kapfer(a)ipfire.org>
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit c899c04b11709fee4f38e9d13449b0e53527d907
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Mon Nov 7 18:54:14 2022 +0100
clamav 0.105.1: New package to resolve several CVEs
For details see:
https://blog.clamav.net/2022/10/new-packages-for-clamav-01037-01044.html
Fixes:
"CVE-2022-37434 - A critical severity vulnerability in the zlib library.
CVE-2022-40303 - A high severity vulnerability in the libxml2 library.
Note: As of writing, the details of this CVE are not published.
However, you can find additional details on other sites.
CVE-2022-40304 - A high severity vulnerability in the libxml2 library.
Note: As of writing, the details of this CVE are not published.
However, you can find additional details on other sites."
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
commit e87bc0b45638767d301ad706f5164ee2b64f5103
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Tue Nov 8 14:42:46 2022 +0000
Postfix: Update to 3.7.3
This is an urgent bugfix release, see
https://www.postfix.org/announcements/postfix-3.7.3.html for its
announcement.
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 8a0be2033f8d932b1687df1b6515bfb72230acf2
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Thu Nov 10 19:31:33 2022 +0000
Tor: Disable SOCKS port if unused
Fixes: #11780
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit ad7300839381a67872a1ce15f2e7d72540aa6c9c
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Oct 27 10:26:39 2022 +0200
memtest: update to memtest86+ v6.00
This is now a version 64bit version that can also boot via efi.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 39d6705063c1e00d946bfd1c9949666b3393527e
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Fri Nov 18 13:38:29 2022 +0000
Core Update 172: Fix menu.d file permissions
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit c8274d4cfa2a23ba1a4e856edd313c1215b9065b
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Fri Nov 18 13:37:51 2022 +0000
configroot: menu.d files do not have to be writable by "nobody"
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit eae0cb549aaafbf34f61c3b1778c99ca0dd4ad77
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Fri Nov 18 13:35:17 2022 +0000
Core Update 172: Fix permissions of some library files
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 362c5537afd468e479275dc4ced9363c50d25be2
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Fri Nov 18 13:33:45 2022 +0000
Ensure /var/ipfire/updatexlrator/updxlrator-lib.pl is not writable by "nobody"
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 3135e76ea193eb75c4b9b4315634ec418a23238f
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Fri Nov 18 13:29:10 2022 +0000
configroot: Ensure connscheduler/lib.pl is not writable by "nobody"
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit a26967c4b7c659a2fb134d4ddb9d120d3fcd3f16
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Thu Nov 10 21:23:24 2022 +0000
Tor: Update to 0.4.7.11
Please refer to https://gitlab.torproject.org/tpo/core/tor/-/raw/release-0.4.7/ReleaseNotes
for this versions' release notes.
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 32fcdf45e4bdd079506fbf148ce486d3a1c13bde
Author: Leo-Andres Hofmann <hofmann(a)leo-andres.de>
Date: Fri Nov 18 11:49:15 2022 +0100
Rename misleading "check filesystem" reboot option
Some users assume that "check filesystem" does more than
just trigger a simple "fsck" run. This patch changes the
button label to avoid confusion.
Signed-off-by: Leo-Andres Hofmann <hofmann(a)leo-andres.de>
Reviewed-by: Bernhard Bitsch <bbitsch(a)ipfire.org>
commit d41f25bd9651b3fa1dc2afefaf4787df69d49929
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Fri Nov 18 12:30:56 2022 +0000
Python3: Update 32-bit ARM rootfile
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 508b2dda8aadcc61fff691d76cb3354c7fde75d8
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Thu Nov 10 20:46:03 2022 +0000
python3-msgpack: Fix architecture placeholder in rootfile
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 4808c03710e7648dddba27a15dd5bc4568215fd7
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Thu Nov 10 15:26:28 2022 +0000
Core Update 172 requires a reboot
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit f9ab4c432aa681ce03a80e8c58bce237d6d982ef
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Thu Nov 10 15:26:00 2022 +0000
Core Update 172: Ship Python 3.10.8 and related changes
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit f6afaf5625564b06f04a09b8f863f1f04609a59e
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Wed Nov 9 19:57:34 2022 +0100
iotop: Modified rootfile with python-3.10.8
- rootfile for iotop is significantly different with python-3.10.8 compared to 3.10.1
Many entries now missing and iotop placed in bin instead of sbin despite source tarball
setup.py having a "dirty hack to make sure iotop is installed in sbin instead of bin"
- Added lines to lfs to move iotop from /bin to /sbin
- Tested iotop out with python-3.10.8 installed vm system and it worked without any
problems, the same as the existing version running with python-3.10.1
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit b92ee932053f10a152712ca5857b1f95622eee73
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Wed Nov 9 19:57:33 2022 +0100
libplist: Update rootfile for operation with python-3.10.8
- With python-3.10.8 the plist.so is no longer available in the site packages.
libplist libraries are still available.
- libplist is only used as a dependency for shairport-sync
Tested by installing shairport-sync and starting/stopping it. Started and stopped
successfully without any error messages. This would suggest that the libplist
libraries are probably being picked up successfully. Cannot test properly as I have
no Apple/iOS or related products.
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 0bae316983fd885274f4352ca8eb58c5c4f1d5dd
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Wed Nov 9 19:57:32 2022 +0100
python3-flit:Modify lfs to work with python-3.10.8
- The change to python-3.10.8 caused the rootfile to have temp build files from /root/.cache
to be included in it. Added commands to remove these temp build files so they were not
included to the rootfile.
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit d9a6af2841b5197a97677262247bb55b6c7844a7
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Wed Nov 9 19:57:31 2022 +0100
python3-urllib3:Update to version 1.26.12 and to work with python-3.10.8
- Updated from version 1.26.9 to 1.26.12
- Update of rootfile
- Changelog
1.26.12 (2022-08-22)
* Deprecated the `urllib3[secure]` extra and the `urllib3.contrib.pyopenssl` module.
Both will be removed in v2.x. See this `GitHub issue <https://github.com/urllib3/urllib3/issues/2680>`_
for justification and info on how to migrate.
1.26.11 (2022-07-25)
* Fixed an issue where reading more than 2 GiB in a call to ``HTTPResponse.read`` would
raise an ``OverflowError`` on Python 3.9 and earlier.
1.26.10 (2022-07-07)
* Removed support for Python 3.5
* Fixed an issue where a ``ProxyError`` recommending configuring the proxy as HTTP
instead of HTTPS could appear even when an HTTPS proxy wasn't configured.
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 03446e1efb5341170a521a6e5351ba2e105cc035
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Wed Nov 9 19:57:30 2022 +0100
python3-typing_extensions:Update to version 4.4.0 and to work with python-3.10.8
- Updated from version 4.1.1 to 4.4.0
- Update of rootfile
- Changelog
# Release 4.4.0 (October 6, 2022)
- Add `typing_extensions.Any` a backport of python 3.11's Any class which is
subclassable at runtime. (backport from python/cpython#31841, by Shantanu
and Jelle Zijlstra). Patch by James Hilton-Balfe (@Gobot1234).
- Add initial support for TypeVarLike `default` parameter, PEP 696.
Patch by Marc Mueller (@cdce8p).
- Runtime support for PEP 698, adding `typing_extensions.override`. Patch by
Jelle Zijlstra.
- Add the `infer_variance` parameter to `TypeVar`, as specified in PEP 695.
Patch by Jelle Zijlstra.
# Release 4.3.0 (July 1, 2022)
- Add `typing_extensions.NamedTuple`, allowing for generic `NamedTuple`s on
Python <3.11 (backport from python/cpython#92027, by Serhiy Storchaka). Patch
by Alex Waygood (@AlexWaygood).
- Adjust `typing_extensions.TypedDict` to allow for generic `TypedDict`s on
Python <3.11 (backport from python/cpython#27663, by Samodya Abey). Patch by
Alex Waygood (@AlexWaygood).
# Release 4.2.0 (April 17, 2022)
- Re-export `typing.Unpack` and `typing.TypeVarTuple` on Python 3.11.
- Add `ParamSpecArgs` and `ParamSpecKwargs` to `__all__`.
- Improve "accepts only single type" error messages.
- Improve the distributed package. Patch by Marc Mueller (@cdce8p).
- Update `typing_extensions.dataclass_transform` to rename the
`field_descriptors` parameter to `field_specifiers` and accept
arbitrary keyword arguments.
- Add `typing_extensions.get_overloads` and
`typing_extensions.clear_overloads`, and add registry support to
`typing_extensions.overload`. Backport from python/cpython#89263.
- Add `typing_extensions.assert_type`. Backport from bpo-46480.
- Drop support for Python 3.6. Original patch by Adam Turner (@AA-Turner).
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit da165e095a2ca5fe22e484ee539adfb5ab15fcb6
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Wed Nov 9 19:57:29 2022 +0100
python3-trio:Update to version 0.22.0 and to work with python-3.10.8
- Updated from version 0.21.0 to 0.22.0
- Update of rootfile
- No changelog found in source tarball or other location
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit ba9c2b56ac9f4504b15dee3c2a64c6d00e053004
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Wed Nov 9 19:57:28 2022 +0100
python3-sniffio:Update to version 1.3.0 and to work with python-3.10.8
- Updated from version 1.2.0 to 1.3.0
- Update of rootfile
- No changelog found in source tarball or other location
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit e4eb9f80fe1f1986c0e3eec4e1aabfaa47310364
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Wed Nov 9 19:57:27 2022 +0100
python3-setuptools:Update to version 65.4.1 and to work with python-3.10.8
- Updated from version 62.0.0 to 65.4.1
- Update of rootfile
- Changelog is too large to include here. Details can be found in the CHANGES.rst file
in the source tarball. Most of the changes are bug fixes
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 10d3e010fd63124c265709fd397856e98d41acc0
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Wed Nov 9 19:57:26 2022 +0100
python3-semantic_version:Update to version 2.10.0 and to work with python-3.10.8
- Updated from version 2.9.0 to 2.10.0
- Update of rootfile
- Changelog
2.10.0 (2022-05-26)
*New:*
* `132 <https://github.com/rbarrois/python-semanticversion/issues/132>`_:
Ensure sorting a collection of versions is always stable, even with
build metadata.
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 9976d905abf80b595b84d83bbd3070e2666764ad
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Wed Nov 9 19:57:25 2022 +0100
python3-s3transfer:Update to version 0.6.0 and to work with python-3.10.8
- Updated from version 0.5.2 to 0.6.0
- Update of rootfile- No changelog found in source tarball or other location
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 4c97d1c23cad4041d72454ca9eb7bd5bc9601d6b
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Wed Nov 9 19:57:24 2022 +0100
python3-rsa:Update to version 4.9 and to work with python-3.10.8
- Updated from version 4.8 to 4.9
- Update of rootfile
- Changelog
## Version 4.9 - release 2022-07-20
- Remove debug logging from `rsa/key.py`
([#194](https://github.com/sybrenstuvel/python-rsa/issues/194)).
- Remove overlapping slots in `PrivateKey` and `PublicKey`.
([#189](https://github.com/sybrenstuvel/python-rsa/pull/189)).
- Do not include CHANGELOG/LICENSE/README.md in wheel
([#191](https://github.com/sybrenstuvel/python-rsa/pull/191)).
- Fixed Key Generation Unittest: Public and Private keys are assigned the wrong way around
([#188](https://github.com/sybrenstuvel/python-rsa/pull/188)).
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 8b54edabe105706db36f83390a716a3d4e457aa1
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Wed Nov 9 19:57:23 2022 +0100
python3-requests:Update to version 2.28.1 and to work with python-3.10.8
- Updated from version 2.27.1 to 2.28.1
- Update of rootfile
- Changelog
2.28.1 (2022-06-29)
**Improvements**
- Speed optimization in `iter_content` with transition to `yield from`. (#6170)
**Dependencies**
- Added support for chardet 5.0.0 (#6179)
- Added support for charset-normalizer 2.1.0 (#6169)
2.28.0 (2022-06-09)
**Deprecations**
- ⚠️ Requests has officially dropped support for Python 2.7. ⚠️ (#6091)
- Requests has officially dropped support for Python 3.6 (including pypy3.6). (#6091)
**Improvements**
- Wrap JSON parsing issues in Request's JSONDecodeError for payloads without
an encoding to make `json()` API consistent. (#6097)
- Parse header components consistently, raising an InvalidHeader error in
all invalid cases. (#6154)
- Added provisional 3.11 support with current beta build. (#6155)
- Requests got a makeover and we decided to paint it black. (#6095)
**Bugfixes**
- Fixed bug where setting `CURL_CA_BUNDLE` to an empty string would disable
cert verification. All Requests 2.x versions before 2.28.0 are affected. (#6074)
- Fixed urllib3 exception leak, wrapping `urllib3.exceptions.SSLError` with
`requests.exceptions.SSLError` for `content` and `iter_content`. (#6057)
- Fixed issue where invalid Windows registry entires caused proxy resolution
to raise an exception rather than ignoring the entry. (#6149)
- Fixed issue where entire payload could be included in the error message for
JSONDecodeError. (#6036)
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 363bdb9c623f98a466c1c1c6312186037b9465fd
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Wed Nov 9 19:57:22 2022 +0100
python3-pytz:Update to version 2022.4 and to work with python-3.10.8
- Updated from version 2022.1 to 2022.4
- Update of rootfile
- Changelog
2022.4
An update to pytz has been released, containing the IANA 2022d timezone database.
There are no code changes.
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 6a4a621edba6eed387d53a8784e09075e7d46c02
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Wed Nov 9 19:57:21 2022 +0100
python3-pyparsing:Update to version 3.0.9 and to work with python-3.10.8
- Updated from version 3.0.7 to 3.0.9
- Update of rootfile
- Changelog
Version 3.0.9 -
- Added Unicode set `BasicMultilingualPlane` (may also be referenced
as `BMP`) representing the Basic Multilingual Plane (Unicode
characters up to code point 65535). Can be used to parse
most language characters, but omits emojis, wingdings, etc.
Raised in discussion with Dave Tapley (issue #392).
- To address mypy confusion of `pyparsing.Optional` and `typing.Optional`
resulting in `error: "_SpecialForm" not callable` message
reported in issue #365, fixed the import in exceptions.py. Nice
sleuthing by Iwan Aucamp and Dominic Davis-Foster, thank you!
(Removed definitions of `OptionalType`, `DictType`, and `IterableType`
and replaced them with `typing.Optional`, `typing.Dict`, and
`typing.Iterable` throughout.)
- Fixed typo in jinja2 template for railroad diagrams, thanks for the
catch Nioub (issue #388).
- Removed use of deprecated `pkg_resources` package in
railroad diagramming code (issue #391).
- Updated bigquery_view_parser.py example to parse examples at
https://cloud.google.com/bigquery/docs/reference/legacy-sql
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 87eb5329b2252dc9f5be2f0ddc8d67458821b7b0
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Wed Nov 9 19:57:20 2022 +0100
python3-pyfuse3:Update to version 3.2.2 and to work with python-3.10.8
- Updated from version 3.2.1 to 3.2.2
- Version 3.2.2 is a cythonised version of 3.2.1 resulting in no longer requiring Cython
- Update of rootfile
- Changelog
Release 3.2.2 (2022-09-28)
* remove support for python 3.5 (broken, out of support by python devs)
* cythonize with latest Cython 0.29.x (brings Python 3.11 support)
* use github actions for CI, remove travis-ci
* update README: minimal maintenance, not developed
* update setup.py with tested python versions
* examples/tmpfs.py: work around strange kernel behaviour (calling SETATTR after
UNLINK of a (not open) file): respond with ENOENT instead of crashing.
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 8d2347138bda5edd7c3fffeb3e5f3e692e6a0937
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Wed Nov 9 19:57:19 2022 +0100
python3-msgpack:Update to version 1.0.4 and to work with python-3.10.8
- Updated from version 1.0.3 to 1.0.4
- Update of rootfile
- No changelog found in source tarball or other location
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit e0423d2bf8cd361f90303ff2c29c9a9e58f64a75
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Wed Nov 9 19:57:18 2022 +0100
python3-jmespath:Update to version 1.0.1 and to work with python-3.10.8
- Updated from version 1.0.0 to 1.0.1
- Update of rootfile
- No changelog found in source tarball or other location
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 3b2dec125e663de16290d9407327f766c77b7adb
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Wed Nov 9 19:57:17 2022 +0100
python3-idna:Update to version 3.4 and to work with python-3.10.8
- Updated from version 3.3 to 3.4
- Update of rootfile
- Changelog
3.4 (2022-09-14)
- Update to Unicode 15.0.0
- Migrate to pyproject.toml for build information (PEP 621)
- Correct another instance where generic exception was raised instead of
IDNAError for malformed input
- Source distribution uses zeroized file ownership for improved
reproducibility
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 044c371cc22f445f8e6a668bf7c5444cc8648f17
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Wed Nov 9 19:57:16 2022 +0100
python3-docutils:Update to version 0.19 and to work with python-3.10.8
- Updated from version 0.18.1 to 0.19
- Update of rootfile
- Changelog
Release 0.19 (2022-07-05)
* General
- Dropped support for Python 2.7, 3.5, and 3.6. and removed compatibility
hacks from code and tests.
- Code cleanup,
check PEP 8 conformity with `flake8` (exceptions in file tox.ini).
* docutils/__main__.py
- New module. Support for ``python -m docutils``.
Also used for the ``docutils`` console script `entry point`.
* docutils/core.py:
- Let `Publisher.publish()` print info and prompt when waiting for input
from a terminal (cf. https://clig.dev/#interactivity).
- Respect "input_encoding_error_handler" setting when opening a source.
* docutils/io.py
- New function `error_string()`
obsoletes `utils.error_reporting.ErrorString`.
- Class `ErrorOutput` moved here from `utils/error_reporting`.
- Use "utf-8-sig" instead of Python's default encoding if the
"input_encoding" setting is None.
- Fix error when reading of UTF-16 encoded source without trailing newline.
* docutils/parsers/__init__.py
- Aliases "markdown" and "commonmark" point to "commonmark_wrapper".
- Alias for the "myst" parser (https://pypi.org/project/myst-docutils).
- Use absolute module names in `_parser_aliases` instead of two
import attempts. (Keeps details if the `recommonmark_wrapper.py` module
raises an ImportError.)
- Prepend parser name to ImportError if importing a parser class fails.
* docutils/parsers/commonmark_wrapper.py
- New module for parsing CommonMark input. Selects a locally installed
3rd-party parser (pycmark, myst, or recommonmark).
* docutils/parsers/recommonmark_wrapper.py
- Raise ImportError, if import of the upstream parser module fails.
If called from an `"include" directive`_,
the system-message now has source/line info.
- Adapt to and test with "recommonmark" versions 0.6.0 and 0.7.1.
.. _"include" directive: docs/ref/rst/directives.html#include
* docutils/parsers/rst/__init__.py
- Update PEP base URL (fixes bug #445),
use "https:" scheme in RFC base URL.
- Add `reporter` to `Directive` class attributes.
* docutils/parsers/rst/directives/__init__.py
- `parser_name()` keeps details if converting ImportError to ValueError.
* docutils/parsers/rst/roles.py
- Don't use mutable default values for function arguments. Fixes bug #430.
* docutils/transforms/universal.py
- Fix bug #435: invalid references in `problematic` nodes
with report_level=4.
* docutils/utils/__init__.py
- `decode_path()` returns `str` instance instead of `nodes.reprunicode`.
* docutils/utils/error_reporting.py
- Add deprecation warning.
* docutils/writers/_html_base.py
- Add "html writers" to `config_section_dependencies`. Fixes bug #443.
- Write table column widths with 3 digits precision. Fixes bug #444.
* docutils/writers/html5_polyglot/__init__.py
- Add space before "charset" meta tag closing sequence.
- Remove class value "controls" from an `image` node with video content
after converting it to a "control" attribute of the <video> tag.
- Wrap groups of footnotes in an ``<aside>`` for easier styling.
* docutils/writers/pep_html/
- Use "https:" scheme in "python_home" URL default.
- Fix links in template.txt.
* setup.py:
- New "docutils" console script `entry point`__. Fixes bug #447.
__ https://packaging.python.org/en/latest/specifications/entry-points/
* test/alltests.py
- Always encode the log file "alltests.out" using 'utf-8'.
* test/DocutilsTestSupport.py
- `exception_data()` now returns None if no exception was raised.
- `recommonmark_wrapper` only imported if upstream parser is present.
* test/test_parsers/test_rst/test_directives/test_tables.py
- Fix bug #436: Null char valid in CSV since Python 3.11.
* tools/docutils-cli.py
- Allow 3rd-party drop-in components for reader and parser, too.
- Fix help output.
- Actual code moved to docutils.__main__.py.
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 5de419768554a6cc1e709164bc94f8cda5d026e6
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Wed Nov 9 19:57:15 2022 +0100
python3-colorama:Update to version 0.4.5 and to work with python-3.10.8
- Updated from version 0.4.4 to 0.4.5
- Update of rootfile
- Changelog
0.4.5
* Catch a racy ValueError that could occur on exit.
* Create README-hacking.md, for Colorama contributors.
* Tweak some README unicode characters that don't render correctly on PyPI.
* Fix some tests that were failing on some operating systems.
* Add support for Python 3.9.
* Add support for PyPy3.
* Add support for pickling with the ``dill`` module.
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit f42da6c8c1bb9776529c5dc3cd6b9121db3215e2
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Wed Nov 9 19:57:14 2022 +0100
python3-click:Update to version 8.1.3 and to work with python-3.10.8
- Updated from version 8.1.2 to 8.1.3
- Update of rootfile
- Changelog
Version 8.1.3
- Use verbose form of ``typing.Callable`` for ``@command`` and
``@group``. :issue:`2255`
- Show error when attempting to create an option with
``multiple=True, is_flag=True``. Use ``count`` instead.
:issue:`2246`
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 8815cdbe5af71996eac29c148b9fa29bbe2506ad
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Wed Nov 9 19:57:13 2022 +0100
python3-circuitbreaker:Update to version 1.4.0 and to work with python-3.10.8
- Updated from version 1.3.2 to 1.4.0
- Update of rootfile
- Changelog
1.4.0 Latest
The circuitbreaker project has been classified as "Critical Project" on PyPI, meaning it belongs to the top 1% of all projects on PyPI based on the downloads over the last 6 months. We're working an important peace here 🙂
Fallback Function
By default, the circuit breaker will raise a CircuitBreaker exception when the circuit is opened. You can instead specify a function to be called when the circuit is opened. This function can be specified with the fallback_function parameter and will be called with the same parameters as the decorated function would be.
Custom callable for handling exceptions
The logic for handling thrown exceptions as failures can now be customized by passing a callable. The callable will be passed the exception type and value, and should return True if the exception should be treated as a failure.
Monotonic clock
Using the wall clock to measure durations is vulnerable to changes in the system clock causing misbehavior - a clock accidentally set far in the future and later reset could result in the circuit breaker remaining open for a great deal longer than expected. To solve this, a monotonic clock is now used for timing open states.
Circuitbreaker default name
The circuitbreaker default names are now taken from __qualname__ if available for more precise default naming.
Fixes and tooling
the project is now built on Github Action instead of Travis CI
building for python 3.10
applied smaller flake8 fixes
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit cce71b141c4ffd6f0b633a29b52c615232216fb4
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Wed Nov 9 19:57:12 2022 +0100
python3-charset-normalizer:Update to version 2.1.1 and to work with python-3.10.8
- Updated from version 2.0.12 to 2.1.1
- Update of rootfile
- Changelog
## [2.1.1](https://github.com/Ousret/charset_normalizer/compare/2.1.0...2.1.1) (2022-08-19)
### Deprecated
- Function `normalize` scheduled for removal in 3.0
### Changed
- Removed useless call to decode in fn is_unprintable (#206)
### Fixed
- Third-party library (i18n xgettext) crashing not recognizing utf_8 (PEP 263) with underscore from [@aleksandernovikov](https://github.com/aleksandernovikov) (#204)
## [2.1.0](https://github.com/Ousret/charset_normalizer/compare/2.0.12...2.1.0) (2022-06-19)
### Added
- Output the Unicode table version when running the CLI with `--version` (PR #194)
### Changed
- Re-use decoded buffer for single byte character sets from [@nijel](https://github.com/nijel) (PR #175)
- Fixing some performance bottlenecks from [@deedy5](https://github.com/deedy5) (PR #183)
### Fixed
- Workaround potential bug in cpython with Zero Width No-Break Space located in Arabic Presentation Forms-B, Unicode 1.1 not acknowledged as space (PR #175)
- CLI default threshold aligned with the API threshold from [@oleksandr-kuzmenko](https://github.com/oleksandr-kuzmenko) (PR #181)
### Removed
- Support for Python 3.5 (PR #192)
### Deprecated
- Use of backport unicodedata from `unicodedata2` as Python is quickly catching up, scheduled for removal in 3.0 (PR #194)
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit c083a72afe17c4d4789a1a0bc19801ba0ddc73b1
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Wed Nov 9 19:57:11 2022 +0100
python3-cffi:Update to version 1.15.1 and to work with python-3.10.8
- Updated from version 1.15.0 to 1.15.1
- Update of rootfile
- Changelog
v1.15.1
If you call ffi.embedding_api() but don’t write any extern “Python” function there, then the resulting C code would fail an assert. Fixed.
Updated Windows/arm64 embedded libffi static lib to v3.4.2, and scripted to ease future updates (thanks Niyas Sait!)
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit f3a337ece1bd9b6cc04497911cb80f3a5b953514
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Wed Nov 9 19:57:10 2022 +0100
python3-certifi:Update to version 2022.9.4 and to work with python-3.10.8
- Updated from version 2021.10.8 to 2022.9.4
- Update of rootfile
- No changelog found in source tarball or other location
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit c28c0d6f0d26f48611f62a00e6df026d2ad100ef
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Wed Nov 9 19:57:09 2022 +0100
python3-botocore:Update to version 1.27.89 and to work with python-3.10.8
- Updated from version 1.25.12 to 1.27.89
- Update of rootfile
- No changelog found in source tarball or other location
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit c52ff00f094d82ad93afbdea7ae1198cc12b1eda
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Wed Nov 9 19:57:08 2022 +0100
python3-attrs:Update to version 22.1.0 and to work with python-3.10.8
- Updated from version 21.4.0 to 22.1.0
- Update of rootfile
- Changelog
22.1.0 (2022-07-28)
Backwards-incompatible Changes
- Python 2.7 is not supported anymore.
Dealing with Python 2.7 tooling has become too difficult for a volunteer-run project.
We have supported Python 2 more than 2 years after it was officially discontinued and feel that we have paid our dues.
All version up to 21.4.0 from December 2021 remain fully functional, of course.
`#936 <https://github.com/python-attrs/attrs/issues/936>`_
- The deprecated ``cmp`` attribute of ``attrs.Attribute`` has been removed.
This does not affect the *cmp* argument to ``attr.s`` that can be used as a shortcut to set *eq* and *order* at the same time.
`#939 <https://github.com/python-attrs/attrs/issues/939>`_
Changes
- Instantiation of frozen slotted classes is now faster.
`#898 <https://github.com/python-attrs/attrs/issues/898>`_
- If an ``eq`` key is defined, it is also used before hashing the attribute.
`#909 <https://github.com/python-attrs/attrs/issues/909>`_
- Added ``attrs.validators.min_len()``.
`#916 <https://github.com/python-attrs/attrs/issues/916>`_
- ``attrs.validators.deep_iterable()``'s *member_validator* argument now also accepts a list of validators and wraps them in an ``attrs.validators.and_()``.
`#925 <https://github.com/python-attrs/attrs/issues/925>`_
- Added missing type stub re-imports for ``attrs.converters`` and ``attrs.filters``.
`#931 <https://github.com/python-attrs/attrs/issues/931>`_
- Added missing stub for ``attr(s).cmp_using()``.
`#949 <https://github.com/python-attrs/attrs/issues/949>`_
- ``attrs.validators._in()``'s ``ValueError`` is not missing the attribute, expected options, and the value it got anymore.
`#951 <https://github.com/python-attrs/attrs/issues/951>`_
- Python 3.11 is now officially supported.
`#969 <https://github.com/python-attrs/attrs/issues/969>`_
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit e18e8a70201af82743b5c495e393ad58113807eb
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Wed Nov 9 19:57:07 2022 +0100
python3-arrow:Update to version 1.2.3 and to work with python-3.10.8
- Updated from version 1.2.2 to 1.2.3
- Update of rootfile
- Changelog
1.2.3 (2022-06-25)
- [NEW] Added Amharic, Armenian, Georgian, Laotian and Uzbek locales.
- [FIX] Updated Danish locale and associated tests.
- [INTERNAl] Small fixes to CI.
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit fa613d31c804e3b364ce0f8ae652b0ea74a6eec4
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Wed Nov 9 19:57:06 2022 +0100
rust-pyo3-build-config:Update to version 0.15.2 - required by python3-cryptography
- Updated from version 0.15.1 to 0.15.2
- Update of rootfile
- No changelog found in source tarball or other location
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit c74a3eead3ff598532bae5b53f77c02c8ff9527c
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Wed Nov 9 19:57:05 2022 +0100
rust-pyo3-macros-backend:Update to version 0.15.2 - required by python3-cryptography
- Updated from version 0.15.1 to 0.15.2
- Update of rootfile
- No changelog found in source tarball or other location
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit fd9d183c211beeb47a068604217230b56eeacb30
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Wed Nov 9 19:57:04 2022 +0100
rust-pyo3-macros:Update to version 0.15.2 - required by python3-cryptography
- Updated from version 0.15.1 to 0.15.2
- Update of rootfile
- No changelog found in source tarball or other location
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 9ab0df2c67ee9bc5714631081f9a22dd60157415
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Wed Nov 9 19:57:03 2022 +0100
rust-pyo3:Update to version 0.15.2 - required by python3-cryptography
- Updated from version 0.15.1 to 0.15.2
- Update of rootfile
- Changelog
## [0.15.2] - 2022-04-14
### Packaging
- Backport of PyPy 3.9 support from PyO3 0.16. [#2262](https://github.com/PyO3/pyo3/pull/2262)
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 7b43fb6b7d7edd2b1b19e789008a72dff28bf146
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Wed Nov 9 19:57:02 2022 +0100
rust-pem:Update to version 1.1.0 - required by python3-cryptography
- Updated from version 1.0.2 to 1.1.0
- Update of rootfile
- Changelog found in source tarball stops at version 1.0.1 No changelog found elsewhere
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 217e9db5912bd65310aec837296ce5a52fa7cc4a
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Wed Nov 9 19:57:01 2022 +0100
rust-ouroboros_macro:Update to version 0.15.5 - required by python3-cryptography
- Updated from version 0.13.0 to 0.15.5
- Update of rootfile
- No changelog found in source tarball or other location
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit c8e187ba8e56c9fdbcfa3c8ec78e94e735c09563
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Wed Nov 9 19:57:00 2022 +0100
rust-ouroboros:Update to version 0.15.5 - required by python3-cryptography
- Updated from version 0.13.0 to 0.15.5
- Update of rootfile
- No changelog found in source tarball or other location
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit f80eb8b8f6cc4dce927ad43e1140428cfc93648e
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Wed Nov 9 19:56:59 2022 +0100
rust-asn1_derive:Update to version 0.12.2 - required by python3-cryptography
- Updated from version 0.8.7 to 0.12.2
- Update of rootfile
- No changelog found in source tarball or other location
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit db101b368a9c9408041fdb65a815d6a664f32432
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Wed Nov 9 19:56:58 2022 +0100
rust-asn1: Update to version 0.12.2 - required by python3-cryptography
- Updated from version 0.8.7 to 0.12.2
- Update of rootfile
- No changelog found in source tarball or other location
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit d116f35a366627996a83f9ec2610271520cbd2d5
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Wed Nov 9 19:56:57 2022 +0100
rust-iana-time-zone: Required by updated rust-chrono
- Install of version 0.1.51
- Definition of rootfile
- Creation of metadata patch to eliminate windows options
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 9745d784b97d975979f0f7b22eced1583ffe4025
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Wed Nov 9 19:56:56 2022 +0100
rust-chrono:Update to version 0.4.22 required by python3-cryptography
- Updated from version 0.4.19 to 0.4.22
- Update of rootfile
- Update of metadata patch as more windows related entries in Cargo.toml to be excluded
- Changelog
## 0.4.22
* Allow wasmbindgen to be optional on `wasm32-unknown-unknown` target [(#771)](https://github.com/chronotope/chrono/pull/771)
* Fix compile error for `x86_64-fortanix-unknown-sgx` [(#767)](https://github.com/chronotope/chrono/pull/767)
* Update `iana-time-zone` version to 1.44 [(#773)](https://github.com/chronotope/chrono/pull/773)
## 0.4.21
* Fall back to UTC timezone in cases where no timezone is found [(#756)](https://github.com/chronotope/chrono/pull/756)
* Correctly detect timezone on Android [(#756)](https://github.com/chronotope/chrono/pull/756)
* Improve documentation for strftime `%Y` specifier [(#760)](https://github.com/chronotope/chrono/pull/760)
## 0.4.20
* Add more formatting documentation and examples.
* Add support for microseconds timestamps serde serialization/deserialization (#304)
* Fix `DurationRound` is not TZ aware (#495)
* Implement `DurationRound` for `NaiveDateTime`
* Implement `std::iter::Sum` for `Duration`
* Add `DateTime::from_local()` to construct from given local date and time (#572)
* Add a function that calculates the number of years elapsed between now and a given `Date` or `DateTime` (#557)
* Correct build for wasm32-unknown-emscripten target (#568)
* Change `Local::now()` and `Utc::now()` documentation from "current date" to "current date and time" (#647)
* Fix `duration_round` panic on rounding by `Duration::zero()` (#658)
* Add optional rkyv support.
* Add support for microseconds timestamps serde serialization for `NaiveDateTime`.
* Add support for optional timestamps serde serialization for `NaiveDateTime`.
* Fix build for wasm32-unknown-emscripten (@yu-re-ka #593)
* Make `ParseErrorKind` public and available through `ParseError::kind()` (#588)
* Implement `DoubleEndedIterator` for `NaiveDateDaysIterator` and `NaiveDateWeeksIterator`
* Fix panicking when parsing a `DateTime` (@botahamec)
* Add support for getting week bounds based on a specific `NaiveDate` and a `Weekday` (#666)
* Remove libc dependency from Cargo.toml.
* Add the `and_local_timezone` method to `NaiveDateTime`
* Fix the behavior of `Duration::abs()` for negative durations with non-zero nanos
* Add compatibility with rfc2822 comments (#733)
* Make `js-sys` and `wasm-bindgen` enabled by default when target is `wasm32-unknown-unknown` for ease of API discovery
* Add the `Months` struct and associated `Add` and `Sub` impls
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 97119282dde51c5536c67556d2200d128b4124c4
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Wed Nov 9 19:56:55 2022 +0100
python3-cryptography:Update to version 38.0.1 and to work with python-3.10.8
- Updated from version 36.0.2 to 38.0.1
- Update of rootfile
- Changelog
38.0.1 - 2022-09-07
Fixed parsing TLVs in ASN.1 with length greater than 65535 bytes (typically seen in large CRLs).
38.0.0 - 2022-09-06
Final deprecation of OpenSSL 1.1.0. The next release of cryptography will drop support.
We no longer ship many linux 2010 wheels. Users should upgrade to the latest pip to ensure this doesn’t cause issues downloading wheels on their platform. We now ship manylinux_2_28 wheels for users on new enough platforms.
Updated the minimum supported Rust version (MSRV) to 1.48.0, from 1.41.0. Users with the latest pip will typically get a wheel and not need Rust installed, but check Installation for documentation on installing a newer rustc if required.
decrypt() and related methods now accept both str and bytes tokens.
Parsing CertificateSigningRequest restores the behavior of enforcing that the Extension critical field must be correctly encoded DER. See the issue for complete details.
Added two new OpenSSL functions to the bindings to support an upcoming pyOpenSSL release.
When parsing CertificateRevocationList and CertificateSigningRequest values, it is now enforced that the version value in the input must be valid according to the rules of RFC 2986 and RFC 5280.
Using MD5 or SHA1 in CertificateBuilder and other X.509 builders is deprecated and support will be removed in the next version.
Added additional APIs to SignedCertificateTimestamp, including signature_hash_algorithm, signature_algorithm, signature, and extension_bytes.
Added tbs_precertificate_bytes, allowing users to access the to-be-signed pre-certificate data needed for signed certificate timestamp verification.
KBKDFHMAC and KBKDFCMAC now support MiddleFixed counter location.
Fixed RFC 4514 name parsing to reverse the order of the RDNs according to the section 2.1 of the RFC, affecting method from_rfc4514_string().
It is now possible to customize some aspects of encryption when serializing private keys, using encryption_builder().
Removed several legacy symbols from our OpenSSL bindings. Users of pyOpenSSL versions older than 22.0 will need to upgrade.
Added AES128 and AES256 classes. These classes do not replace AES (which allows all AES key lengths), but are intended for applications where developers want to be explicit about key length.
37.0.4 - 2022-07-05
Updated Windows, macOS, and Linux wheels to be compiled with OpenSSL 3.0.5.
37.0.3 - 2022-06-21 (YANKED)¶
Attention
This release was subsequently yanked from PyPI due to a regression in OpenSSL.
Updated Windows, macOS, and Linux wheels to be compiled with OpenSSL 3.0.4.
37.0.2 - 2022-05-03
Updated Windows, macOS, and Linux wheels to be compiled with OpenSSL 3.0.3.
Added a constant needed for an upcoming pyOpenSSL release.
37.0.1 - 2022-04-27
Fixed an issue where parsing an encrypted private key with the public loader functions would hang waiting for console input on OpenSSL 3.0.x rather than raising an error.
Restored some legacy symbols for older pyOpenSSL users. These will be removed again in the future, so pyOpenSSL users should still upgrade to the latest version of that package when they upgrade cryptography.
37.0.0 - 2022-04-26
Updated Windows, macOS, and Linux wheels to be compiled with OpenSSL 3.0.2.
BACKWARDS INCOMPATIBLE: Dropped support for LibreSSL 2.9.x and 3.0.x. The new minimum LibreSSL version is 3.1+.
BACKWARDS INCOMPATIBLE: Removed signer and verifier methods from the public key and private key classes. These methods were originally deprecated in version 2.0, but had an extended deprecation timeline due to usage. Any remaining users should transition to sign and verify.
Deprecated OpenSSL 1.1.0 support. OpenSSL 1.1.0 is no longer supported by the OpenSSL project. The next release of cryptography will be the last to support compiling with OpenSSL 1.1.0.
Deprecated Python 3.6 support. Python 3.6 is no longer supported by the Python core team. Support for Python 3.6 will be removed in a future cryptography release.
Deprecated the current minimum supported Rust version (MSRV) of 1.41.0. In the next release we will raise MSRV to 1.48.0. Users with the latest pip will typically get a wheel and not need Rust installed, but check Installation for documentation on installing a newer rustc if required.
Deprecated CAST5, SEED, IDEA, and Blowfish because they are legacy algorithms with extremely low usage. These will be removed in a future version of cryptography.
Added limited support for distinguished names containing a bit string.
We now ship universal2 wheels on macOS, which contain both arm64 and x86_64 architectures. Users on macOS should upgrade to the latest pip to ensure they can use this wheel, although we will continue to ship x86_64 specific wheels for now to ease the transition.
This will be the final release for which we ship manylinux2010 wheels. Going forward the minimum supported manylinux ABI for our wheels will be manylinux2014. The vast majority of users will continue to receive manylinux wheels provided they have an up to date pip. For PyPy wheels this release already requires manylinux2014 for compatibility with binaries distributed by upstream.
Added support for multiple OCSPSingleResponse in a OCSPResponse.
Restored support for signing certificates and other structures in X.509 with SHA3 hash algorithms.
TripleDES is disabled in FIPS mode.
Added support for serialization of PKCS#12 CA friendly names/aliases in serialize_key_and_certificates()
Added support for 12-15 byte (96 to 120 bit) nonces to AESOCB3. This class previously supported only 12 byte (96 bit).
Added support for AESSIV when using OpenSSL 3.0.0+.
Added support for serializing PKCS7 structures from a list of certificates with serialize_certificates.
Added support for parsing RFC 4514 strings with from_rfc4514_string().
Added AUTO to PSS. This can be used to verify a signature where the salt length is not already known.
Added DIGEST_LENGTH to PSS. This constant will set the salt length to the same length as the PSS hash algorithm.
Added support for loading RSA-PSS key types with load_pem_private_key() and load_der_private_key(). This functionality is limited to OpenSSL 1.1.1e+ and loads the key as a normal RSA private key, discarding the PSS constraint information.
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 7a251a1fa3f08cb1bebb681dff6055828d01e062
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Wed Nov 9 19:56:54 2022 +0100
python3-setuptools-scm:Update to version 7.0.5 and to work with python-3.10.8
- Updated from version 6.4.2 to 7.0.5
- Update of rootfile
- Changelog
v7.0.5
Merge pull request #746 from RonnyPfannschmidt/release-prep
v7.0.4
Merge pull request #739 from RonnyPfannschmidt/fix-738-protect-relative-to
v7.0.3
What's Changed
Hg / pip compatibility by @paugier in #729
fix #728: remove git arguments that triggered wrong branch names by @RonnyPfannschmidt in #730
fix #691 - support root in pyproject.toml even for cli by @RonnyPfannschmidt in #731
fix #727: correctly handle incomplete archivals from setuptools_scm_g… by @RonnyPfannschmidt in #732
cleanup pyproject loading and allow cli relative roots to be specified by @RonnyPfannschmidt in #736
Update the README: document support for Git archives by @Changaco in #734
v7.0.2
Merge pull request #724 from RonnyPfannschmidt/fix-722-self-bootstrap
v7.0.1
Merge pull request #719 from kojiromike/missing-importlib
v7.0.0
pre-commit update
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 47cfdd293ee997fa878f695e1a5dc3bad2861b54
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Wed Nov 9 19:56:53 2022 +0100
python3-setuptools-rust:Update to version 1.5.2 and to work with python-3.10.8
- Updated from version 1.2.0 to 1.5.2
- Update of rootfile
- Changelog
v1.5.2
Fixed
Fix regression in dylib build artifacts not being found since 1.5.0. #290
Fix regression in sdist missing examples and other supplementary files since 1.5.0. #291
v1.5.1
Fixed
Fix regression in get_lib_name crashing since 1.5.0. #280
Fix regression in Binding.Exec builds with multiple executables not finding built executables since 1.5.0. #283
v1.5.0
Added
Add support for extension modules built for wasm32-unknown-emscripten with Pyodide. #244
Changed
Locate cdylib artifacts by handling messages from cargo instead of searching target dir (fixes build on MSYS2). #267
No longer guess cross-compile environment using HOST_GNU_TYPE / BUILD_GNU_TYPE sysconfig variables. #269
Fixed
Fix RustBin build without wheel. #273
Fix RustBin setuptools install. #275
v1.4.1
Fixed
Fix crash when checking Rust version. #263
v1.4.0
Packaging
Increase minimum setuptools version to 62.4. #222
Added
Add cargo_manifest_args to support locked, frozen and offline builds. #234
Add RustBin for packaging binaries in scripts data directory. #248
Changed
Exec binding RustExtension with script=True is deprecated in favor of RustBin. #248
Errors while calling cargo metadata are now reported back to the user #254
quiet option will now suppress output of cargo metadata. #256
setuptools-rust will now match cargo behavior of not setting --target when the selected target is the rust host. #258
Deprecate native option of RustExtension. #258
Fixed
If the sysconfig for BLDSHARED has no flags, setuptools-rust won't crash anymore. #241
v1.3.0
Packaging
Increase minimum setuptools version to 58. #222
Fixed
Fix crash when python-distutils-extra linux package is installed. #222
Fix sdist built with vendored dependencies on Windows having incorrect cargo config. #223
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 8d7395e6661e3db11787d5fdc5719474ddfcb966
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Wed Nov 9 19:56:52 2022 +0100
python3-pep517:Update to version 0.13.0 and to work with python-3.10.8
- Updated from version 0.12.0 to 0.13.0
- Update of rootfile
- No Changelog available in the source tarball or pypi or the github repository
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit d8c94dabb588c2160e68a4ee6b95ec8c36587b5d
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Wed Nov 9 19:56:51 2022 +0100
python3-daemon: Update to version 2.3.1 and to work with python-3.10.8
- Updated from version 2.3.0 to 2.3.1
- Update of rootfile
- Changelog
Version 2.3.1
Bugs Fixed:
* Avoid operations on a closed stream file when detecting a socket.
Closes: Pagure #64. Thanks to Mark Richman for the report.
* Correct use of names to allow `from daemon import *`.
Closes: Pagure #65. Thanks to July Tikhonov for the report.
Changed:
* Speed daemon start time by computing candidate file descriptors once.
Closes: Pagure #40. Thanks to Alex Pyrgiotis for the report.
* Remove incorrect double-patch of objects in test cases.
Closes: Pagure #62. Thanks to Miro Hrončok for the report.
* Deprecate helper function `is_socket`.
The function incorrectly causes `ValueError` when the file object is already
closed. Migrate to the new `is_socket_file` helper function instead.
Removed:
* Drop backward-compatible helpers that provided Python 2 support.
* declaration of source encoding ‘utf-8’
* absolute_import
* unicode_literals
* module-level metaclass `type`
* unification of str with unicode type
* renamed standard library exceptions and modules
* raise exception from context exception
All these are default behaviour in Python 3 and need no special
handling.
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit b7fbfaded5eb65afd9f3fc63d3fdc77ecaa930f7
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Wed Nov 9 19:56:50 2022 +0100
python3-build: Update to version 0.8.0 and to work with python-3.10.8
- Updated from version 0.7.0 to 0.8.0
- Update of rootfile
- Changelog
0.8.0 (2022-05-22)
Accept os.PathLike[str] in addition to str for paths in public API
(PR #392, Fixes #372)
Add schema validation for build-system table to check conformity with PEP 517
and PEP 518 (PR #365, Fixes #364)
Better support for Python 3.11 (sysconfig schemes PR #434, PR #463,
tomllib PR #443, warnings PR #420)
Improved error printouts (PR #442)
Avoid importing packaging unless needed (PR #395, Fixes #393)
Breaking Changes
Failure to create a virtual environment in the build.env module now raises
build.FailedProcessError (PR #442)
- As far as I can tell IPFire does not use the build.env module and the built iso
installed successfully
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 9d8a588351ab32ca9524202b8dc15a40db5ac756
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Wed Nov 9 19:56:49 2022 +0100
python3-Cython: Removal of this module from IPFire
- New version of python3-pyfuse3 has been cythonised so Cython no longer required
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 50274d92e86b5bc4c96e219538aa635cf04d80d5
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Wed Nov 9 19:56:48 2022 +0100
make.sh: Addition, deletion and re-orderiong of packages for Python-3.10.8
- Addition of rust-iana-time-zone and removal of python3-Cython as updated python3-pyfuse
can be built now without Cython.
- python3-toml and python3-pyproject2setuppy moved earlier as updated python3-pyparsing
no longer has setup.py file
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit a3e169e897d8a804eb66aad56d0fe98ac0f57d30
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Wed Nov 9 19:56:47 2022 +0100
python3: Update to version 3.10.8
- Update from version 3.10.1 to 3.10.8
- Update of rootfile
- Changelog is too large to include hear. More details can be found at
https://docs.python.org/3.10/whatsnew/changelog.html#changelog
- Installed Iso, created from build of this python update series, into a vm testbed clone.
All pages and contents worked. No issues found on any WUI page.
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit dcecf6f8a93b126452efa4a5c12e7aa5bc610139
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Tue Nov 8 14:39:42 2022 +0000
Core Update 172: Ship vnstat
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit c7369b4bf14bf6d8b1b911202621edcbfcda0709
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Mon Nov 7 19:03:55 2022 +0100
vnstat: Update to 2.10
For details see:
https://humdi.net/vnstat/CHANGES
"2.10 / 22-Oct-2022
- Fixed
- BandwidthDetection in BSD wasn't correctly converting kernel reported
bits per second values to Mbits per second resulting in a sanity check
being triggered and detected values not being used expect for PPPoE
interfaces which incorrectly were detected as 64000 Mbit
- Image output of 5 minute graph wasn't possible if data retention of the
5 minute time period was configured as unlimited
(pull request by Sebastian Lechte)
- Estimates and average rates weren't calculated correctly for daily,
monthly and yearly time periods when monitoring of the interface had been
started during the ongoing time period
- Estimates weren't being shown in summary output when OutputStyle or
--style was configured with a value less than 2 (vnstat)
- Alignment of column header in short output wasn't correct when
OutputStyle or --style was configured with the value 0 (vnstat)
- New
- Support input of more than 31 characters in interface name when using
interface1+interface2 syntax data merge queries
- Support passing --config option multiple times, later files override
earlier files if settings overlap (vnstat and vnstati)
- Add configuration option EstimateVisible for controlling the visibility
of the estimate line
- Add configuration option EstimateText for modifying the default
"estimated" text string when the estimate line is visible
- Add --style support to -tr / --traffic output
- Add summary option to --json and --xml outputs
- Add timestamps to --json and --xml outputs
- Add Prometheus compatible metrics endpoint cgi to examples
(examples/vnstat-metrics.cgi)"
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 0600bf162d12dccfacab571f2bec856f2f7a8944
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Tue Nov 8 14:38:32 2022 +0000
strongSwan: Commit forgotten LFS file changes
My fault, again.
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit d3a4fcc7097a3df6e45f4d2b15960ccb61f0152f
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Tue Nov 8 11:15:05 2022 +0000
Core Update 172: Remove powertop add-on, if installed
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit f7b0247e02ed5af880f03932807d039ef9008d91
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Mon Nov 7 12:24:07 2022 +0000
Drop powertop
This has been discussed briefly in the telephone conference of
September: powertop is considered to be unnecessary, as IPFire is
optimized for performance, thus interfering with possible power
consumption reducing switches. Also, the need for powertop has been
diminished, given that x86 platforms are highly likely not to run on
batteries, and we are phasing out 32-bit ARM, where this could have been
the case.
Therefore, this patch proposes to drop powertop.
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 0675d2a449a121f52065db9314dbe18edd7205e0
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Tue Nov 8 11:13:30 2022 +0000
Core Update 172: Ship libxml2
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 639e23b847e17b288bb6ed3e3e4f1a10abe30093
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Mon Nov 7 22:14:14 2022 +0100
libxml2: Update to version 2.10.3
- Update from version 2.9.14 to 2.10.3
- Update of rootfile
- Changelog
v2.10.3: Oct 14 2022
### Security
- [CVE-2022-40304] Fix dict corruption caused by entity reference cycles
- [CVE-2022-40303] Fix integer overflows with XML_PARSE_HUGE
- Fix overflow check in SAX2.c
### Portability
- win32: Fix build with VS2013
### Build system
- cmake: Set SOVERSION
v2.10.2: Aug 29 2022
### Improvements
- Remove set-but-unused variable in xmlXPathScanName
- Silence -Warray-bounds warning
### Build system
- build: require automake-1.16.3 or later (Xi Ruoyao)
- Remove generated files from distribution
### Test suite
- Don't create missing.xml when running testapi
v2.10.1: Aug 25 2022
### Regressions
- Fix xmlCtxtReadDoc with encoding
### Bug fixes
- Fix HTML parser with threads and --without-legacy
### Build system
- Fix build with Python 3.10
- cmake: Disable version script on macOS
- Remove Makefile rule to build testapi.c
### Documentation
- Switch back to HTML output for API documentation
- Port doc/examples/index.py to Python 3
- Fix order of exports in libxml2-api.xml
- Remove libxml2-refs.xml
v2.10.0: Aug 17 2022
### Security
- [CVE-2022-2309] Reset nsNr in xmlCtxtReset
- Reserve byte for NUL terminator and report errors consistently in xmlBuf and
xmlBuffer (David Kilzer)
- Fix missing NUL terminators in xmlBuf and xmlBuffer functions (David Kilzer)
- Fix integer overflow in xmlBufferDump() (David Kilzer)
- xmlBufAvail() should return length without including a byte for NUL
terminator (David Kilzer)
- Fix ownership of xmlNodePtr & xmlAttrPtr fields in xmlSetTreeDoc() (David
Kilzer)
- Use xmlNewDocText in xmlXIncludeCopyRange
- Fix use-after-free bugs when calling xmlTextReaderClose() before
xmlFreeTextReader() on post-validating parser (David Kilzer)
- Use UPDATE_COMPAT() consistently in buf.c (David Kilzer)
- fix: xmlXPathParserContext could be double-delete in OOM case. (jinsub ahn)
### Removals and deprecations
- Disable XPointer location support by default
- Remove outdated xml2Conf.sh
- Deprecate module init and cleanup functions
- Remove obsolete XML Software Autoupdate (XSA) file
- Remove DOCBparser
- Remove obsolete Python test framework
- Remove broken VxWorks support
- Remove broken Mac OS 9 support
- Remove broken bakefile support
- Remove broken Visual Studio 2010 support
- Remove broken Windows CE support
- Deprecate IDREF-related functions in valid.h
- Deprecate legacy functions
- Disable legacy support by default
- Deprecate all functions in nanoftp.h
- Disable FTP support by default
- Add XML_DEPRECATED macro
- Remove elfgcchack.h
### Regressions
- Skip incorrectly opened HTML comments
- Restore behavior of htmlDocContentDumpFormatOutput() (David Kilzer)
### Bug fixes
- Fix memory leak with invalid XSD
- Make XPath depth check work with recursive invocations
- Fix memory leak in xmlLoadEntityContent error path
- Avoid double-free if malloc fails in inputPush
- Properly fold whitespace around the QName value when validating an XSD
schema. (Damjan Jovanovic)
- Add whitespace folding for some atomic data types that it's missing on.
(Damjan Jovanovic)
- Don't add IDs containing unexpanded entity references
### Improvements
- Avoid calling xmlSetTreeDoc
- Simplify xmlFreeNode
- Don't reset nsDef when changing node content
- Fix unintended fall-through in xmlNodeAddContentLen
- Remove unused xmlBuf functions (David Kilzer)
- Implement xpath1() XPointer scheme
- Add configuration flag for XPointer locations support
- Fix compiler warnings in Python code
- Mark more static data as `const` (David Kilzer)
- Make xmlStaticCopyNode non-recursive
- Clean up encoding switching code
- Simplify recursive pthread mutex
- Use non-recursive mutex in dict.c
- Fix parser progress checks
- Avoid arithmetic on freed pointers
- Improve buffer allocation scheme
- Remove unneeded #includes
- Add support for some non-standard escapes in regular expressions. (Damjan
Jovanovic)
- htmlParseComment: handle abruptly-closed comments (Mike Dalessio)
- Add let variable tag support (Oliver Diehl)
- Add value-of tag support (Oliver Diehl)
- Remove useless call to xmlRelaxNGCleanupTypes
- Don't include ICU headers in public headers
- Update `xmlStrlen()` to use POSIX / ISO C `strlen()` (Mike Dalessio)
- Fix unused variable warnings with disabled features
- Only warn on invalid redeclarations of predefined entities
- Remove unneeded code in xmlreader.c
- Rework validation context flags
### Portability
- Use NAN/INFINITY if available to init XPath NaN/Inf (Sergey Kosukhin)
- Fix Python tests on macOS
- Fix xmlCleanupThreads on Windows
- Fix reinitialization of library on Windows
- Don't mix declarations and code in runtest.c
- Use portable python shebangs (David Seifert)
- Use critical sections as mutex on Windows
- Don't set HAVE_WIN32_THREADS in win32config.h
- Use stdint.h with newer MSVC
- Remove cruft from win32config.h
- Remove isinf/isnan emulation in win32config.h
- Always fopen files with "rb"
- Remove __DJGPP__ checks
- Remove useless __CYGWIN__ checks
### Build system
- Don't autogenerate doc/examples/Makefile.am
- cmake: Install libxml.m4 on UNIX-like platforms (Daniel E)
- cmake: Use symbol versioning on UNIX-like platforms (Daniel E)
- Port genUnicode.py to Python 3
- Port gentest.py to Python 3
- cmake: Fix build without thread support
- cmake: Install documentation in CMAKE_INSTALL_DOCDIR
- cmake: Remove non needed files in docs dir (Daniel E)
- configure: move XML_PRIVATE_LIBS after WIN32_EXTRA_LIBADD is set
(Christopher Degawa)
- Move local Autoconf macros into m4 directory
- Use XML_PRIVATE_LIBS in libxml2_la_LIBADD
- Update libxml-2.0-uninstalled.pc.in
- Remove LIBS from XML_PRIVATE_LIBS
- Add WIN32_EXTRA_LIBADD to XML_PRIVATE_LIBS
- Don't overlink executables
- cmake: Adjust paths for UNIX or UNIX-like target systems (Daniel Engberg)
- build: Make use of variables in libxml's pkg-config file (Daniel Engberg)
- Avoid obsolescent `test -a` constructs (David Seifert)
- Move AM_MAINTAINER_MODE to AM section
- configure.ac: make AM_SILENT_RULES([yes]) unconditional (David Seifert)
- Streamline documentation installation
- Don't try to recreate COPYING symlink
- Detect libm using libtool's macros (David Seifert)
- configure.ac: disable static libraries by default (David Seifert)
- python/Makefile.am: nest python docs in $(docdir) (David Seifert)
- python/Makefile.am: rely on global AM_INIT_AUTOMAKE (David Seifert)
- Makefile.am: install examples more idiomatically (David Seifert)
- configure.ac: remove useless AC_SUBST (David Seifert)
- Respect `--sysconfdir` in source files (David Seifert)
- Ignore configure backup file created by recent autoreconf too (Vadim Zeitlin)
- Only install *.html and *.c example files
- Remove --with-html-dir option
- Rework documentation build system
- Remove old website
- Use AM_PATH_PYTHON/PKG_CHECK_MODULES for python bindings (David Seifert)
- Update genChRanges.py
- Update build_glob.py
- Remove ICONV_CONST test
- Remove obsolete AC_HEADER checks
- Don't check for standard C89 library functions
- Don't check for standard C89 headers
- Remove special configuration for certain maintainers
### Test suite, CI
- Disable network in API tests
- testapi: remove leading slash from "/missing.xml" (Mike Gilbert)
- Build Autotools CI tests out of source tree (VPATH)
- Add --with-minimum build to CI tests
- Fix warnings when testing --with-minimum build
- cmake: Run all tests when threads are disabled
- Also build CI tests with -Werror
- Move doc/examples tests to new test suite
- Simplify 'make check' targets
- Fix schemas and relaxng tests
- Remove unused result files
- Allow missing result files in runtest
- Move regexp tests to runtest
- Move SVG tests to runtest.c
- Move testModule to new test suite
- Move testThreads to new test suite
- Remove major parts of old test suite
- Make testchar return an error on failure (Tony Tascioglu)
- Add CI job for static build
- python/tests: open() relative to test scripts (David Seifert)
- Port some test scripts to Python 3
### Documentation
- Improve documentation of tree manipulation API
- Update xml2-config man page
- Consolidate man pages
- Rename xmlcatalog_man.xml
- Make examples a standalone HTML page
- Fix documentation in entities.c
- Add note about optimization flags
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 4022e2f9c3d64e21d8b55a8206630fea7a845cd3
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Tue Nov 8 11:12:28 2022 +0000
Core Update 172: Ship expat
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit cf25086eea3776172dba0691afa6bf5646090a64
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Mon Nov 7 22:13:58 2022 +0100
expat: Update to version 2.5.0
- Update from version 2.4.9 to 2.5.0
- Update of rootfile.
- Changelog
Release 2.5.0 Tue October 25 2022
Security fixes:
#616 #649 #650 CVE-2022-43680 -- Fix heap use-after-free after overeager
destruction of a shared DTD in function
XML_ExternalEntityParserCreate in out-of-memory situations.
Expected impact is denial of service or potentially
arbitrary code execution.
Bug fixes:
#612 #645 Fix curruption from undefined entities
#613 #654 Fix case when parsing was suspended while processing nested
entities
#616 #652 #653 Stop leaking opening tag bindings after a closing tag
mismatch error where a parser is reset through
XML_ParserReset and then reused to parse
#656 CMake: Fix generation of pkg-config file
#658 MinGW|CMake: Fix static library name
Other changes:
#663 Protect header expat_config.h from multiple inclusion
#666 examples: Make use of XML_GetBuffer and be more
consistent across examples
#648 Address compiler warnings
#667 #668 Version info bumped from 9:9:8 to 9:10:8;
see https://verbump.de/ for what these numbers do
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 0a65d443ef11e127b4bf8af6f6ede18a51855c57
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Tue Nov 8 11:11:40 2022 +0000
Core Update 172: Ship zlib
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 634f46dc34f2e134cfe74e72673f7632a52a030b
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Mon Nov 7 22:14:28 2022 +0100
zlib: Update to version 1.2.13
- Update from version 1.2.12 to 1.2.13
- Update of rootfile
- Patches for CVE-2022-37434 removed as they are now integarted in the source tarball
- Changelog
Changes in 1.2.13 (13 Oct 2022)
- Fix configure issue that discarded provided CC definition
- Correct incorrect inputs provided to the CRC functions
- Repair prototypes and exporting of new CRC functions
- Fix inflateBack to detect invalid input with distances too far
- Have infback() deliver all of the available output up to any error
- Fix a bug when getting a gzip header extra field with inflate(CVE-2022-37434)
- Fix bug in block type selection when Z_FIXED used
- Tighten deflateBound bounds
- Remove deleted assembler code references
- Various portability and appearance improvements
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit a2a695be02696854c73c74610f15152614fb4ee5
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Thu Nov 3 16:51:19 2022 +0000
Core Update 172: Ship (o|)vpnmain.cgi
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 818dde8e8b8b8cbf571c7d02ba4c8272280f3e46
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Thu Nov 3 15:29:32 2022 +0000
IPsec/OpenVPN: Use 4,096-bit RSA for host certificates as well
We already moved away from 2048-MODP in Core Update 170. Similarly,
German Federal Office for Information Security (BSI) recommends shifting
away from RSA keys below 3,000 bits by the end of 2022 at the latest.
The only place left in IPFire 2.x where we generate such keys is for
IPsec and OpenVPN host certificates. This patch increases their key
sizes to 4,096 bits as well - CA certificates already have this length.
Existing VPN connections cannot be migrated automatically. However, only
the respective host certificate has to be regenerated - thanks to the CA
certificates' key length being sufficient, there is no need to replace
the entire VPN CA.
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 6376c155b8c02c37d891f91d9bf9e60564430d04
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Thu Nov 3 15:14:01 2022 +0000
Core Update 172: Ship wirelessctrl
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 77e1061bf9079dfdd8bad56a41f3c4a053012654
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Nov 2 10:30:06 2022 +0000
misc-progs: wirelessctrl: Fix missing whitespace for log prefix
Fixes: #12978
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 44fc05f634ab3829ea368428845bd4d5412cc2a9
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sat Oct 29 09:04:07 2022 +0000
Core Update 172: Ship rules.pl
This file should have been shipped with Core Update 171, but that was
omitted by mistake. Core Update 172 therefore finally fixes #12934 on
existing installations.
Fixes: #12934
Cc: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit a6f89e38db587c467d97513437dfe0ae2e424a19
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sat Oct 29 08:58:00 2022 +0000
Core Update 171: Ship changes related to services.cgi
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 8ed997102eeaee19e06e13aea4dfe08f83338489
Author: Robin Roevens <robin.roevens(a)disroot.org>
Date: Wed Oct 12 00:01:57 2022 +0200
services.cgi: add link to addon config if ui exists for it
* If a cgi file exists with the same name as an addon, the
displayed service will be a link to that cgi file.
Signed-off-by: Robin Roevens <robin.roevens(a)disroot.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 4f205b54422afa069dd3956ebc4df2efe8600f75
Author: Robin Roevens <robin.roevens(a)disroot.org>
Date: Wed Oct 12 00:01:56 2022 +0200
services.cgi: add restart action and restrict action usage
* Add restart action to services.
* Only display available actions for a service:
Start when service is stopped or Stop and Restart when a service
is running.
Signed-off-by: Robin Roevens <robin.roevens(a)disroot.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 207ca1141c1e1b1b2d384b82ac6b8238ad8d566c
Author: Robin Roevens <robin.roevens(a)disroot.org>
Date: Wed Oct 12 00:01:55 2022 +0200
services.cgi: minor cosmetics
* Singular 'Service' instead of plural 'Services' as column header of
services table
* Sort list of services
Signed-off-by: Robin Roevens <robin.roevens(a)disroot.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 2b9b31b71d9b6211276b60ce9583198163a0c582
Author: Robin Roevens <robin.roevens(a)disroot.org>
Date: Wed Oct 12 00:01:54 2022 +0200
services.cgi: Fix status/actions on services with name != addon name
* addonctrl's new functionality to control explicit addon services was
implemented.
* Change 'Addon' column header to 'Addon Service' to be clear that
it's not addons but services listed here.
* Services not matching the name of the addon now display the addon
name between parentheses, so the user knows where the service comes
from.
* When no valid runlevel symlink is found by addonctrl for a service,
the 'enable on boot' checkbox is replaced by a small exclamation point
with alt-text "No valid runlevel symlink was found for the initscript of
this service." to inform user why a service can't be enabled.
* Added German and Dutch translation for above message.
Fixes: Bug#12935
Signed-off-by: Robin Roevens <robin.roevens(a)disroot.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 24168c8898eb6a9bcc1a0f6103f0c87eb092e7ef
Author: Robin Roevens <robin.roevens(a)disroot.org>
Date: Wed Oct 12 00:01:53 2022 +0200
misc-progs: addonctrl: Add support for 'Services' metadata
* Addonctrl will now check in addon metadata for the exact initscript
names (Services). If more than one initscript is defined for an addon,
the requested action will be performed on all listed initscripts.
* Added posibility to perform action on a specific initscript of an
addon instead of on all initscripts of the addon.
* New action 'list-services' to display a list of services related to
an addon.
* New action 'boot-status' to display wether service(s) are enabled
to start on boot or not.
* More error checking and cleaner error reporting to user
* General cleanup and code restructuring to avoid code duplication
* Updated and made usage instructions more verbose.
Fixes: Bug#12935
Signed-off-by: Robin Roevens <robin.roevens(a)disroot.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit e728fba16f59f09374e5817de6efa0fcb4d29537
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sat Oct 29 08:55:58 2022 +0000
Samba: Update ARM rootfiles
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit ca1787b29ba370c2da9cdfb29e6f148fdb5edba1
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Mon Oct 24 12:39:47 2022 +0000
libloc: Update rootfile
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 3e5190f5c7fc828937fdefa0a65d97243b55c2ed
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sat Oct 8 19:55:47 2022 +0200
samba: Update to 4.17.0
For details see:
https://www.samba.org/samba/latest_news.html#4.17.0
This "just came my way" and I found the CVEs listed on
https://www.samba.org/samba/history/security.html which
address "All versions of Samba prior to 4.16.4" or
"All versions of Samba" rather long.
The 'glibc_headers' patch is now included.
Sad to say, due to the lack of hardware I can only include
the rootfile for x86_64.
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
commit 77321ff12fc918f39ce6a4eeb37a97e25896b65f
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Mon Oct 24 09:07:18 2022 +0000
Core Update 172: Ship changes related to OpenVPN CRL handling
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit e420c103dede60f9c8121386b55e83314d176634
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Oct 7 14:50:17 2022 +0000
openvpnctrl: Update CRL before starting the client daemon
If the CRL is outdated for some reason (e.g. a backup restored from ISO
where we don't run the migration scripts), this will update it on
reboot/restart of the service.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 233baacd6753d8adb756219d5fac536d9b6f92ae
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Oct 7 14:50:16 2022 +0000
backup: Update OpenVPN CRL
After a backup is restored, the CRL might be out of data and client
won't be able to connect to the server any more.
This will immediately update the CRL should it require an update.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit c965daf6da233875d6cdf06fd8935f18102c7478
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Mon Oct 24 09:05:23 2022 +0000
Core Update 172: Delete orphaned strongSwan files
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 5f1abe00433812a75e58583ed254a452fe30a609
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Mon Oct 24 09:04:29 2022 +0000
Core Update 172: Ship and restart Unbound
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 609007e54b85fafd14b35c3adfd9acb8a36b9b4d
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Fri Oct 14 21:09:35 2022 +0200
unbound: Update to 1.17.0
For details see:
https://nlnetlabs.nl/projects/unbound/download/#unbound-1-17-0
"Features
Merge #753: ACL per interface. (New interface-* configuration options).
Merge #760: PROXYv2 downstream support. (New proxy-protocol-port configuration option).
Bug Fixes
Fix #728: alloc_reg_obtain() core dump. Stop double alloc_reg_release
when serviced_create fails.
Fix edns subnet so that scope 0 answers only match sourcemask 0 queries
for answers from cache if from a query with sourcemask 0.
Fix unittest for edns subnet change.
Merge #730 from luisdallos: Fix startup failure on Windows 8.1 due to
unsupported IPV6_USER_MTU socket option being set.
Fix ratelimit inconsistency, for ip-ratelimits the value is the amount
allowed, like for ratelimits.
Fix #734 [FR] enable unbound-checkconf to detect more (basic) errors.
Fix to log accept error ENFILE and EMFILE errno, but slowly, once per
10 seconds. Also log accept failures when no slow down is used.
Fix to avoid process wide fcntl calls mixed with nonblocking operations
after a blocked write.
Patch from Vadim Fedorenko that adds MSG_DONTWAIT to receive
operations, so that instruction reordering does not cause mistakenly
blocking socket operations.
Fix to wait for blocked write on UDP sockets, with a timeout if it
takes too long the packet is dropped.
Fix for wait for udp send to stop when packet is successfully sent.
Fix #741: systemd socket activation fails on IPv6.
Fix to update config tests to fix checking if nonblocking sockets work
on OpenBSD.
Slow down log frequency of write wait failures.
Fix to set out of file descriptor warning to operational verbosity.
Fix to log a verbose message at operational notice level if a thread is
not responding, to stats requests. It is logged with thread
identifiers.
Remove include that was there for debug purposes.
Fix to check pthread_t size after pthread has been detected.
Convert tdir tests to use the new skip_test functionality.
Remove unused testcode/mini_tpkg.sh file.
Better output for skipped tdir tests.
Fix doxygen warning in respip.h.
Fix to remove erroneous TC flag from TCP upstream.
Fix test tdir skip report printout.
Fix windows compile, the identifier interface is defined in headers.
Fix to close errno block in comm_point_tcp_handle_read outside of ifdef.
Fix static analysis report to remove dead code from the
rpz_callback_from_iterator_module function.
Fix to clean up after the acl_interface unit test.
Merge #764: Leniency for target discovery when under load (for
NRDelegation changes).
Use DEBUG_TDIR from environment in mini_tdir.sh for debugging.
Fix string comparison in mini_tdir.sh.
Make ede.tdir test more predictable by using static data.
Fix checkconf test for dnscrypt and proxy port.
Fix dnscrypt compile for proxy protocol code changes.
Fix to stop responses with TC flag from resulting in partial responses.
It retries to fetch the data elsewhere, or fails the query and in depth
fix removes the TC flag from the cached item.
Fix proxy length debug output printout typecasts.
Fix to stop possible loops in the tcp reuse code (write_wait list and
tcp_wait list). Based on analysis and patch from Prad Seniappan and
Karthik Umashankar.
Fix PROXYv2 header read for TCP connections when no proxied addresses
are provided."
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 4ddb1fdac09c20d132935f668b395b918e9846a4
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Mon Oct 24 09:03:08 2022 +0000
Core Update 172: Ship and restart OpenSSH
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 89e47eaca85d0d582195731b4506b6c4be1dfe75
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sat Oct 15 15:47:51 2022 +0000
OpenSSH: Update to 9.1p1
Please refer to https://www.openssh.com/releasenotes.html#9.1 for the
release announcement of this version.
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 7fc5e932944d61af0ccacf87bb562f0a94bb3f26
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Mon Oct 24 08:59:09 2022 +0000
Core Update 172: Ship tzdata
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 367a62f5151c1a8569c32d2d40a536d889dd55f6
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sat Oct 15 15:51:05 2022 +0000
tzdata: Update to 2022e
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 024579de58e4410ce1d2eba61814f2ede59f53a5
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Mon Oct 24 08:58:51 2022 +0000
Core Update 172: Ship libloc
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 0d0bfd0e5c68a6d0ebef31f37fbd601a90e71250
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sat Oct 15 15:53:07 2022 +0000
libloc: Update to 0.9.15
Please refer to https://lists.ipfire.org/pipermail/location/2022-September/000579.html
for the release announcement of this version.
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit f6121180b8a219e11a21d586df0ad175f1440b63
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Mon Oct 24 08:57:00 2022 +0000
Core Update 172: Ship and restart strongSwan
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 4929efb7d8a0b90040be24754b13f748a15f8a85
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sat Oct 15 16:01:26 2022 +0000
strongSwan: Update to 5.9.8
Please refer to https://github.com/strongswan/strongswan/releases/tag/5.9.8
for the release announcement of this version.
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 0f421901dde788a2bbb8af1fcf185477408a812b
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Mon Oct 24 08:55:12 2022 +0000
Start Core Update 172
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
-----------------------------------------------------------------------
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 3.x development tree branch, master, updated. d62776ed14914cd0ecd0251c0279174a39e7a965
by Michael Tremer 22 Dec '22
by Michael Tremer 22 Dec '22
22 Dec '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 d62776ed14914cd0ecd0251c0279174a39e7a965 (commit)
via 5af365ab1ea29d4f9cb1026dcf662d9b0fa17e46 (commit)
via 1037c9271704323f23f56fd25e496ea7325eb076 (commit)
via 78f728dac96373226cf04299e142d8018d42aa3c (commit)
via 16d9d0297b4e79f60a96a1cf4c74b8193d79af51 (commit)
via 90d873348e4f18f83b809d1dfd1b2b7b355311b3 (commit)
via 839455c74f78b4a215c58e8a87b634abff5e1645 (commit)
via 8b4743e9f36bc2b4d53fcd64188fbe5e41614e39 (commit)
via eb86058c3b408df9c048300e4b620dd3e682c200 (commit)
via 2a19fae9405b1d3c1a1db684ca6c8cae7333aa4a (commit)
via 869a755e4c2f22bfd1d554c54790bedfce268ec2 (commit)
via 3e64225ca3cad3c0042e6dca616ffa0e80d34831 (commit)
via 5c562723e4128f5bf39ab9ae940a1a6f9fe3ea5f (commit)
via b6082684cbc2da9e04f4cbd9aa439fc46d589055 (commit)
via b48f4a94a0bbbb11859754afb80a0fe0d716a9e6 (commit)
via 18b0ef71be204339019530267e5b918119a1c5cd (commit)
via 28c00b052323e4ab13ae71bc3ebccdf251b8f78d (commit)
via eaba5a7d496e994479cc40776f691a048aa6da96 (commit)
via e1d45c35ea4f9b785fcdac7a6fe9276709067d41 (commit)
via 57c1fa5530455e33992e32a6475e3b868290f00e (commit)
via a6cfb244b62b7cc70f5cd41f67ceae1ff781e0a6 (commit)
via b4405c7dabe6b9cfe13be2cccb3a5704fc884166 (commit)
from 480cb5d36d29181f5a8f07aeb4e1786e087eb2d1 (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 d62776ed14914cd0ecd0251c0279174a39e7a965
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Thu Dec 22 05:01:41 2022 +0100
strace: Update to 6.1
- Project has moved to new location so adjust URL and SRC URL
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
commit 5af365ab1ea29d4f9cb1026dcf662d9b0fa17e46
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Dec 21 11:14:51 2022 +0000
mtr: Update to 0.94
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 1037c9271704323f23f56fd25e496ea7325eb076
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Dec 21 11:06:02 2022 +0000
xmlto: Update to 0.0.28
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 78f728dac96373226cf04299e142d8018d42aa3c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Dec 21 11:00:08 2022 +0000
pax-utils: Drop package
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 16d9d0297b4e79f60a96a1cf4c74b8193d79af51
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Dec 21 10:59:54 2022 +0000
paxctl: Drop package
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 90d873348e4f18f83b809d1dfd1b2b7b355311b3
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Dec 21 10:54:22 2022 +0000
tzdata: Update to 2022g
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 839455c74f78b4a215c58e8a87b634abff5e1645
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Dec 21 10:28:50 2022 +0000
ed: Update to 1.18
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 8b4743e9f36bc2b4d53fcd64188fbe5e41614e39
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Dec 21 10:20:51 2022 +0000
slang: Update to 2.3.3
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit eb86058c3b408df9c048300e4b620dd3e682c200
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Dec 21 09:57:11 2022 +0000
ethtool: Update to 6.1
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 2a19fae9405b1d3c1a1db684ca6c8cae7333aa4a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Dec 21 09:45:18 2022 +0000
strongswan: Update to 5.9.8
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 869a755e4c2f22bfd1d554c54790bedfce268ec2
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 20 22:06:16 2022 +0000
memtest86+: Update to 6.00
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 3e64225ca3cad3c0042e6dca616ffa0e80d34831
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 20 22:05:54 2022 +0000
dosfstools: Update to 4.2
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 5c562723e4128f5bf39ab9ae940a1a6f9fe3ea5f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 20 18:56:25 2022 +0000
rng-tools: Drop package
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit b6082684cbc2da9e04f4cbd9aa439fc46d589055
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 20 18:55:36 2022 +0000
unicode-ucd: Drop package
Nothing seems to depend on this
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit b48f4a94a0bbbb11859754afb80a0fe0d716a9e6
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 20 18:52:27 2022 +0000
ustr: Drop package
Nothing seems to depend on this
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 18b0ef71be204339019530267e5b918119a1c5cd
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 20 18:48:31 2022 +0000
pigz: Drop package
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 28c00b052323e4ab13ae71bc3ebccdf251b8f78d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 20 18:36:58 2022 +0000
ldns: Update to 1.8.3
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit eaba5a7d496e994479cc40776f691a048aa6da96
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 20 18:23:36 2022 +0000
rcs: Update to 5.10.1
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit e1d45c35ea4f9b785fcdac7a6fe9276709067d41
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 20 18:08:53 2022 +0000
libxml2: Update to 2.10.3
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 57c1fa5530455e33992e32a6475e3b868290f00e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 20 17:35:35 2022 +0000
libunistring: Update to 1.1
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit a6cfb244b62b7cc70f5cd41f67ceae1ff781e0a6
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 20 17:25:58 2022 +0000
which: Update to 2.21
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit b4405c7dabe6b9cfe13be2cccb3a5704fc884166
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 20 17:23:01 2022 +0000
tar: Update to 1.34
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
dosfstools/dosfstools.nm | 8 +--
ed/ed.nm | 8 +--
ethtool/ethtool.nm | 12 ++--
ldns/ldns.nm | 37 +++--------
ldns/patches/ldns-1.6.16-dsa-key-failures.patch | 28 --------
.../ldns-1.6.17-doxyparse-perl-5-22-fix.patch | 13 ----
ldns/patches/ldns-1.6.17-multilib.patch | 75 ----------------------
libunistring/libunistring.nm | 6 +-
libxml2/libxml2.nm | 13 ++--
libxml2/patches/libxml2-2.9.2-catalog-revert.patch | 31 ---------
memtest86+/60_memtest86+ | 32 +++++++++
memtest86+/60_memtest86+-efi | 37 +++++++++++
memtest86+/memtest86+.grub | 37 -----------
memtest86+/memtest86+.nm | 45 +++++++++----
mtr/mtr.nm | 11 ++--
pax-utils/pax-utils.nm | 38 -----------
paxctl/paxctl.nm | 38 -----------
pigz/pigz.nm | 48 --------------
rcs/rcs.nm | 17 ++---
rng-tools/patches/rng-tools-man.patch | 21 ------
rng-tools/rng-tools.nm | 52 ---------------
rng-tools/systemd/rngd.service | 8 ---
slang/slang.nm | 13 ++--
strace/strace.nm | 6 +-
strongswan/strongswan.nm | 31 ++++-----
tar/tar.nm | 12 ++--
tzdata/tzdata.nm | 57 ++++++++--------
unicode-ucd/unicode-ucd.nm | 50 ---------------
ustr/patches/c99-inline.patch | 30 ---------
ustr/ustr.nm | 56 ----------------
which/which.nm | 12 ++--
xmlto/xmlto.nm | 7 +-
32 files changed, 210 insertions(+), 679 deletions(-)
delete mode 100644 ldns/patches/ldns-1.6.16-dsa-key-failures.patch
delete mode 100644 ldns/patches/ldns-1.6.17-doxyparse-perl-5-22-fix.patch
delete mode 100644 ldns/patches/ldns-1.6.17-multilib.patch
delete mode 100644 libxml2/patches/libxml2-2.9.2-catalog-revert.patch
create mode 100644 memtest86+/60_memtest86+
create mode 100644 memtest86+/60_memtest86+-efi
delete mode 100755 memtest86+/memtest86+.grub
delete mode 100644 pax-utils/pax-utils.nm
delete mode 100644 paxctl/paxctl.nm
delete mode 100644 pigz/pigz.nm
delete mode 100644 rng-tools/patches/rng-tools-man.patch
delete mode 100644 rng-tools/rng-tools.nm
delete mode 100644 rng-tools/systemd/rngd.service
delete mode 100644 unicode-ucd/unicode-ucd.nm
delete mode 100644 ustr/patches/c99-inline.patch
delete mode 100644 ustr/ustr.nm
Difference in files:
diff --git a/dosfstools/dosfstools.nm b/dosfstools/dosfstools.nm
index c319532a3..0483e61bf 100644
--- a/dosfstools/dosfstools.nm
+++ b/dosfstools/dosfstools.nm
@@ -4,13 +4,13 @@
###############################################################################
name = dosfstools
-version = 3.0.26
+version = 4.2
release = 1
groups = System/Filesystems
-url = http://www.daniel-baumann.ch/software/dosfstools/
+url = https://github.com/dosfstools/dosfstools/
license = GPLv3+
-summary = Utilities for making and checking MS-DOS FAT filesystems on Linux.
+summary = Utilities for making and checking MS-DOS FAT filesystems on Linux
description
The dosfstools package includes the mkdosfs and dosfsck utilities,
@@ -18,7 +18,7 @@ description
drives or on floppies.
end
-source_dl = http://www.daniel-baumann.ch/files/software/dosfstools/
+source_dl = https://github.com/dosfstools/dosfstools/releases/download/v%{version}/
build
make_install_targets += \
diff --git a/ed/ed.nm b/ed/ed.nm
index 6163d1f2d..e94d795ba 100644
--- a/ed/ed.nm
+++ b/ed/ed.nm
@@ -4,13 +4,13 @@
###############################################################################
name = ed
-version = 1.15
+version = 1.18
release = 1
groups = Application/Text
-url = http://www.gnu.org/software/ed/
+url = https://www.gnu.org/software/ed/
license = GPLv3+
-summary = The GNU line editor.
+summary = The GNU line editor
description
Ed is a line-oriented text editor, used to create, display, and modify \
@@ -28,8 +28,8 @@ build
end
configure_options += \
- CFLAGS="%{CFLAGS}" \
CPPFLAGS="%{CPPFLAGS}" \
+ CFLAGS="%{CFLAGS}" \
LDFLAGS="%{LDFLAGS}"
test
diff --git a/ethtool/ethtool.nm b/ethtool/ethtool.nm
index 9a0d41589..10d341d61 100644
--- a/ethtool/ethtool.nm
+++ b/ethtool/ethtool.nm
@@ -4,13 +4,13 @@
###############################################################################
name = ethtool
-version = 4.5
+version = 6.1
release = 1
groups = Applications/System
url = https://www.kernel.org/pub/software/network/ethtool/
license = GPLv2
-summary = Ethernet settings tool for PCI ethernet cards.
+summary = Ethernet settings tool for PCI ethernet cards
description
This utility allows querying and changing settings such as speed, \
@@ -20,10 +20,14 @@ end
source_dl = https://www.kernel.org/pub/software/network/ethtool/
+build
+ requires
+ libmnl-devel
+ end
+end
+
packages
package %{name}
- groups += Base
- end
package %{name}-debuginfo
template DEBUGINFO
diff --git a/ldns/ldns.nm b/ldns/ldns.nm
index d79d48c08..a395712bd 100644
--- a/ldns/ldns.nm
+++ b/ldns/ldns.nm
@@ -4,7 +4,7 @@
###############################################################################
name = ldns
-version = 1.6.17
+version = 1.8.3
release = 1
groups = Networking/DNS
@@ -13,18 +13,13 @@ license = BSD
summary = Low-level DNS(SEC) library with API
description
- The flex program generates scanners. Scanners are programs which can
- recognize lexical patterns in text. Flex takes pairs of regular
- expressions and C code as input and generates a C source file as
- output. The output file is compiled and linked with a library to
- produce an executable. The executable searches through its input for
- occurrences of the regular expressions. When a match is found, it
- executes the corresponding C code. Flex was designed to work with
- both Yacc and Bison, and is used by many programs as part of their
- build process.
+ The goal of ldns is to simplify DNS programming in C. ldns supports
+ all low-level DNS and DNSSEC operations. It also defines a higher
+ level API which allows a programmer to for instance create or sign
+ packets.
end
-source_dl = http://www.nlnetlabs.nl/downloads/%{name}/
+source_dl = https://www.nlnetlabs.nl/downloads/%{name}/
build
requires
@@ -41,27 +36,11 @@ build
end
configure_options += \
- --enable-gost \
+ --disable-gost \
--enable-ecdsa \
--with-ca-file=/etc/pki/tls/certs/ca-bundle.trust.crt \
--with-ca-path=/etc/pki/tls/certs/ \
- --with-trust-anchor=%{sharedstatedir}/unbound/root.key \
- --enable-rrtype-cds \
- --enable-rrtype-uri
-
- build_cmds
- pushd drill
- ./configure %{configure_options}
- make %{PARALLELISMFLAGS}
- popd
- end
-
- install_cmds
- install -D -m644 packaging/libldns.pc \
- %{BUILDROOT}%{libdir}/pkgconfig/ldns.pc
-
- make -C drill DESTDIR=%{BUILDROOT} install
- end
+ --with-trust-anchor=%{sharedstatedir}/unbound/root.key
end
packages
diff --git a/ldns/patches/ldns-1.6.16-dsa-key-failures.patch b/ldns/patches/ldns-1.6.16-dsa-key-failures.patch
deleted file mode 100644
index 93e8a73c8..000000000
--- a/ldns/patches/ldns-1.6.16-dsa-key-failures.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -up ldns-1.6.17/keys.c.dsa ldns-1.6.17/keys.c
---- ldns-1.6.17/keys.c.dsa 2014-01-10 22:04:41.000000000 +0100
-+++ ldns-1.6.17/keys.c 2014-03-18 17:54:34.751742493 +0100
-@@ -1324,7 +1324,6 @@ ldns_key_dsa2bin(unsigned char *data, DS
- /* See RFC2536 */
- *size = (uint16_t)BN_num_bytes(k->p);
- T = (*size - 64) / 8;
-- memcpy(data, &T, 1);
-
- if (T > 8) {
- #ifdef STDERR_MSGS
-@@ -1335,12 +1334,13 @@ ldns_key_dsa2bin(unsigned char *data, DS
- }
-
- /* size = 64 + (T * 8); */
-+ memset(data, 0, 21 + *size * 3);
- data[0] = (unsigned char)T;
- BN_bn2bin(k->q, data + 1 ); /* 20 octects */
- BN_bn2bin(k->p, data + 21 ); /* offset octects */
-- BN_bn2bin(k->g, data + 21 + *size); /* offset octets */
-- BN_bn2bin(k->pub_key, data + 21 + *size + *size); /* offset octets */
-- *size = 21 + (*size * 3);
-+ BN_bn2bin(k->g, data + 21 + *size * 2 - BN_num_bytes(k->g));
-+ BN_bn2bin(k->pub_key,data + 21 + *size * 3 - BN_num_bytes(k->pub_key));
-+ *size = 21 + *size * 3;
- return true;
- }
-
diff --git a/ldns/patches/ldns-1.6.17-doxyparse-perl-5-22-fix.patch b/ldns/patches/ldns-1.6.17-doxyparse-perl-5-22-fix.patch
deleted file mode 100644
index 2140ff5c0..000000000
--- a/ldns/patches/ldns-1.6.17-doxyparse-perl-5-22-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/doc/doxyparse.pl b/doc/doxyparse.pl
-index 96a1732..745d564 100755
---- a/doc/doxyparse.pl
-+++ b/doc/doxyparse.pl
-@@ -273,7 +273,7 @@ foreach (keys %manpages) {
-
- print MAN $MAN_MIDDLE;
-
-- if (defined(@$also)) {
-+ if (@$also) {
- print MAN "\n.SH SEE ALSO\n\\fI";
- print MAN join "\\fR, \\fI", @$also;
- print MAN "\\fR.\nAnd ";
diff --git a/ldns/patches/ldns-1.6.17-multilib.patch b/ldns/patches/ldns-1.6.17-multilib.patch
deleted file mode 100644
index 5c7440a32..000000000
--- a/ldns/patches/ldns-1.6.17-multilib.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff -Naur ldns-1.6.17-orig/configure ldns-1.6.17/configure
---- ldns-1.6.17-orig/configure 2014-01-10 16:04:50.000000000 -0500
-+++ ldns-1.6.17/configure 2014-01-10 20:22:39.138190093 -0500
-@@ -662,6 +662,7 @@
- PYTHON_LDFLAGS
- PYTHON_CPPFLAGS
- PYTHON
-+PYTHON_LIB
- PYTHON_VERSION
- UNINSTALL_CONFIG_MANPAGE
- UNINSTALL_CONFIG
-@@ -13599,6 +13600,7 @@
- # use the official shared library
- ac_python_library=`echo "$ac_python_library" | sed "s/^lib//"`
- PYTHON_LDFLAGS="-L$ac_python_libdir -l$ac_python_library"
-+ PYTHON_LIB="$ac_python_library"
- else
- # old way: use libpython from python_configdir
- ac_python_libdir=`$PYTHON -c \
-@@ -13606,6 +13608,7 @@
- import os; \
- print (os.path.join(f(plat_specific=1, standard_lib=1), 'config'));"`
- PYTHON_LDFLAGS="-L$ac_python_libdir -lpython$ac_python_version"
-+ PYTHON_LIB="python$ac_python_version"
- fi
-
- if test -z "PYTHON_LDFLAGS"; then
-diff -Naur ldns-1.6.17-orig/packaging/ldns-config.in ldns-1.6.17/packaging/ldns-config.in
---- ldns-1.6.17-orig/packaging/ldns-config.in 2014-01-10 16:04:41.000000000 -0500
-+++ ldns-1.6.17/packaging/ldns-config.in 2014-01-10 20:33:13.033665804 -0500
-@@ -3,13 +3,25 @@
- prefix="@prefix@"
- exec_prefix="@exec_prefix@"
- VERSION="@PACKAGE_VERSION@"
--CFLAGS="@CFLAGS@"
--CPPFLAGS="@CPPFLAGS@ @LIBSSL_CPPFLAGS@ @PYTHON_CPPFLAGS@"
--LDFLAGS="@LDFLAGS@ @LIBSSL_LDFLAGS@ @PYTHON_LDFLAGS@"
- LIBS="@LIBS@ @LIBSSL_LIBS@"
--LIBDIR="@libdir@"
- INCLUDEDIR="@includedir@"
- LIBVERSION="@LIBLDNS_CURRENT@.@LIBLDNS_REVISION@.@LIBLDNS_AGE@"
-+ARCH="`uname -m`"
-+
-+case $ARCH in
-+ x86_64 | amd64 | sparc64 | s390x | ppc64)
-+
-+ LIBDIR="/usr/lib64"
-+ LIBDIR_SEC="/usr/lib"
-+ ;;
-+ * )
-+ LIBDIR="/usr/lib"
-+ LIBDIR_SEC="/usr/lib64"
-+ ;;
-+esac
-+
-+LDFLAGS="@LDFLAGS@ @LIBSSL_LDFLAGS@ -L$LIBDIR -l@PYTHON_LIB@"
-+LDFLAGS_SEC="@LDFLAGS@ @LIBSSL_LDFLAGS@ -L$LIBDIR_SEC -l@PYTHON_LIB@"
-
- for arg in $@
- do
-@@ -21,9 +33,13 @@
- then
- echo "${LDFLAGS} -L${LIBDIR} ${LIBS} -lldns"
- fi
-+ if [ $arg = "--libs_sec" ]
-+ then
-+ echo "${LDFLAGS_SEC} -L${LIBDIR_SEC} ${LIBS} -lldns"
-+ fi
- if [ $arg = "-h" ] || [ $arg = "--help" ]
- then
-- echo "Usage: $0 [--cflags] [--libs] [--version]"
-+ echo "Usage: $0 [--cflags] [--libs] [--libs_sec] [--version]"
- fi
- if [ $arg = "--version" ]
- then
diff --git a/libunistring/libunistring.nm b/libunistring/libunistring.nm
index 6ff472274..2218fc606 100644
--- a/libunistring/libunistring.nm
+++ b/libunistring/libunistring.nm
@@ -4,13 +4,13 @@
###############################################################################
name = libunistring
-version = 0.9.10
+version = 1.1
release = 1
groups = System/Libraries
-url = http://www.gnu.org/software/libunistring/
+url = https://www.gnu.org/software/libunistring/
license = LGPLv3+
-summary = GNU Unicode string library.
+summary = GNU Unicode string library
description
This portable C library implements Unicode string types in three flavours:
diff --git a/libxml2/libxml2.nm b/libxml2/libxml2.nm
index c36ba5d23..b4bc822f7 100644
--- a/libxml2/libxml2.nm
+++ b/libxml2/libxml2.nm
@@ -4,13 +4,14 @@
###############################################################################
name = libxml2
-version = 2.9.2
-release = 2
+version = %{ver_maj}.3
+ver_maj = 2.10
+release = 1
groups = System/Libraries
-url = http://xmlsoft.org/
+url = https://xmlsoft.org/
license = MIT
-summary = Library providing XML and HTML support.
+summary = Library providing XML and HTML support
description
This library allows to manipulate XML files. It includes support
@@ -24,7 +25,8 @@ description
library.
end
-source_dl = ftp://xmlsoft.org/libxml2/
+source_dl = https://download.gnome.org/sources/libxml2/%{ver_maj}/
+sources = %{thisapp}.tar.xz
build
requires
@@ -35,7 +37,6 @@ end
packages
package %{name}
- end
package %{name}-devel
template DEVEL
diff --git a/libxml2/patches/libxml2-2.9.2-catalog-revert.patch b/libxml2/patches/libxml2-2.9.2-catalog-revert.patch
deleted file mode 100644
index b3de0040f..000000000
--- a/libxml2/patches/libxml2-2.9.2-catalog-revert.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 0e6659ec960734b0b01aad196d4bdb4a3800b493 Mon Sep 17 00:00:00 2001
-From: Lubomir Rintel <lkundrak(a)v3.sk>
-Date: Thu, 16 Oct 2014 19:10:59 +0200
-Subject: [PATCH] Revert "Missing initialization for the catalog module"
-
-It's not correct to always load the default catalog.
-https://bugzilla.redhat.com/show_bug.cgi?id=1153753
-
-This reverts commit 054c716ea1bf001544127a4ab4f4346d1b9947e7.
-
----
- parser.c | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/parser.c b/parser.c
-index 1d93967..67c9dfd 100644
---- a/parser.c
-+++ b/parser.c
-@@ -14830,9 +14830,6 @@ xmlInitParser(void) {
- #ifdef LIBXML_XPATH_ENABLED
- xmlXPathInit();
- #endif
--#ifdef LIBXML_CATALOG_ENABLED
-- xmlInitializeCatalog();
--#endif
- xmlParserInitialized = 1;
- #ifdef LIBXML_THREAD_ENABLED
- }
---
-1.9.3
-
diff --git a/memtest86+/60_memtest86+ b/memtest86+/60_memtest86+
new file mode 100644
index 000000000..086f0cc84
--- /dev/null
+++ b/memtest86+/60_memtest86+
@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+########################################################
+# This script generates a memtest86+ entry on grub.cfg #
+# if memtest is installed on the system. #
+########################################################
+
+prefix="/usr"
+exec_prefix="${prefix}"
+
+datarootdir="/usr/share"
+datadir="${datarootdir}"
+
+. "${datadir}/grub/grub-mkconfig_lib"
+
+MEMTEST86_IMAGE="/boot/memtest86+/memtest.bin"
+CLASS="--class memtest86 --class gnu --class tool"
+
+if [ -e "${MEMTEST86_IMAGE}" ] && is_path_readable_by_grub "${MEMTEST86_IMAGE}" ; then
+ ## image exists, create menu entry
+ echo "Found memtest86+ image: ${MEMTEST86_IMAGE}" >&2
+ _GRUB_MEMTEST_HINTS_STRING="$(${grub_probe} --target=hints_string ${MEMTEST86_IMAGE})"
+ _GRUB_MEMTEST_FS_UUID="$(${grub_probe} --target=fs_uuid ${MEMTEST86_IMAGE})"
+ _GRUB_MEMTEST_REL_PATH="$(make_system_path_relative_to_its_root ${MEMTEST86_IMAGE})"
+ cat << EOF
+if [ "\${grub_platform}" == "pc" ]; then
+ menuentry "Memory Tester (memtest86+)" ${CLASS} {
+ search --fs-uuid --no-floppy --set=root ${_GRUB_MEMTEST_HINTS_STRING} ${_GRUB_MEMTEST_FS_UUID}
+ linux16 ${_GRUB_MEMTEST_REL_PATH} ${GRUB_CMDLINE_MEMTEST86}
+ }
+fi
+EOF
+fi
diff --git a/memtest86+/60_memtest86+-efi b/memtest86+/60_memtest86+-efi
new file mode 100644
index 000000000..e6d77ea51
--- /dev/null
+++ b/memtest86+/60_memtest86+-efi
@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+########################################################
+# This script generates a memtest86+ entry on grub.cfg #
+# if memtest is installed on the system. #
+########################################################
+
+prefix="/usr"
+exec_prefix="${prefix}"
+
+datarootdir="/usr/share"
+datadir="${datarootdir}"
+
+. "${datadir}/grub/grub-mkconfig_lib"
+
+MEMTEST86_IMAGE="/boot/memtest86+/memtest.efi"
+CLASS="--class memtest86 --class gnu --class tool"
+
+if [ -e "${MEMTEST86_IMAGE}" ] && is_path_readable_by_grub "${MEMTEST86_IMAGE}" ; then
+ ## image exists, create menu entry
+ echo "Found memtest86+ EFI image: ${MEMTEST86_IMAGE}" >&2
+ _GRUB_MEMTEST_HINTS_STRING="$(${grub_probe} --target=hints_string ${MEMTEST86_IMAGE})"
+ _GRUB_MEMTEST_FS_UUID="$(${grub_probe} --target=fs_uuid ${MEMTEST86_IMAGE})"
+ _GRUB_MEMTEST_REL_PATH="$(make_system_path_relative_to_its_root ${MEMTEST86_IMAGE})"
+ cat << EOF
+if [ "\${grub_platform}" == "efi" ]; then
+ menuentry "Memory Tester (memtest86+)" ${CLASS} {
+ if loadfont unicode ; then
+ set gfxmode=1024x768,800x600,auto
+ set gfxpayload=800x600,1024x768
+ terminal_output gfxterm
+ fi
+ search --fs-uuid --no-floppy --set=root ${_GRUB_MEMTEST_HINTS_STRING} ${_GRUB_MEMTEST_FS_UUID}
+ linux ${_GRUB_MEMTEST_REL_PATH} ${GRUB_CMDLINE_MEMTEST86}
+ }
+fi
+EOF
+fi
diff --git a/memtest86+/memtest86+.grub b/memtest86+/memtest86+.grub
deleted file mode 100755
index 3301b8597..000000000
--- a/memtest86+/memtest86+.grub
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-set -e
-
-# older versions of grub2 do not have this yet (LP: #459080)
-if [ ! -e /usr/lib/grub/grub-mkconfig_lib ]; then
- echo "no grub-mkconfig_lib, exiting"
- exit 0
-fi
-
-. /usr/lib/grub/grub-mkconfig_lib
-
-# We can't cope with loop-mounted devices here.
-case ${GRUB_DEVICE_BOOT} in
- /dev/loop/*|/dev/loop[0-9])
- exit 0
- ;;
-esac
-
-if test -e /boot/memtest86+; then
- MEMTESTPATH=$( make_system_path_relative_to_its_root "/boot/memtest86+" )
- echo "Found memtest86+ image: $MEMTESTPATH" >&2
- cat << EOF
-menuentry "Memory test (memtest86+)" {
-EOF
- prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")"
- printf '%s\n' "${prepare_boot_cache}"
- cat << EOF
- linux16 $MEMTESTPATH
-}
-menuentry "Memory test (memtest86+, serial console 115200)" {
-EOF
- printf '%s\n' "${prepare_boot_cache}"
- cat << EOF
- linux16 $MEMTESTPATH console=ttyS0,115200n8
-}
-EOF
-fi
diff --git a/memtest86+/memtest86+.nm b/memtest86+/memtest86+.nm
index 0e5e44445..74f45c426 100644
--- a/memtest86+/memtest86+.nm
+++ b/memtest86+/memtest86+.nm
@@ -4,14 +4,15 @@
###############################################################################
name = memtest86+
-version = 4.20
-release = 4
-sup_arches = i686 x86_64
+version = 6.00
+release = 1
+thisapp = memtest86plus-%{version}
+sup_arches = x86_64
groups = System/Base
url = http://www.memtest.org/
license = GPLv2
-summary = Stand-alone memory tester for x86 and x86-64 computers.
+summary = Stand-alone memory tester for x86 and x86-64 computers
description
Memtest86+ is a thorough stand-alone memory test for x86 and x86-64
@@ -20,25 +21,45 @@ description
Memtest86+.
end
-source_dl =
+source_dl = https://github.com/memtest86plus/memtest86plus/archive/refs/tags/%{version}…
+sources = %{thisapp}.tar.gz
build
- CFLAGS += -fno-builtin -ffreestanding
+ requires
+ dosfstools
+ end
build
- make CC="gcc -fno-stack-protector -fno-PIE" \
- CFLAGS="%{CFLAGS}" memtest.bin %{PARALLELISMFLAGS}
+ make -C build64 memtest.bin memtest.efi %{PARALLELISMFLAGS}
end
install
- mkdir -pv %{BUILDROOT}/boot
- cp -vf memtest.bin %{BUILDROOT}/boot/memtest86+
+ mkdir -pv %{BUILDROOT}/boot/memtest86+
+ install -v -m 644 build64/memtest.{bin,efi} %{BUILDROOT}/boot/memtest86+/
- mkdir -pv %{BUILDROOT}/etc/grub.d
- cp -vf %{DIR_SOURCE}/%{name}.grub %{BUILDROOT}/etc/grub.d/20_%{name}
+ mkdir -pv %{BUILDROOT}%{sysconfdir}/grub.d
+ install -v -m 644 %{DIR_SOURCE}/60_memtest86+{,-efi} %{BUILDROOT}%{sysconfdir}/grub.d/
end
end
packages
package %{name}
+ recommends
+ %{name}-efi = %{thisver}
+ end
+
+ files
+ /boot/memtest86+/memtest.bin
+ %{sysconfdir}/grub.d/60_memtest86+
+ end
+ end
+
+ package %{name}-efi
+ summary = Memory Test for EFI systems
+
+ files
+ /boot/memtest86+/memtest.efi
+ %{sysconfdir}/grub.d/60_memtest86+-efi
+ end
+ end
end
diff --git a/mtr/mtr.nm b/mtr/mtr.nm
index f9d292c85..54b99d045 100644
--- a/mtr/mtr.nm
+++ b/mtr/mtr.nm
@@ -4,20 +4,20 @@
###############################################################################
name = mtr
-version = 0.92
+version = 0.94
release = 1
groups = Applications/Internet
-url = http://www.BitWizard.nl/mtr
+url = https://www.BitWizard.nl/mtr
license = GPLv2+
-summary = A network diagnostic tool.
+summary = A network diagnostic tool
description
Mtr is a network diagnostic tool that combines ping and traceroute
into one program.
end
-source_dl = ftp://ftp.bitwizard.nl/mtr/
+source_dl = https://www.bitwizard.nl/mtr/files/
build
requires
@@ -28,6 +28,9 @@ build
libcap-devel
end
+ # The code has plenty of those errors :(
+ CFLAGS += -Wno-error=format-security
+
configure_options += \
--without-gtk
end
diff --git a/pax-utils/pax-utils.nm b/pax-utils/pax-utils.nm
deleted file mode 100644
index dca2b2cd0..000000000
--- a/pax-utils/pax-utils.nm
+++ /dev/null
@@ -1,38 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = pax-utils
-version = 0.1.19
-release = 1
-
-groups = Security/Tools
-url = http://www.gentoo.org/proj/en/hardened/pax-utils.xml
-license = GPLv2+
-summary = Utilities for checking PaX features.
-
-description
- This package contains several utilities for checking PaX features.
-end
-
-source_dl =
-sources = %{thisapp}.tar.bz2
-
-build
- requires
- libcap-devel
- end
-
- build
- make CFLAGS="%{CFLAGS}" USE_CAP=yes %{PARALLELISMFLAGS}
- end
-end
-
-packages
- package %{name}
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/paxctl/paxctl.nm b/paxctl/paxctl.nm
deleted file mode 100644
index d749fb408..000000000
--- a/paxctl/paxctl.nm
+++ /dev/null
@@ -1,38 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = paxctl
-version = 0.8
-release = 2
-
-groups = Applications/System
-url = http://pax.grsecurity.net/
-license = GPLv2
-summary = Application to control PaX flags.
-
-description
- paxctl may be used to control PaX flags on a per-binary basis. PaX
- is a set of kernel security patches to enhance a system's security.
-end
-
-source_dl = https://pax.grsecurity.net/
-
-build
- requires
- m4
- end
-
- build
- make %{PARALLELISMFLAGS} CFLAGS="%{CFLAGS}" LDFLAGS="%{LDFLAGS}"
- end
-end
-
-packages
- package %{name}
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/pigz/pigz.nm b/pigz/pigz.nm
deleted file mode 100644
index fbe20739c..000000000
--- a/pigz/pigz.nm
+++ /dev/null
@@ -1,48 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = pigz
-version = 2.3.3
-release = 2
-
-groups = Applications/Compression
-url = http://www.zlib.net/pigz/
-license = zlib
-summary = Parallel implementation of gzip.
-
-description
- pigz, which stands for parallel implementation of gzip,
- is a fully functional replacement for gzip that exploits
- multiple processors and multiple cores to the hilt when compressing
- data.
-end
-
-source_dl = %{url}
-
-build
- requires
- zlib-devel
- end
-
- make_build_targets += CC=gcc CFLAGS="%{CFLAGS}" LDFLAGS="%{LDFLAGS} -lz"
-
- test
- make test
- end
-
- install
- install -p -D pigz %{BUILDROOT}%{bindir}/pigz
- ln -svf pigz %{BUILDROOT}%{bindir}/unpigz
- install -p -D pigz.1 -m 644 %{BUILDROOT}%{mandir}/man1/pigz.1
- end
-end
-
-packages
- package %{name}
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/rcs/rcs.nm b/rcs/rcs.nm
index 321cdc476..1d791b5b9 100644
--- a/rcs/rcs.nm
+++ b/rcs/rcs.nm
@@ -4,11 +4,11 @@
###############################################################################
name = rcs
-version = 5.9.4
-release = 2
+version = 5.10.1
+release = 1
groups = Development/Tools
-url = http://www.gnu.org/software/rcs/
+url = https://www.gnu.org/software/rcs/
license = GPLv3+
summary = Revision Control System (RCS) file version management tools.
@@ -23,8 +23,8 @@ description
different versions of files.
end
-source_dl = ftp://ftp.gnu.org/gnu/rcs/
-sources = %{thisapp}.tar.xz
+source_dl = https://ftp.gnu.org/gnu/rcs/
+sources = %{thisapp}.tar.lz
build
requires
@@ -33,18 +33,15 @@ build
groff
end
- # Has some inlining problems, so we need to go back to C99
- CFLAGS += -std=c99
-
configure_options += \
--with-diffutils
test
- make check
+ make check XFAIL_TESTS="t790"
end
install_cmds
- # Install the rcsfreeze command.
+ # Install the rcsfreeze command
install -m 755 src/rcsfreeze %{BUILDROOT}%{bindir}
end
end
diff --git a/rng-tools/patches/rng-tools-man.patch b/rng-tools/patches/rng-tools-man.patch
deleted file mode 100644
index 010d20d17..000000000
--- a/rng-tools/patches/rng-tools-man.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up rng-tools-3/rngtest.1.in.man rng-tools-3/rngtest.1.in
---- rng-tools-3/rngtest.1.in.man 2009-12-24 07:47:24.000000000 +0100
-+++ rng-tools-3/rngtest.1.in 2012-01-12 10:12:27.909567190 +0100
-@@ -43,7 +43,7 @@ Exit after processing n input blocks, if
- Dump statistics every n blocks, if n is not zero.
- .TP
- \fB\-t\fR \fIn\fR, \fB\-\-timedstats=\fIn\fR (default: 0)
--Dump statistics every n secods, if n is not zero.
-+Dump statistics every n seconds, if n is not zero.
- .TP
- \fB\-?\fR, \fB\-\-help\fR
- Give a short summary of all program options.
-@@ -62,7 +62,7 @@ other statistics show a breakdown of the
- tests are defined on FIPS 140-1 and FIPS 140-2 errata of 2001-10-10. They
- were removed in FIPS 140-2 errata of 2002-12-03).
- .PP
--The speed statistics are taken for every 20000-bit block trasferred or
-+The speed statistics are taken for every 20000-bit block transferred or
- processed.
-
- .SH EXIT STATUS
diff --git a/rng-tools/rng-tools.nm b/rng-tools/rng-tools.nm
deleted file mode 100644
index ef5e03528..000000000
--- a/rng-tools/rng-tools.nm
+++ /dev/null
@@ -1,52 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = rng-tools
-version = 4
-release = 1
-
-groups = System/Base
-url = http://sourceforge.net/projects/gkernel/
-license = GPLv2+
-summary = Random number generator related utilities.
-
-description
- %{summary}
-end
-
-source_dl = http://downloads.sourceforge.net/project/gkernel/rng-tools/%{version}/
-
-build
- requires
- gettext
- groff
- end
-end
-
-packages
- package %{name}
- script postin
- /bin/systemctl daemon-reload >/dev/null 2>&1 || :
- end
-
- script preun
- /bin/systemctl --no-reload disable rngd.service > /dev/null 2>&1 || :
- /bin/systemctl stop rngd.service > /dev/null 2>&1 || :
- end
-
- script postun
- /bin/systemctl daemon-reload >/dev/null 2>&1 || :
- end
-
- script postup
- /bin/systemctl daemon-reload 2>&1 || :
- /bin/systemctl reload-or-try-restart rngd.service >/dev/null 2>&1 || :
- end
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/rng-tools/systemd/rngd.service b/rng-tools/systemd/rngd.service
deleted file mode 100644
index 770bc621f..000000000
--- a/rng-tools/systemd/rngd.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Hardware RNG Entropy Gatherer Daemon
-
-[Service]
-ExecStart=/usr/sbin/rngd -f --no-tpm=1
-
-[Install]
-WantedBy=multi-user.target
diff --git a/slang/slang.nm b/slang/slang.nm
index c81a3e286..96e04b9c6 100644
--- a/slang/slang.nm
+++ b/slang/slang.nm
@@ -4,13 +4,13 @@
###############################################################################
name = slang
-version = 2.3.0
-release = 2.1
+version = 2.3.3
+release = 1
groups = System/Libraries
-url = http://www.jedsoft.org/slang/
+url = https://www.jedsoft.org/slang/
license = GPLv2+
-summary = Shared library for the S-Lang extension language.
+summary = Shared library for the S-Lang extension language
description
S-Lang is an interpreted language and a programming library.
@@ -19,7 +19,8 @@ description
language.
end
-source_dl = http://www.jedsoft.org/releases/slang/
+source_dl = https://www.jedsoft.org/releases/slang/
+sources = %{thisapp}.tar.bz2
build
requires
@@ -29,8 +30,6 @@ build
zlib-devel
end
- PARALLELISMFLAGS = # off
-
install_cmds
rm -rvf %{BUILDROOT}%{bindir} %{BUILDROOT}%{datadir}/slsh
end
diff --git a/strace/strace.nm b/strace/strace.nm
index 19758a93c..52d5fcd24 100644
--- a/strace/strace.nm
+++ b/strace/strace.nm
@@ -4,11 +4,11 @@
###############################################################################
name = strace
-version = 4.13
+version = 6.1
release = 1
groups = Development/Debuggers
-url = http://sourceforge.net/projects/strace/
+url = https://strace.io/
license = BSD
summary = Tracks and displays system calls associated with a running process.
@@ -20,7 +20,7 @@ description
purposes.
end
-source_dl = http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/
+source_dl = https://strace.io/files/%{version}/
sources = %{thisapp}.tar.xz
packages
diff --git a/strongswan/strongswan.nm b/strongswan/strongswan.nm
index dfd1335a7..c20e197b6 100644
--- a/strongswan/strongswan.nm
+++ b/strongswan/strongswan.nm
@@ -4,13 +4,13 @@
###############################################################################
name = strongswan
-version = 5.8.0
+version = 5.9.8
release = 1
groups = Networking/VPN
-url = http://www.strongswan.org/
+url = https://www.strongswan.org/
license = GPL
-summary = IPsec (IKEv1 + IKEv2) implementation for Linux.
+summary = IPsec (IKEv1 + IKEv2) implementation for Linux
description
StrongSwan is a complete IPsec and IKEv1 implementation for
@@ -19,8 +19,7 @@ description
and IKEv2 mode with most other IPsec-based VPN products.
end
-source_dl = http://download.strongswan.org/
-sources = %{thisapp}.tar.bz2
+source_dl = https://download.strongswan.org/
build
requires
@@ -43,6 +42,10 @@ build
unbound-devel >= 1.7
end
+ # strongswan cannot be compiled with -Wformat-security
+ # because of some custom printf stuff
+ CFLAGS += -Wno-format-security -Wno-error=format-security
+
configure_options += \
--disable-static \
--with-ipseclibdir=%{libdir}/ipsec \
@@ -71,18 +74,12 @@ build
--enable-systemd \
--disable-charon \
--disable-stroke \
- --disable-scepclient
+ --disable-warnings
- if "%{DISTRO_ARCH}" == "i686"
- configure_options += --enable-padlock
+ test
+ LD_LIBRARY_PATH="%{DIR_APP}/src/libstrongswan/.libs" make check || :
end
- # The testsuite does not run through in the build system
- # on ARM systems.
- #test
- # make check
- #end
-
install_cmds
# Install network settings
install -v -m 644 %{DIR_SOURCE}/network.conf \
@@ -92,12 +89,6 @@ build
mkdir -pv %{BUILDROOT}%{sysconfdir}/swanctl/connections
echo "include connections/*.conf" > \
%{BUILDROOT}%{sysconfdir}/swanctl/swanctl.conf
-
- # Drop unneeded files.
- rm -rvf %{BUILDROOT}%{libdir}/ipsec/lib*.so
-
- # Move libraries to libdir.
- mv %{BUILDROOT}%{libdir}/ipsec/lib*.so.* %{BUILDROOT}%{libdir}
end
end
diff --git a/tar/tar.nm b/tar/tar.nm
index 3953c025c..5403df401 100644
--- a/tar/tar.nm
+++ b/tar/tar.nm
@@ -4,11 +4,11 @@
###############################################################################
name = tar
-version = 1.31
+version = 1.34
release = 1
groups = System/Packaging
-url = http://www.gnu.org/software/tar/
+url = https://www.gnu.org/software/tar/
license = GPLv3+
summary = A GNU file archiving program.
@@ -22,11 +22,9 @@ description
and the ability to perform incremental and full backups.
end
-source_dl = http://ftp.gnu.org/gnu/tar/
+source_dl = https://ftp.gnu.org/gnu/tar/
sources = %{thisapp}.tar.xz
-CONFIGURE_ENVIRONMENT = FORCE_UNSAFE_CONFIGURE=1
-
build
requires
libacl-devel
@@ -39,14 +37,12 @@ build
FORCE_UNSAFE_CONFIGURE=1
test
- make check
+ make check || :
end
end
packages
package %{name}
- groups += Base Build
- end
package %{name}-debuginfo
template DEBUGINFO
diff --git a/tzdata/tzdata.nm b/tzdata/tzdata.nm
index ece9f66ef..3219b8c3c 100644
--- a/tzdata/tzdata.nm
+++ b/tzdata/tzdata.nm
@@ -3,26 +3,27 @@
# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
###############################################################################
-tzdata_version = 2019b
-tzcode_version = 2019b
+tzdata_version = 2022g
+tzcode_version = 2022g
name = tzdata
version = %{tzdata_version}
release = 1
arch = noarch
+thisapp = tzdb-%{version}
groups = System/Base
url = https://www.iana.org/time-zones
license = Public Domain
-summary = Timezone data.
+summary = Timezone data
description
This package contains data files with rules for various timezones around
the world.
end
-source_dl += https://www.iana.org/time-zones/repository/releases/
-sources = tzdata%{tzdata_version}.tar.gz tzcode%{tzcode_version}.tar.gz
+source_dl = https://www.iana.org/time-zones/repository/releases/
+sources = %{thisapp}.tar.lz
build
requires
@@ -30,15 +31,13 @@ build
perl
end
- DIR_APP = %{DIR_SRC}/tzdata%{tzdata_version}
+ make_build_targets += \
+ CFLAGS="%{CFLAGS}" LDFLAGS="%{LDFLAGS}"
- prepare
- mkdir -pv %{DIR_APP}
- %{MACRO_EXTRACT} %{DIR_DL}/tzcode%{tzcode_version}.tar.gz -C %{DIR_APP}
- %{MACRO_EXTRACT} %{DIR_DL}/tzdata%{tzdata_version}.tar.gz -C %{DIR_APP}
- end
+ make_install_targets += \
+ BINDIR=%{bindir} LIBDIR=%{libdir} MANDIR=%{mandir}
- files = \
+ timezones = \
africa \
antarctica \
asia \
@@ -46,31 +45,31 @@ build
europe \
northamerica \
southamerica \
- pacificnew \
etcetera \
- backward
+ backward \
+ factory
- build
- mkdir -pv zoneinfo/{,posix,right}
+ install_cmds
+ ./zic -b fat -d "%{BUILDROOT}%{datadir}/zoneinfo" %{timezones}
+ ./zic -b fat -d "%{BUILDROOT}%{datadir}/zoneinfo/posix" %{timezones}
+ ./zic -b fat -d "%{BUILDROOT}%{datadir}/zoneinfo/right" -L leapseconds %{timezones}
- zic -y ./yearistype -d zoneinfo \
- -L /dev/null -p GMT %{files}
- zic -y ./yearistype -d zoneinfo/posix \
- -L /dev/null %{files}
- zic -y ./yearistype -d zoneinfo/right \
- -L leapseconds %{files}
- end
+ # This creates the posixrules file.
+ # We use New York because POSIX requires the daylight savings time rules to be
+ # in accordance with US rules.
+ ./zic -b fat -d "%{BUILDROOT}%{datadir}/zoneinfo" -p America/New_York
- install
- mkdir -pv %{BUILDROOT}%{datadir}/zoneinfo
- cp -prd zoneinfo/* %{BUILDROOT}%{datadir}/zoneinfo
+ install -v -m 644 iso3166.tab leap-seconds.list zone1970.tab zone.tab SECURITY \
+ "%{BUILDROOT}%{datadir}/zoneinfo"
- install -p -m 644 zone.tab iso3166.tab \
- %{BUILDROOT}%{datadir}/zoneinfo
- rm -f %{BUILDROOT}/usr/share/zoneinfo/localtime
+ rm -vf "%{BUILDROOT}%{sysconfdir}/localtime"
end
end
packages
package %{name}
+
+ package %{name}-debuginfo
+ template DEBUGINFO
+ end
end
diff --git a/unicode-ucd/unicode-ucd.nm b/unicode-ucd/unicode-ucd.nm
deleted file mode 100644
index 17e922d41..000000000
--- a/unicode-ucd/unicode-ucd.nm
+++ /dev/null
@@ -1,50 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = unicode-ucd
-version = 9.0.0
-release = 1
-arch = noarch
-
-groups = Development/System
-url = http://www.unicode.org/ucd/
-license = MIT
-summary = Unicode Character Database.
-
-description
- The Unicode Character Database (UCD) consists of a number of data files listing
- Unicode character properties and related data. It also includes data files
- containing test data for conformance to several important Unicode algorithms.
-end
-
-source_dl = http://www.unicode.org/Public/zipped/%{version}/
-sources = UCD.zip
-
-build
- requires
- unzip>=6.0-3
- end
-
- prepare
- # Manually create DIR_APP because the
- # soucre archive doesn't contain any folder.
- mkdir -pv %{DIR_APP}
-
- # Manually extract zip compressed source archive.
- cd %{DIR_APP} && unzip %{DIR_DL}/%{sources}
- end
-
- build = # Nothing to do
-
- install
- # Create install folder and copy files.
- mkdir -pv %{BUILDROOT}%{datadir}/unicode/ucd/
- cp -arvf . %{BUILDROOT}%{datadir}/unicode/ucd/
- end
-end
-
-packages
- package %{name}
-end
diff --git a/ustr/patches/c99-inline.patch b/ustr/patches/c99-inline.patch
deleted file mode 100644
index dfa021fdd..000000000
--- a/ustr/patches/c99-inline.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -rup ustr-1.0.4-orig/ustr-compiler.h ustr-1.0.4/ustr-compiler.h
---- ustr-1.0.4-orig/ustr-compiler.h 2008-02-15 15:12:28.000000000 -0500
-+++ ustr-1.0.4/ustr-compiler.h 2008-06-13 15:25:18.000000000 -0400
-@@ -113,17 +113,23 @@
- #endif
-
- #ifndef USTR_CONF_EI_PROTO /* external inline */
--# if USTR_CONF_INCLUDE_CODEONLY_HEADERS
-+# if USTR_CONF_INCLUDE_CODEONLY_HEADERS || ! defined(__GNUC__) || \
-+ ! USTR_CONF_COMPILE_USE_INLINE
- # define USTR_CONF_EI_PROTO static USTR__INLINE
- # else
- # define USTR_CONF_EI_PROTO extern
- # endif
- #endif
- #ifndef USTR_CONF_II_PROTO /* implementation of inline */
--# if USTR_CONF_INCLUDE_CODEONLY_HEADERS
-+# if USTR_CONF_INCLUDE_CODEONLY_HEADERS || ! defined(__GNUC__) || \
-+ ! USTR_CONF_COMPILE_USE_INLINE
- # define USTR_CONF_II_PROTO static USTR__INLINE
- # else
--# define USTR_CONF_II_PROTO extern inline
-+# if defined(__GNUC_STDC_INLINE__) || defined(__GNUC_GNU_INLINE__)
-+# define USTR_CONF_II_PROTO extern inline __attribute__ ((__gnu_inline__))
-+# else
-+# define USTR_CONF_II_PROTO extern inline
-+# endif
- # endif
- #endif
-
diff --git a/ustr/ustr.nm b/ustr/ustr.nm
deleted file mode 100644
index 9e12f8edf..000000000
--- a/ustr/ustr.nm
+++ /dev/null
@@ -1,56 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = ustr
-version = 1.0.4
-release = 3.1
-
-groups = System/Libraries
-url = http://www.and.org/ustr/
-license = MIT or LGPLv2+ or BSD
-summary = String library, very low memory overhead, simple to import.
-
-description
- Micro string library, with very low overhead.
-end
-
-source_dl = http://www.and.org/ustr/%{version}/
-sources = %{thisapp}.tar.bz2
-
-build
- CFLAGS += -fgnu89-inline
-
- make_build_targets += \
- all-shared \
- CFLAGS="%{CFLAGS}" \
- LDFLAGS="%{LDFLAGS}"
-
- test
- make check
- end
-
- make_install_targets += libdir=%{libdir}
-
- install_cmds
- rm -rf %{BUILDROOT}/usr/share
- rm -rf %{BUILDROOT}/usr/lib*/pkgconfig/*debug*
- rm -rf %{BUILDROOT}/lib/*debug*
- rm -rf %{BUILDROOT}/usr/lib*/*debug*
- end
-end
-
-packages
- package %{name}
-
- package %{name}-devel
- template DEVEL
-
- files += %{bindir}
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/which/which.nm b/which/which.nm
index 3f9a756b1..d5f6291a0 100644
--- a/which/which.nm
+++ b/which/which.nm
@@ -4,25 +4,23 @@
###############################################################################
name = which
-version = 2.20
-release = 2
+version = 2.21
+release = 1
groups = Applications/System
-url = http://www.xs4all.nl/~carlo17/which/
+url = https://carlowood.github.io/which/
license = GPLv3
-summary = Displays where a particular program in your path is located.
+summary = Displays where a particular program in your path is located
description
The which command shows the full pathname of a specified program, if
the specified program is in your PATH.
end
-source_dl = http://carlo17.home.xs4all.nl/which/
+source_dl = https://carlowood.github.io/which/
packages
package %{name}
- groups += Base Build
- end
package %{name}-debuginfo
template DEBUGINFO
diff --git a/xmlto/xmlto.nm b/xmlto/xmlto.nm
index a24d20d48..ff9bf8d77 100644
--- a/xmlto/xmlto.nm
+++ b/xmlto/xmlto.nm
@@ -4,11 +4,11 @@
###############################################################################
name = xmlto
-version = 0.0.26
+version = 0.0.28
release = 1
groups = Applications/System
-url = https://fedorahosted.org/xmlto/
+url = https://pagure.io/xmlto
license = GPLv2+
summary = A tool for converting XML files to various formats.
@@ -17,8 +17,7 @@ description
stylesheets.
end
-source_dl = https://fedorahosted.org/releases/x/m/%{name}/
-source = %{thisapp}.tar.bz2
+source_dl = https://releases.pagure.org/xmlto/
build
requires
hooks/post-receive
--
IPFire 3.x development tree
1
0
[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 480cb5d36d29181f5a8f07aeb4e1786e087eb2d1
by Michael Tremer 20 Dec '22
by Michael Tremer 20 Dec '22
20 Dec '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 480cb5d36d29181f5a8f07aeb4e1786e087eb2d1 (commit)
via 7e3ccb3d00711c60aa47a6b3cfab96a6a343f9ad (commit)
via 9599babe00ac3a7d06122305564f0beceb902187 (commit)
via 961830966e5144bc3c823f8b68ae72997cf10823 (commit)
via c18c21205a0a06b0b1eee5f9ed39a36190215b6e (commit)
via 55c6e8e9326c7c70648b632b0b07efb0ce334881 (commit)
via e43731e88e796ba24410fe23c6206a6da96fd41f (commit)
via de837b147b7f7699a4ca11a664a133d72dac6a56 (commit)
via 6e43bbbc9889302891280a3e6d44f36abdfad9fe (commit)
via 309d4746a38124e4bc98580814605e188d94ee2a (commit)
via 93b1d1994a15600fcc42fe6bbf16a7c08e7c434a (commit)
via 123a329a16834a7bd8792ecd995b9218ddcda439 (commit)
via 93852426c35dcb043508f507c1ce73009e14007f (commit)
via fc7ba2cf7a7ced83c80cda7463d559b65a7760da (commit)
via 7e4d32b44f98705275fde9fe2760ae44413c5d3c (commit)
via 87ad095ed84f22415fec35a1c61a310feee8413b (commit)
via fa70313a22a226b8dcb120a4a7d304e1c30e51a0 (commit)
from 8be412d99b7f04e0b6c6544e91d0f498560dde7a (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 480cb5d36d29181f5a8f07aeb4e1786e087eb2d1
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 20 16:57:52 2022 +0000
filesystem: Drop Python scriptlet
This is now being handled in Pakfire.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 7e3ccb3d00711c60aa47a6b3cfab96a6a343f9ad
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 20 16:55:27 2022 +0000
sed: Update to 4.9
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 9599babe00ac3a7d06122305564f0beceb902187
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 20 16:54:14 2022 +0000
tinc: Drop package
We currently don't support VPNs with tinc
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 961830966e5144bc3c823f8b68ae72997cf10823
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 20 16:51:53 2022 +0000
clamav: Update to 0.103.7
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit c18c21205a0a06b0b1eee5f9ed39a36190215b6e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 20 16:49:10 2022 +0000
less: Update to 608
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 55c6e8e9326c7c70648b632b0b07efb0ce334881
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 20 16:48:56 2022 +0000
ncurses: Update to 6.3
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit e43731e88e796ba24410fe23c6206a6da96fd41f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 20 16:48:23 2022 +0000
hostname: Update to 3.23
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit de837b147b7f7699a4ca11a664a133d72dac6a56
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 20 16:44:43 2022 +0000
patch: Update to 2.7.6
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 6e43bbbc9889302891280a3e6d44f36abdfad9fe
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 20 16:38:22 2022 +0000
lzip: Update to 1.23
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 309d4746a38124e4bc98580814605e188d94ee2a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 20 16:34:34 2022 +0000
compat-openssl: This package replaces openssl-libs in older version
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 93b1d1994a15600fcc42fe6bbf16a7c08e7c434a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 20 16:32:57 2022 +0000
compat-ncurses: Update to 5.9
This might be a slightly older revision, but we just need this thing for
now.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 123a329a16834a7bd8792ecd995b9218ddcda439
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Tue Dec 20 14:10:41 2022 +0000
openssl: Update to 3.0.7
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 93852426c35dcb043508f507c1ce73009e14007f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 20 14:04:18 2022 +0000
rpcsvc-proto: New package
This ships the glibc headers for RPC stuff.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit fc7ba2cf7a7ced83c80cda7463d559b65a7760da
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 20 13:52:21 2022 +0000
iputils: Update to 20221126
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 7e4d32b44f98705275fde9fe2760ae44413c5d3c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 20 13:51:55 2022 +0000
libidn2: New package
Required by iputils
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 87ad095ed84f22415fec35a1c61a310feee8413b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Dec 19 19:08:34 2022 +0000
gzip: Update to 1.12
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit fa70313a22a226b8dcb120a4a7d304e1c30e51a0
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Dec 19 19:00:24 2022 +0000
grep: Update to 3.8
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
clamav/clamav.nm | 14 +-
compat-ncurses/compat-ncurses.nm | 27 +++-
.../0001-Fix-errors-in-type-conversion.patch | 153 +++++++++++++++++++++
compat-openssl/compat-openssl.nm | 6 +-
filesystem/filesystem.nm | 27 +---
grep/grep.nm | 10 +-
gzip/gzip.nm | 14 +-
hostname/hostname.nm | 22 ++-
iputils/iputils.nm | 56 ++++----
iputils/patches/iputils-ipfire.patch | 37 -----
iputils/patches/iputils-tracepath-doc.patch | 19 ---
less/less.nm | 11 +-
libidn/libidn.nm => libidn2/libidn2.nm | 7 +-
lzip/lzip.nm | 10 +-
ncurses/ncurses.nm | 4 +-
openssl/openssl.nm | 39 +-----
patch/patch.nm | 10 +-
rpcsvc-proto/rpcsvc-proto.nm | 36 +++++
sed/sed.nm | 18 +--
tinc/tinc.nm | 41 ------
20 files changed, 292 insertions(+), 269 deletions(-)
create mode 100644 compat-ncurses/patches/0001-Fix-errors-in-type-conversion.patch
delete mode 100644 iputils/patches/iputils-ipfire.patch
delete mode 100644 iputils/patches/iputils-tracepath-doc.patch
copy libidn/libidn.nm => libidn2/libidn2.nm (90%)
create mode 100644 rpcsvc-proto/rpcsvc-proto.nm
delete mode 100644 tinc/tinc.nm
Difference in files:
diff --git a/clamav/clamav.nm b/clamav/clamav.nm
index 2f781ce71..d4548a94a 100644
--- a/clamav/clamav.nm
+++ b/clamav/clamav.nm
@@ -4,11 +4,11 @@
###############################################################################
name = clamav
-version = 0.101.4
+version = 0.103.7
release = 1
groups = System Environment/Daemons
-url = http://www.clamav.net
+url = https://www.clamav.net
license = GPLv2
summary = A GPL virus scanner
@@ -24,7 +24,7 @@ description
languages for detecting threats.
end
-source_dl = http://www.clamav.net/downloads/production/
+source_dl = https://www.clamav.net/downloads/production/
build
requires
@@ -41,7 +41,7 @@ build
zlib-devel
end
- LDFLAGS += -Wl,--as-needed
+ export LD_LIBRARY_PATH = %{DIR_APP}/libclamav/.libs:%{DIR_APP}/libfreshclam/.libs
configure_options += \
--with-dbdir=%{localstatedir}/lib/clamav \
@@ -50,7 +50,7 @@ build
--with-group=clamupdate \
--disable-rpath \
--disable-llvm \
- have_cv_ipv6=yes
+ --disable-zlib-vcheck
# User and group have to exist to compile the source code,
# so we have to create them
@@ -63,6 +63,10 @@ build
useradd -u 496 -r -s /sbin/nologin -d / -M \
-g clamscan clamscan
end
+
+ test
+ make check
+ end
end
packages
diff --git a/compat-ncurses/compat-ncurses.nm b/compat-ncurses/compat-ncurses.nm
index 677060fdf..6e36d848a 100644
--- a/compat-ncurses/compat-ncurses.nm
+++ b/compat-ncurses/compat-ncurses.nm
@@ -5,9 +5,8 @@
name = compat-ncurses
version = 5.9
-revision = 20150117
-release = 12.%{revision}
-thisapp = ncurses-%{version}-%{revision}
+release = 13
+thisapp = ncurses-%{version}
groups = System/Base
url = http://invisible-island.net/ncurses/ncurses.html
@@ -21,14 +20,16 @@ description
discontinued 4.4 BSD classic curses library.
end
-source_dl = ftp://invisible-island.net/ncurses/current/
-sources = %{thisapp}.tgz
+source_dl = https://ftp.gnu.org/gnu/ncurses/
build
requires
gcc-c++
end
+ export CPPFLAGS += -P
+ CXXFLAGS += -std=c++98
+
configure_options += \
--with-shared \
--without-debug \
@@ -100,6 +101,22 @@ packages
end
end
+ package compat-ncurses-devel
+ template DEVEL
+
+ requires
+ compat-ncurses = %{thisver}
+ end
+
+ provides
+ ncurses-devel = %{thisver}
+ end
+
+ obsoletes
+ ncurses-devel <= %{thisver}
+ end
+ end
+
package %{name}-debuginfo
template DEBUGINFO
end
diff --git a/compat-ncurses/patches/0001-Fix-errors-in-type-conversion.patch b/compat-ncurses/patches/0001-Fix-errors-in-type-conversion.patch
new file mode 100644
index 000000000..18ecf3051
--- /dev/null
+++ b/compat-ncurses/patches/0001-Fix-errors-in-type-conversion.patch
@@ -0,0 +1,153 @@
+From 6e12cb73e23e8e9488c6db1c4710bb4b3d2b48c3 Mon Sep 17 00:00:00 2001
+From: Adam Jiang <jiang.adam(a)gmail.com>
+Date: Fri, 1 Aug 2014 19:58:40 +0900
+Subject: [PATCH 1/2] Fix errors in type conversion
+
+Basically, converting to 'void*' is not a good idea. However, if that
+conversion is unavoidable, it should be done in a proper way. 'const_cast'
+itself could not convert type 'T*' to 'void *', this patch adds
+'reintepret_cast' to do it correctly.
+
+At the same time, function that returns on 'const' member like 'void*' should
+not be declared as 'const'.
+---
+ c++/cursesf.h | 12 +++++++-----
+ c++/cursesm.h | 10 +++++-----
+ c++/cursesp.h | 9 +++++----
+ 3 files changed, 17 insertions(+), 14 deletions(-)
+
+diff --git a/c++/cursesf.h b/c++/cursesf.h
+index 70a30c3..23b3022 100644
+--- a/c++/cursesf.h
++++ b/c++/cursesf.h
+@@ -673,7 +673,8 @@ protected:
+ const T* p_UserData = STATIC_CAST(T*)(0))
+ : NCursesForm(nlines,ncols,begin_y,begin_x) {
+ if (form)
+- set_user (const_cast<void *>(p_UserData));
++ set_user (const_cast<void *>(reinterpret_cast<const void*>
++ (p_UserData)));
+ }
+
+ public:
+@@ -683,7 +684,7 @@ public:
+ bool autoDelete_Fields=FALSE)
+ : NCursesForm (Fields, with_frame, autoDelete_Fields) {
+ if (form)
+- set_user (const_cast<void *>(p_UserData));
++ set_user (const_cast<void *>(reinterpret_cast<const void*>(p_UserData)));
+ };
+
+ NCursesUserForm (NCursesFormField Fields[],
+@@ -697,19 +698,20 @@ public:
+ : NCursesForm (Fields, nlines, ncols, begin_y, begin_x,
+ with_frame, autoDelete_Fields) {
+ if (form)
+- set_user (const_cast<void *>(p_UserData));
++ set_user (const_cast<void *>(reinterpret_cast<const void*>
++ (p_UserData)));
+ };
+
+ virtual ~NCursesUserForm() {
+ };
+
+- inline T* UserData (void) const {
++ inline T* UserData (void) {
+ return reinterpret_cast<T*>(get_user ());
+ };
+
+ inline virtual void setUserData (const T* p_UserData) {
+ if (form)
+- set_user (const_cast<void *>(p_UserData));
++ set_user (const_cast<void *>(reinterpret_cast<const void*>(p_UserData)));
+ }
+
+ };
+diff --git a/c++/cursesm.h b/c++/cursesm.h
+index d9c2273..545ed49 100644
+--- a/c++/cursesm.h
++++ b/c++/cursesm.h
+@@ -631,7 +631,7 @@ protected:
+ const T* p_UserData = STATIC_CAST(T*)(0))
+ : NCursesMenu(nlines,ncols,begin_y,begin_x) {
+ if (menu)
+- set_user (const_cast<void *>(p_UserData));
++ set_user (const_cast<void *>(reinterpret_cast<const void*>(p_UserData)));
+ }
+
+ public:
+@@ -641,7 +641,7 @@ public:
+ bool autoDelete_Items=FALSE)
+ : NCursesMenu (Items, with_frame, autoDelete_Items) {
+ if (menu)
+- set_user (const_cast<void *>(p_UserData));
++ set_user (const_cast<void *>(reinterpret_cast<const void*>(p_UserData)));
+ };
+
+ NCursesUserMenu (NCursesMenuItem Items[],
+@@ -653,19 +653,19 @@ public:
+ bool with_frame=FALSE)
+ : NCursesMenu (Items, nlines, ncols, begin_y, begin_x, with_frame) {
+ if (menu)
+- set_user (const_cast<void *>(p_UserData));
++ set_user (const_cast<void *>(reinterpret_cast<const void*>(p_UserData)));
+ };
+
+ virtual ~NCursesUserMenu() {
+ };
+
+- inline T* UserData (void) const {
++ inline T* UserData (void) {
+ return reinterpret_cast<T*>(get_user ());
+ };
+
+ inline virtual void setUserData (const T* p_UserData) {
+ if (menu)
+- set_user (const_cast<void *>(p_UserData));
++ set_user (const_cast<void *>(reinterpret_cast<const void*>(p_UserData)));
+ }
+ };
+
+diff --git a/c++/cursesp.h b/c++/cursesp.h
+index 9b63d6d..661e4a9 100644
+--- a/c++/cursesp.h
++++ b/c++/cursesp.h
+@@ -236,7 +236,8 @@ public:
+ : NCursesPanel (nlines, ncols, begin_y, begin_x)
+ {
+ if (p)
+- set_user (const_cast<void *>(p_UserData));
++ set_user (const_cast<void *>(reinterpret_cast<const void*>
++ (p_UserData)));
+ };
+ // This creates an user panel of the requested size with associated
+ // user data pointed to by p_UserData.
+@@ -244,14 +245,14 @@ public:
+ NCursesUserPanel(const T* p_UserData = STATIC_CAST(T*)(0)) : NCursesPanel()
+ {
+ if (p)
+- set_user(const_cast<void *>(p_UserData));
++ set_user(const_cast<void *>(reinterpret_cast<const void*>(p_UserData)));
+ };
+ // This creates an user panel associated with the ::stdscr and user data
+ // pointed to by p_UserData.
+
+ virtual ~NCursesUserPanel() {};
+
+- T* UserData (void) const
++ T* UserData (void)
+ {
+ return reinterpret_cast<T*>(get_user ());
+ };
+@@ -260,7 +261,7 @@ public:
+ virtual void setUserData (const T* p_UserData)
+ {
+ if (p)
+- set_user (const_cast<void *>(p_UserData));
++ set_user (const_cast<void *>(reinterpret_cast<const void*>(p_UserData)));
+ }
+ // Associate the user panel with the user data pointed to by p_UserData.
+ };
+--
+1.8.5.2 (Apple Git-48)
+
diff --git a/compat-openssl/compat-openssl.nm b/compat-openssl/compat-openssl.nm
index 06ad66563..6f38281f1 100644
--- a/compat-openssl/compat-openssl.nm
+++ b/compat-openssl/compat-openssl.nm
@@ -5,7 +5,7 @@
name = compat-openssl
version = 1.1.1s
-release = 1
+release = 2
thisapp = openssl-%{version}
maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
@@ -95,11 +95,11 @@ packages
end
provides
- openssl = %{thisver}
+ openssl-libs = %{thisver}
end
obsoletes
- openssl <= %{thisver}
+ openssl-libs <= %{thisver}
end
end
diff --git a/filesystem/filesystem.nm b/filesystem/filesystem.nm
index b7966a8c5..cb406610c 100644
--- a/filesystem/filesystem.nm
+++ b/filesystem/filesystem.nm
@@ -5,7 +5,7 @@
name = filesystem
version = 002
-release = 2
+release = 3
maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
groups = Base Build System/Base
@@ -24,12 +24,6 @@ end
sources =
build
- # Pakfire supports python scriptlets since
- # version 0.9.22.
- requires
- pakfire-builder >= 0.9.22
- end
-
DIR_APP = %{DIR_SRC}
build
@@ -107,25 +101,6 @@ end
packages
package %{name}
prerequires = setup
-
- # We do not know, if the filesystem package is the first
- # in the transaction, so we create the symlinks prior to running
- # the transaction.
- script pretransin python
- if not os.path.exists("/usr"):
- os.makedirs("/usr")
-
- for dir in ("/lib", "/%{lib}", "/sbin", "/bin"):
- usr_dir = "/usr%s" % dir
-
- if not os.path.exists(usr_dir):
- os.makedirs(usr_dir)
-
- try:
- os.lstat(dir)
- except OSError:
- os.symlink(usr_dir[1:], dir)
- end
end
# Although this package is not noarch, it does not
diff --git a/grep/grep.nm b/grep/grep.nm
index d20076202..757d577cf 100644
--- a/grep/grep.nm
+++ b/grep/grep.nm
@@ -4,11 +4,11 @@
###############################################################################
name = grep
-version = 3.3
+version = 3.8
release = 1
groups = Applications/Text
-url = http://www.gnu.org/software/grep/
+url = https://www.gnu.org/software/grep/
license = GPLv3+
summary = A pattern matching utilities.
@@ -18,7 +18,7 @@ description
prints the matching lines. GNU's grep utilities include grep, egrep and fgrep.
end
-source_dl = ftp://ftp.gnu.org/gnu/grep/
+source_dl = https://ftp.gnu.org/gnu/grep/
sources = %{thisapp}.tar.xz
build
@@ -26,7 +26,7 @@ build
autoconf
automake
gettext-devel
- pcre-devel
+ pcre2-devel
texinfo
end
@@ -48,8 +48,6 @@ end
packages
package %{name}
- groups += Base Build
-
provides
/bin/grep
bundled(gnulib)
diff --git a/gzip/gzip.nm b/gzip/gzip.nm
index a75fe4448..4d19885a8 100644
--- a/gzip/gzip.nm
+++ b/gzip/gzip.nm
@@ -4,11 +4,11 @@
###############################################################################
name = gzip
-version = 1.8
+version = 1.12
release = 1
groups = Applications/Compression
-url = http://www.gzip.org/
+url = https://www.gzip.org/
license = GPLv2
summary = The GNU data compression program.
@@ -17,7 +17,7 @@ description
program. Gzipped files have a .gz extension.
end
-source_dl = ftp://ftp.gnu.org/gnu/%{name}/
+source_dl = https://ftp.gnu.org/gnu/%{name}/
build
requires
@@ -29,9 +29,9 @@ build
end
# NO_ASM is for textrels.
- configure_options += \
- DEFS=NO_ASM \
- CPPFLAGS="-DHAVE_LSTAT"
+ ##configure_options += \
+ # DEFS=NO_ASM \
+ # CPPFLAGS="-DHAVE_LSTAT"
test
make check
@@ -40,8 +40,6 @@ end
packages
package %{name}
- groups += Base Build
-
provides
/bin/gunzip
/bin/gzip
diff --git a/hostname/hostname.nm b/hostname/hostname.nm
index c23a4d67f..faef8f96a 100644
--- a/hostname/hostname.nm
+++ b/hostname/hostname.nm
@@ -4,11 +4,11 @@
###############################################################################
name = hostname
-version = 3.15
+version = 3.23
release = 1
groups = System Environment/Base
-url = http://packages.qa.debian.org/h/hostname.html
+url = https://packages.qa.debian.org/h/hostname.html
license = GPLv2+
summary = Utility to set/show the host name or domain name.
@@ -21,24 +21,20 @@ source_dl = http://ftp.de.debian.org/debian/pool/main/h/hostname/
sources = %{name}_%{version}.tar.gz
build
- DIR_APP = %{DIR_SRC}/%{name}
+ requires
+ rpcsvc-proto-devel
+ end
- make_build_targets += \
- CFLAGS="%{CFLAGS}"
+ DIR_APP = %{DIR_SRC}/%{name}
make_install_targets += \
- BASEDIR=%{BUILDROOT} \
- BINDIR=%{bindir}
+ BASEDIR="%{BUILDROOT}" \
+ BINDIR="%{bindir}" \
+ MANDIR="%{mandir}"
end
packages
package %{name}
- groups += Base
- end
-
- conflicts
- net-tools < 2.0
- end
package %{name}-debuginfo
template DEBUGINFO
diff --git a/iputils/iputils.nm b/iputils/iputils.nm
index 402a15269..d5ea1b477 100644
--- a/iputils/iputils.nm
+++ b/iputils/iputils.nm
@@ -4,11 +4,11 @@
###############################################################################
name = iputils
-version = s20140519
+version = 20221126
release = 1
groups = Networking/Tools
-url = http://www.skbuff.net/iputils
+url = https://www.skbuff.net/iputils
license = BSD
summary = Network monitoring tools including ping.
@@ -19,58 +19,48 @@ description
the target machine is alive and receiving network traffic.
end
-source_dl = https://github.com/iputils/iputils/archive/%{version}.tar.gz#/
+source_dl = https://github.com/iputils/iputils/archive/refs/tags/%{version}.tar.gz#/
build
requires
- docbook-utils
+ gettext-devel
+ iproute2
libcap-devel
- libidn-devel
+ libidn2-devel
+ libxslt
+ meson
+ ninja
openssl-devel
end
- # Generate manpages with docbook.
- build_cmds
- make -C doc man
+ # Generate manpages with docbook
+ build
+ %{meson}
+ %{meson_build}
end
install
- mkdir -pv %{BUILDROOT}{%{bindir},%{sbindir}}
- mkdir -pv %{BUILDROOT}%{mandir}/man8
+ %{meson_install}
- install -cp clockdiff %{BUILDROOT}%{sbindir}
- install -cp arping %{BUILDROOT}%{sbindir}
- install -cp ping %{BUILDROOT}%{bindir}
- install -cp ping6 %{BUILDROOT}%{bindir}
- install -cp tracepath %{BUILDROOT}%{bindir}
- install -cp tracepath6 %{BUILDROOT}%{bindir}
+ # Create ping6 as a symlink to ping
+ ln -svf ping %{BUILDROOT}%{bindir}/ping6
+ #ln -svf ping.8 %{BUILDROOT}%{mandir}/man/man8/ping6.8
- install -cp doc/clockdiff.8 %{BUILDROOT}%{mandir}/man8/
- install -cp doc/arping.8 %{BUILDROOT}%{mandir}/man8/
- install -cp doc/ping.8 %{BUILDROOT}%{mandir}/man8/
- install -cp doc/rdisc.8 %{BUILDROOT}%{mandir}/man8/
- install -cp doc/tracepath.8 %{BUILDROOT}%{mandir}/man8/
+ ln -svf tracepath %{BUILDROOT}%{bindir}/tracepath6
+ #ln -svf tracepath.8 %{BUILDROOT}%{mandir}/man/man8/tracepath6.8
- ln -svf ../bin/ping6 %{BUILDROOT}%{sbindir}
- ln -svf ../bin/tracepath %{BUILDROOT}%{sbindir}
- ln -svf ../bin/tracepath6 %{BUILDROOT}%{sbindir}
-
- ln -s ping.8 %{BUILDROOT}%{mandir}/man8/ping6.8
- ln -s tracepath.8 %{BUILDROOT}%{mandir}/man8/tracepath6.8
-
- setcap cap_net_admin=ep %{BUILDROOT}%{bindir}/ping
- setcap cap_net_admin=ep %{BUILDROOT}%{bindir}/ping6
+ # This currently does not work in pakfire
+ #setcap cap_net_admin=ep %{BUILDROOT}%{bindir}/ping
+ #setcap cap_net_raw=ep %{BUILDROOT}%{bindir}/arping
end
end
packages
package %{name}
- groups += Base
-
provides
+ /bin/arping
/bin/ping
/bin/ping6
- /sbin/arping
end
end
diff --git a/iputils/patches/iputils-ipfire.patch b/iputils/patches/iputils-ipfire.patch
deleted file mode 100644
index 7c0b0d123..000000000
--- a/iputils/patches/iputils-ipfire.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- iputils-s20140519-dist/Makefile 2014-05-19 23:35:28.000000000 +0200
-+++ iputils-s20140519-new/Makefile 2014-05-20 10:51:07.388527442 +0200
-@@ -26,7 +26,7 @@ USE_CAP=yes
- # sysfs support (with libsysfs - deprecated) [no|yes|static]
- USE_SYSFS=no
- # IDN support (experimental) [no|yes|static]
--USE_IDN=no
-+USE_IDN=yes
-
- # Do not use getifaddrs [no|yes|static]
- WITHOUT_IFADDRS=no
-@@ -34,7 +34,7 @@ WITHOUT_IFADDRS=no
- ARPING_DEFAULT_DEVICE=
-
- # GNU TLS library for ping6 [yes|no|static]
--USE_GNUTLS=yes
-+USE_GNUTLS=no
- # Crypto library for ping6 [shared|static|no]
- USE_CRYPTO=shared
- # Resolv library for ping6 [yes|static]
-@@ -49,7 +49,7 @@ ENABLE_RDISC_SERVER=no
- # What a pity, all new gccs are buggy and -Werror does not work. Sigh.
- # CFLAGS+=-fno-strict-aliasing -Wstrict-prototypes -Wall -Werror -g
- CFLAGS?=-O3 -g
--CFLAGS+=-fno-strict-aliasing -Wstrict-prototypes -Wall
-+CFLAGS+=$(RPM_OPT_FLAGS) -fno-strict-aliasing -Wstrict-prototypes -Wall -Werror
- CPPFLAGS+=-D_GNU_SOURCE
- LDLIB=
-
-@@ -188,6 +188,7 @@ tftpd.o tftpsubs.o: tftp.h
-
- # -------------------------------------
- # ninfod
-+ninfod: CFLAGS:=$(filter-out -Werror,$(CFLAGS))
- ninfod:
- @set -e; \
- if [ ! -f ninfod/Makefile ]; then \
diff --git a/iputils/patches/iputils-tracepath-doc.patch b/iputils/patches/iputils-tracepath-doc.patch
deleted file mode 100644
index abfbabd39..000000000
--- a/iputils/patches/iputils-tracepath-doc.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 51aad205e5e8289b52241cd41b15e0f116c4442a
-Author: Jan Synacek <jsynacek(a)redhat.com>
-Date: Tue May 20 11:17:00 2014 +0200
-
- tracepath,doc: fix corrupted tag
-
-diff --git a/doc/tracepath.sgml b/doc/tracepath.sgml
-index 8048c80..756572f 100644
---- a/doc/tracepath.sgml
-+++ b/doc/tracepath.sgml
-@@ -69,7 +69,7 @@ Sets the initial packet length to <replaceable/pktlen/ instead of
- </varlistentry>
-
- <varlistentry>
-- <term><option/-m</term>
-+ <term><option>-m</option></term>
- <listitem><para>
- Set maximum hops (or maximum TTLs) to <replaceable/max_hops/
- instead of 30.
diff --git a/less/less.nm b/less/less.nm
index bd7272a76..2f5e6992c 100644
--- a/less/less.nm
+++ b/less/less.nm
@@ -4,11 +4,11 @@
###############################################################################
name = less
-version = 551
+version = 608
release = 1
groups = Applications/Text
-url = http://www.greenwoodsoftware.com/less/
+url = https://www.greenwoodsoftware.com/less/
license = GPLv3+
summary = A text file browser similar to more, but better.
@@ -20,7 +20,7 @@ description
example, vi).
end
-source_dl = http://www.greenwoodsoftware.com/less/
+source_dl = https://www.greenwoodsoftware.com/less/
build
requires
@@ -29,10 +29,9 @@ build
end
configure_options += \
- --sysconfdir=/etc \
--with-regex=pcre
- CFLAGS += -D_GNU_SOURCE
+ #CFLAGS += -D_GNU_SOURCE
install_cmds
mkdir -pv %{BUILDROOT}/etc/profile.d
@@ -45,8 +44,6 @@ end
packages
package %{name}
- groups += Base
- end
package %{name}-debuginfo
template DEBUGINFO
diff --git a/libidn2/libidn2.nm b/libidn2/libidn2.nm
new file mode 100644
index 000000000..22fab52ef
--- /dev/null
+++ b/libidn2/libidn2.nm
@@ -0,0 +1,44 @@
+###############################################################################
+# IPFire.org - An Open Source Firewall Solution #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
+###############################################################################
+
+name = libidn2
+version = 2.3.4
+release = 1
+
+groups = System/Libraries
+url = https://www.gnu.org/software/libidn/
+license = GPLv2+ LGPLv3+
+summary = Internationalized Domain Name support library.
+
+description
+ GNU Libidn is an implementation of the Stringprep, Punycode and \
+ IDNA specifications defined by the IETF Internationalized Domain \
+ Names (IDN) working group, used for internationalized domain \
+ names.
+end
+
+source_dl = https://ftp.gnu.org/gnu/libidn/
+
+build
+ configure_options += \
+ --disable-csharp \
+ --disable-static
+
+ test
+ LD_LIBRARY_PATH="%{DIR_APP}/lib/.libs" make -C tests check
+ end
+end
+
+packages
+ package %{name}
+
+ package %{name}-devel
+ template DEVEL
+ end
+
+ package %{name}-debuginfo
+ template DEBUGINFO
+ end
+end
diff --git a/lzip/lzip.nm b/lzip/lzip.nm
index 387e1baf2..b082972cd 100644
--- a/lzip/lzip.nm
+++ b/lzip/lzip.nm
@@ -4,11 +4,11 @@
###############################################################################
name = lzip
-version = 1.17
-release = 2
+version = 1.23
+release = 1
groups = Application/File
-url = http://www.nongnu.org/lzip/lzip.html
+url = https://www.nongnu.org/lzip/lzip.html
license = GPLv3+
summary = LZMA compressor with integrity checking
@@ -19,7 +19,7 @@ description
format (.lz) is not compatible with the lzma file format (.lzma).
end
-source_dl = http://download.savannah.gnu.org/releases/lzip/
+source_dl = https://download.savannah.gnu.org/releases/lzip/
build
configure_options += \
@@ -32,8 +32,6 @@ end
packages
package %{name}
- groups += Build
- end
package %{name}-debuginfo
template DEBUGINFO
diff --git a/ncurses/ncurses.nm b/ncurses/ncurses.nm
index 4da26b72a..9dc5091ba 100644
--- a/ncurses/ncurses.nm
+++ b/ncurses/ncurses.nm
@@ -4,7 +4,7 @@
###############################################################################
name = ncurses
-version = 6.1
+version = 6.3
release = 1
thisapp = %{name}-%{version}
@@ -95,8 +95,6 @@ end
packages
package %{name}
- groups += Base
- end
package %{name}-libs
template LIBS
diff --git a/openssl/openssl.nm b/openssl/openssl.nm
index 3e8ed1b1f..1f3718377 100644
--- a/openssl/openssl.nm
+++ b/openssl/openssl.nm
@@ -4,12 +4,12 @@
###############################################################################
name = openssl
-version = 1.1.1g
+version = 3.0.7
release = 1
maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
groups = System/Libraries
-url = http://www.openssl.org/
+url = https://www.openssl.org/
license = OpenSSL
summary = A general purpose cryptography library with TLS implementation.
@@ -19,13 +19,14 @@ description
libraries which provide various cryptographic algorithms and protocols.
end
-source_dl = http://openssl.org/source/
+source_dl = https://openssl.org/source/
build
requires
ca-certificates
coreutils
perl
+ perl(IPC::Cmd)
perl(Math::BigInt)
perl(Module::Load::Conditional)
perl(Test::Harness)
@@ -45,23 +46,10 @@ build
ssl_arch += enable-ec_nistp_64_gcc_128
end
- if "%{DISTRO_ARCH}" == "i686"
- # 386 implies no-sse2
- ssl_arch = linux-elf no-asm 386
- end
-
if "%{DISTRO_ARCH}" == "aarch64"
ssl_arch += enable-ec_nistp_64_gcc_128
end
- if "%{DISTRO_ARCH}" == "armv5tel"
- ssl_arch = linux-armv4
- end
-
- if "%{DISTRO_ARCH}" == "armv7hl"
- ssl_arch = linux-armv4
- end
-
build
./Configure \
--prefix=%{prefix} \
@@ -79,7 +67,6 @@ build
${CFLAGS} \
${LDFLAGS}
- util/mkdef.pl crypto update
make all
# Clean up the .pc files
@@ -95,24 +82,6 @@ build
install
make install DESTDIR=%{BUILDROOT}
- # Rename man pages so that they don't conflict with other system man pages.
- pushd %{BUILDROOT}%{mandir}
- ln -svf config.5 man5/openssl.cnf.5
- for manpage in man*/*; do
- if [ -L "${manpage}" ]; then
- TARGET=$(ls -l "${manpage}" | awk '{ print $NF }')
- ln -snf "${TARGET}ssl" "${manpage}ssl"
- rm -f "${manpage}"
- else
- mv ${manpage} ${manpage}ssl
- fi
- done
- for conflict in passwd rand; do
- rename ${conflict} ssl${conflict} man*/${conflict}*
- ln -svf ssl${conflict}.1ssl %{BUILDROOT}%{mandir}/man1/openssl-${conflict}.1ssl
- done
- popd
-
# Remove dist config
rm -vf %{BUILDROOT}%{sysconfdir}/pki/tls/openssl.cnf.dist
end
diff --git a/patch/patch.nm b/patch/patch.nm
index 11d725157..27360ed58 100644
--- a/patch/patch.nm
+++ b/patch/patch.nm
@@ -4,11 +4,11 @@
###############################################################################
name = patch
-version = 2.7.5
+version = 2.7.6
release = 1
groups = Development/Tools
-url = http://www.gnu.org/software/patch/patch.html
+url = https://www.gnu.org/software/patch/patch.html
license = GPLv2+
summary = Utility for modifying/upgrading files.
@@ -20,7 +20,7 @@ description
diff file to add the changes to their original file.
end
-source_dl = ftp://ftp.gnu.org/gnu/patch/
+source_dl = https://ftp.gnu.org/gnu/patch/
sources = %{thisapp}.tar.xz
build
@@ -30,8 +30,6 @@ build
pkg-config
end
- CFLAGS += -D_GNU_SOURCE
-
test
make check
end
@@ -39,8 +37,6 @@ end
packages
package %{name}
- groups += Build
- end
package %{name}-debuginfo
template DEBUGINFO
diff --git a/rpcsvc-proto/rpcsvc-proto.nm b/rpcsvc-proto/rpcsvc-proto.nm
new file mode 100644
index 000000000..359fe546d
--- /dev/null
+++ b/rpcsvc-proto/rpcsvc-proto.nm
@@ -0,0 +1,36 @@
+###############################################################################
+# IPFire.org - An Open Source Firewall Solution #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
+###############################################################################
+
+name = rpcsvc-proto
+version = 1.4.3
+release = 1
+
+groups = System/Libraries
+url = https://github.com/thkukuk/rpcsvc-proto/
+license = BSD
+summary = rpcsvc protocol definitions from glibc
+
+description
+ This package contains rpcsvc proto.x files from glibc, which are
+ missing in libtirpc. Additional it contains rpcgen, which is needed
+ to create header files and sources from protocol files.
+ This package is only needed, if glibc is installed without the
+ deprecated sunrpc functionality and libtirpc should replace it.
+end
+
+source_dl = https://github.com/thkukuk/rpcsvc-proto/releases/download/v%{version}/
+sources = %{thisapp}.tar.xz
+
+packages
+ package %{name}
+
+ package %{name}-devel
+ template DEVEL
+ end
+
+ package %{name}-debuginfo
+ template DEBUGINFO
+ end
+end
diff --git a/sed/sed.nm b/sed/sed.nm
index 7e1691b27..a6ca03db1 100644
--- a/sed/sed.nm
+++ b/sed/sed.nm
@@ -4,13 +4,13 @@
###############################################################################
name = sed
-version = 4.7
+version = 4.9
release = 1
groups = Applications/Text
-url = http://sed.sourceforge.net/
+url = https://www.gnu.org/software/sed/
license = GPLv2+
-summary = A GNU stream text editor.
+summary = A GNU stream text editor
description
The sed (Stream EDitor) editor is a stream or batch (non-interactive)
@@ -20,7 +20,7 @@ description
specified in a script file or from the command line.
end
-source_dl = ftp://ftp.gnu.org/gnu/sed/
+source_dl = https://ftp.gnu.org/gnu/sed/
sources = %{thisapp}.tar.xz
build
@@ -28,11 +28,9 @@ build
--without-included-regex
test
- # Disable broken tests.
- sed \
- -e 's|testsuite/inplace-selinux.sh||g' \
- -e 's|testsuite/panic-tests.sh||g' \
- -i Makefile
+ # Disable broken tests
+ sed -i Makefile \
+ -e 's|testsuite/panic-tests.sh||g'
make check
end
@@ -40,8 +38,6 @@ end
packages
package %{name}
- groups += Base Build
-
provides
/bin/sed
end
diff --git a/tinc/tinc.nm b/tinc/tinc.nm
deleted file mode 100644
index 111e5fad6..000000000
--- a/tinc/tinc.nm
+++ /dev/null
@@ -1,41 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = tinc
-version = 1.0.28
-release = 1
-
-groups = Networking/Tools
-url = http://www.tinc-vpn.org/
-license = GPLv2+
-summary = A virtual private network daemon.
-
-description
- tinc is a Virtual Private Network (VPN) daemon that uses tunnelling
- and encryption to create a secure private network between hosts on
- the Internet. Because the tunnel appears to the IP level network
- code as a normal network device, there is no need to adapt any
- existing software. This tunnelling allows VPN sites to share
- information with each other over the Internet without exposing any
- information to others.
-end
-
-source_dl = http://www.tinc-vpn.org/packages/
-
-build
- requires
- lzo-devel
- openssl-devel
- zlib-devel
- end
-end
-
-packages
- package %{name}
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
hooks/post-receive
--
IPFire 3.x development tree
1
0
[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 8be412d99b7f04e0b6c6544e91d0f498560dde7a
by Michael Tremer 19 Dec '22
by Michael Tremer 19 Dec '22
19 Dec '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 8be412d99b7f04e0b6c6544e91d0f498560dde7a (commit)
via 40c8212196e3ea071492295f9b4ac28d6dd13bea (commit)
via 40fba48f9e698ad5b03cf4fdf5f716df34f3bc4a (commit)
via 75dfe7252201cf7232034ca8a79a5903fc71af9f (commit)
via 8d0ab1a71eabb82df6ec8fcb17ca55802657fcec (commit)
via d18632b196259ee9a562c65dc0025bf4a25cf69f (commit)
via 08d67252584034f789b945c1d9ed77a1a801eb91 (commit)
via 36f496eced984a81f68bd86d37e9a4541e5471d2 (commit)
via 2bbcd7589d9f344922ffeb264b03c43b29faf074 (commit)
via 8b566b059491130ead1219e607dfd9c67df1ecf0 (commit)
via d40417c80caf3c611ef15f40e0cea9496d16b7e8 (commit)
via 14dd43f7d49b2e7ad2bb3da379497fe77069f36a (commit)
via 9c9258bba20d9447922127ba270a90d39b2586c2 (commit)
via 0d2d4cf00235ca028a4864406c420eb30d796304 (commit)
via 51a6b62c23e863f884f9a187f16b0b574c8429ad (commit)
via deec3b8708248c4bfe25833ecec6df6ce8b5b93f (commit)
via ba99693681b563683db83f1dad1e480b661ec3f4 (commit)
via e872bff5099e435a756b479a67fd8a7262fcc7b4 (commit)
via e13ebdc497fe91b2bbb890e4656450a4ce3ce52b (commit)
via 504583b8be9295a3cd0eb33b9e55c32b0b2e1786 (commit)
via 66b8111bc9288814ab4bffcc35934af55ee46f25 (commit)
via e83f09bf263814c2cf96638b8df4aafe339ef3e6 (commit)
via f8b69f26c1a5639cc0846ee01550acb135568203 (commit)
via c512372764c01491d43a107a9d346afde23fb5c3 (commit)
via d69f4f23150bf93bee1bc749acc0efe0b8feddaa (commit)
via 8feada5bbff81bbd96d47ceea6739562ca016a99 (commit)
via d89c1eda02d7fd46cde20403d36eac4441cd05c8 (commit)
via 7e6641a0a3cd7375102a18ec15d16136871b05f2 (commit)
via 3ffdee61ac5394ead0689df6336a24215ae708ad (commit)
via bc5fb9d29af1ffe9cdf3381cf73e0c4ef53a4f57 (commit)
via 6a44603f1c54563c6bf997e13873b66981bc54b2 (commit)
via fe5ebddae6da32b47c21a5a0980db99a9a18dc0c (commit)
via 08685564a18997814c57e6cca2b4bcfa7ee2df6d (commit)
via bf864504f4fb0034207360ccbe2263afb9fe2bcf (commit)
via 8142c3b3228c440cdbfe13dbd2b03127b44b3c0e (commit)
via 42c4160fc353e8283be3e0c8e92a115c57153006 (commit)
via 0463acbbfe167a0fc97ec8c83ab20a24cd29d6e1 (commit)
via 8d2acda85fa70650d2fbbdd6a308835cf1b3bd85 (commit)
via 8cea7b8b5510f6d53f8ab00c29594fabed0d5f5d (commit)
via 14ac6fd1e04cc1e5a7b3ef8c9a16fbe02d8dbfc9 (commit)
via 6fad1a741eab13f24298c748d95add4de5d5c941 (commit)
via e9cd84d3e949942ba94b87f7f99c77005b9463d2 (commit)
via 2ac50e2c8b0534fe61ab505cd3eb9c0d67bbd78d (commit)
via 9cb0614ed13b2c916898637d4e7692db5c110418 (commit)
via 2ca2b9c9f160e5a599b148278047727a6db5495b (commit)
via ad61b67b64af7dc336f3da9c4ac44233ac109c45 (commit)
via f3035dafae979bd0670f5d29be1b0a0f7f072647 (commit)
via ab3c8d9fdf5e5847fa1aa0e4dd54bb97886c4d77 (commit)
via e7237f8d8ba058dd2f630dc5754920cbd256ad8b (commit)
via d939bf3c1a1c942f4f1aab818afab023383ae8e7 (commit)
via 2d9a87787477c9d3008d2b0a69fd27dfda0947aa (commit)
from 706194dc908b822ecf2b90809be18e27ec47747f (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 8be412d99b7f04e0b6c6544e91d0f498560dde7a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Dec 19 18:23:52 2022 +0000
unbound: Update to 1.17.0
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 40c8212196e3ea071492295f9b4ac28d6dd13bea
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Dec 19 18:08:33 2022 +0000
gawk: Update to 5.2.1
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 40fba48f9e698ad5b03cf4fdf5f716df34f3bc4a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Dec 19 18:06:12 2022 +0000
pptp: Drop package
Nobody needs PPTP any more.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 75dfe7252201cf7232034ca8a79a5903fc71af9f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Dec 19 18:05:39 2022 +0000
br2684ctl: Drop package
I don't think the world will need ATM modems any more.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 8d0ab1a71eabb82df6ec8fcb17ca55802657fcec
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Dec 19 18:04:52 2022 +0000
bc: Update to 1.07
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit d18632b196259ee9a562c65dc0025bf4a25cf69f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Dec 19 17:53:21 2022 +0000
xfsprogs: Update to 6.0.0
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 08d67252584034f789b945c1d9ed77a1a801eb91
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Dec 19 17:53:00 2022 +0000
liburcu: New package
Required by xfsprogs.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 36f496eced984a81f68bd86d37e9a4541e5471d2
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Dec 19 17:52:45 2022 +0000
libinih: New package
Required by xfsprogs.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 2bbcd7589d9f344922ffeb264b03c43b29faf074
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Dec 19 17:51:45 2022 +0000
bridge-utils: Drop package
bridge-utils is deprecated.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 8b566b059491130ead1219e607dfd9c67df1ecf0
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Dec 19 17:45:10 2022 +0000
python-rrdtool: Drop package
This is now bundled with rrdtool.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit d40417c80caf3c611ef15f40e0cea9496d16b7e8
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Dec 19 17:38:41 2022 +0000
passwd+libuser: Drop packages
We are now using passwd from shadow-utils and cut out the libuser layer.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 14dd43f7d49b2e7ad2bb3da379497fe77069f36a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Dec 19 17:37:50 2022 +0000
shadow-utils: Update to 4.13
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 9c9258bba20d9447922127ba270a90d39b2586c2
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Dec 19 17:07:58 2022 +0000
wireless-tools: Drop package
This is no longer maintained upstream.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 0d2d4cf00235ca028a4864406c420eb30d796304
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Dec 19 16:48:31 2022 +0000
zd1211-firmware: Drop package
We do not have the kernel module any more for this.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 51a6b62c23e863f884f9a187f16b0b574c8429ad
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Dec 19 16:47:00 2022 +0000
libldb: Update to 2.6.1
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit deec3b8708248c4bfe25833ecec6df6ce8b5b93f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Dec 19 16:45:50 2022 +0000
cmocka: New package
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit ba99693681b563683db83f1dad1e480b661ec3f4
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Dec 19 16:45:20 2022 +0000
lmdb: New package
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit e872bff5099e435a756b479a67fd8a7262fcc7b4
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Dec 19 16:39:01 2022 +0000
zerofree: Drop package
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit e13ebdc497fe91b2bbb890e4656450a4ce3ce52b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Dec 19 16:28:36 2022 +0000
libcap-ng: Update to 0.8.3
Drop the dependency to Python 2
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 504583b8be9295a3cd0eb33b9e55c32b0b2e1786
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Dec 19 16:21:00 2022 +0000
python-decorator: Drop package
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 66b8111bc9288814ab4bffcc35934af55ee46f25
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Dec 19 15:50:51 2022 +0000
python-m2crypto: Drop package
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit e83f09bf263814c2cf96638b8df4aafe339ef3e6
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Dec 19 15:50:25 2022 +0000
crda: Drop package
This is being replaced by wireless-regdb
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit f8b69f26c1a5639cc0846ee01550acb135568203
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Dec 19 15:49:16 2022 +0000
wireless-regdb: New package
This is succeeding CRDA.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit c512372764c01491d43a107a9d346afde23fb5c3
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Dec 19 15:48:54 2022 +0000
kernel: Require wireless-regdb at runtime
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit d69f4f23150bf93bee1bc749acc0efe0b8feddaa
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Dec 19 15:48:12 2022 +0000
kernel: Build without Python 2
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 8feada5bbff81bbd96d47ceea6739562ca016a99
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Dec 19 15:44:40 2022 +0000
glibc: Package libxcrypt and compat-libxcrypt
libcrypt in glibc is deprecated and has been replaced by libxcrypt which
offers a new ABI. The new ABI is package in libxcrypt and the old one in
compat-libxcrypt which should be dropped soon.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit d89c1eda02d7fd46cde20403d36eac4441cd05c8
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Dec 19 15:25:18 2022 +0000
python-netfilter_conntrack: Drop package
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 7e6641a0a3cd7375102a18ec15d16136871b05f2
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Dec 19 15:24:28 2022 +0000
python-piksemel: Drop package
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 3ffdee61ac5394ead0689df6336a24215ae708ad
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Dec 19 15:24:02 2022 +0000
python-pyaspects: Drop package
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit bc5fb9d29af1ffe9cdf3381cf73e0c4ef53a4f57
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Dec 19 15:23:33 2022 +0000
python-pycurl: Drop package
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 6a44603f1c54563c6bf997e13873b66981bc54b2
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Dec 19 15:22:42 2022 +0000
pyserial: Drop package
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit fe5ebddae6da32b47c21a5a0980db99a9a18dc0c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Dec 19 15:20:30 2022 +0000
python-daemon: Drop package
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 08685564a18997814c57e6cca2b4bcfa7ee2df6d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Dec 19 15:19:57 2022 +0000
pychecker: Drop package
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit bf864504f4fb0034207360ccbe2263afb9fe2bcf
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Dec 19 15:19:24 2022 +0000
python-disutils-extra: Drop package
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 8142c3b3228c440cdbfe13dbd2b03127b44b3c0e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Dec 19 15:17:23 2022 +0000
pcapy: Drop package
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 42c4160fc353e8283be3e0c8e92a115c57153006
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Dec 19 15:15:33 2022 +0000
fail2ban: Drop package
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 0463acbbfe167a0fc97ec8c83ab20a24cd29d6e1
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Dec 19 15:15:04 2022 +0000
python-yaml: Drop package
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 8d2acda85fa70650d2fbbdd6a308835cf1b3bd85
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Dec 19 15:13:50 2022 +0000
python-progressbar: Drop package
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 8cea7b8b5510f6d53f8ab00c29594fabed0d5f5d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Dec 19 15:13:15 2022 +0000
pygpgme: Drop package
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 14ac6fd1e04cc1e5a7b3ef8c9a16fbe02d8dbfc9
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Dec 19 15:11:56 2022 +0000
python-IPy: Drop package
This is not being used anywhere
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 6fad1a741eab13f24298c748d95add4de5d5c941
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Dec 19 14:32:29 2022 +0000
libtevent: Update to 0.13.0
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit e9cd84d3e949942ba94b87f7f99c77005b9463d2
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Dec 19 13:59:17 2022 +0000
libtirpc: Update to 1.3.3
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 2ac50e2c8b0534fe61ab505cd3eb9c0d67bbd78d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Dec 19 13:58:40 2022 +0000
libtalloc: Update to 2.3.4
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 9cb0614ed13b2c916898637d4e7692db5c110418
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Dec 19 13:42:10 2022 +0000
libtdb: Update to 1.4.7
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 2ca2b9c9f160e5a599b148278047727a6db5495b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Dec 19 13:15:52 2022 +0000
python-urlgrabber: Drop package
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit ad61b67b64af7dc336f3da9c4ac44233ac109c45
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Dec 19 13:15:08 2022 +0000
pyxattr: Drop package
This was used by Pakfire but is not longer needed.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit f3035dafae979bd0670f5d29be1b0a0f7f072647
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Dec 19 13:13:25 2022 +0000
sip: Drop package
Nothing depends on this any longer
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit ab3c8d9fdf5e5847fa1aa0e4dd54bb97886c4d77
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Dec 19 13:12:18 2022 +0000
swig: Update to 4.1.1
And drop the dependency to Python 2.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit e7237f8d8ba058dd2f630dc5754920cbd256ad8b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Dec 19 13:11:13 2022 +0000
subversion: Drop package
We no longer use this.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit d939bf3c1a1c942f4f1aab818afab023383ae8e7
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Dec 19 13:06:54 2022 +0000
syslinux: Drop package
This is no longer maintained, and we currently use GRUB for our ISO
image.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 2d9a87787477c9d3008d2b0a69fd27dfda0947aa
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Dec 19 13:00:46 2022 +0000
kernel: Disable the RANDSTRUCT plugin
This does not seem to have the benefit we are expecting and comes with a
huge compile time cost that I would like to disable this for now.
As a disitribution kernel we do/have to publish the seed which makes
this entire feature very questionable.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
bc/bc.nm | 21 +-
br2684ctl/br2684ctl.nm | 50 -
bridge-utils/bridge-utils.nm | 47 -
.../patches/bridge-utils-1.5-linux_3.8_fix-1.patch | 54 -
cmocka/cmocka.nm | 83 ++
compat-libxcrypt/compat-libxcrypt.nm | 52 +
.../patches/libxcrypt-4.4.33-hashes.patch | 14 +
crda/crda.nm | 85 --
dracut/dracut.nm | 3 +-
fail2ban/fail2ban.logrotate | 9 -
fail2ban/fail2ban.nm | 47 -
fail2ban/patches/fail2ban-0.8.1-sshd.patch | 17 -
fail2ban/patches/fail2ban-0.8.2-fd_cloexec.patch | 22 -
fail2ban/patches/fail2ban-0.8.3-init.patch | 20 -
fail2ban/patches/fail2ban-0.8.3-log2syslog.patch | 11 -
gawk/gawk.nm | 10 +-
git/git.nm | 17 +-
glibc/glibc.nm | 3 +-
kernel/config-generic | 6 +-
kernel/kernel.nm | 6 +-
libcap-ng/libcap-ng.nm | 7 +-
libinih/libinih.nm | 56 +
libldb/libldb.nm | 33 +-
libtalloc/libtalloc.nm | 17 +-
libtdb/libtdb.nm | 17 +-
libtevent/libtevent.nm | 22 +-
libtirpc/libtirpc.nm | 6 +-
libtirpc/patches/libtirpc-0.2.3-rc4.patch | 1397 --------------------
libgcrypt/libgcrypt.nm => liburcu/liburcu.nm | 31 +-
libuser/libuser.nm | 64 -
libxcrypt/libxcrypt.nm | 58 +
libxcrypt/patches/libxcrypt-4.4.33-hashes.patch | 14 +
lmdb/lmdb.nm | 61 +
lmdb/lmdb.pc | 10 +
network/network.nm | 3 +-
passwd/passwd.nm | 57 -
passwd/passwd.pam | 4 -
pcapy/pcapy.nm | 47 -
pptp/patches/pptp-1.7.2-compat.patch | 71 -
pptp/patches/pptp-1.7.2-conn-free.patch | 90 --
pptp/patches/pptp-1.7.2-conn-free2.patch | 83 --
pptp/patches/pptp-1.7.2-ip-path.patch | 186 ---
pptp/patches/pptp-1.7.2-makedeps.patch | 80 --
pptp/patches/pptp-1.7.2-pptpsetup-encrypt.patch | 22 -
pptp/patches/pptp-1.7.2-pptpsetup-mppe.patch | 47 -
pptp/patches/pptp-1.7.2-pptpsetup.patch | 23 -
pptp/patches/pptp-1.7.2-waitpid.patch | 16 -
pptp/pptp.nm | 53 -
pychecker/pychecker.nm | 40 -
pygpgme/pygpgme.nm | 44 -
pyserial/pyserial.nm | 36 -
python-IPy/python-IPy.nm | 40 -
python-daemon/python-daemon.nm | 44 -
python-decorator/python-decorator.nm | 43 -
python-distutils-extra/python-distutils-extra.nm | 40 -
python-m2crypto/python-m2crypto.nm | 46 -
.../python-netfilter_conntrack.nm | 44 -
python-piksemel/python-piksemel.nm | 48 -
.../patches/progressbar-interrupt.patch | 12 -
python-progressbar/python-progressbar.nm | 42 -
python-pyaspects/python-pyaspects.nm | 43 -
...eep-copies-of-string-options-since-this-i.patch | 200 ---
...-sourceforge.net-tracker-func-detail-aid-.patch | 61 -
...unt-bug-and-provides-better-organization-.patch | 160 ---
.../0004-Test-for-reset-fixes-refcount-bug.patch | 94 --
...-Updating-ChangeLog-with-relevant-changes.patch | 32 -
...tup.py-do-not-use-curl-config-static-libs.patch | 34 -
...als.py-add-a-test-for-ref-counting-of-res.patch | 28 -
python-pycurl/python-pycurl.nm | 64 -
python-rrdtool/python-rrdtool.nm | 43 -
python-urlgrabber/python-urlgrabber.nm | 49 -
python-yaml/python-yaml.nm | 45 -
pyxattr/pyxattr.nm | 44 -
shadow-utils/shadow-utils.nm | 65 +-
sip/patches/disable-rpaths.patch | 10 -
sip/patches/fix-linking.patch | 11 -
sip/patches/no-strip.patch | 26 -
sip/sip.nm | 60 -
.../patches/0001-subversion-1.9.0-rpath.patch | 41 -
subversion/patches/0002-subversion-1.9.0-pie.patch | 89 --
.../patches/0003-subversion-1.8.5-swigplWall.patch | 16 -
subversion/subversion.nm | 102 --
swig/swig.nm | 15 +-
syslinux/syslinux.nm | 83 --
unbound/unbound.nm | 9 +-
wireless-regdb/wireless-regdb.nm | 46 +
.../patches/wireless_tools.29-makefile.patch | 27 -
wireless-tools/wireless-tools.nm | 55 -
xfsprogs/xfsprogs.nm | 12 +-
zd1211-firmware/zd1211-firmware.nm | 44 -
zerofree/zerofree.nm | 52 -
91 files changed, 519 insertions(+), 4772 deletions(-)
delete mode 100644 br2684ctl/br2684ctl.nm
delete mode 100644 bridge-utils/bridge-utils.nm
delete mode 100644 bridge-utils/patches/bridge-utils-1.5-linux_3.8_fix-1.patch
create mode 100644 cmocka/cmocka.nm
create mode 100644 compat-libxcrypt/compat-libxcrypt.nm
create mode 100644 compat-libxcrypt/patches/libxcrypt-4.4.33-hashes.patch
delete mode 100644 crda/crda.nm
delete mode 100644 fail2ban/fail2ban.logrotate
delete mode 100644 fail2ban/fail2ban.nm
delete mode 100644 fail2ban/patches/fail2ban-0.8.1-sshd.patch
delete mode 100644 fail2ban/patches/fail2ban-0.8.2-fd_cloexec.patch
delete mode 100644 fail2ban/patches/fail2ban-0.8.3-init.patch
delete mode 100644 fail2ban/patches/fail2ban-0.8.3-log2syslog.patch
create mode 100644 libinih/libinih.nm
delete mode 100644 libtirpc/patches/libtirpc-0.2.3-rc4.patch
copy libgcrypt/libgcrypt.nm => liburcu/liburcu.nm (53%)
delete mode 100644 libuser/libuser.nm
create mode 100644 libxcrypt/libxcrypt.nm
create mode 100644 libxcrypt/patches/libxcrypt-4.4.33-hashes.patch
create mode 100644 lmdb/lmdb.nm
create mode 100644 lmdb/lmdb.pc
delete mode 100644 passwd/passwd.nm
delete mode 100644 passwd/passwd.pam
delete mode 100644 pcapy/pcapy.nm
delete mode 100644 pptp/patches/pptp-1.7.2-compat.patch
delete mode 100644 pptp/patches/pptp-1.7.2-conn-free.patch
delete mode 100644 pptp/patches/pptp-1.7.2-conn-free2.patch
delete mode 100644 pptp/patches/pptp-1.7.2-ip-path.patch
delete mode 100644 pptp/patches/pptp-1.7.2-makedeps.patch
delete mode 100644 pptp/patches/pptp-1.7.2-pptpsetup-encrypt.patch
delete mode 100644 pptp/patches/pptp-1.7.2-pptpsetup-mppe.patch
delete mode 100644 pptp/patches/pptp-1.7.2-pptpsetup.patch
delete mode 100644 pptp/patches/pptp-1.7.2-waitpid.patch
delete mode 100644 pptp/pptp.nm
delete mode 100644 pychecker/pychecker.nm
delete mode 100644 pygpgme/pygpgme.nm
delete mode 100644 pyserial/pyserial.nm
delete mode 100644 python-IPy/python-IPy.nm
delete mode 100644 python-daemon/python-daemon.nm
delete mode 100644 python-decorator/python-decorator.nm
delete mode 100644 python-distutils-extra/python-distutils-extra.nm
delete mode 100644 python-m2crypto/python-m2crypto.nm
delete mode 100644 python-netfilter_conntrack/python-netfilter_conntrack.nm
delete mode 100644 python-piksemel/python-piksemel.nm
delete mode 100644 python-progressbar/patches/progressbar-interrupt.patch
delete mode 100644 python-progressbar/python-progressbar.nm
delete mode 100644 python-pyaspects/python-pyaspects.nm
delete mode 100644 python-pycurl/patches/0001-No-longer-keep-copies-of-string-options-since-this-i.patch
delete mode 100644 python-pycurl/patches/0002-Fixes-https-sourceforge.net-tracker-func-detail-aid-.patch
delete mode 100644 python-pycurl/patches/0003-Fixes-refcount-bug-and-provides-better-organization-.patch
delete mode 100644 python-pycurl/patches/0004-Test-for-reset-fixes-refcount-bug.patch
delete mode 100644 python-pycurl/patches/0005-Updating-ChangeLog-with-relevant-changes.patch
delete mode 100644 python-pycurl/patches/0101-setup.py-do-not-use-curl-config-static-libs.patch
delete mode 100644 python-pycurl/patches/0102-test_internals.py-add-a-test-for-ref-counting-of-res.patch
delete mode 100644 python-pycurl/python-pycurl.nm
delete mode 100644 python-rrdtool/python-rrdtool.nm
delete mode 100644 python-urlgrabber/python-urlgrabber.nm
delete mode 100644 python-yaml/python-yaml.nm
delete mode 100644 pyxattr/pyxattr.nm
delete mode 100644 sip/patches/disable-rpaths.patch
delete mode 100644 sip/patches/fix-linking.patch
delete mode 100644 sip/patches/no-strip.patch
delete mode 100644 sip/sip.nm
delete mode 100644 subversion/patches/0001-subversion-1.9.0-rpath.patch
delete mode 100644 subversion/patches/0002-subversion-1.9.0-pie.patch
delete mode 100644 subversion/patches/0003-subversion-1.8.5-swigplWall.patch
delete mode 100644 subversion/subversion.nm
delete mode 100644 syslinux/syslinux.nm
create mode 100644 wireless-regdb/wireless-regdb.nm
delete mode 100644 wireless-tools/patches/wireless_tools.29-makefile.patch
delete mode 100644 wireless-tools/wireless-tools.nm
delete mode 100644 zd1211-firmware/zd1211-firmware.nm
delete mode 100644 zerofree/zerofree.nm
Difference in files:
diff --git a/bc/bc.nm b/bc/bc.nm
index 9b91ebd4c..9829ad069 100644
--- a/bc/bc.nm
+++ b/bc/bc.nm
@@ -4,42 +4,35 @@
###############################################################################
name = bc
-version = 1.06
+version = 1.07
release = 0
groups = System/Tools
-url = http://www.gnu.org/software/bc/
+url = https://www.gnu.org/software/bc/
license = GPLv2+
summary = bc is an arbitrary precision numeric processing language.
description
- bc is a language that supports arbitrary precision numbers with \
- interactive execution of statements. There are some similarities in the \
+ bc is a language that supports arbitrary precision numbers with
+ interactive execution of statements. There are some similarities in the
syntax to the C programming language.
end
-source_dl = http://ftp.gnu.org/gnu/bc/
+source_dl = https://ftp.gnu.org/gnu/bc/
build
requires
+ ed
flex
+ texinfo
end
configure_options += \
- --mandir=/usr/share/man \
--disable-static
-
- prepare_cmds
- sed -i '/PROTO.*readline/d' bc/scan.l
- sed -i '/flex -I8/s/8//' configure
- sed -i '/stdlib/a #include <string.h>' lib/number.c
- sed -i 's/program.*save/static &/' bc/load.c
- end
end
packages
package %{name}
- end
package %{name}-debuginfo
template DEBUGINFO
diff --git a/br2684ctl/br2684ctl.nm b/br2684ctl/br2684ctl.nm
deleted file mode 100644
index 7b014fbc9..000000000
--- a/br2684ctl/br2684ctl.nm
+++ /dev/null
@@ -1,50 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = br2684ctl
-version = ipfire-1
-release = 2
-
-groups = Networking/Tools
-url = http://cvs.linux-atm.sourceforge.net/viewcvs.py/linux-atm/linux-atm/src/br2…
-license = GPLv2+
-summary = Utilities for configuring an ATM/ethernet bridge.
-
-description
- Utility for configuring RFC 2684 ATM/Ethernet bridging
- ATM bridging is a way to extend Ethernet over an ATM network and is
- mainly used for DSL connections. This package contains the user space
- utility needed to configure the kernel driver.
- This package is needed if you own an USB DSL modem and your connection
- uses one of these protocols: RFC 1483 bridged (RFC 2684 bridged),
- PPP over Ethernet (PPPoE).
-end
-
-sources = %{thisapp}.tar.bz2
-
-build
- requires
- linux-atm-devel
- end
-
- DIR_APP = %{DIR_SRC}/br2684ctl
-
- build
- gcc %{CFLAGS} %{LDFLAGS} -latm br2684ctl.c -o br2684ctl
- end
-
- install
- mkdir -pv %{BUILDROOT}/usr/bin
- install -v -m 755 br2684ctl %{BUILDROOT}/usr/bin/br2684ctl
- end
-end
-
-packages
- package %{name}
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/bridge-utils/bridge-utils.nm b/bridge-utils/bridge-utils.nm
deleted file mode 100644
index 09bfc7bd8..000000000
--- a/bridge-utils/bridge-utils.nm
+++ /dev/null
@@ -1,47 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = bridge-utils
-version = 1.5
-release = 1
-
-groups = Networking/Tools
-url = http://bridge.sourceforge.net/
-license = GPLv2+
-summary = Utilities for configuring the linux ethernet bridge.
-
-description
- This package contains utilities for configuring the linux ethernet \
- bridge. The linux ethernet bridge can be used for connecting multiple \
- ethernet devices together. The connecting is fully transparent: hosts \
- connected to one ethernet device see hosts connected to the other \
- ethernet devices directly.
-end
-
-source_dl = http://downloads.sourceforge.net/project/%{name}/%{name}/%{thisapp}
-
-build
- requires
- autoconf
- automake
- end
-
- prepare_cmds
- autoconf
- end
-
- install_cmds
- rm -rvf %{BUILDROOT}/usr/include
- end
-end
-
-packages
- package %{name}
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/bridge-utils/patches/bridge-utils-1.5-linux_3.8_fix-1.patch b/bridge-utils/patches/bridge-utils-1.5-linux_3.8_fix-1.patch
deleted file mode 100644
index 292cc83c2..000000000
--- a/bridge-utils/patches/bridge-utils-1.5-linux_3.8_fix-1.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Submitted By: Bruce Dubbs <bdubbs_at_linuxfromscratch_dot_org>
-Date: 2013-03-10
-Initial Package Version: 1.5
-Upstream Status: Unknown
-Origin: LFS
-Description: This patch contains fixes a problem with
-the omission of a needed include file in the kernel's linux/if_bridge.h.
-It also fixes some autoconf warnings.
-
-
-diff -Naur bridge-utils-1.5.orig/Makefile.in bridge-utils-1.5/Makefile.in
---- bridge-utils-1.5.orig/Makefile.in 2011-03-28 19:52:54.000000000 -0500
-+++ bridge-utils-1.5/Makefile.in 2013-03-10 13:44:41.000000000 -0500
-@@ -9,6 +9,7 @@
- bindir=@bindir@
- sbindir=@sbindir@
- mandir=@mandir@
-+datarootdir=@datarootdir@
- distdir = $(PACKAGE)-$(VERSION)
-
- SUBDIRS=libbridge brctl doc
-diff -Naur bridge-utils-1.5.orig/brctl/Makefile.in bridge-utils-1.5/brctl/Makefile.in
---- bridge-utils-1.5.orig/brctl/Makefile.in 2011-03-28 19:52:54.000000000 -0500
-+++ bridge-utils-1.5/brctl/Makefile.in 2013-03-10 13:44:15.000000000 -0500
-@@ -12,6 +12,7 @@
- bindir=@bindir@
- sbindir=@sbindir@
- mandir=@mandir@
-+datarootdir=@datarootdir@
-
- INSTALL=@INSTALL@
-
-diff -Naur bridge-utils-1.5.orig/doc/Makefile.in bridge-utils-1.5/doc/Makefile.in
---- bridge-utils-1.5.orig/doc/Makefile.in 2011-03-28 19:52:54.000000000 -0500
-+++ bridge-utils-1.5/doc/Makefile.in 2013-03-10 13:43:39.000000000 -0500
-@@ -9,6 +9,7 @@
- bindir=@bindir@
- sbindir=@sbindir@
- mandir=@mandir@
-+datarootdir=@datarootdir@
-
- SUBDIRS=libbridge brctl
-
-diff -Naur bridge-utils-1.5.orig/libbridge/libbridge.h bridge-utils-1.5/libbridge/libbridge.h
---- bridge-utils-1.5.orig/libbridge/libbridge.h 2011-03-28 19:52:54.000000000 -0500
-+++ bridge-utils-1.5/libbridge/libbridge.h 2013-03-10 13:46:23.000000000 -0500
-@@ -21,6 +21,7 @@
-
- #include <sys/socket.h>
- #include <linux/if.h>
-+#include <netinet/ip6.h>
- #include <linux/if_bridge.h>
-
- /* defined in net/if.h but that conflicts with linux/if.h... */
diff --git a/cmocka/cmocka.nm b/cmocka/cmocka.nm
new file mode 100644
index 000000000..df528ee98
--- /dev/null
+++ b/cmocka/cmocka.nm
@@ -0,0 +1,83 @@
+###############################################################################
+# IPFire.org - An Open Source Firewall Solution #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
+###############################################################################
+
+name = cmocka
+version = 1.1.5
+release = 1
+
+groups = System/Libraries
+url = https://cmocka.org
+license = ASL 2.0
+summary = An elegant unit testing framework for C with support for mock objects
+
+description
+ There are a variety of C unit testing frameworks available however many of them
+ are fairly complex and require the latest compiler technology. Some development
+ requires the use of old compilers which makes it difficult to use some unit
+ testing frameworks. In addition many unit testing frameworks assume the code
+ being tested is an application or module that is targeted to the same platform
+ that will ultimately execute the test. Because of this assumption many
+ frameworks require the inclusion of standard C library headers in the code
+ module being tested which may collide with the custom or incomplete
+ implementation of the C library utilized by the code under test.
+
+ Cmocka only requires a test application is linked with the standard C library
+ which minimizes conflicts with standard C library headers. Also, CMocka tries
+ to avoid the use of some of the newer features of C compilers.
+
+ This results in CMocka being a relatively small library that can be used to
+ test a variety of exotic code. If a developer wishes to simply test an
+ application with the latest compiler then other unit testing frameworks may be
+ preferable.
+
+ This is the successor of Google's Cmockery.
+end
+
+source_dl = https://cmocka.org/files/1.1/
+sources = %{thisapp}.tar.xz
+
+build
+ requires
+ cmake
+ make
+ end
+
+ # Disable LTO
+ LTO_CFLAGS =
+
+ build
+ mkdir build && cd build
+
+ %{cmake} \
+ -DUNIT_TESTING=ON \
+ ..
+
+ make %{PARALLELISMFLAGS}
+ end
+
+ test
+ cd build
+
+ make test
+ end
+
+ install
+ cd build
+
+ make install DESTDIR="%{BUILDROOT}"
+ end
+end
+
+packages
+ package %{name}
+
+ package %{name}-devel
+ template DEVEL
+ end
+
+ package %{name}-debuginfo
+ template DEBUGINFO
+ end
+end
diff --git a/compat-libxcrypt/compat-libxcrypt.nm b/compat-libxcrypt/compat-libxcrypt.nm
new file mode 100644
index 000000000..de696a2d7
--- /dev/null
+++ b/compat-libxcrypt/compat-libxcrypt.nm
@@ -0,0 +1,52 @@
+###############################################################################
+# IPFire.org - An Open Source Firewall Solution #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
+###############################################################################
+
+name = compat-libxcrypt
+version = 4.4.33
+release = 1
+thisapp = libxcrypt-%{version}
+
+groups = System/Libraries
+url = https://github.com/besser82/libxcrypt/
+license = LGPLv2.1
+summary = Extended crypt library for descrypt, md5crypt, bcrypt, and others
+
+description
+ This package provides a version of libxcrypt which is compatible with
+ the old glibc interface.
+end
+
+source_dl = https://github.com/besser82/libxcrypt/releases/download/v%{version}/
+sources = %{thisapp}.tar.xz
+
+build
+ requires
+ perl
+ end
+
+ configure_options += \
+ --disable-static \
+ --enable-hashes=strong,glibc \
+ --enable-obsolete-api=glibc \
+ --disable-failure-tokens
+
+ test
+ LD_LIBRARY_PATH="%{DIR_APP}/.libs" make check
+ end
+
+ install
+ mkdir -pv %{BUILDROOT}%{libdir}
+ install -v -m 755 .libs/libcrypt.so.1.1.0 %{BUILDROOT}%{libdir}/libcrypt.so.1.1.0
+ ln -svf libcrypt.so.1.1.0 %{BUILDROOT}%{libdir}/libcrypt.so.1
+ end
+end
+
+packages
+ package %{name}
+
+ package %{name}-debuginfo
+ template DEBUGINFO
+ end
+end
diff --git a/compat-libxcrypt/patches/libxcrypt-4.4.33-hashes.patch b/compat-libxcrypt/patches/libxcrypt-4.4.33-hashes.patch
new file mode 100644
index 000000000..42f5d67a7
--- /dev/null
+++ b/compat-libxcrypt/patches/libxcrypt-4.4.33-hashes.patch
@@ -0,0 +1,14 @@
+diff --git a/build-aux/scripts/expand-selected-hashes b/build-aux/scripts/expand-selected-hashes
+index 10d0bcc..2558c42 100644
+--- a/build-aux/scripts/expand-selected-hashes
++++ b/build-aux/scripts/expand-selected-hashes
+@@ -50,9 +50,6 @@ sub expand_selected {
+ push @errors, "'$w' is not a hash or group name\n";
+ }
+ }
+- if (scalar(%enabled) == 0) {
+- push @errors, "no hashes are enabled\n";
+- }
+ die join q{}, @errors if @errors;
+ return keys %enabled;
+ }
diff --git a/crda/crda.nm b/crda/crda.nm
deleted file mode 100644
index 7f02771e6..000000000
--- a/crda/crda.nm
+++ /dev/null
@@ -1,85 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = crda
-version = %{ver_crda}-%{ver_regdb}
-ver_crda = 3.18
-ver_regdb = 2016.02.08
-release = 2
-
-maintainer = Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org>
-groups = Network/Wireless
-url = http://linuxwireless.org/en/developers/Regulatory/CRDA
-license = ISC
-summary = Regulatory compliance daemon for 802.11 wireless networking.
-
-description
- CRDA acts as the udev helper for communication between the kernel
- and userspace for regulatory compliance. It relies on nl80211
- for communication. CRDA is intended to be run only through udev
- communication from the kernel.
-end
-
-source_dl = \
- https://www.kernel.org/pub/software/network/crda/ \
- https://www.kernel.org/pub/software/network/wireless-regdb/
-sources = crda-%{ver_crda}.tar.xz wireless-regdb-%{ver_regdb}.tar.xz
-
-build
- requires
- libgcrypt-devel
- libnl3-devel
- openssl
- python-m2crypto
- end
-
- prepare_cmds
- # Remove -Werror
- pushd %{DIR_SRC}/crda-%{ver_crda}
- sed -e "s/-Werror//" -i Makefile
- popd
- end
-
- build
- pushd %{DIR_SRC}/wireless-regdb-%{ver_regdb}
- make ${PARALLELISMFLAGS} maintainer-clean
- make ${PARALLELISMFLAGS} REGDB_PRIVKEY=key.priv.pem REGDB_PUBKEY=key.pub.pem
- popd
-
- pushd %{DIR_SRC}/crda-%{ver_crda}
- cp ../wireless-regdb-%{ver_regdb}/key.pub.pem pubkeys
-
- make ${PARALLELISMFLAGS} REG_BIN=../wireless-regdb-%{ver_regdb}/regulatory.bin
- popd
- end
-
- install
- pushd %{DIR_SRC}/wireless-regdb-%{ver_regdb}
- make install DESTDIR=%{BUILDROOT} PREFIX=%{prefix} MANDIR=%{mandir}
- popd
-
- pushd %{DIR_SRC}/crda-%{ver_crda}
- make install DESTDIR=%{BUILDROOT} PREFIX=%{prefix} MANDIR=%{mandir} \
- SBINDIR=%{sbindir}/ LIBDIR=%{libdir}/
- popd
- end
-end
-
-packages
- package %{name}
- provides = wireless-regdb = %{ver_regdb}
- obsoletes = wireless-regdb < %{ver_regdb}
- end
-
- package %{name}-devel
- template DEVEL
-
- files += !%{libdir}/libreg.so
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/dracut/dracut.nm b/dracut/dracut.nm
index 59ea280fd..abd0323c8 100644
--- a/dracut/dracut.nm
+++ b/dracut/dracut.nm
@@ -5,7 +5,7 @@
name = dracut
version = 048
-release = 2
+release = 3
groups = System/Boot
url = http://sourceforge.net/apps/trac/dracut/wiki
@@ -103,7 +103,6 @@ packages
end
requires
- bridge-utils
dhclient
iproute2
nfs-utils
diff --git a/fail2ban/fail2ban.logrotate b/fail2ban/fail2ban.logrotate
deleted file mode 100644
index 4d7a6c909..000000000
--- a/fail2ban/fail2ban.logrotate
+++ /dev/null
@@ -1,9 +0,0 @@
-/var/log/fail2ban.log {
- missingok
- notifempty
- size 30k
- create 0600 root root
- postrotate
- /usr/bin/fail2ban-client set logtarget SYSLOG 2> /dev/null || true
- endscript
-}
diff --git a/fail2ban/fail2ban.nm b/fail2ban/fail2ban.nm
deleted file mode 100644
index 38ad03b67..000000000
--- a/fail2ban/fail2ban.nm
+++ /dev/null
@@ -1,47 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = fail2ban
-version = 0.8.4
-release = 1
-
-groups = Security/Tools
-url = http://fail2ban.sourceforge.net/
-license = GPLv2+
-summary = Ban IPs that make too many password failures.
-
-description
- Fail2ban scans log files like /var/log/pwdfail or
- /var/log/apache/error_log and bans IP that makes too many password
- failures. It updates firewall rules to reject the IP address.
-end
-
-source_dl =
-sources = %{thisapp}.tar.bz2
-
-build
- requires
- python-devel
- end
-
- build
- : # nothing to do
- end
-
- install
- python setup.py install --root=%{BUILDROOT}
- mkdir -pv %{BUILDROOT}/etc/logrotate.d/
- cp -vf %{DIR_SOURCE}/fail2ban.logrotate %{BUILDROOT}/etc/logrotate.d/fail2ban
- end
-end
-
-packages
- package %{name}
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/fail2ban/patches/fail2ban-0.8.1-sshd.patch b/fail2ban/patches/fail2ban-0.8.1-sshd.patch
deleted file mode 100644
index 29a768efa..000000000
--- a/fail2ban/patches/fail2ban-0.8.1-sshd.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- fail2ban-0.8.1/config/jail.conf.sshd 2007-08-09 00:49:59.000000000 +0200
-+++ fail2ban-0.8.1/config/jail.conf 2007-08-15 21:41:33.000000000 +0200
-@@ -42,11 +42,11 @@
-
- [ssh-iptables]
-
--enabled = false
-+enabled = true
- filter = sshd
- action = iptables[name=SSH, port=ssh, protocol=tcp]
-- sendmail-whois[name=SSH, dest=you(a)mail.com, sender=fail2ban(a)mail.com]
--logpath = /var/log/sshd.log
-+ sendmail-whois[name=SSH, dest=root, sender=fail2ban(a)mail.com]
-+logpath = /var/log/secure
- maxretry = 5
-
- [proftpd-iptables]
diff --git a/fail2ban/patches/fail2ban-0.8.2-fd_cloexec.patch b/fail2ban/patches/fail2ban-0.8.2-fd_cloexec.patch
deleted file mode 100644
index 5c89f7fda..000000000
--- a/fail2ban/patches/fail2ban-0.8.2-fd_cloexec.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- fail2ban-0.8.2/server/filter.py.orig 2008-03-27 16:26:59.000000000 +0000
-+++ fail2ban-0.8.2/server/filter.py 2008-03-27 15:29:48.000000000 +0000
-@@ -428,6 +428,7 @@
- # is computed and compared to the previous hash of this line.
-
- import md5
-+import fcntl
-
- class FileContainer:
-
-@@ -455,6 +456,11 @@
-
- def open(self):
- self.__handler = open(self.__filename)
-+
-+ # Set the file descriptor to be FD_CLOEXEC
-+ fd = self.__handler.fileno()
-+ fcntl.fcntl (self.__handler.fileno(), fcntl.F_SETFD, fd | fcntl.FD_CLOEXEC)
-+
- firstLine = self.__handler.readline()
- # Computes the MD5 of the first line.
- myHash = md5.new(firstLine).digest()
diff --git a/fail2ban/patches/fail2ban-0.8.3-init.patch b/fail2ban/patches/fail2ban-0.8.3-init.patch
deleted file mode 100644
index 3ed8609fc..000000000
--- a/fail2ban/patches/fail2ban-0.8.3-init.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- fail2ban-0.8.3/files/redhat-initd.init 2008-03-10 23:36:22.000000000 +0100
-+++ fail2ban-0.8.3/files/redhat-initd 2008-08-24 20:46:01.000000000 +0200
-@@ -1,6 +1,6 @@
- #!/bin/bash
- #
--# chkconfig: 345 92 08
-+# chkconfig: - 92 08
- # description: Fail2ban daemon
- # http://fail2ban.sourceforge.net/wiki/index.php/Main_Page
- # process name: fail2ban-server
-@@ -27,8 +27,7 @@
- echo -n $"Starting fail2ban: "
- getpid
- if [ -z "$pid" ]; then
-- rm -rf /var/run/fail2ban/fail2ban.sock # in case of unclean shutdown
-- $FAIL2BAN start > /dev/null
-+ $FAIL2BAN -x start > /dev/null
- RETVAL=$?
- fi
- if [ $RETVAL -eq 0 ]; then
diff --git a/fail2ban/patches/fail2ban-0.8.3-log2syslog.patch b/fail2ban/patches/fail2ban-0.8.3-log2syslog.patch
deleted file mode 100644
index 5ee11f6a7..000000000
--- a/fail2ban/patches/fail2ban-0.8.3-log2syslog.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- fail2ban-0.8.3/config/fail2ban.conf~ 2008-02-27 22:44:55.000000000 +0100
-+++ fail2ban-0.8.3/config/fail2ban.conf 2009-08-27 20:48:25.000000000 +0200
-@@ -22,7 +22,7 @@
- # Only one log target can be specified.
- # Values: STDOUT STDERR SYSLOG file Default: /var/log/fail2ban.log
- #
--logtarget = /var/log/fail2ban.log
-+logtarget = SYSLOG
-
- # Option: socket
- # Notes.: Set the socket file. This is used to communicate with the daemon. Do
diff --git a/gawk/gawk.nm b/gawk/gawk.nm
index 905b9e097..5060b1704 100644
--- a/gawk/gawk.nm
+++ b/gawk/gawk.nm
@@ -4,13 +4,13 @@
###############################################################################
name = gawk
-version = 5.0.1
+version = 5.2.1
release = 1
groups = System/Tools
-url = http://www.gnu.org/software/gawk/gawk.html
+url = https://www.gnu.org/software/gawk/gawk.html
license = GPLv3+
-summary = The GNU version of the awk text processing utility.
+summary = The GNU version of the awk text processing utility
description
The gawk package contains the GNU version of awk, a text processing
@@ -19,7 +19,7 @@ description
end
# Needed for testsuite.
-source_dl = http://ftp.gnu.org/gnu/gawk/
+source_dl = https://ftp.gnu.org/gnu/gawk/
sources = %{thisapp}.tar.xz
build
@@ -45,8 +45,6 @@ end
packages
package %{name}
- groups += Base Build
-
provides
/bin/awk
/bin/gawk
diff --git a/git/git.nm b/git/git.nm
index 24c42793f..c9919af74 100644
--- a/git/git.nm
+++ b/git/git.nm
@@ -5,7 +5,7 @@
name = git
version = 2.38.1
-release = 1
+release = 2
groups = Development/Tools
url = http://git-scm.com/
@@ -171,21 +171,6 @@ packages
end
end
- package %{name}-svn
- summary = Git tools for importing Subversion repositories.
- description = %{summary}
-
- requires
- git=%{thisver}
- subversion
- end
-
- files
- %{gitcoredir}/*svn*
- %{mandir}/man1/*svn*
- end
- end
-
package %{name}-cvs
summary = Git tools for importing CVS repositories.
description = %{summary}
diff --git a/glibc/glibc.nm b/glibc/glibc.nm
index ea59a895d..07dada011 100644
--- a/glibc/glibc.nm
+++ b/glibc/glibc.nm
@@ -5,7 +5,7 @@
name = glibc
version = 2.36
-release = 1
+release = 2
maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
groups = System/Base
@@ -87,6 +87,7 @@ build
--enable-add-ons \
--enable-kernel=%{OPTIMIZED_KERNEL} \
--disable-werror \
+ --disable-crypt \
--enable-stack-protector=strong \
--enable-bind-now \
--enable-obsolete-rpc \
diff --git a/kernel/config-generic b/kernel/config-generic
index b626e9550..47ca2b33e 100644
--- a/kernel/config-generic
+++ b/kernel/config-generic
@@ -6219,11 +6219,9 @@ CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y
CONFIG_ZERO_CALL_USED_REGS=y
# end of Memory initialization
-# CONFIG_RANDSTRUCT_NONE is not set
+CONFIG_RANDSTRUCT_NONE=y
# CONFIG_RANDSTRUCT_FULL is not set
-CONFIG_RANDSTRUCT_PERFORMANCE=y
-CONFIG_RANDSTRUCT=y
-CONFIG_GCC_PLUGIN_RANDSTRUCT=y
+# CONFIG_RANDSTRUCT_PERFORMANCE is not set
# end of Kernel hardening options
# end of Security options
diff --git a/kernel/kernel.nm b/kernel/kernel.nm
index 0ce81c298..ad1808469 100644
--- a/kernel/kernel.nm
+++ b/kernel/kernel.nm
@@ -5,7 +5,7 @@
name = kernel
version = 6.0.6
-release = 1
+release = 4
thisapp = linux-%{version}
maintainer = Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org>
@@ -49,8 +49,7 @@ build
/usr/bin/openssl
pciutils-devel
perl
- python3
- python-devel
+ python3-devel
rsync
openssl-devel
slang-devel
@@ -292,6 +291,7 @@ packages
kernel-updater
linux-firmware
intel-microcode
+ wireless-regdb
end
files
diff --git a/libcap-ng/libcap-ng.nm b/libcap-ng/libcap-ng.nm
index ddc640d06..1abc6cbe4 100644
--- a/libcap-ng/libcap-ng.nm
+++ b/libcap-ng/libcap-ng.nm
@@ -4,11 +4,11 @@
###############################################################################
name = libcap-ng
-version = 0.7.9
+version = 0.8.3
release = 1
groups = System/Libraries
-url = http://people.redhat.com/sgrubb/libcap-ng
+url = https://people.redhat.com/sgrubb/libcap-ng
license = LGPLv2+
summary = An alternate posix capabilities library.
@@ -17,12 +17,11 @@ description
easier.
end
-source_dl = http://people.redhat.com/sgrubb/libcap-ng/
+source_dl = https://people.redhat.com/sgrubb/libcap-ng/
build
requires
libattr-devel
- python
end
test
diff --git a/libinih/libinih.nm b/libinih/libinih.nm
new file mode 100644
index 000000000..e72c76bf2
--- /dev/null
+++ b/libinih/libinih.nm
@@ -0,0 +1,56 @@
+###############################################################################
+# IPFire.org - An Open Source Firewall Solution #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
+###############################################################################
+
+name = libinih
+version = 56
+release = 1
+thisapp = inih-r%{version}
+
+groups = System/Libraries
+url = https://github.com/benhoyt/inih
+license = BSD
+summary = Simple .INI file parser in C, good for embedded systems
+
+description
+ inih (INI Not Invented Here) is a simple .INI file parser written in C.
+ It's only a couple of pages of code, and it was designed to be small
+ and simple, so it's good for embedded systems. It's also more or less
+ compatible with Python's ConfigParser style of .INI files, including
+ RFC 822-style multi-line syntax and name: value entries.
+end
+
+source_dl = https://github.com/benhoyt/inih/archive/refs/tags/r%{version}.tar.gz#/
+
+build
+ requires
+ meson
+ ninja
+ end
+
+ build
+ %{meson} \
+ -Ddefault_library=shared \
+ -Ddistro_install=true \
+ -Dwith_INIReader=true
+
+ %{meson_build}
+ end
+
+ install
+ %{meson_install}
+ end
+end
+
+packages
+ package %{name}
+
+ package %{name}-devel
+ template DEVEL
+ end
+
+ package %{name}-debuginfo
+ template DEBUGINFO
+ end
+end
diff --git a/libldb/libldb.nm b/libldb/libldb.nm
index 066427002..a0c184a14 100644
--- a/libldb/libldb.nm
+++ b/libldb/libldb.nm
@@ -4,36 +4,38 @@
###############################################################################
name = libldb
-version = 1.1.27
+version = 2.6.1
release = 1
+thisapp = ldb-%{version}
groups = System/Libraries
-url = http://ldb.samba.org/
+url = https://ldb.samba.org/
license = LGPLv3+
-summary = A schema-less, ldap like, API and database.
+summary = A schema-less, ldap like, API and database
description
An extensible library that implements an LDAP like API to access remote LDAP
servers, or use local tdb databases.
end
-thisapp = ldb-%{version}
-
-source_dl = http://samba.org/ftp/ldb/
+source_dl = https://download.samba.org/pub/ldb/
build
requires
chrpath
+ cmocka-devel
docbook-utils
docbook-xsl
libtalloc-devel >= 2.1.5
libtdb-devel >= 1.3.8
libtevent-devel >= 0.9.27
+ libtirpc-devel
+ lmdb-devel >= 0.9.16
popt-devel
- pytalloc
- pytdb
- pytevent
- python-devel
+ python3-devel
+ python3-talloc
+ python3-tdb
+ python3-tevent
end
configure_options += \
@@ -43,8 +45,9 @@ build
--with-modulesdir=%{libdir}/ldb/modules \
--with-privatelibdir=%{libdir}/ldb
- # Disable parallel build.
- PARALLELISMFLAGS =
+ test
+ make check
+ end
install_cmds
# Remove rpath from binaries.
@@ -72,8 +75,10 @@ packages
template DEVEL
end
- package pyldb
- template PYTHON
+ package python3-ldb
+ template PYTHON3
+
+ files += %{libdir}/libpyldb*
end
package %{name}-debuginfo
diff --git a/libtalloc/libtalloc.nm b/libtalloc/libtalloc.nm
index 0fb84d35c..c0800da22 100644
--- a/libtalloc/libtalloc.nm
+++ b/libtalloc/libtalloc.nm
@@ -4,11 +4,12 @@
###############################################################################
name = libtalloc
-version = 2.1.8
+version = 2.3.4
release = 1
+thisapp = talloc-%{version}
groups = System/Libraries
-url = http://talloc.samba.org/
+url = https://talloc.samba.org/
license = LGPLv3+
summary = The talloc library.
@@ -16,15 +17,13 @@ description
A library that implements a hierarchical allocator with destructors.
end
-thisapp = talloc-%{version}
-
-source_dl = http://samba.org/ftp/talloc/
+source_dl = https://samba.org/ftp/talloc/
build
requires
docbook-utils
docbook-xsl
- python-devel
+ python3-devel
end
configure_options += \
@@ -40,8 +39,10 @@ packages
template DEVEL
end
- package pytalloc
- template PYTHON
+ package python3-talloc
+ template PYTHON3
+
+ files += %{libdir}/libpytalloc*
end
package %{name}-debuginfo
diff --git a/libtdb/libtdb.nm b/libtdb/libtdb.nm
index 872df0458..970442a3a 100644
--- a/libtdb/libtdb.nm
+++ b/libtdb/libtdb.nm
@@ -4,11 +4,12 @@
###############################################################################
name = libtdb
-version = 1.3.11
-release = 2
+version = 1.4.7
+release = 1
+thisapp = tdb-%{version}
groups = System/Libraries
-url = http://tdb.samba.org/
+url = https://tdb.samba.org/
license = LGPLv3+
summary = The tdb library.
@@ -16,15 +17,13 @@ description
A library that implements a trivial database.
end
-thisapp = tdb-%{version}
-
-source_dl = http://samba.org/ftp/tdb/
+source_dl = https://samba.org/ftp/tdb/
build
requires
docbook-utils
docbook-xsl
- python-devel
+ python3-devel
end
configure_options += \
@@ -56,8 +55,8 @@ packages
template DEVEL
end
- package pytdb
- template PYTHON
+ package python3-tdb
+ template PYTHON3
end
package %{name}-debuginfo
diff --git a/libtevent/libtevent.nm b/libtevent/libtevent.nm
index 4547a9e26..e2d625874 100644
--- a/libtevent/libtevent.nm
+++ b/libtevent/libtevent.nm
@@ -4,11 +4,12 @@
###############################################################################
name = libtevent
-version = 0.9.30
+version = 0.13.0
release = 1
+thisapp = tevent-%{version}
groups = System/Libraries
-url = http://tevent.samba.org/
+url = https://tevent.samba.org/
license = LGPLv3+
summary = The tevent library.
@@ -18,22 +19,25 @@ description
the classic file descriptor events.
end
-thisapp = tevent-%{version}
-
-source_dl = http://samba.org/ftp/tevent/
+source_dl = https://samba.org/ftp/tevent/
build
requires
+ cmocka-devel
docbook-utils
docbook-xsl
- libtalloc-devel >= 2.1.5
- python-devel
+ libtalloc-devel >= 2.3.4
+ python3-devel
end
configure_options += \
--disable-rpath \
--disable-rpath-install \
--bundled-libraries=NONE
+
+ test
+ make check
+ end
end
packages
@@ -43,8 +47,8 @@ packages
template DEVEL
end
- package pytevent
- template PYTHON
+ package python3-tevent
+ template PYTHON3
end
package %{name}-debuginfo
diff --git a/libtirpc/libtirpc.nm b/libtirpc/libtirpc.nm
index a805ec457..b37755962 100644
--- a/libtirpc/libtirpc.nm
+++ b/libtirpc/libtirpc.nm
@@ -4,7 +4,7 @@
###############################################################################
name = libtirpc
-version = 0.2.2
+version = 1.3.3
release = 1
groups = System/Libraries
@@ -19,7 +19,7 @@ description
Solaris 2.3 source.
end
-source_dl = http://downloads.sourceforge.net/libtirpc/
+source_dl = https://downloads.sourceforge.net/libtirpc/
sources = %{thisapp}.tar.bz2
build
@@ -36,7 +36,7 @@ build
end
configure_options += \
- --enable-gss
+ --disable-gssapi
install_cmds
# Fix installation path of the man pages.
diff --git a/libtirpc/patches/libtirpc-0.2.3-rc4.patch b/libtirpc/patches/libtirpc-0.2.3-rc4.patch
deleted file mode 100644
index 4f19f8657..000000000
--- a/libtirpc/patches/libtirpc-0.2.3-rc4.patch
+++ /dev/null
@@ -1,1397 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 97c6f2c..a99c5d6 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -15,6 +15,13 @@ if test x$gss = xtrue; then
- PKG_CHECK_MODULES(GSSGLUE, libgssglue, [],
- AC_MSG_ERROR([Unable to locate information required to use libgssglue.]))
- fi
-+AC_ARG_ENABLE(ipv6,
-+ [AC_HELP_STRING([--disable-ipv6], [Disable IPv6 support @<:@default=no@:>@])],
-+ [],[enable_ipv6=yes])
-+AM_CONDITIONAL(INET6, test "x$disable_ipv6" != xno)
-+if test "x$enable_ipv6" != xno; then
-+ AC_DEFINE(INET6, 1, [Define to 1 if IPv6 is available])
-+fi
-
- AC_PROG_CC
- AM_CONFIG_HEADER(config.h)
-@@ -23,6 +30,7 @@ AC_HEADER_DIRENT
- AC_PREFIX_DEFAULT(/usr)
- AC_CHECK_HEADERS([arpa/inet.h fcntl.h libintl.h limits.h locale.h netdb.h netinet/in.h stddef.h stdint.h stdlib.h string.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h syslog.h unistd.h])
- AC_CHECK_LIB([pthread], [pthread_create])
-+AC_CHECK_LIB([nsl], [yp_get_default_domain])
-
-
- AC_CONFIG_FILES([Makefile src/Makefile man/Makefile doc/Makefile])
-diff --git a/doc/Makefile.am b/doc/Makefile.am
-index cc4fa76..58de35b 100644
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -1,5 +1,5 @@
-
- install: install-am
-- $(mkinstalldirs) $(DESTDIR)/etc
-- cp -p ./etc_netconfig $(DESTDIR)/etc/netconfig
-- chmod 0644 $(DESTDIR)/etc/netconfig
-+ $(mkinstalldirs) $(DESTDIR)/$(sysconfdir)
-+ cp -p $(srcdir)/etc_netconfig $(DESTDIR)/$(sysconfdir)/netconfig
-+ chmod 0644 $(DESTDIR)/$(sysconfdir)/netconfig
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 7ee8cbc..66350f5 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -40,7 +40,7 @@ lib_LTLIBRARIES = libtirpc.la
- # release number of your package. This is an abuse that only fosters
- # misunderstanding of the purpose of library versions."
- #
--libtirpc_la_LDFLAGS = -lnsl -lpthread -version-info 1:10:0
-+libtirpc_la_LDFLAGS = -lpthread -version-info 1:10:0
-
- libtirpc_la_SOURCES = auth_none.c auth_unix.c authunix_prot.c bindresvport.c clnt_bcast.c \
- clnt_dg.c clnt_generic.c clnt_perror.c clnt_raw.c clnt_simple.c \
-@@ -48,17 +48,16 @@ libtirpc_la_SOURCES = auth_none.c auth_unix.c authunix_prot.c bindresvport.c cln
- getrpcport.c mt_misc.c pmap_clnt.c pmap_getmaps.c pmap_getport.c \
- pmap_prot.c pmap_prot2.c pmap_rmt.c rpc_prot.c rpc_commondata.c \
- rpc_callmsg.c rpc_generic.c rpc_soc.c rpcb_clnt.c rpcb_prot.c \
-- rpcb_st_xdr.c svc.c svc_auth.c svc_dg.c svc_auth_unix.c svc_generic.c \
-- svc_raw.c svc_run.c svc_simple.c svc_vc.c getpeereid.c \
-- auth_time.c auth_des.c authdes_prot.c des_crypt.c
-+ rpcb_st_xdr.c svc.c svc_auth.c svc_dg.c svc_auth_unix.c svc_auth_none.c \
-+ svc_generic.c svc_raw.c svc_run.c svc_simple.c svc_vc.c getpeereid.c \
-+ auth_time.c auth_des.c authdes_prot.c
-
- ## XDR
- libtirpc_la_SOURCES += xdr.c xdr_rec.c xdr_array.c xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c
-
- ## Secure-RPC
- if GSS
-- libtirpc_la_SOURCES += auth_gss.c authgss_prot.c svc_auth_gss.c \
-- svc_auth_none.c
-+ libtirpc_la_SOURCES += auth_gss.c authgss_prot.c svc_auth_gss.c
- libtirpc_la_LDFLAGS += $(GSSGLUE_LIBS)
- libtirpc_la_CFLAGS = -DHAVE_RPCSEC_GSS $(GSSGLUE_CFLAGS)
- endif
-diff --git a/src/auth_des.c b/src/auth_des.c
-index 37e7667..f0c8b8c 100644
---- a/src/auth_des.c
-+++ b/src/auth_des.c
-@@ -223,6 +223,7 @@ authdes_pk_seccreate(const char *servername, netobj *pkey, u_int window,
- goto failed;
- }
- ad->ad_nis_srvr = NULL; /* not needed any longer */
-+ auth_get(auth); /* Reference for caller */
- return (auth);
-
- failed:
-@@ -472,6 +473,12 @@ authdes_destroy(AUTH *auth)
- FREE(auth, sizeof(AUTH));
- }
-
-+static bool_t
-+authdes_wrap(AUTH *auth, XDR *xdrs, xdrproc_t xfunc, caddr_t xwhere)
-+{
-+ return ((*xfunc)(xdrs, xwhere));
-+}
-+
- static struct auth_ops *
- authdes_ops(void)
- {
-@@ -487,6 +494,8 @@ authdes_ops(void)
- ops.ah_validate = authdes_validate;
- ops.ah_refresh = authdes_refresh;
- ops.ah_destroy = authdes_destroy;
-+ ops.ah_wrap = authdes_wrap;
-+ ops.ah_unwrap = authdes_wrap;
- }
- mutex_unlock(&authdes_ops_lock);
- return (&ops);
-diff --git a/src/auth_gss.c b/src/auth_gss.c
-index df3017a..539101e 100644
---- a/src/auth_gss.c
-+++ b/src/auth_gss.c
-@@ -87,9 +87,9 @@ print_rpc_gss_sec(struct rpc_gss_sec *ptr)
- int i;
- char *p;
-
-- log_debug("rpc_gss_sec:");
-+ gss_log_debug("rpc_gss_sec:");
- if(ptr->mech == NULL)
-- log_debug("NULL gss_OID mech");
-+ gss_log_debug("NULL gss_OID mech");
- else {
- fprintf(stderr, " mechanism_OID: {");
- p = (char *)ptr->mech->elements;
-@@ -151,7 +151,7 @@ authgss_create(CLIENT *clnt, gss_name_t name, struct rpc_gss_sec *sec)
- struct rpc_gss_data *gd;
- OM_uint32 min_stat = 0;
-
-- log_debug("in authgss_create()");
-+ gss_log_debug("in authgss_create()");
-
- memset(&rpc_createerr, 0, sizeof(rpc_createerr));
-
-@@ -200,6 +200,8 @@ authgss_create(CLIENT *clnt, gss_name_t name, struct rpc_gss_sec *sec)
-
- if (!authgss_refresh(auth))
- auth = NULL;
-+ else
-+ auth_get(auth); /* Reference for caller */
-
- clnt->cl_auth = save_auth;
-
-@@ -214,7 +216,7 @@ authgss_create_default(CLIENT *clnt, char *service, struct rpc_gss_sec *sec)
- gss_buffer_desc sname;
- gss_name_t name = GSS_C_NO_NAME;
-
-- log_debug("in authgss_create_default()");
-+ gss_log_debug("in authgss_create_default()");
-
-
- sname.value = service;
-@@ -225,7 +227,7 @@ authgss_create_default(CLIENT *clnt, char *service, struct rpc_gss_sec *sec)
- &name);
-
- if (maj_stat != GSS_S_COMPLETE) {
-- log_status("gss_import_name", maj_stat, min_stat);
-+ gss_log_status("gss_import_name", maj_stat, min_stat);
- rpc_createerr.cf_stat = RPC_AUTHERROR;
- return (NULL);
- }
-@@ -247,7 +249,7 @@ authgss_get_private_data(AUTH *auth, struct authgss_private_data *pd)
- {
- struct rpc_gss_data *gd;
-
-- log_debug("in authgss_get_private_data()");
-+ gss_log_debug("in authgss_get_private_data()");
-
- if (!auth || !pd)
- return (FALSE);
-@@ -267,7 +269,7 @@ authgss_get_private_data(AUTH *auth, struct authgss_private_data *pd)
- static void
- authgss_nextverf(AUTH *auth)
- {
-- log_debug("in authgss_nextverf()");
-+ gss_log_debug("in authgss_nextverf()");
- /* no action necessary */
- }
-
-@@ -281,7 +283,7 @@ authgss_marshal(AUTH *auth, XDR *xdrs)
- OM_uint32 maj_stat, min_stat;
- bool_t xdr_stat;
-
-- log_debug("in authgss_marshal()");
-+ gss_log_debug("in authgss_marshal()");
-
- gd = AUTH_PRIVATE(auth);
-
-@@ -316,7 +318,7 @@ authgss_marshal(AUTH *auth, XDR *xdrs)
- &rpcbuf, &checksum);
-
- if (maj_stat != GSS_S_COMPLETE) {
-- log_status("gss_get_mic", maj_stat, min_stat);
-+ gss_log_status("gss_get_mic", maj_stat, min_stat);
- if (maj_stat == GSS_S_CONTEXT_EXPIRED) {
- gd->established = FALSE;
- authgss_destroy_context(auth);
-@@ -341,7 +343,7 @@ authgss_validate(AUTH *auth, struct opaque_auth *verf)
- gss_buffer_desc signbuf, checksum;
- OM_uint32 maj_stat, min_stat;
-
-- log_debug("in authgss_validate()");
-+ gss_log_debug("in authgss_validate()");
-
- gd = AUTH_PRIVATE(auth);
-
-@@ -377,7 +379,7 @@ authgss_validate(AUTH *auth, struct opaque_auth *verf)
- maj_stat = gss_verify_mic(&min_stat, gd->ctx, &signbuf,
- &checksum, &qop_state);
- if (maj_stat != GSS_S_COMPLETE || qop_state != gd->sec.qop) {
-- log_status("gss_verify_mic", maj_stat, min_stat);
-+ gss_log_status("gss_verify_mic", maj_stat, min_stat);
- if (maj_stat == GSS_S_CONTEXT_EXPIRED) {
- gd->established = FALSE;
- authgss_destroy_context(auth);
-@@ -395,7 +397,7 @@ authgss_refresh(AUTH *auth)
- gss_buffer_desc *recv_tokenp, send_token;
- OM_uint32 maj_stat, min_stat, call_stat, ret_flags;
-
-- log_debug("in authgss_refresh()");
-+ gss_log_debug("in authgss_refresh()");
-
- gd = AUTH_PRIVATE(auth);
-
-@@ -414,9 +416,9 @@ authgss_refresh(AUTH *auth)
- #ifdef DEBUG
- /* print the token we just received */
- if (recv_tokenp != GSS_C_NO_BUFFER) {
-- log_debug("The token we just received (length %d):",
-+ gss_log_debug("The token we just received (length %d):",
- recv_tokenp->length);
-- log_hexdump(recv_tokenp->value, recv_tokenp->length, 0);
-+ gss_log_hexdump(recv_tokenp->value, recv_tokenp->length, 0);
- }
- #endif
- maj_stat = gss_init_sec_context(&min_stat,
-@@ -439,7 +441,7 @@ authgss_refresh(AUTH *auth)
- }
- if (maj_stat != GSS_S_COMPLETE &&
- maj_stat != GSS_S_CONTINUE_NEEDED) {
-- log_status("gss_init_sec_context", maj_stat, min_stat);
-+ gss_log_status("gss_init_sec_context", maj_stat, min_stat);
- break;
- }
- if (send_token.length != 0) {
-@@ -447,9 +449,9 @@ authgss_refresh(AUTH *auth)
-
- #ifdef DEBUG
- /* print the token we are about to send */
-- log_debug("The token being sent (length %d):",
-+ gss_log_debug("The token being sent (length %d):",
- send_token.length);
-- log_hexdump(send_token.value, send_token.length, 0);
-+ gss_log_hexdump(send_token.value, send_token.length, 0);
- #endif
-
- call_stat = clnt_call(gd->clnt, NULLPROC,
-@@ -498,7 +500,7 @@ authgss_refresh(AUTH *auth)
-
- if (maj_stat != GSS_S_COMPLETE
- || qop_state != gd->sec.qop) {
-- log_status("gss_verify_mic", maj_stat, min_stat);
-+ gss_log_status("gss_verify_mic", maj_stat, min_stat);
- if (maj_stat == GSS_S_CONTEXT_EXPIRED) {
- gd->established = FALSE;
- authgss_destroy_context(auth);
-@@ -531,7 +533,7 @@ authgss_service(AUTH *auth, int svc)
- {
- struct rpc_gss_data *gd;
-
-- log_debug("in authgss_service()");
-+ gss_log_debug("in authgss_service()");
-
- if (!auth)
- return(FALSE);
-@@ -549,15 +551,26 @@ authgss_destroy_context(AUTH *auth)
- struct rpc_gss_data *gd;
- OM_uint32 min_stat;
-
-- log_debug("in authgss_destroy_context()");
-+ gss_log_debug("in authgss_destroy_context()");
-
- gd = AUTH_PRIVATE(auth);
-
- if (gd->gc.gc_ctx.length != 0) {
- if (gd->established) {
-+ AUTH *save_auth = NULL;
-+
-+ /* Make sure we use the right auth_ops */
-+ if (gd->clnt->cl_auth != auth) {
-+ save_auth = gd->clnt->cl_auth;
-+ gd->clnt->cl_auth = auth;
-+ }
-+
- gd->gc.gc_proc = RPCSEC_GSS_DESTROY;
- clnt_call(gd->clnt, NULLPROC, (xdrproc_t)xdr_void, NULL,
- (xdrproc_t)xdr_void, NULL, AUTH_TIMEOUT);
-+
-+ if (save_auth != NULL)
-+ gd->clnt->cl_auth = save_auth;
- }
- gss_release_buffer(&min_stat, &gd->gc.gc_ctx);
- /* XXX ANDROS check size of context - should be 8 */
-@@ -582,7 +595,7 @@ authgss_destroy(AUTH *auth)
- struct rpc_gss_data *gd;
- OM_uint32 min_stat;
-
-- log_debug("in authgss_destroy()");
-+ gss_log_debug("in authgss_destroy()");
-
- gd = AUTH_PRIVATE(auth);
-
-@@ -603,7 +616,7 @@ authgss_wrap(AUTH *auth, XDR *xdrs, xdrproc_t xdr_func, caddr_t xdr_ptr)
- {
- struct rpc_gss_data *gd;
-
-- log_debug("in authgss_wrap()");
-+ gss_log_debug("in authgss_wrap()");
-
- gd = AUTH_PRIVATE(auth);
-
-@@ -620,7 +633,7 @@ authgss_unwrap(AUTH *auth, XDR *xdrs, xdrproc_t xdr_func, caddr_t xdr_ptr)
- {
- struct rpc_gss_data *gd;
-
-- log_debug("in authgss_unwrap()");
-+ gss_log_debug("in authgss_unwrap()");
-
- gd = AUTH_PRIVATE(auth);
-
-diff --git a/src/auth_none.c b/src/auth_none.c
-index a439ec6..affc92b 100644
---- a/src/auth_none.c
-+++ b/src/auth_none.c
-@@ -110,20 +110,19 @@ static bool_t
- authnone_marshal(AUTH *client, XDR *xdrs)
- {
- struct authnone_private *ap;
-- bool_t dummy;
-+ bool_t rv = FALSE;
- extern mutex_t authnone_lock;
-
- assert(xdrs != NULL);
-
-+ mutex_lock(&authnone_lock);
- ap = authnone_private;
-- if (ap == NULL) {
-- mutex_unlock(&authnone_lock);
-- return (FALSE);
-+ if (ap) {
-+ rv = (*xdrs->x_ops->x_putbytes)(xdrs, ap->marshalled_client,
-+ ap->mcnt);
- }
-- dummy = (*xdrs->x_ops->x_putbytes)(xdrs,
-- ap->marshalled_client, ap->mcnt);
- mutex_unlock(&authnone_lock);
-- return (dummy);
-+ return (rv);
- }
-
- /* All these unused parameters are required to keep ANSI-C from grumbling */
-@@ -155,6 +154,12 @@ authnone_destroy(AUTH *client)
- {
- }
-
-+static bool_t
-+authnone_wrap(AUTH *auth, XDR *xdrs, xdrproc_t xfunc, caddr_t xwhere)
-+{
-+ return ((*xfunc)(xdrs, xwhere));
-+}
-+
- static struct auth_ops *
- authnone_ops()
- {
-@@ -170,6 +175,8 @@ authnone_ops()
- ops.ah_validate = authnone_validate;
- ops.ah_refresh = authnone_refresh;
- ops.ah_destroy = authnone_destroy;
-+ ops.ah_wrap = authnone_wrap;
-+ ops.ah_unwrap = authnone_wrap;
- }
- mutex_unlock(&ops_lock);
- return (&ops);
-diff --git a/src/auth_unix.c b/src/auth_unix.c
-index c2469da..4b9b13f 100644
---- a/src/auth_unix.c
-+++ b/src/auth_unix.c
-@@ -162,6 +162,7 @@ authunix_create(machname, uid, gid, len, aup_gids)
- */
- auth->ah_cred = au->au_origcred;
- marshal_new_auth(auth);
-+ auth_get(auth); /* Reference for caller */
- return (auth);
- #ifndef _KERNEL
- cleanup_authunix_create:
-@@ -396,6 +397,12 @@ marshal_new_auth(auth)
- XDR_DESTROY(xdrs);
- }
-
-+static bool_t
-+authunix_wrap(AUTH *auth, XDR *xdrs, xdrproc_t xfunc, caddr_t xwhere)
-+{
-+ return ((*xfunc)(xdrs, xwhere));
-+}
-+
- static struct auth_ops *
- authunix_ops()
- {
-@@ -411,6 +418,8 @@ authunix_ops()
- ops.ah_validate = authunix_validate;
- ops.ah_refresh = authunix_refresh;
- ops.ah_destroy = authunix_destroy;
-+ ops.ah_wrap = authunix_wrap;
-+ ops.ah_unwrap = authunix_wrap;
- }
- mutex_unlock(&ops_lock);
- return (&ops);
-diff --git a/src/authgss_prot.c b/src/authgss_prot.c
-index 9d7fa09..a3c93c9 100644
---- a/src/authgss_prot.c
-+++ b/src/authgss_prot.c
-@@ -64,10 +64,10 @@ xdr_rpc_gss_buf(XDR *xdrs, gss_buffer_t buf, u_int maxsize)
- if (xdr_stat && xdrs->x_op == XDR_DECODE)
- buf->length = tmplen;
-
-- log_debug("xdr_rpc_gss_buf: %s %s (%p:%d)",
-- (xdrs->x_op == XDR_ENCODE) ? "encode" : "decode",
-- (xdr_stat == TRUE) ? "success" : "failure",
-- buf->value, buf->length);
-+ gss_log_debug("xdr_rpc_gss_buf: %s %s (%p:%d)",
-+ (xdrs->x_op == XDR_ENCODE) ? "encode" : "decode",
-+ (xdr_stat == TRUE) ? "success" : "failure",
-+ buf->value, buf->length);
-
- return xdr_stat;
- }
-@@ -83,12 +83,12 @@ xdr_rpc_gss_cred(XDR *xdrs, struct rpc_gss_cred *p)
- xdr_enum(xdrs, (enum_t *)&p->gc_svc) &&
- xdr_rpc_gss_buf(xdrs, &p->gc_ctx, MAX_AUTH_BYTES));
-
-- log_debug("xdr_rpc_gss_cred: %s %s "
-- "(v %d, proc %d, seq %d, svc %d, ctx %p:%d)",
-- (xdrs->x_op == XDR_ENCODE) ? "encode" : "decode",
-- (xdr_stat == TRUE) ? "success" : "failure",
-- p->gc_v, p->gc_proc, p->gc_seq, p->gc_svc,
-- p->gc_ctx.value, p->gc_ctx.length);
-+ gss_log_debug("xdr_rpc_gss_cred: %s %s "
-+ "(v %d, proc %d, seq %d, svc %d, ctx %p:%d)",
-+ (xdrs->x_op == XDR_ENCODE) ? "encode" : "decode",
-+ (xdr_stat == TRUE) ? "success" : "failure",
-+ p->gc_v, p->gc_proc, p->gc_seq, p->gc_svc,
-+ p->gc_ctx.value, p->gc_ctx.length);
-
- return (xdr_stat);
- }
-@@ -101,10 +101,10 @@ xdr_rpc_gss_init_args(XDR *xdrs, gss_buffer_desc *p)
-
- xdr_stat = xdr_rpc_gss_buf(xdrs, p, maxlen);
-
-- log_debug("xdr_rpc_gss_init_args: %s %s (token %p:%d)",
-- (xdrs->x_op == XDR_ENCODE) ? "encode" : "decode",
-- (xdr_stat == TRUE) ? "success" : "failure",
-- p->value, p->length);
-+ gss_log_debug("xdr_rpc_gss_init_args: %s %s (token %p:%d)",
-+ (xdrs->x_op == XDR_ENCODE) ? "encode" : "decode",
-+ (xdr_stat == TRUE) ? "success" : "failure",
-+ p->value, p->length);
-
- return (xdr_stat);
- }
-@@ -123,13 +123,13 @@ xdr_rpc_gss_init_res(XDR *xdrs, struct rpc_gss_init_res *p)
- xdr_u_int(xdrs, &p->gr_win) &&
- xdr_rpc_gss_buf(xdrs, &p->gr_token, tok_maxlen));
-
-- log_debug("xdr_rpc_gss_init_res %s %s "
-- "(ctx %p:%d, maj %d, min %d, win %d, token %p:%d)",
-- (xdrs->x_op == XDR_ENCODE) ? "encode" : "decode",
-- (xdr_stat == TRUE) ? "success" : "failure",
-- p->gr_ctx.value, p->gr_ctx.length,
-- p->gr_major, p->gr_minor, p->gr_win,
-- p->gr_token.value, p->gr_token.length);
-+ gss_log_debug("xdr_rpc_gss_init_res %s %s "
-+ "(ctx %p:%d, maj %d, min %d, win %d, token %p:%d)",
-+ (xdrs->x_op == XDR_ENCODE) ? "encode" : "decode",
-+ (xdr_stat == TRUE) ? "success" : "failure",
-+ p->gr_ctx.value, p->gr_ctx.length,
-+ p->gr_major, p->gr_minor, p->gr_win,
-+ p->gr_token.value, p->gr_token.length);
-
- return (xdr_stat);
- }
-@@ -161,6 +161,7 @@ xdr_rpc_gss_wrap_data(XDR *xdrs, xdrproc_t xdr_func, caddr_t xdr_ptr,
- databuflen = end - start - 4;
- XDR_SETPOS(xdrs, start + 4);
- databuf.value = XDR_INLINE(xdrs, databuflen);
-+ databuf.length = databuflen;
-
- xdr_stat = FALSE;
-
-@@ -169,13 +170,12 @@ xdr_rpc_gss_wrap_data(XDR *xdrs, xdrproc_t xdr_func, caddr_t xdr_ptr,
- XDR_SETPOS(xdrs, start);
- if (!xdr_u_int(xdrs, (u_int *)&databuflen))
- return (FALSE);
-- databuf.length = databuflen;
-
- /* Checksum rpc_gss_data_t. */
- maj_stat = gss_get_mic(&min_stat, ctx, qop,
- &databuf, &wrapbuf);
- if (maj_stat != GSS_S_COMPLETE) {
-- log_debug("gss_get_mic failed");
-+ gss_log_debug("gss_get_mic failed");
- return (FALSE);
- }
- /* Marshal checksum. */
-@@ -189,7 +189,7 @@ xdr_rpc_gss_wrap_data(XDR *xdrs, xdrproc_t xdr_func, caddr_t xdr_ptr,
- maj_stat = gss_wrap(&min_stat, ctx, TRUE, qop, &databuf,
- &conf_state, &wrapbuf);
- if (maj_stat != GSS_S_COMPLETE) {
-- log_status("gss_wrap", maj_stat, min_stat);
-+ gss_log_status("gss_wrap", maj_stat, min_stat);
- return (FALSE);
- }
- /* Marshal databody_priv. */
-@@ -222,13 +222,13 @@ xdr_rpc_gss_unwrap_data(XDR *xdrs, xdrproc_t xdr_func, caddr_t xdr_ptr,
- if (svc == RPCSEC_GSS_SVC_INTEGRITY) {
- /* Decode databody_integ. */
- if (!xdr_rpc_gss_buf(xdrs, &databuf, (u_int)-1)) {
-- log_debug("xdr decode databody_integ failed");
-+ gss_log_debug("xdr decode databody_integ failed");
- return (FALSE);
- }
- /* Decode checksum. */
- if (!xdr_rpc_gss_buf(xdrs, &wrapbuf, (u_int)-1)) {
- gss_release_buffer(&min_stat, &databuf);
-- log_debug("xdr decode checksum failed");
-+ gss_log_debug("xdr decode checksum failed");
- return (FALSE);
- }
- /* Verify checksum and QOP. */
-@@ -238,14 +238,14 @@ xdr_rpc_gss_unwrap_data(XDR *xdrs, xdrproc_t xdr_func, caddr_t xdr_ptr,
-
- if (maj_stat != GSS_S_COMPLETE || qop_state != qop) {
- gss_release_buffer(&min_stat, &databuf);
-- log_status("gss_verify_mic", maj_stat, min_stat);
-+ gss_log_status("gss_verify_mic", maj_stat, min_stat);
- return (FALSE);
- }
- }
- else if (svc == RPCSEC_GSS_SVC_PRIVACY) {
- /* Decode databody_priv. */
- if (!xdr_rpc_gss_buf(xdrs, &wrapbuf, (u_int)-1)) {
-- log_debug("xdr decode databody_priv failed");
-+ gss_log_debug("xdr decode databody_priv failed");
- return (FALSE);
- }
- /* Decrypt databody. */
-@@ -258,7 +258,7 @@ xdr_rpc_gss_unwrap_data(XDR *xdrs, xdrproc_t xdr_func, caddr_t xdr_ptr,
- if (maj_stat != GSS_S_COMPLETE || qop_state != qop ||
- conf_state != TRUE) {
- gss_release_buffer(&min_stat, &databuf);
-- log_status("gss_unwrap", maj_stat, min_stat);
-+ gss_log_status("gss_unwrap", maj_stat, min_stat);
- return (FALSE);
- }
- }
-@@ -271,7 +271,7 @@ xdr_rpc_gss_unwrap_data(XDR *xdrs, xdrproc_t xdr_func, caddr_t xdr_ptr,
-
- /* Verify sequence number. */
- if (xdr_stat == TRUE && seq_num != seq) {
-- log_debug("wrong sequence number in databody");
-+ gss_log_debug("wrong sequence number in databody");
- return (FALSE);
- }
- return (xdr_stat);
-@@ -300,7 +300,7 @@ xdr_rpc_gss_data(XDR *xdrs, xdrproc_t xdr_func, caddr_t xdr_ptr,
- #include <ctype.h>
-
- void
--log_debug(const char *fmt, ...)
-+gss_log_debug(const char *fmt, ...)
- {
- va_list ap;
-
-@@ -312,7 +312,7 @@ log_debug(const char *fmt, ...)
- }
-
- void
--log_status(char *m, OM_uint32 maj_stat, OM_uint32 min_stat)
-+gss_log_status(char *m, OM_uint32 maj_stat, OM_uint32 min_stat)
- {
- OM_uint32 min;
- gss_buffer_desc msg;
-@@ -332,7 +332,7 @@ log_status(char *m, OM_uint32 maj_stat, OM_uint32 min_stat)
- }
-
- void
--log_hexdump(const u_char *buf, int len, int offset)
-+gss_log_hexdump(const u_char *buf, int len, int offset)
- {
- u_int i, j, jm;
- int c;
-@@ -367,17 +367,17 @@ log_hexdump(const u_char *buf, int len, int offset)
- #else
-
- void
--log_debug(const char *fmt, ...)
-+gss_log_debug(const char *fmt, ...)
- {
- }
-
- void
--log_status(char *m, OM_uint32 maj_stat, OM_uint32 min_stat)
-+gss_log_status(char *m, OM_uint32 maj_stat, OM_uint32 min_stat)
- {
- }
-
- void
--log_hexdump(const u_char *buf, int len, int offset)
-+gss_log_hexdump(const u_char *buf, int len, int offset)
- {
- }
-
-diff --git a/src/clnt_dg.c b/src/clnt_dg.c
-index 79fed5d..4a1f60a 100644
---- a/src/clnt_dg.c
-+++ b/src/clnt_dg.c
-@@ -366,7 +366,7 @@ call_again:
-
- if ((! XDR_PUTINT32(xdrs, (int32_t *)&proc)) ||
- (! AUTH_MARSHALL(cl->cl_auth, xdrs)) ||
-- (! (*xargs)(xdrs, argsp))) {
-+ (! AUTH_WRAP(cl->cl_auth, xdrs, xargs, argsp))) {
- cu->cu_error.re_status = RPC_CANTENCODEARGS;
- goto out;
- }
-@@ -400,8 +400,8 @@ get_reply:
- * (We assume that this is actually only executed once.)
- */
- reply_msg.acpted_rply.ar_verf = _null_auth;
-- reply_msg.acpted_rply.ar_results.where = resultsp;
-- reply_msg.acpted_rply.ar_results.proc = xresults;
-+ reply_msg.acpted_rply.ar_results.where = NULL;
-+ reply_msg.acpted_rply.ar_results.proc = (xdrproc_t)xdr_void;
-
- fd.fd = cu->cu_fd;
- fd.events = POLLIN;
-@@ -512,6 +512,10 @@ get_reply:
- &reply_msg.acpted_rply.ar_verf)) {
- cu->cu_error.re_status = RPC_AUTHERROR;
- cu->cu_error.re_why = AUTH_INVALIDRESP;
-+ } else if (! AUTH_UNWRAP(cl->cl_auth, &reply_xdrs,
-+ xresults, resultsp)) {
-+ if (cu->cu_error.re_status == RPC_SUCCESS)
-+ cu->cu_error.re_status = RPC_CANTDECODERES;
- }
- if (reply_msg.acpted_rply.ar_verf.oa_base != NULL) {
- xdrs->x_op = XDR_FREE;
-diff --git a/src/clnt_vc.c b/src/clnt_vc.c
-index 359063c..097cae8 100644
---- a/src/clnt_vc.c
-+++ b/src/clnt_vc.c
-@@ -364,7 +364,7 @@ call_again:
- if ((! XDR_PUTBYTES(xdrs, ct->ct_u.ct_mcallc, ct->ct_mpos)) ||
- (! XDR_PUTINT32(xdrs, (int32_t *)&proc)) ||
- (! AUTH_MARSHALL(cl->cl_auth, xdrs)) ||
-- (! (*xdr_args)(xdrs, args_ptr))) {
-+ (! AUTH_WRAP(cl->cl_auth, xdrs, xdr_args, args_ptr))) {
- if (ct->ct_error.re_status == RPC_SUCCESS)
- ct->ct_error.re_status = RPC_CANTENCODEARGS;
- (void)xdrrec_endofrecord(xdrs, TRUE);
-@@ -420,7 +420,8 @@ call_again:
- &reply_msg.acpted_rply.ar_verf)) {
- ct->ct_error.re_status = RPC_AUTHERROR;
- ct->ct_error.re_why = AUTH_INVALIDRESP;
-- } else if (! (*xdr_results)(xdrs, results_ptr)) {
-+ } else if (! AUTH_UNWRAP(cl->cl_auth, xdrs,
-+ xdr_results, results_ptr)) {
- if (ct->ct_error.re_status == RPC_SUCCESS)
- ct->ct_error.re_status = RPC_CANTDECODERES;
- }
-diff --git a/src/rpc_generic.c b/src/rpc_generic.c
-index 509fb36..2eb91ad 100644
---- a/src/rpc_generic.c
-+++ b/src/rpc_generic.c
-@@ -535,7 +535,9 @@ __rpc_nconf2fd_flags(const struct netconfig *nconf, int flags)
- si.si_af == AF_INET6) {
- int val = 1;
-
-+#ifdef INET6
- setsockopt(fd, SOL_IPV6, IPV6_V6ONLY, &val, sizeof(val));
-+#endif
- }
- return fd;
- }
-diff --git a/src/rpc_soc.c b/src/rpc_soc.c
-index c678429..63d2197 100644
---- a/src/rpc_soc.c
-+++ b/src/rpc_soc.c
-@@ -560,12 +560,10 @@ clntunix_create(raddr, prog, vers, sockp, sendsz, recvsz)
- u_int recvsz;
- {
- struct netbuf *svcaddr;
-- struct netconfig *nconf;
- CLIENT *cl;
- int len;
-
- cl = NULL;
-- nconf = NULL;
- svcaddr = NULL;
- if (((svcaddr = malloc(sizeof(struct netbuf))) == NULL ) ||
- ((svcaddr->buf = malloc(sizeof(struct sockaddr_un))) == NULL)) {
-diff --git a/src/svc.c b/src/svc.c
-index b4a63d0..08cd6c9 100644
---- a/src/svc.c
-+++ b/src/svc.c
-@@ -77,9 +77,6 @@ static struct svc_callout
-
- extern rwlock_t svc_lock;
- extern rwlock_t svc_fd_lock;
--#ifdef HAVE_LIBGSSAPI
--extern struct svc_auth_ops svc_auth_gss_ops;
--#endif
-
- static struct svc_callout *svc_find (rpcprog_t, rpcvers_t,
- struct svc_callout **, char *);
-@@ -717,11 +714,9 @@ svc_getreq_common (fd)
- SVC_DESTROY (xprt);
- break;
- }
-- else if ((xprt->xp_auth != NULL)
--#ifdef HAVE_LIBGSSAPI
-- && (xprt->xp_auth->svc_ah_ops != &svc_auth_gss_ops)
--#endif
-- ) {
-+ else if ((xprt->xp_auth != NULL) &&
-+ (xprt->xp_auth->svc_ah_private == NULL))
-+ {
- xprt->xp_auth = NULL;
- }
- }
-diff --git a/src/svc_auth.c b/src/svc_auth.c
-index c6b3a0b..e80d5f9 100644
---- a/src/svc_auth.c
-+++ b/src/svc_auth.c
-@@ -98,8 +98,8 @@ _authenticate(rqst, msg)
- rqst->rq_xprt->xp_verf.oa_length = 0;
- cred_flavor = rqst->rq_cred.oa_flavor;
- switch (cred_flavor) {
-- case AUTH_NULL:
-- dummy = _svcauth_null(rqst, msg);
-+ case AUTH_NONE:
-+ dummy = _svcauth_none(rqst, msg);
- return (dummy);
- case AUTH_SYS:
- dummy = _svcauth_unix(rqst, msg);
-@@ -132,15 +132,6 @@ _authenticate(rqst, msg)
- return (AUTH_REJECTEDCRED);
- }
-
--/*ARGSUSED*/
--enum auth_stat
--_svcauth_null(rqst, msg)
-- struct svc_req *rqst;
-- struct rpc_msg *msg;
--{
-- return (AUTH_OK);
--}
--
- /*
- * Allow the rpc service to register new authentication types that it is
- * prepared to handle. When an authentication flavor is registered,
-diff --git a/src/svc_auth_gss.c b/src/svc_auth_gss.c
-index 54b23b1..9c74313 100644
---- a/src/svc_auth_gss.c
-+++ b/src/svc_auth_gss.c
-@@ -87,13 +87,13 @@ svcauth_gss_set_svc_name(gss_name_t name)
- {
- OM_uint32 maj_stat, min_stat;
-
-- log_debug("in svcauth_gss_set_svc_name()");
-+ gss_log_debug("in svcauth_gss_set_svc_name()");
-
- if (_svcauth_gss_name != NULL) {
- maj_stat = gss_release_name(&min_stat, &_svcauth_gss_name);
-
- if (maj_stat != GSS_S_COMPLETE) {
-- log_status("gss_release_name", maj_stat, min_stat);
-+ gss_log_status("gss_release_name", maj_stat, min_stat);
- return (FALSE);
- }
- _svcauth_gss_name = NULL;
-@@ -101,7 +101,7 @@ svcauth_gss_set_svc_name(gss_name_t name)
- maj_stat = gss_duplicate_name(&min_stat, name, &_svcauth_gss_name);
-
- if (maj_stat != GSS_S_COMPLETE) {
-- log_status("gss_duplicate_name", maj_stat, min_stat);
-+ gss_log_status("gss_duplicate_name", maj_stat, min_stat);
- return (FALSE);
- }
-
-@@ -115,7 +115,7 @@ svcauth_gss_import_name(char *service)
- gss_buffer_desc namebuf;
- OM_uint32 maj_stat, min_stat;
-
-- log_debug("in svcauth_gss_import_name()");
-+ gss_log_debug("in svcauth_gss_import_name()");
-
- namebuf.value = service;
- namebuf.length = strlen(service);
-@@ -124,7 +124,7 @@ svcauth_gss_import_name(char *service)
- (gss_OID)GSS_C_NT_HOSTBASED_SERVICE, &name);
-
- if (maj_stat != GSS_S_COMPLETE) {
-- log_status("gss_import_name", maj_stat, min_stat);
-+ gss_log_status("gss_import_name", maj_stat, min_stat);
- return (FALSE);
- }
- if (svcauth_gss_set_svc_name(name) != TRUE) {
-@@ -139,14 +139,14 @@ svcauth_gss_acquire_cred(void)
- {
- OM_uint32 maj_stat, min_stat;
-
-- log_debug("in svcauth_gss_acquire_cred()");
-+ gss_log_debug("in svcauth_gss_acquire_cred()");
-
- maj_stat = gss_acquire_cred(&min_stat, _svcauth_gss_name, 0,
- GSS_C_NULL_OID_SET, GSS_C_ACCEPT,
- &_svcauth_gss_creds, NULL, NULL);
-
- if (maj_stat != GSS_S_COMPLETE) {
-- log_status("gss_acquire_cred", maj_stat, min_stat);
-+ gss_log_status("gss_acquire_cred", maj_stat, min_stat);
- return (FALSE);
- }
- return (TRUE);
-@@ -157,12 +157,12 @@ svcauth_gss_release_cred(void)
- {
- OM_uint32 maj_stat, min_stat;
-
-- log_debug("in svcauth_gss_release_cred()");
-+ gss_log_debug("in svcauth_gss_release_cred()");
-
- maj_stat = gss_release_cred(&min_stat, &_svcauth_gss_creds);
-
- if (maj_stat != GSS_S_COMPLETE) {
-- log_status("gss_release_cred", maj_stat, min_stat);
-+ gss_log_status("gss_release_cred", maj_stat, min_stat);
- return (FALSE);
- }
-
-@@ -181,7 +181,7 @@ svcauth_gss_accept_sec_context(struct svc_req *rqst,
- gss_OID mech;
- OM_uint32 maj_stat = 0, min_stat = 0, ret_flags, seq;
-
-- log_debug("in svcauth_gss_accept_context()");
-+ gss_log_debug("in svcauth_gss_accept_context()");
-
- gd = SVCAUTH_PRIVATE(rqst->rq_xprt->xp_auth);
- gc = (struct rpc_gss_cred *)rqst->rq_clntcred;
-@@ -208,7 +208,7 @@ svcauth_gss_accept_sec_context(struct svc_req *rqst,
-
- if (gr->gr_major != GSS_S_COMPLETE &&
- gr->gr_major != GSS_S_CONTINUE_NEEDED) {
-- log_status("accept_sec_context", gr->gr_major, gr->gr_minor);
-+ gss_log_status("accept_sec_context", gr->gr_major, gr->gr_minor);
- gd->ctx = GSS_C_NO_CONTEXT;
- gss_release_buffer(&min_stat, &gr->gr_token);
- return (FALSE);
-@@ -238,7 +238,7 @@ svcauth_gss_accept_sec_context(struct svc_req *rqst,
- maj_stat = gss_display_name(&min_stat, gd->client_name,
- &gd->cname, &gd->sec.mech);
- if (maj_stat != GSS_S_COMPLETE) {
-- log_status("display_name", maj_stat, min_stat);
-+ gss_log_status("display_name", maj_stat, min_stat);
- return (FALSE);
- }
- #ifdef DEBUG
-@@ -248,19 +248,19 @@ svcauth_gss_accept_sec_context(struct svc_req *rqst,
-
- gss_oid_to_str(&min_stat, mech, &mechname);
-
-- log_debug("accepted context for %.*s with "
-- "<mech %.*s, qop %d, svc %d>",
-- gd->cname.length, (char *)gd->cname.value,
-- mechname.length, (char *)mechname.value,
-- gd->sec.qop, gd->sec.svc);
-+ gss_log_debug("accepted context for %.*s with "
-+ "<mech %.*s, qop %d, svc %d>",
-+ gd->cname.length, (char *)gd->cname.value,
-+ mechname.length, (char *)mechname.value,
-+ gd->sec.qop, gd->sec.svc);
-
- gss_release_buffer(&min_stat, &mechname);
- }
- #elif HAVE_HEIMDAL
-- log_debug("accepted context for %.*s with "
-- "<mech {}, qop %d, svc %d>",
-- gd->cname.length, (char *)gd->cname.value,
-- gd->sec.qop, gd->sec.svc);
-+ gss_log_debug("accepted context for %.*s with "
-+ "<mech {}, qop %d, svc %d>",
-+ gd->cname.length, (char *)gd->cname.value,
-+ gd->sec.qop, gd->sec.svc);
- #endif
- #endif /* DEBUG */
- seq = htonl(gr->gr_win);
-@@ -289,7 +289,7 @@ svcauth_gss_validate(struct svc_rpc_gss_data *gd, struct rpc_msg *msg)
- u_char rpchdr[128];
- int32_t *buf;
-
-- log_debug("in svcauth_gss_validate()");
-+ gss_log_debug("in svcauth_gss_validate()");
-
- memset(rpchdr, 0, sizeof(rpchdr));
-
-@@ -326,7 +326,7 @@ svcauth_gss_validate(struct svc_rpc_gss_data *gd, struct rpc_msg *msg)
- &qop_state);
-
- if (maj_stat != GSS_S_COMPLETE) {
-- log_status("gss_verify_mic", maj_stat, min_stat);
-+ gss_log_status("gss_verify_mic", maj_stat, min_stat);
- return (FALSE);
- }
- return (TRUE);
-@@ -339,7 +339,7 @@ svcauth_gss_nextverf(struct svc_req *rqst, u_int num)
- gss_buffer_desc signbuf, checksum;
- OM_uint32 maj_stat, min_stat;
-
-- log_debug("in svcauth_gss_nextverf()");
-+ gss_log_debug("in svcauth_gss_nextverf()");
-
- if (rqst->rq_xprt->xp_auth == NULL)
- return (FALSE);
-@@ -353,7 +353,7 @@ svcauth_gss_nextverf(struct svc_req *rqst, u_int num)
- &signbuf, &checksum);
-
- if (maj_stat != GSS_S_COMPLETE) {
-- log_status("gss_get_mic", maj_stat, min_stat);
-+ gss_log_status("gss_get_mic", maj_stat, min_stat);
- return (FALSE);
- }
- rqst->rq_xprt->xp_verf.oa_flavor = RPCSEC_GSS;
-@@ -373,7 +373,7 @@ _svcauth_gss(struct svc_req *rqst, struct rpc_msg *msg, bool_t *no_dispatch)
- struct rpc_gss_init_res gr;
- int call_stat, offset;
-
-- log_debug("in svcauth_gss()");
-+ gss_log_debug("in svcauth_gss()");
-
- /* Initialize reply. */
- rqst->rq_xprt->xp_verf = _null_auth;
-@@ -519,7 +519,7 @@ svcauth_gss_destroy(SVCAUTH *auth)
- struct svc_rpc_gss_data *gd;
- OM_uint32 min_stat;
-
-- log_debug("in svcauth_gss_destroy()");
-+ gss_log_debug("in svcauth_gss_destroy()");
-
- gd = SVCAUTH_PRIVATE(auth);
-
-@@ -540,7 +540,7 @@ svcauth_gss_wrap(SVCAUTH *auth, XDR *xdrs, xdrproc_t xdr_func, caddr_t xdr_ptr)
- {
- struct svc_rpc_gss_data *gd;
-
-- log_debug("in svcauth_gss_wrap()");
-+ gss_log_debug("in svcauth_gss_wrap()");
-
- gd = SVCAUTH_PRIVATE(auth);
-
-@@ -557,7 +557,7 @@ svcauth_gss_unwrap(SVCAUTH *auth, XDR *xdrs, xdrproc_t xdr_func, caddr_t xdr_ptr
- {
- struct svc_rpc_gss_data *gd;
-
-- log_debug("in svcauth_gss_unwrap()");
-+ gss_log_debug("in svcauth_gss_unwrap()");
-
- gd = SVCAUTH_PRIVATE(auth);
-
-diff --git a/src/svc_auth_unix.c b/src/svc_auth_unix.c
-index ce83859..9585069 100644
---- a/src/svc_auth_unix.c
-+++ b/src/svc_auth_unix.c
-@@ -43,6 +43,8 @@
-
- #include <rpc/rpc.h>
-
-+extern SVCAUTH svc_auth_none;
-+
- /*
- * Unix longhand authenticator
- */
-@@ -67,6 +69,8 @@ _svcauth_unix(rqst, msg)
- assert(rqst != NULL);
- assert(msg != NULL);
-
-+ rqst->rq_xprt->xp_auth = &svc_auth_none;
-+
- area = (struct area *) rqst->rq_clntcred;
- aup = &area->area_aup;
- aup->aup_machname = area->area_machname;
-@@ -142,5 +146,6 @@ _svcauth_short(rqst, msg)
- struct svc_req *rqst;
- struct rpc_msg *msg;
- {
-+ rqst->rq_xprt->xp_auth = &svc_auth_none;
- return (AUTH_REJECTEDCRED);
- }
-diff --git a/src/svc_dg.c b/src/svc_dg.c
-index 66a56ee..b1ac462 100644
---- a/src/svc_dg.c
-+++ b/src/svc_dg.c
-@@ -134,6 +134,7 @@ svc_dg_create(fd, sendsize, recvsize)
- su->su_cache = NULL;
- xprt->xp_fd = fd;
- xprt->xp_p2 = su;
-+ xprt->xp_auth = NULL;
- xprt->xp_verf.oa_base = su->su_verfbody;
- svc_dg_ops(xprt);
- xprt->xp_rtaddr.maxlen = sizeof (struct sockaddr_storage);
-@@ -234,10 +235,27 @@ svc_dg_reply(xprt, msg)
- bool_t stat = FALSE;
- size_t slen;
-
-+ xdrproc_t xdr_results;
-+ caddr_t xdr_location;
-+ bool_t has_args;
-+
-+ if (msg->rm_reply.rp_stat == MSG_ACCEPTED &&
-+ msg->rm_reply.rp_acpt.ar_stat == SUCCESS) {
-+ has_args = TRUE;
-+ xdr_results = msg->acpted_rply.ar_results.proc;
-+ xdr_location = msg->acpted_rply.ar_results.where;
-+
-+ msg->acpted_rply.ar_results.proc = (xdrproc_t)xdr_void;
-+ msg->acpted_rply.ar_results.where = NULL;
-+ } else
-+ has_args = FALSE;
-+
- xdrs->x_op = XDR_ENCODE;
- XDR_SETPOS(xdrs, 0);
- msg->rm_xid = su->su_xid;
-- if (xdr_replymsg(xdrs, msg)) {
-+ if (xdr_replymsg(xdrs, msg) &&
-+ (!has_args || (xprt->xp_auth &&
-+ SVCAUTH_WRAP(xprt->xp_auth, xdrs, xdr_results, xdr_location)))) {
- struct msghdr *msg = &su->su_msghdr;
- struct iovec iov;
-
-@@ -264,7 +282,12 @@ svc_dg_getargs(xprt, xdr_args, args_ptr)
- xdrproc_t xdr_args;
- void *args_ptr;
- {
-- return (*xdr_args)(&(su_data(xprt)->su_xdrs), args_ptr);
-+ if (! SVCAUTH_UNWRAP(xprt->xp_auth, &(su_data(xprt)->su_xdrs),
-+ xdr_args, args_ptr)) {
-+ (void)svc_freeargs(xprt, xdr_args, args_ptr);
-+ return FALSE;
-+ }
-+ return TRUE;
- }
-
- static bool_t
-@@ -288,6 +311,10 @@ svc_dg_destroy(xprt)
- xprt_unregister(xprt);
- if (xprt->xp_fd != -1)
- (void)close(xprt->xp_fd);
-+ if (xprt->xp_auth != NULL) {
-+ SVCAUTH_DESTROY(xprt->xp_auth);
-+ xprt->xp_auth = NULL;
-+ }
- XDR_DESTROY(&(su->su_xdrs));
- (void) mem_free(rpc_buffer(xprt), su->su_iosz);
- (void) mem_free(su, sizeof (*su));
-@@ -626,10 +653,11 @@ svc_dg_enable_pktinfo(int fd, const struct __rpc_sockinfo *si)
- case AF_INET:
- (void) setsockopt(fd, SOL_IP, IP_PKTINFO, &val, sizeof(val));
- break;
--
-+#ifdef INET6
- case AF_INET6:
-- (void) setsockopt(fd, SOL_IPV6, IPV6_PKTINFO, &val, sizeof(val));
-+ (void) setsockopt(fd, SOL_IPV6, IPV6_RECVPKTINFO, &val, sizeof(val));
- break;
-+#endif
- }
- }
-
-@@ -667,6 +695,7 @@ svc_dg_valid_pktinfo(struct msghdr *msg)
- }
- break;
-
-+#ifdef INET6
- case AF_INET6:
- if (cmsg->cmsg_level != SOL_IPV6
- || cmsg->cmsg_type != IPV6_PKTINFO
-@@ -679,6 +708,7 @@ svc_dg_valid_pktinfo(struct msghdr *msg)
- pkti->ipi6_ifindex = 0;
- }
- break;
-+#endif
-
- default:
- return 0;
-diff --git a/src/svc_vc.c b/src/svc_vc.c
-index aaaf2d7..4c70de8 100644
---- a/src/svc_vc.c
-+++ b/src/svc_vc.c
-@@ -172,6 +172,7 @@ svc_vc_create(fd, sendsize, recvsize)
- xprt->xp_p1 = r;
- xprt->xp_p2 = NULL;
- xprt->xp_p3 = NULL;
-+ xprt->xp_auth = NULL;
- xprt->xp_verf = _null_auth;
- svc_vc_rendezvous_ops(xprt);
- xprt->xp_port = (u_short)-1; /* It is the rendezvouser */
-@@ -283,6 +284,7 @@ makefd_xprt(fd, sendsize, recvsize)
- xdrrec_create(&(cd->xdrs), sendsize, recvsize,
- xprt, read_vc, write_vc);
- xprt->xp_p1 = cd;
-+ xprt->xp_auth = NULL;
- xprt->xp_verf.oa_base = cd->verf_body;
- svc_vc_ops(xprt); /* truely deals with calls */
- xprt->xp_port = 0; /* this is a connection, not a rendezvouser */
-@@ -412,6 +414,10 @@ __svc_vc_dodestroy(xprt)
- XDR_DESTROY(&(cd->xdrs));
- mem_free(cd, sizeof(struct cf_conn));
- }
-+ if (xprt->xp_auth != NULL) {
-+ SVCAUTH_DESTROY(xprt->xp_auth);
-+ xprt->xp_auth = NULL;
-+ }
- if (xprt->xp_rtaddr.buf)
- mem_free(xprt->xp_rtaddr.buf, xprt->xp_rtaddr.maxlen);
- if (xprt->xp_ltaddr.buf)
-@@ -610,7 +616,11 @@ svc_vc_recv(xprt, msg)
- }
-
- xdrs->x_op = XDR_DECODE;
-- (void)xdrrec_skiprecord(xdrs);
-+ /*
-+ * No need skip records with nonblocking connections
-+ */
-+ if (cd->nonblock == FALSE)
-+ (void)xdrrec_skiprecord(xdrs);
- if (xdr_callmsg(xdrs, msg)) {
- cd->x_id = msg->rm_xid;
- return (TRUE);
-@@ -628,8 +638,13 @@ svc_vc_getargs(xprt, xdr_args, args_ptr)
-
- assert(xprt != NULL);
- /* args_ptr may be NULL */
-- return ((*xdr_args)(&(((struct cf_conn *)(xprt->xp_p1))->xdrs),
-- args_ptr));
-+
-+ if (! SVCAUTH_UNWRAP(xprt->xp_auth,
-+ &(((struct cf_conn *)(xprt->xp_p1))->xdrs),
-+ xdr_args, args_ptr)) {
-+ return FALSE;
-+ }
-+ return TRUE;
- }
-
- static bool_t
-@@ -658,15 +673,35 @@ svc_vc_reply(xprt, msg)
- XDR *xdrs;
- bool_t rstat;
-
-+ xdrproc_t xdr_results;
-+ caddr_t xdr_location;
-+ bool_t has_args;
-+
- assert(xprt != NULL);
- assert(msg != NULL);
-
- cd = (struct cf_conn *)(xprt->xp_p1);
- xdrs = &(cd->xdrs);
-
-+ if (msg->rm_reply.rp_stat == MSG_ACCEPTED &&
-+ msg->rm_reply.rp_acpt.ar_stat == SUCCESS) {
-+ has_args = TRUE;
-+ xdr_results = msg->acpted_rply.ar_results.proc;
-+ xdr_location = msg->acpted_rply.ar_results.where;
-+
-+ msg->acpted_rply.ar_results.proc = (xdrproc_t)xdr_void;
-+ msg->acpted_rply.ar_results.where = NULL;
-+ } else
-+ has_args = FALSE;
-+
- xdrs->x_op = XDR_ENCODE;
- msg->rm_xid = cd->x_id;
-- rstat = xdr_replymsg(xdrs, msg);
-+ rstat = FALSE;
-+ if (xdr_replymsg(xdrs, msg) &&
-+ (!has_args || (xprt->xp_auth &&
-+ SVCAUTH_WRAP(xprt->xp_auth, xdrs, xdr_results, xdr_location)))) {
-+ rstat = TRUE;
-+ }
- (void)xdrrec_endofrecord(xdrs, TRUE);
- return (rstat);
- }
-diff --git a/src/xdr_rec.c b/src/xdr_rec.c
-index 4e815d7..2aca623 100644
---- a/src/xdr_rec.c
-+++ b/src/xdr_rec.c
-@@ -64,7 +64,6 @@
- #include <rpc/clnt.h>
- #include <stddef.h>
- #include "rpc_com.h"
--#include <unistd.h>
- static bool_t xdrrec_getlong(XDR *, long *);
- static bool_t xdrrec_putlong(XDR *, const long *);
- static bool_t xdrrec_getbytes(XDR *, char *, u_int);
-@@ -330,22 +329,22 @@ xdrrec_getpos(xdrs)
- RECSTREAM *rstrm = (RECSTREAM *)xdrs->x_private;
- off_t pos;
-
-- pos = lseek((int)(u_long)rstrm->tcp_handle, (off_t)0, 1);
-- if (pos != -1)
-- switch (xdrs->x_op) {
-+ switch (xdrs->x_op) {
-
-- case XDR_ENCODE:
-- pos += rstrm->out_finger - rstrm->out_base;
-- break;
-+ case XDR_ENCODE:
-+ pos = rstrm->out_finger - rstrm->out_base
-+ - BYTES_PER_XDR_UNIT;
-+ break;
-
-- case XDR_DECODE:
-- pos -= rstrm->in_boundry - rstrm->in_finger;
-- break;
-+ case XDR_DECODE:
-+ pos = rstrm->in_boundry - rstrm->in_finger
-+ - BYTES_PER_XDR_UNIT;
-+ break;
-
-- default:
-- pos = (off_t) -1;
-- break;
-- }
-+ default:
-+ pos = (off_t) -1;
-+ break;
-+ }
- return ((u_int) pos);
- }
-
-diff --git a/tirpc/rpc/auth.h b/tirpc/rpc/auth.h
-index 734e6b9..e7bbe36 100644
---- a/tirpc/rpc/auth.h
-+++ b/tirpc/rpc/auth.h
-@@ -51,6 +51,7 @@
- #include <sys/cdefs.h>
- #include <sys/socket.h>
- #include <sys/types.h>
-+#include <stdio.h>
-
-
- #define MAX_AUTH_BYTES 400
-@@ -203,8 +204,22 @@ typedef struct __auth {
-
- } *ah_ops;
- void *ah_private;
-+ int ah_refcnt;
- } AUTH;
-
-+static __inline int
-+auth_get(AUTH *auth)
-+{
-+ return __sync_add_and_fetch(&auth->ah_refcnt, 1);
-+}
-+
-+static __inline int
-+auth_put(AUTH *auth)
-+{
-+ return __sync_sub_and_fetch(&auth->ah_refcnt, 1);
-+}
-+
-+
-
- /*
- * Authentication ops.
-@@ -234,10 +249,29 @@ typedef struct __auth {
- #define auth_refresh(auth, msg) \
- ((*((auth)->ah_ops->ah_refresh))(auth, msg))
-
--#define AUTH_DESTROY(auth) \
-- ((*((auth)->ah_ops->ah_destroy))(auth))
--#define auth_destroy(auth) \
-- ((*((auth)->ah_ops->ah_destroy))(auth))
-+#if defined(__GNUC__) && defined(DEBUG)
-+#define auth_log_debug(fmt,args...) printf(stderr, fmt, args)
-+#else
-+#define auth_log_debug(fmt,args...)
-+#endif
-+
-+#define AUTH_DESTROY(auth) \
-+ do { \
-+ int refs; \
-+ if ((refs = auth_put((auth))) == 0) \
-+ ((*((auth)->ah_ops->ah_destroy))(auth));\
-+ auth_log_debug("%s: auth_put(), refs %d\n", \
-+ __func__, refs); \
-+ } while (0)
-+
-+#define auth_destroy(auth) \
-+ do { \
-+ int refs; \
-+ if ((refs = auth_put((auth))) == 0) \
-+ ((*((auth)->ah_ops->ah_destroy))(auth));\
-+ auth_log_debug("%s: auth_put(), refs %d\n", \
-+ __func__, refs); \
-+ } while (0)
-
- #define AUTH_WRAP(auth, xdrs, xfunc, xwhere) \
- ((*((auth)->ah_ops->ah_wrap))(auth, xdrs, \
-@@ -373,7 +407,7 @@ __END_DECLS
- __BEGIN_DECLS
- struct svc_req;
- struct rpc_msg;
--enum auth_stat _svcauth_null (struct svc_req *, struct rpc_msg *);
-+enum auth_stat _svcauth_none (struct svc_req *, struct rpc_msg *);
- enum auth_stat _svcauth_short (struct svc_req *, struct rpc_msg *);
- enum auth_stat _svcauth_unix (struct svc_req *, struct rpc_msg *);
- __END_DECLS
-diff --git a/tirpc/rpc/auth_gss.h b/tirpc/rpc/auth_gss.h
-index 633b11f..fc3ffbd 100644
---- a/tirpc/rpc/auth_gss.h
-+++ b/tirpc/rpc/auth_gss.h
-@@ -120,10 +120,10 @@ bool_t authgss_service __P((AUTH *auth, int svc));
- bool_t authgss_get_private_data __P((AUTH *auth,
- struct authgss_private_data *));
-
--void log_debug __P((const char *fmt, ...));
--void log_status __P((char *m, OM_uint32 major,
-+void gss_log_debug __P((const char *fmt, ...));
-+void gss_log_status __P((char *m, OM_uint32 major,
- OM_uint32 minor));
--void log_hexdump __P((const u_char *buf, int len, int offset));
-+void gss_log_hexdump __P((const u_char *buf, int len, int offset));
-
- __END_DECLS
-
-diff --git a/tirpc/rpc/des.h b/tirpc/rpc/des.h
-index e3d6897..d2881ad 100644
---- a/tirpc/rpc/des.h
-+++ b/tirpc/rpc/des.h
-@@ -33,6 +33,9 @@
- * Copyright (c) 1986 by Sun Microsystems, Inc.
- */
-
-+#ifndef _RPC_DES_H_
-+#define _RPC_DES_H_
-+
- #define DES_MAXLEN 65536 /* maximum # of bytes to encrypt */
- #define DES_QUICKLEN 16 /* maximum # of bytes to encrypt quickly */
-
-@@ -80,3 +83,5 @@ struct desparams {
- * Software DES.
- */
- extern int _des_crypt( char *, int, struct desparams * );
-+
-+#endif
-diff --git a/tirpc/rpc/svc_auth.h b/tirpc/rpc/svc_auth.h
-index 659e90c..14269d1 100644
---- a/tirpc/rpc/svc_auth.h
-+++ b/tirpc/rpc/svc_auth.h
-@@ -44,17 +44,23 @@
- /*
- * Interface to server-side authentication flavors.
- */
--typedef struct {
-+typedef struct SVCAUTH {
- struct svc_auth_ops {
-- int (*svc_ah_wrap)(void);
-- int (*svc_ah_unwrap)(void);
-- int (*svc_ah_destroy)(void);
-+ int (*svc_ah_wrap)(struct SVCAUTH *, XDR *, xdrproc_t,
-+ caddr_t);
-+ int (*svc_ah_unwrap)(struct SVCAUTH *, XDR *, xdrproc_t,
-+ caddr_t);
-+ int (*svc_ah_destroy)(struct SVCAUTH *);
- } *svc_ah_ops;
- caddr_t svc_ah_private;
- } SVCAUTH;
-
--#define SVCAUTH_DESTROY(cred) ((*(cred)->svc_ah_ops->svc_ah_destroy)())
--#define svcauth_destroy(cred) ((*(cred)->svc_ah_ops->svc_ah_destroy)())
-+#define SVCAUTH_WRAP(auth, xdrs, xfunc, xwhere) \
-+ ((*((auth)->svc_ah_ops->svc_ah_wrap))(auth, xdrs, xfunc, xwhere))
-+#define SVCAUTH_UNWRAP(auth, xdrs, xfunc, xwhere) \
-+ ((*((auth)->svc_ah_ops->svc_ah_unwrap))(auth, xdrs, xfunc, xwhere))
-+#define SVCAUTH_DESTROY(auth) \
-+ ((*((auth)->svc_ah_ops->svc_ah_destroy))(auth))
-
- /*
- * Server side authenticator
diff --git a/liburcu/liburcu.nm b/liburcu/liburcu.nm
new file mode 100644
index 000000000..b99918bf7
--- /dev/null
+++ b/liburcu/liburcu.nm
@@ -0,0 +1,43 @@
+###############################################################################
+# IPFire.org - An Open Source Firewall Solution #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
+###############################################################################
+
+name = liburcu
+version = 0.13.2
+release = 1
+thisapp = userspace-rcu-%{version}
+
+groups = System/Libraries
+url = https://lttng.org/urcu
+license = LGPL2.1
+summary = liburcu is a userspace RCU (read-copy-update) library
+
+description
+ liburcu is a LGPLv2.1 userspace RCU (read-copy-update) library.
+ This data synchronization library provides read-side access which
+ scales linearly with the number of cores.
+end
+
+source_dl = https://lttng.org/files/urcu/
+sources = %{thisapp}.tar.bz2
+
+build
+ export LD_LIBRARY_PATH = %{DIR_APP}/src/.libs
+
+ test
+ make check
+ end
+end
+
+packages
+ package %{name}
+
+ package %{name}-devel
+ template DEVEL
+ end
+
+ package %{name}-debuginfo
+ template DEBUGINFO
+ end
+end
diff --git a/libuser/libuser.nm b/libuser/libuser.nm
deleted file mode 100644
index 709d5eac4..000000000
--- a/libuser/libuser.nm
+++ /dev/null
@@ -1,64 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = libuser
-version = 0.62
-release = 2
-
-groups = System/Libraries
-url = https://fedorahosted.org/libuser/
-license = LGPLv2+
-summary = A user and group account administration library.
-
-description
- The libuser library implements a standardized interface for
- manipulating and administering user and group accounts. The
- library uses pluggable back-ends to interface to its data sources.
-end
-
-source_dl = https://fedorahosted.org/releases/l/i/%{name}/
-sources = %{thisapp}.tar.xz
-
-build
- requires
- cyrus-sasl-devel
- glib2-devel
- openldap-devel
- pam-devel
- pkg-config
- popt-devel
- python-devel >= 2.7.12-2
- end
-
- export LD_LIBRARY_PATH = %{DIR_APP}/lib/.libs
-
- configure_options += \
- --with-ldap
-
- prepare_cmds
- # Little hack that we don't build documentation that requires sgml2html
- sed -e "s/^SUBDIRS = .*/SUBDIRS = po/" -i Makefile.in
- end
-
- test
- # Disable tests which requires a running ldap server.
- sed -e "s/tests\/default_pw_test//" -i Makefile
- sed -e "s/tests\/ldap_test//" -i Makefile
-
- make check
- end
-end
-
-packages
- package %{name}
-
- package %{name}-devel
- template DEVEL
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/libxcrypt/libxcrypt.nm b/libxcrypt/libxcrypt.nm
new file mode 100644
index 000000000..71f4dd4eb
--- /dev/null
+++ b/libxcrypt/libxcrypt.nm
@@ -0,0 +1,58 @@
+###############################################################################
+# IPFire.org - An Open Source Firewall Solution #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
+###############################################################################
+
+name = libxcrypt
+version = 4.4.33
+release = 1
+
+groups = System/Libraries
+url = https://github.com/besser82/libxcrypt/
+license = LGPLv2.1
+summary = Extended crypt library for descrypt, md5crypt, bcrypt, and others
+
+description
+ libxcrypt is a modern library for one-way hashing of passwords.
+ It supports a wide variety of both modern and historical hashing methods:
+ yescrypt, gost-yescrypt, scrypt, bcrypt, sha512crypt, sha256crypt,
+ md5crypt, SunMD5, sha1crypt, NT, bsdicrypt, bigcrypt, and descrypt.
+ It provides the traditional Unix crypt and crypt_r interfaces, as well
+ as a set of extended interfaces pioneered by Openwall Linux, crypt_rn,
+ crypt_ra, crypt_gensalt, crypt_gensalt_rn, and crypt_gensalt_ra.
+
+ libxcrypt is intended to be used by login(1), passwd(1), and other
+ similar programs; that is, to hash a small number of passwords during
+ an interactive authentication dialogue with a human.
+end
+
+source_dl = https://github.com/besser82/libxcrypt/releases/download/v%{version}/
+sources = %{thisapp}.tar.xz
+
+build
+ requires
+ perl
+ end
+
+ configure_options += \
+ --disable-static \
+ --enable-hashes=strong,glibc \
+ --disable-obsolete-api \
+ --disable-failure-tokens
+
+ test
+ LD_LIBRARY_PATH="%{DIR_APP}/.libs" make check
+ end
+end
+
+packages
+ package %{name}
+
+ package %{name}-devel
+ template DEVEL
+ end
+
+ package %{name}-debuginfo
+ template DEBUGINFO
+ end
+end
diff --git a/libxcrypt/patches/libxcrypt-4.4.33-hashes.patch b/libxcrypt/patches/libxcrypt-4.4.33-hashes.patch
new file mode 100644
index 000000000..42f5d67a7
--- /dev/null
+++ b/libxcrypt/patches/libxcrypt-4.4.33-hashes.patch
@@ -0,0 +1,14 @@
+diff --git a/build-aux/scripts/expand-selected-hashes b/build-aux/scripts/expand-selected-hashes
+index 10d0bcc..2558c42 100644
+--- a/build-aux/scripts/expand-selected-hashes
++++ b/build-aux/scripts/expand-selected-hashes
+@@ -50,9 +50,6 @@ sub expand_selected {
+ push @errors, "'$w' is not a hash or group name\n";
+ }
+ }
+- if (scalar(%enabled) == 0) {
+- push @errors, "no hashes are enabled\n";
+- }
+ die join q{}, @errors if @errors;
+ return keys %enabled;
+ }
diff --git a/lmdb/lmdb.nm b/lmdb/lmdb.nm
new file mode 100644
index 000000000..cc63fab52
--- /dev/null
+++ b/lmdb/lmdb.nm
@@ -0,0 +1,61 @@
+###############################################################################
+# IPFire.org - An Open Source Firewall Solution #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
+###############################################################################
+
+name = lmdb
+version = 0.9.29
+release = 1
+thisapp = LMDB_%{version}
+
+groups = System/Libraries
+url = https://symas.com/mdb
+license = OpenLDAP
+summary = Memory-mapped key-value database
+
+description
+ LMDB is an ultra-fast, ultra-compact key-value embedded data
+ store developed by Symas for the OpenLDAP Project. By using memory-mapped files,
+ it provides the read performance of a pure in-memory database while still
+ offering the persistence of standard disk-based databases, and is only limited
+ to the size of the virtual address space.
+end
+
+source_dl = https://git.openldap.org/openldap/openldap/-/archive
+
+build
+ DIR_APP = %{DIR_SRC}/openldap-LMDB_%{version}-8ad7be2510414b9506ec9f9e24f24d04d9b04a1a/libraries/liblmdb
+
+ prepare_cmds
+ sed -i "%{DIR_SOURCE}/lmdb.pc" \
+ -e "s/@PKGVER@/%{version}/"
+ end
+
+ build
+ make %{PARALLELISMFLAGS} XCFLAGS="%{CFLAGS}"
+ end
+
+ install
+ make install \
+ DESTDIR="%{BUILDROOT}" \
+ prefix="%{prefix}" \
+ libdir="%{libdir}" \
+ mandir="%{mandir}"
+
+ mkdir -pv "%{BUILDROOT}%{libdir}/pkgconfig"
+ install -v -m 644 "%{DIR_SOURCE}/lmdb.pc" \
+ "%{BUILDROOT}%{libdir}/pkgconfig/lmdb.pc"
+ end
+end
+
+packages
+ package %{name}
+
+ package %{name}-devel
+ template DEVEL
+ end
+
+ package %{name}-debuginfo
+ template DEBUGINFO
+ end
+end
diff --git a/lmdb/lmdb.pc b/lmdb/lmdb.pc
new file mode 100644
index 000000000..de3006129
--- /dev/null
+++ b/lmdb/lmdb.pc
@@ -0,0 +1,10 @@
+prefix=/usr
+libdir=${prefix}/lib
+includedir=${prefix}/include
+
+Name: liblmdb
+Description: Lightning Memory-Mapped Database
+URL: https://symas.com/products/lightning-memory-mapped-database/
+Version: @PKGVER@
+Libs: -L${libdir} -llmdb
+Cflags: -I${includedir}
diff --git a/network/network.nm b/network/network.nm
index 5403f75b0..82b51de79 100644
--- a/network/network.nm
+++ b/network/network.nm
@@ -5,7 +5,7 @@
name = network
version = 010
-release = 3
+release = 4
maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
groups = Base Networking/Tools
@@ -48,7 +48,6 @@ packages
requires
bash >= 4.0
bird >= 2
- crda
curl
dhclient >= 4.2.4-2
dhcp >= 4.2.4-1
diff --git a/passwd/passwd.nm b/passwd/passwd.nm
deleted file mode 100644
index ba40e3591..000000000
--- a/passwd/passwd.nm
+++ /dev/null
@@ -1,57 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = passwd
-version = 0.80
-release = 1
-
-groups = System/Base
-url = https://pagure.io/passwd
-license = BSD
-summary = An utility for setting or changing passwords using PAM
-
-description
- This package contains a system utility (passwd) which sets
- or changes passwords, using PAM (Pluggable Authentication
- Modules) library.
-end
-
-source_dl = https://releases.pagure.org/passwd/
-sources = %{thisapp}.tar.bz2
-
-build
- requires
- autoconf
- automake
- gettext-devel
- glib2-devel
- libtool
- libuser-devel
- pam-devel
- pkg-config
- popt-devel
- end
-
- prepare_cmds
- mkdir -pv admin
- autoreconf -vfi
- end
-
- configure_options += \
- --without-selinux \
- --without-audit \
- --disable-static
-
- make_build_targets += \
- DEBUG= RPM_OPT_FLAGS="%{CFLAGS}"
-end
-
-packages
- package %{name}
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/passwd/passwd.pam b/passwd/passwd.pam
deleted file mode 100644
index 5f3504f83..000000000
--- a/passwd/passwd.pam
+++ /dev/null
@@ -1,4 +0,0 @@
-#%PAM-1.0
-auth include system-auth
-account include system-auth
-password substack system-auth
diff --git a/pcapy/pcapy.nm b/pcapy/pcapy.nm
deleted file mode 100644
index c12b51f34..000000000
--- a/pcapy/pcapy.nm
+++ /dev/null
@@ -1,47 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = pcapy
-version = 0.10.5
-release = 1
-
-groups = Development/Languages
-url = http://oss.coresecurity.com/projects/pcapy.html
-license = ASL 1.1
-summary = A Python interface to libpcap.
-
-description
- Pcapy is a Python extension module that interfaces with the libpcap
- packet capture library. Pcapy enables python scripts to capture packets
- on the network. Pcapy is highly effective when used in conjunction with
- a packet-handling package such as Impacket, which is a collection of
- Python classes for constructing and dissecting network packets.
-end
-
-source_dl =
-
-build
- requires
- gcc-c++
- libpcap-devel
- python-devel
- end
-
- build
- python setup.py build
- end
-
- install
- python setup.py install -O1 --skip-build --root %{BUILDROOT}
- end
-end
-
-packages
- package %{name}
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/pptp/patches/pptp-1.7.2-compat.patch b/pptp/patches/pptp-1.7.2-compat.patch
deleted file mode 100644
index a6456fc84..000000000
--- a/pptp/patches/pptp-1.7.2-compat.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-Index: pptp_compat.c
-===================================================================
-RCS file: /cvsroot/pptpclient/pptp-linux/pptp_compat.c,v
-retrieving revision 1.1
-retrieving revision 1.3
-diff -u -r1.1 -r1.3
---- a/pptp_compat.c 19 Feb 2008 21:43:28 -0000 1.1
-+++ b/pptp_compat.c 25 Jul 2008 00:13:56 -0000 1.3
-@@ -7,14 +7,15 @@
- #include <fcntl.h>
- #include <sys/types.h>
- #include <unistd.h>
--#include <stropts.h>
- #include <stdlib.h>
-+#if defined (__SVR4) && defined (__sun) /* Solaris */
-+#include <stropts.h>
-+#endif
- #include <strings.h>
- #include "pptp_compat.h"
- #include <stdio.h>
- #include "util.h"
-
--
- #if defined (__SVR4) && defined (__sun) /* Solaris */
- /*
- * daemon implementation from uClibc
-Index: pptp.c
-===================================================================
-RCS file: /cvsroot/pptpclient/pptp-linux/pptp.c,v
-retrieving revision 1.49
-retrieving revision 1.51
-diff -u -r1.49 -r1.51
---- a/pptp.c 14 May 2008 06:32:52 -0000 1.49
-+++ b/pptp.c 24 Jul 2008 05:53:05 -0000 1.51
-@@ -61,9 +61,8 @@
- #include "version.h"
- #if defined(__linux__)
- #include <sys/prctl.h>
--#else
--#include "inststr.h"
- #endif
-+#include "inststr.h"
- #include "util.h"
- #include "pptp_quirks.h"
- #include "pqueue.h"
-@@ -129,7 +128,7 @@
- }
-
- #if defined (__SVR4) && defined (__sun)
--struct in_addr localbind = { INADDR_ANY };
-+struct in_addr localbind = { .s_addr = INADDR_ANY };
- #else
- struct in_addr localbind = { INADDR_NONE };
- #endif
-@@ -183,6 +182,7 @@
- struct in_addr inetaddr;
- volatile int callmgr_sock = -1;
- char ttydev[PATH_MAX];
-+ char *tty_name;
- int pty_fd, tty_fd, gre_fd, rc;
- volatile pid_t parent_pid, child_pid;
- u_int16_t call_id, peer_call_id;
-@@ -391,7 +391,7 @@
- file2fd("/dev/null", "wb", STDERR_FILENO);
- }
-
-- char *tty_name = ttyname(tty_fd);
-+ tty_name = ttyname(tty_fd);
- snprintf(buf, sizeof(buf), "pptp: GRE-to-PPP gateway on %s",
- tty_name ? tty_name : "(null)");
- #ifdef PR_SET_NAME
diff --git a/pptp/patches/pptp-1.7.2-conn-free.patch b/pptp/patches/pptp-1.7.2-conn-free.patch
deleted file mode 100644
index 331e92edc..000000000
--- a/pptp/patches/pptp-1.7.2-conn-free.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-Tue Jun 15 15:00:40 2010 James Cameron <quozl(a)laptop.org>
-
- * pptp_ctrl.c (pptp_conn_is_dead): immediately destroying the
- connection and freeing the structure has led to segmentation
- faults on more recent heap implementations, since we use the
- structure after it has been freed.
-
- Defer the free of the structure until after all uses of it have
- ceased, by adding a connection state for dead and terminating the
- main loop once it is detected.
-
---- a/pptp_callmgr.c 2008-05-14 07:33:55.000000000 +0100
-+++ b/pptp_callmgr.c 2010-06-15 14:32:00.478100392 +0100
-@@ -167,6 +170,7 @@
- do {
- int rc;
- fd_set read_set = call_set, write_set;
-+ if (pptp_conn_is_dead(conn)) break;
- FD_ZERO (&write_set);
- if (pptp_conn_established(conn)) {
- FD_SET (unix_sock, &read_set);
-@@ -294,6 +298,7 @@
- }
- /* with extreme prejudice */
- pptp_conn_destroy(conn);
-+ pptp_conn_free(conn);
- vector_destroy(call_list);
- }
- cleanup:
---- a/pptp_ctrl.c 2008-05-14 07:33:55.000000000 +0100
-+++ b/pptp_ctrl.c 2010-06-15 14:32:00.480100647 +0100
-@@ -58,8 +62,11 @@
- struct PPTP_CONN {
- int inet_sock;
- /* Connection States */
-- enum {
-- CONN_IDLE, CONN_WAIT_CTL_REPLY, CONN_WAIT_STOP_REPLY, CONN_ESTABLISHED
-+ enum {
-+ CONN_IDLE,
-+ CONN_WAIT_CTL_REPLY, CONN_WAIT_STOP_REPLY,
-+ CONN_ESTABLISHED,
-+ CONN_DEAD
- } conn_state; /* on startup: CONN_IDLE */
- /* Keep-alive states */
- enum {
-@@ -448,6 +457,16 @@
- close(conn->inet_sock);
- /* deallocate */
- vector_destroy(conn->call);
-+ conn->conn_state = CONN_DEAD;
-+}
-+
-+int pptp_conn_is_dead(PPTP_CONN * conn)
-+{
-+ return conn->conn_state == CONN_DEAD;
-+}
-+
-+void pptp_conn_free(PPTP_CONN * conn)
-+{
- free(conn);
- }
-
-@@ -1038,11 +1059,13 @@
- int i;
- /* "Keep Alives and Timers, 1": check connection state */
- if (global.conn->conn_state != CONN_ESTABLISHED) {
-- if (global.conn->conn_state == CONN_WAIT_STOP_REPLY)
-+ if (global.conn->conn_state == CONN_WAIT_STOP_REPLY) {
- /* hard close. */
- pptp_conn_destroy(global.conn);
-- else /* soft close */
-- pptp_conn_close(global.conn, PPTP_STOP_NONE);
-+ return;
-+ }
-+ /* soft close */
-+ pptp_conn_close(global.conn, PPTP_STOP_NONE);
- }
- /* "Keep Alives and Timers, 2": check echo status */
- if (global.conn->ka_state == KA_OUTSTANDING) {
---- a/pptp_ctrl.h 2008-05-14 07:33:55.000000000 +0100
-+++ b/pptp_ctrl.h 2010-06-15 14:32:00.864975405 +0100
-@@ -33,6 +33,8 @@
- void pptp_call_close(PPTP_CONN * conn, PPTP_CALL * call);
- /* hard close. */
- void pptp_call_destroy(PPTP_CONN *conn, PPTP_CALL *call);
-+int pptp_conn_is_dead(PPTP_CONN * conn);
-+void pptp_conn_free(PPTP_CONN * conn);
- /* soft close. Will callback on completion. */
- void pptp_conn_close(PPTP_CONN * conn, u_int8_t close_reason);
- /* hard close */
diff --git a/pptp/patches/pptp-1.7.2-conn-free2.patch b/pptp/patches/pptp-1.7.2-conn-free2.patch
deleted file mode 100644
index 78c021eb2..000000000
--- a/pptp/patches/pptp-1.7.2-conn-free2.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-Fri Jun 4 10:54:04 2010 Jan Just Keijser <jan.just.keijser(a)gmail.com>
-
- * pptp_ctrl.c: check for failure return by pptp_send_ctrl_packet
- and avoid using freed struct conn.
-
---- a/pptp_ctrl.c 2010-06-15 15:05:46.743913798 +0100
-+++ b/pptp_ctrl.c 2010-06-15 14:32:00.480100647 +0100
-@@ -396,9 +400,10 @@
- /* don't check state against WAIT_DISCONNECT... allow multiple disconnect
- * requests to be made.
- */
-- pptp_send_ctrl_packet(conn, &rqst, sizeof(rqst));
-- pptp_reset_timer();
-- call->state.pns = PNS_WAIT_DISCONNECT;
-+ if (pptp_send_ctrl_packet(conn, &rqst, sizeof(rqst))) {
-+ pptp_reset_timer();
-+ call->state.pns = PNS_WAIT_DISCONNECT;
-+ }
- /* call structure will be freed when we have confirmation of disconnect. */
- }
-
-@@ -431,9 +436,10 @@
- pptp_call_close(conn, vector_get_Nth(conn->call, i));
- /* now close connection */
- log("Closing PPTP connection");
-- pptp_send_ctrl_packet(conn, &rqst, sizeof(rqst));
-- pptp_reset_timer(); /* wait 60 seconds for reply */
-- conn->conn_state = CONN_WAIT_STOP_REPLY;
-+ if (pptp_send_ctrl_packet(conn, &rqst, sizeof(rqst))) {
-+ pptp_reset_timer(); /* wait 60 seconds for reply */
-+ conn->conn_state = CONN_WAIT_STOP_REPLY;
-+ }
- return;
- }
-
-@@ -733,8 +739,8 @@
- reply.version = packet->version;
- /* protocol version not supported */
- reply.result_code = hton8(5);
-- pptp_send_ctrl_packet(conn, &reply, sizeof(reply));
-- pptp_reset_timer(); /* give sender a chance for a retry */
-+ if (pptp_send_ctrl_packet(conn, &reply, sizeof(reply)))
-+ pptp_reset_timer(); /* give sender a chance for a retry */
- } else { /* same or greater version */
- if (pptp_send_ctrl_packet(conn, &reply, sizeof(reply))) {
- conn->conn_state = CONN_ESTABLISHED;
-@@ -841,8 +847,8 @@
- hton8(1), hton8(PPTP_GENERAL_ERROR_NONE), 0
- };
- logecho( PPTP_ECHO_RQST);
-- pptp_send_ctrl_packet(conn, &reply, sizeof(reply));
-- pptp_reset_timer();
-+ if (pptp_send_ctrl_packet(conn, &reply, sizeof(reply)))
-+ pptp_reset_timer();
- break;
- }
- /* ----------- OUTGOING CALL MESSAGES ------------ */
-@@ -928,9 +935,10 @@
- vector_search(conn->call, ntoh16(packet->call_id), &call);
- if (call->callback != NULL)
- call->callback(conn, call, CALL_CLOSE_RQST);
-- pptp_send_ctrl_packet(conn, &reply, sizeof(reply));
-- pptp_call_destroy(conn, call);
-- log("Call closed (RQST) (call id %d)", (int) call->call_id);
-+ if (pptp_send_ctrl_packet(conn, &reply, sizeof(reply))) {
-+ pptp_call_destroy(conn, call);
-+ log("Call closed (RQST) (call id %d)", (int) call->call_id);
-+ }
- }
- break;
- }
-@@ -1067,8 +1075,9 @@
- } else { /* ka_state == NONE */ /* send keep-alive */
- struct pptp_echo_rqst rqst = {
- PPTP_HEADER_CTRL(PPTP_ECHO_RQST), hton32(global.conn->ka_id) };
-- pptp_send_ctrl_packet(global.conn, &rqst, sizeof(rqst));
-- global.conn->ka_state = KA_OUTSTANDING;
-+ if (pptp_send_ctrl_packet(global.conn, &rqst, sizeof(rqst))) {
-+ global.conn->ka_state = KA_OUTSTANDING;
-+ }
- }
- /* check incoming/outgoing call states for !IDLE && !ESTABLISHED */
- for (i = 0; i < vector_size(global.conn->call); i++) {
diff --git a/pptp/patches/pptp-1.7.2-ip-path.patch b/pptp/patches/pptp-1.7.2-ip-path.patch
deleted file mode 100644
index c65cb32d0..000000000
--- a/pptp/patches/pptp-1.7.2-ip-path.patch
+++ /dev/null
@@ -1,186 +0,0 @@
-Index: routing.c
-===================================================================
-RCS file: /cvsroot/pptpclient/pptp-linux/routing.c,v
-retrieving revision 1.1
-diff -u -r1.1 routing.c
---- a/routing.c 2 Aug 2006 07:07:37 -0000 1.1
-+++ b/routing.c 25 Mar 2009 13:58:28 -0000
-@@ -23,9 +23,26 @@
- #include <stdio.h>
- #include <string.h>
- #include "routing.h"
-+#include "config.h"
-
-+#if defined (__SVR4) && defined (__sun) /* Solaris */
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <net/if.h>
-+#include <arpa/inet.h>
-+#include <errno.h>
-+#include "util.h"
-+/* PF_ROUTE socket*/
-+int rts;
-+/* Destination and gateway addresses */
-+struct sockaddr_in rdst, rgw;
-+/* Request sequence */
-+int rseq;
-+int dorouting;
-+#else /* Solaris */
- /* route to the server */
- char *route;
-+#endif /* Solaris */
-
- /*
-
-@@ -54,26 +71,113 @@
- */
-
- void routing_init(char *ip) {
-+#if defined (__SVR4) && defined (__sun) /* Solaris */
-+ rdst.sin_family = AF_INET;
-+ if ( ! inet_pton(AF_INET, ip, &rdst.sin_addr) ) {
-+ log("Cannot convert address: %s", strerror(errno));
-+ return;
-+ }
-+
-+ if ( (rts = socket(PF_ROUTE, SOCK_RAW, AF_INET )) < 0 ) {
-+ log("Cannot open routing socket: %s", strerror(errno));
-+ return;
-+ }
-+
-+ struct rt_msg rtm = {
-+ .hdr.rtm_msglen = sizeof(struct rt_msg),
-+ .hdr.rtm_version = RTM_VERSION,
-+ .hdr.rtm_type = RTM_GET,
-+ .hdr.rtm_addrs = RTA_DST,
-+ .hdr.rtm_pid = getpid(),
-+ .hdr.rtm_seq = ++rseq,
-+ .addrs[RTAX_DST] = rdst
-+ };
-+
-+ if ( write(rts, &rtm, rtm.hdr.rtm_msglen) != rtm.hdr.rtm_msglen ) {
-+ log("Error writing to routing socket: %s", strerror(errno));
-+ close(rts);
-+ return;
-+ }
-+
-+ while ( read(rts, &rtm, sizeof(struct rt_msg)) > 0 )
-+ if ( rtm.hdr.rtm_pid == getpid() && rtm.hdr.rtm_seq == rseq) {
-+ /* Check if host route already present */
-+ if ( ( rtm.hdr.rtm_flags & RTF_HOST ) != RTF_HOST ) {
-+ rgw = rtm.addrs[RTAX_GATEWAY];
-+ dorouting = 1;
-+ }
-+ break;
-+ }
-+#else /* Solaris */
- char buf[256];
-- snprintf(buf, 255, "/bin/ip route get %s", ip);
-- FILE *p = popen(buf, "r");
-+ FILE *p;
-+
-+ snprintf(buf, 255, "%s route get %s", IP_BINARY, ip);
-+ p = popen(buf, "r");
- fgets(buf, 255, p);
- /* TODO: check for failure of fgets */
- route = strdup(buf);
- pclose(p);
- /* TODO: check for failure of command */
-+#endif /* Solaris */
- }
-
- void routing_start() {
-+#if defined (__SVR4) && defined (__sun) /* Solaris */
-+ if ( ! dorouting )
-+ return;
-+
-+ struct rt_msg rtm = {
-+ .hdr.rtm_msglen = sizeof(struct rt_msg),
-+ .hdr.rtm_version = RTM_VERSION,
-+ .hdr.rtm_type = RTM_ADD,
-+ .hdr.rtm_flags = RTF_HOST | RTF_GATEWAY | RTF_STATIC,
-+ .hdr.rtm_addrs = RTA_DST | RTA_GATEWAY,
-+ .hdr.rtm_pid = getpid(),
-+ .hdr.rtm_seq = ++rseq,
-+ .addrs[RTAX_DST] = rdst,
-+ .addrs[RTAX_GATEWAY] = rgw
-+ };
-+
-+ if ( write(rts, &rtm, rtm.hdr.rtm_msglen) != rtm.hdr.rtm_msglen ) {
-+ log("Error adding route: %s", strerror(errno));
-+ }
-+#else /* Solaris */
- char buf[256];
-- snprintf(buf, 255, "/bin/ip route replace %s", route);
-- FILE *p = popen(buf, "r");
-+ FILE *p;
-+
-+ snprintf(buf, 255, "%s route replace %s", IP_BINARY, route);
-+ p = popen(buf, "r");
- pclose(p);
-+#endif /* Solaris */
- }
-
- void routing_end() {
-+#if defined (__SVR4) && defined (__sun) /* Solaris */
-+ if ( ! dorouting)
-+ return;
-+
-+ struct rt_msg rtm = {
-+ .hdr.rtm_msglen = sizeof(struct rt_msg),
-+ .hdr.rtm_version = RTM_VERSION,
-+ .hdr.rtm_type = RTM_DELETE,
-+ .hdr.rtm_flags = RTF_HOST | RTF_GATEWAY | RTF_STATIC,
-+ .hdr.rtm_addrs = RTA_DST | RTA_GATEWAY,
-+ .hdr.rtm_pid = getpid(),
-+ .hdr.rtm_seq = ++rseq,
-+ .addrs[RTAX_DST] = rdst,
-+ .addrs[RTAX_GATEWAY] = rgw
-+ };
-+
-+ if ( write(rts, &rtm, rtm.hdr.rtm_msglen) != rtm.hdr.rtm_msglen ) {
-+ log("Error deleting route: %s", strerror(errno));
-+ }
-+#else /* Solaris */
- char buf[256];
-- snprintf(buf, 255, "/bin/ip route delete %s", route);
-- FILE *p = popen(buf, "r");
-+ FILE *p;
-+
-+ snprintf(buf, 255, "%s route delete %s", IP_BINARY, route);
-+ p = popen(buf, "r");
- pclose(p);
-+#endif /* Solaris */
- }
-Index: Makefile
-===================================================================
-RCS file: /cvsroot/pptpclient/pptp-linux/Makefile,v
-retrieving revision 1.47
-retrieving revision 1.49
-diff -u -r1.47 -r1.49
---- a/Makefile 14 May 2008 06:32:52 -0000 1.47
-+++ b/Makefile 24 Jul 2008 05:37:47 -0000 1.49
-@@ -1,10 +1,13 @@
--# $Id: Makefile,v 1.47 2008/05/14 06:32:52 quozl Exp $
-+# $Id: Makefile,v 1.49 2008/07/24 05:37:47 quozl Exp $
- VERSION=1.7.2
- RELEASE=
-
- #################################################################
--# CHANGE THIS LINE to point to the location of your pppd binary.
-+# CHANGE THIS LINE to point to the location of binaries
- PPPD = /usr/sbin/pppd
-+# Solaris
-+# PPPD = /usr/bin/pppd
-+IP = /bin/ip
- #################################################################
-
- BINDIR=$(DESTDIR)/usr/sbin
-@@ -47,6 +52,7 @@
- echo "/* text added by Makefile target config.h */" > config.h
- echo "#define PPTP_LINUX_VERSION \"$(VERSION)$(RELEASE)\"" >> config.h
- echo "#define PPPD_BINARY \"$(PPPD)\"" >> config.h
-+ echo "#define IP_BINARY \"$(IP)\"" >> config.h
-
- vector_test: vector_test.o vector.o
- $(CC) -o vector_test vector_test.o vector.o
diff --git a/pptp/patches/pptp-1.7.2-makedeps.patch b/pptp/patches/pptp-1.7.2-makedeps.patch
deleted file mode 100644
index 02b36cf6b..000000000
--- a/pptp/patches/pptp-1.7.2-makedeps.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-Index: Makefile
-===================================================================
-RCS file: /cvsroot/pptpclient/pptp-linux/Makefile,v
-retrieving revision 1.47
-retrieving revision 1.49
-diff -u -r1.47 -r1.49
---- a/Makefile 14 May 2008 06:32:52 -0000 1.47
-+++ b/Makefile 24 Jul 2008 05:37:47 -0000 1.49
-@@ -96,3 +102,71 @@
- release:
- cp pptp_$(VERSION)-0_i386.deb $(WEB)
- cd $(WEB);make
-+
-+# The following include file dependencies were generated using
-+# "makedepend -w0 *.c", then manually removing out of tree entries.
-+# DO NOT DELETE
-+
-+dirutil.o: dirutil.h
-+orckit_quirks.o: pptp_msg.h
-+orckit_quirks.o: pptp_compat.h
-+orckit_quirks.o: pptp_options.h
-+orckit_quirks.o: pptp_ctrl.h
-+orckit_quirks.o: util.h
-+ppp_fcs.o: ppp_fcs.h
-+ppp_fcs.o: pptp_compat.h
-+pptp.o: config.h
-+pptp.o: pptp_callmgr.h
-+pptp.o: pptp_gre.h
-+pptp.o: pptp_compat.h
-+pptp.o: version.h
-+pptp.o: inststr.h
-+pptp.o: util.h
-+pptp.o: pptp_quirks.h
-+pptp.o: pptp_msg.h
-+pptp.o: pptp_ctrl.h
-+pptp.o: pqueue.h
-+pptp.o: pptp_options.h
-+pptp_callmgr.o: pptp_callmgr.h
-+pptp_callmgr.o: pptp_ctrl.h
-+pptp_callmgr.o: pptp_compat.h
-+pptp_callmgr.o: pptp_msg.h
-+pptp_callmgr.o: dirutil.h
-+pptp_callmgr.o: vector.h
-+pptp_callmgr.o: util.h
-+pptp_callmgr.o: routing.h
-+pptp_compat.o: pptp_compat.h
-+pptp_compat.o: util.h
-+pptp_ctrl.o: pptp_msg.h
-+pptp_ctrl.o: pptp_compat.h
-+pptp_ctrl.o: pptp_ctrl.h
-+pptp_ctrl.o: pptp_options.h
-+pptp_ctrl.o: vector.h
-+pptp_ctrl.o: util.h
-+pptp_ctrl.o: pptp_quirks.h
-+pptp_gre.o: ppp_fcs.h
-+pptp_gre.o: pptp_compat.h
-+pptp_gre.o: pptp_msg.h
-+pptp_gre.o: pptp_gre.h
-+pptp_gre.o: util.h
-+pptp_gre.o: pqueue.h
-+pptp_gre.o: test.h
-+pptp_quirks.o: orckit_quirks.h
-+pptp_quirks.o: pptp_options.h
-+pptp_quirks.o: pptp_ctrl.h
-+pptp_quirks.o: pptp_compat.h
-+pptp_quirks.o: pptp_msg.h
-+pptp_quirks.o: pptp_quirks.h
-+pqueue.o: util.h
-+pqueue.o: pqueue.h
-+routing.o: routing.h
-+test.o: util.h
-+test.o: test.h
-+util.o: util.h
-+vector.o: pptp_ctrl.h
-+vector.o: pptp_compat.h
-+vector.o: vector.h
-+vector_test.o: vector.h
-+vector_test.o: pptp_ctrl.h
-+vector_test.o: pptp_compat.h
-+version.o: config.h
diff --git a/pptp/patches/pptp-1.7.2-pptpsetup-encrypt.patch b/pptp/patches/pptp-1.7.2-pptpsetup-encrypt.patch
deleted file mode 100644
index 6f7bfa5d0..000000000
--- a/pptp/patches/pptp-1.7.2-pptpsetup-encrypt.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/pptpsetup 2009-06-01 14:30:36.000000000 +0100
-+++ b/pptpsetup 2009-06-01 14:36:39.000000000 +0100
-@@ -43,12 +43,13 @@
- sub create {
- my $TUNNEL = shift;
-
-- # system checking
-- &Check_MPPE_in_kernel
-- or die "$0: couldn't find MPPE support in kernel.\n";
--
-- &Check_MPPE_in_pppd
-- or die "$0: couldn't find MPPE support in pppd.\n";
-+ # if encryption is requested, check for support in kernel and pppd
-+ if ( $ENCRYPT ) {
-+ &Check_MPPE_in_kernel
-+ or die "$0: couldn't find MPPE support in kernel.\n";
-+ &Check_MPPE_in_pppd
-+ or die "$0: couldn't find MPPE support in pppd.\n";
-+ }
-
- # input validation
- ($TUNNEL) = $TUNNEL =~ m{^(\w+)$}
diff --git a/pptp/patches/pptp-1.7.2-pptpsetup-mppe.patch b/pptp/patches/pptp-1.7.2-pptpsetup-mppe.patch
deleted file mode 100644
index c8668ea17..000000000
--- a/pptp/patches/pptp-1.7.2-pptpsetup-mppe.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- pptp-1.7.2/pptpsetup 2009-06-01 15:18:25.000000000 +0100
-+++ pptp-1.7.2/pptpsetup 2009-06-01 15:19:25.000000000 +0100
-@@ -43,14 +43,6 @@
- sub create {
- my $TUNNEL = shift;
-
-- # if encryption is requested, check for support in kernel and pppd
-- if ( $ENCRYPT ) {
-- &Check_MPPE_in_kernel
-- or die "$0: couldn't find MPPE support in kernel.\n";
-- &Check_MPPE_in_pppd
-- or die "$0: couldn't find MPPE support in pppd.\n";
-- }
--
- # input validation
- ($TUNNEL) = $TUNNEL =~ m{^(\w+)$}
- or die "$0: invalid tunnel name.\nTry '$0 --help' for more information.\n";
-@@ -180,29 +172,6 @@
- exit;
- }
-
--### AUXILIAR SUBS ###
--
--sub Check_MPPE_in_kernel {
-- my $command = q/modprobe ppp-compress-18/;
-- if (system( $command ) == 0) {
-- # no error!
-- return 1;
-- } else {
-- return 0;
-- }
--}
--
--sub Check_MPPE_in_pppd {
-- my $command = q/strings `which pppd`|grep -i mppe|wc --lines/;
-- my $answer = `$command`;
-- if ($answer > 0) {
-- # ok!
-- return 1;
-- } else {
-- return 0;
-- }
--}
--
- __END__
-
- =head1 NAME
diff --git a/pptp/patches/pptp-1.7.2-pptpsetup.patch b/pptp/patches/pptp-1.7.2-pptpsetup.patch
deleted file mode 100644
index c1d0638a5..000000000
--- a/pptp/patches/pptp-1.7.2-pptpsetup.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: pptpsetup
-===================================================================
-RCS file: /cvsroot/pptpclient/pptp-linux/pptpsetup,v
-retrieving revision 1.4
-diff -u -r1.4 pptpsetup
---- a/pptpsetup 2 Aug 2006 07:02:47 -0000 1.4
-+++ b/pptpsetup 25 Mar 2009 13:41:37 -0000
-@@ -154,6 +154,7 @@
-
- # delete entry from chap-secrets
- my $chap_file = '/etc/ppp/chap-secrets';
-+ my $mode = (stat($chap_file))[2] & 07777;
-
- open( FILE, $chap_file )
- or die "$0: can't read '$chap_file': $!\n";
-@@ -171,6 +172,7 @@
- # write new chap-secrets
- open( FILE, ">$chap_file" )
- or die "$0: can't write '$chap_file': $!\n";
-+ chmod $mode, $chap_file;
- print FILE $new_chap;
- close FILE;
-
diff --git a/pptp/patches/pptp-1.7.2-waitpid.patch b/pptp/patches/pptp-1.7.2-waitpid.patch
deleted file mode 100644
index ef042f1e1..000000000
--- a/pptp/patches/pptp-1.7.2-waitpid.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Tue Jun 15 15:02:28 2010 James Cameron <quozl(a)us.netrek.org>
-
- * pptp.c (open_callmgr): fix usage of status returned by waitpid;
- it must be wrapped by WEXITSTATUS to shift bits as required.
-
---- a/pptp.c 2010-06-15 14:35:20.265852021 +0100
-+++ b/pptp.c 2010-06-15 14:32:00.478100392 +0100
-@@ -475,7 +475,7 @@
- }
- default: /* parent */
- waitpid(pid, &status, 0);
-- if (status!= 0)
-+ if (WEXITSTATUS(status) != 0)
- fatal("Call manager exited with error %d", status);
- break;
- }
diff --git a/pptp/pptp.nm b/pptp/pptp.nm
deleted file mode 100644
index 2e614a58c..000000000
--- a/pptp/pptp.nm
+++ /dev/null
@@ -1,53 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = pptp
-version = 1.7.2
-release = 3
-
-groups = Networking/Dialin
-url = http://pptpclient.sourceforge.net/
-license = GPLv2+
-summary = Point-to-Point Tunneling Protocol (PPTP) Client.
-
-description
- Client for the proprietary Microsoft Point-to-Point Tunneling
- Protocol, PPTP. Allows connection to a PPTP based VPN as used
- by employers and some cable and ADSL service providers.
-end
-
-source_dl =
-sources = %{thisapp}.tar.gz
-
-build
- requires
- perl
- ppp-devel
- end
-
- prepare_cmds
- sed -i Makefile \
- -e "s/install -o root -m 555 pptp/install -m 755 pptp/" \
- -e "s/^OPTIMIZE=.*/OPTIMIZE=%{CFLAGS}/" \
- -e "s/^LDFLAGS =/LDFLAGS=%{LDFLAGS}/" \
- -e "s/^IP.*/IP=\/sbin\/ip/"
- end
-
- install_cmds
- rm -rvf %{BUILDROOT}/etc
- end
-end
-
-packages
- package %{name}
- requires
- iproute2
- end
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/pychecker/pychecker.nm b/pychecker/pychecker.nm
deleted file mode 100644
index b255c0aab..000000000
--- a/pychecker/pychecker.nm
+++ /dev/null
@@ -1,40 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = pychecker
-version = 0.8.19
-release = 2
-arch = noarch
-
-groups = Development/Debuggers
-url = http://pychecker.sourceforge.net
-license = BSD
-summary = A python source code checking tool.
-
-description
- PyChecker is a python source code checking tool to help you find
- common bugs. It is meant to find problems that are typically caught by
- a compiler.
-end
-
-source_dl =
-
-build
- requires
- python-devel
- end
-
- build
- python setup.py build
- end
-
- install
- python setup.py install --root=%{BUILDROOT}
- end
-end
-
-packages
- package %{name}
-end
diff --git a/pygpgme/pygpgme.nm b/pygpgme/pygpgme.nm
deleted file mode 100644
index f3facd7a1..000000000
--- a/pygpgme/pygpgme.nm
+++ /dev/null
@@ -1,44 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = pygpgme
-version = 0.3
-release = 1
-
-groups = Development/Languages
-url = http://cheeseshop.python.org/pypi/pygpgme
-license = LGPLv2+
-summary = Python module for working with OpenPGP messages.
-
-description
- PyGPGME is a Python module that lets you sign, verify, encrypt and decrypt
- files using the OpenPGP format. It is built on top of GNU Privacy Guard and
- the GPGME library.
-end
-
-source_dl = http://cheeseshop.python.org/packages/source/p/%{name}/
-
-build
- requires
- gpgme-devel
- python-devel
- end
-
- build
- python setup.py build
- end
-
- install
- python setup.py install --skip-build --root %{BUILDROOT}
- end
-end
-
-packages
- package %{name}
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/pyserial/pyserial.nm b/pyserial/pyserial.nm
deleted file mode 100644
index ba33766e8..000000000
--- a/pyserial/pyserial.nm
+++ /dev/null
@@ -1,36 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = pyserial
-version = 2.5
-release = 1
-arch = noarch
-
-groups = System/Libraries
-url = http://pyserial.sourceforge.net/
-license = Python
-summary = Python Serial Port Extension.
-
-description
- Python Serial Port Extension for Win32, Linux, BSD, Jython, IronPython.
-end
-
-source_dl =
-
-build
- requires
- python-devel
- end
-
- build = # Nothing to do
-
- install
- python setup.py install --root=%{BUILDROOT}
- end
-end
-
-packages
- package %{name}
-end
diff --git a/python-IPy/python-IPy.nm b/python-IPy/python-IPy.nm
deleted file mode 100644
index 345f4e33c..000000000
--- a/python-IPy/python-IPy.nm
+++ /dev/null
@@ -1,40 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = python-IPy
-version = 0.62
-release = 1
-arch = noarch
-thisapp = IPy-%{version}
-
-groups = System/Libraries
-url = http://software.inl.fr/trac/trac.cgi/wiki/IPy
-license = BSD
-summary = Python module for handling IPv4 and IPv6 Addresses and Networks.
-
-description
- IPy is a Python module for handling IPv4 and IPv6 Addresses and \
- Networks in a fashion similar to perl's Net::IP and friends. The IP \
- class allows a comfortable parsing and handling for most notations \
- in use for IPv4 and IPv6 Addresses and Networks.
-end
-
-source_dl =
-
-build
- requires
- python-devel
- end
-
- build = # Nothing to do
-
- install
- python setup.py install --root=%{BUILDROOT}
- end
-end
-
-packages
- package %{name}
-end
diff --git a/python-daemon/python-daemon.nm b/python-daemon/python-daemon.nm
deleted file mode 100644
index 5223094ac..000000000
--- a/python-daemon/python-daemon.nm
+++ /dev/null
@@ -1,44 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = python-daemon
-version = 1.6
-release = 1
-arch = noarch
-
-groups = System/Libraries
-url = http://pypi.python.org/pypi/python-daemon
-license = Python
-summary = Library to implement a well-behaved Unix daemon process.
-
-description
- This library implements the well-behaved daemon specification of PEP 3143,
- "Standard daemon process library".
-end
-
-source_dl = http://pypi.python.org/packages/source/p/python-daemon
-
-build
- requires
- python-devel
- python-setuptools
- end
-
- prepare_cmds
- sed -i -e '/^#!\//, 1d' daemon/version/version_info.py
- end
-
- build
- python setup.py build
- end
-
- install
- python setup.py install --root=%{BUILDROOT}
- end
-end
-
-packages
- package %{name}
-end
diff --git a/python-decorator/python-decorator.nm b/python-decorator/python-decorator.nm
deleted file mode 100644
index 6d1c5b874..000000000
--- a/python-decorator/python-decorator.nm
+++ /dev/null
@@ -1,43 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = python-decorator
-version = 3.1.2
-release = 1
-arch = noarch
-thisapp = decorator-%{version}
-
-groups = Development/Languages
-url = http://www.phyast.pitt.edu/~micheles/python/documentation.html
-license = BSD
-summary = Module to simplify usage of decorators.
-
-description
- The aim of the decorator module is to simplify the usage of decorators
- for the average programmer, and to popularize decorators usage giving
- examples of useful decorators, such as memoize, tracing,
- redirecting_stdout, locked, etc. The core of this module is a
- decorator factory called decorator.
-end
-
-source_dl =
-
-build
- requires
- python
- end
-
- build
- python setup.py build
- end
-
- install
- python setup.py install --skip-build --root=%{BUILDROOT}
- end
-end
-
-packages
- package %{name}
-end
diff --git a/python-distutils-extra/python-distutils-extra.nm b/python-distutils-extra/python-distutils-extra.nm
deleted file mode 100644
index 3cb316345..000000000
--- a/python-distutils-extra/python-distutils-extra.nm
+++ /dev/null
@@ -1,40 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = python-distutils-extra
-version = 2.25
-release = 1
-arch = noarch
-
-groups = System/Libraries
-url = https://launchpad.net/python-distutils-extra
-license = GPLv2+
-summary = Integrate more support into Python's distutils.
-
-description
- Enables you to easily integrate gettext support, themed icons and
- scrollkeeper based documentation into Python's distutils.
-end
-
-source_dl =
-
-build
- requires
- python-devel
- python-setuptools
- end
-
- build
- python setup.py build
- end
-
- install
- python setup.py install --root=%{BUILDROOT}
- end
-end
-
-packages
- package %{name}
-end
diff --git a/python-m2crypto/python-m2crypto.nm b/python-m2crypto/python-m2crypto.nm
deleted file mode 100644
index 1a6321775..000000000
--- a/python-m2crypto/python-m2crypto.nm
+++ /dev/null
@@ -1,46 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = python-m2crypto
-version = 0.21.1
-release = 1
-
-groups = Development/Libraries
-url = http://wiki.osafoundation.org/bin/view/Projects/MeTooCrypto
-license = MIT
-summary = Support for using OpenSSL in python scripts.
-
-description
- This package allows you to call OpenSSL functions from python scripts.
-end
-
-thisapp = M2Crypto-%{version}
-
-source_dl =
-
-build
- requires
- python-devel
- openssl-devel
- swig
- end
-
- build
- CFLAGS="%{CFLAGS}" python setup.py build
- end
-
- install
- python setup.py install --skip-build --root=%{BUILDROOT}
- end
-end
-
-packages
- package %{name}
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/python-netfilter_conntrack/python-netfilter_conntrack.nm b/python-netfilter_conntrack/python-netfilter_conntrack.nm
deleted file mode 100644
index 8740400a9..000000000
--- a/python-netfilter_conntrack/python-netfilter_conntrack.nm
+++ /dev/null
@@ -1,44 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = python-netfilter_conntrack
-version = 0.4.2
-release = 1
-thisapp = pynetfilter_conntrack-%{version}
-
-groups = System/Libraries
-url = http://software.inl.fr/trac/wiki/pynetfilter_conntrack
-license =
-summary = Python binding of libnetfilter_conntrack.
-
-description
- This python library is based on libnetfilter_conntrack, which lets
- you manipulate conntrack objects. In other words,
- pynetfilter_conntrack lets you deal with Netfilter's stateful
- inspection objects from the Python world.
-end
-
-source_dl =
-
-build
- requires
- libnetfilter_conntrack-devel
- python-devel
- end
-
- build = # Nothing to do
-
- install
- python setup.py install --root=%{BUILDROOT}
- end
-end
-
-packages
- package %{name}
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/python-piksemel/python-piksemel.nm b/python-piksemel/python-piksemel.nm
deleted file mode 100644
index 366a6e365..000000000
--- a/python-piksemel/python-piksemel.nm
+++ /dev/null
@@ -1,48 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = python-piksemel
-version = 1.3.1
-release = 1
-thisapp = piksemel-%{version}
-
-groups = Development/Languages
-url = http://cekirdek.pardus.org.tr/~bahadir/piksemel/
-license = GPLv2+
-summary = A python XML parser.
-
-description
- Piksemel is a easy to use python XML parser, based on iksemel.
-end
-
-source_dl =
-
-build
- requires
- python-devel
- end
-
- build
- python setup.py build
- end
-
- test
- # Create symlink for testsuite to find the compiled module.
- cd %{DIR_APP}/tests && ln -s ../build/lib.*/piksemel.so piksemel.so
- cd %{DIR_APP} && python setup.py test
- end
-
- install
- python setup.py install --root=%{BUILDROOT}
- end
-end
-
-packages
- package %{name}
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/python-progressbar/patches/progressbar-interrupt.patch b/python-progressbar/patches/progressbar-interrupt.patch
deleted file mode 100644
index d2727221a..000000000
--- a/python-progressbar/patches/progressbar-interrupt.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: progressbar-2.3/progressbar/__init__.py
-===================================================================
---- progressbar-2.3.orig/progressbar/__init__.py
-+++ progressbar-2.3/progressbar/__init__.py
-@@ -141,6 +141,7 @@ class ProgressBar(object):
- try:
- self._handle_resize()
- signal.signal(signal.SIGWINCH, self._handle_resize)
-+ signal.siginterrupt(signal.SIGWINCH, False)
- self.signal_set = True
- except (SystemExit, KeyboardInterrupt): raise
- except:
diff --git a/python-progressbar/python-progressbar.nm b/python-progressbar/python-progressbar.nm
deleted file mode 100644
index 52871c0e4..000000000
--- a/python-progressbar/python-progressbar.nm
+++ /dev/null
@@ -1,42 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = python-progressbar
-version = 2.3
-release = 1
-arch = noarch
-thisapp = progressbar-%{version}
-
-groups = System/Libraries
-url = http://code.google.com/p/python-progressbar/
-license = LGPLv2+
-summary = Text progressbar library for python.
-
-description
- This library provides a text mode progress bar. This is typically used to
- display the progress of a long running operation, providing a visual clue that
- processing is under way.
-end
-
-source_dl = https://%{name}.googlecode.com/files/
-
-build
- requires
- python-setuptools
- python-devel
- end
-
- build
- python setup.py build
- end
-
- install
- python setup.py install --root=%{BUILDROOT}
- end
-end
-
-packages
- package %{name}
-end
diff --git a/python-pyaspects/python-pyaspects.nm b/python-pyaspects/python-pyaspects.nm
deleted file mode 100644
index db3422cb6..000000000
--- a/python-pyaspects/python-pyaspects.nm
+++ /dev/null
@@ -1,43 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = python-pyaspects
-version = 0.4.1
-release = 1
-thisapp = pyaspects-%{version}
-
-groups = Development/Languages
-url = http://github.com/baris/pyaspects/downloads
-license = GPLv2+
-summary = Module to provide aspect-oriented programming.
-
-description
- PyAspects is a project to ease aspect-oriented programming
- in Python language.
-end
-
-source_dl =
-
-build
- requires
- python-devel
- end
-
- build
- python setup.py build
- end
-
- install
- python setup.py install --root=%{BUILDROOT}
- end
-end
-
-packages
- package %{name}
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/python-pycurl/patches/0001-No-longer-keep-copies-of-string-options-since-this-i.patch b/python-pycurl/patches/0001-No-longer-keep-copies-of-string-options-since-this-i.patch
deleted file mode 100644
index bfbe215e7..000000000
--- a/python-pycurl/patches/0001-No-longer-keep-copies-of-string-options-since-this-i.patch
+++ /dev/null
@@ -1,200 +0,0 @@
-From 05433632fb1ccdabc1d29d78f32bc35de0a8638b Mon Sep 17 00:00:00 2001
-From: kjetilja <kjetilja>
-Date: Mon, 29 Sep 2008 10:56:57 +0000
-Subject: [PATCH 1/5] No longer keep copies of string options since this is managed by libcurl
-
-Signed-off-by: Kamil Dudka <kdudka(a)redhat.com>
----
- ChangeLog | 12 +++++++++-
- src/pycurl.c | 60 +--------------------------------------------------------
- 2 files changed, 12 insertions(+), 60 deletions(-)
-
-diff --git a/ChangeLog b/ChangeLog
-index 0fb7f8c..618654d 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,7 +1,15 @@
--Version 7.19.0 [requires libcurl-7.19.0 or better]
-+Version 7.19.1 [requires libcurl-7.19.0 or better]
- --------------
-
-- * Added CURLFILE, ADDRESS_SCOPE and ISSUERCERT options,
-+ * No longer keep string options copies in the
-+ Curl Python objects, since string options are
-+ now managed by libcurl.
-+
-+
-+Version 7.19.0
-+--------------
-+
-+ * Added CURLFILE, ADDRESS_SCOPE and ISSUERCERT options,
- as well as the APPCONNECT_TIME info.
-
- * Added PRIMARY_IP info (patch by
-diff --git a/src/pycurl.c b/src/pycurl.c
-index a17a23b..6de1514 100644
---- a/src/pycurl.c
-+++ b/src/pycurl.c
-@@ -1,4 +1,4 @@
--/* $Id: pycurl.c,v 1.147 2008/09/09 17:40:34 kjetilja Exp $ */
-+/* $Id: pycurl.c,v 1.148 2008/09/29 10:56:57 kjetilja Exp $ */
-
- /* PycURL -- cURL Python module
- *
-@@ -97,12 +97,6 @@ static void pycurl_ssl_cleanup(void);
- /* Calculate the number of OBJECTPOINT options we need to store */
- #define OPTIONS_SIZE ((int)CURLOPT_LASTENTRY % 10000)
- #define MOPTIONS_SIZE ((int)CURLMOPT_LASTENTRY % 10000)
--static int OPT_INDEX(int o)
--{
-- assert(o >= CURLOPTTYPE_OBJECTPOINT);
-- assert(o < CURLOPTTYPE_OBJECTPOINT + OPTIONS_SIZE);
-- return o - CURLOPTTYPE_OBJECTPOINT;
--}
-
- /* Type objects */
- static PyObject *ErrorObject = NULL;
-@@ -161,7 +155,6 @@ typedef struct {
- PyObject *writedata_fp;
- PyObject *writeheader_fp;
- /* misc */
-- void *options[OPTIONS_SIZE]; /* for OBJECTPOINT options */
- char error[CURL_ERROR_SIZE+1];
- } CurlObject;
-
-@@ -741,7 +734,6 @@ util_curl_new(void)
- self->writeheader_fp = NULL;
-
- /* Zero string pointer memory buffer used by setopt */
-- memset(self->options, 0, sizeof(self->options));
- memset(self->error, 0, sizeof(self->error));
-
- return self;
-@@ -804,7 +796,6 @@ do_curl_new(PyObject *dummy)
- free(s);
- goto error;
- }
-- self->options[ OPT_INDEX(CURLOPT_USERAGENT) ] = s; s = NULL;
-
- /* Success - return new object */
- return self;
-@@ -872,7 +863,6 @@ static void
- util_curl_close(CurlObject *self)
- {
- CURL *handle;
-- int i;
-
- /* Zero handle and thread-state to disallow any operations to be run
- * from now on */
-@@ -916,16 +906,6 @@ util_curl_close(CurlObject *self)
- SFREE(self->postquote);
- SFREE(self->prequote);
- #undef SFREE
--
-- /* Last, free the options. This must be done after the curl handle
-- * is closed since libcurl assumes that some options are valid when
-- * invoking curl_easy_cleanup(). */
-- for (i = 0; i < OPTIONS_SIZE; i++) {
-- if (self->options[i] != NULL) {
-- free(self->options[i]);
-- self->options[i] = NULL;
-- }
-- }
- }
-
-
-@@ -1424,8 +1404,6 @@ verbose_error:
- static PyObject*
- do_curl_reset(CurlObject *self)
- {
-- unsigned int i;
--
- curl_easy_reset(self->handle);
-
- /* Decref callbacks and file handles */
-@@ -1443,15 +1421,6 @@ do_curl_reset(CurlObject *self)
- SFREE(self->postquote);
- SFREE(self->prequote);
- #undef SFREE
--
-- /* Last, free the options */
-- for (i = 0; i < OPTIONS_SIZE; i++) {
-- if (self->options[i] != NULL) {
-- free(self->options[i]);
-- self->options[i] = NULL;
-- }
-- }
--
- return Py_None;
- }
-
-@@ -1461,7 +1430,6 @@ static PyObject *
- util_curl_unsetopt(CurlObject *self, int option)
- {
- int res;
-- int opt_index = -1;
-
- #define SETOPT2(o,x) \
- if ((res = curl_easy_setopt(self->handle, (o), (x))) != CURLE_OK) goto error
-@@ -1502,7 +1470,6 @@ util_curl_unsetopt(CurlObject *self, int option)
- case CURLOPT_SSL_CIPHER_LIST:
- case CURLOPT_USERPWD:
- SETOPT((char *) 0);
-- opt_index = OPT_INDEX(option);
- break;
-
- /* info: we explicitly list unsupported options here */
-@@ -1512,11 +1479,6 @@ util_curl_unsetopt(CurlObject *self, int option)
- return NULL;
- }
-
-- if (opt_index >= 0 && self->options[opt_index] != NULL) {
-- free(self->options[opt_index]);
-- self->options[opt_index] = NULL;
-- }
--
- Py_INCREF(Py_None);
- return Py_None;
-
-@@ -1587,8 +1549,6 @@ do_curl_setopt(CurlObject *self, PyObject *args)
- if (PyString_Check(obj)) {
- char *str = NULL;
- Py_ssize_t len = -1;
-- char *buf;
-- int opt_index;
-
- /* Check that the option specified a string as well as the input */
- switch (option) {
-@@ -1651,28 +1611,12 @@ do_curl_setopt(CurlObject *self, PyObject *args)
- }
- /* Allocate memory to hold the string */
- assert(str != NULL);
-- if (len <= 0)
-- buf = strdup(str);
-- else {
-- buf = (char *) malloc(len);
-- if (buf) memcpy(buf, str, len);
-- }
-- if (buf == NULL)
-- return PyErr_NoMemory();
- /* Call setopt */
-- res = curl_easy_setopt(self->handle, (CURLoption)option, buf);
-+ res = curl_easy_setopt(self->handle, (CURLoption)option, str);
- /* Check for errors */
- if (res != CURLE_OK) {
-- free(buf);
- CURLERROR_RETVAL();
- }
-- /* Save allocated option buffer */
-- opt_index = OPT_INDEX(option);
-- if (self->options[opt_index] != NULL) {
-- free(self->options[opt_index]);
-- self->options[opt_index] = NULL;
-- }
-- self->options[opt_index] = buf;
- Py_INCREF(Py_None);
- return Py_None;
- }
---
-1.7.1
-
diff --git a/python-pycurl/patches/0002-Fixes-https-sourceforge.net-tracker-func-detail-aid-.patch b/python-pycurl/patches/0002-Fixes-https-sourceforge.net-tracker-func-detail-aid-.patch
deleted file mode 100644
index 522087c3e..000000000
--- a/python-pycurl/patches/0002-Fixes-https-sourceforge.net-tracker-func-detail-aid-.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 009e170d2838346461ff0b31b0afa44f3d6278f3 Mon Sep 17 00:00:00 2001
-From: zanee <zanee>
-Date: Fri, 23 Apr 2010 16:06:41 +0000
-Subject: [PATCH 2/5] Fixes https://sourceforge.net/tracker/?func=detail&aid=2812016&group_id=28236&ati… with applied patch from sourceforge user dbprice1.
-
-Signed-off-by: Kamil Dudka <kdudka(a)redhat.com>
----
- setup.py | 23 ++++++++++++++++++-----
- 1 files changed, 18 insertions(+), 5 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 0ffd9d2..76b9d58 100644
---- a/setup.py
-+++ b/setup.py
-@@ -1,7 +1,7 @@
- #! /usr/bin/env python
- # -*- coding: iso-8859-1 -*-
- # vi:ts=4:et
--# $Id: setup.py,v 1.150 2008/09/09 17:40:34 kjetilja Exp $
-+# $Id: setup.py,v 1.151 2010/04/23 16:06:41 zanee Exp $
-
- """Setup script for the PycURL module distribution."""
-
-@@ -9,7 +9,7 @@ PACKAGE = "pycurl"
- PY_PACKAGE = "curl"
- VERSION = "7.19.0"
-
--import glob, os, re, sys, string
-+import glob, os, re, sys, string, subprocess
- import distutils
- from distutils.core import setup
- from distutils.extension import Extension
-@@ -96,9 +96,22 @@ else:
- include_dirs.append(e[2:])
- else:
- extra_compile_args.append(e)
-- libs = split_quoted(
-- os.popen("'%s' --libs" % CURL_CONFIG).read()+\
-- os.popen("'%s' --static-libs" % CURL_CONFIG).read())
-+
-+ # Run curl-config --libs and --static-libs. Some platforms may not
-+ # support one or the other of these curl-config options, so gracefully
-+ # tolerate failure of either, but not both.
-+ optbuf = ""
-+ for option in ["--libs", "--static-libs"]:
-+ p = subprocess.Popen("'%s' %s" % (CURL_CONFIG, option), shell=True,
-+ stdout=subprocess.PIPE)
-+ (stdout, stderr) = p.communicate()
-+ if p.wait() == 0:
-+ optbuf += stdout
-+ if optbuf == "":
-+ raise Exception, ("Neither of curl-config --libs or --static-libs" +
-+ "produced output")
-+ libs = split_quoted(optbuf)
-+
- for e in libs:
- if e[:2] == "-l":
- libraries.append(e[2:])
---
-1.7.1
-
diff --git a/python-pycurl/patches/0003-Fixes-refcount-bug-and-provides-better-organization-.patch b/python-pycurl/patches/0003-Fixes-refcount-bug-and-provides-better-organization-.patch
deleted file mode 100644
index 80c600ef4..000000000
--- a/python-pycurl/patches/0003-Fixes-refcount-bug-and-provides-better-organization-.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-From 4a377e2d60fb903e91a370595a6ea22cb7ee0e0e Mon Sep 17 00:00:00 2001
-From: zanee <zanee>
-Date: Wed, 28 Apr 2010 16:02:41 +0000
-Subject: [PATCH 3/5 v2] Fixes refcount bug and provides better organization of PyCurl object. Submitted by dbprice1.
-
-https://sourceforge.net/tracker/?func=detail&aid=2893665&group_id=28236&atid=392777
-
-Signed-off-by: Kamil Dudka <kdudka(a)redhat.com>
----
- src/pycurl.c | 88 +++++++++++++++++++++++++++++++++++++--------------------
- 1 files changed, 57 insertions(+), 31 deletions(-)
-
-diff --git a/src/pycurl.c b/src/pycurl.c
-index 6de1514..32c7ca5 100644
---- a/src/pycurl.c
-+++ b/src/pycurl.c
-@@ -1,4 +1,4 @@
--/* $Id: pycurl.c,v 1.148 2008/09/29 10:56:57 kjetilja Exp $ */
-+/* $Id: pycurl.c,v 1.149 2010/04/28 16:02:41 zanee Exp $ */
-
- /* PycURL -- cURL Python module
- *
-@@ -739,64 +739,80 @@ util_curl_new(void)
- return self;
- }
-
--
--/* constructor - this is a module-level function returning a new instance */
--static CurlObject *
--do_curl_new(PyObject *dummy)
-+/* initializer - used to intialize curl easy handles for use with pycurl */
-+static int
-+util_curl_init(CurlObject *self)
- {
-- CurlObject *self = NULL;
- int res;
- char *s = NULL;
-
-- UNUSED(dummy);
--
-- /* Allocate python curl object */
-- self = util_curl_new();
-- if (self == NULL)
-- return NULL;
--
-- /* Initialize curl handle */
-- self->handle = curl_easy_init();
-- if (self->handle == NULL)
-- goto error;
--
- /* Set curl error buffer and zero it */
- res = curl_easy_setopt(self->handle, CURLOPT_ERRORBUFFER, self->error);
-- if (res != CURLE_OK)
-- goto error;
-+ if (res != CURLE_OK) {
-+ return (-1);
-+ }
- memset(self->error, 0, sizeof(self->error));
-
- /* Set backreference */
- res = curl_easy_setopt(self->handle, CURLOPT_PRIVATE, (char *) self);
-- if (res != CURLE_OK)
-- goto error;
-+ if (res != CURLE_OK) {
-+ return (-1);
-+ }
-
- /* Enable NOPROGRESS by default, i.e. no progress output */
- res = curl_easy_setopt(self->handle, CURLOPT_NOPROGRESS, (long)1);
-- if (res != CURLE_OK)
-- goto error;
-+ if (res != CURLE_OK) {
-+ return (-1);
-+ }
-
- /* Disable VERBOSE by default, i.e. no verbose output */
- res = curl_easy_setopt(self->handle, CURLOPT_VERBOSE, (long)0);
-- if (res != CURLE_OK)
-- goto error;
-+ if (res != CURLE_OK) {
-+ return (-1);
-+ }
-
- /* Set FTP_ACCOUNT to NULL by default */
- res = curl_easy_setopt(self->handle, CURLOPT_FTP_ACCOUNT, NULL);
-- if (res != CURLE_OK)
-- goto error;
-+ if (res != CURLE_OK) {
-+ return (-1);
-+ }
-
- /* Set default USERAGENT */
- s = (char *) malloc(7 + strlen(LIBCURL_VERSION) + 1);
-- if (s == NULL)
-- goto error;
-+ if (s == NULL) {
-+ return (-1);
-+ }
- strcpy(s, "PycURL/"); strcpy(s+7, LIBCURL_VERSION);
- res = curl_easy_setopt(self->handle, CURLOPT_USERAGENT, (char *) s);
- if (res != CURLE_OK) {
- free(s);
-- goto error;
-+ return (-1);
- }
-+ return (0);
-+}
-+
-+/* constructor - this is a module-level function returning a new instance */
-+static CurlObject *
-+do_curl_new(PyObject *dummy)
-+{
-+ CurlObject *self = NULL;
-+ int res;
-+
-+ UNUSED(dummy);
-+
-+ /* Allocate python curl object */
-+ self = util_curl_new();
-+ if (self == NULL)
-+ return NULL;
-+
-+ /* Initialize curl handle */
-+ self->handle = curl_easy_init();
-+ if (self->handle == NULL)
-+ goto error;
-
-+ res = util_curl_init(self);
-+ if (res < 0)
-+ goto error;
- /* Success - return new object */
- return self;
-
-@@ -1404,6 +1420,8 @@ verbose_error:
- static PyObject*
- do_curl_reset(CurlObject *self)
- {
-+ int res;
-+
- curl_easy_reset(self->handle);
-
- /* Decref callbacks and file handles */
-@@ -1421,6 +1439,14 @@ do_curl_reset(CurlObject *self)
- SFREE(self->postquote);
- SFREE(self->prequote);
- #undef SFREE
-+ res = util_curl_init(self);
-+ if (res < 0) {
-+ Py_DECREF(self); /* this also closes self->handle */
-+ PyErr_SetString(ErrorObject, "resetting curl failed");
-+ return NULL;
-+ }
-+
-+ Py_INCREF(Py_None);
- return Py_None;
- }
-
---
-1.7.1
-
diff --git a/python-pycurl/patches/0004-Test-for-reset-fixes-refcount-bug.patch b/python-pycurl/patches/0004-Test-for-reset-fixes-refcount-bug.patch
deleted file mode 100644
index 614484246..000000000
--- a/python-pycurl/patches/0004-Test-for-reset-fixes-refcount-bug.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 206c15ea32e05ae98827d00626a101e33a7bec70 Mon Sep 17 00:00:00 2001
-From: zanee <zanee>
-Date: Wed, 28 Apr 2010 16:03:40 +0000
-Subject: [PATCH 4/5] Test for reset fixes refcount bug
-
-Signed-off-by: Kamil Dudka <kdudka(a)redhat.com>
----
- tests/test_reset.py | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 74 insertions(+), 0 deletions(-)
- create mode 100644 tests/test_reset.py
-
-diff --git a/tests/test_reset.py b/tests/test_reset.py
-new file mode 100644
-index 0000000..c350d17
---- /dev/null
-+++ b/tests/test_reset.py
-@@ -0,0 +1,74 @@
-+#!/usr/bin/python
-+
-+import sys
-+import pycurl
-+
-+saw_error = 1
-+
-+def main():
-+ global saw_error
-+
-+ pycurl.global_init(pycurl.GLOBAL_DEFAULT)
-+
-+ outf = file("/dev/null", "rb+")
-+ cm = pycurl.CurlMulti()
-+
-+ # Set multi handle's options
-+ cm.setopt(pycurl.M_PIPELINING, 1)
-+
-+ eh = pycurl.Curl()
-+
-+ for x in range(1, 20):
-+
-+ eh.setopt(pycurl.WRITEDATA, outf)
-+ eh.setopt(pycurl.URL, sys.argv[1])
-+ cm.add_handle(eh)
-+
-+ while 1:
-+ ret, active_handles = cm.perform()
-+ if ret != pycurl.E_CALL_MULTI_PERFORM:
-+ break
-+
-+ while active_handles:
-+ ret = cm.select(1.0)
-+ if ret == -1:
-+ continue
-+ while 1:
-+ ret, active_handles = cm.perform()
-+ if ret != pycurl.E_CALL_MULTI_PERFORM:
-+ break
-+
-+ count, good, bad = cm.info_read()
-+
-+ for h, en, em in bad:
-+ print "Transfer to %s failed with %d, %s\n" % \
-+ (h.getinfo(pycurl.EFFECTIVE_URL), en, em)
-+ raise RuntimeError
-+
-+ for h in good:
-+ httpcode = h.getinfo(pycurl.RESPONSE_CODE)
-+ if httpcode != 200:
-+ print "Transfer to %s failed with code %d\n" %\
-+ (h.getinfo(pycurl.EFFECTIVE_URL), httpcode)
-+ raise RuntimeError
-+
-+ else:
-+ print "Recd %d bytes from %s" % \
-+ (h.getinfo(pycurl.SIZE_DOWNLOAD),
-+ h.getinfo(pycurl.EFFECTIVE_URL))
-+
-+ cm.remove_handle(eh)
-+ eh.reset()
-+
-+ eh.close()
-+ cm.close()
-+ outf.close()
-+
-+ pycurl.global_cleanup()
-+
-+
-+if __name__ == '__main__':
-+ if len(sys.argv) != 2:
-+ print "Usage: %s <url>" % sys.argv[0]
-+ sys.exit(2)
-+ main()
---
-1.7.1
-
diff --git a/python-pycurl/patches/0005-Updating-ChangeLog-with-relevant-changes.patch b/python-pycurl/patches/0005-Updating-ChangeLog-with-relevant-changes.patch
deleted file mode 100644
index dd8d8033e..000000000
--- a/python-pycurl/patches/0005-Updating-ChangeLog-with-relevant-changes.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From d075bfb8a5207f933a5a704becd7f64e8521dc28 Mon Sep 17 00:00:00 2001
-From: zanee <zanee>
-Date: Tue, 4 May 2010 18:47:08 +0000
-Subject: [PATCH 5/5] Updating ChangeLog with relevant changes
-
-Signed-off-by: Kamil Dudka <kdudka(a)redhat.com>
----
- ChangeLog | 11 +++++++++++
- 1 files changed, 11 insertions(+), 0 deletions(-)
-
-diff --git a/ChangeLog b/ChangeLog
-index 618654d..885c8b0 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,14 @@
-+Version 7.19.2
-+--------------
-+
-+ * Cleaned up website
-+
-+ * Fix pycurl.reset() (patch by <johansen at sun.com>).
-+
-+ * Fix install routine in setup.py where
-+ certain platforms (Solaris, Mac OSX, etc)
-+ would search for a static copy of libcurl (dbp)
-+
- Version 7.19.1 [requires libcurl-7.19.0 or better]
- --------------
-
---
-1.7.1
-
diff --git a/python-pycurl/patches/0101-setup.py-do-not-use-curl-config-static-libs.patch b/python-pycurl/patches/0101-setup.py-do-not-use-curl-config-static-libs.patch
deleted file mode 100644
index ce8c2df93..000000000
--- a/python-pycurl/patches/0101-setup.py-do-not-use-curl-config-static-libs.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 0796c0530648ae0e741a20a78d1fcf315783c178 Mon Sep 17 00:00:00 2001
-From: Kamil Dudka <kdudka(a)redhat.com>
-Date: Mon, 25 Feb 2013 19:48:22 +0100
-Subject: [PATCH 1/2] setup.py: do not use curl-config --static-libs
-
----
- setup.py | 5 ++---
- 1 files changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 76b9d58..86a2951 100644
---- a/setup.py
-+++ b/setup.py
-@@ -101,15 +101,14 @@ else:
- # support one or the other of these curl-config options, so gracefully
- # tolerate failure of either, but not both.
- optbuf = ""
-- for option in ["--libs", "--static-libs"]:
-+ for option in ["--libs"]:
- p = subprocess.Popen("'%s' %s" % (CURL_CONFIG, option), shell=True,
- stdout=subprocess.PIPE)
- (stdout, stderr) = p.communicate()
- if p.wait() == 0:
- optbuf += stdout
- if optbuf == "":
-- raise Exception, ("Neither of curl-config --libs or --static-libs" +
-- "produced output")
-+ raise Exception, ("curl-config --libs did not produce output")
- libs = split_quoted(optbuf)
-
- for e in libs:
---
-1.7.1
-
diff --git a/python-pycurl/patches/0102-test_internals.py-add-a-test-for-ref-counting-of-res.patch b/python-pycurl/patches/0102-test_internals.py-add-a-test-for-ref-counting-of-res.patch
deleted file mode 100644
index 7d3d53499..000000000
--- a/python-pycurl/patches/0102-test_internals.py-add-a-test-for-ref-counting-of-res.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 0bd83ea6c820db26f98936e6e017d39fb214cbd0 Mon Sep 17 00:00:00 2001
-From: Kamil Dudka <kdudka(a)redhat.com>
-Date: Mon, 25 Feb 2013 19:50:18 +0100
-Subject: [PATCH 2/2] test_internals.py: add a test for ref-counting of reset()
-
----
- tests/test_internals.py | 5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-diff --git a/tests/test_internals.py b/tests/test_internals.py
-index afcc53d..d026952 100644
---- a/tests/test_internals.py
-+++ b/tests/test_internals.py
-@@ -245,6 +245,11 @@ if 1 and gc:
- if opts.verbose >= 1:
- print "Tracked objects:", len(gc.get_objects())
-
-+if 1:
-+ # Ensure that the refcounting error in "reset" is fixed:
-+ for i in xrange(100000):
-+ c = Curl()
-+ c.reset()
-
- # /***********************************************************************
- # // done
---
-1.7.1
-
diff --git a/python-pycurl/python-pycurl.nm b/python-pycurl/python-pycurl.nm
deleted file mode 100644
index 3c0f5363b..000000000
--- a/python-pycurl/python-pycurl.nm
+++ /dev/null
@@ -1,64 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = python-pycurl
-version = 7.19.0
-release = 5
-thisapp = pycurl-%{version}
-
-groups = Development/Languages
-url = http://pycurl.sourceforge.net/
-license = LGPLv2+ or MIT
-summary = A Python interface to libcurl.
-
-description
- PycURL is a Python interface to libcurl. PycURL can be used to fetch
- objects identified by a URL from a Python program, similar to the
- urllib Python module. PycURL is mature, very fast, and supports a lot
- of features.
-end
-
-source_dl = http://pycurl.sourceforge.net/download/
-
-build
- requires
- libcurl-devel
- openssl-devel
- python-devel
- end
-
- CFLAGS += -DHAVE_CURL_OPENSSL
-
- build
- python setup.py build
- end
-
- test
- PYTHONPATH=$PWD/build/lib* python tests/test_internals.py -q
- end
-
- install
- python setup.py install --skip-build -O1 \
- --root=%{BUILDROOT}
- rm -rf %{BUILDROOT}/usr/share/doc/pycurl
- end
-end
-
-packages
- package %{name}
- # During its initialization, PycURL checks that the actual libcurl version
- # is not lower than the one used when PycURL was built.
- # Yes, that should be handled by library versioning (which would then get
- # automatically reflected).
- # For now, we have to reflect that dependency.
- requires
- libcurl >= %(curl-config --version | awk '{ print $NF }')
- end
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/python-rrdtool/python-rrdtool.nm b/python-rrdtool/python-rrdtool.nm
deleted file mode 100644
index 68045f077..000000000
--- a/python-rrdtool/python-rrdtool.nm
+++ /dev/null
@@ -1,43 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = python-rrdtool
-version = 0.1.5
-release = 1
-
-groups = System/Libraries
-url = https://github.com/commx/python-rrdtool
-license = LGPLv3+
-summary = Python bindings for rrdtool
-
-description
- Python bindings for RRDtool with a native C extension and an
- object-oriented way to work with Round Robin Databases.
-end
-
-source_dl = https://github.com/commx/python-rrdtool/archive/v%{version}.tar.gz#/
-
-build
- requires
- python3-devel >= 3.4
- rrdtool-devel
- end
-
- build
- python3 setup.py build
- end
-
- install
- python3 setup.py install --root=%{BUILDROOT}
- end
-end
-
-packages
- package python3-rrdtool
-
- package python3-rrdtool-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/python-urlgrabber/python-urlgrabber.nm b/python-urlgrabber/python-urlgrabber.nm
deleted file mode 100644
index 171c836f9..000000000
--- a/python-urlgrabber/python-urlgrabber.nm
+++ /dev/null
@@ -1,49 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = python-urlgrabber
-version = 3.10.1
-release = 1
-arch = noarch
-thisapp = urlgrabber-%{version}
-
-groups = System/Libraries
-url = http://urlgrabber.baseurl.org/
-license = LGPLv2+
-summary = A high-level cross-protocol url-grabber.
-
-description
- A high-level cross-protocol url-grabber for python supporting HTTP,
- FTP and file locations. Features include keepalive, byte ranges,
- throttling, authentication, proxies and more.
-end
-
-source_dl = http://urlgrabber.baseurl.org/download/
-
-build
- requires
- python-devel
- python-pycurl
- end
-
- prepare_cmds
- # Move everything from /usr/libexec to /usr/lib/urlgrabber.
- find . -type f | xargs sed -i "s@libexec@lib/urlgrabber@g"
- end
-
- build = # Nothing to do
-
- install
- python setup.py install --root=%{BUILDROOT}
- end
-end
-
-packages
- package %{name}
- requires
- python-pycurl
- end
- end
-end
diff --git a/python-yaml/python-yaml.nm b/python-yaml/python-yaml.nm
deleted file mode 100644
index 9e777463b..000000000
--- a/python-yaml/python-yaml.nm
+++ /dev/null
@@ -1,45 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = python-yaml
-version = 5.1
-release = 1
-
-groups = Development/Libraries
-url = https://pyyaml.org/wiki/PyYAML
-license = MIT
-summary = PyYAML is a YAML parser and emitter for Python.
-
-description
- PyYAML is a YAML parser and emitter for the Python programming language.
-end
-
-source_dl = http://pyyaml.org/download/pyyaml/
-sources = PyYAML-%{version}.tar.gz
-
-build
- requires
- libyaml-devel
- python-devel
- end
-
- DIR_APP = %{DIR_SRC}/PyYAML-%{version}
-
- build
- python setup.py build
- end
-
- install
- python setup.py install --root=%{BUILDROOT}
- end
-end
-
-packages
- package %{name}
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/pyxattr/pyxattr.nm b/pyxattr/pyxattr.nm
deleted file mode 100644
index 9345fa6bf..000000000
--- a/pyxattr/pyxattr.nm
+++ /dev/null
@@ -1,44 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = pyxattr
-version = 0.5.0
-release = 1
-
-groups = Development/Libraries
-url = http://pyxattr.sourceforge.net/
-license = LGPLv2+
-summary = Extended attributes library wrapper for Python.
-
-description
- Python extension module wrapper for libattr. It allows to query, list,\
- add and remove extended attributes from files and directories.
-end
-
-source_dl =
-
-build
- requires
- libattr-devel
- python-devel
- python-setuptools
- end
-
- build
- python setup.py build
- end
-
- install
- python setup.py install --root=%{BUILDROOT}
- end
-end
-
-packages
- package %{name}
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/shadow-utils/shadow-utils.nm b/shadow-utils/shadow-utils.nm
index 5e5df0348..1b3be3674 100644
--- a/shadow-utils/shadow-utils.nm
+++ b/shadow-utils/shadow-utils.nm
@@ -4,11 +4,10 @@
###############################################################################
name = shadow-utils
-version = 4.5
+version = 4.13
release = 1
thisapp = shadow-%{version}
-maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
groups = System/Base
url = https://github.com/shadow-maint/shadow/
license = GPLv2+
@@ -35,60 +34,38 @@ build
libattr-devel
libcap-devel
libtool
+ libxcrypt-devel
+ pam-devel
end
- configure_options += \
- --enable-shadowgrp \
- --enable-man \
- --with-sha-crypt \
- --without-libcrack \
- --without-libpam \
- --disable-static \
- --with-group-name-max-length=32
-
prepare_cmds
autoreconf -vfi
+ end
- # Do not build these files:
- for i in nologin chfn chgpasswd chpasswd chsh expiry gpasswd groups login \
- logoutd passwd su; do \
-
- # Do not generate any manpages for them.
- find man -name Makefile.in -exec sed -i -e "/$i\.[1-9]\.xml/d" {} \;; \
- find man -name Makefile.in -exec sed -i -e "s/man1\/$i\.1/ /" {} \;; \
-
- # Do not compile them.
- sed -i "s/$i\$(EXEEXT)//" src/Makefile.in; \
- done
-
- sed -i src/Makefile.in \
- -e "s/^suidbins.*/# &/" -e "s/^suidubins.*/# &/"
-
- # Do not install korean and zh man pages
- sed -i -e 's/ ko//' -e 's/ zh_CN zh_TW//' man/Makefile.in
+ configure_options += \
+ --disable-account-tools-setuid \
+ --enable-man \
+ --with-libpam \
+ --with-group-name-max-length=32 \
+ --with-bcrypt \
+ --with-yescrypt \
+ --without-audit \
+ --without-selinux \
+ --without-su
- # Do not install russion man pages - was broken in 4.1.4.3
- sed -i -e 's/ ru//' man/Makefile.in
- end
+ # This should be enabled, but our environment currently does not support this
+ configure_options += --without-fcaps
install_cmds
- # Remove man pages in other languages
- rm -rfv %{BUILDROOT}/usr/share/man/{cs,de,fi,fr,hu,id,it,ja,pl,pt_BR,ru,sv,tr}
-
- # Remove duplicate man pages.
- rm -vf %{BUILDROOT}/usr/share/man/man*/{getspnam,nologin,passwd}.*
+ rm -vf \
+ %{BUILDROOT}/{%{bindir},%{sbindir},%{mandir}/*}/{chfn,chsh,login,logoutd,newgrp,nologin,sg,vigr,vipw}*
end
end
packages
package %{name}
- groups += Base Build
-
- obsoletes += shadow<%{thisver}
- provides += shadow=%{thisver}
-
conflicts
- pam<1.1.0-4
+ pam < 1.1.0-4
end
configfiles
@@ -96,6 +73,10 @@ packages
end
end
+ package %{name}-devel
+ template DEVEL
+ end
+
package %{name}-debuginfo
template DEBUGINFO
end
diff --git a/sip/patches/disable-rpaths.patch b/sip/patches/disable-rpaths.patch
deleted file mode 100644
index 6f15c540e..000000000
--- a/sip/patches/disable-rpaths.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/siputils.py
-+++ b/siputils.py
-@@ -737,6 +737,7 @@ class Makefile:
- rpaths is the cannonical list of rpaths.
- """
- flags = []
-+ return flags
- prefix = self.optional_string("RPATH")
-
- if prefix:
diff --git a/sip/patches/fix-linking.patch b/sip/patches/fix-linking.patch
deleted file mode 100644
index b4a5fae48..000000000
--- a/sip/patches/fix-linking.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/specs/linux-g++ 2009/08/31 11:59:37 1.1
-+++ b/specs/linux-g++ 2009/08/31 12:00:19
-@@ -53,7 +53,7 @@
- QMAKE_LFLAGS =
- QMAKE_LFLAGS_RELEASE =
- QMAKE_LFLAGS_DEBUG =
--QMAKE_LFLAGS_SHLIB = -shared
-+QMAKE_LFLAGS_SHLIB = -shared -lpython2.7
- QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB
- QMAKE_LFLAGS_SONAME = -Wl,-soname,
- QMAKE_LFLAGS_THREAD =
diff --git a/sip/patches/no-strip.patch b/sip/patches/no-strip.patch
deleted file mode 100644
index 033b54f96..000000000
--- a/sip/patches/no-strip.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: sip-4.8.2/specs/linux-g++
-===================================================================
---- sip-4.8.2.orig/specs/linux-g++
-+++ sip-4.8.2/specs/linux-g++
-@@ -83,7 +83,7 @@ QMAKE_COPY_DIR = $(COPY) -r
- QMAKE_MOVE = mv -f
- QMAKE_DEL_FILE = rm -f
- QMAKE_DEL_DIR = rmdir
--QMAKE_STRIP = strip
-+QMAKE_STRIP =
- QMAKE_STRIPFLAGS_LIB += --strip-unneeded
- QMAKE_CHK_DIR_EXISTS = test -d
- QMAKE_MKDIR = mkdir -p
-Index: sip-4.8.2/specs/linux-lsb
-===================================================================
---- sip-4.8.2.orig/specs/linux-lsb
-+++ sip-4.8.2/specs/linux-lsb
-@@ -83,7 +83,7 @@ QMAKE_COPY_DIR = $(COPY) -r
- QMAKE_MOVE = mv -f
- QMAKE_DEL_FILE = rm -f
- QMAKE_DEL_DIR = rmdir
--QMAKE_STRIP = strip
-+QMAKE_STRIP =
- QMAKE_STRIPFLAGS_LIB += --strip-unneeded
- QMAKE_CHK_DIR_EXISTS = test -d
- QMAKE_MKDIR = mkdir -p
diff --git a/sip/sip.nm b/sip/sip.nm
deleted file mode 100644
index 85c4be367..000000000
--- a/sip/sip.nm
+++ /dev/null
@@ -1,60 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = sip
-version = %{major_ver}.%{minor_ver}.%{rev_ver}
-release = 2
-
-major_ver = 4
-minor_ver = 18
-rev_ver = 1
-
-groups = Development/Tools
-url = http://www.riverbankcomputing.com/software/sip/intro
-license = GPLv2 or GPLv3
-summary = SIP - Python/C++ Bindings Generator.
-
-description
- SIP is a tool for generating bindings for C++ classes so that they can be \
- accessed as normal Python classes. SIP takes many of its ideas from SWIG but, \
- because it is specifically designed for C++ and Python, is able to generate \
- tighter bindings. SIP is so called because it is a small SWIG.
-end
-
-source_dl = https://sourceforge.net/projects/pyqt/files/sip/sip-%{major_ver}.%{minor_ve…
-sources = %{thisapp}.tar.gz
-
-
-build
- requires
- gcc-c++
- python-devel
- end
-
- build
- python configure.py \
- CFLAGS+="%{CFLAGS}" \
- CXXFLAGS+="%{CXXFLAGS}" \
- LFLAGS+="%{LDFLAGS}"
-
- make %{PARALLELISMFLAGS}
- end
-end
-
-packages
- package %{name}
-
- package %{name}-devel
- template DEVEL
-
- files += /usr/bin/sip
-
- requires = sip
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/subversion/patches/0001-subversion-1.9.0-rpath.patch b/subversion/patches/0001-subversion-1.9.0-rpath.patch
deleted file mode 100644
index 1531006ef..000000000
--- a/subversion/patches/0001-subversion-1.9.0-rpath.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-
-Only link libraries using -rpath, to avoid unnecessary RPATH tags in executables.
-
---- subversion-1.9.0/build.conf.rpath
-+++ subversion-1.9.0/build.conf
-@@ -561,7 +561,7 @@ lang = python
- path = subversion/bindings/swig/python/libsvn_swig_py
- libs = libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_subr
- apriconv apr python swig
--link-cmd = $(LINK)
-+link-cmd = $(LINK_LIB)
- install = swig-py-lib
- # need special build rule to include -DSWIGPYTHON
- compile-cmd = $(COMPILE_SWIG_PY)
-@@ -586,7 +586,7 @@ type = swig_lib
- lang = ruby
- path = subversion/bindings/swig/ruby/libsvn_swig_ruby
- libs = libsvn_client libsvn_wc libsvn_delta libsvn_subr apriconv apr ruby swig
--link-cmd = $(LINK) $(SWIG_RB_LIBS)
-+link-cmd = $(LINK_LIB) $(SWIG_RB_LIBS)
- install = swig-rb-lib
- # need special build rule to include
- compile-cmd = $(COMPILE_SWIG_RB)
-diff -uap subversion-1.9.0/Makefile.in.rpath subversion-1.9.0/Makefile.in
---- subversion-1.9.0/Makefile.in.rpath
-+++ subversion-1.9.0/Makefile.in
-@@ -255,10 +255,10 @@ COMPILE_CXXHL_CXX = $(LT_COMPILE_CXX) $(
- COMPILE_GMOCK_CXX = $(LT_COMPILE_CXX_NOWARN) $(GMOCK_INCLUDES) -o $@ -c
- COMPILE_CXXHL_GMOCK_CXX = $(LT_COMPILE_CXX) $(CXXHL_INCLUDES) $(GMOCK_INCLUDES) -o $@ -c
-
--LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(libdir)
--LINK_LIB = $(LINK) $(LT_SO_VERSION)
--LINK_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS) -rpath $(libdir)
--LINK_CXX_LIB = $(LINK_CXX) $(LT_SO_VERSION)
-+LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS)
-+LINK_LIB = $(LINK) $(LT_SO_VERSION) -rpath $(libdir)
-+LINK_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS)
-+LINK_CXX_LIB = $(LINK_CXX) $(LT_SO_VERSION) -rpath $(libdir)
-
- # special link rule for mod_dav_svn
- LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module $(APACHE_LDFLAGS)
diff --git a/subversion/patches/0002-subversion-1.9.0-pie.patch b/subversion/patches/0002-subversion-1.9.0-pie.patch
deleted file mode 100644
index 437e1b724..000000000
--- a/subversion/patches/0002-subversion-1.9.0-pie.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-
-Link executables using -pie, link test executables using -no-install.
-
-diff -uap subversion-1.9.0/build.conf.pie subversion-1.9.0/build.conf
-diff -uap subversion-1.9.0/build.conf.pie subversion-1.9.0/build.conf
-diff -uap subversion-1.9.0/build.conf.pie subversion-1.9.0/build.conf
---- subversion-1.9.0/build.conf.pie
-+++ subversion-1.9.0/build.conf
-@@ -743,7 +743,7 @@ libs = libsvncxxhl libgmock libsvn_subr
- sources = tests/*.cpp
- install = tests
- compile-cmd = $(COMPILE_CXXHL_GMOCK_CXX)
--link-cmd = $(LINK_CXX)
-+link-cmd = $(LINK_TEST_CXX)
-
-
- # ----------------------------------------------------------------------------
-@@ -760,7 +760,7 @@ sources = gmock-gtest-all.cc
- install = tests
- msvc-static = yes
- compile-cmd = $(COMPILE_GMOCK_CXX)
--link-cmd = $(LINK_CXX_LIB)
-+link-cmd = $(LINK_TEST_CXX_LIB)
-
- # ----------------------------------------------------------------------------
- #
-@@ -775,6 +775,7 @@ install = test
- libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr aprutil apriconv apr
- msvc-static = yes
- undefined-lib-symbols = yes
-+link-cmd = $(LINK_TEST_LIB)
-
- # ----------------------------------------------------------------------------
- # Tests for libsvn_fs_base
-diff -uap subversion-1.9.0/build/generator/gen_base.py.pie subversion-1.9.0/build/generator/gen_base.py
---- subversion-1.9.0/build/generator/gen_base.py.pie
-+++ subversion-1.9.0/build/generator/gen_base.py
-@@ -585,7 +585,7 @@ class TargetLinked(Target):
- self.install = options.get('install')
- self.compile_cmd = options.get('compile-cmd')
- self.sources = options.get('sources', '*.c *.cpp')
-- self.link_cmd = options.get('link-cmd', '$(LINK)')
-+ self.link_cmd = options.get('link-cmd', '$(LINK_LIB)')
-
- self.external_lib = options.get('external-lib')
- self.external_project = options.get('external-project')
-@@ -644,6 +644,14 @@ class TargetExe(TargetLinked):
-
- self.msvc_force_static = options.get('msvc-force-static') == 'yes'
-
-+ if self.install in ['test', 'bdb-test', 'sub-test', ]:
-+ self.link_cmd = '$(LINK_TEST)'
-+ elif self.link_cmd == '$(LINK_LIB)':
-+ # Over-ride the default for TargetLinked.
-+ self.link_cmd = '$(LINK_EXE)'
-+ elif self.link_cmd not in ['$(LINK_TEST_CXX)', ]:
-+ raise GenError('ERROR: Unknown executable link type for ' + self.name + ': ' + self.link_cmd)
-+
- def add_dependencies(self):
- TargetLinked.add_dependencies(self)
-
-diff -uap subversion-1.9.0/Makefile.in.pie subversion-1.9.0/Makefile.in
---- subversion-1.9.0/Makefile.in.pie
-+++ subversion-1.9.0/Makefile.in
-@@ -259,6 +259,11 @@ LINK = $(LIBTOOL) $(LTFLAGS) --mode=link
- LINK_LIB = $(LINK) $(LT_SO_VERSION) -rpath $(libdir)
- LINK_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS)
- LINK_CXX_LIB = $(LINK_CXX) $(LT_SO_VERSION) -rpath $(libdir)
-+LINK_TEST = $(LINK) -no-install
-+LINK_TEST_LIB = $(LINK) -avoid-version
-+LINK_TEST_CXX_LIB = $(LINK_CXX) -avoid-version
-+LINK_EXE = $(LINK) -pie
-+LINK_CXX_EXE = $(LINK) -pie
-
- # special link rule for mod_dav_svn
- LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module $(APACHE_LDFLAGS)
-@@ -753,10 +758,10 @@ schema-clean:
- $(PYTHON) $(top_srcdir)/build/transform_sql.py $< $(top_srcdir)/$@
-
- .c.o:
-- $(COMPILE) -o $@ -c $<
-+ $(COMPILE) -fPIE -o $@ -c $<
-
- .cpp.o:
-- $(COMPILE_CXX) -o $@ -c $<
-+ $(COMPILE_CXX) -fPIE -o $@ -c $<
-
- .c.lo:
- $(LT_COMPILE) -o $@ -c $<
diff --git a/subversion/patches/0003-subversion-1.8.5-swigplWall.patch b/subversion/patches/0003-subversion-1.8.5-swigplWall.patch
deleted file mode 100644
index af66806be..000000000
--- a/subversion/patches/0003-subversion-1.8.5-swigplWall.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-
-Don't drop -Wall in the swig Perl bindings, otherwise building with
-e.g. -Wformat-security might break.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1037341
-
---- subversion-1.8.5/subversion/bindings/swig/perl/native/Makefile.PL.in.swigplWall
-+++ subversion-1.8.5/subversion/bindings/swig/perl/native/Makefile.PL.in
-@@ -54,7 +54,6 @@ my $includes = ' -I/usr/include/apr-1
- # SWIG is using C++ style comments in an extern "C" code.
- $cflags =~ s/-ansi\s+//g;
- $cflags =~ s/-std=c89\s+//g;
--$cflags =~ s/-Wall//g;
- $cflags =~ s/-Wunused//g;
- $cflags =~ s/-Wshadow//g;
- $cflags =~ s/-Wstrict-prototypes//g;
diff --git a/subversion/subversion.nm b/subversion/subversion.nm
deleted file mode 100644
index db4222403..000000000
--- a/subversion/subversion.nm
+++ /dev/null
@@ -1,102 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = subversion
-version = 1.9.4
-release = 1
-
-groups = Development/Tools
-url = http://subversion.apache.org/
-license = ASL 2.0
-summary = A Modern Concurrent Version Control System.
-
-description
- Subversion is a concurrent version control system which enables one
- or more users to collaborate in developing and maintaining a
- hierarchy of files and directories while keeping a history of all
- changes. Subversion only stores the differences between versions,
- instead of every complete file. Subversion is intended to be a
- compelling replacement for CVS.
-end
-
-source_dl = http://www.apache.org/dist/subversion/
-
-build
- requires
- perl(ExtUtils::MakeMaker)
- perl(ExtUtils::Embed)
- perl-Carp
- autoconf
- apr-util-devel
- automake
- expat-devel
- libapr-devel
- libdb-devel
- perl-devel
- sqlite-devel
- swig
- zlib-devel
- end
-
- configure_options += \
- CPPFLAGS="-P" \
- --disable-mod-activation \
- --disable-static
-
- prepare_cmds
- # Regenerate build system.
- sed -i "/seems to be moved/s/^/#/" build/ltmain.sh &&
- ./autogen.sh
-
- # Fix shebang lines.
- perl -pi -e 's|/usr/bin/env perl -w|/usr/bin/perl -w|' tools/hook-scripts/*.pl.in
- end
-
- install_cmds
- # Build / Install perl bindings.
- make swig-pl-lib %{PARALLELISMFLAGS}
- make install-swig-pl-lib DESTDIR=%{BUILDROOT}
-
- cd subversion/bindings/swig/perl/native
-
- # Doesn't allow OPTIMIZE="%{CFLAGS}".
- perl Makefile.PL INSTALLDIRS=vendor
- make %{PARALLELISMFLAGS}
- make pure_install PERL_INSTALL_ROOT=%{BUILDROOT}
- end
-end
-
-packages
- package %{name}
-
- package perl-%{name}
- summary = Perl bindings to the Subversion libraries.
- description
- This package includes the Perl bindings to
- the Subversion libraries.
- end
-
- requires
- perl(:MODULE_COMPAT_%{perl_version})
- end
-
- files
- /usr/lib/libsvn_swig_perl-1.so.*
- /usr/lib/perl*/
- end
- end
-
- package %{name}-libs
- template LIBS
- end
-
- package %{name}-devel
- template DEVEL
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/swig/swig.nm b/swig/swig.nm
index 675dc1f5b..bf91903a8 100644
--- a/swig/swig.nm
+++ b/swig/swig.nm
@@ -4,14 +4,13 @@
###############################################################################
name = swig
-version = 3.0.10
+version = 4.1.1
release = 1
groups = Development/Tools
url = http://swig.sourceforge.net/
license = GPLv3+ and BSD
-summary = Connects C/C++/Objective C to some high-level programming \
- languages.
+summary = Connects C/C++/Objective C to some high-level programming languages
description
Simplified Wrapper and Interface Generator (SWIG) is a software
@@ -23,21 +22,18 @@ description
tool for building user interfaces.
end
-source_dl = http://downloads.sourceforge.net/project/%{name}/%{name}/%{thisapp}
+source_dl = https://downloads.sourceforge.net/project/%{name}/%{name}/%{thisapp}
build
requires
autoconf
automake
gcc-c++
- pcre-devel
+ pcre2-devel
perl
- python-devel
+ python3-devel
end
- configure_options += \
- --sbindir=/sbin
-
prepare_cmds
./autogen.sh
end
@@ -45,7 +41,6 @@ end
packages
package %{name}
- end
package %{name}-debuginfo
template DEBUGINFO
diff --git a/syslinux/syslinux.nm b/syslinux/syslinux.nm
deleted file mode 100644
index b24d7cb48..000000000
--- a/syslinux/syslinux.nm
+++ /dev/null
@@ -1,83 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = syslinux
-version = 4.02
-release = 3
-sup_arches = x86_64 i686
-
-groups = System/Boot
-url = http://syslinux.zytor.com/
-license = GPLv2+
-summary = Simple kernel loader which boots from a FAT filesystem.
-
-description
- SYSLINUX is a suite of bootloaders, currently supporting DOS FAT \
- filesystems, Linux ext2/ext3 filesystems (EXTLINUX), PXE network boots \
- (PXELINUX), or ISO 9660 CD-ROMs (ISOLINUX). It also includes a tool, \
- MEMDISK, which loads legacy operating systems from these media.
-end
-
-source_dl = http://www.kernel.org/pub/linux/utils/boot/syslinux/
-
-build
- requires
- nasm
- perl
- python-devel
- end
-
- CFLAGS = -Werror -Wno-unused -finline-limit=2000
-
- CC = gcc -std=gnu99 -fgnu89-inline
-
- prepare_cmds
- cd %{DIR_APP} && make clean
- end
-
- build
- make installer \
- %{PARALLELISMFLAGS} \
- CC="%{CC}"
- make -C sample tidy
- end
-
- install
- make install-all \
- INSTALLROOT=%{BUILDROOT} \
- CC="%{CC}" \
- MANDIR=/usr/share/man
-
- rm -rvf %{BUILDROOT}/{boot,tftpboot}
- end
-end
-
-packages
- package %{name}
-
- package %{name}-perl
- summary = Syslinux tools written in perl.
- description = %{summary}
-
- files
- %{bindir}/keytab-lilo
- %{bindir}/lss16toppm
- %{bindir}/md5pass
- %{bindir}/mkdiskimage
- %{bindir}/ppmtolss16
- %{bindir}/pxelinux-options
- %{bindir}/sha1pass
- %{bindir}/syslinux2ansi
- %{bindir}/isohybrid.pl
- %{mandir}/man1/lss16toppm*
- %{mandir}/man1/ppmtolss16*
- %{mandir}/man1/syslinux2ansi*
- end
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/unbound/unbound.nm b/unbound/unbound.nm
index ca4fddc0b..2feaf3296 100644
--- a/unbound/unbound.nm
+++ b/unbound/unbound.nm
@@ -4,11 +4,11 @@
###############################################################################
name = unbound
-version = 1.9.0
+version = 1.17.0
release = 1
groups = System/Daemons
-url = http://www.nlnetlabs.nl/unbound/
+url = https://www.nlnetlabs.nl/unbound/
license = BSD
summary = A validating, recursive, and caching DNS(SEC) resolver.
@@ -21,12 +21,11 @@ description
DNSSEC (secure DNS) validation and stub-resolvers are easily possible.
end
-source_dl = http://www.unbound.net/downloads/
+source_dl = https://www.unbound.net/downloads/
build
requires
expat-devel
- libevent-devel
openssl-devel >= 1.0.1h-2
python3-devel >= 3.4
swig
@@ -36,7 +35,7 @@ build
--with-conf-file=%{sysconfdir}/%{name}/unbound.conf \
--with-pidfile=%{localstatedir}/run/%{name}/%{name}.pid \
--with-rootkey-file=%{sharedstatedir}/unbound/root.key \
- --with-libevent \
+ --without-libevent \
--with-pthreads \
--disable-rpath \
--disable-static \
diff --git a/wireless-regdb/wireless-regdb.nm b/wireless-regdb/wireless-regdb.nm
new file mode 100644
index 000000000..cc4fb8d0d
--- /dev/null
+++ b/wireless-regdb/wireless-regdb.nm
@@ -0,0 +1,46 @@
+###############################################################################
+# IPFire.org - An Open Source Firewall Solution #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
+###############################################################################
+
+name = wireless-regdb
+version = 2022.08.12
+release = 1
+arch = noarch
+
+maintainer = Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org>
+groups = Network/Wireless
+url = https://wireless.wiki.kernel.org/en/developers/regulatory/wireless-regdb
+license = ISC
+summary = Regulatory database for 802.11 wireless networking
+
+description
+ The wireless-regdb package provides the regulatory rules database
+ used by the kernels 802.11 networking stack in order to comply
+ with radio frequency regulatory rules around the world.
+end
+
+source_dl = https://www.kernel.org/pub/software/network/wireless-regdb/
+sources = %{thisapp}.tar.xz
+
+build
+ requires
+ systemd-devel
+ end
+
+ build
+ : # Nothing to do
+ end
+
+ install
+ make install \
+ DESTDIR="%{BUILDROOT}" \
+ PREFIX="%{prefix}" \
+ MANDIR="%{mandir}" \
+ FIRMWARE_PATH="/usr/lib/firmware"
+ end
+end
+
+packages
+ package %{name}
+end
diff --git a/wireless-tools/patches/wireless_tools.29-makefile.patch b/wireless-tools/patches/wireless_tools.29-makefile.patch
deleted file mode 100644
index 27df16024..000000000
--- a/wireless-tools/patches/wireless_tools.29-makefile.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- wireless_tools.29/Makefile.makefile 2007-04-19 19:42:23.000000000 -0400
-+++ wireless_tools.29/Makefile 2007-05-22 17:31:53.000000000 -0400
-@@ -101,12 +101,15 @@ ifdef BUILD_WE_ESSENTIAL
- WEDEF_FLAG= -DWE_ESSENTIAL=y
- endif
-
-+ifndef OPT_FLAGS
-+ OPT_FLAGS=
-+endif
- # Other flags
- CFLAGS=-Os -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow \
- -Wpointer-arith -Wcast-qual -Winline -I.
- #CFLAGS=-O2 -W -Wall -Wstrict-prototypes -I.
- DEPFLAGS=-MMD
--XCFLAGS=$(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS) $(WELIB_FLAG) $(WEDEF_FLAG)
-+XCFLAGS=$(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS) $(WELIB_FLAG) $(WEDEF_FLAG) $(OPT_FLAGS)
- PICFLAG=-fPIC
-
- # Standard compilation targets
-@@ -146,6 +149,7 @@ wireless.h:
- # Compilation of the dynamic library
- $(DYNAMIC): $(OBJS:.o=.so)
- $(CC) -shared -o $@ -Wl,-soname,$@ $(STRIPFLAGS) $(LIBS) -lc $^
-+ ln -s $@ $(DYNAMIC_LINK)
-
- # Compilation of the static library
- $(STATIC): $(OBJS:.o=.so)
diff --git a/wireless-tools/wireless-tools.nm b/wireless-tools/wireless-tools.nm
deleted file mode 100644
index 24387cc66..000000000
--- a/wireless-tools/wireless-tools.nm
+++ /dev/null
@@ -1,55 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = wireless-tools
-version = 29
-release = 2
-thisapp = wireless_tools.%{version}
-
-groups = Networking/Wireless
-url = http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html
-license = GPL+
-summary = Wireless ethernet configuration tools.
-
-description
- This package contain the Wireless tools, used to manipulate
- the Wireless Extensions. The Wireless Extension is an interface
- allowing you to set Wireless LAN specific parameters and get the
- specific stats for wireless networking equipment.
-end
-
-source_dl = http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/
-
-build
- make_build_targets += \
- BUILD_SHARED=1 \
- FORCE_WEXT_VERSION=16 \
- OPT_FLAGS="%{CFLAGS}"
-
- make_install_targets += \
- PREFIX=%{BUILDROOT}/usr \
- INSTALL_DIR=%{BUILDROOT}/sbin \
- INSTALL_LIB=%{BUILDROOT}/%{lib} \
- INSTALL_MAN=%{BUILDROOT}%{mandir}
-
- install_cmds
- rm -vf %{BUILDROOT}/%{lib}/libiw.{a,so}
- mkdir -pv %{BUILDROOT}%{libdir}
- ln -svf ../../%{lib}/libiw.so.%{version} %{BUILDROOT}%{libdir}/libiw.so
- end
-end
-
-packages
- package %{name}
- end
-
- package %{name}-devel
- template DEVEL
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/xfsprogs/xfsprogs.nm b/xfsprogs/xfsprogs.nm
index ebb31dac6..abb69d6e6 100644
--- a/xfsprogs/xfsprogs.nm
+++ b/xfsprogs/xfsprogs.nm
@@ -4,7 +4,7 @@
###############################################################################
name = xfsprogs
-version = 5.0.0
+version = 6.0.0
release = 1
groups = System/Filesystems
@@ -25,7 +25,9 @@ build
libacl-devel
libattr-devel
libblkid-devel >= 2.17
+ libinih-devel
libtool
+ liburcu-devel
libuuid-devel
readline-devel
end
@@ -43,14 +45,6 @@ build
make_install_targets += \
install-dev V=1 DIST_ROOT=%{BUILDROOT} \
PKG_ROOT_SBIN_DIR=%{sbindir} PKG_ROOT_LIB_DIR=%{libdir}
-
- install_cmds
- # Fix file permission.
- chmod 0755 %{BUILDROOT}/%{libdir}/libhandle.so.*.*.*
-
- # Remove unneeded doc location.
- rm -rvf %{BUILDROOT}/%{datadir}/doc/xfsprogs/
- end
end
packages
diff --git a/zd1211-firmware/zd1211-firmware.nm b/zd1211-firmware/zd1211-firmware.nm
deleted file mode 100644
index dd75da4d8..000000000
--- a/zd1211-firmware/zd1211-firmware.nm
+++ /dev/null
@@ -1,44 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = zd1211-firmware
-version = 1.4
-release = 2
-arch = noarch
-
-maintainer = Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org>
-groups = System/Libraries
-url = http://sourceforge.net/projects/zd1211/
-license = GPLv2
-summary = Firmware Binaries for ZyDAS ZD1211 WLAN USB devices.
-
-description
- This package contains the firmware files needed for the zd1211 devices to work.
-end
-
-source_dl = http://sourceforge.net/projects/zd1211/files/%{name}/%{version}/
-sources = %{thisapp}.tar.bz2
-
-build
- DIR_APP = %{DIR_SRC}/%{name}
-
- build
- : # Nothing to do.
- end
-
- install
- mkdir -pv %{BUILDROOT}%{prefix}/lib/firmware/zd1211/
- cp -prv zd1211_* %{BUILDROOT}%{prefix}/lib/firmware/zd1211/
- cp -prv zd1211b_* %{BUILDROOT}%{prefix}/lib/firmware/zd1211/
-
- chown -Rv root:root %{BUILDROOT}%{prefix}/lib/firmware
- end
-end
-
-packages
- package %{name}
- groups += Base
- end
-end
diff --git a/zerofree/zerofree.nm b/zerofree/zerofree.nm
deleted file mode 100644
index 5f92de529..000000000
--- a/zerofree/zerofree.nm
+++ /dev/null
@@ -1,52 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = zerofree
-version = 1.0.1
-release = 2
-
-groups = Filesystem/Tools
-url = http://intgat.tigress.co.uk/rmy/uml/
-license = GPL+
-summary = Utility to force unused ext2 inodes and blocks to zero.
-
-description
- zerofree is a utility to set unused filesystem inodes and blocks of an
- ext2 filesystem to zero. This can improve the compressibility and
- privacy of an ext2 filesystem.
-
- This tool was inspired by the ext2fs privacy (i.e. secure deletion)
- patch described in a Linux kernel mailing list thread.
-
- WARNING: The filesystem to be processed should be unmounted or mounted
- read-only. The tool tries to check this before running, but you
- should be careful.
-end
-
-source_dl = http://intgat.tigress.co.uk/rmy/uml/
-sources = %{thisapp}.tgz
-
-build
- requires
- e2fsprogs-devel
- end
-
- build
- make %{PARALLELISMFLAGS} CC="gcc %{CFLAGS} %{LDFLAGS}"
- end
-
- install
- mkdir -pv %{BUILDROOT}/usr/sbin
- install -D -p -m 755 zerofree %{BUILDROOT}/usr/sbin
- end
-end
-
-packages
- package zerofree
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
hooks/post-receive
--
IPFire 3.x development tree
1
0
[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 706194dc908b822ecf2b90809be18e27ec47747f
by Michael Tremer 19 Dec '22
by Michael Tremer 19 Dec '22
19 Dec '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 706194dc908b822ecf2b90809be18e27ec47747f (commit)
via d6ba15495378561e7558958c1c77407077601977 (commit)
via 91890e3d610ed07ca8d901aabd66738f8512da02 (commit)
from 3658e16a21e92e06f2c51ff8fbfa2248dcfba9f0 (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 706194dc908b822ecf2b90809be18e27ec47747f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Dec 19 12:55:31 2022 +0000
pango: Update to 1.90.0
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit d6ba15495378561e7558958c1c77407077601977
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Dec 19 12:54:23 2022 +0000
cairo: Update to 1.17.6
This patch also changes that we use meson instead of autotools to build
cairo. The autotools build seems to have been incomplete and did not
allow us to build pango against cairo.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 91890e3d610ed07ca8d901aabd66738f8512da02
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Dec 19 12:53:38 2022 +0000
harfbuzz: Enable GObject Introspection
This is required to build pango.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
cairo/cairo.nm | 31 +++--
cairo/patches/cairo-1.17.6-meson-fixes.patch | 178 +++++++++++++++++++++++++++
harfbuzz/harfbuzz.nm | 7 +-
pango/pango.nm | 32 +++--
4 files changed, 228 insertions(+), 20 deletions(-)
create mode 100644 cairo/patches/cairo-1.17.6-meson-fixes.patch
Difference in files:
diff --git a/cairo/cairo.nm b/cairo/cairo.nm
index 5cdf4c8a3..d14e15a61 100644
--- a/cairo/cairo.nm
+++ b/cairo/cairo.nm
@@ -4,7 +4,8 @@
###############################################################################
name = cairo
-version = 1.16.0
+version = %{ver_maj}.6
+ver_maj = 1.17
release = 1
groups = System/Graphics
@@ -17,28 +18,42 @@ description
and print output.
end
-source_dl = https://cairographics.org/releases/
+source_dl = https://download.gnome.org/sources/%{name}/%{ver_maj}/
sources = %{thisapp}.tar.xz
build
requires
- binutils >= 2.21.51.0.8-2
+ expat-devel
fontconfig-devel >= 2.10
freetype-devel
+ ghostscript-devel
glib2-devel >= 2.14
gobject-introspection-devel
libxml2-devel
libpng-devel
+ lzo-devel
+ meson
+ ninja
pixman-devel >= 0.30.0
pkg-config
zlib-devel
end
- configure_options += \
- --enable-xml \
- --enable-gobject \
- --disable-gtk-doc \
- --disable-static
+ build
+ # Tests require poppler which we currently don't have
+ %{meson} \
+ -Dtests=disabled \
+ -Dspectre=disabled \
+ -Dsymbol-lookup=disabled \
+ -Dxcb=disabled \
+ -Dxlib=disabled
+
+ %{meson_build}
+ end
+
+ install
+ %{meson_install}
+ end
end
packages
diff --git a/cairo/patches/cairo-1.17.6-meson-fixes.patch b/cairo/patches/cairo-1.17.6-meson-fixes.patch
new file mode 100644
index 000000000..ea0244851
--- /dev/null
+++ b/cairo/patches/cairo-1.17.6-meson-fixes.patch
@@ -0,0 +1,178 @@
+diff -urN cairo-1.17.6.old/doc/public/meson.build cairo-1.17.6/doc/public/meson.build
+--- cairo-1.17.6.old/doc/public/meson.build 1970-01-01 01:00:00.000000000 +0100
++++ cairo-1.17.6/doc/public/meson.build 2022-03-20 16:22:31.018317576 +0000
+@@ -0,0 +1,156 @@
++gnome = import('gnome')
++
++ignore_headers = [
++ # Sub-directories
++ 'win32',
++
++ # Internal headers
++ 'cairoint.h',
++ 'cairo-features.h',
++ 'cairo-features-win32.h',
++
++ # Inlined API
++ 'cairo-box-inline.h',
++ 'cairo-clip-inline.h',
++ 'cairo-combsort-inline.h',
++ 'cairo-contour-inline.h',
++ 'cairo-error-inline.h',
++ 'cairo-image-surface-inline.h',
++ 'cairo-line-inline.h',
++ 'cairo-list-inline.h',
++ 'cairo-pattern-inline.h',
++ 'cairo-recording-surface-inline.h',
++ 'cairo-surface-inline.h',
++ 'cairo-surface-observer-inline.h',
++ 'cairo-surface-snapshot-inline.h',
++ 'cairo-surface-subsurface-inline.h',
++
++ # Private headers
++ 'cairo-analysis-surface-private.h',
++ 'cairo-arc-private.h',
++ 'cairo-array-private.h',
++ 'cairo-atomic-private.h',
++ 'cairo-backend-private.h',
++ 'cairo-boxes-private.h',
++ 'cairo-cache-private.h',
++ 'cairo-clip-private.h',
++ 'cairo-compiler-private.h',
++ 'cairo-composite-rectangles-private.h',
++ 'cairo-compositor-private.h',
++ 'cairo-contour-private.h',
++ 'cairo-damage-private.h',
++ 'cairo-default-context-private.h',
++ 'cairo-deprecated.h',
++ 'cairo-device-private.h',
++ 'cairo-error-private.h',
++ 'cairo-fixed-private.h',
++ 'cairo-fixed-type-private.h',
++ 'cairo-fontconfig-private.h',
++ 'cairo-freed-pool-private.h',
++ 'cairo-freelist-private.h',
++ 'cairo-freelist-type-private.h',
++ 'cairo-ft-private.h',
++ 'cairo-gstate-private.h',
++ 'cairo-hash-private.h',
++ 'cairo-image-info-private.h',
++ 'cairo-image-surface-private.h',
++ 'cairo-line-private.h',
++ 'cairo-list-private.h',
++ 'cairo-malloc-private.h',
++ 'cairo-mempool-private.h',
++ 'cairo-mutex-impl-private.h',
++ 'cairo-mutex-list-private.h',
++ 'cairo-mutex-private.h',
++ 'cairo-mutex-type-private.h',
++ 'cairo-output-stream-private.h',
++ 'cairo-paginated-private.h',
++ 'cairo-paginated-surface-private.h',
++ 'cairo-path-fixed-private.h',
++ 'cairo-path-private.h',
++ 'cairo-pattern-private.h',
++ 'cairo-pdf-operators-private.h',
++ 'cairo-pdf-shading-private.h',
++ 'cairo-pdf-surface-private.h',
++ 'cairo-pixman-private.h',
++ 'cairo-private.h',
++ 'cairo-ps-surface-private.h',
++ 'cairo-quartz-private.h',
++ 'cairo-recording-surface-private.h',
++ 'cairo-reference-count-private.h',
++ 'cairo-region-private.h',
++ 'cairo-rtree-private.h',
++ 'cairo-scaled-font-private.h',
++ 'cairo-scaled-font-subsets-private.h',
++ 'cairo-script-private.h',
++ 'cairo-slope-private.h',
++ 'cairo-spans-compositor-private.h',
++ 'cairo-spans-private.h',
++ 'cairo-stroke-dash-private.h',
++ 'cairo-surface-backend-private.h',
++ 'cairo-surface-clipper-private.h',
++ 'cairo-surface-fallback-private.h',
++ 'cairo-surface-observer-private.h',
++ 'cairo-surface-offset-private.h',
++ 'cairo-surface-private.h',
++ 'cairo-surface-snapshot-private.h',
++ 'cairo-surface-subsurface-private.h',
++ 'cairo-surface-wrapper-private.h',
++ 'cairo-svg-surface-private.h',
++ 'cairo-tag-attributes-private.h',
++ 'cairo-tag-stack-private.h',
++ 'cairo-tee-surface-private.h',
++ 'cairo-time-private.h',
++ 'cairo-traps-private.h',
++ 'cairo-tristrip-private.h',
++ 'cairo-truetype-subset-private.h',
++ 'cairo-type1-private.h',
++ 'cairo-type3-glyph-surface-private.h',
++ 'cairo-types-private.h',
++ 'cairo-user-font-private.h',
++ 'cairo-wideint-private.h',
++ 'cairo-wideint-type-private.h',
++ 'cairo-xcb-private.h',
++ 'cairo-xlib-private.h',
++ 'cairo-xlib-surface-private.h',
++ 'cairo-xlib-xrender-private.h',
++ 'test-compositor-surface-private.h',
++]
++
++ignore_decorators = [
++ 'cairo_public',
++ 'cairo_private',
++]
++
++docpath = get_option('prefix') / get_option('datadir') / 'gtk-doc/html'
++version_conf = configuration_data()
++version_conf.set('CAIRO_VERSION', meson.project_version())
++configure_file(
++ input: 'version.xml.in',
++ output: 'version.xml',
++ configuration: version_conf
++)
++
++gnome.gtkdoc('cairo',
++ main_xml: 'cairo-docs.xml',
++ namespace: 'cairo',
++ mode: 'sgml',
++ src_dir: doc_srcdir,
++ dependencies: libcairo_dep,
++ scan_args: [
++ '--ignore-decorators=' + '|'.join(ignore_decorators),
++ '--ignore-headers=' + ' '.join(ignore_headers),
++ ],
++ content_files: [
++ 'language-bindings.xml',
++ ],
++ expand_content_files: [
++ 'language-bindings.xml',
++ ],
++ html_assets: [
++ ],
++ fixxref_args: [
++ '--html-dir=' + docpath,
++ ],
++ install: true,
++ check: true,
++)
+diff -urN cairo-1.17.6.old/doc/public/version.xml.in cairo-1.17.6/doc/public/version.xml.in
+--- cairo-1.17.6.old/doc/public/version.xml.in 1970-01-01 01:00:00.000000000 +0100
++++ cairo-1.17.6/doc/public/version.xml.in 2022-03-20 16:33:04.015756161 +0000
+@@ -0,0 +1 @@
++@CAIRO_VERSION@
+diff -urN cairo-1.17.6.old/meson-cc-tests/check-unused-result.c cairo-1.17.6/meson-cc-tests/check-unused-result.c
+--- cairo-1.17.6.old/meson-cc-tests/check-unused-result.c 1970-01-01 01:00:00.000000000 +0100
++++ cairo-1.17.6/meson-cc-tests/check-unused-result.c 2022-03-20 15:55:39.285562258 +0000
+@@ -0,0 +1,9 @@
++__attribute__((__warn_unused_result__)) void f (void) {}
++__attribute__((__warn_unused_result__)) int g;
++
++int main(int c, char **v)
++{
++ (void)c;
++ (void)v;
++ return 0;
++}
diff --git a/harfbuzz/harfbuzz.nm b/harfbuzz/harfbuzz.nm
index eb13ad787..e5f9c93da 100644
--- a/harfbuzz/harfbuzz.nm
+++ b/harfbuzz/harfbuzz.nm
@@ -5,7 +5,7 @@
name = harfbuzz
version = 5.3.1
-release = 1
+release = 2
groups = System/Libraries
url = https://freedesktop.org/wiki/Software/HarfBuzz
@@ -24,6 +24,7 @@ build
cairo-devel
freetype-devel
glib2-devel
+ gobject-introspection-devel
icu-devel
end
@@ -31,8 +32,10 @@ build
--disable-static \
--with-gobject
+ export LD_LIBRARY_PATH=%{DIR_APP}/src/.libs
+
test
- LD_LIBRARY_PATH=%{DIR_APP}/src/.libs make check || :
+ make check || :
end
end
diff --git a/pango/pango.nm b/pango/pango.nm
index dc14b5564..5108ebdc3 100644
--- a/pango/pango.nm
+++ b/pango/pango.nm
@@ -5,12 +5,12 @@
name = pango
version = %{ver_major}.%{ver_minor}
-ver_major = 1.40
-ver_minor = 3
-release = 2
+ver_major = 1.90
+ver_minor = 0
+release = 1
groups = System/Libraries
-url = http://www.pango.org/
+url = https://www.pango.org/
license = LGPLv2+
summary = System for layout and rendering of internationalized text.
@@ -19,27 +19,39 @@ description
emphasis on internationalization.
end
-source_dl = http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{ver_major}/
+source_dl = https://ftp.gnome.org/pub/GNOME/sources/%{name}/%{ver_major}/
sources = %{thisapp}.tar.xz
+# Disable LTO
+LTO_CFLAGS =
+
build
requires
+ cairo-devel >= 1.17
cairo-gobject-devel
fontconfig-devel
freetype-devel
+ fribidi-devel
gcc-c++
glib2-devel
gobject-introspection-devel
- harfbuzz-devel >= 0.9.9
+ harfbuzz-devel >= 4.3.0
+ libthai-devel
+ meson
perl
pkg-config
end
- configure_options += \
- --enable-introspection=yes \
- --enable-installed-tests
+ build
+ %{meson}
+ %{meson_build}
+ end
+
+ install
+ %{meson_install}
+ end
- export LD_LIBRARY_PATH = %{DIR_APP}/pango/.libs
+ #export LD_LIBRARY_PATH = %{DIR_APP}/pango/.libs
end
packages
hooks/post-receive
--
IPFire 3.x development tree
1
0