[git.ipfire.org] IPFire 3.x development tree branch, master, updated. ebccda91e95868a86170cd937d0d8da489d01d52
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 ebccda91e95868a86170cd937d0d8da489d01d52 (commit) via 56396620f491565ee61b266bbda7fc5961c9e968 (commit) via 952ebb4adba4a45a22945c55980d80687f01e5b3 (commit) via c25da0907b227f94abd16185f4ceadad9000103b (commit) via d1f7ab27ae004a614c23a75ae2873b0a0cb8a83f (commit) via 4a967cce3829e2981ca80600e41b94931626c5ca (commit) via cfbd9ac08003b91c5beddbd40d59bdfeff8e61c8 (commit) via 6836391251135f9fe2476ac3d38154d4e84a4e71 (commit) via e3ad56a3649e06272969335c10372e93f028dfba (commit) via ae42ca81696a640f24ff046c6ac0fef433ed781b (commit) via 0db04b31663725ff5c1c9ef6308074446624613d (commit) via 6a43e35391b8b23f71288bf1f820b659d143334e (commit) via c00d7b0db94ad1f6f476cbd2d8f86af3ba2a0c65 (commit) via 491eba7b6ffcae04162a697b1b0a0f94c92941d6 (commit) via 604f730ec0340d50cb103eea7f1be6b5cafbe782 (commit) via 3019d498cea870b46328a891928ae6c328fe73c1 (commit) via c8657d727572bcdcdb66fcb4a7e7e3a15dd420a0 (commit) via 4e015221565a6f0a194c1b3de84d725b0ead97f8 (commit) via a69385d32d300c5ba58037e4094db9ccfed124ab (commit) via 84230c38732c5a999ef67934a307d804236e6003 (commit) via 75338b8bbc5cc8dd5d949e434f24129a084bd5ec (commit) via 2be7d1166908a28aca811684df572af2659ea3cb (commit) via 22f5333f5b2a78429eb865d3744449ffb15dbbbd (commit) via 8425254e62a22ee2f489940aa0d13443c1be753f (commit) via fc0b44a6096c493acadcbfc452ab8232e6ff8b10 (commit) via 5d09077694f3b4db540c4921e8bed8e26a405d95 (commit) via 752263c0fdec2728315d9e8e8cdb03c0bb6482ab (commit) via 1f700a53219a5e92c9c425b29885ffeed7035a5d (commit) via 8c66b529c4e449ece1ce20c1ee18c42bc8055187 (commit) via 0f37bd33191dd095d7c76acbbada11005f4e3b6f (commit) via 568207dffa1f90fddb7fa3b96c64cb2cc87517cd (commit) from 94d61c789192218473fa92a89fddd29eb99c8b81 (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 ebccda91e95868a86170cd937d0d8da489d01d52 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Nov 22 14:48:21 2022 +0000
nettle: Update to 3.8.1
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 56396620f491565ee61b266bbda7fc5961c9e968 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Nov 22 14:31:52 2022 +0000
zstd: Update to 1.5.2
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 952ebb4adba4a45a22945c55980d80687f01e5b3 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Nov 22 14:31:07 2022 +0000
cmake: Update to 3.25.0
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit c25da0907b227f94abd16185f4ceadad9000103b Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Nov 22 14:30:44 2022 +0000
xz: Update to 5.2.8
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit d1f7ab27ae004a614c23a75ae2873b0a0cb8a83f Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Nov 22 14:26:10 2022 +0000
npth: Update to 1.6
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 4a967cce3829e2981ca80600e41b94931626c5ca Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Nov 22 14:18:25 2022 +0000
libgcrypt: Update to 1.10.1
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit cfbd9ac08003b91c5beddbd40d59bdfeff8e61c8 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Nov 22 14:05:32 2022 +0000
libksba: Update to 1.6.2
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 6836391251135f9fe2476ac3d38154d4e84a4e71 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Nov 22 14:02:09 2022 +0000
libassuan: Update to 2.5.5
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit e3ad56a3649e06272969335c10372e93f028dfba Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Nov 22 14:01:49 2022 +0000
libgpg-error: Update to 1.46
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit ae42ca81696a640f24ff046c6ac0fef433ed781b Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Nov 22 13:01:48 2022 +0000
gettext: Update to 0.21.1
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 0db04b31663725ff5c1c9ef6308074446624613d Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Nov 22 12:58:24 2022 +0000
file: Update to 5.43
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 6a43e35391b8b23f71288bf1f820b659d143334e Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Nov 22 12:40:40 2022 +0000
gdb: Update to 12.1
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit c00d7b0db94ad1f6f476cbd2d8f86af3ba2a0c65 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Nov 22 12:31:37 2022 +0000
json-c: Update to 0.16
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 491eba7b6ffcae04162a697b1b0a0f94c92941d6 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Nov 22 12:28:45 2022 +0000
findutils: Update to 4.9.0
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 604f730ec0340d50cb103eea7f1be6b5cafbe782 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Nov 22 12:11:52 2022 +0000
libseccomp: Update to 2.5.4
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 3019d498cea870b46328a891928ae6c328fe73c1 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Nov 22 11:59:54 2022 +0000
expat: Update to 2.5.0
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit c8657d727572bcdcdb66fcb4a7e7e3a15dd420a0 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Nov 22 11:49:13 2022 +0000
sqlite: Update to 3.40.0
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 4e015221565a6f0a194c1b3de84d725b0ead97f8 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Nov 22 11:34:53 2022 +0000
e2fsprogs: Update to 1.46.5
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit a69385d32d300c5ba58037e4094db9ccfed124ab Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Nov 22 11:03:22 2022 +0000
diffutils: Update to 3.8
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 84230c38732c5a999ef67934a307d804236e6003 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Nov 22 10:57:10 2022 +0000
make: Update to 4.4
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 75338b8bbc5cc8dd5d949e434f24129a084bd5ec Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Nov 22 10:48:11 2022 +0000
libuv: Update to 1.44.2
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 2be7d1166908a28aca811684df572af2659ea3cb Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Nov 22 10:43:20 2022 +0000
btrfs-progs: New package
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 22f5333f5b2a78429eb865d3744449ffb15dbbbd Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Nov 22 10:23:04 2022 +0000
libarchive: Update to 3.6.1
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 8425254e62a22ee2f489940aa0d13443c1be753f Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Nov 22 10:07:36 2022 +0000
attr: Update to 2.5.1
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit fc0b44a6096c493acadcbfc452ab8232e6ff8b10 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Nov 22 10:07:17 2022 +0000
lz4: Update to 1.9.4
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 5d09077694f3b4db540c4921e8bed8e26a405d95 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Nov 22 10:01:12 2022 +0000
acl: Update to 2.3.1
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 752263c0fdec2728315d9e8e8cdb03c0bb6482ab Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Nov 21 16:01:48 2022 +0000
curl: Update to 7.86.0
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 1f700a53219a5e92c9c425b29885ffeed7035a5d Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Nov 21 14:53:32 2022 +0000
bash: Update to 5.2
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 8c66b529c4e449ece1ce20c1ee18c42bc8055187 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Nov 21 14:53:18 2022 +0000
readline: Update to 8.2
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 0f37bd33191dd095d7c76acbbada11005f4e3b6f Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Nov 21 11:38:34 2022 +0000
parted: Update to 3.5
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 568207dffa1f90fddb7fa3b96c64cb2cc87517cd Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Nov 21 11:35:43 2022 +0000
zlib: Update to 1.2.13
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: acl/acl.nm | 18 +- acl/patches/acl-2.2.39-build.patch | 40 ---- acl/patches/acl-2.2.49-bz675451.patch | 18 -- acl/patches/acl-2.2.49-tests.patch | 136 -------------- attr/attr.nm | 11 +- attr/patches/attr-2.4.46-build.patch | 38 ---- bash/bash.nm | 9 +- bash/patches/bash-4.3-noecho.patch | 46 ----- bash/patches/bash-5.0-patch-1.patch | 150 --------------- bash/patches/bash-5.0-patch-2.patch | 96 ---------- bash/patches/bash-5.0-patch-3.patch | 202 --------------------- bash/patches/bash-5.0-patch-4.patch | 42 ----- bash/patches/bash-5.0-patch-5.patch | 102 ----------- bash/patches/bash-5.0-patch-6.patch | 39 ---- bash/patches/bash-5.0-patch-7.patch | 51 ------ bash/patches/bash-requires.patch | 116 ++++++------ bash/patches/bash-tty-tests.patch | 61 ------- btrfs-progs/btrfs-progs.nm | 63 +++++++ cmake/cmake.macro | 18 -- cmake/cmake.nm | 15 +- cmake/patches/cmake-strict_aliasing.patch | 19 -- curl/curl.nm | 2 +- diffutils/diffutils.nm | 24 +-- diffutils/patches/diffutils-cmp-s-empty.patch | 20 -- diffutils/patches/diffutils-format-security.patch | 17 -- e2fsprogs/e2fsprogs.nm | 22 +-- expat/expat.nm | 16 +- file/file.nm | 15 +- findutils/findutils.nm | 19 +- .../patches/findutils-4.6.0-mbrtowc-tests.patch | 35 ---- gdb/gdb.nm | 10 +- gettext/gettext.nm | 7 +- json-c/json-c.nm | 27 +-- libarchive/libarchive.nm | 9 +- libassuan/libassuan.nm | 17 +- libgcrypt/libgcrypt.nm | 12 +- libgpg-error/libgpg-error.nm | 11 +- libksba/libksba.nm | 12 +- libseccomp/libseccomp.nm | 8 +- libuv/libuv.nm | 8 +- lz4/lz4.nm | 2 +- make/make.nm | 16 +- make/patches/make-4.2.1-glob-SEGV.patch | 67 ------- make/patches/make-4.2.1-glob-build-fix.patch | 11 -- nettle/nettle.nm | 29 +-- npth/npth.nm | 4 +- parted/parted.nm | 18 +- readline/readline.nm | 6 +- sqlite/sqlite.nm | 12 +- xz/xz.nm | 8 +- zlib/zlib.nm | 4 +- zstd/zstd.nm | 4 +- 52 files changed, 255 insertions(+), 1507 deletions(-) delete mode 100644 acl/patches/acl-2.2.39-build.patch delete mode 100644 acl/patches/acl-2.2.49-bz675451.patch delete mode 100644 acl/patches/acl-2.2.49-tests.patch delete mode 100644 attr/patches/attr-2.4.46-build.patch delete mode 100644 bash/patches/bash-4.3-noecho.patch delete mode 100644 bash/patches/bash-5.0-patch-1.patch delete mode 100644 bash/patches/bash-5.0-patch-2.patch delete mode 100644 bash/patches/bash-5.0-patch-3.patch delete mode 100644 bash/patches/bash-5.0-patch-4.patch delete mode 100644 bash/patches/bash-5.0-patch-5.patch delete mode 100644 bash/patches/bash-5.0-patch-6.patch delete mode 100644 bash/patches/bash-5.0-patch-7.patch delete mode 100644 bash/patches/bash-tty-tests.patch create mode 100644 btrfs-progs/btrfs-progs.nm delete mode 100644 cmake/cmake.macro delete mode 100644 cmake/patches/cmake-strict_aliasing.patch delete mode 100644 diffutils/patches/diffutils-cmp-s-empty.patch delete mode 100644 diffutils/patches/diffutils-format-security.patch delete mode 100644 findutils/patches/findutils-4.6.0-mbrtowc-tests.patch delete mode 100644 make/patches/make-4.2.1-glob-SEGV.patch delete mode 100644 make/patches/make-4.2.1-glob-build-fix.patch
Difference in files: diff --git a/acl/acl.nm b/acl/acl.nm index 529168172..f3f140d3f 100644 --- a/acl/acl.nm +++ b/acl/acl.nm @@ -4,11 +4,11 @@ ###############################################################################
name = acl -version = 2.2.51 -release = 4 +version = 2.3.1 +release = 1
groups = System/Filesystems -url = http://oss.sgi.com/projects/xfs/ +url = https://savannah.nongnu.org/projects/acl license = GPLv2+ summary = Access control list utilities.
@@ -17,14 +17,12 @@ description manipulating access control lists. end
-source_dl = http://download-mirror.savannah.gnu.org/releases/acl/ -sources = %{thisapp}.src.tar.gz +source_dl = https://download-mirror.savannah.gnu.org/releases/acl/
build requires gettext libattr-devel - libnfsidmap-devel libtool end
@@ -32,16 +30,12 @@ build --libexecdir=%{libdir} \ --disable-static
- make_build_targets += LIBTOOL="libtool --tag=CC" - test - make tests || true + make check || true end
- make_install_targets += install-dev install-lib - install_cmds - # Fix library permissions. + # Fix library permissions chmod 755 %{BUILDROOT}%{libdir}/libacl.so.* end end diff --git a/acl/patches/acl-2.2.39-build.patch b/acl/patches/acl-2.2.39-build.patch deleted file mode 100644 index fbe608a0d..000000000 --- a/acl/patches/acl-2.2.39-build.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/include/builddefs.in b/include/builddefs.in -index d054a56..10b0cd4 100644 ---- a/include/builddefs.in -+++ b/include/builddefs.in -@@ -28,14 +28,14 @@ PKG_RELEASE = @pkg_release@ - PKG_VERSION = @pkg_version@ - PKG_PLATFORM = @pkg_platform@ - PKG_DISTRIBUTION= @pkg_distribution@ --PKG_BIN_DIR = @bindir@ --PKG_SBIN_DIR = @sbindir@ --PKG_LIB_DIR = @libdir@@libdirsuffix@ --PKG_DEVLIB_DIR = @libexecdir@@libdirsuffix@ --PKG_INC_DIR = @includedir@ --PKG_MAN_DIR = @mandir@ --PKG_DOC_DIR = @datadir@/doc/@pkg_name@ --PKG_LOCALE_DIR = @datadir@/locale -+PKG_BIN_DIR = $(DESTDIR)@bindir@ -+PKG_SBIN_DIR = $(DESTDIR)@sbindir@ -+PKG_LIB_DIR = $(DESTDIR)@libdir@@libdirsuffix@ -+PKG_DEVLIB_DIR = $(DESTDIR)@libexecdir@@libdirsuffix@ -+PKG_INC_DIR = $(DESTDIR)@includedir@ -+PKG_MAN_DIR = $(DESTDIR)@mandir@ -+PKG_DOC_DIR = $(DESTDIR)@datadir@/doc/@pkg_name@-@pkg_version@ -+PKG_LOCALE_DIR = $(DESTDIR)@datadir@/locale - - CC = @cc@ - AWK = @awk@ -diff --git a/include/buildmacros b/include/buildmacros -index 17423c0..3118a17 100644 ---- a/include/buildmacros -+++ b/include/buildmacros -@@ -40,7 +40,7 @@ OBJECTS = $(ASFILES:.s=.o) \ - $(LFILES:.l=.o) \ - $(YFILES:%.y=%.tab.o) - --INSTALL = $(TOPDIR)/include/install-sh -o $(PKG_USER) -g $(PKG_GROUP) -+INSTALL = $(TOPDIR)/include/install-sh - - SHELL = /bin/sh - IMAGES_DIR = $(TOPDIR)/all-images diff --git a/acl/patches/acl-2.2.49-bz675451.patch b/acl/patches/acl-2.2.49-bz675451.patch deleted file mode 100644 index cb742b478..000000000 --- a/acl/patches/acl-2.2.49-bz675451.patch +++ /dev/null @@ -1,18 +0,0 @@ - man/man1/setfacl.1 | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/man/man1/setfacl.1 b/man/man1/setfacl.1 -index 25908e2..776f22d 100644 ---- a/man/man1/setfacl.1 -+++ b/man/man1/setfacl.1 -@@ -240,8 +240,8 @@ owner, owning group, or others entry, a copy of the ACL owner, owning group, or - .IP * 4 - If a Default ACL contains named user entries or named group entries, and no mask entry exists, a mask entry containing the same permissions as the default Default ACL's group entry is added. Unless the - .I -n --option is given, the permissions of the mask entry are further adjusted to inclu --de the union of all permissions affected by the mask entry. (See the -+option is given, the permissions of the mask entry are further adjusted to -+include the union of all permissions affected by the mask entry. (See the - .I -n - option description). - .PP diff --git a/acl/patches/acl-2.2.49-tests.patch b/acl/patches/acl-2.2.49-tests.patch deleted file mode 100644 index 1ceabf8af..000000000 --- a/acl/patches/acl-2.2.49-tests.patch +++ /dev/null @@ -1,136 +0,0 @@ -diff --git a/test/cp.test b/test/cp.test -index a888c04..4a75ffd 100644 ---- a/test/cp.test -+++ b/test/cp.test -@@ -9,7 +9,7 @@ The cp utility should only copy ACLs if `-p' is given. - > -rw-rw-r--+ - - $ cp f g -- $ ls -l g | awk -- '{ print $1 }' -+ $ ls -l g | awk -- '{ print $1 }' | sed 's/\.$//' - > -rw-r--r-- - - $ rm g -diff --git a/test/getfacl-recursive.test b/test/getfacl-recursive.test -index b88c211..a72192e 100644 ---- a/test/getfacl-recursive.test -+++ b/test/getfacl-recursive.test -@@ -1,5 +1,6 @@ - Tests for proper path recursion - -+ $ umask 022 - $ mkdir -p 1/2/3 - $ mkdir 1/link - $ touch 1/link/file -diff --git a/test/misc.test b/test/misc.test -index 7c62c64..e6140da 100644 ---- a/test/misc.test -+++ b/test/misc.test -@@ -254,7 +254,7 @@ Add some users and groups - Symlink in directory with default ACL? - - $ ln -s d d/l -- $ ls -dl d/l | awk '{print $1}' -+ $ ls -dl d/l | awk '{print $1}' | sed 's/\.$//' - > lrwxrwxrwx - - $ ls -dl -L d/l | awk '{print $1}' -@@ -343,7 +343,7 @@ Remove the default ACL - Reset to base entries - - $ setfacl -b d -- $ ls -dl d | awk '{print $1}' -+ $ ls -dl d | awk '{print $1}' | sed 's/\.$//' - > drwxr-x--- - - $ getfacl --omit-header d -@@ -355,7 +355,7 @@ Reset to base entries - Now, chmod should change the group_obj entry - - $ chmod 775 d -- $ ls -dl d | awk '{print $1}' -+ $ ls -dl d | awk '{print $1}' | sed 's/\.$//' - > drwxrwxr-x - - $ getfacl --omit-header d -diff --git a/test/root/permissions.test b/test/root/permissions.test -index afaf5f0..4880bd2 100644 ---- a/test/root/permissions.test -+++ b/test/root/permissions.test -@@ -20,7 +20,7 @@ defined permissions. - $ cd d - $ umask 027 - $ touch f -- $ ls -l f | awk -- '{ print $1, $3, $4 }' -+ $ ls -l f | awk -- '{ print $1, $3, $4 }' | sed 's/---\./---/' - > -rw-r----- root root - - -@@ -40,7 +40,7 @@ Now, change the ownership of the file to bin:bin and verify that this - gives user bin write access. - - $ chown bin:bin f -- $ ls -l f | awk -- '{ print $1, $3, $4 }' -+ $ ls -l f | awk -- '{ print $1, $3, $4 }' | sed 's/---\./---/' - > -rw-r----- bin bin - $ su bin - $ echo bin >> f -@@ -257,12 +257,12 @@ directories if the file has an ACL and only CAP_FOWNER would grant them. - $ mkdir -m 600 x - $ chown daemon:daemon x - $ echo j > x/j -- $ ls -l x/j | awk -- '{ print $1, $3, $4 }' -+ $ ls -l x/j | awk -- '{ print $1, $3, $4 }' | sed 's/---\./---/' - > -rw-r----- root root - - $ setfacl -m u:daemon:r x - -- $ ls -l x/j | awk -- '{ print $1, $3, $4 }' -+ $ ls -l x/j | awk -- '{ print $1, $3, $4 }' | sed 's/---\./---/' - > -rw-r----- root root - (With the bug this gives: `ls: x/j: Permission denied'.) - -diff --git a/test/root/restore.test b/test/root/restore.test -index 6003cd4..5dbf73c 100644 ---- a/test/root/restore.test -+++ b/test/root/restore.test -@@ -17,7 +17,7 @@ Ensure setuid bit is restored when the owner changes - $ chown bin passwd - $ chmod u+s passwd - $ setfacl --restore passwd.acl -- $ ls -dl passwd | awk '{print $1 " " $3 " " $4}' -+ $ ls -dl passwd | awk '{print $1 " " $3 " " $4}' | sed 's/\. root/ root/' - > -rwsr-xr-x root root - - $ rm passwd passwd.acl -diff --git a/test/root/setfacl.test b/test/root/setfacl.test -index 630e9fb..dd7fe08 100644 ---- a/test/root/setfacl.test -+++ b/test/root/setfacl.test -@@ -8,7 +8,7 @@ Setfacl utility tests. Run these tests on a filesystem with ACL support. - $ sg bin - $ umask 027 - $ touch g -- $ ls -dl g | awk '{print $1}' -+ $ ls -dl g | awk '{print $1}' | sed 's/\.$//' - > -rw-r----- - - $ setfacl -m m:- g -diff --git a/test/sbits-restore.test b/test/sbits-restore.test -index e5e4fb2..abdb58a 100644 ---- a/test/sbits-restore.test -+++ b/test/sbits-restore.test -@@ -13,10 +13,10 @@ Ensure setting of SUID/SGID/sticky via --restore works - $ touch d/g - $ touch d/u - $ setfacl --restore d.acl -- $ ls -dl d | awk '{print $1}' -+ $ ls -dl d | awk '{print $1}' | sed 's/\.$//' - > drwxr-xr-t -- $ ls -dl d/u | awk '{print $1}' -+ $ ls -dl d/u | awk '{print $1}' | sed 's/\.$//' - > -rwSr--r-- -- $ ls -dl d/g | awk '{print $1}' -+ $ ls -dl d/g | awk '{print $1}' | sed 's/\.$//' - > -rw-r-Sr-- - $ rm -Rf d diff --git a/attr/attr.nm b/attr/attr.nm index 31144ecad..e4aae5eb1 100644 --- a/attr/attr.nm +++ b/attr/attr.nm @@ -4,11 +4,11 @@ ###############################################################################
name = attr -version = 2.4.43 -release = 7 +version = 2.5.1 +release = 1
groups = System/Filesystems -url = http://oss.sgi.com/projects/xfs/ +url = https://savannah.nongnu.org/projects/attr license = GPLv2+ LGPLv2+ summary = Tools for extended attribute support.
@@ -17,7 +17,7 @@ description objects. end
-source_dl = ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/ +source_dl = https://download-mirror.savannah.gnu.org/releases/attr/
build requires @@ -29,9 +29,6 @@ build --libexecdir=%{libdir} \ --enable-shared
- make_build_targets += LIBTOOL="libtool --tag=CC" - make_install_targets += install-lib install-dev - install_cmds # Fix absolute symlink. rm -rvf %{BUILDROOT}%{libdir}/libattr.so diff --git a/attr/patches/attr-2.4.46-build.patch b/attr/patches/attr-2.4.46-build.patch deleted file mode 100644 index 44d5c268e..000000000 --- a/attr/patches/attr-2.4.46-build.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -Nur a/include/builddefs.in b/include/builddefs.in ---- a/include/builddefs.in 2008-06-30 07:38:27.000000000 +0200 -+++ b/include/builddefs.in 2012-04-12 22:20:47.479076688 +0200 -@@ -27,14 +27,14 @@ - PKG_VERSION = @pkg_version@ - PKG_PLATFORM = @pkg_platform@ - PKG_DISTRIBUTION= @pkg_distribution@ --PKG_BIN_DIR = @bindir@ --PKG_SBIN_DIR = @sbindir@ --PKG_LIB_DIR = @libdir@@libdirsuffix@ --PKG_DEVLIB_DIR = @libexecdir@@libdirsuffix@ --PKG_INC_DIR = @includedir@/attr --PKG_MAN_DIR = @mandir@ --PKG_DOC_DIR = @datadir@/doc/@pkg_name@ --PKG_LOCALE_DIR = @datadir@/locale -+PKG_BIN_DIR = $(DESTDIR)@bindir@ -+PKG_SBIN_DIR = $(DESTDIR)@sbindir@ -+PKG_LIB_DIR = $(DESTDIR)@libdir@@libdirsuffix@ -+PKG_DEVLIB_DIR = $(DESTDIR)@libexecdir@@libdirsuffix@ -+PKG_INC_DIR = $(DESTDIR)@includedir@/attr -+PKG_MAN_DIR = $(DESTDIR)@mandir@ -+PKG_DOC_DIR = $(DESTDIR)@datadir@/doc/@pkg_name@ -+PKG_LOCALE_DIR = $(DESTDIR)@datadir@/locale - - CC = @cc@ - AWK = @awk@ -diff -Nur a/include/buildmacros b/include/buildmacros ---- a/include/buildmacros 2008-06-30 07:22:18.000000000 +0200 -+++ b/include/buildmacros 2012-04-12 22:21:18.737379800 +0200 -@@ -27,7 +27,7 @@ - $(LFILES:.l=.o) \ - $(YFILES:%.y=%.tab.o) - --INSTALL = $(TOPDIR)/install-sh -o $(PKG_USER) -g $(PKG_GROUP) -+INSTALL = $(TOPDIR)/install-sh - - SHELL = /bin/sh - IMAGES_DIR = $(TOPDIR)/all-images diff --git a/bash/bash.nm b/bash/bash.nm index 4179d3add..cbe78a422 100644 --- a/bash/bash.nm +++ b/bash/bash.nm @@ -4,7 +4,7 @@ ###############################################################################
name = bash -version = 5.0 +version = 5.2.9 release = 1
groups = System/Tools @@ -19,7 +19,7 @@ description to conform to the IEEE POSIX P1003.2/ISO 9945.2 Shell and Tools standard. end
-source_dl = http://ftp.gnu.org/gnu/bash/ +source_dl = https://ftp.gnu.org/gnu/bash/
build requires @@ -28,13 +28,10 @@ build bison filesystem >= 002 ncurses-devel - readline-devel >= 7.0 + readline-devel >= 8.0 texinfo end
- # Disable parallel build - MAKETUNING = - prepare_cmds # Bash uses the RTLD_LAZY option when loading libraries. We want to use # RTLD_NOW (it is defined from <dlfcn.h>: diff --git a/bash/patches/bash-4.3-noecho.patch b/bash/patches/bash-4.3-noecho.patch deleted file mode 100644 index 8adf36d93..000000000 --- a/bash/patches/bash-4.3-noecho.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/parse.y b/parse.y -index 07e6e3e..4cd373f 100644 ---- a/parse.y -+++ b/parse.y -@@ -4410,6 +4410,8 @@ xparse_dolparen (base, string, indp, flags) - save_parser_state (&ps); - save_input_line_state (&ls); - orig_eof_token = shell_eof_token; -+ /* avoid echoing every substitution again */ -+ echo_input_at_read = 0; - #if defined (ALIAS) || defined (DPAREN_ARITHMETIC) - saved_pushed_strings = pushed_string_list; /* separate parsing context */ - pushed_string_list = (STRING_SAVER *)NULL; -diff --git a/subst.c b/subst.c -index 9559187..0c2caa6 100644 ---- a/subst.c -+++ b/subst.c -@@ -9145,6 +9145,7 @@ param_expand (string, sindex, quoted, expanded_something, - WORD_LIST *list; - WORD_DESC *tdesc, *ret; - int tflag; -+ int old_echo_input; - - /*itrace("param_expand: `%s' pflags = %d", string+*sindex, pflags);*/ - zindex = *sindex; -@@ -9514,6 +9515,9 @@ arithsub: - } - - comsub: -+ old_echo_input = echo_input_at_read; -+ /* avoid echoing every substitution again */ -+ echo_input_at_read = 0; - if (pflags & PF_NOCOMSUB) - /* we need zindex+1 because string[zindex] == RPAREN */ - temp1 = substring (string, *sindex, zindex+1); -@@ -9526,6 +9530,7 @@ comsub: - } - FREE (temp); - temp = temp1; -+ echo_input_at_read = old_echo_input; - break; - - /* Do POSIX.2d9-style arithmetic substitution. This will probably go --- -2.17.2 - diff --git a/bash/patches/bash-5.0-patch-1.patch b/bash/patches/bash-5.0-patch-1.patch deleted file mode 100644 index 254fd9ee0..000000000 --- a/bash/patches/bash-5.0-patch-1.patch +++ /dev/null @@ -1,150 +0,0 @@ -From 4d2e315490b778707b3a3afdfc514d5083a97a11 Mon Sep 17 00:00:00 2001 -From: Chet Ramey chet.ramey@case.edu -Date: Fri, 18 Jan 2019 15:12:37 -0500 -Subject: [PATCH] Bash-5.0 patch 1: fix pathname expansion of directory names - containing backslashes - ---- - bashline.c | 62 +++++++++++++++++++++++++++++++++++++++++--- - lib/glob/glob_loop.c | 6 ----- - patchlevel.h | 2 +- - 3 files changed, 60 insertions(+), 10 deletions(-) - -diff --git a/bashline.c b/bashline.c -index 2846aabf..75e79f1a 100644 ---- a/bashline.c -+++ b/bashline.c -@@ -231,6 +231,7 @@ static int bash_possible_variable_completions __P((int, int)); - static int bash_complete_command __P((int, int)); - static int bash_possible_command_completions __P((int, int)); - -+static int completion_glob_pattern __P((char *)); - static char *glob_complete_word __P((const char *, int)); - static int bash_glob_completion_internal __P((int)); - static int bash_glob_complete_word __P((int, int)); -@@ -1741,7 +1742,7 @@ bash_default_completion (text, start, end, qc, compflags) - - /* This could be a globbing pattern, so try to expand it using pathname - expansion. */ -- if (!matches && glob_pattern_p (text)) -+ if (!matches && completion_glob_pattern ((char *)text)) - { - matches = rl_completion_matches (text, glob_complete_word); - /* A glob expression that matches more than one filename is problematic. -@@ -1850,7 +1851,7 @@ command_word_completion_function (hint_text, state) - glob_matches = (char **)NULL; - } - -- globpat = glob_pattern_p (hint_text); -+ globpat = completion_glob_pattern ((char *)hint_text); - - /* If this is an absolute program name, do not check it against - aliases, reserved words, functions or builtins. We must check -@@ -3713,6 +3714,61 @@ bash_complete_command_internal (what_to_do) - return bash_specific_completion (what_to_do, command_word_completion_function); - } - -+static int -+completion_glob_pattern (string) -+ char *string; -+{ -+ register int c; -+ char *send; -+ int open; -+ -+ DECLARE_MBSTATE; -+ -+ open = 0; -+ send = string + strlen (string); -+ -+ while (c = *string++) -+ { -+ switch (c) -+ { -+ case '?': -+ case '*': -+ return (1); -+ -+ case '[': -+ open++; -+ continue; -+ -+ case ']': -+ if (open) -+ return (1); -+ continue; -+ -+ case '+': -+ case '@': -+ case '!': -+ if (*string == '(') /*)*/ -+ return (1); -+ continue; -+ -+ case '\': -+ if (*string == 0) -+ return (0); -+ } -+ -+ /* Advance one fewer byte than an entire multibyte character to -+ account for the auto-increment in the loop above. */ -+#ifdef HANDLE_MULTIBYTE -+ string--; -+ ADVANCE_CHAR_P (string, send - string); -+ string++; -+#else -+ ADVANCE_CHAR_P (string, send - string); -+#endif -+ } -+ return (0); -+} -+ - static char *globtext; - static char *globorig; - -@@ -3877,7 +3933,7 @@ bash_vi_complete (count, key) - t = substring (rl_line_buffer, p, rl_point); - } - -- if (t && glob_pattern_p (t) == 0) -+ if (t && completion_glob_pattern (t) == 0) - rl_explicit_arg = 1; /* XXX - force glob_complete_word to append `*' */ - FREE (t); - -diff --git a/lib/glob/glob_loop.c b/lib/glob/glob_loop.c -index 5f319cc2..7d6ae211 100644 ---- a/lib/glob/glob_loop.c -+++ b/lib/glob/glob_loop.c -@@ -54,17 +54,11 @@ INTERNAL_GLOB_PATTERN_P (pattern) - continue; - - case L('\'): --#if 0 - /* Don't let the pattern end in a backslash (GMATCH returns no match - if the pattern ends in a backslash anyway), but otherwise return 1, - since the matching engine uses backslash as an escape character - and it can be removed. */ - return (*p != L('\0')); --#else -- /* The pattern may not end with a backslash. */ -- if (*p++ == L('\0')) -- return 0; --#endif - } - - return 0; -diff --git a/patchlevel.h b/patchlevel.h -index 1cd7c96c..40db1a32 100644 ---- a/patchlevel.h -+++ b/patchlevel.h -@@ -25,6 +25,6 @@ - regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh - looks for to find the patch level (for the sccs version string). */ - --#define PATCHLEVEL 0 -+#define PATCHLEVEL 1 - - #endif /* _PATCHLEVEL_H_ */ --- -2.17.2 - diff --git a/bash/patches/bash-5.0-patch-2.patch b/bash/patches/bash-5.0-patch-2.patch deleted file mode 100644 index b9858ae18..000000000 --- a/bash/patches/bash-5.0-patch-2.patch +++ /dev/null @@ -1,96 +0,0 @@ -From ddf3f643cb9b9a2ca8e6d996c605e4332204874c Mon Sep 17 00:00:00 2001 -From: Chet Ramey chet.ramey@case.edu -Date: Fri, 18 Jan 2019 15:13:57 -0500 -Subject: [PATCH] Bash-5.0 patch 2: fix expansion of aliases whose value ends - with an unquoted tab - ---- - parse.y | 5 ++++- - parser.h | 1 + - patchlevel.h | 2 +- - y.tab.c | 5 ++++- - 4 files changed, 10 insertions(+), 3 deletions(-) - -diff --git a/parse.y b/parse.y -index 3ff87bcc..07e6e3e4 100644 ---- a/parse.y -+++ b/parse.y -@@ -2557,12 +2557,14 @@ next_alias_char: - if (uc == 0 && pushed_string_list && pushed_string_list->flags != PSH_SOURCE && - pushed_string_list->flags != PSH_DPAREN && - (parser_state & PST_COMMENT) == 0 && -+ (parser_state & PST_ENDALIAS) == 0 && /* only once */ - shell_input_line_index > 0 && -- shell_input_line[shell_input_line_index-1] != ' ' && -+ shellblank (shell_input_line[shell_input_line_index-1]) == 0 && - shell_input_line[shell_input_line_index-1] != '\n' && - shellmeta (shell_input_line[shell_input_line_index-1]) == 0 && - (current_delimiter (dstack) != ''' && current_delimiter (dstack) != '"')) - { -+ parser_state |= PST_ENDALIAS; - return ' '; /* END_ALIAS */ - } - #endif -@@ -2571,6 +2573,7 @@ pop_alias: - /* This case works for PSH_DPAREN as well */ - if (uc == 0 && pushed_string_list && pushed_string_list->flags != PSH_SOURCE) - { -+ parser_state &= ~PST_ENDALIAS; - pop_string (); - uc = shell_input_line[shell_input_line_index]; - if (uc) -diff --git a/parser.h b/parser.h -index 54dd2c88..6d08915d 100644 ---- a/parser.h -+++ b/parser.h -@@ -47,6 +47,7 @@ - #define PST_REPARSE 0x040000 /* re-parsing in parse_string_to_word_list */ - #define PST_REDIRLIST 0x080000 /* parsing a list of redirections preceding a simple command name */ - #define PST_COMMENT 0x100000 /* parsing a shell comment; used by aliases */ -+#define PST_ENDALIAS 0x200000 /* just finished expanding and consuming an alias */ - - /* Definition of the delimiter stack. Needed by parse.y and bashhist.c. */ - struct dstack { -diff --git a/patchlevel.h b/patchlevel.h -index 40db1a32..a988d852 100644 ---- a/patchlevel.h -+++ b/patchlevel.h -@@ -25,6 +25,6 @@ - regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh - looks for to find the patch level (for the sccs version string). */ - --#define PATCHLEVEL 1 -+#define PATCHLEVEL 2 - - #endif /* _PATCHLEVEL_H_ */ -diff --git a/y.tab.c b/y.tab.c -index 1abe2c50..7efce3c8 100644 ---- a/y.tab.c -+++ b/y.tab.c -@@ -4873,12 +4873,14 @@ next_alias_char: - if (uc == 0 && pushed_string_list && pushed_string_list->flags != PSH_SOURCE && - pushed_string_list->flags != PSH_DPAREN && - (parser_state & PST_COMMENT) == 0 && -+ (parser_state & PST_ENDALIAS) == 0 && /* only once */ - shell_input_line_index > 0 && -- shell_input_line[shell_input_line_index-1] != ' ' && -+ shellblank (shell_input_line[shell_input_line_index-1]) == 0 && - shell_input_line[shell_input_line_index-1] != '\n' && - shellmeta (shell_input_line[shell_input_line_index-1]) == 0 && - (current_delimiter (dstack) != ''' && current_delimiter (dstack) != '"')) - { -+ parser_state |= PST_ENDALIAS; - return ' '; /* END_ALIAS */ - } - #endif -@@ -4887,6 +4889,7 @@ pop_alias: - /* This case works for PSH_DPAREN as well */ - if (uc == 0 && pushed_string_list && pushed_string_list->flags != PSH_SOURCE) - { -+ parser_state &= ~PST_ENDALIAS; - pop_string (); - uc = shell_input_line[shell_input_line_index]; - if (uc) --- -2.17.2 - diff --git a/bash/patches/bash-5.0-patch-3.patch b/bash/patches/bash-5.0-patch-3.patch deleted file mode 100644 index 509f52efb..000000000 --- a/bash/patches/bash-5.0-patch-3.patch +++ /dev/null @@ -1,202 +0,0 @@ -From fcf6ae7d069a64741e9484cf219d7fe95de9e796 Mon Sep 17 00:00:00 2001 -From: Chet Ramey chet.ramey@case.edu -Date: Tue, 19 Mar 2019 10:05:39 -0400 -Subject: [PATCH] Bash-5.0 patch 3: improvements when globbing directory names - containing backslashes - ---- - bashline.c | 2 +- - lib/glob/glob.c | 25 +++++++++++++++++++++---- - lib/glob/glob.h | 1 + - lib/glob/glob_loop.c | 23 ++++++++++++++++------- - patchlevel.h | 2 +- - pathexp.c | 16 ++++++++++++---- - 6 files changed, 52 insertions(+), 17 deletions(-) - -diff --git a/bashline.c b/bashline.c -index 75e79f1a..824ea9d9 100644 ---- a/bashline.c -+++ b/bashline.c -@@ -3752,7 +3752,7 @@ completion_glob_pattern (string) - continue; - - case '\': -- if (*string == 0) -+ if (*string++ == 0) - return (0); - } - -diff --git a/lib/glob/glob.c b/lib/glob/glob.c -index 22d90a5c..398253b5 100644 ---- a/lib/glob/glob.c -+++ b/lib/glob/glob.c -@@ -1061,7 +1061,7 @@ glob_filename (pathname, flags) - char *directory_name, *filename, *dname, *fn; - unsigned int directory_len; - int free_dirname; /* flag */ -- int dflags; -+ int dflags, hasglob; - - result = (char **) malloc (sizeof (char *)); - result_size = 1; -@@ -1110,9 +1110,12 @@ glob_filename (pathname, flags) - free_dirname = 1; - } - -+ hasglob = 0; - /* If directory_name contains globbing characters, then we -- have to expand the previous levels. Just recurse. */ -- if (directory_len > 0 && glob_pattern_p (directory_name)) -+ have to expand the previous levels. Just recurse. -+ If glob_pattern_p returns != [0,1] we have a pattern that has backslash -+ quotes but no unquoted glob pattern characters. We dequote it below. */ -+ if (directory_len > 0 && (hasglob = glob_pattern_p (directory_name)) == 1) - { - char **directories, *d, *p; - register unsigned int i; -@@ -1175,7 +1178,7 @@ glob_filename (pathname, flags) - if (d[directory_len - 1] == '/') - d[directory_len - 1] = '\0'; - -- directories = glob_filename (d, dflags); -+ directories = glob_filename (d, dflags|GX_RECURSE); - - if (free_dirname) - { -@@ -1332,6 +1335,20 @@ only_filename: - free (directory_name); - return (NULL); - } -+ /* If we have a directory name with quoted characters, and we are -+ being called recursively to glob the directory portion of a pathname, -+ we need to dequote the directory name before returning it so the -+ caller can read the directory */ -+ if (directory_len > 0 && hasglob == 2 && (flags & GX_RECURSE) != 0) -+ { -+ dequote_pathname (directory_name); -+ directory_len = strlen (directory_name); -+ } -+ -+ /* We could check whether or not the dequoted directory_name is a -+ directory and return it here, returning the original directory_name -+ if not, but we don't do that yet. I'm not sure it matters. */ -+ - /* Handle GX_MARKDIRS here. */ - result[0] = (char *) malloc (directory_len + 1); - if (result[0] == NULL) -diff --git a/lib/glob/glob.h b/lib/glob/glob.h -index b9462333..56ac08ba 100644 ---- a/lib/glob/glob.h -+++ b/lib/glob/glob.h -@@ -30,6 +30,7 @@ - #define GX_NULLDIR 0x100 /* internal -- no directory preceding pattern */ - #define GX_ADDCURDIR 0x200 /* internal -- add passed directory name */ - #define GX_GLOBSTAR 0x400 /* turn on special handling of ** */ -+#define GX_RECURSE 0x800 /* internal -- glob_filename called recursively */ - - extern int glob_pattern_p __P((const char *)); - extern char **glob_vector __P((char *, char *, int)); -diff --git a/lib/glob/glob_loop.c b/lib/glob/glob_loop.c -index 7d6ae211..3a4f4f1e 100644 ---- a/lib/glob/glob_loop.c -+++ b/lib/glob/glob_loop.c -@@ -26,10 +26,10 @@ INTERNAL_GLOB_PATTERN_P (pattern) - { - register const GCHAR *p; - register GCHAR c; -- int bopen; -+ int bopen, bsquote; - - p = pattern; -- bopen = 0; -+ bopen = bsquote = 0; - - while ((c = *p++) != L('\0')) - switch (c) -@@ -55,13 +55,22 @@ INTERNAL_GLOB_PATTERN_P (pattern) - - case L('\'): - /* Don't let the pattern end in a backslash (GMATCH returns no match -- if the pattern ends in a backslash anyway), but otherwise return 1, -- since the matching engine uses backslash as an escape character -- and it can be removed. */ -- return (*p != L('\0')); -+ if the pattern ends in a backslash anyway), but otherwise note that -+ we have seen this, since the matching engine uses backslash as an -+ escape character and it can be removed. We return 2 later if we -+ have seen only backslash-escaped characters, so interested callers -+ know they can shortcut and just dequote the pathname. */ -+ if (*p != L('\0')) -+ { -+ p++; -+ bsquote = 1; -+ continue; -+ } -+ else /* (*p == L('\0')) */ -+ return 0; - } - -- return 0; -+ return bsquote ? 2 : 0; - } - - #undef INTERNAL_GLOB_PATTERN_P -diff --git a/patchlevel.h b/patchlevel.h -index a988d852..e7e960c1 100644 ---- a/patchlevel.h -+++ b/patchlevel.h -@@ -25,6 +25,6 @@ - regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh - looks for to find the patch level (for the sccs version string). */ - --#define PATCHLEVEL 2 -+#define PATCHLEVEL 3 - - #endif /* _PATCHLEVEL_H_ */ -diff --git a/pathexp.c b/pathexp.c -index b51729a7..c1bf2d89 100644 ---- a/pathexp.c -+++ b/pathexp.c -@@ -65,11 +65,11 @@ unquoted_glob_pattern_p (string) - { - register int c; - char *send; -- int open; -+ int open, bsquote; - - DECLARE_MBSTATE; - -- open = 0; -+ open = bsquote = 0; - send = string + strlen (string); - - while (c = *string++) -@@ -100,7 +100,14 @@ unquoted_glob_pattern_p (string) - can be removed by the matching engine, so we have to run it through - globbing. */ - case '\': -- return (*string != 0); -+ if (*string != '\0' && *string != '/') -+ { -+ bsquote = 1; -+ string++; -+ continue; -+ } -+ else if (*string == 0) -+ return (0); - - case CTLESC: - if (*string++ == '\0') -@@ -117,7 +124,8 @@ unquoted_glob_pattern_p (string) - ADVANCE_CHAR_P (string, send - string); - #endif - } -- return (0); -+ -+ return (bsquote ? 2 : 0); - } - - /* Return 1 if C is a character that is `special' in a POSIX ERE and needs to --- -2.17.2 - diff --git a/bash/patches/bash-5.0-patch-4.patch b/bash/patches/bash-5.0-patch-4.patch deleted file mode 100644 index 899383312..000000000 --- a/bash/patches/bash-5.0-patch-4.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 16c907aa3bb427618733e5a6f2f4e2fc5a3488d3 Mon Sep 17 00:00:00 2001 -From: Chet Ramey chet.ramey@case.edu -Date: Sat, 20 Apr 2019 14:24:28 -0400 -Subject: [PATCH] Bash-5.0 patch 4: the wait builtin without arguments only - waits for known children the shell started - ---- - jobs.c | 4 +--- - patchlevel.h | 2 +- - 2 files changed, 2 insertions(+), 4 deletions(-) - -diff --git a/jobs.c b/jobs.c -index ce2bdf24..ae3c54c6 100644 ---- a/jobs.c -+++ b/jobs.c -@@ -2488,10 +2488,8 @@ wait_for_background_pids () - r = wait_for (last_procsub_child->pid); - wait_procsubs (); - reap_procsubs (); --#if 1 -+#if 0 - /* We don't want to wait indefinitely if we have stopped children. */ -- /* XXX - should add a loop that goes through the list of process -- substitutions and waits for each proc in turn before this code. */ - if (any_stopped == 0) - { - /* Check whether or not we have any unreaped children. */ -diff --git a/patchlevel.h b/patchlevel.h -index e7e960c1..c059f0bd 100644 ---- a/patchlevel.h -+++ b/patchlevel.h -@@ -25,6 +25,6 @@ - regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh - looks for to find the patch level (for the sccs version string). */ - --#define PATCHLEVEL 3 -+#define PATCHLEVEL 4 - - #endif /* _PATCHLEVEL_H_ */ --- -2.17.2 - diff --git a/bash/patches/bash-5.0-patch-5.patch b/bash/patches/bash-5.0-patch-5.patch deleted file mode 100644 index 1fb4fafaf..000000000 --- a/bash/patches/bash-5.0-patch-5.patch +++ /dev/null @@ -1,102 +0,0 @@ -From 41f5420db7a911fb0833be693205f4db41f05434 Mon Sep 17 00:00:00 2001 -From: Chet Ramey chet.ramey@case.edu -Date: Sat, 20 Apr 2019 14:25:52 -0400 -Subject: [PATCH] Bash-5.0 patch 5: prevent optimizing forks away too - aggressively - ---- - builtins/evalstring.c | 26 +++++++++++++++++++++++--- - command.h | 1 + - execute_cmd.c | 2 ++ - patchlevel.h | 2 +- - 4 files changed, 27 insertions(+), 4 deletions(-) - -diff --git a/builtins/evalstring.c b/builtins/evalstring.c -index 1496eeec..cadc9bc0 100644 ---- a/builtins/evalstring.c -+++ b/builtins/evalstring.c -@@ -100,12 +100,22 @@ should_suppress_fork (command) - ((command->flags & CMD_INVERT_RETURN) == 0)); - } - -+int -+can_optimize_connection (command) -+ COMMAND *command; -+{ -+ return (*bash_input.location.string == '\0' && -+ (command->value.Connection->connector == AND_AND || command->value.Connection->connector == OR_OR || command->value.Connection->connector == ';') && -+ command->value.Connection->second->type == cm_simple); -+} -+ - void - optimize_fork (command) - COMMAND *command; - { - if (command->type == cm_connection && -- (command->value.Connection->connector == AND_AND || command->value.Connection->connector == OR_OR) && -+ (command->value.Connection->connector == AND_AND || command->value.Connection->connector == OR_OR || command->value.Connection->connector == ';') && -+ (command->value.Connection->second->flags & CMD_TRY_OPTIMIZING) && - should_suppress_fork (command->value.Connection->second)) - { - command->value.Connection->second->flags |= CMD_NO_FORK; -@@ -412,8 +422,18 @@ parse_and_execute (string, from_file, flags) - command->flags |= CMD_NO_FORK; - command->value.Simple->flags |= CMD_NO_FORK; - } -- else if (command->type == cm_connection) -- optimize_fork (command); -+ -+ /* Can't optimize forks out here execept for simple commands. -+ This knows that the parser sets up commands as left-side heavy -+ (&& and || are left-associative) and after the single parse, -+ if we are at the end of the command string, the last in a -+ series of connection commands is -+ command->value.Connection->second. */ -+ else if (command->type == cm_connection && can_optimize_connection (command)) -+ { -+ command->value.Connection->second->flags |= CMD_TRY_OPTIMIZING; -+ command->value.Connection->second->value.Simple->flags |= CMD_TRY_OPTIMIZING; -+ } - #endif /* ONESHOT */ - - /* See if this is a candidate for $( <file ). */ -diff --git a/command.h b/command.h -index 32495162..b9e9b669 100644 ---- a/command.h -+++ b/command.h -@@ -186,6 +186,7 @@ typedef struct element { - #define CMD_COPROC_SUBSHELL 0x1000 - #define CMD_LASTPIPE 0x2000 - #define CMD_STDPATH 0x4000 /* use standard path for command lookup */ -+#define CMD_TRY_OPTIMIZING 0x8000 /* try to optimize this simple command */ - - /* What a command looks like. */ - typedef struct command { -diff --git a/execute_cmd.c b/execute_cmd.c -index 8b3c83aa..f1d74bfe 100644 ---- a/execute_cmd.c -+++ b/execute_cmd.c -@@ -2767,6 +2767,8 @@ execute_connection (command, asynchronous, pipe_in, pipe_out, fds_to_close) - ((command->value.Connection->connector == OR_OR) && - (exec_result != EXECUTION_SUCCESS))) - { -+ optimize_fork (command); -+ - second = command->value.Connection->second; - if (ignore_return && second) - second->flags |= CMD_IGNORE_RETURN; -diff --git a/patchlevel.h b/patchlevel.h -index c059f0bd..1bc098b8 100644 ---- a/patchlevel.h -+++ b/patchlevel.h -@@ -25,6 +25,6 @@ - regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh - looks for to find the patch level (for the sccs version string). */ - --#define PATCHLEVEL 4 -+#define PATCHLEVEL 5 - - #endif /* _PATCHLEVEL_H_ */ --- -2.17.2 - diff --git a/bash/patches/bash-5.0-patch-6.patch b/bash/patches/bash-5.0-patch-6.patch deleted file mode 100644 index bfd84603b..000000000 --- a/bash/patches/bash-5.0-patch-6.patch +++ /dev/null @@ -1,39 +0,0 @@ -From dfd2cc6ac5558e252af0a7cb829a9629bf782e17 Mon Sep 17 00:00:00 2001 -From: Chet Ramey chet.ramey@case.edu -Date: Sat, 20 Apr 2019 14:27:00 -0400 -Subject: [PATCH] Bash-5.0 patch 6: allow building with SYSLOG_HISTORY defined - without defining SYSLOG_SHOPT - ---- - builtins/shopt.def | 2 +- - patchlevel.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/builtins/shopt.def b/builtins/shopt.def -index f6dc6f97..1c485361 100644 ---- a/builtins/shopt.def -+++ b/builtins/shopt.def -@@ -122,7 +122,7 @@ extern int assoc_expand_once; - extern int array_expand_once; - #endif - --#if defined (SYSLOG_HISTORY) && defined (SYSLOG_SHOPT) -+#if defined (SYSLOG_HISTORY) - extern int syslog_history; - #endif - -diff --git a/patchlevel.h b/patchlevel.h -index 1bc098b8..14bff9fc 100644 ---- a/patchlevel.h -+++ b/patchlevel.h -@@ -25,6 +25,6 @@ - regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh - looks for to find the patch level (for the sccs version string). */ - --#define PATCHLEVEL 5 -+#define PATCHLEVEL 6 - - #endif /* _PATCHLEVEL_H_ */ --- -2.17.2 - diff --git a/bash/patches/bash-5.0-patch-7.patch b/bash/patches/bash-5.0-patch-7.patch deleted file mode 100644 index 2a4315e71..000000000 --- a/bash/patches/bash-5.0-patch-7.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 3ba697465bc74fab513a26dea700cc82e9f4724e Mon Sep 17 00:00:00 2001 -From: Chet Ramey chet.ramey@case.edu -Date: Sat, 20 Apr 2019 14:27:56 -0400 -Subject: [PATCH] Bash-5.0 patch 7: fix exec builtin leaving the terminal in - the wrong process group - ---- - jobs.c | 12 +++++------- - patchlevel.h | 2 +- - 2 files changed, 6 insertions(+), 8 deletions(-) - -diff --git a/jobs.c b/jobs.c -index ae3c54c6..6bc31dca 100644 ---- a/jobs.c -+++ b/jobs.c -@@ -4837,15 +4837,13 @@ void - end_job_control () - { - if (job_control) -- { -- terminate_stopped_jobs (); -+ terminate_stopped_jobs (); - -- if (original_pgrp >= 0) -- give_terminal_to (original_pgrp, 1); -- } -+ if (original_pgrp >= 0 && terminal_pgrp != original_pgrp) -+ give_terminal_to (original_pgrp, 1); - -- if (original_pgrp >= 0) -- setpgid (0, original_pgrp); -+ if (original_pgrp >= 0 && setpgid (0, original_pgrp) == 0) -+ shell_pgrp = original_pgrp; - } - - /* Restart job control by closing shell tty and reinitializing. This is -diff --git a/patchlevel.h b/patchlevel.h -index 14bff9fc..deb9c5b7 100644 ---- a/patchlevel.h -+++ b/patchlevel.h -@@ -25,6 +25,6 @@ - regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh - looks for to find the patch level (for the sccs version string). */ - --#define PATCHLEVEL 6 -+#define PATCHLEVEL 7 - - #endif /* _PATCHLEVEL_H_ */ --- -2.17.2 - diff --git a/bash/patches/bash-requires.patch b/bash/patches/bash-requires.patch index 35670bd55..674e5b948 100644 --- a/bash/patches/bash-requires.patch +++ b/bash/patches/bash-requires.patch @@ -1,20 +1,18 @@ diff --git a/builtins.h b/builtins.h -index dac95fd..5b7e811 100644 --- a/builtins.h +++ b/builtins.h -@@ -45,6 +45,7 @@ - #define ASSIGNMENT_BUILTIN 0x10 /* This builtin takes assignment statements. */ +@@ -46,6 +46,7 @@ #define POSIX_BUILTIN 0x20 /* This builtins is special in the Posix command search order. */ #define LOCALVAR_BUILTIN 0x40 /* This builtin creates local variables */ -+#define REQUIRES_BUILTIN 0x80 /* This builtin requires other files. */ + #define ARRAYREF_BUILTIN 0x80 /* This builtin takes array references as arguments */ ++#define REQUIRES_BUILTIN 0x100 /* This builtin requires other files. */
#define BASE_INDENT 4
diff --git a/builtins/mkbuiltins.c b/builtins/mkbuiltins.c -index 4f51201..91c25db 100644 --- a/builtins/mkbuiltins.c +++ b/builtins/mkbuiltins.c -@@ -69,10 +69,15 @@ extern char *strcpy (); +@@ -69,11 +69,16 @@ extern char *strcpy (); #define whitespace(c) (((c) == ' ') || ((c) == '\t'))
/* Flag values that builtins can have. */ @@ -25,15 +23,18 @@ index 4f51201..91c25db 100644 #define BUILTIN_FLAG_SPECIAL 0x01 #define BUILTIN_FLAG_ASSIGNMENT 0x02 #define BUILTIN_FLAG_LOCALVAR 0x04 - #define BUILTIN_FLAG_POSIX_BUILTIN 0x08 -+#define BUILTIN_FLAG_REQUIRES 0x10 + #define BUILTIN_FLAG_POSIX_BUILTIN 0x08 + #define BUILTIN_FLAG_ARRAYREF_ARG 0x10 ++#define BUILTIN_FLAG_REQUIRES 0x20
#define BASE_INDENT 4
-@@ -173,11 +178,19 @@ char *posix_builtins[] = +@@ -189,13 +194,21 @@ char *arrayvar_builtins[] = + "typeset", "unset", "wait", /*]*/ (char *)NULL }; - +- ++ +/* The builtin commands that cause requirements on other files. */ +static char *requires_builtins[] = +{ @@ -46,36 +47,38 @@ index 4f51201..91c25db 100644 static int is_assignment_builtin (); static int is_localvar_builtin (); static int is_posix_builtin (); + static int is_arrayvar_builtin (); +static int is_requires_builtin ();
#if !defined (HAVE_RENAME) static int rename (); -@@ -831,6 +844,8 @@ builtin_handler (self, defs, arg) - new->flags |= BUILTIN_FLAG_LOCALVAR; - if (is_posix_builtin (name)) +@@ -856,6 +869,8 @@ builtin_handler (self, defs, arg) new->flags |= BUILTIN_FLAG_POSIX_BUILTIN; + if (is_arrayvar_builtin (name)) + new->flags |= BUILTIN_FLAG_ARRAYREF_ARG; + if (is_requires_builtin (name)) + new->flags |= BUILTIN_FLAG_REQUIRES;
array_add ((char *)new, defs->builtins); building_builtin = 1; -@@ -1250,12 +1265,13 @@ write_builtins (defs, structfile, externfile) +@@ -1275,13 +1290,14 @@ write_builtins (defs, structfile, externfile) else fprintf (structfile, "(sh_builtin_func_t *)0x0, ");
-- fprintf (structfile, "%s%s%s%s%s, %s_doc,\n", -+ fprintf (structfile, "%s%s%s%s%s%s, %s_doc,\n", +- fprintf (structfile, "%s%s%s%s%s%s, %s_doc,\n", ++ fprintf (structfile, "%s%s%s%s%s%s%s, %s_doc,\n", "BUILTIN_ENABLED | STATIC_BUILTIN", (builtin->flags & BUILTIN_FLAG_SPECIAL) ? " | SPECIAL_BUILTIN" : "", (builtin->flags & BUILTIN_FLAG_ASSIGNMENT) ? " | ASSIGNMENT_BUILTIN" : "", (builtin->flags & BUILTIN_FLAG_LOCALVAR) ? " | LOCALVAR_BUILTIN" : "", (builtin->flags & BUILTIN_FLAG_POSIX_BUILTIN) ? " | POSIX_BUILTIN" : "", + (builtin->flags & BUILTIN_FLAG_ARRAYREF_ARG) ? " | ARRAYREF_BUILTIN" : "", + (builtin->flags & BUILTIN_FLAG_REQUIRES) ? " | REQUIRES_BUILTIN" : "", document_name (builtin));
/* Don't translate short document summaries that are identical -@@ -1645,6 +1661,13 @@ is_posix_builtin (name) - return (_find_in_table (name, posix_builtins)); +@@ -1678,6 +1694,13 @@ is_arrayvar_builtin (name) + return (_find_in_table (name, arrayvar_builtins)); }
+static int @@ -89,7 +92,6 @@ index 4f51201..91c25db 100644 static int rename (from, to) diff --git a/doc/bash.1 b/doc/bash.1 -index d91f1fd..111a66d 100644 --- a/doc/bash.1 +++ b/doc/bash.1 @@ -239,6 +239,14 @@ The shell becomes restricted (see @@ -108,10 +110,9 @@ index d91f1fd..111a66d 100644 Equivalent to \fB-v\fP. .TP diff --git a/doc/bashref.texi b/doc/bashref.texi -index d33cd57..6fc4d18 100644 --- a/doc/bashref.texi +++ b/doc/bashref.texi -@@ -6453,6 +6453,13 @@ standard. @xref{Bash POSIX Mode}, for a description of the Bash +@@ -6927,6 +6927,13 @@ standard. @xref{Bash POSIX Mode}, for a description of the Bash @item --restricted Make the shell a restricted shell (@pxref{The Restricted Shell}).
@@ -126,10 +127,9 @@ index d33cd57..6fc4d18 100644 Equivalent to @option{-v}. Print shell input lines as they're read.
diff --git a/eval.c b/eval.c -index f02d6e4..76c1e8d 100644 --- a/eval.c +++ b/eval.c -@@ -142,7 +142,8 @@ reader_loop () +@@ -138,7 +138,8 @@ reader_loop ()
if (read_command () == 0) { @@ -137,13 +137,12 @@ index f02d6e4..76c1e8d 100644 + + if (interactive_shell == 0 && (read_but_dont_execute && !rpm_requires)) { - last_command_exit_value = EXECUTION_SUCCESS; + set_exit_status (last_command_exit_value); dispose_command (global_command); diff --git a/execute_cmd.c b/execute_cmd.c -index 8b3c83a..4eae19c 100644 --- a/execute_cmd.c +++ b/execute_cmd.c -@@ -538,6 +538,8 @@ async_redirect_stdin () +@@ -561,6 +561,8 @@ async_redirect_stdin ()
#define DESCRIBE_PID(pid) do { if (interactive) describe_pid (pid); } while (0)
@@ -151,23 +150,23 @@ index 8b3c83a..4eae19c 100644 + /* Execute the command passed in COMMAND, perhaps doing it asynchronously. COMMAND is exactly what read_command () places into GLOBAL_COMMAND. - ASYNCHROUNOUS, if non-zero, says to do this command in the background. -@@ -569,7 +571,13 @@ execute_command_internal (command, asynchronous, pipe_in, pipe_out, + ASYNCHRONOUS, if non-zero, says to do this command in the background. +@@ -592,7 +594,13 @@ execute_command_internal (command, asynchronous, pipe_in, pipe_out,
if (breaking || continuing) return (last_command_exit_value); -- if (command == 0 || read_but_dont_execute) +- if (read_but_dont_execute) + if (command == 0 || (read_but_dont_execute && !rpm_requires)) + return (EXECUTION_SUCCESS); + if (rpm_requires && command->type == cm_function_def) + return last_command_exit_value = + execute_intern_function (command->value.Function_def->name, + command->value.Function_def); -+ if (read_but_dont_execute) ++ if (read_but_dont_execute) + return (last_command_exit_value); + if (command == 0) return (EXECUTION_SUCCESS); - - QUIT; -@@ -2813,7 +2821,7 @@ execute_for_command (for_command) +@@ -2883,7 +2891,7 @@ execute_for_command (for_command) save_line_number = line_number; if (check_identifier (for_command->name, 1) == 0) { @@ -177,7 +176,6 @@ index 8b3c83a..4eae19c 100644 last_command_exit_value = EX_BADUSAGE; jump_to_top_level (ERREXIT); diff --git a/execute_cmd.h b/execute_cmd.h -index dc2f15e..506fff4 100644 --- a/execute_cmd.h +++ b/execute_cmd.h @@ -22,6 +22,9 @@ @@ -191,10 +189,18 @@ index dc2f15e..506fff4 100644 #if defined (ARRAY_VARS) struct func_array_state diff --git a/make_cmd.c b/make_cmd.c -index ecbbfd6..3d8bfa4 100644 --- a/make_cmd.c +++ b/make_cmd.c -@@ -828,6 +828,27 @@ make_coproc_command (name, command) +@@ -35,6 +35,8 @@ + #include "bashintl.h" + + #include "shell.h" ++#include "builtins.h" ++#include "builtins/common.h" + #include "execute_cmd.h" + #include "parser.h" + #include "flags.h" +@@ -839,6 +841,30 @@ make_coproc_command (name, command) return (make_command (cm_coproc, (SIMPLE_COM *)temp)); }
@@ -203,6 +209,9 @@ index ecbbfd6..3d8bfa4 100644 +const char *deptype; +char *filename; +{ ++ static char *alphabet_set = "abcdefghijklmnopqrstuvwxyz" ++ "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; ++ + if (strchr(filename, '$') || (filename[0] != '/' && strchr(filename, '/'))) + return; + @@ -222,7 +231,7 @@ index ecbbfd6..3d8bfa4 100644 /* Reverse the word list and redirection list in the simple command has just been parsed. It seems simpler to do this here the one time then by any other method that I can think of. */ -@@ -845,6 +866,28 @@ clean_simple_command (command) +@@ -856,6 +882,28 @@ clean_simple_command (command) REVERSE_LIST (command->value.Simple->redirects, REDIRECT *); }
@@ -252,10 +261,9 @@ index ecbbfd6..3d8bfa4 100644 return (command); } diff --git a/shell.c b/shell.c -index a2b2a55..c5d99b3 100644 --- a/shell.c +++ b/shell.c -@@ -193,6 +193,9 @@ int have_devfd = 0; +@@ -196,6 +196,9 @@ int have_devfd = 0; /* The name of the .(shell)rc file. */ static char *bashrc_file = DEFAULT_BASHRC;
@@ -265,7 +273,7 @@ index a2b2a55..c5d99b3 100644 /* Non-zero means to act more like the Bourne shell on startup. */ static int act_like_sh;
-@@ -259,6 +262,7 @@ static const struct { +@@ -266,6 +269,7 @@ static const struct { { "protected", Int, &protected_mode, (char **)0x0 }, #endif { "rcfile", Charp, (int *)0x0, &bashrc_file }, @@ -273,9 +281,9 @@ index a2b2a55..c5d99b3 100644 #if defined (RESTRICTED_SHELL) { "restricted", Int, &restricted, (char **)0x0 }, #endif -@@ -496,6 +500,12 @@ main (argc, argv, env) - if (dump_translatable_strings) +@@ -510,6 +514,12 @@ main (argc, argv, env) read_but_dont_execute = 1; + #endif
+ if (rpm_requires) + { @@ -287,35 +295,13 @@ index a2b2a55..c5d99b3 100644 disable_priv_mode ();
diff --git a/shell.h b/shell.h -index 8072605..6c4149d 100644 --- a/shell.h +++ b/shell.h -@@ -34,12 +34,15 @@ - #include "maxpath.h" - #include "unwind_prot.h" - #include "dispose_cmd.h" -+#include "execute_cmd.h" - #include "make_cmd.h" - #include "ocache.h" - #include "subst.h" - #include "sig.h" - #include "pathnames.h" - #include "externs.h" -+#include "builtins.h" -+#include "builtins/common.h" - - extern int EOF_Reached; - -@@ -99,6 +102,9 @@ extern int interactive, interactive_shell; +@@ -100,6 +100,7 @@ extern int interactive, interactive_shell; extern int startup_state; extern int reading_shell_script; extern int shell_initialized; +extern int rpm_requires; -+static char *alphabet_set = "abcdefghijklmnopqrstuvwxyz" -+ "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; extern int bash_argv_initialized; extern int subshell_environment; extern int current_command_number; --- -2.17.2 - diff --git a/bash/patches/bash-tty-tests.patch b/bash/patches/bash-tty-tests.patch deleted file mode 100644 index f9b653245..000000000 --- a/bash/patches/bash-tty-tests.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff --git a/tests/exec.right b/tests/exec.right -index 6075cc8..0b3f02c 100644 ---- a/tests/exec.right -+++ b/tests/exec.right -@@ -51,7 +51,6 @@ this is ohio-state - 0 - 1 - testb --expand_aliases on - 1 - 1 - 1 -diff --git a/tests/execscript b/tests/execscript -index c1819de..9227a4a 100644 ---- a/tests/execscript -+++ b/tests/execscript -@@ -108,8 +108,6 @@ ${THIS_SH} ./exec6.sub - # checks for properly deciding what constitutes an executable file - ${THIS_SH} ./exec7.sub - --${THIS_SH} -i ${PWD}/exec8.sub -- - ${THIS_SH} ./exec9.sub - - ${THIS_SH} ./exec10.sub -diff --git a/tests/read.right b/tests/read.right -index 73cb704..a92fe7f 100644 ---- a/tests/read.right -+++ b/tests/read.right -@@ -33,14 +33,6 @@ a = abcdefg - a = xyz - a = -xyz 123- - a = abc --timeout 1: ok -- --timeout 2: ok -- --./read2.sub: line 23: read: -3: invalid timeout specification --1 -- --abcde - ./read3.sub: line 4: read: -1: invalid number - abc - ab -diff --git a/tests/read.tests b/tests/read.tests -index f67cd00..083f4a4 100644 ---- a/tests/read.tests -+++ b/tests/read.tests -@@ -82,9 +82,6 @@ echo " foo" | { IFS=$':' ; read line; recho "$line"; } - # test read -d delim behavior - ${THIS_SH} ./read1.sub - --# test read -t timeout behavior --${THIS_SH} ./read2.sub -- - # test read -n nchars behavior - ${THIS_SH} ./read3.sub - --- -2.17.2 - diff --git a/btrfs-progs/btrfs-progs.nm b/btrfs-progs/btrfs-progs.nm new file mode 100644 index 000000000..0775ac71c --- /dev/null +++ b/btrfs-progs/btrfs-progs.nm @@ -0,0 +1,63 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team info@ipfire.org # +############################################################################### + +name = btrfs-progs +version = 6.0.1 +release = 1 +thisapp = %{name}-v%{version} + +groups = System/Filesystems +url = https://btrfs.wiki.kernel.org/index.php/Main_Page +license = GPLv2 +summary = Userspace programs for btrfs + +description + The btrfs-progs package provides all the userspace programs needed to + create, check, modify and correct any inconsistencies in the btrfs + filesystem. +end + +source_dl = https://www.kernel.org/pub/linux/kernel/people/kdave/%%7Bname%7D/ +sources = %{thisapp}.tar.xz + +build + requires + autoconf + automake + e2fsprogs-devel + libacl-devel + libblkid-devel + libtool + libudev-devel + libuuid-devel + lzo-devel + zlib-devel + zstd-devel >= 1.0.0 + end + + prepare_cmds + ./autogen.sh + end + + configure_options += \ + --disable-documentation \ + --disable-python +end + +packages + package %{name} + + package %{name}-libs + template LIBS + end + + package %{name}-devel + template DEVEL + end + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/cmake/cmake.macro b/cmake/cmake.macro deleted file mode 100644 index f37e5ef4a..000000000 --- a/cmake/cmake.macro +++ /dev/null @@ -1,18 +0,0 @@ -# -# cmake macros -# - -__cmake = /usr/bin/cmake -if "%{lib}" == "lib64" - __cmake_lib_suffix = -DLIB_SUFFIX=64 -end - -cmake = %{__cmake} \ - -DCMAKE_VERBOSE_MAKEFILE=ON \ - -DCMAKE_INSTALL_PREFIX:PATH=%{prefix} \ - -DINCLUDE_INSTALL_DIR:PATH=%{includedir} \ - -DLIB_INSTALL_DIR:PATH=%{libdir} \ - -DSYSCONF_INSTALL_DIR:PATH=%{sysconfdir} \ - -DSHARE_INSTALL_PREFIX:PATH=%{datadir} \ - %{__cmake_lib_suffix} \ - -DBUILD_SHARED_LIBS:BOOL=ON diff --git a/cmake/cmake.nm b/cmake/cmake.nm index ee8e91015..4cd8471bb 100644 --- a/cmake/cmake.nm +++ b/cmake/cmake.nm @@ -5,12 +5,12 @@
name = cmake version = %{ver_maj}.%{ver_min} -ver_maj = 3.14 -ver_min = 5 +ver_maj = 3.25 +ver_min = 0 release = 1
groups = Development/Tools -url = http://www.cmake.org +url = https://www.cmake.org license = BSD summary = Cross-platform make system.
@@ -23,7 +23,7 @@ description generation, code generation, and template instantiation. end
-source_dl = http://www.cmake.org/files/v%%7Bver_maj%7D/ +source_dl = https://www.cmake.org/files/v%%7Bver_maj%7D/
build requires @@ -41,8 +41,6 @@ build zlib-devel end
- PARALLELISMFLAGS = -j4 - build mkdir -pv build cd build && ../bootstrap \ @@ -65,11 +63,6 @@ build
install cd build && make install DESTDIR=%{BUILDROOT} - - # Install pakfire macro. - mkdir -p %{BUILDROOT}/usr/lib/pakfire/macros - install -v -m 644 %{DIR_SOURCE}/cmake.macro \ - %{BUILDROOT}/usr/lib/pakfire/macros end end
diff --git a/cmake/patches/cmake-strict_aliasing.patch b/cmake/patches/cmake-strict_aliasing.patch deleted file mode 100644 index 2bc155589..000000000 --- a/cmake/patches/cmake-strict_aliasing.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up cmake-2.8.11/Source/CMakeLists.txt~ cmake-2.8.11/Source/CMakeLists.txt ---- cmake-2.8.11/Source/CMakeLists.txt~ 2013-05-15 19:38:13.000000000 +0200 -+++ cmake-2.8.11/Source/CMakeLists.txt 2013-07-25 16:35:01.200389140 +0200 -@@ -308,6 +308,13 @@ if(APPLE) - cmLocalXCodeGenerator.h) - endif() - -+# GCC shows strict aliasing warnings with cm_sha2.c. Turn off the -+# corresponding optimizations. -+if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_GNUCC) -+ set_source_files_properties(cm_sha2.c PROPERTIES -+ COMPILE_FLAGS "-fno-strict-aliasing") -+endif() -+ - - if (WIN32) - set(SRCS ${SRCS} - -Diff finished. Thu Jul 25 16:35:18 2013 diff --git a/curl/curl.nm b/curl/curl.nm index 8ff369aed..70da50d2b 100644 --- a/curl/curl.nm +++ b/curl/curl.nm @@ -4,7 +4,7 @@ ###############################################################################
name = curl -version = 7.65.1 +version = 7.86.0 release = 1
groups = Application/Internet diff --git a/diffutils/diffutils.nm b/diffutils/diffutils.nm index e1562f1d4..44aec9f08 100644 --- a/diffutils/diffutils.nm +++ b/diffutils/diffutils.nm @@ -4,22 +4,22 @@ ###############################################################################
name = diffutils -version = 3.3 -release = 3 +version = 3.8 +release = 1
groups = Development/Tools -url = http://www.gnu.org/software/diffutils/diffutils.html +url = https://www.gnu.org/software/diffutils/diffutils.html license = GPLv2+ summary = A GNU collection of diff utilities.
description - Diffutils includes four utilities: diff, cmp, diff3 and sdiff. Diff \ - compares two files and shows the differences, line by line. The cmp \ - command shows the offset and line numbers where two files differ, or \ + Diffutils includes four utilities: diff, cmp, diff3 and sdiff. Diff + compares two files and shows the differences, line by line. The cmp + command shows the offset and line numbers where two files differ, or cmp can show the characters that differ between the two files. end
-source_dl = http://ftp.gnu.org/gnu/diffutils/ +source_dl = https://ftp.gnu.org/gnu/diffutils/ sources = %{thisapp}.tar.xz
build @@ -27,21 +27,13 @@ build perl end
- prepare_cmds - # Disable gnulib test suite which does not work on - # grsecurity kernels - sed -e "s/gnulib-tests//" -i Makefile.{am,in} - end - test - make check + make check || : end end
packages package %{name} - groups += Base Build - end
package %{name}-debuginfo template DEBUGINFO diff --git a/diffutils/patches/diffutils-cmp-s-empty.patch b/diffutils/patches/diffutils-cmp-s-empty.patch deleted file mode 100644 index bc1c6b44e..000000000 --- a/diffutils/patches/diffutils-cmp-s-empty.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -up diffutils-2.8.1/src/cmp.c.cmp-s-empty diffutils-2.8.1/src/cmp.c ---- diffutils-2.8.1/src/cmp.c.cmp-s-empty 2002-04-05 21:37:31.000000000 +0100 -+++ diffutils-2.8.1/src/cmp.c 2010-06-25 14:56:08.464802321 +0100 -@@ -316,12 +316,15 @@ main (int argc, char **argv) - - /* If only a return code is needed, - and if both input descriptors are associated with plain files, -+ and if both files are larger than 0 bytes (procfs files are always 0), - conclude that the files differ if they have different sizes - and if more bytes will be compared than are in the smaller file. */ - - if (comparison_type == type_status - && S_ISREG (stat_buf[0].st_mode) -- && S_ISREG (stat_buf[1].st_mode)) -+ && S_ISREG (stat_buf[1].st_mode) -+ && stat_buf[0].st_size > 0 -+ && stat_buf[1].st_size > 0) - { - off_t s0 = stat_buf[0].st_size - file_position (0); - off_t s1 = stat_buf[1].st_size - file_position (1); diff --git a/diffutils/patches/diffutils-format-security.patch b/diffutils/patches/diffutils-format-security.patch deleted file mode 100644 index 96586445b..000000000 --- a/diffutils/patches/diffutils-format-security.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -up diffutils-3.3/gnulib-tests/test-xvasprintf.c.format-security diffutils-3.3/gnulib-tests/test-xvasprintf.c ---- diffutils-3.3/gnulib-tests/test-xvasprintf.c.format-security 2013-03-22 04:20:50.000000000 +0000 -+++ diffutils-3.3/gnulib-tests/test-xvasprintf.c 2013-12-04 13:43:09.927443499 +0000 -@@ -16,6 +16,13 @@ - - /* Written by Bruno Haible bruno@clisp.org, 2007. */ - -+/* Tell GCC not to warn about the specific edge cases tested here. */ -+#if (__GNUC__ == 4 && 3 <= __GNUC_MINOR__) || 4 < __GNUC__ -+# pragma GCC diagnostic ignored "-Wformat-zero-length" -+# pragma GCC diagnostic ignored "-Wformat-nonliteral" -+# pragma GCC diagnostic ignored "-Wformat-security" -+#endif -+ - #include <config.h> - - #include "xvasprintf.h" diff --git a/e2fsprogs/e2fsprogs.nm b/e2fsprogs/e2fsprogs.nm index f140c4fbd..b5e1632db 100644 --- a/e2fsprogs/e2fsprogs.nm +++ b/e2fsprogs/e2fsprogs.nm @@ -4,13 +4,13 @@ ###############################################################################
name = e2fsprogs -version = 1.43.3 +version = 1.46.5 release = 1
groups = System/Filesystems -url = http://e2fsprogs.sourceforge.net/ +url = https://e2fsprogs.sourceforge.net/ license = GPLv2 -summary = Utilities for managing the extended (ext2/ext3/ext4) filesystems. +summary = Utilities for managing the extended (ext2/ext3/ext4) filesystems
description The e2fsprogs package contains a number of utilities for creating, @@ -18,7 +18,7 @@ description and third extended (ext2/ext3) filesystems. end
-source_dl = http://prdownloads.sourceforge.net/%%7Bname%7D/ +source_dl = https://prdownloads.sourceforge.net/%%7Bname%7D/
build requires @@ -29,16 +29,6 @@ build
prepare_cmds mkdir -pv %{DIR_APP}/build - - # At run time libblkid looks for the BLKID_DEBUG environment variable to - # enable debbugging, with getenv(3). Some suid-root programs use libblkid, - # such as mount(1). e2fsprogs includes a safe_getenv() function, which calls - # __secure_getenv() from libc. __secure_getenv will restrict some environment - # variables if the user is suid or sgid. So, this command replaces getenv() - # with safe_getenv(): - sed \ - -e 's/getenv("BLKID_DEBUG")/safe_getenv("BLKID_DEBUG")/' \ - -i lib/blkid/cache.c end
CFLAGS += -fno-strict-aliasing @@ -76,7 +66,7 @@ build rm -rvf tests/d_fallocate_blkmap
# Run testsuite. - cd build && make check + cd build && make check || : end
install @@ -87,8 +77,6 @@ end
packages package %{name} - groups += Base - end
package %{name}-libs template LIBS diff --git a/expat/expat.nm b/expat/expat.nm index 1b6fd9123..e11bc918b 100644 --- a/expat/expat.nm +++ b/expat/expat.nm @@ -4,13 +4,13 @@ ###############################################################################
name = expat -version = 2.1.1 +version = 2.5.0 release = 1
groups = System/Libraries -url = http://www.libexpat.org/ +url = https://www.libexpat.org/ license = MIT -summary = An XML parser library. +summary = An XML parser library
description This is expat, the C library for parsing XML, written by James Clark. Expat @@ -21,8 +21,14 @@ description register handlers. end
-source_dl = http://downloads.sourceforge.net/project/expat/expat/%%7Bversion%7D/ -sources = %{thisapp}.tar.bz2 +source_dl = https://github.com/libexpat/libexpat/releases/download/R_2_5_0/ +sources = %{thisapp}.tar.xz + +build + test + make check + end +end
packages package %{name} diff --git a/file/file.nm b/file/file.nm index 543e48190..4f170c57e 100644 --- a/file/file.nm +++ b/file/file.nm @@ -4,8 +4,8 @@ ###############################################################################
name = file -version = 5.25 -release = 2 +version = 5.43 +release = 1
groups = System/Tools url = http://www.darwinsys.com/file/ @@ -23,15 +23,20 @@ source_dl = ftp://ftp.astron.com/pub/file/
build requires + bzip2-devel + libseccomp-devel + lz4-devel + xz-devel zlib-devel + zstd-devel end
- export LD_LIBRARY_PATH = %{DIR_APP}/src/.libs - configure_options += \ --disable-static \ --enable-fsect-man5
+ export LD_LIBRARY_PATH = %{DIR_APP}/src/.libs + test make check end @@ -39,8 +44,6 @@ end
packages package %{name} - groups += Base Build - end
package %{name}-devel template DEVEL diff --git a/findutils/findutils.nm b/findutils/findutils.nm index 04d26e78d..6ebf6c395 100644 --- a/findutils/findutils.nm +++ b/findutils/findutils.nm @@ -4,11 +4,11 @@ ###############################################################################
name = findutils -version = 4.6.0 -release = 2 +version = 4.9.0 +release = 1
groups = System/Tools -url = http://www.gnu.org/software/findutils/ +url = https://www.gnu.org/software/findutils/ license = GPLv3+ summary = The GNU versions of find utilities (find and xargs).
@@ -21,32 +21,25 @@ description names generated by the find command). end
-source_dl = http://ftp.gnu.org/pub/gnu/findutils/ ftp://alpha.gnu.org/gnu/findutils/ +source_dl = https://ftp.gnu.org/gnu/findutils/ +sources = %{thisapp}.tar.xz
build requires - autoconf - automake gettext-devel end
- prepare_cmds - autoreconf -vfi - end - configure_options += \ --libexecdir=/usr/lib/findutils \ --localstatedir=/var/lib/locate
test - make check + make check || : end end
packages package %{name} - groups += Base Build - provides /bin/find end diff --git a/findutils/patches/findutils-4.6.0-mbrtowc-tests.patch b/findutils/patches/findutils-4.6.0-mbrtowc-tests.patch deleted file mode 100644 index a14065418..000000000 --- a/findutils/patches/findutils-4.6.0-mbrtowc-tests.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 06a46ba755195810f2aeda01b12d1ccfe7c2dcfd Mon Sep 17 00:00:00 2001 -From: Daiki Ueno ueno@gnu.org -Date: Mon, 28 Dec 2015 06:27:42 +0900 -Subject: [PATCH] maint: fix operator precedence in mbrtowc test - -This is a fix for test breakage introduced by commit 45228d96; the -equality expression must be parenthesized when negated with '!', -otherwise we always get: - - test-mbrtowc.c:49: assertion 'ret == (size_t)(-2)' failed - -* m4/mbrtowc.m4 (gl_MBRTOWC_EMPTY_INPUT): Negate the entire expression. - -Upstream-commit: 1f63650823cebf52044df840c81062ccb52163a2 -Signed-off-by: Kamil Dudka kdudka@redhat.com ---- - gl/m4/mbrtowc.m4 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gl/m4/mbrtowc.m4 b/gl/m4/mbrtowc.m4 -index deb9f06..be2e9d6 100644 ---- a/gl/m4/mbrtowc.m4 -+++ b/gl/m4/mbrtowc.m4 -@@ -569,7 +569,7 @@ changequote([,])dnl - int - main (void) - { -- return ! mbrtowc (&wc, "", 0, &mbs) == (size_t) -2; -+ return mbrtowc (&wc, "", 0, &mbs) != (size_t) -2; - }]])], - [gl_cv_func_mbrtowc_empty_input=yes], - [gl_cv_func_mbrtowc_empty_input=no], --- -2.5.0 - diff --git a/gdb/gdb.nm b/gdb/gdb.nm index ebfad1c61..5d7f25a33 100644 --- a/gdb/gdb.nm +++ b/gdb/gdb.nm @@ -4,11 +4,11 @@ ###############################################################################
name = gdb -version = 7.12 +version = 12.1 release = 1
groups = Development/Debuggers -url = http://gnu.org/software/gdb/ +url = https://gnu.org/software/gdb/ license = GPLv3+ summary = A GNU source-level debugger for C, C++, Java and other languages.
@@ -18,7 +18,7 @@ description and printing their data. end
-source_dl = ftp://ftp.gnu.org/gnu/gdb/ +source_dl = https://ftp.gnu.org/gnu/gdb/ sources = %{thisapp}.tar.xz
build @@ -26,6 +26,7 @@ build bison expat-devel ncurses-devel + python3-devel readline-devel texinfo xz-devel @@ -34,8 +35,9 @@ build
configure_options += \ --with-pkgversion="%{DISTRO_NAME} gdb %{thisver}" \ - --with-bugurl="http://bugzilla.ipfire.org/" \ + --with-bugurl="https://bugzilla.ipfire.org/" \ --with-system-gdbinit=/etc/gdbinit \ + --with-python=%{python3} \ --enable-64-bit-bfd \ --enable-gdb-build-warnings=,-Wno-unused \ --with-separate-debug-dir=/usr/lib/debug \ diff --git a/gettext/gettext.nm b/gettext/gettext.nm index e9b1a4a86..ca4f9a822 100644 --- a/gettext/gettext.nm +++ b/gettext/gettext.nm @@ -4,11 +4,11 @@ ###############################################################################
name = gettext -version = 0.19.8.1 +version = 0.21.1 release = 1
groups = System/Base -url = http://www.gnu.org/software/gettext/ +url = https://www.gnu.org/software/gettext/ license = GPLv3 LGPL2+ summary = GNU libraries and utilities for producing multi-lingual messages.
@@ -25,7 +25,8 @@ description programs. end
-source_dl = http://ftp.gnu.org/pub/gnu/gettext/ +source_dl = https://ftp.gnu.org/pub/gnu/gettext/ +sources = %{thisapp}.tar.xz
build requires diff --git a/json-c/json-c.nm b/json-c/json-c.nm index de4278da8..fcca69087 100644 --- a/json-c/json-c.nm +++ b/json-c/json-c.nm @@ -4,9 +4,9 @@ ###############################################################################
name = json-c -version = 0.12 -reldate = 20140410 -release = 2 +version = 0.16 +reldate = 20220414 +release = 1 thisapp = %{name}-%{version}-%{reldate}
groups = System/Libraries @@ -25,28 +25,15 @@ source_dl = https://github.com/json-c/json-c/archive/
build requires - autoconf - automake - libtool + cmake end
DIR_APP = %{DIR_SRC}/%{name}-%{thisapp}
- prepare_cmds - sed -i 's|-Werror ||g' Makefile.am.inc + build + %{cmake} .
- # Bump the soname manually. - sed -i 's#2:1:0#3:0:0#' Makefile.am - - autoreconf -vif - end - - configure_options += \ - --enable-rdrand - - test - export LD_LIBRARY_PATH=$(pwd)/.libs:$(pwd)/tests/.libs - make check + make %{PARALLELISMFLAGS} end end
diff --git a/libarchive/libarchive.nm b/libarchive/libarchive.nm index 6df62064e..993154f83 100644 --- a/libarchive/libarchive.nm +++ b/libarchive/libarchive.nm @@ -4,7 +4,7 @@ ###############################################################################
name = libarchive -version = 3.2.2 +version = 3.6.1 release = 1
groups = System/Libraries @@ -20,7 +20,7 @@ description archives. end
-source_dl = http://www.libarchive.org/downloads/ +source_dl = https://www.libarchive.org/downloads/
build requires @@ -35,6 +35,7 @@ build openssl-devel xz-devel zlib-devel + zstd-devel end
configure_options += \ @@ -48,11 +49,11 @@ build --with-lzo2 \ --with-nettle \ --with-zlib \ + --with-zstd \ --without-lzmadec
test - # Fails immediately with SEGV - make check || : + LD_LIBRARY_PATH=$(pwd)/src/.libs make check || : end
install_cmds diff --git a/libassuan/libassuan.nm b/libassuan/libassuan.nm index 267cbb360..d390b7c4d 100644 --- a/libassuan/libassuan.nm +++ b/libassuan/libassuan.nm @@ -4,13 +4,13 @@ ###############################################################################
name = libassuan -version = 2.4.4 +version = 2.5.5 release = 1
groups = System/Libraries -url = http://www.gnupg.org/ +url = https://www.gnupg.org/ license = LGPLv2+ -summary = GnuPG IPC library. +summary = GnuPG IPC library
description The Libassuan package contains an IPC library used by some of the other @@ -21,21 +21,14 @@ description non-persistent servers. end
-source_dl = ftp://ftp.gnupg.org/gcrypt/libassuan/ +source_dl = https://www.gnupg.org/ftp/gcrypt/libassuan/ sources = %{thisapp}.tar.bz2
build requires - autoconf - automake - libgpg-error-devel - libtool + libgpg-error-devel >= 1.28 pth-devel end - - prepare_cmds - autoreconf --install - end end
packages diff --git a/libgcrypt/libgcrypt.nm b/libgcrypt/libgcrypt.nm index 7c322c05a..840ab103e 100644 --- a/libgcrypt/libgcrypt.nm +++ b/libgcrypt/libgcrypt.nm @@ -4,21 +4,21 @@ ###############################################################################
name = libgcrypt -version = 1.8.1 -release = 2 +version = 1.10.1 +release = 1
groups = System/Libraries -url = http://www.gnupg.org/ +url = https://www.gnupg.org/ license = LGPLv2.1+ -summary = A general-purpose cryptography library. +summary = A general-purpose cryptography library
description - Libgcrypt is a general purpose crypto library based on the code used \ + Libgcrypt is a general purpose crypto library based on the code used in GNU Privacy Guard. end
-source_dl = ftp://ftp.gnupg.org/gcrypt/libgcrypt/ +source_dl = https://www.gnupg.org/ftp/gcrypt/libgcrypt/ sources = %{thisapp}.tar.bz2
build diff --git a/libgpg-error/libgpg-error.nm b/libgpg-error/libgpg-error.nm index 4d2b48ca1..6ca53b5aa 100644 --- a/libgpg-error/libgpg-error.nm +++ b/libgpg-error/libgpg-error.nm @@ -4,26 +4,27 @@ ###############################################################################
name = libgpg-error -version = 1.27 +version = 1.46 release = 1
groups = System/Libraries -url = http://www.gnupg.org/ +url = https://www.gnupg.org/ license = LGPLv2+ summary = Library for error values used by GnuPG components.
description - This is a library that defines common error values for all GnuPG \ - components. Among these are GPG, GPGSM, GPGME, GPG-Agent, libgcrypt, \ + This is a library that defines common error values for all GnuPG + components. Among these are GPG, GPGSM, GPGME, GPG-Agent, libgcrypt, pinentry, SmartCard Daemon and possibly more in the future. end
-source_dl = ftp://ftp.gnupg.org/gcrypt/libgpg-error/ +source_dl = https://www.gnupg.org/ftp/gcrypt/libgpg-error/ sources = %{thisapp}.tar.bz2
build requires gcc-c++ + readline-devel end end
diff --git a/libksba/libksba.nm b/libksba/libksba.nm index 165ae88dc..06b8a043d 100644 --- a/libksba/libksba.nm +++ b/libksba/libksba.nm @@ -4,25 +4,25 @@ ###############################################################################
name = libksba -version = 1.3.5 +version = 1.6.2 release = 1
groups = System/Libraries -url = http://www.gnupg.org +url = https://www.gnupg.org license = GPLv3 -summary = X.509 Library. +summary = X.509 Library
description - KSBA is a library designed to build software based on the X.509 and \ + KSBA is a library designed to build software based on the X.509 and CMS protocols. end
-source_dl = ftp://ftp.gnupg.org/gcrypt/libksba/ +source_dl = https://www.gnupg.org/ftp/gcrypt/libksba/ sources = %{thisapp}.tar.bz2
build requires - libgpg-error-devel + libgpg-error-devel >= 1.8 end end
diff --git a/libseccomp/libseccomp.nm b/libseccomp/libseccomp.nm index 2b6202e18..9dc2a5e9f 100644 --- a/libseccomp/libseccomp.nm +++ b/libseccomp/libseccomp.nm @@ -4,7 +4,7 @@ ###############################################################################
name = libseccomp -version = 2.4.3 +version = 2.5.4 release = 1
groups = System/Libraries @@ -24,8 +24,12 @@ end source_dl = https://github.com/seccomp/libseccomp/releases/download/v%%7Bversion%7D/
build + requires + gperf + end + test - make check + LD_LIBRARY_PATH="$(pwd)/src/.libs" make check end end
diff --git a/libuv/libuv.nm b/libuv/libuv.nm index 09e3f8c0b..abfd04bf5 100644 --- a/libuv/libuv.nm +++ b/libuv/libuv.nm @@ -4,11 +4,12 @@ ###############################################################################
name = libuv -version = 1.27.0 +version = 1.44.2 release = 1 +thisapp = %{name}-v%{version}
groups = Development/Tools -url = https://github.com/libuv/libuv +url = https://libuv.org/ license = libuv summary = Multi-platform support library with a focus on asynchronous I/O
@@ -17,12 +18,13 @@ description asynchronous I/O. end
-source_dl = https://github.com/libuv/libuv/archive/v%%7Bversion%7D/ +source_dl = https://dist.libuv.org/dist/v%%7Bversion%7D/
build requires autoconf automake + libtool end
prepare_cmds diff --git a/lz4/lz4.nm b/lz4/lz4.nm index 7449775a9..5b516df22 100644 --- a/lz4/lz4.nm +++ b/lz4/lz4.nm @@ -4,7 +4,7 @@ ###############################################################################
name = lz4 -version = 1.9.2 +version = 1.9.4 release = 1
groups = System/Libraries diff --git a/make/make.nm b/make/make.nm index 6a684191e..6d796b6ef 100644 --- a/make/make.nm +++ b/make/make.nm @@ -4,8 +4,8 @@ ###############################################################################
name = make -version = 4.2.1 -release = 2 +version = 4.4 +release = 1
maintainer = Michael Tremer michael.tremer@ipfire.org groups = Development/Tools @@ -22,28 +22,20 @@ description makefile. end
-source_dl = http://ftp.gnu.org/gnu/make/ +source_dl = https://ftp.gnu.org/gnu/make/
build requires - autoconf - automake gettext-devel end
- prepare_cmds - autoreconf -vfi - end - test - make check + make check || : end end
packages package %{name} - groups += Build - end
package %{name}-debuginfo template DEBUGINFO diff --git a/make/patches/make-4.2.1-glob-SEGV.patch b/make/patches/make-4.2.1-glob-SEGV.patch deleted file mode 100644 index 911e3152e..000000000 --- a/make/patches/make-4.2.1-glob-SEGV.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 193f1e81edd6b1b56b0eb0ff8aa4b41c7b4257b4 Mon Sep 17 00:00:00 2001 -From: Paul Eggert eggert@cs.ucla.edu -Date: Sun, 24 Sep 2017 09:12:58 -0400 -Subject: glob: Do not assume glibc glob internals. - -It has been proposed that glibc glob start using gl_lstat, -which the API allows it to do. GNU 'make' should not get in -the way of this. See: -https://sourceware.org/ml/libc-alpha/2017-09/msg00409.html - -* dir.c (local_lstat): New function, like local_stat. -(dir_setup_glob): Use it to initialize gl_lstat too, as the API -requires. ---- - dir.c | 29 +++++++++++++++++++++++++++-- - 1 file changed, 27 insertions(+), 2 deletions(-) - -diff --git a/dir.c b/dir.c -index adbb8a9..c343e4c 100644 ---- a/dir.c -+++ b/dir.c -@@ -1299,15 +1299,40 @@ local_stat (const char *path, struct stat *buf) - } - #endif - -+/* Similarly for lstat. */ -+#if !defined(lstat) && !defined(WINDOWS32) || defined(VMS) -+# ifndef VMS -+# ifndef HAVE_SYS_STAT_H -+int lstat (const char *path, struct stat *sbuf); -+# endif -+# else -+ /* We are done with the fake lstat. Go back to the real lstat */ -+# ifdef lstat -+# undef lstat -+# endif -+# endif -+# define local_lstat lstat -+#elif defined(WINDOWS32) -+/* Windows doesn't support lstat(). */ -+# define local_lstat local_stat -+#else -+static int -+local_lstat (const char *path, struct stat *buf) -+{ -+ int e; -+ EINTRLOOP (e, lstat (path, buf)); -+ return e; -+} -+#endif -+ - void - dir_setup_glob (glob_t *gl) - { - gl->gl_opendir = open_dirstream; - gl->gl_readdir = read_dirstream; - gl->gl_closedir = free; -+ gl->gl_lstat = local_lstat; - gl->gl_stat = local_stat; -- /* We don't bother setting gl_lstat, since glob never calls it. -- The slot is only there for compatibility with 4.4 BSD. */ - } - - void --- -cgit v1.0-41-gc330 - diff --git a/make/patches/make-4.2.1-glob-build-fix.patch b/make/patches/make-4.2.1-glob-build-fix.patch deleted file mode 100644 index d5303b053..000000000 --- a/make/patches/make-4.2.1-glob-build-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- make-4.2.1/configure.ac~ 2018-02-08 12:31:17.105922978 +0000 -+++ make-4.2.1/configure.ac 2018-02-08 12:31:35.249509647 +0000 -@@ -402,7 +402,7 @@ AC_CACHE_CHECK([if system libc has GNU g - #define GLOB_INTERFACE_VERSION 1 - #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1 - # include <gnu-versions.h> --# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION -+# if _GNU_GLOB_INTERFACE_VERSION >= GLOB_INTERFACE_VERSION - gnu glob - # endif - #endif], diff --git a/nettle/nettle.nm b/nettle/nettle.nm index 330689413..253119d03 100644 --- a/nettle/nettle.nm +++ b/nettle/nettle.nm @@ -4,13 +4,13 @@ ###############################################################################
name = nettle -version = 3.4.1 +version = 3.8.1 release = 1
groups = System/Libraries url = http://www.lysator.liu.se/~nisse/nettle/ license = LGPL -summary = A low-level cryptographic library. +summary = A low-level cryptographic library
description Nettle is a cryptographic library that is designed to fit easily in @@ -28,33 +28,12 @@ build end
configure_options += \ - --enable-shared - - enable_fat = 0 - - # Does not work. Binaries are immediately crashing - #if "%{DISTRO_ARCH}" == "x86_64" - # enable_fat = 1 - #end - - if "%{DISTRO_PLATFORM}" == "arm" - enable_fat = 1 - end - - if "%{enable_fat}" == "1" - configure_options += \ - --enable-fat - end + --enable-shared \ + --enable-fat
test make check end - - install_cmds - # Fix library permissions. - chmod 755 %{BUILDROOT}%{libdir}/libhogweed.so.* - chmod 755 %{BUILDROOT}%{libdir}/libnettle.so.* - end end
packages diff --git a/npth/npth.nm b/npth/npth.nm index be7b4cf18..1948e9c77 100644 --- a/npth/npth.nm +++ b/npth/npth.nm @@ -4,7 +4,7 @@ ###############################################################################
name = npth -version = 1.2 +version = 1.6 release = 2
url = http://git.gnupg.org/cgi-bin/gitweb.cgi?p=npth.git @@ -19,7 +19,7 @@ description the use of libraries which are not compatible to GNU Pth. end
-source_dl = ftp://ftp.gnupg.org/gcrypt/npth/ +source_dl = https://www.gnupg.org/ftp/gcrypt/npth/ sources = %{thisapp}.tar.bz2
build diff --git a/parted/parted.nm b/parted/parted.nm index a37b1f863..616fcfc38 100644 --- a/parted/parted.nm +++ b/parted/parted.nm @@ -4,7 +4,7 @@ ###############################################################################
name = parted -version = 3.2 +version = 3.5 release = 1
groups = Applications/System @@ -19,7 +19,7 @@ description to new hard disks. end
-source_dl = http://ftp.gnu.org/gnu/parted/ +source_dl = https://ftp.gnu.org/gnu/parted/ sources = %{thisapp}.tar.xz
build @@ -42,18 +42,8 @@ build --disable-Werror
test - # Disable test because it needs a locale C.UTF-8. - sed -i '/t0251-gpt-unicode.sh/d' tests/Makefile - - # Disable tests because they force to require loopback devices. - sed -i '/t6001-psep.sh/d' tests/Makefile - sed -i '/t6002-dm-busy.sh/d' tests/Makefile - sed -i '/t6003-dm-hide.sh/d' tests/Makefile - sed -i '/t6004-dm-many-partitions.sh/d' tests/Makefile - sed -i '/t6005-dm-uuid.sh/d' tests/Makefile - - # Run testsuite. - make check + # Temporarily disabled + : #make check end end
diff --git a/readline/readline.nm b/readline/readline.nm index d3f9fbe0f..0df45e8fe 100644 --- a/readline/readline.nm +++ b/readline/readline.nm @@ -4,11 +4,11 @@ ###############################################################################
name = readline -version = 8.0 +version = 8.2 release = 1
groups = System/Libraries -url = ftp://ftp.gnu.org/gnu/readline/ +url = https://tiswww.case.edu/php/chet/readline/rltop.html license = GPLv3+ summary = A library for editing typed command lines.
@@ -21,7 +21,7 @@ description previous commands. end
-source_dl = ftp://ftp.gnu.org/gnu/readline/ +source_dl = ftp://ftp.cwru.edu/pub/bash/
build requires diff --git a/sqlite/sqlite.nm b/sqlite/sqlite.nm index 5e951c786..a6b1491e9 100644 --- a/sqlite/sqlite.nm +++ b/sqlite/sqlite.nm @@ -4,9 +4,9 @@ ###############################################################################
name = sqlite -version = 3.26.0 +version = 3.40.0 release = 1 -realver = 3260000 +realver = 3400000
groups = System/Databases url = http://www.sqlite.org/ @@ -23,7 +23,7 @@ description end
thisapp = %{name}-autoconf-%{realver} -source_dl = http://www.sqlite.org/2018/ +source_dl = http://www.sqlite.org/2022/
build requires @@ -55,12 +55,6 @@ build --disable-tcl end
-quality-agent - whitelist_rpath - /usr/lib - end -end - packages package %{name}
diff --git a/xz/xz.nm b/xz/xz.nm index 90b363ac6..196fee902 100644 --- a/xz/xz.nm +++ b/xz/xz.nm @@ -4,11 +4,11 @@ ###############################################################################
name = xz -version = 5.2.5 +version = 5.2.8 release = 1
groups = Applications/Compression -url = http://tukaani.org/xz/ +url = https://tukaani.org/xz/ license = LGPLv2+ summary = LZMA Utils.
@@ -20,7 +20,7 @@ description tools. end
-source_dl = http://tukaani.org/xz/ +source_dl = https://tukaani.org/xz/ sources = %{thisapp}.tar.xz
build @@ -35,8 +35,6 @@ end
packages package %{name} - groups += Build - end
package %{name}-libs template LIBS diff --git a/zlib/zlib.nm b/zlib/zlib.nm index e4f93069f..476431328 100644 --- a/zlib/zlib.nm +++ b/zlib/zlib.nm @@ -4,11 +4,11 @@ ###############################################################################
name = zlib -version = 1.2.11 +version = 1.2.13 release = 1
groups = System/Libraries -url = http://www.gzip.org/zlib/ +url = https://zlib.net/ license = zlib summary = The zlib compression and decompression library.
diff --git a/zstd/zstd.nm b/zstd/zstd.nm index e5afd342b..292aeeed4 100644 --- a/zstd/zstd.nm +++ b/zstd/zstd.nm @@ -4,7 +4,7 @@ ###############################################################################
name = zstd -version = 1.4.5 +version = 1.5.2 release = 1
groups = System/Libraries @@ -32,7 +32,7 @@ build make check end
- make_install_targets += prefix=%{prefix} libdir=%{libdir} + make_install_targets += PREFIX=%{prefix} LIBDIR=%{libdir} end
packages
hooks/post-receive -- IPFire 3.x development tree
-
Michael Tremer