[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 82b6c2cbcaddb88a11fb8bacd5e987b08c30df34
by Michael Tremer 06 Mar '23
by Michael Tremer 06 Mar '23
06 Mar '23
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 82b6c2cbcaddb88a11fb8bacd5e987b08c30df34 (commit)
via 301325aec47289fe47a0be69fbe01c83b39c581b (commit)
via e225e04160c5a936c183550d6e60e1923d63ab11 (commit)
via 20ca119c20f67cc39a401d98d09d9d3791e96a1c (commit)
via dde86ed7d9f63dac8b864e56756007bf2f69d84c (commit)
via 2f45640b146cc8def7369c192c1eb7a1564bb2cd (commit)
from c578985df1c1a4916d9ee83b07665e77e3f33f08 (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 82b6c2cbcaddb88a11fb8bacd5e987b08c30df34
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Mar 6 10:51:54 2023 +0000
mc: Update to 4.8.29
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 301325aec47289fe47a0be69fbe01c83b39c581b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Mar 6 10:46:12 2023 +0000
plymouth: Drop dependency on grubby
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit e225e04160c5a936c183550d6e60e1923d63ab11
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Mar 6 10:45:40 2023 +0000
ipfire-logos: Update to version 4
This contains a hack that avoids an endless loop in ImageMagick when
converting from our source SVG file.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 20ca119c20f67cc39a401d98d09d9d3791e96a1c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Mar 6 10:44:54 2023 +0000
filesystem: Drop /usr/local
This is a quick hack to work around the quality agent which does not
allow to create anything under /usr/local.
There is also very little need as we do not support any custom built
software on IPFire.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit dde86ed7d9f63dac8b864e56756007bf2f69d84c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Mar 6 10:09:03 2023 +0000
basesystem: Drop some ancient dependencies
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 2f45640b146cc8def7369c192c1eb7a1564bb2cd
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Mar 6 10:08:02 2023 +0000
basesystem: Replace passwd by shadow-utils
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
basesystem/basesystem.nm | 6 ++----
filesystem/filesystem.nm | 10 +---------
ipfire-logos/ipfire-logos.nm | 5 ++---
mc/mc.nm | 13 +++++--------
plymouth/plymouth.nm | 3 +--
5 files changed, 11 insertions(+), 26 deletions(-)
Difference in files:
diff --git a/basesystem/basesystem.nm b/basesystem/basesystem.nm
index 033a2b3df..889e8d7fe 100644
--- a/basesystem/basesystem.nm
+++ b/basesystem/basesystem.nm
@@ -5,7 +5,7 @@
name = basesystem
version = 2.99
-release = 4
+release = 4.2
arch = noarch
groups = Base System/Base
@@ -47,15 +47,13 @@ packages
initscripts
kbd
less
- module-init-tools
network
pakfire
- passwd
procps
psmisc
sed
setup
- syslog
+ shadow-utils
system-release
tar
udev
diff --git a/filesystem/filesystem.nm b/filesystem/filesystem.nm
index cb406610c..f94eedbac 100644
--- a/filesystem/filesystem.nm
+++ b/filesystem/filesystem.nm
@@ -5,7 +5,7 @@
name = filesystem
version = 002
-release = 3
+release = 4
maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
groups = Base Build System/Base
@@ -58,14 +58,6 @@ build
usr/share/{aclocal,dict,doc,empty,info,mime-info,misc} \
usr/share/man/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x,0p,1p,3p} \
usr/src \
- usr/local/bin \
- usr/local/etc \
- usr/local/lib \
- usr/local/sbin \
- usr/local/share \
- usr/local/share/man/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x} \
- usr/local/share/info \
- usr/local/include \
var/empty \
var/lib \
var/local \
diff --git a/ipfire-logos/ipfire-logos.nm b/ipfire-logos/ipfire-logos.nm
index 78f4781fa..dce866c7e 100644
--- a/ipfire-logos/ipfire-logos.nm
+++ b/ipfire-logos/ipfire-logos.nm
@@ -4,12 +4,11 @@
###############################################################################
name = ipfire-logos
-version = 3
-release = 2
+version = 4
+release = 1
arch = noarch
maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
-groups = Base System/Base
url = http://www.ipfire.org
license =
summary = IPFire logos and images.
diff --git a/mc/mc.nm b/mc/mc.nm
index acf78ac2c..70f60246a 100644
--- a/mc/mc.nm
+++ b/mc/mc.nm
@@ -4,11 +4,11 @@
###############################################################################
name = mc
-version = 4.8.16
+version = 4.8.29
release = 1
groups = Applications/System
-url = http://www.ibiblio.org/mc/
+url = https://midnight-commander.org
license = GPLv2+
summary = User-friendly text console file manager and visual shell.
@@ -20,8 +20,8 @@ description
specific files.
end
+source_dl = https://www.midnight-commander.org/downloads/
sources = %{thisapp}.tar.xz
-source_dl = http://www.midnight-commander.org/downloads/
build
requires
@@ -33,7 +33,6 @@ build
end
configure_options += \
- --sysconfdir=/etc \
--libexecdir=/usr/lib \
--with-screen=slang \
--with-samba \
@@ -48,10 +47,8 @@ end
packages
package %{name}
- # This awkward dependency is found and cannot be resolved.
- filter_requires
- perl\(pieces\)
- end
+ # This awkward dependency is found and cannot be resolved
+ filter_requires = perl\(pieces\)
end
package %{name}-debuginfo
diff --git a/plymouth/plymouth.nm b/plymouth/plymouth.nm
index b45d3c44c..5530e9a8d 100644
--- a/plymouth/plymouth.nm
+++ b/plymouth/plymouth.nm
@@ -5,7 +5,7 @@
name = plymouth
version = 22.02.122
-release = 2
+release = 2.1
groups = System/Base
url = https://www.freedesktop.org/wiki/Software/Plymouth
@@ -133,7 +133,6 @@ packages
cpio
dracut
findutils
- grubby
gzip
end
hooks/post-receive
--
IPFire 3.x development tree
1
0
[git.ipfire.org] IPFire 3.x development tree branch, master, updated. c578985df1c1a4916d9ee83b07665e77e3f33f08
by Michael Tremer 06 Mar '23
by Michael Tremer 06 Mar '23
06 Mar '23
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 c578985df1c1a4916d9ee83b07665e77e3f33f08 (commit)
via 1f575853c2a1790508d70be758e91eae66fb4dbd (commit)
via 53fdc7db4c4251820a16a576f7ce63859d2f13e7 (commit)
via d22566c94c88ac870b87ac2b8938730ef51ada32 (commit)
via 9c531111cc4325246ca43f159f05694296a070de (commit)
via 0ae51ff9b1b7d11d116b83bcd24e2bdcf5813ae8 (commit)
via 9b5d12f6a44367fb343ea0dba4046ffd81743acb (commit)
via 29079cfd30f4f2f6d1498a7fe7d4e60e808f91a6 (commit)
via df00727116d584050a18a112e636fec0502473b0 (commit)
via 393004b02ad91e7fef2c403d894aa08bf9732faa (commit)
via f8840db4e5870b088cec87f0da76f88588ef74b3 (commit)
from fb12a971729f275528110f3ef64b6107713c0fe4 (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 c578985df1c1a4916d9ee83b07665e77e3f33f08
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Mon Mar 6 09:42:53 2023 +0000
network: Fix build dependencies
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 1f575853c2a1790508d70be758e91eae66fb4dbd
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Mar 5 16:48:02 2023 +0100
perl-YAML: Fix build dependencies
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 53fdc7db4c4251820a16a576f7ce63859d2f13e7
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Mar 5 16:46:49 2023 +0100
perl-Module-Package: New package
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit d22566c94c88ac870b87ac2b8938730ef51ada32
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Mar 5 16:46:23 2023 +0100
perl-Module-Install-ManifestSkip: New package
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 9c531111cc4325246ca43f159f05694296a070de
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Mar 5 16:45:54 2023 +0100
perl-Module-Install-AuthorRequires: New package
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 0ae51ff9b1b7d11d116b83bcd24e2bdcf5813ae8
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Mar 5 16:45:30 2023 +0100
perl-IO-All: New package
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 9b5d12f6a44367fb343ea0dba4046ffd81743acb
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Mar 5 16:45:11 2023 +0100
perl-Moo: New package
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 29079cfd30f4f2f6d1498a7fe7d4e60e808f91a6
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Mar 5 16:44:53 2023 +0100
perl-Class-Method-Modifieres: New package
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit df00727116d584050a18a112e636fec0502473b0
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Mar 5 16:44:30 2023 +0100
perl-Sub-Quote: New package
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 393004b02ad91e7fef2c403d894aa08bf9732faa
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Mar 5 16:44:05 2023 +0100
perl-Role-Tiny: New package
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit f8840db4e5870b088cec87f0da76f88588ef74b3
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Mar 6 09:56:33 2023 +0000
squid: Fix build by providing libxcrypt-devel
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
network/network.nm | 7 ++---
.../perl-Class-Method-Modifiers.nm | 22 +++++++-------
.../perl-IO-All.nm | 34 ++++++++++++----------
.../perl-Module-Install-AuthorRequires.nm | 28 +++++++++---------
.../perl-Module-Install-ManifestSkip.nm | 28 +++++++++---------
....30-Fix-building-on-Perl-without-.-in-INC.patch | 25 ++++++++++++++++
.../perl-Module-Package.nm | 30 ++++++++++---------
.../perl-libintl-perl.nm => perl-Moo/perl-Moo.nm | 34 ++++++++++------------
.../perl-Role-Tiny.nm | 23 ++++++++-------
.../perl-Sub-Quote.nm | 23 ++++++++-------
perl-YAML/perl-YAML.nm | 7 ++---
squid/squid.nm | 3 +-
12 files changed, 150 insertions(+), 114 deletions(-)
copy perl-YAML-Tiny/perl-YAML-Tiny.nm => perl-Class-Method-Modifiers/perl-Class-Method-Modifiers.nm (64%)
copy perl-YAML-Tiny/perl-YAML-Tiny.nm => perl-IO-All/perl-IO-All.nm (52%)
copy perl-YAML-Tiny/perl-YAML-Tiny.nm => perl-Module-Install-AuthorRequires/perl-Module-Install-AuthorRequires.nm (54%)
copy perl-YAML-Tiny/perl-YAML-Tiny.nm => perl-Module-Install-ManifestSkip/perl-Module-Install-ManifestSkip.nm (54%)
create mode 100644 perl-Module-Package/patches/Module-Package-0.30-Fix-building-on-Perl-without-.-in-INC.patch
copy perl-Parse-Yapp/perl-Parse-Yapp.nm => perl-Module-Package/perl-Module-Package.nm (55%)
copy perl-libintl-perl/perl-libintl-perl.nm => perl-Moo/perl-Moo.nm (52%)
copy perl-YAML-Tiny/perl-YAML-Tiny.nm => perl-Role-Tiny/perl-Role-Tiny.nm (59%)
copy perl-YAML-Tiny/perl-YAML-Tiny.nm => perl-Sub-Quote/perl-Sub-Quote.nm (59%)
Difference in files:
diff --git a/network/network.nm b/network/network.nm
index 92903b7e4..4879f71f9 100644
--- a/network/network.nm
+++ b/network/network.nm
@@ -5,7 +5,7 @@
name = network
version = 010
-release = 4.1
+release = 4.2
maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
groups = Base Networking/Tools
@@ -49,10 +49,9 @@ packages
bash >= 4.0
bird >= 2
curl
- dhclient >= 4.2.4-2
- ebtables
+ dhcpcd
hostapd
- initscripts >= 1:2.99-18
+ initscripts >= 2.99-18
iproute2
iw
man
diff --git a/perl-Class-Method-Modifiers/perl-Class-Method-Modifiers.nm b/perl-Class-Method-Modifiers/perl-Class-Method-Modifiers.nm
new file mode 100644
index 000000000..e90ef3004
--- /dev/null
+++ b/perl-Class-Method-Modifiers/perl-Class-Method-Modifiers.nm
@@ -0,0 +1,48 @@
+###############################################################################
+# IPFire.org - An Open Source Firewall Solution #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
+###############################################################################
+
+name = perl-Class-Method-Modifiers
+version = 2.14
+release = 1
+thisapp = Class-Method-Modifiers-%{version}
+arch = noarch
+
+groups = Development/Libraries
+url = http://search.cpan.org/dist/Class-Method-Modifiers/
+license = GPL+ or Artistic
+summary = This module provides Moose-like method modifiers.
+
+description
+ Method modifiers are a convenient feature from the CLOS
+ (Common Lisp Object System) world.
+end
+
+source_dl = https://cpan.metacpan.org/authors/id/E/ET/ETHER/
+
+build
+ requires
+ perl(B)
+ perl(Carp)
+ perl(ExtUtils::MakeMaker)
+ perl(Test::More)
+ end
+
+ build
+ perl Makefile.PL INSTALLDIRS=vendor
+ make %{PARALLELISMFLAGS}
+ end
+
+ test
+ make test
+ end
+end
+
+packages
+ package %{name}
+ requires
+ perl(:MODULE_COMPAT_%{perl_version})
+ end
+ end
+end
diff --git a/perl-IO-All/perl-IO-All.nm b/perl-IO-All/perl-IO-All.nm
new file mode 100644
index 000000000..c903b9ac3
--- /dev/null
+++ b/perl-IO-All/perl-IO-All.nm
@@ -0,0 +1,50 @@
+###############################################################################
+# IPFire.org - An Open Source Firewall Solution #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
+###############################################################################
+
+name = perl-IO-All
+version = 0.87
+release = 1
+thisapp = IO-All-%{version}
+arch = noarch
+
+groups = Development/Libraries
+url = http://search.cpan.org/dist/IO-All/
+license = GPL+ or Artistic
+summary = An OO perl IO wrapper.
+
+description
+ IO::All combines all of the best Perl IO modules into a single nifty
+ object oriented interface to greatly simplify your everyday Perl IO idioms.
+
+ It exports a single function called io, which returns a new IO::All object.
+ And that object can do it all!
+end
+
+source_dl = https://cpan.metacpan.org/authors/id/F/FR/FREW/
+
+build
+ requires
+ perl(FindBin)
+ perl(ExtUtils::MakeMaker)
+ perl(Test::More)
+ end
+
+ build
+ perl Makefile.PL INSTALLDIRS=vendor
+ make %{PARALLELISMFLAGS}
+ end
+
+ #test
+ # make test
+ #end
+end
+
+packages
+ package %{name}
+ requires
+ perl(:MODULE_COMPAT_%{perl_version})
+ end
+ end
+end
diff --git a/perl-Module-Install-AuthorRequires/perl-Module-Install-AuthorRequires.nm b/perl-Module-Install-AuthorRequires/perl-Module-Install-AuthorRequires.nm
new file mode 100644
index 000000000..8a7d348dd
--- /dev/null
+++ b/perl-Module-Install-AuthorRequires/perl-Module-Install-AuthorRequires.nm
@@ -0,0 +1,48 @@
+###############################################################################
+# IPFire.org - An Open Source Firewall Solution #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
+###############################################################################
+
+name = perl-Module-Install-AuthorRequires
+version = 0.02
+release = 1
+arch = noarch
+
+groups = Development/Libratries
+url = http://search.cpan.org/dist/Module-Install-AuthorRequires/
+license = GPL+ or Artistic
+summary = Declare author-only dependencies.
+
+description
+ An extenision for the Module::Install to declare author-only dependencies.
+end
+
+source_dl = https://cpan.metacpan.org/authors/id/F/FL/FLORA/
+
+thisapp = Module-Install-AuthorRequires-%{version}
+
+build
+ requires
+ perl(FindBin)
+ perl(ExtUtils::MakeMaker)
+ perl(Module::Install)
+ perl(Test::More)
+ end
+
+ build
+ perl Makefile.PL INSTALLDIRS=vendor
+ make %{PARALLELISMFLAGS}
+ end
+
+ test
+ make test
+ end
+end
+
+packages
+ package %{name}
+ requires
+ perl(:MODULE_COMPAT_%{perl_version})
+ end
+ end
+end
diff --git a/perl-Module-Install-ManifestSkip/perl-Module-Install-ManifestSkip.nm b/perl-Module-Install-ManifestSkip/perl-Module-Install-ManifestSkip.nm
new file mode 100644
index 000000000..609eba4d4
--- /dev/null
+++ b/perl-Module-Install-ManifestSkip/perl-Module-Install-ManifestSkip.nm
@@ -0,0 +1,48 @@
+###############################################################################
+# IPFire.org - An Open Source Firewall Solution #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
+###############################################################################
+
+name = perl-Module-Install-ManifestSkip
+version = 0.24
+release = 1
+arch = noarch
+
+groups = Development/Libratries
+url = http://search.cpan.org/dist/Module-Install-ManifestSkip/
+license = GPL+ or Artistic
+summary = Generate a MANIFEST.SKIP file
+
+description
+ An extenision for the Module::Install to generate a MANIFEST.SKIP file.
+end
+
+source_dl = https://cpan.metacpan.org/authors/id/I/IN/INGY/
+
+thisapp = Module-Install-ManifestSkip-%{version}
+
+build
+ requires
+ perl(FindBin)
+ perl(ExtUtils::MakeMaker)
+ perl(Module::Install)
+ perl(Test::More)
+ end
+
+ build
+ perl Makefile.PL INSTALLDIRS=vendor
+ make %{PARALLELISMFLAGS}
+ end
+
+ test
+ make test
+ end
+end
+
+packages
+ package %{name}
+ requires
+ perl(:MODULE_COMPAT_%{perl_version})
+ end
+ end
+end
diff --git a/perl-Module-Package/patches/Module-Package-0.30-Fix-building-on-Perl-without-.-in-INC.patch b/perl-Module-Package/patches/Module-Package-0.30-Fix-building-on-Perl-without-.-in-INC.patch
new file mode 100644
index 000000000..81f5ebe0d
--- /dev/null
+++ b/perl-Module-Package/patches/Module-Package-0.30-Fix-building-on-Perl-without-.-in-INC.patch
@@ -0,0 +1,25 @@
+From fc4e65f8d43226739624e15fe3eefa0d05fd8f96 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar(a)redhat.com>
+Date: Wed, 17 May 2017 16:48:56 +0200
+Subject: [PATCH] Fix building on Perl without "." in @INC
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Petr Písař <ppisar(a)redhat.com>
+---
+ Makefile.PL | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Makefile.PL b/Makefile.PL
+index 93b5ed5..fffb0d1 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -1,3 +1,4 @@
++BEGIN { push @INC, '.'; }
+ use inc::Module::Package 'Ingy:modern 0.17';
+
+ # The default module 'lib/Module/Package.pm' has to be very strict
+--
+2.9.4
+
diff --git a/perl-Module-Package/perl-Module-Package.nm b/perl-Module-Package/perl-Module-Package.nm
new file mode 100644
index 000000000..3815ba11d
--- /dev/null
+++ b/perl-Module-Package/perl-Module-Package.nm
@@ -0,0 +1,54 @@
+###############################################################################
+# IPFire.org - An Open Source Firewall Solution #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
+###############################################################################
+
+name = perl-Module-Package
+version = 0.30
+release = 1
+arch = noarch
+
+groups = Development/Libratries
+url = http://search.cpan.org/dist/Module-Package/
+license = GPL+ or Artistic
+summary = Postmodern Perl Module Packaging
+
+description
+ This module is a dropin replacement for Module::Install.
+ It does everything Module::Install does, but just a bit better.
+end
+
+source_dl = https://cpan.metacpan.org/authors/id/I/IN/INGY/
+
+thisapp = Module-Package-%{version}
+
+build
+ requires
+ perl(FindBin)
+ perl(File::Find)
+ perl(IO::All)
+ perl(ExtUtils::MakeMaker)
+ perl(Module::Install)
+ perl(Module::Install::AuthorRequires)
+ perl(Module::Install::ManifestSkip)
+ perl(Moo)
+ perl(Test::More)
+ end
+
+ build
+ perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{CFLAGS}"
+ make %{PARALLELISMFLAGS}
+ end
+
+ test
+ make test
+ end
+end
+
+packages
+ package %{name}
+ requires
+ perl(:MODULE_COMPAT_%{perl_version})
+ end
+ end
+end
diff --git a/perl-Moo/perl-Moo.nm b/perl-Moo/perl-Moo.nm
new file mode 100644
index 000000000..622eacdc2
--- /dev/null
+++ b/perl-Moo/perl-Moo.nm
@@ -0,0 +1,52 @@
+###############################################################################
+# IPFire.org - An Open Source Firewall Solution #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
+###############################################################################
+
+name = perl-Moo
+version = 2.005005
+release = 1
+thisapp = Moo-%{version}
+arch = noarch
+
+groups = Development/Libraries
+url = http://search.cpan.org/dist/Moo/
+license = GPL+ or Artistic
+summary = Minimalist Object Orientation perl module.
+
+description
+ Moo is an extremely light-weight Object Orientation system. It allows
+ one to concisely define objects and roles with a convenient syntax that
+ avoids the details of Perl's object system.
+end
+
+source_dl = https://cpan.metacpan.org/authors/id/H/HA/HAARG/
+
+build
+ requires
+ perl(B::Deparse)
+ perl(Class::Method::Modifiers)
+ perl(ExtUtils::MakeMaker)
+ perl(Role::Tiny)
+ perl(Sub::Defer)
+ perl(Sub::Quote)
+ perl(Test::More)
+ end
+
+ build
+ perl Makefile.PL INSTALLDIRS=vendor
+ make %{PARALLELISMFLAGS}
+ end
+
+ test
+ make test
+ end
+end
+
+packages
+ package %{name}
+ requires
+ perl(:MODULE_COMPAT_%{perl_version})
+ end
+ end
+end
diff --git a/perl-Role-Tiny/perl-Role-Tiny.nm b/perl-Role-Tiny/perl-Role-Tiny.nm
new file mode 100644
index 000000000..d6d93a136
--- /dev/null
+++ b/perl-Role-Tiny/perl-Role-Tiny.nm
@@ -0,0 +1,47 @@
+###############################################################################
+# IPFire.org - An Open Source Firewall Solution #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
+###############################################################################
+
+name = perl-Role-Tiny
+version = 2.002004
+release = 1
+thisapp = Role-Tiny-%{version}
+arch = noarch
+
+groups = Development/Libraries
+url = http://search.cpan.org/dist/Moo/
+license = GPL+ or Artistic
+summary = Role::Tiny is a minimalist role composition tool.
+
+description
+ Role composition can be thought of as much more clever and meaningful
+ multiple inheritance.
+end
+
+source_dl = https://cpan.metacpan.org/authors/id/H/HA/HAARG/
+
+build
+ requires
+ perl(B)
+ perl(ExtUtils::MakeMaker)
+ perl(Test::More)
+ end
+
+ build
+ perl Makefile.PL INSTALLDIRS=vendor
+ make %{PARALLELISMFLAGS}
+ end
+
+ test
+ make test
+ end
+end
+
+packages
+ package %{name}
+ requires
+ perl(:MODULE_COMPAT_%{perl_version})
+ end
+ end
+end
diff --git a/perl-Sub-Quote/perl-Sub-Quote.nm b/perl-Sub-Quote/perl-Sub-Quote.nm
new file mode 100644
index 000000000..81bcce47c
--- /dev/null
+++ b/perl-Sub-Quote/perl-Sub-Quote.nm
@@ -0,0 +1,47 @@
+###############################################################################
+# IPFire.org - An Open Source Firewall Solution #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
+###############################################################################
+
+name = perl-Sub-Quote
+version = 2.006008
+release = 1
+thisapp = Sub-Quote-%{version}
+arch = noarch
+
+groups = Development/Libraries
+url = http://search.cpan.org/dist/Sub-Quote/
+license = GPL+ or Artistic
+summary = Efficient generation of subroutines via string eval
+
+description
+ This package provides performant ways to generate subroutines from
+ strings.
+end
+
+source_dl = https://cpan.metacpan.org/authors/id/H/HA/HAARG/
+
+build
+ requires
+ perl(B)
+ perl(ExtUtils::MakeMaker)
+ perl(Test::More)
+ end
+
+ build
+ perl Makefile.PL INSTALLDIRS=vendor
+ make %{PARALLELISMFLAGS}
+ end
+
+ test
+ make test
+ end
+end
+
+packages
+ package %{name}
+ requires
+ perl(:MODULE_COMPAT_%{perl_version})
+ end
+ end
+end
diff --git a/perl-YAML/perl-YAML.nm b/perl-YAML/perl-YAML.nm
index 73ec0f33e..4b8f3105d 100644
--- a/perl-YAML/perl-YAML.nm
+++ b/perl-YAML/perl-YAML.nm
@@ -5,7 +5,7 @@
name = perl-YAML
version = 0.84
-release = 2
+release = 2.1
arch = noarch
thisapp = YAML-%{version}
@@ -28,15 +28,14 @@ source_dl = http://search.cpan.org/CPAN/authors/id/M/MS/MSTROUT/
build
requires
- # required for perl macros
- pakfire-builder >= 0.9.23-6
-
perl(Carp)
perl(constant)
perl(Cwd)
perl(Data::Dumper)
+ perl(FindBin)
perl(Exporter)
perl(ExtUtils::MakeMaker)
+ perl(Module::Package)
perl(File::Path)
perl(lib)
diff --git a/squid/squid.nm b/squid/squid.nm
index 26cd46f6c..eca35788f 100644
--- a/squid/squid.nm
+++ b/squid/squid.nm
@@ -7,7 +7,7 @@ name = squid
major_ver = 5
minor_ver = 7
version = %{major_ver}.%{minor_ver}
-release = 1.1
+release = 1.2
groups = Networking/Daemons
url = https://www.squid-cache.org/
@@ -28,6 +28,7 @@ source_dl = http://www.squid-cache.org/Versions/v%{major_ver}/
build
requires
gcc-c++
+ libxcrypt-devel
libxml2-devel
openssl-devel
openldap-devel
hooks/post-receive
--
IPFire 3.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, next, updated. cf66a3f133428dcd51be0cc36161237c20cda84b
by Peter Müller 05 Mar '23
by Peter Müller 05 Mar '23
05 Mar '23
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 cf66a3f133428dcd51be0cc36161237c20cda84b (commit)
from 6173f6ba149cf5bd70a92b48d99be32c75590433 (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 cf66a3f133428dcd51be0cc36161237c20cda84b
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sun Mar 5 15:56:28 2023 +0000
Revert "grub: Fix for riscv64 rootfile"
This reverts commit 6d3e6cfc16cb734d1923c5bb2c41e70433113a33.
Arne informed me via the phone that this patch has to be reverted, since
his changes for riscv64 already made it redundant. Keeping it would
cause rootfile quirks to the riscv64 builds.
Reported-by: Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org>
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/x86_64/grub | 1092 +++++++++++++++++------------------
1 file changed, 546 insertions(+), 546 deletions(-)
Difference in files:
diff --git a/config/rootfiles/common/x86_64/grub b/config/rootfiles/common/x86_64/grub
index 96836776c..737fa8ccb 100644
--- a/config/rootfiles/common/x86_64/grub
+++ b/config/rootfiles/common/x86_64/grub
@@ -607,552 +607,552 @@ usr/lib/grub/i386-pc/zfsinfo.mod
usr/lib/grub/i386-pc/zfsinfo.module
usr/lib/grub/i386-pc/zstd.mod
usr/lib/grub/i386-pc/zstd.module
-#usr/lib/grub/xxxMACHINExxx-efi
-usr/lib/grub/xxxMACHINExxx-efi/acpi.mod
-usr/lib/grub/xxxMACHINExxx-efi/acpi.module
-usr/lib/grub/xxxMACHINExxx-efi/adler32.mod
-usr/lib/grub/xxxMACHINExxx-efi/adler32.module
-usr/lib/grub/xxxMACHINExxx-efi/affs.mod
-usr/lib/grub/xxxMACHINExxx-efi/affs.module
-usr/lib/grub/xxxMACHINExxx-efi/afs.mod
-usr/lib/grub/xxxMACHINExxx-efi/afs.module
-usr/lib/grub/xxxMACHINExxx-efi/afsplitter.mod
-usr/lib/grub/xxxMACHINExxx-efi/afsplitter.module
-usr/lib/grub/xxxMACHINExxx-efi/ahci.mod
-usr/lib/grub/xxxMACHINExxx-efi/ahci.module
-usr/lib/grub/xxxMACHINExxx-efi/all_video.mod
-usr/lib/grub/xxxMACHINExxx-efi/all_video.module
-usr/lib/grub/xxxMACHINExxx-efi/aout.mod
-usr/lib/grub/xxxMACHINExxx-efi/aout.module
-usr/lib/grub/xxxMACHINExxx-efi/appleldr.mod
-usr/lib/grub/xxxMACHINExxx-efi/appleldr.module
-usr/lib/grub/xxxMACHINExxx-efi/archelp.mod
-usr/lib/grub/xxxMACHINExxx-efi/archelp.module
-usr/lib/grub/xxxMACHINExxx-efi/at_keyboard.mod
-usr/lib/grub/xxxMACHINExxx-efi/at_keyboard.module
-usr/lib/grub/xxxMACHINExxx-efi/ata.mod
-usr/lib/grub/xxxMACHINExxx-efi/ata.module
-usr/lib/grub/xxxMACHINExxx-efi/backtrace.mod
-usr/lib/grub/xxxMACHINExxx-efi/backtrace.module
-usr/lib/grub/xxxMACHINExxx-efi/bfs.mod
-usr/lib/grub/xxxMACHINExxx-efi/bfs.module
-usr/lib/grub/xxxMACHINExxx-efi/bitmap.mod
-usr/lib/grub/xxxMACHINExxx-efi/bitmap.module
-usr/lib/grub/xxxMACHINExxx-efi/bitmap_scale.mod
-usr/lib/grub/xxxMACHINExxx-efi/bitmap_scale.module
-usr/lib/grub/xxxMACHINExxx-efi/blocklist.mod
-usr/lib/grub/xxxMACHINExxx-efi/blocklist.module
-usr/lib/grub/xxxMACHINExxx-efi/boot.mod
-usr/lib/grub/xxxMACHINExxx-efi/boot.module
-usr/lib/grub/xxxMACHINExxx-efi/bsd.mod
-usr/lib/grub/xxxMACHINExxx-efi/bsd.module
-usr/lib/grub/xxxMACHINExxx-efi/bswap_test.mod
-usr/lib/grub/xxxMACHINExxx-efi/bswap_test.module
-usr/lib/grub/xxxMACHINExxx-efi/btrfs.mod
-usr/lib/grub/xxxMACHINExxx-efi/btrfs.module
-usr/lib/grub/xxxMACHINExxx-efi/bufio.mod
-usr/lib/grub/xxxMACHINExxx-efi/bufio.module
-usr/lib/grub/xxxMACHINExxx-efi/cat.mod
-usr/lib/grub/xxxMACHINExxx-efi/cat.module
-usr/lib/grub/xxxMACHINExxx-efi/cbfs.mod
-usr/lib/grub/xxxMACHINExxx-efi/cbfs.module
-usr/lib/grub/xxxMACHINExxx-efi/cbls.mod
-usr/lib/grub/xxxMACHINExxx-efi/cbls.module
-usr/lib/grub/xxxMACHINExxx-efi/cbmemc.mod
-usr/lib/grub/xxxMACHINExxx-efi/cbmemc.module
-usr/lib/grub/xxxMACHINExxx-efi/cbtable.mod
-usr/lib/grub/xxxMACHINExxx-efi/cbtable.module
-usr/lib/grub/xxxMACHINExxx-efi/cbtime.mod
-usr/lib/grub/xxxMACHINExxx-efi/cbtime.module
-usr/lib/grub/xxxMACHINExxx-efi/chain.mod
-usr/lib/grub/xxxMACHINExxx-efi/chain.module
-usr/lib/grub/xxxMACHINExxx-efi/cmdline_cat_test.mod
-usr/lib/grub/xxxMACHINExxx-efi/cmdline_cat_test.module
-usr/lib/grub/xxxMACHINExxx-efi/cmp.mod
-usr/lib/grub/xxxMACHINExxx-efi/cmp.module
-usr/lib/grub/xxxMACHINExxx-efi/cmp_test.mod
-usr/lib/grub/xxxMACHINExxx-efi/cmp_test.module
-usr/lib/grub/xxxMACHINExxx-efi/command.lst
-usr/lib/grub/xxxMACHINExxx-efi/config.h
-usr/lib/grub/xxxMACHINExxx-efi/configfile.mod
-usr/lib/grub/xxxMACHINExxx-efi/configfile.module
-usr/lib/grub/xxxMACHINExxx-efi/cpio.mod
-usr/lib/grub/xxxMACHINExxx-efi/cpio.module
-usr/lib/grub/xxxMACHINExxx-efi/cpio_be.mod
-usr/lib/grub/xxxMACHINExxx-efi/cpio_be.module
-usr/lib/grub/xxxMACHINExxx-efi/cpuid.mod
-usr/lib/grub/xxxMACHINExxx-efi/cpuid.module
-usr/lib/grub/xxxMACHINExxx-efi/crc64.mod
-usr/lib/grub/xxxMACHINExxx-efi/crc64.module
-usr/lib/grub/xxxMACHINExxx-efi/crypto.lst
-usr/lib/grub/xxxMACHINExxx-efi/crypto.mod
-usr/lib/grub/xxxMACHINExxx-efi/crypto.module
-usr/lib/grub/xxxMACHINExxx-efi/cryptodisk.mod
-usr/lib/grub/xxxMACHINExxx-efi/cryptodisk.module
-usr/lib/grub/xxxMACHINExxx-efi/cs5536.mod
-usr/lib/grub/xxxMACHINExxx-efi/cs5536.module
-usr/lib/grub/xxxMACHINExxx-efi/ctz_test.mod
-usr/lib/grub/xxxMACHINExxx-efi/ctz_test.module
-usr/lib/grub/xxxMACHINExxx-efi/date.mod
-usr/lib/grub/xxxMACHINExxx-efi/date.module
-usr/lib/grub/xxxMACHINExxx-efi/datehook.mod
-usr/lib/grub/xxxMACHINExxx-efi/datehook.module
-usr/lib/grub/xxxMACHINExxx-efi/datetime.mod
-usr/lib/grub/xxxMACHINExxx-efi/datetime.module
-usr/lib/grub/xxxMACHINExxx-efi/disk.mod
-usr/lib/grub/xxxMACHINExxx-efi/disk.module
-usr/lib/grub/xxxMACHINExxx-efi/diskfilter.mod
-usr/lib/grub/xxxMACHINExxx-efi/diskfilter.module
-usr/lib/grub/xxxMACHINExxx-efi/div.mod
-usr/lib/grub/xxxMACHINExxx-efi/div.module
-usr/lib/grub/xxxMACHINExxx-efi/div_test.mod
-usr/lib/grub/xxxMACHINExxx-efi/div_test.module
-usr/lib/grub/xxxMACHINExxx-efi/dm_nv.mod
-usr/lib/grub/xxxMACHINExxx-efi/dm_nv.module
-usr/lib/grub/xxxMACHINExxx-efi/echo.mod
-usr/lib/grub/xxxMACHINExxx-efi/echo.module
-usr/lib/grub/xxxMACHINExxx-efi/efi_gop.mod
-usr/lib/grub/xxxMACHINExxx-efi/efi_gop.module
-usr/lib/grub/xxxMACHINExxx-efi/efi_uga.mod
-usr/lib/grub/xxxMACHINExxx-efi/efi_uga.module
-usr/lib/grub/xxxMACHINExxx-efi/efifwsetup.mod
-usr/lib/grub/xxxMACHINExxx-efi/efifwsetup.module
-usr/lib/grub/xxxMACHINExxx-efi/efinet.mod
-usr/lib/grub/xxxMACHINExxx-efi/efinet.module
-usr/lib/grub/xxxMACHINExxx-efi/ehci.mod
-usr/lib/grub/xxxMACHINExxx-efi/ehci.module
-usr/lib/grub/xxxMACHINExxx-efi/elf.mod
-usr/lib/grub/xxxMACHINExxx-efi/elf.module
-usr/lib/grub/xxxMACHINExxx-efi/eval.mod
-usr/lib/grub/xxxMACHINExxx-efi/eval.module
-usr/lib/grub/xxxMACHINExxx-efi/exfat.mod
-usr/lib/grub/xxxMACHINExxx-efi/exfat.module
-usr/lib/grub/xxxMACHINExxx-efi/exfctest.mod
-usr/lib/grub/xxxMACHINExxx-efi/exfctest.module
-usr/lib/grub/xxxMACHINExxx-efi/ext2.mod
-usr/lib/grub/xxxMACHINExxx-efi/ext2.module
-usr/lib/grub/xxxMACHINExxx-efi/extcmd.mod
-usr/lib/grub/xxxMACHINExxx-efi/extcmd.module
-usr/lib/grub/xxxMACHINExxx-efi/f2fs.mod
-usr/lib/grub/xxxMACHINExxx-efi/f2fs.module
-usr/lib/grub/xxxMACHINExxx-efi/fat.mod
-usr/lib/grub/xxxMACHINExxx-efi/fat.module
-usr/lib/grub/xxxMACHINExxx-efi/fdt.lst
-usr/lib/grub/xxxMACHINExxx-efi/file.mod
-usr/lib/grub/xxxMACHINExxx-efi/file.module
-usr/lib/grub/xxxMACHINExxx-efi/fixvideo.mod
-usr/lib/grub/xxxMACHINExxx-efi/fixvideo.module
-usr/lib/grub/xxxMACHINExxx-efi/font.mod
-usr/lib/grub/xxxMACHINExxx-efi/font.module
-usr/lib/grub/xxxMACHINExxx-efi/fs.lst
-usr/lib/grub/xxxMACHINExxx-efi/fshelp.mod
-usr/lib/grub/xxxMACHINExxx-efi/fshelp.module
-usr/lib/grub/xxxMACHINExxx-efi/functional_test.mod
-usr/lib/grub/xxxMACHINExxx-efi/functional_test.module
-usr/lib/grub/xxxMACHINExxx-efi/gcry_arcfour.mod
-usr/lib/grub/xxxMACHINExxx-efi/gcry_arcfour.module
-usr/lib/grub/xxxMACHINExxx-efi/gcry_blowfish.mod
-usr/lib/grub/xxxMACHINExxx-efi/gcry_blowfish.module
-usr/lib/grub/xxxMACHINExxx-efi/gcry_camellia.mod
-usr/lib/grub/xxxMACHINExxx-efi/gcry_camellia.module
-usr/lib/grub/xxxMACHINExxx-efi/gcry_cast5.mod
-usr/lib/grub/xxxMACHINExxx-efi/gcry_cast5.module
-usr/lib/grub/xxxMACHINExxx-efi/gcry_crc.mod
-usr/lib/grub/xxxMACHINExxx-efi/gcry_crc.module
-usr/lib/grub/xxxMACHINExxx-efi/gcry_des.mod
-usr/lib/grub/xxxMACHINExxx-efi/gcry_des.module
-usr/lib/grub/xxxMACHINExxx-efi/gcry_dsa.mod
-usr/lib/grub/xxxMACHINExxx-efi/gcry_dsa.module
-usr/lib/grub/xxxMACHINExxx-efi/gcry_idea.mod
-usr/lib/grub/xxxMACHINExxx-efi/gcry_idea.module
-usr/lib/grub/xxxMACHINExxx-efi/gcry_md4.mod
-usr/lib/grub/xxxMACHINExxx-efi/gcry_md4.module
-usr/lib/grub/xxxMACHINExxx-efi/gcry_md5.mod
-usr/lib/grub/xxxMACHINExxx-efi/gcry_md5.module
-usr/lib/grub/xxxMACHINExxx-efi/gcry_rfc2268.mod
-usr/lib/grub/xxxMACHINExxx-efi/gcry_rfc2268.module
-usr/lib/grub/xxxMACHINExxx-efi/gcry_rijndael.mod
-usr/lib/grub/xxxMACHINExxx-efi/gcry_rijndael.module
-usr/lib/grub/xxxMACHINExxx-efi/gcry_rmd160.mod
-usr/lib/grub/xxxMACHINExxx-efi/gcry_rmd160.module
-usr/lib/grub/xxxMACHINExxx-efi/gcry_rsa.mod
-usr/lib/grub/xxxMACHINExxx-efi/gcry_rsa.module
-usr/lib/grub/xxxMACHINExxx-efi/gcry_seed.mod
-usr/lib/grub/xxxMACHINExxx-efi/gcry_seed.module
-usr/lib/grub/xxxMACHINExxx-efi/gcry_serpent.mod
-usr/lib/grub/xxxMACHINExxx-efi/gcry_serpent.module
-usr/lib/grub/xxxMACHINExxx-efi/gcry_sha1.mod
-usr/lib/grub/xxxMACHINExxx-efi/gcry_sha1.module
-usr/lib/grub/xxxMACHINExxx-efi/gcry_sha256.mod
-usr/lib/grub/xxxMACHINExxx-efi/gcry_sha256.module
-usr/lib/grub/xxxMACHINExxx-efi/gcry_sha512.mod
-usr/lib/grub/xxxMACHINExxx-efi/gcry_sha512.module
-usr/lib/grub/xxxMACHINExxx-efi/gcry_tiger.mod
-usr/lib/grub/xxxMACHINExxx-efi/gcry_tiger.module
-usr/lib/grub/xxxMACHINExxx-efi/gcry_twofish.mod
-usr/lib/grub/xxxMACHINExxx-efi/gcry_twofish.module
-usr/lib/grub/xxxMACHINExxx-efi/gcry_whirlpool.mod
-usr/lib/grub/xxxMACHINExxx-efi/gcry_whirlpool.module
-usr/lib/grub/xxxMACHINExxx-efi/gdb_grub
-usr/lib/grub/xxxMACHINExxx-efi/geli.mod
-usr/lib/grub/xxxMACHINExxx-efi/geli.module
-usr/lib/grub/xxxMACHINExxx-efi/gettext.mod
-usr/lib/grub/xxxMACHINExxx-efi/gettext.module
-usr/lib/grub/xxxMACHINExxx-efi/gfxmenu.mod
-usr/lib/grub/xxxMACHINExxx-efi/gfxmenu.module
-usr/lib/grub/xxxMACHINExxx-efi/gfxterm.mod
-usr/lib/grub/xxxMACHINExxx-efi/gfxterm.module
-usr/lib/grub/xxxMACHINExxx-efi/gfxterm_background.mod
-usr/lib/grub/xxxMACHINExxx-efi/gfxterm_background.module
-usr/lib/grub/xxxMACHINExxx-efi/gfxterm_menu.mod
-usr/lib/grub/xxxMACHINExxx-efi/gfxterm_menu.module
-usr/lib/grub/xxxMACHINExxx-efi/gmodule.pl
-usr/lib/grub/xxxMACHINExxx-efi/gptsync.mod
-usr/lib/grub/xxxMACHINExxx-efi/gptsync.module
-usr/lib/grub/xxxMACHINExxx-efi/gzio.mod
-usr/lib/grub/xxxMACHINExxx-efi/gzio.module
-usr/lib/grub/xxxMACHINExxx-efi/halt.mod
-usr/lib/grub/xxxMACHINExxx-efi/halt.module
-usr/lib/grub/xxxMACHINExxx-efi/hashsum.mod
-usr/lib/grub/xxxMACHINExxx-efi/hashsum.module
-usr/lib/grub/xxxMACHINExxx-efi/hdparm.mod
-usr/lib/grub/xxxMACHINExxx-efi/hdparm.module
-usr/lib/grub/xxxMACHINExxx-efi/hello.mod
-usr/lib/grub/xxxMACHINExxx-efi/hello.module
-usr/lib/grub/xxxMACHINExxx-efi/help.mod
-usr/lib/grub/xxxMACHINExxx-efi/help.module
-usr/lib/grub/xxxMACHINExxx-efi/hexdump.mod
-usr/lib/grub/xxxMACHINExxx-efi/hexdump.module
-usr/lib/grub/xxxMACHINExxx-efi/hfs.mod
-usr/lib/grub/xxxMACHINExxx-efi/hfs.module
-usr/lib/grub/xxxMACHINExxx-efi/hfsplus.mod
-usr/lib/grub/xxxMACHINExxx-efi/hfsplus.module
-usr/lib/grub/xxxMACHINExxx-efi/hfspluscomp.mod
-usr/lib/grub/xxxMACHINExxx-efi/hfspluscomp.module
-usr/lib/grub/xxxMACHINExxx-efi/http.mod
-usr/lib/grub/xxxMACHINExxx-efi/http.module
-usr/lib/grub/xxxMACHINExxx-efi/iorw.mod
-usr/lib/grub/xxxMACHINExxx-efi/iorw.module
-usr/lib/grub/xxxMACHINExxx-efi/iso9660.mod
-usr/lib/grub/xxxMACHINExxx-efi/iso9660.module
-usr/lib/grub/xxxMACHINExxx-efi/jfs.mod
-usr/lib/grub/xxxMACHINExxx-efi/jfs.module
-usr/lib/grub/xxxMACHINExxx-efi/jpeg.mod
-usr/lib/grub/xxxMACHINExxx-efi/jpeg.module
-usr/lib/grub/xxxMACHINExxx-efi/json.mod
-usr/lib/grub/xxxMACHINExxx-efi/json.module
-usr/lib/grub/xxxMACHINExxx-efi/kernel.exec
-usr/lib/grub/xxxMACHINExxx-efi/kernel.img
-usr/lib/grub/xxxMACHINExxx-efi/keylayouts.mod
-usr/lib/grub/xxxMACHINExxx-efi/keylayouts.module
-usr/lib/grub/xxxMACHINExxx-efi/keystatus.mod
-usr/lib/grub/xxxMACHINExxx-efi/keystatus.module
-usr/lib/grub/xxxMACHINExxx-efi/ldm.mod
-usr/lib/grub/xxxMACHINExxx-efi/ldm.module
-usr/lib/grub/xxxMACHINExxx-efi/legacy_password_test.mod
-usr/lib/grub/xxxMACHINExxx-efi/legacy_password_test.module
-usr/lib/grub/xxxMACHINExxx-efi/legacycfg.mod
-usr/lib/grub/xxxMACHINExxx-efi/legacycfg.module
-usr/lib/grub/xxxMACHINExxx-efi/linux.mod
-usr/lib/grub/xxxMACHINExxx-efi/linux.module
-usr/lib/grub/xxxMACHINExxx-efi/linux16.mod
-usr/lib/grub/xxxMACHINExxx-efi/linux16.module
-usr/lib/grub/xxxMACHINExxx-efi/loadbios.mod
-usr/lib/grub/xxxMACHINExxx-efi/loadbios.module
-usr/lib/grub/xxxMACHINExxx-efi/loadenv.mod
-usr/lib/grub/xxxMACHINExxx-efi/loadenv.module
-usr/lib/grub/xxxMACHINExxx-efi/loopback.mod
-usr/lib/grub/xxxMACHINExxx-efi/loopback.module
-usr/lib/grub/xxxMACHINExxx-efi/ls.mod
-usr/lib/grub/xxxMACHINExxx-efi/ls.module
-usr/lib/grub/xxxMACHINExxx-efi/lsacpi.mod
-usr/lib/grub/xxxMACHINExxx-efi/lsacpi.module
-usr/lib/grub/xxxMACHINExxx-efi/lsefi.mod
-usr/lib/grub/xxxMACHINExxx-efi/lsefi.module
-usr/lib/grub/xxxMACHINExxx-efi/lsefimmap.mod
-usr/lib/grub/xxxMACHINExxx-efi/lsefimmap.module
-usr/lib/grub/xxxMACHINExxx-efi/lsefisystab.mod
-usr/lib/grub/xxxMACHINExxx-efi/lsefisystab.module
-usr/lib/grub/xxxMACHINExxx-efi/lsmmap.mod
-usr/lib/grub/xxxMACHINExxx-efi/lsmmap.module
-usr/lib/grub/xxxMACHINExxx-efi/lspci.mod
-usr/lib/grub/xxxMACHINExxx-efi/lspci.module
-usr/lib/grub/xxxMACHINExxx-efi/lssal.mod
-usr/lib/grub/xxxMACHINExxx-efi/lssal.module
-usr/lib/grub/xxxMACHINExxx-efi/luks.mod
-usr/lib/grub/xxxMACHINExxx-efi/luks.module
-usr/lib/grub/xxxMACHINExxx-efi/luks2.mod
-usr/lib/grub/xxxMACHINExxx-efi/luks2.module
-usr/lib/grub/xxxMACHINExxx-efi/lvm.mod
-usr/lib/grub/xxxMACHINExxx-efi/lvm.module
-usr/lib/grub/xxxMACHINExxx-efi/lzopio.mod
-usr/lib/grub/xxxMACHINExxx-efi/lzopio.module
-usr/lib/grub/xxxMACHINExxx-efi/macbless.mod
-usr/lib/grub/xxxMACHINExxx-efi/macbless.module
-usr/lib/grub/xxxMACHINExxx-efi/macho.mod
-usr/lib/grub/xxxMACHINExxx-efi/macho.module
-usr/lib/grub/xxxMACHINExxx-efi/mdraid09.mod
-usr/lib/grub/xxxMACHINExxx-efi/mdraid09.module
-usr/lib/grub/xxxMACHINExxx-efi/mdraid09_be.mod
-usr/lib/grub/xxxMACHINExxx-efi/mdraid09_be.module
-usr/lib/grub/xxxMACHINExxx-efi/mdraid1x.mod
-usr/lib/grub/xxxMACHINExxx-efi/mdraid1x.module
-usr/lib/grub/xxxMACHINExxx-efi/memdisk.mod
-usr/lib/grub/xxxMACHINExxx-efi/memdisk.module
-usr/lib/grub/xxxMACHINExxx-efi/memrw.mod
-usr/lib/grub/xxxMACHINExxx-efi/memrw.module
-usr/lib/grub/xxxMACHINExxx-efi/minicmd.mod
-usr/lib/grub/xxxMACHINExxx-efi/minicmd.module
-usr/lib/grub/xxxMACHINExxx-efi/minix.mod
-usr/lib/grub/xxxMACHINExxx-efi/minix.module
-usr/lib/grub/xxxMACHINExxx-efi/minix2.mod
-usr/lib/grub/xxxMACHINExxx-efi/minix2.module
-usr/lib/grub/xxxMACHINExxx-efi/minix2_be.mod
-usr/lib/grub/xxxMACHINExxx-efi/minix2_be.module
-usr/lib/grub/xxxMACHINExxx-efi/minix3.mod
-usr/lib/grub/xxxMACHINExxx-efi/minix3.module
-usr/lib/grub/xxxMACHINExxx-efi/minix3_be.mod
-usr/lib/grub/xxxMACHINExxx-efi/minix3_be.module
-usr/lib/grub/xxxMACHINExxx-efi/minix_be.mod
-usr/lib/grub/xxxMACHINExxx-efi/minix_be.module
-usr/lib/grub/xxxMACHINExxx-efi/mmap.mod
-usr/lib/grub/xxxMACHINExxx-efi/mmap.module
-usr/lib/grub/xxxMACHINExxx-efi/moddep.lst
-usr/lib/grub/xxxMACHINExxx-efi/modinfo.sh
-usr/lib/grub/xxxMACHINExxx-efi/morse.mod
-usr/lib/grub/xxxMACHINExxx-efi/morse.module
-usr/lib/grub/xxxMACHINExxx-efi/mpi.mod
-usr/lib/grub/xxxMACHINExxx-efi/mpi.module
-usr/lib/grub/xxxMACHINExxx-efi/msdospart.mod
-usr/lib/grub/xxxMACHINExxx-efi/msdospart.module
-usr/lib/grub/xxxMACHINExxx-efi/mul_test.mod
-usr/lib/grub/xxxMACHINExxx-efi/mul_test.module
-usr/lib/grub/xxxMACHINExxx-efi/multiboot.mod
-usr/lib/grub/xxxMACHINExxx-efi/multiboot.module
-usr/lib/grub/xxxMACHINExxx-efi/multiboot2.mod
-usr/lib/grub/xxxMACHINExxx-efi/multiboot2.module
-usr/lib/grub/xxxMACHINExxx-efi/nativedisk.mod
-usr/lib/grub/xxxMACHINExxx-efi/nativedisk.module
-usr/lib/grub/xxxMACHINExxx-efi/net.mod
-usr/lib/grub/xxxMACHINExxx-efi/net.module
-usr/lib/grub/xxxMACHINExxx-efi/newc.mod
-usr/lib/grub/xxxMACHINExxx-efi/newc.module
-usr/lib/grub/xxxMACHINExxx-efi/nilfs2.mod
-usr/lib/grub/xxxMACHINExxx-efi/nilfs2.module
-usr/lib/grub/xxxMACHINExxx-efi/normal.mod
-usr/lib/grub/xxxMACHINExxx-efi/normal.module
-usr/lib/grub/xxxMACHINExxx-efi/ntfs.mod
-usr/lib/grub/xxxMACHINExxx-efi/ntfs.module
-usr/lib/grub/xxxMACHINExxx-efi/ntfscomp.mod
-usr/lib/grub/xxxMACHINExxx-efi/ntfscomp.module
-usr/lib/grub/xxxMACHINExxx-efi/odc.mod
-usr/lib/grub/xxxMACHINExxx-efi/odc.module
-usr/lib/grub/xxxMACHINExxx-efi/offsetio.mod
-usr/lib/grub/xxxMACHINExxx-efi/offsetio.module
-usr/lib/grub/xxxMACHINExxx-efi/ohci.mod
-usr/lib/grub/xxxMACHINExxx-efi/ohci.module
-usr/lib/grub/xxxMACHINExxx-efi/part_acorn.mod
-usr/lib/grub/xxxMACHINExxx-efi/part_acorn.module
-usr/lib/grub/xxxMACHINExxx-efi/part_amiga.mod
-usr/lib/grub/xxxMACHINExxx-efi/part_amiga.module
-usr/lib/grub/xxxMACHINExxx-efi/part_apple.mod
-usr/lib/grub/xxxMACHINExxx-efi/part_apple.module
-usr/lib/grub/xxxMACHINExxx-efi/part_bsd.mod
-usr/lib/grub/xxxMACHINExxx-efi/part_bsd.module
-usr/lib/grub/xxxMACHINExxx-efi/part_dfly.mod
-usr/lib/grub/xxxMACHINExxx-efi/part_dfly.module
-usr/lib/grub/xxxMACHINExxx-efi/part_dvh.mod
-usr/lib/grub/xxxMACHINExxx-efi/part_dvh.module
-usr/lib/grub/xxxMACHINExxx-efi/part_gpt.mod
-usr/lib/grub/xxxMACHINExxx-efi/part_gpt.module
-usr/lib/grub/xxxMACHINExxx-efi/part_msdos.mod
-usr/lib/grub/xxxMACHINExxx-efi/part_msdos.module
-usr/lib/grub/xxxMACHINExxx-efi/part_plan.mod
-usr/lib/grub/xxxMACHINExxx-efi/part_plan.module
-usr/lib/grub/xxxMACHINExxx-efi/part_sun.mod
-usr/lib/grub/xxxMACHINExxx-efi/part_sun.module
-usr/lib/grub/xxxMACHINExxx-efi/part_sunpc.mod
-usr/lib/grub/xxxMACHINExxx-efi/part_sunpc.module
-usr/lib/grub/xxxMACHINExxx-efi/partmap.lst
-usr/lib/grub/xxxMACHINExxx-efi/parttool.lst
-usr/lib/grub/xxxMACHINExxx-efi/parttool.mod
-usr/lib/grub/xxxMACHINExxx-efi/parttool.module
-usr/lib/grub/xxxMACHINExxx-efi/password.mod
-usr/lib/grub/xxxMACHINExxx-efi/password.module
-usr/lib/grub/xxxMACHINExxx-efi/password_pbkdf2.mod
-usr/lib/grub/xxxMACHINExxx-efi/password_pbkdf2.module
-usr/lib/grub/xxxMACHINExxx-efi/pata.mod
-usr/lib/grub/xxxMACHINExxx-efi/pata.module
-usr/lib/grub/xxxMACHINExxx-efi/pbkdf2.mod
-usr/lib/grub/xxxMACHINExxx-efi/pbkdf2.module
-usr/lib/grub/xxxMACHINExxx-efi/pbkdf2_test.mod
-usr/lib/grub/xxxMACHINExxx-efi/pbkdf2_test.module
-usr/lib/grub/xxxMACHINExxx-efi/pcidump.mod
-usr/lib/grub/xxxMACHINExxx-efi/pcidump.module
-usr/lib/grub/xxxMACHINExxx-efi/pgp.mod
-usr/lib/grub/xxxMACHINExxx-efi/pgp.module
-usr/lib/grub/xxxMACHINExxx-efi/play.mod
-usr/lib/grub/xxxMACHINExxx-efi/play.module
-usr/lib/grub/xxxMACHINExxx-efi/png.mod
-usr/lib/grub/xxxMACHINExxx-efi/png.module
-usr/lib/grub/xxxMACHINExxx-efi/priority_queue.mod
-usr/lib/grub/xxxMACHINExxx-efi/priority_queue.module
-usr/lib/grub/xxxMACHINExxx-efi/probe.mod
-usr/lib/grub/xxxMACHINExxx-efi/probe.module
-usr/lib/grub/xxxMACHINExxx-efi/procfs.mod
-usr/lib/grub/xxxMACHINExxx-efi/procfs.module
-usr/lib/grub/xxxMACHINExxx-efi/progress.mod
-usr/lib/grub/xxxMACHINExxx-efi/progress.module
-usr/lib/grub/xxxMACHINExxx-efi/raid5rec.mod
-usr/lib/grub/xxxMACHINExxx-efi/raid5rec.module
-usr/lib/grub/xxxMACHINExxx-efi/raid6rec.mod
-usr/lib/grub/xxxMACHINExxx-efi/raid6rec.module
-usr/lib/grub/xxxMACHINExxx-efi/random.mod
-usr/lib/grub/xxxMACHINExxx-efi/random.module
-usr/lib/grub/xxxMACHINExxx-efi/rdmsr.mod
-usr/lib/grub/xxxMACHINExxx-efi/rdmsr.module
-usr/lib/grub/xxxMACHINExxx-efi/read.mod
-usr/lib/grub/xxxMACHINExxx-efi/read.module
-usr/lib/grub/xxxMACHINExxx-efi/reboot.mod
-usr/lib/grub/xxxMACHINExxx-efi/reboot.module
-usr/lib/grub/xxxMACHINExxx-efi/regexp.mod
-usr/lib/grub/xxxMACHINExxx-efi/regexp.module
-usr/lib/grub/xxxMACHINExxx-efi/reiserfs.mod
-usr/lib/grub/xxxMACHINExxx-efi/reiserfs.module
-usr/lib/grub/xxxMACHINExxx-efi/relocator.mod
-usr/lib/grub/xxxMACHINExxx-efi/relocator.module
-usr/lib/grub/xxxMACHINExxx-efi/romfs.mod
-usr/lib/grub/xxxMACHINExxx-efi/romfs.module
-usr/lib/grub/xxxMACHINExxx-efi/scsi.mod
-usr/lib/grub/xxxMACHINExxx-efi/scsi.module
-usr/lib/grub/xxxMACHINExxx-efi/search.mod
-usr/lib/grub/xxxMACHINExxx-efi/search.module
-usr/lib/grub/xxxMACHINExxx-efi/search_fs_file.mod
-usr/lib/grub/xxxMACHINExxx-efi/search_fs_file.module
-usr/lib/grub/xxxMACHINExxx-efi/search_fs_uuid.mod
-usr/lib/grub/xxxMACHINExxx-efi/search_fs_uuid.module
-usr/lib/grub/xxxMACHINExxx-efi/search_label.mod
-usr/lib/grub/xxxMACHINExxx-efi/search_label.module
-usr/lib/grub/xxxMACHINExxx-efi/serial.mod
-usr/lib/grub/xxxMACHINExxx-efi/serial.module
-usr/lib/grub/xxxMACHINExxx-efi/setjmp.mod
-usr/lib/grub/xxxMACHINExxx-efi/setjmp.module
-usr/lib/grub/xxxMACHINExxx-efi/setjmp_test.mod
-usr/lib/grub/xxxMACHINExxx-efi/setjmp_test.module
-usr/lib/grub/xxxMACHINExxx-efi/setpci.mod
-usr/lib/grub/xxxMACHINExxx-efi/setpci.module
-usr/lib/grub/xxxMACHINExxx-efi/sfs.mod
-usr/lib/grub/xxxMACHINExxx-efi/sfs.module
-usr/lib/grub/xxxMACHINExxx-efi/shift_test.mod
-usr/lib/grub/xxxMACHINExxx-efi/shift_test.module
-usr/lib/grub/xxxMACHINExxx-efi/signature_test.mod
-usr/lib/grub/xxxMACHINExxx-efi/signature_test.module
-usr/lib/grub/xxxMACHINExxx-efi/sleep.mod
-usr/lib/grub/xxxMACHINExxx-efi/sleep.module
-usr/lib/grub/xxxMACHINExxx-efi/sleep_test.mod
-usr/lib/grub/xxxMACHINExxx-efi/sleep_test.module
-usr/lib/grub/xxxMACHINExxx-efi/smbios.mod
-usr/lib/grub/xxxMACHINExxx-efi/smbios.module
-usr/lib/grub/xxxMACHINExxx-efi/spkmodem.mod
-usr/lib/grub/xxxMACHINExxx-efi/spkmodem.module
-usr/lib/grub/xxxMACHINExxx-efi/squash4.mod
-usr/lib/grub/xxxMACHINExxx-efi/squash4.module
-usr/lib/grub/xxxMACHINExxx-efi/strtoull_test.mod
-usr/lib/grub/xxxMACHINExxx-efi/strtoull_test.module
-usr/lib/grub/xxxMACHINExxx-efi/syslinuxcfg.mod
-usr/lib/grub/xxxMACHINExxx-efi/syslinuxcfg.module
-usr/lib/grub/xxxMACHINExxx-efi/tar.mod
-usr/lib/grub/xxxMACHINExxx-efi/tar.module
-usr/lib/grub/xxxMACHINExxx-efi/terminal.lst
-usr/lib/grub/xxxMACHINExxx-efi/terminal.mod
-usr/lib/grub/xxxMACHINExxx-efi/terminal.module
-usr/lib/grub/xxxMACHINExxx-efi/terminfo.mod
-usr/lib/grub/xxxMACHINExxx-efi/terminfo.module
-usr/lib/grub/xxxMACHINExxx-efi/test.mod
-usr/lib/grub/xxxMACHINExxx-efi/test.module
-usr/lib/grub/xxxMACHINExxx-efi/test_blockarg.mod
-usr/lib/grub/xxxMACHINExxx-efi/test_blockarg.module
-usr/lib/grub/xxxMACHINExxx-efi/testload.mod
-usr/lib/grub/xxxMACHINExxx-efi/testload.module
-usr/lib/grub/xxxMACHINExxx-efi/testspeed.mod
-usr/lib/grub/xxxMACHINExxx-efi/testspeed.module
-usr/lib/grub/xxxMACHINExxx-efi/tftp.mod
-usr/lib/grub/xxxMACHINExxx-efi/tftp.module
-usr/lib/grub/xxxMACHINExxx-efi/tga.mod
-usr/lib/grub/xxxMACHINExxx-efi/tga.module
-usr/lib/grub/xxxMACHINExxx-efi/time.mod
-usr/lib/grub/xxxMACHINExxx-efi/time.module
-usr/lib/grub/xxxMACHINExxx-efi/tpm.mod
-usr/lib/grub/xxxMACHINExxx-efi/tpm.module
-usr/lib/grub/xxxMACHINExxx-efi/tr.mod
-usr/lib/grub/xxxMACHINExxx-efi/tr.module
-usr/lib/grub/xxxMACHINExxx-efi/trig.mod
-usr/lib/grub/xxxMACHINExxx-efi/trig.module
-usr/lib/grub/xxxMACHINExxx-efi/true.mod
-usr/lib/grub/xxxMACHINExxx-efi/true.module
-usr/lib/grub/xxxMACHINExxx-efi/udf.mod
-usr/lib/grub/xxxMACHINExxx-efi/udf.module
-usr/lib/grub/xxxMACHINExxx-efi/ufs1.mod
-usr/lib/grub/xxxMACHINExxx-efi/ufs1.module
-usr/lib/grub/xxxMACHINExxx-efi/ufs1_be.mod
-usr/lib/grub/xxxMACHINExxx-efi/ufs1_be.module
-usr/lib/grub/xxxMACHINExxx-efi/ufs2.mod
-usr/lib/grub/xxxMACHINExxx-efi/ufs2.module
-usr/lib/grub/xxxMACHINExxx-efi/uhci.mod
-usr/lib/grub/xxxMACHINExxx-efi/uhci.module
-usr/lib/grub/xxxMACHINExxx-efi/usb.mod
-usr/lib/grub/xxxMACHINExxx-efi/usb.module
-usr/lib/grub/xxxMACHINExxx-efi/usb_keyboard.mod
-usr/lib/grub/xxxMACHINExxx-efi/usb_keyboard.module
-usr/lib/grub/xxxMACHINExxx-efi/usbms.mod
-usr/lib/grub/xxxMACHINExxx-efi/usbms.module
-usr/lib/grub/xxxMACHINExxx-efi/usbserial_common.mod
-usr/lib/grub/xxxMACHINExxx-efi/usbserial_common.module
-usr/lib/grub/xxxMACHINExxx-efi/usbserial_ftdi.mod
-usr/lib/grub/xxxMACHINExxx-efi/usbserial_ftdi.module
-usr/lib/grub/xxxMACHINExxx-efi/usbserial_pl2303.mod
-usr/lib/grub/xxxMACHINExxx-efi/usbserial_pl2303.module
-usr/lib/grub/xxxMACHINExxx-efi/usbserial_usbdebug.mod
-usr/lib/grub/xxxMACHINExxx-efi/usbserial_usbdebug.module
-usr/lib/grub/xxxMACHINExxx-efi/usbtest.mod
-usr/lib/grub/xxxMACHINExxx-efi/usbtest.module
-usr/lib/grub/xxxMACHINExxx-efi/video.lst
-usr/lib/grub/xxxMACHINExxx-efi/video.mod
-usr/lib/grub/xxxMACHINExxx-efi/video.module
-usr/lib/grub/xxxMACHINExxx-efi/video_bochs.mod
-usr/lib/grub/xxxMACHINExxx-efi/video_bochs.module
-usr/lib/grub/xxxMACHINExxx-efi/video_cirrus.mod
-usr/lib/grub/xxxMACHINExxx-efi/video_cirrus.module
-usr/lib/grub/xxxMACHINExxx-efi/video_colors.mod
-usr/lib/grub/xxxMACHINExxx-efi/video_colors.module
-usr/lib/grub/xxxMACHINExxx-efi/video_fb.mod
-usr/lib/grub/xxxMACHINExxx-efi/video_fb.module
-usr/lib/grub/xxxMACHINExxx-efi/videoinfo.mod
-usr/lib/grub/xxxMACHINExxx-efi/videoinfo.module
-usr/lib/grub/xxxMACHINExxx-efi/videotest.mod
-usr/lib/grub/xxxMACHINExxx-efi/videotest.module
-usr/lib/grub/xxxMACHINExxx-efi/videotest_checksum.mod
-usr/lib/grub/xxxMACHINExxx-efi/videotest_checksum.module
-usr/lib/grub/xxxMACHINExxx-efi/wrmsr.mod
-usr/lib/grub/xxxMACHINExxx-efi/wrmsr.module
-usr/lib/grub/xxxMACHINExxx-efi/xfs.mod
-usr/lib/grub/xxxMACHINExxx-efi/xfs.module
-usr/lib/grub/xxxMACHINExxx-efi/xnu.mod
-usr/lib/grub/xxxMACHINExxx-efi/xnu.module
-usr/lib/grub/xxxMACHINExxx-efi/xnu_uuid.mod
-usr/lib/grub/xxxMACHINExxx-efi/xnu_uuid.module
-usr/lib/grub/xxxMACHINExxx-efi/xnu_uuid_test.mod
-usr/lib/grub/xxxMACHINExxx-efi/xnu_uuid_test.module
-usr/lib/grub/xxxMACHINExxx-efi/xzio.mod
-usr/lib/grub/xxxMACHINExxx-efi/xzio.module
-usr/lib/grub/xxxMACHINExxx-efi/zfs.mod
-usr/lib/grub/xxxMACHINExxx-efi/zfs.module
-usr/lib/grub/xxxMACHINExxx-efi/zfscrypt.mod
-usr/lib/grub/xxxMACHINExxx-efi/zfscrypt.module
-usr/lib/grub/xxxMACHINExxx-efi/zfsinfo.mod
-usr/lib/grub/xxxMACHINExxx-efi/zfsinfo.module
-usr/lib/grub/xxxMACHINExxx-efi/zstd.mod
-usr/lib/grub/xxxMACHINExxx-efi/zstd.module
+#usr/lib/grub/x86_64-efi
+usr/lib/grub/x86_64-efi/acpi.mod
+usr/lib/grub/x86_64-efi/acpi.module
+usr/lib/grub/x86_64-efi/adler32.mod
+usr/lib/grub/x86_64-efi/adler32.module
+usr/lib/grub/x86_64-efi/affs.mod
+usr/lib/grub/x86_64-efi/affs.module
+usr/lib/grub/x86_64-efi/afs.mod
+usr/lib/grub/x86_64-efi/afs.module
+usr/lib/grub/x86_64-efi/afsplitter.mod
+usr/lib/grub/x86_64-efi/afsplitter.module
+usr/lib/grub/x86_64-efi/ahci.mod
+usr/lib/grub/x86_64-efi/ahci.module
+usr/lib/grub/x86_64-efi/all_video.mod
+usr/lib/grub/x86_64-efi/all_video.module
+usr/lib/grub/x86_64-efi/aout.mod
+usr/lib/grub/x86_64-efi/aout.module
+usr/lib/grub/x86_64-efi/appleldr.mod
+usr/lib/grub/x86_64-efi/appleldr.module
+usr/lib/grub/x86_64-efi/archelp.mod
+usr/lib/grub/x86_64-efi/archelp.module
+usr/lib/grub/x86_64-efi/at_keyboard.mod
+usr/lib/grub/x86_64-efi/at_keyboard.module
+usr/lib/grub/x86_64-efi/ata.mod
+usr/lib/grub/x86_64-efi/ata.module
+usr/lib/grub/x86_64-efi/backtrace.mod
+usr/lib/grub/x86_64-efi/backtrace.module
+usr/lib/grub/x86_64-efi/bfs.mod
+usr/lib/grub/x86_64-efi/bfs.module
+usr/lib/grub/x86_64-efi/bitmap.mod
+usr/lib/grub/x86_64-efi/bitmap.module
+usr/lib/grub/x86_64-efi/bitmap_scale.mod
+usr/lib/grub/x86_64-efi/bitmap_scale.module
+usr/lib/grub/x86_64-efi/blocklist.mod
+usr/lib/grub/x86_64-efi/blocklist.module
+usr/lib/grub/x86_64-efi/boot.mod
+usr/lib/grub/x86_64-efi/boot.module
+usr/lib/grub/x86_64-efi/bsd.mod
+usr/lib/grub/x86_64-efi/bsd.module
+usr/lib/grub/x86_64-efi/bswap_test.mod
+usr/lib/grub/x86_64-efi/bswap_test.module
+usr/lib/grub/x86_64-efi/btrfs.mod
+usr/lib/grub/x86_64-efi/btrfs.module
+usr/lib/grub/x86_64-efi/bufio.mod
+usr/lib/grub/x86_64-efi/bufio.module
+usr/lib/grub/x86_64-efi/cat.mod
+usr/lib/grub/x86_64-efi/cat.module
+usr/lib/grub/x86_64-efi/cbfs.mod
+usr/lib/grub/x86_64-efi/cbfs.module
+usr/lib/grub/x86_64-efi/cbls.mod
+usr/lib/grub/x86_64-efi/cbls.module
+usr/lib/grub/x86_64-efi/cbmemc.mod
+usr/lib/grub/x86_64-efi/cbmemc.module
+usr/lib/grub/x86_64-efi/cbtable.mod
+usr/lib/grub/x86_64-efi/cbtable.module
+usr/lib/grub/x86_64-efi/cbtime.mod
+usr/lib/grub/x86_64-efi/cbtime.module
+usr/lib/grub/x86_64-efi/chain.mod
+usr/lib/grub/x86_64-efi/chain.module
+usr/lib/grub/x86_64-efi/cmdline_cat_test.mod
+usr/lib/grub/x86_64-efi/cmdline_cat_test.module
+usr/lib/grub/x86_64-efi/cmp.mod
+usr/lib/grub/x86_64-efi/cmp.module
+usr/lib/grub/x86_64-efi/cmp_test.mod
+usr/lib/grub/x86_64-efi/cmp_test.module
+usr/lib/grub/x86_64-efi/command.lst
+usr/lib/grub/x86_64-efi/config.h
+usr/lib/grub/x86_64-efi/configfile.mod
+usr/lib/grub/x86_64-efi/configfile.module
+usr/lib/grub/x86_64-efi/cpio.mod
+usr/lib/grub/x86_64-efi/cpio.module
+usr/lib/grub/x86_64-efi/cpio_be.mod
+usr/lib/grub/x86_64-efi/cpio_be.module
+usr/lib/grub/x86_64-efi/cpuid.mod
+usr/lib/grub/x86_64-efi/cpuid.module
+usr/lib/grub/x86_64-efi/crc64.mod
+usr/lib/grub/x86_64-efi/crc64.module
+usr/lib/grub/x86_64-efi/crypto.lst
+usr/lib/grub/x86_64-efi/crypto.mod
+usr/lib/grub/x86_64-efi/crypto.module
+usr/lib/grub/x86_64-efi/cryptodisk.mod
+usr/lib/grub/x86_64-efi/cryptodisk.module
+usr/lib/grub/x86_64-efi/cs5536.mod
+usr/lib/grub/x86_64-efi/cs5536.module
+usr/lib/grub/x86_64-efi/ctz_test.mod
+usr/lib/grub/x86_64-efi/ctz_test.module
+usr/lib/grub/x86_64-efi/date.mod
+usr/lib/grub/x86_64-efi/date.module
+usr/lib/grub/x86_64-efi/datehook.mod
+usr/lib/grub/x86_64-efi/datehook.module
+usr/lib/grub/x86_64-efi/datetime.mod
+usr/lib/grub/x86_64-efi/datetime.module
+usr/lib/grub/x86_64-efi/disk.mod
+usr/lib/grub/x86_64-efi/disk.module
+usr/lib/grub/x86_64-efi/diskfilter.mod
+usr/lib/grub/x86_64-efi/diskfilter.module
+usr/lib/grub/x86_64-efi/div.mod
+usr/lib/grub/x86_64-efi/div.module
+usr/lib/grub/x86_64-efi/div_test.mod
+usr/lib/grub/x86_64-efi/div_test.module
+usr/lib/grub/x86_64-efi/dm_nv.mod
+usr/lib/grub/x86_64-efi/dm_nv.module
+usr/lib/grub/x86_64-efi/echo.mod
+usr/lib/grub/x86_64-efi/echo.module
+usr/lib/grub/x86_64-efi/efi_gop.mod
+usr/lib/grub/x86_64-efi/efi_gop.module
+usr/lib/grub/x86_64-efi/efi_uga.mod
+usr/lib/grub/x86_64-efi/efi_uga.module
+usr/lib/grub/x86_64-efi/efifwsetup.mod
+usr/lib/grub/x86_64-efi/efifwsetup.module
+usr/lib/grub/x86_64-efi/efinet.mod
+usr/lib/grub/x86_64-efi/efinet.module
+usr/lib/grub/x86_64-efi/ehci.mod
+usr/lib/grub/x86_64-efi/ehci.module
+usr/lib/grub/x86_64-efi/elf.mod
+usr/lib/grub/x86_64-efi/elf.module
+usr/lib/grub/x86_64-efi/eval.mod
+usr/lib/grub/x86_64-efi/eval.module
+usr/lib/grub/x86_64-efi/exfat.mod
+usr/lib/grub/x86_64-efi/exfat.module
+usr/lib/grub/x86_64-efi/exfctest.mod
+usr/lib/grub/x86_64-efi/exfctest.module
+usr/lib/grub/x86_64-efi/ext2.mod
+usr/lib/grub/x86_64-efi/ext2.module
+usr/lib/grub/x86_64-efi/extcmd.mod
+usr/lib/grub/x86_64-efi/extcmd.module
+usr/lib/grub/x86_64-efi/f2fs.mod
+usr/lib/grub/x86_64-efi/f2fs.module
+usr/lib/grub/x86_64-efi/fat.mod
+usr/lib/grub/x86_64-efi/fat.module
+usr/lib/grub/x86_64-efi/fdt.lst
+usr/lib/grub/x86_64-efi/file.mod
+usr/lib/grub/x86_64-efi/file.module
+usr/lib/grub/x86_64-efi/fixvideo.mod
+usr/lib/grub/x86_64-efi/fixvideo.module
+usr/lib/grub/x86_64-efi/font.mod
+usr/lib/grub/x86_64-efi/font.module
+usr/lib/grub/x86_64-efi/fs.lst
+usr/lib/grub/x86_64-efi/fshelp.mod
+usr/lib/grub/x86_64-efi/fshelp.module
+usr/lib/grub/x86_64-efi/functional_test.mod
+usr/lib/grub/x86_64-efi/functional_test.module
+usr/lib/grub/x86_64-efi/gcry_arcfour.mod
+usr/lib/grub/x86_64-efi/gcry_arcfour.module
+usr/lib/grub/x86_64-efi/gcry_blowfish.mod
+usr/lib/grub/x86_64-efi/gcry_blowfish.module
+usr/lib/grub/x86_64-efi/gcry_camellia.mod
+usr/lib/grub/x86_64-efi/gcry_camellia.module
+usr/lib/grub/x86_64-efi/gcry_cast5.mod
+usr/lib/grub/x86_64-efi/gcry_cast5.module
+usr/lib/grub/x86_64-efi/gcry_crc.mod
+usr/lib/grub/x86_64-efi/gcry_crc.module
+usr/lib/grub/x86_64-efi/gcry_des.mod
+usr/lib/grub/x86_64-efi/gcry_des.module
+usr/lib/grub/x86_64-efi/gcry_dsa.mod
+usr/lib/grub/x86_64-efi/gcry_dsa.module
+usr/lib/grub/x86_64-efi/gcry_idea.mod
+usr/lib/grub/x86_64-efi/gcry_idea.module
+usr/lib/grub/x86_64-efi/gcry_md4.mod
+usr/lib/grub/x86_64-efi/gcry_md4.module
+usr/lib/grub/x86_64-efi/gcry_md5.mod
+usr/lib/grub/x86_64-efi/gcry_md5.module
+usr/lib/grub/x86_64-efi/gcry_rfc2268.mod
+usr/lib/grub/x86_64-efi/gcry_rfc2268.module
+usr/lib/grub/x86_64-efi/gcry_rijndael.mod
+usr/lib/grub/x86_64-efi/gcry_rijndael.module
+usr/lib/grub/x86_64-efi/gcry_rmd160.mod
+usr/lib/grub/x86_64-efi/gcry_rmd160.module
+usr/lib/grub/x86_64-efi/gcry_rsa.mod
+usr/lib/grub/x86_64-efi/gcry_rsa.module
+usr/lib/grub/x86_64-efi/gcry_seed.mod
+usr/lib/grub/x86_64-efi/gcry_seed.module
+usr/lib/grub/x86_64-efi/gcry_serpent.mod
+usr/lib/grub/x86_64-efi/gcry_serpent.module
+usr/lib/grub/x86_64-efi/gcry_sha1.mod
+usr/lib/grub/x86_64-efi/gcry_sha1.module
+usr/lib/grub/x86_64-efi/gcry_sha256.mod
+usr/lib/grub/x86_64-efi/gcry_sha256.module
+usr/lib/grub/x86_64-efi/gcry_sha512.mod
+usr/lib/grub/x86_64-efi/gcry_sha512.module
+usr/lib/grub/x86_64-efi/gcry_tiger.mod
+usr/lib/grub/x86_64-efi/gcry_tiger.module
+usr/lib/grub/x86_64-efi/gcry_twofish.mod
+usr/lib/grub/x86_64-efi/gcry_twofish.module
+usr/lib/grub/x86_64-efi/gcry_whirlpool.mod
+usr/lib/grub/x86_64-efi/gcry_whirlpool.module
+usr/lib/grub/x86_64-efi/gdb_grub
+usr/lib/grub/x86_64-efi/geli.mod
+usr/lib/grub/x86_64-efi/geli.module
+usr/lib/grub/x86_64-efi/gettext.mod
+usr/lib/grub/x86_64-efi/gettext.module
+usr/lib/grub/x86_64-efi/gfxmenu.mod
+usr/lib/grub/x86_64-efi/gfxmenu.module
+usr/lib/grub/x86_64-efi/gfxterm.mod
+usr/lib/grub/x86_64-efi/gfxterm.module
+usr/lib/grub/x86_64-efi/gfxterm_background.mod
+usr/lib/grub/x86_64-efi/gfxterm_background.module
+usr/lib/grub/x86_64-efi/gfxterm_menu.mod
+usr/lib/grub/x86_64-efi/gfxterm_menu.module
+usr/lib/grub/x86_64-efi/gmodule.pl
+usr/lib/grub/x86_64-efi/gptsync.mod
+usr/lib/grub/x86_64-efi/gptsync.module
+usr/lib/grub/x86_64-efi/gzio.mod
+usr/lib/grub/x86_64-efi/gzio.module
+usr/lib/grub/x86_64-efi/halt.mod
+usr/lib/grub/x86_64-efi/halt.module
+usr/lib/grub/x86_64-efi/hashsum.mod
+usr/lib/grub/x86_64-efi/hashsum.module
+usr/lib/grub/x86_64-efi/hdparm.mod
+usr/lib/grub/x86_64-efi/hdparm.module
+usr/lib/grub/x86_64-efi/hello.mod
+usr/lib/grub/x86_64-efi/hello.module
+usr/lib/grub/x86_64-efi/help.mod
+usr/lib/grub/x86_64-efi/help.module
+usr/lib/grub/x86_64-efi/hexdump.mod
+usr/lib/grub/x86_64-efi/hexdump.module
+usr/lib/grub/x86_64-efi/hfs.mod
+usr/lib/grub/x86_64-efi/hfs.module
+usr/lib/grub/x86_64-efi/hfsplus.mod
+usr/lib/grub/x86_64-efi/hfsplus.module
+usr/lib/grub/x86_64-efi/hfspluscomp.mod
+usr/lib/grub/x86_64-efi/hfspluscomp.module
+usr/lib/grub/x86_64-efi/http.mod
+usr/lib/grub/x86_64-efi/http.module
+usr/lib/grub/x86_64-efi/iorw.mod
+usr/lib/grub/x86_64-efi/iorw.module
+usr/lib/grub/x86_64-efi/iso9660.mod
+usr/lib/grub/x86_64-efi/iso9660.module
+usr/lib/grub/x86_64-efi/jfs.mod
+usr/lib/grub/x86_64-efi/jfs.module
+usr/lib/grub/x86_64-efi/jpeg.mod
+usr/lib/grub/x86_64-efi/jpeg.module
+usr/lib/grub/x86_64-efi/json.mod
+usr/lib/grub/x86_64-efi/json.module
+usr/lib/grub/x86_64-efi/kernel.exec
+usr/lib/grub/x86_64-efi/kernel.img
+usr/lib/grub/x86_64-efi/keylayouts.mod
+usr/lib/grub/x86_64-efi/keylayouts.module
+usr/lib/grub/x86_64-efi/keystatus.mod
+usr/lib/grub/x86_64-efi/keystatus.module
+usr/lib/grub/x86_64-efi/ldm.mod
+usr/lib/grub/x86_64-efi/ldm.module
+usr/lib/grub/x86_64-efi/legacy_password_test.mod
+usr/lib/grub/x86_64-efi/legacy_password_test.module
+usr/lib/grub/x86_64-efi/legacycfg.mod
+usr/lib/grub/x86_64-efi/legacycfg.module
+usr/lib/grub/x86_64-efi/linux.mod
+usr/lib/grub/x86_64-efi/linux.module
+usr/lib/grub/x86_64-efi/linux16.mod
+usr/lib/grub/x86_64-efi/linux16.module
+usr/lib/grub/x86_64-efi/loadbios.mod
+usr/lib/grub/x86_64-efi/loadbios.module
+usr/lib/grub/x86_64-efi/loadenv.mod
+usr/lib/grub/x86_64-efi/loadenv.module
+usr/lib/grub/x86_64-efi/loopback.mod
+usr/lib/grub/x86_64-efi/loopback.module
+usr/lib/grub/x86_64-efi/ls.mod
+usr/lib/grub/x86_64-efi/ls.module
+usr/lib/grub/x86_64-efi/lsacpi.mod
+usr/lib/grub/x86_64-efi/lsacpi.module
+usr/lib/grub/x86_64-efi/lsefi.mod
+usr/lib/grub/x86_64-efi/lsefi.module
+usr/lib/grub/x86_64-efi/lsefimmap.mod
+usr/lib/grub/x86_64-efi/lsefimmap.module
+usr/lib/grub/x86_64-efi/lsefisystab.mod
+usr/lib/grub/x86_64-efi/lsefisystab.module
+usr/lib/grub/x86_64-efi/lsmmap.mod
+usr/lib/grub/x86_64-efi/lsmmap.module
+usr/lib/grub/x86_64-efi/lspci.mod
+usr/lib/grub/x86_64-efi/lspci.module
+usr/lib/grub/x86_64-efi/lssal.mod
+usr/lib/grub/x86_64-efi/lssal.module
+usr/lib/grub/x86_64-efi/luks.mod
+usr/lib/grub/x86_64-efi/luks.module
+usr/lib/grub/x86_64-efi/luks2.mod
+usr/lib/grub/x86_64-efi/luks2.module
+usr/lib/grub/x86_64-efi/lvm.mod
+usr/lib/grub/x86_64-efi/lvm.module
+usr/lib/grub/x86_64-efi/lzopio.mod
+usr/lib/grub/x86_64-efi/lzopio.module
+usr/lib/grub/x86_64-efi/macbless.mod
+usr/lib/grub/x86_64-efi/macbless.module
+usr/lib/grub/x86_64-efi/macho.mod
+usr/lib/grub/x86_64-efi/macho.module
+usr/lib/grub/x86_64-efi/mdraid09.mod
+usr/lib/grub/x86_64-efi/mdraid09.module
+usr/lib/grub/x86_64-efi/mdraid09_be.mod
+usr/lib/grub/x86_64-efi/mdraid09_be.module
+usr/lib/grub/x86_64-efi/mdraid1x.mod
+usr/lib/grub/x86_64-efi/mdraid1x.module
+usr/lib/grub/x86_64-efi/memdisk.mod
+usr/lib/grub/x86_64-efi/memdisk.module
+usr/lib/grub/x86_64-efi/memrw.mod
+usr/lib/grub/x86_64-efi/memrw.module
+usr/lib/grub/x86_64-efi/minicmd.mod
+usr/lib/grub/x86_64-efi/minicmd.module
+usr/lib/grub/x86_64-efi/minix.mod
+usr/lib/grub/x86_64-efi/minix.module
+usr/lib/grub/x86_64-efi/minix2.mod
+usr/lib/grub/x86_64-efi/minix2.module
+usr/lib/grub/x86_64-efi/minix2_be.mod
+usr/lib/grub/x86_64-efi/minix2_be.module
+usr/lib/grub/x86_64-efi/minix3.mod
+usr/lib/grub/x86_64-efi/minix3.module
+usr/lib/grub/x86_64-efi/minix3_be.mod
+usr/lib/grub/x86_64-efi/minix3_be.module
+usr/lib/grub/x86_64-efi/minix_be.mod
+usr/lib/grub/x86_64-efi/minix_be.module
+usr/lib/grub/x86_64-efi/mmap.mod
+usr/lib/grub/x86_64-efi/mmap.module
+usr/lib/grub/x86_64-efi/moddep.lst
+usr/lib/grub/x86_64-efi/modinfo.sh
+usr/lib/grub/x86_64-efi/morse.mod
+usr/lib/grub/x86_64-efi/morse.module
+usr/lib/grub/x86_64-efi/mpi.mod
+usr/lib/grub/x86_64-efi/mpi.module
+usr/lib/grub/x86_64-efi/msdospart.mod
+usr/lib/grub/x86_64-efi/msdospart.module
+usr/lib/grub/x86_64-efi/mul_test.mod
+usr/lib/grub/x86_64-efi/mul_test.module
+usr/lib/grub/x86_64-efi/multiboot.mod
+usr/lib/grub/x86_64-efi/multiboot.module
+usr/lib/grub/x86_64-efi/multiboot2.mod
+usr/lib/grub/x86_64-efi/multiboot2.module
+usr/lib/grub/x86_64-efi/nativedisk.mod
+usr/lib/grub/x86_64-efi/nativedisk.module
+usr/lib/grub/x86_64-efi/net.mod
+usr/lib/grub/x86_64-efi/net.module
+usr/lib/grub/x86_64-efi/newc.mod
+usr/lib/grub/x86_64-efi/newc.module
+usr/lib/grub/x86_64-efi/nilfs2.mod
+usr/lib/grub/x86_64-efi/nilfs2.module
+usr/lib/grub/x86_64-efi/normal.mod
+usr/lib/grub/x86_64-efi/normal.module
+usr/lib/grub/x86_64-efi/ntfs.mod
+usr/lib/grub/x86_64-efi/ntfs.module
+usr/lib/grub/x86_64-efi/ntfscomp.mod
+usr/lib/grub/x86_64-efi/ntfscomp.module
+usr/lib/grub/x86_64-efi/odc.mod
+usr/lib/grub/x86_64-efi/odc.module
+usr/lib/grub/x86_64-efi/offsetio.mod
+usr/lib/grub/x86_64-efi/offsetio.module
+usr/lib/grub/x86_64-efi/ohci.mod
+usr/lib/grub/x86_64-efi/ohci.module
+usr/lib/grub/x86_64-efi/part_acorn.mod
+usr/lib/grub/x86_64-efi/part_acorn.module
+usr/lib/grub/x86_64-efi/part_amiga.mod
+usr/lib/grub/x86_64-efi/part_amiga.module
+usr/lib/grub/x86_64-efi/part_apple.mod
+usr/lib/grub/x86_64-efi/part_apple.module
+usr/lib/grub/x86_64-efi/part_bsd.mod
+usr/lib/grub/x86_64-efi/part_bsd.module
+usr/lib/grub/x86_64-efi/part_dfly.mod
+usr/lib/grub/x86_64-efi/part_dfly.module
+usr/lib/grub/x86_64-efi/part_dvh.mod
+usr/lib/grub/x86_64-efi/part_dvh.module
+usr/lib/grub/x86_64-efi/part_gpt.mod
+usr/lib/grub/x86_64-efi/part_gpt.module
+usr/lib/grub/x86_64-efi/part_msdos.mod
+usr/lib/grub/x86_64-efi/part_msdos.module
+usr/lib/grub/x86_64-efi/part_plan.mod
+usr/lib/grub/x86_64-efi/part_plan.module
+usr/lib/grub/x86_64-efi/part_sun.mod
+usr/lib/grub/x86_64-efi/part_sun.module
+usr/lib/grub/x86_64-efi/part_sunpc.mod
+usr/lib/grub/x86_64-efi/part_sunpc.module
+usr/lib/grub/x86_64-efi/partmap.lst
+usr/lib/grub/x86_64-efi/parttool.lst
+usr/lib/grub/x86_64-efi/parttool.mod
+usr/lib/grub/x86_64-efi/parttool.module
+usr/lib/grub/x86_64-efi/password.mod
+usr/lib/grub/x86_64-efi/password.module
+usr/lib/grub/x86_64-efi/password_pbkdf2.mod
+usr/lib/grub/x86_64-efi/password_pbkdf2.module
+usr/lib/grub/x86_64-efi/pata.mod
+usr/lib/grub/x86_64-efi/pata.module
+usr/lib/grub/x86_64-efi/pbkdf2.mod
+usr/lib/grub/x86_64-efi/pbkdf2.module
+usr/lib/grub/x86_64-efi/pbkdf2_test.mod
+usr/lib/grub/x86_64-efi/pbkdf2_test.module
+usr/lib/grub/x86_64-efi/pcidump.mod
+usr/lib/grub/x86_64-efi/pcidump.module
+usr/lib/grub/x86_64-efi/pgp.mod
+usr/lib/grub/x86_64-efi/pgp.module
+usr/lib/grub/x86_64-efi/play.mod
+usr/lib/grub/x86_64-efi/play.module
+usr/lib/grub/x86_64-efi/png.mod
+usr/lib/grub/x86_64-efi/png.module
+usr/lib/grub/x86_64-efi/priority_queue.mod
+usr/lib/grub/x86_64-efi/priority_queue.module
+usr/lib/grub/x86_64-efi/probe.mod
+usr/lib/grub/x86_64-efi/probe.module
+usr/lib/grub/x86_64-efi/procfs.mod
+usr/lib/grub/x86_64-efi/procfs.module
+usr/lib/grub/x86_64-efi/progress.mod
+usr/lib/grub/x86_64-efi/progress.module
+usr/lib/grub/x86_64-efi/raid5rec.mod
+usr/lib/grub/x86_64-efi/raid5rec.module
+usr/lib/grub/x86_64-efi/raid6rec.mod
+usr/lib/grub/x86_64-efi/raid6rec.module
+usr/lib/grub/x86_64-efi/random.mod
+usr/lib/grub/x86_64-efi/random.module
+usr/lib/grub/x86_64-efi/rdmsr.mod
+usr/lib/grub/x86_64-efi/rdmsr.module
+usr/lib/grub/x86_64-efi/read.mod
+usr/lib/grub/x86_64-efi/read.module
+usr/lib/grub/x86_64-efi/reboot.mod
+usr/lib/grub/x86_64-efi/reboot.module
+usr/lib/grub/x86_64-efi/regexp.mod
+usr/lib/grub/x86_64-efi/regexp.module
+usr/lib/grub/x86_64-efi/reiserfs.mod
+usr/lib/grub/x86_64-efi/reiserfs.module
+usr/lib/grub/x86_64-efi/relocator.mod
+usr/lib/grub/x86_64-efi/relocator.module
+usr/lib/grub/x86_64-efi/romfs.mod
+usr/lib/grub/x86_64-efi/romfs.module
+usr/lib/grub/x86_64-efi/scsi.mod
+usr/lib/grub/x86_64-efi/scsi.module
+usr/lib/grub/x86_64-efi/search.mod
+usr/lib/grub/x86_64-efi/search.module
+usr/lib/grub/x86_64-efi/search_fs_file.mod
+usr/lib/grub/x86_64-efi/search_fs_file.module
+usr/lib/grub/x86_64-efi/search_fs_uuid.mod
+usr/lib/grub/x86_64-efi/search_fs_uuid.module
+usr/lib/grub/x86_64-efi/search_label.mod
+usr/lib/grub/x86_64-efi/search_label.module
+usr/lib/grub/x86_64-efi/serial.mod
+usr/lib/grub/x86_64-efi/serial.module
+usr/lib/grub/x86_64-efi/setjmp.mod
+usr/lib/grub/x86_64-efi/setjmp.module
+usr/lib/grub/x86_64-efi/setjmp_test.mod
+usr/lib/grub/x86_64-efi/setjmp_test.module
+usr/lib/grub/x86_64-efi/setpci.mod
+usr/lib/grub/x86_64-efi/setpci.module
+usr/lib/grub/x86_64-efi/sfs.mod
+usr/lib/grub/x86_64-efi/sfs.module
+usr/lib/grub/x86_64-efi/shift_test.mod
+usr/lib/grub/x86_64-efi/shift_test.module
+usr/lib/grub/x86_64-efi/signature_test.mod
+usr/lib/grub/x86_64-efi/signature_test.module
+usr/lib/grub/x86_64-efi/sleep.mod
+usr/lib/grub/x86_64-efi/sleep.module
+usr/lib/grub/x86_64-efi/sleep_test.mod
+usr/lib/grub/x86_64-efi/sleep_test.module
+usr/lib/grub/x86_64-efi/smbios.mod
+usr/lib/grub/x86_64-efi/smbios.module
+usr/lib/grub/x86_64-efi/spkmodem.mod
+usr/lib/grub/x86_64-efi/spkmodem.module
+usr/lib/grub/x86_64-efi/squash4.mod
+usr/lib/grub/x86_64-efi/squash4.module
+usr/lib/grub/x86_64-efi/strtoull_test.mod
+usr/lib/grub/x86_64-efi/strtoull_test.module
+usr/lib/grub/x86_64-efi/syslinuxcfg.mod
+usr/lib/grub/x86_64-efi/syslinuxcfg.module
+usr/lib/grub/x86_64-efi/tar.mod
+usr/lib/grub/x86_64-efi/tar.module
+usr/lib/grub/x86_64-efi/terminal.lst
+usr/lib/grub/x86_64-efi/terminal.mod
+usr/lib/grub/x86_64-efi/terminal.module
+usr/lib/grub/x86_64-efi/terminfo.mod
+usr/lib/grub/x86_64-efi/terminfo.module
+usr/lib/grub/x86_64-efi/test.mod
+usr/lib/grub/x86_64-efi/test.module
+usr/lib/grub/x86_64-efi/test_blockarg.mod
+usr/lib/grub/x86_64-efi/test_blockarg.module
+usr/lib/grub/x86_64-efi/testload.mod
+usr/lib/grub/x86_64-efi/testload.module
+usr/lib/grub/x86_64-efi/testspeed.mod
+usr/lib/grub/x86_64-efi/testspeed.module
+usr/lib/grub/x86_64-efi/tftp.mod
+usr/lib/grub/x86_64-efi/tftp.module
+usr/lib/grub/x86_64-efi/tga.mod
+usr/lib/grub/x86_64-efi/tga.module
+usr/lib/grub/x86_64-efi/time.mod
+usr/lib/grub/x86_64-efi/time.module
+usr/lib/grub/x86_64-efi/tpm.mod
+usr/lib/grub/x86_64-efi/tpm.module
+usr/lib/grub/x86_64-efi/tr.mod
+usr/lib/grub/x86_64-efi/tr.module
+usr/lib/grub/x86_64-efi/trig.mod
+usr/lib/grub/x86_64-efi/trig.module
+usr/lib/grub/x86_64-efi/true.mod
+usr/lib/grub/x86_64-efi/true.module
+usr/lib/grub/x86_64-efi/udf.mod
+usr/lib/grub/x86_64-efi/udf.module
+usr/lib/grub/x86_64-efi/ufs1.mod
+usr/lib/grub/x86_64-efi/ufs1.module
+usr/lib/grub/x86_64-efi/ufs1_be.mod
+usr/lib/grub/x86_64-efi/ufs1_be.module
+usr/lib/grub/x86_64-efi/ufs2.mod
+usr/lib/grub/x86_64-efi/ufs2.module
+usr/lib/grub/x86_64-efi/uhci.mod
+usr/lib/grub/x86_64-efi/uhci.module
+usr/lib/grub/x86_64-efi/usb.mod
+usr/lib/grub/x86_64-efi/usb.module
+usr/lib/grub/x86_64-efi/usb_keyboard.mod
+usr/lib/grub/x86_64-efi/usb_keyboard.module
+usr/lib/grub/x86_64-efi/usbms.mod
+usr/lib/grub/x86_64-efi/usbms.module
+usr/lib/grub/x86_64-efi/usbserial_common.mod
+usr/lib/grub/x86_64-efi/usbserial_common.module
+usr/lib/grub/x86_64-efi/usbserial_ftdi.mod
+usr/lib/grub/x86_64-efi/usbserial_ftdi.module
+usr/lib/grub/x86_64-efi/usbserial_pl2303.mod
+usr/lib/grub/x86_64-efi/usbserial_pl2303.module
+usr/lib/grub/x86_64-efi/usbserial_usbdebug.mod
+usr/lib/grub/x86_64-efi/usbserial_usbdebug.module
+usr/lib/grub/x86_64-efi/usbtest.mod
+usr/lib/grub/x86_64-efi/usbtest.module
+usr/lib/grub/x86_64-efi/video.lst
+usr/lib/grub/x86_64-efi/video.mod
+usr/lib/grub/x86_64-efi/video.module
+usr/lib/grub/x86_64-efi/video_bochs.mod
+usr/lib/grub/x86_64-efi/video_bochs.module
+usr/lib/grub/x86_64-efi/video_cirrus.mod
+usr/lib/grub/x86_64-efi/video_cirrus.module
+usr/lib/grub/x86_64-efi/video_colors.mod
+usr/lib/grub/x86_64-efi/video_colors.module
+usr/lib/grub/x86_64-efi/video_fb.mod
+usr/lib/grub/x86_64-efi/video_fb.module
+usr/lib/grub/x86_64-efi/videoinfo.mod
+usr/lib/grub/x86_64-efi/videoinfo.module
+usr/lib/grub/x86_64-efi/videotest.mod
+usr/lib/grub/x86_64-efi/videotest.module
+usr/lib/grub/x86_64-efi/videotest_checksum.mod
+usr/lib/grub/x86_64-efi/videotest_checksum.module
+usr/lib/grub/x86_64-efi/wrmsr.mod
+usr/lib/grub/x86_64-efi/wrmsr.module
+usr/lib/grub/x86_64-efi/xfs.mod
+usr/lib/grub/x86_64-efi/xfs.module
+usr/lib/grub/x86_64-efi/xnu.mod
+usr/lib/grub/x86_64-efi/xnu.module
+usr/lib/grub/x86_64-efi/xnu_uuid.mod
+usr/lib/grub/x86_64-efi/xnu_uuid.module
+usr/lib/grub/x86_64-efi/xnu_uuid_test.mod
+usr/lib/grub/x86_64-efi/xnu_uuid_test.module
+usr/lib/grub/x86_64-efi/xzio.mod
+usr/lib/grub/x86_64-efi/xzio.module
+usr/lib/grub/x86_64-efi/zfs.mod
+usr/lib/grub/x86_64-efi/zfs.module
+usr/lib/grub/x86_64-efi/zfscrypt.mod
+usr/lib/grub/x86_64-efi/zfscrypt.module
+usr/lib/grub/x86_64-efi/zfsinfo.mod
+usr/lib/grub/x86_64-efi/zfsinfo.module
+usr/lib/grub/x86_64-efi/zstd.mod
+usr/lib/grub/x86_64-efi/zstd.module
usr/sbin/grub-bios-setup
usr/sbin/grub-install
usr/sbin/grub-macbless
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 6173f6ba149cf5bd70a92b48d99be32c75590433
by Peter Müller 05 Mar '23
by Peter Müller 05 Mar '23
05 Mar '23
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 6173f6ba149cf5bd70a92b48d99be32c75590433 (commit)
via ee5c0d09dc1562782e770ce6a943c2cb2e35eb65 (commit)
via 56db79acab5c025b1e5513a147aec753e6e91df9 (commit)
via 8d941070aad52a2396126c57a0a3aea23d55f5b0 (commit)
via 88b06e23f19f46d8039bc75614012f4a717f9d04 (commit)
via e547e3170b4f8324eb7c4e5e3eabcb1b7a26401e (commit)
via 9e5de6c13216c6acf50ceb0f738060eda3b6ac72 (commit)
via 9f2c7dda09dd42612ed98dda96a5782e9af822f4 (commit)
via 53adbbbaa1d410da79e6a5e2d039dbc73e063e78 (commit)
via de374578af356402f484b31206d5b9a7af46664d (commit)
via 98242ca615ec01e4d2001fd7656e9c63553667e1 (commit)
via fe9264e58879b4a7f52b0b90370277dbd11abd22 (commit)
via 120d6aed89ae65d3dea6a985d486e636c64004d7 (commit)
via aefb33df1ba95df1deb9df8332b16f363fb77002 (commit)
via a2a038fcc5e5bcf8e69342543ba6d69801ae1c12 (commit)
via d17852b25ed5c4379141ef808fb33db318525586 (commit)
via 65e7e3e26cca5eaff6dd3949160ee003b51793fc (commit)
via 4e692c42b618d524e2206b9ce58f296e19e1a124 (commit)
via 129e68716c4c0f660471914854afb499dacfdd4c (commit)
via 0c5234e1ce27cdc3187c52b17f1db7f5f09c97b0 (commit)
via ac146a5b651b9664801b75b80065d5b0e8e35d7e (commit)
via 1f3f26702144ef600eb7937c4ab78e4833e6636f (commit)
via 3626475fd9c4bbd1a95fc0313afcc35cc5bd0620 (commit)
via 4de715dbe22786c674124d637b2300d2a529b852 (commit)
via 295d50f120da9b8b60b552f3ba3c56f6bafcffca (commit)
via fc6323b89492a229b5f2a3d2aa5e48304b613e57 (commit)
via 083950a0df6ab6f8d63891bfdb4d86e8143740eb (commit)
via e6b73f0b6bedc1dd4dea96c200391b4e2b6da143 (commit)
via 6d3e6cfc16cb734d1923c5bb2c41e70433113a33 (commit)
via 5490e9654aee62d56e763887810144c440de2146 (commit)
via 7721b92500e2e060944f5fe92b956b4ce1caea51 (commit)
via 6b53d3b1295a07e1850c3bd4d0c634750ab10f77 (commit)
via 949b65891672215fa6cfce03582836b069f428fd (commit)
via e0c0e59c4372d9f0b04c72922f2cd656e62017ff (commit)
via 4bb389232ea4610feb20fa880ee39d9ad514c8af (commit)
via 3ad00458a5470ea32c436d2ff6c96e7dc9119734 (commit)
via 7c343ef358609a01586395553889b1bf19a0087b (commit)
via ccf8c0580f2605af4daa0442bfde1b6fede909ea (commit)
via f418988e24351fdabbe0a2a667669969eb38d2e4 (commit)
via c14d53e979a6a3aa3d4155b8bbe0a59199bb02aa (commit)
via 504756d4f571b9c75f71be81789f7f5a6c0010b5 (commit)
via 628a05122dda930261be4bd7c31d867c216dedc2 (commit)
via fa4e17db8a9c852bee7fff577f30a542168ec016 (commit)
via 3791abd6ebcf768020cbf0da21f31f6a50561ccc (commit)
via f502e53c83a92ced9f6ad26cab124d6ce4c747cb (commit)
via 72df13821d0ab4e35d68ffaa2c5b67e7dcdb817a (commit)
via 0695b748d4614aa0e0c89a68aeb6aefe1876d872 (commit)
via b7fdcbf6cabd0cb6fb3d53a1b74d7c6aa111b6ea (commit)
via 498134e5dda21dd9440098872e006408d8531d5b (commit)
via 42d4b881409cdf63e2edfe4c74e0b568ff99be50 (commit)
via 2223cafa37811c8da8872a9ce83f4fbc1b5c5763 (commit)
via 2705a8903e82ad999a49f7860d5719554b5b6bf0 (commit)
via 60cbad9204ffaf9d8a00bb13460a34bc3586fa71 (commit)
via d51c4e566bfb235a1c30cffa7b6fa095cd9275b7 (commit)
from 3fca7d6c76772dfdce6385653cbbe14a4f0b5ace (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 6173f6ba149cf5bd70a92b48d99be32c75590433
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sun Mar 5 15:17:03 2023 +0000
Core Update 174: Ship zstd
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit ee5c0d09dc1562782e770ce6a943c2cb2e35eb65
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Thu Mar 2 11:14:19 2023 +0100
zstd: Update to version 1.5.4
- Update from version 1.5.2 to 1.5.4
- Update of rootfile
- Changelog
v1.5.4 (Feb 2023)
perf: +20% faster huffman decompression for targets that can't compile x64 assembly (#3449, @terrelln)
perf: up to +10% faster streaming compression at levels 1-2 (#3114, @embg)
perf: +4-13% for levels 5-12 by optimizing function generation (#3295, @terrelln)
pref: +3-11% compression speed for `arm` target (#3199, #3164, #3145, #3141, #3138, @JunHe77 and #3139, #3160, @danlark1)
perf: +5-30% faster dictionary compression at levels 1-4 (#3086, #3114, #3152, @embg)
perf: +10-20% cold dict compression speed by prefetching CDict tables (#3177, @embg)
perf: +1% faster compression by removing a branch in ZSTD_fast_noDict (#3129, @felixhandte)
perf: Small compression ratio improvements in high compression mode (#2983, #3391, @Cyan4973 and #3285, #3302, @daniellerozenblit)
perf: small speed improvement by better detecting `STATIC_BMI2` for `clang` (#3080, @TocarIP)
perf: Improved streaming performance when `ZSTD_c_stableInBuffer` is set (#2974, @Cyan4973)
cli: Asynchronous I/O for improved cli speed (#2975, #2985, #3021, #3022, @yoniko)
cli: Change `zstdless` behavior to align with `zless` (#2909, @binhdvo)
cli: Keep original file if `-c` or `--stdout` is given (#3052, @dirkmueller)
cli: Keep original files when result is concatenated into a single output with `-o` (#3450, @Cyan4973)
cli: Preserve Permissions and Ownership of regular files (#3432, @felixhandte)
cli: Print zlib/lz4/lzma library versions with `-vv` (#3030, @terrelln)
cli: Print checksum value for single frame files with `-lv` (#3332, @Cyan4973)
cli: Print `dictID` when present with `-lv` (#3184, @htnhan)
cli: when `stderr` is *not* the console, disable status updates, but preserve final summary (#3458, @Cyan4973)
cli: support `--best` and `--no-name` in `gzip` compatibility mode (#3059, @dirkmueller)
cli: support for `posix` high resolution timer `clock_gettime()`, for improved benchmark accuracy (#3423, @Cyan4973)
cli: improved help/usage (`-h`, `-H`) formatting (#3094, @dirkmueller and #3385, @jonpalmisc)
cli: Fix better handling of bogus numeric values (#3268, @ctkhanhly)
cli: Fix input consists of multiple files _and_ `stdin` (#3222, @yoniko)
cli: Fix tiny files passthrough (#3215, @cgbur)
cli: Fix for `-r` on empty directory (#3027, @brailovich)
cli: Fix empty string as argument for `--output-dir-*` (#3220, @embg)
cli: Fix decompression memory usage reported by `-vv --long` (#3042, @u1f35c, and #3232, @zengyijing)
cli: Fix infinite loop when empty input is passed to trainer (#3081, @terrelln)
cli: Fix `--adapt` doesn't work when `--no-progress` is also set (#3354, @terrelln)
api: Support for Block-Level Sequence Producer (#3333, @embg)
api: Support for in-place decompression (#3432, @terrelln)
api: New `ZSTD_CCtx_setCParams()` function, set all parameters defined in a `ZSTD_compressionParameters` structure (#3403, @Cyan4973)
api: Streaming decompression detects incorrect header ID sooner (#3175, @Cyan4973)
api: Window size resizing optimization for edge case (#3345, @daniellerozenblit)
api: More accurate error codes for busy-loop scenarios (#3413, #3455, @Cyan4973)
api: Fix limit overflow in `compressBound` and `decompressBound` (#3362, #3373, Cyan4973) reported by @nigeltao
api: Deprecate several advanced experimental functions: streaming (#3408, @embg), copy (#3196, @mileshu)
bug: Fix corruption that rarely occurs in 32-bit mode with wlog=25 (#3361, @terrelln)
bug: Fix for block-splitter (#3033, @Cyan4973)
bug: Fixes for Sequence Compression API (#3023, #3040, @Cyan4973)
bug: Fix leaking thread handles on Windows (#3147, @animalize)
bug: Fix timing issues with cmake/meson builds (#3166, #3167, #3170, @Cyan4973)
build: Allow user to select legacy level for cmake (#3050, @shadchin)
build: Enable legacy support by default in cmake (#3079, @niamster)
build: Meson build script improvements (#3039, #3120, #3122, #3327, #3357, @eli-schwartz and #3276, @neheb)
build: Add aarch64 to supported architectures for zstd_trace (#3054, @ooosssososos)
build: support AIX architecture (#3219, @qiongsiwu)
build: Fix `ZSTD_LIB_MINIFY` build macro, which now reduces static library size by half (#3366, @terrelln)
build: Fix Windows issues with Multithreading translation layer (#3364, #3380, @yoniko) and ARM64 target (#3320, @cwoffenden)
build: Fix `cmake` script (#3382, #3392, @terrelln and #3252 @Tachi107 and #3167 @Cyan4973)
doc: Updated man page, providing more details for `--train` mode (#3112, @Cyan4973)
doc: Add decompressor errata document (#3092, @terrelln)
misc: Enable Intel CET (#2992, #2994, @hjl-tools)
misc: Fix `contrib/` seekable format (#3058, @yhoogstrate and #3346, @daniellerozenblit)
misc: Improve speed of the one-file library generator (#3241, @wahern and #3005, @cwoffenden)
v1.5.3 (dev version, unpublished)
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 56db79acab5c025b1e5513a147aec753e6e91df9
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Thu Mar 2 11:14:18 2023 +0100
texinfo: Update to version 7.0.2
- Update from version 6.8 to 7.0.2
- Update of rootfile
- Removal of patch which was needed due to inability to build texinfo-6.8 with glibc-2.34
Problem was fixed for building with glibc-2.34 and onwards with texinfo-7.0
- Changelog
7.0.2 (22 January 2023)
This is a bug-fix release with minimal changes.
* texi2any
. do not distribute architecture-dependent files
. build fixed on OpenIndiana 11
* info
. further fix of recoding of UTF-8 files to ASCII
. fix check for presence of man pages on Solaris
* install-info
. fix build by avoiding function name clash on some platforms
. compiler warning re strncat silenced
7.0.1 (30 November 2022)
This is a bug-fix release with minimal changes.
* texi2any
. avoid crashes on empty @image argument and other potential crashes
(with "Can't use an undefined value as an ARRAY reference" message)
. avoid hang on @ref command inside section command
* info
. fix recoding of UTF-8 files to ASCII when run in C locale
* js
. index search fixed for new HTML output
. some obsolete files removed from distribution
7.0 (7 November 2022)
* texi2any
. LaTeX added as an output format, selected with --latex
. EPUB 3 added as an output format, selected with --epub3
. reform throughout the code in general
. thorough review of character encoding issues
. new customization variables involved with character encoding:
INPUT_FILE_NAME_ENCODING, OUTPUT_FILE_NAME_ENCODING,
DOC_ENCODING_FOR_INPUT_FILE_NAME, DOC_ENCODING_FOR_OUTPUT_FILE_NAME,
MESSAGE_ENCODING and COMMAND_LINE_ENCODING
. warn if full-text commands (@ref, @footnote, @anchor) appear in @w
. new variable NO_TOP_NODE_OUTPUT
. IGNORE_BEFORE_SETFILENAME variable removed. former effect
is now always on.
. HTML output:
. use manual_name_html as output directory for split HTML instead of
manual_name or manual_name.html
. default DOCTYPE declaration changed to plain HTML5 style rather than
HTML4 DTD reference
. output only the CSS rules that are needed in an output file
. remove CSS_LINES variable and add SHOW_BUILTIN_CSS_RULES
(custom CSS can still be output using EXTRA_HEAD)
. use <code> tag for the output of @t and @verb instead of <tt>
. use <abbr> for @acronym instead of <acronym>
. link to table of contents from short table of contents only if a
table of contents is actually output
. prefix classes from @example arguments with `user-'
. percent encode URL in @url/@uref, @email, @image and external
manual file
. new USE_XML_SYNTAX, HTML_ROOT_ELEMENT_ATTRIBUTES and
NO_CUSTOM_HTML_ATTRIBUTE variables can be used to output
valid XHTML
. systematic addition of classes attribute in HTML elements based on the
Texinfo @-command names. renaming of class attributes to avoid
confusion with @-commands formatting and describe the role in the
document rather than the formatting style.
. COPIABLE_ANCHORS renamed to COPIABLE_LINKS
. do not add a title by default; SHOW_TITLE or NO_TOP_NODE_OUTPUT has
to be set
. USE_TITLEPAGE_FOR_TITLE is now true by default
. L2H variable removed, replaced by HTML_MATH set to `l2h'
. rename OVERVIEW_LINK_TO_TOC to SHORT_TOC_LINK_TO_TOC
. rename BEFORE_OVERVIEW to BEFORE_SHORT_TOC_LINE
. rename AFTER_OVERVIEW to AFTER_SHORT_TOC_LINES
. remove PRE_ABOUT, AFTER_ABOUT, and add PROGRAM_NAME_IN_ABOUT
. remove KEEP_TOP_EXTERNAL_REF
. new variables IGNORE_REF_TO_TOP_NODE_UP, CONVERT_TO_LATEX_IN_MATH,
HTMLXREF_MODE and HTMLXREF_FILE
. DocBook output:
. do not output Top node or text before the first @node or sectioning
@-command. NO_TOP_NODE_OUTPUT can be set to false to output Top node
for now.
. replace @definfocenlose defined @-commands by the argument as-is
to be more consistent with printed output
. HTML/DocBook output:
. USE_NUMERIC_ENTITY changed to mean to use numeric entities instead
of named entities. former effect is now always on.
. ENABLE_ENCODING_USE_ENTITY variable removed. former effect is now
always off.
. Info output
. quote problematic node names (with :, comma...) by default
. new customization variable ASCII_PUNCTUATION to use plain ASCII
characters for quotation marks and a few other symbols
* texinfo.tex
. `@microtype on' uses microtypography in formatting for pdfTeX and LuaTeX
. do not ignore @part page immediately following Top node
. do `@set txicodevaristt' to get slanted typewriter for @var in code,
`@clear txicodevaristt' to use slanted, variable-width roman font for
@var everywhere. flag is @set by default, but we may turn this off
in the future.
. new file doc/texinfo-zh.tex for Texinfo documents in Chinese.
new support file doc/txi-zh.tex for Chinese. doc/short-sample-zh.texi is
a sample document.
* info
. better support for index entries containing parentheses
. better support for getting bold text etc. when displaying manpages
. bug fixed where the first index entry in a file could be ignored
. M-C-f closes as well as opens footnotes window
. do not crash if run in Brazilian Portuguese locale
* Language
. @deftype* commands use typewriter font in argument list
. new commands @latex, @iflatex, @ifnotlatex for new LaTeX output format
. do `@set txidefnamenospace' to omit space after a definition name
* Other
. build fixed for glibc 2.34
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 8d941070aad52a2396126c57a0a3aea23d55f5b0
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sun Mar 5 15:15:52 2023 +0000
Core Update 174: Ship sudo
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 88b06e23f19f46d8039bc75614012f4a717f9d04
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Thu Mar 2 11:14:17 2023 +0100
sudo: Update to version 1.9.13p2
- Update from version 1.9.12p2 to 1.9.13p2
- Update of rootfile
- Changelog
What's new in Sudo 1.9.13p2
* Fixed the --enable-static-sudoers option, broken in sudo 1.9.13.
GitHub issue #245.
* Fixed a potential double-free bug when matching a sudoers rule
that contains a per-command chroot directive (CHROOT=dir). This
bug was introduced in sudo 1.9.8.
What's new in Sudo 1.9.13p1
* Fixed a typo in the configure script that resulted in a line
like "]: command not found" in the output. GitHub issue #238.
* Corrected the order of the C23 [[noreturn]] attribute in function
prototypes. This fixes a build error with GCC 13. GitHub issue
#239.
* The "check" make target misbehaved when there was more than
one version of the UTF-8 C locale in the output of "locale -a".
GitHub issue #241.
* Removed a dependency on the AC_SYS_YEAR2038 macro in configure.ac.
This was added in autoconf 2.72 but sudo's configure.ac only
required autoconf 2.70.
* Relaxed the autoconf version requirement to version 2.69.
What's new in Sudo 1.9.13
* Fixed a bug running relative commands via sudo when "log_subcmds"
is enabled. GitHub issue #194.
* Fixed a signal handling bug when running sudo commands in a shell
script. Signals were not being forwarded to the command when
the sudo process was not run in its own process group.
* Fixed a bug in cvtsudoers' LDIF parsing when the file ends without
a newline and a backslash is the last character of the file.
* Fixed a potential use-after-free bug with cvtsudoers filtering.
GitHub issue #198.
* Added a reminder to the default lecture that the password will
not echo. This line is only displayed when the pwfeedback option
is disabled. GitHub issue #195.
* Fixed potential memory leaks in error paths. GitHub issues #199,
#202.
* Fixed potential NULL dereferences on memory allocation failure.
GitHub issues #204, #211.
* Sudo now uses C23-style attributes in function prototypes instead
of gcc-style attributes if supported.
* Added a new "list" pseudo-command in sudoers to allow a user to
list another user's privileges. Previously, only root or a user
with the ability to run any command as either root or the target
user on the current host could use the -U option. This also
includes a fix to the log entry when a user lacks permission to
run "sudo -U otheruser -l command". Previously, the logs would
indicate that the user tried to run the actual command, now the
log entry includes the list operation.
* JSON logging now escapes control characters if they happen to
appear in the command or environment.
* New Albanian translation from translationproject.org.
* Regular expressions in sudoers or logsrvd.conf may no longer
contain consecutive repetition operators. This is implementation-
specific behavior according to POSIX, but some implementations
will allocate excessive amounts of memory. This mainly affects
the fuzzers.
* Sudo now builds AIX-style shared libraries and dynamic shared
objects by default instead of svr4-style. This means that the
default sudo plugins are now .a (archive) files that contain a
.so shared object file instead of bare .so files. This was done
to improve compatibility with the AIX Freeware ecosystem,
specifically, the AIX Freeware build of OpenSSL. Sudo will still
load svr4-style .so plugins and if a .so file is requested,
either via sudo.conf or the sudoers file, and only the .a file
is present, sudo will convert the path from plugin.so to
plugin.a(plugin.so) when loading it. This ensures compatibility
with existing configurations. To restore the old, pre-1.9.13
behavior, run configure using the --with-aix-soname=svr4 option.
* Sudo no longer checks the ownership and mode of the plugins that
it loads. Plugins are configured via either the sudo.conf or
sudoers file which are trusted configuration files. These checks
suffered from time-of-check vs. time-of-use race conditions and
complicate loading plugins that are not simple paths. Ownership
and mode checks are still performed when loading the sudo.conf
and sudoers files, which do not suffer from race conditions.
The sudo.conf "developer_mode" setting is no longer used.
* Control characters in sudo log messages and "sudoreplay -l"
output are now escaped in octal format. Space characters in the
command path are also escaped. Command line arguments that
contain spaces are surrounded by single quotes and any literal
single quote or backslash characters are escaped with a backslash.
This makes it possible to distinguish multiple command line
arguments from a single argument that contains spaces.
* Improved support for DragonFly BSD which uses a different struct
procinfo than either FreeBSD or 4.4BSD.
* Fixed a compilation error on Linux arm systems running older
kernels that may not define EM_ARM in linux/elf-em.h.
GitHub issue #232.
* Fixed a compilation error when LDFLAGS contains -Wl,--no-undefined.
Sudo will now link using -Wl,--no-undefined by default if possible.
GitHub issue #234.
* Fixed a bug executing a command with a very long argument vector
when "log_subcmds" or "intercept" is enabled on a system where
"intercept_type" is set to "trace". GitHub issue #194.
* When sudo is configured to run a command in a pseudo-terminal
but the standard input is not connected to a terminal, the command
will now be run as a background process. This works around a
problem running sudo commands in the background from a shell
script where changing the terminal to raw mode could interfere
with the interactive shell that ran the script.
GitHub issue #237.
* A missing include file in sudoers is no longer a fatal error
unless the error_recovery plugin argument has been set to false.
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit e547e3170b4f8324eb7c4e5e3eabcb1b7a26401e
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sun Mar 5 15:15:21 2023 +0000
Core Update 174: Ship pango
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 9e5de6c13216c6acf50ceb0f738060eda3b6ac72
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Thu Mar 2 11:14:16 2023 +0100
pango: Update to version 1.50.13
- Update from version 1.50.6 to 1.50.13
- Update of rootfile
- Changelog
Overview of changes in 1.50.13, 20-02-2023
- win32: Add back fallback for empty fontsets
- win32: Improve DirectWrite support
- Fix word segmentation for Japanese
- Don't set backspace-deletes-char for math symbols
- coretext: Fix a crash
- cairo: Apply metrics hinting to underlines too
- Treat COLRv1 fonts as color fonts
Overview of changes in 1.50.12, 18-11-2022
- Fix weight conversion on MacOS
- Update to Unicode 15
- Some introspection annotation fixes
- Improve PangoAttrList serialization
- Fix char offset calculatiosn in multi-paragraph
layouts
Overview of changes in 1.50.11, 03-10-2022
- Don't crash for lack of fonts
- Avoid a crash in shaping
Overview of changes in 1.50.10, 16-09-2022
- Avoid some unnecessary strdups
- Fix line height computations with a non-trivial CTM
Overview of changes in 1.50.9, 09-08-2022
- Apply show flags to line separators
- Fix a thread-safety problem
Overview of changes in 1.50.8, 02-07-2022
- Add some properties to fontmap and family
- Fix handling of ligature carets in mixed directions
Overview of changes in 1.50.7, 14-04-2022
- coretext: Fix the build
- editing: Fix moving across paragraph boundaries in rtl
- layout: Try harder to survive without fonts
- Windows: Register a sans-serif font
- Windows: Try harder to load a font
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 9f2c7dda09dd42612ed98dda96a5782e9af822f4
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Thu Mar 2 11:14:15 2023 +0100
make: Update to version 4.4.1
- Update from version 4.4 to 4.4.1
- Update of rootfile not required
- Changelog
Version 4.4.1 (26 Feb 2023)
This release is primarily a bug-fix release.
A complete list of bugs fixed in this version is available here:
https://sv.gnu.org/bugs/index.php?group=make&report_id=111&fix_release_id=1…
* WARNING: Backward-incompatibility!
In previous releases it was not well-defined when updates to MAKEFLAGS made
inside a makefile would be visible. This release ensures they are visible
immediately, even when invoking $(shell ...) functions. Also, command line
variable assignments are now always present in MAKEFLAGS, even when parsing
makefiles.
Implementation provided by Dmitry Goncharov <dgoncharov(a)users.sf.net>
* New feature: Parallel builds of archives
Previously it was not possible to use parallel builds with archives. It is
still not possible using the built-in rules, however you can now override
the built-in rules with a slightly different set of rules and use parallel
builds with archive creation. See the "Dangers When Using Archives" section
of the GNU Make manual, and https://savannah.gnu.org/bugs/index.php?14927
* Previously target-specific variables would inherit their "export" capability
from parent target-specific variables even if they were marked private. Now
private parent target-specific variables have no affect. For more details
see https://savannah.gnu.org/bugs/index.php?61463
* Disable FIFO jobserver on GNU/Hurd and Cygwin
Experimentation shows that the new FIFO-based jobserver doesn't work well on
GNU/Hurd or Cygwin: revert these systems to use the pipe-based jobserver.
* Updates to allow building on OS/2
Provided by KO Myung-Hun <komh78(a)gmail.com>
* New platform: GNU Make is supported on z/OS
Thanks to Igor Todorovski <itodorov(a)ca.ibm.com> for the patches and testing
assistance.
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 53adbbbaa1d410da79e6a5e2d039dbc73e063e78
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sun Mar 5 15:14:36 2023 +0000
Core Update 174: Ship lmdb
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit de374578af356402f484b31206d5b9a7af46664d
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Thu Mar 2 11:14:14 2023 +0100
lmdb: Update to version 0.9.30
- Update from version 0.9.29 to 0.9.30
- Update of rootfile not required
- The original git repo where the lmdb-LMDB file was obtained from is marked as a read only
mirror of the official repo on openldap.org
Going to opemnldap.org then points you to https://git.openldap.org/openldap/openldap for
the downloads, which also has a newer version of lmdb than the mirror site.
- Therefore I have changed over to that location for the source tarball which requires
the name change to openldap-LMDB for the file. Also changed to bz2 version.
- Changelog
LMDB 0.9.30 Release (2023/02/08)
ITS#9806 - LMDB page_split: key threshold depends on page size
ITS#9916 - avoid gcc optimization bug on sparc64 linux
ITS#9919 - Mark infrequently used functions as cold
ITS#9723 - clear C_EOF on cursor with MDB_FIRST_DUP
ITS#9030 - Use sys/cachectl.h rather than asm/cachectl.h on mips
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 98242ca615ec01e4d2001fd7656e9c63553667e1
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sun Mar 5 15:13:51 2023 +0000
Core Update 174: Ship liburcu
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit fe9264e58879b4a7f52b0b90370277dbd11abd22
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Thu Mar 2 11:14:13 2023 +0100
liburcu: Update to version 0.14.0
- Update from version 0.13.2 to 0.14.0
- Update of rootfile
- Changelog
2023-02-14 Userspace RCU 0.14.0
* Fix: urcu-bp: only teardown call-rcu worker in destructor
* Fix: rculfhash: urcu_die() takes positive error value
* Fix: call_rcu: teardown default call_rcu worker on application exit
* Fix: join worker thread in call_rcu_data_free
* Docs: clarify grace period polling API
* Document grace period polling in rcu-api.md
* Implement poll rcu stress test in rcutorture
* urcu-memb,mb,signal: Implement grace period polling
* Fix: auto-resize hash table destroy deadlock
* Fix building on MSYS2
* rculfhash: Include rculfhash-internal.h from local directory
* Remove "Darwin" from "should also work on list"
* Merge branch 'adah1972-improve-md'
* Add semicolons at the end of function prototypes
* Wrap a file name in backticks
* Wrap command-line options in backticks
* Fix a wrong format
* Wrap URLs in angle brackets
* Fix Markdown issues
* Fix: Always check pthread_create for failures
* Disable signals in URCU background threads
* 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
* Add unit tests for possible_cpus_array_len
* 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
* Update ABI definition files
* Bump version current and age
* alpha: allocate membarrier system call number
* Bump version to 0.14.0-pre
* Improved test framework
* rculfhash: introduce cds_lfht_node_init_deleted
* Fix: changelog: v0.13.0 was released in 2021
* cleanup: i386 arch detection
* fix: properly detect 'cmpxchg' on x86-32
* fix: use urcu-tls compat with c++ compiler
* Fix typo
* fix: remove autoconf features default value in help message
* fix: add missing pkgconfig file for memb flavour lib
* Cleanup: Tests: Remove useless pre-C99 compatibility code from tap.h
* Document C99 and C++11 requirement in README.md
* Always use '__thread' for Thread local storage except on MSVC
* Fix: powerpc32: transparent unions alter calling convention
* fix: don't use C++ thread_local on MacOs
* wfcqueue API: implement overloaded wrappers with templates
* wfcqueue: combine C++ API cds_wfcq_head_cast with overloading
* wfstack C++ API: implement overloaded wrappers with templates
* lfstack C++ API: implement overloaded wrappers with templates
* wfstack: combine C++ API cds_wfs_stack_cast with overloading
* lfstack: combine C++ API cds_lfs_stack_cast with overloading
* fix: test_build tap plan
* Test C++ build of list head init
* Fix order of initializers in CDS_LIST_HEAD_INIT
* unit tests: test wfcqueue, wfstack, lfstack empty check functions in C++
* wfcqueue: implement C++ API based on function overloading
* wfstack: implement C++ API based on function overloading
* lfstack: implement C++ API based on function overloading
* Fix tap.h: remove extra semicolon in pass/fail macros
* Add C++ build tests
* Build and run regression and unit tests as C++ programs
* Add --enable-Werror configure switch
* Add `urcu_posix_assert()` as `assert()` replacement
* Rename `urcu_assert()` to `urcu_assert_debug()`
* cleanup: spelling fixes in comments
* Make temporary variable in _rcu_dereference non-const
* (tls-ie2) 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
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 120d6aed89ae65d3dea6a985d486e636c64004d7
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sun Mar 5 15:13:07 2023 +0000
Core Update 174: Ship iproute2
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit aefb33df1ba95df1deb9df8332b16f363fb77002
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Thu Mar 2 11:14:12 2023 +0100
iproute2: Update to version 6.2.0
- Update from version 6.1.0 to 6.2.0
- Update of rootfile
- Changelog
No Changelog in website or in source tarball. Only source of changes is the git commits
https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/log/
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit a2a038fcc5e5bcf8e69342543ba6d69801ae1c12
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sun Mar 5 15:12:39 2023 +0000
Core Update 174: Ship harfbuzz
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit d17852b25ed5c4379141ef808fb33db318525586
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Thu Mar 2 11:14:11 2023 +0100
harfbuzz: Update to version 7.0.1
- Update from version 6.0.0 to 7.0.1
- Update of rootfile
- Changelog
Overview of changes leading to 7.0.1
- Various build and bug fixes.
Overview of changes leading to 7.0.0
- New hb-paint API that is designed mainly to paint “COLRv1” glyphs, but can be
also used as a unified API to paint any of the glyph representations
supported by HarfBuzz (B/W outlines, color layers, or color bitmaps).
(Behdad Esfahbod, Matthias Clasen)
- New hb-cairo API for integrating with cairo graphics library. This is provided
as a separate harfbuzz-cairo library. (Behdad Esfahbod, Matthias Clasen)
- Support for instancing “CFF2” table. (Behdad Esfahbod)
- Support font emboldening. (Behdad Esfahbod)
- Support feature ranges with AAT shaping. (Behdad Esfahbod)
- Experimental support to cubic curves in “glyf” table, see
https://github.com/harfbuzz/boring-expansion-spec/blob/main/glyf1-cubicOutl…
for spec. (Behdad Esfahbod)
- Various subsetter improvements. (Garret Rieger, Qunxin Liu, Behdad Esfahbod)
- Various documentation improvements.
(Behdad Esfahbod, Matthias Clasen, Khaled Hosny)
- Significantly reduced memory use during shaping. (Behdad Esfahbod)
- Greatly reduced memory use during subsetting “CFF” table. (Behdad Esfahbod)
- New command line utility, hb-info, for querying various font information.
(Behdad Esfahbod, Matthias Clasen)
- New hb-shape/hb-view options: --glyphs, --color-palette, --font-bold,
--font-grade, and --named-instance. (Behdad Esfahbod)
- Miscellaneous fixes and improvements.
(Amir Masoud Abdol, Andres Salomon, Behdad Esfahbod, Chun-wei Fan,
Garret Rieger, Jens Kutilek, Khaled Hosny, Konstantin Käfer, Matthias Clasen,
Nirbheek Chauhan, Pedro J. Estébanez, Qunxin Liu, Sergei Trofimovich)
- New API:
+HB_FONT_NO_VAR_NAMED_INSTANCE
+HB_PAINT_IMAGE_FORMAT_BGRA
+HB_PAINT_IMAGE_FORMAT_PNG
+HB_PAINT_IMAGE_FORMAT_SVG
+hb_cairo_font_face_create_for_face
+hb_cairo_font_face_create_for_font
+hb_cairo_font_face_get_face
+hb_cairo_font_face_get_font
+hb_cairo_font_face_get_scale_factor
+hb_cairo_font_face_set_font_init_func
+hb_cairo_font_face_set_scale_factor
+hb_cairo_font_init_func_t
+hb_cairo_glyphs_from_buffer
+hb_cairo_scaled_font_get_font
+hb_color_line_get_color_stops
+hb_color_line_get_color_stops_func_t
+hb_color_line_get_extend
+hb_color_line_get_extend_func_t
+hb_color_line_t
+hb_color_stop_t
+hb_draw_funcs_get_empty
+hb_draw_funcs_get_user_data
+hb_draw_funcs_set_user_data
+hb_face_collect_nominal_glyph_mapping
+hb_font_draw_glyph
+hb_font_draw_glyph_func_t
+hb_font_funcs_set_draw_glyph_func
+hb_font_funcs_set_paint_glyph_func
+hb_font_get_synthetic_bold
+hb_font_get_var_named_instance
+hb_font_paint_glyph
+hb_font_paint_glyph_func_t
+hb_font_set_synthetic_bold
+hb_map_keys
+hb_map_next
+hb_map_update
+hb_map_values
+hb_ot_color_glyph_has_paint
+hb_ot_color_has_paint
+hb_ot_layout_script_select_language2
+hb_ot_name_id_predefined_t
+hb_paint_color
+hb_paint_color_func_t
+hb_paint_composite_mode_t
+hb_paint_custom_palette_color
+hb_paint_custom_palette_color_func_t
+hb_paint_extend_t
+hb_paint_funcs_create
+hb_paint_funcs_destroy
+hb_paint_funcs_get_empty
+hb_paint_funcs_get_user_data
+hb_paint_funcs_is_immutable
+hb_paint_funcs_make_immutable
+hb_paint_funcs_reference
+hb_paint_funcs_set_color_func
+hb_paint_funcs_set_custom_palette_color_func
+hb_paint_funcs_set_image_func
+hb_paint_funcs_set_linear_gradient_func
+hb_paint_funcs_set_pop_clip_func
+hb_paint_funcs_set_pop_group_func
+hb_paint_funcs_set_pop_transform_func
+hb_paint_funcs_set_push_clip_glyph_func
+hb_paint_funcs_set_push_clip_rectangle_func
+hb_paint_funcs_set_push_group_func
+hb_paint_funcs_set_push_transform_func
+hb_paint_funcs_set_radial_gradient_func
+hb_paint_funcs_set_sweep_gradient_func
+hb_paint_funcs_set_user_data
+hb_paint_funcs_t
+hb_paint_image
+hb_paint_image_func_t
+hb_paint_linear_gradient
+hb_paint_linear_gradient_func_t
+hb_paint_pop_clip
+hb_paint_pop_clip_func_t
+hb_paint_pop_group
+hb_paint_pop_group_func_t
+hb_paint_pop_transform
+hb_paint_pop_transform_func_t
+hb_paint_push_clip_glyph
+hb_paint_push_clip_glyph_func_t
+hb_paint_push_clip_rectangle
+hb_paint_push_clip_rectangle_func_t
+hb_paint_push_group
+hb_paint_push_group_func_t
+hb_paint_push_transform
+hb_paint_push_transform_func_t
+hb_paint_radial_gradient
+hb_paint_radial_gradient_func_t
+hb_paint_sweep_gradient
+hb_paint_sweep_gradient_func_t
+hb_set_is_inverted
+hb_subset_input_keep_everything
- Deprecated API:
+hb_font_funcs_set_glyph_shape_func
+hb_font_get_glyph_shape_func_t
+hb_font_get_glyph_shape
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 65e7e3e26cca5eaff6dd3949160ee003b51793fc
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sun Mar 5 15:11:30 2023 +0000
Core Update 174: Ship gnutls
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 4e692c42b618d524e2206b9ce58f296e19e1a124
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Thu Mar 2 11:14:10 2023 +0100
gnutls: Update to version 3.8.0
- Update from version 3.7.7 to 3.8.0
- Update of rootfile
- Changelog
Version 3.8.0 (unreleased 2023-02-09)
-- libgnutls: Fix a Bleichenbacher oracle in the TLS RSA key exchange.
Reported by Hubert Kario (#1050). Fix developed by Alexander Sosedkin.
[GNUTLS-SA-2020-07-14, CVSS: medium] [CVE-2023-0361]
-- libgnutls: C++ library is now header only. All definitions from
gnutlsxx.c have been moved into gnutlsxx.h. Users of the C++
interface have two options:
1. include gnutlsxx.h in their application and link against
the C library. (default)
2. include gnutlsxx.h in their application, compile with
GNUTLS_GNUTLSXX_NO_HEADERONLY macro defined and link
against the C++ library.
-- libgnutls: GNUTLS_NO_STATUS_REQUEST flag and %NO_STATUS_REQUEST
priority modifier have been added to allow disabling of the
status_request TLS extension in the client side.
-- libgnutls: TLS heartbeat is disabled by default.
The heartbeat extension in TLS (RFC 6520) is not widely used given
other implementations dropped support for it. To enable back
support for it, supply --enable-heartbeat-support to configure
script.
-- libgnutls: SRP authentication is now disabled by default.
It is disabled because the SRP authentication in TLS is not up to
date with the latest TLS standards and its ciphersuites are based
on the CBC mode and SHA-1. To enable it back, supply
--enable-srp-authentication option to configure script.
-- libgnutls: All code has been indented using "indent -ppi1 -linux".
CI/CD has been adjusted to catch regressions. This is implemented
through devel/indent-gnutls, devel/indent-maybe and .gitlab-ci.yml’s
commit-check. You may run devel/indent-gnutls to fix any
indentation issues if you make code modifications.
-- guile: Guile-bindings removed.
They have been extracted into a separate project to reduce complexity
and to simplify maintenance, see <https://gitlab.com/gnutls/guile/>.
-- minitasn1: Upgraded to libtasn1 version 4.19.
-- API and ABI modifications:
GNUTLS_NO_STATUS_REQUEST: New flag
GNUTLS_SRTP_AEAD_AES_128_GCM: New gnutls_srtp_profile_t enum member
GNUTLS_SRTP_AEAD_AES_256_GCM: New gnutls_srtp_profile_t enum member
Version 3.7.8 (released 2022-09-27)
-- libgnutls: In FIPS140 mode, RSA signature verification is an approved
operation if the key has modulus with known sizes (1024, 1280,
1536, and 1792 bits), in addition to any modulus sizes larger than
2048 bits, according to SP800-131A rev2.
-- libgnutls: gnutls_session_channel_binding performs additional checks when
GNUTLS_CB_TLS_EXPORTER is requested. According to RFC9622 4.2, the
"tls-exporter" channel binding is only usable when the handshake is
bound to a unique master secret (i.e., either TLS 1.3 or extended
master secret extension is negotiated). Otherwise the function now
returns error.
-- libgnutls: usage of the following functions, which are designed to
loosen restrictions imposed by allowlisting mode of configuration,
has been additionally restricted. Invoking them is now only allowed
if system-wide TLS priority string has not been initialized yet:
gnutls_digest_set_secure
gnutls_sign_set_secure
gnutls_sign_set_secure_for_certs
gnutls_protocol_set_enabled
-- API and ABI modifications:
No changes since last version.
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 129e68716c4c0f660471914854afb499dacfdd4c
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sun Mar 5 15:10:39 2023 +0000
Core Update 174: Ship ethtool
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 0c5234e1ce27cdc3187c52b17f1db7f5f09c97b0
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Thu Mar 2 11:14:09 2023 +0100
ethtool: Update to version 6.2
- Update from version 6.1 to 6.2
- Update of rootfile not required
- Changelog
Version 6.2 - February 21, 2023
* Feature: link down event statistics (no option)
* Feature: JSON output for coalesce (-c)
* Feature: new link modes (no option)
* Feature: JSON output for ring (-g)
* Feature: netlink handler for RSS get (-x)
* Fix: fix boolean value output in JSON output
* Fix: fix build errors and warnings
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit ac146a5b651b9664801b75b80065d5b0e8e35d7e
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sun Mar 5 15:10:12 2023 +0000
Core Update 174: Ship e2fsprogs
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 1f3f26702144ef600eb7937c4ab78e4833e6636f
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Thu Mar 2 11:14:08 2023 +0100
e2fsprogs: Update to version 1.47.0
- Update from version 1.46.5 to 1.47.0
- Update of rootfile not required
- Changelog
E2fsprogs 1.47.0 (February 5, 2023)
Updates/Fixes since v1.46.6:
UI and Features
Add support for the orphan_file feature, which speeds up workloads that
are deleting or truncating a large number files in parallel. This
compat feature was first supported in the v5.15 Linux kernel.
The mke2fs program (via the mke2fs.conf file) now enables the
metadata_csum_seed and orphan_file features by default. The
metadata_csum_seed feature is an incompat feature which is first
supported in the Linux kernel starting in the 4.4 kernel and e2fsprogs
1.43.
Mke2fs now supports the extended option "assume_storage_prezeroed" which
causes mke2fs to skip zeroing the journal and inode tables and to mark
the inode tables as zeroed.
Add support to tune2fs and e2label to set the label and UUID for a
mounted file system using a ioctl, which is more reliable than modifying
the superblock via writing to the block device. The kernel support for
setting the label landed in v5.17, while the support for adding the UUID
landed in v6.0. If the ioctls are not supported, tune2fs and e2label
will fall back old strategy of directly modifying the superblock.
Allow tune2fs to disable the casefold feature after scanning all of the
directories do not have the Casefold flag set.
Fixes
Fix a potential unbalanced mutex unlock when there is a short read while
using the bounce buffer when using direct I/O.
Performance, Internal Implementation, Development Support etc.
Fix various Coverity and compiler warnings.
Add the new function ext2fs_xattrs_read_inode() which takes an in-memory
inode to avoid needing to reread an inode that was already read into
memory.
Teach debugfs logdump command the -n option which forces printing a
specified number of transactions, even when a block missing a magic
number would have stopped the logdump. (This is for debugging
journalling problems.)
E2fsprogs 1.46.6 (February 1, 2023)
Updates/Fixes since v1.46.5:
UI and Features
Debugfs's ncheck command now allows the inode number to be surrounded by
angle brackets, to be consistent with other debugfs commands.
Debugfs no longer prints a scary message when debugfs -c (which enables
"catastrophic mode") is used. This was intended to allow debugfs to
operate on very badly corrupted file systems, but it is now sometimes
used to suppress reading the block and inode bitmaps when they are not
needed.
Resize2fs will round down the requested new file system size to the
nearest cluster boundary when resizing bigalloc file systems.
Improve error messages issued by badblocks.
Fuse2fs now supports an offset=<bytes> option which allows operating on
a file system image which is located starting at the specified offset
from the beginning of the image.
Fixes
Pre-v6.2 Linux kernels had long-standing bug in how the extended
attribute hash was calculated when there were non-ASCII characters in
the xattr name, when the hash would be different depending on whether
the C 'char' type was signed or unsigned. To address this bug, starting
with e2fsprogs 1.46.6+ and Linux 6.2+, we will accept either the signed
or unsigned hash variant, but only set the unsigned hash variant. Since
extended attribute names are in practice composed of ASCII characters,
other than various tests (such as generic/454), most users will
hopefully not notice this change.
Avoid triggering udev in dumpe2fs and "resize2fs -P" for file systems
with MMP enabled by opening the device read-only when reading the MMP
block.
Fix MMP handling so it can notice when another writer has modify the MMP
block out from under it when stopping a MMP sessions.
Fix tune2fs so it will detect another device stealing the MMP sessions
while rewriting metadata checksums.
E2fsck will now check to make sure the journal inode does not have the
encrypt flag set.
Fix a deadlock bug in e2fsck's error handler when there are errors
trying to write to the file system.
Fix a bug where e2fsck could fail when specifying an undo file and an
explicit superblock number.
Fix e2image so it won't potentially loop forever for certain invalid
file systems.
Fix resize2fs to honor the E2FSPROGS_FAKE_TIME environment variable.
This allows embedded system builders who use resize2fs as part of their
image build process to create reproducible images.
Fix tune2fs to avoid a crash if the journal replay fails and to make
sure its exit status is non-zero if there is some failure.
Fix tune2fs, fuse2fs, and debugsfs to update j_tail_sequence when
replaying the journal.
Add additional bullet-proofing for very badly corrupted file systems.
Try avoid UBSAN warnings, null pointer derferences, and other memory
bugs. (Addresses CVE-2022-1304)
Don't fail when the source directory for mke2fs -d doesn't support
extended attributese.
Check for and handle malloc() failures when computing the log filename
in e2fsck and in the libss library.
Fix tune2fs and e2fsck to accept pathames which include '=' characters.
Previously arguments to tune2fs and e2fsck which included '=' characters
are presumed to be blkid specifiers such as UUID=xxx or LABEL=yyy. If a
specifier is both a valid pathname name and blkid tag name specifier,
priority is given to a blkid resolved pathname.
Improve tune2fs's error messages.
Fix a bug in tune2fs which could cause it to crash if device goes
off-line just as it being opened.
Fix the fsck driver so if it is interrupted while running fsck -N it
doesn't end up kllling all processes on the system.
Fix a crash in badblocks when the user specifies an overly large
number of blocks tested at a time in read/write or nondestructive
mode.
Update and clarify's chattr's man page and usage message. Fix spelling
typo's in a variety of different man pages and comments.
Performance, Internal Implementation, Development Support etc.
Update to autoconf 2.71.
Update flags used to create shared library on Darwin/MacOS.
Speed up e2fsck's clonning of multiply-claimed blocks so it is
substantially faster on very large file systems.
Add tests/fuzz directory with fuzzers from oss-fuzz.
Add a Github Actions configuration file so that Github will run CI tests
on Linux, Windows and MacOS on a push to the e2fsprogs github repo.
Make the mtab parsing in ext2fs_check_mount_point() more careful so it
won't get confused when a block device shows up in the mnt_name field
for a virtual file system.
Fix the libss's Makefile to create the man page directory before trying
to install its man page.
Fix various Coverity and compiler warnings.
Make tests more portable on various different OS's and system
configurations (e.g., with SELinux enabled, MacOS, and Windows)
Use mallinfo2() instead of mallinfo() where avilable, since mallinfo()
is deprecated on newer glibc versions.
E2fsck will no longer do a full scan of disconnected directory when
trying to print the parent directory, which is pointless and can slow
down e2fsck if there are a large number of disconnected directories.
Debugfs will now print the extended attribute's e_hash field.
Fix the setup-schroot script to work on non-Linux platforms.
Fix ext2fs_compare_generic_bmap() so it correctly compares all of the
bits in the bitmap, and so that it works correctly when comparing a
bitarray bitmap with a rbtree-based bitmap. (Fortunately, none of the
programs in e2fsprogs uses bitmap comparison functions.)
Fix memory leaks on error paths.
Add support for the configure option --enable-largefile so that
e2fsprogs can utilize largefile support for the MUSL C library.
Add an note that the dict library code has been modified, as required by
the Kazlib license.
Synchronized changes from Android's AOSP e2fsprogs tree.
Updated config.guess and config.sub with newer versions from the FSF.
Add Friulian translation.
Update Chinese, Czech, Dutch, French, German, Malay, Polish, Serbian,
Spanish, Swedish, and Ukrainian translations.
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 3626475fd9c4bbd1a95fc0313afcc35cc5bd0620
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sun Mar 5 15:09:40 2023 +0000
Core Update 174: Ship curl
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 4de715dbe22786c674124d637b2300d2a529b852
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Thu Mar 2 11:14:07 2023 +0100
curl: Update to version 7.88.1
- Update from version 7.87.0 to 7.88.1
- Update of rootfile not required
- Patch removed as fix now built into source tarball
- Changelog
Fixed in 7.88.1 - February 20 2023
Bugfixes:
build-openssl.bat: keep OpenSSL 3 engine binaries
cmake: fix Windows check for CryptAcquireContext
connnect: fix timeout handling to use full duration
curl: make --silent work stand-alone
curl_setup: Suppress OpenSSL 3 deprecation warnings
CURLOPT_WS_OPTIONS.3: fix the availability version
GHA: update rustls dependency to 0.9.2
http2: buffer/pausedata and output flush fix.
http2: set drain on stream end
http: include stdint.h more readily
krb5: silence cast-align warning
lib1560: add IPv6 canonicalization tests
os400: correct Curl_os400_sendto()
remote-header-name.d: mention that filename* is not supported
runtests: fix "uninitialized value $port"
setopt: allow HTTP3 when HTTP2 is not defined
socketpair: allow EWOULDBLOCK when reading the pair check bytes
socks: allow using DoH to resolve host names
tests-httpd: add proxy tests
tests: make sure gnuserv-tls has SRP support before using it
tests: make the telnet server shut down a socket gracefully
tool_getparam: make --get a true boolean
tool_operate: allow debug builds to set buffersize
urlapi: do the port number extraction without using sscanf()
urldata: remove `now` from struct SingleRequest - not needed
Fixed in 7.88.0 - February 15 2023
Changes:
curl.h: add CURL_HTTP_VERSION_3ONLY
share: add sharing of HSTS cache among handles
src: add --http3-only
tool_operate: share HSTS between handles
urlapi: add CURLU_PUNYCODE
writeout: add %{certs} and %{num_certs}
Bugfixes:
cf-socket: fix build when not HAVE_GETPEERNAME
cf-socket: keep sockaddr local in the socket filters
cfilters:Curl_conn_get_select_socks: use the first non-connected filter
CI: add a workflow to automatically label pull requests
CI: add pytest GHA to CI test/tests-httpd on a HTTP/3 setup
CI: Retry failed downloads to reduce spurious failures
CI: update wolfssl / wolfssh to 5.5.4 / 1.4.12
cmake: bump requirement to 3.7
cmake: check for sendmsg
cmake: delete redundant macro definition `SECURITY_WIN32`
cmake: fix dev warning due to mismatched arg
cmake: fix the snprintf detection
cmake: remove deprecated symbols check
cmake: set SOVERSION also for macOS
cmake: use list APPEND syntax for CMAKE_REQUIRED_DEFINITIONS
cmdline-opts/Makefile: on error, do not leave a partial
CODEOWNERS: remove the peeps mentioned as CI owners
connect: fix access of pointer before NULL check
connect: fix build when not ENABLE_IPV6
connect: fix strategy testing for attempts, timeouts and happy-eyeball
connections: introduce http/3 happy eyeballs
content_encoding: do not reset stage counter for each header
CONTRIBUTE: More formally specify the commit description
cookies: fp is always not NULL
copyright.pl: cease doing year verifications
copyright: update all copyright lines and remove year ranges
curl.1: make help, version and manual sections "custom"
curl.h: allow up to 10M buffer size
curl.h: mark CURLSSLBACKEND_MESALINK as deprecated
curl/websockets.h: extend the websocket frame struct
curl: output warning at --verbose output for debug-enabled version
curl_free.3: fix return type of `curl_free`
curl_global_sslset.3: clarify the openssl situation
curl_log: for failf/infof and debug logging implementations
curl_setup: Disable by default recv-before-send in Windows
curl_version_info.3: fix typo
curl_ws_send.3: clarify how to send multi-frame messages
CURLOPT_HEADERDATA.3: warn DLL users must set write function
CURLOPT_READFUNCTION.3: the callback 'size' arg is always 1
CURLOPT_WRITEFUNCTION.3: fix memory leak in example
dict: URL decode the entire path always
docs/DEPRECATE.md: deprecate gskit
docs: add link to GitHub Discussions
docs: mention indirect effects of --insecure
docs: POSTFIELDSIZE must be set to -1 with read function
doh: ifdef IPv6 code
easyoptions: fix header printing in generation script
escape: hex decode with a lookup-table
escape: use table lookup when adding %-codes to output
examples: remove the curlgtk.c example
fopen: remove unnecessary assignment
ftpserver: lower the DATA connect timeout to speed up torture tests
GHA/macos.yml: bump to gcc-12
GHA/macos: use Xcode_14.0.1 for cmake builds
GHA: add job on Slackware 15.0
GHA: bump ngtcp2 workflow dependencies
GHA: enable websockets in the torture job
GHA: move the quiche job here from zuul
GHA: use designated ngtcp2 and its dependencies versions
haxproxy: send before TLS handhshake
header.d: add a header file example
hsts.d: explain hsts more
hsts: handle adding the same host name again
HTTP/[23]: continue upload when state.drain is set
http2: aggregate small SETTINGS/PRIO/WIN_UPDATE frames
http2: fix compiler warning due to uninitialized variable
http2: minor buffer and error path fixes
http2: when using printf %.*s, the length arg must be 'int'
HTTP3: mention what needs to be in place to remove EXPERIMENTAL label
http: add additional condition for including stdint.h
http: decode transfer encoding first
http: fix "part of conditional expression is always false"
http: remove the trace message "Mark bundle... multiuse"
http_aws_sigv4: remove typecasts from HMAC_SHA256 macro
http_proxy: do not assign data->req.p.http use local copy
INSTALL: document how to use multiple TLS backends
lib670: make test.h the first include
lib: connect/h2/h3 refactor
lib: fix typos
lib: fix typos in comments which repeat a word
libssh2: try sha2 algos for hostkey methods
libtest: add a sleep macro for Windows
Linux CI: update some dependecies to latest tag
Makefile.mk: fix wolfssl and mbedtls default paths
man pages: call the custom user pointer 'clientp' consistently
md4: fix build with GnuTLS + OpenSSL v1
misc: fix grammar and spelling
misc: fix spelling
misc: reduce struct and struct field sizes
msh3: add support for request payload
msh3: update to v0.5 Release
msh3: update to v0.6
multi: stop sending empty HTTP/3 UDP datagrams on Windows
multihandle: turn bool struct fields into bits
ngtcp2: add CURLOPT_SSL_CTX_FUNCTION support for openssl+wolfssl
ngtcp2: fix the build without 'sendmsg'
ngtcp2: replace removed define and stop using removed function
no-clobber.d: only use long form options in man page text
noproxy: support for space-separated names is deprecated
nss: implement data_pending method
openldap: fix missing sasl symbols at build in specific configs
openssl: adapt to boringssl's error code type
openssl: don't ignore CA paths when using Windows CA store (redux)
openssl: don't log raw record headers
openssl: make the BIO_METHOD a local variable in the connection filter
openssl: only use CA_BLOB if verifying peer
openssl: remove attached easy handles from SSL instances
openssl: store the CA after first send (ClientHello)
os400: fixes to make-lib.sh and initscript.sh
packages: remove Android, update README
release-notes.pl: check fixes/closes lines better
Revert "x509asn1: avoid freeing unallocated pointers"
runtest.pl: add expected fourth return value
runtests: tear down http2/http3 servers when https server is stopped
runtests: consider warnings fatal and error on them
runtests: fix detection of TLS backends
runtests: make 'mbedtls' a testable feature
rustls: improve error messages
scripts/delta: show percent of number of files changed since last tag
scripts: fix Appveyor job detection in cijobs.pl
scripts: set file mode +x on all perl and shell scripts
sectransp: fix for incomplete read/writes
SECURITY-PROCESS.md: document severity levels
setopt: Address undefined behaviour by checking for null
setopt: move the SHA256 opt within #ifdef libssh2
setopt: use >, not >=, when checking if uarg is larger than uint-max
smb: return error on upload without size
socketpair: allow localhost MITM sniffers
strdup: name it Curl_strdup
system.h: assume OS400 is always built with ILEC compiler
test1560: use a UTF8-using locale when run
test2304: remove stdout verification
tests-httpd: basic infra to run curl against an apache httpd
tests: add 3 new HTTP/2 test cases, plus https: support for nghttpx
tests: add tests for HTTP/2 and HTTP/3 to verify the header API
tests: avoid use of sha1 in certificates
tls: fixes for wolfssl + openssl combo builds
tool_getparam: fix hiding of command line secrets
tool_operate: fix `CURLOPT_SOCKS5_GSSAPI_NEC` type
tool_operate: fix error codes during DOS filename sanitize
tool_operate: fix error codes on bad URL & OOM
tool_operate: fix headerfile writing
tool_operate: repair --rate
transfer: break the read loop when RECV is cleared
typecheck: accept expressions for option/info parameters
url: fix part of conditional expression is always true
urlapi: avoid Curl_dyn_addf() for hex outputs
urlapi: fix part of conditional expression is always true: qlen
urlapi: skip path checks if path is just "/"
urlapi: skip the extra dedotdot alloc if no dot in path
urldata: cease storing TLS auth type
urldata: make 'ftp_create_missing_dirs' depend on FTP || SFTP
urldata: make set.http200aliases conditional on HTTP being present
urldata: move the cookefilelist to the 'set' struct
urldata: remove unused struct fields, made more conditional
vquic: stabilization and improvements
vtls: fix hostname handling in filters
vtls: manage current easy handle in nested cfilter calls
vtls: use ALPN HTTP/1.0 when HTTP/1.0 is used
winbuild: document that arm64 is supported
windows: always use curl's basename() implementation
wolfssl: remove deprecated post-quantum algorithms
workflows/linux.yml: merge 3 common packages
write-out.d: add 'since version' to %{header_json} documentation
write-out.d: clarify Windows % symbol escaping
ws: fix autoping handling
ws: fix multiframe send handling
ws: fix recv of larger frames
ws: remove bad assert
ws: unstick connect-only shutdown
ws: use %Ou for outputting curl_off_t with info()
x509asn1: fix compile errors and warnings
zuul: stop using this CI service
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 295d50f120da9b8b60b552f3ba3c56f6bafcffca
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sun Mar 5 15:09:07 2023 +0000
Core Update 174: Ship apr
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit fc6323b89492a229b5f2a3d2aa5e48304b613e57
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Thu Mar 2 11:14:06 2023 +0100
apr: Update to version 1.7.2
- Update from version 1.7.0 to 1.7.2
- Update of rootfile
- Changelog
Changes for APR 1.7.2
*) Correct a packaging issue in 1.7.1. The contents of the release were
correct, but the top level directory was misnamed.
Changes for APR 1.7.1
*) SECURITY: CVE-2022-24963 (cve.mitre.org)
Integer Overflow or Wraparound vulnerability in apr_encode functions of
Apache Portable Runtime (APR) allows an attacker to write beyond bounds
of a buffer.
*) SECURITY: CVE-2022-28331 (cve.mitre.org)
On Windows, Apache Portable Runtime 1.7.0 and earlier may write beyond
the end of a stack based buffer in apr_socket_sendv(). This is a result
of integer overflow.
*) SECURITY: CVE-2021-35940 (cve.mitre.org)
Restore fix for out-of-bounds array dereference in apr_time_exp*() functions.
(This issue was addressed as CVE-2017-12613 in APR 1.6.3 and
later 1.6.x releases, but was missing in 1.7.0.) [Stefan Sperling]
*) configure: Fix various build issues for compilers enforcing
strict C99 compliance. PR 66396, 66408, 66426.
[Florian Weimer <fweimer redhat.com>, Sam James <sam gentoo.org>]
*) apr_atomic_read64(): Fix non-atomic read on 32-bit Windows [Ivan Zhakov]
*) configure: Prefer posix name-based shared memory over SysV IPC.
[Jim Jagielski]
*) configure: Add --disable-sctp argument to forcibly disable SCTP
support, or --enable-sctp which fails if SCTP support is not
detected. [Lubos Uhliarik <luhliari redhat.com>, Joe Orton]
*) Fix handle leak in the Win32 apr_uid_current implementation.
PR 61165. [Ivan Zhakov]
*) Add error handling for lseek() failures in apr_file_write() and
apr_file_writev(). [Joe Orton]
*) Don't silently set APR_FOPEN_NOCLEANUP for apr_file_mktemp() created file
to avoid a fd and inode leak when/if later passed to apr_file_setaside().
[Yann Ylavic]
*) APR's configure script uses AC_TRY_RUN to detect whether the return type
of strerror_r is int. When cross-compiling this defaults to no.
This commit adds an AC_CACHE_CHECK so users who cross-compile APR may
influence the outcome with a configure variable. [Sebastian Kemper
<sebastian_ml gmx net>]
*) Add a cache check with which users who cross-compile APR
can influence the outcome of the /dev/zero test by setting the variable
ac_cv_mmap__dev_zero=yes [Sebastian Kemper <sebastian_ml gmx net>]
*) Trick autoconf into printing the correct default prefix in the help.
[Stefan Fritsch]
*) Don't try to use PROC_PTHREAD by default when cross compiling.
[Yann Ylavic]
*) Add the ability to cross compile APR. [Graham Leggett]
*) While cross-compiling, the tools/gen_test_char could not
be executed at build time, use AX_PROG_CC_FOR_BUILD to
build native tools/gen_test_char
Support explicit libtool by variable assigning before buildcheck.sh,
it is helpful for cross-compiling (such as libtool=aarch64-linux-libtool)
[Hongxu Jia <hongxu.jia windriver.com>]
*) Avoid an overflow on 32 bit platforms. [René Hjortskov Nielsen
<r... hjortskov.dk>]
*) Use AC_CHECK_SIZEOF, so as to support cross compiling. PR 56053.
[Mike Frysinger <vapier gentoo.org>]
*) Add --tag=CC to libtool invocations. PR 62640. [Michael Osipov]
*) apr_pools: Fix pool debugging output so that creation events are
always emitted before allocation events and subpool destruction
events are emitted on pool clear/destroy for proper accounting.
[Brane Čibej]
*) apr_socket_listen: Allow larger listen backlog values on Windows 8+.
[Evgeny Kotkov <evgeny.kotkov visualsvn.com>]
*) Fixed: apr_get_oslevel() was returning APR_WIN_XP on Windows 10
*) Fix attempt to free invalid memory on exit when apr_app is used
on Windows. [Ivan Zhakov]
*) Fix double free on exit when apr_app is used on Windows. [Ivan Zhakov]
*) Fix a regression in apr_stat() for root path on Windows. [Ivan Zhakov]
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 083950a0df6ab6f8d63891bfdb4d86e8143740eb
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sun Mar 5 15:07:51 2023 +0000
samba: Bump package version
This is necessary, since the package version was already incremented to
91 in "master", due to the libtirpc changes in Core Update 173.
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit e6b73f0b6bedc1dd4dea96c200391b4e2b6da143
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Tue Feb 28 17:54:15 2023 +0100
samba: Update to version 4.17.5
- Update from 4.17.4 to 4.17.5
- Update of rootfile not required
- Changelog
Release Notes for Samba 4.17.5
* BUG 14808: smbc_getxattr() return value is incorrect.
* BUG 15172: Compound SMB2 FLUSH+CLOSE requests from MacOSX are not handled correctly.
* BUG 15210: synthetic_pathref AFP_AfpInfo failed errors.
* BUG 15226: samba-tool gpo listall fails IPv6 only - finddcs() fails to find DC when there is only an AAAA record for the DC in DNS.
* BUG 15236: smbd crashes if an FSCTL request is done on a stream handle.
* BUG 15277: DFS links don't work anymore on Mac clients since 4.17.
* BUG 15283: vfs_virusfilter segfault on access, directory edgecase (accessing NULL value).
* BUG 15240: CVE-2022-38023 [SECURITY] Samba should refuse RC4 (aka md5) based SChannel on NETLOGON (additional changes).
* BUG 15243: %U for include directive doesn't work for share listing (netshareenum).
* BUG 15266: Shares missing from netshareenum response in samba 4.17.4.
* BUG 15269: ctdb: use-after-free in run_proc.
* BUG 15243: %U for include directive doesn't work for share listing (netshareenum).
* BUG 15266: Shares missing from netshareenum response in samba 4.17.4.
* BUG 15280: irpc_destructor may crash during shutdown.
* BUG 15286: auth3_generate_session_info_pac leaks wbcAuthUserInfo.
* BUG 15268: smbclient segfaults with use after free on an optimized build.
* BUG 15282: smbstatus leaking files in msg.sock and msg.lock.
* BUG 15164: Leak in wbcCtxPingDc2.
* BUG 15265: Access based share enum does not work in Samba 4.16+.
* BUG 15267: Crash during share enumeration.
* BUG 15271: rep_listxattr on FreeBSD does not properly check for reads off end of returned buffer.
* BUG 15281: Avoid relying on C89 features in a few places.
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 6d3e6cfc16cb734d1923c5bb2c41e70433113a33
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sat Feb 25 15:04:39 2023 +0100
grub: Fix for riscv64 rootfile
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
commit 5490e9654aee62d56e763887810144c440de2146
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sun Mar 5 15:04:20 2023 +0000
Core Update 174: Ship updatexlrator.cgi
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 7721b92500e2e060944f5fe92b956b4ce1caea51
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Tue Feb 21 14:11:54 2023 +0100
updatexlrator.cgi: Fixes bug#13024 - Table style rendering bug
- This is happening due to the use of bgcolor which has been deprecated since HTML4.01 and
is no longer supported in HTML5
- Similar approach used here as was used in the same fix for the dhcp.cgi page
- CSS based approach utilised.
- Partially tested in my vm testbed. The percentage bar works withg no problems.
The table could not be confirmed as in my testbed I don't have updatexlrator running
as my updates are all based on https and not http.
- The table will need to be confirmed by the bug reporter or someone else that uses
updatexlrator
Fixes: Bug#13024
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 6b53d3b1295a07e1850c3bd4d0c634750ab10f77
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sat Feb 18 08:59:12 2023 +0100
monit: Update to 5.33.0
For details see:
https://mmonit.com/monit/changes/
"New: Added click-jacking protection headers to Monit HTTP GUI (the
SAMEORIGIN iframe is allowed).
Fixed: Issue #1035: If the start, stop or restart program statement
contains the equal sign, which is not followed by a space character,
the configuration is not parsed correctly.
Fixed: Issue #1047: If the MariaDB server doesn't allow access to the
host, from which Monit test is running, Monit reported: Invalid
handshake packet sequence id -- not MySQL protocol.
Fixed: Add the missing responsetime option to the ping test."
For more details see:
https://bitbucket.org/tildeslash/monit/commits/tag/release-5-33-0
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
commit 949b65891672215fa6cfce03582836b069f428fd
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sun Mar 5 15:03:04 2023 +0000
Core Update 174: Ship bind
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit e0c0e59c4372d9f0b04c72922f2cd656e62017ff
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Fri Feb 17 19:07:08 2023 +0100
bind: Update to 9.16.38
For details see:
https://downloads.isc.org/isc/bind9/9.16.38/doc/arm/html/notes.html#notes-f…
"Notes for BIND 9.16.38
Bug Fixes
A constant stream of zone additions and deletions via rndc reconfig
could cause increased memory consumption due to delayed cleaning of
view memory. This has been fixed. [GL #3801]
The speed of the message digest algorithms (MD5, SHA-1, SHA-2), and of
NSEC3 hashing, has been improved. [GL #3795]
Building BIND 9 failed when the --enable-dnsrps switch for ./configure
was used. This has been fixed. [GL #3827]"
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
commit 4bb389232ea4610feb20fa880ee39d9ad514c8af
Author: Jon Murphy <jon.murphy(a)ipfire.org>
Date: Fri Feb 17 11:53:37 2023 -0600
log.dat: Fix an error with 'unbound' logging too much data.
- Make regex "non-greedy"
- grab data up to first occurance of "]" and not last occurance of "]"
Signed-off-by: Jon Murphy <jon.murphy(a)ipfire.org>
commit 3ad00458a5470ea32c436d2ff6c96e7dc9119734
Author: Jon Murphy <jon.murphy(a)ipfire.org>
Date: Thu Feb 16 16:40:36 2023 -0600
pcengines-apu-firmware: Update to version 4.19.0.1
- Update from 4.17.0.3 to 4.19.0.1
- Changelog
v4.19.0.1 - Release date: 2023-02-02
Rebased with official coreboot repository commit 2ccbcc5
Removed configuration and mainboard files for apu1 due to the board being dropped from upstream coreboot
See: https://github.com/pcengines/coreboot/compare/v4.17.0.3...v4.19.0.1
Signed-off-by: Jon Murphy <jon.murphy(a)ipfire.org>
commit 7c343ef358609a01586395553889b1bf19a0087b
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sun Mar 5 15:00:48 2023 +0000
Core Update 174: Ship elinks
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit ccf8c0580f2605af4daa0442bfde1b6fede909ea
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Thu Feb 16 21:59:04 2023 +0100
elinks: Update to version 0.16.0
- Update from version 0.15.1 to 0.16.0
- Update of rootfile
- According to the forked elinks developer if parallel build is required then meson
should be used for the build. With make they don't believe that it ever ran in
parallel mode.
- This patch modifies the build from autotools to meson and updates the version.
- Parallel build option added back in to meson/ninja flow.
- The build requires git to be present so git moved to just before elinks in make.sh
- Changelog
ELinks 0.16.0
* detect xterm on my computer
ELinks 0.16.0rc1
* alternative mujs engine for js
* bump mozjs to 102
* experimental XHR implementation
* macros in exmode #196
* removed infinite loop, which occurred under BSD #197
* optional terminal hyperlinks in dumps #198
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit f418988e24351fdabbe0a2a667669969eb38d2e4
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sun Mar 5 14:59:19 2023 +0000
Core Update 174: Remove orphaned Pakfire metadata for perl-TimeDate
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit c14d53e979a6a3aa3d4155b8bbe0a59199bb02aa
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sun Mar 5 14:56:54 2023 +0000
Core Update 174: Ship intel-microcode and rebuild initrds
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 504756d4f571b9c75f71be81789f7f5a6c0010b5
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Thu Feb 16 13:50:34 2023 +0100
intel-microcode: Update to version 20230214
- Update from version 20221108 to 20230214
- Update of rootfile
- Changelog - details can be found in the releasenote.md file in the source tarball
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 628a05122dda930261be4bd7c31d867c216dedc2
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sun Mar 5 14:54:23 2023 +0000
Core Update 174: Ship freetype
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit fa4e17db8a9c852bee7fff577f30a542168ec016
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Thu Feb 16 13:50:33 2023 +0100
freetype: Update to version 2.13.0
- Update from version 2.12.1 to 2.13.0
- Update of rootfile
- Changelog
CHANGES BETWEEN 2.12.1 and 2.13.0 (2023-Feb-09)
I. IMPORTANT CHANGES
- The demo program `ftinspect` has been completely updated and much
enhanced. It now combines the functionality of almost all other
graphical FreeType demo programs into a single application based
on the Qt framework. This was Charlie Jiang's GSoC 2022 project.
- The 'COLR' v1 API is now considered as stable.
https://learn.microsoft.com/en-us/typography/opentype/spec/colr
III. MISCELLANEOUS
- For OpenType Variable Fonts, `avar` table format 2.0 is now
supported. The code was contributed by Behdad Esfahbod.
Note that this is an extension supported on recent Apple platforms
and by HarfBuzz, but not yet in the OpenType standard! See
https://github.com/harfbuzz/boring-expansion-spec/blob/main/avar2.md
for the specification. To deactivate it, define the configuration
macro 'TT_CONFIG_OPTION_NO_BORING_EXPANSION'.
- A new API `FT_GlyphSlot_Slant` to slant a glyph by a given angle
has been added. Note that this function is part of `ftsynth.h`,
which is still considered to be in alpha stage.
- TrueType interpreter version 38 (also known as 'Infinality') that
was first introduced about 10 years ago in FreeType 2.4.11 is now
deprecated and slated to be removed in the next version. TrueType
interpreter version 40 has been FreeType's default version for six
years now and provides an excellent alternative. This is the last
FreeType version with TT_INTERPRETER_VERSION_38 and
TT_INTERPRETER_VERSION_40 treated differently.
- The only referenced but never documented configuration macro
`FT_CONFIG_OPTION_NO_GLYPH_NAMES` has been removed.
- The `ftbench` demo program got a new command line option `-e` to
set a charmap index.
- Specifying a point size is now optional for the demo programs
`ftgrid`, `ftmulti`, `ftstring`, and `ftview`. If not given, a
default size is used.
- For `ftgrid`, `ftstring`, and `ftview`, option `-e` now also
accepts a numeric value to set a charmap index.
- In `ftstring`, it is now possible to set the displayed text
interactively by pressing the 'Enter' key.
- `ftmulti` can now handle up to 16 design axes.
- To avoid reserved identifiers that are globally defined, the
auto-hinter debugging macros (which are only available if
`FT_DEBUG_AUTOFIT` is defined)
```
_af_debug_disable_horz_hints
_af_debug_disable_vert_hints
_af_debug_disable_blue_hints
_af_debug_hints
```
have been renamed to
```
af_debug_disable_horz_hints_
af_debug_disable_vert_hints_
af_debug_disable_blue_hints_
af_debug_hints_
```
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 3791abd6ebcf768020cbf0da21f31f6a50561ccc
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Thu Feb 16 13:50:32 2023 +0100
dbus: Update to version 1.14.6
- Update from version 1.14.4 to 1.14.6
- Update of rootfile
- The Denial of service issue mentioned first in the changelog is not applicable to IPFire
as the build is done without asserts enabled.
- Changelog
dbus 1.14.6 (2023-02-08)
Denial of service fixes:
• Fix an incorrect assertion that could be used to crash dbus-daemon or
other users of DBusServer prior to authentication, if libdbus was compiled
with assertions enabled.
We recommend that production builds of dbus, for example in OS distributions,
should be compiled with checks but without assertions.
(dbus#421, Ralf Habacker; thanks to Evgeny Vereshchagin)
Other fixes:
• When connected to a dbus-broker, stop dbus-monitor from incorrectly
replying to Peer method calls that were sent to the dbus-broker with
a NULL destination (dbus#301, Kai A. Hiller)
• Fix out-of-bounds varargs read in the dbus-daemon's config-parser.
This is not attacker-triggerable and appears to be harmless in practice,
but is technically undefined behaviour and is detected as such by
AddressSanitizer. (dbus!357, Evgeny Vereshchagin)
• Avoid a data race in multi-threaded use of DBusCounter
(dbus#426, Ralf Habacker)
• Fix a crash with some glibc versions when non-auditable SELinux events
are logged (dbus!386, Jeremi Piotrowski)
• If dbus_message_demarshal() runs out of memory while validating a message,
report it as NoMemory rather than InvalidArgs (dbus#420, Simon McVittie)
• Use C11 _Alignof if available, for better standards-compliance
(dbus!389, Khem Raj)
• Stop including an outdated copy of pkg.m4 in the git tree
(dbus!365, Simon McVittie)
• Documentation:
· Consistently use Gitlab bug reporting URL (dbus!372, Marco Trevisan)
• Tests fixes:
· Fix the test-apparmor-activation test after dbus#416
(dbus!380, Dave Jones)
Internal changes:
• Fix CI builds with recent git versions (dbus#447, Simon McVittie)
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit f502e53c83a92ced9f6ad26cab124d6ce4c747cb
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sun Mar 5 14:53:20 2023 +0000
Core Update 174: Ship logwatch
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 72df13821d0ab4e35d68ffaa2c5b67e7dcdb817a
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Wed Jan 25 18:10:39 2023 +0100
logwatch: Update to 7.8
The developers do not provide a changelog, this time I couldn't
even find a comment.
All I can say:
Running her on Core 172. No seen problems.
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
commit 0695b748d4614aa0e0c89a68aeb6aefe1876d872
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sun Mar 5 14:52:01 2023 +0000
Core Update 174: Ship changes related to bug #11742
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit b7fdcbf6cabd0cb6fb3d53a1b74d7c6aa111b6ea
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Feb 22 12:25:34 2023 +0000
perl-TimeDate: Move from package into main system
This is now required by ovpnmain.cgi for certificate expiry time
detection.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Acked-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 498134e5dda21dd9440098872e006408d8531d5b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Feb 22 12:25:33 2023 +0000
OpenVPN: Show indication when OpenVPN certificates expire
This will help with #11742 - OpenVPN: No method to replace expired
certificates.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Acked-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 42d4b881409cdf63e2edfe4c74e0b568ff99be50
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sun Mar 5 14:23:20 2023 +0000
rust: Update aarch64 rootfile
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 2223cafa37811c8da8872a9ce83f4fbc1b5c5763
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sun Mar 5 14:22:28 2023 +0000
linux: Update aarch64 rootfile
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 2705a8903e82ad999a49f7860d5719554b5b6bf0
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Tue Feb 7 22:52:50 2023 +0100
ragel: Update to version 7.0.4
- Update from version 7.0.0.11 to 7.0.4
- Update of rootfile
- Changelog
updated language flags, catch abortcompile throw in non-ragel progs
7.0.3
This version of colm includes a critical fix for big-endian system. Fixes #61.
expect colm version 0.14.6 and version bump ragel to 7.0.3
7.0.2
Latest colm includes bugfixes for refcounting, which fixes a ragel issue with includes #58.
expect colm 0.14.5 and version bump to 7.0.2
7.0.1
removed accidental commit of ragel/.exrc
7.0.0.12
implemented NfaClear in asm codegen
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 60cbad9204ffaf9d8a00bb13460a34bc3586fa71
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Tue Feb 7 22:52:49 2023 +0100
colm: Update to version 0.14.7
- Update from version 0.13.0.6 to 0.14.7
- Update of rootfile
- patch from colm commit fc61ecb required to fix bug of make looking for static and
dynamic libs even if one of them was disabled
- Changelog is not available in source tarball or on website etc. Changes have to be
reviewed by the commits https://github.com/adrian-thurston/colm/commits/0.14.7
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit d51c4e566bfb235a1c30cffa7b6fa095cd9275b7
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sun Mar 5 14:14:31 2023 +0000
linux: Update x86_64 rootfile
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/aarch64/linux | 9 +-
config/rootfiles/common/aarch64/rust | 85 +-
config/rootfiles/common/apr | 4 +-
config/rootfiles/common/bind | 14 +-
config/rootfiles/common/colm | 69 +-
config/rootfiles/common/elinks | 6 +-
config/rootfiles/common/freetype | 2 +-
config/rootfiles/common/gnutls | 8 +-
config/rootfiles/common/harfbuzz | 18 +-
config/rootfiles/common/iproute2 | 1 +
config/rootfiles/common/liburcu | 18 +-
config/rootfiles/common/logwatch | 2 +
config/rootfiles/common/pango | 6 +-
.../rootfiles/{packages => common}/perl-TimeDate | 0
config/rootfiles/common/ragel | 52 +-
config/rootfiles/common/sudo | 2 +
config/rootfiles/common/texinfo | 19 +-
config/rootfiles/common/x86_64/grub | 1092 ++++++++++----------
config/rootfiles/common/x86_64/intel-microcode | 7 +
config/rootfiles/common/x86_64/linux | 7 +-
config/rootfiles/common/zstd | 2 +-
.../{oldcore/114 => core/174}/filelists/apr | 0
.../{oldcore/100 => core/174}/filelists/bind | 0
.../{oldcore/104 => core/174}/filelists/curl | 0
.../{oldcore/101 => core/174}/filelists/e2fsprogs | 0
.../{oldcore/141 => core/174}/filelists/elinks | 0
.../{oldcore/158 => core/174}/filelists/ethtool | 0
config/rootfiles/core/174/filelists/files | 2 +
.../{oldcore/110 => core/174}/filelists/freetype | 0
.../{oldcore/110 => core/174}/filelists/gnutls | 0
.../{oldcore/163 => core/174}/filelists/harfbuzz | 0
.../{oldcore/106 => core/174}/filelists/iproute2 | 0
.../{oldcore/163 => core/174}/filelists/liburcu | 0
.../{oldcore/151 => core/174}/filelists/lmdb | 0
.../{oldcore/111 => core/174}/filelists/logwatch | 0
.../{oldcore/163 => core/174}/filelists/pango | 0
config/rootfiles/core/174/filelists/perl-TimeDate | 1 +
.../{oldcore/112 => core/174}/filelists/sudo | 0
.../174}/filelists/x86_64/intel-microcode | 0
.../{oldcore/149 => core/174}/filelists/zstd | 0
config/rootfiles/core/174/update.sh | 28 +-
config/rootfiles/packages/dbus | 2 +-
config/rootfiles/packages/pcengines-apu-firmware | 13 +-
doc/language_issues.en | 2 +
doc/language_issues.es | 2 +
doc/language_issues.fr | 2 +
doc/language_issues.it | 2 +
doc/language_issues.nl | 2 +
doc/language_issues.pl | 2 +
doc/language_issues.ru | 2 +
doc/language_issues.tr | 2 +
doc/language_missings | 18 +
html/cgi-bin/logs.cgi/log.dat | 2 +-
html/cgi-bin/ovpnmain.cgi | 51 +-
html/cgi-bin/updatexlrator.cgi | 64 +-
langs/de/cgi-bin/de.pl | 2 +
langs/en/cgi-bin/en.pl | 2 +
lfs/apr | 4 +-
lfs/bind | 4 +-
lfs/colm | 9 +-
lfs/curl | 7 +-
lfs/dbus | 8 +-
lfs/e2fsprogs | 4 +-
lfs/elinks | 15 +-
lfs/ethtool | 4 +-
lfs/freetype | 6 +-
lfs/gnutls | 6 +-
lfs/harfbuzz | 6 +-
lfs/intel-microcode | 6 +-
lfs/iproute2 | 6 +-
lfs/liburcu | 6 +-
lfs/lmdb | 10 +-
lfs/logwatch | 6 +-
lfs/make | 6 +-
lfs/monit | 9 +-
lfs/pango | 6 +-
lfs/pcengines-apu-firmware | 19 +-
lfs/perl-TimeDate | 5 -
lfs/ragel | 8 +-
lfs/samba | 6 +-
lfs/sudo | 4 +-
lfs/swatch | 4 +-
lfs/texinfo | 7 +-
lfs/zstd | 6 +-
make.sh | 2 +-
...ble_shared-and-link-libcolm-appropriately.patch | 44 +
...pt_expressions_for_option_info_parameters.patch | 42 -
src/patches/texinfo-6.8-undo-gnulib-nonnul.patch | 186 ----
88 files changed, 1039 insertions(+), 1046 deletions(-)
rename config/rootfiles/{packages => common}/perl-TimeDate (100%)
copy config/rootfiles/{oldcore/114 => core/174}/filelists/apr (100%)
copy config/rootfiles/{oldcore/100 => core/174}/filelists/bind (100%)
copy config/rootfiles/{oldcore/104 => core/174}/filelists/curl (100%)
copy config/rootfiles/{oldcore/101 => core/174}/filelists/e2fsprogs (100%)
copy config/rootfiles/{oldcore/141 => core/174}/filelists/elinks (100%)
copy config/rootfiles/{oldcore/158 => core/174}/filelists/ethtool (100%)
copy config/rootfiles/{oldcore/110 => core/174}/filelists/freetype (100%)
copy config/rootfiles/{oldcore/110 => core/174}/filelists/gnutls (100%)
copy config/rootfiles/{oldcore/163 => core/174}/filelists/harfbuzz (100%)
copy config/rootfiles/{oldcore/106 => core/174}/filelists/iproute2 (100%)
copy config/rootfiles/{oldcore/163 => core/174}/filelists/liburcu (100%)
copy config/rootfiles/{oldcore/151 => core/174}/filelists/lmdb (100%)
copy config/rootfiles/{oldcore/111 => core/174}/filelists/logwatch (100%)
copy config/rootfiles/{oldcore/163 => core/174}/filelists/pango (100%)
create mode 120000 config/rootfiles/core/174/filelists/perl-TimeDate
copy config/rootfiles/{oldcore/112 => core/174}/filelists/sudo (100%)
copy config/rootfiles/{oldcore/121 => core/174}/filelists/x86_64/intel-microcode (100%)
copy config/rootfiles/{oldcore/149 => core/174}/filelists/zstd (100%)
create mode 100644 src/patches/colm-0.14.7-check-enable_static-and-enable_shared-and-link-libcolm-appropriately.patch
delete mode 100644 src/patches/curl-7.87.0_typecheck_accept_expressions_for_option_info_parameters.patch
delete mode 100644 src/patches/texinfo-6.8-undo-gnulib-nonnul.patch
Difference in files:
diff --git a/config/rootfiles/common/aarch64/linux b/config/rootfiles/common/aarch64/linux
index e5dca7ea4..77c6ba1b7 100644
--- a/config/rootfiles/common/aarch64/linux
+++ b/config/rootfiles/common/aarch64/linux
@@ -6837,6 +6837,7 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire/build/include/config/ARCH_SUPPORTS_MEMORY_FAILURE
#lib/modules/KVER-ipfire/build/include/config/ARCH_SUPPORTS_NUMA_BALANCING
#lib/modules/KVER-ipfire/build/include/config/ARCH_SUPPORTS_PAGE_TABLE_CHECK
+#lib/modules/KVER-ipfire/build/include/config/ARCH_SUPPORTS_SHADOW_CALL_STACK
#lib/modules/KVER-ipfire/build/include/config/ARCH_SUPPORTS_UPROBES
#lib/modules/KVER-ipfire/build/include/config/ARCH_SUSPEND_POSSIBLE
#lib/modules/KVER-ipfire/build/include/config/ARCH_USES_HIGH_VMA_FLAGS
@@ -7236,6 +7237,9 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire/build/include/config/CC_HAS_ASM_GOTO_OUTPUT
#lib/modules/KVER-ipfire/build/include/config/CC_HAS_ASM_GOTO_TIED_OUTPUT
#lib/modules/KVER-ipfire/build/include/config/CC_HAS_ASM_INLINE
+#lib/modules/KVER-ipfire/build/include/config/CC_HAS_AUTO_VAR_INIT_PATTERN
+#lib/modules/KVER-ipfire/build/include/config/CC_HAS_AUTO_VAR_INIT_ZERO
+#lib/modules/KVER-ipfire/build/include/config/CC_HAS_AUTO_VAR_INIT_ZERO_BARE
#lib/modules/KVER-ipfire/build/include/config/CC_HAS_BRANCH_PROT_PAC_RET
#lib/modules/KVER-ipfire/build/include/config/CC_HAS_BRANCH_PROT_PAC_RET_BTI
#lib/modules/KVER-ipfire/build/include/config/CC_HAS_INT128
@@ -7246,6 +7250,7 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire/build/include/config/CC_HAS_SIGN_RETURN_ADDRESS
#lib/modules/KVER-ipfire/build/include/config/CC_HAS_WORKING_NOSANITIZE_ADDRESS
#lib/modules/KVER-ipfire/build/include/config/CC_HAS_ZERO_CALL_USED_REGS
+#lib/modules/KVER-ipfire/build/include/config/CC_HAVE_SHADOW_CALL_STACK
#lib/modules/KVER-ipfire/build/include/config/CC_HAVE_STACKPROTECTOR_SYSREG
#lib/modules/KVER-ipfire/build/include/config/CC_IMPLICIT_FALLTHROUGH
#lib/modules/KVER-ipfire/build/include/config/CC_IS_GCC
@@ -8099,8 +8104,6 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire/build/include/config/GCC11_NO_ARRAY_BOUNDS
#lib/modules/KVER-ipfire/build/include/config/GCC12_NO_ARRAY_BOUNDS
#lib/modules/KVER-ipfire/build/include/config/GCC_PLUGINS
-#lib/modules/KVER-ipfire/build/include/config/GCC_PLUGIN_STRUCTLEAK
-#lib/modules/KVER-ipfire/build/include/config/GCC_PLUGIN_STRUCTLEAK_BYREF_ALL
#lib/modules/KVER-ipfire/build/include/config/GCC_SUPPORTS_DYNAMIC_FTRACE_WITH_REGS
#lib/modules/KVER-ipfire/build/include/config/GCC_VERSION
#lib/modules/KVER-ipfire/build/include/config/GEMINI_ETHERNET
@@ -8459,6 +8462,7 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire/build/include/config/INITRAMFS_SOURCE
#lib/modules/KVER-ipfire/build/include/config/INIT_ENV_ARG_LIMIT
#lib/modules/KVER-ipfire/build/include/config/INIT_ON_ALLOC_DEFAULT_ON
+#lib/modules/KVER-ipfire/build/include/config/INIT_STACK_ALL_ZERO
#lib/modules/KVER-ipfire/build/include/config/INOTIFY_USER
#lib/modules/KVER-ipfire/build/include/config/INPUT
#lib/modules/KVER-ipfire/build/include/config/INPUT_ATI_REMOTE2
@@ -18100,7 +18104,6 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire/build/scripts/gcc-plugins/sancov_plugin.c
#lib/modules/KVER-ipfire/build/scripts/gcc-plugins/stackleak_plugin.c
#lib/modules/KVER-ipfire/build/scripts/gcc-plugins/structleak_plugin.c
-#lib/modules/KVER-ipfire/build/scripts/gcc-plugins/structleak_plugin.so
#lib/modules/KVER-ipfire/build/scripts/gcc-x86_32-has-stack-protector.sh
#lib/modules/KVER-ipfire/build/scripts/gcc-x86_64-has-stack-protector.sh
#lib/modules/KVER-ipfire/build/scripts/gdb
diff --git a/config/rootfiles/common/aarch64/rust b/config/rootfiles/common/aarch64/rust
index 952351e07..225bad7b6 100644
--- a/config/rootfiles/common/aarch64/rust
+++ b/config/rootfiles/common/aarch64/rust
@@ -6,17 +6,23 @@
#usr/bin/rustdoc
#usr/etc/bash_completion.d
#usr/etc/bash_completion.d/cargo
-#usr/lib/libchalk_derive-32e8d11ebc2d3771.so
-#usr/lib/libcstr-35243ee29600a3d5.so
-#usr/lib/libproc_macro_hack-f3f86b375f852280.so
-#usr/lib/librustc_driver-607f09e7bd955f7e.so
-#usr/lib/librustc_macros-b04a966475b428d1.so
-#usr/lib/libserde_derive-80e4492fd5e63e0c.so
-#usr/lib/libstd-d6a3d69f99ffaf6d.so
-#usr/lib/libtest-23103a494d253295.so
-#usr/lib/libthiserror_impl-a26e6345865c1bf9.so
-#usr/lib/libtracing_attributes-433437e889b94779.so
-#usr/lib/libunic_langid_macros_impl-53f301ae412d0720.so
+#usr/lib/libchalk_derive-73a40a6a15aa6119.so
+#usr/lib/libcstr-435995457a32217b.so
+#usr/lib/libderive_more-89bd279f3334d3f2.so
+#usr/lib/libdisplaydoc-ccaea0b1dd937724.so
+#usr/lib/libicu_provider_macros-bdd161fb91bfac75.so
+#usr/lib/libproc_macro_hack-5515f5e9de7f3b33.so
+#usr/lib/librustc_driver-c21064f0d6190bc9.so
+#usr/lib/librustc_macros-9459ff5fdab1896f.so
+#usr/lib/libserde_derive-9ec19eb421babc4f.so
+#usr/lib/libstd-f6fab35afe949852.so
+#usr/lib/libtest-15e26e6e92c6d6a9.so
+#usr/lib/libthiserror_impl-d8ffaa228f9b0a09.so
+#usr/lib/libtracing_attributes-babc061b68390947.so
+#usr/lib/libunic_langid_macros_impl-25424350b834739e.so
+#usr/lib/libyoke_derive-ad9526c2c89e2145.so
+#usr/lib/libzerofrom_derive-ef5640f90c8390cf.so
+#usr/lib/libzerovec_derive-6b7809d259a5aea6.so
#usr/lib/rustlib
#usr/lib/rustlib/aarch64-unknown-linux-gnu
#usr/lib/rustlib/aarch64-unknown-linux-gnu/bin
@@ -26,39 +32,39 @@
#usr/lib/rustlib/aarch64-unknown-linux-gnu/bin/gcc-ld/lld-link
#usr/lib/rustlib/aarch64-unknown-linux-gnu/bin/gcc-ld/wasm-ld
#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib
-#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libaddr2line-a927b162bc60c425.rlib
-#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libadler-d92914ff3d5eb095.rlib
-#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/liballoc-a4dac6d0a3453f99.rlib
-#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libcfg_if-35d3effb200737cc.rlib
-#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libcompiler_builtins-d39f7c1f0b7c4e1c.rlib
-#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libcore-7ffafb81d9ab205d.rlib
-#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libgetopts-8be4364242eae647.rlib
-#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libgimli-70cb0f9eab66d391.rlib
-#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libhashbrown-70a3992a32923f78.rlib
-#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/liblibc-c8a1bdfd2a181af5.rlib
-#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libmemchr-253d0ac16cbdc0ed.rlib
-#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libminiz_oxide-99adfdadbdbeebc5.rlib
-#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libobject-3244f06480a2a12d.rlib
-#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libpanic_abort-a5ecf3e73c4eb1a6.rlib
-#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libpanic_unwind-a1274b3b8ea88bcd.rlib
-#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libproc_macro-aee3c65ec4e0f02b.rlib
-#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libprofiler_builtins-37259a2ec2c60da2.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libaddr2line-214015861667ba9c.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libadler-d3734ff9791968ba.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/liballoc-a9cb98efa50102fe.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libcfg_if-d76500918c8766e9.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libcompiler_builtins-0222020c3eea44f8.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libcore-ded8ec8026a81d22.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libgetopts-f27c9689662442e2.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libgimli-7d5d0c1e1e66cafd.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libhashbrown-db473b4fe6ee2788.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/liblibc-c889f940e97ce094.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libmemchr-5a2e11949e6321e8.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libminiz_oxide-1dd46390c6037e19.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libobject-bcf3087a1126b654.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libpanic_abort-5843d82f1254d4af.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libpanic_unwind-6f5a332029a62322.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libproc_macro-e301cc22fe5c6c1c.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libprofiler_builtins-2b2e90d3a4db58a2.rlib
#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc-stable_rt.asan.a
#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc-stable_rt.hwasan.a
#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc-stable_rt.lsan.a
#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc-stable_rt.msan.a
#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc-stable_rt.tsan.a
-#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc_demangle-c7714af29ccdfe2f.rlib
-#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc_std_workspace_alloc-d67985415946bc22.rlib
-#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc_std_workspace_core-16263bc2bc299e34.rlib
-#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc_std_workspace_std-f31115862496eec5.rlib
-#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libstd-d6a3d69f99ffaf6d.rlib
-#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libstd-d6a3d69f99ffaf6d.so
-#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libstd_detect-8c0e5b3b6bbc28b1.rlib
-#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libtest-23103a494d253295.rlib
-#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libtest-23103a494d253295.so
-#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libunicode_width-a0f6ff0d42aad917.rlib
-#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libunwind-9847c52cefdf3177.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc_demangle-b11737a5f240b7f8.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc_std_workspace_alloc-83bbc9721056031d.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc_std_workspace_core-9ae314eb5ffdbb16.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc_std_workspace_std-f6be17bf7bedad3b.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libstd-f6fab35afe949852.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libstd-f6fab35afe949852.so
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libstd_detect-f68e9d9079b1320e.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libtest-15e26e6e92c6d6a9.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libtest-15e26e6e92c6d6a9.so
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libunicode_width-0d0e75e55a2615d2.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libunwind-2a36edb432000403.rlib
#usr/lib/rustlib/components
#usr/lib/rustlib/etc
#usr/lib/rustlib/etc/gdb_load_rust_pretty_printers.py
@@ -108,6 +114,7 @@
#usr/share/man/man1/cargo-package.1
#usr/share/man/man1/cargo-pkgid.1
#usr/share/man/man1/cargo-publish.1
+#usr/share/man/man1/cargo-remove.1
#usr/share/man/man1/cargo-report.1
#usr/share/man/man1/cargo-run.1
#usr/share/man/man1/cargo-rustc.1
diff --git a/config/rootfiles/common/apr b/config/rootfiles/common/apr
index 52e59aaae..50b811bdd 100644
--- a/config/rootfiles/common/apr
+++ b/config/rootfiles/common/apr
@@ -45,13 +45,11 @@ usr/bin/apr-1-config
#usr/lib/libapr-1.la
#usr/lib/libapr-1.so
usr/lib/libapr-1.so.0
-usr/lib/libapr-1.so.0.7.0
+usr/lib/libapr-1.so.0.7.2
#usr/lib/pkgconfig/apr-1.pc
#usr/share/apr-1
#usr/share/apr-1/build
-#usr/share/apr-1/build/apr_common.m4
#usr/share/apr-1/build/apr_rules.mk
-#usr/share/apr-1/build/find_apr.m4
#usr/share/apr-1/build/libtool
#usr/share/apr-1/build/make_exports.awk
#usr/share/apr-1/build/make_var_export.awk
diff --git a/config/rootfiles/common/bind b/config/rootfiles/common/bind
index b926495d3..49a56107e 100644
--- a/config/rootfiles/common/bind
+++ b/config/rootfiles/common/bind
@@ -271,24 +271,24 @@ usr/bin/nsupdate
#usr/include/pk11/site.h
#usr/include/pkcs11
#usr/include/pkcs11/pkcs11.h
-usr/lib/libbind9-9.16.37.so
+usr/lib/libbind9-9.16.38.so
#usr/lib/libbind9.la
#usr/lib/libbind9.so
-usr/lib/libdns-9.16.37.so
+usr/lib/libdns-9.16.38.so
#usr/lib/libdns.la
#usr/lib/libdns.so
-usr/lib/libirs-9.16.37.so
+usr/lib/libirs-9.16.38.so
#usr/lib/libirs.la
#usr/lib/libirs.so
-usr/lib/libisc-9.16.37.so
+usr/lib/libisc-9.16.38.so
#usr/lib/libisc.la
#usr/lib/libisc.so
-usr/lib/libisccc-9.16.37.so
+usr/lib/libisccc-9.16.38.so
#usr/lib/libisccc.la
#usr/lib/libisccc.so
-usr/lib/libisccfg-9.16.37.so
+usr/lib/libisccfg-9.16.38.so
#usr/lib/libisccfg.la
#usr/lib/libisccfg.so
-usr/lib/libns-9.16.37.so
+usr/lib/libns-9.16.38.so
#usr/lib/libns.la
#usr/lib/libns.so
diff --git a/config/rootfiles/common/colm b/config/rootfiles/common/colm
index 7f0d22396..a3ad4bcdd 100644
--- a/config/rootfiles/common/colm
+++ b/config/rootfiles/common/colm
@@ -1,7 +1,48 @@
#usr/bin/colm
+#usr/bin/colm-wrap
+#usr/include/aapl
+#usr/include/aapl/astring.h
+#usr/include/aapl/avlbasic.h
+#usr/include/aapl/avlcommon.h
+#usr/include/aapl/avlibasic.h
+#usr/include/aapl/avlikeyless.h
+#usr/include/aapl/avlimap.h
+#usr/include/aapl/avlimel.h
+#usr/include/aapl/avlimelkey.h
+#usr/include/aapl/avliset.h
+#usr/include/aapl/avlitree.h
+#usr/include/aapl/avlkeyless.h
+#usr/include/aapl/avlmap.h
+#usr/include/aapl/avlmel.h
+#usr/include/aapl/avlmelkey.h
+#usr/include/aapl/avlset.h
+#usr/include/aapl/avltree.h
+#usr/include/aapl/bstcommon.h
+#usr/include/aapl/bstmap.h
+#usr/include/aapl/bstset.h
+#usr/include/aapl/bsttable.h
+#usr/include/aapl/bubblesort.h
+#usr/include/aapl/buffer.h
+#usr/include/aapl/compare.h
+#usr/include/aapl/dlcommon.h
+#usr/include/aapl/dlist.h
+#usr/include/aapl/dlistmel.h
+#usr/include/aapl/dlistval.h
+#usr/include/aapl/insertsort.h
+#usr/include/aapl/mergesort.h
+#usr/include/aapl/quicksort.h
+#usr/include/aapl/resize.h
+#usr/include/aapl/rope.h
+#usr/include/aapl/sbstmap.h
+#usr/include/aapl/sbstset.h
+#usr/include/aapl/sbsttable.h
+#usr/include/aapl/svector.h
+#usr/include/aapl/table.h
+#usr/include/aapl/vector.h
#usr/include/colm
#usr/include/colm/bytecode.h
#usr/include/colm/colm.h
+#usr/include/colm/colmex.h
#usr/include/colm/config.h
#usr/include/colm/debug.h
#usr/include/colm/defs.h
@@ -14,8 +55,34 @@
#usr/include/colm/struct.h
#usr/include/colm/tree.h
#usr/include/colm/type.h
-#usr/lib/libcolm-0.13.0.6.so
+#usr/include/libfsm
+#usr/include/libfsm/action.h
+#usr/include/libfsm/asm.h
+#usr/include/libfsm/common.h
+#usr/include/libfsm/dot.h
+#usr/include/libfsm/fsmgraph.h
+#usr/include/libfsm/gendata.h
+#usr/include/libfsm/ragel.h
+#usr/include/libfsm/redfsm.h
+#usr/lib/libcolm-0.14.7.so
#usr/lib/libcolm.la
#usr/lib/libcolm.so
+#usr/lib/libfsm-0.14.7.so
+#usr/lib/libfsm.la
+#usr/lib/libfsm.so
#usr/share/doc/colm
#usr/share/doc/colm/colm.vim
+#usr/share/ril.lm
+#usr/share/rlhc-c.lm
+#usr/share/rlhc-crack.lm
+#usr/share/rlhc-csharp.lm
+#usr/share/rlhc-d.lm
+#usr/share/rlhc-go.lm
+#usr/share/rlhc-java.lm
+#usr/share/rlhc-js.lm
+#usr/share/rlhc-julia.lm
+#usr/share/rlhc-main.lm
+#usr/share/rlhc-ocaml.lm
+#usr/share/rlhc-ruby.lm
+#usr/share/rlhc-rust.lm
+#usr/share/runtests
diff --git a/config/rootfiles/common/elinks b/config/rootfiles/common/elinks
index be30d1cde..c8c79f114 100644
--- a/config/rootfiles/common/elinks
+++ b/config/rootfiles/common/elinks
@@ -25,7 +25,7 @@ usr/local/etc/elinks/elinks.conf
#usr/local/share/locale/da/LC_MESSAGES/elinks.mo
#usr/local/share/locale/de
#usr/local/share/locale/de/LC_MESSAGES
-usr/local/share/locale/de/LC_MESSAGES/elinks.mo
+#usr/local/share/locale/de/LC_MESSAGES/elinks.mo
#usr/local/share/locale/el
#usr/local/share/locale/el/LC_MESSAGES
#usr/local/share/locale/el/LC_MESSAGES/elinks.mo
@@ -62,7 +62,6 @@ usr/local/share/locale/de/LC_MESSAGES/elinks.mo
#usr/local/share/locale/ja
#usr/local/share/locale/ja/LC_MESSAGES
#usr/local/share/locale/ja/LC_MESSAGES/elinks.mo
-#usr/local/share/locale/locale.alias
#usr/local/share/locale/lt
#usr/local/share/locale/lt/LC_MESSAGES
#usr/local/share/locale/lt/LC_MESSAGES/elinks.mo
@@ -102,6 +101,3 @@ usr/local/share/locale/de/LC_MESSAGES/elinks.mo
#usr/local/share/locale/uk
#usr/local/share/locale/uk/LC_MESSAGES
#usr/local/share/locale/uk/LC_MESSAGES/elinks.mo
-#usr/local/share/man/man1/elinks.1
-#usr/local/share/man/man5/elinks.conf.5
-#usr/local/share/man/man5/elinkskeys.5
diff --git a/config/rootfiles/common/freetype b/config/rootfiles/common/freetype
index e7d8e9ff9..d42345cc9 100644
--- a/config/rootfiles/common/freetype
+++ b/config/rootfiles/common/freetype
@@ -60,7 +60,7 @@
#usr/lib/libfreetype.la
#usr/lib/libfreetype.so
usr/lib/libfreetype.so.6
-usr/lib/libfreetype.so.6.18.3
+usr/lib/libfreetype.so.6.19.0
#usr/lib/pkgconfig/freetype2.pc
#usr/share/aclocal/freetype2.m4
#usr/share/man/man1/freetype-config.1
diff --git a/config/rootfiles/common/gnutls b/config/rootfiles/common/gnutls
index 77ce36c88..508596906 100644
--- a/config/rootfiles/common/gnutls
+++ b/config/rootfiles/common/gnutls
@@ -5,7 +5,6 @@ usr/bin/gnutls-cli-debug
usr/bin/gnutls-serv
usr/bin/ocsptool
usr/bin/psktool
-usr/bin/srptool
#usr/include/gnutls
#usr/include/gnutls/abstract.h
#usr/include/gnutls/compat.h
@@ -33,7 +32,7 @@ usr/lib/libgnutls-dane.so.0.4.1
#usr/lib/libgnutls.la
#usr/lib/libgnutls.so
usr/lib/libgnutls.so.30
-usr/lib/libgnutls.so.30.34.1
+usr/lib/libgnutls.so.30.35.0
#usr/lib/libgnutlsxx.la
#usr/lib/libgnutlsxx.so
usr/lib/libgnutlsxx.so.30
@@ -53,7 +52,6 @@ usr/lib/libgnutlsxx.so.30.0.0
#usr/share/doc/gnutls/pkcs11-vision.png
#usr/share/info/gnutls-client-server-use-case.png
#usr/share/info/gnutls-crypto-layers.png
-#usr/share/info/gnutls-guile.info
#usr/share/info/gnutls-handshake-sequence.png
#usr/share/info/gnutls-handshake-state.png
#usr/share/info/gnutls-internals.png
@@ -77,10 +75,12 @@ usr/lib/libgnutlsxx.so.30.0.0
#usr/share/locale/fi/LC_MESSAGES/gnutls.mo
#usr/share/locale/fr/LC_MESSAGES/gnutls.mo
#usr/share/locale/it/LC_MESSAGES/gnutls.mo
+#usr/share/locale/ka/LC_MESSAGES/gnutls.mo
#usr/share/locale/ms/LC_MESSAGES/gnutls.mo
#usr/share/locale/nl/LC_MESSAGES/gnutls.mo
#usr/share/locale/pl/LC_MESSAGES/gnutls.mo
#usr/share/locale/pt_BR/LC_MESSAGES/gnutls.mo
+#usr/share/locale/ro/LC_MESSAGES/gnutls.mo
#usr/share/locale/sr/LC_MESSAGES/gnutls.mo
#usr/share/locale/sv/LC_MESSAGES/gnutls.mo
#usr/share/locale/uk/LC_MESSAGES/gnutls.mo
@@ -94,7 +94,6 @@ usr/lib/libgnutlsxx.so.30.0.0
#usr/share/man/man1/ocsptool.1
#usr/share/man/man1/p11tool.1
#usr/share/man/man1/psktool.1
-#usr/share/man/man1/srptool.1
#usr/share/man/man1/tpmtool.1
#usr/share/man/man3/dane_cert_type_name.3
#usr/share/man/man3/dane_cert_usage_name.3
@@ -1280,4 +1279,3 @@ usr/lib/libgnutlsxx.so.30.0.0
#usr/share/man/man3/gnutls_x509_trust_list_verify_crt.3
#usr/share/man/man3/gnutls_x509_trust_list_verify_crt2.3
#usr/share/man/man3/gnutls_x509_trust_list_verify_named_crt.3
-
diff --git a/config/rootfiles/common/harfbuzz b/config/rootfiles/common/harfbuzz
index 7da247be0..b18e30a18 100644
--- a/config/rootfiles/common/harfbuzz
+++ b/config/rootfiles/common/harfbuzz
@@ -1,3 +1,4 @@
+#usr/bin/hb-info
#usr/bin/hb-ot-shape-closure
#usr/bin/hb-shape
#usr/bin/hb-subset
@@ -7,6 +8,7 @@
#usr/include/harfbuzz/hb-aat.h
#usr/include/harfbuzz/hb-blob.h
#usr/include/harfbuzz/hb-buffer.h
+#usr/include/harfbuzz/hb-cairo.h
#usr/include/harfbuzz/hb-common.h
#usr/include/harfbuzz/hb-cplusplus.hh
#usr/include/harfbuzz/hb-deprecated.h
@@ -27,6 +29,7 @@
#usr/include/harfbuzz/hb-ot-shape.h
#usr/include/harfbuzz/hb-ot-var.h
#usr/include/harfbuzz/hb-ot.h
+#usr/include/harfbuzz/hb-paint.h
#usr/include/harfbuzz/hb-set.h
#usr/include/harfbuzz/hb-shape-plan.h
#usr/include/harfbuzz/hb-shape.h
@@ -38,14 +41,19 @@
#usr/include/harfbuzz/hb.h
#usr/lib/cmake/harfbuzz
#usr/lib/cmake/harfbuzz/harfbuzz-config.cmake
+#usr/lib/libharfbuzz-cairo.la
+#usr/lib/libharfbuzz-cairo.so
+usr/lib/libharfbuzz-cairo.so.0
+usr/lib/libharfbuzz-cairo.so.0.60701.0
#usr/lib/libharfbuzz-subset.la
#usr/lib/libharfbuzz-subset.so
usr/lib/libharfbuzz-subset.so.0
-usr/lib/libharfbuzz-subset.so.0.60000.0
+usr/lib/libharfbuzz-subset.so.0.60701.0
#usr/lib/libharfbuzz.la
#usr/lib/libharfbuzz.so
usr/lib/libharfbuzz.so.0
-usr/lib/libharfbuzz.so.0.60000.0
+usr/lib/libharfbuzz.so.0.60701.0
+#usr/lib/pkgconfig/harfbuzz-cairo.pc
#usr/lib/pkgconfig/harfbuzz-subset.pc
#usr/lib/pkgconfig/harfbuzz.pc
#usr/share/gtk-doc/html/harfbuzz
@@ -118,6 +126,7 @@ usr/lib/libharfbuzz.so.0.60000.0
#usr/share/gtk-doc/html/harfbuzz/api-index-5-0-0.html
#usr/share/gtk-doc/html/harfbuzz/api-index-5-3-0.html
#usr/share/gtk-doc/html/harfbuzz/api-index-6-0-0.html
+#usr/share/gtk-doc/html/harfbuzz/api-index-7-0-0.html
#usr/share/gtk-doc/html/harfbuzz/api-index-full.html
#usr/share/gtk-doc/html/harfbuzz/apple-advanced-typography-api.html
#usr/share/gtk-doc/html/harfbuzz/buffers-language-script-and-direction.html
@@ -131,16 +140,19 @@ usr/lib/libharfbuzz.so.0.60000.0
#usr/share/gtk-doc/html/harfbuzz/fonts-and-faces-variable.html
#usr/share/gtk-doc/html/harfbuzz/fonts-and-faces.html
#usr/share/gtk-doc/html/harfbuzz/getting-started.html
+#usr/share/gtk-doc/html/harfbuzz/glyphs-and-rendering.html
#usr/share/gtk-doc/html/harfbuzz/graphite-shaping.html
#usr/share/gtk-doc/html/harfbuzz/harfbuzz-hb-aat-layout.html
#usr/share/gtk-doc/html/harfbuzz/harfbuzz-hb-blob.html
#usr/share/gtk-doc/html/harfbuzz/harfbuzz-hb-buffer.html
+#usr/share/gtk-doc/html/harfbuzz/harfbuzz-hb-cairo.html
#usr/share/gtk-doc/html/harfbuzz/harfbuzz-hb-common.html
#usr/share/gtk-doc/html/harfbuzz/harfbuzz-hb-coretext.html
#usr/share/gtk-doc/html/harfbuzz/harfbuzz-hb-deprecated.html
#usr/share/gtk-doc/html/harfbuzz/harfbuzz-hb-directwrite.html
#usr/share/gtk-doc/html/harfbuzz/harfbuzz-hb-draw.html
#usr/share/gtk-doc/html/harfbuzz/harfbuzz-hb-face.html
+#usr/share/gtk-doc/html/harfbuzz/harfbuzz-hb-features.html
#usr/share/gtk-doc/html/harfbuzz/harfbuzz-hb-font.html
#usr/share/gtk-doc/html/harfbuzz/harfbuzz-hb-ft.html
#usr/share/gtk-doc/html/harfbuzz/harfbuzz-hb-gdi.html
@@ -157,6 +169,7 @@ usr/lib/libharfbuzz.so.0.60000.0
#usr/share/gtk-doc/html/harfbuzz/harfbuzz-hb-ot-name.html
#usr/share/gtk-doc/html/harfbuzz/harfbuzz-hb-ot-shape.html
#usr/share/gtk-doc/html/harfbuzz/harfbuzz-hb-ot-var.html
+#usr/share/gtk-doc/html/harfbuzz/harfbuzz-hb-paint.html
#usr/share/gtk-doc/html/harfbuzz/harfbuzz-hb-set.html
#usr/share/gtk-doc/html/harfbuzz/harfbuzz-hb-shape-plan.html
#usr/share/gtk-doc/html/harfbuzz/harfbuzz-hb-shape.html
@@ -170,6 +183,7 @@ usr/lib/libharfbuzz.so.0.60000.0
#usr/share/gtk-doc/html/harfbuzz/index.html
#usr/share/gtk-doc/html/harfbuzz/install-harfbuzz.html
#usr/share/gtk-doc/html/harfbuzz/integration-api.html
+#usr/share/gtk-doc/html/harfbuzz/integration-cairo.html
#usr/share/gtk-doc/html/harfbuzz/integration-coretext.html
#usr/share/gtk-doc/html/harfbuzz/integration-freetype.html
#usr/share/gtk-doc/html/harfbuzz/integration-icu.html
diff --git a/config/rootfiles/common/iproute2 b/config/rootfiles/common/iproute2
index 5f6058904..420a33c85 100644
--- a/config/rootfiles/common/iproute2
+++ b/config/rootfiles/common/iproute2
@@ -44,6 +44,7 @@ usr/share/bash-completion/completions/tc
#usr/share/man/man8/bridge.8
#usr/share/man/man8/ctstat.8
#usr/share/man/man8/dcb-app.8
+#usr/share/man/man8/dcb-apptrust.8
#usr/share/man/man8/dcb-buffer.8
#usr/share/man/man8/dcb-dcbx.8
#usr/share/man/man8/dcb-ets.8
diff --git a/config/rootfiles/common/liburcu b/config/rootfiles/common/liburcu
index c67695c8d..029fc6f50 100644
--- a/config/rootfiles/common/liburcu
+++ b/config/rootfiles/common/liburcu
@@ -24,6 +24,7 @@
#usr/include/urcu/arch/sparc64.h
#usr/include/urcu/arch/tile.h
#usr/include/urcu/arch/x86.h
+#usr/include/urcu/assert.h
#usr/include/urcu/call-rcu.h
#usr/include/urcu/cds.h
#usr/include/urcu/compiler.h
@@ -92,6 +93,7 @@
#usr/include/urcu/urcu-futex.h
#usr/include/urcu/urcu-mb.h
#usr/include/urcu/urcu-memb.h
+#usr/include/urcu/urcu-poll.h
#usr/include/urcu/urcu-qsbr.h
#usr/include/urcu/urcu-signal.h
#usr/include/urcu/urcu.h
@@ -102,35 +104,35 @@
#usr/lib/liburcu-bp.la
#usr/lib/liburcu-bp.so
usr/lib/liburcu-bp.so.8
-usr/lib/liburcu-bp.so.8.0.0
+usr/lib/liburcu-bp.so.8.1.0
#usr/lib/liburcu-cds.la
#usr/lib/liburcu-cds.so
usr/lib/liburcu-cds.so.8
-usr/lib/liburcu-cds.so.8.0.0
+usr/lib/liburcu-cds.so.8.1.0
#usr/lib/liburcu-common.la
#usr/lib/liburcu-common.so
usr/lib/liburcu-common.so.8
-usr/lib/liburcu-common.so.8.0.0
+usr/lib/liburcu-common.so.8.1.0
#usr/lib/liburcu-mb.la
#usr/lib/liburcu-mb.so
usr/lib/liburcu-mb.so.8
-usr/lib/liburcu-mb.so.8.0.0
+usr/lib/liburcu-mb.so.8.1.0
#usr/lib/liburcu-memb.la
#usr/lib/liburcu-memb.so
usr/lib/liburcu-memb.so.8
-usr/lib/liburcu-memb.so.8.0.0
+usr/lib/liburcu-memb.so.8.1.0
#usr/lib/liburcu-qsbr.la
#usr/lib/liburcu-qsbr.so
usr/lib/liburcu-qsbr.so.8
-usr/lib/liburcu-qsbr.so.8.0.0
+usr/lib/liburcu-qsbr.so.8.1.0
#usr/lib/liburcu-signal.la
#usr/lib/liburcu-signal.so
usr/lib/liburcu-signal.so.8
-usr/lib/liburcu-signal.so.8.0.0
+usr/lib/liburcu-signal.so.8.1.0
#usr/lib/liburcu.la
#usr/lib/liburcu.so
usr/lib/liburcu.so.8
-usr/lib/liburcu.so.8.0.0
+usr/lib/liburcu.so.8.1.0
#usr/lib/pkgconfig/liburcu-bp.pc
#usr/lib/pkgconfig/liburcu-cds.pc
#usr/lib/pkgconfig/liburcu-mb.pc
diff --git a/config/rootfiles/common/logwatch b/config/rootfiles/common/logwatch
index 975ec40c1..2732215d5 100644
--- a/config/rootfiles/common/logwatch
+++ b/config/rootfiles/common/logwatch
@@ -95,6 +95,7 @@ usr/share/logwatch/default.conf/services/dhcpd.conf
#usr/share/logwatch/default.conf/services/dnssec.conf
#usr/share/logwatch/default.conf/services/dovecot.conf
#usr/share/logwatch/default.conf/services/dpkg.conf
+#usr/share/logwatch/default.conf/services/dropbear.conf
#usr/share/logwatch/default.conf/services/emerge.conf
#usr/share/logwatch/default.conf/services/evtapplication.conf
#usr/share/logwatch/default.conf/services/evtmswindows.conf
@@ -243,6 +244,7 @@ usr/share/logwatch/scripts/services/dialup
#usr/share/logwatch/scripts/services/dnssec
#usr/share/logwatch/scripts/services/dovecot
#usr/share/logwatch/scripts/services/dpkg
+#usr/share/logwatch/scripts/services/dropbear
#usr/share/logwatch/scripts/services/emerge
#usr/share/logwatch/scripts/services/evtapplication
#usr/share/logwatch/scripts/services/evtmswindows
diff --git a/config/rootfiles/common/pango b/config/rootfiles/common/pango
index 3c0fc91fd..a50610e7c 100644
--- a/config/rootfiles/common/pango
+++ b/config/rootfiles/common/pango
@@ -41,13 +41,13 @@ usr/bin/pango-view
#usr/include/pango-1.0/pango/pangoft2.h
#usr/lib/libpango-1.0.so
usr/lib/libpango-1.0.so.0
-usr/lib/libpango-1.0.so.0.5000.6
+usr/lib/libpango-1.0.so.0.5000.13
#usr/lib/libpangocairo-1.0.so
usr/lib/libpangocairo-1.0.so.0
-usr/lib/libpangocairo-1.0.so.0.5000.6
+usr/lib/libpangocairo-1.0.so.0.5000.13
#usr/lib/libpangoft2-1.0.so
usr/lib/libpangoft2-1.0.so.0
-usr/lib/libpangoft2-1.0.so.0.5000.6
+usr/lib/libpangoft2-1.0.so.0.5000.13
#usr/lib/pkgconfig/pango.pc
#usr/lib/pkgconfig/pangocairo.pc
#usr/lib/pkgconfig/pangofc.pc
diff --git a/config/rootfiles/packages/perl-TimeDate b/config/rootfiles/common/perl-TimeDate
similarity index 100%
rename from config/rootfiles/packages/perl-TimeDate
rename to config/rootfiles/common/perl-TimeDate
diff --git a/config/rootfiles/common/ragel b/config/rootfiles/common/ragel
index 6b16f03d2..9c0b469b2 100644
--- a/config/rootfiles/common/ragel
+++ b/config/rootfiles/common/ragel
@@ -11,60 +11,12 @@
#usr/bin/ragel-ocaml
#usr/bin/ragel-ruby
#usr/bin/ragel-rust
-#usr/include/ragel
-#usr/include/ragel/action.h
-#usr/include/ragel/avlbasic.h
-#usr/include/ragel/avlcommon.h
-#usr/include/ragel/avlibasic.h
-#usr/include/ragel/avlikeyless.h
-#usr/include/ragel/avlimap.h
-#usr/include/ragel/avlimel.h
-#usr/include/ragel/avlimelkey.h
-#usr/include/ragel/avliset.h
-#usr/include/ragel/avlitree.h
-#usr/include/ragel/avlkeyless.h
-#usr/include/ragel/avlmap.h
-#usr/include/ragel/avlmel.h
-#usr/include/ragel/avlmelkey.h
-#usr/include/ragel/avlset.h
-#usr/include/ragel/avltree.h
-#usr/include/ragel/bstcommon.h
-#usr/include/ragel/bstmap.h
-#usr/include/ragel/bstset.h
-#usr/include/ragel/bsttable.h
-#usr/include/ragel/bubblesort.h
-#usr/include/ragel/common.h
-#usr/include/ragel/compare.h
-#usr/include/ragel/config.h
-#usr/include/ragel/dlcommon.h
-#usr/include/ragel/dlist.h
-#usr/include/ragel/dlistmel.h
-#usr/include/ragel/dlistval.h
-#usr/include/ragel/dot.h
-#usr/include/ragel/fsmgraph.h
-#usr/include/ragel/gendata.h
-#usr/include/ragel/insertsort.h
-#usr/include/ragel/mergesort.h
-#usr/include/ragel/quicksort.h
-#usr/include/ragel/ragel.h
-#usr/include/ragel/redfsm.h
-#usr/include/ragel/resize.h
-#usr/include/ragel/sbstmap.h
-#usr/include/ragel/sbstset.h
-#usr/include/ragel/sbsttable.h
-#usr/include/ragel/svector.h
-#usr/include/ragel/table.h
-#usr/include/ragel/vector.h
-#usr/lib/libfsm.la
-#usr/lib/libfsm.so
-#usr/lib/libfsm.so.0
-#usr/lib/libfsm.so.0.0.0
#usr/lib/libragel.la
#usr/lib/libragel.so
#usr/lib/libragel.so.0
#usr/lib/libragel.so.0.0.0
#usr/share/doc/ragel
-#usr/share/doc/ragel/CREDITS
-#usr/share/doc/ragel/ChangeLog
+#usr/share/doc/ragel/ragel.vim
#usr/share/man/man1/ragel.1
+#usr/share/out-go.lm
#usr/share/ragel.lm
diff --git a/config/rootfiles/common/sudo b/config/rootfiles/common/sudo
index 43b8f7127..9c8be9974 100644
--- a/config/rootfiles/common/sudo
+++ b/config/rootfiles/common/sudo
@@ -79,6 +79,7 @@ usr/sbin/visudo
#usr/share/locale/ja/LC_MESSAGES/sudo.mo
#usr/share/locale/ja/LC_MESSAGES/sudoers.mo
#usr/share/locale/ka/LC_MESSAGES/sudo.mo
+#usr/share/locale/ka/LC_MESSAGES/sudoers.mo
#usr/share/locale/ko/LC_MESSAGES/sudo.mo
#usr/share/locale/ko/LC_MESSAGES/sudoers.mo
#usr/share/locale/lt/LC_MESSAGES/sudoers.mo
@@ -101,6 +102,7 @@ usr/sbin/visudo
#usr/share/locale/sk/LC_MESSAGES/sudoers.mo
#usr/share/locale/sl/LC_MESSAGES/sudo.mo
#usr/share/locale/sl/LC_MESSAGES/sudoers.mo
+#usr/share/locale/sq/LC_MESSAGES/sudo.mo
#usr/share/locale/sr/LC_MESSAGES/sudo.mo
#usr/share/locale/sr/LC_MESSAGES/sudoers.mo
#usr/share/locale/sv/LC_MESSAGES/sudo.mo
diff --git a/config/rootfiles/common/texinfo b/config/rootfiles/common/texinfo
index 13df03542..76ff08310 100644
--- a/config/rootfiles/common/texinfo
+++ b/config/rootfiles/common/texinfo
@@ -15,6 +15,8 @@
#usr/lib/texinfo/XSParagraph.la
#usr/lib/texinfo/XSParagraph.so
#usr/share/info/info-stnd.info
+#usr/share/info/texi2any_api.info
+#usr/share/info/texi2any_internals.info
#usr/share/info/texinfo.info
#usr/share/info/texinfo.info-1
#usr/share/info/texinfo.info-2
@@ -38,7 +40,10 @@
#usr/share/texinfo/Pod-Simple-Texinfo/Pod/Simple
#usr/share/texinfo/Pod-Simple-Texinfo/Pod/Simple/Texinfo.pm
#usr/share/texinfo/Texinfo
+#usr/share/texinfo/Texinfo/Commands.pm
+#usr/share/texinfo/Texinfo/Commands.pod
#usr/share/texinfo/Texinfo/Common.pm
+#usr/share/texinfo/Texinfo/Config.pm
#usr/share/texinfo/Texinfo/Convert
#usr/share/texinfo/Texinfo/Convert/Converter.pm
#usr/share/texinfo/Texinfo/Convert/DocBook.pm
@@ -46,21 +51,21 @@
#usr/share/texinfo/Texinfo/Convert/IXIN.pm
#usr/share/texinfo/Texinfo/Convert/IXINSXML.pm
#usr/share/texinfo/Texinfo/Convert/Info.pm
-#usr/share/texinfo/Texinfo/Convert/Line.pm
+#usr/share/texinfo/Texinfo/Convert/LaTeX.pm
#usr/share/texinfo/Texinfo/Convert/NodeNameNormalization.pm
#usr/share/texinfo/Texinfo/Convert/Paragraph.pm
#usr/share/texinfo/Texinfo/Convert/ParagraphNonXS.pm
#usr/share/texinfo/Texinfo/Convert/PlainTexinfo.pm
#usr/share/texinfo/Texinfo/Convert/Plaintext.pm
#usr/share/texinfo/Texinfo/Convert/Texinfo.pm
+#usr/share/texinfo/Texinfo/Convert/TexinfoMarkup.pm
#usr/share/texinfo/Texinfo/Convert/TexinfoSXML.pm
#usr/share/texinfo/Texinfo/Convert/TexinfoXML.pm
#usr/share/texinfo/Texinfo/Convert/Text.pm
#usr/share/texinfo/Texinfo/Convert/TextContent.pm
-#usr/share/texinfo/Texinfo/Convert/UnFilled.pm
#usr/share/texinfo/Texinfo/Convert/Unicode.pm
+#usr/share/texinfo/Texinfo/Convert/Utils.pm
#usr/share/texinfo/Texinfo/Documentlanguages.pm
-#usr/share/texinfo/Texinfo/Encoding.pm
#usr/share/texinfo/Texinfo/MiscXS.pm
#usr/share/texinfo/Texinfo/ModulePath.pm
#usr/share/texinfo/Texinfo/Parser.pm
@@ -68,18 +73,22 @@
#usr/share/texinfo/Texinfo/Report.pm
#usr/share/texinfo/Texinfo/Structuring.pm
#usr/share/texinfo/Texinfo/Transformations.pm
+#usr/share/texinfo/Texinfo/Translations.pm
#usr/share/texinfo/Texinfo/XS
#usr/share/texinfo/Texinfo/XS/parsetexi
#usr/share/texinfo/Texinfo/XS/parsetexi/Parsetexi.pm
#usr/share/texinfo/Texinfo/XSLoader.pm
+#usr/share/texinfo/ext
+#usr/share/texinfo/ext/epub3.pm
+#usr/share/texinfo/ext/latex2html.pm
+#usr/share/texinfo/ext/tex4ht.pm
#usr/share/texinfo/htmlxref.cnf
#usr/share/texinfo/init
#usr/share/texinfo/init/book.pm
#usr/share/texinfo/init/chm.pm
+#usr/share/texinfo/init/documentation_examples.pm
#usr/share/texinfo/init/highlight_syntax.pm
#usr/share/texinfo/init/html32.pm
-#usr/share/texinfo/init/latex2html.pm
-#usr/share/texinfo/init/tex4ht.pm
#usr/share/texinfo/js
#usr/share/texinfo/js/info.css
#usr/share/texinfo/js/info.js
diff --git a/config/rootfiles/common/x86_64/grub b/config/rootfiles/common/x86_64/grub
index 737fa8ccb..96836776c 100644
--- a/config/rootfiles/common/x86_64/grub
+++ b/config/rootfiles/common/x86_64/grub
@@ -607,552 +607,552 @@ usr/lib/grub/i386-pc/zfsinfo.mod
usr/lib/grub/i386-pc/zfsinfo.module
usr/lib/grub/i386-pc/zstd.mod
usr/lib/grub/i386-pc/zstd.module
-#usr/lib/grub/x86_64-efi
-usr/lib/grub/x86_64-efi/acpi.mod
-usr/lib/grub/x86_64-efi/acpi.module
-usr/lib/grub/x86_64-efi/adler32.mod
-usr/lib/grub/x86_64-efi/adler32.module
-usr/lib/grub/x86_64-efi/affs.mod
-usr/lib/grub/x86_64-efi/affs.module
-usr/lib/grub/x86_64-efi/afs.mod
-usr/lib/grub/x86_64-efi/afs.module
-usr/lib/grub/x86_64-efi/afsplitter.mod
-usr/lib/grub/x86_64-efi/afsplitter.module
-usr/lib/grub/x86_64-efi/ahci.mod
-usr/lib/grub/x86_64-efi/ahci.module
-usr/lib/grub/x86_64-efi/all_video.mod
-usr/lib/grub/x86_64-efi/all_video.module
-usr/lib/grub/x86_64-efi/aout.mod
-usr/lib/grub/x86_64-efi/aout.module
-usr/lib/grub/x86_64-efi/appleldr.mod
-usr/lib/grub/x86_64-efi/appleldr.module
-usr/lib/grub/x86_64-efi/archelp.mod
-usr/lib/grub/x86_64-efi/archelp.module
-usr/lib/grub/x86_64-efi/at_keyboard.mod
-usr/lib/grub/x86_64-efi/at_keyboard.module
-usr/lib/grub/x86_64-efi/ata.mod
-usr/lib/grub/x86_64-efi/ata.module
-usr/lib/grub/x86_64-efi/backtrace.mod
-usr/lib/grub/x86_64-efi/backtrace.module
-usr/lib/grub/x86_64-efi/bfs.mod
-usr/lib/grub/x86_64-efi/bfs.module
-usr/lib/grub/x86_64-efi/bitmap.mod
-usr/lib/grub/x86_64-efi/bitmap.module
-usr/lib/grub/x86_64-efi/bitmap_scale.mod
-usr/lib/grub/x86_64-efi/bitmap_scale.module
-usr/lib/grub/x86_64-efi/blocklist.mod
-usr/lib/grub/x86_64-efi/blocklist.module
-usr/lib/grub/x86_64-efi/boot.mod
-usr/lib/grub/x86_64-efi/boot.module
-usr/lib/grub/x86_64-efi/bsd.mod
-usr/lib/grub/x86_64-efi/bsd.module
-usr/lib/grub/x86_64-efi/bswap_test.mod
-usr/lib/grub/x86_64-efi/bswap_test.module
-usr/lib/grub/x86_64-efi/btrfs.mod
-usr/lib/grub/x86_64-efi/btrfs.module
-usr/lib/grub/x86_64-efi/bufio.mod
-usr/lib/grub/x86_64-efi/bufio.module
-usr/lib/grub/x86_64-efi/cat.mod
-usr/lib/grub/x86_64-efi/cat.module
-usr/lib/grub/x86_64-efi/cbfs.mod
-usr/lib/grub/x86_64-efi/cbfs.module
-usr/lib/grub/x86_64-efi/cbls.mod
-usr/lib/grub/x86_64-efi/cbls.module
-usr/lib/grub/x86_64-efi/cbmemc.mod
-usr/lib/grub/x86_64-efi/cbmemc.module
-usr/lib/grub/x86_64-efi/cbtable.mod
-usr/lib/grub/x86_64-efi/cbtable.module
-usr/lib/grub/x86_64-efi/cbtime.mod
-usr/lib/grub/x86_64-efi/cbtime.module
-usr/lib/grub/x86_64-efi/chain.mod
-usr/lib/grub/x86_64-efi/chain.module
-usr/lib/grub/x86_64-efi/cmdline_cat_test.mod
-usr/lib/grub/x86_64-efi/cmdline_cat_test.module
-usr/lib/grub/x86_64-efi/cmp.mod
-usr/lib/grub/x86_64-efi/cmp.module
-usr/lib/grub/x86_64-efi/cmp_test.mod
-usr/lib/grub/x86_64-efi/cmp_test.module
-usr/lib/grub/x86_64-efi/command.lst
-usr/lib/grub/x86_64-efi/config.h
-usr/lib/grub/x86_64-efi/configfile.mod
-usr/lib/grub/x86_64-efi/configfile.module
-usr/lib/grub/x86_64-efi/cpio.mod
-usr/lib/grub/x86_64-efi/cpio.module
-usr/lib/grub/x86_64-efi/cpio_be.mod
-usr/lib/grub/x86_64-efi/cpio_be.module
-usr/lib/grub/x86_64-efi/cpuid.mod
-usr/lib/grub/x86_64-efi/cpuid.module
-usr/lib/grub/x86_64-efi/crc64.mod
-usr/lib/grub/x86_64-efi/crc64.module
-usr/lib/grub/x86_64-efi/crypto.lst
-usr/lib/grub/x86_64-efi/crypto.mod
-usr/lib/grub/x86_64-efi/crypto.module
-usr/lib/grub/x86_64-efi/cryptodisk.mod
-usr/lib/grub/x86_64-efi/cryptodisk.module
-usr/lib/grub/x86_64-efi/cs5536.mod
-usr/lib/grub/x86_64-efi/cs5536.module
-usr/lib/grub/x86_64-efi/ctz_test.mod
-usr/lib/grub/x86_64-efi/ctz_test.module
-usr/lib/grub/x86_64-efi/date.mod
-usr/lib/grub/x86_64-efi/date.module
-usr/lib/grub/x86_64-efi/datehook.mod
-usr/lib/grub/x86_64-efi/datehook.module
-usr/lib/grub/x86_64-efi/datetime.mod
-usr/lib/grub/x86_64-efi/datetime.module
-usr/lib/grub/x86_64-efi/disk.mod
-usr/lib/grub/x86_64-efi/disk.module
-usr/lib/grub/x86_64-efi/diskfilter.mod
-usr/lib/grub/x86_64-efi/diskfilter.module
-usr/lib/grub/x86_64-efi/div.mod
-usr/lib/grub/x86_64-efi/div.module
-usr/lib/grub/x86_64-efi/div_test.mod
-usr/lib/grub/x86_64-efi/div_test.module
-usr/lib/grub/x86_64-efi/dm_nv.mod
-usr/lib/grub/x86_64-efi/dm_nv.module
-usr/lib/grub/x86_64-efi/echo.mod
-usr/lib/grub/x86_64-efi/echo.module
-usr/lib/grub/x86_64-efi/efi_gop.mod
-usr/lib/grub/x86_64-efi/efi_gop.module
-usr/lib/grub/x86_64-efi/efi_uga.mod
-usr/lib/grub/x86_64-efi/efi_uga.module
-usr/lib/grub/x86_64-efi/efifwsetup.mod
-usr/lib/grub/x86_64-efi/efifwsetup.module
-usr/lib/grub/x86_64-efi/efinet.mod
-usr/lib/grub/x86_64-efi/efinet.module
-usr/lib/grub/x86_64-efi/ehci.mod
-usr/lib/grub/x86_64-efi/ehci.module
-usr/lib/grub/x86_64-efi/elf.mod
-usr/lib/grub/x86_64-efi/elf.module
-usr/lib/grub/x86_64-efi/eval.mod
-usr/lib/grub/x86_64-efi/eval.module
-usr/lib/grub/x86_64-efi/exfat.mod
-usr/lib/grub/x86_64-efi/exfat.module
-usr/lib/grub/x86_64-efi/exfctest.mod
-usr/lib/grub/x86_64-efi/exfctest.module
-usr/lib/grub/x86_64-efi/ext2.mod
-usr/lib/grub/x86_64-efi/ext2.module
-usr/lib/grub/x86_64-efi/extcmd.mod
-usr/lib/grub/x86_64-efi/extcmd.module
-usr/lib/grub/x86_64-efi/f2fs.mod
-usr/lib/grub/x86_64-efi/f2fs.module
-usr/lib/grub/x86_64-efi/fat.mod
-usr/lib/grub/x86_64-efi/fat.module
-usr/lib/grub/x86_64-efi/fdt.lst
-usr/lib/grub/x86_64-efi/file.mod
-usr/lib/grub/x86_64-efi/file.module
-usr/lib/grub/x86_64-efi/fixvideo.mod
-usr/lib/grub/x86_64-efi/fixvideo.module
-usr/lib/grub/x86_64-efi/font.mod
-usr/lib/grub/x86_64-efi/font.module
-usr/lib/grub/x86_64-efi/fs.lst
-usr/lib/grub/x86_64-efi/fshelp.mod
-usr/lib/grub/x86_64-efi/fshelp.module
-usr/lib/grub/x86_64-efi/functional_test.mod
-usr/lib/grub/x86_64-efi/functional_test.module
-usr/lib/grub/x86_64-efi/gcry_arcfour.mod
-usr/lib/grub/x86_64-efi/gcry_arcfour.module
-usr/lib/grub/x86_64-efi/gcry_blowfish.mod
-usr/lib/grub/x86_64-efi/gcry_blowfish.module
-usr/lib/grub/x86_64-efi/gcry_camellia.mod
-usr/lib/grub/x86_64-efi/gcry_camellia.module
-usr/lib/grub/x86_64-efi/gcry_cast5.mod
-usr/lib/grub/x86_64-efi/gcry_cast5.module
-usr/lib/grub/x86_64-efi/gcry_crc.mod
-usr/lib/grub/x86_64-efi/gcry_crc.module
-usr/lib/grub/x86_64-efi/gcry_des.mod
-usr/lib/grub/x86_64-efi/gcry_des.module
-usr/lib/grub/x86_64-efi/gcry_dsa.mod
-usr/lib/grub/x86_64-efi/gcry_dsa.module
-usr/lib/grub/x86_64-efi/gcry_idea.mod
-usr/lib/grub/x86_64-efi/gcry_idea.module
-usr/lib/grub/x86_64-efi/gcry_md4.mod
-usr/lib/grub/x86_64-efi/gcry_md4.module
-usr/lib/grub/x86_64-efi/gcry_md5.mod
-usr/lib/grub/x86_64-efi/gcry_md5.module
-usr/lib/grub/x86_64-efi/gcry_rfc2268.mod
-usr/lib/grub/x86_64-efi/gcry_rfc2268.module
-usr/lib/grub/x86_64-efi/gcry_rijndael.mod
-usr/lib/grub/x86_64-efi/gcry_rijndael.module
-usr/lib/grub/x86_64-efi/gcry_rmd160.mod
-usr/lib/grub/x86_64-efi/gcry_rmd160.module
-usr/lib/grub/x86_64-efi/gcry_rsa.mod
-usr/lib/grub/x86_64-efi/gcry_rsa.module
-usr/lib/grub/x86_64-efi/gcry_seed.mod
-usr/lib/grub/x86_64-efi/gcry_seed.module
-usr/lib/grub/x86_64-efi/gcry_serpent.mod
-usr/lib/grub/x86_64-efi/gcry_serpent.module
-usr/lib/grub/x86_64-efi/gcry_sha1.mod
-usr/lib/grub/x86_64-efi/gcry_sha1.module
-usr/lib/grub/x86_64-efi/gcry_sha256.mod
-usr/lib/grub/x86_64-efi/gcry_sha256.module
-usr/lib/grub/x86_64-efi/gcry_sha512.mod
-usr/lib/grub/x86_64-efi/gcry_sha512.module
-usr/lib/grub/x86_64-efi/gcry_tiger.mod
-usr/lib/grub/x86_64-efi/gcry_tiger.module
-usr/lib/grub/x86_64-efi/gcry_twofish.mod
-usr/lib/grub/x86_64-efi/gcry_twofish.module
-usr/lib/grub/x86_64-efi/gcry_whirlpool.mod
-usr/lib/grub/x86_64-efi/gcry_whirlpool.module
-usr/lib/grub/x86_64-efi/gdb_grub
-usr/lib/grub/x86_64-efi/geli.mod
-usr/lib/grub/x86_64-efi/geli.module
-usr/lib/grub/x86_64-efi/gettext.mod
-usr/lib/grub/x86_64-efi/gettext.module
-usr/lib/grub/x86_64-efi/gfxmenu.mod
-usr/lib/grub/x86_64-efi/gfxmenu.module
-usr/lib/grub/x86_64-efi/gfxterm.mod
-usr/lib/grub/x86_64-efi/gfxterm.module
-usr/lib/grub/x86_64-efi/gfxterm_background.mod
-usr/lib/grub/x86_64-efi/gfxterm_background.module
-usr/lib/grub/x86_64-efi/gfxterm_menu.mod
-usr/lib/grub/x86_64-efi/gfxterm_menu.module
-usr/lib/grub/x86_64-efi/gmodule.pl
-usr/lib/grub/x86_64-efi/gptsync.mod
-usr/lib/grub/x86_64-efi/gptsync.module
-usr/lib/grub/x86_64-efi/gzio.mod
-usr/lib/grub/x86_64-efi/gzio.module
-usr/lib/grub/x86_64-efi/halt.mod
-usr/lib/grub/x86_64-efi/halt.module
-usr/lib/grub/x86_64-efi/hashsum.mod
-usr/lib/grub/x86_64-efi/hashsum.module
-usr/lib/grub/x86_64-efi/hdparm.mod
-usr/lib/grub/x86_64-efi/hdparm.module
-usr/lib/grub/x86_64-efi/hello.mod
-usr/lib/grub/x86_64-efi/hello.module
-usr/lib/grub/x86_64-efi/help.mod
-usr/lib/grub/x86_64-efi/help.module
-usr/lib/grub/x86_64-efi/hexdump.mod
-usr/lib/grub/x86_64-efi/hexdump.module
-usr/lib/grub/x86_64-efi/hfs.mod
-usr/lib/grub/x86_64-efi/hfs.module
-usr/lib/grub/x86_64-efi/hfsplus.mod
-usr/lib/grub/x86_64-efi/hfsplus.module
-usr/lib/grub/x86_64-efi/hfspluscomp.mod
-usr/lib/grub/x86_64-efi/hfspluscomp.module
-usr/lib/grub/x86_64-efi/http.mod
-usr/lib/grub/x86_64-efi/http.module
-usr/lib/grub/x86_64-efi/iorw.mod
-usr/lib/grub/x86_64-efi/iorw.module
-usr/lib/grub/x86_64-efi/iso9660.mod
-usr/lib/grub/x86_64-efi/iso9660.module
-usr/lib/grub/x86_64-efi/jfs.mod
-usr/lib/grub/x86_64-efi/jfs.module
-usr/lib/grub/x86_64-efi/jpeg.mod
-usr/lib/grub/x86_64-efi/jpeg.module
-usr/lib/grub/x86_64-efi/json.mod
-usr/lib/grub/x86_64-efi/json.module
-usr/lib/grub/x86_64-efi/kernel.exec
-usr/lib/grub/x86_64-efi/kernel.img
-usr/lib/grub/x86_64-efi/keylayouts.mod
-usr/lib/grub/x86_64-efi/keylayouts.module
-usr/lib/grub/x86_64-efi/keystatus.mod
-usr/lib/grub/x86_64-efi/keystatus.module
-usr/lib/grub/x86_64-efi/ldm.mod
-usr/lib/grub/x86_64-efi/ldm.module
-usr/lib/grub/x86_64-efi/legacy_password_test.mod
-usr/lib/grub/x86_64-efi/legacy_password_test.module
-usr/lib/grub/x86_64-efi/legacycfg.mod
-usr/lib/grub/x86_64-efi/legacycfg.module
-usr/lib/grub/x86_64-efi/linux.mod
-usr/lib/grub/x86_64-efi/linux.module
-usr/lib/grub/x86_64-efi/linux16.mod
-usr/lib/grub/x86_64-efi/linux16.module
-usr/lib/grub/x86_64-efi/loadbios.mod
-usr/lib/grub/x86_64-efi/loadbios.module
-usr/lib/grub/x86_64-efi/loadenv.mod
-usr/lib/grub/x86_64-efi/loadenv.module
-usr/lib/grub/x86_64-efi/loopback.mod
-usr/lib/grub/x86_64-efi/loopback.module
-usr/lib/grub/x86_64-efi/ls.mod
-usr/lib/grub/x86_64-efi/ls.module
-usr/lib/grub/x86_64-efi/lsacpi.mod
-usr/lib/grub/x86_64-efi/lsacpi.module
-usr/lib/grub/x86_64-efi/lsefi.mod
-usr/lib/grub/x86_64-efi/lsefi.module
-usr/lib/grub/x86_64-efi/lsefimmap.mod
-usr/lib/grub/x86_64-efi/lsefimmap.module
-usr/lib/grub/x86_64-efi/lsefisystab.mod
-usr/lib/grub/x86_64-efi/lsefisystab.module
-usr/lib/grub/x86_64-efi/lsmmap.mod
-usr/lib/grub/x86_64-efi/lsmmap.module
-usr/lib/grub/x86_64-efi/lspci.mod
-usr/lib/grub/x86_64-efi/lspci.module
-usr/lib/grub/x86_64-efi/lssal.mod
-usr/lib/grub/x86_64-efi/lssal.module
-usr/lib/grub/x86_64-efi/luks.mod
-usr/lib/grub/x86_64-efi/luks.module
-usr/lib/grub/x86_64-efi/luks2.mod
-usr/lib/grub/x86_64-efi/luks2.module
-usr/lib/grub/x86_64-efi/lvm.mod
-usr/lib/grub/x86_64-efi/lvm.module
-usr/lib/grub/x86_64-efi/lzopio.mod
-usr/lib/grub/x86_64-efi/lzopio.module
-usr/lib/grub/x86_64-efi/macbless.mod
-usr/lib/grub/x86_64-efi/macbless.module
-usr/lib/grub/x86_64-efi/macho.mod
-usr/lib/grub/x86_64-efi/macho.module
-usr/lib/grub/x86_64-efi/mdraid09.mod
-usr/lib/grub/x86_64-efi/mdraid09.module
-usr/lib/grub/x86_64-efi/mdraid09_be.mod
-usr/lib/grub/x86_64-efi/mdraid09_be.module
-usr/lib/grub/x86_64-efi/mdraid1x.mod
-usr/lib/grub/x86_64-efi/mdraid1x.module
-usr/lib/grub/x86_64-efi/memdisk.mod
-usr/lib/grub/x86_64-efi/memdisk.module
-usr/lib/grub/x86_64-efi/memrw.mod
-usr/lib/grub/x86_64-efi/memrw.module
-usr/lib/grub/x86_64-efi/minicmd.mod
-usr/lib/grub/x86_64-efi/minicmd.module
-usr/lib/grub/x86_64-efi/minix.mod
-usr/lib/grub/x86_64-efi/minix.module
-usr/lib/grub/x86_64-efi/minix2.mod
-usr/lib/grub/x86_64-efi/minix2.module
-usr/lib/grub/x86_64-efi/minix2_be.mod
-usr/lib/grub/x86_64-efi/minix2_be.module
-usr/lib/grub/x86_64-efi/minix3.mod
-usr/lib/grub/x86_64-efi/minix3.module
-usr/lib/grub/x86_64-efi/minix3_be.mod
-usr/lib/grub/x86_64-efi/minix3_be.module
-usr/lib/grub/x86_64-efi/minix_be.mod
-usr/lib/grub/x86_64-efi/minix_be.module
-usr/lib/grub/x86_64-efi/mmap.mod
-usr/lib/grub/x86_64-efi/mmap.module
-usr/lib/grub/x86_64-efi/moddep.lst
-usr/lib/grub/x86_64-efi/modinfo.sh
-usr/lib/grub/x86_64-efi/morse.mod
-usr/lib/grub/x86_64-efi/morse.module
-usr/lib/grub/x86_64-efi/mpi.mod
-usr/lib/grub/x86_64-efi/mpi.module
-usr/lib/grub/x86_64-efi/msdospart.mod
-usr/lib/grub/x86_64-efi/msdospart.module
-usr/lib/grub/x86_64-efi/mul_test.mod
-usr/lib/grub/x86_64-efi/mul_test.module
-usr/lib/grub/x86_64-efi/multiboot.mod
-usr/lib/grub/x86_64-efi/multiboot.module
-usr/lib/grub/x86_64-efi/multiboot2.mod
-usr/lib/grub/x86_64-efi/multiboot2.module
-usr/lib/grub/x86_64-efi/nativedisk.mod
-usr/lib/grub/x86_64-efi/nativedisk.module
-usr/lib/grub/x86_64-efi/net.mod
-usr/lib/grub/x86_64-efi/net.module
-usr/lib/grub/x86_64-efi/newc.mod
-usr/lib/grub/x86_64-efi/newc.module
-usr/lib/grub/x86_64-efi/nilfs2.mod
-usr/lib/grub/x86_64-efi/nilfs2.module
-usr/lib/grub/x86_64-efi/normal.mod
-usr/lib/grub/x86_64-efi/normal.module
-usr/lib/grub/x86_64-efi/ntfs.mod
-usr/lib/grub/x86_64-efi/ntfs.module
-usr/lib/grub/x86_64-efi/ntfscomp.mod
-usr/lib/grub/x86_64-efi/ntfscomp.module
-usr/lib/grub/x86_64-efi/odc.mod
-usr/lib/grub/x86_64-efi/odc.module
-usr/lib/grub/x86_64-efi/offsetio.mod
-usr/lib/grub/x86_64-efi/offsetio.module
-usr/lib/grub/x86_64-efi/ohci.mod
-usr/lib/grub/x86_64-efi/ohci.module
-usr/lib/grub/x86_64-efi/part_acorn.mod
-usr/lib/grub/x86_64-efi/part_acorn.module
-usr/lib/grub/x86_64-efi/part_amiga.mod
-usr/lib/grub/x86_64-efi/part_amiga.module
-usr/lib/grub/x86_64-efi/part_apple.mod
-usr/lib/grub/x86_64-efi/part_apple.module
-usr/lib/grub/x86_64-efi/part_bsd.mod
-usr/lib/grub/x86_64-efi/part_bsd.module
-usr/lib/grub/x86_64-efi/part_dfly.mod
-usr/lib/grub/x86_64-efi/part_dfly.module
-usr/lib/grub/x86_64-efi/part_dvh.mod
-usr/lib/grub/x86_64-efi/part_dvh.module
-usr/lib/grub/x86_64-efi/part_gpt.mod
-usr/lib/grub/x86_64-efi/part_gpt.module
-usr/lib/grub/x86_64-efi/part_msdos.mod
-usr/lib/grub/x86_64-efi/part_msdos.module
-usr/lib/grub/x86_64-efi/part_plan.mod
-usr/lib/grub/x86_64-efi/part_plan.module
-usr/lib/grub/x86_64-efi/part_sun.mod
-usr/lib/grub/x86_64-efi/part_sun.module
-usr/lib/grub/x86_64-efi/part_sunpc.mod
-usr/lib/grub/x86_64-efi/part_sunpc.module
-usr/lib/grub/x86_64-efi/partmap.lst
-usr/lib/grub/x86_64-efi/parttool.lst
-usr/lib/grub/x86_64-efi/parttool.mod
-usr/lib/grub/x86_64-efi/parttool.module
-usr/lib/grub/x86_64-efi/password.mod
-usr/lib/grub/x86_64-efi/password.module
-usr/lib/grub/x86_64-efi/password_pbkdf2.mod
-usr/lib/grub/x86_64-efi/password_pbkdf2.module
-usr/lib/grub/x86_64-efi/pata.mod
-usr/lib/grub/x86_64-efi/pata.module
-usr/lib/grub/x86_64-efi/pbkdf2.mod
-usr/lib/grub/x86_64-efi/pbkdf2.module
-usr/lib/grub/x86_64-efi/pbkdf2_test.mod
-usr/lib/grub/x86_64-efi/pbkdf2_test.module
-usr/lib/grub/x86_64-efi/pcidump.mod
-usr/lib/grub/x86_64-efi/pcidump.module
-usr/lib/grub/x86_64-efi/pgp.mod
-usr/lib/grub/x86_64-efi/pgp.module
-usr/lib/grub/x86_64-efi/play.mod
-usr/lib/grub/x86_64-efi/play.module
-usr/lib/grub/x86_64-efi/png.mod
-usr/lib/grub/x86_64-efi/png.module
-usr/lib/grub/x86_64-efi/priority_queue.mod
-usr/lib/grub/x86_64-efi/priority_queue.module
-usr/lib/grub/x86_64-efi/probe.mod
-usr/lib/grub/x86_64-efi/probe.module
-usr/lib/grub/x86_64-efi/procfs.mod
-usr/lib/grub/x86_64-efi/procfs.module
-usr/lib/grub/x86_64-efi/progress.mod
-usr/lib/grub/x86_64-efi/progress.module
-usr/lib/grub/x86_64-efi/raid5rec.mod
-usr/lib/grub/x86_64-efi/raid5rec.module
-usr/lib/grub/x86_64-efi/raid6rec.mod
-usr/lib/grub/x86_64-efi/raid6rec.module
-usr/lib/grub/x86_64-efi/random.mod
-usr/lib/grub/x86_64-efi/random.module
-usr/lib/grub/x86_64-efi/rdmsr.mod
-usr/lib/grub/x86_64-efi/rdmsr.module
-usr/lib/grub/x86_64-efi/read.mod
-usr/lib/grub/x86_64-efi/read.module
-usr/lib/grub/x86_64-efi/reboot.mod
-usr/lib/grub/x86_64-efi/reboot.module
-usr/lib/grub/x86_64-efi/regexp.mod
-usr/lib/grub/x86_64-efi/regexp.module
-usr/lib/grub/x86_64-efi/reiserfs.mod
-usr/lib/grub/x86_64-efi/reiserfs.module
-usr/lib/grub/x86_64-efi/relocator.mod
-usr/lib/grub/x86_64-efi/relocator.module
-usr/lib/grub/x86_64-efi/romfs.mod
-usr/lib/grub/x86_64-efi/romfs.module
-usr/lib/grub/x86_64-efi/scsi.mod
-usr/lib/grub/x86_64-efi/scsi.module
-usr/lib/grub/x86_64-efi/search.mod
-usr/lib/grub/x86_64-efi/search.module
-usr/lib/grub/x86_64-efi/search_fs_file.mod
-usr/lib/grub/x86_64-efi/search_fs_file.module
-usr/lib/grub/x86_64-efi/search_fs_uuid.mod
-usr/lib/grub/x86_64-efi/search_fs_uuid.module
-usr/lib/grub/x86_64-efi/search_label.mod
-usr/lib/grub/x86_64-efi/search_label.module
-usr/lib/grub/x86_64-efi/serial.mod
-usr/lib/grub/x86_64-efi/serial.module
-usr/lib/grub/x86_64-efi/setjmp.mod
-usr/lib/grub/x86_64-efi/setjmp.module
-usr/lib/grub/x86_64-efi/setjmp_test.mod
-usr/lib/grub/x86_64-efi/setjmp_test.module
-usr/lib/grub/x86_64-efi/setpci.mod
-usr/lib/grub/x86_64-efi/setpci.module
-usr/lib/grub/x86_64-efi/sfs.mod
-usr/lib/grub/x86_64-efi/sfs.module
-usr/lib/grub/x86_64-efi/shift_test.mod
-usr/lib/grub/x86_64-efi/shift_test.module
-usr/lib/grub/x86_64-efi/signature_test.mod
-usr/lib/grub/x86_64-efi/signature_test.module
-usr/lib/grub/x86_64-efi/sleep.mod
-usr/lib/grub/x86_64-efi/sleep.module
-usr/lib/grub/x86_64-efi/sleep_test.mod
-usr/lib/grub/x86_64-efi/sleep_test.module
-usr/lib/grub/x86_64-efi/smbios.mod
-usr/lib/grub/x86_64-efi/smbios.module
-usr/lib/grub/x86_64-efi/spkmodem.mod
-usr/lib/grub/x86_64-efi/spkmodem.module
-usr/lib/grub/x86_64-efi/squash4.mod
-usr/lib/grub/x86_64-efi/squash4.module
-usr/lib/grub/x86_64-efi/strtoull_test.mod
-usr/lib/grub/x86_64-efi/strtoull_test.module
-usr/lib/grub/x86_64-efi/syslinuxcfg.mod
-usr/lib/grub/x86_64-efi/syslinuxcfg.module
-usr/lib/grub/x86_64-efi/tar.mod
-usr/lib/grub/x86_64-efi/tar.module
-usr/lib/grub/x86_64-efi/terminal.lst
-usr/lib/grub/x86_64-efi/terminal.mod
-usr/lib/grub/x86_64-efi/terminal.module
-usr/lib/grub/x86_64-efi/terminfo.mod
-usr/lib/grub/x86_64-efi/terminfo.module
-usr/lib/grub/x86_64-efi/test.mod
-usr/lib/grub/x86_64-efi/test.module
-usr/lib/grub/x86_64-efi/test_blockarg.mod
-usr/lib/grub/x86_64-efi/test_blockarg.module
-usr/lib/grub/x86_64-efi/testload.mod
-usr/lib/grub/x86_64-efi/testload.module
-usr/lib/grub/x86_64-efi/testspeed.mod
-usr/lib/grub/x86_64-efi/testspeed.module
-usr/lib/grub/x86_64-efi/tftp.mod
-usr/lib/grub/x86_64-efi/tftp.module
-usr/lib/grub/x86_64-efi/tga.mod
-usr/lib/grub/x86_64-efi/tga.module
-usr/lib/grub/x86_64-efi/time.mod
-usr/lib/grub/x86_64-efi/time.module
-usr/lib/grub/x86_64-efi/tpm.mod
-usr/lib/grub/x86_64-efi/tpm.module
-usr/lib/grub/x86_64-efi/tr.mod
-usr/lib/grub/x86_64-efi/tr.module
-usr/lib/grub/x86_64-efi/trig.mod
-usr/lib/grub/x86_64-efi/trig.module
-usr/lib/grub/x86_64-efi/true.mod
-usr/lib/grub/x86_64-efi/true.module
-usr/lib/grub/x86_64-efi/udf.mod
-usr/lib/grub/x86_64-efi/udf.module
-usr/lib/grub/x86_64-efi/ufs1.mod
-usr/lib/grub/x86_64-efi/ufs1.module
-usr/lib/grub/x86_64-efi/ufs1_be.mod
-usr/lib/grub/x86_64-efi/ufs1_be.module
-usr/lib/grub/x86_64-efi/ufs2.mod
-usr/lib/grub/x86_64-efi/ufs2.module
-usr/lib/grub/x86_64-efi/uhci.mod
-usr/lib/grub/x86_64-efi/uhci.module
-usr/lib/grub/x86_64-efi/usb.mod
-usr/lib/grub/x86_64-efi/usb.module
-usr/lib/grub/x86_64-efi/usb_keyboard.mod
-usr/lib/grub/x86_64-efi/usb_keyboard.module
-usr/lib/grub/x86_64-efi/usbms.mod
-usr/lib/grub/x86_64-efi/usbms.module
-usr/lib/grub/x86_64-efi/usbserial_common.mod
-usr/lib/grub/x86_64-efi/usbserial_common.module
-usr/lib/grub/x86_64-efi/usbserial_ftdi.mod
-usr/lib/grub/x86_64-efi/usbserial_ftdi.module
-usr/lib/grub/x86_64-efi/usbserial_pl2303.mod
-usr/lib/grub/x86_64-efi/usbserial_pl2303.module
-usr/lib/grub/x86_64-efi/usbserial_usbdebug.mod
-usr/lib/grub/x86_64-efi/usbserial_usbdebug.module
-usr/lib/grub/x86_64-efi/usbtest.mod
-usr/lib/grub/x86_64-efi/usbtest.module
-usr/lib/grub/x86_64-efi/video.lst
-usr/lib/grub/x86_64-efi/video.mod
-usr/lib/grub/x86_64-efi/video.module
-usr/lib/grub/x86_64-efi/video_bochs.mod
-usr/lib/grub/x86_64-efi/video_bochs.module
-usr/lib/grub/x86_64-efi/video_cirrus.mod
-usr/lib/grub/x86_64-efi/video_cirrus.module
-usr/lib/grub/x86_64-efi/video_colors.mod
-usr/lib/grub/x86_64-efi/video_colors.module
-usr/lib/grub/x86_64-efi/video_fb.mod
-usr/lib/grub/x86_64-efi/video_fb.module
-usr/lib/grub/x86_64-efi/videoinfo.mod
-usr/lib/grub/x86_64-efi/videoinfo.module
-usr/lib/grub/x86_64-efi/videotest.mod
-usr/lib/grub/x86_64-efi/videotest.module
-usr/lib/grub/x86_64-efi/videotest_checksum.mod
-usr/lib/grub/x86_64-efi/videotest_checksum.module
-usr/lib/grub/x86_64-efi/wrmsr.mod
-usr/lib/grub/x86_64-efi/wrmsr.module
-usr/lib/grub/x86_64-efi/xfs.mod
-usr/lib/grub/x86_64-efi/xfs.module
-usr/lib/grub/x86_64-efi/xnu.mod
-usr/lib/grub/x86_64-efi/xnu.module
-usr/lib/grub/x86_64-efi/xnu_uuid.mod
-usr/lib/grub/x86_64-efi/xnu_uuid.module
-usr/lib/grub/x86_64-efi/xnu_uuid_test.mod
-usr/lib/grub/x86_64-efi/xnu_uuid_test.module
-usr/lib/grub/x86_64-efi/xzio.mod
-usr/lib/grub/x86_64-efi/xzio.module
-usr/lib/grub/x86_64-efi/zfs.mod
-usr/lib/grub/x86_64-efi/zfs.module
-usr/lib/grub/x86_64-efi/zfscrypt.mod
-usr/lib/grub/x86_64-efi/zfscrypt.module
-usr/lib/grub/x86_64-efi/zfsinfo.mod
-usr/lib/grub/x86_64-efi/zfsinfo.module
-usr/lib/grub/x86_64-efi/zstd.mod
-usr/lib/grub/x86_64-efi/zstd.module
+#usr/lib/grub/xxxMACHINExxx-efi
+usr/lib/grub/xxxMACHINExxx-efi/acpi.mod
+usr/lib/grub/xxxMACHINExxx-efi/acpi.module
+usr/lib/grub/xxxMACHINExxx-efi/adler32.mod
+usr/lib/grub/xxxMACHINExxx-efi/adler32.module
+usr/lib/grub/xxxMACHINExxx-efi/affs.mod
+usr/lib/grub/xxxMACHINExxx-efi/affs.module
+usr/lib/grub/xxxMACHINExxx-efi/afs.mod
+usr/lib/grub/xxxMACHINExxx-efi/afs.module
+usr/lib/grub/xxxMACHINExxx-efi/afsplitter.mod
+usr/lib/grub/xxxMACHINExxx-efi/afsplitter.module
+usr/lib/grub/xxxMACHINExxx-efi/ahci.mod
+usr/lib/grub/xxxMACHINExxx-efi/ahci.module
+usr/lib/grub/xxxMACHINExxx-efi/all_video.mod
+usr/lib/grub/xxxMACHINExxx-efi/all_video.module
+usr/lib/grub/xxxMACHINExxx-efi/aout.mod
+usr/lib/grub/xxxMACHINExxx-efi/aout.module
+usr/lib/grub/xxxMACHINExxx-efi/appleldr.mod
+usr/lib/grub/xxxMACHINExxx-efi/appleldr.module
+usr/lib/grub/xxxMACHINExxx-efi/archelp.mod
+usr/lib/grub/xxxMACHINExxx-efi/archelp.module
+usr/lib/grub/xxxMACHINExxx-efi/at_keyboard.mod
+usr/lib/grub/xxxMACHINExxx-efi/at_keyboard.module
+usr/lib/grub/xxxMACHINExxx-efi/ata.mod
+usr/lib/grub/xxxMACHINExxx-efi/ata.module
+usr/lib/grub/xxxMACHINExxx-efi/backtrace.mod
+usr/lib/grub/xxxMACHINExxx-efi/backtrace.module
+usr/lib/grub/xxxMACHINExxx-efi/bfs.mod
+usr/lib/grub/xxxMACHINExxx-efi/bfs.module
+usr/lib/grub/xxxMACHINExxx-efi/bitmap.mod
+usr/lib/grub/xxxMACHINExxx-efi/bitmap.module
+usr/lib/grub/xxxMACHINExxx-efi/bitmap_scale.mod
+usr/lib/grub/xxxMACHINExxx-efi/bitmap_scale.module
+usr/lib/grub/xxxMACHINExxx-efi/blocklist.mod
+usr/lib/grub/xxxMACHINExxx-efi/blocklist.module
+usr/lib/grub/xxxMACHINExxx-efi/boot.mod
+usr/lib/grub/xxxMACHINExxx-efi/boot.module
+usr/lib/grub/xxxMACHINExxx-efi/bsd.mod
+usr/lib/grub/xxxMACHINExxx-efi/bsd.module
+usr/lib/grub/xxxMACHINExxx-efi/bswap_test.mod
+usr/lib/grub/xxxMACHINExxx-efi/bswap_test.module
+usr/lib/grub/xxxMACHINExxx-efi/btrfs.mod
+usr/lib/grub/xxxMACHINExxx-efi/btrfs.module
+usr/lib/grub/xxxMACHINExxx-efi/bufio.mod
+usr/lib/grub/xxxMACHINExxx-efi/bufio.module
+usr/lib/grub/xxxMACHINExxx-efi/cat.mod
+usr/lib/grub/xxxMACHINExxx-efi/cat.module
+usr/lib/grub/xxxMACHINExxx-efi/cbfs.mod
+usr/lib/grub/xxxMACHINExxx-efi/cbfs.module
+usr/lib/grub/xxxMACHINExxx-efi/cbls.mod
+usr/lib/grub/xxxMACHINExxx-efi/cbls.module
+usr/lib/grub/xxxMACHINExxx-efi/cbmemc.mod
+usr/lib/grub/xxxMACHINExxx-efi/cbmemc.module
+usr/lib/grub/xxxMACHINExxx-efi/cbtable.mod
+usr/lib/grub/xxxMACHINExxx-efi/cbtable.module
+usr/lib/grub/xxxMACHINExxx-efi/cbtime.mod
+usr/lib/grub/xxxMACHINExxx-efi/cbtime.module
+usr/lib/grub/xxxMACHINExxx-efi/chain.mod
+usr/lib/grub/xxxMACHINExxx-efi/chain.module
+usr/lib/grub/xxxMACHINExxx-efi/cmdline_cat_test.mod
+usr/lib/grub/xxxMACHINExxx-efi/cmdline_cat_test.module
+usr/lib/grub/xxxMACHINExxx-efi/cmp.mod
+usr/lib/grub/xxxMACHINExxx-efi/cmp.module
+usr/lib/grub/xxxMACHINExxx-efi/cmp_test.mod
+usr/lib/grub/xxxMACHINExxx-efi/cmp_test.module
+usr/lib/grub/xxxMACHINExxx-efi/command.lst
+usr/lib/grub/xxxMACHINExxx-efi/config.h
+usr/lib/grub/xxxMACHINExxx-efi/configfile.mod
+usr/lib/grub/xxxMACHINExxx-efi/configfile.module
+usr/lib/grub/xxxMACHINExxx-efi/cpio.mod
+usr/lib/grub/xxxMACHINExxx-efi/cpio.module
+usr/lib/grub/xxxMACHINExxx-efi/cpio_be.mod
+usr/lib/grub/xxxMACHINExxx-efi/cpio_be.module
+usr/lib/grub/xxxMACHINExxx-efi/cpuid.mod
+usr/lib/grub/xxxMACHINExxx-efi/cpuid.module
+usr/lib/grub/xxxMACHINExxx-efi/crc64.mod
+usr/lib/grub/xxxMACHINExxx-efi/crc64.module
+usr/lib/grub/xxxMACHINExxx-efi/crypto.lst
+usr/lib/grub/xxxMACHINExxx-efi/crypto.mod
+usr/lib/grub/xxxMACHINExxx-efi/crypto.module
+usr/lib/grub/xxxMACHINExxx-efi/cryptodisk.mod
+usr/lib/grub/xxxMACHINExxx-efi/cryptodisk.module
+usr/lib/grub/xxxMACHINExxx-efi/cs5536.mod
+usr/lib/grub/xxxMACHINExxx-efi/cs5536.module
+usr/lib/grub/xxxMACHINExxx-efi/ctz_test.mod
+usr/lib/grub/xxxMACHINExxx-efi/ctz_test.module
+usr/lib/grub/xxxMACHINExxx-efi/date.mod
+usr/lib/grub/xxxMACHINExxx-efi/date.module
+usr/lib/grub/xxxMACHINExxx-efi/datehook.mod
+usr/lib/grub/xxxMACHINExxx-efi/datehook.module
+usr/lib/grub/xxxMACHINExxx-efi/datetime.mod
+usr/lib/grub/xxxMACHINExxx-efi/datetime.module
+usr/lib/grub/xxxMACHINExxx-efi/disk.mod
+usr/lib/grub/xxxMACHINExxx-efi/disk.module
+usr/lib/grub/xxxMACHINExxx-efi/diskfilter.mod
+usr/lib/grub/xxxMACHINExxx-efi/diskfilter.module
+usr/lib/grub/xxxMACHINExxx-efi/div.mod
+usr/lib/grub/xxxMACHINExxx-efi/div.module
+usr/lib/grub/xxxMACHINExxx-efi/div_test.mod
+usr/lib/grub/xxxMACHINExxx-efi/div_test.module
+usr/lib/grub/xxxMACHINExxx-efi/dm_nv.mod
+usr/lib/grub/xxxMACHINExxx-efi/dm_nv.module
+usr/lib/grub/xxxMACHINExxx-efi/echo.mod
+usr/lib/grub/xxxMACHINExxx-efi/echo.module
+usr/lib/grub/xxxMACHINExxx-efi/efi_gop.mod
+usr/lib/grub/xxxMACHINExxx-efi/efi_gop.module
+usr/lib/grub/xxxMACHINExxx-efi/efi_uga.mod
+usr/lib/grub/xxxMACHINExxx-efi/efi_uga.module
+usr/lib/grub/xxxMACHINExxx-efi/efifwsetup.mod
+usr/lib/grub/xxxMACHINExxx-efi/efifwsetup.module
+usr/lib/grub/xxxMACHINExxx-efi/efinet.mod
+usr/lib/grub/xxxMACHINExxx-efi/efinet.module
+usr/lib/grub/xxxMACHINExxx-efi/ehci.mod
+usr/lib/grub/xxxMACHINExxx-efi/ehci.module
+usr/lib/grub/xxxMACHINExxx-efi/elf.mod
+usr/lib/grub/xxxMACHINExxx-efi/elf.module
+usr/lib/grub/xxxMACHINExxx-efi/eval.mod
+usr/lib/grub/xxxMACHINExxx-efi/eval.module
+usr/lib/grub/xxxMACHINExxx-efi/exfat.mod
+usr/lib/grub/xxxMACHINExxx-efi/exfat.module
+usr/lib/grub/xxxMACHINExxx-efi/exfctest.mod
+usr/lib/grub/xxxMACHINExxx-efi/exfctest.module
+usr/lib/grub/xxxMACHINExxx-efi/ext2.mod
+usr/lib/grub/xxxMACHINExxx-efi/ext2.module
+usr/lib/grub/xxxMACHINExxx-efi/extcmd.mod
+usr/lib/grub/xxxMACHINExxx-efi/extcmd.module
+usr/lib/grub/xxxMACHINExxx-efi/f2fs.mod
+usr/lib/grub/xxxMACHINExxx-efi/f2fs.module
+usr/lib/grub/xxxMACHINExxx-efi/fat.mod
+usr/lib/grub/xxxMACHINExxx-efi/fat.module
+usr/lib/grub/xxxMACHINExxx-efi/fdt.lst
+usr/lib/grub/xxxMACHINExxx-efi/file.mod
+usr/lib/grub/xxxMACHINExxx-efi/file.module
+usr/lib/grub/xxxMACHINExxx-efi/fixvideo.mod
+usr/lib/grub/xxxMACHINExxx-efi/fixvideo.module
+usr/lib/grub/xxxMACHINExxx-efi/font.mod
+usr/lib/grub/xxxMACHINExxx-efi/font.module
+usr/lib/grub/xxxMACHINExxx-efi/fs.lst
+usr/lib/grub/xxxMACHINExxx-efi/fshelp.mod
+usr/lib/grub/xxxMACHINExxx-efi/fshelp.module
+usr/lib/grub/xxxMACHINExxx-efi/functional_test.mod
+usr/lib/grub/xxxMACHINExxx-efi/functional_test.module
+usr/lib/grub/xxxMACHINExxx-efi/gcry_arcfour.mod
+usr/lib/grub/xxxMACHINExxx-efi/gcry_arcfour.module
+usr/lib/grub/xxxMACHINExxx-efi/gcry_blowfish.mod
+usr/lib/grub/xxxMACHINExxx-efi/gcry_blowfish.module
+usr/lib/grub/xxxMACHINExxx-efi/gcry_camellia.mod
+usr/lib/grub/xxxMACHINExxx-efi/gcry_camellia.module
+usr/lib/grub/xxxMACHINExxx-efi/gcry_cast5.mod
+usr/lib/grub/xxxMACHINExxx-efi/gcry_cast5.module
+usr/lib/grub/xxxMACHINExxx-efi/gcry_crc.mod
+usr/lib/grub/xxxMACHINExxx-efi/gcry_crc.module
+usr/lib/grub/xxxMACHINExxx-efi/gcry_des.mod
+usr/lib/grub/xxxMACHINExxx-efi/gcry_des.module
+usr/lib/grub/xxxMACHINExxx-efi/gcry_dsa.mod
+usr/lib/grub/xxxMACHINExxx-efi/gcry_dsa.module
+usr/lib/grub/xxxMACHINExxx-efi/gcry_idea.mod
+usr/lib/grub/xxxMACHINExxx-efi/gcry_idea.module
+usr/lib/grub/xxxMACHINExxx-efi/gcry_md4.mod
+usr/lib/grub/xxxMACHINExxx-efi/gcry_md4.module
+usr/lib/grub/xxxMACHINExxx-efi/gcry_md5.mod
+usr/lib/grub/xxxMACHINExxx-efi/gcry_md5.module
+usr/lib/grub/xxxMACHINExxx-efi/gcry_rfc2268.mod
+usr/lib/grub/xxxMACHINExxx-efi/gcry_rfc2268.module
+usr/lib/grub/xxxMACHINExxx-efi/gcry_rijndael.mod
+usr/lib/grub/xxxMACHINExxx-efi/gcry_rijndael.module
+usr/lib/grub/xxxMACHINExxx-efi/gcry_rmd160.mod
+usr/lib/grub/xxxMACHINExxx-efi/gcry_rmd160.module
+usr/lib/grub/xxxMACHINExxx-efi/gcry_rsa.mod
+usr/lib/grub/xxxMACHINExxx-efi/gcry_rsa.module
+usr/lib/grub/xxxMACHINExxx-efi/gcry_seed.mod
+usr/lib/grub/xxxMACHINExxx-efi/gcry_seed.module
+usr/lib/grub/xxxMACHINExxx-efi/gcry_serpent.mod
+usr/lib/grub/xxxMACHINExxx-efi/gcry_serpent.module
+usr/lib/grub/xxxMACHINExxx-efi/gcry_sha1.mod
+usr/lib/grub/xxxMACHINExxx-efi/gcry_sha1.module
+usr/lib/grub/xxxMACHINExxx-efi/gcry_sha256.mod
+usr/lib/grub/xxxMACHINExxx-efi/gcry_sha256.module
+usr/lib/grub/xxxMACHINExxx-efi/gcry_sha512.mod
+usr/lib/grub/xxxMACHINExxx-efi/gcry_sha512.module
+usr/lib/grub/xxxMACHINExxx-efi/gcry_tiger.mod
+usr/lib/grub/xxxMACHINExxx-efi/gcry_tiger.module
+usr/lib/grub/xxxMACHINExxx-efi/gcry_twofish.mod
+usr/lib/grub/xxxMACHINExxx-efi/gcry_twofish.module
+usr/lib/grub/xxxMACHINExxx-efi/gcry_whirlpool.mod
+usr/lib/grub/xxxMACHINExxx-efi/gcry_whirlpool.module
+usr/lib/grub/xxxMACHINExxx-efi/gdb_grub
+usr/lib/grub/xxxMACHINExxx-efi/geli.mod
+usr/lib/grub/xxxMACHINExxx-efi/geli.module
+usr/lib/grub/xxxMACHINExxx-efi/gettext.mod
+usr/lib/grub/xxxMACHINExxx-efi/gettext.module
+usr/lib/grub/xxxMACHINExxx-efi/gfxmenu.mod
+usr/lib/grub/xxxMACHINExxx-efi/gfxmenu.module
+usr/lib/grub/xxxMACHINExxx-efi/gfxterm.mod
+usr/lib/grub/xxxMACHINExxx-efi/gfxterm.module
+usr/lib/grub/xxxMACHINExxx-efi/gfxterm_background.mod
+usr/lib/grub/xxxMACHINExxx-efi/gfxterm_background.module
+usr/lib/grub/xxxMACHINExxx-efi/gfxterm_menu.mod
+usr/lib/grub/xxxMACHINExxx-efi/gfxterm_menu.module
+usr/lib/grub/xxxMACHINExxx-efi/gmodule.pl
+usr/lib/grub/xxxMACHINExxx-efi/gptsync.mod
+usr/lib/grub/xxxMACHINExxx-efi/gptsync.module
+usr/lib/grub/xxxMACHINExxx-efi/gzio.mod
+usr/lib/grub/xxxMACHINExxx-efi/gzio.module
+usr/lib/grub/xxxMACHINExxx-efi/halt.mod
+usr/lib/grub/xxxMACHINExxx-efi/halt.module
+usr/lib/grub/xxxMACHINExxx-efi/hashsum.mod
+usr/lib/grub/xxxMACHINExxx-efi/hashsum.module
+usr/lib/grub/xxxMACHINExxx-efi/hdparm.mod
+usr/lib/grub/xxxMACHINExxx-efi/hdparm.module
+usr/lib/grub/xxxMACHINExxx-efi/hello.mod
+usr/lib/grub/xxxMACHINExxx-efi/hello.module
+usr/lib/grub/xxxMACHINExxx-efi/help.mod
+usr/lib/grub/xxxMACHINExxx-efi/help.module
+usr/lib/grub/xxxMACHINExxx-efi/hexdump.mod
+usr/lib/grub/xxxMACHINExxx-efi/hexdump.module
+usr/lib/grub/xxxMACHINExxx-efi/hfs.mod
+usr/lib/grub/xxxMACHINExxx-efi/hfs.module
+usr/lib/grub/xxxMACHINExxx-efi/hfsplus.mod
+usr/lib/grub/xxxMACHINExxx-efi/hfsplus.module
+usr/lib/grub/xxxMACHINExxx-efi/hfspluscomp.mod
+usr/lib/grub/xxxMACHINExxx-efi/hfspluscomp.module
+usr/lib/grub/xxxMACHINExxx-efi/http.mod
+usr/lib/grub/xxxMACHINExxx-efi/http.module
+usr/lib/grub/xxxMACHINExxx-efi/iorw.mod
+usr/lib/grub/xxxMACHINExxx-efi/iorw.module
+usr/lib/grub/xxxMACHINExxx-efi/iso9660.mod
+usr/lib/grub/xxxMACHINExxx-efi/iso9660.module
+usr/lib/grub/xxxMACHINExxx-efi/jfs.mod
+usr/lib/grub/xxxMACHINExxx-efi/jfs.module
+usr/lib/grub/xxxMACHINExxx-efi/jpeg.mod
+usr/lib/grub/xxxMACHINExxx-efi/jpeg.module
+usr/lib/grub/xxxMACHINExxx-efi/json.mod
+usr/lib/grub/xxxMACHINExxx-efi/json.module
+usr/lib/grub/xxxMACHINExxx-efi/kernel.exec
+usr/lib/grub/xxxMACHINExxx-efi/kernel.img
+usr/lib/grub/xxxMACHINExxx-efi/keylayouts.mod
+usr/lib/grub/xxxMACHINExxx-efi/keylayouts.module
+usr/lib/grub/xxxMACHINExxx-efi/keystatus.mod
+usr/lib/grub/xxxMACHINExxx-efi/keystatus.module
+usr/lib/grub/xxxMACHINExxx-efi/ldm.mod
+usr/lib/grub/xxxMACHINExxx-efi/ldm.module
+usr/lib/grub/xxxMACHINExxx-efi/legacy_password_test.mod
+usr/lib/grub/xxxMACHINExxx-efi/legacy_password_test.module
+usr/lib/grub/xxxMACHINExxx-efi/legacycfg.mod
+usr/lib/grub/xxxMACHINExxx-efi/legacycfg.module
+usr/lib/grub/xxxMACHINExxx-efi/linux.mod
+usr/lib/grub/xxxMACHINExxx-efi/linux.module
+usr/lib/grub/xxxMACHINExxx-efi/linux16.mod
+usr/lib/grub/xxxMACHINExxx-efi/linux16.module
+usr/lib/grub/xxxMACHINExxx-efi/loadbios.mod
+usr/lib/grub/xxxMACHINExxx-efi/loadbios.module
+usr/lib/grub/xxxMACHINExxx-efi/loadenv.mod
+usr/lib/grub/xxxMACHINExxx-efi/loadenv.module
+usr/lib/grub/xxxMACHINExxx-efi/loopback.mod
+usr/lib/grub/xxxMACHINExxx-efi/loopback.module
+usr/lib/grub/xxxMACHINExxx-efi/ls.mod
+usr/lib/grub/xxxMACHINExxx-efi/ls.module
+usr/lib/grub/xxxMACHINExxx-efi/lsacpi.mod
+usr/lib/grub/xxxMACHINExxx-efi/lsacpi.module
+usr/lib/grub/xxxMACHINExxx-efi/lsefi.mod
+usr/lib/grub/xxxMACHINExxx-efi/lsefi.module
+usr/lib/grub/xxxMACHINExxx-efi/lsefimmap.mod
+usr/lib/grub/xxxMACHINExxx-efi/lsefimmap.module
+usr/lib/grub/xxxMACHINExxx-efi/lsefisystab.mod
+usr/lib/grub/xxxMACHINExxx-efi/lsefisystab.module
+usr/lib/grub/xxxMACHINExxx-efi/lsmmap.mod
+usr/lib/grub/xxxMACHINExxx-efi/lsmmap.module
+usr/lib/grub/xxxMACHINExxx-efi/lspci.mod
+usr/lib/grub/xxxMACHINExxx-efi/lspci.module
+usr/lib/grub/xxxMACHINExxx-efi/lssal.mod
+usr/lib/grub/xxxMACHINExxx-efi/lssal.module
+usr/lib/grub/xxxMACHINExxx-efi/luks.mod
+usr/lib/grub/xxxMACHINExxx-efi/luks.module
+usr/lib/grub/xxxMACHINExxx-efi/luks2.mod
+usr/lib/grub/xxxMACHINExxx-efi/luks2.module
+usr/lib/grub/xxxMACHINExxx-efi/lvm.mod
+usr/lib/grub/xxxMACHINExxx-efi/lvm.module
+usr/lib/grub/xxxMACHINExxx-efi/lzopio.mod
+usr/lib/grub/xxxMACHINExxx-efi/lzopio.module
+usr/lib/grub/xxxMACHINExxx-efi/macbless.mod
+usr/lib/grub/xxxMACHINExxx-efi/macbless.module
+usr/lib/grub/xxxMACHINExxx-efi/macho.mod
+usr/lib/grub/xxxMACHINExxx-efi/macho.module
+usr/lib/grub/xxxMACHINExxx-efi/mdraid09.mod
+usr/lib/grub/xxxMACHINExxx-efi/mdraid09.module
+usr/lib/grub/xxxMACHINExxx-efi/mdraid09_be.mod
+usr/lib/grub/xxxMACHINExxx-efi/mdraid09_be.module
+usr/lib/grub/xxxMACHINExxx-efi/mdraid1x.mod
+usr/lib/grub/xxxMACHINExxx-efi/mdraid1x.module
+usr/lib/grub/xxxMACHINExxx-efi/memdisk.mod
+usr/lib/grub/xxxMACHINExxx-efi/memdisk.module
+usr/lib/grub/xxxMACHINExxx-efi/memrw.mod
+usr/lib/grub/xxxMACHINExxx-efi/memrw.module
+usr/lib/grub/xxxMACHINExxx-efi/minicmd.mod
+usr/lib/grub/xxxMACHINExxx-efi/minicmd.module
+usr/lib/grub/xxxMACHINExxx-efi/minix.mod
+usr/lib/grub/xxxMACHINExxx-efi/minix.module
+usr/lib/grub/xxxMACHINExxx-efi/minix2.mod
+usr/lib/grub/xxxMACHINExxx-efi/minix2.module
+usr/lib/grub/xxxMACHINExxx-efi/minix2_be.mod
+usr/lib/grub/xxxMACHINExxx-efi/minix2_be.module
+usr/lib/grub/xxxMACHINExxx-efi/minix3.mod
+usr/lib/grub/xxxMACHINExxx-efi/minix3.module
+usr/lib/grub/xxxMACHINExxx-efi/minix3_be.mod
+usr/lib/grub/xxxMACHINExxx-efi/minix3_be.module
+usr/lib/grub/xxxMACHINExxx-efi/minix_be.mod
+usr/lib/grub/xxxMACHINExxx-efi/minix_be.module
+usr/lib/grub/xxxMACHINExxx-efi/mmap.mod
+usr/lib/grub/xxxMACHINExxx-efi/mmap.module
+usr/lib/grub/xxxMACHINExxx-efi/moddep.lst
+usr/lib/grub/xxxMACHINExxx-efi/modinfo.sh
+usr/lib/grub/xxxMACHINExxx-efi/morse.mod
+usr/lib/grub/xxxMACHINExxx-efi/morse.module
+usr/lib/grub/xxxMACHINExxx-efi/mpi.mod
+usr/lib/grub/xxxMACHINExxx-efi/mpi.module
+usr/lib/grub/xxxMACHINExxx-efi/msdospart.mod
+usr/lib/grub/xxxMACHINExxx-efi/msdospart.module
+usr/lib/grub/xxxMACHINExxx-efi/mul_test.mod
+usr/lib/grub/xxxMACHINExxx-efi/mul_test.module
+usr/lib/grub/xxxMACHINExxx-efi/multiboot.mod
+usr/lib/grub/xxxMACHINExxx-efi/multiboot.module
+usr/lib/grub/xxxMACHINExxx-efi/multiboot2.mod
+usr/lib/grub/xxxMACHINExxx-efi/multiboot2.module
+usr/lib/grub/xxxMACHINExxx-efi/nativedisk.mod
+usr/lib/grub/xxxMACHINExxx-efi/nativedisk.module
+usr/lib/grub/xxxMACHINExxx-efi/net.mod
+usr/lib/grub/xxxMACHINExxx-efi/net.module
+usr/lib/grub/xxxMACHINExxx-efi/newc.mod
+usr/lib/grub/xxxMACHINExxx-efi/newc.module
+usr/lib/grub/xxxMACHINExxx-efi/nilfs2.mod
+usr/lib/grub/xxxMACHINExxx-efi/nilfs2.module
+usr/lib/grub/xxxMACHINExxx-efi/normal.mod
+usr/lib/grub/xxxMACHINExxx-efi/normal.module
+usr/lib/grub/xxxMACHINExxx-efi/ntfs.mod
+usr/lib/grub/xxxMACHINExxx-efi/ntfs.module
+usr/lib/grub/xxxMACHINExxx-efi/ntfscomp.mod
+usr/lib/grub/xxxMACHINExxx-efi/ntfscomp.module
+usr/lib/grub/xxxMACHINExxx-efi/odc.mod
+usr/lib/grub/xxxMACHINExxx-efi/odc.module
+usr/lib/grub/xxxMACHINExxx-efi/offsetio.mod
+usr/lib/grub/xxxMACHINExxx-efi/offsetio.module
+usr/lib/grub/xxxMACHINExxx-efi/ohci.mod
+usr/lib/grub/xxxMACHINExxx-efi/ohci.module
+usr/lib/grub/xxxMACHINExxx-efi/part_acorn.mod
+usr/lib/grub/xxxMACHINExxx-efi/part_acorn.module
+usr/lib/grub/xxxMACHINExxx-efi/part_amiga.mod
+usr/lib/grub/xxxMACHINExxx-efi/part_amiga.module
+usr/lib/grub/xxxMACHINExxx-efi/part_apple.mod
+usr/lib/grub/xxxMACHINExxx-efi/part_apple.module
+usr/lib/grub/xxxMACHINExxx-efi/part_bsd.mod
+usr/lib/grub/xxxMACHINExxx-efi/part_bsd.module
+usr/lib/grub/xxxMACHINExxx-efi/part_dfly.mod
+usr/lib/grub/xxxMACHINExxx-efi/part_dfly.module
+usr/lib/grub/xxxMACHINExxx-efi/part_dvh.mod
+usr/lib/grub/xxxMACHINExxx-efi/part_dvh.module
+usr/lib/grub/xxxMACHINExxx-efi/part_gpt.mod
+usr/lib/grub/xxxMACHINExxx-efi/part_gpt.module
+usr/lib/grub/xxxMACHINExxx-efi/part_msdos.mod
+usr/lib/grub/xxxMACHINExxx-efi/part_msdos.module
+usr/lib/grub/xxxMACHINExxx-efi/part_plan.mod
+usr/lib/grub/xxxMACHINExxx-efi/part_plan.module
+usr/lib/grub/xxxMACHINExxx-efi/part_sun.mod
+usr/lib/grub/xxxMACHINExxx-efi/part_sun.module
+usr/lib/grub/xxxMACHINExxx-efi/part_sunpc.mod
+usr/lib/grub/xxxMACHINExxx-efi/part_sunpc.module
+usr/lib/grub/xxxMACHINExxx-efi/partmap.lst
+usr/lib/grub/xxxMACHINExxx-efi/parttool.lst
+usr/lib/grub/xxxMACHINExxx-efi/parttool.mod
+usr/lib/grub/xxxMACHINExxx-efi/parttool.module
+usr/lib/grub/xxxMACHINExxx-efi/password.mod
+usr/lib/grub/xxxMACHINExxx-efi/password.module
+usr/lib/grub/xxxMACHINExxx-efi/password_pbkdf2.mod
+usr/lib/grub/xxxMACHINExxx-efi/password_pbkdf2.module
+usr/lib/grub/xxxMACHINExxx-efi/pata.mod
+usr/lib/grub/xxxMACHINExxx-efi/pata.module
+usr/lib/grub/xxxMACHINExxx-efi/pbkdf2.mod
+usr/lib/grub/xxxMACHINExxx-efi/pbkdf2.module
+usr/lib/grub/xxxMACHINExxx-efi/pbkdf2_test.mod
+usr/lib/grub/xxxMACHINExxx-efi/pbkdf2_test.module
+usr/lib/grub/xxxMACHINExxx-efi/pcidump.mod
+usr/lib/grub/xxxMACHINExxx-efi/pcidump.module
+usr/lib/grub/xxxMACHINExxx-efi/pgp.mod
+usr/lib/grub/xxxMACHINExxx-efi/pgp.module
+usr/lib/grub/xxxMACHINExxx-efi/play.mod
+usr/lib/grub/xxxMACHINExxx-efi/play.module
+usr/lib/grub/xxxMACHINExxx-efi/png.mod
+usr/lib/grub/xxxMACHINExxx-efi/png.module
+usr/lib/grub/xxxMACHINExxx-efi/priority_queue.mod
+usr/lib/grub/xxxMACHINExxx-efi/priority_queue.module
+usr/lib/grub/xxxMACHINExxx-efi/probe.mod
+usr/lib/grub/xxxMACHINExxx-efi/probe.module
+usr/lib/grub/xxxMACHINExxx-efi/procfs.mod
+usr/lib/grub/xxxMACHINExxx-efi/procfs.module
+usr/lib/grub/xxxMACHINExxx-efi/progress.mod
+usr/lib/grub/xxxMACHINExxx-efi/progress.module
+usr/lib/grub/xxxMACHINExxx-efi/raid5rec.mod
+usr/lib/grub/xxxMACHINExxx-efi/raid5rec.module
+usr/lib/grub/xxxMACHINExxx-efi/raid6rec.mod
+usr/lib/grub/xxxMACHINExxx-efi/raid6rec.module
+usr/lib/grub/xxxMACHINExxx-efi/random.mod
+usr/lib/grub/xxxMACHINExxx-efi/random.module
+usr/lib/grub/xxxMACHINExxx-efi/rdmsr.mod
+usr/lib/grub/xxxMACHINExxx-efi/rdmsr.module
+usr/lib/grub/xxxMACHINExxx-efi/read.mod
+usr/lib/grub/xxxMACHINExxx-efi/read.module
+usr/lib/grub/xxxMACHINExxx-efi/reboot.mod
+usr/lib/grub/xxxMACHINExxx-efi/reboot.module
+usr/lib/grub/xxxMACHINExxx-efi/regexp.mod
+usr/lib/grub/xxxMACHINExxx-efi/regexp.module
+usr/lib/grub/xxxMACHINExxx-efi/reiserfs.mod
+usr/lib/grub/xxxMACHINExxx-efi/reiserfs.module
+usr/lib/grub/xxxMACHINExxx-efi/relocator.mod
+usr/lib/grub/xxxMACHINExxx-efi/relocator.module
+usr/lib/grub/xxxMACHINExxx-efi/romfs.mod
+usr/lib/grub/xxxMACHINExxx-efi/romfs.module
+usr/lib/grub/xxxMACHINExxx-efi/scsi.mod
+usr/lib/grub/xxxMACHINExxx-efi/scsi.module
+usr/lib/grub/xxxMACHINExxx-efi/search.mod
+usr/lib/grub/xxxMACHINExxx-efi/search.module
+usr/lib/grub/xxxMACHINExxx-efi/search_fs_file.mod
+usr/lib/grub/xxxMACHINExxx-efi/search_fs_file.module
+usr/lib/grub/xxxMACHINExxx-efi/search_fs_uuid.mod
+usr/lib/grub/xxxMACHINExxx-efi/search_fs_uuid.module
+usr/lib/grub/xxxMACHINExxx-efi/search_label.mod
+usr/lib/grub/xxxMACHINExxx-efi/search_label.module
+usr/lib/grub/xxxMACHINExxx-efi/serial.mod
+usr/lib/grub/xxxMACHINExxx-efi/serial.module
+usr/lib/grub/xxxMACHINExxx-efi/setjmp.mod
+usr/lib/grub/xxxMACHINExxx-efi/setjmp.module
+usr/lib/grub/xxxMACHINExxx-efi/setjmp_test.mod
+usr/lib/grub/xxxMACHINExxx-efi/setjmp_test.module
+usr/lib/grub/xxxMACHINExxx-efi/setpci.mod
+usr/lib/grub/xxxMACHINExxx-efi/setpci.module
+usr/lib/grub/xxxMACHINExxx-efi/sfs.mod
+usr/lib/grub/xxxMACHINExxx-efi/sfs.module
+usr/lib/grub/xxxMACHINExxx-efi/shift_test.mod
+usr/lib/grub/xxxMACHINExxx-efi/shift_test.module
+usr/lib/grub/xxxMACHINExxx-efi/signature_test.mod
+usr/lib/grub/xxxMACHINExxx-efi/signature_test.module
+usr/lib/grub/xxxMACHINExxx-efi/sleep.mod
+usr/lib/grub/xxxMACHINExxx-efi/sleep.module
+usr/lib/grub/xxxMACHINExxx-efi/sleep_test.mod
+usr/lib/grub/xxxMACHINExxx-efi/sleep_test.module
+usr/lib/grub/xxxMACHINExxx-efi/smbios.mod
+usr/lib/grub/xxxMACHINExxx-efi/smbios.module
+usr/lib/grub/xxxMACHINExxx-efi/spkmodem.mod
+usr/lib/grub/xxxMACHINExxx-efi/spkmodem.module
+usr/lib/grub/xxxMACHINExxx-efi/squash4.mod
+usr/lib/grub/xxxMACHINExxx-efi/squash4.module
+usr/lib/grub/xxxMACHINExxx-efi/strtoull_test.mod
+usr/lib/grub/xxxMACHINExxx-efi/strtoull_test.module
+usr/lib/grub/xxxMACHINExxx-efi/syslinuxcfg.mod
+usr/lib/grub/xxxMACHINExxx-efi/syslinuxcfg.module
+usr/lib/grub/xxxMACHINExxx-efi/tar.mod
+usr/lib/grub/xxxMACHINExxx-efi/tar.module
+usr/lib/grub/xxxMACHINExxx-efi/terminal.lst
+usr/lib/grub/xxxMACHINExxx-efi/terminal.mod
+usr/lib/grub/xxxMACHINExxx-efi/terminal.module
+usr/lib/grub/xxxMACHINExxx-efi/terminfo.mod
+usr/lib/grub/xxxMACHINExxx-efi/terminfo.module
+usr/lib/grub/xxxMACHINExxx-efi/test.mod
+usr/lib/grub/xxxMACHINExxx-efi/test.module
+usr/lib/grub/xxxMACHINExxx-efi/test_blockarg.mod
+usr/lib/grub/xxxMACHINExxx-efi/test_blockarg.module
+usr/lib/grub/xxxMACHINExxx-efi/testload.mod
+usr/lib/grub/xxxMACHINExxx-efi/testload.module
+usr/lib/grub/xxxMACHINExxx-efi/testspeed.mod
+usr/lib/grub/xxxMACHINExxx-efi/testspeed.module
+usr/lib/grub/xxxMACHINExxx-efi/tftp.mod
+usr/lib/grub/xxxMACHINExxx-efi/tftp.module
+usr/lib/grub/xxxMACHINExxx-efi/tga.mod
+usr/lib/grub/xxxMACHINExxx-efi/tga.module
+usr/lib/grub/xxxMACHINExxx-efi/time.mod
+usr/lib/grub/xxxMACHINExxx-efi/time.module
+usr/lib/grub/xxxMACHINExxx-efi/tpm.mod
+usr/lib/grub/xxxMACHINExxx-efi/tpm.module
+usr/lib/grub/xxxMACHINExxx-efi/tr.mod
+usr/lib/grub/xxxMACHINExxx-efi/tr.module
+usr/lib/grub/xxxMACHINExxx-efi/trig.mod
+usr/lib/grub/xxxMACHINExxx-efi/trig.module
+usr/lib/grub/xxxMACHINExxx-efi/true.mod
+usr/lib/grub/xxxMACHINExxx-efi/true.module
+usr/lib/grub/xxxMACHINExxx-efi/udf.mod
+usr/lib/grub/xxxMACHINExxx-efi/udf.module
+usr/lib/grub/xxxMACHINExxx-efi/ufs1.mod
+usr/lib/grub/xxxMACHINExxx-efi/ufs1.module
+usr/lib/grub/xxxMACHINExxx-efi/ufs1_be.mod
+usr/lib/grub/xxxMACHINExxx-efi/ufs1_be.module
+usr/lib/grub/xxxMACHINExxx-efi/ufs2.mod
+usr/lib/grub/xxxMACHINExxx-efi/ufs2.module
+usr/lib/grub/xxxMACHINExxx-efi/uhci.mod
+usr/lib/grub/xxxMACHINExxx-efi/uhci.module
+usr/lib/grub/xxxMACHINExxx-efi/usb.mod
+usr/lib/grub/xxxMACHINExxx-efi/usb.module
+usr/lib/grub/xxxMACHINExxx-efi/usb_keyboard.mod
+usr/lib/grub/xxxMACHINExxx-efi/usb_keyboard.module
+usr/lib/grub/xxxMACHINExxx-efi/usbms.mod
+usr/lib/grub/xxxMACHINExxx-efi/usbms.module
+usr/lib/grub/xxxMACHINExxx-efi/usbserial_common.mod
+usr/lib/grub/xxxMACHINExxx-efi/usbserial_common.module
+usr/lib/grub/xxxMACHINExxx-efi/usbserial_ftdi.mod
+usr/lib/grub/xxxMACHINExxx-efi/usbserial_ftdi.module
+usr/lib/grub/xxxMACHINExxx-efi/usbserial_pl2303.mod
+usr/lib/grub/xxxMACHINExxx-efi/usbserial_pl2303.module
+usr/lib/grub/xxxMACHINExxx-efi/usbserial_usbdebug.mod
+usr/lib/grub/xxxMACHINExxx-efi/usbserial_usbdebug.module
+usr/lib/grub/xxxMACHINExxx-efi/usbtest.mod
+usr/lib/grub/xxxMACHINExxx-efi/usbtest.module
+usr/lib/grub/xxxMACHINExxx-efi/video.lst
+usr/lib/grub/xxxMACHINExxx-efi/video.mod
+usr/lib/grub/xxxMACHINExxx-efi/video.module
+usr/lib/grub/xxxMACHINExxx-efi/video_bochs.mod
+usr/lib/grub/xxxMACHINExxx-efi/video_bochs.module
+usr/lib/grub/xxxMACHINExxx-efi/video_cirrus.mod
+usr/lib/grub/xxxMACHINExxx-efi/video_cirrus.module
+usr/lib/grub/xxxMACHINExxx-efi/video_colors.mod
+usr/lib/grub/xxxMACHINExxx-efi/video_colors.module
+usr/lib/grub/xxxMACHINExxx-efi/video_fb.mod
+usr/lib/grub/xxxMACHINExxx-efi/video_fb.module
+usr/lib/grub/xxxMACHINExxx-efi/videoinfo.mod
+usr/lib/grub/xxxMACHINExxx-efi/videoinfo.module
+usr/lib/grub/xxxMACHINExxx-efi/videotest.mod
+usr/lib/grub/xxxMACHINExxx-efi/videotest.module
+usr/lib/grub/xxxMACHINExxx-efi/videotest_checksum.mod
+usr/lib/grub/xxxMACHINExxx-efi/videotest_checksum.module
+usr/lib/grub/xxxMACHINExxx-efi/wrmsr.mod
+usr/lib/grub/xxxMACHINExxx-efi/wrmsr.module
+usr/lib/grub/xxxMACHINExxx-efi/xfs.mod
+usr/lib/grub/xxxMACHINExxx-efi/xfs.module
+usr/lib/grub/xxxMACHINExxx-efi/xnu.mod
+usr/lib/grub/xxxMACHINExxx-efi/xnu.module
+usr/lib/grub/xxxMACHINExxx-efi/xnu_uuid.mod
+usr/lib/grub/xxxMACHINExxx-efi/xnu_uuid.module
+usr/lib/grub/xxxMACHINExxx-efi/xnu_uuid_test.mod
+usr/lib/grub/xxxMACHINExxx-efi/xnu_uuid_test.module
+usr/lib/grub/xxxMACHINExxx-efi/xzio.mod
+usr/lib/grub/xxxMACHINExxx-efi/xzio.module
+usr/lib/grub/xxxMACHINExxx-efi/zfs.mod
+usr/lib/grub/xxxMACHINExxx-efi/zfs.module
+usr/lib/grub/xxxMACHINExxx-efi/zfscrypt.mod
+usr/lib/grub/xxxMACHINExxx-efi/zfscrypt.module
+usr/lib/grub/xxxMACHINExxx-efi/zfsinfo.mod
+usr/lib/grub/xxxMACHINExxx-efi/zfsinfo.module
+usr/lib/grub/xxxMACHINExxx-efi/zstd.mod
+usr/lib/grub/xxxMACHINExxx-efi/zstd.module
usr/sbin/grub-bios-setup
usr/sbin/grub-install
usr/sbin/grub-macbless
diff --git a/config/rootfiles/common/x86_64/intel-microcode b/config/rootfiles/common/x86_64/intel-microcode
index cb45f6558..2d4f8f8c3 100644
--- a/config/rootfiles/common/x86_64/intel-microcode
+++ b/config/rootfiles/common/x86_64/intel-microcode
@@ -95,6 +95,11 @@ lib/firmware/intel-ucode/06-8e-09
lib/firmware/intel-ucode/06-8e-0a
lib/firmware/intel-ucode/06-8e-0b
lib/firmware/intel-ucode/06-8e-0c
+lib/firmware/intel-ucode/06-8f-04
+lib/firmware/intel-ucode/06-8f-05
+lib/firmware/intel-ucode/06-8f-06
+lib/firmware/intel-ucode/06-8f-07
+lib/firmware/intel-ucode/06-8f-08
lib/firmware/intel-ucode/06-96-01
lib/firmware/intel-ucode/06-97-02
lib/firmware/intel-ucode/06-97-05
@@ -113,6 +118,8 @@ lib/firmware/intel-ucode/06-a6-00
lib/firmware/intel-ucode/06-a6-01
lib/firmware/intel-ucode/06-a7-01
lib/firmware/intel-ucode/06-b7-01
+lib/firmware/intel-ucode/06-ba-02
+lib/firmware/intel-ucode/06-ba-03
lib/firmware/intel-ucode/06-bf-02
lib/firmware/intel-ucode/06-bf-05
lib/firmware/intel-ucode/0f-00-07
diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x86_64/linux
index 0b27541fb..fab1e5064 100644
--- a/config/rootfiles/common/x86_64/linux
+++ b/config/rootfiles/common/x86_64/linux
@@ -6997,6 +6997,9 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire/build/include/config/CC_HAS_ASM_GOTO_OUTPUT
#lib/modules/KVER-ipfire/build/include/config/CC_HAS_ASM_GOTO_TIED_OUTPUT
#lib/modules/KVER-ipfire/build/include/config/CC_HAS_ASM_INLINE
+#lib/modules/KVER-ipfire/build/include/config/CC_HAS_AUTO_VAR_INIT_PATTERN
+#lib/modules/KVER-ipfire/build/include/config/CC_HAS_AUTO_VAR_INIT_ZERO
+#lib/modules/KVER-ipfire/build/include/config/CC_HAS_AUTO_VAR_INIT_ZERO_BARE
#lib/modules/KVER-ipfire/build/include/config/CC_HAS_IBT
#lib/modules/KVER-ipfire/build/include/config/CC_HAS_INT128
#lib/modules/KVER-ipfire/build/include/config/CC_HAS_KASAN_GENERIC
@@ -7857,8 +7860,6 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire/build/include/config/GCC11_NO_ARRAY_BOUNDS
#lib/modules/KVER-ipfire/build/include/config/GCC12_NO_ARRAY_BOUNDS
#lib/modules/KVER-ipfire/build/include/config/GCC_PLUGINS
-#lib/modules/KVER-ipfire/build/include/config/GCC_PLUGIN_STRUCTLEAK
-#lib/modules/KVER-ipfire/build/include/config/GCC_PLUGIN_STRUCTLEAK_BYREF_ALL
#lib/modules/KVER-ipfire/build/include/config/GCC_VERSION
#lib/modules/KVER-ipfire/build/include/config/GENERIC_ALLOCATOR
#lib/modules/KVER-ipfire/build/include/config/GENERIC_BUG
@@ -8280,6 +8281,7 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire/build/include/config/INITRAMFS_SOURCE
#lib/modules/KVER-ipfire/build/include/config/INIT_ENV_ARG_LIMIT
#lib/modules/KVER-ipfire/build/include/config/INIT_ON_ALLOC_DEFAULT_ON
+#lib/modules/KVER-ipfire/build/include/config/INIT_STACK_ALL_ZERO
#lib/modules/KVER-ipfire/build/include/config/INOTIFY_USER
#lib/modules/KVER-ipfire/build/include/config/INPUT
#lib/modules/KVER-ipfire/build/include/config/INPUT_APANEL
@@ -18190,7 +18192,6 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire/build/scripts/gcc-plugins/sancov_plugin.c
#lib/modules/KVER-ipfire/build/scripts/gcc-plugins/stackleak_plugin.c
#lib/modules/KVER-ipfire/build/scripts/gcc-plugins/structleak_plugin.c
-#lib/modules/KVER-ipfire/build/scripts/gcc-plugins/structleak_plugin.so
#lib/modules/KVER-ipfire/build/scripts/gcc-x86_32-has-stack-protector.sh
#lib/modules/KVER-ipfire/build/scripts/gcc-x86_64-has-stack-protector.sh
#lib/modules/KVER-ipfire/build/scripts/gdb
diff --git a/config/rootfiles/common/zstd b/config/rootfiles/common/zstd
index b4a2dbd95..235613949 100644
--- a/config/rootfiles/common/zstd
+++ b/config/rootfiles/common/zstd
@@ -10,7 +10,7 @@ usr/bin/zstdmt
#usr/lib/libzstd.a
#usr/lib/libzstd.so
usr/lib/libzstd.so.1
-usr/lib/libzstd.so.1.5.2
+usr/lib/libzstd.so.1.5.4
#usr/lib/pkgconfig/libzstd.pc
#usr/share/man/man1/unzstd.1
#usr/share/man/man1/zstd.1
diff --git a/config/rootfiles/core/174/filelists/apr b/config/rootfiles/core/174/filelists/apr
new file mode 120000
index 000000000..87dd1974f
--- /dev/null
+++ b/config/rootfiles/core/174/filelists/apr
@@ -0,0 +1 @@
+../../../common/apr
\ No newline at end of file
diff --git a/config/rootfiles/core/174/filelists/bind b/config/rootfiles/core/174/filelists/bind
new file mode 120000
index 000000000..48a0ebaef
--- /dev/null
+++ b/config/rootfiles/core/174/filelists/bind
@@ -0,0 +1 @@
+../../../common/bind
\ No newline at end of file
diff --git a/config/rootfiles/core/174/filelists/curl b/config/rootfiles/core/174/filelists/curl
new file mode 120000
index 000000000..4b84bef53
--- /dev/null
+++ b/config/rootfiles/core/174/filelists/curl
@@ -0,0 +1 @@
+../../../common/curl
\ No newline at end of file
diff --git a/config/rootfiles/core/174/filelists/e2fsprogs b/config/rootfiles/core/174/filelists/e2fsprogs
new file mode 120000
index 000000000..37b55de69
--- /dev/null
+++ b/config/rootfiles/core/174/filelists/e2fsprogs
@@ -0,0 +1 @@
+../../../common/e2fsprogs
\ No newline at end of file
diff --git a/config/rootfiles/core/174/filelists/elinks b/config/rootfiles/core/174/filelists/elinks
new file mode 120000
index 000000000..10db4dd8f
--- /dev/null
+++ b/config/rootfiles/core/174/filelists/elinks
@@ -0,0 +1 @@
+../../../common/elinks
\ No newline at end of file
diff --git a/config/rootfiles/core/174/filelists/ethtool b/config/rootfiles/core/174/filelists/ethtool
new file mode 120000
index 000000000..494a53e9d
--- /dev/null
+++ b/config/rootfiles/core/174/filelists/ethtool
@@ -0,0 +1 @@
+../../../common/ethtool
\ No newline at end of file
diff --git a/config/rootfiles/core/174/filelists/files b/config/rootfiles/core/174/filelists/files
index baf9da9a7..305974014 100644
--- a/config/rootfiles/core/174/filelists/files
+++ b/config/rootfiles/core/174/filelists/files
@@ -1,5 +1,7 @@
srv/web/ipfire/cgi-bin/dhcp.cgi
srv/web/ipfire/cgi-bin/logs.cgi/log.dat
srv/web/ipfire/cgi-bin/mail.cgi
+srv/web/ipfire/cgi-bin/ovpnmain.cgi
+srv/web/ipfire/cgi-bin/updatexlrator.cgi
var/ipfire/header.pl
var/ipfire/network-functions.pl
diff --git a/config/rootfiles/core/174/filelists/freetype b/config/rootfiles/core/174/filelists/freetype
new file mode 120000
index 000000000..79ec5c42e
--- /dev/null
+++ b/config/rootfiles/core/174/filelists/freetype
@@ -0,0 +1 @@
+../../../common/freetype
\ No newline at end of file
diff --git a/config/rootfiles/core/174/filelists/gnutls b/config/rootfiles/core/174/filelists/gnutls
new file mode 120000
index 000000000..8dbe60bc3
--- /dev/null
+++ b/config/rootfiles/core/174/filelists/gnutls
@@ -0,0 +1 @@
+../../../common/gnutls
\ No newline at end of file
diff --git a/config/rootfiles/core/174/filelists/harfbuzz b/config/rootfiles/core/174/filelists/harfbuzz
new file mode 120000
index 000000000..ffe1e0d0b
--- /dev/null
+++ b/config/rootfiles/core/174/filelists/harfbuzz
@@ -0,0 +1 @@
+../../../common/harfbuzz
\ No newline at end of file
diff --git a/config/rootfiles/core/174/filelists/iproute2 b/config/rootfiles/core/174/filelists/iproute2
new file mode 120000
index 000000000..05f0f71fb
--- /dev/null
+++ b/config/rootfiles/core/174/filelists/iproute2
@@ -0,0 +1 @@
+../../../common/iproute2
\ No newline at end of file
diff --git a/config/rootfiles/core/174/filelists/liburcu b/config/rootfiles/core/174/filelists/liburcu
new file mode 120000
index 000000000..d19012e04
--- /dev/null
+++ b/config/rootfiles/core/174/filelists/liburcu
@@ -0,0 +1 @@
+../../../common/liburcu
\ No newline at end of file
diff --git a/config/rootfiles/core/174/filelists/lmdb b/config/rootfiles/core/174/filelists/lmdb
new file mode 120000
index 000000000..c25767da5
--- /dev/null
+++ b/config/rootfiles/core/174/filelists/lmdb
@@ -0,0 +1 @@
+../../../common/lmdb
\ No newline at end of file
diff --git a/config/rootfiles/core/174/filelists/logwatch b/config/rootfiles/core/174/filelists/logwatch
new file mode 120000
index 000000000..f14eabda9
--- /dev/null
+++ b/config/rootfiles/core/174/filelists/logwatch
@@ -0,0 +1 @@
+../../../common/logwatch
\ No newline at end of file
diff --git a/config/rootfiles/core/174/filelists/pango b/config/rootfiles/core/174/filelists/pango
new file mode 120000
index 000000000..6c37231c7
--- /dev/null
+++ b/config/rootfiles/core/174/filelists/pango
@@ -0,0 +1 @@
+../../../common/pango
\ No newline at end of file
diff --git a/config/rootfiles/core/174/filelists/perl-TimeDate b/config/rootfiles/core/174/filelists/perl-TimeDate
new file mode 120000
index 000000000..d26d4c549
--- /dev/null
+++ b/config/rootfiles/core/174/filelists/perl-TimeDate
@@ -0,0 +1 @@
+../../../common/perl-TimeDate
\ No newline at end of file
diff --git a/config/rootfiles/core/174/filelists/sudo b/config/rootfiles/core/174/filelists/sudo
new file mode 120000
index 000000000..0d3c45e04
--- /dev/null
+++ b/config/rootfiles/core/174/filelists/sudo
@@ -0,0 +1 @@
+../../../common/sudo
\ No newline at end of file
diff --git a/config/rootfiles/core/174/filelists/x86_64/intel-microcode b/config/rootfiles/core/174/filelists/x86_64/intel-microcode
new file mode 120000
index 000000000..d5ac074e2
--- /dev/null
+++ b/config/rootfiles/core/174/filelists/x86_64/intel-microcode
@@ -0,0 +1 @@
+../../../../common/x86_64/intel-microcode
\ No newline at end of file
diff --git a/config/rootfiles/core/174/filelists/zstd b/config/rootfiles/core/174/filelists/zstd
new file mode 120000
index 000000000..d6d4a3bf1
--- /dev/null
+++ b/config/rootfiles/core/174/filelists/zstd
@@ -0,0 +1 @@
+../../../common/zstd
\ No newline at end of file
diff --git a/config/rootfiles/core/174/update.sh b/config/rootfiles/core/174/update.sh
index 49280a89a..3f8263f22 100644
--- a/config/rootfiles/core/174/update.sh
+++ b/config/rootfiles/core/174/update.sh
@@ -39,7 +39,16 @@ extract_files
# Remove files
rm -rfv \
- /usr/lib/libboost*.so.1.76.0
+ /usr/bin/srptool \
+ /usr/lib/libbind9-9.16.37.so \
+ /usr/lib/libboost*.so.1.76.0 \
+ /usr/lib/libdns-9.16.37.so \
+ /usr/lib/libirs-9.16.37.so \
+ /usr/lib/libisc-9.16.37.so \
+ /usr/lib/libisccc-9.16.37.so \
+ /usr/lib/libisccfg-9.16.37.so \
+ /usr/lib/libns-9.16.37.so \
+ /usr/local/share/locale/de/LC_MESSAGES/elinks.mo
# update linker config
ldconfig
@@ -56,6 +65,23 @@ if [ -f /var/ipfire/proxy/enable ]; then
/etc/init.d/squid start
fi
+# Rebuild initial ramdisk to apply microcode updates
+dracut --regenerate-all --force
+case "$(uname -m)" in
+ aarch64)
+ mkimage -A arm64 -T ramdisk -C lzma -d /boot/initramfs-${KVER}-ipfire.img /boot/uInit-${KVER}-ipfire
+ # dont remove initramfs because grub need this to boot.
+ ;;
+esac
+
+# perl-TimeDate is now part of the core system, remove Pakfire metadata for it
+if [ -e "/opt/pakfire/db/installed/meta-perl-TimeDate" ] && [ -e "/opt/pakfire/db/meta/meta-perl-TimeDate" ]; then
+ rm -vf \
+ /opt/pakfire/db/installed/meta-perl-TimeDate \
+ /opt/pakfire/db/meta/meta-perl-TimeDate \
+ /opt/pakfire/db/rootfiles/perl-TimeDate
+fi
+
# This update needs a reboot...
touch /var/run/need_reboot
diff --git a/config/rootfiles/packages/dbus b/config/rootfiles/packages/dbus
index 3f752c21e..01b1538b7 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.1
+usr/lib/libdbus-1.so.3.32.2
#usr/lib/pkgconfig/dbus-1.pc
usr/libexec/dbus-daemon-launch-helper
#usr/share/dbus-1
diff --git a/config/rootfiles/packages/pcengines-apu-firmware b/config/rootfiles/packages/pcengines-apu-firmware
index abae7bd0f..ac810a65f 100644
--- a/config/rootfiles/packages/pcengines-apu-firmware
+++ b/config/rootfiles/packages/pcengines-apu-firmware
@@ -1,9 +1,8 @@
#lib/firmware/pcengines
#lib/firmware/pcengines/apu
-lib/firmware/pcengines/apu/apu1_v4.17.0.3.rom
-lib/firmware/pcengines/apu/apu2_v4.17.0.3.rom
-lib/firmware/pcengines/apu/apu3_v4.17.0.3.rom
-lib/firmware/pcengines/apu/apu4_v4.17.0.3.rom
-lib/firmware/pcengines/apu/apu5_v4.17.0.3.rom
-lib/firmware/pcengines/apu/apu6_v4.17.0.3.rom
-lib/firmware/pcengines/apu/apu7_v4.17.0.3.rom
+lib/firmware/pcengines/apu/apu2_v4.19.0.1.rom
+lib/firmware/pcengines/apu/apu3_v4.19.0.1.rom
+lib/firmware/pcengines/apu/apu4_v4.19.0.1.rom
+lib/firmware/pcengines/apu/apu5_v4.19.0.1.rom
+lib/firmware/pcengines/apu/apu6_v4.19.0.1.rom
+lib/firmware/pcengines/apu/apu7_v4.19.0.1.rom
diff --git a/doc/language_issues.en b/doc/language_issues.en
index 08fda35b7..131278a20 100644
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -1413,6 +1413,8 @@ WARNING: untranslated string: only digits allowed in max retries field = Only di
WARNING: untranslated string: only digits allowed in the idle timeout = Only digits allowed in the idle timeout.
WARNING: untranslated string: open connections = Open Connections
WARNING: untranslated string: openssl produced an error = OpenSSL produced an error
+WARNING: untranslated string: openvpn cert expires soon = Expires Soon
+WARNING: untranslated string: openvpn cert has expired = Expired
WARNING: untranslated string: openvpn client = OpenVPN client
WARNING: untranslated string: openvpn default = Default
WARNING: untranslated string: openvpn destination port used = The destination port is already used by another OpenVPN server.
diff --git a/doc/language_issues.es b/doc/language_issues.es
index ffe423bd1..501f60764 100644
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -982,6 +982,8 @@ WARNING: untranslated string: hardware vulnerabilities = Hardware Vulnerabilitie
WARNING: untranslated string: info messages = unknown string
WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hostname
WARNING: untranslated string: no data = unknown string
+WARNING: untranslated string: openvpn cert expires soon = Expires Soon
+WARNING: untranslated string: openvpn cert has expired = Expired
WARNING: untranslated string: pakfire ago = ago.
WARNING: untranslated string: route config changed = unknown string
WARNING: untranslated string: routing config added = unknown string
diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index cb06f0ab3..bbf686b74 100644
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -946,6 +946,8 @@ WARNING: untranslated string: guardian logtarget_file = unknown string
WARNING: untranslated string: guardian logtarget_syslog = unknown string
WARNING: untranslated string: guardian no entries = unknown string
WARNING: untranslated string: guardian service = unknown string
+WARNING: untranslated string: openvpn cert expires soon = Expires Soon
+WARNING: untranslated string: openvpn cert has expired = Expired
WARNING: untranslated string: pakfire ago = ago.
WARNING: untranslated string: route config changed = unknown string
WARNING: untranslated string: routing config added = unknown string
diff --git a/doc/language_issues.it b/doc/language_issues.it
index dd794f57a..f9fa74de1 100644
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -1174,6 +1174,8 @@ WARNING: untranslated string: one month = One Month
WARNING: untranslated string: one week = One Week
WARNING: untranslated string: one year = One Year
WARNING: untranslated string: open connections = Open Connections
+WARNING: untranslated string: openvpn cert expires soon = Expires Soon
+WARNING: untranslated string: openvpn cert has expired = Expired
WARNING: untranslated string: optional = Optional
WARNING: untranslated string: otp qrcode = OTP QRCode
WARNING: untranslated string: outgoing compression in bytes per second = Outgoing compression
diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 4f100abd2..d406e7299 100644
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -1197,6 +1197,8 @@ WARNING: untranslated string: one month = One Month
WARNING: untranslated string: one week = One Week
WARNING: untranslated string: one year = One Year
WARNING: untranslated string: open connections = Open Connections
+WARNING: untranslated string: openvpn cert expires soon = Expires Soon
+WARNING: untranslated string: openvpn cert has expired = Expired
WARNING: untranslated string: optional = Optional
WARNING: untranslated string: otp qrcode = OTP QRCode
WARNING: untranslated string: outgoing compression in bytes per second = Outgoing compression
diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index e91e62c5b..54aba0c66 100644
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -1355,6 +1355,8 @@ WARNING: untranslated string: one month = One Month
WARNING: untranslated string: one week = One Week
WARNING: untranslated string: one year = One Year
WARNING: untranslated string: open connections = Open Connections
+WARNING: untranslated string: openvpn cert expires soon = Expires Soon
+WARNING: untranslated string: openvpn cert has expired = Expired
WARNING: untranslated string: openvpn default = Default
WARNING: untranslated string: openvpn destination port used = The destination port is already used by another OpenVPN server.
WARNING: untranslated string: openvpn fragment allowed with udp = Using fragment is only allowed when using the UDP protocol.
diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 7dd1a63d7..05ee8461e 100644
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -1353,6 +1353,8 @@ WARNING: untranslated string: one month = One Month
WARNING: untranslated string: one week = One Week
WARNING: untranslated string: one year = One Year
WARNING: untranslated string: open connections = Open Connections
+WARNING: untranslated string: openvpn cert expires soon = Expires Soon
+WARNING: untranslated string: openvpn cert has expired = Expired
WARNING: untranslated string: openvpn default = Default
WARNING: untranslated string: openvpn destination port used = The destination port is already used by another OpenVPN server.
WARNING: untranslated string: openvpn fragment allowed with udp = Using fragment is only allowed when using the UDP protocol.
diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 3443b1f1a..6871ea35a 100644
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -1091,6 +1091,8 @@ WARNING: untranslated string: no entries = No entries at the moment.
WARNING: untranslated string: not affected = Not Affected
WARNING: untranslated string: not validating = Not validating
WARNING: untranslated string: open connections = Open Connections
+WARNING: untranslated string: openvpn cert expires soon = Expires Soon
+WARNING: untranslated string: openvpn cert has expired = Expired
WARNING: untranslated string: optional = Optional
WARNING: untranslated string: otp qrcode = OTP QRCode
WARNING: untranslated string: ovpn connection name = Connection Name
diff --git a/doc/language_missings b/doc/language_missings
index 78b9e8a2d..956303c92 100644
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -107,6 +107,8 @@
< dns servers
< hardware vulnerabilities
< invalid ip or hostname
+< openvpn cert expires soon
+< openvpn cert has expired
< service boot setting unavailable
< transport mode does not support vti
< wlanap
@@ -123,6 +125,12 @@
< dhcp fixed ip address in dynamic range
< g.dtm
< g.lite
+< guaranteed bandwidth
+< retbleed
+< service boot setting unavailable
+< show dh
+< openvpn cert expires soon
+< openvpn cert has expired
< upload fcdsl.o
############################################################################
# Checking cgi-bin translations for language: it #
@@ -467,6 +475,8 @@
< one week
< one year
< open connections
+< openvpn cert expires soon
+< openvpn cert has expired
< optional
< otp qrcode
< outgoing compression in bytes per second
@@ -995,6 +1005,8 @@
< one week
< one year
< open connections
+< openvpn cert expires soon
+< openvpn cert has expired
< optional
< otp qrcode
< outgoing compression in bytes per second
@@ -1828,6 +1840,8 @@
< one week
< one year
< open connections
+< openvpn cert expires soon
+< openvpn cert has expired
< openvpn default
< openvpn destination port used
< openvpn disabled
@@ -2812,6 +2826,8 @@
< one week
< one year
< open connections
+< openvpn cert expires soon
+< openvpn cert has expired
< openvpn default
< openvpn destination port used
< openvpn disabled
@@ -3317,6 +3333,8 @@
< not validating
< okay
< open connections
+< openvpn cert expires soon
+< openvpn cert has expired
< optional
< otp qrcode
< ovpn connection name
diff --git a/html/cgi-bin/logs.cgi/log.dat b/html/cgi-bin/logs.cgi/log.dat
index bf71b3c9f..fbc83f48d 100644
--- a/html/cgi-bin/logs.cgi/log.dat
+++ b/html/cgi-bin/logs.cgi/log.dat
@@ -75,7 +75,7 @@ my %sections = (
'suricata' => '(suricata: )',
'squid' => '(squid\[.*\]: |squid: )',
'ssh' => '(sshd(?:\(.*\))?\[.*\]: )',
- 'unbound' => '(unbound: \[.*:.*\])(.*:.*$)',
+ 'unbound' => '(unbound: \[.*?\])(.*:.*$)',
'urlfilter bl' => '(installpackage\[urlfilter\]: )',
'wireless' => '(hostapd:|kernel: ath.*:|kernel: wifi[0-9]:)'
);
diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 42a7354fc..87bda4f1e 100644
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -33,6 +33,7 @@ use File::Temp qw/ tempfile tempdir /;
use strict;
use Archive::Zip qw(:ERROR_CODES :CONSTANTS);
use Sort::Naturally;
+use Date::Parse;
require '/var/ipfire/general-functions.pl';
require "${General::swroot}/lang.pl";
require "${General::swroot}/header.pl";
@@ -5352,31 +5353,45 @@ END
END
}
if ($confighash{$key}[0] eq 'on') { $gif = 'on.gif'; } else { $gif = 'off.gif'; }
- if ($id % 2) {
- print "<tr>";
- $col="bgcolor='$color{'color20'}'";
- } else {
- print "<tr>";
- $col="bgcolor='$color{'color22'}'";
- }
- print "<td align='center' nowrap='nowrap' $col>$confighash{$key}[1]</td>";
- print "<td align='center' nowrap='nowrap' $col>" . $Lang::tr{"$confighash{$key}[3]"} . " (" . $Lang::tr{"$confighash{$key}[4]"} . ")</td>";
- #if ($confighash{$key}[4] eq 'cert') {
- #print "<td align='left' nowrap='nowrap'>$confighash{$key}[2]</td>";
- #} else {
- #print "<td align='left'> </td>";
- #}
- my @cavalid = &General::system_output("/usr/bin/openssl", "x509", "-text", "-in", "${General::swroot}/ovpn/certs/$confighash{$key}[1]cert.pem");
- my $cavalid;
+ # Fetch information about the certificate
+ my @cavalid = &General::system_output("/usr/bin/openssl", "x509", "-text",
+ "-in", "${General::swroot}/ovpn/certs/$confighash{$key}[1]cert.pem");
+
+ my $expiryDate = 0;
+
+ # Parse the certificate information
foreach my $line (@cavalid) {
if ($line =~ /Not After : (.*)[\n]/) {
- $cavalid = $1;
-
+ $expiryDate = &Date::Parse::str2time($1);
last;
}
}
+ # Calculate the remaining time
+ my $remainingTime = $expiryDate - time();
+
+ # Create some simple booleans to check the status
+ my $hasExpired = ($remainingTime <= 0);
+ my $expiresSoon = ($remainingTime <= 30 * 24 * 3600);
+
+ print "<tr>";
+
+ if ($hasExpired || $expiresSoon) {
+ $col="bgcolor='$color{'color14'}'";
+ } elsif ($id % 2) {
+ $col="bgcolor='$color{'color20'}'";
+ } else {
+ $col="bgcolor='$color{'color22'}'";
+ }
+ print "<td align='center' nowrap='nowrap' $col>$confighash{$key}[1]";
+ if ($hasExpired) {
+ print " ($Lang::tr{'openvpn cert has expired'})";
+ } elsif ($expiresSoon) {
+ print " ($Lang::tr{'openvpn cert expires soon'})";
+ }
+ print "</td>";
+ print "<td align='center' nowrap='nowrap' $col>" . $Lang::tr{"$confighash{$key}[3]"} . " (" . $Lang::tr{"$confighash{$key}[4]"} . ")</td>";
print "<td align='center' $col>$confighash{$key}[25]</td>";
$col1="bgcolor='${Header::colourred}'";
my $active = "<b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b>";
diff --git a/html/cgi-bin/updatexlrator.cgi b/html/cgi-bin/updatexlrator.cgi
index fb3959457..47d3cca42 100644
--- a/html/cgi-bin/updatexlrator.cgi
+++ b/html/cgi-bin/updatexlrator.cgi
@@ -105,6 +105,46 @@ my @metadata=();
&General::readhash("${General::swroot}/proxy/settings", \%proxysettings);
&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", \%color);
+###--- HTML HEAD ---###
+my $extraHead = <<END
+<style>
+ .row-color20 {
+ background-color: $color{'color20'};
+ }
+ .row-color22 {
+ background-color: $color{'color22'};
+ }
+ .row-table1colour {
+ background-color: $Header::table1colour;
+ }
+ .row-table2colour {
+ background-color: $Header::table2colour;
+ }
+ .percent-box {
+ border-style: solid;
+ border-width: 1px;
+ border-color: #a0a0a0;
+ width: 100px;
+ height: 10px;
+ }
+ .percent-bar {
+ background-color: #a0a0a0;
+ border-style: solid;
+ border-width: 1px;
+ border-color: #e2e2e2;
+ }
+ .percent-space {
+ background-color: #e2e2e2;
+ border-style: solid;
+ border-width: 1px;
+ border-color: #e2e2e2;
+ }
+</style>
+END
+;
+###--- END HTML HEAD ---###
+
+
$xlratorsettings{'ACTION'} = '';
$xlratorsettings{'ENABLE_LOG'} = 'off';
$xlratorsettings{'PASSIVE_MODE'} = 'off';
@@ -369,7 +409,7 @@ $selected{'NOT_ACCESSED_LAST'}{$xlratorsettings{'NOT_ACCESSED_LAST'}} = "selecte
&Header::showhttpheaders();
-&Header::openpage($Lang::tr{'updxlrtr configuration'}, 1, '');
+&Header::openpage($Lang::tr{'updxlrtr configuration'}, 1, $extraHead);
&Header::openbigbox('100%', 'left', '', $errormessage);
@@ -532,9 +572,9 @@ END
$id++;
if ($id % 2) {
- print "<tr bgcolor='$Header::table1colour'>\n"; }
+ print "<tr class='row-table1colour'>\n"; }
else {
- print "<tr bgcolor='$Header::table2colour'>\n"; }
+ print "<tr class='row-table2colour'>\n"; }
$filesize = $size_updatefile;
1 while $filesize =~ s/^(-?\d+)(\d{3})/$1.$2/;
@@ -823,9 +863,9 @@ foreach (@vendors)
$id++;
if ($id % 2) {
- print "<tr bgcolor=''$color{'color20'}'>\n"; }
+ print "<tr class='row-color20'>\n"; }
else {
- print "<tr bgcolor=''$color{'color22'}'>\n"; }
+ print "<tr class='row-color22'>\n"; }
print "<td class='base' align='center'><nobr> ";
@@ -1162,9 +1202,9 @@ END
$id++;
if ($id % 2) {
- print "<tr bgcolor='$Header::table1colour'>\n"; }
+ print "<tr class='row-table1colour'>\n"; }
else {
- print "<tr bgcolor='$Header::table2colour'>\n"; }
+ print "<tr class='row-table2colour'>\n"; }
$filesize = $size_updatefile;
1 while $filesize =~ s/^(-?\d+)(\d{3})/$1.$2/;
@@ -1522,22 +1562,20 @@ sub savesettings
sub percentbar
{
my $percent = $_[0];
- my $fg = '#a0a0a0';
- my $bg = '#e2e2e2';
if ($percent =~ m/^(\d+)%$/ )
{
print <<END
-<table width='100' border='1' cellspacing='0' cellpadding='0' style='border-width:1px;border-style:solid;border-color:$fg;width:100px;height:10px;'>
+<table width='100' border='1' cellspacing='0' cellpadding='0' class='percent-box'>
<tr>
END
;
if ($percent eq "100%") {
- print "<td width='100%' bgcolor='$fg' style='background-color:$fg;border-style:solid;border-width:1px;border-color:$bg'>"
+ print "<td width='100%' class='percent-bar'>"
} elsif ($percent eq "0%") {
- print "<td width='100%' bgcolor='$bg' style='background-color:$bg;border-style:solid;border-width:1px;border-color:$bg'>"
+ print "<td width='100%' class='percent-space'>"
} else {
- print "<td width='$percent' bgcolor='$fg' style='background-color:$fg;border-style:solid;border-width:1px;border-color:$bg'></td><td width='" . (100-$1) . "%' bgcolor='$bg' style='background-color:$bg;border-style:solid;border-width:1px;border-color:$bg'>"
+ print "<td width='$percent' class='percent-bar'></td><td width='" . (100-$1) . "%' class='percent-space'>"
}
print <<END
<img src='/images/null.gif' width='1' height='1' alt='' /></td></tr></table>
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 5fbab2ff8..a57b62ad8 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1884,6 +1884,8 @@
'open connections' => 'Offene Verbindungen',
'open to all' => 'Überschreibe externen Zugang zu ALL',
'openssl produced an error' => 'OpenSSL hat einen Fehler verursacht',
+'openvpn cert expires soon' => 'Läuft bald ab',
+'openvpn cert has expired' => 'Abgelaufen',
'openvpn client' => 'OpenVPN-Client',
'openvpn default' => 'Vorgabe',
'openvpn destination port used' => 'Der Zielport wird bereits von einer anderen OpenVPN-Server-Instanz genutzt.',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 5a72f53b8..cc7704e9d 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1941,6 +1941,8 @@
'open connections' => 'Open Connections',
'open to all' => 'Override external access to ALL',
'openssl produced an error' => 'OpenSSL produced an error',
+'openvpn cert expires soon' => 'Expires Soon',
+'openvpn cert has expired' => 'Expired',
'openvpn client' => 'OpenVPN client',
'openvpn default' => 'Default',
'openvpn destination port used' => 'The destination port is already used by another OpenVPN server.',
diff --git a/lfs/apr b/lfs/apr
index 35acd6ab7..6ef88fd18 100644
--- a/lfs/apr
+++ b/lfs/apr
@@ -25,7 +25,7 @@
include Config
-VER = 1.7.0
+VER = 1.7.2
THISAPP = apr-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = a8750c45ca6495073a7120f3ae9b858905aecb24b6af5966c3900b06ac1f6d6b55346b17a39a9604cf1b595882335adedf8c8cf4db10e322501bfff4ad7adfe7
+$(DL_FILE)_BLAKE2 = a17ee4311a33acee0bdeb9e5225a198f9dec1b2e0267a742080c77d5342e5052392a5a2100a0ba85f5a192b8679838a7002d4c9a12aa5bdd7921eff025b75d15
install : $(TARGET)
diff --git a/lfs/bind b/lfs/bind
index 4ecceda97..6782ab24a 100644
--- a/lfs/bind
+++ b/lfs/bind
@@ -25,7 +25,7 @@
include Config
-VER = 9.16.37
+VER = 9.16.38
THISAPP = bind-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -43,7 +43,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 3b18f7c780ce04e296498e30c09628ad8eb89f38afdb032700455f193a3f8556029cd2e3d3c42861965d5fc776f56f761b8d21a74a0f95d82338e65fb519acfb
+$(DL_FILE)_BLAKE2 = af74f3867837741102f9e1b9eb0fa44948131fc2122a5ea6a707b92408604d62f95350ff561ec98787ce516c96ef971b1a03d775aaba99ebc4ea334cd9800ed2
install : $(TARGET)
diff --git a/lfs/colm b/lfs/colm
index 5e118336e..4a90f78bd 100644
--- a/lfs/colm
+++ b/lfs/colm
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
-VER = 0.13.0.6
+VER = 0.14.7
THISAPP = colm-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = e5b00bc276fa3414cc9ec557a6e4ca93194f86cd6b3b1ad11611352962da1ef68aa1acd4aa62d47495ba04313dcc52e2a17588fefabf51572d19826c7bb70fe8
+$(DL_FILE)_BLAKE2 = c8be14001e8dc3340f5c55fbf8140b86237ec9462699e417f618cf44c759307eda0ede9f7a9ef897f5b8bc51d1fdf8b7360872a30b4cf07ba8191e405940030c
install : $(TARGET)
@@ -71,8 +71,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
$(UPDATE_AUTOMAKE)
+ cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/colm-0.14.7-check-enable_static-and-enable_shared-and-link-libcolm-appropriately.patch
+ cd $(DIR_APP) && autoreconf
cd $(DIR_APP) && ./configure \
--prefix=/usr \
+ --disable-manual \
--disable-static
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
diff --git a/lfs/curl b/lfs/curl
index b76c33410..feb4fa810 100644
--- a/lfs/curl
+++ b/lfs/curl
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
-VER = 7.87.0
+VER = 7.88.1
THISAPP = curl-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = b272ec928c5ef1728434630d8910f58834327a30570913df9d47921a2810d002bd88b81371005197db857d3a53386420c1e28b1e463e6241d46c1e50fbce0c13
+$(DL_FILE)_BLAKE2 = ed7e7aa29efb02fd89a53d5c8d0ec79b4d17612ea07d2a6b5a951f0ca651b4cf7264704344b1a0c2d82196f4cb5c08525e06b4cdd432bc3278ff23c7a6580839
install : $(TARGET)
@@ -71,7 +71,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xf $(DIR_DL)/$(DL_FILE)
# Add upstream patche.
- cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/curl-7.87.0_typecheck_accept_expressions_for_option_info_parameters.patch
cd $(DIR_APP) && ./configure \
--prefix=/usr \
--disable-ipv6 \
diff --git a/lfs/dbus b/lfs/dbus
index 9aceceb08..7d123e4ef 100644
--- a/lfs/dbus
+++ b/lfs/dbus
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -26,7 +26,7 @@ include Config
SUMMARY = D-Bus Message Bus System
-VER = 1.14.4
+VER = 1.14.6
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 = 8
+PAK_VER = 9
DEPS =
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 7da5cd8f09eaef7a64f35f8ccbeb81c5687b3fad02d6ac05dd4c232e0f731dbcf4c76c36b615e6216815c8f8631bf9cb32543665440153a1199b1b35922cdda4
+$(DL_FILE)_BLAKE2 = c3b8a3bc455a65eb4c561fc701547760c4236912d9caf29822547c7ac4a5852d951c2a484e5eb0435f9d40dfa131e28b7243d5350318ea212aac7c28670ab355
install : $(TARGET)
diff --git a/lfs/e2fsprogs b/lfs/e2fsprogs
index 4758b5401..8db1c215c 100644
--- a/lfs/e2fsprogs
+++ b/lfs/e2fsprogs
@@ -24,7 +24,7 @@
include Config
-VER = 1.46.5
+VER = 1.47.0
THISAPP = e2fsprogs-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 8d8c02e891c464782a7cff518c41d793fc73366b57e17d80ffc5afd96e6144e354290e667e9710509a9dde4e5dab7e7185c5bf084c5bfd26219f05e5e92e0830
+$(DL_FILE)_BLAKE2 = 84f58b05a9f0e14e1a66c6e5171ff23b022f51c4e9a02d4d6d1d26c91909f3c7ec9c9f0462663a4457b4479043774502b8891f691e58a61f4ef6bf9ba33f33aa
install : $(TARGET)
diff --git a/lfs/elinks b/lfs/elinks
index bf8f66f56..c4b121d6a 100644
--- a/lfs/elinks
+++ b/lfs/elinks
@@ -26,7 +26,7 @@ include Config
SUMMARY = An advanced and well-established feature-rich text mode web browser
-VER = 0.15.1
+VER = 0.16.0
THISAPP = elinks-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = dcec7054d417842e709f26bab53ddb1bf43556de4c69d116ad1e049664bc7c5a5513f02cee500d591252b439a66f354079e2e3eff5692202102cb900e06340c2
+$(DL_FILE)_BLAKE2 = b81dfeb303d2e33c88f063925f61dbf50a1cf8462cf3d000b70e01b210855682352303646c7d4dc2c5bdd0de41c3ce33d222c636be4d8292cbe8379b4b043ef8
install : $(TARGET)
@@ -72,10 +72,13 @@ $(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
- cd $(DIR_APP) && make $(EXTRA_MAKE)
- cd $(DIR_APP) && make install
+ cd $(DIR_APP) && meson \
+ --prefix=/usr/local \
+ -D tre=false \
+ -D gpm=false \
+ builddir/
+ cd $(DIR_APP) && ninja -C builddir/ $(MAKETUNING) $(EXTRA_MAKE)
+ cd $(DIR_APP) && ninja -C builddir/ install
mkdir -p /usr/local/etc/elinks
cp -vf $(DIR_SRC)/config/elinks/elinks.conf /usr/local/etc/elinks/elinks.conf
diff --git a/lfs/ethtool b/lfs/ethtool
index 2b13cb424..f2b996fa9 100644
--- a/lfs/ethtool
+++ b/lfs/ethtool
@@ -24,7 +24,7 @@
include Config
-VER = 6.1
+VER = 6.2
THISAPP = ethtool-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 002a4edffda42520d77e8f0c27adf909090823f1a08689b67fc7c75de3048bdc9c94d7d32973bd17562d7dbf295479e796c2529b5db66b5fce42a2ede5851cd6
+$(DL_FILE)_BLAKE2 = b3fa2571b1efef3b686eb4f20b33e6cc32bdb8cff5f2e642454ca3d41c427b1953df7b07e5ac8ef149f8b4be614210e05e593233655e5fe317c48630b20b68e8
install : $(TARGET)
diff --git a/lfs/freetype b/lfs/freetype
index 5233f7bb8..22ba9b4a4 100644
--- a/lfs/freetype
+++ b/lfs/freetype
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
-VER = 2.12.1
+VER = 2.13.0
THISAPP = freetype-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = c4737dc0c6e44e0a911545d604fdb2e8e8b3f5185d3f5dfe4e4561ee2d75b3e5a31afcbb2089306fec4b31ba10324a6ec6499c3735b2b7591c71e96fee4ed278
+$(DL_FILE)_BLAKE2 = 11aac3cddb3e71cc0e6a616ed609294d6641aa0011842aa8230eace826955883aca0063331660025be14582b44aa189718ce21e0e5193a66bb5d7cffa1d0fb7f
install : $(TARGET)
diff --git a/lfs/gnutls b/lfs/gnutls
index 089b37719..7336528f6 100644
--- a/lfs/gnutls
+++ b/lfs/gnutls
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
-VER = 3.7.7
+VER = 3.8.0
THISAPP = gnutls-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = a66037ecc6da660ff12949f50012840263c2e0b174079e41b62a2d884f060cee56f0c64a2815d07321a54b08cce016d2b4c8f0e059636c1ab5f7db9c8d64c7c6
+$(DL_FILE)_BLAKE2 = 64784e9c0ac4dcab2c9e90d7d17d0bd8a0021224be285c12a53673f3a52aa3f189152b1b0b4aaae5a8fb41951361af1fd04a5b535774c4a26c26eb895519af40
install : $(TARGET)
diff --git a/lfs/harfbuzz b/lfs/harfbuzz
index c547b203c..17186b203 100644
--- a/lfs/harfbuzz
+++ b/lfs/harfbuzz
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
-VER = 6.0.0
+VER = 7.0.1
THISAPP = harfbuzz-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = bb08f90cf9540a076ec2fe5498658a0e5f963537ebd98fce271af9070d0fc7178346bf56c600720d433c9e3a403f67ec3ac898abeb1da12697ad22980ecf5204
+$(DL_FILE)_BLAKE2 = 4a8844093b627b8d5d2e6f7b735781334f2715fe5146bb135ba19fb5a38f2a38248028b447d985fbde4505cd66721766a727fa7fe1300efd31259c7cafb8b6f2
install : $(TARGET)
diff --git a/lfs/intel-microcode b/lfs/intel-microcode
index 1d4204231..fb7be5fe4 100644
--- a/lfs/intel-microcode
+++ b/lfs/intel-microcode
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
-VER = 20221108
+VER = 20230214
THISAPP = Intel-Linux-Processor-Microcode-Data-Files-microcode-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -41,7 +41,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = e149e001656f45e8da9a83817a6f83fc6663edbfc8a98b27ab4f9d326f0999921aea03f1ea3628d35978ad5534e017f2d394d1d00d0c992aee54a539a582abf2
+$(DL_FILE)_BLAKE2 = d98d054a8cfd66e3d0549d1e8f4a4745cad342d45f36a82d2f2f51fedc29635125fdad95ee4970069e134facc1ab3092b97837c6f8744ffedf220a5d3d022dd5
install : $(TARGET)
diff --git a/lfs/iproute2 b/lfs/iproute2
index 62d3483d9..f9e24fd09 100644
--- a/lfs/iproute2
+++ b/lfs/iproute2
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
-VER = 6.1.0
+VER = 6.2.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 = 38249703e0a9ba74405aebdb97560b286deefa959a9c3f0e0893962b6966f5da2da46199dda6a0f9584bb473f8ba529440643d97f66e9b7619df029e3091d163
+$(DL_FILE)_BLAKE2 = d3bfaecf33ffc7861e983e8db0d6a63f4767b6c01b5346e88f51c65ed6279c4be29412ed18b8f98ed54d60a84455b73fe7745142fd0fc0f3e327a29e8bcce986
install : $(TARGET)
diff --git a/lfs/liburcu b/lfs/liburcu
index 5b1d6fd45..6825b50a6 100644
--- a/lfs/liburcu
+++ b/lfs/liburcu
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
-VER = 0.13.2
+VER = 0.14.0
THISAPP = userspace-rcu-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -41,7 +41,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 6d502e0035b03df262c917ba70f7442e2bd81369091b2c521fe5c32f31ed2ef7404070759f3a8910b767153e05d28e354d5e5ece2a3ba17e4a31dd7db3e1924f
+$(DL_FILE)_BLAKE2 = ba9fa4c6dec693d2616234187db531f00fc0ade65f7e2a57182d9441728ddfa6f3e9d4544b824ca5edf7c027a43c9231d998a309c01f4bbab1eeefe856344f77
install : $(TARGET)
diff --git a/lfs/lmdb b/lfs/lmdb
index 919dfb2fc..81a295b4a 100644
--- a/lfs/lmdb
+++ b/lfs/lmdb
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,10 +24,10 @@
include Config
-VER = 0.9.29
+VER = 0.9.30
-THISAPP = lmdb-LMDB_$(VER)
-DL_FILE = $(THISAPP).tar.gz
+THISAPP = openldap-LMDB_$(VER)
+DL_FILE = $(THISAPP).tar.bz2
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 3f2a48785dd62921af79e0f10b86438085d86f8013f667dcf2f6177535baee26bba74c6a8023e47c6179c8a6be8fd63cf575b30e216b5669de2d58e69757bd1f
+$(DL_FILE)_BLAKE2 = 849d40187dc3aaddcd118cf6db28a9807854d4b5b34a365f6e076ccccd556470f117933e3d29cf2678368db2f0c9d264e033a27de310f036e1a65f04ed643fa9
install : $(TARGET)
diff --git a/lfs/logwatch b/lfs/logwatch
index 57a605ed5..391315de4 100644
--- a/lfs/logwatch
+++ b/lfs/logwatch
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
-VER = 7.7
+VER = 7.8
THISAPP = logwatch-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 8978930fe844bde372f68038f295cc62ca61f1c2b10d18f545ddcc713cb72cd01520ff0ea0869f2dff96846431a6dd9a04da1bc79817ccb590b0235f96e934da
+$(DL_FILE)_BLAKE2 = 35480a22077e43b70d15a00cc0a3a8297c1e57c465d6fffe7a9a68a9b4fb14ef62c1d2bcae8a4ab2d70af16451b8f0b5dba8aec29beae1012501a118915edd92
install : $(TARGET)
diff --git a/lfs/make b/lfs/make
index feaeab658..c6684ac75 100644
--- a/lfs/make
+++ b/lfs/make
@@ -26,14 +26,14 @@ include Config
SUMMARY = GNU make
-VER = 4.4
+VER = 4.4.1
THISAPP = make-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
PROG = make
-PAK_VER = 6
+PAK_VER = 7
DEPS =
@@ -59,7 +59,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 5b8a2fcd7610c33347c2e552fdc4f2698c9a4c468de588c9687cd11d15f120a37768bcd521231adf32359e3b48b27ab7b142746fd18b1a8d15578d34344f487e
+$(DL_FILE)_BLAKE2 = 09a4ad8060259e36854b525ab610fd317a86f4926e44e3ab8adba75dccc8d4b445df9dd25ccfb4c25a54bc0e98238a9127e36401d74cbc3503a329eadcdf4995
install : $(TARGET)
diff --git a/lfs/monit b/lfs/monit
index 4793129e4..d243be460 100644
--- a/lfs/monit
+++ b/lfs/monit
@@ -24,7 +24,7 @@
include Config
-VER = 5.32.0
+VER = 5.33.0
SUMMARY = Utility for monitoring services on a Unix system
THISAPP = monit-$(VER)
@@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = monit
-PAK_VER = 20
+PAK_VER = 21
DEPS =
@@ -47,7 +47,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 48b824365dca349914ffc066a19758f23fee122fb29b1aed5cecad6f97799a987752e3e59cbed488282738c755fdf4d7c95dbe85069f2e070c28f03a324e0a7f
+$(DL_FILE)_BLAKE2 = 770474f010067fe6388622e764a0d032495589dad24873dabd87ab0aa8edcff34d7a014a72c1c05aaa47104b12daf3dc542aa1d2d823d267814c9b5fd139e747
install : $(TARGET)
@@ -90,6 +90,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
mkdir -p /var/lib/monit
+ # Install backup include file
install -v -m 644 $(DIR_SRC)/config/backup/includes/monit \
/var/ipfire/backup/addons/includes/monit
@@ -99,7 +100,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
#install initscripts
$(call INSTALL_INITSCRIPTS,$(SERVICES))
- # Install start links and backup include file.
+ # Install start links
ln -sf ../init.d/monit /etc/rc.d/rc3.d/S60monit
ln -sf ../init.d/monit /etc/rc.d/rc0.d/K40monit
ln -sf ../init.d/monit /etc/rc.d/rc6.d/K40monit
diff --git a/lfs/pango b/lfs/pango
index 759f269ae..19b510059 100644
--- a/lfs/pango
+++ b/lfs/pango
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
-VER = 1.50.6
+VER = 1.50.13
THISAPP = pango-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 63cad33f5fe5361642edb0e26a11c45e28e23400f29c078079fa9ce4411eca90c67fdd789e8cf9caec0f1d4a6b5d619808d8dcf53447f961b66db17e1bbcdb97
+$(DL_FILE)_BLAKE2 = 8524d5ff478137e6f3795aff8428a8bc864d72338d93c579c039c94eba368526d38f999b7a9b1964e3649d748393dbe2fffaa29a11732df5bd0adff010d79e05
install : $(TARGET)
diff --git a/lfs/pcengines-apu-firmware b/lfs/pcengines-apu-firmware
index 6a5c81741..43642b021 100644
--- a/lfs/pcengines-apu-firmware
+++ b/lfs/pcengines-apu-firmware
@@ -26,14 +26,14 @@ include Config
SUMMARY = Firmware files for PC Engines apu system boards
-VER = 4.17.0.3
+VER = 4.19.0.1
THISAPP = pcengines-apu-firmware-$(VER)
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = pcengines-apu-firmware
-PAK_VER = 14
+PAK_VER = 15
SUP_ARCH = x86_64
DEPS = firmware-update
@@ -45,7 +45,6 @@ SERVICES =
###############################################################################
objects = \
- apu1_v$(VER).rom \
apu2_v$(VER).rom \
apu3_v$(VER).rom \
apu4_v$(VER).rom \
@@ -53,7 +52,6 @@ objects = \
apu6_v$(VER).rom \
apu7_v$(VER).rom
-apu1_v$(VER).rom = $(DL_FROM)/apu1_v$(VER).rom
apu2_v$(VER).rom = $(DL_FROM)/apu2_v$(VER).rom
apu3_v$(VER).rom = $(DL_FROM)/apu3_v$(VER).rom
apu4_v$(VER).rom = $(DL_FROM)/apu4_v$(VER).rom
@@ -61,13 +59,12 @@ apu5_v$(VER).rom = $(DL_FROM)/apu5_v$(VER).rom
apu6_v$(VER).rom = $(DL_FROM)/apu6_v$(VER).rom
apu7_v$(VER).rom = $(DL_FROM)/apu7_v$(VER).rom
-apu1_v$(VER).rom_BLAKE2 = e64c56f6105a206b6af2da4d54bd36d9caa53154b17d5fc32966ee3ed74b0b25749fd10c6936b5b9e526b779c2ef9f1d566915297244e1570c5000b555561aea
-apu2_v$(VER).rom_BLAKE2 = 082e89bc8867383e673a6ba2791558b17bb7ab807257f546fa549393b25891287bdb13ae59e2525fc5951a8bab0ffead33c2a2d6b6616bea5c6f5daba573bd8c
-apu3_v$(VER).rom_BLAKE2 = 06aef3cc85aa8a6082399961b75598c8632c6214079a2f670f2567c21b8b46c39736ef6514af14559048d118986d6fc56d1373e3c39309b73c2b56bfd6477611
-apu4_v$(VER).rom_BLAKE2 = ea07e2742ea98eae959928c3c5ba8038f24dbbac38087dc21a61039b92ed87fad8079414a92b81291de9d30f701574c4bf9c4c9c66e70938c2efcfa46f7c578d
-apu5_v$(VER).rom_BLAKE2 = 0f4bf5fedc5948578c8c76aa9a622874c1c8df1774df6bda70baccd7453fd882c5ecccd1c249612c5415ed2408a86ed7cba6c05f1fe57a9df9138589e86b630c
-apu6_v$(VER).rom_BLAKE2 = 90faa16c2ee863876b1bbdb862dd99213f2bcb30727db7553e4fc736ddc3fb354d3c8d58d6dd27f71586e5296ceb68a6f6dd43a15a4dbe4ee27f455486b6e43c
-apu7_v$(VER).rom_BLAKE2 = 251e0e3183bce159351397aa7a2146e22d1c840e818c3118c2c02d21d3adfd574b3061d91d227cd51d64c6bc31d27f159b296ffdbb5ce5fdbced727b97f508ad
+apu2_v$(VER).rom_BLAKE2 = e079af4e8f6898a83a0ad2ba2c5af5e89416b58562fd47fb22ba5d9332f88c822efd354e21d486b0002b41769f26fe02cc2b78a3d6b52fc8e95b48ea68c2fb4c
+apu3_v$(VER).rom_BLAKE2 = edfff21da4d6391ac89d911ee205445ac714e7813e92b5721e05b2d81701e5891eaf073ebcc282648b09645d88b897a8d2201029888a9cdf09ed7b9503f840da
+apu4_v$(VER).rom_BLAKE2 = 5b92cbfe6ac0c75e4a01a18b9c8c0e8abd924b335063edc60944c65bec4edb439d3e1320129cd363e55497590cae7d16a205fdbb33621ff5e9be99e63723eaa1
+apu5_v$(VER).rom_BLAKE2 = fbeda636542a78670faaed859bb774b7f380c7e9a5b2efb12865118df96e9a010a611a7e5fee8a88cb05063bc7cec9eaa780974b27b5c3738fbaea8d64de6493
+apu6_v$(VER).rom_BLAKE2 = af595261161cb214059906e613dfac72d083a370706c4ae37a9d234348f74ece7e2a9c3ea305dc6a66e73c56e86e42754adf516e828d3cf5923466584c2317e9
+apu7_v$(VER).rom_BLAKE2 = 1a22c3d7f13927bb765ec0538e6d79fd9e5bed31fda5b3530901710444232fd007a705cad86318d52b1204448a7b9b020c00fd87eaf41268bbed12a0ebed2f47
install : $(TARGET)
diff --git a/lfs/perl-TimeDate b/lfs/perl-TimeDate
index b56c5e7f6..ccb6f534a 100644
--- a/lfs/perl-TimeDate
+++ b/lfs/perl-TimeDate
@@ -33,11 +33,6 @@ DL_FILE = ${THISAPP}.tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
-PROG = perl-TimeDate
-DEPS =
-PAK_VER = 7
-
-SERVICES =
###############################################################################
# Top-level Rules
diff --git a/lfs/ragel b/lfs/ragel
index caca45921..b9b99b09f 100644
--- a/lfs/ragel
+++ b/lfs/ragel
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
-VER = 7.0.0.11
+VER = 7.0.4
THISAPP = ragel-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = d967251d4eeb06a0fb2c5f3bf398dbc53fe4499b092113bb948f03b50f9e468cf510b2196055544ae65a47559ad5baed57238ac92c8aae5300873716ddd070b1
+$(DL_FILE)_BLAKE2 = d96444f6b8dc356b9effa6c5032952ffb2526833f90fcb63c7f6c293a73a70ba057995426ba789d237c61dee5e3aa1ab53ec3193bd31c9c4b994193910219d13
install : $(TARGET)
@@ -72,6 +72,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
$(UPDATE_AUTOMAKE)
cd $(DIR_APP) && ./configure \
--prefix=/usr \
+ --with-colm=/usr \
+ --disable-manual \
--disable-static
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
diff --git a/lfs/samba b/lfs/samba
index e7b31c900..32c9fab39 100644
--- a/lfs/samba
+++ b/lfs/samba
@@ -24,7 +24,7 @@
include Config
-VER = 4.17.4
+VER = 4.17.5
SUMMARY = A SMB/CIFS File, Print, and Authentication Server
THISAPP = samba-$(VER)
@@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = samba
-PAK_VER = 91
+PAK_VER = 92
DEPS = avahi cups perl-Parse-Yapp perl-JSON
@@ -47,7 +47,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 2f95ef07530c11b3b46fd5dec3b44c926bc4c06871a2d9405c86a791d8e28d84649444f8147275fe425923eefc46ec49a903b71d21aaca379618ffbfce1dcd84
+$(DL_FILE)_BLAKE2 = f8d6cf3c0f5333c5a6b1ac16793d8fd443c517068211829f40ca2fbc08d80921de65a4f3e2c08775a5551a4f834f406208c0941a4eb496720cc45ecaeb6c173f
install : $(TARGET)
diff --git a/lfs/sudo b/lfs/sudo
index ddcddf225..bad193d7c 100644
--- a/lfs/sudo
+++ b/lfs/sudo
@@ -24,7 +24,7 @@
include Config
-VER = 1.9.12p2
+VER = 1.9.13p2
THISAPP = sudo-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 79eac710b757acae7aa98e6e6f495a475e5236be456e4687fb1441345ee296672ff80a5a60902cffcd257aa81a01fbc3857f3c52e51bb46f56c060fd299e0c05
+$(DL_FILE)_BLAKE2 = a96198e865c644c79b0879e1a39c9dcc5f9db2164d22fe25804805065a78424dd6ed6f9e0995cad2d0809a1a21957c6a059c6bdbd2ebdf26cfdf5488004d9cb4
install : $(TARGET)
diff --git a/lfs/swatch b/lfs/swatch
index 227313e07..1071e9b12 100644
--- a/lfs/swatch
+++ b/lfs/swatch
@@ -34,9 +34,9 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = swatch
-PAK_VER = 6
+PAK_VER = 7
-DEPS = perl-File-Tail perl-Date-Calc perl-TimeDate perl-Date-Manip
+DEPS = perl-File-Tail perl-Date-Calc perl-Date-Manip
SERVICES =
diff --git a/lfs/texinfo b/lfs/texinfo
index 5ee90d0dc..62acc0af5 100644
--- a/lfs/texinfo
+++ b/lfs/texinfo
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2021 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
-VER = 6.8
+VER = 7.0.2
THISAPP = texinfo-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -47,7 +47,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 0256dac5ba9c7f171c970644907b763f7a88fd9995111244df0458591aed1a0fe94c76045dde69f9138d65d6f780aae6869bbbc013f58e04ae7c62456b222bbb
+$(DL_FILE)_BLAKE2 = 23737cc800392c949add14c1d0a01a294e8c224d958c03325c96d6540dcfae49db5c2d4a8c29310c0603f8ac8477f6ee00a14db4aa6caab317b19e776139e617
install : $(TARGET)
@@ -77,7 +77,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/texinfo-6.8-undo-gnulib-nonnul.patch
cd $(DIR_APP) && ./configure --prefix=$(PREFIX) --disable-nls
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
diff --git a/lfs/zstd b/lfs/zstd
index 94cc4faef..1c2447f54 100644
--- a/lfs/zstd
+++ b/lfs/zstd
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
-VER = 1.5.2
+VER = 1.5.4
THISAPP = zstd-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -49,7 +49,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = c4da9317e612dcf53983617151290bfbe8eae96701621eaff9f47cbdf4e1ca06e94db2058f7590fec8ca3bf744740ffdcefb29a8f4f043a51e8c8a01128b2942
+$(DL_FILE)_BLAKE2 = ffc5fcbbdf4ab04bc14b5037308bf4e879d4cbaaf863462ea1e8af3f1b86b935ee6036e49298c83ac42b00472c003e32c263c977f0ae7d64f31d9ae63c5c28cb
install : $(TARGET)
diff --git a/make.sh b/make.sh
index 306ce7959..3b7f9850c 100755
--- a/make.sh
+++ b/make.sh
@@ -1494,6 +1494,7 @@ buildipfire() {
lfsmake2 libstatgrab
lfsmake2 liboping
lfsmake2 collectd
+ lfsmake2 git
lfsmake2 elinks
lfsmake2 igmpproxy
lfsmake2 opus
@@ -1531,7 +1532,6 @@ buildipfire() {
lfsmake2 perl-Authen-SASL
lfsmake2 perl-MIME-Lite
lfsmake2 perl-Email-Date-Format
- lfsmake2 git
lfsmake2 squidclamav
lfsmake2 vnstat
lfsmake2 iw
diff --git a/src/patches/colm-0.14.7-check-enable_static-and-enable_shared-and-link-libcolm-appropriately.patch b/src/patches/colm-0.14.7-check-enable_static-and-enable_shared-and-link-libcolm-appropriately.patch
new file mode 100644
index 000000000..966de916d
--- /dev/null
+++ b/src/patches/colm-0.14.7-check-enable_static-and-enable_shared-and-link-libcolm-appropriately.patch
@@ -0,0 +1,44 @@
+diff -Naur colm-0.14.7.orig/configure.ac colm-0.14.7/configure.ac
+--- colm-0.14.7.orig/configure.ac 2021-02-10 07:04:55.000000000 +0100
++++ colm-0.14.7/configure.ac 2023-02-07 17:35:08.462977144 +0100
+@@ -45,6 +45,7 @@
+ AC_CHECK_TOOL(AR, ar)
+ AC_PROG_RANLIB
+ AC_PROG_LIBTOOL
++
+ SED_SUBST=["\
+ -e 's|@CXX@|${CXX}|g' \
+ -e 's|@CC@|${CC}|g' \
+@@ -424,6 +425,13 @@
+ echo "#define VERSION \"$VERSION\"" > src/version.h
+ echo "#define PUBDATE \"$PUBDATE\"" >> src/version.h
+
++if test "x$enable_static" = "xyes"; then
++ AC_DEFINE([LINK_STATIC], [1], [Link static lib when invoking C compile and link])
++fi
++
++if test "x$enable_shared" = "xyes"; then
++ AC_DEFINE([LINK_SHARED], [1], [Link shared lib when invoking C compile and link])
++fi
+
+ dnl
+ dnl Wrap up.
+diff -Naur colm-0.14.7.orig/src/main.cc colm-0.14.7/src/main.cc
+--- colm-0.14.7.orig/src/main.cc 2020-12-24 00:37:24.000000000 +0100
++++ colm-0.14.7/src/main.cc 2023-02-07 17:36:51.313669629 +0100
+@@ -485,7 +485,14 @@
+ " -I%s/../aapl"
+ " -I%s/include"
+ " -L%s"
+- " %s/libcolm.a",
++#if defined(LINK_STATIC)
++ " %s/libcolm.a",
++#elif defined(LINK_SHARED)
++ " %s/libcolm.so",
++#else
++# error "must enabled at least one of shared or static libs"
++#endif
++
+ binaryFn, intermedFn, srcLocation,
+ srcLocation, location, location );
+ }
diff --git a/src/patches/curl-7.87.0_typecheck_accept_expressions_for_option_info_parameters.patch b/src/patches/curl-7.87.0_typecheck_accept_expressions_for_option_info_parameters.patch
deleted file mode 100644
index 63b23e309..000000000
--- a/src/patches/curl-7.87.0_typecheck_accept_expressions_for_option_info_parameters.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From curl commit e2aed00
-
-As expressions can have side effects, evaluate only once.
-
-To enable deprecation reporting only once, get rid of the __typeof__
-use to define the local temporary variable and use the target type
-(CURLoption/CURLINFO). This also avoids multiple reports on type
-conflicts (if some) by the curlcheck_* macros.
-
-Note that CURLOPT_* and CURLINFO_* symbols may be deprecated, but not
-their values: a curl_easy_setopt call with an integer constant as option
-will never report a deprecation.
-
-Reported-by: Thomas Klausner
-Fixes #10148
-Closes #10149
-
-
---- curl-7.87.0/include/curl/typecheck-gcc.h.orig 2022-12-19 08:48:23.000000000 +0100
-+++ curl-7.87.0/include/curl/typecheck-gcc.h 2022-12-26 20:39:29.243819395 +0100
-@@ -42,9 +42,8 @@
- */
- #define curl_easy_setopt(handle, option, value) \
- __extension__({ \
-- CURL_IGNORE_DEPRECATION(__typeof__(option) _curl_opt = option;) \
-+ CURLoption _curl_opt = (option); \
- if(__builtin_constant_p(_curl_opt)) { \
-- (void) option; \
- CURL_IGNORE_DEPRECATION( \
- if(curlcheck_long_option(_curl_opt)) \
- if(!curlcheck_long(value)) \
-@@ -120,9 +119,8 @@
- /* wraps curl_easy_getinfo() with typechecking */
- #define curl_easy_getinfo(handle, info, arg) \
- __extension__({ \
-- CURL_IGNORE_DEPRECATION(__typeof__(info) _curl_info = info;) \
-+ CURLINFO _curl_info = (info); \
- if(__builtin_constant_p(_curl_info)) { \
-- (void) info; \
- CURL_IGNORE_DEPRECATION( \
- if(curlcheck_string_info(_curl_info)) \
- if(!curlcheck_arr((arg), char *)) \
diff --git a/src/patches/texinfo-6.8-undo-gnulib-nonnul.patch b/src/patches/texinfo-6.8-undo-gnulib-nonnul.patch
deleted file mode 100644
index 60f2e63b7..000000000
--- a/src/patches/texinfo-6.8-undo-gnulib-nonnul.patch
+++ /dev/null
@@ -1,186 +0,0 @@
-
-Patch by Vitezslav Crhonek <vcrhonek(a)redhat.com>
-Source: https://src.fedoraproject.org/rpms/texinfo/c/9b2cca4817fa4bd8d520fed05e9560…
-
-diff -up texinfo-6.8/gnulib/lib/cdefs.h.orig texinfo-6.8/gnulib/lib/cdefs.h
---- texinfo-6.8/gnulib/lib/cdefs.h.orig 2021-03-11 19:57:53.000000000 +0100
-+++ texinfo-6.8/gnulib/lib/cdefs.h 2021-07-19 12:26:46.985176475 +0200
-@@ -321,15 +321,15 @@
-
- /* The nonnull function attribute marks pointer parameters that
- must not be NULL. */
--#ifndef __attribute_nonnull__
-+#ifndef __nonnull
- # if __GNUC_PREREQ (3,3) || __glibc_has_attribute (__nonnull__)
--# define __attribute_nonnull__(params) __attribute__ ((__nonnull__ params))
-+# define __nonnull(params) __attribute__ ((__nonnull__ params))
- # else
--# define __attribute_nonnull__(params)
-+# define __nonnull(params)
- # endif
--#endif
--#ifndef __nonnull
--# define __nonnull(params) __attribute_nonnull__ (params)
-+#elif !defined __GLIBC__
-+# undef __nonnull
-+# define __nonnull(params) _GL_ATTRIBUTE_NONNULL (params)
- #endif
-
- /* If fortification mode, we warn about unused results of certain
-diff -up texinfo-6.8/gnulib/lib/libc-config.h.orig texinfo-6.8/gnulib/lib/libc-config.h
---- texinfo-6.8/gnulib/lib/libc-config.h.orig 2021-03-11 19:57:54.000000000 +0100
-+++ texinfo-6.8/gnulib/lib/libc-config.h 2021-07-19 12:27:58.810590975 +0200
-@@ -33,9 +33,9 @@
- #include <config.h>
-
- /* On glibc this includes <features.h> and <sys/cdefs.h> and #defines
-- _FEATURES_H, __WORDSIZE, and __set_errno. On FreeBSD 11 and
-- DragonFlyBSD 5.9 it includes <sys/cdefs.h> which defines __nonnull.
-- Elsewhere it is harmless. */
-+ _FEATURES_H, __WORDSIZE, and __set_errno. On FreeBSD 11 it
-+ includes <sys/cdefs.h> which defines __nonnull. Elsewhere it
-+ is harmless. */
- #include <errno.h>
-
- /* From glibc <errno.h>. */
-diff -up texinfo-6.8/gnulib/lib/malloc/dynarray-skeleton.c.orig texinfo-6.8/gnulib/lib/malloc/dynarray-skeleton.c
---- texinfo-6.8/gnulib/lib/malloc/dynarray-skeleton.c.orig 2021-03-11 19:57:54.000000000 +0100
-+++ texinfo-6.8/gnulib/lib/malloc/dynarray-skeleton.c 2021-07-19 12:24:46.878419397 +0200
-@@ -192,7 +192,7 @@ DYNARRAY_NAME (free__array__) (struct DY
-
- /* Initialize a dynamic array object. This must be called before any
- use of the object. */
--__attribute_nonnull__ ((1))
-+__nonnull ((1))
- static void
- DYNARRAY_NAME (init) (struct DYNARRAY_STRUCT *list)
- {
-@@ -202,7 +202,7 @@ DYNARRAY_NAME (init) (struct DYNARRAY_ST
- }
-
- /* Deallocate the dynamic array and its elements. */
--__attribute_maybe_unused__ __attribute_nonnull__ ((1))
-+__attribute_maybe_unused__ __nonnull ((1))
- static void
- DYNARRAY_FREE (struct DYNARRAY_STRUCT *list)
- {
-@@ -213,7 +213,7 @@ DYNARRAY_FREE (struct DYNARRAY_STRUCT *l
- }
-
- /* Return true if the dynamic array is in an error state. */
--__attribute_nonnull__ ((1))
-+__nonnull ((1))
- static inline bool
- DYNARRAY_NAME (has_failed) (const struct DYNARRAY_STRUCT *list)
- {
-@@ -222,7 +222,7 @@ DYNARRAY_NAME (has_failed) (const struct
-
- /* Mark the dynamic array as failed. All elements are deallocated as
- a side effect. */
--__attribute_nonnull__ ((1))
-+__nonnull ((1))
- static void
- DYNARRAY_NAME (mark_failed) (struct DYNARRAY_STRUCT *list)
- {
-@@ -236,7 +236,7 @@ DYNARRAY_NAME (mark_failed) (struct DYNA
-
- /* Return the number of elements which have been added to the dynamic
- array. */
--__attribute_nonnull__ ((1))
-+__nonnull ((1))
- static inline size_t
- DYNARRAY_NAME (size) (const struct DYNARRAY_STRUCT *list)
- {
-@@ -245,7 +245,7 @@ DYNARRAY_NAME (size) (const struct DYNAR
-
- /* Return a pointer to the array element at INDEX. Terminate the
- process if INDEX is out of bounds. */
--__attribute_nonnull__ ((1))
-+__nonnull ((1))
- static inline DYNARRAY_ELEMENT *
- DYNARRAY_NAME (at) (struct DYNARRAY_STRUCT *list, size_t index)
- {
-@@ -257,7 +257,7 @@ DYNARRAY_NAME (at) (struct DYNARRAY_STRU
- /* Return a pointer to the first array element, if any. For a
- zero-length array, the pointer can be NULL even though the dynamic
- array has not entered the failure state. */
--__attribute_nonnull__ ((1))
-+__nonnull ((1))
- static inline DYNARRAY_ELEMENT *
- DYNARRAY_NAME (begin) (struct DYNARRAY_STRUCT *list)
- {
-@@ -267,7 +267,7 @@ DYNARRAY_NAME (begin) (struct DYNARRAY_S
- /* Return a pointer one element past the last array element. For a
- zero-length array, the pointer can be NULL even though the dynamic
- array has not entered the failure state. */
--__attribute_nonnull__ ((1))
-+__nonnull ((1))
- static inline DYNARRAY_ELEMENT *
- DYNARRAY_NAME (end) (struct DYNARRAY_STRUCT *list)
- {
-@@ -294,7 +294,7 @@ DYNARRAY_NAME (add__) (struct DYNARRAY_S
- /* Add ITEM at the end of the array, enlarging it by one element.
- Mark *LIST as failed if the dynamic array allocation size cannot be
- increased. */
--__attribute_nonnull__ ((1))
-+__nonnull ((1))
- static inline void
- DYNARRAY_NAME (add) (struct DYNARRAY_STRUCT *list, DYNARRAY_ELEMENT item)
- {
-@@ -348,8 +348,7 @@ DYNARRAY_NAME (emplace__) (struct DYNARR
- /* Allocate a place for a new element in *LIST and return a pointer to
- it. The pointer can be NULL if the dynamic array cannot be
- enlarged due to a memory allocation failure. */
--__attribute_maybe_unused__ __attribute_warn_unused_result__
--__attribute_nonnull__ ((1))
-+__attribute_maybe_unused__ __attribute_warn_unused_result__ __nonnull ((1))
- static
- /* Avoid inlining with the larger initialization code. */
- #if !(defined (DYNARRAY_ELEMENT_INIT) || defined (DYNARRAY_ELEMENT_FREE))
-@@ -373,7 +372,7 @@ DYNARRAY_NAME (emplace) (struct DYNARRAY
- existing size, new elements are added (which can be initialized).
- Otherwise, the list is truncated, and elements are freed. Return
- false on memory allocation failure (and mark *LIST as failed). */
--__attribute_maybe_unused__ __attribute_nonnull__ ((1))
-+__attribute_maybe_unused__ __nonnull ((1))
- static bool
- DYNARRAY_NAME (resize) (struct DYNARRAY_STRUCT *list, size_t size)
- {
-@@ -418,7 +417,7 @@ DYNARRAY_NAME (resize) (struct DYNARRAY_
- }
-
- /* Remove the last element of LIST if it is present. */
--__attribute_maybe_unused__ __attribute_nonnull__ ((1))
-+__attribute_maybe_unused__ __nonnull ((1))
- static void
- DYNARRAY_NAME (remove_last) (struct DYNARRAY_STRUCT *list)
- {
-@@ -435,7 +434,7 @@ DYNARRAY_NAME (remove_last) (struct DYNA
-
- /* Remove all elements from the list. The elements are freed, but the
- list itself is not. */
--__attribute_maybe_unused__ __attribute_nonnull__ ((1))
-+__attribute_maybe_unused__ __nonnull ((1))
- static void
- DYNARRAY_NAME (clear) (struct DYNARRAY_STRUCT *list)
- {
-@@ -453,8 +452,7 @@ DYNARRAY_NAME (clear) (struct DYNARRAY_S
- stored in *RESULT if LIST refers to an empty list. On success, the
- pointer in *RESULT is heap-allocated and must be deallocated using
- free. */
--__attribute_maybe_unused__ __attribute_warn_unused_result__
--__attribute_nonnull__ ((1, 2))
-+__attribute_maybe_unused__ __attribute_warn_unused_result__ __nonnull ((1, 2))
- static bool
- DYNARRAY_NAME (finalize) (struct DYNARRAY_STRUCT *list,
- DYNARRAY_FINAL_TYPE *result)
-@@ -485,8 +483,7 @@ DYNARRAY_NAME (finalize) (struct DYNARRA
- have a sentinel at the end). If LENGTHP is not NULL, the array
- length is written to *LENGTHP. *LIST is re-initialized and can be
- reused. */
--__attribute_maybe_unused__ __attribute_warn_unused_result__
--__attribute_nonnull__ ((1))
-+__attribute_maybe_unused__ __attribute_warn_unused_result__ __nonnull ((1))
- static DYNARRAY_ELEMENT *
- DYNARRAY_NAME (finalize) (struct DYNARRAY_STRUCT *list, size_t *lengthp)
- {
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 3.x development tree branch, master, updated. fb12a971729f275528110f3ef64b6107713c0fe4
by Michael Tremer 05 Mar '23
by Michael Tremer 05 Mar '23
05 Mar '23
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 fb12a971729f275528110f3ef64b6107713c0fe4 (commit)
via dce228b2d1fe4783c9bb59af42b8c6c1472c88a2 (commit)
via 98cd9885ddb69b2976965c6b93b7120ffe988d58 (commit)
via 8b85fef3550271db30057e5e3accf0b2ceea4ed7 (commit)
via 291f753be9eaac9a9c5bf4b66e98ec0967c3f2b1 (commit)
via 5c42d3f475ab1686e8ee668926e3045aa893eb86 (commit)
via 8f967a84194a221b33173d620796a553ac1aafd5 (commit)
via 3edaf0a3499f81210fcdd06f3aa56a2901e29cd6 (commit)
via 0f91f52ded5dd1d674d367bfebd1817184f4ed01 (commit)
via d61127481075ec1ba1b414814e80048fdc193354 (commit)
via bfc41009ff9a24d4932424a8f122e77d2b7fb6c9 (commit)
via 53eb9705f682c1d9bfec531e6db15fcac8180b08 (commit)
via 4402bf8d1520b0a0bacd7f7c011f6da32ace56da (commit)
from c3327360dffddb8a7b9ff52e9007548af4ae5db8 (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 fb12a971729f275528110f3ef64b6107713c0fe4
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Mar 5 12:06:38 2023 +0000
spectre-meltdown-checker: Fix source download
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit dce228b2d1fe4783c9bb59af42b8c6c1472c88a2
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Mar 5 12:41:59 2023 +0100
telnet: FTBFS
* Rebase patchset with debians one.
* Now uses cmake to build.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 98cd9885ddb69b2976965c6b93b7120ffe988d58
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Mar 5 12:04:48 2023 +0000
screen: Link against libxcrypt
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 8b85fef3550271db30057e5e3accf0b2ceea4ed7
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Mar 5 12:04:06 2023 +0000
perl-DBI: Fix build
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 291f753be9eaac9a9c5bf4b66e98ec0967c3f2b1
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Mar 5 12:03:33 2023 +0000
ppp: Build without depending on network
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 5c42d3f475ab1686e8ee668926e3045aa893eb86
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Mar 5 11:36:50 2023 +0000
rp-pppoe: Drop package
The plugin is already being shipped with ppp.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 8f967a84194a221b33173d620796a553ac1aafd5
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Mar 5 10:27:59 2023 +0000
sssd: FTBFS
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 3edaf0a3499f81210fcdd06f3aa56a2901e29cd6
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Mar 5 10:25:41 2023 +0000
ImageMagic: Update to 7.1.0 patchlevel 62
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 0f91f52ded5dd1d674d367bfebd1817184f4ed01
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Mar 5 10:22:08 2023 +0000
tcl: Rework package
* Rework build process
* Fix installation of man-pages
* Don't ship main so file in devel pkg
* Ship static library in devel package
* Ship tcl m4 macro for libtool
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit d61127481075ec1ba1b414814e80048fdc193354
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Mar 5 10:32:26 2023 +0000
squid: Fix download URL
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit bfc41009ff9a24d4932424a8f122e77d2b7fb6c9
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Mar 5 11:15:10 2023 +0000
whois: Depend on libxcrypt-devel
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 53eb9705f682c1d9bfec531e6db15fcac8180b08
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Mar 5 11:13:25 2023 +0000
wpa_supplicant: Drop custom systemd file
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 4402bf8d1520b0a0bacd7f7c011f6da32ace56da
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Mar 5 11:01:16 2023 +0000
memtest86+: Update to 6.10 and fix download URL
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
ImageMagick/ImageMagick.nm | 2 +-
memtest86+/memtest86+.nm | 4 +-
network/network.nm | 1 -
perl-DBI/perl-DBI.nm | 8 +-
ppp/ppp.nm | 8 +-
rp-pppoe/rp-pppoe.nm | 90 -
rp-pppoe/systemd/pppoe-server@.service | 11 -
screen/screen.nm | 3 +-
.../spectre-meltdown-checker.nm | 4 +-
squid/squid.nm | 4 +-
sssd/sssd.nm | 8 +-
tcl/tcl.nm | 23 +-
telnet/patches/010-full_set_in_18.diff | 2206 ++++++++++++++++++++
telnet/patches/020-from_18_to_24.diff | 609 ++++++
telnet/patches/022-buffer_overflow_by_HOME.diff | 42 +
telnet/patches/024-can_2004-0911.diff | 40 +
telnet/patches/026-can_2005_0469.diff | 37 +
telnet/patches/030-reject_invalid_port.diff | 35 +
telnet/patches/045-avoid_unsetting_term.diff | 20 +
telnet/patches/100-format_security_error.diff | 53 +
telnet/patches/110-markup_errors.diff | 69 +
telnet/patches/120-some_protocol_refinement.diff | 351 ++++
telnet/patches/124-support_uservar.diff | 170 ++
telnet/patches/130-drain_input_from_child.diff | 135 ++
telnet/patches/140-telnetlogin_name_check.diff | 19 +
telnet/patches/142-numeric_hosts.diff | 76 +
telnet/patches/netkit-telnet-0.17-ipv6.diff | 265 ---
telnet/patches/netkit-telnet-0.17-nodns.patch | 43 -
.../patches/netkit-telnet-0.17-reallynodns.patch | 88 -
telnet/patches/telnet-0.17-8bit.patch | 33 -
telnet/patches/telnet-0.17-CAN-2005-468_469.patch | 179 --
telnet/patches/telnet-0.17-argv.patch | 12 -
telnet/patches/telnet-0.17-cleanup_race.patch | 11 -
telnet/patches/telnet-0.17-conf.patch | 23 -
telnet/patches/telnet-0.17-env.patch | 84 -
.../patches/telnet-0.17-errno_test_sys_bsd.patch | 24 -
telnet/patches/telnet-0.17-issue.patch | 81 -
telnet/patches/telnet-0.17-pek.patch0 | 37 -
telnet/patches/telnet-0.17-sa-01-49.patch | 208 --
telnet/patches/telnet-client-cvs.patch0 | 1721 ---------------
telnet/patches/telnet-gethostbyname.patch | 48 -
telnet/patches/telnetd-0.17-pty_read.patch0 | 25 -
telnet/patches/telnetd-0.17.patch0 | 10 -
telnet/patches/use-cmake-as-buildsystem.patch | 137 ++
telnet/telnet.nm | 62 +-
whois/whois.nm | 3 +-
wpa_supplicant/systemd/wpa_supplicant@.service | 10 -
wpa_supplicant/wpa_supplicant.nm | 19 +-
48 files changed, 4058 insertions(+), 3093 deletions(-)
delete mode 100644 rp-pppoe/rp-pppoe.nm
delete mode 100644 rp-pppoe/systemd/pppoe-server@.service
create mode 100644 telnet/patches/010-full_set_in_18.diff
create mode 100644 telnet/patches/020-from_18_to_24.diff
create mode 100644 telnet/patches/022-buffer_overflow_by_HOME.diff
create mode 100644 telnet/patches/024-can_2004-0911.diff
create mode 100644 telnet/patches/026-can_2005_0469.diff
create mode 100644 telnet/patches/030-reject_invalid_port.diff
create mode 100644 telnet/patches/045-avoid_unsetting_term.diff
create mode 100644 telnet/patches/100-format_security_error.diff
create mode 100644 telnet/patches/110-markup_errors.diff
create mode 100644 telnet/patches/120-some_protocol_refinement.diff
create mode 100644 telnet/patches/124-support_uservar.diff
create mode 100644 telnet/patches/130-drain_input_from_child.diff
create mode 100644 telnet/patches/140-telnetlogin_name_check.diff
create mode 100644 telnet/patches/142-numeric_hosts.diff
delete mode 100644 telnet/patches/netkit-telnet-0.17-ipv6.diff
delete mode 100644 telnet/patches/netkit-telnet-0.17-nodns.patch
delete mode 100644 telnet/patches/netkit-telnet-0.17-reallynodns.patch
delete mode 100644 telnet/patches/telnet-0.17-8bit.patch
delete mode 100644 telnet/patches/telnet-0.17-CAN-2005-468_469.patch
delete mode 100644 telnet/patches/telnet-0.17-argv.patch
delete mode 100644 telnet/patches/telnet-0.17-cleanup_race.patch
delete mode 100644 telnet/patches/telnet-0.17-conf.patch
delete mode 100644 telnet/patches/telnet-0.17-env.patch
delete mode 100644 telnet/patches/telnet-0.17-errno_test_sys_bsd.patch
delete mode 100644 telnet/patches/telnet-0.17-issue.patch
delete mode 100644 telnet/patches/telnet-0.17-pek.patch0
delete mode 100644 telnet/patches/telnet-0.17-sa-01-49.patch
delete mode 100644 telnet/patches/telnet-client-cvs.patch0
delete mode 100644 telnet/patches/telnet-gethostbyname.patch
delete mode 100644 telnet/patches/telnetd-0.17-pty_read.patch0
delete mode 100644 telnet/patches/telnetd-0.17.patch0
create mode 100644 telnet/patches/use-cmake-as-buildsystem.patch
delete mode 100644 wpa_supplicant/systemd/wpa_supplicant@.service
Difference in files:
diff --git a/ImageMagick/ImageMagick.nm b/ImageMagick/ImageMagick.nm
index a845e619c..3ef144fcd 100644
--- a/ImageMagick/ImageMagick.nm
+++ b/ImageMagick/ImageMagick.nm
@@ -5,7 +5,7 @@
name = ImageMagick
version = 7.1.0
-patchlevel = 56
+patchlevel = 62
release = 1.1
groups = Application/Multimedia
diff --git a/memtest86+/memtest86+.nm b/memtest86+/memtest86+.nm
index 74f45c426..d62137d83 100644
--- a/memtest86+/memtest86+.nm
+++ b/memtest86+/memtest86+.nm
@@ -4,7 +4,7 @@
###############################################################################
name = memtest86+
-version = 6.00
+version = 6.10
release = 1
thisapp = memtest86plus-%{version}
sup_arches = x86_64
@@ -21,7 +21,7 @@ description
Memtest86+.
end
-source_dl = https://github.com/memtest86plus/memtest86plus/archive/refs/tags/%{version}…
+source_dl = https://github.com/memtest86plus/memtest86plus/archive/refs/tags/v%{version…
sources = %{thisapp}.tar.gz
build
diff --git a/network/network.nm b/network/network.nm
index cd7825749..92903b7e4 100644
--- a/network/network.nm
+++ b/network/network.nm
@@ -57,7 +57,6 @@ packages
iw
man
ppp >= 2.4.5-4
- rp-pppoe
strongswan
sqlite
systemd-units
diff --git a/perl-DBI/perl-DBI.nm b/perl-DBI/perl-DBI.nm
index 00e7d52ea..1ab303d00 100644
--- a/perl-DBI/perl-DBI.nm
+++ b/perl-DBI/perl-DBI.nm
@@ -5,7 +5,7 @@
name = perl-DBI
version = 1.643
-release = 1
+release = 1.1
thisapp = DBI-%{version}
groups = Development/Libraries
@@ -46,6 +46,7 @@ build
perl(Tie::Hash)
perl(Test::Simple)
perl(base)
+ perl(blib)
perl(strict)
perl-devel
@@ -69,10 +70,7 @@ end
packages
package %{name}
- filter_requires
- RPC
- Win32
- end
+ filter_requires = (RPC|Win32)
requires
perl(:MODULE_COMPAT_%{perl_version})
diff --git a/ppp/ppp.nm b/ppp/ppp.nm
index 50af895b6..dc57a1b45 100644
--- a/ppp/ppp.nm
+++ b/ppp/ppp.nm
@@ -5,7 +5,7 @@
name = ppp
version = 2.4.9
-release = 3
+release = 3.1
groups = System/Daemons
url = https://ppp.samba.org/
@@ -65,9 +65,9 @@ end
packages
package %{name}
- requires
- /usr/lib/network/helpers/pppd-angel
- end
+ #requires
+ # /usr/lib/network/helpers/pppd-angel
+ #end
script postin
systemctl daemon-reload >/dev/null 2>&1 || :
diff --git a/rp-pppoe/rp-pppoe.nm b/rp-pppoe/rp-pppoe.nm
deleted file mode 100644
index 354c9c09a..000000000
--- a/rp-pppoe/rp-pppoe.nm
+++ /dev/null
@@ -1,90 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = rp-pppoe
-version = 3.12
-release = 1
-
-groups = Networking/Dialin
-url = https://www.roaringpenguin.com/products/pppoe
-license = GPLv2+
-summary = Administration tools for PPPoE connections.
-
-description
- PPPoE (Point-to-Point Protocol over Ethernet) is a protocol used by
- many ADSL Internet Service Providers.
- This package contains a set of tools to build your own PPPoE server.
-end
-
-source_dl = http://www.roaringpenguin.com/files/download/
-
-build
- requires
- autoconf
- automake
- iproute2
- libtool
- ppp-devel
- systemd-units
- end
-
- DIR_APP = %{DIR_APP}/src
- CFLAGS += -D_GNU_SOURCE -fno-strict-aliasing
-
- pppd_version = %(pppd --version 2>&1 | awk '{ print $NF }')
-
- prepare_cmds
- # PLUGIN_DIR defaults to /etc/ppp/plugins, which is not what we want.
- sed -i Makefile.in \
- -e "s@^PLUGIN_DIR=.*@PLUGIN_DIR=%{libdir}/pppd/%{pppd_version}@"
-
- # Always enable kernel mode PPPoE for the server, because we
- # don't ship the userspace component.
- sed -i pppoe-server.c \
- -e "s/UseLinuxKernelModePPPoE = 0/UseLinuxKernelModePPPoE = 1/"
-
- autoconf
- end
-
- # Force support for kernel-mode PPPoE.
- #configure_options += \
- # ac_cv_header_linux_if_pppox_h=yes
-
- install_cmds
- # Remove all the client components because we only support the
- # rp-pppoe plugin that comes with pppd.
- rm -rvf %{BUILDROOT}%{sysconfdir}
- rm -vf %{BUILDROOT}%{sbindir}/pppoe
- rm -vf %{BUILDROOT}%{sbindir}/pppoe-{connect,start,stop,status,setup}
- rm -vf %{BUILDROOT}%{mandir}/man*/pppoe-{connect,start,stop,status,setup}*
- rm -vf %{BUILDROOT}%{mandir}/man*/pppoe.{,conf}*
- rm -rvf %{BUILDROOT}%{libdir}
- end
-end
-
-packages
- package %{name}
- requires
- iproute2
- ppp = %{pppd_version}
- end
-
- script postin
- systemctl daemon-reload >/dev/null 2>&1 || :
- end
-
- script postup
- systemctl daemon-reload >/dev/null 2>&1 || :
- end
-
- script postun
- systemctl daemon-reload >/dev/null 2>&1 || :
- end
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/rp-pppoe/systemd/pppoe-server@.service b/rp-pppoe/systemd/pppoe-server@.service
deleted file mode 100644
index 141bc8a50..000000000
--- a/rp-pppoe/systemd/pppoe-server@.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=PPPoE server daemon on %I
-BindTo=dev-%I.device
-After=dev-%I.device
-
-[Service]
-ExecStart=/usr/lib/network/pppoe-server %I
-ExecStopPost=/usr/lib/network/pppoe-server %I cleanup
-Restart=failure
-UtmpIdentifier=%I
-KillMode=process
diff --git a/screen/screen.nm b/screen/screen.nm
index 1f1ec1676..eb8add2c0 100644
--- a/screen/screen.nm
+++ b/screen/screen.nm
@@ -5,7 +5,7 @@
name = screen
version = 4.9.0
-release = 1
+release = 1.1
groups = Application/System
url = https://www.gnu.org/software/screen
@@ -26,6 +26,7 @@ build
autoconf
automake
libtool
+ libxcrypt-devel
ncurses-devel
pam-devel
end
diff --git a/spectre-meltdown-checker/spectre-meltdown-checker.nm b/spectre-meltdown-checker/spectre-meltdown-checker.nm
index bbea8217c..11cfb1818 100644
--- a/spectre-meltdown-checker/spectre-meltdown-checker.nm
+++ b/spectre-meltdown-checker/spectre-meltdown-checker.nm
@@ -4,7 +4,7 @@
###############################################################################
name = spectre-meltdown-checker
-version = 0.40
+version = 0.45
release = 1
groups = Development/Tools
@@ -17,7 +17,7 @@ description
several "speculative execution" CVEs that were made public in 2018.
end
-source_dl = https://github.com/speed47/spectre-meltdown-checker/archive/%{version}.tar.…
+source_dl = https://github.com/speed47/spectre-meltdown-checker/archive/refs/tags/v%{ve…
build
build
diff --git a/squid/squid.nm b/squid/squid.nm
index ccd96c27c..26cd46f6c 100644
--- a/squid/squid.nm
+++ b/squid/squid.nm
@@ -7,7 +7,7 @@ name = squid
major_ver = 5
minor_ver = 7
version = %{major_ver}.%{minor_ver}
-release = 1
+release = 1.1
groups = Networking/Daemons
url = https://www.squid-cache.org/
@@ -23,7 +23,7 @@ description
DNS lookups, and implements negative caching of failed requests.
end
-source_dl = http://www.squid-cache.org/Versions/v%{ver_major}/
+source_dl = http://www.squid-cache.org/Versions/v%{major_ver}/
build
requires
diff --git a/sssd/sssd.nm b/sssd/sssd.nm
index 140f5c5d3..2a6c8aa19 100644
--- a/sssd/sssd.nm
+++ b/sssd/sssd.nm
@@ -5,7 +5,7 @@
name = sssd
version = 2.8.2
-release = 1
+release = 1.1
groups = System/Tools
url = https://github.com/SSSD/sssd
@@ -29,7 +29,6 @@ build
requires
/usr/bin/nsupdate
c-ares-devel
- cifs-utils-devel >= 6.6
curl-devel
cyrus-sasl-devel
dbus-devel
@@ -44,8 +43,8 @@ build
libdhash-devel >= 0.6.1
libini_config-devel >= 0.6.1
libldb-devel >= 1.6.1
- libnl3-devel
libnfsidmap-devel
+ libnl3-devel
libtalloc-devel
libtdb-devel
libtevent-devel
@@ -79,7 +78,8 @@ build
--disable-config-lib \
--without-secrets \
--without-semanage \
- --without-selinux
+ --without-selinux \
+ --disable-cifs-idmap-plugin
test
make check
diff --git a/tcl/tcl.nm b/tcl/tcl.nm
index d0160cad0..76bc6eea9 100644
--- a/tcl/tcl.nm
+++ b/tcl/tcl.nm
@@ -6,7 +6,7 @@
name = tcl
major_ver = 8.6
version = %{major_ver}.13
-release = 1.1
+release = 1.2
thisapp = tcl%{version}
groups = Development/Languages
@@ -37,11 +37,12 @@ build
LDFLAGS += -lm
prepare_cmds
- # Don't build SQLite3 support
- rm -rf pkgs/sqlite3*
+ # Don't build support for sqlite3.
+ rm -rf %{DIR_SRC}/%{thisapp}/pkgs/sqlite3*
end
configure_options += \
+ --mandir=%{mandir} \
--enable-threads \
--enable-64bit
@@ -54,13 +55,15 @@ build
# for linking with -lib%{name}
ln -svf lib%{name}%{major_ver}.so %{BUILDROOT}%{libdir}/lib%{name}.so
- # paths don't look at /usr/lib for efficiency, so we symlink into tcl8.5 for now
+ # paths don't look at /usr/lib for efficiency, so we symlink into tcl8.6 for now
mkdir -pv %{BUILDROOT}%{libdir}/%{name}%{major_ver}
ln -svf ../%{name}Config.sh %{BUILDROOT}%{libdir}/%{name}%{major_ver}/%{name}Config.sh
- # remove buildroot traces
- #sed -i -e "s|$PWD/unix|%{libdir}|; s|$PWD|%{includedir}/%{name}-private|" %{BUILDROOT}%{libdir}/%{name}Config.sh
- #rm -rf %{BUILDROOT}%{datadir}/%{name}%{major_ver}/ldAix
+ # Install tcl m4 macros for aclocal.
+ install -Dm644 tcl.m4 -t %{BUILDROOT}/usr/share/aclocal
+
+ # Fix permissions.
+ chmod 644 %{BUILDROOT}%{libdir}/libtclstub%{major_ver}.a
end
end
@@ -69,6 +72,12 @@ packages
package %{name}-devel
template DEVEL
+
+ files += \
+ %{libdir}/libtclstub*.a
+
+ files += \
+ !%{libdir}/libtcl%{major_ver}.so
end
package %{name}-debuginfo
diff --git a/telnet/patches/010-full_set_in_18.diff b/telnet/patches/010-full_set_in_18.diff
new file mode 100644
index 000000000..d2d0d5df5
--- /dev/null
+++ b/telnet/patches/010-full_set_in_18.diff
@@ -0,0 +1,2206 @@
+Description: Source patches present in package 0.17-18woody3.
+ Multiple files are touched by this legacy patch. It has been
+ pruned to reproduce source package netkit-telnet_0.17-18.
+ .
+ Implement IPv6 support.
+ .
+ Read `/etc/telnetrc'.
+ .
+ Various buffer length errors.
+ .
+ Fix IAC+SB crashes due to format errors.
+ .
+ The server accepts numerical TOS together with `-S'.
+ .
+ Remote DOS hole, CAN-2004-0911, moved to a separate file.
+ .
+ Buffer overflow, CAN-2005-0469, moved to a separate file.
+
+Comment: Recovered from source netkit-telnet_0.17-18woody3.diff.gz.
+Author: Herbert Xu, Jason Gunthorpe
+Forwarded: no
+Last-Update: 2015-01-26
+
+--- a/telnet/commands.cc
++++ b/telnet/commands.cc
+@@ -86,10 +86,6 @@
+
+ #define HELPINDENT ((int) sizeof ("connect"))
+
+-#ifndef MAXHOSTNAMELEN
+-#define MAXHOSTNAMELEN 64
+-#endif MAXHOSTNAMELEN
+-
+ #if defined(HAS_IPPROTO_IP) && defined(IP_TOS)
+ int tos = -1;
+ #endif /* defined(HAS_IPPROTO_IP) && defined(IP_TOS) */
+@@ -98,7 +94,7 @@
+
+
+ char *hostname;
+-static char _hostname[MAXHOSTNAMELEN];
++static char *_hostname;
+
+ //typedef int (*intrtn_t)(int argc, const char *argv[]);
+
+@@ -161,7 +157,7 @@
+ assert(argc>=1);
+ if (nargs>=0 && argc!=nargs+1) {
+ fprintf(stderr, "Wrong number of arguments for command.\n");
+- fprintf(stderr, "Try %s ? for help\n", argv[0]);
++ fprintf(stderr, "Try ? %s for help\n", argv[0]);
+ return 0; /* is this right? */
+ }
+ if (nargs==-2) {
+@@ -689,9 +685,9 @@
+ "print encryption debugging information" },
+ #endif
+
+- { "skiprc", "don't read ~/.telnetrc file",
++ { "skiprc", "don't read the telnetrc files",
+ NULL, &skiprc,
+- "read ~/.telnetrc file" },
++ "read the telnetrc files" },
+ { "binary",
+ "sending and receiving of binary data",
+ togbinary, NULL,
+@@ -1615,15 +1611,20 @@
+ #endif
+
+ int tn(int argc, const char *argv[]) {
+- register struct hostent *host = 0;
+ struct sockaddr_in sn;
+- struct servent *sp = 0;
+ char *srp = NULL;
+ int srlen;
+-
++ int family = 0;
+ const char *cmd, *volatile user = 0;
+ const char *portp = NULL;
+ char *hostp = NULL;
++ char *resolv_hostp;
++ struct addrinfo hints;
++ struct addrinfo *hostaddr = 0;
++ int res;
++ char name[NI_MAXHOST];
++ char service[NI_MAXSERV];
++ struct addrinfo *tmpaddr;
+
+ /* clear the socket address prior to use */
+ memset(&sn, 0, sizeof(sn));
+@@ -1632,6 +1633,10 @@
+ printf("?Already connected to %s\n", hostname);
+ return 0;
+ }
++ if (_hostname) {
++ delete[] _hostname;
++ _hostname = 0;
++ }
+ if (argc < 2) {
+ (void) strcpy(line, "open ");
+ printf("(to) ");
+@@ -1662,6 +1667,20 @@
+ autologin = 1;
+ continue;
+ }
++ if (strcmp(*argv, "-6") == 0) {
++ --argc; ++argv;
++#ifdef AF_INET6
++ family = AF_INET6;
++#else
++ puts("IPv6 unsupported");
++#endif
++ continue;
++ }
++ if (strcmp(*argv, "-4") == 0) {
++ --argc; ++argv;
++ family = AF_INET;
++ continue;
++ }
+ if (hostp == 0) {
+ /* this leaks memory - FIXME */
+ hostp = strdup(*argv++);
+@@ -1680,6 +1699,8 @@
+ if (hostp == 0)
+ goto usage;
+
++ resolv_hostp = hostp;
++
+ #if defined(IP_OPTIONS) && defined(HAS_IPPROTO_IP)
+ if (hostp[0] == '@' || hostp[0] == '!') {
+ if ((hostname = strrchr(hostp, ':')) == NULL)
+@@ -1696,78 +1717,94 @@
+ } else {
+ sn.sin_addr.s_addr = temp;
+ sn.sin_family = AF_INET;
++ /*
++ * For source route we just make sure to get the IP given
++ * on the command line when looking up the port.
++ */
++ resolv_hostp = inet_ntoa(sn.sin_addr);
+ }
+ }
+- else {
+-#endif
+- if (inet_aton(hostp, &sn.sin_addr)) {
+- sn.sin_family = AF_INET;
+- strcpy(_hostname, hostp);
+- hostname = _hostname;
+- }
+- else {
+- host = gethostbyname(hostp);
+- if (host) {
+- sn.sin_family = host->h_addrtype;
+- if (host->h_length > (int)sizeof(sn.sin_addr)) {
+- host->h_length = sizeof(sn.sin_addr);
+- }
+-#if defined(h_addr) /* In 4.3, this is a #define */
+- memcpy((caddr_t)&sn.sin_addr,
+- host->h_addr_list[0], host->h_length);
+-#else /* defined(h_addr) */
+- memcpy((caddr_t)&sn.sin_addr, host->h_addr, host->h_length);
+-#endif /* defined(h_addr) */
+- strncpy(_hostname, host->h_name, sizeof(_hostname));
+- _hostname[sizeof(_hostname)-1] = '\0';
+- hostname = _hostname;
+- } else {
+- herror(hostp);
+- return 0;
+- }
+- }
+-#if defined(IP_OPTIONS) && defined(HAS_IPPROTO_IP)
+- }
+ #endif
++
++ /* User port or the default name of telnet. */
+ if (portp) {
+ if (*portp == '-') {
+ portp++;
+ telnetport = 1;
+ } else
+ telnetport = 0;
+- sn.sin_port = atoi(portp);
+- if (sn.sin_port == 0) {
+- sp = getservbyname(portp, "tcp");
+- if (sp)
+- sn.sin_port = sp->s_port;
+- else {
+- printf("%s: bad port number\n", portp);
+- return 0;
+- }
+- }
+- else {
+- sn.sin_port = htons(sn.sin_port);
+- }
+- }
++ }
+ else {
+- if (sp == 0) {
+- sp = getservbyname("telnet", "tcp");
+- if (sp == 0) {
+- fprintf(stderr, "telnet: tcp/telnet: unknown service\n");
+- return 0;
+- }
+- sn.sin_port = sp->s_port;
+- }
++ portp = "telnet";
+ telnetport = 1;
+ }
+- printf("Trying %s...\n", inet_ntoa(sn.sin_addr));
++
++ /* We only understand SOCK_STREAM sockets. */
++ memset(&hints, 0, sizeof(hints));
++ hints.ai_socktype = SOCK_STREAM;
++ hints.ai_flags = AI_NUMERICHOST;
++ hints.ai_family = family;
++
++ /* Resolve both the host and service simultaneously. */
++ res = getaddrinfo(resolv_hostp, portp, &hints, &hostaddr);
++ if (res == EAI_NONAME) {
++ hints.ai_flags = AI_CANONNAME;
++ res = getaddrinfo(resolv_hostp, portp, &hints, &hostaddr);
++ } else if (hostaddr) {
++ hostaddr->ai_canonname = 0;
++ }
++ if (res || !hostaddr) {
++ fprintf(stderr, "telnet: could not resolve %s/%s: %s\n", resolv_hostp, portp, gai_strerror(res));
++ return 0;
++ }
++
++ /* Try to connect to every listed round robin IP. */
++ tmpaddr = hostaddr;
++ errno = 0;
+ do {
+- int x = nlink.connect(debug, host, &sn, srp, srlen, tos);
+- if (!x) return 0;
+- else if (x==1) continue;
++ int x;
++
++ if (!tmpaddr) {
++ if (errno)
++ perror("telnet: Unable to connect to remote host");
++ else
++ fputs("telnet: Unable to connect to remote host: "
++ "Bad port number\n", stderr);
++err:
++ freeaddrinfo(hostaddr);
++ return 0;
++ }
++
++ if (tmpaddr->ai_family == AF_UNIX) {
++nextaddr:
++ tmpaddr = tmpaddr->ai_next;
++ continue;
++ }
++
++ getnameinfo(tmpaddr->ai_addr, tmpaddr->ai_addrlen,
++ name, sizeof(name), service, sizeof(service),
++ NI_NUMERICHOST | NI_NUMERICSERV);
++
++ printf("Trying %s...\n", name);
++ x = nlink.connect(debug, tmpaddr, srp, srlen, tos);
++ if (!x)
++ goto err;
++ else if (x==1)
++ goto nextaddr;
++
+ connected++;
+ } while (connected == 0);
++ if (tmpaddr->ai_canonname == 0) {
++ hostname = new char[strlen(hostp)+1];
++ strcpy(hostname, hostp);
++ }
++ else {
++ hostname = new char[strlen(tmpaddr->ai_canonname)+1];
++ strcpy(hostname, tmpaddr->ai_canonname);
++ }
++
+ cmdrc(hostp, hostname);
++ freeaddrinfo(hostaddr);
+ if (autologin && user == NULL) {
+ struct passwd *pw;
+
+@@ -2013,31 +2050,16 @@
+ return 0;
+ }
+
+-static char *rcname = 0;
+-static char rcbuf[128];
+-
+-void cmdrc(const char *m1, const char *m2) {
++static void readrc(const char *m1, const char *m2, const char *rcname) {
+ FILE *rcfile;
+ int gotmachine = 0;
+ int l1 = strlen(m1);
+ int l2 = strlen(m2);
+- char m1save[64];
+-
+- if (skiprc) return;
++ char m1save[strlen(m1) + 1];
+
+ strcpy(m1save, m1);
+ m1 = m1save;
+
+- if (rcname == 0) {
+- rcname = getenv("HOME");
+- if (rcname)
+- strcpy(rcbuf, rcname);
+- else
+- rcbuf[0] = '\0';
+- strcat(rcbuf, "/.telnetrc");
+- rcname = rcbuf;
+- }
+-
+ rcfile = fopen(rcname, "r");
+ if (!rcfile) return;
+
+@@ -2073,6 +2095,25 @@
+ fclose(rcfile);
+ }
+
++void cmdrc(const char *m1, const char *m2) {
++ static char *rcname = 0;
++ static char rcbuf[128];
++
++ if (skiprc) return;
++
++ readrc(m1, m2, "/etc/telnetrc");
++ if (rcname == 0) {
++ rcname = getenv("HOME");
++ if (rcname)
++ strcpy(rcbuf, rcname);
++ else
++ rcbuf[0] = '\0';
++ strcat(rcbuf, "/.telnetrc");
++ rcname = rcbuf;
++ }
++ readrc(m1, m2, rcname);
++}
++
+ #if defined(IP_OPTIONS) && defined(HAS_IPPROTO_IP)
+
+ /*
+--- a/telnet/main.cc
++++ b/telnet/main.cc
+@@ -45,7 +45,10 @@
+
+ #include <sys/types.h>
+ #include <getopt.h>
++#include <stdlib.h>
+ #include <string.h>
++#include <netdb.h>
++#include <errno.h>
+
+ #include "ring.h"
+ #include "externs.h"
+@@ -80,12 +83,13 @@
+ void usage(void) {
+ fprintf(stderr, "Usage: %s %s%s%s%s\n",
+ prompt,
+- " [-8] [-E] [-L] [-a] [-d] [-e char] [-l user] [-n tracefile]",
+- "\n\t",
++ "[-4] [-6] [-8] [-E] [-L] [-a] [-d] [-e char] [-l user]",
++ "\n\t[-n tracefile]",
+ #ifdef TN3270
++ "\n\t"
+ "[-noasynch] [-noasynctty] [-noasyncnet] [-r] [-t transcom]\n\t",
+ #else
+- "[-r] ",
++ " [-r] ",
+ #endif
+ "[host-name [port]]"
+ );
+@@ -103,6 +107,7 @@
+ extern int optind;
+ int ch;
+ char *user;
++ int family;
+
+ tninit(); /* Clear out things */
+ #if defined(CRAY) && !defined(__STDC__)
+@@ -117,12 +122,23 @@
+ prompt = argv[0];
+
+ user = NULL;
++ family = 0;
+
+ rlogin = (strncmp(prompt, "rlog", 4) == 0) ? '~' : _POSIX_VDISABLE;
+ autologin = -1;
+
+- while ((ch = getopt(argc, argv, "8EKLS:X:ade:k:l:n:rt:x")) != EOF) {
++ while ((ch = getopt(argc, argv, "468EKLS:X:ade:k:l:n:rt:x")) != EOF) {
+ switch(ch) {
++ case '4':
++ family = AF_INET;
++ break;
++ case '6':
++#ifdef AF_INET6
++ family = AF_INET6;
++#else
++ fputs("IPv6 unsupported\n", stderr);
++#endif
++ break;
+ case '8':
+ eight = 3; /* binary output and input */
+ break;
+@@ -137,19 +153,22 @@
+ break;
+ case 'S':
+ {
+-#ifdef HAS_GETTOS
+ extern int tos;
++ int num;
+
+- if ((tos = parsetos(optarg, "tcp")) < 0)
++#ifdef HAS_GETTOS
++ if ((num = parsetos(optarg, "tcp")) < 0) {
++#else
++ errno = 0;
++ num = strtol(optarg, 0, 0);
++ if (errno) {
++#endif
+ fprintf(stderr, "%s%s%s%s\n",
+ prompt, ": Bad TOS argument '",
+ optarg,
+ "; will try to use default TOS");
+-#else
+- fprintf(stderr,
+- "%s: Warning: -S ignored, no parsetos() support.\n",
+- prompt);
+-#endif
++ } else
++ tos = num;
+ }
+ break;
+ case 'X':
+@@ -233,6 +252,9 @@
+ *argp++ = "-l";
+ *argp++ = user;
+ }
++ if (family) {
++ *argp++ = family == AF_INET ? "-4" : "-6";
++ }
+ *argp++ = argv[0]; /* host */
+ if (argc > 1)
+ *argp++ = argv[1]; /* port */
+--- a/telnet/netlink.cc
++++ b/telnet/netlink.cc
+@@ -81,20 +81,23 @@
+ ::close(net);
+ }
+
+-int netlink::connect(int debug, struct hostent *host,
+- struct sockaddr_in *sn,
++int netlink::connect(int debug, struct addrinfo *addr,
+ char *srcroute, int srlen, int tos)
+ {
+ int on=1;
+
+- net = socket(AF_INET, SOCK_STREAM, 0);
++ net = socket(addr->ai_family, SOCK_STREAM, 0);
+ if (net < 0) {
++ if (errno == EAFNOSUPPORT)
++ return 1;
+ perror("telnet: socket");
+ return 0;
+ }
+
+ #if defined(IP_OPTIONS) && defined(HAS_IPPROTO_IP)
+ if (srcroute) {
++ if (addr->ai_family != AF_INET)
++ fputs("Source route is only supported for IPv4\n", stderr);
+ if (setsockopt(net, IPPROTO_IP, IP_OPTIONS, srcroute, srlen) < 0)
+ perror("setsockopt (IP_OPTIONS)");
+ }
+@@ -108,7 +111,7 @@
+ #endif
+ if (tos < 0) tos = 020; /* Low Delay bit */
+ if (tos && (setsockopt(net, IPPROTO_IP, IP_TOS, &tos, sizeof(int)) < 0)
+- && (errno != ENOPROTOOPT))
++ && (errno != ENOPROTOOPT) && (errno != EOPNOTSUPP))
+ perror("telnet: setsockopt (IP_TOS) (ignored)");
+ #endif /* defined(IPPROTO_IP) && defined(IP_TOS) */
+
+@@ -116,27 +119,8 @@
+ perror("setsockopt (SO_DEBUG)");
+ }
+
+- if (::connect(net, (struct sockaddr *)sn, sizeof(*sn)) < 0) {
+-#if defined(h_addr) /* In 4.3, this is a #define */
+- if (host && host->h_addr_list[1]) {
+- int oerrno = errno;
+-
+- fprintf(stderr, "telnet: connect to address %s: ",
+- inet_ntoa(sn->sin_addr));
+- errno = oerrno;
+- perror(NULL);
+- host->h_addr_list++;
+- if (host->h_length > (int)sizeof(sn->sin_addr)) {
+- host->h_length = sizeof(sn->sin_addr);
+- }
+- memcpy(&sn->sin_addr, host->h_addr_list[0], host->h_length);
+- close(net);
+- return 1;
+- }
+-#endif /* defined(h_addr) */
+-
+- perror("telnet: Unable to connect to remote host");
+- return 0;
++ if (::connect(net, addr->ai_addr, addr->ai_addrlen) < 0) {
++ return 1;
+ }
+ return 2;
+ }
+--- a/telnet/netlink.h
++++ b/telnet/netlink.h
+@@ -6,8 +6,7 @@
+ netlink();
+ ~netlink();
+
+- int connect(int debug, struct hostent *host,
+- struct sockaddr_in *sin,
++ int connect(int debug, struct addrinfo *hostaddr,
+ char *srcroute, int srlen,
+ int tos);
+ void close(int doshutdown);
+--- a/telnet/network.cc
++++ b/telnet/network.cc
+@@ -40,6 +40,7 @@
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/time.h>
++#include <stdlib.h>
+ #include <errno.h>
+ #include <arpa/telnet.h>
+
+--- a/telnet/ring.cc
++++ b/telnet/ring.cc
+@@ -165,7 +165,7 @@
+
+ /////////////////////////////////////////////////// supply //////////////
+
+-void ringbuf::printf(const char *format, ...) {
++void ringbuf::xprintf(const char *format, ...) {
+ char xbuf[256];
+ va_list ap;
+ va_start(ap, format);
+--- a/telnet/ring.h
++++ b/telnet/ring.h
+@@ -83,7 +83,7 @@
+ // manual supply
+ void putch(char c) { write(&c, 1); }
+ void write(const char *buffer, int ct);
+- void printf(const char *format, ...);
++ void xprintf(const char *format, ...);
+ int empty_count() { return size - count; }
+
+ // automatic supply
+--- a/telnet/sys_bsd.cc
++++ b/telnet/sys_bsd.cc
+@@ -189,18 +189,25 @@
+ * Various signal handling routines.
+ */
+
++#if 0
+ static void deadpeer(int /*sig*/) {
+ setcommandmode();
+ siglongjmp(peerdied, -1);
+ }
++#endif
+
+ static void intr(int /*sig*/) {
+ if (localchars) {
+ intp();
+ }
+ else {
++#if 0
+ setcommandmode();
+ siglongjmp(toplevel, -1);
++#else
++ signal(SIGINT, SIG_DFL);
++ raise(SIGINT);
++#endif
+ }
+ }
+
+@@ -214,6 +221,8 @@
+ sendabort();
+ return;
+ }
++ signal(SIGQUIT, SIG_DFL);
++ raise(SIGQUIT);
+ }
+
+ #ifdef SIGWINCH
+@@ -238,7 +247,9 @@
+ void sys_telnet_init(void) {
+ signal(SIGINT, intr);
+ signal(SIGQUIT, intr2);
++#if 0
+ signal(SIGPIPE, deadpeer);
++#endif
+ #ifdef SIGWINCH
+ signal(SIGWINCH, sendwin);
+ #endif
+--- a/telnet/telnet.1
++++ b/telnet/telnet.1
+@@ -42,7 +42,7 @@
+ protocol
+ .Sh SYNOPSIS
+ .Nm telnet
+-.Op Fl 8ELadr
++.Op Fl 468ELadr
+ .Op Fl S Ar tos
+ .Op Fl e Ar escapechar
+ .Op Fl l Ar user
+@@ -68,6 +68,10 @@
+ .Pp
+ Options:
+ .Bl -tag -width indent
++.It Fl 4
++Force IPv4 address resolution.
++.It Fl 6
++Force IPv6 address resolution.
+ .It Fl 8
+ Request 8-bit operation. This causes an attempt to negotiate the
+ .Dv TELNET BINARY
+@@ -474,17 +478,21 @@
+ placing a dash before the port number.
+ .Pp
+ After establishing a connection, any commands associated with the
+-remote host in the user's
++remote host in
++.Pa /etc/telnetrc
++and the user's
+ .Pa .telnetrc
+-file are executed.
++file are executed, in that order.
+ .Pp
+-The format of the .telnetrc file is as follows: Lines beginning with a
++The format of the telnetrc files is as follows: Lines beginning with a
+ #, and blank lines, are ignored. The rest of the file should consist
+ of hostnames and sequences of
+ .Nm telnet
+ commands to use with that host. Commands should be one per line,
+ indented by whitespace; lines beginning without whitespace are
+-interpreted as hostnames. Upon connecting to a particular host, the
++interpreted as hostnames. Lines beginning with the special hostname
++.Ql DEFAULT
++will apply to all hosts. Upon connecting to a particular host, the
+ commands associated with that host are executed.
+ .It Ic quit
+ Close any open session and exit
+@@ -1184,9 +1192,7 @@
+ When the skiprc toggle is
+ .Dv TRUE ,
+ .Tn telnet
+-does not read the
+-.Pa \&.telnetrc
+-file. The initial value for this toggle is
++does not read the telnetrc files. The initial value for this toggle is
+ .Dv FALSE.
+ .It Ic termdata
+ Toggles the display of all terminal data (in hexadecimal format).
+@@ -1239,7 +1245,9 @@
+ .Dv TELNET ENVIRON
+ option.
+ .Sh FILES
+-.Bl -tag -width ~/.telnetrc -compact
++.Bl -tag -width /etc/telnetrc -compact
++.It Pa /etc/telnetrc
++global telnet startup values
+ .It Pa ~/.telnetrc
+ user customized telnet startup values
+ .El
+--- a/telnet/telnet.cc
++++ b/telnet/telnet.cc
+@@ -646,7 +646,7 @@
+ mklist(termbuf, tname, termtypes);
+ next = 0;
+ }
+- if (next==termtypes.num()) next = 0;
++ if (next==termtypes.num()-1) next = 0;
+ return termtypes[next++];
+ }
+ /*
+@@ -681,7 +681,7 @@
+ }
+ #endif /* TN3270 */
+ name = gettermname();
+- netoring.printf("%c%c%c%c%s%c%c", IAC, SB, TELOPT_TTYPE,
++ netoring.xprintf("%c%c%c%c%s%c%c", IAC, SB, TELOPT_TTYPE,
+ TELQUAL_IS, name, IAC, SE);
+ }
+ break;
+@@ -693,7 +693,7 @@
+ if (SB_GET() == TELQUAL_SEND) {
+ long oospeed, iispeed;
+ TerminalSpeeds(&iispeed, &oospeed);
+- netoring.printf("%c%c%c%c%ld,%ld%c%c", IAC, SB, TELOPT_TSPEED,
++ netoring.xprintf("%c%c%c%c%ld,%ld%c%c", IAC, SB, TELOPT_TSPEED,
+ TELQUAL_IS, oospeed, iispeed, IAC, SE);
+ }
+ break;
+@@ -780,7 +780,7 @@
+ send_wont(TELOPT_XDISPLOC, 1);
+ break;
+ }
+- netoring.printf("%c%c%c%c%s%c%c", IAC, SB, TELOPT_XDISPLOC,
++ netoring.xprintf("%c%c%c%c%s%c%c", IAC, SB, TELOPT_XDISPLOC,
+ TELQUAL_IS, dp, IAC, SE);
+ }
+ break;
+@@ -798,7 +798,7 @@
+ return;
+ }
+
+- netoring.printf("%c%c%c%c%c%c%c", IAC, SB, TELOPT_LINEMODE,
++ netoring.xprintf("%c%c%c%c%c%c%c", IAC, SB, TELOPT_LINEMODE,
+ DONT, cmd[0], IAC, SE);
+ }
+
+@@ -815,7 +815,7 @@
+ /*@*/ printf("lm_do: no command!!!\n"); /* Should not happen... */
+ return;
+ }
+- netoring.printf("%c%c%c%c%c%c%c", IAC, SB, TELOPT_LINEMODE,
++ netoring.xprintf("%c%c%c%c%c%c%c", IAC, SB, TELOPT_LINEMODE,
+ WONT, cmd[0], IAC, SE);
+ }
+
+@@ -838,7 +838,7 @@
+ k |= MODE_ACK;
+ }
+
+- netoring.printf("%c%c%c%c%c%c%c", IAC, SB, TELOPT_LINEMODE, LM_MODE,
++ netoring.xprintf("%c%c%c%c%c%c%c", IAC, SB, TELOPT_LINEMODE, LM_MODE,
+ k, IAC, SE);
+
+ setconnmode(0); /* set changed mode */
+@@ -933,11 +933,11 @@
+
+ void slc_import(int def) {
+ if (def) {
+- netoring.printf("%c%c%c%c%c%c%c%c%c", IAC, SB, TELOPT_LINEMODE,
++ netoring.xprintf("%c%c%c%c%c%c%c%c%c", IAC, SB, TELOPT_LINEMODE,
+ LM_SLC, 0, SLC_DEFAULT, 0, IAC, SE);
+ }
+ else {
+- netoring.printf("%c%c%c%c%c%c%c%c%c", IAC, SB, TELOPT_LINEMODE,
++ netoring.xprintf("%c%c%c%c%c%c%c%c%c", IAC, SB, TELOPT_LINEMODE,
+ LM_SLC, 0, SLC_VARIABLE, 0, IAC, SE);
+ }
+ }
+@@ -1142,6 +1142,7 @@
+ }
+ }
+
++/* OPT_REPLY_SIZE must be a multiple of 2. */
+ #define OPT_REPLY_SIZE 256
+ unsigned char *opt_reply;
+ unsigned char *opt_replyp;
+@@ -1173,6 +1174,7 @@
+
+ void env_opt_add(const char *ep) {
+ const char *vp;
++ const unsigned char *tp;
+ unsigned char c;
+
+ if (opt_reply == NULL) /*XXX*/
+@@ -1185,11 +1187,12 @@
+ return;
+ }
+ vp = env_getvalue(ep, 1);
+- if (opt_replyp + (vp ? strlen(vp) : 0) + strlen(ep) + 6 > opt_replyend)
++ tp = opt_replyp + (vp ? strlen(vp) * 2 : 0) + strlen(ep) * 2 + 6;
++ if (tp > opt_replyend)
+ {
+ register int len;
+- opt_replyend += OPT_REPLY_SIZE;
+- len = opt_replyend - opt_reply;
++ len = ((tp - opt_reply) + OPT_REPLY_SIZE - 1) & ~(OPT_REPLY_SIZE - 1);
++ opt_replyend = opt_reply + len;
+ opt_reply = (unsigned char *)realloc(opt_reply, len);
+ if (opt_reply == NULL) {
+ /*@*/ printf("env_opt_add: realloc() failed!!!\n");
+--- a/telnet/terminal.cc
++++ b/telnet/terminal.cc
+@@ -45,6 +45,8 @@
+ #include <signal.h>
+ #include <errno.h>
+ #include <stdio.h>
++#include <string.h>
++#include <stdlib.h>
+
+ #include "ring.h"
+ #include "defines.h"
+--- a/telnet/utilities.cc
++++ b/telnet/utilities.cc
+@@ -47,6 +47,8 @@
+ #include <sys/socket.h>
+ #include <unistd.h>
+ #include <ctype.h>
++#include <string.h>
++#include <stdlib.h>
+
+ #include "ring.h"
+ #include "defines.h"
+--- a/telnetd/authenc.c
++++ b/telnetd/authenc.c
+@@ -42,18 +42,6 @@
+ return(0);
+ }
+
+-void
+-net_encrypt()
+-{
+-#if defined(ENCRYPT)
+- char *s = (nclearto > nbackp) ? nclearto : nbackp;
+- if (s < nfrontp && encrypt_output) {
+- (*encrypt_output)((unsigned char *)s, nfrontp - s);
+- }
+- nclearto = nfrontp;
+-#endif
+-}
+-
+ int
+ telnet_spin()
+ {
+--- a/telnetd/defs.h
++++ b/telnetd/defs.h
+@@ -55,10 +55,11 @@
+ #include <fcntl.h>
+ #include <sys/file.h>
+ #include <sys/stat.h>
+-#include <sys/time.h>
++#include <time.h>
+ #include <sys/ioctl.h>
+ #include <netinet/in.h>
+ #include <arpa/telnet.h>
++#include <sys/uio.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <signal.h>
+--- a/telnetd/ext.h
++++ b/telnetd/ext.h
+@@ -81,12 +81,11 @@
+ */
+ extern char ptyobuf[BUFSIZ+NETSLOP], *pfrontp, *pbackp;
+ extern char netibuf[BUFSIZ], *netip;
+-extern char netobuf[BUFSIZ+NETSLOP], *nfrontp, *nbackp;
+-extern char *neturg; /* one past last byte of urgent data */
+ extern int pcc, ncc;
++extern FILE *netfile;
+
+ /* printf into netobuf */
+-void netoprintf(const char *fmt, ...) __attribute((format (printf, 1, 2)));
++#define netoprintf(fmt, ...) fprintf(netfile, fmt, ## __VA_ARGS__)
+
+ extern int pty, net;
+ extern char *line;
+@@ -96,7 +95,7 @@
+ void add_slc(int, int, int);
+ void check_slc(void);
+ void change_slc(int, int, int);
+-void cleanup(int);
++void cleanup(int) __attribute__ ((noreturn));
+ void clientstat(int, int, int);
+ void copy_termbuf(char *, int);
+ void deferslc(void);
+@@ -106,8 +105,8 @@
+ void dooption(int);
+ void dontoption(int);
+ void edithost(const char *, const char *);
+-void fatal(int, const char *);
+-void fatalperror(int, const char *);
++void fatal(int, const char *) __attribute__ ((noreturn));
++void fatalperror(int, const char *) __attribute__ ((noreturn));
+ void get_slc_defaults(void);
+ void init_env(void);
+ void init_termbuf(void);
+@@ -115,6 +114,8 @@
+ void localstat(void);
+ void netclear(void);
+ void netflush(void);
++size_t netbuflen(int);
++void sendurg(const char *, size_t);
+
+ #ifdef DIAGNOSTICS
+ void printoption(const char *, int);
+@@ -182,10 +183,11 @@
+ void tty_tspeed(int);
+ void willoption(int);
+ void wontoption(int);
+-void writenet(unsigned char *, int);
++#define writenet(b, l) fwrite(b, 1, l, netfile)
++void netopen(void);
+
+ #if defined(ENCRYPT)
+-extern void (*encrypt_output)(unsigned char *, int);
++extern void (*encrypt_output)(const unsigned char *, int);
+ extern int (*decrypt_input)(int);
+ extern char *nclearto;
+ #endif
+--- a/telnetd/global.c
++++ b/telnetd/global.c
+@@ -87,11 +87,10 @@
+
+ char netibuf[BUFSIZ], *netip;
+
+-char netobuf[BUFSIZ+NETSLOP], *nfrontp, *nbackp;
+-char *neturg; /* one past last bye of urgent data */
+-
+ int pcc, ncc;
+
++FILE *netfile;
++
+ int pty, net;
+ int SYNCHing; /* we are in TELNET SYNCH mode */
+
+--- a/telnetd/issue.net.5
++++ b/telnetd/issue.net.5
+@@ -40,4 +40,4 @@
+ .Sh FILES
+ .Pa /etc/issue.net
+ .Sh "SEE ALSO"
+-.Xr telnetd 8
++.Xr in.telnetd 8
+--- a/telnetd/setproctitle.c
++++ b/telnetd/setproctitle.c
+@@ -139,7 +139,7 @@
+ (void) strcpy(Argv[0], buf);
+ p = &Argv[0][i];
+ while (p < LastArgv)
+- *p++ = ' ';
++ *p++ = '\0';
+ Argv[1] = NULL;
+ }
+
+--- a/telnetd/state.c
++++ b/telnetd/state.c
+@@ -179,6 +179,7 @@
+ */
+ case AO:
+ {
++ static const char msg[] = { IAC, DM };
+ DIAG(TD_OPTIONS, printoption("td: recv IAC", c));
+ ptyflush(); /* half-hearted */
+ init_termbuf();
+@@ -191,9 +192,7 @@
+ }
+
+ netclear(); /* clear buffer back */
+- *nfrontp++ = (char)IAC;
+- *nfrontp++ = (char)DM;
+- neturg = nfrontp-1; /* off by one XXX */
++ sendurg(msg, sizeof(msg));
+ DIAG(TD_OPTIONS, printoption("td: send IAC", DM));
+ break;
+ }
+--- a/telnetd/sys_term.c
++++ b/telnetd/sys_term.c
+@@ -41,8 +41,6 @@
+
+ #include "telnetd.h"
+ #include "pathnames.h"
+-#include "logout.h"
+-#include "logwtmp.h"
+
+ #if defined(__GLIBC__) && (__GLIBC__ >= 2)
+ /* mmm, nonstandard */
+@@ -681,7 +679,9 @@
+ memcpy(&argvfoo, &avs.argv, sizeof(argvfoo));
+ execv(loginprg, argvfoo);
+
++ openlog("telnetd", LOG_PID | LOG_ODELAY, LOG_DAEMON);
+ syslog(LOG_ERR, "%s: %m\n", loginprg);
++ closelog();
+ fatalperror(net, loginprg);
+ }
+
+--- a/telnetd/telnetd.8
++++ b/telnetd/telnetd.8
+@@ -161,7 +161,7 @@
+ .It Fl L Ar loginprg
+ This option may be used to specify a different login program.
+ By default,
+-.Pa /bin/login
++.Pa /usr/sbin/telnetlogin
+ is used.
+ .It Fl n
+ Disable
+@@ -406,6 +406,7 @@
+ indicates a willingness to decrypt
+ the data stream.
+ .Xr issue.net 5 ) .
++.El
+ .Sh FILES
+ .Pa /etc/services ,
+ .Pa /etc/issue.net
+@@ -458,6 +459,7 @@
+ Telnet Environment Option Interoperability Issues
+ .It Cm RFC-1572
+ Telnet Environment Option
++.El
+ .Sh BUGS
+ Some
+ .Tn TELNET
+--- a/telnetd/telnetd.c
++++ b/telnetd/telnetd.c
+@@ -43,12 +43,16 @@
+
+ #include "../version.h"
+
++#include <sys/socket.h>
+ #include <netdb.h>
+ #include <termcap.h>
+ #include <netinet/in.h>
+ /* #include <netinet/ip.h> */ /* Don't think this is used at all here */
+ #include <arpa/inet.h>
+ #include <assert.h>
++#include <poll.h>
++#include <fcntl.h>
++#include <unistd.h>
+ #include "telnetd.h"
+ #include "pathnames.h"
+ #include "setproctitle.h"
+@@ -68,7 +72,7 @@
+ #define HAS_IPPROTO_IP
+ #endif
+
+-static void doit(struct sockaddr_in *who);
++static void doit(struct sockaddr *who, socklen_t who_len);
+ static int terminaltypeok(const char *s);
+
+ /*
+@@ -82,15 +86,119 @@
+
+ int debug = 0;
+ int keepalive = 1;
++#ifdef LOGIN_WRAPPER
++char *loginprg = LOGIN_WRAPPER;
++#else
+ char *loginprg = _PATH_LOGIN;
+-char *progname;
++#endif
+
+ extern void usage(void);
+
++static void
++wait_for_connection(const char *service)
++{
++ struct addrinfo hints;
++ struct addrinfo *res, *addr;
++ struct pollfd *fds, *fdp;
++ int nfds;
++ int i;
++ int error;
++ int on = 1;
++
++ memset(&hints, 0, sizeof(hints));
++ hints.ai_family = PF_UNSPEC;
++ hints.ai_flags = AI_PASSIVE;
++ hints.ai_socktype = SOCK_STREAM;
++ error = getaddrinfo(NULL, service, &hints, &res);
++ if (error) {
++ char *p;
++ error = asprintf(&p, "getaddrinfo: %s\n", gai_strerror(error));
++ fatal(2, error >= 0 ? p : "");
++ }
++
++ for (addr = res, nfds = 0; addr; addr = addr->ai_next, nfds++)
++ ;
++ fds = malloc(sizeof(struct pollfd) * nfds);
++ for (addr = res, fdp = fds; addr; addr = addr->ai_next, fdp++) {
++ int s;
++
++ if (addr->ai_family == AF_LOCAL) {
++nextaddr:
++ fdp--;
++ nfds--;
++ continue;
++ }
++
++ s = socket(addr->ai_family, SOCK_STREAM, 0);
++ if (s < 0) {
++ if (errno == EAFNOSUPPORT || errno == EINVAL) {
++ goto nextaddr;
++ }
++ fatalperror(2, "socket");
++ }
++ if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on))) {
++ fatalperror(2, "setsockopt");
++ }
++ if (bind(s, addr->ai_addr, addr->ai_addrlen)) {
++#ifdef linux
++ if (fdp != fds && errno == EADDRINUSE) {
++ close(s);
++ goto nextaddr;
++ }
++#endif
++ fatalperror(2, "bind");
++ }
++ if (listen(s, 1)) {
++ fatalperror(2, "listen");
++ }
++ if (fcntl(s, F_SETFL, O_NONBLOCK)) {
++ fatalperror(2, "fcntl");
++ }
++
++ fdp->fd = s;
++ fdp->events = POLLIN;
++ }
++
++ freeaddrinfo(res);
++
++ while (1) {
++ if (poll(fds, nfds, -1) < 0) {
++ if (errno == EINTR) {
++ continue;
++ }
++ fatalperror(2, "poll");
++ }
++
++ for (i = 0, fdp = fds; i < nfds; i++, fdp++) {
++ int fd;
++
++ if (!(fdp->revents & POLLIN)) {
++ continue;
++ }
++
++ fd = accept(fdp->fd, 0, 0);
++ if (fd >= 0) {
++ dup2(fd, 0);
++ close(fd);
++ goto out;
++ }
++ if (errno != EAGAIN) {
++ fatalperror(2, "accept");
++ }
++ }
++ }
++
++out:
++ for (i = 0, fdp = fds; i < nfds; i++, fdp++) {
++ close(fdp->fd);
++ }
++ free(fds);
++}
++
+ int
+ main(int argc, char *argv[], char *env[])
+ {
+- struct sockaddr_in from;
++ struct sockaddr_storage from;
+ int on = 1;
+ socklen_t fromlen;
+ register int ch;
+@@ -103,12 +211,6 @@
+
+ pfrontp = pbackp = ptyobuf;
+ netip = netibuf;
+- nfrontp = nbackp = netobuf;
+-#if defined(ENCRYPT)
+- nclearto = 0;
+-#endif
+-
+- progname = *argv;
+
+ while ((ch = getopt(argc, argv, "d:a:e:lhnr:I:D:B:sS:a:X:L:")) != EOF) {
+ switch(ch) {
+@@ -249,74 +351,18 @@
+ argv += optind;
+
+ if (debug) {
+- int s, ns;
+- socklen_t foo;
+- struct servent *sp;
+- struct sockaddr_in sn;
+-
+- memset(&sn, 0, sizeof(sn));
+- sn.sin_family = AF_INET;
+-
+- if (argc > 1) {
+- usage();
+- /* NOTREACHED */
+- } else if (argc == 1) {
+- if ((sp = getservbyname(*argv, "tcp"))!=NULL) {
+- sn.sin_port = sp->s_port;
+- }
+- else {
+- int pt = atoi(*argv);
+- if (pt <= 0) {
+- fprintf(stderr, "telnetd: %s: bad port number\n",
+- *argv);
+- usage();
+- /* NOTREACHED */
+- }
+- sn.sin_port = htons(pt);
+- }
+- } else {
+- sp = getservbyname("telnet", "tcp");
+- if (sp == 0) {
+- fprintf(stderr, "telnetd: tcp/telnet: unknown service\n");
+- exit(1);
++ if (argc > 1) {
++ usage();
++ /* NOTREACHED */
+ }
+- sn.sin_port = sp->s_port;
+- }
+
+- s = socket(AF_INET, SOCK_STREAM, 0);
+- if (s < 0) {
+- perror("telnetd: socket");;
+- exit(1);
+- }
+- (void) setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
+- if (bind(s, (struct sockaddr *)&sn, sizeof(sn)) < 0) {
+- perror("bind");
+- exit(1);
+- }
+- if (listen(s, 1) < 0) {
+- perror("listen");
+- exit(1);
+- }
+- foo = sizeof(sn);
+- ns = accept(s, (struct sockaddr *)&sn, &foo);
+- if (ns < 0) {
+- perror("accept");
+- exit(1);
+- }
+- (void) dup2(ns, 0);
+- (void) close(ns);
+- (void) close(s);
+- } else if (argc > 0) {
+- usage();
+- /* NOT REACHED */
++ wait_for_connection((argc == 1) ? *argv : "telnet");
+ }
+
+ openlog("telnetd", LOG_PID | LOG_ODELAY, LOG_DAEMON);
+ fromlen = sizeof (from);
+ if (getpeername(0, (struct sockaddr *)&from, &fromlen) < 0) {
+- fprintf(stderr, "%s: ", progname);
+- perror("getpeername");
+- _exit(1);
++ fatalperror(2, "getpeername");
+ }
+ if (keepalive &&
+ setsockopt(0, SOL_SOCKET, SO_KEEPALIVE, &on, sizeof (on)) < 0) {
+@@ -339,7 +385,8 @@
+ }
+ #endif /* defined(HAS_IPPROTO_IP) && defined(IP_TOS) */
+ net = 0;
+- doit(&from);
++ netopen();
++ doit((struct sockaddr *)&from, fromlen);
+ /* NOTREACHED */
+ return 0;
+ } /* end of main */
+@@ -354,7 +401,7 @@
+ #ifdef BFTPDAEMON
+ fprintf(stderr, " [-B]");
+ #endif
+- fprintf(stderr, " [-debug]");
++ fprintf(stderr, " [-debug port]");
+ #ifdef DIAGNOSTICS
+ fprintf(stderr, " [-D (options|report|exercise|netdata|ptydata)]\n\t");
+ #endif
+@@ -373,7 +420,7 @@
+ #ifdef AUTHENTICATE
+ fprintf(stderr, " [-X auth-type]");
+ #endif
+- fprintf(stderr, " [port]\n");
++ fprintf(stderr, "\n");
+ exit(1);
+ }
+
+@@ -608,54 +655,45 @@
+ * Get a pty, scan input lines.
+ */
+ static void
+-doit(struct sockaddr_in *who)
++doit(struct sockaddr *who, socklen_t who_len)
+ {
+ const char *host;
+- struct hostent *hp;
+ int level;
+ char user_name[256];
++ int i;
++ struct addrinfo hints, *res;
+
+ /*
+ * Find an available pty to use.
+ */
+ pty = getpty();
+ if (pty < 0)
+- fatal(net, "All network ports in use");
++ fatalperror(net, "getpty");
+
+ /* get name of connected client */
+- hp = gethostbyaddr((char *)&who->sin_addr, sizeof (struct in_addr),
+- who->sin_family);
+- if (hp)
+- host = hp->h_name;
+- else
+- host = inet_ntoa(who->sin_addr);
+-
+- /*
+- * We must make a copy because Kerberos is probably going
+- * to also do a gethost* and overwrite the static data...
+- */
+- {
+- int i;
+- strncpy(remote_host_name, host, sizeof(remote_host_name)-1);
+- remote_host_name[sizeof(remote_host_name)-1] = 0;
+-
+- /* Disallow funnies. */
+- for (i=0; remote_host_name[i]; i++) {
+- if (remote_host_name[i]<=32 || remote_host_name[i]>126)
+- remote_host_name[i] = '?';
+- }
++ if (getnameinfo(who, who_len, remote_host_name,
++ sizeof(remote_host_name), 0, 0, 0)) {
++ syslog(LOG_ERR, "doit: getnameinfo: %m");
++ *remote_host_name = 0;
++ }
++
++ /* Disallow funnies. */
++ for (i=0; remote_host_name[i]; i++) {
++ if (remote_host_name[i]<=32 || remote_host_name[i]>126)
++ remote_host_name[i] = '?';
+ }
+ host = remote_host_name;
+
+ /* Get local host name */
+- {
+- struct hostent *h;
+- gethostname(host_name, sizeof(host_name));
+- h = gethostbyname(host_name);
+- if (h) {
+- strncpy(host_name, h->h_name, sizeof(host_name));
+- host_name[sizeof(host_name)-1] = 0;
+- }
++ gethostname(host_name, sizeof(host_name));
++ memset(&hints, 0, sizeof(hints));
++ hints.ai_family = PF_UNSPEC;
++ hints.ai_flags = AI_CANONNAME;
++ if ((i = getaddrinfo(host_name, 0, &hints, &res)))
++ syslog(LOG_WARNING, "doit: getaddrinfo: %s", gai_strerror(i));
++ else {
++ strncpy(host_name, res->ai_canonname, sizeof(host_name)-1);
++ host_name[sizeof(host_name)-1] = 0;
+ }
+
+ #if defined(AUTHENTICATE) || defined(ENCRYPT)
+@@ -892,7 +930,7 @@
+ * Never look for input if there's still
+ * stuff in the corresponding output buffer
+ */
+- if (nfrontp - nbackp || pcc > 0) {
++ if (netbuflen(1) || pcc > 0) {
+ FD_SET(f, &obits);
+ if (f >= hifd) hifd = f+1;
+ }
+@@ -1033,6 +1071,7 @@
+ }
+ #endif /* LINEMODE */
+ if (ptyibuf[0] & TIOCPKT_FLUSHWRITE) {
++ static const char msg[] = { IAC, DM };
+ netclear(); /* clear buffer back */
+ #ifndef NO_URGENT
+ /*
+@@ -1041,8 +1080,7 @@
+ * royally if we send them urgent
+ * mode data.
+ */
+- netoprintf("%c%c", IAC, DM);
+- neturg = nfrontp-1; /* off by one XXX */
++ sendurg(msg, sizeof(msg));
+ #endif
+ }
+ if (his_state_is_will(TELOPT_LFLOW) &&
+@@ -1058,23 +1096,21 @@
+ }
+ }
+
+- while (pcc > 0) {
+- if ((&netobuf[BUFSIZ] - nfrontp) < 2)
+- break;
++ while (pcc > 0 && !netbuflen(0)) {
+ c = *ptyip++ & 0377, pcc--;
+ if (c == IAC)
+- *nfrontp++ = c;
+- *nfrontp++ = c;
++ putc(c, netfile);
++ putc(c, netfile);
+ if ((c == '\r' ) && (my_state_is_wont(TELOPT_BINARY))) {
+ if (pcc > 0 && ((*ptyip & 0377) == '\n')) {
+- *nfrontp++ = *ptyip++ & 0377;
++ putc(*ptyip++ & 0377, netfile);
+ pcc--;
+ }
+- else *nfrontp++ = '\0';
++ else putc('\0', netfile);
+ }
+ }
+
+- if (FD_ISSET(f, &obits) && (nfrontp - nbackp) > 0)
++ if (FD_ISSET(f, &obits))
+ netflush();
+ if (ncc > 0)
+ telrcv();
+--- a/telnetd/utility.c
++++ b/telnetd/utility.c
+@@ -41,6 +41,7 @@
+
+ #include <stdarg.h>
+ #include <sys/utsname.h>
++#include <sys/time.h>
+
+ #ifdef AUTHENTICATE
+ #include <libtelnet/auth.h>
+@@ -48,34 +49,19 @@
+
+ #include "telnetd.h"
+
+-/*
+- * utility functions performing io related tasks
+- */
+-
+-void
+-netoprintf(const char *fmt, ...)
+-{
+- int len, maxsize;
+- va_list ap;
+- int done=0;
+-
+- while (!done) {
+- maxsize = sizeof(netobuf) - (nfrontp - netobuf);
+-
+- va_start(ap, fmt);
+- len = vsnprintf(nfrontp, maxsize, fmt, ap);
+- va_end(ap);
+-
+- if (len<0 || len==maxsize) {
+- /* didn't fit */
+- netflush();
+- }
+- else {
+- done = 1;
+- }
+- }
+- nfrontp += len;
+-}
++struct buflist {
++ struct buflist *next;
++ char *buf;
++ size_t len;
++};
++
++static struct buflist head = { next: &head, buf: 0, len: 0 };
++static struct buflist *tail = &head;
++static size_t skip;
++static int trailing;
++static size_t listlen;
++static int doclear;
++static struct buflist *urg;
+
+ /*
+ * ttloop
+@@ -92,9 +78,7 @@
+
+ DIAG(TD_REPORT, netoprintf("td: ttloop\r\n"););
+
+- if (nfrontp-nbackp) {
+- netflush();
+- }
++ netflush();
+ ncc = read(net, netibuf, sizeof(netibuf));
+ if (ncc < 0) {
+ syslog(LOG_INFO, "ttloop: read: %m\n");
+@@ -168,33 +152,64 @@
+ * character.
+ */
+ static
+-char *
+-nextitem(char *current)
+-{
+- if ((*current&0xff) != IAC) {
+- return current+1;
+- }
+- switch (*(current+1)&0xff) {
+- case DO:
+- case DONT:
+- case WILL:
+- case WONT:
+- return current+3;
+- case SB: /* loop forever looking for the SE */
+- {
+- register char *look = current+2;
+-
+- for (;;) {
+- if ((*look++&0xff) == IAC) {
+- if ((*look++&0xff) == SE) {
+- return look;
+- }
++const char *
++nextitem(
++ const unsigned char *current, const unsigned char *end,
++ const unsigned char *next, const unsigned char *nextend
++) {
++ if (*current++ != IAC) {
++ while (current < end && *current++ != IAC)
++ ;
++ goto out;
++ }
++
++ if (current >= end) {
++ current = next;
++ if (!current) {
++ return 0;
+ }
+- }
++ end = nextend;
++ next = 0;
+ }
+- default:
+- return current+2;
+- }
++
++ switch (*current++) {
++ case DO:
++ case DONT:
++ case WILL:
++ case WONT:
++ current++;
++ break;
++ case SB: /* loop forever looking for the SE */
++ for (;;) {
++ int iac;
++
++ while (iac = 0, current < end) {
++ if (*current++ == IAC) {
++ if (current >= end) {
++ iac = 1;
++ break;
++ }
++iac:
++ if (*current++ == SE) {
++ goto out;
++ }
++ }
++ }
++
++ current = next;
++ if (!current) {
++ return 0;
++ }
++ end = nextend;
++ next = 0;
++ if (iac) {
++ goto iac;
++ }
++ }
++ }
++
++out:
++ return next ? next + (current - end) : current;
+ } /* end of nextitem */
+
+
+@@ -216,145 +231,102 @@
+ */
+ void netclear(void)
+ {
+- register char *thisitem, *next;
+- char *good;
+-#define wewant(p) ((nfrontp > p) && ((*p&0xff) == IAC) && \
+- ((*(p+1)&0xff) != EC) && ((*(p+1)&0xff) != EL))
++ doclear++;
++ netflush();
++ doclear--;
++} /* end of netclear */
+
+-#if defined(ENCRYPT)
+- thisitem = nclearto > netobuf ? nclearto : netobuf;
+-#else
+- thisitem = netobuf;
+-#endif
++static void
++netwritebuf(void)
++{
++ struct iovec *vector;
++ struct iovec *v;
++ struct buflist *lp;
++ ssize_t n;
++ size_t len;
++ int ltrailing = trailing;
+
+- while ((next = nextitem(thisitem)) <= nbackp) {
+- thisitem = next;
+- }
++ vector = malloc(listlen * sizeof(struct iovec));
++ if (!vector) {
++ return;
++ }
+
+- /* Now, thisitem is first before/at boundary. */
++ len = listlen - (doclear & ltrailing);
++ v = vector;
++ lp = head.next;
++ while (lp != &head) {
++ if (lp == urg) {
++ len = v - vector;
++ if (!len) {
++ n = send(net, lp->buf, 1, MSG_OOB);
++ if (n > 0) {
++ urg = 0;
++ }
++ goto epi;
++ }
++ break;
++ }
++ v->iov_base = lp->buf;
++ v->iov_len = lp->len;
++ v++;
++ lp = lp->next;
++ }
+
+-#if defined(ENCRYPT)
+- good = nclearto > netobuf ? nclearto : netobuf;
+-#else
+- good = netobuf; /* where the good bytes go */
+-#endif
++ vector->iov_base = (char *)vector->iov_base + skip;
++ vector->iov_len -= skip;
++
++ n = writev(net, vector, len);
+
+- while (nfrontp > thisitem) {
+- if (wewant(thisitem)) {
+- int length;
+-
+- next = thisitem;
+- do {
+- next = nextitem(next);
+- } while (wewant(next) && (nfrontp > next));
+- length = next-thisitem;
+- bcopy(thisitem, good, length);
+- good += length;
+- thisitem = next;
+- } else {
+- thisitem = nextitem(thisitem);
++epi:
++ free(vector);
++
++ if (n < 0) {
++ if (errno != EWOULDBLOCK && errno != EINTR)
++ cleanup(0);
++ return;
+ }
+- }
+
+- nbackp = netobuf;
+- nfrontp = good; /* next byte to be sent */
+- neturg = 0;
+-} /* end of netclear */
++ len = n + skip;
+
+-/*
+- * netflush
+- * Send as much data as possible to the network,
+- * handling requests for urgent data.
+- */
+-extern int not42;
+-void
+-netflush(void)
+-{
+- int n;
++ lp = head.next;
++ while (lp->len <= len) {
++ if (lp == tail && ltrailing) {
++ break;
++ }
+
+- if ((n = nfrontp - nbackp) > 0) {
+- DIAG(TD_REPORT,
+- { netoprintf("td: netflush %d chars\r\n", n);
+- n = nfrontp - nbackp; /* update count */
+- });
+-#if defined(ENCRYPT)
+- if (encrypt_output) {
+- char *s = nclearto ? nclearto : nbackp;
+- if (nfrontp - s > 0) {
+- (*encrypt_output)((unsigned char *)s, nfrontp-s);
+- nclearto = nfrontp;
++ len -= lp->len;
++
++ head.next = lp->next;
++ listlen--;
++ free(lp->buf);
++ free(lp);
++
++ lp = head.next;
++ if (lp == &head) {
++ tail = &head;
++ break;
+ }
+ }
+-#endif
+- /*
+- * if no urgent data, or if the other side appears to be an
+- * old 4.2 client (and thus unable to survive TCP urgent data),
+- * write the entire buffer in non-OOB mode.
+- */
+- if ((neturg == 0) || (not42 == 0)) {
+- n = write(net, nbackp, n); /* normal write */
+- } else {
+- n = neturg - nbackp;
+- /*
+- * In 4.2 (and 4.3) systems, there is some question about
+- * what byte in a sendOOB operation is the "OOB" data.
+- * To make ourselves compatible, we only send ONE byte
+- * out of band, the one WE THINK should be OOB (though
+- * we really have more the TCP philosophy of urgent data
+- * rather than the Unix philosophy of OOB data).
+- */
+- if (n > 1) {
+- n = send(net, nbackp, n-1, 0); /* send URGENT all by itself */
+- } else {
+- n = send(net, nbackp, n, MSG_OOB); /* URGENT data */
+- }
+- }
+- }
+- if (n < 0) {
+- if (errno == EWOULDBLOCK || errno == EINTR)
+- return;
+- cleanup(0);
+- }
+- nbackp += n;
+-#if defined(ENCRYPT)
+- if (nbackp > nclearto)
+- nclearto = 0;
+-#endif
+- if (nbackp >= neturg) {
+- neturg = 0;
+- }
+- if (nbackp == nfrontp) {
+- nbackp = nfrontp = netobuf;
+-#if defined(ENCRYPT)
+- nclearto = 0;
+-#endif
+- }
+- return;
+-} /* end of netflush */
+
++ skip = len;
++}
+
+ /*
+- * writenet
+- *
+- * Just a handy little function to write a bit of raw data to the net.
+- * It will force a transmit of the buffer if necessary
+- *
+- * arguments
+- * ptr - A pointer to a character string to write
+- * len - How many bytes to write
++ * netflush
++ * Send as much data as possible to the network,
++ * handling requests for urgent data.
+ */
+-void writenet(register unsigned char *ptr, register int len)
++void
++netflush(void)
+ {
+- /* flush buffer if no room for new data) */
+- if ((&netobuf[BUFSIZ] - nfrontp) < len) {
+- /* if this fails, don't worry, buffer is a little big */
+- netflush();
++ if (fflush(netfile)) {
++ /* out of memory? */
++ cleanup(0);
+ }
+-
+- bcopy(ptr, nfrontp, len);
+- nfrontp += len;
+-
+-} /* end of writenet */
++ if (listlen) {
++ netwritebuf();
++ }
++}
+
+
+ /*
+@@ -391,18 +363,30 @@
+ fatal(f, buf);
+ }
+
+-char editedhost[32];
++char *editedhost;
+ struct utsname kerninfo;
+
+ void
+ edithost(const char *pat, const char *host)
+ {
+- char *res = editedhost;
++ char *res;
+
+ uname(&kerninfo);
+
+ if (!pat)
+ pat = "";
++
++ res = realloc(editedhost, strlen(pat) + strlen(host) + 1);
++ if (!res) {
++ if (editedhost) {
++ free(editedhost);
++ editedhost = 0;
++ }
++ fprintf(stderr, "edithost: Out of memory\n");
++ return;
++ }
++ editedhost = res;
++
+ while (*pat) {
+ switch (*pat) {
+
+@@ -420,18 +404,12 @@
+ *res++ = *pat;
+ break;
+ }
+- if (res == &editedhost[sizeof editedhost - 1]) {
+- *res = '\0';
+- return;
+- }
+ pat++;
+ }
+ if (*host)
+- (void) strncpy(res, host,
+- sizeof editedhost - (res - editedhost) -1);
++ (void) strcpy(res, host);
+ else
+ *res = '\0';
+- editedhost[sizeof editedhost - 1] = '\0';
+ }
+
+ static char *putlocation;
+@@ -475,7 +453,9 @@
+ break;
+
+ case 'h':
+- putstr(editedhost);
++ if (editedhost) {
++ putstr(editedhost);
++ }
+ break;
+
+ case 'd':
+@@ -1118,11 +1098,6 @@
+ char xbuf[30];
+
+ while (cnt) {
+- /* flush net output buffer if no room for new data) */
+- if ((&netobuf[BUFSIZ] - nfrontp) < 80) {
+- netflush();
+- }
+-
+ /* add a line of output */
+ netoprintf("%s: ", tag);
+ for (i = 0; i < 20 && cnt; i++) {
+@@ -1143,3 +1118,154 @@
+ }
+ }
+ #endif /* DIAGNOSTICS */
++
++static struct buflist *
++addbuf(const char *buf, size_t len)
++{
++ struct buflist *bufl;
++
++ bufl = malloc(sizeof(struct buflist));
++ if (!bufl) {
++ return 0;
++ }
++ bufl->next = tail->next;
++ bufl->buf = malloc(len);
++ if (!bufl->buf) {
++ free(bufl);
++ return 0;
++ }
++ bufl->len = len;
++
++ tail = tail->next = bufl;
++ listlen++;
++
++ memcpy(bufl->buf, buf, len);
++ return bufl;
++}
++
++static ssize_t
++netwrite(void *cookie, const char *buf, size_t len)
++{
++ size_t ret;
++ const char *const end = buf + len;
++ int ltrailing = trailing;
++ int ldoclear = doclear;
++
++#define wewant(p) ((*p&0xff) == IAC) && \
++ ((*(p+1)&0xff) != EC) && ((*(p+1)&0xff) != EL)
++
++ ret = 0;
++
++ if (ltrailing) {
++ const char *p;
++ size_t l;
++ size_t m = tail->len;
++
++ p = nextitem(tail->buf, tail->buf + tail->len, buf, end);
++ ltrailing = !p;
++ if (ltrailing) {
++ p = end;
++ }
++
++ l = p - buf;
++ tail->len += l;
++ tail->buf = realloc(tail->buf, tail->len);
++ if (!tail->buf) {
++ return -1;
++ }
++
++ memcpy(tail->buf + m, buf, l);
++ buf += l;
++ len -= l;
++ ret += l;
++ trailing = ltrailing;
++ }
++
++ if (ldoclear) {
++ struct buflist *lpprev;
++
++ skip = 0;
++ lpprev = &head;
++ for (;;) {
++ struct buflist *lp;
++
++ lp = lpprev->next;
++
++ if (lp == &head) {
++ tail = lpprev;
++ break;
++ }
++
++ if (lp == tail && ltrailing) {
++ break;
++ }
++
++ if (!wewant(lp->buf)) {
++ lpprev->next = lp->next;
++ listlen--;
++ free(lp->buf);
++ free(lp);
++ } else {
++ lpprev = lp;
++ }
++ }
++ }
++
++ while (len) {
++ const char *p;
++ size_t l;
++
++ p = nextitem(buf, end, 0, 0);
++ ltrailing = !p;
++ if (ltrailing) {
++ p = end;
++ } else if (ldoclear) {
++ if (!wewant(buf)) {
++ l = p - buf;
++ goto cont;
++ }
++ }
++
++ l = p - buf;
++ if (!addbuf(buf, l)) {
++ return ret ? ret : -1;
++ }
++ trailing = ltrailing;
++
++cont:
++ buf += l;
++ len -= l;
++ ret += l;
++ }
++
++ netwritebuf();
++ return ret;
++}
++
++void
++netopen() {
++ static const cookie_io_functions_t funcs = {
++ read: 0, write: netwrite, seek: 0, close: 0
++ };
++
++ netfile = fopencookie(0, "w", funcs);
++}
++
++extern int not42;
++void
++sendurg(const char *buf, size_t len) {
++ if (!not42) {
++ fwrite(buf, 1, len, netfile);
++ return;
++ }
++
++ urg = addbuf(buf, len);
++}
++
++size_t
++netbuflen(int flush) {
++ if (flush) {
++ netflush();
++ }
++ return listlen != 1 ? listlen : tail->len - skip;
++}
+--- a/telnetlogin/telnetlogin.8
++++ b/telnetlogin/telnetlogin.8
+@@ -40,6 +40,7 @@
+ .Nm telnetlogin
+ .Op Fl h Ar host
+ .Op Fl p
++.Op Ar username
+ .Sh DESCRIPTION
+ .Nm telnetlogin
+ is a setuid wrapper that runs
+@@ -62,10 +63,8 @@
+ .Nm telnetd 8
+ normally provides them in.
+ .Nm telnetlogin
+-also only accepts the environment variables
++also does sanity checks on the environment variables
+ .Ev TERM ,
+-.Ev DISPLAY ,
+-.Ev POSIXLY_CORRECT ,
+ and
+ .Ev REMOTEHOST .
+ It also insists that the standard input, output, and error streams are
+@@ -83,7 +82,7 @@
+ .Nm telnetlogin
+ does not permit the
+ .Fl f
+-option to login, and does not permit passing a username, so will not
++option to login, so will not
+ work with telnetds that perform authentication via Kerberos or SSL.
+ .Pp
+ THIS IS PRESENTLY EXPERIMENTAL CODE; USE WITH CAUTION.
+--- a/telnetlogin/telnetlogin.c
++++ b/telnetlogin/telnetlogin.c
+@@ -51,20 +51,24 @@
+ #include <string.h>
+ #include <stdarg.h>
+ #include <stdio.h>
++#include <syslog.h>
+
+ #ifndef _PATH_LOGIN
+ #define _PATH_LOGIN "/bin/login"
+ #endif
+
++extern char **environ;
++
+ static const char *remhost = NULL;
+
++static void die(const char *, ...) __attribute__ ((noreturn));
++
+ static void die(const char *fmt, ...) {
+ va_list ap;
+- fprintf(stderr, "telnetlogin: ");
++ openlog("telnetlogin", LOG_PID, LOG_AUTHPRIV);
+ va_start(ap, fmt);
+- vfprintf(stderr, fmt, ap);
++ vsyslog(LOG_CRIT, fmt, ap);
+ va_end(ap);
+- fprintf(stderr, "\n");
+ exit(1);
+ }
+
+@@ -86,41 +90,6 @@
+ return 0;
+ }
+
+-static int check_display(char *disp) {
+- char *colon, *s;
+- struct hostent *hp;
+- int num;
+-
+- colon = strchr(disp, ':');
+- if (!colon) return -1;
+- *colon = 0; /* temporarily */
+-
+- if (check_a_hostname(disp)) return -1;
+-
+- hp = gethostbyname(disp);
+- if (!hp) return -1;
+-
+- *colon = ':';
+- s = colon+1;
+- while (*s && isdigit(*s)) s++;
+- if (*s) {
+- if (*s!='.') return -1;
+- s++;
+- while (*s && isdigit(*s)) s++;
+- }
+- if (*s) return -1;
+-
+- num = atoi(colon+1);
+- if (num<0 || num>99) return -1;
+-
+- return 0;
+-}
+-
+-static int check_posixly_correct(char *val) {
+- if (strlen(val)==0 || !strcmp(val, "1")) return 0;
+- return -1;
+-}
+-
+ static int check_remotehost(char *val) {
+ if (check_a_hostname(val)) return -1;
+ if (remhost && strcmp(val, remhost)) return -1;
+@@ -132,8 +101,6 @@
+ int (*validator)(char *);
+ } legal_envs[] = {
+ { "TERM", check_term },
+- { "DISPLAY", check_display },
+- { "POSIXLY_CORRECT", check_posixly_correct },
+ { "REMOTEHOST", check_remotehost },
+ { NULL, NULL }
+ };
+@@ -166,10 +133,7 @@
+ static char argv0[] = "login";
+ int argn, i, j;
+ const char *rh = NULL;
+- char **envs = __environ;
+-
+- /* make as sure as possible no library routines or anything can use it */
+- __environ = NULL;
++ char **envs = environ;
+
+ /* first, make sure our stdin/stdout/stderr are aimed somewhere */
+ i = open("/", O_RDONLY);
+@@ -194,6 +158,9 @@
+ if (argn < argc && !strcmp(argv[argn], "-p")) {
+ argn++;
+ }
++ if (argn < argc && argv[argn][0] != '-') {
++ argn++;
++ }
+ if (argn < argc) die("Illegal args: too many args");
+ argv[0] = argv0;
+
+@@ -201,21 +168,22 @@
+ if (envs) for (i=0; envs[i]; i++) {
+ char *testenv = envs[i];
+ size_t testlen = strlen(testenv);
+- int ok = 0;
+- for (j=0; legal_envs[j].name && !ok; j++) {
++ for (j=0; legal_envs[j].name; j++) {
+ const char *okenv = legal_envs[j].name;
+ size_t oklen = strlen(okenv);
++ int sign;
+
+ if (testlen < oklen) continue;
+ if (testenv[oklen]!='=') continue;
+- if (memcmp(testenv, okenv, oklen)) continue;
++ if ((sign = memcmp(testenv, okenv, oklen)) < 0) {
++ continue;
++ } else if (sign > 0) {
++ break;
++ }
+ if (legal_envs[j].validator(testenv+oklen+1)) {
+ die("Invalid environment: bad value for %s", okenv);
+ }
+- ok = 1;
+- }
+- if (!ok) {
+- die("Illegal environment: forbidden variable");
++ break;
+ }
+ }
+
+@@ -234,6 +202,13 @@
+ * but, should we insist that ruid==nobody?
+ */
+
++#ifdef debian
++ /*
++ * Debian's /bin/login doesn't work properly unless we're really root.
++ */
++ setuid(0);
++#endif
++
+ /*
+ * don't do anything with limits, itimers, or process priority either
+ */
diff --git a/telnet/patches/020-from_18_to_24.diff b/telnet/patches/020-from_18_to_24.diff
new file mode 100644
index 000000000..4766e93fd
--- /dev/null
+++ b/telnet/patches/020-from_18_to_24.diff
@@ -0,0 +1,609 @@
+Description: Incremental patches from 0.17-18 to 0.17-24.
+ A large set of mixed code patches on top of upstream's source.
+ It has been pruned to reproduce the step from source package
+ netkit-telnet_0.17-18 to netkit-telnet_0.17-24.
+ .
+ Support also Hurd.
+ [telnetd/sys_term.c, telnetd/ext.h]
+ .
+ Do not reset access mode and owner of TTY when client ends the session.
+ [telnetd/sys_term.c (cleanup)]
+ .
+ Path of telnetlogin.
+ [telnetd/telnetd.8]
+ .
+ Adjust 8-bit mode to be without mandatory binary option.
+ A new command line switch `-7' is added to telnet.
+ [telnet/main.cc, telnet/telnet.cc, telnet/terminal.cc,
+ telnet/defines.h, telnet/externs.h]
+ .
+ Allow telnetrc files to specify a port in addition to host name.
+ [telnet/commands.cc, telnet/proto.h, telnet/telnet.1]
+ .
+ Disable 8-bit mode of client if parity bit is enabled.
+ [telnet/main.cc]
+ .
+ Remove obsolete compiler warnings, and disable trigraph warning.
+ Protect tokens ifter #endif.
+ [configure, telnet/terminal.cc]
+ .
+ Support option `-b' in client.
+ [telnet/commands.cc, telnet/main.cc, telnet/netlink.cc,
+ telnet/netlink.h, telnet/telnet.1]
+ .
+ Accept numeric telnet options.
+ [telnet/command.cc]
+ .
+ Buffer overflow due to $HOME, moved to a separate file.
+ .
+ Remote DOS hole, CAN-2004-0911, moved to a separate file.
+ .
+ Buffer overflow, CAN-2005-0469, moved to a separate file.
+
+Comment: interdiff netkit-telnet_0.17-{18woody3,29}.diff
+Author: Herbert Xu, Robert Millan
+Bug-Debian: http://bugs.debian.org/149325
+ http://bugs.debian.org/150812
+ http://bugs.debian.org/144921
+ http://bugs.debian.org/194736
+ http://bugs.debian.org/203544
+ http://bugs.debian.org/242018
+Forwarded: no
+Last-Update: 2015-01-27
+
+--- a/telnet/commands.cc
++++ b/telnet/commands.cc
+@@ -476,6 +476,7 @@
+ int send_tncmd(int (*func)(int, int), const char *cmd, const char *name) {
+ char **cpp;
+ extern char *telopts[];
++ long opt;
+
+ if (isprefix(name, "help") || isprefix(name, "?")) {
+ register int col, len;
+@@ -502,16 +503,23 @@
+ name, cmd);
+ return 0;
+ }
++
++ opt = cpp - telopts;
+ if (cpp == 0) {
+- fprintf(stderr, "'%s': unknown argument ('send %s ?' for help).\n",
++ char *end;
++
++ opt = strtol(name, &end, 10);
++ if (*end || opt < 0 || opt > 255) {
++ fprintf(stderr, "'%s': unknown argument ('send %s ?' for help).\n",
+ name, cmd);
+- return 0;
++ return 0;
++ }
+ }
+ if (!connected) {
+ printf("?Need to be connected first.\n");
+ return 0;
+ }
+- (*func)(cpp - telopts, 1);
++ (*func)(opt, 1);
+ return 1;
+ }
+
+@@ -1615,7 +1623,7 @@
+ char *srp = NULL;
+ int srlen;
+ int family = 0;
+- const char *cmd, *volatile user = 0;
++ const char *cmd, *volatile user = 0, *srchostp = 0;
+ const char *portp = NULL;
+ char *hostp = NULL;
+ char *resolv_hostp;
+@@ -1662,6 +1670,14 @@
+ --argc;
+ continue;
+ }
++ if (strcmp(*argv, "-b") == 0) {
++ --argc; ++argv;
++ if (argc == 0)
++ goto usage;
++ srchostp = *argv++;
++ --argc;
++ continue;
++ }
+ if (strcmp(*argv, "-a") == 0) {
+ --argc; ++argv;
+ autologin = 1;
+@@ -1744,6 +1760,20 @@
+ hints.ai_socktype = SOCK_STREAM;
+ hints.ai_flags = AI_NUMERICHOST;
+ hints.ai_family = family;
++
++ if (srchostp) {
++ res = getaddrinfo(srchostp, "0", &hints, &hostaddr);
++ if (res) {
++ fprintf(stderr, "telnet: could not resolve %s: %s\n", srchostp,
++ gai_strerror(res));
++ return 0;
++ }
++ hints.ai_family = hostaddr->ai_family;
++ res = nlink.bind(hostaddr);
++ freeaddrinfo(hostaddr);
++ if (res < 0)
++ return 0;
++ }
+
+ /* Resolve both the host and service simultaneously. */
+ res = getaddrinfo(resolv_hostp, portp, &hints, &hostaddr);
+@@ -1803,7 +1833,7 @@
+ strcpy(hostname, tmpaddr->ai_canonname);
+ }
+
+- cmdrc(hostp, hostname);
++ cmdrc(hostp, hostname, portp);
+ freeaddrinfo(hostaddr);
+ if (autologin && user == NULL) {
+ struct passwd *pw;
+@@ -2050,15 +2080,21 @@
+ return 0;
+ }
+
+-static void readrc(const char *m1, const char *m2, const char *rcname) {
++static void readrc(const char *m1, const char *m2, const char *port,
++ const char *rcname)
++{
+ FILE *rcfile;
+ int gotmachine = 0;
+ int l1 = strlen(m1);
+ int l2 = strlen(m2);
+- char m1save[strlen(m1) + 1];
++ int lport = strlen(port);
++ char m1save[l1 + 1];
++ char portsave[lport + 1];
+
+ strcpy(m1save, m1);
+ m1 = m1save;
++ strcpy(portsave, port);
++ port = portsave;
+
+ rcfile = fopen(rcname, "r");
+ if (!rcfile) return;
+@@ -2083,6 +2119,13 @@
+ strncpy(line, &line[7], sizeof(line) - 7);
+ else
+ continue;
++
++ if (line[0] == ':') {
++ if (!strncasecmp(&line[1], port, lport))
++ continue;
++ strncpy(line, &line[lport + 1], sizeof(line) - lport - 1);
++ }
++
+ if (line[0] != ' ' && line[0] != '\t' && line[0] != '\n')
+ continue;
+ gotmachine = 1;
+@@ -2095,13 +2138,13 @@
+ fclose(rcfile);
+ }
+
+-void cmdrc(const char *m1, const char *m2) {
++void cmdrc(const char *m1, const char *m2, const char *port) {
+ static char *rcname = 0;
+ static char rcbuf[128];
+
+ if (skiprc) return;
+
+- readrc(m1, m2, "/etc/telnetrc");
++ readrc(m1, m2, port, "/etc/telnetrc");
+ if (rcname == 0) {
+ rcname = getenv("HOME");
+ if (rcname)
+@@ -2111,7 +2154,7 @@
+ strcat(rcbuf, "/.telnetrc");
+ rcname = rcbuf;
+ }
+- readrc(m1, m2, rcname);
++ readrc(m1, m2, port, rcname);
+ }
+
+ #if defined(IP_OPTIONS) && defined(HAS_IPPROTO_IP)
+--- a/telnet/main.cc
++++ b/telnet/main.cc
+@@ -84,7 +84,7 @@
+ fprintf(stderr, "Usage: %s %s%s%s%s\n",
+ prompt,
+ "[-4] [-6] [-8] [-E] [-L] [-a] [-d] [-e char] [-l user]",
+- "\n\t[-n tracefile]",
++ "\n\t[-n tracefile] [ -b addr ]",
+ #ifdef TN3270
+ "\n\t"
+ "[-noasynch] [-noasynctty] [-noasyncnet] [-r] [-t transcom]\n\t",
+@@ -106,7 +106,7 @@
+ extern char *optarg;
+ extern int optind;
+ int ch;
+- char *user;
++ char *user, *srcaddr;
+ int family;
+
+ tninit(); /* Clear out things */
+@@ -115,19 +115,22 @@
+ #endif
+
+ TerminalSaveState();
++ if ((old_tc.c_cflag & (CSIZE|PARENB)) != CS8)
++ eight = 0;
+
+ if ((prompt = strrchr(argv[0], '/'))!=NULL)
+ ++prompt;
+ else
+ prompt = argv[0];
+
+- user = NULL;
++ user = srcaddr = NULL;
+ family = 0;
+
+ rlogin = (strncmp(prompt, "rlog", 4) == 0) ? '~' : _POSIX_VDISABLE;
+ autologin = -1;
+
+- while ((ch = getopt(argc, argv, "468EKLS:X:ade:k:l:n:rt:x")) != EOF) {
++ while ((ch = getopt(argc, argv,
++ "4678EKLS:X:ab:de:k:l:n:rt:x")) != EOF) {
+ switch(ch) {
+ case '4':
+ family = AF_INET;
+@@ -139,8 +142,11 @@
+ fputs("IPv6 unsupported\n", stderr);
+ #endif
+ break;
++ case '7':
++ eight = 0; /* 7-bit ouput and input */
++ break;
+ case '8':
+- eight = 3; /* binary output and input */
++ binary = 3; /* binary output and input */
+ break;
+ case 'E':
+ rlogin = escapechar = _POSIX_VDISABLE;
+@@ -149,7 +155,7 @@
+ //autologin = 0;
+ break;
+ case 'L':
+- eight |= 2; /* binary output only */
++ binary |= 2; /* binary output only */
+ break;
+ case 'S':
+ {
+@@ -229,6 +235,9 @@
+ "%s: -x ignored, no encryption support.\n",
+ prompt);
+ break;
++ case 'b':
++ srcaddr = optarg;
++ break;
+ case '?':
+ default:
+ usage();
+@@ -252,6 +261,10 @@
+ *argp++ = "-l";
+ *argp++ = user;
+ }
++ if (srcaddr) {
++ *argp++ = "-b";
++ *argp++ = srcaddr;
++ }
+ if (family) {
+ *argp++ = family == AF_INET ? "-4" : "-6";
+ }
+--- a/telnet/netlink.cc
++++ b/telnet/netlink.cc
+@@ -79,20 +79,56 @@
+ shutdown(net, 2);
+ }
+ ::close(net);
++ net = -1;
++}
++
++int netlink::bind(struct addrinfo *addr)
++{
++ int res;
++
++ res = socket(addr->ai_family);
++ if (res < 2) {
++ if (res == 1)
++ perror("telnet: socket");
++ return -1;
++ }
++
++ if (::bind(net, addr->ai_addr, addr->ai_addrlen) < 0) {
++ perror("telnet: bind");
++ return -1;
++ }
++
++ return 0;
++}
++
++int netlink::socket(int family)
++{
++ if (this->family != family)
++ close(0);
++
++ if (net < 0) {
++ this->family = family;
++ net = ::socket(family, SOCK_STREAM, 0);
++ if (net < 0) {
++ if (errno == EAFNOSUPPORT)
++ return 1;
++ perror("telnet: socket");
++ return 0;
++ }
++ }
++
++ return 2;
+ }
+
+ int netlink::connect(int debug, struct addrinfo *addr,
+ char *srcroute, int srlen, int tos)
+ {
+ int on=1;
++ int res;
+
+- net = socket(addr->ai_family, SOCK_STREAM, 0);
+- if (net < 0) {
+- if (errno == EAFNOSUPPORT)
+- return 1;
+- perror("telnet: socket");
+- return 0;
+- }
++ res = socket(addr->ai_family);
++ if (res < 2)
++ return res;
+
+ #if defined(IP_OPTIONS) && defined(HAS_IPPROTO_IP)
+ if (srcroute) {
+--- a/telnet/netlink.h
++++ b/telnet/netlink.h
+@@ -1,11 +1,15 @@
+
+ class netlink {
++ private:
++ int family;
+ protected:
+ int net;
+ public:
+ netlink();
+ ~netlink();
+
++ int bind(struct addrinfo *hostaddr);
++ int socket(int family);
+ int connect(int debug, struct addrinfo *hostaddr,
+ char *srcroute, int srlen,
+ int tos);
+--- a/telnet/telnet.1
++++ b/telnet/telnet.1
+@@ -44,6 +44,7 @@
+ .Nm telnet
+ .Op Fl 468ELadr
+ .Op Fl S Ar tos
++.Op Fl b Ar address
+ .Op Fl e Ar escapechar
+ .Op Fl l Ar user
+ .Op Fl n Ar tracefile
+@@ -93,6 +94,8 @@
+ option if supported by the remote system. The username is retrieved
+ via
+ .Xr getlogin 3 .
++.It Fl b Ar address
++Use bind(2) on the local socket to bind it to a specific local address.
+ .It Fl d
+ Sets the initial value of the
+ .Ic debug
+@@ -492,7 +495,15 @@
+ indented by whitespace; lines beginning without whitespace are
+ interpreted as hostnames. Lines beginning with the special hostname
+ .Ql DEFAULT
+-will apply to all hosts. Upon connecting to a particular host, the
++will apply to all hosts. Hostnames including
++.Ql DEFAULT
++may be followed immediately by a colon and a port number or string.
++If a port is specified it must match exactly with what is specified
++on the command line. If no port was specified on the command line,
++then the value
++.Ql telnet
++is used.
++Upon connecting to a particular host, the
+ commands associated with that host are executed.
+ .It Ic quit
+ Close any open session and exit
+--- a/telnet/telnet.cc
++++ b/telnet/telnet.cc
+@@ -88,7 +88,8 @@
+ char will_wont_resp[256];
+
+ int
+-eight = 0,
++ eight = 3,
++ binary = 0,
+ autologin = 0, /* Autologin anyone? */
+ skiprc = 0,
+ connected,
+@@ -1743,8 +1744,8 @@
+ send_do(TELOPT_STATUS, 1);
+ if (env_getvalue("DISPLAY", 0))
+ send_will(TELOPT_XDISPLOC, 1);
+- if (eight)
+- tel_enter_binary(eight);
++ if (binary)
++ tel_enter_binary(binary);
+ }
+ #endif /* !defined(TN3270) */
+
+--- a/telnet/terminal.cc
++++ b/telnet/terminal.cc
+@@ -157,9 +157,11 @@
+ if (localflow)
+ mode |= MODE_FLOW;
+
+- if (my_want_state_is_will(TELOPT_BINARY))
++ if ((eight & 1) || my_want_state_is_will(TELOPT_BINARY))
+ mode |= MODE_INBIN;
+
++ if (eight & 2)
++ mode |= MODE_OUT8;
+ if (his_want_state_is_will(TELOPT_BINARY))
+ mode |= MODE_OUTBIN;
+
+@@ -451,10 +453,13 @@
+ // breaks SunOS.
+ tmp_tc.c_iflag |= ISTRIP;
+ }
+- if (f & MODE_OUTBIN) {
++ if (f & (MODE_OUTBIN|MODE_OUT8)) {
+ tmp_tc.c_cflag &= ~(CSIZE|PARENB);
+ tmp_tc.c_cflag |= CS8;
+- tmp_tc.c_oflag &= ~OPOST;
++ if (f & MODE_OUTBIN)
++ tmp_tc.c_oflag &= ~OPOST;
++ else
++ tmp_tc.c_oflag |= OPOST;
+ } else {
+ tmp_tc.c_cflag &= ~(CSIZE|PARENB);
+ tmp_tc.c_cflag |= old_tc.c_cflag & (CSIZE|PARENB);
+@@ -470,7 +475,7 @@
+
+ #ifdef SIGINFO
+ signal(SIGINFO, ayt);
+-#endif SIGINFO
++#endif /* SIGINFO */
+
+ #if defined(NOKERNINFO)
+ tmp_tc.c_lflag |= NOKERNINFO;
+@@ -506,7 +511,7 @@
+
+ #ifdef SIGINFO
+ signal(SIGINFO, ayt_status);
+-#endif SIGINFO
++#endif /* SIGINFO */
+
+ #ifdef SIGTSTP
+ signal(SIGTSTP, SIG_DFL);
+--- a/telnetd/ext.h
++++ b/telnetd/ext.h
+@@ -88,7 +88,7 @@
+ #define netoprintf(fmt, ...) fprintf(netfile, fmt, ## __VA_ARGS__)
+
+ extern int pty, net;
+-extern char *line;
++extern const char *line;
+ extern int SYNCHing; /* we are in TELNET SYNCH mode */
+
+ void _termstat(void);
+--- a/telnetd/sys_term.c
++++ b/telnetd/sys_term.c
+@@ -204,17 +204,17 @@
+ *
+ * Returns the file descriptor of the opened pty.
+ */
+-static char linedata[PATH_MAX];
+-char *line = linedata;
++const char *line;
+
+ static int ptyslavefd=-1;
+
+ int getpty(void) {
+ int masterfd;
+
+- if (openpty(&masterfd, &ptyslavefd, line, NULL, NULL)) {
++ if (openpty(&masterfd, &ptyslavefd, NULL, NULL, NULL)) {
+ return -1;
+ }
++ line = ttyname(ptyslavefd);
+ return masterfd;
+ }
+
+@@ -720,25 +720,11 @@
+ * clean up anything that needs to be cleaned up.
+ */
+ void cleanup(int sig) {
+- char *p;
++ const char *p;
+ (void)sig;
+
+ p = line + sizeof("/dev/") - 1;
+ if (logout(p)) logwtmp(p, "", "");
+-#ifdef PARANOID_TTYS
+- /*
+- * dholland 16-Aug-96 chmod the tty when not in use
+- * This will make it harder to attach unwanted stuff to it
+- * (which is a security risk) but will break some programs.
+- */
+- chmod(line, 0600);
+-#else
+- chmod(line, 0666);
+-#endif
+- chown(line, 0, 0);
+- *p = 'p';
+- chmod(line, 0666);
+- chown(line, 0, 0);
+ shutdown(net, 2);
+ exit(0);
+ }
+--- a/telnetd/telnetd.8
++++ b/telnetd/telnetd.8
+@@ -161,7 +161,7 @@
+ .It Fl L Ar loginprg
+ This option may be used to specify a different login program.
+ By default,
+-.Pa /usr/sbin/telnetlogin
++.Pa /usr/lib/telnetlogin
+ is used.
+ .It Fl n
+ Disable
+--- a/telnet/defines.h
++++ b/telnet/defines.h
+@@ -50,3 +50,5 @@
+ #define MODE_COMMAND_LINE(m) ((m)==-1)
+
+ #define CONTROL(x) ((x)&0x1f) /* CTRL(x) is not portable */
++
++#define MODE_OUT8 0x8000 /* binary mode sans -opost */
+--- a/telnet/proto.h
++++ b/telnet/proto.h
+@@ -13,7 +13,7 @@
+ void auth_encrypt_user(char *);
+ void auth_name(unsigned char *, int);
+ void auth_printsub(unsigned char *, int, unsigned char *, int);
+-void cmdrc(const char *m1, const char *m2);
++void cmdrc(const char *, const char *, const char *);
+ void env_init(void);
+ int getconnmode(void);
+ void init_network(void);
+--- a/telnet/externs.h
++++ b/telnet/externs.h
+@@ -48,9 +48,7 @@
+ typedef unsigned char cc_t;
+ #endif
+
+-#ifdef __linux__
+ #include <unistd.h> /* get _POSIX_VDISABLE */
+-#endif
+
+ #ifndef _POSIX_VDISABLE
+ #error "Please fix externs.h to define _POSIX_VDISABLE"
+@@ -60,7 +58,8 @@
+
+ extern int autologin; /* Autologin enabled */
+ extern int skiprc; /* Don't process the ~/.telnetrc file */
+-extern int eight; /* use eight bit mode (binary in and/or out */
++extern int eight; /* use eight bit mode (binary in and/or out) */
++extern int binary; /* use binary option (in and/or out) */
+ extern int flushout; /* flush output */
+ extern int connected; /* Are we connected to the other side? */
+ extern int globalmode; /* Mode tty should be in */
+@@ -225,6 +224,8 @@
+
+ //#if 0
+ extern struct termios new_tc;
++extern struct termios old_tc;
++
+
+ #define termEofChar new_tc.c_cc[VEOF]
+ #define termEraseChar new_tc.c_cc[VERASE]
diff --git a/telnet/patches/022-buffer_overflow_by_HOME.diff b/telnet/patches/022-buffer_overflow_by_HOME.diff
new file mode 100644
index 000000000..f9233c3d0
--- /dev/null
+++ b/telnet/patches/022-buffer_overflow_by_HOME.diff
@@ -0,0 +1,42 @@
+Description: Fix buffer overflow when $HOME is large.
+ Very long values of $HOME will extend beyond fixed rcbuf[128].
+ In its stead, use dynamic allocation.
+
+Author: Josh Martin
+Bug-Debian: http://bugs.debian.org/264846
+Comment: Introduced in netkit-telnet_0.17-25.
+Forwarded: no
+Last-Update: 2004-08-13
+
+--- netkit-telnet-0.17.orig/telnet/commands.cc
++++ netkit-telnet-0.17/telnet/commands.cc
+@@ -2139,22 +2139,18 @@
+ }
+
+ void cmdrc(const char *m1, const char *m2, const char *port) {
+- static char *rcname = 0;
+- static char rcbuf[128];
++ char *rcname = NULL;
+
+ if (skiprc) return;
+
+ readrc(m1, m2, port, "/etc/telnetrc");
+- if (rcname == 0) {
+- rcname = getenv("HOME");
+- if (rcname)
+- strcpy(rcbuf, rcname);
+- else
+- rcbuf[0] = '\0';
+- strcat(rcbuf, "/.telnetrc");
+- rcname = rcbuf;
+- }
++ if (asprintf (&rcname, "%s/.telnetrc", getenv ("HOME")) == -1)
++ {
++ perror ("asprintf");
++ return;
++ }
+ readrc(m1, m2, port, rcname);
++ free (rcname);
+ }
+
+ #if defined(IP_OPTIONS) && defined(HAS_IPPROTO_IP)
diff --git a/telnet/patches/024-can_2004-0911.diff b/telnet/patches/024-can_2004-0911.diff
new file mode 100644
index 000000000..558e717fe
--- /dev/null
+++ b/telnet/patches/024-can_2004-0911.diff
@@ -0,0 +1,40 @@
+Description: Fix remote DOS hole, CAN-2004-0911.
+ telnetd/utility.c (netwritebuf): Check that `listlen' is positive
+ before any action. Otherwise do nothing, just return.
+ .
+ Patch made public in bug report.
+
+Author: Herbert Xu
+Bug-Debian: http://bugs.debian.org/273694
+Comment: Introduced in ntekit-telnet_0.17-26.
+Forwarded: no
+Last-Update: 2004-07-27
+
+Index: netkit-telnet-0.17/telnetd/utility.c
+===================================================================
+RCS file: /home/gondolin/herbert/src/CVS/debian/netkit-telnet/telnetd/utility.c,v
+retrieving revision 1.8
+diff -u -r1.8 utility.c
+--- netkit-telnet-0.17/telnetd/utility.c 18 Jan 2002 09:13:36 -0000 1.8
++++ netkit-telnet-0.17/telnetd/utility.c 25 Sep 2004 01:22:51 -0000
+@@ -246,6 +246,9 @@
+ size_t len;
+ int ltrailing = trailing;
+
++ if (!listlen)
++ return;
++
+ vector = malloc(listlen * sizeof(struct iovec));
+ if (!vector) {
+ return;
+@@ -323,9 +326,7 @@
+ /* out of memory? */
+ cleanup(0);
+ }
+- if (listlen) {
+- netwritebuf();
+- }
++ netwritebuf();
+ }
+
+
diff --git a/telnet/patches/026-can_2005_0469.diff b/telnet/patches/026-can_2005_0469.diff
new file mode 100644
index 000000000..7c4c8024c
--- /dev/null
+++ b/telnet/patches/026-can_2005_0469.diff
@@ -0,0 +1,37 @@
+Description: Buffer overflow in LINEMODE suboptions, CAN-2005-0469.
+ telnet/telnet.cc (slc_add_reply): Check that sufficiently space
+ still is available beyond `slc_replyp'.
+ .
+ Extracted by comparison of netkit-telnet_0.17-18woody3,
+ netkit-telnet_0.17-29, and netkit-telnet-ssl_0.17.24+0.1-7.1.
+
+Author: Martin 'Joey' Schultze.
+Comment: Introduced in netkit-telnet_0.17-28.
+Forwarded: no
+Last-Update: 2015-01-26
+
+--- netkit-telnet-0.17.orig/telnet/telnet.cc
++++ netkit-telnet-0.17/telnet/telnet.cc
+@@ -1051,6 +1051,7 @@
+
+
+ unsigned char slc_reply[128];
++unsigned char const * const slc_reply_eom = &slc_reply[sizeof(slc_reply)];
+ unsigned char *slc_replyp;
+
+ void slc_start_reply(void) {
+@@ -1062,6 +1063,14 @@
+ }
+
+ void slc_add_reply(int func, int flags, int value) {
++ /* A sequence of up to 6 bytes my be written for this member of the SLC
++ * suboption list by this function. The end of negotiation command,
++ * which is written by slc_end_reply(), will require 2 additional
++ * bytes. Do not proceed unless there is sufficient space for these
++ * items.
++ */
++ if (&slc_replyp[6+2] > slc_reply_eom)
++ return;
+ if ((*slc_replyp++ = func) == IAC)
+ *slc_replyp++ = IAC;
+ if ((*slc_replyp++ = flags) == IAC)
diff --git a/telnet/patches/030-reject_invalid_port.diff b/telnet/patches/030-reject_invalid_port.diff
new file mode 100644
index 000000000..e4ea902f9
--- /dev/null
+++ b/telnet/patches/030-reject_invalid_port.diff
@@ -0,0 +1,35 @@
+Description: Reject invalid port numbers.
+ Check that any port number is within the range of a short integer.
+Author: Justin Pryzby
+Bug-Debian: http://bugs.debian.org/300273
+Comment: interdiff netkit-telnet_0.17-{29.34}.diff
+Forwarded: no
+Last-Update: 2005-10-09
+
+diff -u netkit-telnet-0.17/telnet/commands.cc netkit-telnet-0.17/telnet/commands.cc
+--- netkit-telnet-0.17/telnet/commands.cc
++++ netkit-telnet-0.17/telnet/commands.cc
+@@ -1747,8 +1747,22 @@
+ if (*portp == '-') {
+ portp++;
+ telnetport = 1;
+- } else
++ } else {
+ telnetport = 0;
++ if (*portp >='0' && *portp<='9') {
++ char *end;
++ long int p;
++
++ p=strtol(portp, &end, 10);
++ if (ERANGE==errno && (LONG_MIN==p || LONG_MAX==p)) {
++ fprintf(stderr, "telnet: port %s overflows\n", portp);
++ return 0;
++ } else if (p<=0 || p>=65536) {
++ fprintf(stderr, "telnet: port %s out of range\n", portp);
++ return 0;
++ }
++ }
++ }
+ }
+ else {
+ portp = "telnet";
diff --git a/telnet/patches/045-avoid_unsetting_term.diff b/telnet/patches/045-avoid_unsetting_term.diff
new file mode 100644
index 000000000..e003936ea
--- /dev/null
+++ b/telnet/patches/045-avoid_unsetting_term.diff
@@ -0,0 +1,20 @@
+Description: Avoid unsetting environment variable TERM.
+ Do not reset TERM to "UNKNOWN", when it is unknown in the local host.
+Author: Philippe Troin
+Bug-Debian: http://bugs.debian.org/237324
+Comment: interdiff netkit-telnet_0.17-{34,36}.diff
+Forwarded: no
+Last-Update: 2008-06-22
+
+diff -u netkit-telnet-0.17/telnet/telnet.cc netkit-telnet-0.17/telnet/telnet.cc
+--- netkit-telnet-0.17/telnet/telnet.cc
++++ netkit-telnet-0.17/telnet/telnet.cc
+@@ -640,7 +640,7 @@
+ if (resettermname) {
+ resettermname = 0;
+ tname = env_getvalue("TERM", 0);
+- if (!tname || my_setupterm(tname, 1, &err)) {
++ if (!tname /* || my_setupterm(tname, 1, &err) */) {
+ termbuf[0] = 0;
+ tname = "UNKNOWN";
+ }
diff --git a/telnet/patches/100-format_security_error.diff b/telnet/patches/100-format_security_error.diff
new file mode 100644
index 000000000..2e57181eb
--- /dev/null
+++ b/telnet/patches/100-format_security_error.diff
@@ -0,0 +1,53 @@
+Description: Format string is not a string literal.
+ Hardened builds are failing due to "-Werror=format-security".
+ Insertion of a trivial format string resolves the failure.
+Author: Mats Erik Andersson <debian(a)gisladisker.se>
+Forwarded: no
+Last-Update: 2015-01-09
+
+--- netkit-telnet-0.17/telnetd/utility.c.orig 2015-01-09 20:22:23.000000000 +0100
++++ netkit-telnet-0.17/telnetd/utility.c 2015-01-09 23:11:41.695499612 +0100
+@@ -890,17 +890,17 @@
+ case ENV_VAR:
+ if (pointer[1] == TELQUAL_SEND)
+ goto def_case;
+- netoprintf("\" VAR " + noquote);
++ netoprintf("%s", "\" VAR " + noquote);
+ noquote = 2;
+ break;
+
+ case ENV_VALUE:
+- netoprintf("\" VALUE " + noquote);
++ netoprintf("%s", "\" VALUE " + noquote);
+ noquote = 2;
+ break;
+
+ case ENV_ESC:
+- netoprintf("\" ESC " + noquote);
++ netoprintf("%s", "\" ESC " + noquote);
+ noquote = 2;
+ break;
+
+--- netkit-telnet-0.17/telnet/utilities.cc.orig 2015-01-09 20:22:23.000000000 +0100
++++ netkit-telnet-0.17/telnet/utilities.cc 2015-01-09 23:33:05.219513739 +0100
+@@ -583,17 +583,17 @@
+ case ENV_VAR:
+ if (pointer[1] == TELQUAL_SEND)
+ goto def_case;
+- fprintf(NetTrace, "\" VAR " + noquote);
++ fprintf(NetTrace, "%s", "\" VAR " + noquote);
+ noquote = 2;
+ break;
+
+ case ENV_VALUE:
+- fprintf(NetTrace, "\" VALUE " + noquote);
++ fprintf(NetTrace, "%s", "\" VALUE " + noquote);
+ noquote = 2;
+ break;
+
+ case ENV_ESC:
+- fprintf(NetTrace, "\" ESC " + noquote);
++ fprintf(NetTrace, "%s", "\" ESC " + noquote);
+ noquote = 2;
+ break;
+
diff --git a/telnet/patches/110-markup_errors.diff b/telnet/patches/110-markup_errors.diff
new file mode 100644
index 000000000..8509eee68
--- /dev/null
+++ b/telnet/patches/110-markup_errors.diff
@@ -0,0 +1,69 @@
+Description: Nit picking on troff macros.
+ Annoying misprints which Lintian complains on.
+ .
+ A minor inconsistency bug, misnaming the original escape character.
+Author: Mats Erik Andersson <debian(a)gisladisker.se>
+Bug-Debian: http://bugs.debian.org/676258
+Forwarded: no
+Last-Update: 2015-01-10
+
+--- netkit-telnet-0.17/telnet/telnet.1.orig 2015-01-09 20:22:23.000000000 +0100
++++ netkit-telnet-0.17/telnet/telnet.1 2015-01-10 01:35:37.775594668 +0100
+@@ -711,7 +711,7 @@
+ .It Ic escape
+ This is the
+ .Nm telnet
+-escape character (initially \*(Lq^[\*(Rq) which causes entry
++escape character (initially \*(Lq^]\*(Rq) which causes entry
+ into
+ .Nm telnet
+ command mode (when connected to a remote system).
+@@ -1167,10 +1167,12 @@
+ is sent as
+ .Ic abort ,
+ and
+-.Ic eof and
+-.B suspend
++.Ic eof
++and
++.Ic suspend
+ are sent as
+-.Ic eof and
++.Ic eof
++and
+ .Ic susp ,
+ see
+ .Ic send
+--- netkit-telnet-0.17/telnetd/issue.net.5.orig 2015-01-09 20:22:23.000000000 +0100
++++ netkit-telnet-0.17/telnetd/issue.net.5 2015-01-10 01:01:20.827572027 +0100
+@@ -22,7 +22,7 @@
+ - show the current tty
+ .It %h
+ - show the system node name (FQDN)
+-.It %D
++.It \&%D
+ - show the name of the NIS domain
+ .It %d
+ - show the current time and date
+--- netkit-telnet-0.17/telnetd/telnetd.8.orig 2015-01-09 20:22:23.000000000 +0100
++++ netkit-telnet-0.17/telnetd/telnetd.8 2015-01-10 00:30:52.891551907 +0100
+@@ -261,7 +261,7 @@
+ .Ed
+ .Pp
+ The pseudo-terminal allocated to the client is configured
+-to operate in \*(lqcooked\*(rq mode, and with
++to operate in \*(Lqcooked\*(Rq mode, and with
+ .Dv XTABS
+ .Dv CRMOD
+ enabled (see
+--- netkit-telnet-0.17/telnetlogin/telnetlogin.8.orig 2015-01-09 20:22:23.000000000 +0100
++++ netkit-telnet-0.17/telnetlogin/telnetlogin.8 2015-01-10 01:18:25.835583309 +0100
+@@ -60,7 +60,7 @@
+ accepts only the subset of options to
+ .Xr login 1
+ shown above, in the order listed. This is the order
+-.Nm telnetd 8
++.Xr telnetd 8
+ normally provides them in.
+ .Nm telnetlogin
+ also does sanity checks on the environment variables
diff --git a/telnet/patches/120-some_protocol_refinement.diff b/telnet/patches/120-some_protocol_refinement.diff
new file mode 100644
index 000000000..752e63207
--- /dev/null
+++ b/telnet/patches/120-some_protocol_refinement.diff
@@ -0,0 +1,351 @@
+Description: Selected protocol refinement.
+ Let the manual pages express NEW-ENVIRON as the only
+ supported environment mechanism.
+ .
+ Let the diagnostic printout correctly identify the observed
+ modi of local flow control.
+ .
+ Let the server in debug mode correctly decode only the suboption
+ part of a status response, by ignoring the initial `IAC SB'.
+ .
+ Let the server and client decode suboptions containing also ENV_USERVAR
+ in addition to the already known ENV_VAR.
+ .
+ Make the command `status' be as verbose as in other clients.
+ .
+ Several calls to printsub() were missing in `telnet.cc', thus failing
+ to display options that the client sends to the server. Instead only
+ the received responses were display in some few negotiations, namely
+ TELOPT_TTYPE, TELOPT_TSPEED, TELOPT_XDISPLOC and TELOPT_LINEMODE
+
+Author: Mats Erik Andersson <debian(a)gisladisker.se>
+Forwarded: no
+Last-Update: 2015-03-09
+
+--- netkit-telnet-0.17/telnet/telnet.1.orig 2015-01-10 01:35:37.775594668 +0100
++++ netkit-telnet-0.17/telnet/telnet.1 2015-01-13 22:22:47.371626252 +0100
+@@ -90,7 +90,7 @@
+ .Ev USER
+ variable
+ of the
+-.Ev ENVIRON
++.Ev NEW-ENVIRON
+ option if supported by the remote system. The username is retrieved
+ via
+ .Xr getlogin 3 .
+@@ -131,7 +131,7 @@
+ sending the specified name as the
+ .Dv USER
+ environment variable, so it requires that the remote system support the
+-.Ev TELNET ENVIRON
++.Ev TELNET NEW-ENVIRON
+ option. This option implies the
+ .Fl a
+ option, and may also be used with the
+@@ -327,7 +327,7 @@
+ command is used to propagate environment variables across the
+ .Nm telnet
+ link using the
+-.Dv TELNET ENVIRON
++.Dv TELNET NEW-ENVIRON
+ protocol option.
+ All variables exported from the shell are defined, but only the
+ .Ev DISPLAY
+@@ -1044,7 +1044,7 @@
+ attempts to use it to perform automatic authentication. If the
+ .Dv TELNET AUTHENTICATION
+ option is not supported, the user's login name is propagated using the
+-.Dv TELNET ENVIRON
++.Dv TELNET NEW-ENVIRON
+ option.
+ Setting this flag is the same as specifying the
+ .Ar a
+@@ -1255,7 +1255,7 @@
+ environment variables.
+ Other environment variables may be propagated
+ to the other side via the
+-.Dv TELNET ENVIRON
++.Dv TELNET NEW-ENVIRON
+ option.
+ .Sh FILES
+ .Bl -tag -width /etc/telnetrc -compact
+--- netkit-telnet-0.17/telnetd/telnetd.8.orig 2015-01-10 00:30:52.891551907 +0100
++++ netkit-telnet-0.17/telnetd/telnetd.8 2015-01-13 23:06:04.039624516 +0100
+@@ -250,7 +250,6 @@
+ DO TSPEED
+ DO XDISPLOC
+ DO NEW-ENVIRON
+-DO ENVIRON
+ WILL SUPPRESS GO AHEAD
+ DO ECHO
+ DO LINEMODE
+@@ -372,9 +371,6 @@
+ .It "DO NEW-ENVIRON"
+ Indicates a desire to be able to request environment
+ variable information, as described in RFC 1572.
+-.It "DO ENVIRON"
+-Indicates a desire to be able to request environment
+-variable information, as described in RFC 1408.
+ .It "DO LINEMODE"
+ Only sent if
+ .Nm telnetd
+--- netkit-telnet-0.17/telnet/utilities.cc.orig 2015-01-09 23:33:05.219513739 +0100
++++ netkit-telnet-0.17/telnet/utilities.cc 2015-03-09 15:07:32.965473513 +0100
+@@ -335,10 +335,14 @@
+ break;
+ }
+ switch (pointer[1]) {
+- case 0:
++ case LFLOW_OFF:
+ fprintf(NetTrace, " OFF"); break;
+- case 1:
++ case LFLOW_ON:
+ fprintf(NetTrace, " ON"); break;
++ case LFLOW_RESTART_ANY:
++ fprintf(NetTrace, " RESTART-ANY"); break;
++ case LFLOW_RESTART_XON:
++ fprintf(NetTrace, " RESTART-XON"); break;
+ default:
+ fprintf(NetTrace, " %d (unknown)", pointer[1]);
+ }
+@@ -454,7 +458,7 @@
+ pointer[2]&MODE_SOFT_TAB ? "|SOFT_TAB" : "",
+ pointer[2]&MODE_LIT_ECHO ? "|LIT_ECHO" : "",
+ pointer[2]&MODE_ACK ? "|ACK" : "");
+- fprintf(NetTrace, "%s", tbuf[1] ? &tbuf[1] : "0");
++ fprintf(NetTrace, "%s", tbuf[0] ? &tbuf[1] : "0");
+ }
+ if (pointer[2]&~(MODE_MASK))
+ fprintf(NetTrace, " (0x%x)", pointer[2]);
+@@ -580,10 +584,14 @@
+ register int noquote = 2;
+ for (i = 2; i < length; i++ ) {
+ switch (pointer[i]) {
++ case ENV_USERVAR:
+ case ENV_VAR:
+ if (pointer[1] == TELQUAL_SEND)
+ goto def_case;
+- fprintf(NetTrace, "%s", "\" VAR " + noquote);
++ if (pointer[i] == ENV_VAR)
++ fprintf(NetTrace, "%s", "\" VAR " + noquote);
++ else
++ fprintf(NetTrace, "%s", "\" USERVAR " + noquote);
+ noquote = 2;
+ break;
+
+@@ -624,7 +632,7 @@
+ if (TELOPT_OK(pointer[0]))
+ fprintf(NetTrace, "%s (unknown)", TELOPT(pointer[0]));
+ else
+- fprintf(NetTrace, "%d (unknown)", pointer[i]);
++ fprintf(NetTrace, "%d (unknown)", pointer[0]);
+ for (i = 1; i < length; i++)
+ fprintf(NetTrace, " %d", pointer[i]);
+ break;
+--- netkit-telnet-0.17/telnetd/utility.c.orig 2015-01-09 23:11:41.695499612 +0100
++++ netkit-telnet-0.17/telnetd/utility.c 2015-01-14 18:03:48.552691379 +0100
+@@ -643,10 +643,14 @@
+ break;
+ }
+ switch (pointer[1]) {
+- case 0:
++ case LFLOW_OFF:
+ netoprintf(" OFF"); break;
+- case 1:
++ case LFLOW_ON:
+ netoprintf(" ON"); break;
++ case LFLOW_RESTART_ANY:
++ netoprintf(" RESTART-ANY"); break;
++ case LFLOW_RESTART_XON:
++ netoprintf(" RESTART-XON"); break;
+ default:
+ netoprintf(" %d (unknown)", pointer[1]);
+ }
+@@ -792,15 +796,6 @@
+ netoprintf("STATUS");
+
+ switch (pointer[1]) {
+- default:
+- if (pointer[1] == TELQUAL_SEND)
+- netoprintf(" SEND");
+- else
+- netoprintf(" %d (unknown)", pointer[1]);
+- for (i = 2; i < length; i++) {
+- netoprintf(" ?%d?", pointer[i]);
+- }
+- break;
+ case TELQUAL_IS:
+ netoprintf(" IS\r\n");
+
+@@ -852,6 +847,15 @@
+ }
+ }
+ break;
++ default:
++ if (pointer[1] == TELQUAL_SEND)
++ netoprintf(" SEND");
++ else
++ netoprintf(" %d (unknown)", pointer[1]);
++ for (i = 2; i < length; i++) {
++ netoprintf(" ?%d?", pointer[i]);
++ }
++ break;
+ }
+ break;
+ }
+@@ -887,10 +891,14 @@
+ register int noquote = 2;
+ for (i = 2; i < length; i++ ) {
+ switch (pointer[i]) {
++ case ENV_USERVAR:
+ case ENV_VAR:
+ if (pointer[1] == TELQUAL_SEND)
+ goto def_case;
+- netoprintf("%s", "\" VAR " + noquote);
++ if (pointer[i] == ENV_VAR)
++ netoprintf("%s", "\" VAR " + noquote);
++ else
++ netoprintf("%s", "\" USERVAR " + noquote);
+ noquote = 2;
+ break;
+
+@@ -1080,7 +1088,7 @@
+ if (TELOPT_OK(pointer[0]))
+ netoprintf("%s (unknown)", TELOPT(pointer[0]));
+ else
+- netoprintf("%d (unknown)", pointer[i]);
++ netoprintf("%d (unknown)", pointer[0]);
+ for (i = 1; i < length; i++) {
+ netoprintf(" %d", pointer[i]);
+ }
+--- netkit-telnet-0.17/telnet/commands.cc.orig 2015-01-09 20:22:23.000000000 +0100
++++ netkit-telnet-0.17/telnet/commands.cc 2015-01-21 23:20:17.488735411 +0100
+@@ -1605,7 +1605,7 @@
+ }
+
+ static int status(void) {
+- int notmuch = 1;
++ int notmuch = 0;
+ return dostatus(notmuch);
+ }
+
+--- netkit-telnet-0.17/telnet/telnet.cc.orig 2015-01-09 20:22:23.000000000 +0100
++++ netkit-telnet-0.17/telnet/telnet.cc 2015-01-22 14:34:01.402828217 +0100
+@@ -684,6 +684,15 @@
+ name = gettermname();
+ netoring.xprintf("%c%c%c%c%s%c%c", IAC, SB, TELOPT_TTYPE,
+ TELQUAL_IS, name, IAC, SE);
++ {
++ unsigned char tbuf[7 + 20]; /* 20 chars for terminal name. */
++ int len;
++
++ len = snprintf((char *) tbuf, sizeof(tbuf), "%c%c%c%c%s%c%c",
++ IAC, SB, TELOPT_TTYPE, TELQUAL_IS, name, IAC, SE);
++ if (len > 6 && len < sizeof(tbuf))
++ printsub('>', &tbuf[2], len - 2);
++ }
+ }
+ break;
+ case TELOPT_TSPEED:
+@@ -696,6 +705,16 @@
+ TerminalSpeeds(&iispeed, &oospeed);
+ netoring.xprintf("%c%c%c%c%ld,%ld%c%c", IAC, SB, TELOPT_TSPEED,
+ TELQUAL_IS, oospeed, iispeed, IAC, SE);
++ {
++ unsigned char tbuf[8 + 20]; /* 20 characters for two speeds. */
++ int len;
++
++ len = snprintf((char *) tbuf, sizeof(tbuf), "%c%c%c%c%ld,%ld%c%c",
++ IAC, SB, TELOPT_TSPEED, TELQUAL_IS,
++ oospeed, iispeed, IAC, SE);
++ if (len > 7 && len < sizeof(tbuf))
++ printsub('>', &tbuf[2], len - 2);
++ }
+ }
+ break;
+ case TELOPT_LFLOW:
+@@ -783,6 +802,15 @@
+ }
+ netoring.xprintf("%c%c%c%c%s%c%c", IAC, SB, TELOPT_XDISPLOC,
+ TELQUAL_IS, dp, IAC, SE);
++ {
++ unsigned char tbuf[7 + 30]; /* 30 chars for display name. */
++ int len;
++
++ len = snprintf((char *) tbuf, sizeof(tbuf), "%c%c%c%c%s%c%c",
++ IAC, SB, TELOPT_XDISPLOC, TELQUAL_IS, dp, IAC, SE);
++ if (len > 6 && len < sizeof(tbuf))
++ printsub('>', &tbuf[2], len - 2);
++ }
+ }
+ break;
+
+@@ -801,6 +829,14 @@
+
+ netoring.xprintf("%c%c%c%c%c%c%c", IAC, SB, TELOPT_LINEMODE,
+ DONT, cmd[0], IAC, SE);
++ {
++ unsigned char tbuf[8];
++ int len;
++
++ len = snprintf((char *) tbuf, sizeof(tbuf), "%c%c%c%c%c%c%c",
++ IAC, SB, TELOPT_LINEMODE, DONT, cmd[0], IAC, SE);
++ printsub('>', &tbuf[2], len - 2);
++ }
+ }
+
+ void lm_wont(unsigned char * /*cmd*/, int len) {
+@@ -818,6 +854,14 @@
+ }
+ netoring.xprintf("%c%c%c%c%c%c%c", IAC, SB, TELOPT_LINEMODE,
+ WONT, cmd[0], IAC, SE);
++ {
++ unsigned char tbuf[8];
++ int len;
++
++ len = snprintf((char *) tbuf, sizeof(tbuf), "%c%c%c%c%c%c%c",
++ IAC, SB, TELOPT_LINEMODE, WONT, cmd[0], IAC, SE);
++ printsub('>', &tbuf[2], len - 2);
++ }
+ }
+
+ void lm_dont(unsigned char * /*cmd*/, int len) {
+@@ -841,6 +885,14 @@
+
+ netoring.xprintf("%c%c%c%c%c%c%c", IAC, SB, TELOPT_LINEMODE, LM_MODE,
+ k, IAC, SE);
++ {
++ unsigned char tbuf[8];
++ int len;
++
++ len = snprintf((char *) tbuf, sizeof(tbuf), "%c%c%c%c%c%c%c",
++ IAC, SB, TELOPT_LINEMODE, LM_MODE, k, IAC, SE);
++ printsub('>', &tbuf[2], len - 2);
++ }
+
+ setconnmode(0); /* set changed mode */
+ }
+@@ -933,14 +985,23 @@
+ }
+
+ void slc_import(int def) {
++ unsigned char cmd, tbuf[10];
++ int len;
++
+ if (def) {
++ cmd = SLC_DEFAULT;
+ netoring.xprintf("%c%c%c%c%c%c%c%c%c", IAC, SB, TELOPT_LINEMODE,
+ LM_SLC, 0, SLC_DEFAULT, 0, IAC, SE);
+ }
+ else {
++ cmd = SLC_VARIABLE;
+ netoring.xprintf("%c%c%c%c%c%c%c%c%c", IAC, SB, TELOPT_LINEMODE,
+ LM_SLC, 0, SLC_VARIABLE, 0, IAC, SE);
+ }
++
++ len = snprintf((char *) tbuf, sizeof(tbuf), "%c%c%c%c%c%c%c%c%c",
++ IAC, SB, TELOPT_LINEMODE, LM_SLC, 0, cmd, 0, IAC, SE);
++ printsub('>', &tbuf[2], len - 2);
+ }
+
+ void slc_export(void) {
diff --git a/telnet/patches/124-support_uservar.diff b/telnet/patches/124-support_uservar.diff
new file mode 100644
index 000000000..a4f919e01
--- /dev/null
+++ b/telnet/patches/124-support_uservar.diff
@@ -0,0 +1,170 @@
+Description: Support user variables in environment.
+ Include conditionally protected code, allowing the server to accept
+ variables from the client marked as user defined, i.e., ENV_USERVAR,
+ into the environment. The code is made active by the compiler macro
+ ACCEPT_USERVAR. This would let clients from Solaris and FreeBSD set
+ variables exported by the user.
+ [telnetd/state.c (suboption)]
+ .
+ Fix incorrect offset while diagnostically printing suboptions.
+ [telnetd/state.c (send_status)]
+ .
+ Add LANG and LC_* to the list of acceptable environment variables.
+ [telnetd/state.c (envvarok)]
+ .
+ Let the client executable announce most environment variables as user
+ defined, i.e., as ENV_USERVAR. A new function wellknown_var() checks
+ whether a proposed variable name is known well enough to be kept as
+ ENV_VAR, thus nominally undergo more scrutiny at the server's end.
+ These addition are also conditioned by the macro ACCEPT_USERVAR:
+ [telnet/telnet.cc (env_opt_add)]
+
+Author: Mats Erik Andersson <debian(a)gisladisker.se>
+Bug-Debian: http://bugs.debian.org/237268
+Forwarded: no
+Last-Update: 2015-03-09
+
+--- netkit-telnet-0.17/telnetd/state.c.orig 2015-01-09 20:22:23.000000000 +0100
++++ netkit-telnet-0.17/telnetd/state.c 2015-03-07 13:53:41.241039630 +0100
+@@ -1157,7 +1157,7 @@
+ } /* end of case TELOPT_XDISPLOC */
+
+ case TELOPT_ENVIRON: {
+- register int c;
++ register int c, is_uservar = 0;
+ register char *cp, *varp, *valp;
+
+ if (SB_EOF())
+@@ -1168,12 +1168,17 @@
+ else if (c != TELQUAL_INFO)
+ return;
+
+- while (!SB_EOF() && SB_GET() != ENV_VAR)
+- ;
++ while (!SB_EOF()) {
++ c = SB_GET();
++ if (c == ENV_VAR || c == ENV_USERVAR)
++ break;
++ }
+
+ if (SB_EOF())
+ return;
+
++ is_uservar = (c == ENV_USERVAR) ? 1 : 0;
++
+ cp = varp = (char *)subpointer;
+ valp = 0;
+
+@@ -1184,14 +1189,20 @@
+ cp = valp = (char *)subpointer;
+ break;
+
++ case ENV_USERVAR:
+ case ENV_VAR:
+ *cp = '\0';
+- if (envvarok(varp)) {
++ if (envvarok(varp)
++#ifdef ACCEPT_USERVAR
++ || is_uservar
++#endif
++ ) {
+ if (valp)
+ (void)setenv(varp, valp, 1);
+ else
+ unsetenv(varp);
+ }
++ is_uservar = (c == ENV_USERVAR) ? 1 : 0;
+ cp = varp = (char *)subpointer;
+ valp = 0;
+ break;
+@@ -1208,7 +1219,11 @@
+ }
+ }
+ *cp = '\0';
+- if (envvarok(varp)) {
++ if (envvarok(varp)
++#ifdef ACCEPT_USERVAR
++ || is_uservar
++#endif
++ ) {
+ if (valp)
+ (void)setenv(varp, valp, 1);
+ else
+@@ -1367,7 +1382,7 @@
+ writenet(statusbuf, ncp - statusbuf);
+ netflush(); /* Send it on its way */
+
+- DIAG(TD_OPTIONS, {printsub('>', statusbuf, ncp - statusbuf); netflush();});
++ DIAG(TD_OPTIONS, {printsub('>', statusbuf + 2, ncp - statusbuf - 2); netflush();});
+ }
+
+ /* check that variable is safe to pass to login or shell */
+@@ -1399,6 +1414,8 @@ static int envvarok(char *varp) {
+ if (!strcmp(varp, "USER")) return 1;
+ if (!strcmp(varp, "LOGNAME")) return 1;
+ if (!strcmp(varp, "POSIXLY_CORRECT")) return 1;
++ if (!strcmp(varp, "LANG")) return 1;
++ if (!strncmp(varp, "LC_", 3)) return 1;
+
+ /* optionally syslog(LOG_INFO) here */
+ return 0;
+--- netkit-telnet-0.17/telnet/telnet.cc.orig 2015-01-09 20:22:23.000000000 +0100
++++ netkit-telnet-0.17/telnet/telnet.cc 2015-03-09 14:35:22.513396375 +0100
+@@ -1213,6 +1213,40 @@ void env_opt(unsigned char *buf, int len
+ }
+ }
+
++#ifdef ACCEPT_USERVAR
++namespace {
++ const struct stems {
++ const char *stem; /* Initial part, or a full name. */
++ const int len; /* Naught indicates a full name. */
++ } wellknown_stems[] = {
++ { "ACCT", 0 },
++ { "DISPLAY", 0 },
++ { "JOB", 0 },
++ { "LANG", 0 },
++ { "LC_", 3 },
++ { "LOGNAME", 0 },
++ { "POSIXLY_CORRECT", 0 },
++ { "PRINTER", 0 },
++ { "SSH_", 4 },
++ { "SYSTEMTYPE", 0 },
++ { "TERM", 0 },
++ { "USER", 0 },
++ { "XAUTHORITY", 0 },
++ { NULL, 0 }
++ };
++
++ int wellknown_var(const char *name) {
++ const stems *stem;
++ for (stem = wellknown_stems; stem->stem != NULL; stem++)
++ if ((stem->len ? strncmp(name, stem->stem, stem->len)
++ : strcmp(name, stem->stem)) == 0)
++ return 1;
++
++ return 0;
++ }
++} /* Anonymous namespace */
++#endif /* ACCEPT_USERVAR */
++
+ /* OPT_REPLY_SIZE must be a multiple of 2. */
+ #define OPT_REPLY_SIZE 256
+ unsigned char *opt_reply;
+@@ -1273,7 +1307,16 @@ void env_opt_add(const char *ep) {
+ opt_replyp = opt_reply + len - (opt_replyend - opt_replyp);
+ opt_replyend = opt_reply + len;
+ }
++
++#ifdef ACCEPT_USERVAR
++ if (wellknown_var(ep))
++ *opt_replyp++ = ENV_VAR;
++ else
++ *opt_replyp++ = ENV_USERVAR;
++#else /* !ACCEPT_USERVAR */
+ *opt_replyp++ = ENV_VAR;
++#endif
++
+ for (;;) {
+ while ((c = *ep++)!=0) {
+ switch(c) {
diff --git a/telnet/patches/130-drain_input_from_child.diff b/telnet/patches/130-drain_input_from_child.diff
new file mode 100644
index 000000000..e756096b7
--- /dev/null
+++ b/telnet/patches/130-drain_input_from_child.diff
@@ -0,0 +1,135 @@
+Description: Drain input stream from child process.
+ When the server process receives SIGCHILD, there might
+ well be data pending in the PTY buffer, intended for
+ the client waiting eagerly at the network link.
+ .
+ Replace the old signal handler for SIGCHILD with a simpler
+ version that sets a semaphor. That semaphor is then sampled
+ at a suitable time during the I/O main loop, and execution
+ is transferred to the old handler after flushing the queue.
+ .
+ In the original signal handler, call waitpid() in order to
+ remove the child process from the kernel's process list.
+ .
+ Make some small adjustment to debugging output.
+Author: Mats Erik Andersson <debian(a)gisladisker.se>
+Bug-Debian: http://bugs.debian.org/607415
+Forwarded: no
+Last-Update: 2015-01-20
+
+--- netkit-telnet-0.17/telnetd/sys_term.c.orig 2015-01-09 20:22:23.000000000 +0100
++++ netkit-telnet-0.17/telnetd/sys_term.c 2015-03-07 15:44:01.185237034 +0100
+@@ -39,6 +39,8 @@
+
+ #include <utmp.h>
+
++#include <sys/wait.h>
++
+ #include "telnetd.h"
+ #include "pathnames.h"
+
+@@ -720,11 +722,16 @@
+ * clean up anything that needs to be cleaned up.
+ */
+ void cleanup(int sig) {
++ int stat = 0;
+ const char *p;
+- (void)sig;
++
++ if (sig == SIGCHLD) {
++ if (waitpid(-1, &stat, WNOHANG) > 0)
++ stat = WEXITSTATUS(stat);
++ }
+
+ p = line + sizeof("/dev/") - 1;
+ if (logout(p)) logwtmp(p, "", "");
+ shutdown(net, 2);
+- exit(0);
++ exit(stat);
+ }
+--- netkit-telnet-0.17/telnetd/telnetd.c.orig 2015-01-09 20:22:23.000000000 +0100
++++ netkit-telnet-0.17/telnetd/telnetd.c 2015-01-20 13:59:40.625777998 +0100
+@@ -92,9 +92,17 @@
+ char *loginprg = _PATH_LOGIN;
+ #endif
+
++static int got_sigchld = 0;
++
+ extern void usage(void);
+
+ static void
++catch_sigchld(int sig)
++{
++ got_sigchld = 1;
++}
++
++static void
+ wait_for_connection(const char *service)
+ {
+ struct addrinfo hints;
+@@ -870,9 +878,9 @@
+ */
+ signal(SIGTTOU, SIG_IGN);
+ #endif
+-
+- signal(SIGCHLD, cleanup);
+-
++
++ signal(SIGCHLD, catch_sigchld);
++
+ #ifdef TIOCNOTTY
+ {
+ register int t;
+@@ -1091,6 +1099,11 @@
+ ptyibuf[0] & TIOCPKT_DOSTOP ? 1 : 0,
+ IAC, SE);
+ }
++
++ DIAG((TD_REPORT | TD_PTYDATA),
++ netoprintf("td: ptyread %d chars\r\n", pcc););
++ DIAG(TD_PTYDATA, printdata("pd", ptyibuf, pcc));
++
+ pcc--;
+ ptyip = ptyibuf+1;
+ }
+@@ -1116,6 +1129,11 @@
+ telrcv();
+ if (FD_ISSET(p, &obits) && (pfrontp - pbackp) > 0)
+ ptyflush();
++
++ if (got_sigchld) {
++ netflush();
++ cleanup(SIGCHLD); /* Not returning. */
++ }
+ }
+ cleanup(0);
+ } /* end of telnet */
+--- netkit-telnet-0.17/telnetd/utility.c.orig 2015-01-14 18:03:48.552691379 +0100
++++ netkit-telnet-0.17/telnetd/utility.c 2015-01-19 16:06:55.783013012 +0100
+@@ -1110,7 +1110,7 @@
+ /* add a line of output */
+ netoprintf("%s: ", tag);
+ for (i = 0; i < 20 && cnt; i++) {
+- netoprintf("%02x", *ptr);
++ netoprintf("%02x", (unsigned char) *ptr);
+ if (isprint(*ptr)) {
+ xbuf[i] = *ptr;
+ } else {
+--- netkit-telnet-0.17/telnetd/telnetd.8.orig 2015-01-13 23:06:04.039624516 +0100
++++ netkit-telnet-0.17/telnetd/telnetd.8 2015-01-20 14:35:13.973804769 +0100
+@@ -124,12 +124,13 @@
+ program.
+ .El
+ .It Fl D Ar debugmode
+-This option may be used for debugging purposes. This allows
++This option may be used for debugging purposes. It allows
+ .Nm telnetd
+ to print out debugging information to the connection, allowing the
+ user to see what
+ .Nm telnetd
+-is doing. There are several possible values for
++is doing. Repeated use of the option arranges composite debug reports.
++There are several possible values for
+ .Ar debugmode:
+ .Bl -tag -width exercise
+ .It Cm options
diff --git a/telnet/patches/140-telnetlogin_name_check.diff b/telnet/patches/140-telnetlogin_name_check.diff
new file mode 100644
index 000000000..945a4c1df
--- /dev/null
+++ b/telnet/patches/140-telnetlogin_name_check.diff
@@ -0,0 +1,19 @@
+Description: Logical error in host name check.
+ Mutually exclusive conditions were juxtaposed with logical AND,
+ resulting in a test never being effective.
+Author: Ian Beckwith <ianb(a)debian.org>
+Comment: Incorporated from netkit-telnet-ssl.
+Forwarded: no
+Last Update: 2015-01-30
+
+--- netkit-telnet-0.17.orig/telnetlogin/telnetlogin.c
++++ netkit-telnet-0.17/telnetlogin/telnetlogin.c
+@@ -76,7 +76,7 @@
+ int i=0;
+ /* should we check length? */
+ for (i=0; hname[i]; i++) {
+- if (hname[i]<=32 && hname[i]>126) return -1;
++ if ((hname[i]<=32) || (hname[i]>126)) return -1;
+ }
+ return 0;
+ }
diff --git a/telnet/patches/142-numeric_hosts.diff b/telnet/patches/142-numeric_hosts.diff
new file mode 100644
index 000000000..45299390c
--- /dev/null
+++ b/telnet/patches/142-numeric_hosts.diff
@@ -0,0 +1,76 @@
+Description: Resolve remote host as numeric host identifier.
+ Implement a new switch '-N' in the server, avoiding reverse DNS
+ resolution and instead registering a numeric host representation.
+ The environment variable REMOTEHOST is set to this numeric address.
+ .
+ The change could be of benefit in PAM rules for access control as well
+ as for accounting and tracing of network activity. In addition, the use
+ of '-N' mitigates cases when a hostile third party might have gained
+ control of reverse DNS resolution and is trying to inject fake answers.
+
+Author: Dean Gaudet
+Bug-Debian: http://bugs.debian.org/258371
+Comment: The patch was first applied to netkit-telnet-ssl.
+Last-Update: 2004-12-05
+
+--- netkit-telnet-0.17/telnetd/telnetd.c.orig
++++ netkit-telnet-0.17/telnetd/telnetd.c
+@@ -86,6 +86,7 @@ int hostinfo = 1; /* do we print login
+
+ int debug = 0;
+ int keepalive = 1;
++int numeric_hosts = 0;
+ #ifdef LOGIN_WRAPPER
+ char *loginprg = LOGIN_WRAPPER;
+ #else
+@@ -220,7 +221,7 @@ main(int argc, char *argv[], char *env[]
+ pfrontp = pbackp = ptyobuf;
+ netip = netibuf;
+
+- while ((ch = getopt(argc, argv, "d:a:e:lhnr:I:D:B:sS:a:X:L:")) != EOF) {
++ while ((ch = getopt(argc, argv, "d:a:e:lhnNr:I:D:B:sS:a:X:L:")) != EOF) {
+ switch(ch) {
+
+ #ifdef AUTHENTICATE
+@@ -319,6 +320,10 @@ main(int argc, char *argv[], char *env[]
+ keepalive = 0;
+ break;
+
++ case 'N':
++ numeric_hosts = 1;
++ break;
++
+ #ifdef SecurID
+ case 's':
+ /* SecurID required */
+@@ -680,7 +685,8 @@ doit(struct sockaddr *who, socklen_t who
+
+ /* get name of connected client */
+ if (getnameinfo(who, who_len, remote_host_name,
+- sizeof(remote_host_name), 0, 0, 0)) {
++ sizeof(remote_host_name), 0, 0,
++ numeric_hosts ? NI_NUMERICHOST : 0)) {
+ syslog(LOG_ERR, "doit: getnameinfo: %m");
+ *remote_host_name = 0;
+ }
+--- netkit-telnet-0.17/telnetd/telnetd.8.orig
++++ netkit-telnet-0.17/telnetd/telnetd.8
+@@ -42,7 +42,7 @@
+ protocol server
+ .Sh SYNOPSIS
+ .Nm /usr/sbin/in.telnetd
+-.Op Fl hns
++.Op Fl hnNs
+ .Op Fl a Ar authmode
+ .Op Fl D Ar debugmode
+ .Op Fl L Ar loginprg
+@@ -176,6 +176,9 @@
+ if the client is still there, so that idle connections
+ from machines that have crashed or can no longer
+ be reached may be cleaned up.
++.It Fl N
++Disable reverse DNS lookups and use the numeric IP address in logs
++and REMOTEHOST environment variable.
+ .It Fl s
+ This option is only enabled if
+ .Nm telnetd
diff --git a/telnet/patches/netkit-telnet-0.17-ipv6.diff b/telnet/patches/netkit-telnet-0.17-ipv6.diff
deleted file mode 100644
index e3719f1f5..000000000
--- a/telnet/patches/netkit-telnet-0.17-ipv6.diff
+++ /dev/null
@@ -1,265 +0,0 @@
-diff -uNr netkit-telnet-0.17/telnetd/telnetd.c netkit-telnet-0.17.ipv6/telnetd/telnetd.c
---- netkit-telnet-0.17/telnetd/telnetd.c 2006-07-13 08:37:18.000000000 +0200
-+++ netkit-telnet-0.17.ipv6/telnetd/telnetd.c 2006-07-14 08:36:11.000000000 +0200
-@@ -49,6 +49,7 @@
- /* #include <netinet/ip.h> */ /* Don't think this is used at all here */
- #include <arpa/inet.h>
- #include <assert.h>
-+#include <sys/poll.h>
- #include "telnetd.h"
- #include "pathnames.h"
- #include "setproctitle.h"
-@@ -68,7 +69,7 @@
- #define HAS_IPPROTO_IP
- #endif
-
--static void doit(struct sockaddr_in *who);
-+static void doit(struct sockaddr *who, socklen_t wholen);
- static int terminaltypeok(const char *s);
-
- /*
-@@ -90,7 +91,7 @@
- int
- main(int argc, char *argv[], char *env[])
- {
-- struct sockaddr_in from;
-+ struct sockaddr from;
- int on = 1;
- socklen_t fromlen;
- register int ch;
-@@ -248,64 +249,89 @@
- argc -= optind;
- argv += optind;
-
-- if (debug) {
-- int s, ns;
-- socklen_t foo;
-- struct servent *sp;
-- struct sockaddr_in sn;
-+ int s = 0;
-
-- memset(&sn, 0, sizeof(sn));
-- sn.sin_family = AF_INET;
-+ if (debug) {
-+ struct addrinfo *ai;
-+ unsigned int nfds = 0;
-+ struct pollfd fds[2];
-
- if (argc > 1) {
-- usage();
-- /* NOTREACHED */
-- } else if (argc == 1) {
-- if ((sp = getservbyname(*argv, "tcp"))!=NULL) {
-- sn.sin_port = sp->s_port;
-- }
-- else {
-- int pt = atoi(*argv);
-- if (pt <= 0) {
-- fprintf(stderr, "telnetd: %s: bad port number\n",
-- *argv);
-- usage();
-- /* NOTREACHED */
-- }
-- sn.sin_port = htons(pt);
-- }
-+ usage();
-+ /* NOTREACHED */
- } else {
-- sp = getservbyname("telnet", "tcp");
-- if (sp == 0) {
-- fprintf(stderr, "telnetd: tcp/telnet: unknown service\n");
-- exit(1);
-- }
-- sn.sin_port = sp->s_port;
-- }
-+ struct addrinfo hints;
-+
-+ memset (&hints, '\0', sizeof (hints));
-+ hints.ai_socktype = SOCK_STREAM;
-+ hints.ai_flags = AI_ADDRCONFIG | AI_PASSIVE;
-+ hints.ai_protocol = IPPROTO_TCP;
-+
-+ if (argc == 0) {
-+ if (getaddrinfo(NULL, "telnet", &hints, &ai) != 0) {
-+ fprintf(stderr, "telnetd: %s: bad port number\n", *argv);
-+ usage();
-+ /* NOTREACHED */
-+ }
-+ } else {
-+ if (getaddrinfo(NULL, *argv, &hints, &ai) != 0) {
-+ fprintf(stderr, "telnetd: %s: bad port number\n", *argv);
-+ usage();
-+ /* NOTREACHED */
-+ }
-+ }
-+ }
-
-- s = socket(AF_INET, SOCK_STREAM, 0);
-- if (s < 0) {
-+ struct addrinfo *runp;
-+ int b = 0;
-+ for (runp = ai; ((runp != NULL) && (nfds < sizeof (fds) / sizeof (fds[0]))); runp = runp->ai_next) {
-+ fds[nfds].fd = socket(runp->ai_family, runp->ai_socktype, runp->ai_protocol);
-+ if (fds[nfds].fd < 0) {
- perror("telnetd: socket");;
-- exit(1);
-+ exit(1);
-+ }
-+ fds[nfds].events = POLLIN;
-+ (void) setsockopt(fds[nfds].fd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
-+
-+ if (bind(fds[nfds].fd, runp->ai_addr, runp->ai_addrlen) != 0) {
-+ // Unable to bind to given port. One of the reason can be
-+ // that we can't bind to both IPv4 and IPv6
-+ break;
-+ } else {
-+ b++;
-+ }
-+
-+ if (listen(fds[nfds].fd, 1) < 0) {
-+ perror("listen");
-+ exit(1);
-+ }
-+ nfds++;
- }
-- (void) setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
-- if (bind(s, (struct sockaddr *)&sn, sizeof(sn)) < 0) {
-- perror("bind");
-- exit(1);
-- }
-- if (listen(s, 1) < 0) {
-- perror("listen");
-- exit(1);
-+ freeaddrinfo(ai);
-+
-+ if (b == 0) {
-+ perror("bind");
-+ exit(1);
- }
-- foo = sizeof(sn);
-- ns = accept(s, (struct sockaddr *)&sn, &foo);
-- if (ns < 0) {
-- perror("accept");
-- exit(1);
-+
-+ int n = poll (fds, nfds, -1);
-+ if (n > 0) {
-+ unsigned int i;
-+ for (i = 0; i < nfds; i++) {
-+ if (fds[i].revents & POLLIN) {
-+ struct sockaddr_storage rem;
-+ socklen_t remlen = sizeof(rem);
-+ int fd = accept(fds[i].fd, (struct sockaddr *) &rem, &remlen);
-+
-+ if (fd < 0) {
-+ perror("accept");
-+ exit(1);
-+ }
-+
-+ s = fd;
-+ }
-+ }
- }
-- (void) dup2(ns, 0);
-- (void) close(ns);
-- (void) close(s);
- } else if (argc > 0) {
- usage();
- /* NOT REACHED */
-@@ -313,13 +339,13 @@
-
- openlog("telnetd", LOG_PID | LOG_ODELAY, LOG_DAEMON);
- fromlen = sizeof (from);
-- if (getpeername(0, (struct sockaddr *)&from, &fromlen) < 0) {
-+ if (getpeername(s, &from, &fromlen) < 0) {
- fprintf(stderr, "%s: ", progname);
- perror("getpeername");
- _exit(1);
- }
- if (keepalive &&
-- setsockopt(0, SOL_SOCKET, SO_KEEPALIVE, &on, sizeof (on)) < 0) {
-+ setsockopt(s, SOL_SOCKET, SO_KEEPALIVE, &on, sizeof (on)) < 0) {
- syslog(LOG_WARNING, "setsockopt (SO_KEEPALIVE): %m");
- }
-
-@@ -333,13 +359,13 @@
- if (tos < 0)
- tos = 020; /* Low Delay bit */
- if (tos
-- && (setsockopt(0, IPPROTO_IP, IP_TOS, &tos, sizeof(tos)) < 0)
-+ && (setsockopt(s, IPPROTO_IP, IP_TOS, &tos, sizeof(tos)) < 0)
- && (errno != ENOPROTOOPT) )
- syslog(LOG_WARNING, "setsockopt (IP_TOS): %m");
- }
- #endif /* defined(HAS_IPPROTO_IP) && defined(IP_TOS) */
-- net = 0;
-- doit(&from);
-+ net = s;
-+ doit(&from, fromlen);
- /* NOTREACHED */
- return 0;
- } /* end of main */
-@@ -608,10 +634,9 @@
- * Get a pty, scan input lines.
- */
- static void
--doit(struct sockaddr_in *who)
-+doit(struct sockaddr *who, socklen_t wholen)
- {
- const char *host;
-- struct hostent *hp;
- int level;
- char user_name[256];
-
-@@ -623,12 +648,18 @@
- fatal(net, "All network ports in use");
-
- /* get name of connected client */
-- hp = gethostbyaddr((char *)&who->sin_addr, sizeof (struct in_addr),
-- who->sin_family);
-- if (hp)
-- host = hp->h_name;
-- else
-- host = inet_ntoa(who->sin_addr);
-+ int error = -1;
-+ char namebuf[255];
-+
-+ error = getnameinfo(who, wholen, namebuf, sizeof(namebuf), NULL, 0, 0);
-+
-+ if (error) {
-+ perror("getnameinfo: localhost");
-+ perror(gai_strerror(error));
-+ exit(1);
-+ }
-+
-+ host = namebuf;
-
- /*
- * We must make a copy because Kerberos is probably going
-@@ -649,13 +680,21 @@
-
- /* Get local host name */
- {
-- struct hostent *h;
-+ struct addrinfo hints;
-+ struct addrinfo *res;
-+ int e;
-+
-+ memset(&hints, '\0', sizeof(hints));
-+ hints.ai_socktype = SOCK_STREAM;
-+ hints.ai_flags = AI_ADDRCONFIG;
-+
- gethostname(host_name, sizeof(host_name));
-- h = gethostbyname(host_name);
-- if (h) {
-- strncpy(host_name, h->h_name, sizeof(host_name));
-- host_name[sizeof(host_name)-1] = 0;
-+ if ((e = getaddrinfo(host_name, NULL, &hints, &res)) != 0) {
-+ perror("getaddrinfo: localhost");
-+ perror(gai_strerror(e));
-+ exit(1);
- }
-+ freeaddrinfo(res);
- }
-
- #if defined(AUTHENTICATE) || defined(ENCRYPT)
diff --git a/telnet/patches/netkit-telnet-0.17-nodns.patch b/telnet/patches/netkit-telnet-0.17-nodns.patch
deleted file mode 100644
index 1dba79bf6..000000000
--- a/telnet/patches/netkit-telnet-0.17-nodns.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- netkit-telnet-0.17.orig/telnetd/telnetd.c 2007-03-13 16:31:20.000000000 +0000
-+++ netkit-telnet-0.17.orig/telnetd/telnetd.c 2007-03-13 16:31:26.000000000 +0000
-@@ -653,6 +653,11 @@ doit(struct sockaddr *who, socklen_t who
-
- error = getnameinfo(who, wholen, namebuf, sizeof(namebuf), NULL, 0, 0);
-
-+ /* if we can't get a hostname now, settle for an address */
-+ if(error == EAI_AGAIN)
-+ error = getnameinfo(who, wholen, namebuf, sizeof(namebuf),
-+ NULL, 0, NI_NUMERICHOST);
-+
- if (error) {
- perror("getnameinfo: localhost");
- perror(gai_strerror(error));
-@@ -681,7 +686,7 @@ doit(struct sockaddr *who, socklen_t who
- /* Get local host name */
- {
- struct addrinfo hints;
-- struct addrinfo *res;
-+ struct addrinfo *res = 0;
- int e;
-
- memset(&hints, '\0', sizeof(hints));
-@@ -690,11 +695,14 @@ doit(struct sockaddr *who, socklen_t who
-
- gethostname(host_name, sizeof(host_name));
- if ((e = getaddrinfo(host_name, NULL, &hints, &res)) != 0) {
-- perror("getaddrinfo: localhost");
-- perror(gai_strerror(e));
-- exit(1);
-+ if(e != EAI_AGAIN) {
-+ fprintf(stderr, "getaddrinfo: localhost %s\n",
-+ gai_strerror(e));
-+ exit(1);
-+ }
- }
-- freeaddrinfo(res);
-+ if(res)
-+ freeaddrinfo(res);
- }
-
- #if defined(AUTHENTICATE) || defined(ENCRYPT)
-
diff --git a/telnet/patches/netkit-telnet-0.17-reallynodns.patch b/telnet/patches/netkit-telnet-0.17-reallynodns.patch
deleted file mode 100644
index 32f7af53b..000000000
--- a/telnet/patches/netkit-telnet-0.17-reallynodns.patch
+++ /dev/null
@@ -1,88 +0,0 @@
---- netkit-telnet-0.17.orig/telnetd/telnetd.c.reallynodns 2009-03-12 14:32:29.000000000 -0700
-+++ netkit-telnet-0.17.orig/telnetd/telnetd.c 2009-03-12 14:51:59.000000000 -0700
-@@ -85,6 +85,7 @@
- int keepalive = 1;
- char *loginprg = _PATH_LOGIN;
- char *progname;
-+int lookupself = 1;
-
- extern void usage(void);
-
-@@ -111,7 +112,7 @@
-
- progname = *argv;
-
-- while ((ch = getopt(argc, argv, "d:a:e:lhnr:I:D:B:sS:a:X:L:")) != EOF) {
-+ while ((ch = getopt(argc, argv, "d:a:e:lhnr:I:D:B:sS:a:X:L:N")) != EOF) {
- switch(ch) {
-
- #ifdef AUTHENTICATE
-@@ -210,6 +211,10 @@
- keepalive = 0;
- break;
-
-+ case 'N':
-+ lookupself = 0;
-+ break;
-+
- #ifdef SecurID
- case 's':
- /* SecurID required */
-@@ -393,6 +398,7 @@
- #endif
- fprintf(stderr, " [-L login_program]");
- fprintf(stderr, " [-n]");
-+ fprintf(stderr, " [-N]");
- #ifdef SecurID
- fprintf(stderr, " [-s]");
- #endif
-@@ -691,15 +697,20 @@
-
- memset(&hints, '\0', sizeof(hints));
- hints.ai_socktype = SOCK_STREAM;
-- hints.ai_flags = AI_ADDRCONFIG;
-+ hints.ai_flags = AI_CANONNAME;
-
- gethostname(host_name, sizeof(host_name));
-- if ((e = getaddrinfo(host_name, NULL, &hints, &res)) != 0) {
-- if(e != EAI_AGAIN) {
-- fprintf(stderr, "getaddrinfo: localhost %s\n",
-- gai_strerror(e));
-- exit(1);
-- }
-+ /*
-+ * Optionally canonicalize the local host name, in case
-+ * gethostname() returns foo, we want foo.example.com
-+ */
-+ if (lookupself &&
-+ (e = getaddrinfo(host_name, NULL, &hints, &res)) == 0) {
-+ if (res->ai_canonname) {
-+ strncpy(host_name, res->ai_canonname,
-+ sizeof(host_name)-1);
-+ host_name[sizeof(host_name)-1] = 0;
-+ }
- }
- if(res)
- freeaddrinfo(res);
---- netkit-telnet-0.17.orig/telnetd/telnetd.8.reallynodns 2009-03-12 14:54:54.000000000 -0700
-+++ netkit-telnet-0.17.orig/telnetd/telnetd.8 2009-03-12 14:56:58.000000000 -0700
-@@ -42,7 +42,7 @@
- protocol server
- .Sh SYNOPSIS
- .Nm /usr/sbin/in.telnetd
--.Op Fl hns
-+.Op Fl hnNs
- .Op Fl a Ar authmode
- .Op Fl D Ar debugmode
- .Op Fl L Ar loginprg
-@@ -175,6 +175,10 @@
- if the client is still there, so that idle connections
- from machines that have crashed or can no longer
- be reached may be cleaned up.
-+.It Fl N
-+Do not use DNS to canonicalize the local hostname;
-+.Fn gethostname 2
-+returns a fully qualified name.
- .It Fl s
- This option is only enabled if
- .Nm telnetd
diff --git a/telnet/patches/telnet-0.17-8bit.patch b/telnet/patches/telnet-0.17-8bit.patch
deleted file mode 100644
index 89818b54f..000000000
--- a/telnet/patches/telnet-0.17-8bit.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -ru netkit-telnet-0.17.orig/telnet/main.c netkit-telnet-0.17/telnet/main.c
---- netkit-telnet-0.17.orig/telnet/main.c 2003-05-15 20:07:40.000000000 +0200
-+++ netkit-telnet-0.17/telnet/main.c 2003-05-16 00:18:28.000000000 +0200
-@@ -143,7 +143,7 @@
- while ((ch = getopt(argc, argv, "78DEKLS:X:ab:cde:fFk:l:n:rt:x")) != -1) {
- switch(ch) {
- case '8':
-- eight = 3; /* binary output and input */
-+ binary = 3; /* send TELNET BINARY option for output and input */
- break;
- case '7':
- eight = 0;
-@@ -165,7 +165,7 @@
- #endif
- break;
- case 'L':
-- eight |= 2; /* binary output only */
-+ binary = 2; /* send TELNET BINARY option for output only */
- break;
- case 'S':
- {
-diff -ru netkit-telnet-0.17.orig/telnet/telnet.1 netkit-telnet-0.17/telnet/telnet.1
---- netkit-telnet-0.17.orig/telnet/telnet.1 2003-05-15 20:07:40.000000000 +0200
-+++ netkit-telnet-0.17/telnet/telnet.1 2003-05-15 23:38:37.000000000 +0200
-@@ -76,6 +76,8 @@
- .Pp
- The options are as follows:
- .Bl -tag -width Ds
-+.It Fl 7
-+Strip 8th bit on input and output. Telnet is 8-bit clean by default but doesn't send the TELNET BINARY option unless forced.
- .It Fl 8
- Specifies an 8-bit data path.
- This causes an attempt to negotiate the
diff --git a/telnet/patches/telnet-0.17-CAN-2005-468_469.patch b/telnet/patches/telnet-0.17-CAN-2005-468_469.patch
deleted file mode 100644
index 57e13727b..000000000
--- a/telnet/patches/telnet-0.17-CAN-2005-468_469.patch
+++ /dev/null
@@ -1,179 +0,0 @@
---- netkit-telnet-0.17/telnet/telnet.c.CAN-2005-468_469 2005-03-17 13:48:58.000000000 +0100
-+++ netkit-telnet-0.17/telnet/telnet.c 2005-03-17 14:02:27.000000000 +0100
-@@ -1310,22 +1310,66 @@
- }
-
-
--unsigned char slc_reply[128];
-+#define SLC_REPLY_SIZE 128
-+unsigned char *slc_reply;
- unsigned char *slc_replyp;
-+unsigned char *slc_replyend;
-
- void
- slc_start_reply(void)
- {
-+ slc_reply = (unsigned char *)malloc(SLC_REPLY_SIZE);
-+ if (slc_reply == NULL) {
-+/*@*/ printf("slc_start_reply: malloc()/realloc() failed!!!\n");
-+ slc_reply = slc_replyp = slc_replyend = NULL;
-+ return;
-+ }
-+
- slc_replyp = slc_reply;
-+ slc_replyend = slc_reply + SLC_REPLY_SIZE;
- *slc_replyp++ = IAC;
- *slc_replyp++ = SB;
- *slc_replyp++ = TELOPT_LINEMODE;
- *slc_replyp++ = LM_SLC;
- }
-
-+static int
-+slc_assure_buffer(int want_len);
-+
-+ static int
-+slc_assure_buffer(int want_len)
-+{
-+ if ((slc_replyp + want_len) >= slc_replyend) {
-+ int len;
-+ int old_len = slc_replyp - slc_reply;
-+ unsigned char *p;
-+
-+ len = old_len
-+ + (want_len / SLC_REPLY_SIZE + 1) * SLC_REPLY_SIZE;
-+ p = (unsigned char *)realloc(slc_reply, len);
-+ if (p == NULL)
-+ free(slc_reply);
-+ slc_reply = p;
-+ if (slc_reply == NULL) {
-+/*@*/ printf("slc_add_reply: realloc() failed!!!\n");
-+ slc_reply = slc_replyp = slc_replyend = NULL;
-+ return 1;
-+ }
-+ slc_replyp = slc_reply + old_len;
-+ slc_replyend = slc_reply + len;
-+ }
-+ return 0;
-+}
-+
- void
- slc_add_reply(unsigned char func, unsigned char flags, cc_t value)
- {
-+ if (slc_assure_buffer(6))
-+ return;
-+
-+ if (slc_replyp == NULL)
-+ return;
-+
- if ((*slc_replyp++ = func) == IAC)
- *slc_replyp++ = IAC;
- if ((*slc_replyp++ = flags) == IAC)
-@@ -1339,6 +1383,12 @@
- {
- int len;
-
-+ if (slc_assure_buffer(2))
-+ return;
-+
-+ if (slc_replyp == NULL)
-+ return;
-+
- *slc_replyp++ = IAC;
- *slc_replyp++ = SE;
- len = slc_replyp - slc_reply;
-@@ -1456,7 +1506,7 @@
- }
- }
-
--#define OPT_REPLY_SIZE 256
-+#define OPT_REPLY_SIZE 1024
- unsigned char *opt_reply;
- unsigned char *opt_replyp;
- unsigned char *opt_replyend;
-@@ -1490,10 +1540,38 @@
- env_opt_start_info(void)
- {
- env_opt_start();
-- if (opt_replyp)
-+ if (opt_replyp && (opt_replyp > opt_reply))
- opt_replyp[-1] = TELQUAL_INFO;
- }
-
-+static int
-+env_opt_assure_buffer(int want_len);
-+
-+ static int
-+env_opt_assure_buffer(int want_len)
-+{
-+ if ((opt_replyp + want_len) >= opt_replyend) {
-+ int len;
-+ unsigned char *p;
-+ int old_len = opt_replyp - opt_reply;
-+
-+ len = old_len
-+ + (want_len / OPT_REPLY_SIZE + 1) * OPT_REPLY_SIZE;
-+ p = (unsigned char *)realloc(opt_reply, len);
-+ if (p == NULL)
-+ free(opt_reply);
-+ opt_reply = p;
-+ if (opt_reply == NULL) {
-+/*@*/ printf("env_opt_add: realloc() failed!!!\n");
-+ opt_reply = opt_replyp = opt_replyend = NULL;
-+ return 1;
-+ }
-+ opt_replyp = opt_reply + old_len;
-+ opt_replyend = opt_reply + len;
-+ }
-+ return 0;
-+}
-+
- void
- env_opt_add(unsigned char *ep)
- {
-@@ -1515,25 +1593,12 @@
- return;
- }
- vp = env_getvalue(ep, 1);
-- if (opt_replyp + (vp ? strlen((char *)vp) : 0) +
-- strlen((char *)ep) + 6 > opt_replyend)
-- {
-- int len;
-- unsigned char *p;
-- opt_replyend += OPT_REPLY_SIZE;
-- len = opt_replyend - opt_reply;
-- p = (unsigned char *)realloc(opt_reply, len);
-- if (p == NULL)
-- free(opt_reply);
-- opt_reply = p;
-- if (opt_reply == NULL) {
--/*@*/ printf("env_opt_add: realloc() failed!!!\n");
-- opt_reply = opt_replyp = opt_replyend = NULL;
-- return;
-- }
-- opt_replyp = opt_reply + len - (opt_replyend - opt_replyp);
-- opt_replyend = opt_reply + len;
-- }
-+
-+ /* use the double length in case it gots escaped */
-+ if (env_opt_assure_buffer((vp ? strlen((char *)vp)*2 : 0) +
-+ strlen((char *)ep)*2 + 6))
-+ return;
-+
- if (opt_welldefined((char *)ep))
- #ifdef OLD_ENVIRON
- if (telopt_environ == TELOPT_OLD_ENVIRON)
-@@ -1588,8 +1653,14 @@
- {
- int len;
-
-+ if (opt_reply == NULL) /*XXX*/
-+ return; /*XXX*/
-+
-+
- len = opt_replyp - opt_reply + 2;
- if (emptyok || len > 6) {
-+ if (env_opt_assure_buffer(2))
-+ return;
- *opt_replyp++ = IAC;
- *opt_replyp++ = SE;
- if (NETROOM() > len) {
diff --git a/telnet/patches/telnet-0.17-argv.patch b/telnet/patches/telnet-0.17-argv.patch
deleted file mode 100644
index 6f71beddd..000000000
--- a/telnet/patches/telnet-0.17-argv.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur netkit-telnet-0.17/telnetd/setproctitle.c netkit-telnet-0.17.new/telnetd/setproctitle.c
---- netkit-telnet-0.17/telnetd/setproctitle.c 1999-12-11 00:06:39.000000000 +0100
-+++ netkit-telnet-0.17.new/telnetd/setproctitle.c 2004-06-28 16:48:51.153514392 +0200
-@@ -139,7 +139,7 @@
- (void) strcpy(Argv[0], buf);
- p = &Argv[0][i];
- while (p < LastArgv)
-- *p++ = ' ';
-+ *p++ = '\0';
- Argv[1] = NULL;
- }
-
diff --git a/telnet/patches/telnet-0.17-cleanup_race.patch b/telnet/patches/telnet-0.17-cleanup_race.patch
deleted file mode 100644
index bc3c0f5f5..000000000
--- a/telnet/patches/telnet-0.17-cleanup_race.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- netkit-telnet-0.17/telnetd/telnetd.c.cleanup_race 2005-01-11 18:39:49.578123000 -0500
-+++ netkit-telnet-0.17/telnetd/telnetd.c 2005-01-11 18:42:45.909616000 -0500
-@@ -1081,6 +1081,8 @@
- if (FD_ISSET(p, &obits) && (pfrontp - pbackp) > 0)
- ptyflush();
- }
-+ /* to avoid a race for wtmp lock */
-+ signal(SIGCHLD, SIG_IGN);
- cleanup(0);
- } /* end of telnet */
-
diff --git a/telnet/patches/telnet-0.17-conf.patch b/telnet/patches/telnet-0.17-conf.patch
deleted file mode 100644
index 512f104ac..000000000
--- a/telnet/patches/telnet-0.17-conf.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- netkit-telnet-0.17/configure.confverb 2000-07-29 20:00:29.000000000 +0200
-+++ netkit-telnet-0.17/configure 2004-07-05 10:50:36.492963840 +0200
-@@ -263,14 +263,19 @@
- cat <<EOF >__conftest.cc
- #include <unistd.h>
- #include <signal.h>
--int count=0;
-+volatile int count=0;
- void handle(int foo) { count++; }
- int main() {
-+ sigset_t sset;
- int pid=getpid();
-+ sigemptyset(&sset);
-+ sigaddset(&sset, SIGINT);
-+ sigprocmask(SIG_UNBLOCK, &sset, NULL);
- signal(SIGINT, handle);
- kill(pid,SIGINT);
- kill(pid,SIGINT);
- kill(pid,SIGINT);
-+ sleep(1);
- if (count!=3) return 1;
- return 0;
- }
diff --git a/telnet/patches/telnet-0.17-env.patch b/telnet/patches/telnet-0.17-env.patch
deleted file mode 100644
index 88e7c016d..000000000
--- a/telnet/patches/telnet-0.17-env.patch
+++ /dev/null
@@ -1,84 +0,0 @@
---- netkit-telnet-0.17-pre-20000204/telnet/commands.c.env Thu Apr 8 19:30:20 1999
-+++ netkit-telnet-0.17-pre-20000204/telnet/commands.c Tue May 16 17:19:47 2000
-@@ -1815,11 +1815,11 @@
- }
-
- unsigned char *
--env_getvalue(unsigned char *var)
-+env_getvalue(unsigned char *var, int exported_only)
- {
-- struct env_lst *ep;
-+ struct env_lst *ep = env_find(var);
-
-- if ((ep = env_find(var)))
-+ if (ep && (!exported_only || ep->export))
- return(ep->value);
- return(NULL);
- }
---- netkit-telnet-0.17-pre-20000204/telnet/telnet.c.env Tue May 16 17:19:47 2000
-+++ netkit-telnet-0.17-pre-20000204/telnet/telnet.c Tue May 16 17:19:47 2000
-@@ -438,7 +438,7 @@
- #endif
-
- case TELOPT_XDISPLOC: /* X Display location */
-- if (env_getvalue((unsigned char *)"DISPLAY"))
-+ if (env_getvalue((unsigned char *)"DISPLAY", 0))
- new_state_ok = 1;
- break;
-
-@@ -693,7 +693,7 @@
- resettermname = 0;
- if (tnamep && tnamep != unknown)
- free(tnamep);
-- if ((tname = (char *)env_getvalue((unsigned char *)"TERM")) &&
-+ if ((tname = (char *)env_getvalue((unsigned char *)"TERM", 0)) &&
- (setupterm(tname, 1, &errret) == 0)) {
- tnamep = mklist(ttytype, tname);
- } else {
-@@ -870,7 +870,7 @@
- unsigned char temp[50], *dp;
- int len;
-
-- if ((dp = env_getvalue((unsigned char *)"DISPLAY")) == NULL) {
-+ if ((dp = env_getvalue((unsigned char *)"DISPLAY", 0)) == NULL) {
- /*
- * Something happened, we no longer have a DISPLAY
- * variable. So, turn off the option.
-@@ -1527,7 +1527,7 @@
- env_opt_add(ep);
- return;
- }
-- vp = env_getvalue(ep);
-+ vp = env_getvalue(ep, 1);
- if (opt_replyp + (vp ? strlen((char *)vp) : 0) +
- strlen((char *)ep) + 6 > opt_replyend)
- {
-@@ -2170,7 +2170,7 @@
- send_will(TELOPT_LINEMODE, 1);
- send_will(TELOPT_NEW_ENVIRON, 1);
- send_do(TELOPT_STATUS, 1);
-- if (env_getvalue((unsigned char *)"DISPLAY"))
-+ if (env_getvalue((unsigned char *)"DISPLAY", 0))
- send_will(TELOPT_XDISPLOC, 1);
- if (binary)
- tel_enter_binary(binary);
---- netkit-telnet-0.17-pre-20000204/telnet/externs.h.env Mon Feb 8 15:56:11 1999
-+++ netkit-telnet-0.17-pre-20000204/telnet/externs.h Tue May 16 17:19:47 2000
-@@ -203,7 +203,7 @@
- void env_send (unsigned char *);
- void env_list (void);
- unsigned char * env_default(int init, int welldefined);
--unsigned char * env_getvalue(unsigned char *var);
-+unsigned char * env_getvalue(unsigned char *var, int exported_only);
-
- void set_escape_char(char *s);
- unsigned long sourceroute(char *arg, char **cpp, int *lenp);
-@@ -335,7 +335,7 @@
- void env_opt_end (int);
-
- unsigned char *env_default (int, int);
--unsigned char *env_getvalue (unsigned char *);
-+unsigned char *env_getvalue (unsigned char *, int);
-
- int get_status (void);
- int dosynch (void);
diff --git a/telnet/patches/telnet-0.17-errno_test_sys_bsd.patch b/telnet/patches/telnet-0.17-errno_test_sys_bsd.patch
deleted file mode 100644
index 9a4fcba6d..000000000
--- a/telnet/patches/telnet-0.17-errno_test_sys_bsd.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up netkit-telnet-0.17/telnet/sys_bsd.c.errnosysbsd netkit-telnet-0.17/telnet/sys_bsd.c
---- netkit-telnet-0.17/telnet/sys_bsd.c.errnosysbsd 2007-09-20 10:57:58.000000000 +0200
-+++ netkit-telnet-0.17/telnet/sys_bsd.c 2007-09-20 11:10:08.000000000 +0200
-@@ -375,6 +375,7 @@ TerminalNewMode(int f)
- int onoff;
- int old;
- cc_t esc;
-+ int err;
-
- globalmode = f&~MODE_FORCE;
- if (prevmode == f)
-@@ -407,6 +408,12 @@ TerminalNewMode(int f)
- tcsetattr(tin, TCSADRAIN, &tmp_tc);
- #endif /* USE_TERMIO */
- old = ttyflush(SYNCHing|flushout);
-+ if (old < 0) {
-+ err = errno;
-+ if (! ((err == EINTR) || (err == EAGAIN) || (err == ENOSPC))) {
-+ break;
-+ }
-+ }
- } while (old < 0 || old > 1);
- }
-
diff --git a/telnet/patches/telnet-0.17-issue.patch b/telnet/patches/telnet-0.17-issue.patch
deleted file mode 100644
index c00df4363..000000000
--- a/telnet/patches/telnet-0.17-issue.patch
+++ /dev/null
@@ -1,81 +0,0 @@
---- netkit-telnet-0.17/telnetd/utility.c.issue Sun Dec 12 09:59:45 1999
-+++ netkit-telnet-0.17/telnetd/utility.c Wed Jul 18 11:14:11 2001
-@@ -460,13 +460,13 @@
- putlocation = where;
-
- while (*cp) {
-- if (*cp != '%') {
-+ if (*cp != '%' && *cp != '\\') {
- putchr(*cp++);
- continue;
- }
- switch (*++cp) {
-
-- case 't':
-+ case 'l':
- slash = strrchr(line, '/');
- if (slash == NULL)
- putstr(line);
-@@ -474,21 +474,28 @@
- putstr(slash+1);
- break;
-
-+ case 'n':
- case 'h':
- putstr(editedhost);
- break;
-
-+ case 't':
- case 'd':
- (void)time(&t);
- (void)strftime(db, sizeof(db), fmtstr, localtime(&t));
- putstr(db);
- break;
-
-+ case '\\':
-+ putchr('\\');
-+ break;
-+
- case '%':
- putchr('%');
- break;
-
- case 'D':
-+ case 'o':
- {
- char buff[128];
-
-@@ -515,7 +522,7 @@
- c = fgetc(fp);
- } while (c != EOF && c != '\n');
- continue;
-- } else if (c == '%') {
-+ } else if (c == '%' || c == '\\') {
- buff[0] = c;
- c = fgetc(fp);
- if (c == EOF) break;
---- netkit-telnet-0.17/telnetd/issue.net.5.issue Sun Jul 30 19:57:09 2000
-+++ netkit-telnet-0.17/telnetd/issue.net.5 Wed Jul 18 11:03:09 2001
-@@ -15,16 +15,17 @@
- .Pa /etc/issue.net
- is a text file which contains a message or system identification to be
- printed before the login prompt of a telnet session. It may contain
--various `%-char' sequences. The following sequences are supported by
-+various `%-char' (or, alternatively, '\\-char') sequences. The following
-+sequences are supported by
- .Ic telnetd :
- .Bl -tag -offset indent -compact -width "abcde"
--.It %t
-+.It %l
- - show the current tty
--.It %h
-+.It %h, %n
- - show the system node name (FQDN)
--.It %D
-+.It %D, %o
- - show the name of the NIS domain
--.It %d
-+.It %d, %t
- - show the current time and date
- .It %s
- - show the name of the operating system
diff --git a/telnet/patches/telnet-0.17-pek.patch0 b/telnet/patches/telnet-0.17-pek.patch0
deleted file mode 100644
index 0f4c40049..000000000
--- a/telnet/patches/telnet-0.17-pek.patch0
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -u telnet/commands.c telnet.new/commands.c
---- telnet/commands.c Sat Sep 1 12:55:18 2001
-+++ telnet.new/commands.c Sat Sep 1 12:54:36 2001
-@@ -2354,6 +2354,7 @@
- hints.ai_flags = AI_CANONNAME;
- if (portp == NULL) {
- portp = "telnet";
-+ telnetport = 1;
- } else if (*portp == '-') {
- portp++;
- telnetport = 1;
-@@ -2397,7 +2398,6 @@
- if (error) {
- warn("%s: %s", aliasp, gai_strerror(error));
- close(net);
-- freeaddrinfo(ares);
- continue;
- }
- if (bind(net, ares->ai_addr, ares->ai_addrlen) < 0) {
-@@ -2414,7 +2414,7 @@
- perror("setsockopt (IP_OPTIONS)");
- #endif
- #if defined(IPPROTO_IP) && defined(IP_TOS)
-- {
-+ if (res->ai_family == AF_INET) {
- # if defined(HAS_GETTOS)
- struct tosent *tp;
- if (tos < 0 && (tp = gettosbyname("telnet", "tcp")))
-@@ -2438,7 +2438,7 @@
- char hbuf[NI_MAXHOST];
-
- if (getnameinfo(res->ai_addr, res->ai_addrlen, hbuf, sizeof(hbuf),
-- NULL, 0, NI_NUMERICHOST) != 0) {
-+ NULL, 0, niflags) != 0) {
- strcpy(hbuf, "(invalid)");
- }
- fprintf(stderr, "telnet: connect to address %s: %s\n", hbuf,
diff --git a/telnet/patches/telnet-0.17-sa-01-49.patch b/telnet/patches/telnet-0.17-sa-01-49.patch
deleted file mode 100644
index 64ed23c80..000000000
--- a/telnet/patches/telnet-0.17-sa-01-49.patch
+++ /dev/null
@@ -1,208 +0,0 @@
-diff -up netkit-telnet-0.17/telnetd/ext.h.sa-01-49 netkit-telnet-0.17/telnetd/ext.h
---- netkit-telnet-0.17/telnetd/ext.h.sa-01-49 1999-12-12 15:59:44.000000000 +0100
-+++ netkit-telnet-0.17/telnetd/ext.h 2011-01-20 22:39:54.000000000 +0100
-@@ -86,7 +86,10 @@ extern char *neturg; /* one past last b
- extern int pcc, ncc;
-
- /* printf into netobuf */
--void netoprintf(const char *fmt, ...) __attribute((format (printf, 1, 2)));
-+/* void netoprintf(const char *fmt, ...) __attribute((format (printf, 1, 2))); */
-+#define netoprintf output_data
-+int output_data(const char *, ...) __attribute((format (printf, 1, 2)));
-+void output_datalen(const char *, int);
-
- extern int pty, net;
- extern char *line;
-@@ -182,7 +185,10 @@ void tty_setsofttab(int);
- void tty_tspeed(int);
- void willoption(int);
- void wontoption(int);
-+
-+#if 0
- void writenet(unsigned char *, int);
-+#endif
-
- #if defined(ENCRYPT)
- extern void (*encrypt_output)(unsigned char *, int);
-diff -up netkit-telnet-0.17/telnetd/slc.c.sa-01-49 netkit-telnet-0.17/telnetd/slc.c
---- netkit-telnet-0.17/telnetd/slc.c.sa-01-49 1999-12-12 15:59:44.000000000 +0100
-+++ netkit-telnet-0.17/telnetd/slc.c 2011-01-20 22:39:54.000000000 +0100
-@@ -183,7 +183,7 @@ int end_slc(unsigned char **bufp) {
- else {
- snprintf(slcbuf+slcoff, sizeof(slcbuf)-slcoff, "%c%c", IAC, SE);
- slcoff += 2;
-- writenet(slcbuf, slcoff);
-+ output_datalen(slcbuf, slcoff);
- netflush(); /* force it out immediately */
- }
- }
-diff -up netkit-telnet-0.17/telnetd/state.c.sa-01-49 netkit-telnet-0.17/telnetd/state.c
---- netkit-telnet-0.17/telnetd/state.c.sa-01-49 1999-12-12 20:41:44.000000000 +0100
-+++ netkit-telnet-0.17/telnetd/state.c 2011-01-20 22:43:34.000000000 +0100
-@@ -37,6 +37,7 @@
- char state_rcsid[] =
- "$Id: state.c,v 1.12 1999/12/12 19:41:44 dholland Exp $";
-
-+#include <stdarg.h>
- #include "telnetd.h"
-
- int not42 = 1;
-@@ -1365,7 +1366,7 @@ void send_status(void) {
- ADD(IAC);
- ADD(SE);
-
-- writenet(statusbuf, ncp - statusbuf);
-+ output_datalen(statusbuf, ncp - statusbuf);
- netflush(); /* Send it on its way */
-
- DIAG(TD_OPTIONS, {printsub('>', statusbuf, ncp - statusbuf); netflush();});
-diff -up netkit-telnet-0.17/telnetd/termstat.c.sa-01-49 netkit-telnet-0.17/telnetd/termstat.c
---- netkit-telnet-0.17/telnetd/termstat.c.sa-01-49 1999-12-12 15:59:45.000000000 +0100
-+++ netkit-telnet-0.17/telnetd/termstat.c 2011-01-20 22:39:54.000000000 +0100
-@@ -128,7 +128,6 @@ static int _terminit = 0;
- void
- localstat()
- {
-- void netflush();
- int need_will_echo = 0;
-
- /*
-diff -up netkit-telnet-0.17/telnetd/utility.c.sa-01-49 netkit-telnet-0.17/telnetd/utility.c
---- netkit-telnet-0.17/telnetd/utility.c.sa-01-49 2011-01-20 22:39:54.000000000 +0100
-+++ netkit-telnet-0.17/telnetd/utility.c 2011-01-20 22:48:02.000000000 +0100
-@@ -38,8 +38,10 @@ char util_rcsid[] =
- "$Id: utility.c,v 1.11 1999/12/12 14:59:45 dholland Exp $";
-
- #define PRINTOPTIONS
-+#define _GNU_SOURCE
-
- #include <stdarg.h>
-+#include <stdio.h>
- #include <sys/utsname.h>
-
- #ifdef AUTHENTICATE
-@@ -52,6 +54,53 @@ char util_rcsid[] =
- * utility functions performing io related tasks
- */
-
-+/*
-+ * This function appends data to nfrontp and advances nfrontp.
-+ * Returns the number of characters written altogether (the
-+ * buffer may have been flushed in the process).
-+ */
-+
-+int
-+output_data(const char *format, ...)
-+{
-+ va_list args;
-+ int len;
-+ char *buf;
-+
-+ va_start(args, format);
-+ if ((len = vasprintf(&buf, format, args)) == -1)
-+ return -1;
-+ output_datalen(buf, len);
-+ va_end(args);
-+ free(buf);
-+ return (len);
-+}
-+
-+void
-+output_datalen(const char *buf, int len)
-+{
-+ int remaining, copied;
-+
-+ remaining = BUFSIZ - (nfrontp - netobuf);
-+ while (len > 0) {
-+ /* Free up enough space if the room is too low*/
-+ if ((len > BUFSIZ ? BUFSIZ : len) > remaining) {
-+ netflush();
-+ remaining = BUFSIZ - (nfrontp - netobuf);
-+ }
-+
-+ /* Copy out as much as will fit */
-+ copied = remaining > len ? len : remaining;
-+ memmove(nfrontp, buf, copied);
-+ nfrontp += copied;
-+ len -= copied;
-+ remaining -= copied;
-+ buf += copied;
-+ }
-+ return;
-+}
-+
-+/**
- void
- netoprintf(const char *fmt, ...)
- {
-@@ -67,7 +116,7 @@ netoprintf(const char *fmt, ...)
- va_end(ap);
-
- if (len<0 || len==maxsize) {
-- /* didn't fit */
-+ / * did not fit * /
- netflush();
- }
- else {
-@@ -76,6 +125,7 @@ netoprintf(const char *fmt, ...)
- }
- nfrontp += len;
- }
-+*/
-
- /*
- * ttloop
-@@ -273,10 +323,15 @@ netflush(void)
- int n;
-
- if ((n = nfrontp - nbackp) > 0) {
-+
-+#if 0
-+ /* XXX This causes output_data() to recurse and die */
- DIAG(TD_REPORT,
- { netoprintf("td: netflush %d chars\r\n", n);
- n = nfrontp - nbackp; /* update count */
- });
-+#endif
-+
- #if defined(ENCRYPT)
- if (encrypt_output) {
- char *s = nclearto ? nclearto : nbackp;
-@@ -310,11 +365,14 @@ netflush(void)
- }
- }
- }
-- if (n < 0) {
-- if (errno == EWOULDBLOCK || errno == EINTR)
-- return;
-- cleanup(0);
-- }
-+
-+ if (n == -1) {
-+ if (errno == EWOULDBLOCK || errno == EINTR)
-+ return;
-+ cleanup(0);
-+ /* NOTREACHED */
-+ }
-+
- nbackp += n;
- #if defined(ENCRYPT)
- if (nbackp > nclearto)
-@@ -332,7 +390,7 @@ netflush(void)
- return;
- } /* end of netflush */
-
--
-+#if 0
- /*
- * writenet
- *
-@@ -355,7 +413,7 @@ void writenet(register unsigned char *pt
- nfrontp += len;
-
- } /* end of writenet */
--
-+#endif
-
- /*
- * miscellaneous functions doing a variety of little jobs follow ...
diff --git a/telnet/patches/telnet-client-cvs.patch0 b/telnet/patches/telnet-client-cvs.patch0
deleted file mode 100644
index 5fc57a714..000000000
--- a/telnet/patches/telnet-client-cvs.patch0
+++ /dev/null
@@ -1,1721 +0,0 @@
-diff -uNr telnet/Makefile telnet.obsd-cvs/Makefile
---- telnet/Makefile Mon Jul 27 18:25:13 1998
-+++ telnet.obsd-cvs/Makefile Sat Mar 10 10:54:26 2001
-@@ -36,22 +36,20 @@
-
- PROG= telnet
-
--CFLAGS+=-DTERMCAP -DKLUDGELINEMODE -DUSE_TERMIO -DSKEY -Dunix
--CFLAGS+=-DENV_HACK -D_USE_OLD_CURSES_
-+CFLAGS+=-DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DSKEY -Dunix
- CFLAGS+=-I${.CURDIR}/../../lib
--LDADD+= -locurses -ltelnet
--DPADD= ${LIBOLDCURSES} ${LIBTELNET}
-+LDADD+= -lcurses -ltelnet
-+DPADD= ${LIBCURSES} ${LIBTELNET
-
- SRCS= authenc.c commands.c main.c network.c ring.c sys_bsd.c telnet.c \
- terminal.c tn3270.c utilities.c
-
- .include <bsd.own.mk> # for KERBEROS
-
--.if (${KERBEROS} == "yes")
-+.if (${KERBEROS:L} == "yes")
- CFLAGS+=-DENCRYPTION -DAUTHENTICATION -DKRB4
- LDADD+= -lkrb -ldes
- DPADD+= ${LIBDES} ${LIBKRB}
- .endif
-
- .include <bsd.prog.mk>
--
-diff -uNr telnet/commands.c telnet.obsd-cvs/commands.c
---- telnet/commands.c Fri Apr 9 02:30:20 1999
-+++ telnet.obsd-cvs/commands.c Sat Mar 10 10:51:22 2001
-@@ -1,4 +1,4 @@
--/* $OpenBSD: commands.c,v 1.20 1999/01/04 07:55:05 art Exp $ */
-+/* $OpenBSD: commands.c,v 1.34 2000/11/08 21:49:44 aaron Exp $ */
- /* $NetBSD: commands.c,v 1.14 1996/03/24 22:03:48 jtk Exp $ */
-
- /*
-@@ -69,7 +69,7 @@
- int status;
-
- if(argc != 3) {
-- printf("%s sequence challenge\n", argv[0]);
-+ printf("usage: %s sequence challenge\n", argv[0]);
- return 0;
- }
-
-@@ -2175,17 +2175,19 @@
- int gotmachine = 0;
- int l1 = strlen(m1);
- int l2 = strlen(m2);
-- char m1save[64];
-+ char m1save[MAXHOSTNAMELEN];
-
- if (skiprc)
- return;
-
-- strcpy(m1save, m1);
-+ strncpy(m1save, m1, sizeof(m1save));
- m1 = m1save;
-
- if (rcname[0] == 0) {
- char *home = getenv("HOME");
-
-+ if (home == NULL || *home == '\0')
-+ return;
- snprintf (rcname, sizeof(rcname), "%s/.telnetrc",
- home ? home : "");
- }
-@@ -2248,15 +2250,9 @@
- int
- tn(int argc, char *argv[])
- {
-- struct hostent *host = 0, *alias = 0;
--#if defined(AF_INET6)
-- struct sockaddr_in6 sin6;
--#endif
-+ struct addrinfo hints, *res, *res0;
-+ int error;
- struct sockaddr_in sin;
-- struct sockaddr_in ladr;
-- struct sockaddr *sa;
-- int sa_size;
-- struct servent *sp = 0;
- unsigned long temp;
- #if !defined(__linux__)
- extern char *inet_ntoa();
-@@ -2266,15 +2262,18 @@
- int srlen;
- #endif
- char *cmd, *hostp = 0, *portp = 0, *user = 0, *aliasp = 0;
-- int family, port = 0;
--
-+ int retry;
-+#ifdef NI_WITHSCOPEID
-+ const int niflags = NI_NUMERICHOST | NI_WITHSCOPEID;
-+#else
-+ const int niflags = NI_NUMERICHOST;
-+#endif
-+
- /* clear the socket address prior to use */
- memset((char *)&sin, 0, sizeof(sin));
-
- if (connected) {
- printf("?Already connected to %s\r\n", hostname);
-- seteuid(getuid());
-- setuid(getuid());
- return 0;
- }
- if (argc < 2) {
-@@ -2324,8 +2323,6 @@
- }
- usage:
- printf("usage: %s [-l user] [-a] host-name [port]\r\n", cmd);
-- seteuid(getuid());
-- setuid(getuid());
- return 0;
- }
- if (hostp == 0)
-@@ -2340,185 +2337,80 @@
- temp = sourceroute(hostp, &srp, &srlen);
- if (temp == 0) {
- herror(srp);
-- seteuid(getuid());
-- setuid(getuid());
- return 0;
- } else if (temp == -1) {
- printf("Bad source route option: %s\r\n", hostp);
-- seteuid(getuid());
-- setuid(getuid());
- return 0;
- } else {
- abort();
- }
-- } else {
--#endif
-- memset (&sin, 0, sizeof(sin));
--#if defined(HAVE_INET_PTON) && defined(AF_INET6)
-- memset (&sin6, 0, sizeof(sin6));
--
-- if(inet_pton(AF_INET6, hostp, &sin6.sin6_addr)) {
-- sin6.sin6_family = family = AF_INET6;
-- sa = (struct sockaddr *)&sin6;
-- sa_size = sizeof(sin6);
-- strcpy(_hostname, hostp);
-- hostname =_hostname;
-- } else
--#endif
-- if(inet_aton(hostp, &sin.sin_addr)){
-- sin.sin_family = family = AF_INET;
-- sa = (struct sockaddr *)&sin;
-- sa_size = sizeof(sin);
-- strcpy(_hostname, hostp);
-- hostname = _hostname;
-- } else {
--#ifdef HAVE_GETHOSTBYNAME2
-- host = gethostbyname2(hostp, AF_INET6);
-- if(host == NULL)
-- host = gethostbyname2(hostp, AF_INET);
--#else
-- host = gethostbyname(hostp);
--#endif
-- if (host) {
-- strncpy(_hostname, host->h_name, sizeof(_hostname));
-- family = host->h_addrtype;
--
-- switch(family) {
-- case AF_INET:
-- memset(&sin, 0, sizeof(sin));
-- sa_size = sizeof(sin);
-- sa = (struct sockaddr *)&sin;
-- sin.sin_family = family;
--
-- memcpy(&sin.sin_addr, *host->h_addr_list, sizeof(struct in_addr));
-- break;
--#if defined(AF_INET6) && defined(HAVE_STRUCT_SOCKADDR_IN6)
-- case AF_INET6:
-- memset(&sin6, 0, sizeof(sin6));
-- sa_size = sizeof(sin6);
-- sa = (struct sockaddr *)&sin6;
-- sin6.sin6_family = family;
-- memcpy(&sin6.sin6_addr, *host->h_addr_list, sizeof(struct in6_addr));
-- break;
--#endif
-- default:
-- fprintf(stderr, "Bad address family: %d\n", family);
-- return 0;
-- }
--
-- _hostname[sizeof(_hostname)-1] = '\0';
-- hostname = _hostname;
-- } else {
-- herror(hostp);
-- seteuid(getuid());
-- setuid(getuid());
-- return 0;
-- }
-- }
--#if defined(IP_OPTIONS) && defined(IPPROTO_IP)
-- }
-+ } else
- #endif
-- if (portp) {
-- if (*portp == '-') {
-- portp++;
-- telnetport = 1;
-- } else
-- telnetport = 0;
-- port = atoi(portp);
-- if (port == 0) {
-- sp = getservbyname(portp, "tcp");
-- if (sp)
-- port = sp->s_port;
-- else {
-- printf("%s: bad port number\r\n", portp);
-- seteuid(getuid());
-- setuid(getuid());
-- return 0;
-- }
-- } else {
-- port = htons(port);
-- }
-- } else {
-- if (sp == 0) {
-- sp = getservbyname("telnet", "tcp");
-- if (sp == 0) {
-- fprintf(stderr, "telnet: tcp/telnet: unknown service\r\n");
-- seteuid(getuid());
-- setuid(getuid());
-- return 0;
-- }
-- port = sp->s_port;
-+ {
-+ hostname = hostp;
-+ memset(&hints, 0, sizeof(hints));
-+ hints.ai_family = PF_UNSPEC;
-+ hints.ai_socktype = SOCK_STREAM;
-+ hints.ai_flags = AI_CANONNAME;
-+ if (portp == NULL) {
-+ portp = "telnet";
-+ } else if (*portp == '-') {
-+ portp++;
-+ telnetport = 1;
-+ }
-+ h_errno = 0;
-+ error = getaddrinfo(hostp, portp, &hints, &res0);
-+ if (error) {
-+ if (error == EAI_SERVICE)
-+ warnx("%s: bad port", portp);
-+ else
-+ warnx("%s: %s", hostp, gai_strerror(error));
-+ if (h_errno)
-+ herror(hostp);
-+ return 0;
- }
-- telnetport = 1;
- }
-- switch(family) {
-- case AF_INET:
-- sin.sin_port = port;
-- printf("Trying %s...\r\n", inet_ntoa(sin.sin_addr));
-- break;
--#if defined(AF_INET6) && defined(HAVE_STRUCT_SOCKADDR_IN6)
-- case AF_INET6: {
--#ifndef INET6_ADDRSTRLEN
--#define INET6_ADDRSTRLEN 46
--#endif
-
-- char buf[INET6_ADDRSTRLEN];
--
-- sin6.sin6_port = port;
--#ifdef HAVE_INET_NTOP
-- printf("Trying %s...\r\n", inet_ntop(AF_INET6,
-- &sin6.sin6_addr,
-- buf,
-- sizeof(buf)));
--#endif
-- break;
-- }
--#endif
-- default:
-- abort();
-- }
--
-- do {
-- net = socket(family, SOCK_STREAM, 0);
-- seteuid(getuid());
-- setuid(getuid());
-- if (net < 0) {
-- perror("telnet: socket");
-- return 0;
-+ net = -1;
-+ retry = 0;
-+ for (res = res0; res; res = res->ai_next) {
-+ if (1 /* retry */) {
-+ char hbuf[NI_MAXHOST];
-+
-+ if (getnameinfo(res->ai_addr, res->ai_addrlen, hbuf, sizeof(hbuf),
-+ NULL, 0, niflags) != 0) {
-+ strcpy(hbuf, "(invalid)");
-+ }
-+ printf("Trying %s...\r\n", hbuf);
- }
-+ net = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
-+ if (net < 0)
-+ continue;
-+
- if (aliasp) {
-- memset ((caddr_t)&ladr, 0, sizeof (ladr));
-- temp = inet_addr(aliasp);
-- if (temp != INADDR_NONE) {
-- ladr.sin_addr.s_addr = temp;
-- ladr.sin_family = AF_INET;
-- alias = gethostbyaddr((char *)&temp, sizeof(temp), AF_INET);
-- } else {
-- alias = gethostbyname(aliasp);
-- if (alias) {
-- ladr.sin_family = alias->h_addrtype;
--#if defined(h_addr) /* In 4.3, this is a #define */
-- memmove((caddr_t)&ladr.sin_addr,
-- alias->h_addr_list[0], alias->h_length);
--#else /* defined(h_addr) */
-- memmove((caddr_t)&ladr.sin_addr, alias->h_addr,
-- alias->h_length);
--#endif /* defined(h_addr) */
-- } else {
-- herror(aliasp);
-- return 0;
-- }
-+ struct addrinfo ahints, *ares;
-+ memset(&ahints, 0, sizeof(ahints));
-+ ahints.ai_family = PF_UNSPEC;
-+ ahints.ai_socktype = SOCK_STREAM;
-+ ahints.ai_flags = AI_PASSIVE;
-+ error = getaddrinfo(aliasp, "0", &ahints, &ares);
-+ if (error) {
-+ warn("%s: %s", aliasp, gai_strerror(error));
-+ close(net);
-+ freeaddrinfo(ares);
-+ continue;
- }
-- ladr.sin_port = htons(0);
--
-- if (bind (net, (struct sockaddr *)&ladr, sizeof(ladr)) < 0) {
-- perror(aliasp);;
-+ if (bind(net, ares->ai_addr, ares->ai_addrlen) < 0) {
-+ perror(aliasp);
- (void) close(net); /* dump descriptor */
-- return 0;
-+ freeaddrinfo(ares);
-+ continue;
- }
-+ freeaddrinfo(ares);
- }
- #if defined(IP_OPTIONS) && defined(IPPROTO_IP)
-- if (srp && setsockopt(net, IPPROTO_IP, IP_OPTIONS, (char *)srp, srlen) < 0)
-+ if (srp && res->ai_family == AF_INET
-+ && setsockopt(net, IPPROTO_IP, IP_OPTIONS, (char *)srp, srlen) < 0)
- perror("setsockopt (IP_OPTIONS)");
- #endif
- #if defined(IPPROTO_IP) && defined(IP_TOS)
-@@ -2542,65 +2434,32 @@
- perror("setsockopt (SO_DEBUG)");
- }
-
-- if (connect(net, sa, sa_size) < 0) {
-- int retry = 0;
--
-- if (host && host->h_addr_list[1]) {
-- int oerrno = errno;
-- retry = 1;
--
-- switch(family) {
-- case AF_INET :
-- fprintf(stderr, "telnet: connect to address %s: ",
-- inet_ntoa(sin.sin_addr));
-- ++host->h_addr_list;
-- memcpy(&sin.sin_addr, *host->h_addr_list, sizeof(struct in_addr));
-- break;
--#if defined(AF_INET6) && defined(HAVE_STRUCT_SOCKADDR_IN6)
-- case AF_INET6: {
-- char buf[INET6_ADDRSTRLEN];
--
-- fprintf(stderr, "telnet: connect to address %s: ",
-- inet_ntop(AF_INET6, &sin6.sin6_addr, buf,
-- sizeof(buf)));
-- ++host->h_addr_list;
-- memcpy(&sin6.sin6_addr, *host->h_addr_list, sizeof(struct in6_addr));
-- break;
-- }
--#endif
-- default:
-- abort();
-- }
--
-- errno = oerrno;
-- perror(NULL);
--
-- switch(family) {
-- case AF_INET :
-- printf("Trying %s...\r\n", inet_ntoa(sin.sin_addr));
-- break;
--#if defined(AF_INET6) && defined(HAVE_STRUCT_SOCKADDR_IN6)
-- case AF_INET6: {
-- printf("Trying %s...\r\n", inet_ntop(AF_INET6,
-- &sin6.sin6_addr,
-- buf,
-- sizeof(buf)));
-- break;
-- }
--#endif
-- }
--
-- (void) NetClose(net);
-- continue;
-+ if (connect(net, res->ai_addr, res->ai_addrlen) < 0) {
-+ char hbuf[NI_MAXHOST];
-+
-+ if (getnameinfo(res->ai_addr, res->ai_addrlen, hbuf, sizeof(hbuf),
-+ NULL, 0, NI_NUMERICHOST) != 0) {
-+ strcpy(hbuf, "(invalid)");
- }
-- perror("telnet: Unable to connect to remote host");
-- return 0;
-+ fprintf(stderr, "telnet: connect to address %s: %s\n", hbuf,
-+ strerror(errno));
-+
-+ close(net);
-+ net = -1;
-+ retry++;
-+ continue;
- }
-+
- connected++;
- #if defined(AUTHENTICATION) || defined(ENCRYPTION)
- auth_encrypt_connect(connected);
- #endif /* defined(AUTHENTICATION) */
-- } while (connected == 0);
-+ break;
-+ }
-+ freeaddrinfo(res0);
-+ if (net < 0) {
-+ return 0;
-+ }
- cmdrc(hostp, hostname);
- if (autologin && user == NULL) {
- struct passwd *pw;
-@@ -2652,6 +2511,9 @@
- encrypthelp[] = "turn on (off) encryption ('encrypt ?' for more)",
- #endif
- zhelp[] = "suspend telnet",
-+#ifdef SKEY
-+ skeyhelp[] = "compute response to s/key challenge",
-+#endif
- shellhelp[] = "invoke a subshell",
- envhelp[] = "change environment variables ('environ ?' for more)",
- modestring[] = "try to enter line or character mode ('mode ?' for more)";
-@@ -2690,7 +2552,7 @@
- { "environ", envhelp, env_cmd, 0 },
- { "?", helphelp, help, 0 },
- #if defined(SKEY)
-- { "skey", NULL, skey_calc, 0 },
-+ { "skey", skeyhelp, skey_calc, 0 },
- #endif
- { 0, 0, 0, 0 }
- };
-diff -uNr telnet/externs.h telnet.obsd-cvs/externs.h
---- telnet/externs.h Mon Feb 8 22:56:11 1999
-+++ telnet.obsd-cvs/externs.h Sat Mar 10 10:54:35 2001
-@@ -1,4 +1,4 @@
--/* $OpenBSD: externs.h,v 1.4 1998/03/12 17:31:32 deraadt Exp $ */
-+/* $OpenBSD: externs.h,v 1.5 1998/03/12 2001/01/22 11:03:38 fgsch Exp $ */
- /* $KTH: externs.h,v 1.16 1997/11/29 02:28:35 joda Exp $ */
-
- /*
-@@ -447,7 +447,7 @@
- *Ibackp, /* Oldest byte of 3270 data */
- Ibuf[], /* 3270 buffer */
- *Ifrontp, /* Where next 3270 byte goes */
-- tline[],
-+ tline[200],
- *transcom; /* Transparent command */
-
- extern int
-diff -uNr telnet/main.c telnet.obsd-cvs/main.c
---- telnet/main.c Wed Apr 7 23:23:35 1999
-+++ telnet.obsd-cvs/main.c Sat Mar 10 09:59:35 2001
-@@ -1,4 +1,4 @@
--/* $OpenBSD: main.c,v 1.7 1998/05/15 03:16:38 art Exp $ */
-+/* $OpenBSD: main.c,v 1.10 2001/01/21 22:46:37 aaron Exp $ */
- /* $NetBSD: main.c,v 1.5 1996/02/28 21:04:05 thorpej Exp $ */
-
- /*
-@@ -81,10 +81,10 @@
- prompt,
- #ifdef AUTHENTICATION
- "[-8] [-E] [-K] [-L] [-S tos] [-X atype] [-a] [-c] [-d] [-e char]",
-- "\n\t[-k realm] [-l user] [-f/-F] [-n tracefile] [-b hostalias ]",
-+ "\n\t[-k realm] [-l user] [-f/-F] [-n tracefile] [-b hostalias ] ",
- #else
- "[-8] [-E] [-L] [-S tos] [-a] [-c] [-d] [-e char] [-l user]",
-- "\n\t[-n tracefile] [-b hostalias ]",
-+ "\n\t[-n tracefile] [-b hostalias ] ",
- #endif
- #if defined(TN3270) && defined(unix)
- # ifdef AUTHENTICATION
-@@ -95,13 +95,11 @@
- #else
- "[-r] ",
- #endif
-+ "\n\r "
- #ifdef ENCRYPTION
-- "[-x] [host-name [port]]"
--#else
--
-- "[host-name [port]]"
-+ "[-x] "
- #endif
-- );
-+ "[host-name [port]]");
- exit(1);
- }
-
-@@ -276,8 +274,8 @@
- break;
- case 't':
- #if defined(TN3270) && defined(unix)
-+ (void)strncpy(tline, optarg, sizeof(tline));
- transcom = tline;
-- (void)strcpy(transcom, optarg);
- #else
- fprintf(stderr,
- "%s: Warning: -t ignored, no TN3270 support.\n",
-diff -uNr telnet/sys_bsd.c telnet.obsd-cvs/sys_bsd.c
---- telnet/sys_bsd.c Wed Apr 7 21:38:31 1999
-+++ telnet.obsd-cvs/sys_bsd.c Sat Mar 10 10:55:18 2001
-@@ -1,4 +1,4 @@
--/* $OpenBSD: sys_bsd.c,v 1.6 1998/12/28 11:13:51 deraadt Exp $ */
-+/* $OpenBSD: sys_bsd.c,v 1.8 2000/10/10 15:41:10 millert Exp $ */
- /* $NetBSD: sys_bsd.c,v 1.11 1996/02/28 21:04:10 thorpej Exp $ */
-
- /*
-@@ -35,6 +35,7 @@
- */
-
- #include "telnet_locl.h"
-+#include <err.h>
-
- /*
- * The following routines try to encapsulate what is system dependent
-@@ -198,9 +199,10 @@
- TerminalFlushOutput(void)
- {
- #ifdef TIOCFLUSH
-- (void) ioctl(fileno(stdout), TIOCFLUSH, (char *) 0);
-+ int com = FWRITE;
-+ (void) ioctl(fileno(stdout), TIOCFLUSH, (int *) &com);
- #else
-- (void) ioctl(fileno(stdout), TCFLSH, (char *) 0);
-+ (void) ioctl(fileno(stdout), TCFLSH, (int *) 0);
- #endif
- }
-
-diff -uNr telnet/telnet.c telnet.obsd-cvs/telnet.c
---- telnet/telnet.c Wed Apr 7 23:22:14 1999
-+++ telnet.obsd-cvs/telnet.c Sat Mar 10 11:02:34 2001
-@@ -1,4 +1,4 @@
--/* $OpenBSD: telnet.c,v 1.6 1998/07/27 15:29:29 millert Exp $ */
-+/* $OpenBSD: telnet.c,v 1.11 2000/11/10 15:33:13 provos millert Exp $ */
- /* $NetBSD: telnet.c,v 1.7 1996/02/28 21:04:15 thorpej Exp $ */
-
- /*
-@@ -35,6 +35,8 @@
- */
-
- #include "telnet_locl.h"
-+#include <curses.h>
-+#include <term.h>
-
- #define strip(x) (eight ? (x) : ((x) & 0x7f))
-
-@@ -523,10 +525,9 @@
- }
-
- /*
-- * Given a buffer returned by tgetent(), this routine will turn
-- * the pipe seperated list of names in the buffer into an array
-- * of pointers to null terminated names. We toss out any bad,
-- * duplicate, or verbose names (names with spaces).
-+ * This routine will turn a pipe seperated list of names in the buffer
-+ * into an array of pointers to NUL terminated names. We toss out any
-+ * bad, duplicate, or verbose names (names with spaces).
- */
-
- int is_unique P((char *, char **, char **));
-@@ -554,7 +555,7 @@
- /*
- * Count up the number of names.
- */
-- for (n = 1, cp = buf; *cp && *cp != ':'; cp++) {
-+ for (n = 1, cp = buf; *cp; cp++) {
- if (*cp == '|')
- n++;
- }
-@@ -659,25 +660,6 @@
- return (1);
- }
-
--static char termbuf[1024];
--
--int telnet_setupterm P((char *tname, int fd, int *errp)); /* XXX move elsewhere */
-- /*ARGSUSED*/
-- int
--telnet_setupterm(char *tname, int fd, int *errp)
--{
-- (void)fd;
-- if (tgetent(termbuf, tname) == 1) {
-- termbuf[1023] = '\0';
-- if (errp)
-- *errp = 1;
-- return(0);
-- }
-- if (errp)
-- *errp = 0;
-- return(-1);
--}
--
- int resettermname = 1;
-
- char *gettermname P((void)); /* XXX move elsewhere */
-@@ -687,15 +669,15 @@
- char *tname;
- static char **tnamep = 0;
- static char **next;
-- int err;
-+ int errret;
-
- if (resettermname) {
- resettermname = 0;
- if (tnamep && tnamep != unknown)
- free(tnamep);
- if ((tname = (char *)env_getvalue((unsigned char *)"TERM")) &&
-- (telnet_setupterm(tname, 1, &err) == 0)) {
-- tnamep = mklist(termbuf, tname);
-+ (setupterm(tname, 1, &errret) == 0)) {
-+ tnamep = mklist(ttytype, tname);
- } else {
- if (tname && ((int)strlen(tname) <= 40)) {
- unknown[0] = tname;
-@@ -1482,10 +1464,15 @@
- void
- env_opt_start(void)
- {
-- if (opt_reply)
-- opt_reply = (unsigned char *)realloc(opt_reply, OPT_REPLY_SIZE);
-- else
-- opt_reply = (unsigned char *)malloc(OPT_REPLY_SIZE);
-+ unsigned char *p;
-+
-+ if (opt_reply) {
-+ p = (unsigned char *)realloc(opt_reply, OPT_REPLY_SIZE);
-+ if (p == NULL)
-+ free(opt_reply);
-+ } else
-+ p = (unsigned char *)malloc(OPT_REPLY_SIZE);
-+ opt_reply = p;
- if (opt_reply == NULL) {
- /*@*/ printf("env_opt_start: malloc()/realloc() failed!!!\n");
- opt_reply = opt_replyp = opt_replyend = NULL;
-@@ -1532,9 +1519,13 @@
- strlen((char *)ep) + 6 > opt_replyend)
- {
- int len;
-+ unsigned char *p;
- opt_replyend += OPT_REPLY_SIZE;
- len = opt_replyend - opt_reply;
-- opt_reply = (unsigned char *)realloc(opt_reply, len);
-+ p = (unsigned char *)realloc(opt_reply, len);
-+ if (p == NULL)
-+ free(opt_reply);
-+ opt_reply = p;
- if (opt_reply == NULL) {
- /*@*/ printf("env_opt_add: realloc() failed!!!\n");
- opt_reply = opt_replyp = opt_replyend = NULL;
-@@ -1945,7 +1936,7 @@
- command(0, "z\n", 2);
- continue;
- }
-- if (sc == escape) {
-+ if (sc == escape && escape != _POSIX_VDISABLE) {
- command(0, (char *)tbp, tcc);
- bol = 1;
- count += tcc;
-@@ -1962,7 +1953,7 @@
- }
- if ((sc == '\n') || (sc == '\r'))
- bol = 1;
-- } else if (sc == escape) {
-+ } else if (sc == escape && escape != _POSIX_VDISABLE) {
- /*
- * Double escape is a pass through of a single escape character.
- */
-diff -uNr telnet/telnet_locl.h telnet.obsd-cvs/telnet_locl.h
---- telnet/telnet_locl.h Thu Mar 12 06:57:44 1998
-+++ telnet.obsd-cvs/telnet_locl.h Sat Mar 10 11:12:37 2001
-@@ -1,4 +1,4 @@
--/* $OpenBSD: telnet_locl.h,v 1.1 1998/03/12 04:57:44 art Exp $ */
-+/* $OpenBSD: telnet_locl.h,v 1.2 1999/12/11 09:08:09 itojun Exp $ */
- /* $KTH: telnet_locl.h,v 1.13 1997/11/03 21:37:55 assar Exp $ */
-
- /*
-@@ -86,7 +86,5 @@
- #include "defines.h"
- #include "types.h"
-
--#undef AF_INET6 /* XXX - it has not been tested and it doesn't exist yet */
--
- /* prototypes */
-
-diff -uNr libtelnet/kerberos.c libtelnet.obsd-cvs/kerberos.c
---- libtelnet/kerberos.c Mon Feb 8 23:38:17 1999
-+++ libtelnet.obsd-cvs/kerberos.c Sat Mar 10 11:11:03 2001
-@@ -320,11 +320,10 @@
- char ts[MAXPATHLEN];
- struct passwd *pw = getpwnam(UserNameRequested);
-
-- if(pw){
-+ if (pw) {
- snprintf(ts, sizeof(ts),
-- "%s%u",
-- TKT_ROOT,
-- (unsigned)pw->pw_uid);
-+ "%s%u", TKT_ROOT, (unsigned)pw->pw_uid);
-+ /* XXX allocation failure? */
- setenv("KRBTKFILE", ts, 1);
- }
- Data(ap, KRB_ACCEPT, NULL, 0);
-@@ -609,16 +608,26 @@
- {
- unsigned char *p = buf;
-
-- p += krb_put_nir(cred->service, cred->instance, cred->realm, p);
-+ memcpy (p, cred->service, ANAME_SZ);
-+ p += ANAME_SZ;
-+ memcpy (p, cred->instance, INST_SZ);
-+ p += INST_SZ;
-+ memcpy (p, cred->realm, REALM_SZ);
-+ p += REALM_SZ;
- memcpy(p, cred->session, 8);
- p += 8;
- *p++ = cred->lifetime;
- *p++ = cred->kvno;
-- p += krb_put_int(cred->ticket_st.length, p, 4);
-+ p += krb_put_int(cred->ticket_st.length, p, 4, 4);
- memcpy(p, cred->ticket_st.dat, cred->ticket_st.length);
- p += cred->ticket_st.length;
-- p += krb_put_int(cred->issue_date, p, 4);
-- p += krb_put_nir(cred->pname, cred->pinst, NULL, p);
-+ p += krb_put_int(cred->issue_date, p, 4, 4);
-+ strncpy (cred->pname, p, ANAME_SZ);
-+ cred->pname[ANAME_SZ - 1] = '\0';
-+ p += ANAME_SZ;
-+ strncpy (cred->pinst, p, INST_SZ);
-+ cred->pinst[INST_SZ - 1] = '\0';
-+ p += INST_SZ;
- return p - buf;
- }
-
-@@ -627,7 +636,16 @@
- {
- unsigned char *p = buf;
-
-- p += krb_get_nir(p, cred->service, cred->instance, cred->realm);
-+ strncpy (cred->service, p, ANAME_SZ);
-+ cred->service[ANAME_SZ - 1] = '\0';
-+ p += ANAME_SZ;
-+ strncpy (cred->instance, p, INST_SZ);
-+ cred->instance[INST_SZ - 1] = '\0';
-+ p += INST_SZ;
-+ strncpy (cred->realm, p, REALM_SZ);
-+ cred->realm[REALM_SZ - 1] = '\0';
-+ p += REALM_SZ;
-+
- memcpy(cred->session, p, 8);
- p += 8;
- cred->lifetime = *p++;
-@@ -636,7 +654,10 @@
- memcpy(cred->ticket_st.dat, p, cred->ticket_st.length);
- cred->ticket_st.mbz = 0;
- p += krb_get_int(p, (u_int32_t *)&cred->issue_date, 4, 0);
-- p += krb_get_nir(p, cred->pname, cred->pinst, NULL);
-+ p += krb_get_nir(p,
-+ cred->pname, sizeof(cred->pname),
-+ cred->pinst, sizeof(cred->pinst),
-+ NULL, 0);
- return 0;
- }
-
---- telnet/telnet.1 Thu Nov 12 01:01:46 1998
-+++ telnet.obsd-cvs/telnet.1 Thu Nov 9 19:52:41 2000
-@@ -1,4 +1,4 @@
--.\" $OpenBSD: telnet.1,v 1.14 1998/11/11 23:01:46 aaron Exp $
-+.\" $OpenBSD: telnet.1,v 1.27 2000/11/09 17:52:41 aaron Exp $
- .\" $NetBSD: telnet.1,v 1.5 1996/02/28 21:04:12 thorpej Exp $
- .\"
- .\" Copyright (c) 1983, 1990, 1993
-@@ -36,45 +36,34 @@
- .\"
- .Dd February 3, 1994
- .Dt TELNET 1
--.Os BSD 4.2
-+.Os
- .Sh NAME
- .Nm telnet
--.Nd user interface to the
-+.Nd user interface to the
- .Tn TELNET
- protocol
- .Sh SYNOPSIS
- .Nm telnet
--.Op Fl 8
--.Op Fl E
--.Op Fl F
--.Op Fl K
--.Op Fl L
--.Op Fl S Ar tos
-+.Op Fl 8EFKLacdfrx
- .Op Fl X Ar authtype
--.Op Fl a
- .Op Fl b Ar hostalias
--.Op Fl c
--.Op Fl d
- .Op Fl e Ar escapechar
--.Op Fl f
- .Op Fl k Ar realm
- .Op Fl l Ar user
- .Op Fl n Ar tracefile
--.Op Fl r
--.Op Fl x
- .Oo
- .Ar host
- .Op Ar port
- .Oc
- .Sh DESCRIPTION
- The
--.Nm telnet
-+.Nm
- command
--is used to communicate with another host using the
-+is used to communicate with another host using the
- .Tn TELNET
- protocol.
- If
--.Nm telnet
-+.Nm
- is invoked without the
- .Ar host
- argument, it enters command mode,
-@@ -85,11 +74,11 @@
- .Ic open
- command with those arguments.
- .Pp
--Options:
--.Bl -tag -width indent
-+The options are as follows:
-+.Bl -tag -width Ds
- .It Fl 8
--Specifies an 8-bit data path. This causes an attempt to
--negotiate the
-+Specifies an 8-bit data path.
-+This causes an attempt to negotiate the
- .Dv TELNET BINARY
- option on both input and output.
- .It Fl E
-@@ -103,18 +92,9 @@
- .It Fl K
- Specifies no automatic login to the remote system.
- .It Fl L
--Specifies an 8-bit data path on output. This causes the
--BINARY option to be negotiated on output.
--.It Fl S Ar tos
--Sets the IP type-of-service (TOS) option for the telnet
--connection to the value
--.Ar tos ,
--which can be a numeric TOS value
--or, on systems that support it, a symbolic
--TOS name found in the
--.Pa /etc/iptos
--file.
--.It Fl X Ar atype
-+Specifies an 8-bit data path on output.
-+This causes the BINARY option to be negotiated on output.
-+.It Fl X Ar atype
- Disables the
- .Ar atype
- type of authentication.
-@@ -144,7 +124,8 @@
- .It Fl c
- Disables the reading of the user's
- .Pa \&.telnetrc
--file. (See the
-+file.
-+(See the
- .Ic toggle skiprc
- command on this man page.)
- .It Fl d
-@@ -152,7 +133,7 @@
- .Ic debug
- toggle to
- .Dv TRUE .
--.It Fl e Ar escapechar
-+.It Fl e Ar escapechar
- Sets the initial
- .Nm
- escape character to
-@@ -169,14 +150,14 @@
- If Kerberos authentication is being used, the
- .Fl k
- option requests that
--.Nm telnet
-+.Nm
- obtain tickets for the remote host in
- realm
- .Ar realm
- instead of the remote host's realm, as determined
- by
- .Xr krb_realmofhost 3 .
--.It Fl l Ar user
-+.It Fl l Ar user
- When connecting to the remote system, if the remote system
- understands the
- .Ev ENVIRON
-@@ -189,7 +170,7 @@
- This option may also be used with the
- .Ic open
- command.
--.It Fl n Ar tracefile
-+.It Fl n Ar tracefile
- Opens
- .Ar tracefile
- for recording trace information.
-@@ -210,35 +191,38 @@
- Indicates the official name, an alias, or the Internet address
- of a remote host.
- .It Ar port
--Indicates a port number (address of an application). If a number is
--not specified, the default
--.Nm telnet
-+Indicates a port number (address of an application).
-+If a number is not specified, the default
-+.Nm
- port is used.
- .El
- .Pp
--When in rlogin mode, a line of the form ~. disconnects from the
-+When in rlogin mode, a line of the form ~.
-+disconnects from the
- remote host; ~ is the telnet escape character.
- Similarly, the line ~^Z suspends the telnet session.
- The line ~^] escapes to the normal telnet escape prompt.
- .Pp
- Once a connection has been opened,
--.Nm telnet
-+.Nm
- will attempt to enable the
- .Dv TELNET LINEMODE
- option.
- If this fails,
--.Nm telnet
-+.Nm
- will revert to one of two input modes:
- either ``character at a time''
- or ``old line by line''
- depending on what the remote system supports.
- .Pp
--When
-+When
- .Dv LINEMODE
- is enabled, character processing is done on the
--local system, under the control of the remote system. When input
-+local system, under the control of the remote system.
-+When input
- editing or character echoing is to be disabled, the remote system
--will relay that information. The remote system will also relay
-+will relay that information.
-+The remote system will also relay
- changes to any special characters that happen on the remote
- system, so that they can take effect on the local system.
- .Pp
-@@ -252,7 +236,7 @@
- (this would mostly be used to enter passwords
- without the password being echoed).
- .Pp
--If the
-+If the
- .Dv LINEMODE
- option is enabled, or if the
- .Ic localchars
-@@ -267,7 +251,7 @@
- characters are trapped locally, and sent as
- .Tn TELNET
- protocol sequences to the remote side.
--If
-+If
- .Dv LINEMODE
- has ever been enabled, then the user's
- .Ic susp
-@@ -278,9 +262,9 @@
- protocol sequences,
- and
- .Ic quit
--is sent as a
-+is sent as a
- .Dv TELNET ABORT
--instead of
-+instead of
- .Dv BREAK .
- There are options (see
- .Ic toggle
-@@ -296,17 +280,26 @@
- (in the case of
- .Ic quit
- and
--.Ic intr ) .
-+.Ic intr ) .
- .Pp
- While connected to a remote host,
--.Nm telnet
-+.Nm
- command mode may be entered by typing the
--.Nm telnet
-+.Nm
- ``escape character'' (initially ``^]'').
- When in command mode, the normal terminal editing conventions are available.
-+Note that the escape character will return to the command mode of the initial
-+invocation of
-+.Nm
-+that has the controlling terminal.
-+Use the
-+.Cm send escape
-+command to switch to command mode in subsequent
-+.Nm
-+processes on remote hosts.
- .Pp
- The following
--.Nm telnet
-+.Nm
- commands are available.
- Only enough of each command to uniquely identify it need be typed
- (this is also true for arguments to the
-@@ -320,26 +313,28 @@
- .Ic display
- commands).
- .Bl -tag -width "mode type"
--.It Ic auth Ar argument Op Ar ...
-+.It Ic auth Ar argument Op Ar ...
- The
- .Ic auth
- command manipulates the information sent through the
- .Dv TELNET AUTHENTICATE
--option. Valid arguments for the
--auth command are as follows:
-+option.
-+Valid arguments for the
-+.Ic auth
-+command are as follows:
- .Bl -tag -width "disable type"
- .It Ic disable Ar type
- Disables the specified
- .Ar type
--of authentication. To
--obtain a list of available types, use the
-+of authentication.
-+To obtain a list of available types, use the
- .Ic auth disable \&?
- command.
- .It Ic enable Ar type
- Enables the specified
- .Ar type
--of authentication. To
--obtain a list of available types, use the
-+of authentication.
-+To obtain a list of available types, use the
- .Ic auth enable \&?
- command.
- .It Ic status
-@@ -350,7 +345,7 @@
- Close a
- .Tn TELNET
- session and return to command mode.
--.It Ic display Ar argument Op Ar ...
-+.It Ic display Ar argument Op Ar ...
- Displays all, or some, of the
- .Ic set
- and
-@@ -368,26 +363,27 @@
- .It Ic disable Ar type Ic [input|output]
- Disables the specified
- .Ar type
--of encryption. If you
--omit
-+of encryption.
-+If you omit
- .Ic input
- and
- .Ic output ,
- both input and output
--are disabled. To obtain a list of available
--types, use the
-+are disabled.
-+To obtain a list of available types, use the
- .Ic encrypt disable \&?
- command.
- .It Ic enable Ar type Ic [input|output]
- Enables the specified
- .Ar type
--of encryption. If you
--omit
-+of encryption.
-+If you omit
- .Ic input
- and
- .Ic output ,
- both input and output are
--enabled. To obtain a list of available types, use the
-+enabled.
-+To obtain a list of available types, use the
- .Ic encrypt enable \&?
- command.
- .It Ic input
-@@ -407,18 +403,20 @@
- .Ic encrypt stop output
- command.
- .It Ic start Ic [input|output]
--Attempts to start encryption. If you omit
-+Attempts to start encryption.
-+If you omit
- .Ic input
- and
--.Ic output,
--both input and output are enabled. To
--obtain a list of available types, use the
-+.Ic output ,
-+both input and output are enabled.
-+To obtain a list of available types, use the
- .Ic encrypt enable \&?
- command.
- .It Ic status
- Lists the current status of encryption.
- .It Ic stop Ic [input|output]
--Stops encryption. If you omit
-+Stops encryption.
-+If you omit
- .Ic input
- and
- .Ic output ,
-@@ -431,7 +429,7 @@
- .Ic encrypt stop
- commands.
- .El
--.It Ic environ Ar arguments Op Ar ...
-+.It Ic environ Ar arguments Op Ar ...
- The
- .Ic environ
- command is used to manipulate the
-@@ -456,7 +454,7 @@
- .Ic environ
- command are:
- .Bl -tag -width Fl
--.It Ic define Ar variable value
-+.It Ic define Ar variable value
- Define the variable
- .Ar variable
- to have a value of
-@@ -466,15 +464,15 @@
- .Ar value
- may be enclosed in single or double quotes so
- that tabs and spaces may be included.
--.It Ic undefine Ar variable
-+.It Ic undefine Ar variable
- Remove
- .Ar variable
- from the list of environment variables.
--.It Ic export Ar variable
-+.It Ic export Ar variable
- Mark the variable
- .Ar variable
- to be exported to the remote side.
--.It Ic unexport Ar variable
-+.It Ic unexport Ar variable
- Mark the variable
- .Ar variable
- to not be exported unless
-@@ -508,7 +506,7 @@
- suspending a user's session for later reattachment,
- the logout argument indicates that you
- should terminate the session immediately.
--.It Ic mode Ar type
-+.It Ic mode Ar type
- .Ar type
- is one of several options, depending on the state of the
- .Tn TELNET
-@@ -529,40 +527,40 @@
- option, or, if the remote side does not understand the
- .Dv LINEMODE
- option, then attempt to enter ``old-line-by-line'' mode.
--.It Ic isig Pq Ic \-isig
--Attempt to enable (disable) the
-+.It Ic isig Pq Ic \-isig
-+Attempt to enable (disable) the
- .Dv TRAPSIG
--mode of the
-+mode of the
- .Dv LINEMODE
- option.
--This requires that the
-+This requires that the
- .Dv LINEMODE
- option be enabled.
--.It Ic edit Pq Ic \-edit
--Attempt to enable (disable) the
-+.It Ic edit Pq Ic \-edit
-+Attempt to enable (disable) the
- .Dv EDIT
--mode of the
-+mode of the
- .Dv LINEMODE
- option.
--This requires that the
-+This requires that the
- .Dv LINEMODE
- option be enabled.
--.It Ic softtabs Pq Ic \-softtabs
--Attempt to enable (disable) the
-+.It Ic softtabs Pq Ic \-softtabs
-+Attempt to enable (disable) the
- .Dv SOFT_TAB
--mode of the
-+mode of the
- .Dv LINEMODE
- option.
--This requires that the
-+This requires that the
- .Dv LINEMODE
- option be enabled.
--.It Ic litecho Pq Ic \-litecho
--Attempt to enable (disable) the
-+.It Ic litecho Pq Ic \-litecho
-+Attempt to enable (disable) the
- .Dv LIT_ECHO
--mode of the
-+mode of the
- .Dv LINEMODE
- option.
--This requires that the
-+This requires that the
- .Dv LINEMODE
- option be enabled.
- .It Ic \&?
-@@ -579,7 +577,7 @@
- Open a connection to the named host.
- If no port number
- is specified,
--.Nm telnet
-+.Nm
- will attempt to contact a
- .Tn TELNET
- server at the default port.
-@@ -594,24 +592,29 @@
- .Ev ENVIRON
- option.
- When connecting to a non-standard port,
--.Nm telnet
-+.Nm
- omits any automatic initiation of
- .Tn TELNET
--options. When the port number is preceded by a minus sign,
-+options.
-+When the port number is preceded by a minus sign,
- the initial option negotiation is done.
- After establishing a connection, the file
- .Pa \&.telnetrc
- in the
--user's home directory is opened. Lines beginning with a ``#'' are
--comment lines. Blank lines are ignored. Lines that begin
--without white space are the start of a machine entry. The
--first thing on the line is the name of the machine that is
--being connected to. The rest of the line, and successive
--lines that begin with white space are assumed to be
--.Nm telnet
-+user's home directory is opened.
-+Lines beginning with a ``#'' are
-+comment lines.
-+Blank lines are ignored.
-+Lines that begin
-+without whitespace are the start of a machine entry.
-+The first thing on the line is the name of the machine that is
-+being connected to.
-+The rest of the line, and successive
-+lines that begin with whitespace are assumed to be
-+.Nm
- commands and are processed as if they had been typed
- in manually to the
--.Nm telnet
-+.Nm
- command prompt.
- .It Ic quit
- Close any open
-@@ -619,7 +622,7 @@
- session and exit
- .Nm telnet .
- An end-of-file (in command mode) will also close a session and exit.
--.It Ic send Ar arguments
-+.It Ic send Ar arguments
- Sends one or more special character sequences to the remote host.
- The following are the arguments which may be specified
- (more than one argument may be specified at a time):
-@@ -673,7 +676,7 @@
- sequence.
- .It Ic escape
- Sends the current
--.Nm telnet
-+.Nm
- escape character (initially ``^]'').
- .It Ic ga
- Sends the
-@@ -788,12 +791,12 @@
- .Ic send
- command.
- .El
--.It Ic set Ar argument value
--.It Ic unset Ar argument value
-+.It Ic set Ar argument value
-+.It Ic unset Ar argument value
- The
- .Ic set
- command will set any one of a number of
--.Nm telnet
-+.Nm
- variables to a specific value or to
- .Dv TRUE .
- The special value
-@@ -811,7 +814,8 @@
- .Ic display
- command.
- The variables which may be set or unset, but not toggled, are
--listed here. In addition, any of the variables for the
-+listed here.
-+In addition, any of the variables for the
- .Ic toggle
- command may be explicitly set or unset using
- the
-@@ -832,7 +836,8 @@
- sequence (see
- .Ic send ayt
- preceding) is sent to the
--remote host. The initial value for the "Are You There"
-+remote host.
-+The initial value for the "Are You There"
- character is the terminal's status character.
- .It Ic echo
- This is the value (initially ``^E'') which, when in
-@@ -841,7 +846,7 @@
- echoing of entered characters (for entering, say, a password).
- .It Ic eof
- If
--.Nm telnet
-+.Nm
- is operating in
- .Dv LINEMODE
- or ``old line by line'' mode, entering this character
-@@ -854,7 +859,7 @@
- character.
- .It Ic erase
- If
--.Nm telnet
-+.Nm
- is in
- .Ic localchars
- mode (see
-@@ -862,7 +867,7 @@
- .Ic localchars
- below),
- and if
--.Nm telnet
-+.Nm
- is operating in ``character at a time'' mode, then when this
- character is typed, a
- .Dv TELNET EC
-@@ -879,14 +884,14 @@
- character.
- .It Ic escape
- This is the
--.Nm telnet
-+.Nm
- escape character (initially ``^['') which causes entry
- into
--.Nm telnet
-+.Nm
- command mode (when connected to a remote system).
- .It Ic flushoutput
- If
--.Nm telnet
-+.Nm
- is in
- .Ic localchars
- mode (see
-@@ -916,12 +921,13 @@
- .Dv LINEMODE ,
- these are the
- characters that, when typed, cause partial lines to be
--forwarded to the remote system. The initial value for
-+forwarded to the remote system.
-+The initial value for
- the forwarding characters are taken from the terminal's
- eol and eol2 characters.
- .It Ic interrupt
- If
--.Nm telnet
-+.Nm
- is in
- .Ic localchars
- mode (see
-@@ -945,7 +951,7 @@
- character.
- .It Ic kill
- If
--.Nm telnet
-+.Nm
- is in
- .Ic localchars
- mode (see
-@@ -953,7 +959,7 @@
- .Ic localchars
- below),
- and if
--.Nm telnet
-+.Nm
- is operating in ``character at a time'' mode, then when this
- character is typed, a
- .Dv TELNET EL
-@@ -970,7 +976,7 @@
- character.
- .It Ic lnext
- If
--.Nm telnet
-+.Nm
- is operating in
- .Dv LINEMODE
- or ``old line by line'' mode, then this character is taken to
-@@ -985,7 +991,7 @@
- character.
- .It Ic quit
- If
--.Nm telnet
-+.Nm
- is in
- .Ic localchars
- mode (see
-@@ -1009,7 +1015,7 @@
- character.
- .It Ic reprint
- If
--.Nm telnet
-+.Nm
- is operating in
- .Dv LINEMODE
- or old line by line'' mode, then this character is taken to
-@@ -1031,8 +1037,9 @@
- This character, at the beginning of a line, followed by
- a "." closes the connection; when followed by a ^Z it
- suspends the
--.Nm telnet
--command. The initial state is to
-+.Nm
-+command.
-+The initial state is to
- disable the
- .Ic rlogin
- escape character.
-@@ -1066,7 +1073,7 @@
- character.
- .It Ic susp
- If
--.Nm telnet
-+.Nm
- is in
- .Ic localchars
- mode, or
-@@ -1093,12 +1100,13 @@
- .Ic option
- tracing being
- .Dv TRUE ,
--will be written. If it is set to
-+will be written.
-+If it is set to
- .Dq Fl ,
- then tracing information will be written to standard output (the default).
- .It Ic worderase
- If
--.Nm telnet
-+.Nm
- is operating in
- .Dv LINEMODE
- or ``old line by line'' mode, then this character is taken to
-@@ -1117,25 +1125,32 @@
- .Pq Ic unset
- commands.
- .El
--.It Ic slc Ar state
-+.It Ic skey Ar sequence challenge
-+The
-+.Ic skey
-+command computes a response to the S/Key challenge.
-+See
-+.Xr skey 1
-+for more information on the S/Key system.
-+.It Ic slc Ar state
- The
- .Ic slc
- command (Set Local Characters) is used to set
- or change the state of the special
--characters when the
-+characters when the
- .Dv TELNET LINEMODE
- option has
--been enabled. Special characters are characters that get
--mapped to
-+been enabled.
-+Special characters are characters that get mapped to
- .Tn TELNET
- commands sequences (like
- .Ic ip
- or
--.Ic quit )
-+.Ic quit )
- or line editing characters (like
- .Ic erase
- and
--.Ic kill ) .
-+.Ic kill ) .
- By default, the local special characters are exported.
- .Bl -tag -width Fl
- .It Ic check
-@@ -1144,15 +1159,15 @@
- character settings, and if there are any discrepancies with
- the local side, the local side will switch to the remote value.
- .It Ic export
--Switch to the local defaults for the special characters. The
--local default characters are those of the local terminal at
-+Switch to the local defaults for the special characters.
-+The local default characters are those of the local terminal at
- the time when
--.Nm telnet
-+.Nm
- was started.
- .It Ic import
- Switch to the remote defaults for the special characters.
- The remote default characters are those of the remote system
--at the time when the
-+at the time when the
- .Tn TELNET
- connection was established.
- .It Ic \&?
-@@ -1165,13 +1180,13 @@
- .Nm telnet .
- This includes the peer one is connected to, as well
- as the current mode.
--.It Ic toggle Ar arguments Op Ar ...
-+.It Ic toggle Ar arguments Op Ar ...
- Toggle (between
- .Dv TRUE
- and
- .Dv FALSE )
- various flags that control how
--.Nm telnet
-+.Nm
- responds to events.
- These flags may be set explicitly to
- .Dv TRUE
-@@ -1206,7 +1221,7 @@
- sequences; see
- .Ic set
- above for details),
--.Nm telnet
-+.Nm
- refuses to display any data on the user's terminal
- until the remote system acknowledges (via a
- .Dv TELNET TIMING MARK
-@@ -1220,13 +1235,14 @@
- done an "stty noflsh", otherwise
- .Dv FALSE
- (see
--.Xr stty 1 ) .
-+.Xr stty 1 ) .
- .It Ic autodecrypt
- When the
- .Dv TELNET ENCRYPT
- option is negotiated, by
- default the actual encryption (decryption) of the data
--stream does not start automatically. The
-+stream does not start automatically.
-+The
- .Ic autoencrypt
- .Pq Ic autodecrypt
- command states that encryption of the
-@@ -1238,7 +1254,8 @@
- .Dv TELNET AUTHENTICATION
- option
- .Tn TELNET
--attempts to use it to perform automatic authentication. If the
-+attempts to use it to perform automatic authentication.
-+If the
- .Dv AUTHENTICATION
- option is not supported, the user's login
- name are propagated through the
-@@ -1314,7 +1331,7 @@
- The initial value for this toggle is
- .Dv FALSE .
- .It Ic debug
--Toggles socket level debugging (useful only to the super-user).
-+Toggles socket level debugging (useful only to the superuser).
- The initial value for this toggle is
- .Dv FALSE .
- .It Ic encdebug
-@@ -1340,7 +1357,7 @@
- .Ic brk ,
- .Ic ec ,
- and
--.Ic el ;
-+.Ic el ;
- see
- .Ic send
- above).
-@@ -1379,7 +1396,7 @@
- .Dv FALSE .
- .It Ic options
- Toggles the display of some internal
--.Nm telnet
-+.Nm
- protocol processing (having to do with
- .Tn TELNET
- options).
-@@ -1404,8 +1421,8 @@
- skips the reading of the
- .Pa \&.telnetrc
- file in the user's home
--directory when connections are opened. The initial
--value for this toggle is
-+directory when connections are opened.
-+The initial value for this toggle is
- .Dv FALSE .
- .It Ic termdata
- Toggles the display of all terminal data (in hexadecimal format).
-@@ -1416,9 +1433,10 @@
- .Ic verbose_encrypt
- toggle is
- .Dv TRUE ,
--.Nm telnet
-+.Nm
- prints out a message each time encryption is enabled or
--disabled. The initial value for this toggle is
-+disabled.
-+The initial value for this toggle is
- .Dv FALSE .
- .It Ic \&?
- Displays the legal
-@@ -1430,22 +1448,24 @@
- .Nm telnet .
- This command only works when the user is using the
- .Xr csh 1 .
--.It Ic \&! Op Ar command
-+.It Ic \&! Op Ar command
- Execute a single command in a subshell on the local
--system. If
-+system.
-+If
- .Ar command
- is omitted, then an interactive
- subshell is invoked.
--.It Ic \&? Op Ar command
--Get help. With no arguments,
--.Nm telnet
-+.It Ic \&? Op Ar command
-+Get help.
-+With no arguments,
-+.Nm
- prints a help summary.
- If a command is specified,
--.Nm telnet
-+.Nm
- will print the help information for just that command.
- .El
- .Sh ENVIRONMENT
--.Nm telnet
-+.Nm
- uses at least the
- .Ev HOME ,
- .Ev SHELL ,
-@@ -1464,16 +1484,18 @@
- .El
- .Sh HISTORY
- The
--.Nm telnet
-+.Nm
- command appeared in
- .Bx 4.2 .
- .Sh NOTES
- On some remote systems, echo has to be turned off manually when in
- ``old line by line'' mode.
- .Pp
--In ``old line by line'' mode or
-+In ``old line by line'' mode or
- .Dv LINEMODE
- the terminal's
- .Ic eof
- character is only recognized (and sent to the remote system)
- when it is the first character on a line.
-+.Pp
-+Source routing is not supported yet for IPv6.
diff --git a/telnet/patches/telnet-gethostbyname.patch b/telnet/patches/telnet-gethostbyname.patch
deleted file mode 100644
index e1c1976a3..000000000
--- a/telnet/patches/telnet-gethostbyname.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- netkit-telnet-0.17/telnet/commands.c.old 2006-04-30 10:24:49.000000000 -0700
-+++ netkit-telnet-0.17/telnet/commands.c 2006-04-30 10:37:10.000000000 -0700
-@@ -1669,9 +1669,15 @@
-
- /* If this is not the full name, try to get it via DNS */
- if (strchr(hbuf, '.') == 0) {
-- struct hostent *he = gethostbyname(hbuf);
-- if (he != 0)
-- strncpy(hbuf, he->h_name, sizeof hbuf-1);
-+ struct addrinfo hints;
-+ struct addrinfo *res;
-+ memset (&hints, '\0', sizeof (hints));
-+ hints.ai_flags = AI_V4MAPPED | AI_ADDRCONFIG | AI_CANONNAME;
-+ if (getaddrinfo (hbuf, NULL, &hints, &res) == 0) {
-+ if (res->ai_canonname != NULL)
-+ strncpy(hbuf, res->ai_canonname, sizeof hbuf-1);
-+ freeaddrinfo (res);
-+ }
- hbuf[sizeof hbuf-1] = '\0';
- }
-
-@@ -2832,17 +2838,15 @@
- if (!c)
- cp2 = 0;
-
-- if ((tmp = inet_addr(cp)) != -1) {
-- sin_addr.s_addr = tmp;
-- } else if ((host = gethostbyname(cp))) {
--#if defined(h_addr)
-- memmove((caddr_t)&sin_addr,
-- host->h_addr_list[0],
-- sizeof(sin_addr));
--#else
-- memmove((caddr_t)&sin_addr, host->h_addr,
-- sizeof(sin_addr));
--#endif
-+ struct addrinfo hints;
-+ memset (&hints, '\0', sizeof (hints));
-+ // XXX The code here seems to allow only IPv4 addresses.
-+ hints.ai_family = AF_INET;
-+ hints.ai_flags = AI_ADDRCONFIG;
-+ struct addrinfo *aires;
-+ if (getaddrinfo (cp, NULL, &hints, &aires) == 0) {
-+ sin_addr = ((struct sockaddr_in *) aires->ai_addr)->sin_addr;
-+ freeaddrinfo (aires);
- } else {
- *cpp = cp;
- return(0);
diff --git a/telnet/patches/telnetd-0.17-pty_read.patch0 b/telnet/patches/telnetd-0.17-pty_read.patch0
deleted file mode 100644
index 1760dddf7..000000000
--- a/telnet/patches/telnetd-0.17-pty_read.patch0
+++ /dev/null
@@ -1,25 +0,0 @@
---- telnetd/telnetd.c 2005-01-19 14:37:25.000000000 +0000
-+++ telnetd/telnetd.c.new 2005-01-19 14:48:12.000000000 +0000
-@@ -697,6 +697,7 @@
- int on = 1;
- char *HE;
- const char *IM;
-+ int pty_read_ok = 0; /* track whether the pty read has worked yet */
-
- /*
- * Initialize the slc mapping table.
-@@ -1016,12 +1017,13 @@
- * off the master side before the slave side is
- * opened, we get EIO.
- */
-- if (pcc < 0 && (errno == EWOULDBLOCK || errno == EIO)) {
-+ if (pcc < 0 && (errno == EWOULDBLOCK || (errno == EIO && pty_read_ok == 0))) {
- pcc = 0;
- }
- else {
- if (pcc <= 0)
- break;
-+ pty_read_ok = 1; /* mark connection up for read */
- #ifdef LINEMODE
- /*
- * If ioctl from pty, pass it through net
diff --git a/telnet/patches/telnetd-0.17.patch0 b/telnet/patches/telnetd-0.17.patch0
deleted file mode 100644
index 469b35adb..000000000
--- a/telnet/patches/telnetd-0.17.patch0
+++ /dev/null
@@ -1,10 +0,0 @@
---- telnetd/defs.h Mon Aug 2 06:14:03 1999
-+++ telnetd.new/defs.h Sun Mar 11 03:28:13 2001
-@@ -56,6 +56,7 @@
- #include <sys/file.h>
- #include <sys/stat.h>
- #include <sys/time.h>
-+#include <time.h>
- #include <sys/ioctl.h>
- #include <netinet/in.h>
- #include <arpa/telnet.h>
diff --git a/telnet/patches/use-cmake-as-buildsystem.patch b/telnet/patches/use-cmake-as-buildsystem.patch
new file mode 100644
index 000000000..19a289796
--- /dev/null
+++ b/telnet/patches/use-cmake-as-buildsystem.patch
@@ -0,0 +1,137 @@
+Description: Use cmake as build system
+Author: Christoph Biedl <debian.axhn(a)manchmal.in-ulm.de>
+Bug-Debian: https://bugs.debian.org/912131
+Last-Update: 2019-02-24
+
+--- /dev/null
++++ b/CMakeLists.txt
+@@ -0,0 +1,27 @@
++cmake_minimum_required(VERSION 3.7)
++project(netkit-telnet)
++
++set(BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin")
++set(SBIN_DIR "${CMAKE_INSTALL_PREFIX}/sbin")
++set(MAN_DIR "${CMAKE_INSTALL_PREFIX}/share/man")
++
++set(USE_GLIBC 1)
++
++set(
++ CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
++ -D_GNU_SOURCE \
++ -DACCEPT_USERVAR \
++ -Wall \
++ -Wno-trigraphs \
++")
++set(
++ CMAKE_C_FLAGS "${CMAKE_C_FLAGS} \
++ -D_GNU_SOURCE \
++ -DACCEPT_USERVAR \
++ -Wall \
++ -Wno-trigraphs \
++")
++
++add_subdirectory(telnet)
++add_subdirectory(telnetd)
++add_subdirectory(telnetlogin)
+--- /dev/null
++++ b/telnet/CMakeLists.txt
+@@ -0,0 +1,31 @@
++
++set(
++ CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
++ -DUSE_TERMIO \
++ -DKLUDGELINEMODE \
++")
++
++add_executable(
++ telnet
++ commands.cc
++ environ.cc
++ genget.cc
++ main.cc
++ netlink.cc
++ network.cc
++ ring.cc
++ sys_bsd.cc
++ telnet.cc
++ terminal.cc
++ tn3270.cc
++ utilities.cc
++)
++install(
++ TARGETS telnet
++ DESTINATION ${BIN_DIR}
++)
++
++install(
++ FILES telnet.1
++ DESTINATION ${MAN_DIR}/man1/
++)
+--- /dev/null
++++ b/telnetd/CMakeLists.txt
+@@ -0,0 +1,43 @@
++
++set(CMAKE_C_FLAGS "\
++ ${CMAKE_C_FLAGS} \
++ -DISSUE_FILE='\"/etc/issue.net\"' \
++ -DPARANOID_TTYS \
++ -DNO_REVOKE \
++ -DKLUDGELINEMODE \
++ -DDIAGNOSTICS \
++ -DLOGIN_WRAPPER='\"/usr/lib/telnetlogin\"' \
++")
++
++add_executable(
++ in.telnetd
++ global.c
++ setproctitle.c
++ slc.c
++ state.c
++ sys_term.c
++ telnetd.c
++ termstat.c
++ utility.c
++)
++target_link_libraries(
++ in.telnetd
++ ncurses
++ util
++)
++install(
++ TARGETS in.telnetd
++ DESTINATION ${SBIN_DIR}
++)
++
++install(
++ FILES telnetd.8
++ DESTINATION ${MAN_DIR}/man8/
++ RENAME in.telnetd.8
++)
++install(
++ CODE "execute_process( \
++ COMMAND ${CMAKE_COMMAND} -E create_symlink \
++ telnetd.8 \$ENV{DESTDIR}${MAN_DIR}/man8/in.telnetd.8 \
++ )"
++)
+--- /dev/null
++++ b/telnetlogin/CMakeLists.txt
+@@ -0,0 +1,19 @@
++
++add_executable(
++ telnetlogin
++ telnetlogin.c
++)
++install(
++ TARGETS telnetlogin
++ DESTINATION ${SBIN_DIR}
++ PERMISSIONS
++ SETUID
++ OWNER_WRITE OWNER_READ OWNER_EXECUTE
++ GROUP_READ GROUP_EXECUTE
++
++)
++
++install(
++ FILES telnetlogin.8
++ DESTINATION ${MAN_DIR}/man8/
++)
diff --git a/telnet/telnet.nm b/telnet/telnet.nm
index a660f1c23..6927acffc 100644
--- a/telnet/telnet.nm
+++ b/telnet/telnet.nm
@@ -5,7 +5,7 @@
name = telnet
version = 0.17
-release = 3
+release = 4
groups = Applications/Internet
url = http://www.ibiblio.org/pub/Linux/system/network/netkit/
@@ -20,75 +20,33 @@ end
source_dl = http://www.ibiblio.org/pub/Linux/system/network/netkit/
sources = netkit-%{thisapp}.tar.gz
-sources += telnet-client.tar.gz
-
-# Apply patches in a special order
-patches = \
- telnet-client-cvs.patch0 \
- telnetd-0.17.patch0 \
- telnet-0.17-env.patch \
- telnet-0.17-pek.patch0 \
- telnet-0.17-issue.patch \
- telnet-0.17-sa-01-49.patch \
- telnet-0.17-8bit.patch \
- telnet-0.17-argv.patch \
- telnet-0.17-conf.patch \
- telnet-0.17-cleanup_race.patch \
- telnetd-0.17-pty_read.patch0 \
- telnet-0.17-CAN-2005-468_469.patch \
- telnet-gethostbyname.patch \
- netkit-telnet-0.17-ipv6.diff \
- netkit-telnet-0.17-nodns.patch \
- telnet-0.17-errno_test_sys_bsd.patch \
- netkit-telnet-0.17-reallynodns.patch
build
requires
+ cmake
gcc-c++
ncurses-devel
end
DIR_APP = %{DIR_SRC}/netkit-%{thisapp}
- # Overwite configure options, because configure script
- # doesn't accept flags for used compiler or host definition
- configure_options = \
- --prefix=/usr
-
- # For the telnet client we have to extract a second tarball into the source
- # directory of the main tarball.
- prepare
- cd %{DIR_SRC} && %{MACRO_EXTRACT} %{DIR_DL}/netkit-%{thisapp}.tar.gz
- cd %{DIR_APP} && mv telnet telnet-netkit
- cd %{DIR_APP} && %{MACRO_EXTRACT} %{DIR_DL}/telnet-client.tar.gz
+ build
+ %{cmake}
- %{MACRO_PATCHES}
-
- sed -i configure \
- -e "s/LDFLAGS=/LDFLAGS=\"%{LDFLAGS}\"/"
+ make %{PARALLELISMFLAGS}
end
- install
- # We have to create the directories on our own
- mkdir -pv %{BUILDROOT}/usr/man/man{1,5,8}
- mkdir -pv %{BUILDROOT}/usr/{,s}bin
-
- make install INSTALLROOT=%{BUILDROOT}
-
- # Move manpages to correct place
- mkdir -pv %{BUILDROOT}/usr/share
- mv %{BUILDROOT}/usr/man %{BUILDROOT}/usr/share/man
-
+ install_cmds
# Remove telnetd, we don't want it
- rm -rf %{BUILDROOT}/usr/sbin
- rm -rf %{BUILDROOT}/usr/share/man/man8
- rm -rf %{BUILDROOT}/usr/share/man/man5
+ rm -rvf %{BUILDROOT}%{sbindir}/*telnetd*
+ rm -rvf %{BUILDROOT}%{sbindir}/telnetlogin
+ rm -rvf %{BUILDROOT}%{mandir}/man8/*telnetd*
+ rm -rvf %{BUILDROOT}%{mandir}/man8/telnetlogin*
end
end
packages
package %{name}
- end
package %{name}-debuginfo
template DEBUGINFO
diff --git a/whois/whois.nm b/whois/whois.nm
index a96855c1b..a53114bb3 100644
--- a/whois/whois.nm
+++ b/whois/whois.nm
@@ -5,7 +5,7 @@
name = whois
version = 5.5.15
-release = 1
+release = 1.1
groups = Applications/Internet
url = https://github.com/rfc1036/whois
@@ -28,6 +28,7 @@ build
requires
libidn2-devel
+ libxcrypt-devel
perl
perl(autodie)
perl(strict)
diff --git a/wpa_supplicant/systemd/wpa_supplicant@.service b/wpa_supplicant/systemd/wpa_supplicant@.service
deleted file mode 100644
index 79073107c..000000000
--- a/wpa_supplicant/systemd/wpa_supplicant@.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=wpa_supplicant for %I.
-
-[Service]
-ExecStart=/usr/lib/network/helpers/wpa_supplicant %I
-ExecReload=/bin/kill -HUP $MAINPID
-PIDFile=/run/wpa_supplicant-%I.pid
-Restart=on-failure
-UtmpIdentifier=%I
-KillMode=process
diff --git a/wpa_supplicant/wpa_supplicant.nm b/wpa_supplicant/wpa_supplicant.nm
index 101fb5959..d93a3c166 100644
--- a/wpa_supplicant/wpa_supplicant.nm
+++ b/wpa_supplicant/wpa_supplicant.nm
@@ -5,7 +5,7 @@
name = wpa_supplicant
version = 2.9
-release = 1.1
+release = 2
groups = Sytem/Base
url = https://w1.fi/wpa_supplicant/
@@ -54,23 +54,26 @@ build
end
install
- mkdir -pv %{BUILDROOT}/etc/wpa_supplicant
- mkdir -pv %{BUILDROOT}/usr/sbin
+ mkdir -pv %{BUILDROOT}%{sysconfdir}/wpa_supplicant
+ mkdir -pv %{BUILDROOT}%{sbindir}
+ mkdir -pv %{BUILDROOT}%{unitdir}
# Install config file
install -D -m 0600 %{DIR_SOURCE}/wpa_supplicant.conf %{BUILDROOT}/etc/wpa_supplicant
# Install binaries
- install -m 0755 %{DIR_APP}/wpa_supplicant/wpa_passphrase %{BUILDROOT}/usr/sbin
- install -m 0755 %{DIR_APP}/wpa_supplicant/wpa_cli %{BUILDROOT}/usr/sbin
- install -m 0755 %{DIR_APP}/wpa_supplicant/wpa_supplicant %{BUILDROOT}/usr/sbin
+ install -m 0755 %{DIR_APP}/wpa_supplicant/wpa_passphrase %{BUILDROOT}%{sbindir}
+ install -m 0755 %{DIR_APP}/wpa_supplicant/wpa_cli %{BUILDROOT}%{sbindir}
+ install -m 0755 %{DIR_APP}/wpa_supplicant/wpa_supplicant %{BUILDROOT}%{sbindir}
+
+ # Install systemd unit file
+ install -v -m 644 wpa_supplicant/systemd/wpa_supplicant.service \
+ %{BUILDROOT}%{unitdir}
end
end
packages
package %{name}
- requires += network >= 005
-
script postin
/usr/bin/systemctl daemon-reload >/dev/null 2>&1 || :
end
hooks/post-receive
--
IPFire 3.x development tree
1
0
[git.ipfire.org] IPFire 3.x development tree branch, master, updated. c3327360dffddb8a7b9ff52e9007548af4ae5db8
by Michael Tremer 04 Mar '23
by Michael Tremer 04 Mar '23
04 Mar '23
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 c3327360dffddb8a7b9ff52e9007548af4ae5db8 (commit)
via 2918480a77ed3598e9c2011ce19578e7a3ce1163 (commit)
from 8e572b75d6f93bfbd51de0180a01a28edf5a2a14 (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 c3327360dffddb8a7b9ff52e9007548af4ae5db8
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Mar 4 15:26:17 2023 +0000
nftables: Drop autogen
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 2918480a77ed3598e9c2011ce19578e7a3ce1163
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Mar 4 15:25:23 2023 +0000
ncurses: Fix broken symlinks of static libraries
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
ncurses/ncurses.nm | 5 ++++-
nftables/nftables.nm | 3 +--
2 files changed, 5 insertions(+), 3 deletions(-)
Difference in files:
diff --git a/ncurses/ncurses.nm b/ncurses/ncurses.nm
index 9dc5091ba..f4a424d8e 100644
--- a/ncurses/ncurses.nm
+++ b/ncurses/ncurses.nm
@@ -5,7 +5,7 @@
name = ncurses
version = 6.3
-release = 1
+release = 2
thisapp = %{name}-%{version}
groups = System/Base
@@ -90,6 +90,9 @@ build
rm -vf %{BUILDROOT}%{libdir}/terminfo
rm -vf %{BUILDROOT}%{libdir}/pkgconfig/{*_g,ncurses++*}.pc
+
+ # Manually remove all static libraries
+ rm -vf %{BUILDROOT}%{libdir}/*.a
end
end
diff --git a/nftables/nftables.nm b/nftables/nftables.nm
index 315040f97..ae54d89ec 100644
--- a/nftables/nftables.nm
+++ b/nftables/nftables.nm
@@ -5,7 +5,7 @@
name = nftables
version = 1.0.5
-release = 1
+release = 2
groups = Networking/Tools
url = https://netfilter.org/projects/nftables/
@@ -22,7 +22,6 @@ sources = %{thisapp}.tar.bz2
build
requires
asciidoc
- autogen
bison
docbook2X
docbook-xsl
hooks/post-receive
--
IPFire 3.x development tree
1
0
[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 8e572b75d6f93bfbd51de0180a01a28edf5a2a14
by Michael Tremer 04 Mar '23
by Michael Tremer 04 Mar '23
04 Mar '23
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 8e572b75d6f93bfbd51de0180a01a28edf5a2a14 (commit)
via d71f79b00b9ac65e7996066f3c6ce6e4a9d307f3 (commit)
via bb9ce9e87ffcd9cf665e90214eb17c0d8be201f7 (commit)
from 519c41881f8ce8f8ceb3a5f317fa323830771990 (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 8e572b75d6f93bfbd51de0180a01a28edf5a2a14
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Mar 4 15:08:09 2023 +0000
mailcap: Drop package
This has only been required by perl-libwww-perl which has been dropped.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit d71f79b00b9ac65e7996066f3c6ce6e4a9d307f3
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Mar 4 15:07:46 2023 +0000
perl-libwww-perl: Drop package
Nothing seems to require this
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit bb9ce9e87ffcd9cf665e90214eb17c0d8be201f7
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Mar 4 15:01:01 2023 +0000
krb5: Drop logrotate configuration
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
krb5/krb5.nm | 2 +-
krb5/logrotate/kadmind.logrotate | 9 ------
krb5/logrotate/krb5kdc.logrotate | 9 ------
mailcap/mailcap.nm | 45 --------------------------
perl-libwww-perl/perl-libwww-perl.nm | 63 ------------------------------------
5 files changed, 1 insertion(+), 127 deletions(-)
delete mode 100644 krb5/logrotate/kadmind.logrotate
delete mode 100644 krb5/logrotate/krb5kdc.logrotate
delete mode 100644 mailcap/mailcap.nm
delete mode 100644 perl-libwww-perl/perl-libwww-perl.nm
Difference in files:
diff --git a/krb5/krb5.nm b/krb5/krb5.nm
index 25c05634c..e2132afc0 100644
--- a/krb5/krb5.nm
+++ b/krb5/krb5.nm
@@ -7,7 +7,7 @@ name = krb5
version = %{ver_maj}.%{ver_min}
ver_maj = 1.20
ver_min = 1
-release = 1
+release = 2
groups = System/Libraries
url = https://web.mit.edu/kerberos/www/
diff --git a/krb5/logrotate/kadmind.logrotate b/krb5/logrotate/kadmind.logrotate
deleted file mode 100644
index 52a66c418..000000000
--- a/krb5/logrotate/kadmind.logrotate
+++ /dev/null
@@ -1,9 +0,0 @@
-/var/log/kadmind.log {
- missingok
- notifempty
- monthly
- rotate 12
- postrotate
- /bin/kill -HUP `cat /var/run/kadmind.pid 2>/dev/null` 2> /dev/null || true
- endscript
-}
diff --git a/krb5/logrotate/krb5kdc.logrotate b/krb5/logrotate/krb5kdc.logrotate
deleted file mode 100644
index 1100ed3a6..000000000
--- a/krb5/logrotate/krb5kdc.logrotate
+++ /dev/null
@@ -1,9 +0,0 @@
-/var/log/krb5kdc.log {
- missingok
- notifempty
- monthly
- rotate 12
- postrotate
- /bin/kill -HUP `cat /var/run/krb5kdc.pid 2>/dev/null` 2> /dev/null || true
- endscript
-}
diff --git a/mailcap/mailcap.nm b/mailcap/mailcap.nm
deleted file mode 100644
index 40ac57206..000000000
--- a/mailcap/mailcap.nm
+++ /dev/null
@@ -1,45 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = mailcap
-version = 2.1.45
-release = 1
-arch = noarch
-
-groups = System/Base
-url = https://fedorahosted.org/released/mailcap/
-license = Public Domain and MIT
-summary = Helper application and MIME type associations for file types.
-
-description
- The mailcap file is used by the metamail program. Metamail reads the
- mailcap file to determine how it should display non-text or multimedia
- material. Basically, mailcap associates a particular type of file
- with a particular program that a mail agent or other program can call
- in order to handle the file. Mailcap should be installed to allow
- certain programs to be able to handle non-text files.
-end
-
-source_dl = https://fedorahosted.org/released/mailcap/
-sources = %{thisapp}.tar.xz
-
-build
- requires
- perl
- end
-
- build = # Nothing to do.
-
- test
- make check
- end
-
- make_install_targets += \
- sysconfdir=/etc mandir=/usr/share/man
-end
-
-packages
- package %{name}
-end
diff --git a/perl-libwww-perl/perl-libwww-perl.nm b/perl-libwww-perl/perl-libwww-perl.nm
deleted file mode 100644
index 74fe1fb88..000000000
--- a/perl-libwww-perl/perl-libwww-perl.nm
+++ /dev/null
@@ -1,63 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = perl-libwww-perl
-version = 5.837
-release = 2
-arch = noarch
-thisapp = libwww-perl-%{version}
-
-groups = Development/Libraries
-url = http://search.cpan.org/dist/libwww-perl/
-license = GPL+ or Artistic
-summary = A Perl interface to the World-Wide Web.
-
-description
- The libwww-perl collection is a set of Perl modules which provides a simple and
- consistent application programming interface to the World-Wide Web.
-end
-
-source_dl =
-
-build
- requires
- mailcap
- perl-core
- perl-devel
- perl-HTML-Parser
- perl(Test::More)
- perl(Compress::Zlib)
- perl(MIME::Base64)
- perl(Net::FTP)
- perl(URI)
- end
-
- build
- perl Makefile.PL INSTALLDIRS=perl --aliases < /dev/null
- make %{PARALLELISMFLAGS}
- end
-
- #test
- # # Use system wide MIME types (link also to blib/... for "make test"). Doing
- # # this stuff before "make install" would not cause the symlink to be packaged
- # # but a copy of /etc/mime.types.
- # ln -svf /etc/mime.types %{DIR_APP}/blib/lib/LWP/media.types
- #
- # make test
- #end
-end
-
-packages
- package %{name}
- # Filter string for very weird dependencies.
- filter_requires
- HTTP::Headers
- HTTP::GHTTP
- Win32
- Authen::NTLM
- end
- end
-
-end
hooks/post-receive
--
IPFire 3.x development tree
1
0
[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 519c41881f8ce8f8ceb3a5f317fa323830771990
by Michael Tremer 04 Mar '23
by Michael Tremer 04 Mar '23
04 Mar '23
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 519c41881f8ce8f8ceb3a5f317fa323830771990 (commit)
via c82b4b9580909e16a283765cd50d0e67fa3cb3c3 (commit)
from 0881f707b48111d3645ca431239024e4d9af05b9 (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 519c41881f8ce8f8ceb3a5f317fa323830771990
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Mar 4 14:59:25 2023 +0000
chrony: Drop logrotate configuration
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit c82b4b9580909e16a283765cd50d0e67fa3cb3c3
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Mar 4 14:58:40 2023 +0000
logrotate: Drop package
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
chrony/chrony.logrotate | 8 ------
chrony/chrony.nm | 6 +---
logrotate/logrotate.nm | 57 -------------------------------------
logrotate/systemd/logrotate.service | 5 ----
4 files changed, 1 insertion(+), 75 deletions(-)
delete mode 100644 chrony/chrony.logrotate
delete mode 100644 logrotate/logrotate.nm
delete mode 100644 logrotate/systemd/logrotate.service
Difference in files:
diff --git a/chrony/chrony.logrotate b/chrony/chrony.logrotate
deleted file mode 100644
index 4bb83b216..000000000
--- a/chrony/chrony.logrotate
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/chrony/*.log {
- missingok
- nocreate
- sharedscripts
- postrotate
- /usr/libexec/chrony-helper command cyclelogs > /dev/null 2>&1 || true
- endscript
-}
diff --git a/chrony/chrony.nm b/chrony/chrony.nm
index 10d6a4942..fbf6ae4cb 100644
--- a/chrony/chrony.nm
+++ b/chrony/chrony.nm
@@ -5,7 +5,7 @@
name = chrony
version = 4.3
-release = 1
+release = 2
groups = System/Daemons
url = https://chrony.tuxfamily.org
@@ -53,10 +53,6 @@ build
install -m 640 -p %{DIR_SOURCE}/chrony.keys %{BUILDROOT}/etc/chrony.keys
chown -v root.chrony %{BUILDROOT}/etc/chrony.keys
- mkdir -pv %{BUILDROOT}/etc/logrotate.d
- install -m 644 -p %{DIR_SOURCE}/chrony.logrotate \
- %{BUILDROOT}/etc/logrotate.d/chrony
-
chown -Rv chrony.chrony %{BUILDROOT}/var/{lib,log}/chrony
end
end
diff --git a/logrotate/logrotate.nm b/logrotate/logrotate.nm
deleted file mode 100644
index c15906b6b..000000000
--- a/logrotate/logrotate.nm
+++ /dev/null
@@ -1,57 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = logrotate
-version = 3.9.1
-release = 1
-
-groups = System/Base
-url = https://fedorahosted.org/releases/l/o/logrotate/
-license = GPL+
-summary = Rotates, compresses, removes and mails system log files.
-
-description
- The logrotate utility is designed to simplify the administration of
- log files on a system which generates a lot of log files. Logrotate
- allows for the automatic rotation compression, removal and mailing of
- log files. Logrotate can be set to handle a log file daily, weekly,
- monthly or when the log file gets to a certain size.
-end
-
-source_dl = https://fedorahosted.org/releases/l/o/logrotate/
-
-build
- requires
- coreutils
- gzip
- popt-devel
- which
- end
-
- build
- make RPM_OPT_FLAGS="%{CFLAGS}" %{PARALLELISMFLAGS}
- end
-
- install
- make install BASEDIR=%{prefix} PREFIX=%{BUILDROOT} \
- MANDIR=%{mandir}
-
- mkdir -pv %{BUILDROOT}%{localstatedir}
- touch %{BUILDROOT}%{localstatedir}/logrotate.status
-
- # Creating directory for config files
- mkdir -pv %{BUILDROOT}%{sysconfdir}/logrotate.d
- end
-end
-
-packages
- package %{name}
- groups += Base
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/logrotate/systemd/logrotate.service b/logrotate/systemd/logrotate.service
deleted file mode 100644
index 0b45621d3..000000000
--- a/logrotate/systemd/logrotate.service
+++ /dev/null
@@ -1,5 +0,0 @@
-[Unit]
-Description=logrotate
-
-[Service]
-ExexStart=/usr/sbin/logrotate /etc/logrotate.d/*
hooks/post-receive
--
IPFire 3.x development tree
1
0
[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 0881f707b48111d3645ca431239024e4d9af05b9
by Michael Tremer 04 Mar '23
by Michael Tremer 04 Mar '23
04 Mar '23
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 0881f707b48111d3645ca431239024e4d9af05b9 (commit)
via f667f8a55460b9fc3fd970037852a4386de3d2d9 (commit)
via 5aa616d092d216c37b90e8c1bd7679ff4474a1e2 (commit)
via b576643b1b3e42264e140cdf33d52d07e46a7db4 (commit)
via 93cdb0550e4ed6affae2f540962ad52976283746 (commit)
from adfe8977aed3b0816d9fd107402128753fe4f510 (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 0881f707b48111d3645ca431239024e4d9af05b9
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Mar 4 14:56:13 2023 +0000
openjade: Fix build on aarch64
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit f667f8a55460b9fc3fd970037852a4386de3d2d9
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Mar 4 14:51:29 2023 +0000
opensp: Fix build on aarch64
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 5aa616d092d216c37b90e8c1bd7679ff4474a1e2
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sat Mar 4 14:19:08 2023 +0000
samba: Fix build dependencies
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit b576643b1b3e42264e140cdf33d52d07e46a7db4
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Mar 4 14:57:34 2023 +0000
libvirt: Add missing build dependency attr-devel
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 93cdb0550e4ed6affae2f540962ad52976283746
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Mar 4 14:54:50 2023 +0000
libxcrypt: Add missing Perl build dependencies
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
libvirt/libvirt.nm | 3 ++-
libxcrypt/libxcrypt.nm | 4 +++-
openjade/openjade.nm | 7 ++++++-
opensp/opensp.nm | 7 ++++++-
samba/samba.nm | 5 ++++-
5 files changed, 21 insertions(+), 5 deletions(-)
Difference in files:
diff --git a/libvirt/libvirt.nm b/libvirt/libvirt.nm
index 7d27308a0..bad9beaa9 100644
--- a/libvirt/libvirt.nm
+++ b/libvirt/libvirt.nm
@@ -5,7 +5,7 @@
name = libvirt
version = 8.10.0
-release = 1
+release = 2
maintainer = Jonatan Schlag <jonatan.schlag(a)ipfire.org>
groups = Applications/Virtualization
@@ -23,6 +23,7 @@ sources = %{thisapp}.tar.xz
build
requires
+ attr-devel
avahi-devel
bash-completion-devel
cyrus-sasl-devel
diff --git a/libxcrypt/libxcrypt.nm b/libxcrypt/libxcrypt.nm
index 71f4dd4eb..0005eba61 100644
--- a/libxcrypt/libxcrypt.nm
+++ b/libxcrypt/libxcrypt.nm
@@ -5,7 +5,7 @@
name = libxcrypt
version = 4.4.33
-release = 1
+release = 2
groups = System/Libraries
url = https://github.com/besser82/libxcrypt/
@@ -32,6 +32,8 @@ sources = %{thisapp}.tar.xz
build
requires
perl
+ perl(FindBin)
+ perl(open)
end
configure_options += \
diff --git a/openjade/openjade.nm b/openjade/openjade.nm
index 27ad2d6da..717e4dd06 100644
--- a/openjade/openjade.nm
+++ b/openjade/openjade.nm
@@ -5,7 +5,7 @@
name = openjade
version = 1.3.2
-release = 5
+release = 6
groups = Application/Text
url = https://openjade.sourceforge.net/
@@ -22,6 +22,7 @@ source_dl = https://prdownloads.sourceforge.net/openjade/
build
requires
gcc-c++
+ libtool
opensp-devel
perl
end
@@ -34,6 +35,10 @@ build
--datadir=/usr/share/sgml/openjade-%{version} \
--enable-splibdir=%{libdir}
+ prepare_cmds
+ %{MACRO_FIX_AUTOTOOLS}
+ end
+
install_cmds
# Create symlink for jade
ln -s openjade %{BUILDROOT}/usr/bin/jade
diff --git a/opensp/opensp.nm b/opensp/opensp.nm
index 6172b1f34..a9756112f 100644
--- a/opensp/opensp.nm
+++ b/opensp/opensp.nm
@@ -5,7 +5,7 @@
name = opensp
version = 1.5.2
-release = 3
+release = 4
thisapp = OpenSP-%{version}
groups = Application/Text
@@ -25,6 +25,7 @@ build
gcc-c++
docbook-dtds
docbook-xsl
+ libtool
libxml2
libxslt
perl
@@ -39,6 +40,10 @@ build
--enable-default-catalog=/etc/sgml/catalog \
--enable-default-search-path=/usr/share/sgml:/usr/share/xml
+ prepare_cmds
+ %{MACRO_FIX_AUTOTOOLS}
+ end
+
install_cmds
# Create symlinks and manpages for binaries wtitout "o".
for file in nsgmls sgmlnorm spam spent sx ; do
diff --git a/samba/samba.nm b/samba/samba.nm
index d5441344f..e407f4988 100644
--- a/samba/samba.nm
+++ b/samba/samba.nm
@@ -5,7 +5,7 @@
name = samba
version = 4.17.5
-release = 1
+release = 1.1
groups = Networking/Daemons
url = http://www.samba.org/
@@ -54,9 +54,12 @@ build
libtalloc-devel >= 2.1.8
libtdb-devel >=1.3.11
libtevent-devel >= 0.9.29
+ libxcrypt-devel
openldap-devel
openssl-devel
pam-devel
+ perl(base)
+ perl(FindBin)
perl(JSON)
perl(Parse::Yapp::Driver) >= 1.21
popt-devel
hooks/post-receive
--
IPFire 3.x development tree
1
0
[git.ipfire.org] IPFire 3.x development tree branch, master, updated. adfe8977aed3b0816d9fd107402128753fe4f510
by Michael Tremer 04 Mar '23
by Michael Tremer 04 Mar '23
04 Mar '23
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 adfe8977aed3b0816d9fd107402128753fe4f510 (commit)
via 0897b92ca6b6481155f4e6df8a68d2cb32840630 (commit)
via 418f550baedc081f04b2668de6b01e8bbed9fa9e (commit)
via 4704797f6205f55772f13b792f1ae97192631bee (commit)
via d0d758e19f54be96d21ed68fa8a57b80708f536c (commit)
via f0103f6acb0e4de2202916b74449b30378180445 (commit)
via 0c361451ca20cc65b60fe9918d71422792e38b05 (commit)
via e92c488ead69cac605882cdbcfa16c7735a4306b (commit)
via 8d32419ac0bee698f685a08515e32d9803e4893b (commit)
via af3514d0f7351cb67b30e548dcfa6e540ecde093 (commit)
via 0b6ddf60fb16095b3d9ddb3e2d6ef84114c73d86 (commit)
via fd83b39371962e1031e6a491ad83eed6abfbd33a (commit)
via 7aa9388cb06b16bf2733d4681c894e8b3a70c979 (commit)
via d05006f4a0b4b60b584c603d17ad811be422ebb7 (commit)
via c57f113c700d412527dfaacfaefb1f7109be8d2a (commit)
from 57fb3e8c1a9532f6e883c39415f6feb974511556 (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 adfe8977aed3b0816d9fd107402128753fe4f510
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Mar 4 14:42:59 2023 +0000
libtevent: Depend on libxcrypt-devel
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 0897b92ca6b6481155f4e6df8a68d2cb32840630
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Mar 4 14:42:45 2023 +0000
libtdb: Depend on libxcrypt-devel
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 418f550baedc081f04b2668de6b01e8bbed9fa9e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Mar 4 14:39:35 2023 +0000
libtalloc: Depend on libxcrypt-devel
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 4704797f6205f55772f13b792f1ae97192631bee
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Mar 4 14:36:55 2023 +0000
libpng: Disable building static libraries
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit d0d758e19f54be96d21ed68fa8a57b80708f536c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Mar 4 14:33:09 2023 +0000
liboping: Fix some string formatting errors
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit f0103f6acb0e4de2202916b74449b30378180445
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Mar 4 14:31:58 2023 +0000
libpciaccess: Don't depend xorg-x11-util-macros
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 0c361451ca20cc65b60fe9918d71422792e38b05
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Mar 4 14:28:09 2023 +0000
libunwind: Disable building static libraries
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit e92c488ead69cac605882cdbcfa16c7735a4306b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Mar 4 14:27:28 2023 +0000
libnftnl: Drop dependency on autogen
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 8d32419ac0bee698f685a08515e32d9803e4893b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Mar 4 14:24:59 2023 +0000
libldb: Add libxcrypt as missing build dependency
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit af3514d0f7351cb67b30e548dcfa6e540ecde093
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sat Mar 4 13:59:54 2023 +0000
libunwind: Remove brocken symlink
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 0b6ddf60fb16095b3d9ddb3e2d6ef84114c73d86
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Mar 4 14:12:30 2023 +0000
ldapvi: Link against libxcrypt
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit fd83b39371962e1031e6a491ad83eed6abfbd33a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Mar 4 14:12:06 2023 +0000
openldap: Drop dependencies on libdb < 6 and pth-devel
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 7aa9388cb06b16bf2733d4681c894e8b3a70c979
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Mar 4 14:11:39 2023 +0000
gnome-doc-utils: Fix build with Python 3
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit d05006f4a0b4b60b584c603d17ad811be422ebb7
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Mar 4 14:11:03 2023 +0000
libxml2: Build Python 3 module
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit c57f113c700d412527dfaacfaefb1f7109be8d2a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Mar 4 14:05:03 2023 +0000
libdrm: Drop dependency on libxcb
This no longer exists.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
gnome-doc-utils/gnome-doc-utils.nm | 4 +-
.../patches/gnome-doc-utils-0.20.10-python3.patch | 540 +++++++++++++++++++++
ldapvi/ldapvi.nm | 7 +-
libdrm/libdrm.nm | 3 +-
libldb/libldb.nm | 3 +-
libnftnl/libnftnl.nm | 3 +-
liboping/liboping.nm | 2 +-
liboping/patches/liboping-1.10.0-ncurses-6.3.patch | 51 ++
liboping/patches/liboping-1.10.0-no-werror.patch | 22 +
libpciaccess/libpciaccess.nm | 10 +-
libpng/libpng.nm | 10 +-
libtalloc/libtalloc.nm | 3 +-
libtdb/libtdb.nm | 3 +-
libtevent/libtevent.nm | 3 +-
libunwind/libunwind.nm | 14 +-
libxml2/libxml2.nm | 9 +-
openldap/openldap.nm | 9 +-
17 files changed, 653 insertions(+), 43 deletions(-)
create mode 100644 gnome-doc-utils/patches/gnome-doc-utils-0.20.10-python3.patch
create mode 100644 liboping/patches/liboping-1.10.0-ncurses-6.3.patch
create mode 100644 liboping/patches/liboping-1.10.0-no-werror.patch
Difference in files:
diff --git a/gnome-doc-utils/gnome-doc-utils.nm b/gnome-doc-utils/gnome-doc-utils.nm
index 4246ce13b..e6c64ba95 100644
--- a/gnome-doc-utils/gnome-doc-utils.nm
+++ b/gnome-doc-utils/gnome-doc-utils.nm
@@ -7,7 +7,7 @@ name = gnome-doc-utils
ver_major = 0.20
ver_minor = 10
version = %{ver_major}.%{ver_minor}
-release = 1
+release = 2
groups = Development/Tools
url = http://www.gnome.org/
@@ -26,6 +26,8 @@ sources = %{thisapp}.tar.xz
build
requires
perl(XML::Parser)
+ python3
+ python3-libxml2
intltool >= 0.35.0
libxml2-devel >= 2.6.12
libxslt-devel >= 1.1.8
diff --git a/gnome-doc-utils/patches/gnome-doc-utils-0.20.10-python3.patch b/gnome-doc-utils/patches/gnome-doc-utils-0.20.10-python3.patch
new file mode 100644
index 000000000..bf9614feb
--- /dev/null
+++ b/gnome-doc-utils/patches/gnome-doc-utils-0.20.10-python3.patch
@@ -0,0 +1,540 @@
+diff -U3 -r gnome-doc-utils-0.20.10.orig/xml2po/xml2po/__init__.py gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py
+--- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/__init__.py 2011-08-04 09:36:03.000000000 -0500
++++ gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py 2019-09-10 09:30:28.018627919 -0500
+@@ -86,14 +86,14 @@
+ self.messages.append(t)
+ if spacepreserve:
+ self.nowrap[t] = True
+- if t in self.linenos.keys():
++ if t in list(self.linenos.keys()):
+ self.linenos[t].append((self.filename, tag, lineno))
+ else:
+ self.linenos[t] = [ (self.filename, tag, lineno) ]
+ if (not self.do_translations) and comment and not t in self.comments:
+ self.comments[t] = comment
+ else:
+- if t in self.linenos.keys():
++ if t in list(self.linenos.keys()):
+ self.linenos[t].append((self.filename, tag, lineno))
+ else:
+ self.linenos[t] = [ (self.filename, tag, lineno) ]
+@@ -166,7 +166,7 @@
+ elif node.isText():
+ if node.isBlankNode():
+ if self.app.options.get('expand_entities') or \
+- (not (node.prev and not node.prev.isBlankNode() and node.next and not node.next.isBlankNode()) ):
++ (not (node.prev and not node.prev.isBlankNode() and node.__next__ and not node.next.isBlankNode()) ):
+ #print >>sys.stderr, "BLANK"
+ node.setContent('')
+ else:
+@@ -176,7 +176,7 @@
+ child = node.children
+ while child:
+ self.normalizeNode(child)
+- child = child.next
++ child = child.__next__
+
+ def normalizeString(self, text, spacepreserve = False):
+ """Normalizes string to be used as key for gettext lookup.
+@@ -200,7 +200,7 @@
+ tree = ctxt.doc()
+ newnode = tree.getRootElement()
+ except:
+- print >> sys.stderr, """Error while normalizing string as XML:\n"%s"\n""" % (text)
++ print("""Error while normalizing string as XML:\n"%s"\n""" % (text), file=sys.stderr)
+ return text
+
+ self.normalizeNode(newnode)
+@@ -209,7 +209,7 @@
+ child = newnode.children
+ while child:
+ result += child.serialize('utf-8')
+- child = child.next
++ child = child.__next__
+
+ result = re.sub('^ ','', result)
+ result = re.sub(' $','', result)
+@@ -235,7 +235,7 @@
+ ctxt.parseDocument()
+ tree = ctxt.doc()
+ if next:
+- newnode = tree.children.next
++ newnode = tree.children.__next__
+ else:
+ newnode = tree.children
+
+@@ -243,7 +243,7 @@
+ child = newnode.children
+ while child:
+ result += child.serialize('utf-8')
+- child = child.next
++ child = child.__next__
+ tree.freeDoc()
+ return result
+
+@@ -262,7 +262,7 @@
+ result += child.content.decode('utf-8')
+ else:
+ result += self.myAttributeSerialize(child)
+- child = child.next
++ child = child.__next__
+ else:
+ result = node.serialize('utf-8')
+ return result
+@@ -338,7 +338,7 @@
+ pass
+
+ if not newnode:
+- print >> sys.stderr, """Error while parsing translation as XML:\n"%s"\n""" % (text.encode('utf-8'))
++ print("""Error while parsing translation as XML:\n"%s"\n""" % (text.encode('utf-8')), file=sys.stderr)
+ return
+
+ newelem = newnode.getRootElement()
+@@ -346,13 +346,13 @@
+ if newelem and newelem.children:
+ free = node.children
+ while free:
+- next = free.next
++ next = free.__next__
+ free.unlinkNode()
+ free = next
+
+ if node:
+ copy = newelem.copyNodeList()
+- next = node.next
++ next = node.__next__
+ node.replaceNode(newelem.copyNodeList())
+ node.next = next
+
+@@ -378,7 +378,7 @@
+ if child.type in ['text'] and child.content.strip()!='':
+ final = True
+ break
+- child = child.next
++ child = child.__next__
+
+ node.__autofinal__ = final
+ return final
+@@ -457,7 +457,7 @@
+ outtxt += '<%s>%s</%s>' % (starttag, content, endtag)
+ else:
+ outtxt += self.doSerialize(child)
+- child = child.next
++ child = child.__next__
+
+ if self.app.operation == 'merge':
+ norm_outtxt = self.normalizeString(outtxt, self.app.isSpacePreserveNode(node))
+@@ -534,7 +534,7 @@
+ outtxt = ''
+ while child:
+ outtxt += self.doSerialize(child)
+- child = child.next
++ child = child.__next__
+ return outtxt
+
+ def xml_error_handler(arg, ctxt):
+@@ -577,8 +577,8 @@
+ raise IOError("Unable to read file '%s'" % xmlfile)
+ try:
+ doc = XMLDocument(xmlfile, self)
+- except Exception, e:
+- print >> sys.stderr, "Unable to parse XML file '%s': %s" % (xmlfile, str(e))
++ except Exception as e:
++ print("Unable to parse XML file '%s': %s" % (xmlfile, str(e)), file=sys.stderr)
+ sys.exit(1)
+ self.current_mode.preProcessXml(doc.doc, self.msg)
+ doc.generate_messages()
+@@ -590,14 +590,14 @@
+ raise IOError("Unable to read file '%s'" % xmlfile)
+ try:
+ doc = XMLDocument(xmlfile, self)
+- except Exception, e:
+- print >> sys.stderr, str(e)
++ except Exception as e:
++ print(str(e), file=sys.stderr)
+ sys.exit(1)
+
+ try:
+ mfile = open(mofile, "rb")
+ except:
+- print >> sys.stderr, "Can't open MO file '%s'." % (mofile)
++ print("Can't open MO file '%s'." % (mofile), file=sys.stderr)
+ self.gt = gettext.GNUTranslations(mfile)
+ self.gt.add_fallback(NoneTranslations())
+ # Has preProcessXml use cases for merge?
+@@ -619,16 +619,16 @@
+ raise IOError("Unable to read file '%s'" % xmlfile)
+ try:
+ doc = XMLDocument(xmlfile, self)
+- except Exception, e:
+- print >> sys.stderr, str(e)
++ except Exception as e:
++ print(str(e), file=sys.stderr)
+ sys.exit(1)
+ doc.generate_messages()
+
+ self.msg.translationsFollow()
+ try:
+ doc = XMLDocument(origxml, self)
+- except Exception, e:
+- print >> sys.stderr, str(e)
++ except Exception as e:
++ print(str(e), file=sys.stderr)
+ sys.exit(1)
+ doc.generate_messages()
+ self.output_po()
+diff -U3 -r gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/docbook.py gnome-doc-utils-0.20.10/xml2po/xml2po/modes/docbook.py
+--- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/docbook.py 2011-01-10 10:08:10.000000000 -0600
++++ gnome-doc-utils-0.20.10/xml2po/xml2po/modes/docbook.py 2019-09-10 09:31:15.199572286 -0500
+@@ -43,7 +43,7 @@
+ except ImportError:
+ from md5 import new as md5_new
+
+-from basic import basicXmlMode
++from .basic import basicXmlMode
+
+ class docbookXmlMode(basicXmlMode):
+ """Class for special handling of DocBook document types.
+@@ -131,7 +131,7 @@
+ hash = self._md5_for_file(fullpath)
+ else:
+ hash = "THIS FILE DOESN'T EXIST"
+- print >>sys.stderr, "Warning: image file '%s' not found." % fullpath
++ print("Warning: image file '%s' not found." % fullpath, file=sys.stderr)
+
+ msg.outputMessage("@@image: '%s'; md5=%s" % (attr, hash), node.lineNo(),
+ "When image changes, this message will be marked fuzzy or untranslated for you.\n"+
+@@ -198,10 +198,10 @@
+ # Perform some tests when ran standalone
+ if __name__ == '__main__':
+ test = docbookXmlMode()
+- print "Ignored tags : " + repr(test.getIgnoredTags())
+- print "Final tags : " + repr(test.getFinalTags())
+- print "Space-preserve tags: " + repr(test.getSpacePreserveTags())
++ print("Ignored tags : " + repr(test.getIgnoredTags()))
++ print("Final tags : " + repr(test.getFinalTags()))
++ print("Space-preserve tags: " + repr(test.getSpacePreserveTags()))
+
+- print "Credits from string: '%s'" % test.getStringForTranslators()
+- print "Explanation for credits:\n\t'%s'" % test.getCommentForTranslators()
++ print("Credits from string: '%s'" % test.getStringForTranslators())
++ print("Explanation for credits:\n\t'%s'" % test.getCommentForTranslators())
+
+diff -U3 -r gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/gs.py gnome-doc-utils-0.20.10/xml2po/xml2po/modes/gs.py
+--- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/gs.py 2010-12-13 10:14:07.000000000 -0600
++++ gnome-doc-utils-0.20.10/xml2po/xml2po/modes/gs.py 2019-09-10 09:31:15.201572284 -0500
+@@ -20,7 +20,7 @@
+ # Special case Gnome Summary
+ #
+
+-from basic import basicXmlMode
++from .basic import basicXmlMode
+
+ class gsXmlMode(basicXmlMode):
+ """Abstract class for special handling of document types."""
+diff -U3 -r gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/mallard.py gnome-doc-utils-0.20.10/xml2po/xml2po/modes/mallard.py
+--- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/mallard.py 2011-01-10 10:08:50.000000000 -0600
++++ gnome-doc-utils-0.20.10/xml2po/xml2po/modes/mallard.py 2019-09-10 09:31:15.212572271 -0500
+@@ -39,7 +39,7 @@
+ except ImportError:
+ from md5 import new as md5_new
+
+-from basic import basicXmlMode
++from .basic import basicXmlMode
+
+ class mallardXmlMode(basicXmlMode):
+ """Class for special handling of Mallard document types."""
+@@ -112,7 +112,7 @@
+ hash = self._md5_for_file(fullpath)
+ else:
+ hash = "THIS FILE DOESN'T EXIST"
+- print >>sys.stderr, "Warning: image file '%s' not found." % fullpath
++ print("Warning: image file '%s' not found." % fullpath, file=sys.stderr)
+
+ msg.outputMessage("@@image: '%s'; md5=%s" % (attr, hash), node.lineNo(),
+ "When image changes, this message will be marked fuzzy or untranslated for you.\n"+
+diff -U3 -r gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/ubuntu.py gnome-doc-utils-0.20.10/xml2po/xml2po/modes/ubuntu.py
+--- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/ubuntu.py 2010-12-13 10:14:07.000000000 -0600
++++ gnome-doc-utils-0.20.10/xml2po/xml2po/modes/ubuntu.py 2019-09-10 09:31:15.213572270 -0500
+@@ -2,7 +2,7 @@
+
+ import libxml2
+
+-from docbook import docbookXmlMode
++from .docbook import docbookXmlMode
+
+ class ubuntuXmlMode (docbookXmlMode):
+ """Special-casing Ubuntu DocBook website documentation."""
+diff -U3 -r gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/xhtml.py gnome-doc-utils-0.20.10/xml2po/xml2po/modes/xhtml.py
+--- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/xhtml.py 2010-12-13 10:14:07.000000000 -0600
++++ gnome-doc-utils-0.20.10/xml2po/xml2po/modes/xhtml.py 2019-09-10 09:31:15.214572269 -0500
+@@ -21,7 +21,7 @@
+ # This implements special instructions for handling XHTML documents
+ # in a better way, particularly to extract some attributes in HTML tags
+
+-from basic import basicXmlMode
++from .basic import basicXmlMode
+
+ class xhtmlXmlMode(basicXmlMode):
+ """Class for special handling of XHTML document types."""
+diff -U3 -r gnome-doc-utils-0.20.10.orig/xml2po/xml2po/xml2po.py.in gnome-doc-utils-0.20.10/xml2po/xml2po/xml2po.py.in
+--- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/xml2po.py.in 2010-12-13 10:14:07.000000000 -0600
++++ gnome-doc-utils-0.20.10/xml2po/xml2po/xml2po.py.in 2019-09-10 09:30:28.217627684 -0500
+@@ -41,9 +41,9 @@
+ if not os.path.exists('/dev/null'): NULL_STRING = 'NUL'
+
+ def usage (with_help = False):
+- print >> sys.stderr, "Usage: %s [OPTIONS] [XMLFILE]..." % (sys.argv[0])
++ print("Usage: %s [OPTIONS] [XMLFILE]..." % (sys.argv[0]), file=sys.stderr)
+ if with_help:
+- print >> sys.stderr, """
++ print("""
+ OPTIONS may be some of:
+ -a --automatic-tags Automatically decides if tags are to be considered
+ "final" or not
+@@ -72,7 +72,7 @@
+ using -p option for each XML file:
+ %(command)s -p de.po chapter1.xml > chapter1.de.xml
+ %(command)s -p de.po chapter2.xml > chapter2.de.xml
+-""" % {'command': sys.argv[0]}
++""" % {'command': sys.argv[0]}, file=sys.stderr)
+
+
+ def main(argv):
+@@ -82,7 +82,7 @@
+
+ name = os.path.join(os.path.dirname(__file__), '..')
+ if os.path.exists(os.path.join(name, 'tests')):
+- print >> sys.stderr, 'Running from source folder, modifying PYTHONPATH'
++ print('Running from source folder, modifying PYTHONPATH', file=sys.stderr)
+ sys.path.insert(0, name)
+
+ from xml2po import Main
+@@ -142,14 +142,14 @@
+ elif opt in ('-o', '--output'):
+ output = arg
+ elif opt in ('-v', '--version'):
+- print VERSION
++ print(VERSION)
+ sys.exit(0)
+ elif opt in ('-h', '--help'):
+ usage(True)
+ sys.exit(0)
+
+ if operation == 'update' and output != "-":
+- print >> sys.stderr, "Option '-o' is not yet supported when updating translations directly. Ignoring this option."
++ print("Option '-o' is not yet supported when updating translations directly. Ignoring this option.", file=sys.stderr)
+
+ # Treat remaining arguments as XML files
+ filenames = []
+@@ -159,16 +159,16 @@
+ try:
+ xml2po_main = Main(default_mode, operation, output, options)
+ except IOError:
+- print >> sys.stderr, "Error: cannot open file %s for writing." % (output)
++ print("Error: cannot open file %s for writing." % (output), file=sys.stderr)
+ sys.exit(5)
+
+ if operation == 'merge':
+ if len(filenames) > 1:
+- print >> sys.stderr, "Error: You can merge translations with only one XML file at a time."
++ print("Error: You can merge translations with only one XML file at a time.", file=sys.stderr)
+ sys.exit(2)
+
+ if not mofile:
+- print >> sys.stderr, "Error: You must specify MO file when merging translations."
++ print("Error: You must specify MO file when merging translations.", file=sys.stderr)
+ sys.exit(3)
+
+ xml2po_main.merge(mofile, filenames[0])
+--- gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py.orig 2019-09-10 09:34:42.110328324 -0500
++++ gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py 2019-09-10 09:34:44.170325899 -0500
+@@ -166,7 +166,7 @@
+ elif node.isText():
+ if node.isBlankNode():
+ if self.app.options.get('expand_entities') or \
+- (not (node.prev and not node.prev.isBlankNode() and node.__next__ and not node.next.isBlankNode()) ):
++ (not (node.prev and not node.prev.isBlankNode() and node.next and not node.next.isBlankNode()) ):
+ #print >>sys.stderr, "BLANK"
+ node.setContent('')
+ else:
+@@ -176,7 +176,7 @@
+ child = node.children
+ while child:
+ self.normalizeNode(child)
+- child = child.__next__
++ child = child.next
+
+ def normalizeString(self, text, spacepreserve = False):
+ """Normalizes string to be used as key for gettext lookup.
+@@ -209,7 +209,7 @@
+ child = newnode.children
+ while child:
+ result += child.serialize('utf-8')
+- child = child.__next__
++ child = child.next
+
+ result = re.sub('^ ','', result)
+ result = re.sub(' $','', result)
+@@ -235,7 +235,7 @@
+ ctxt.parseDocument()
+ tree = ctxt.doc()
+ if next:
+- newnode = tree.children.__next__
++ newnode = tree.children.next
+ else:
+ newnode = tree.children
+
+@@ -243,7 +243,7 @@
+ child = newnode.children
+ while child:
+ result += child.serialize('utf-8')
+- child = child.__next__
++ child = child.next
+ tree.freeDoc()
+ return result
+
+@@ -262,7 +262,7 @@
+ result += child.content.decode('utf-8')
+ else:
+ result += self.myAttributeSerialize(child)
+- child = child.__next__
++ child = child.next
+ else:
+ result = node.serialize('utf-8')
+ return result
+@@ -346,13 +346,13 @@
+ if newelem and newelem.children:
+ free = node.children
+ while free:
+- next = free.__next__
++ next = free.next
+ free.unlinkNode()
+ free = next
+
+ if node:
+ copy = newelem.copyNodeList()
+- next = node.__next__
++ next = node.next
+ node.replaceNode(newelem.copyNodeList())
+ node.next = next
+
+@@ -378,7 +378,7 @@
+ if child.type in ['text'] and child.content.strip()!='':
+ final = True
+ break
+- child = child.__next__
++ child = child.next
+
+ node.__autofinal__ = final
+ return final
+@@ -457,7 +457,7 @@
+ outtxt += '<%s>%s</%s>' % (starttag, content, endtag)
+ else:
+ outtxt += self.doSerialize(child)
+- child = child.__next__
++ child = child.next
+
+ if self.app.operation == 'merge':
+ norm_outtxt = self.normalizeString(outtxt, self.app.isSpacePreserveNode(node))
+@@ -534,7 +534,7 @@
+ outtxt = ''
+ while child:
+ outtxt += self.doSerialize(child)
+- child = child.__next__
++ child = child.next
+ return outtxt
+
+ def xml_error_handler(arg, ctxt):
+--- gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py.orig 2019-09-10 09:39:57.733974912 -0500
++++ gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py 2019-09-10 09:40:24.761946962 -0500
+@@ -326,7 +326,7 @@
+ pass
+
+ content = '<%s>%s</%s>' % (starttag, text, endtag)
+- tmp = tmp + content.encode('utf-8')
++ tmp = tmp + content
+
+ newnode = None
+ try:
+@@ -663,7 +663,7 @@
+ if not text or text.strip() == '':
+ return text
+ if self.gt:
+- res = self.gt.ugettext(text.decode('utf-8'))
++ res = self.gt.gettext(text)
+ return res
+
+ return text
+--- gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py.orig 2019-09-10 09:41:23.853885851 -0500
++++ gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py 2019-09-10 09:44:23.580699979 -0500
+@@ -352,9 +352,10 @@
+
+ if node:
+ copy = newelem.copyNodeList()
+- next = node.next
++ #next = node.next
+ node.replaceNode(newelem.copyNodeList())
+- node.next = next
++ #print(type(next))
++ #node.next = next
+
+ else:
+ # In practice, this happens with tags such as "<para> </para>" (only whitespace in between)
+@@ -470,7 +471,7 @@
+
+ worth = self.worthOutputting(node)
+ if not translation:
+- translation = outtxt.decode('utf-8')
++ translation = outtxt
+ if worth and self.app.options.get('mark_untranslated'):
+ node.setLang('C')
+
+--- gnome-doc-utils-0.20.10/xml2po/xml2po/modes/docbook.py.orig 2019-09-10 09:46:15.409584334 -0500
++++ gnome-doc-utils-0.20.10/xml2po/xml2po/modes/docbook.py 2019-09-10 09:46:30.164569075 -0500
+@@ -184,7 +184,7 @@
+ else:
+ ai.addChild(copy)
+ if match.group(3):
+- copy.newChild(None, "year", match.group(3).encode('utf-8'))
++ copy.newChild(None, "year", match.group(3))
+ if match.group(1) and match.group(2):
+ holder = match.group(1)+"(%s)" % match.group(2)
+ elif match.group(1):
+@@ -193,7 +193,7 @@
+ holder = match.group(2)
+ else:
+ holder = "???"
+- copy.newChild(None, "holder", holder.encode('utf-8'))
++ copy.newChild(None, "holder", holder)
+
+ # Perform some tests when ran standalone
+ if __name__ == '__main__':
+--- gnome-doc-utils-0.20.10/xml2po/xml2po/xml2po.py.in~ 2019-09-10 09:50:34.000000000 -0500
++++ gnome-doc-utils-0.20.10/xml2po/xml2po/xml2po.py.in 2019-09-10 09:50:45.114305443 -0500
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python -u
++#!/usr/bin/python3 -u
+ # -*- encoding: utf-8 -*-
+ # Copyright (c) 2004, 2005, 2006 Danilo Šegan <danilo(a)gnome.org>.
+ # Copyright (c) 2009 Claude Paroz <claude(a)2xlibre.net>.
+--- gnome-doc-utils-0.20.10.old/xml2po/xml2po/__init__.py 2021-10-14 16:54:33.332661817 +0900
++++ gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py 2021-10-14 17:06:31.006607987 +0900
+@@ -504,7 +504,7 @@
+ # !!! This is not very nice thing to do, but I don't know if
+ # raising an exception is any better
+ return False
+- return tmpstr.find('EXTERNAL_GENERAL_PARSED_ENTITY') != -1
++ return tmpstr.find(b'EXTERNAL_GENERAL_PARSED_ENTITY') != -1
+
+ def doSerialize(self, node):
+ """Serializes a node and its children, emitting PO messages along the way.
+@@ -556,7 +556,7 @@
+ elif output == '-':
+ self.out = sys.stdout
+ else:
+- self.out = file(output, 'w')
++ self.out = open(output, 'w')
+
+ def load_mode(self, modename):
+ try:
diff --git a/ldapvi/ldapvi.nm b/ldapvi/ldapvi.nm
index fb0ff9c8b..f1b939b0f 100644
--- a/ldapvi/ldapvi.nm
+++ b/ldapvi/ldapvi.nm
@@ -5,12 +5,12 @@
name = ldapvi
version = 1.7
-release = 2
+release = 3
groups = Applications/Editors
url = http://www.lichteblau.com/ldapvi/
license = GPLv2+
-summary = An interactive LDAP client.
+summary = An interactive LDAP client
description
ldapvi is an interactive LDAP client for Unix terminals. Using it, you can \
@@ -18,11 +18,12 @@ description
it as vipw(1) for LDAP.
end
-source_dl =
+source_dl = https://www.lichteblau.com/download/
build
requires
glib2-devel
+ libxcrypt-devel
ncurses-devel
openldap-devel
openssl-devel
diff --git a/libdrm/libdrm.nm b/libdrm/libdrm.nm
index c806a13cc..d0ab91680 100644
--- a/libdrm/libdrm.nm
+++ b/libdrm/libdrm.nm
@@ -5,7 +5,7 @@
name = libdrm
version = 2.4.114
-release = 1
+release = 1.1
maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
groups = X/Libraries
@@ -27,7 +27,6 @@ build
cairo-devel
libpciaccess-devel
libtool
- libxcb-devel
meson
pkg-config
libudev-devel
diff --git a/libldb/libldb.nm b/libldb/libldb.nm
index a0c184a14..8567546a8 100644
--- a/libldb/libldb.nm
+++ b/libldb/libldb.nm
@@ -5,7 +5,7 @@
name = libldb
version = 2.6.1
-release = 1
+release = 1.1
thisapp = ldb-%{version}
groups = System/Libraries
@@ -30,6 +30,7 @@ build
libtdb-devel >= 1.3.8
libtevent-devel >= 0.9.27
libtirpc-devel
+ libxcrypt-devel
lmdb-devel >= 0.9.16
popt-devel
python3-devel
diff --git a/libnftnl/libnftnl.nm b/libnftnl/libnftnl.nm
index 6c3523627..547bbc090 100644
--- a/libnftnl/libnftnl.nm
+++ b/libnftnl/libnftnl.nm
@@ -5,7 +5,7 @@
name = libnftnl
version = 1.2.4
-release = 1
+release = 1.1
groups = Networking/Tools
url = https://netfilter.org/projects/libnftnl
@@ -23,7 +23,6 @@ sources = %{thisapp}.tar.bz2
build
requires
autoconf
- autogen
automake
libmnl-devel
libtool
diff --git a/liboping/liboping.nm b/liboping/liboping.nm
index e775143a7..8f2296e7f 100644
--- a/liboping/liboping.nm
+++ b/liboping/liboping.nm
@@ -5,7 +5,7 @@
name = liboping
version = 1.10.0
-release = 3
+release = 4
groups = Development/Tools
url = https://noping.cc/
diff --git a/liboping/patches/liboping-1.10.0-ncurses-6.3.patch b/liboping/patches/liboping-1.10.0-ncurses-6.3.patch
new file mode 100644
index 000000000..d29afab6a
--- /dev/null
+++ b/liboping/patches/liboping-1.10.0-ncurses-6.3.patch
@@ -0,0 +1,51 @@
+From 609559aa3b257a5eb627717d870dfce336f941ec Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich(a)gmail.com>
+Date: Mon, 15 Nov 2021 08:05:43 +0000
+Subject: [PATCH] src/oping.c: always use "%s"-style format for printf()-style
+ functions
+
+`ncuses-6.3` added printf-style function attributes and now makes
+it easier to catch cases when user input is used in palce of format
+string when built with CFLAGS=-Werror=format-security:
+
+ oping.c:1265:41: error: format not a string literal and no format arguments [-Werror=format-security]
+ 1265 | hist_symbols_utf8[index]);
+ | ^~~~~~~~~~~~~~~~~
+
+Let's wrap all the missing places with "%s" format.
+---
+ src/oping.c | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/src/oping.c b/src/oping.c
+index c087c80..af4a0cb 100644
+--- a/src/oping.c
++++ b/src/oping.c
+@@ -1156,7 +1156,7 @@ static int update_graph_prettyping (ping_context_t *ctx, /* {{{ */
+ wattron (ctx->window, COLOR_PAIR(color));
+
+ if (has_utf8())
+- mvwprintw (ctx->window, /* y = */ 3, /* x = */ x + 2, symbol);
++ mvwprintw (ctx->window, /* y = */ 3, /* x = */ x + 2, "%s", symbol);
+ else
+ mvwaddch (ctx->window, /* y = */ 3, /* x = */ x + 2, symbolc);
+
+@@ -1262,7 +1262,7 @@ static int update_graph_histogram (ping_context_t *ctx) /* {{{ */
+ mvwaddch (ctx->window, /* y = */ 3, /* x = */ x + 2, ' ');
+ else if (has_utf8 ())
+ mvwprintw (ctx->window, /* y = */ 3, /* x = */ x + 2,
+- hist_symbols_utf8[index]);
++ "%s", hist_symbols_utf8[index]);
+ else
+ mvwaddch (ctx->window, /* y = */ 3, /* x = */ x + 2,
+ hist_symbols_acs[index] | A_ALTCHARSET);
+@@ -1639,8 +1639,7 @@ static void update_host_hook (pingobj_iter_t *iter, /* {{{ */
+
+ HOST_PRINTF ("%zu bytes from %s (%s): icmp_seq=%u ttl=%i ",
+ data_len, context->host, context->addr,
+- sequence, recv_ttl,
+- format_qos (recv_qos, recv_qos_str, sizeof (recv_qos_str)));
++ sequence, recv_ttl);
+ if ((recv_qos != 0) || (opt_send_qos != 0))
+ {
+ HOST_PRINTF ("qos=%s ",
diff --git a/liboping/patches/liboping-1.10.0-no-werror.patch b/liboping/patches/liboping-1.10.0-no-werror.patch
new file mode 100644
index 000000000..56a70a533
--- /dev/null
+++ b/liboping/patches/liboping-1.10.0-no-werror.patch
@@ -0,0 +1,22 @@
+--- liboping-1.10.0/src/Makefile.am 2017-05-11 00:32:27.000000000 -0700
++++ liboping-1.10.0/src/Makefile.am.new 2018-07-24 14:29:43.400661398 -0700
+@@ -3,7 +3,7 @@
+ SUBDIRS = mans
+
+ if COMPILER_IS_GCC
+-AM_CFLAGS = -Wall -Werror
++AM_CFLAGS = -Wall
+ endif
+
+ include_HEADERS = oping.h
+--- liboping-1.10.0/src/Makefile.in 2018-07-24 14:30:52.192553951 -0700
++++ liboping-1.10.0/src/Makefile.in.new 2018-07-24 14:30:57.281546003 -0700
+@@ -388,7 +388,7 @@
+ top_srcdir = @top_srcdir@
+ AUTOMAKE_OPTIONS = foreign no-dependencies
+ SUBDIRS = mans
+-@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall -Werror
++@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall
+ include_HEADERS = oping.h
+ lib_LTLIBRARIES = liboping.la
+
diff --git a/libpciaccess/libpciaccess.nm b/libpciaccess/libpciaccess.nm
index e02131b5c..4d8ca9aa0 100644
--- a/libpciaccess/libpciaccess.nm
+++ b/libpciaccess/libpciaccess.nm
@@ -5,12 +5,12 @@
name = libpciaccess
version = 0.17
-release = 1
+release = 2
groups = Applications/Virtualization
url = https://cgit.freedesktop.org/xorg/lib/libpciaccess/
license = LGPLv2.1+
-summary = Generic PCI access library.
+summary = Generic PCI access library
description
A toolkit to interact with the virtualization capabilities of recent
@@ -19,12 +19,6 @@ end
source_dl = https://www.x.org/archive/individual/lib/
-build
- requires
- xorg-x11-util-macros
- end
-end
-
packages
package %{name}
diff --git a/libpng/libpng.nm b/libpng/libpng.nm
index 8b6b9e71c..9c478eb9d 100644
--- a/libpng/libpng.nm
+++ b/libpng/libpng.nm
@@ -5,7 +5,7 @@
name = libpng
version = 1.6.39
-release = 1
+release = 2
groups = System/Libraries
url = http://www.libpng.org/pub/png/
@@ -27,6 +27,14 @@ build
pkg-config
zlib-devel
end
+
+ configure_options += \
+ --disable-static
+
+ install_cmds
+ # Remove libtool archives manually as they are installed incorrectly
+ rm -vf %{BUILDROOT}%{libdir}/*.la
+ end
end
packages
diff --git a/libtalloc/libtalloc.nm b/libtalloc/libtalloc.nm
index c0800da22..fc079ea6b 100644
--- a/libtalloc/libtalloc.nm
+++ b/libtalloc/libtalloc.nm
@@ -5,7 +5,7 @@
name = libtalloc
version = 2.3.4
-release = 1
+release = 2
thisapp = talloc-%{version}
groups = System/Libraries
@@ -23,6 +23,7 @@ build
requires
docbook-utils
docbook-xsl
+ libxcrypt-devel
python3-devel
end
diff --git a/libtdb/libtdb.nm b/libtdb/libtdb.nm
index 970442a3a..b85fb53cf 100644
--- a/libtdb/libtdb.nm
+++ b/libtdb/libtdb.nm
@@ -5,7 +5,7 @@
name = libtdb
version = 1.4.7
-release = 1
+release = 2
thisapp = tdb-%{version}
groups = System/Libraries
@@ -23,6 +23,7 @@ build
requires
docbook-utils
docbook-xsl
+ libxcrypt-devel
python3-devel
end
diff --git a/libtevent/libtevent.nm b/libtevent/libtevent.nm
index e2d625874..d179133d2 100644
--- a/libtevent/libtevent.nm
+++ b/libtevent/libtevent.nm
@@ -5,7 +5,7 @@
name = libtevent
version = 0.13.0
-release = 1
+release = 2
thisapp = tevent-%{version}
groups = System/Libraries
@@ -27,6 +27,7 @@ build
docbook-utils
docbook-xsl
libtalloc-devel >= 2.3.4
+ libxcrypt-devel
python3-devel
end
diff --git a/libunwind/libunwind.nm b/libunwind/libunwind.nm
index 80e5851b4..707feb22a 100644
--- a/libunwind/libunwind.nm
+++ b/libunwind/libunwind.nm
@@ -5,7 +5,7 @@
name = libunwind
version = 1.4.0
-release = 1
+release = 2
groups = Development/Debuggers
url = https://savannah.nongnu.org/projects/libunwind
@@ -19,22 +19,14 @@ end
source_dl = https://download.savannah.gnu.org/releases/libunwind/
build
- requires
- autoconf
- automake
- libtool
- end
-
CFLAGS += -fcommon
- export LD_LIBRARY_PATH = %{DIR_APP}/src/.libs
-
configure_options += \
- --enable-static \
+ --disable-static \
--enable-shared
test
- make check || :
+ make check LD_LIBRARY_PATH=%{DIR_APP}/src/.libs || :
end
end
diff --git a/libxml2/libxml2.nm b/libxml2/libxml2.nm
index 24d27aa13..c284d5a47 100644
--- a/libxml2/libxml2.nm
+++ b/libxml2/libxml2.nm
@@ -6,7 +6,7 @@
name = libxml2
version = %{ver_maj}.3
ver_maj = 2.10
-release = 2
+release = 3
groups = System/Libraries
url = https://xmlsoft.org/
@@ -31,11 +31,12 @@ sources = %{thisapp}.tar.xz
build
requires
pkg-config
+ python3-devel
zlib-devel
end
configure_options += \
- --without-python
+ PYTHON=%{python3}
end
packages
@@ -45,6 +46,10 @@ packages
template DEVEL
end
+ package python3-%{name}
+ template PYTHON3
+ end
+
package %{name}-debuginfo
template DEBUGINFO
end
diff --git a/openldap/openldap.nm b/openldap/openldap.nm
index d00727c8d..847d13fc4 100644
--- a/openldap/openldap.nm
+++ b/openldap/openldap.nm
@@ -4,7 +4,7 @@
###############################################################################
name = openldap
-version = 2.6.3
+version = 2.6.4
release = 1.1
groups = System/Daemons
@@ -29,14 +29,10 @@ build
automake
cyrus-sasl-devel
groff
- # Cannot be built with libdb 6 and above
- # because of an incompatibility with AGPL
- libdb-devel < 6
libtool
libtool-devel
libxcrypt-devel
openssl-devel
- pth-devel
shadow-utils
end
@@ -52,9 +48,6 @@ build
--enable-backends=mod \
--enable-overlays=mod \
--enable-sql=no \
- --enable-ndb=no \
- --enable-hdb=yes \
- --enable-monitor=yes \
--disable-static
prepare_cmds
hooks/post-receive
--
IPFire 3.x development tree
1
0