* [git.ipfire.org] IPFire 3.x development tree branch, master, updated. d62776ed14914cd0ecd0251c0279174a39e7a965
@ 2022-12-22 19:31 Michael Tremer
0 siblings, 0 replies; only message in thread
From: Michael Tremer @ 2022-12-22 19:31 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 52737 bytes --]
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 d62776ed14914cd0ecd0251c0279174a39e7a965 (commit)
via 5af365ab1ea29d4f9cb1026dcf662d9b0fa17e46 (commit)
via 1037c9271704323f23f56fd25e496ea7325eb076 (commit)
via 78f728dac96373226cf04299e142d8018d42aa3c (commit)
via 16d9d0297b4e79f60a96a1cf4c74b8193d79af51 (commit)
via 90d873348e4f18f83b809d1dfd1b2b7b355311b3 (commit)
via 839455c74f78b4a215c58e8a87b634abff5e1645 (commit)
via 8b4743e9f36bc2b4d53fcd64188fbe5e41614e39 (commit)
via eb86058c3b408df9c048300e4b620dd3e682c200 (commit)
via 2a19fae9405b1d3c1a1db684ca6c8cae7333aa4a (commit)
via 869a755e4c2f22bfd1d554c54790bedfce268ec2 (commit)
via 3e64225ca3cad3c0042e6dca616ffa0e80d34831 (commit)
via 5c562723e4128f5bf39ab9ae940a1a6f9fe3ea5f (commit)
via b6082684cbc2da9e04f4cbd9aa439fc46d589055 (commit)
via b48f4a94a0bbbb11859754afb80a0fe0d716a9e6 (commit)
via 18b0ef71be204339019530267e5b918119a1c5cd (commit)
via 28c00b052323e4ab13ae71bc3ebccdf251b8f78d (commit)
via eaba5a7d496e994479cc40776f691a048aa6da96 (commit)
via e1d45c35ea4f9b785fcdac7a6fe9276709067d41 (commit)
via 57c1fa5530455e33992e32a6475e3b868290f00e (commit)
via a6cfb244b62b7cc70f5cd41f67ceae1ff781e0a6 (commit)
via b4405c7dabe6b9cfe13be2cccb3a5704fc884166 (commit)
from 480cb5d36d29181f5a8f07aeb4e1786e087eb2d1 (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 d62776ed14914cd0ecd0251c0279174a39e7a965
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Thu Dec 22 05:01:41 2022 +0100
strace: Update to 6.1
- Project has moved to new location so adjust URL and SRC URL
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
commit 5af365ab1ea29d4f9cb1026dcf662d9b0fa17e46
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Dec 21 11:14:51 2022 +0000
mtr: Update to 0.94
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 1037c9271704323f23f56fd25e496ea7325eb076
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Dec 21 11:06:02 2022 +0000
xmlto: Update to 0.0.28
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 78f728dac96373226cf04299e142d8018d42aa3c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Dec 21 11:00:08 2022 +0000
pax-utils: Drop package
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 16d9d0297b4e79f60a96a1cf4c74b8193d79af51
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Dec 21 10:59:54 2022 +0000
paxctl: Drop package
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 90d873348e4f18f83b809d1dfd1b2b7b355311b3
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Dec 21 10:54:22 2022 +0000
tzdata: Update to 2022g
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 839455c74f78b4a215c58e8a87b634abff5e1645
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Dec 21 10:28:50 2022 +0000
ed: Update to 1.18
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 8b4743e9f36bc2b4d53fcd64188fbe5e41614e39
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Dec 21 10:20:51 2022 +0000
slang: Update to 2.3.3
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit eb86058c3b408df9c048300e4b620dd3e682c200
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Dec 21 09:57:11 2022 +0000
ethtool: Update to 6.1
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 2a19fae9405b1d3c1a1db684ca6c8cae7333aa4a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Dec 21 09:45:18 2022 +0000
strongswan: Update to 5.9.8
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 869a755e4c2f22bfd1d554c54790bedfce268ec2
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 20 22:06:16 2022 +0000
memtest86+: Update to 6.00
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 3e64225ca3cad3c0042e6dca616ffa0e80d34831
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 20 22:05:54 2022 +0000
dosfstools: Update to 4.2
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 5c562723e4128f5bf39ab9ae940a1a6f9fe3ea5f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 20 18:56:25 2022 +0000
rng-tools: Drop package
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit b6082684cbc2da9e04f4cbd9aa439fc46d589055
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 20 18:55:36 2022 +0000
unicode-ucd: Drop package
Nothing seems to depend on this
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit b48f4a94a0bbbb11859754afb80a0fe0d716a9e6
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 20 18:52:27 2022 +0000
ustr: Drop package
Nothing seems to depend on this
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 18b0ef71be204339019530267e5b918119a1c5cd
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 20 18:48:31 2022 +0000
pigz: Drop package
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 28c00b052323e4ab13ae71bc3ebccdf251b8f78d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 20 18:36:58 2022 +0000
ldns: Update to 1.8.3
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit eaba5a7d496e994479cc40776f691a048aa6da96
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 20 18:23:36 2022 +0000
rcs: Update to 5.10.1
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit e1d45c35ea4f9b785fcdac7a6fe9276709067d41
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 20 18:08:53 2022 +0000
libxml2: Update to 2.10.3
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 57c1fa5530455e33992e32a6475e3b868290f00e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 20 17:35:35 2022 +0000
libunistring: Update to 1.1
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit a6cfb244b62b7cc70f5cd41f67ceae1ff781e0a6
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 20 17:25:58 2022 +0000
which: Update to 2.21
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit b4405c7dabe6b9cfe13be2cccb3a5704fc884166
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 20 17:23:01 2022 +0000
tar: Update to 1.34
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
dosfstools/dosfstools.nm | 8 +--
ed/ed.nm | 8 +--
ethtool/ethtool.nm | 12 ++--
ldns/ldns.nm | 37 +++--------
ldns/patches/ldns-1.6.16-dsa-key-failures.patch | 28 --------
.../ldns-1.6.17-doxyparse-perl-5-22-fix.patch | 13 ----
ldns/patches/ldns-1.6.17-multilib.patch | 75 ----------------------
libunistring/libunistring.nm | 6 +-
libxml2/libxml2.nm | 13 ++--
libxml2/patches/libxml2-2.9.2-catalog-revert.patch | 31 ---------
memtest86+/60_memtest86+ | 32 +++++++++
memtest86+/60_memtest86+-efi | 37 +++++++++++
memtest86+/memtest86+.grub | 37 -----------
memtest86+/memtest86+.nm | 45 +++++++++----
mtr/mtr.nm | 11 ++--
pax-utils/pax-utils.nm | 38 -----------
paxctl/paxctl.nm | 38 -----------
pigz/pigz.nm | 48 --------------
rcs/rcs.nm | 17 ++---
rng-tools/patches/rng-tools-man.patch | 21 ------
rng-tools/rng-tools.nm | 52 ---------------
rng-tools/systemd/rngd.service | 8 ---
slang/slang.nm | 13 ++--
strace/strace.nm | 6 +-
strongswan/strongswan.nm | 31 ++++-----
tar/tar.nm | 12 ++--
tzdata/tzdata.nm | 57 ++++++++--------
unicode-ucd/unicode-ucd.nm | 50 ---------------
ustr/patches/c99-inline.patch | 30 ---------
ustr/ustr.nm | 56 ----------------
which/which.nm | 12 ++--
xmlto/xmlto.nm | 7 +-
32 files changed, 210 insertions(+), 679 deletions(-)
delete mode 100644 ldns/patches/ldns-1.6.16-dsa-key-failures.patch
delete mode 100644 ldns/patches/ldns-1.6.17-doxyparse-perl-5-22-fix.patch
delete mode 100644 ldns/patches/ldns-1.6.17-multilib.patch
delete mode 100644 libxml2/patches/libxml2-2.9.2-catalog-revert.patch
create mode 100644 memtest86+/60_memtest86+
create mode 100644 memtest86+/60_memtest86+-efi
delete mode 100755 memtest86+/memtest86+.grub
delete mode 100644 pax-utils/pax-utils.nm
delete mode 100644 paxctl/paxctl.nm
delete mode 100644 pigz/pigz.nm
delete mode 100644 rng-tools/patches/rng-tools-man.patch
delete mode 100644 rng-tools/rng-tools.nm
delete mode 100644 rng-tools/systemd/rngd.service
delete mode 100644 unicode-ucd/unicode-ucd.nm
delete mode 100644 ustr/patches/c99-inline.patch
delete mode 100644 ustr/ustr.nm
Difference in files:
diff --git a/dosfstools/dosfstools.nm b/dosfstools/dosfstools.nm
index c319532a3..0483e61bf 100644
--- a/dosfstools/dosfstools.nm
+++ b/dosfstools/dosfstools.nm
@@ -4,13 +4,13 @@
###############################################################################
name = dosfstools
-version = 3.0.26
+version = 4.2
release = 1
groups = System/Filesystems
-url = http://www.daniel-baumann.ch/software/dosfstools/
+url = https://github.com/dosfstools/dosfstools/
license = GPLv3+
-summary = Utilities for making and checking MS-DOS FAT filesystems on Linux.
+summary = Utilities for making and checking MS-DOS FAT filesystems on Linux
description
The dosfstools package includes the mkdosfs and dosfsck utilities,
@@ -18,7 +18,7 @@ description
drives or on floppies.
end
-source_dl = http://www.daniel-baumann.ch/files/software/dosfstools/
+source_dl = https://github.com/dosfstools/dosfstools/releases/download/v%{version}/
build
make_install_targets += \
diff --git a/ed/ed.nm b/ed/ed.nm
index 6163d1f2d..e94d795ba 100644
--- a/ed/ed.nm
+++ b/ed/ed.nm
@@ -4,13 +4,13 @@
###############################################################################
name = ed
-version = 1.15
+version = 1.18
release = 1
groups = Application/Text
-url = http://www.gnu.org/software/ed/
+url = https://www.gnu.org/software/ed/
license = GPLv3+
-summary = The GNU line editor.
+summary = The GNU line editor
description
Ed is a line-oriented text editor, used to create, display, and modify \
@@ -28,8 +28,8 @@ build
end
configure_options += \
- CFLAGS="%{CFLAGS}" \
CPPFLAGS="%{CPPFLAGS}" \
+ CFLAGS="%{CFLAGS}" \
LDFLAGS="%{LDFLAGS}"
test
diff --git a/ethtool/ethtool.nm b/ethtool/ethtool.nm
index 9a0d41589..10d341d61 100644
--- a/ethtool/ethtool.nm
+++ b/ethtool/ethtool.nm
@@ -4,13 +4,13 @@
###############################################################################
name = ethtool
-version = 4.5
+version = 6.1
release = 1
groups = Applications/System
url = https://www.kernel.org/pub/software/network/ethtool/
license = GPLv2
-summary = Ethernet settings tool for PCI ethernet cards.
+summary = Ethernet settings tool for PCI ethernet cards
description
This utility allows querying and changing settings such as speed, \
@@ -20,10 +20,14 @@ end
source_dl = https://www.kernel.org/pub/software/network/ethtool/
+build
+ requires
+ libmnl-devel
+ end
+end
+
packages
package %{name}
- groups += Base
- end
package %{name}-debuginfo
template DEBUGINFO
diff --git a/ldns/ldns.nm b/ldns/ldns.nm
index d79d48c08..a395712bd 100644
--- a/ldns/ldns.nm
+++ b/ldns/ldns.nm
@@ -4,7 +4,7 @@
###############################################################################
name = ldns
-version = 1.6.17
+version = 1.8.3
release = 1
groups = Networking/DNS
@@ -13,18 +13,13 @@ license = BSD
summary = Low-level DNS(SEC) library with API
description
- The flex program generates scanners. Scanners are programs which can
- recognize lexical patterns in text. Flex takes pairs of regular
- expressions and C code as input and generates a C source file as
- output. The output file is compiled and linked with a library to
- produce an executable. The executable searches through its input for
- occurrences of the regular expressions. When a match is found, it
- executes the corresponding C code. Flex was designed to work with
- both Yacc and Bison, and is used by many programs as part of their
- build process.
+ The goal of ldns is to simplify DNS programming in C. ldns supports
+ all low-level DNS and DNSSEC operations. It also defines a higher
+ level API which allows a programmer to for instance create or sign
+ packets.
end
-source_dl = http://www.nlnetlabs.nl/downloads/%{name}/
+source_dl = https://www.nlnetlabs.nl/downloads/%{name}/
build
requires
@@ -41,27 +36,11 @@ build
end
configure_options += \
- --enable-gost \
+ --disable-gost \
--enable-ecdsa \
--with-ca-file=/etc/pki/tls/certs/ca-bundle.trust.crt \
--with-ca-path=/etc/pki/tls/certs/ \
- --with-trust-anchor=%{sharedstatedir}/unbound/root.key \
- --enable-rrtype-cds \
- --enable-rrtype-uri
-
- build_cmds
- pushd drill
- ./configure %{configure_options}
- make %{PARALLELISMFLAGS}
- popd
- end
-
- install_cmds
- install -D -m644 packaging/libldns.pc \
- %{BUILDROOT}%{libdir}/pkgconfig/ldns.pc
-
- make -C drill DESTDIR=%{BUILDROOT} install
- end
+ --with-trust-anchor=%{sharedstatedir}/unbound/root.key
end
packages
diff --git a/ldns/patches/ldns-1.6.16-dsa-key-failures.patch b/ldns/patches/ldns-1.6.16-dsa-key-failures.patch
deleted file mode 100644
index 93e8a73c8..000000000
--- a/ldns/patches/ldns-1.6.16-dsa-key-failures.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -up ldns-1.6.17/keys.c.dsa ldns-1.6.17/keys.c
---- ldns-1.6.17/keys.c.dsa 2014-01-10 22:04:41.000000000 +0100
-+++ ldns-1.6.17/keys.c 2014-03-18 17:54:34.751742493 +0100
-@@ -1324,7 +1324,6 @@ ldns_key_dsa2bin(unsigned char *data, DS
- /* See RFC2536 */
- *size = (uint16_t)BN_num_bytes(k->p);
- T = (*size - 64) / 8;
-- memcpy(data, &T, 1);
-
- if (T > 8) {
- #ifdef STDERR_MSGS
-@@ -1335,12 +1334,13 @@ ldns_key_dsa2bin(unsigned char *data, DS
- }
-
- /* size = 64 + (T * 8); */
-+ memset(data, 0, 21 + *size * 3);
- data[0] = (unsigned char)T;
- BN_bn2bin(k->q, data + 1 ); /* 20 octects */
- BN_bn2bin(k->p, data + 21 ); /* offset octects */
-- BN_bn2bin(k->g, data + 21 + *size); /* offset octets */
-- BN_bn2bin(k->pub_key, data + 21 + *size + *size); /* offset octets */
-- *size = 21 + (*size * 3);
-+ BN_bn2bin(k->g, data + 21 + *size * 2 - BN_num_bytes(k->g));
-+ BN_bn2bin(k->pub_key,data + 21 + *size * 3 - BN_num_bytes(k->pub_key));
-+ *size = 21 + *size * 3;
- return true;
- }
-
diff --git a/ldns/patches/ldns-1.6.17-doxyparse-perl-5-22-fix.patch b/ldns/patches/ldns-1.6.17-doxyparse-perl-5-22-fix.patch
deleted file mode 100644
index 2140ff5c0..000000000
--- a/ldns/patches/ldns-1.6.17-doxyparse-perl-5-22-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/doc/doxyparse.pl b/doc/doxyparse.pl
-index 96a1732..745d564 100755
---- a/doc/doxyparse.pl
-+++ b/doc/doxyparse.pl
-@@ -273,7 +273,7 @@ foreach (keys %manpages) {
-
- print MAN $MAN_MIDDLE;
-
-- if (defined(@$also)) {
-+ if (@$also) {
- print MAN "\n.SH SEE ALSO\n\\fI";
- print MAN join "\\fR, \\fI", @$also;
- print MAN "\\fR.\nAnd ";
diff --git a/ldns/patches/ldns-1.6.17-multilib.patch b/ldns/patches/ldns-1.6.17-multilib.patch
deleted file mode 100644
index 5c7440a32..000000000
--- a/ldns/patches/ldns-1.6.17-multilib.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff -Naur ldns-1.6.17-orig/configure ldns-1.6.17/configure
---- ldns-1.6.17-orig/configure 2014-01-10 16:04:50.000000000 -0500
-+++ ldns-1.6.17/configure 2014-01-10 20:22:39.138190093 -0500
-@@ -662,6 +662,7 @@
- PYTHON_LDFLAGS
- PYTHON_CPPFLAGS
- PYTHON
-+PYTHON_LIB
- PYTHON_VERSION
- UNINSTALL_CONFIG_MANPAGE
- UNINSTALL_CONFIG
-@@ -13599,6 +13600,7 @@
- # use the official shared library
- ac_python_library=`echo "$ac_python_library" | sed "s/^lib//"`
- PYTHON_LDFLAGS="-L$ac_python_libdir -l$ac_python_library"
-+ PYTHON_LIB="$ac_python_library"
- else
- # old way: use libpython from python_configdir
- ac_python_libdir=`$PYTHON -c \
-@@ -13606,6 +13608,7 @@
- import os; \
- print (os.path.join(f(plat_specific=1, standard_lib=1), 'config'));"`
- PYTHON_LDFLAGS="-L$ac_python_libdir -lpython$ac_python_version"
-+ PYTHON_LIB="python$ac_python_version"
- fi
-
- if test -z "PYTHON_LDFLAGS"; then
-diff -Naur ldns-1.6.17-orig/packaging/ldns-config.in ldns-1.6.17/packaging/ldns-config.in
---- ldns-1.6.17-orig/packaging/ldns-config.in 2014-01-10 16:04:41.000000000 -0500
-+++ ldns-1.6.17/packaging/ldns-config.in 2014-01-10 20:33:13.033665804 -0500
-@@ -3,13 +3,25 @@
- prefix="@prefix@"
- exec_prefix="@exec_prefix@"
- VERSION="@PACKAGE_VERSION@"
--CFLAGS="@CFLAGS@"
--CPPFLAGS="@CPPFLAGS@ @LIBSSL_CPPFLAGS@ @PYTHON_CPPFLAGS@"
--LDFLAGS="@LDFLAGS@ @LIBSSL_LDFLAGS@ @PYTHON_LDFLAGS@"
- LIBS="@LIBS@ @LIBSSL_LIBS@"
--LIBDIR="@libdir@"
- INCLUDEDIR="@includedir@"
- LIBVERSION="@LIBLDNS_CURRENT(a).@LIBLDNS_REVISION(a).@LIBLDNS_AGE@"
-+ARCH="`uname -m`"
-+
-+case $ARCH in
-+ x86_64 | amd64 | sparc64 | s390x | ppc64)
-+
-+ LIBDIR="/usr/lib64"
-+ LIBDIR_SEC="/usr/lib"
-+ ;;
-+ * )
-+ LIBDIR="/usr/lib"
-+ LIBDIR_SEC="/usr/lib64"
-+ ;;
-+esac
-+
-+LDFLAGS="@LDFLAGS@ @LIBSSL_LDFLAGS@ -L$LIBDIR -l(a)PYTHON_LIB@"
-+LDFLAGS_SEC="@LDFLAGS@ @LIBSSL_LDFLAGS@ -L$LIBDIR_SEC -l(a)PYTHON_LIB@"
-
- for arg in $@
- do
-@@ -21,9 +33,13 @@
- then
- echo "${LDFLAGS} -L${LIBDIR} ${LIBS} -lldns"
- fi
-+ if [ $arg = "--libs_sec" ]
-+ then
-+ echo "${LDFLAGS_SEC} -L${LIBDIR_SEC} ${LIBS} -lldns"
-+ fi
- if [ $arg = "-h" ] || [ $arg = "--help" ]
- then
-- echo "Usage: $0 [--cflags] [--libs] [--version]"
-+ echo "Usage: $0 [--cflags] [--libs] [--libs_sec] [--version]"
- fi
- if [ $arg = "--version" ]
- then
diff --git a/libunistring/libunistring.nm b/libunistring/libunistring.nm
index 6ff472274..2218fc606 100644
--- a/libunistring/libunistring.nm
+++ b/libunistring/libunistring.nm
@@ -4,13 +4,13 @@
###############################################################################
name = libunistring
-version = 0.9.10
+version = 1.1
release = 1
groups = System/Libraries
-url = http://www.gnu.org/software/libunistring/
+url = https://www.gnu.org/software/libunistring/
license = LGPLv3+
-summary = GNU Unicode string library.
+summary = GNU Unicode string library
description
This portable C library implements Unicode string types in three flavours:
diff --git a/libxml2/libxml2.nm b/libxml2/libxml2.nm
index c36ba5d23..b4bc822f7 100644
--- a/libxml2/libxml2.nm
+++ b/libxml2/libxml2.nm
@@ -4,13 +4,14 @@
###############################################################################
name = libxml2
-version = 2.9.2
-release = 2
+version = %{ver_maj}.3
+ver_maj = 2.10
+release = 1
groups = System/Libraries
-url = http://xmlsoft.org/
+url = https://xmlsoft.org/
license = MIT
-summary = Library providing XML and HTML support.
+summary = Library providing XML and HTML support
description
This library allows to manipulate XML files. It includes support
@@ -24,7 +25,8 @@ description
library.
end
-source_dl = ftp://xmlsoft.org/libxml2/
+source_dl = https://download.gnome.org/sources/libxml2/%{ver_maj}/
+sources = %{thisapp}.tar.xz
build
requires
@@ -35,7 +37,6 @@ end
packages
package %{name}
- end
package %{name}-devel
template DEVEL
diff --git a/libxml2/patches/libxml2-2.9.2-catalog-revert.patch b/libxml2/patches/libxml2-2.9.2-catalog-revert.patch
deleted file mode 100644
index b3de0040f..000000000
--- a/libxml2/patches/libxml2-2.9.2-catalog-revert.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 0e6659ec960734b0b01aad196d4bdb4a3800b493 Mon Sep 17 00:00:00 2001
-From: Lubomir Rintel <lkundrak(a)v3.sk>
-Date: Thu, 16 Oct 2014 19:10:59 +0200
-Subject: [PATCH] Revert "Missing initialization for the catalog module"
-
-It's not correct to always load the default catalog.
-https://bugzilla.redhat.com/show_bug.cgi?id=1153753
-
-This reverts commit 054c716ea1bf001544127a4ab4f4346d1b9947e7.
-
----
- parser.c | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/parser.c b/parser.c
-index 1d93967..67c9dfd 100644
---- a/parser.c
-+++ b/parser.c
-@@ -14830,9 +14830,6 @@ xmlInitParser(void) {
- #ifdef LIBXML_XPATH_ENABLED
- xmlXPathInit();
- #endif
--#ifdef LIBXML_CATALOG_ENABLED
-- xmlInitializeCatalog();
--#endif
- xmlParserInitialized = 1;
- #ifdef LIBXML_THREAD_ENABLED
- }
---
-1.9.3
-
diff --git a/memtest86+/60_memtest86+ b/memtest86+/60_memtest86+
new file mode 100644
index 000000000..086f0cc84
--- /dev/null
+++ b/memtest86+/60_memtest86+
@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+########################################################
+# This script generates a memtest86+ entry on grub.cfg #
+# if memtest is installed on the system. #
+########################################################
+
+prefix="/usr"
+exec_prefix="${prefix}"
+
+datarootdir="/usr/share"
+datadir="${datarootdir}"
+
+. "${datadir}/grub/grub-mkconfig_lib"
+
+MEMTEST86_IMAGE="/boot/memtest86+/memtest.bin"
+CLASS="--class memtest86 --class gnu --class tool"
+
+if [ -e "${MEMTEST86_IMAGE}" ] && is_path_readable_by_grub "${MEMTEST86_IMAGE}" ; then
+ ## image exists, create menu entry
+ echo "Found memtest86+ image: ${MEMTEST86_IMAGE}" >&2
+ _GRUB_MEMTEST_HINTS_STRING="$(${grub_probe} --target=hints_string ${MEMTEST86_IMAGE})"
+ _GRUB_MEMTEST_FS_UUID="$(${grub_probe} --target=fs_uuid ${MEMTEST86_IMAGE})"
+ _GRUB_MEMTEST_REL_PATH="$(make_system_path_relative_to_its_root ${MEMTEST86_IMAGE})"
+ cat << EOF
+if [ "\${grub_platform}" == "pc" ]; then
+ menuentry "Memory Tester (memtest86+)" ${CLASS} {
+ search --fs-uuid --no-floppy --set=root ${_GRUB_MEMTEST_HINTS_STRING} ${_GRUB_MEMTEST_FS_UUID}
+ linux16 ${_GRUB_MEMTEST_REL_PATH} ${GRUB_CMDLINE_MEMTEST86}
+ }
+fi
+EOF
+fi
diff --git a/memtest86+/60_memtest86+-efi b/memtest86+/60_memtest86+-efi
new file mode 100644
index 000000000..e6d77ea51
--- /dev/null
+++ b/memtest86+/60_memtest86+-efi
@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+########################################################
+# This script generates a memtest86+ entry on grub.cfg #
+# if memtest is installed on the system. #
+########################################################
+
+prefix="/usr"
+exec_prefix="${prefix}"
+
+datarootdir="/usr/share"
+datadir="${datarootdir}"
+
+. "${datadir}/grub/grub-mkconfig_lib"
+
+MEMTEST86_IMAGE="/boot/memtest86+/memtest.efi"
+CLASS="--class memtest86 --class gnu --class tool"
+
+if [ -e "${MEMTEST86_IMAGE}" ] && is_path_readable_by_grub "${MEMTEST86_IMAGE}" ; then
+ ## image exists, create menu entry
+ echo "Found memtest86+ EFI image: ${MEMTEST86_IMAGE}" >&2
+ _GRUB_MEMTEST_HINTS_STRING="$(${grub_probe} --target=hints_string ${MEMTEST86_IMAGE})"
+ _GRUB_MEMTEST_FS_UUID="$(${grub_probe} --target=fs_uuid ${MEMTEST86_IMAGE})"
+ _GRUB_MEMTEST_REL_PATH="$(make_system_path_relative_to_its_root ${MEMTEST86_IMAGE})"
+ cat << EOF
+if [ "\${grub_platform}" == "efi" ]; then
+ menuentry "Memory Tester (memtest86+)" ${CLASS} {
+ if loadfont unicode ; then
+ set gfxmode=1024x768,800x600,auto
+ set gfxpayload=800x600,1024x768
+ terminal_output gfxterm
+ fi
+ search --fs-uuid --no-floppy --set=root ${_GRUB_MEMTEST_HINTS_STRING} ${_GRUB_MEMTEST_FS_UUID}
+ linux ${_GRUB_MEMTEST_REL_PATH} ${GRUB_CMDLINE_MEMTEST86}
+ }
+fi
+EOF
+fi
diff --git a/memtest86+/memtest86+.grub b/memtest86+/memtest86+.grub
deleted file mode 100755
index 3301b8597..000000000
--- a/memtest86+/memtest86+.grub
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-set -e
-
-# older versions of grub2 do not have this yet (LP: #459080)
-if [ ! -e /usr/lib/grub/grub-mkconfig_lib ]; then
- echo "no grub-mkconfig_lib, exiting"
- exit 0
-fi
-
-. /usr/lib/grub/grub-mkconfig_lib
-
-# We can't cope with loop-mounted devices here.
-case ${GRUB_DEVICE_BOOT} in
- /dev/loop/*|/dev/loop[0-9])
- exit 0
- ;;
-esac
-
-if test -e /boot/memtest86+; then
- MEMTESTPATH=$( make_system_path_relative_to_its_root "/boot/memtest86+" )
- echo "Found memtest86+ image: $MEMTESTPATH" >&2
- cat << EOF
-menuentry "Memory test (memtest86+)" {
-EOF
- prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")"
- printf '%s\n' "${prepare_boot_cache}"
- cat << EOF
- linux16 $MEMTESTPATH
-}
-menuentry "Memory test (memtest86+, serial console 115200)" {
-EOF
- printf '%s\n' "${prepare_boot_cache}"
- cat << EOF
- linux16 $MEMTESTPATH console=ttyS0,115200n8
-}
-EOF
-fi
diff --git a/memtest86+/memtest86+.nm b/memtest86+/memtest86+.nm
index 0e5e44445..74f45c426 100644
--- a/memtest86+/memtest86+.nm
+++ b/memtest86+/memtest86+.nm
@@ -4,14 +4,15 @@
###############################################################################
name = memtest86+
-version = 4.20
-release = 4
-sup_arches = i686 x86_64
+version = 6.00
+release = 1
+thisapp = memtest86plus-%{version}
+sup_arches = x86_64
groups = System/Base
url = http://www.memtest.org/
license = GPLv2
-summary = Stand-alone memory tester for x86 and x86-64 computers.
+summary = Stand-alone memory tester for x86 and x86-64 computers
description
Memtest86+ is a thorough stand-alone memory test for x86 and x86-64
@@ -20,25 +21,45 @@ description
Memtest86+.
end
-source_dl =
+source_dl = https://github.com/memtest86plus/memtest86plus/archive/refs/tags/%{version}.tar.gz#/
+sources = %{thisapp}.tar.gz
build
- CFLAGS += -fno-builtin -ffreestanding
+ requires
+ dosfstools
+ end
build
- make CC="gcc -fno-stack-protector -fno-PIE" \
- CFLAGS="%{CFLAGS}" memtest.bin %{PARALLELISMFLAGS}
+ make -C build64 memtest.bin memtest.efi %{PARALLELISMFLAGS}
end
install
- mkdir -pv %{BUILDROOT}/boot
- cp -vf memtest.bin %{BUILDROOT}/boot/memtest86+
+ mkdir -pv %{BUILDROOT}/boot/memtest86+
+ install -v -m 644 build64/memtest.{bin,efi} %{BUILDROOT}/boot/memtest86+/
- mkdir -pv %{BUILDROOT}/etc/grub.d
- cp -vf %{DIR_SOURCE}/%{name}.grub %{BUILDROOT}/etc/grub.d/20_%{name}
+ mkdir -pv %{BUILDROOT}%{sysconfdir}/grub.d
+ install -v -m 644 %{DIR_SOURCE}/60_memtest86+{,-efi} %{BUILDROOT}%{sysconfdir}/grub.d/
end
end
packages
package %{name}
+ recommends
+ %{name}-efi = %{thisver}
+ end
+
+ files
+ /boot/memtest86+/memtest.bin
+ %{sysconfdir}/grub.d/60_memtest86+
+ end
+ end
+
+ package %{name}-efi
+ summary = Memory Test for EFI systems
+
+ files
+ /boot/memtest86+/memtest.efi
+ %{sysconfdir}/grub.d/60_memtest86+-efi
+ end
+ end
end
diff --git a/mtr/mtr.nm b/mtr/mtr.nm
index f9d292c85..54b99d045 100644
--- a/mtr/mtr.nm
+++ b/mtr/mtr.nm
@@ -4,20 +4,20 @@
###############################################################################
name = mtr
-version = 0.92
+version = 0.94
release = 1
groups = Applications/Internet
-url = http://www.BitWizard.nl/mtr
+url = https://www.BitWizard.nl/mtr
license = GPLv2+
-summary = A network diagnostic tool.
+summary = A network diagnostic tool
description
Mtr is a network diagnostic tool that combines ping and traceroute
into one program.
end
-source_dl = ftp://ftp.bitwizard.nl/mtr/
+source_dl = https://www.bitwizard.nl/mtr/files/
build
requires
@@ -28,6 +28,9 @@ build
libcap-devel
end
+ # The code has plenty of those errors :(
+ CFLAGS += -Wno-error=format-security
+
configure_options += \
--without-gtk
end
diff --git a/pax-utils/pax-utils.nm b/pax-utils/pax-utils.nm
deleted file mode 100644
index dca2b2cd0..000000000
--- a/pax-utils/pax-utils.nm
+++ /dev/null
@@ -1,38 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = pax-utils
-version = 0.1.19
-release = 1
-
-groups = Security/Tools
-url = http://www.gentoo.org/proj/en/hardened/pax-utils.xml
-license = GPLv2+
-summary = Utilities for checking PaX features.
-
-description
- This package contains several utilities for checking PaX features.
-end
-
-source_dl =
-sources = %{thisapp}.tar.bz2
-
-build
- requires
- libcap-devel
- end
-
- build
- make CFLAGS="%{CFLAGS}" USE_CAP=yes %{PARALLELISMFLAGS}
- end
-end
-
-packages
- package %{name}
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/paxctl/paxctl.nm b/paxctl/paxctl.nm
deleted file mode 100644
index d749fb408..000000000
--- a/paxctl/paxctl.nm
+++ /dev/null
@@ -1,38 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = paxctl
-version = 0.8
-release = 2
-
-groups = Applications/System
-url = http://pax.grsecurity.net/
-license = GPLv2
-summary = Application to control PaX flags.
-
-description
- paxctl may be used to control PaX flags on a per-binary basis. PaX
- is a set of kernel security patches to enhance a system's security.
-end
-
-source_dl = https://pax.grsecurity.net/
-
-build
- requires
- m4
- end
-
- build
- make %{PARALLELISMFLAGS} CFLAGS="%{CFLAGS}" LDFLAGS="%{LDFLAGS}"
- end
-end
-
-packages
- package %{name}
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/pigz/pigz.nm b/pigz/pigz.nm
deleted file mode 100644
index fbe20739c..000000000
--- a/pigz/pigz.nm
+++ /dev/null
@@ -1,48 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = pigz
-version = 2.3.3
-release = 2
-
-groups = Applications/Compression
-url = http://www.zlib.net/pigz/
-license = zlib
-summary = Parallel implementation of gzip.
-
-description
- pigz, which stands for parallel implementation of gzip,
- is a fully functional replacement for gzip that exploits
- multiple processors and multiple cores to the hilt when compressing
- data.
-end
-
-source_dl = %{url}
-
-build
- requires
- zlib-devel
- end
-
- make_build_targets += CC=gcc CFLAGS="%{CFLAGS}" LDFLAGS="%{LDFLAGS} -lz"
-
- test
- make test
- end
-
- install
- install -p -D pigz %{BUILDROOT}%{bindir}/pigz
- ln -svf pigz %{BUILDROOT}%{bindir}/unpigz
- install -p -D pigz.1 -m 644 %{BUILDROOT}%{mandir}/man1/pigz.1
- end
-end
-
-packages
- package %{name}
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/rcs/rcs.nm b/rcs/rcs.nm
index 321cdc476..1d791b5b9 100644
--- a/rcs/rcs.nm
+++ b/rcs/rcs.nm
@@ -4,11 +4,11 @@
###############################################################################
name = rcs
-version = 5.9.4
-release = 2
+version = 5.10.1
+release = 1
groups = Development/Tools
-url = http://www.gnu.org/software/rcs/
+url = https://www.gnu.org/software/rcs/
license = GPLv3+
summary = Revision Control System (RCS) file version management tools.
@@ -23,8 +23,8 @@ description
different versions of files.
end
-source_dl = ftp://ftp.gnu.org/gnu/rcs/
-sources = %{thisapp}.tar.xz
+source_dl = https://ftp.gnu.org/gnu/rcs/
+sources = %{thisapp}.tar.lz
build
requires
@@ -33,18 +33,15 @@ build
groff
end
- # Has some inlining problems, so we need to go back to C99
- CFLAGS += -std=c99
-
configure_options += \
--with-diffutils
test
- make check
+ make check XFAIL_TESTS="t790"
end
install_cmds
- # Install the rcsfreeze command.
+ # Install the rcsfreeze command
install -m 755 src/rcsfreeze %{BUILDROOT}%{bindir}
end
end
diff --git a/rng-tools/patches/rng-tools-man.patch b/rng-tools/patches/rng-tools-man.patch
deleted file mode 100644
index 010d20d17..000000000
--- a/rng-tools/patches/rng-tools-man.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up rng-tools-3/rngtest.1.in.man rng-tools-3/rngtest.1.in
---- rng-tools-3/rngtest.1.in.man 2009-12-24 07:47:24.000000000 +0100
-+++ rng-tools-3/rngtest.1.in 2012-01-12 10:12:27.909567190 +0100
-@@ -43,7 +43,7 @@ Exit after processing n input blocks, if
- Dump statistics every n blocks, if n is not zero.
- .TP
- \fB\-t\fR \fIn\fR, \fB\-\-timedstats=\fIn\fR (default: 0)
--Dump statistics every n secods, if n is not zero.
-+Dump statistics every n seconds, if n is not zero.
- .TP
- \fB\-?\fR, \fB\-\-help\fR
- Give a short summary of all program options.
-@@ -62,7 +62,7 @@ other statistics show a breakdown of the
- tests are defined on FIPS 140-1 and FIPS 140-2 errata of 2001-10-10. They
- were removed in FIPS 140-2 errata of 2002-12-03).
- .PP
--The speed statistics are taken for every 20000-bit block trasferred or
-+The speed statistics are taken for every 20000-bit block transferred or
- processed.
-
- .SH EXIT STATUS
diff --git a/rng-tools/rng-tools.nm b/rng-tools/rng-tools.nm
deleted file mode 100644
index ef5e03528..000000000
--- a/rng-tools/rng-tools.nm
+++ /dev/null
@@ -1,52 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = rng-tools
-version = 4
-release = 1
-
-groups = System/Base
-url = http://sourceforge.net/projects/gkernel/
-license = GPLv2+
-summary = Random number generator related utilities.
-
-description
- %{summary}
-end
-
-source_dl = http://downloads.sourceforge.net/project/gkernel/rng-tools/%{version}/
-
-build
- requires
- gettext
- groff
- end
-end
-
-packages
- package %{name}
- script postin
- /bin/systemctl daemon-reload >/dev/null 2>&1 || :
- end
-
- script preun
- /bin/systemctl --no-reload disable rngd.service > /dev/null 2>&1 || :
- /bin/systemctl stop rngd.service > /dev/null 2>&1 || :
- end
-
- script postun
- /bin/systemctl daemon-reload >/dev/null 2>&1 || :
- end
-
- script postup
- /bin/systemctl daemon-reload 2>&1 || :
- /bin/systemctl reload-or-try-restart rngd.service >/dev/null 2>&1 || :
- end
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/rng-tools/systemd/rngd.service b/rng-tools/systemd/rngd.service
deleted file mode 100644
index 770bc621f..000000000
--- a/rng-tools/systemd/rngd.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Hardware RNG Entropy Gatherer Daemon
-
-[Service]
-ExecStart=/usr/sbin/rngd -f --no-tpm=1
-
-[Install]
-WantedBy=multi-user.target
diff --git a/slang/slang.nm b/slang/slang.nm
index c81a3e286..96e04b9c6 100644
--- a/slang/slang.nm
+++ b/slang/slang.nm
@@ -4,13 +4,13 @@
###############################################################################
name = slang
-version = 2.3.0
-release = 2.1
+version = 2.3.3
+release = 1
groups = System/Libraries
-url = http://www.jedsoft.org/slang/
+url = https://www.jedsoft.org/slang/
license = GPLv2+
-summary = Shared library for the S-Lang extension language.
+summary = Shared library for the S-Lang extension language
description
S-Lang is an interpreted language and a programming library.
@@ -19,7 +19,8 @@ description
language.
end
-source_dl = http://www.jedsoft.org/releases/slang/
+source_dl = https://www.jedsoft.org/releases/slang/
+sources = %{thisapp}.tar.bz2
build
requires
@@ -29,8 +30,6 @@ build
zlib-devel
end
- PARALLELISMFLAGS = # off
-
install_cmds
rm -rvf %{BUILDROOT}%{bindir} %{BUILDROOT}%{datadir}/slsh
end
diff --git a/strace/strace.nm b/strace/strace.nm
index 19758a93c..52d5fcd24 100644
--- a/strace/strace.nm
+++ b/strace/strace.nm
@@ -4,11 +4,11 @@
###############################################################################
name = strace
-version = 4.13
+version = 6.1
release = 1
groups = Development/Debuggers
-url = http://sourceforge.net/projects/strace/
+url = https://strace.io/
license = BSD
summary = Tracks and displays system calls associated with a running process.
@@ -20,7 +20,7 @@ description
purposes.
end
-source_dl = http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/
+source_dl = https://strace.io/files/%{version}/
sources = %{thisapp}.tar.xz
packages
diff --git a/strongswan/strongswan.nm b/strongswan/strongswan.nm
index dfd1335a7..c20e197b6 100644
--- a/strongswan/strongswan.nm
+++ b/strongswan/strongswan.nm
@@ -4,13 +4,13 @@
###############################################################################
name = strongswan
-version = 5.8.0
+version = 5.9.8
release = 1
groups = Networking/VPN
-url = http://www.strongswan.org/
+url = https://www.strongswan.org/
license = GPL
-summary = IPsec (IKEv1 + IKEv2) implementation for Linux.
+summary = IPsec (IKEv1 + IKEv2) implementation for Linux
description
StrongSwan is a complete IPsec and IKEv1 implementation for
@@ -19,8 +19,7 @@ description
and IKEv2 mode with most other IPsec-based VPN products.
end
-source_dl = http://download.strongswan.org/
-sources = %{thisapp}.tar.bz2
+source_dl = https://download.strongswan.org/
build
requires
@@ -43,6 +42,10 @@ build
unbound-devel >= 1.7
end
+ # strongswan cannot be compiled with -Wformat-security
+ # because of some custom printf stuff
+ CFLAGS += -Wno-format-security -Wno-error=format-security
+
configure_options += \
--disable-static \
--with-ipseclibdir=%{libdir}/ipsec \
@@ -71,18 +74,12 @@ build
--enable-systemd \
--disable-charon \
--disable-stroke \
- --disable-scepclient
+ --disable-warnings
- if "%{DISTRO_ARCH}" == "i686"
- configure_options += --enable-padlock
+ test
+ LD_LIBRARY_PATH="%{DIR_APP}/src/libstrongswan/.libs" make check || :
end
- # The testsuite does not run through in the build system
- # on ARM systems.
- #test
- # make check
- #end
-
install_cmds
# Install network settings
install -v -m 644 %{DIR_SOURCE}/network.conf \
@@ -92,12 +89,6 @@ build
mkdir -pv %{BUILDROOT}%{sysconfdir}/swanctl/connections
echo "include connections/*.conf" > \
%{BUILDROOT}%{sysconfdir}/swanctl/swanctl.conf
-
- # Drop unneeded files.
- rm -rvf %{BUILDROOT}%{libdir}/ipsec/lib*.so
-
- # Move libraries to libdir.
- mv %{BUILDROOT}%{libdir}/ipsec/lib*.so.* %{BUILDROOT}%{libdir}
end
end
diff --git a/tar/tar.nm b/tar/tar.nm
index 3953c025c..5403df401 100644
--- a/tar/tar.nm
+++ b/tar/tar.nm
@@ -4,11 +4,11 @@
###############################################################################
name = tar
-version = 1.31
+version = 1.34
release = 1
groups = System/Packaging
-url = http://www.gnu.org/software/tar/
+url = https://www.gnu.org/software/tar/
license = GPLv3+
summary = A GNU file archiving program.
@@ -22,11 +22,9 @@ description
and the ability to perform incremental and full backups.
end
-source_dl = http://ftp.gnu.org/gnu/tar/
+source_dl = https://ftp.gnu.org/gnu/tar/
sources = %{thisapp}.tar.xz
-CONFIGURE_ENVIRONMENT = FORCE_UNSAFE_CONFIGURE=1
-
build
requires
libacl-devel
@@ -39,14 +37,12 @@ build
FORCE_UNSAFE_CONFIGURE=1
test
- make check
+ make check || :
end
end
packages
package %{name}
- groups += Base Build
- end
package %{name}-debuginfo
template DEBUGINFO
diff --git a/tzdata/tzdata.nm b/tzdata/tzdata.nm
index ece9f66ef..3219b8c3c 100644
--- a/tzdata/tzdata.nm
+++ b/tzdata/tzdata.nm
@@ -3,26 +3,27 @@
# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
###############################################################################
-tzdata_version = 2019b
-tzcode_version = 2019b
+tzdata_version = 2022g
+tzcode_version = 2022g
name = tzdata
version = %{tzdata_version}
release = 1
arch = noarch
+thisapp = tzdb-%{version}
groups = System/Base
url = https://www.iana.org/time-zones
license = Public Domain
-summary = Timezone data.
+summary = Timezone data
description
This package contains data files with rules for various timezones around
the world.
end
-source_dl += https://www.iana.org/time-zones/repository/releases/
-sources = tzdata%{tzdata_version}.tar.gz tzcode%{tzcode_version}.tar.gz
+source_dl = https://www.iana.org/time-zones/repository/releases/
+sources = %{thisapp}.tar.lz
build
requires
@@ -30,15 +31,13 @@ build
perl
end
- DIR_APP = %{DIR_SRC}/tzdata%{tzdata_version}
+ make_build_targets += \
+ CFLAGS="%{CFLAGS}" LDFLAGS="%{LDFLAGS}"
- prepare
- mkdir -pv %{DIR_APP}
- %{MACRO_EXTRACT} %{DIR_DL}/tzcode%{tzcode_version}.tar.gz -C %{DIR_APP}
- %{MACRO_EXTRACT} %{DIR_DL}/tzdata%{tzdata_version}.tar.gz -C %{DIR_APP}
- end
+ make_install_targets += \
+ BINDIR=%{bindir} LIBDIR=%{libdir} MANDIR=%{mandir}
- files = \
+ timezones = \
africa \
antarctica \
asia \
@@ -46,31 +45,31 @@ build
europe \
northamerica \
southamerica \
- pacificnew \
etcetera \
- backward
+ backward \
+ factory
- build
- mkdir -pv zoneinfo/{,posix,right}
+ install_cmds
+ ./zic -b fat -d "%{BUILDROOT}%{datadir}/zoneinfo" %{timezones}
+ ./zic -b fat -d "%{BUILDROOT}%{datadir}/zoneinfo/posix" %{timezones}
+ ./zic -b fat -d "%{BUILDROOT}%{datadir}/zoneinfo/right" -L leapseconds %{timezones}
- zic -y ./yearistype -d zoneinfo \
- -L /dev/null -p GMT %{files}
- zic -y ./yearistype -d zoneinfo/posix \
- -L /dev/null %{files}
- zic -y ./yearistype -d zoneinfo/right \
- -L leapseconds %{files}
- end
+ # This creates the posixrules file.
+ # We use New York because POSIX requires the daylight savings time rules to be
+ # in accordance with US rules.
+ ./zic -b fat -d "%{BUILDROOT}%{datadir}/zoneinfo" -p America/New_York
- install
- mkdir -pv %{BUILDROOT}%{datadir}/zoneinfo
- cp -prd zoneinfo/* %{BUILDROOT}%{datadir}/zoneinfo
+ install -v -m 644 iso3166.tab leap-seconds.list zone1970.tab zone.tab SECURITY \
+ "%{BUILDROOT}%{datadir}/zoneinfo"
- install -p -m 644 zone.tab iso3166.tab \
- %{BUILDROOT}%{datadir}/zoneinfo
- rm -f %{BUILDROOT}/usr/share/zoneinfo/localtime
+ rm -vf "%{BUILDROOT}%{sysconfdir}/localtime"
end
end
packages
package %{name}
+
+ package %{name}-debuginfo
+ template DEBUGINFO
+ end
end
diff --git a/unicode-ucd/unicode-ucd.nm b/unicode-ucd/unicode-ucd.nm
deleted file mode 100644
index 17e922d41..000000000
--- a/unicode-ucd/unicode-ucd.nm
+++ /dev/null
@@ -1,50 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = unicode-ucd
-version = 9.0.0
-release = 1
-arch = noarch
-
-groups = Development/System
-url = http://www.unicode.org/ucd/
-license = MIT
-summary = Unicode Character Database.
-
-description
- The Unicode Character Database (UCD) consists of a number of data files listing
- Unicode character properties and related data. It also includes data files
- containing test data for conformance to several important Unicode algorithms.
-end
-
-source_dl = http://www.unicode.org/Public/zipped/%{version}/
-sources = UCD.zip
-
-build
- requires
- unzip>=6.0-3
- end
-
- prepare
- # Manually create DIR_APP because the
- # soucre archive doesn't contain any folder.
- mkdir -pv %{DIR_APP}
-
- # Manually extract zip compressed source archive.
- cd %{DIR_APP} && unzip %{DIR_DL}/%{sources}
- end
-
- build = # Nothing to do
-
- install
- # Create install folder and copy files.
- mkdir -pv %{BUILDROOT}%{datadir}/unicode/ucd/
- cp -arvf . %{BUILDROOT}%{datadir}/unicode/ucd/
- end
-end
-
-packages
- package %{name}
-end
diff --git a/ustr/patches/c99-inline.patch b/ustr/patches/c99-inline.patch
deleted file mode 100644
index dfa021fdd..000000000
--- a/ustr/patches/c99-inline.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -rup ustr-1.0.4-orig/ustr-compiler.h ustr-1.0.4/ustr-compiler.h
---- ustr-1.0.4-orig/ustr-compiler.h 2008-02-15 15:12:28.000000000 -0500
-+++ ustr-1.0.4/ustr-compiler.h 2008-06-13 15:25:18.000000000 -0400
-@@ -113,17 +113,23 @@
- #endif
-
- #ifndef USTR_CONF_EI_PROTO /* external inline */
--# if USTR_CONF_INCLUDE_CODEONLY_HEADERS
-+# if USTR_CONF_INCLUDE_CODEONLY_HEADERS || ! defined(__GNUC__) || \
-+ ! USTR_CONF_COMPILE_USE_INLINE
- # define USTR_CONF_EI_PROTO static USTR__INLINE
- # else
- # define USTR_CONF_EI_PROTO extern
- # endif
- #endif
- #ifndef USTR_CONF_II_PROTO /* implementation of inline */
--# if USTR_CONF_INCLUDE_CODEONLY_HEADERS
-+# if USTR_CONF_INCLUDE_CODEONLY_HEADERS || ! defined(__GNUC__) || \
-+ ! USTR_CONF_COMPILE_USE_INLINE
- # define USTR_CONF_II_PROTO static USTR__INLINE
- # else
--# define USTR_CONF_II_PROTO extern inline
-+# if defined(__GNUC_STDC_INLINE__) || defined(__GNUC_GNU_INLINE__)
-+# define USTR_CONF_II_PROTO extern inline __attribute__ ((__gnu_inline__))
-+# else
-+# define USTR_CONF_II_PROTO extern inline
-+# endif
- # endif
- #endif
-
diff --git a/ustr/ustr.nm b/ustr/ustr.nm
deleted file mode 100644
index 9e12f8edf..000000000
--- a/ustr/ustr.nm
+++ /dev/null
@@ -1,56 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = ustr
-version = 1.0.4
-release = 3.1
-
-groups = System/Libraries
-url = http://www.and.org/ustr/
-license = MIT or LGPLv2+ or BSD
-summary = String library, very low memory overhead, simple to import.
-
-description
- Micro string library, with very low overhead.
-end
-
-source_dl = http://www.and.org/ustr/%{version}/
-sources = %{thisapp}.tar.bz2
-
-build
- CFLAGS += -fgnu89-inline
-
- make_build_targets += \
- all-shared \
- CFLAGS="%{CFLAGS}" \
- LDFLAGS="%{LDFLAGS}"
-
- test
- make check
- end
-
- make_install_targets += libdir=%{libdir}
-
- install_cmds
- rm -rf %{BUILDROOT}/usr/share
- rm -rf %{BUILDROOT}/usr/lib*/pkgconfig/*debug*
- rm -rf %{BUILDROOT}/lib/*debug*
- rm -rf %{BUILDROOT}/usr/lib*/*debug*
- end
-end
-
-packages
- package %{name}
-
- package %{name}-devel
- template DEVEL
-
- files += %{bindir}
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/which/which.nm b/which/which.nm
index 3f9a756b1..d5f6291a0 100644
--- a/which/which.nm
+++ b/which/which.nm
@@ -4,25 +4,23 @@
###############################################################################
name = which
-version = 2.20
-release = 2
+version = 2.21
+release = 1
groups = Applications/System
-url = http://www.xs4all.nl/~carlo17/which/
+url = https://carlowood.github.io/which/
license = GPLv3
-summary = Displays where a particular program in your path is located.
+summary = Displays where a particular program in your path is located
description
The which command shows the full pathname of a specified program, if
the specified program is in your PATH.
end
-source_dl = http://carlo17.home.xs4all.nl/which/
+source_dl = https://carlowood.github.io/which/
packages
package %{name}
- groups += Base Build
- end
package %{name}-debuginfo
template DEBUGINFO
diff --git a/xmlto/xmlto.nm b/xmlto/xmlto.nm
index a24d20d48..ff9bf8d77 100644
--- a/xmlto/xmlto.nm
+++ b/xmlto/xmlto.nm
@@ -4,11 +4,11 @@
###############################################################################
name = xmlto
-version = 0.0.26
+version = 0.0.28
release = 1
groups = Applications/System
-url = https://fedorahosted.org/xmlto/
+url = https://pagure.io/xmlto
license = GPLv2+
summary = A tool for converting XML files to various formats.
@@ -17,8 +17,7 @@ description
stylesheets.
end
-source_dl = https://fedorahosted.org/releases/x/m/%{name}/
-source = %{thisapp}.tar.bz2
+source_dl = https://releases.pagure.org/xmlto/
build
requires
hooks/post-receive
--
IPFire 3.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-12-22 19:31 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-12-22 19:31 [git.ipfire.org] IPFire 3.x development tree branch, master, updated. d62776ed14914cd0ecd0251c0279174a39e7a965 Michael Tremer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox