Development February 2023

development@lists.ipfire.org

9 participants
118 discussions

[PATCH] compat-icu: Update to 56.1
by Stefan Schantl 27 Feb '23

27 Feb '23

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- compat-icu/compat-icu.nm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/compat-icu/compat-icu.nm b/compat-icu/compat-icu.nm index 47e24d4f4..8ca0f6ac5 100644 --- a/compat-icu/compat-icu.nm +++ b/compat-icu/compat-icu.nm @@ -5,9 +5,9 @@ name = compat-icu version = %{ver_major}.%{ver_minor}.%{ver_plevel} -ver_major = 50 +ver_major = 56 ver_minor = 1 -ver_plevel = 2 +ver_plevel = release = 1 thisapp = icu-%{version} @@ -20,8 +20,8 @@ description Tools and utilities for developing with icu. end -source_dl = http://download.icu-project.org/files/icu4c/%{version}/ -sources = icu4c-%{ver_major}_%{ver_minor}_%{ver_plevel}-src.tgz +source_dl = https://github.com/unicode-org/icu/releases/download/release-%{ver_major}-%… +sources = icu4c-%{ver_major}_%{ver_minor}-src.tgz build DIR_APP = %{DIR_SRC}/icu/source -- 2.30.2

1 0

[PATCH] icu: Update to 72.1
by Stefan Schantl 27 Feb '23

27 Feb '23

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- icu/icu.nm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/icu/icu.nm b/icu/icu.nm index 39b7b8339..dea5445b3 100644 --- a/icu/icu.nm +++ b/icu/icu.nm @@ -5,7 +5,7 @@ name = icu version = %{ver_major}.%{ver_minor} -ver_major = 56 +ver_major = 72 ver_minor = 1 ver_plevel = release = 1 @@ -19,7 +19,7 @@ description Tools and utilities for developing with icu. end -source_dl = http://download.icu-project.org/files/icu4c/%{version}/ +source_dl = https://github.com/unicode-org/icu/releases/download/release-%{ver_major}-%… sources = icu4c-%{ver_major}_%{ver_minor}-src.tgz build -- 2.30.2

1 0

[PATCH] python3-sdbus: New package
by Stefan Schantl 27 Feb '23

27 Feb '23

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- python3-sdbus/python3-sdbus.nm | 45 ++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 python3-sdbus/python3-sdbus.nm diff --git a/python3-sdbus/python3-sdbus.nm b/python3-sdbus/python3-sdbus.nm new file mode 100644 index 000000000..5411a16ea --- /dev/null +++ b/python3-sdbus/python3-sdbus.nm @@ -0,0 +1,45 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = python3-sdbus +version = 0.11.0 +release = 1 +thisapp = python-sdbus-%{version} + +groups = System/Libraries +url = https://github.com/python-sdbus/python-sdbus +license = LGPL2.1 and GPL2 +summary = Modern Python bindings for D-Bus + +description + A modern python library for D-Bus, based on the fast sd-bus + from systemd. +end + +source_dl = https://github.com/python-sdbus/python-sdbus/archive/refs/tags/%{version}.t… + +build + requires + python3-devel + python3-setuptools + systemd-devel + end + + build + %{python3} setup.py build + end + + install + %{python3} setup.py install --root=%{BUILDROOT} + end +end + +packages + package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end +end -- 2.30.2

1 0

[PATCH] perl: Move DynaLoader subpackage back into main
by Stefan Schantl 26 Feb '23

26 Feb '23

Fixes a lot of dependency issues with a certain perl modules. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- perl/perl.nm | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/perl/perl.nm b/perl/perl.nm index 5233b652a..949dc9b31 100644 --- a/perl/perl.nm +++ b/perl/perl.nm @@ -10,7 +10,7 @@ ver_plevel = 0 version = %{ver_major}.%{ver_minor}.%{ver_plevel} # Never reset release in this package, just increase. -release = 1 +release = 2 thisver = %{version}-%{_release} @@ -152,9 +152,6 @@ packages package perl requires perl-libs = %{version}-%{_release} - - # XSLoader requires DynaLoader - perl(DynaLoader) end conflicts @@ -1036,28 +1033,6 @@ packages end end - package perl-DynaLoader - version = 1.52 - - summary = Dynamically load C libraries into Perl code - description - The DynaLoader module defines a standard generic interface to the dynamic - linking mechanisms available on many platforms. Its primary purpose is to - implement automatic dynamic loading of Perl modules. For a simpler interface, - see XSLoader module. - end - - requires - perl = %{perl_version} - perl(Carp) - end - - files - %{libdir}/perl5/DynaLoader.pm - %{mandir}/man3/DynaLoader.3* - end - end - package perl-doc version = %{perl_version} arch = noarch -- 2.30.2

1 0

[PATCH 1/7] perl-Module-Install: New package
by Stefan Schantl 26 Feb '23

26 Feb '23

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- perl-Module-Install/perl-Module-Install.nm | 57 ++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 perl-Module-Install/perl-Module-Install.nm diff --git a/perl-Module-Install/perl-Module-Install.nm b/perl-Module-Install/perl-Module-Install.nm new file mode 100644 index 000000000..f3313e5fc --- /dev/null +++ b/perl-Module-Install/perl-Module-Install.nm @@ -0,0 +1,57 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = perl-Module-Install +version = 1.19 +release = 1 +arch = noarch + +groups = Development/Libratries +url = http://search.cpan.org/dist/Module-Install/ +license = GPL+ or Artistic +summary = Standalone, extensible Perl module installer. + +description + Module::Install is a package for writing installers for CPAN (or CPAN-like) + distributions that are clean, simple, minimalist, act in a strictly correct + manner with ExtUtils::MakeMaker, and will run on any Perl installation + version 5.005 or newer. +end + +source_dl = https://cpan.metacpan.org/authors/id/E/ET/ETHER/ + +thisapp = Module-Install-%{version} + +build + requires + perl(autodie) + perl(CPAN::Meta::YAML) + perl(Devel::PPPort) + perl(File::Remove) + perl(FindBin) + perl(ExtUtils::MakeMaker) + perl(Module::CoreList) + perl(Parse::CPAN::Meta) + perl(Test::More) + perl(YAML::Tiny) + 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 -- 2.30.2

1 6

[PATCH] git: Shrink package
by Stefan Schantl 26 Feb '23

26 Feb '23

* Drop daemon, gitweb, SVN, CVS and p4 sub-packages. * Drop git daemon related systemd files. * Drop gitweb related config files. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- git/git.conf.httpd | 7 -- git/git.nm | 161 +++++++-------------------------------- git/gitweb.conf | 53 ------------- git/systemd/git.socket | 9 --- git/systemd/git@.service | 8 -- 5 files changed, 27 insertions(+), 211 deletions(-) delete mode 100644 git/git.conf.httpd delete mode 100644 git/gitweb.conf delete mode 100644 git/systemd/git.socket delete mode 100644 git/systemd/git@.service diff --git a/git/git.conf.httpd b/git/git.conf.httpd deleted file mode 100644 index 4f4eac7c7..000000000 --- a/git/git.conf.httpd +++ /dev/null @@ -1,7 +0,0 @@ -Alias /git /var/www/git - -<Directory /var/www/git> - Options +ExecCGI - AddHandler cgi-script .cgi - DirectoryIndex gitweb.cgi -</Directory> diff --git a/git/git.nm b/git/git.nm index c9919af74..b3b5f789b 100644 --- a/git/git.nm +++ b/git/git.nm @@ -5,7 +5,7 @@ name = git version = 2.38.1 -release = 2 +release = 3 groups = Development/Tools url = http://git-scm.com/ @@ -46,14 +46,13 @@ build ETC_GITCONFIG = %{sysconfdir}/gitconfig DESTDIR = %{BUILDROOT} INSTALL = install -p - GITWEB_PROJECTROOT = %{localstatedir}/git GNU_ROFF = 1 NO_CROSS_DIRECTORY_HARDLINKS = 1 PYTHON_PATH = %{python3} prefix = %{prefix} gitexecdir = lib/git-core htmldir = %{datadir}/doc - gitwebdir = %{localstatedir}/www/git + NO_GITWEB=1 EOF # Remove shebang from bash-completion script. @@ -75,132 +74,42 @@ build install -v -m 644 contrib/completion/git-completion.bash \ %{BUILDROOT}%{sysconfdir}/bash_completion.d/git - # Create folder for git-daemon. - mkdir -pv %{BUILDROOT}%{sharedstatedir}/git - - # Create folder for gitweb. - mkdir -pv %{BUILDROOT}%{sysconfdir}/httpd/conf.d - - # Install config files for gitweb. - install -pm 0664 %{DIR_SOURCE}/gitweb.conf \ - %{BUILDROOT}%{sysconfdir}/gitweb.conf - - install -pm 0644 %{DIR_SOURCE}/git.conf.httpd \ - %{BUILDROOT}%{sysconfdir}/httpd/conf.d/git.conf + # Remove git-daemon related files + rm -rvf %{BUILDROOT}/usr/lib/git-core/git-daemon + rm -rvf %{BUILDROOT}%{mandir}/man1/git-daemon* + + # Remove SVN related files + rm -rvf %{BUILDROOT}/usr/lib/git-core/git-svn + rm -rvf %{BUILDROOT}%{mandir}/man1/git-svn* + rm -rvf %{BUILDROOT}%{perl_vendorlib}/Git/SVN*.pm + rm -rvf %{BUILDROOT}%{perl_vendorlib}/Git/SVN/ + rm -rvf %{BUILDROOT}%{datadir}/perl5/Git/SVN/ + rm -rvf %{BUILDROOT}%{datadir}/perl5/Git/SVN*.pm + + # Remove CVS related files + rm -rvf %{BUILDROOT}%{bindir}/git-cvsserver + rm -rvf %{BUILDROOT}/usr/lib/git-core/*cvs* + rm -rvf %{BUILDROOT}%{mandir}/man1/*cvs* + rm -rvf %{BUILDROOT}%{mandir}/man7/*cvs* + + # Remove Perforce depots related files. + rm -rvf %{BUILDROOT}/usr/lib/git-core/*p4* + rm -rvf %{BUILDROOT}/usr/lib/git-core/mergetools/p4* + rm -rvf %{BUILDROOT}%{mandir}/man1/*p4* end end packages - # Define %{gitcoredir} to have a more handy name. - gitcoredir = %{prefix}/lib/git-core - package %{name} requires less openssh-clients - rsync /usr/bin/vi end recommends %{name}-email - end - end - - package %{name}-daemon - summary = Git protocol daemon. - description - The git daemon for supporting git:// access to git repositories. - end - - requires - git=%{thisver} - end - - files - %{gitcoredir}/git-daemon - %{mandir}/man1/git-daemon* - %{sharedstatedir}/git - %{unitdir}/git@.service - %{unitdir}/git.socket - end - - script postin - systemctl daemon-reload >/dev/null 2>&1 || : - end - - script preun - systemctl --no-reload disable git.socket >/dev/null 2>&1 || : - systemctl stop git.socket >/dev/null 2>&1 || : - systemctl stop git@.service >/dev/null 2>&1 || : - end - - script postun - systemctl daemon-reload >/dev/null 2>&1 || : - end - - script postup - systemctl daemon-reload >/dev/null 2>&1 || : - systemctl try-restart git.socket >/dev/null 2>&1 || : - end - end - - package %{name}-gitweb - arch = noarch - - summary = Simple web interface to git repositories. - description - Simple web interface to track changes in git repositories - end - - requires - git=%{thisver} - end - - configfiles - %{sysconfdir}/gitweb.conf - %{sysconfdir}/httpd/conf.d/git.conf - end - - files - %{sysconfdir}/gitweb.conf - %{sysconfdir}/httpd/conf.d/git.conf - %{mandir}/man1/gitweb* - %{mandir}/man5/gitweb* - %{localstatedir}/www/git - end - end - - package %{name}-cvs - summary = Git tools for importing CVS repositories. - description = %{summary} - - requires - git=%{thisver} - end - - files - %{bindir}/git-cvsserver - %{gitcoredir}/*cvs* - %{mandir}/man1/*cvs* - %{mandir}/man7/*cvs* - end - end - - package %{name}-p4 - arch = noarch - - summary = Git tools for working with Perforce depots. - description = %{summary} - - requires - git=%{thisver} - end - - files - %{gitcoredir}/*p4* - %{gitcoredir}mergetools/p4merge - %{mandir}/man1/*p4* + rsync end end @@ -216,7 +125,7 @@ packages end files - %{gitcoredir}/git-send-email + /usr/lib/git-core/git-send-email %{mandir}/man1/git-send-email* end end @@ -236,23 +145,7 @@ packages %{perl_archlib} %{perl_vendorlib}/*.pm %{perl_vendorlib}/Git/*.pm - end - end - - package perl-Git-SVN - arch = noarch - - summary = Perl interface to Git::SVN. - description = %{summary} - - requires - git=%{thisver} - end - - files - %{mandir}/man3/Git::SVN* - %{perl_vendorlib}/Git/SVN*.pm - %{perl_vendorlib}/Git/SVN/ + %{datadir}/perl5/ end end diff --git a/git/gitweb.conf b/git/gitweb.conf deleted file mode 100644 index fe6ede43b..000000000 --- a/git/gitweb.conf +++ /dev/null @@ -1,53 +0,0 @@ -# The gitweb config file is a fragment of perl code. You can set variables -# using "our $variable = value"; text from "#" character until the end of a -# line is ignored. See perlsyn(1) man page for details. -# -# See /usr/share/doc/gitweb-*/README and /usr/share/doc/gitweb-*/INSTALL for -# more details and available configuration variables. - -# Set the path to git projects. This is an absolute filesystem path which will -# be prepended to the project path. -#our $projectroot = "/var/lib/git"; - -# Set the list of git base URLs used for URL to where fetch project from, i.e. -# the full URL is "$git_base_url/$project". By default this is empty -#our @git_base_url_list = qw(git://git.example.com -# ssh://git.example.com@PROJECTROOT@); - -# Enable the 'blame' blob view, showing the last commit that modified -# each line in the file. This can be very CPU-intensive. Disabled by default -#$feature{'blame'}{'default'} = [1]; -# -# Allow projects to override the default setting via git config file. -# Example: gitweb.blame = 0|1; -#$feature{'blame'}{'override'} = 1; - -# Disable the 'snapshot' link, providing a compressed archive of any tree. This -# can potentially generate high traffic if you have large project. Enabled for -# .tar.gz snapshots by default. -# -# Value is a list of formats defined in %known_snapshot_formats that you wish -# to offer. -#$feature{'snapshot'}{'default'} = []; -# -# Allow projects to override the default setting via git config file. -# Example: gitweb.snapshot = tbz2,zip; (use "none" to disable) -#$feature{'snapshot'}{'override'} = 1; - -# Disable grep search, which will list the files in currently selected tree -# containing the given string. This can be potentially CPU-intensive, of -# course. Enabled by default. -#$feature{'grep'}{'default'} = [0]; -# -# Allow projects to override the default setting via git config file. -# Example: gitweb.grep = 0|1; -#$feature{'grep'}{'override'} = 1; - -# Disable the pickaxe search, which will list the commits that modified a given -# string in a file. This can be practical and quite faster alternative to -# 'blame', but still potentially CPU-intensive. Enabled by default. -#$feature{'pickaxe'}{'default'} = [0]; -# -# Allow projects to override the default setting via git config file. -# Example: gitweb.pickaxe = 0|1; -#$feature{'pickaxe'}{'override'} = 1; diff --git a/git/systemd/git.socket b/git/systemd/git.socket deleted file mode 100644 index 3dec01d21..000000000 --- a/git/systemd/git.socket +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Git Activation Socket - -[Socket] -ListenStream=9418 -Accept=true - -[Install] -WantedBy=sockets.target diff --git a/git/systemd/git@.service b/git/systemd/git@.service deleted file mode 100644 index 185ff2569..000000000 --- a/git/systemd/git@.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Git Repositories Server Daemon -Documentation=man:git-daemon(1) - -[Service] -User=nobody -ExecStart=-/usr/libexec/git-core/git-daemon --base-path=/var/lib/git --export-all --user-path=public_git --syslog --inetd --verbose -StandardInput=socket -- 2.30.2

1 0

[PATCH] docbook-xsl: Add patch to fix problematic recursed strings.
by Stefan Schantl 26 Feb '23

26 Feb '23

This fixes the following error messages: xsltApplySequenceConstructor: A potential infinite template recursion was detected. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- docbook-xsl/docbook-xsl.nm | 2 +- .../765567_non-recursive_string_subst.patch2 | 32 +++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 docbook-xsl/patches/765567_non-recursive_string_subst.patch2 diff --git a/docbook-xsl/docbook-xsl.nm b/docbook-xsl/docbook-xsl.nm index f3a7a11b2..c1c5caf3c 100644 --- a/docbook-xsl/docbook-xsl.nm +++ b/docbook-xsl/docbook-xsl.nm @@ -5,7 +5,7 @@ name = docbook-xsl version = 1.79.2 -release = 1 +release = 2 arch = noarch groups = Applications/Text diff --git a/docbook-xsl/patches/765567_non-recursive_string_subst.patch2 b/docbook-xsl/patches/765567_non-recursive_string_subst.patch2 new file mode 100644 index 000000000..ae845ad00 --- /dev/null +++ b/docbook-xsl/patches/765567_non-recursive_string_subst.patch2 @@ -0,0 +1,32 @@ +Description: use EXSLT "replace" function when available + A recursive implementation of string.subst is problematic, + long strings with many matches will cause stack overflows. +Author: Peter De Wachter <pdewacht(a)gmail.com> +Bug-Debian: https://bugs.debian.org/750593 + +--- docbook-xsl-1.78.1+dfsg.orig/docbook-xsl/lib/lib.xsl ++++ docbook-xsl-1.78.1+dfsg/docbook-xsl/lib/lib.xsl +@@ -6,7 +6,11 @@ + + This module implements DTD-independent functions + +- ******************************************************************** --><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> ++ ******************************************************************** --> ++<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" ++ xmlns:str="http://exslt.org/strings" ++ exclude-result-prefixes="str" ++ version="1.0"> + + <xsl:template name="dot.count"> +  +@@ -52,6 +56,9 @@ + <xsl:param name="replacement"/> + + <xsl:choose> ++ <xsl:when test="function-available('str:replace')"> ++ <xsl:value-of select="str:replace($string, string($target), string($replacement))"/> ++ </xsl:when> + <xsl:when test="contains($string, $target)"> + <xsl:variable name="rest"> + <xsl:call-template name="string.subst"> + -- 2.30.2

1 0

[PATCH] kbd: Update to 2.5.1
by Stefan Schantl 26 Feb '23

