[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 57fb3e8c1a9532f6e883c39415f6feb974511556
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 57fb3e8c1a9532f6e883c39415f6feb974511556 (commit) via fd30f093b71e245d0b4364c4aa2c20477da44722 (commit) via 4bc0fa31f26e08920d8a825f2a3079d887abcc02 (commit) via b581cb223893165efa8a3e0bba5ab076c9b895f1 (commit) via 92492e8dc8fa16d69102086127f84e695eb8a1c8 (commit) via e2cff7fa0d27689b6a8b36bff69f80c67fbd3525 (commit) via ba5912cd1b57ba95d54386bcef02ce97f7b3c307 (commit) via 7bce9e6041b9529004b2746aa8ee3b87f6d96ebf (commit) via 81a6680ed88e81525e8904b4262ec2db43277554 (commit) via bb97a2338a58b9c0ffbb5454f796ad84844efb49 (commit) via 931f85d65c36a2a547adfb456b65699999e65eab (commit) via 19e7240e65cf8d75cdc573af8c40e3ed8aa11f92 (commit) via b059a4e1560349e12b8f50c19133c2aa1354567d (commit) via b23cda09bed6f5547224ca08297da98165e7dfd5 (commit) via ecfbf11ab11fddf3f5c053d7c318600e5cefaa35 (commit) via b2acbbf9ff90b41a2abddd0b1082a5e0fbdc9acb (commit) via e002fd196d31f125a155cabb99a96d871a86916e (commit) via 5fc37d861dc7eb57fc5fb596a24189f149f1acd9 (commit) via 6876e5d8c274243016f2d27a595628803cb96266 (commit) from 40a31d41cf79d8baa5c290cf1f179bd8846aac21 (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 57fb3e8c1a9532f6e883c39415f6feb974511556 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Mar 4 13:45:41 2023 +0000
kernel: Install intel-microcode only on x86_64
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit fd30f093b71e245d0b4364c4aa2c20477da44722 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Mar 4 13:45:07 2023 +0000
ImageMagick: Disable building documentation
This added some dependencies to Perl modules that we do not build.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 4bc0fa31f26e08920d8a825f2a3079d887abcc02 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Mar 4 13:43:02 2023 +0000
kernel: Do not depend on net-tools
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit b581cb223893165efa8a3e0bba5ab076c9b895f1 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Mar 4 13:42:09 2023 +0000
grub: Drop dependencies to all fonts and use Python 3
We no longer ship any fonts, but GRUB still depends on them.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 92492e8dc8fa16d69102086127f84e695eb8a1c8 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Mar 4 13:41:45 2023 +0000
hyperscan: Fix resetting LTO flags
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit e2cff7fa0d27689b6a8b36bff69f80c67fbd3525 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Mar 4 13:41:19 2023 +0000
libmpc: Disable testsuite
The testsuite hangs for forever.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit ba5912cd1b57ba95d54386bcef02ce97f7b3c307 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Fri Mar 3 10:45:14 2023 +0000
tcl: Adopt makefile into new format
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 7bce9e6041b9529004b2746aa8ee3b87f6d96ebf Author: Stefan Schantl stefan.schantl@ipfire.org Date: Fri Mar 3 10:46:11 2023 +0000
compat-gmp: Update source URL
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 81a6680ed88e81525e8904b4262ec2db43277554 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Mar 4 13:14:51 2023 +0000
rrdtool: Do not depend on dejavu-fonts
I did not test if graphs can still be generated, but we do not have this package any more.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit bb97a2338a58b9c0ffbb5454f796ad84844efb49 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Fri Mar 3 11:03:23 2023 +0000
perl: Re-enable file provides
They are required by at least vim
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 931f85d65c36a2a547adfb456b65699999e65eab Author: Stefan Schantl stefan.schantl@ipfire.org Date: Fri Mar 3 11:00:26 2023 +0000
expect: Fix build on aarch64
Requires autotools to support this architecture.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 19e7240e65cf8d75cdc573af8c40e3ed8aa11f92 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Mar 4 12:52:27 2023 +0000
gcc: Create a linker script to ensure correct link against libgcc
On aarch64, GCC builds some emulated functions into the code which come from libgcc. To ensure that we dynamically link as much as possible, this script is required so that it will only fall back to pull functions from the static library if there is no other resort.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit b059a4e1560349e12b8f50c19133c2aa1354567d Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Mar 4 12:50:54 2023 +0000
gcc: Drop build dependency to autogen
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit b23cda09bed6f5547224ca08297da98165e7dfd5 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Mar 4 12:37:07 2023 +0000
gettext: Filter weird perl dependency.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit ecfbf11ab11fddf3f5c053d7c318600e5cefaa35 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Fri Mar 3 10:51:18 2023 +0000
kbd: Update to 2.5.1
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit b2acbbf9ff90b41a2abddd0b1082a5e0fbdc9acb Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Mar 4 12:50:02 2023 +0000
compat-gnutls: Fix build
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit e002fd196d31f125a155cabb99a96d871a86916e Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Mar 4 12:43:13 2023 +0000
gnutls: Build without net-tools
net-tools has been dropped
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 5fc37d861dc7eb57fc5fb596a24189f149f1acd9 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Mar 4 12:34:17 2023 +0000
perl-XML-NamespaceSupport: Fix build requirements
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 6876e5d8c274243016f2d27a595628803cb96266 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Mar 4 12:27:19 2023 +0000
curl: Do not depend on net-tools
This package has been dropped
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: ImageMagick/ImageMagick.nm | 3 +- compat-gmp/compat-gmp.nm | 4 +- compat-gnutls/compat-gnutls.nm | 5 +- curl/curl.nm | 3 +- expect/expect.nm | 9 +- gcc/gcc.nm | 10 +- gettext/gettext.nm | 10 +- gnutls/gnutls.nm | 3 +- grub/grub.nm | 13 +- hyperscan/hyperscan.nm | 8 +- kbd/kbd.nm | 27 +-- kbd/patches/kbd-1.15-defkeymap.patch | 12 - kbd/patches/kbd-1.15-keycodes-man.patch | 52 ----- kbd/patches/kbd-1.15-resizecon-x86_64.patch | 15 -- kbd/patches/kbd-1.15-unicode_start.patch | 21 -- kbd/patches/kbd-1.15.3-dumpkeys-man.patch | 18 -- kbd/patches/kbd-1.15.3-fix-es-translation.patch | 12 - kbd/patches/kbd-2.5.1-backspace-1.patch | 250 +++++++++++++++++++++ kbd/vlock.pamd | 3 + kernel/kernel.nm | 7 +- libmpc/libmpc.nm | 5 +- .../perl-XML-NamespaceSupport.nm | 4 +- perl/perl.nm | 75 +++---- rrdtool/rrdtool.nm | 4 +- tcl/tcl.nm | 15 +- 25 files changed, 358 insertions(+), 230 deletions(-) delete mode 100644 kbd/patches/kbd-1.15-defkeymap.patch delete mode 100644 kbd/patches/kbd-1.15-keycodes-man.patch delete mode 100644 kbd/patches/kbd-1.15-resizecon-x86_64.patch delete mode 100644 kbd/patches/kbd-1.15-unicode_start.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-2.5.1-backspace-1.patch create mode 100644 kbd/vlock.pamd
Difference in files: diff --git a/ImageMagick/ImageMagick.nm b/ImageMagick/ImageMagick.nm index f240d11a7..a845e619c 100644 --- a/ImageMagick/ImageMagick.nm +++ b/ImageMagick/ImageMagick.nm @@ -6,7 +6,7 @@ name = ImageMagick version = 7.1.0 patchlevel = 56 -release = 1 +release = 1.1
groups = Application/Multimedia url = https://www.imagemagick.org/ @@ -45,6 +45,7 @@ build configure_options += \ --enable-shared \ --disable-static \ + --disable-docs \ --with-threads \ --with-bzlib=yes \ --with-fontconfig=yes \ diff --git a/compat-gmp/compat-gmp.nm b/compat-gmp/compat-gmp.nm index fc1d9184f..60168433a 100644 --- a/compat-gmp/compat-gmp.nm +++ b/compat-gmp/compat-gmp.nm @@ -5,7 +5,7 @@
name = compat-gmp version = 4.3.2 -release = 1 +release = 1.1 thisapp = gmp-%{version}
groups = System/Libraries @@ -23,7 +23,7 @@ description emphasizes speed over simplicity/elegance in its operations. end
-source_dl += https://gmplib.org/download/gmp/ ftp://ftp.gnu.org/gnu/gmp/ +source_dl += https://gmplib.org/download/gmp/archive/ ftp://ftp.gnu.org/gnu/gmp/ sources = %{thisapp}.tar.xz
build diff --git a/compat-gnutls/compat-gnutls.nm b/compat-gnutls/compat-gnutls.nm index 9711d5034..3ae618164 100644 --- a/compat-gnutls/compat-gnutls.nm +++ b/compat-gnutls/compat-gnutls.nm @@ -7,7 +7,7 @@ name = compat-gnutls version = %{ver_maj}.%{ver_min} ver_maj = 3.3 ver_min = 25 -release = 3 +release = 3.1 thisapp = gnutls-%{version}
groups = System/Libraries @@ -22,7 +22,7 @@ description TLS working group. end
-source_dl = ftp://ftp.gnutls.org/gcrypt/gnutls/v%{ver_maj}/ +source_dl = https://www.gnupg.org/ftp/gcrypt/gnutls/v%%7Bver_maj%7D/ sources = %{thisapp}.tar.xz
build @@ -32,7 +32,6 @@ build libidn-devel libtasn1-devel >= 3.2 lzo-devel - net-tools nettle-devel >= 3.2 perl p11-kit-devel >= 0.23.1 diff --git a/curl/curl.nm b/curl/curl.nm index c0e01165f..7d93a8c07 100644 --- a/curl/curl.nm +++ b/curl/curl.nm @@ -5,7 +5,7 @@
name = curl version = 7.86.0 -release = 2 +release = 2.1
groups = Application/Internet url = https://curl.haxx.se/ @@ -28,7 +28,6 @@ build libidn-devel libssh2-devel libtool-devel - net-tools nghttp2-devel openldap-devel openssl-devel diff --git a/expect/expect.nm b/expect/expect.nm index af7658c1d..6ed1625ef 100644 --- a/expect/expect.nm +++ b/expect/expect.nm @@ -5,7 +5,7 @@
name = expect version = 5.45.4 -release = 1 +release = 1.1 thisapp = %{name}%{version}
groups = Development/Languages @@ -24,7 +24,10 @@ source_dl = https://downloads.sourceforge.net/project/expect/Expect/%%7Bversion%7D/
build requires + autoconf + automake tcl-devel + gettext-devel end
configure_options += \ @@ -32,6 +35,10 @@ build --with-tclinclude=%{includedir} \ --enable-shared
+ prepare_cmds + autoreconf -vfi + end + test make test end diff --git a/gcc/gcc.nm b/gcc/gcc.nm index 4764ec0a5..84243e48e 100644 --- a/gcc/gcc.nm +++ b/gcc/gcc.nm @@ -8,7 +8,7 @@ build_graphite = 1
name = gcc version = 12.2.0 -release = 2.1 +release = 3
maintainer = Michael Tremer michael.tremer@ipfire.org groups = Development/Compilers @@ -29,7 +29,6 @@ sources = %{thisapp}.tar.gz
build requires - autogen binutils >= %{binutils_version} dejagnu elfutils-devel @@ -218,7 +217,12 @@ build
# Fix libgcc_s symlinks. rm -f ${FULLPATH}/libgcc_s.so %{BUILDROOT}%{libdir}/libgcc_s.so - ln -svf ../../../../..%{libdir}/libgcc_s.so.1 ${FULLPATH}/libgcc_s.so + echo '/* GNU ld script + Use the shared library, but some functions are only in + the static library, so try that secondarily. */ + + OUTPUT_FORMAT('`gcc -Wl,--print-output-format -nostdlib -r -o /dev/null`') + GROUP ( /%{libdir}/libgcc_s.so.1 libgcc.a )' > ${FULLPATH}/libgcc_s.so chmod 755 %{BUILDROOT}%{libdir}/libgcc_s.so.1
# Remove some GNU debugger stuff. diff --git a/gettext/gettext.nm b/gettext/gettext.nm index 1fcb77e6d..264eb2db0 100644 --- a/gettext/gettext.nm +++ b/gettext/gettext.nm @@ -5,7 +5,7 @@
name = gettext version = 0.21.1 -release = 2 +release = 2.1
groups = System/Base url = https://www.gnu.org/software/gettext/ @@ -67,6 +67,8 @@ packages bundled(gnulib) bundled(libcroco) = 0.6.12 end + + filter_requires = (Shell) end
package %{name}-common-devel @@ -77,6 +79,8 @@ packages files /usr/share/gettext/ end + + filter_requires = (Shell) end
package %{name}-devel @@ -88,6 +92,8 @@ packages git end
+ filter_requires = (Shell) + files += \ /usr/bin/autopoint \ /usr/share/man/man1/autopoint.1 @@ -96,6 +102,8 @@ packages package %{name}-libs template LIBS
+ filter_requires = (Shell) + files %{libdir}/libgettextlib-*.so %{libdir}/libgettextpo.so.* diff --git a/gnutls/gnutls.nm b/gnutls/gnutls.nm index 753f632f9..880a356f9 100644 --- a/gnutls/gnutls.nm +++ b/gnutls/gnutls.nm @@ -7,7 +7,7 @@ name = gnutls version = %{ver_maj}.%{ver_min} ver_maj = 3.7 ver_min = 8 -release = 2 +release = 2.1
groups = System/Libraries url = https://gnutls.org/ @@ -32,7 +32,6 @@ build libtasn1-devel >= 4.9 libunistring-devel lzo-devel - net-tools nettle-devel >= 3.4.1 perl p11-kit-devel >= 0.23.1 diff --git a/grub/grub.nm b/grub/grub.nm index a5deb8e31..e5ad722d0 100644 --- a/grub/grub.nm +++ b/grub/grub.nm @@ -5,7 +5,7 @@
name = grub version = 2.06 -release = 1 +release = 1.1
sup_arches = aarch64 x86_64 thisapp = %{name}-%{version} @@ -25,26 +25,20 @@ end source_dl = https://ftp.gnu.org/gnu/grub/ sources = %{thisapp}.tar.xz
-# Unifont -unifont = /usr/share/X11/fonts/misc/unifont.pcf.gz - build requires autoconf - autogen automake bison bzip2-devel - debugedit >= 5.3.5-2 - dejavu-fonts-sans-fonts flex freetype-devel gettext gettext-devel libdevmapper-devel ncurses-devel + python3 zlib-devel - %{unifont} end
# Don't leak our CFLAGS to boot code @@ -58,8 +52,7 @@ build end
prepare_cmds - cp -vf %{unifont} unifont.pcf.gz - ./autogen.sh + PYTHON=%{python3} ./autogen.sh
for platform in %{platforms}; do cp -r %{DIR_APP} %{DIR_APP}-${platform} diff --git a/hyperscan/hyperscan.nm b/hyperscan/hyperscan.nm index 91a7d665d..a0a437e65 100644 --- a/hyperscan/hyperscan.nm +++ b/hyperscan/hyperscan.nm @@ -5,7 +5,7 @@
name = hyperscan version = 5.4.0 -release = 1 +release = 1.1
# This won't build on any architectures but those sup_arches = x86_64 @@ -28,9 +28,6 @@ end
source_dl = https://github.com/intel/hyperscan/archive/v%%7Bversion%7D.tar.gz#/
-# Disable LTO -LTO_CFLAGS = - build requires boost-devel >= 1.57 @@ -41,6 +38,9 @@ build sqlite-devel end
+ # Disable LTO + LTO_CFLAGS = + build %{cmake} . \ -DBUILD_SHARED_LIBS:BOOL=ON \ diff --git a/kbd/kbd.nm b/kbd/kbd.nm index fbc57c7e6..4625a1c65 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 = http://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 = -sources += kbd-latarcyrheb-16-fixed.tar.bz2 -sources += kbd-latsun-fonts.tar.bz2 +source_dl = https://github.com/legionus/kbd/archive/refs/tags/v%%7Bversion%7D.tar.gz/# +sources = %{thisapp}.tar.gz
build requires + autoconf + automake bison flex - gettext + gettext-devel + pam-devel end
configure_options += \ @@ -35,15 +37,8 @@ build --enable-nls
prepare_cmds - # Adding our own fonts. - cd %{DIR_APP} - %{MACRO_EXTRACT} %{DIR_DL}/kbd-latarcyrheb-16-fixed.tar.bz2 - %{MACRO_EXTRACT} %{DIR_DL}/kbd-latsun-fonts.tar.bz2 - # 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 +46,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 @@ -60,6 +54,9 @@ build # remove obsolete "gr" translation cd %{DIR_APP}/po rm -f gr.po gr.gmo + + # Run autogen + cd %{DIR_APP} && ./autogen.sh end end
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 deleted file mode 100644 index d18a8c8b5..000000000 --- a/kbd/patches/kbd-1.15-keycodes-man.patch +++ /dev/null @@ -1,52 +0,0 @@ -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 - 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. -+ -+.SH NOTES -+The raw scan codes are available only on AT and PS/2 keyboards, -+and even then they are disabled unless the -+.B atkbd.softraw=0 -+kernel parameter is used. -+When the raw scan codes are not available, the kernel uses a fixed built-in -+table to produce scan codes from keycodes. Thus, -+.BR setkeycodes (8) -+can affect the output of -+.B showkey -+in scan code dump mode. -+ - .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. - -+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. - .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. -+ -+.B setkeycodes -+affects only the "first" input device -+that has modifiable scancode-to-keycode mapping. -+If there is more than one such device, -+.B setkeycodes -+cannot change the mapping of other devices than the "first" one. -+ - .SH "SEE ALSO" - .I "dumpkeys (1), loadkeys (1), showkey (1), getkeycodes (8)" - 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 deleted file mode 100644 index 41827ccd4..000000000 --- a/kbd/patches/kbd-1.15-unicode_start.patch +++ /dev/null @@ -1,21 +0,0 @@ -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 -@@ -72,6 +72,9 @@ 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 -+# Also drdos8x16 is a good candidate. -+ - case "$#" in - 2) - setfont "$1" -u "$2" -@@ -80,6 +83,7 @@ case "$#" in - setfont "$1" - ;; - 0) -+ setfont $DEFAULT_UNICODE_FONT - ;; - *) - echo "usage: unicode_start [font [unicode map]]" 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-2.5.1-backspace-1.patch b/kbd/patches/kbd-2.5.1-backspace-1.patch new file mode 100644 index 000000000..8fec17180 --- /dev/null +++ b/kbd/patches/kbd-2.5.1-backspace-1.patch @@ -0,0 +1,250 @@ +Submitted By: Matt Burgess +Date: 2008-12-06 +Initial Package Version: 1.15 +Upstream Status: Not submitted, possibly incomplete +Description: Makes Backspace and Delete keys consistent in all i386 keymaps. +Makes the Backspace key send character code 127, and Delete send a well known +escape sequence. Obsoletes the /etc/kbd/bs-sends-del file for i386. + +Original patch for 1.12 by Alexander Patrakov. +Updated for 1.13 (drop ru.map, the change is upstream, and add ru_win.map, +ru-cp1251.map) by Ken Moffat <ken at linuxfromscratch dot org>. +Re-diffed against 1.15 by Matt Burgess <matthew at linuxfromscratch.org>. + +diff -Naur kbd-1.15.orig/data/keymaps/i386/dvorak/dvorak-l.map kbd-1.15/data/keymaps/i386/dvorak/dvorak-l.map +--- kbd-1.15.orig/data/keymaps/i386/dvorak/dvorak-l.map 2008-06-20 12:36:01.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/dvorak/dvorak-l.map 2008-12-03 22:27:55.000000000 +0000 +@@ -43,7 +43,7 @@ + keycode 11 = three numbersign + keycode 12 = two at + keycode 13 = one exclam +- keycode 14 = BackSpace Delete ++ keycode 14 = Delete Delete + ! -------------------------------------------------------------------------- + ! Row 3 + ! -------------------------------------------------------------------------- +diff -Naur kbd-1.15.orig/data/keymaps/i386/dvorak/dvorak-r.map kbd-1.15/data/keymaps/i386/dvorak/dvorak-r.map +--- kbd-1.15.orig/data/keymaps/i386/dvorak/dvorak-r.map 2008-06-20 12:36:01.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/dvorak/dvorak-r.map 2008-12-03 22:28:13.000000000 +0000 +@@ -43,7 +43,7 @@ + keycode 11 = slash question + keycode 12 = bracketleft braceleft + keycode 13 = bracketright braceright +- keycode 14 = BackSpace Delete ++ keycode 14 = Delete Delete + ! -------------------------------------------------------------------------- + ! Row 3 + ! -------------------------------------------------------------------------- +diff -Naur kbd-1.15.orig/data/keymaps/i386/fgGIod/tr_f-latin5.map kbd-1.15/data/keymaps/i386/fgGIod/tr_f-latin5.map +--- kbd-1.15.orig/data/keymaps/i386/fgGIod/tr_f-latin5.map 2008-10-23 20:03:58.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/fgGIod/tr_f-latin5.map 2008-12-03 22:40:32.000000000 +0000 +@@ -51,7 +51,7 @@ + alt keycode 12 = Meta_minus + keycode 13 = minus underscore + alt keycode 13 = Meta_equal +-keycode 14 = BackSpace Delete ++keycode 14 = Delete Delete + alt keycode 14 = Meta_Delete + keycode 15 = Tab Meta_Tab + alt keycode 15 = Meta_Tab +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/lt.l4.map kbd-1.15/data/keymaps/i386/qwerty/lt.l4.map +--- kbd-1.15.orig/data/keymaps/i386/qwerty/lt.l4.map 2008-10-23 20:03:59.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/qwerty/lt.l4.map 2008-12-03 22:42:14.000000000 +0000 +@@ -205,7 +205,7 @@ + # edit this if you want the key above <Enter> to delete symbols above + # cursor, not before. + keycode 14 = \ +- BackSpace BackSpace BackSpace BackSpace \ ++ Delete Delete Delete Delete \ + Delete Delete Delete Delete \ + Meta_BackSpace Meta_BackSpace Meta_BackSpace Meta_BackSpace \ + Meta_Delete Meta_Delete Meta_Delete Meta_Delete +@@ -506,7 +506,7 @@ + + # Edit this if you want strict VT100 emulation. + string F111 = "\033[3$" +-keycode 111 = Delete F111 Delete F111 \ ++keycode 111 = Remove F111 Remove F111 \ + Remove Remove Remove Remove \ + Meta_Delete Meta_Delete Meta_Delete Meta_Delete \ + Boot Boot Boot Boot +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/lt.map kbd-1.15/data/keymaps/i386/qwerty/lt.map +--- kbd-1.15.orig/data/keymaps/i386/qwerty/lt.map 2008-10-23 20:03:59.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/qwerty/lt.map 2008-12-03 22:42:58.000000000 +0000 +@@ -204,7 +204,7 @@ + # edit this if you want the key above <Enter> to delete symbols above + # cursor, not before. + keycode 14 = \ +- BackSpace BackSpace BackSpace BackSpace \ ++ Delete Delete Delete Delete \ + Delete Delete Delete Delete \ + Meta_BackSpace Meta_BackSpace Meta_BackSpace Meta_BackSpace \ + Meta_Delete Meta_Delete Meta_Delete Meta_Delete +@@ -505,7 +505,7 @@ + + # Edit this if you want strict VT100 emulation. + string F111 = "\033[3$" +-keycode 111 = Delete F111 Delete F111 \ ++keycode 111 = Remove F111 Remove F111 \ + Remove Remove Remove Remove \ + Meta_Delete Meta_Delete Meta_Delete Meta_Delete \ + Boot Boot Boot Boot +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/no-latin1.map kbd-1.15/data/keymaps/i386/qwerty/no-latin1.map +--- kbd-1.15.orig/data/keymaps/i386/qwerty/no-latin1.map 2008-06-20 12:36:00.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/qwerty/no-latin1.map 2008-12-03 22:44:25.000000000 +0000 +@@ -3,7 +3,7 @@ + # Send comments to Kjetil T. Homme kjetilho@ifi.uio.no + include "linux-with-alt-and-altgr" + plain keycode 83 = KP_Comma +- plain keycode 111 = Delete # "Remove" originally, weird... ++ plain keycode 111 = Remove + strings as usual + + keycode 1 = Escape +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru1.map kbd-1.15/data/keymaps/i386/qwerty/ru1.map +--- kbd-1.15.orig/data/keymaps/i386/qwerty/ru1.map 2008-10-23 20:03:59.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/qwerty/ru1.map 2008-12-03 22:45:32.000000000 +0000 +@@ -143,8 +143,8 @@ + + # The keycode "0xFF" is too dangerous for many programs (including emacs). + # So let it be bracket instead of Hard Sign. +-# altgr keycode 27 = +0xDF +-# altgr shift keycode 27 = +0xFF ++altgr keycode 27 = +0xDF ++altgr shift keycode 27 = +0xFF + control keycode 27 = Control_bracketright + altgr control keycode 27 = Control_bracketright + alt keycode 27 = Meta_bracketright +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru2.map kbd-1.15/data/keymaps/i386/qwerty/ru2.map +--- kbd-1.15.orig/data/keymaps/i386/qwerty/ru2.map 2008-10-23 20:03:59.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/qwerty/ru2.map 2008-12-03 22:46:15.000000000 +0000 +@@ -46,7 +46,7 @@ + alt keycode 12 = Meta_minus + keycode 13 = equal plus equal plus + alt keycode 13 = Meta_equal +- keycode 14 = BackSpace BackSpace BackSpace BackSpace ++ keycode 14 = Delete Delete Delete Delete + alt keycode 14 = Meta_Delete + keycode 15 = Tab Tab Tab Tab + alt keycode 15 = Meta_Tab +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru-cp1251.map kbd-1.15/data/keymaps/i386/qwerty/ru-cp1251.map +--- kbd-1.15.orig/data/keymaps/i386/qwerty/ru-cp1251.map 2008-10-23 20:03:59.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/qwerty/ru-cp1251.map 2008-12-03 22:47:12.000000000 +0000 +@@ -39,7 +39,7 @@ + alt keycode 12 = Meta_minus + keycode 13 = equal plus equal plus + alt keycode 13 = Meta_equal +- keycode 14 = BackSpace ++ keycode 14 = Delete + alt keycode 14 = Meta_Delete + keycode 15 = Tab + alt keycode 15 = Meta_Tab +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru-ms.map kbd-1.15/data/keymaps/i386/qwerty/ru-ms.map +--- kbd-1.15.orig/data/keymaps/i386/qwerty/ru-ms.map 2008-10-23 20:03:59.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/qwerty/ru-ms.map 2008-12-03 22:48:10.000000000 +0000 +@@ -89,8 +89,8 @@ + altgr alt keycode 13 = Meta_equal + shift alt keycode 13 = Meta_plus + altgr shift alt keycode 13 = Meta_plus +- keycode 14 = BackSpace BackSpace BackSpace BackSpace +-# keycode 14 = Delete Delete Delete Delete ++# keycode 14 = BackSpace BackSpace BackSpace BackSpace ++ keycode 14 = Delete Delete Delete Delete + alt keycode 14 = Meta_Delete + altgr alt keycode 14 = Meta_Delete + keycode 15 = Tab Tab Tab Tab +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru_win.map kbd-1.15/data/keymaps/i386/qwerty/ru_win.map +--- kbd-1.15.orig/data/keymaps/i386/qwerty/ru_win.map 2008-10-23 20:03:59.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/qwerty/ru_win.map 2008-12-03 22:49:17.000000000 +0000 +@@ -42,7 +42,7 @@ + alt keycode 12 = Meta_minus + keycode 13 = equal plus equal plus + alt keycode 13 = Meta_equal +- keycode 14 = BackSpace BackSpace BackSpace BackSpace ++ keycode 14 = Delete Delete Delete Delete + alt keycode 14 = Meta_Delete + keycode 15 = Tab Tab Tab Tab + alt keycode 15 = Meta_Tab +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/se-ir209.map kbd-1.15/data/keymaps/i386/qwerty/se-ir209.map +--- kbd-1.15.orig/data/keymaps/i386/qwerty/se-ir209.map 2008-10-23 20:03:59.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/qwerty/se-ir209.map 2008-12-03 22:50:18.000000000 +0000 +@@ -345,7 +345,7 @@ + keycode 109 = Next Scroll_Forward + keycode 110 = Insert + +- keycode 111 = Delete # "Remove" originally, weird... ++ keycode 111 = Remove + control alt keycode 111 = Boot + control altgr keycode 111 = Boot + +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/se-lat6.map kbd-1.15/data/keymaps/i386/qwerty/se-lat6.map +--- kbd-1.15.orig/data/keymaps/i386/qwerty/se-lat6.map 2008-10-23 20:03:59.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/qwerty/se-lat6.map 2008-12-03 22:50:44.000000000 +0000 +@@ -374,6 +374,6 @@ + keycode 109 = Next Scroll_Forward + keycode 110 = Insert + +- keycode 111 = Delete # "Remove" originally, weird... ++ keycode 111 = Remove + control alt keycode 111 = Boot + control altgr keycode 111 = Boot +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/tr_q-latin5.map kbd-1.15/data/keymaps/i386/qwerty/tr_q-latin5.map +--- kbd-1.15.orig/data/keymaps/i386/qwerty/tr_q-latin5.map 2008-10-23 20:03:59.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/qwerty/tr_q-latin5.map 2008-12-03 22:52:09.000000000 +0000 +@@ -49,7 +49,7 @@ + alt keycode 12 = Meta_minus + keycode 13 = minus underscore + alt keycode 13 = Meta_equal +-keycode 14 = BackSpace Delete ++keycode 14 = Delete Delete + alt keycode 14 = Meta_Delete + keycode 15 = Tab Meta_Tab + alt keycode 15 = Meta_Tab +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua.map kbd-1.15/data/keymaps/i386/qwerty/ua.map +--- kbd-1.15.orig/data/keymaps/i386/qwerty/ua.map 2008-10-23 20:03:59.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/qwerty/ua.map 2008-12-03 22:52:52.000000000 +0000 +@@ -249,7 +249,7 @@ + shift ctrll ctrlr keycode 13 = plus + alt ctrll ctrlr keycode 13 = Meta_equal + shift alt ctrll ctrlr keycode 13 = Meta_plus +-keycode 14 = BackSpace Delete ++keycode 14 = Delete Delete + control keycode 14 = BackSpace + alt keycode 14 = Meta_Delete + ctrlr keycode 14 = BackSpace +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua-utf.map kbd-1.15/data/keymaps/i386/qwerty/ua-utf.map +--- kbd-1.15.orig/data/keymaps/i386/qwerty/ua-utf.map 2008-10-23 20:03:59.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/qwerty/ua-utf.map 2008-12-03 22:53:36.000000000 +0000 +@@ -250,7 +250,7 @@ + shift ctrll ctrlr keycode 13 = plus + alt ctrll ctrlr keycode 13 = Meta_equal + shift alt ctrll ctrlr keycode 13 = Meta_plus +-keycode 14 = BackSpace Delete ++keycode 14 = Delete Delete + control keycode 14 = BackSpace + alt keycode 14 = Meta_Delete + ctrlr keycode 14 = BackSpace +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua-utf-ws.map kbd-1.15/data/keymaps/i386/qwerty/ua-utf-ws.map +--- kbd-1.15.orig/data/keymaps/i386/qwerty/ua-utf-ws.map 2008-10-23 20:03:59.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/qwerty/ua-utf-ws.map 2008-12-03 22:54:06.000000000 +0000 +@@ -260,7 +260,7 @@ + shift ctrll ctrlr keycode 13 = plus + alt ctrll ctrlr keycode 13 = Meta_equal + shift alt ctrll ctrlr keycode 13 = Meta_plus +-keycode 14 = BackSpace Delete ++keycode 14 = Delete Delete + control keycode 14 = BackSpace + alt keycode 14 = Meta_Delete + ctrlr keycode 14 = BackSpace +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua-ws.map kbd-1.15/data/keymaps/i386/qwerty/ua-ws.map +--- kbd-1.15.orig/data/keymaps/i386/qwerty/ua-ws.map 2008-10-23 20:03:59.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/qwerty/ua-ws.map 2008-12-03 22:54:23.000000000 +0000 +@@ -260,7 +260,7 @@ + shift ctrll ctrlr keycode 13 = plus + alt ctrll ctrlr keycode 13 = Meta_equal + shift alt ctrll ctrlr keycode 13 = Meta_plus +-keycode 14 = BackSpace Delete ++keycode 14 = Delete Delete + control keycode 14 = BackSpace + alt keycode 14 = Meta_Delete + ctrlr keycode 14 = BackSpace diff --git a/kbd/vlock.pamd b/kbd/vlock.pamd new file mode 100644 index 000000000..d2d47e5b2 --- /dev/null +++ b/kbd/vlock.pamd @@ -0,0 +1,3 @@ +#%PAM-1.0 +auth include system-auth +account required pam_permit.so diff --git a/kernel/kernel.nm b/kernel/kernel.nm index 4d90512e2..62c23132b 100644 --- a/kernel/kernel.nm +++ b/kernel/kernel.nm @@ -5,7 +5,7 @@
name = kernel version = 6.2 -release = 1 +release = 1.2 thisapp = linux-%{version}
maintainer = Arne Fitzenreiter arne.fitzenreiter@ipfire.org @@ -43,7 +43,6 @@ build hostname libunwind-devel ncurses-devel - net-tools newt-devel openssl /usr/bin/openssl @@ -290,8 +289,10 @@ packages dracut kernel-updater linux-firmware - intel-microcode wireless-regdb + + # Install intel-microcode only on x86_64 + (intel-microcode if arch(x86_64)) end
files diff --git a/libmpc/libmpc.nm b/libmpc/libmpc.nm index fb6aacc44..a9bf379ad 100644 --- a/libmpc/libmpc.nm +++ b/libmpc/libmpc.nm @@ -5,7 +5,7 @@
name = libmpc version = 1.3.1 -release = 1.1 +release = 1.2 thisapp = mpc-%{version}
groups = System/Libraries @@ -32,7 +32,8 @@ build --disable-static
test - make check LD_LIBRARY_PATH="${DIR_APP}/src/.libs" + # This testsuite runs forever on x86_64 + : # make check LD_LIBRARY_PATH="${DIR_APP}/src/.libs" end end
diff --git a/perl-XML-NamespaceSupport/perl-XML-NamespaceSupport.nm b/perl-XML-NamespaceSupport/perl-XML-NamespaceSupport.nm index fd4e8edda..9010e505b 100644 --- a/perl-XML-NamespaceSupport/perl-XML-NamespaceSupport.nm +++ b/perl-XML-NamespaceSupport/perl-XML-NamespaceSupport.nm @@ -5,7 +5,7 @@
name = perl-XML-NamespaceSupport version = 1.11 -release = 1 +release = 1.1 arch = noarch
thisapp = XML-NamespaceSupport-%{version} @@ -28,6 +28,8 @@ build perl(constant) perl(Cwd) perl(ExtUtils::MakeMaker) >= 6.42 + perl(FindBin) + perl(Module::Install) perl(File::Path) perl(Test::More) >= 0.47 end diff --git a/perl/perl.nm b/perl/perl.nm index 949dc9b31..18c4c65a2 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 = 2 +release = 2.1
thisver = %{version}-%{_release}
@@ -179,43 +179,42 @@ packages perl(:WITH_PERLIO)
# File provides - #perl(abbrev.pl) - #perl(assert.pl) - #perl(bigfloat.pl) - #perl(bigint.pl) - #perl(bigrat.pl) - #perl(bytes_heavy.pl) - #perl(cacheout.pl) - #perl(complete.pl) - #perl(ctime.pl) - #perl(dotsh.pl) - #perl(dumpvar.pl) - #perl(exceptions.pl) - #perl(fastcwd.pl) - #perl(find.pl) - #perl(finddepth.pl) - #perl(flush.pl) - #perl(ftp.pl) - #perl(getcwd.pl) - #perl(getopt.pl) - #perl(getopts.pl) - #perl(hostname.pl) - #perl(importenv.pl) - #perl(look.pl) - #perl(newgetopt.pl) - #perl(open2.pl) - #perl(open3.pl) - #perl(perl5db.pl) - #perl(pwd.pl) - #perl(shellwords.pl) - #perl(stat.pl) - #perl(syslog.pl) - #perl(tainted.pl) - #perl(termcap.pl) - #perl(timelocal.pl) - #perl(utf8_heavy.pl) - #perl(validate.pl) - #perl(strict) + perl(abbrev.pl) + perl(assert.pl) + perl(bigfloat.pl) + perl(bigint.pl) + perl(bigrat.pl) + perl(bytes_heavy.pl) + perl(cacheout.pl) + perl(complete.pl) + perl(ctime.pl) + perl(dotsh.pl) + perl(dumpvar.pl) + perl(exceptions.pl) + perl(fastcwd.pl) + perl(find.pl) + perl(finddepth.pl) + perl(flush.pl) + perl(ftp.pl) + perl(getcwd.pl) + perl(getopt.pl) + perl(getopts.pl) + perl(hostname.pl) + perl(importenv.pl) + perl(look.pl) + perl(newgetopt.pl) + perl(open2.pl) + perl(open3.pl) + perl(perl5db.pl) + perl(pwd.pl) + perl(shellwords.pl) + perl(stat.pl) + perl(syslog.pl) + perl(tainted.pl) + perl(termcap.pl) + perl(timelocal.pl) + perl(utf8_heavy.pl) + perl(validate.pl) end end
diff --git a/rrdtool/rrdtool.nm b/rrdtool/rrdtool.nm index c9fa29602..6842ba491 100644 --- a/rrdtool/rrdtool.nm +++ b/rrdtool/rrdtool.nm @@ -5,7 +5,7 @@
name = rrdtool version = 1.8.0 -release = 1 +release = 1.1
groups = Applications/Databases url = https://oss.oetiker.ch/rrdtool/ @@ -72,8 +72,6 @@ packages
package %{name}-libs template LIBS - - requires += dejavu-fonts-sans-mono-fonts end
package python3-%{name} diff --git a/tcl/tcl.nm b/tcl/tcl.nm index 4adf47524..d0160cad0 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 +release = 1.1 thisapp = tcl%{version}
groups = Development/Languages @@ -31,6 +31,8 @@ build zlib-devel end
+ DIR_APP = %{DIR_SRC}/%{thisapp}/unix + # tcl fails to detect that it needs to link agains libm LDFLAGS += -lm
@@ -43,15 +45,10 @@ build --enable-threads \ --enable-64bit
- build - cd unix && %{configure} - - make %{PARALLELISMFLAGS} - end - - install - cd unix && make install install-private-headers INSTALL_ROOT=%{BUILDROOT} + make_install_targets += \ + install-private-headers INSTALL_ROOT=%{BUILDROOT}
+ install_cmds ln -svf tclsh%{major_ver} %{BUILDROOT}/usr/bin/tclsh
# for linking with -lib%{name}
hooks/post-receive -- IPFire 3.x development tree
-
Michael Tremer