[git.ipfire.org] IPFire 3.x development tree branch, master, updated. d51e3b59e2b0849a5144c6aa54aa7ccb93f532f8
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 d51e3b59e2b0849a5144c6aa54aa7ccb93f532f8 (commit) via 6e314797751f5e5ab0e5729dae56b25a131627ac (commit) via afcf86248de5e2dd4d9546b6a95d46b0b2a18daa (commit) via b91f2873fdf2f30a07e1882791951dd0b143f99c (commit) via 4b41c86cdf3680c37d8fee256d5c745a63e15bf8 (commit) via ee425925a4c7ba09b893222213cc666accdd14bf (commit) via e57de6746fdf09c8aabb5f1af664a739ce7daf9b (commit) via 64a8a1643ac84c28a910c372a8662f6c9d674f2f (commit) via f960e8728e8aec3f4510635c8a20115200ca2e3f (commit) via d8d7d10289493a750931f7bdd4a7d1e95020f799 (commit) from 2d7a96b46f6db8991da4180836f4eb59c49a6d10 (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 d51e3b59e2b0849a5144c6aa54aa7ccb93f532f8 Author: Peter Müller peter.mueller@ipfire.org Date: Mon Nov 28 18:13:52 2022 +0100
usbutils: Update to 014
Signed-off-by: Peter Müller peter.mueller@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 6e314797751f5e5ab0e5729dae56b25a131627ac Author: Peter Müller peter.mueller@ipfire.org Date: Mon Nov 28 18:17:03 2022 +0100
dmidecode: Update to 3.3
Signed-off-by: Peter Müller peter.mueller@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit afcf86248de5e2dd4d9546b6a95d46b0b2a18daa Author: Peter Müller peter.mueller@ipfire.org Date: Tue Nov 29 10:32:48 2022 +0100
wget: Update to 1.21.3
Signed-off-by: Peter Müller peter.mueller@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit b91f2873fdf2f30a07e1882791951dd0b143f99c Author: Peter Müller peter.mueller@ipfire.org Date: Tue Nov 29 10:08:15 2022 +0100
bird: Update to 2.0.10
Signed-off-by: Peter Müller peter.mueller@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 4b41c86cdf3680c37d8fee256d5c745a63e15bf8 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Nov 29 09:41:56 2022 +0000
bison: Update to 3.8.2
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit ee425925a4c7ba09b893222213cc666accdd14bf Author: Peter Müller peter.mueller@ipfire.org Date: Tue Nov 29 09:55:54 2022 +0100
grub: Update to 2.06
Signed-off-by: Peter Müller peter.mueller@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit e57de6746fdf09c8aabb5f1af664a739ce7daf9b Author: Peter Müller peter.mueller@ipfire.org Date: Mon Nov 28 19:54:04 2022 +0100
util-linux: Update to 2.38.1
It is to be noted that setting file capabilities, which is required for some of these provided by util-linux, is currently broken due to bug #13010.
Cc: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit 64a8a1643ac84c28a910c372a8662f6c9d674f2f Author: Peter Müller peter.mueller@ipfire.org Date: Mon Nov 28 19:53:35 2022 +0100
automake: Update to 1.16.5
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit f960e8728e8aec3f4510635c8a20115200ca2e3f Author: Peter Müller peter.mueller@ipfire.org Date: Mon Nov 28 20:09:21 2022 +0100
autoconf: Update to 2.71
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit d8d7d10289493a750931f7bdd4a7d1e95020f799 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Nov 28 15:40:37 2022 +0000
kernel: Enable support for btrfs
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: autoconf/autoconf.nm | 8 +- automake/automake.nm | 6 +- bird/bird.nm | 6 +- bison/bison.nm | 4 +- dmidecode/dmidecode.nm | 2 +- .../dmidecode-3.3-fix_crash_with_u_option.patch | 34 +++++ ...3-fix_the_condition_error_in_ascii_filter.patch | 30 ++++ grub/grub.nm | 13 +- grub/patches/grub-2.02-X86_64_PLT32.patch | 75 ---------- ....02-fix-packed-not-aligned-error-on-gcc-8.patch | 72 ---------- ...-xfs-accept-filesystem-with-sparse-inodes.patch | 60 -------- grub/patches/grub-2.02_disable_vga_fallback.patch | 15 -- kernel/config-generic | 2 +- kernel/kernel.nm | 159 +++++---------------- kernel/scripts/configure | 0 usbutils/patches/usbutils-003-hwdata.patch | 79 ---------- usbutils/patches/usbutils-make-hwdata.patch | 21 --- usbutils/usbutils.nm | 11 +- util-linux/nologin.8 | 63 -------- util-linux/nologin.c | 58 -------- util-linux/util-linux.nm | 28 ++-- wget/wget.nm | 4 +- 22 files changed, 133 insertions(+), 617 deletions(-) create mode 100644 dmidecode/patches/dmidecode-3.3-fix_crash_with_u_option.patch create mode 100644 dmidecode/patches/dmidecode-3.3-fix_the_condition_error_in_ascii_filter.patch delete mode 100644 grub/patches/grub-2.02-X86_64_PLT32.patch delete mode 100644 grub/patches/grub-2.02-fix-packed-not-aligned-error-on-gcc-8.patch delete mode 100644 grub/patches/grub-2.02-xfs-accept-filesystem-with-sparse-inodes.patch delete mode 100644 grub/patches/grub-2.02_disable_vga_fallback.patch mode change 100755 => 100644 kernel/scripts/configure delete mode 100644 usbutils/patches/usbutils-003-hwdata.patch delete mode 100644 usbutils/patches/usbutils-make-hwdata.patch delete mode 100644 util-linux/nologin.8 delete mode 100644 util-linux/nologin.c
Difference in files: diff --git a/autoconf/autoconf.nm b/autoconf/autoconf.nm index a411bf923..3acdc127e 100644 --- a/autoconf/autoconf.nm +++ b/autoconf/autoconf.nm @@ -4,12 +4,12 @@ ###############################################################################
name = autoconf -version = 2.69 -release = 2 +version = 2.71 +release = 1 arch = noarch
groups = Development/Tools -url = http://www.gnu.org/software/autoconf/ +url = https://www.gnu.org/software/autoconf/ license = GPLv2+ summary = A GNU tool for automatically configuring source code.
@@ -20,7 +20,7 @@ description specify various configuration options. end
-source_dl = http://ftp.gnu.org/gnu/autoconf/ +source_dl = https://ftp.gnu.org/gnu/autoconf/ sources = %{thisapp}.tar.xz
build diff --git a/automake/automake.nm b/automake/automake.nm index 21b24784d..96df054ef 100644 --- a/automake/automake.nm +++ b/automake/automake.nm @@ -4,12 +4,12 @@ ###############################################################################
name = automake -version = 1.16.1 +version = 1.16.5 release = 1 arch = noarch
groups = Development/Tools -url = http://www.gnu.org/software/automake/ +url = htts://www.gnu.org/software/automake/ license = GPLv2+ summary = A GNU tool for automatically configuring source code.
@@ -18,7 +18,7 @@ description files compliant with the GNU Coding Standards. end
-source_dl = http://ftp.gnu.org/gnu/automake/ +source_dl = https://ftp.gnu.org/gnu/automake/ sources = %{thisapp}.tar.xz
required_autoconf_version = 2.62 diff --git a/bird/bird.nm b/bird/bird.nm index c288bcefc..cee24efd5 100644 --- a/bird/bird.nm +++ b/bird/bird.nm @@ -4,11 +4,11 @@ ###############################################################################
name = bird -version = 2.0.2 +version = 2.0.10 release = 1
groups = Networking/Routing -url = http://bird.network.cz/ +url = https://bird.network.cz/ license = GPLv2+ summary = BIRD Internet Routing Daemon.
@@ -17,7 +17,7 @@ description protocols BGP, RIP and OSPF. end
-source_dl = ftp://bird.network.cz/pub/bird/ +source_dl = https://bird.network.cz/download/
build requires diff --git a/bison/bison.nm b/bison/bison.nm index cbbb0da69..96d0ed331 100644 --- a/bison/bison.nm +++ b/bison/bison.nm @@ -4,7 +4,7 @@ ###############################################################################
name = bison -version = 3.3.2 +version = 3.8.2 release = 1
groups = Development/Tools @@ -17,7 +17,7 @@ description context-free grammar into an LALR(1) or GLR parser for that grammar. end
-source_dl = http://ftp.gnu.org/gnu/bison/ +source_dl = https://ftp.gnu.org/gnu/bison/ sources = %{thisapp}.tar.xz
build diff --git a/dmidecode/dmidecode.nm b/dmidecode/dmidecode.nm index 27eee5d14..e4e37cbf5 100644 --- a/dmidecode/dmidecode.nm +++ b/dmidecode/dmidecode.nm @@ -4,7 +4,7 @@ ###############################################################################
name = dmidecode -version = 3.2 +version = 3.3 release = 1
groups = Applications/System diff --git a/dmidecode/patches/dmidecode-3.3-fix_crash_with_u_option.patch b/dmidecode/patches/dmidecode-3.3-fix_crash_with_u_option.patch new file mode 100644 index 000000000..497768add --- /dev/null +++ b/dmidecode/patches/dmidecode-3.3-fix_crash_with_u_option.patch @@ -0,0 +1,34 @@ +From 11e134e54d15e67a64c39a623f492a28df922517 Mon Sep 17 00:00:00 2001 +From: Jean Delvare jdelvare@suse.de +Date: Tue, 19 Jan 2021 16:26:01 +0100 +Subject: dmidecode: Fix crash with -u option + +A segmentation fault was reported with option -u. Turns out to be a +stupid thinko where the buffer offset was reset at the wrong loop +depth. + +Reported-by: Jerry Hoemann jerry.hoemann@hpe.com +Fixes: da06888d08b9 ("dmidecode: Use the print helpers in dump mode too") +Signed-off-by: Jean Delvare jdelvare@suse.de +--- + dmidecode.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dmidecode.c b/dmidecode.c +index 572cb1a..69ea0e8 100644 +--- a/dmidecode.c ++++ b/dmidecode.c +@@ -248,9 +248,9 @@ static void dmi_dump(const struct dmi_header *h) + { + int j, l = strlen(s) + 1; + +- off = 0; + for (row = 0; row < ((l - 1) >> 4) + 1; row++) + { ++ off = 0; + for (j = 0; j < 16 && j < l - (row << 4); j++) + off += sprintf(raw_data + off, + j ? " %02X" : "%02X", +-- +cgit v1.2.1 + diff --git a/dmidecode/patches/dmidecode-3.3-fix_the_condition_error_in_ascii_filter.patch b/dmidecode/patches/dmidecode-3.3-fix_the_condition_error_in_ascii_filter.patch new file mode 100644 index 000000000..e5f99b477 --- /dev/null +++ b/dmidecode/patches/dmidecode-3.3-fix_the_condition_error_in_ascii_filter.patch @@ -0,0 +1,30 @@ +From 1117390ccd9cea139638db6f460bb6de70e28f94 Mon Sep 17 00:00:00 2001 +From: Tianjia Zhang tianjia.zhang@linux.alibaba.com +Date: Tue, 5 Jan 2021 10:36:29 +0100 +Subject: dmidecode: Fix the condition error in ascii_filter + +The normal printable ASCII range is 32 to 127 (not included), +so fix the error in this if condition. + +Signed-off-by: Tianjia Zhang tianjia.zhang@linux.alibaba.com +Signed-off-by: Jean Delvare jdelvare@suse.de +--- + dmidecode.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dmidecode.c b/dmidecode.c +index 27d5494..864a193 100644 +--- a/dmidecode.c ++++ b/dmidecode.c +@@ -116,7 +116,7 @@ static void ascii_filter(char *bp, size_t len) + size_t i; + + for (i = 0; i < len; i++) +- if (bp[i] < 32 || bp[i] == 127) ++ if (bp[i] < 32 || bp[i] >= 127) + bp[i] = '.'; + } + +-- +cgit v1.2.1 + diff --git a/grub/grub.nm b/grub/grub.nm index c076c0116..aa95c7149 100644 --- a/grub/grub.nm +++ b/grub/grub.nm @@ -4,15 +4,15 @@ ###############################################################################
name = grub -version = 2.02 -release = 2 +version = 2.06 +release = 1
-sup_arches = aarch64 x86_64 i686 +sup_arches = aarch64 x86_64 thisapp = %{name}-%{version}
groups = System/Boot -url = http://www.gnu.org/software/grub/ -license = GPLv2+ +url = https://www.gnu.org/software/grub/ +license = GPLv3 summary = Grand Unified Boot Loader.
description @@ -22,7 +22,7 @@ description systems. end
-source_dl = http://ftp.gnu.org/gnu/grub/ ftp://alpha.gnu.org/gnu/grub/ +source_dl = https://ftp.gnu.org/gnu/grub/ sources = %{thisapp}.tar.xz
# Unifont @@ -40,6 +40,7 @@ build flex freetype-devel gettext + gettext-devel libdevmapper-devel ncurses-devel zlib-devel diff --git a/grub/patches/grub-2.02-X86_64_PLT32.patch b/grub/patches/grub-2.02-X86_64_PLT32.patch deleted file mode 100644 index 2c65cb78a..000000000 --- a/grub/patches/grub-2.02-X86_64_PLT32.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 02702bdfe14d8a04643a45b03715f734ae34dbac Mon Sep 17 00:00:00 2001 -From: "H.J. Lu" hjl.tools@gmail.com -Date: Sat, 17 Feb 2018 06:47:28 -0800 -Subject: x86-64: Treat R_X86_64_PLT32 as R_X86_64_PC32 - -Starting from binutils commit bd7ab16b4537788ad53521c45469a1bdae84ad4a: - -https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=bd7ab16b4537788ad5... - -x86-64 assembler generates R_X86_64_PLT32, instead of R_X86_64_PC32, for -32-bit PC-relative branches. Grub2 should treat R_X86_64_PLT32 as -R_X86_64_PC32. - -Signed-off-by: H.J. Lu hjl.tools@gmail.com -Reviewed-by: Daniel Kiper daniel.kiper@oracle.com - -Origin: upstream, https://git.savannah.gnu.org/cgit/grub.git/commit/?id=842c390469e2c2e10b5aa3... -Last-Update: 2018-07-30 - -Patch-Name: R_X86_64_PLT32.patch ---- - grub-core/efiemu/i386/loadcore64.c | 1 + - grub-core/kern/x86_64/dl.c | 1 + - util/grub-mkimagexx.c | 1 + - util/grub-module-verifier.c | 1 + - 4 files changed, 4 insertions(+) - -diff --git a/grub-core/efiemu/i386/loadcore64.c b/grub-core/efiemu/i386/loadcore64.c -index e49d0b6ff..18facf47f 100644 ---- a/grub-core/efiemu/i386/loadcore64.c -+++ b/grub-core/efiemu/i386/loadcore64.c -@@ -98,6 +98,7 @@ grub_arch_efiemu_relocate_symbols64 (grub_efiemu_segment_t segs, - break; - - case R_X86_64_PC32: -+ case R_X86_64_PLT32: - err = grub_efiemu_write_value (addr, - *addr32 + rel->r_addend - + sym.off -diff --git a/grub-core/kern/x86_64/dl.c b/grub-core/kern/x86_64/dl.c -index 440690673..3a73e6e6c 100644 ---- a/grub-core/kern/x86_64/dl.c -+++ b/grub-core/kern/x86_64/dl.c -@@ -70,6 +70,7 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr, - break; - - case R_X86_64_PC32: -+ case R_X86_64_PLT32: - { - grub_int64_t value; - value = ((grub_int32_t) *addr32) + rel->r_addend + sym->st_value - -diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c -index e63f148e4..f20255a28 100644 ---- a/util/grub-mkimagexx.c -+++ b/util/grub-mkimagexx.c -@@ -832,6 +832,7 @@ SUFFIX (relocate_addresses) (Elf_Ehdr *e, Elf_Shdr *sections, - break; - - case R_X86_64_PC32: -+ case R_X86_64_PLT32: - { - grub_uint32_t *t32 = (grub_uint32_t *) target; - *t32 = grub_host_to_target64 (grub_target_to_host32 (*t32) -diff --git a/util/grub-module-verifier.c b/util/grub-module-verifier.c -index 9179285a5..a79271f66 100644 ---- a/util/grub-module-verifier.c -+++ b/util/grub-module-verifier.c -@@ -19,6 +19,7 @@ struct grub_module_verifier_arch archs[] = { - -1 - }, (int[]){ - R_X86_64_PC32, -+ R_X86_64_PLT32, - -1 - } - }, diff --git a/grub/patches/grub-2.02-fix-packed-not-aligned-error-on-gcc-8.patch b/grub/patches/grub-2.02-fix-packed-not-aligned-error-on-gcc-8.patch deleted file mode 100644 index 51ee7dc86..000000000 --- a/grub/patches/grub-2.02-fix-packed-not-aligned-error-on-gcc-8.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 563b1da6e6ae7af46cc8354cadb5dab416989f0a Mon Sep 17 00:00:00 2001 -From: Michael Chang mchang@suse.com -Date: Mon, 26 Mar 2018 16:52:34 +0800 -Subject: Fix packed-not-aligned error on GCC 8 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -When building with GCC 8, there are several errors regarding packed-not-aligned. - -./include/grub/gpt_partition.h:79:1: error: alignment 1 of ‘struct grub_gpt_partentry’ is less than 8 [-Werror=packed-not-aligned] - -This patch fixes the build error by cleaning up the ambiguity of placing -aligned structure in a packed one. In "struct grub_btrfs_time" and "struct -grub_gpt_part_type", the aligned attribute seems to be superfluous, and also -has to be packed, to ensure the structure is bit-to-bit mapped to the format -laid on disk. I think we could blame to copy and paste error here for the -mistake. In "struct efi_variable", we have to use grub_efi_packed_guid_t, as -the name suggests. :) - -Signed-off-by: Michael Chang mchang@suse.com -Tested-by: Michael Chang mchang@suse.com -Tested-by: Paul Menzel paulepanter@users.sourceforge.net -Reviewed-by: Daniel Kiper daniel.kiper@oracle.com ---- - grub-core/fs/btrfs.c | 2 +- - include/grub/efiemu/runtime.h | 2 +- - include/grub/gpt_partition.h | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c -index 4849c1c..be19544 100644 ---- a/grub-core/fs/btrfs.c -+++ b/grub-core/fs/btrfs.c -@@ -175,7 +175,7 @@ struct grub_btrfs_time - { - grub_int64_t sec; - grub_uint32_t nanosec; --} __attribute__ ((aligned (4))); -+} GRUB_PACKED; - - struct grub_btrfs_inode - { -diff --git a/include/grub/efiemu/runtime.h b/include/grub/efiemu/runtime.h -index 9b6b729..36d2ded 100644 ---- a/include/grub/efiemu/runtime.h -+++ b/include/grub/efiemu/runtime.h -@@ -29,7 +29,7 @@ struct grub_efiemu_ptv_rel - - struct efi_variable - { -- grub_efi_guid_t guid; -+ grub_efi_packed_guid_t guid; - grub_uint32_t namelen; - grub_uint32_t size; - grub_efi_uint32_t attributes; -diff --git a/include/grub/gpt_partition.h b/include/grub/gpt_partition.h -index 1b32f67..9668a68 100644 ---- a/include/grub/gpt_partition.h -+++ b/include/grub/gpt_partition.h -@@ -28,7 +28,7 @@ struct grub_gpt_part_type - grub_uint16_t data2; - grub_uint16_t data3; - grub_uint8_t data4[8]; --} __attribute__ ((aligned(8))); -+} GRUB_PACKED; - typedef struct grub_gpt_part_type grub_gpt_part_type_t; - - #define GRUB_GPT_PARTITION_TYPE_EMPTY \ --- -cgit v1.0-41-gc330 - diff --git a/grub/patches/grub-2.02-xfs-accept-filesystem-with-sparse-inodes.patch b/grub/patches/grub-2.02-xfs-accept-filesystem-with-sparse-inodes.patch deleted file mode 100644 index 6c6a750b4..000000000 --- a/grub/patches/grub-2.02-xfs-accept-filesystem-with-sparse-inodes.patch +++ /dev/null @@ -1,60 +0,0 @@ -From cda0a857dd7a27cd5d621747464bfe71e8727fff Mon Sep 17 00:00:00 2001 -From: Daniel Kiper daniel.kiper@oracle.com -Date: Tue, 29 May 2018 16:16:02 +0200 -Subject: xfs: Accept filesystem with sparse inodes - -The sparse inode metadata format became a mkfs.xfs default in -xfsprogs-4.16.0, and such filesystems are now rejected by grub as -containing an incompatible feature. - -In essence, this feature allows xfs to allocate inodes into fragmented -freespace. (Without this feature, if xfs could not allocate contiguous -space for 64 new inodes, inode creation would fail.) - -In practice, the disk format change is restricted to the inode btree, -which as far as I can tell is not used by grub. If all you're doing -today is parsing a directory, reading an inode number, and converting -that inode number to a disk location, then ignoring this feature -should be fine, so I've added it to XFS_SB_FEAT_INCOMPAT_SUPPORTED - -I did some brief testing of this patch by hacking up the regression -tests to completely fragment freespace on the test xfs filesystem, and -then write a large-ish number of inodes to consume any existing -contiguous 64-inode chunk. This way any files the grub tests add and -traverse would be in such a fragmented inode allocation. Tests passed, -but I'm not sure how to cleanly integrate that into the test harness. - -Signed-off-by: Eric Sandeen sandeen@redhat.com -Reviewed-by: Daniel Kiper daniel.kiper@oracle.com -Tested-by: Chris Murphy lists@colorremedies.com ---- - grub-core/fs/xfs.c | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - -diff --git a/grub-core/fs/xfs.c b/grub-core/fs/xfs.c -index c6031bd..3b00c74 100644 ---- a/grub-core/fs/xfs.c -+++ b/grub-core/fs/xfs.c -@@ -79,9 +79,18 @@ GRUB_MOD_LICENSE ("GPLv3+"); - #define XFS_SB_FEAT_INCOMPAT_SPINODES (1 << 1) /* sparse inode chunks */ - #define XFS_SB_FEAT_INCOMPAT_META_UUID (1 << 2) /* metadata UUID */ - --/* We do not currently verify metadata UUID so it is safe to read such filesystem */ -+/* -+ * Directory entries with ftype are explicitly handled by GRUB code. -+ * -+ * We do not currently read the inode btrees, so it is safe to read filesystems -+ * with the XFS_SB_FEAT_INCOMPAT_SPINODES feature. -+ * -+ * We do not currently verify metadata UUID, so it is safe to read filesystems -+ * with the XFS_SB_FEAT_INCOMPAT_META_UUID feature. -+ */ - #define XFS_SB_FEAT_INCOMPAT_SUPPORTED \ - (XFS_SB_FEAT_INCOMPAT_FTYPE | \ -+ XFS_SB_FEAT_INCOMPAT_SPINODES | \ - XFS_SB_FEAT_INCOMPAT_META_UUID) - - struct grub_xfs_sblock --- -cgit v1.0-41-gc330 - diff --git a/grub/patches/grub-2.02_disable_vga_fallback.patch b/grub/patches/grub-2.02_disable_vga_fallback.patch deleted file mode 100644 index 0cf30cff4..000000000 --- a/grub/patches/grub-2.02_disable_vga_fallback.patch +++ /dev/null @@ -1,15 +0,0 @@ -We have to remove the vga fallback because this not work on bay-trail and other -new intel onboard graphics. - -diff -Naur grub-2.02.org/grub-core/video/i386/pc/vga.c grub-2.02/grub-core/video/i386/pc/vga.c ---- grub-2.02.org/grub-core/video/i386/pc/vga.c 2015-05-21 17:50:29.000000000 +0200 -+++ grub-2.02/grub-core/video/i386/pc/vga.c 2018-04-15 22:24:41.686842878 +0200 -@@ -122,7 +122,7 @@ - { - grub_err_t err; - -- if ((width && width != VGA_WIDTH) || (height && height != 350 && height != 480)) -+// if ((width && width != VGA_WIDTH) || (height && height != 350 && height != 480)) - return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "no matching mode found"); - - vga_height = height ? : 480; diff --git a/kernel/config-generic b/kernel/config-generic index 1e1bc8e52..fff96d76c 100644 --- a/kernel/config-generic +++ b/kernel/config-generic @@ -5796,7 +5796,7 @@ CONFIG_XFS_ONLINE_REPAIR=y # CONFIG_XFS_DEBUG is not set # CONFIG_GFS2_FS is not set # CONFIG_OCFS2_FS is not set -# CONFIG_BTRFS_FS is not set +CONFIG_BTRFS_FS=y # CONFIG_NILFS2_FS is not set # CONFIG_F2FS_FS is not set CONFIG_FS_POSIX_ACL=y diff --git a/kernel/kernel.nm b/kernel/kernel.nm index 4a7434d15..683982528 100644 --- a/kernel/kernel.nm +++ b/kernel/kernel.nm @@ -4,8 +4,8 @@ ###############################################################################
name = kernel -version = 5.3.8 -release = 0.1 +version = 6.0.6 +release = 0.2 thisapp = linux-%{version}
maintainer = Arne Fitzenreiter arne.fitzenreiter@ipfire.org @@ -25,7 +25,7 @@ end localversion = %{release}.%{DISTRO_DISTTAG}.%{DISTRO_ARCH} fullver = %{version}-%{localversion}
-source_dl = http://www.kernel.org/pub/linux/kernel/v5.x/ +source_dl = https://www.kernel.org/pub/linux/kernel/v6.x/ sources = %{thisapp}.tar.xz
build @@ -60,41 +60,15 @@ build %{kernel_logo} end
- # A list of kernels to build. - kernels = - kernel_arch = %{DISTRO_PLATFORM} kernel_target = bzImage kernel_image = arch/%{kernel_arch}/boot/%{kernel_target}
- if "%{DISTRO_ARCH}" == "x86_64" - build_kernel_default = 1 - end - if "%{DISTRO_ARCH}" == "aarch64" - build_kernel_default = 1 - kernel_arch = arm64 kernel_target = Image.gz end
- if "%{DISTRO_ARCH}" == "armv7hl" - # Build the default unified kernel. - build_kernel_default = 1 - - kernel_target = zImage - end - - # mkimage is a requirement to build uImage images. - if "%{kernel_target}" == "uImage" - requires += u-boot-tools - end - - # Build default kernel. - if "%{build_kernel_default}" == "1" - kernels += default - end - prepare_cmds # Disable the colorize plugin. # It's generally very nice but it clutters our @@ -126,15 +100,13 @@ build suffix="-${flavour}" fi
- scripts/configure --kernel-dir=%{DIR_APP} \ + bash scripts/configure --kernel-dir=%{DIR_APP} \ merge %{DISTRO_ARCH} ${flavour} %{DIR_APP}/configs/config.${flavour} }
# Generate configuration files for all kernels we are going to # build. - for kernel in %{kernels}; do - configure_kernel ${kernel} - done + configure_kernel "default" end
build @@ -167,7 +139,7 @@ build
# Compile Flattened Device Tree database case "${DISTRO_ARCH}" in - aarch64|arm*) + aarch64) make ARCH=%{kernel_arch} dtbs
mkdir -pv %{BUILDROOT}/boot/dtb-${fullversion} @@ -246,9 +218,8 @@ build rm -rf %{BUILDROOT}/usr/src/kernels/*/scripts/dtc }
- for kernel in %{kernels}; do - build_kernel ${kernel} - done + # Build the kernel + build_kernel "default"
# cpupower chmod +x tools/power/cpupower/utils/version-gen.sh @@ -294,18 +265,24 @@ build end
packages - template KERNEL - kernel_name = kernel - kernel_release = %{fullver} + package kernel-tools + summary = Assortment of tools for the Linux kernel. + description = %{summary}
- summary = The Linux kernel %{kernel_release}. + filter_requires + perl>=[0-9]:.* + end + end + + package kernel + summary = The Linux kernel %{fullver}
prerequires /sbin/depmod end
provides - kernel=%{kernel_release} + kernel = %{fullver} end
requires @@ -316,15 +293,15 @@ packages end
files - /boot/System.map-%{kernel_release} - /boot/dtb-%{kernel_release} - /boot/vmlinuz-%{kernel_release} - /boot/initramfs-%{kernel_release}.img - /usr/lib/modules/%{kernel_release} + /boot/System.map-%{fullver} + /boot/dtb-%{fullver} + /boot/vmlinuz-%{fullver} + /boot/initramfs-%{fullver}.img + /usr/lib/modules/%{fullver} end
_posttrans - kernel-updater install %{kernel_release} + kernel-updater install %{fullver} end
script posttransin @@ -336,19 +313,17 @@ packages end
script postun - kernel-updater uninstall %{kernel_release} + kernel-updater uninstall %{fullver} end end
- template KERNELDEVEL - kernel_release = %{fullver} - - summary = Development files of kernel-%{kernel_release}. + package kernel-devel + summary = Development files of kernel-%{fullver} description %{summary}
Install this package in order to compile modules for - kernel release %{kernel_release}. + kernel release %{fullver}. end
provides @@ -360,86 +335,18 @@ packages end
files - /usr/lib/modules/%{kernel_release}/build - /usr/lib/modules/%{kernel_release}/source - /usr/src/kernels/%{kernel_release} - end - end - - if "%{build_kernel_default}" == "1" - if "%{DISTRO_ARCH}" == "armv7hl" - package kernel - template KERNEL - - kernel_name = kernel - kernel_release = %{fullver} - - # Replace the Exynos kernel. - obsoletes += kernel-exynos < %{kernel_release} - conflicts += kernel-exynos < %{kernel_release} - - # Replace the OMAP kernel. - obsoletes += kernel-omap < %{kernel_release} - conflicts += kernel-omap < %{kernel_release} - end - - package kernel-devel - template KERNELDEVEL - - kernel_name = kernel - kernel_release = %{fullver} - - # Replace the Exynos kernel. - obsoletes += kernel-exynos-devel < %{kernel_release} - conflicts += kernel-exynos-devel < %{kernel_release} - - # Replace the OMAP kernel. - obsoletes += kernel-omap-devel < %{kernel_release} - conflicts += kernel-omap-devel < %{kernel_release} - end - - else - package kernel - template KERNEL - - kernel_name = kernel - kernel_release = %{fullver} - end - - package kernel-devel - template KERNELDEVEL - - kernel_name = kernel - kernel_release = %{fullver} - end + /usr/lib/modules/%{fullver}/build + /usr/lib/modules/%{fullver}/source + /usr/src/kernels/%{fullver} end end
package kernel-headers - summary = Header files of the kernel release %{fullver}. + summary = Header files of the kernel release %{fullver} desciption = %{summary}
files /usr/include end end - - package kernel-tools - summary = Assortment of tools for the Linux kernel. - description = %{summary} - - filter_requires - perl>=[0-9]:.* - end - - files - / - !/boot - !/usr/include - !/usr/lib/modules - !/usr/src - !/usr/src/debug - !/usr/lib/debug - end - end end diff --git a/kernel/scripts/configure b/kernel/scripts/configure old mode 100755 new mode 100644 diff --git a/usbutils/patches/usbutils-003-hwdata.patch b/usbutils/patches/usbutils-003-hwdata.patch deleted file mode 100644 index 4a08c48fa..000000000 --- a/usbutils/patches/usbutils-003-hwdata.patch +++ /dev/null @@ -1,79 +0,0 @@ ---- usbutils-003/Makefile.am 2011-03-22 00:23:33.000000000 +0100 -+++ usbutils-003_/Makefile.am 2011-06-16 15:41:20.927882420 +0200 -@@ -4,15 +4,9 @@ - AM_LDFLAGS = \ - -Wl,--as-needed - --data_DATA = \ -- usb.ids -- - bin_PROGRAMS = \ - lsusb - --sbin_SCRIPTS = \ -- update-usbids.sh -- - bin_SCRIPTS = \ - usb-devices \ - lsusb.py -@@ -27,37 +21,22 @@ - - lsusb_CPPFLAGS = \ - $(AM_CPPFLAGS) $(LIBUSB_CFLAGS) \ -- -DDATADIR="$(datadir)" -+ -DDATADIR="$(datadir)/hwdata" - - lsusb_LDADD = \ - $(LIBUSB_LIBS) - --if HAVE_ZLIB --data_DATA += usb.ids.gz --lsusb_CPPFLAGS += -DHAVE_LIBZ --lsusb_LDADD += -lz --endif -- - man_MANS = \ - lsusb.8 \ - usb-devices.1 - - EXTRA_DIST = \ -- usb.ids \ -- update-usbids.sh.in \ - lsusb.8.in \ - usb-devices.1.in \ - usb-devices \ - lsusb.py \ - usbutils.pc.in - --usb.ids.gz: $(srcdir)/usb.ids -- gzip -c -9 $< > $@ -- --update-usbids.sh: $(srcdir)/update-usbids.sh.in -- sed 's|@usbids@|$(datadir)/usb.ids|g' $< >$@ -- chmod 755 $@ -- - lsusb.8: $(srcdir)/lsusb.8.in - sed 's|VERSION|$(VERSION)|g;s|@usbids@|$(datadir)/usb.ids|g' $< >$@ - -@@ -71,10 +50,8 @@ - sed 's|@usbids@|$(datadir)/usb.ids|g;s|@VERSION[@]|$(VERSION)|g' $< >$@ - - DISTCLEANFILES = \ -- usb.ids.gz \ - lsusb.8 \ - usb-devices.1 \ -- update-usbids.sh \ - usbutils.pc - - distclean-local: ---- usbutils-003/lsusb.py 2010-12-16 01:07:09.000000000 +0100 -+++ usbutils-003_/lsusb.py 2011-08-11 09:57:57.079327430 +0200 -@@ -16,7 +16,7 @@ - warnsort = False - - prefix = "/sys/bus/usb/devices/" --usbids = "/usr/share/usb.ids" -+usbids = "/usr/share/hwdata/usb.ids" - - esc = chr(27) - norm = esc + "[0;0m" diff --git a/usbutils/patches/usbutils-make-hwdata.patch b/usbutils/patches/usbutils-make-hwdata.patch deleted file mode 100644 index 862c7fcb3..000000000 --- a/usbutils/patches/usbutils-make-hwdata.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up usbutils-004/Makefile.am.orig usbutils-004/Makefile.am ---- usbutils-004/Makefile.am.orig 2011-09-20 09:42:04.282566870 +0200 -+++ usbutils-004/Makefile.am 2011-09-20 09:42:41.399102845 +0200 -@@ -38,7 +38,7 @@ EXTRA_DIST = \ - usbutils.pc.in - - lsusb.8: $(srcdir)/lsusb.8.in -- sed 's|VERSION|$(VERSION)|g;s|@usbids@|$(datadir)/usb.ids|g' $< >$@ -+ sed 's|VERSION|$(VERSION)|g;s|@usbids@|$(datadir)/hwdata/usb.ids|g' $< >$@ - - usb-devices.1: $(srcdir)/usb-devices.1.in - sed 's|VERSION|$(VERSION)|g' $< >$@ -@@ -47,7 +47,7 @@ pkgconfigdir = $(datarootdir)/pkgconfig - pkgconfig_DATA = usbutils.pc - - usbutils.pc: $(srcdir)/usbutils.pc.in -- sed 's|@usbids@|$(datadir)/usb.ids|g;s|@VERSION[@]|$(VERSION)|g' $< >$@ -+ sed 's|@usbids@|$(datadir)/hwdata/usb.ids|g;s|@VERSION[@]|$(VERSION)|g' $< >$@ - - DISTCLEANFILES = \ - lsusb.8 \ diff --git a/usbutils/usbutils.nm b/usbutils/usbutils.nm index a54a78c0d..a0038fef5 100644 --- a/usbutils/usbutils.nm +++ b/usbutils/usbutils.nm @@ -5,11 +5,11 @@
name = usbutils epoch = 1 -version = 005 +version = 014 release = 4
groups = System/Tools -url = http://www.linux-usb.org/ +url = https://www.linux-usb.org/ license = GPLv2 summary = Tool to provide and enhance USB support in Linux.
@@ -17,21 +17,18 @@ description A set of tools to configure list USB Devices. end
-source_dl = http://www.kernel.org/pub/linux/utils/usb/usbutils/ +source_dl = https://www.kernel.org/pub/linux/utils/usb/usbutils/
build requires autoconf automake hwdata + libudev-devel libusb-devel zlib-devel end
- prepare_cmds - ./autogen.sh - end - install_cmds # Removing lsusb.py. rm -rfv %{BUILDROOT}/usr/bin/lsusb.py diff --git a/util-linux/nologin.8 b/util-linux/nologin.8 deleted file mode 100644 index 5cb16013d..000000000 --- a/util-linux/nologin.8 +++ /dev/null @@ -1,63 +0,0 @@ -." $OpenBSD: nologin.8,v 1.8 1999/06/04 02:45:19 aaron Exp $ -." $NetBSD: nologin.8,v 1.3 1995/03/18 14:59:09 cgd Exp $ -." -." Copyright (c) 1993 -." The Regents of the University of California. All rights reserved. -." -." Redistribution and use in source and binary forms, with or without -." modification, are permitted provided that the following conditions -." are met: -." 1. Redistributions of source code must retain the above copyright -." notice, this list of conditions and the following disclaimer. -." 2. Redistributions in binary form must reproduce the above copyright -." notice, this list of conditions and the following disclaimer in the -." documentation and/or other materials provided with the distribution. -." 3. All advertising materials mentioning features or use of this software -." must display the following acknowledgement: -." This product includes software developed by the University of -." California, Berkeley and its contributors. -." 4. Neither the name of the University nor the names of its contributors -." may be used to endorse or promote products derived from this software -." without specific prior written permission. -." -." THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND -." ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -." IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -." ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -." FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -." DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -." OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -." HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -." LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -." OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -." SUCH DAMAGE. -." -." @(#)nologin.8 8.1 (Berkeley) 6/19/93 -." -.Dd February 15, 1997 -.Dt NOLOGIN 8 -.Os -.Sh NAME -.Nm nologin -.Nd politely refuse a login -.Sh SYNOPSIS -.Nm nologin -.Sh DESCRIPTION -.Nm -displays a message that an account is not available and -exits non-zero. -It is intended as a replacement shell field for accounts that -have been disabled. -.Pp -If the file -.Pa /etc/nologin.txt -exists, -.Nm -displays its contents to the user instead of the default message. -.Sh SEE ALSO -.Xr login 1 -.Sh HISTORY -The -.Nm -command appeared in -.Bx 4.4 . diff --git a/util-linux/nologin.c b/util-linux/nologin.c deleted file mode 100644 index 8a51ba96b..000000000 --- a/util-linux/nologin.c +++ /dev/null @@ -1,58 +0,0 @@ -/* $OpenBSD: nologin.c,v 1.2 1997/04/04 16:51:37 millert Exp $ */ - -/* - * Copyright (c) 1997, Jason Downs. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS - * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, - * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include <sys/types.h> -#include <fcntl.h> -#include <string.h> -#include <unistd.h> -#include <stdlib.h> - -/* Distinctly different from _PATH_NOLOGIN. */ -#define _PATH_NOLOGIN_TXT "/etc/nologin.txt" - -#define DEFAULT_MESG "This account is currently not available.\n" - -/*ARGSUSED*/ -int main(argc, argv) - int argc; - char *argv[]; -{ - int nfd, nrd; - char nbuf[128]; - - nfd = open(_PATH_NOLOGIN_TXT, O_RDONLY); - if (nfd < 0) { - write(STDOUT_FILENO, DEFAULT_MESG, strlen(DEFAULT_MESG)); - exit (1); - } - - while ((nrd = read(nfd, nbuf, sizeof(nbuf))) > 0) - write(STDOUT_FILENO, nbuf, nrd); - close (nfd); - - exit (1); -} diff --git a/util-linux/util-linux.nm b/util-linux/util-linux.nm index 7a1e66a2c..684e57b0a 100644 --- a/util-linux/util-linux.nm +++ b/util-linux/util-linux.nm @@ -4,8 +4,9 @@ ###############################################################################
name = util-linux -version = 2.34 -release = 2 +ver_maj = 2.38 +version = %{ver_maj}.1 +release = 1
maintainer = Stefan Schantl stefan.schantl@ipfire.org groups = System/Base @@ -20,12 +21,12 @@ description program. end
-source_dl = https://www.kernel.org/pub/linux/utils/%%7Bname%7D/v%%7Bversion%7D/ +source_dl = https://www.kernel.org/pub/linux/utils/%%7Bname%7D/v%%7Bver_maj%7D/
build requires autoconf >= 1.16 - automake >= 1.15 + automake >= 1.16 coreutils >= 8.19 gettext libcap-devel @@ -64,11 +65,6 @@ build -i $(grep -rl '/etc/adjtime' .) end
- # Build nolodin - build_cmds - gcc %{CFLAGS} %{LDFLAGS} -o nologin %{DIR_SOURCE}/nologin.c - end - install_cmds mkdir -pv \ %{BUILDROOT}/var/lib/libuuid \ @@ -77,9 +73,6 @@ build %{BUILDROOT}/run/uuidd \ %{BUILDROOT}/var/log
- install -m 755 %{DIR_APP}/nologin %{BUILDROOT}%{sbindir} - install -m 644 %{DIR_SOURCE}/nologin.8 %{BUILDROOT}/usr/share/man/man8/ - touch %{BUILDROOT}/var/log/lastlog
# Remove deprecated commands @@ -91,21 +84,20 @@ build rm -fv %{BUILDROOT}/usr/share/getopt/*.tcsh
# Set capabilities + # XXX: Setting capabilities is currently unusable due to #13010 chmod -v -s %{BUILDROOT}%{bindir}/mount - setcap CAP_DAC_OVERRIDE,CAP_SYS_ADMIN=ep %{BUILDROOT}%{bindir}/mount + #setcap CAP_DAC_OVERRIDE,CAP_SYS_ADMIN=ep %{BUILDROOT}%{bindir}/mount chmod -v -s %{BUILDROOT}%{bindir}/umount - setcap CAP_DAC_OVERRIDE,CAP_SYS_ADMIN=ep %{BUILDROOT}%{bindir}/umount + #setcap CAP_DAC_OVERRIDE,CAP_SYS_ADMIN=ep %{BUILDROOT}%{bindir}/umount
# su (set right capabilities) chmod -v u-s %{BUILDROOT}%{bindir}/su - setcap cap_setgid,cap_setuid+ep %{BUILDROOT}%{bindir}/su + #setcap cap_setgid,cap_setuid+ep %{BUILDROOT}%{bindir}/su end end
packages package %{name} - groups += Base - requires /etc/pam.d/system-auth end @@ -303,8 +295,6 @@ packages SMP systems. end
- groups += Base - files %{sbindir}/uuidd %{mandir}/man8/uuidd.8* diff --git a/wget/wget.nm b/wget/wget.nm index f0a664df8..e3ffd3707 100644 --- a/wget/wget.nm +++ b/wget/wget.nm @@ -4,7 +4,7 @@ ###############################################################################
name = wget -version = 1.20.1 +version = 1.21.3 release = 1
groups = Applications/Internet @@ -30,7 +30,7 @@ build end
export CPPFLAGS = %(pkg-config --cflags openssl) - export LDFLAGS += %(pkg-config --libs openssl) + LDFLAGS += %(pkg-config --libs openssl)
configure_options += \ --with-ssl=openssl \
hooks/post-receive -- IPFire 3.x development tree
-
Michael Tremer