26 Feb '23

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- kbd/kbd.nm | 13 +++-- kbd/patches/kbd-1.15-defkeymap.patch | 12 ----- kbd/patches/kbd-1.15-keycodes-man.patch | 36 +++++++------- kbd/patches/kbd-1.15-resizecon-x86_64.patch | 15 ------ kbd/patches/kbd-1.15-unicode_start.patch | 6 +-- kbd/patches/kbd-1.15.3-dumpkeys-man.patch | 18 ------- .../kbd-1.15.3-fix-es-translation.patch | 12 ----- .../kbd-1.15.5-loadkeys-search-path.patch | 24 +++++++++ .../kbd-1.15.5-sg-decimal-separator.patch | 12 +++++ .../kbd-2.0.2-unicode-start-font.patch | 15 ++++++ kbd/patches/kbd-2.4.0-covscan-fixes.patch | 49 +++++++++++++++++++ 11 files changed, 127 insertions(+), 85 deletions(-) delete mode 100644 kbd/patches/kbd-1.15-defkeymap.patch delete mode 100644 kbd/patches/kbd-1.15-resizecon-x86_64.patch delete mode 100644 kbd/patches/kbd-1.15.3-dumpkeys-man.patch delete mode 100644 kbd/patches/kbd-1.15.3-fix-es-translation.patch create mode 100644 kbd/patches/kbd-1.15.5-loadkeys-search-path.patch create mode 100644 kbd/patches/kbd-1.15.5-sg-decimal-separator.patch create mode 100644 kbd/patches/kbd-2.0.2-unicode-start-font.patch create mode 100644 kbd/patches/kbd-2.4.0-covscan-fixes.patch diff --git a/kbd/kbd.nm b/kbd/kbd.nm index fbc57c7e6..af829cbc0 100644 --- a/kbd/kbd.nm +++ b/kbd/kbd.nm @@ -4,11 +4,11 @@ ############################################################################### name = kbd -version = 1.15.3 -release = 2 +version = 2.5.1 +release = 1 groups = System/Base -url = http://ftp.altlinux.org/pub/people/legion/kbd +url = https://www.kbd-project.org/ license = GPLv2+ summary = Tools for configuring the console (keyboard, virtual terminals, etc.). @@ -18,15 +18,17 @@ description fonts, the virtual terminals and font files. end -source_dl = +source_dl = https://www.kernel.org/pub/linux/utils/kbd/ sources += kbd-latarcyrheb-16-fixed.tar.bz2 sources += kbd-latsun-fonts.tar.bz2 build requires + automake bison flex gettext + pam-devel end configure_options += \ @@ -42,8 +44,6 @@ build # 7-bit maps are obsolete; so are non-euro maps cd %{DIR_APP}/data/keymaps/i386 - mv qwerty/fi.map qwerty/fi-old.map - cp qwerty/fi-latin9.map qwerty/fi.map cp qwerty/pt-latin9.map qwerty/pt.map cp qwerty/sv-latin1.map qwerty/se-latin1.map mv azerty/fr.map azerty/fr-old.map @@ -51,7 +51,6 @@ build cp azerty/fr-latin9.map azerty/fr-latin0.map # Rename conflicting keymaps - mv dvorak/no.map dvorak/no-dvorak.map mv fgGIod/trf.map fgGIod/trf-fgGIod.map mv olpc/es.map olpc/es-olpc.map mv olpc/pt.map olpc/pt-olpc.map diff --git a/kbd/patches/kbd-1.15-defkeymap.patch b/kbd/patches/kbd-1.15-defkeymap.patch deleted file mode 100644 index 5e604b71e..000000000 --- a/kbd/patches/kbd-1.15-defkeymap.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up kbd-1.15/src/paths.h.orig kbd-1.15/src/paths.h ---- kbd-1.15/src/paths.h.orig 2010-06-07 15:26:21.787315778 +0200 -+++ kbd-1.15/src/paths.h 2010-06-07 15:26:49.353336391 +0200 -@@ -19,7 +19,7 @@ - # define DEFMAP "sunkeymap.kmap" - # define KERNDIR "/usr/src/linux/drivers/sbus/char" - #else --# define DEFMAP "defkeymap.kmap" -+# define DEFMAP "defkeymap.map" - # define KERNDIR "/usr/src/linux/drivers/char" - #endif - diff --git a/kbd/patches/kbd-1.15-keycodes-man.patch b/kbd/patches/kbd-1.15-keycodes-man.patch index d18a8c8b5..e400c9df6 100644 --- a/kbd/patches/kbd-1.15-keycodes-man.patch +++ b/kbd/patches/kbd-1.15-keycodes-man.patch @@ -1,7 +1,7 @@ -diff -up kbd-1.15/man/man1/showkey.1_old kbd-1.15/man/man1/showkey.1 ---- kbd-1.15/man/man1/showkey.1_old 2008-03-13 17:46:23.000000000 +0100 -+++ kbd-1.15/man/man1/showkey.1 2008-12-10 12:31:38.000000000 +0100 -@@ -80,6 +80,19 @@ corresponds to what the keyboard hardwar +diff -up kbd-2.3.0/docs/man/man1/showkey.1.orig kbd-2.3.0/docs/man/man1/showkey.1 +--- kbd-2.3.0/docs/man/man1/showkey.1.orig 2020-07-08 19:25:47.000000000 +0200 ++++ kbd-2.3.0/docs/man/man1/showkey.1 2020-07-16 08:56:15.970254183 +0200 +@@ -84,6 +84,19 @@ corresponds to what the keyboard hardwar to know the scan codes sent by various keys it is better to boot a 2.4 kernel. Since 2.6.9 there also is the boot option atkbd.softraw=0 that tells the 2.6 kernel to return the actual scan codes. @@ -21,21 +21,21 @@ diff -up kbd-1.15/man/man1/showkey.1_old kbd-1.15/man/man1/showkey.1 .SH "SEE ALSO" .BR loadkeys (1), .BR dumpkeys (1), -diff -up kbd-1.15/man/man8/setkeycodes.8_old kbd-1.15/man/man8/setkeycodes.8 ---- kbd-1.15/man/man8/setkeycodes.8_old 2008-12-10 12:31:56.000000000 +0100 -+++ kbd-1.15/man/man8/setkeycodes.8 2008-12-10 12:37:36.000000000 +0100 -@@ -41,6 +41,10 @@ to showkey(1), the command - will assign the keycode 112 to it, and then loadkeys(1) can be used - to define the function of this key. - +diff -up kbd-2.3.0/docs/man/man8/setkeycodes.8.orig kbd-2.3.0/docs/man/man8/setkeycodes.8 +--- kbd-2.3.0/docs/man/man8/setkeycodes.8.orig 2020-07-08 19:35:35.000000000 +0200 ++++ kbd-2.3.0/docs/man/man8/setkeycodes.8 2020-07-16 08:57:52.293900997 +0200 +@@ -42,6 +42,10 @@ the command + will assign the keycode 112 to it, and then + .BR loadkeys (1) + can be used to define the function of this key. ++ +USB keyboards have standardized keycodes and +.B setkeycodes +doesn't affect them at all. -+ - .SH "2.6 KERNELS" - In 2.6 kernels key codes lie in the range 1-255, instead of 1-127. - (It might be best to confine oneself to the range 1-239.) -@@ -54,6 +58,14 @@ None. + .LP + Some older kernels might hardwire a low scancode range to the + equivalent keycodes; setkeycodes will fail when you try to remap +@@ -60,6 +64,14 @@ None. .SH BUGS The keycodes of X have nothing to do with those of Linux. Unusual keys can be made visible under Linux, but not under X. @@ -48,5 +48,5 @@ diff -up kbd-1.15/man/man8/setkeycodes.8_old kbd-1.15/man/man8/setkeycodes.8 +cannot change the mapping of other devices than the "first" one. + .SH "SEE ALSO" - .I "dumpkeys (1), loadkeys (1), showkey (1), getkeycodes (8)" - + .BR dumpkeys (1), + .BR loadkeys (1), diff --git a/kbd/patches/kbd-1.15-resizecon-x86_64.patch b/kbd/patches/kbd-1.15-resizecon-x86_64.patch deleted file mode 100644 index 5e8350a86..000000000 --- a/kbd/patches/kbd-1.15-resizecon-x86_64.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up kbd-1.15/configure_old kbd-1.15/configure ---- kbd-1.15/configure_old 2009-01-08 15:11:04.000000000 +0100 -+++ kbd-1.15/configure 2009-01-08 15:11:45.000000000 +0100 -@@ -7637,8 +7637,9 @@ fi - - - case $host_cpu in -- i?86*) RESIZECONS_PROGS=yes ;; -- *) RESIZECONS_PROGS=no ;; -+ i?86*) RESIZECONS_PROGS=yes ;; -+ x86_64*) RESIZECONS_PROGS=yes ;; -+ *) RESIZECONS_PROGS=no ;; - esac - if test "$RESIZECONS_PROGS" = "yes"; then - RESIZECONS_PROGS_TRUE= diff --git a/kbd/patches/kbd-1.15-unicode_start.patch b/kbd/patches/kbd-1.15-unicode_start.patch index 41827ccd4..119fe78d8 100644 --- a/kbd/patches/kbd-1.15-unicode_start.patch +++ b/kbd/patches/kbd-1.15-unicode_start.patch @@ -1,6 +1,6 @@ -diff -up kbd-1.15/src/unicode_start_old kbd-1.15/src/unicode_start ---- kbd-1.15/src/unicode_start_old 2009-01-08 13:34:10.000000000 +0100 -+++ kbd-1.15/src/unicode_start 2009-01-08 14:02:12.000000000 +0100 +diff -up kbd-1.15.2/src/unicode_start.orig kbd-1.15.2/src/unicode_start +--- kbd-1.15.2/src/unicode_start.orig 2011-01-05 13:28:22.079662644 +0100 ++++ kbd-1.15.2/src/unicode_start 2011-01-05 13:29:01.327353698 +0100 @@ -72,6 +72,9 @@ stty iutf8 # have a Unicode map attached, or explicitly specified, e.g., # by giving `def.uni' as a second argument. diff --git a/kbd/patches/kbd-1.15.3-dumpkeys-man.patch b/kbd/patches/kbd-1.15.3-dumpkeys-man.patch deleted file mode 100644 index e77718b47..000000000 --- a/kbd/patches/kbd-1.15.3-dumpkeys-man.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -up kbd-1.15.3/man/man1/dumpkeys.1.in.orig kbd-1.15.3/man/man1/dumpkeys.1.in ---- kbd-1.15.3/man/man1/dumpkeys.1.in.orig 2011-08-23 13:06:16.905892768 +0200 -+++ kbd-1.15.3/man/man1/dumpkeys.1.in 2011-08-23 13:15:18.264853435 +0200 -@@ -156,6 +156,14 @@ output of - .BR dumpkeys . - .LP - .TP -+.B \-1 \-\-separate-lines -+This forces -+.B dumpkeys -+to write one line per (modifier,keycode) pair. It prefixes the word -+.I plain -+for plain keycodes. -+.LP -+.TP - .B \-\-funcs-only - When this option is given, - .B dumpkeys diff --git a/kbd/patches/kbd-1.15.3-fix-es-translation.patch b/kbd/patches/kbd-1.15.3-fix-es-translation.patch deleted file mode 100644 index 9d43d8d15..000000000 --- a/kbd/patches/kbd-1.15.3-fix-es-translation.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up kbd-1.15.3/po/es.po.orig kbd-1.15.3/po/es.po ---- kbd-1.15.3/po/es.po.orig 2011-08-22 15:18:35.262343023 +0200 -+++ kbd-1.15.3/po/es.po 2011-08-22 15:19:14.844340262 +0200 -@@ -1363,7 +1363,7 @@ msgstr "No se encontró nada que guardar - #: src/setfont.c:682 - #, c-format - msgid "Saved %d-char %dx%d font file on %s\n" --msgstr "Se ha guardado el fichero de tipos %2$dx%3$d de %1$d caracteres en %s\n" -+msgstr "Se ha guardado el fichero de tipos %dx%d de %d caracteres en %s\n" - - #: src/setkeycodes.c:21 - #, c-format diff --git a/kbd/patches/kbd-1.15.5-loadkeys-search-path.patch b/kbd/patches/kbd-1.15.5-loadkeys-search-path.patch new file mode 100644 index 000000000..16beb3da8 --- /dev/null +++ b/kbd/patches/kbd-1.15.5-loadkeys-search-path.patch @@ -0,0 +1,24 @@ +diff -up kbd-2.3.0/src/loadkeys.c.orig kbd-2.3.0/src/loadkeys.c +--- kbd-2.3.0/src/loadkeys.c.orig 2020-06-02 12:16:45.000000000 +0200 ++++ kbd-2.3.0/src/loadkeys.c 2020-07-16 09:02:50.398864688 +0200 +@@ -28,6 +28,8 @@ + static const char *const dirpath1[] = { + "", + DATADIR "/" KEYMAPDIR "/**", ++ DATADIR "/" XKBKEYMAPDIR "/", ++ DATADIR "/" LEGACYKEYMAPDIR "/**", + KERNDIR "/", + NULL + }; +diff -up kbd-2.3.0/src/paths.h.orig kbd-2.3.0/src/paths.h +--- kbd-2.3.0/src/paths.h.orig 2020-07-16 09:02:59.243010909 +0200 ++++ kbd-2.3.0/src/paths.h 2020-07-16 09:03:23.446410942 +0200 +@@ -5,6 +5,8 @@ + * The following five subdirectories are defined: + */ + #define KEYMAPDIR "keymaps" ++#define XKBKEYMAPDIR "keymaps/xkb" ++#define LEGACYKEYMAPDIR "keymaps/legacy" + #define UNIMAPDIR "unimaps" + #define TRANSDIR "consoletrans" + #define VIDEOMODEDIR "videomodes" diff --git a/kbd/patches/kbd-1.15.5-sg-decimal-separator.patch b/kbd/patches/kbd-1.15.5-sg-decimal-separator.patch new file mode 100644 index 000000000..cb7398d57 --- /dev/null +++ b/kbd/patches/kbd-1.15.5-sg-decimal-separator.patch @@ -0,0 +1,12 @@ +diff -up kbd-1.15.5/data/keymaps/i386/qwertz/sg.map.orig kbd-1.15.5/data/keymaps/i386/qwertz/sg.map +--- kbd-1.15.5/data/keymaps/i386/qwertz/sg.map.orig 2013-02-21 15:54:39.362799094 +0100 ++++ kbd-1.15.5/data/keymaps/i386/qwertz/sg.map 2013-02-21 15:54:46.448838554 +0100 +@@ -1,7 +1,7 @@ + keymaps 0-2,4-6,8,12 + include "qwertz-layout" + include "linux-with-alt-and-altgr.inc" +- plain keycode 83 = KP_Comma ++ plain keycode 83 = KP_Period + strings as usual + + keycode 1 = Escape Escape diff --git a/kbd/patches/kbd-2.0.2-unicode-start-font.patch b/kbd/patches/kbd-2.0.2-unicode-start-font.patch new file mode 100644 index 000000000..72d47f40f --- /dev/null +++ b/kbd/patches/kbd-2.0.2-unicode-start-font.patch @@ -0,0 +1,15 @@ +diff -up kbd-2.0.2/src/unicode_start.orig kbd-2.0.2/src/unicode_start +--- kbd-2.0.2/src/unicode_start.orig 2014-08-12 14:47:53.019028849 +0200 ++++ kbd-2.0.2/src/unicode_start 2014-08-12 14:54:42.631427602 +0200 +@@ -72,7 +72,10 @@ stty iutf8 + # have a Unicode map attached, or explicitly specified, e.g., + # by giving `def.uni' as a second argument. + +-DEFAULT_UNICODE_FONT=latarcyrheb-sun16 ++# Source /etc/vconsole.conf to get default font ++. /etc/vconsole.conf ++ ++DEFAULT_UNICODE_FONT=$FONT + # Also drdos8x16 is a good candidate. + + case "$#" in diff --git a/kbd/patches/kbd-2.4.0-covscan-fixes.patch b/kbd/patches/kbd-2.4.0-covscan-fixes.patch new file mode 100644 index 000000000..c7ddf27b9 --- /dev/null +++ b/kbd/patches/kbd-2.4.0-covscan-fixes.patch @@ -0,0 +1,49 @@ +diff -up kbd-2.4.0/src/libkfont/psffontop.c.orig kbd-2.4.0/src/libkfont/psffontop.c +--- kbd-2.4.0/src/libkfont/psffontop.c.orig 2020-04-27 17:53:01.000000000 +0200 ++++ kbd-2.4.0/src/libkfont/psffontop.c 2021-04-27 09:59:14.170153676 +0200 +@@ -235,6 +235,7 @@ kfont_read_psffont(struct kfont_context + + if (psfhdr->mode > PSF1_MAXMODE) { + KFONT_ERR(ctx, _("Unsupported psf file mode (%d)"), psfhdr->mode); ++ free(psfhdr); + return -EX_DATAERR; + } + fontlen = ((psfhdr->mode & PSF1_MODE512) ? 512 : 256); +@@ -251,6 +252,7 @@ kfont_read_psffont(struct kfont_context + + if (psfhdr.version > PSF2_MAXVERSION) { + KFONT_ERR(ctx, _("Unsupported psf version (%d)"), psfhdr.version); ++ free(inputbuf); + return -EX_DATAERR; + } + fontlen = assemble_uint32((unsigned char *)&psfhdr.length); +@@ -260,16 +262,20 @@ kfont_read_psffont(struct kfont_context + ftoffset = assemble_uint32((unsigned char *)&psfhdr.headersize); + fontwidth = assemble_uint32((unsigned char *)&psfhdr.width); + utf8 = 1; +- } else ++ } else { ++ free(inputbuf); + return -EX_DATAERR; /* not psf */ ++ } + + /* tests required - we divide by these */ + if (fontlen == 0) { + KFONT_ERR(ctx, _("zero input font length?")); ++ free(inputbuf); + return -EX_DATAERR; + } + if (charsize == 0) { + KFONT_ERR(ctx, _("zero input character size?")); ++ free(inputbuf); + return -EX_DATAERR; + } + +@@ -277,6 +283,7 @@ kfont_read_psffont(struct kfont_context + + if (i > inputlth || (!hastable && i != inputlth)) { + KFONT_ERR(ctx, _("Input file: bad input length (%d)"), inputlth); ++ free(inputbuf); + return -EX_DATAERR; + } + -- 2.30.2

1 0

[PATCH] popt: Update to 1.19
by Stefan Schantl 26 Feb '23

26 Feb '23

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- popt/popt.nm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/popt/popt.nm b/popt/popt.nm index 56eb33cee..070dc7f37 100644 --- a/popt/popt.nm +++ b/popt/popt.nm @@ -4,11 +4,11 @@ ############################################################################### name = popt -version = 1.16 +version = 1.19 release = 1 groups = System/Libraries -url = http://www.rpm5.org/ +url = https://github.com/rpm-software-management/popt license = MIT summary = C library for parsing command line parameters. @@ -18,17 +18,18 @@ description it improves on them by allowing more powerful argument expansion. end -source_dl = http://rpm5.org/files/popt/ +source_dl = https://github.com/rpm-software-management/popt/archive/refs/tags/ +sources = %{thisapp}-release.tar.gz build + DIR_APP = popt-popt-%{version}-release + requires automake end prepare_cmds - for i in $(find . -name config.guess -or -name config.sub); do - cp -vf %{datadir}/automake-*/config.{guess,sub} $(dirname ${i}) - done + ./autogen.sh end end -- 2.30.2

1 0

[PATCH] tree: Install files into correct location
by Stefan Schantl 26 Feb '23

26 Feb '23

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- tree/tree.nm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tree/tree.nm b/tree/tree.nm index 5c3cb32b1..895948bc4 100644 --- a/tree/tree.nm +++ b/tree/tree.nm @@ -5,7 +5,7 @@ name = tree version = 2.1.0 -release = 1 +release = 2 groups = Applications/File url = https://mama.indstate.edu/users/ice/tree/ @@ -27,8 +27,10 @@ build LDFLAGS="%{LDFLAGS}" install - make install BINDIR=%{BUILDROOT}%{bindir} \ - MANDIR=%{BUILDROOT}%{mandir}/man1 + make install \ + PREFIX=%{BUILDROOT}%{prefix} \ + BINDIR=%{BUILDROOT}%{bindir} \ + MANDIR=%{BUILDROOT}%{mandir} end end -- 2.30.2

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development February 2023