[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 2bb739f6129949a483b87e3c9d233c070f38f13a
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 2bb739f6129949a483b87e3c9d233c070f38f13a (commit) via f249319872a99d2687bb4d906627a99a28a31033 (commit) via d4f225660ef2b39d664e2b2c61362249fb91395e (commit) via cde60c806094bd5776de4a890f06defd372a429b (commit) via 891254846c86b861e1b7b1d70095d665b79bd859 (commit) via 2cb9d65a3a7430b48b8a4ca5297e73db90865ddb (commit) via b814248d26430425ba606fde167ab24c03f96706 (commit) via 548a5f3ef9b6ee7748fd34e8ac9a80fbc00f986e (commit) via 789e6f1050a7e2604c07b6919b9c4397085a5ee6 (commit) via f40b4ef7ad9e6fe5ac257005f16749194b8031d8 (commit) via b1f434d95bf2e995f50280db241cea94c5e9a19f (commit) via 8d1a9dde31c498f67a7d5132e17f1a9b3150c329 (commit) via d0209835a37c5150999c4cbb96b9f10c12351cc0 (commit) via 075261bd91ff498260fd9253c7a3dac534fcbb89 (commit) via aa5dc92a3074f778149dd2e5d55735ebc53c3d6f (commit) via f0cda7b7b75724afe3a3d518cee28ec572f65ed6 (commit) via 41723e9ba86575654a70989eb88408c632dc64b7 (commit) via be5e81c8ba15a88f569b372960c8c6c3c81d3955 (commit) via 6db12f43f23c8d2bb7addaf21b613c2162f8ade9 (commit) via 4d9c9f33f9a2993d9cf01cbba9b6f629906a51f4 (commit) via 87941f3fa35983b097d92adcace7f0a2a5dfbc89 (commit) via 345961d240f043991cf90702b0d910e4c86aafa4 (commit) via e08cd8468dd04623277ebca74575946681462b7d (commit) via 4ccd8ed8a0bd1a8e9b8423a2af6cee66511b49ec (commit) via d4b092dbb21a9a13b7e155d8c5a3659492d0b6c3 (commit) via 76b1d6e3411d25847d60355727543e560a03e3b7 (commit) via 3c5a74dfcd28ac49e5a1e17ae202ebc90d26f509 (commit) via 3c08fdcd41120595ee956acac2420b69e20e3ecf (commit) via a7992b4bcf82900731327f9ed1e4f9c637444e16 (commit) via 5283f73b8169680fd67b0b5be8feaec0e8ca730f (commit) via 4bb618340e078c2bbf6b5c1e760aa94b21f71ca0 (commit) via ca12c08a5b9fbb5db020dcc04b2abcf33f94f76e (commit) via a702b430848a86cb7337a41d35b04aa7a499aebf (commit) via 74ce71d40c23da523a2869e259dd46f927872d78 (commit) via 4f6ac2f938dc5e4c889d37ce5aea3307405dd0ab (commit) via 5f77f6cf006063bbacc74da186e2c8880aace66c (commit) via 081aacc44c83618ffea951162d539b0972df3238 (commit) via 3123ad59b7860c7b5cdf451398eb492e5b2f3da3 (commit) via a5024be6c091d81ef1c4f8d492c671d7ffa5c7b6 (commit) from f6f03dfafc4bc31f540d5a4a5961bac0e799f1ba (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 2bb739f6129949a483b87e3c9d233c070f38f13a Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jan 8 17:52:35 2023 +0000
libpipeline: Update to 1.5.3
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit f249319872a99d2687bb4d906627a99a28a31033 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jan 8 17:49:38 2023 +0000
json-glib: Drop package
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit d4f225660ef2b39d664e2b2c61362249fb91395e Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jan 8 17:42:01 2023 +0000
libnfnetlink: Update to 1.0.2
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit cde60c806094bd5776de4a890f06defd372a429b Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jan 8 17:41:17 2023 +0000
linux-firmware: Update to 20221214
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 891254846c86b861e1b7b1d70095d665b79bd859 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jan 8 17:25:55 2023 +0000
libxslt: Update to 1.1.37
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 2cb9d65a3a7430b48b8a4ca5297e73db90865ddb Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jan 8 17:08:16 2023 +0000
psmisc: Update to 23.6
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit b814248d26430425ba606fde167ab24c03f96706 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jan 8 17:07:05 2023 +0000
libsodium: Update to 1.0.18
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 548a5f3ef9b6ee7748fd34e8ac9a80fbc00f986e Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jan 8 17:03:26 2023 +0000
libpng: Update to 1.6.39
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 789e6f1050a7e2604c07b6919b9c4397085a5ee6 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jan 8 16:56:59 2023 +0000
libnl3: Update download URL
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit f40b4ef7ad9e6fe5ac257005f16749194b8031d8 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jan 8 16:53:49 2023 +0000
libatomic_ops: Drop package
Nothing depends on this
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit b1f434d95bf2e995f50280db241cea94c5e9a19f Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jan 8 16:53:06 2023 +0000
libhtp: Drop package
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 8d1a9dde31c498f67a7d5132e17f1a9b3150c329 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jan 8 16:51:46 2023 +0000
libaio: Update to 0.3.113
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit d0209835a37c5150999c4cbb96b9f10c12351cc0 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jan 8 16:47:15 2023 +0000
libnl: Update to 1.1.4
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 075261bd91ff498260fd9253c7a3dac534fcbb89 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jan 8 16:42:16 2023 +0000
iptraf-ng: Update to 1.2.1
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit aa5dc92a3074f778149dd2e5d55735ebc53c3d6f Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Jan 7 22:05:05 2023 +0100
dbus: Refactor package.
* Do not ship dbus-daemon and related files anymore. * Create a package for common files. * Ship dbus related tools in an own package.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit f0cda7b7b75724afe3a3d518cee28ec572f65ed6 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Jan 7 22:05:04 2023 +0100
dbus-broker: New package
This will replace the legacy dbus-daemon.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 41723e9ba86575654a70989eb88408c632dc64b7 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jan 8 16:30:22 2023 +0000
libatasmart: Fix source URL
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit be5e81c8ba15a88f569b372960c8c6c3c81d3955 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jan 8 16:29:43 2023 +0000
libcgroup: Drop package
Nothing depends on this
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 6db12f43f23c8d2bb7addaf21b613c2162f8ade9 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jan 8 16:27:33 2023 +0000
hwdata: Update to 0.366
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 4d9c9f33f9a2993d9cf01cbba9b6f629906a51f4 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jan 8 16:27:17 2023 +0000
liboping: Fix format errors
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 87941f3fa35983b097d92adcace7f0a2a5dfbc89 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jan 8 16:20:55 2023 +0000
iso-codes: Drop package
Nothing depends on this.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 345961d240f043991cf90702b0d910e4c86aafa4 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jan 8 16:20:26 2023 +0000
smartmontools: Update to 7.3
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit e08cd8468dd04623277ebca74575946681462b7d Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jan 8 16:15:57 2023 +0000
hdparm: Update to 9.65
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 4ccd8ed8a0bd1a8e9b8423a2af6cee66511b49ec Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jan 8 16:13:11 2023 +0000
iperf3: Update to 3.12
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit d4b092dbb21a9a13b7e155d8c5a3659492d0b6c3 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jan 8 16:09:36 2023 +0000
libcroco: Drop package
gettext has a bundled version
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 76b1d6e3411d25847d60355727543e560a03e3b7 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jan 8 16:06:49 2023 +0000
iperf: Update to 2.1.8
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 3c5a74dfcd28ac49e5a1e17ae202ebc90d26f509 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jan 8 16:04:16 2023 +0000
gsettings-desktop-schemas: Drop package
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 3c08fdcd41120595ee956acac2420b69e20e3ecf Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jan 8 16:03:36 2023 +0000
intel-microcode: Update to 20221108
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit a7992b4bcf82900731327f9ed1e4f9c637444e16 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jan 8 16:00:37 2023 +0000
groff: Update to 1.22.4
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 5283f73b8169680fd67b0b5be8feaec0e8ca730f Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jan 8 15:57:55 2023 +0000
dhcping: Add source URL
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 4bb618340e078c2bbf6b5c1e760aa94b21f71ca0 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jan 8 15:54:54 2023 +0000
cronie: Update to 1.6.1
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit ca12c08a5b9fbb5db020dcc04b2abcf33f94f76e Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jan 8 15:51:05 2023 +0000
pdns: Update to 4.7.3
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit a702b430848a86cb7337a41d35b04aa7a499aebf Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jan 8 15:23:39 2023 +0000
ddns: Update to 014
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 74ce71d40c23da523a2869e259dd46f927872d78 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jan 8 15:19:24 2023 +0000
etherwake: Drop package
Upstream is dead.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 4f6ac2f938dc5e4c889d37ce5aea3307405dd0ab Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jan 8 15:17:15 2023 +0000
dos2unix: Update to 7.4.3
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 5f77f6cf006063bbacc74da186e2c8880aace66c Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jan 8 15:15:34 2023 +0000
lua: Update to 5.4.4
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 081aacc44c83618ffea951162d539b0972df3238 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jan 8 15:11:46 2023 +0000
eject: Drop package
This is now provided by util-linux
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 3123ad59b7860c7b5cdf451398eb492e5b2f3da3 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jan 8 15:10:04 2023 +0000
ddrescue: Update to 1.26
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit a5024be6c091d81ef1c4f8d492c671d7ffa5c7b6 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jan 8 15:04:50 2023 +0000
nmap: Update to 7.93
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: cronie/cronie.nm | 4 +- dbus/dbus.nm => dbus-broker/dbus-broker.nm | 60 +- dbus/dbus.nm | 105 +- ddns/ddns.nm | 12 +- ddrescue/ddrescue.nm | 7 +- dhcping/dhcping.nm | 10 +- dos2unix/dos2unix.nm | 8 +- eject/eject.nm | 43 - eject/patches/eject-2.1.1-verbose.patch | 15 - eject/patches/eject-2.1.5-lock.patch | 171 -- eject/patches/eject-2.1.5-opendevice.patch | 39 - eject/patches/eject-2.1.5-spaces.patch | 62 - eject/patches/eject-2.1.5-umount.patch | 176 -- eject/patches/eject-timeout.patch | 11 - etherwake/etherwake.8 | 81 - etherwake/etherwake.nm | 45 - etherwake/patches/etherwake-1.09-hardening.patch | 30 - etherwake/patches/etherwake-1.09-install.patch | 10 - gettext/gettext.nm | 8 +- groff/groff.nm | 20 +- ...ad-site-font-and-site-tmac-from-etc-groff.patch | 43 - .../gsettings-desktop-schemas.nm | 56 - hdparm/hdparm.nm | 10 +- hwdata/hwdata.nm | 21 +- intel-microcode/intel-microcode.nm | 2 +- iperf/iperf.nm | 4 +- iperf3/iperf3.nm | 3 +- iptraf-ng/iptraf-ng.nm | 8 +- ...g-kernel-v3.5-kill-off-token-ring-support.patch | 128 - iso-codes/iso-codes.nm | 37 - json-glib/json-glib.nm | 49 - libaio/libaio.nm | 30 +- .../patches/libaio-0.3.109-install-to-slash.patch | 30 - libatasmart/libatasmart.nm | 8 +- libatomic_ops/libatomic_ops.nm | 45 - libcgroup/libcgroup.nm | 54 - libcroco/libcroco.nm | 51 - libhtp/libhtp.nm | 55 - libnfnetlink/libnfnetlink.nm | 16 +- libnl/libnl.nm | 23 +- libnl/patches/libnl-1.1-include-limits-h.patch | 11 - libnl/patches/libnl-1.1-no-extern-inline.patch | 57 - libnl/patches/libnl-1.1-permissions.patch | 13 - libnl3/libnl3.nm | 2 +- liboping/liboping.nm | 6 +- libpipeline/libpipeline.nm | 8 +- libpng/libpng.nm | 3 +- libsodium/libsodium.nm | 6 +- libxslt/libxslt.nm | 14 +- linux-firmware/linux-firmware.nm | 15 +- lua/lua.nm | 69 +- lua/lua.pc | 20 - lua/patches/liblua.so.patch | 60 - lua/patches/lua-5.4.4-autotoolize.patch | 2539 ++++++++++++++++++++ .../lua-5.4.4-configure-compat-module.patch | 34 + lua/patches/lua-5.4.4-configure-linux.patch | 22 + nmap/nmap.nm | 14 +- pdns/pdns.conf | 4 +- pdns/pdns.nm | 13 +- psmisc/psmisc.nm | 11 +- smartmontools/smartmontools.nm | 22 +- 61 files changed, 2867 insertions(+), 1666 deletions(-) copy dbus/dbus.nm => dbus-broker/dbus-broker.nm (68%) delete mode 100644 eject/eject.nm delete mode 100644 eject/patches/eject-2.1.1-verbose.patch delete mode 100644 eject/patches/eject-2.1.5-lock.patch delete mode 100644 eject/patches/eject-2.1.5-opendevice.patch delete mode 100644 eject/patches/eject-2.1.5-spaces.patch delete mode 100644 eject/patches/eject-2.1.5-umount.patch delete mode 100644 eject/patches/eject-timeout.patch delete mode 100644 etherwake/etherwake.8 delete mode 100644 etherwake/etherwake.nm delete mode 100644 etherwake/patches/etherwake-1.09-hardening.patch delete mode 100644 etherwake/patches/etherwake-1.09-install.patch delete mode 100644 groff/patches/0002-load-site-font-and-site-tmac-from-etc-groff.patch delete mode 100644 gsettings-desktop-schemas/gsettings-desktop-schemas.nm delete mode 100644 iptraf-ng/patches/0001-token-ring-kernel-v3.5-kill-off-token-ring-support.patch delete mode 100644 iso-codes/iso-codes.nm delete mode 100644 json-glib/json-glib.nm delete mode 100644 libaio/patches/libaio-0.3.109-install-to-slash.patch delete mode 100644 libatomic_ops/libatomic_ops.nm delete mode 100644 libcgroup/libcgroup.nm delete mode 100644 libcroco/libcroco.nm delete mode 100644 libhtp/libhtp.nm delete mode 100644 libnl/patches/libnl-1.1-include-limits-h.patch delete mode 100644 libnl/patches/libnl-1.1-no-extern-inline.patch delete mode 100644 libnl/patches/libnl-1.1-permissions.patch delete mode 100644 lua/lua.pc delete mode 100644 lua/patches/liblua.so.patch create mode 100644 lua/patches/lua-5.4.4-autotoolize.patch create mode 100644 lua/patches/lua-5.4.4-configure-compat-module.patch create mode 100644 lua/patches/lua-5.4.4-configure-linux.patch
Difference in files: diff --git a/cronie/cronie.nm b/cronie/cronie.nm index ce7a5581c..b24f79c37 100644 --- a/cronie/cronie.nm +++ b/cronie/cronie.nm @@ -4,8 +4,8 @@ ###############################################################################
name = cronie -version = 1.5.1 -release = 2 +version = 1.6.1 +release = 1
groups = System/Environment/Base url = https://github.com/cronie-crond/cronie diff --git a/dbus-broker/dbus-broker.nm b/dbus-broker/dbus-broker.nm new file mode 100644 index 000000000..a65a1e0d6 --- /dev/null +++ b/dbus-broker/dbus-broker.nm @@ -0,0 +1,100 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team info@ipfire.org # +############################################################################### + +name = dbus-broker +version = 32 +release = 1 + +maintainer = Stefan Schantl stefan.schantl@ipfire.org +groups = System/Daemons +url = https://github.com/bus1/dbus-broker +license = Apache 2.0 +summary = Linux D-Bus Message Broker + +description + D-BUS is a system for sending messages between applications. It is + used both for the system-wide message bus service, and as a + per-user-login-session messaging facility. +end + +source_dl = https://github.com/bus1/%%7Bname%7D/releases/download/v%%7Bversion%7D/ +sources = %{thisapp}.tar.xz + +build + requires + meson + python3-docutils + expat-devel + libcap-ng-devel + systemd-devel + end + + build + %{meson} \ + -Ddocs=true \ + -Dlinux-4-17=true + + %{meson_build} + end + + install + %{meson_install} + end +end + +packages + package %{name} + obsoletes + dbus <= 1.15.2-2 + end + + provides + dbus + end + + requires + dbus-common + end + + prerequires += shadow-utils + + script prein + getent group dbus >/dev/null || groupadd -r dbus + getent passwd dbus >/dev/null || \ + useradd -r -g dbus -d / -s /sbin/nologin \ + -c "User for dbus service" dbus + exit 0 + end + + # Just search for new unit files that were just installed. + script postin + systemctl daemon-reload >/dev/null 2>&1 || : + + # The dbus service should be started on default. + systemctl enable dbus-broker.service > /dev/null 2>&1 || : + end + + # Disable the service that is to be removed and stop it if it is still running. + script preun + systemctl --no-reload disable dbus-broker.service >/dev/null 2>&1 || : + systemctl stop dbus-broker.service >/dev/null 2>&1 || : + end + + # Just tell systemd that unitfiles have been removed. + script postun + systemctl daemon-reload >/dev/null 2>&1 || : + end + + # Try to restart the service if it is running. + script postup + systemctl daemon-reload >/dev/null 2>&1 || : + systemctl try-restart dbus-broker.service >/dev/null 2>&1 || : + end + end + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/dbus/dbus.nm b/dbus/dbus.nm index e25427bee..d6daa5270 100644 --- a/dbus/dbus.nm +++ b/dbus/dbus.nm @@ -4,9 +4,14 @@ ###############################################################################
name = dbus -version = 1.15.2 +ver_major = 1 +ver_minor = 15 +ver_plevel = 2 release = 1
+version = %{ver_major}.%{ver_minor}.%{ver_plevel} +dbus_ver = %{ver_major}.%{ver_minor}.%{ver_plevel} + maintainer = Stefan Schantl stefan.schantl@ipfire.org groups = System/Daemons url = https://www.freedesktop.org/software/dbus/ @@ -40,43 +45,89 @@ build test make check end + + install_cmds + # Remove unneeded documentation. + rm -rvf %{BUILDROOT}/%{datadir}/doc + rm -rvf %{BUILDROOT}/%{datadir}/xml + + # Drop cmake related stuff + rm -rvf %{BUILDROOT}/%{libdir}/cmake + + # Remove daemon related binaries and manpages. + for bin in daemon launch run-session test-tool cleanup-sockets; do + rm -rvf %{BUILDROOT}/%{bindir}/dbus-$bin + rm -rvf %{BUILDROOT}/%{mandir}/man1/dbus-$bin* + done + + # Remove daemon-lauch-helper + rm -rvf %{BUILDROOT}/usr/lib/dbus-daemon-launch-helper + + # Remove daemon related systemd files. + rm -rvf %{BUILDROOT}/%{unitdir}/dbus.service + rm -rvf %{BUILDROOT}/%{unitdir}/multi-user.target.wants + rm -rvf %{BUILDROOT}/usr/lib/tmpfiles.d + + # Remove daemon related folders in /var + rm -rvf %{BUILDROOT}/%{localstatedir} + end end
packages - package %{name} - prerequires += shadow-utils - - script prein - getent group dbus >/dev/null || groupadd -r dbus - getent passwd dbus >/dev/null || \ - useradd -r -g dbus -d / -s /sbin/nologin \ - -c "User for dbus service" dbus - exit 0 + package %{name}-common + summary = D-BUS message bus configuration. + version = %{dbus_ver} + arch = noarch + + description + The dbus-common package provides the configuration and setup files for D-Bus + implementations to provide a System and User Message Bus. end
- # Just search for new unit files that were just installed. - script postin - systemctl daemon-reload >/dev/null 2>&1 || : - - # The dbus service should be started on default. - systemctl enable dbus.service > /dev/null 2>&1 || : + files + /usr/lib/sysusers.d/ + /usr/lib/sysusers.d/* + %{sysconfdir}/dbus-1 + %{sysconfdir}/dbus-1/session.d + %{sysconfdir}/dbus-1/system.d + %{sysconfdir}/dbus-1/session.conf + %{sysconfdir}/dbus-1/system.conf + %{datadir}/dbus-1 + %{datadir}/dbus-1/session.d + %{datadir}/dbus-1/system.d + %{datadir}/dbus-1/session.conf + %{datadir}/dbus-1/system.conf + %{datadir}/dbus-1/services + %{datadir}/dbus-1/system-services + %{datadir}/dbus-1/interfaces + %{unitdir}/dbus.socket + %{unitdir}/sockets.target.wants/dbus.socket end + end + + package %{name}-tools + summary = D-BUS Tools and Utilities. + version = %{dbus_ver}
- # Disable the service that is to be removed and stop it if it is still running. - script preun - systemctl --no-reload disable dbus.service >/dev/null 2>&1 || : - systemctl stop dbus.service >/dev/null 2>&1 || : + description + Tools and utilities to interact with a running D-Bus Message Bus, provided by + the reference implementation. end
- # Just tell systemd that unitfiles have been removed. - script postun - systemctl daemon-reload >/dev/null 2>&1 || : + requires + dbus-libs = %{thisver} + dbus-common = %{dbus_ver} end
- # Try to restart the service if it is running. - script postup - systemctl daemon-reload >/dev/null 2>&1 || : - systemctl try-restart dbus.service >/dev/null 2>&1 || : + files + %{bindir}/dbus-send + %{bindir}/dbus-monitor + %{bindir}/dbus-update-activation-environment + %{bindir}/dbus-uuidgen + %{mandir}/man1/dbus-monitor.1* + %{mandir}/man1/dbus-send.1* + %{mandir}/man1/dbus-update-activation-environment.1* + %{mandir}/man1/dbus-uuidgen.1* end end
diff --git a/ddns/ddns.nm b/ddns/ddns.nm index c19411be1..005d90e23 100644 --- a/ddns/ddns.nm +++ b/ddns/ddns.nm @@ -4,12 +4,12 @@ ###############################################################################
name = ddns -version = 009 +version = 014 release = 1 arch = noarch
groups = System/Tools -url = http://www.ipfire.org +url = https://www.ipfire.org license = GPLv3 summary = A python based dynamic DNS updater.
@@ -18,8 +18,8 @@ description written in Python. end
-source_dl = http://source.ipfire.org/releases/ddns/ -sources = %{thisapp}.tar.xz +source_dl = https://source.ipfire.org/releases/ddns/ +sources = %{thisapp}.tar.xz
build requires @@ -33,8 +33,6 @@ build end
configure_options += \ - --prefix=%{prefix} \ - --sysconfdir=%{sysconfdir} \ --enable-manpages \ --with-systemd
@@ -54,7 +52,7 @@ end
packages package %{name} - recommends + requires %{bindir}/nsupdate end
diff --git a/ddrescue/ddrescue.nm b/ddrescue/ddrescue.nm index be34d02d7..7342e6a6c 100644 --- a/ddrescue/ddrescue.nm +++ b/ddrescue/ddrescue.nm @@ -4,11 +4,11 @@ ###############################################################################
name = ddrescue -version = 1.21 +version = 1.26 release = 1
groups = System/Tools -url = http://gnu.org/software/ddrescue +url = https://gnu.org/software/ddrescue license = GPLv2+ summary = Data recovery tool
@@ -18,14 +18,13 @@ description good parts first in case of read errors. end
-source_dl = http://ftp.gnu.org/gnu/ddrescue/ +source_dl = https://ftp.gnu.org/gnu/ddrescue/ sources = %{thisapp}.tar.lz
build # ddrescue comes with a non-traditional configure script configure_options = \ --prefix=%{prefix} \ - --enable-linux \ CPPFLAGS="%{CPPFLAGS}" \ CFLAGS="%{CFLAGS}" \ LDFLAGS="%{LDFLAGS}" \ diff --git a/dhcping/dhcping.nm b/dhcping/dhcping.nm index ef2d45c51..3d31c728d 100644 --- a/dhcping/dhcping.nm +++ b/dhcping/dhcping.nm @@ -10,23 +10,17 @@ release = 1 groups = Applications/Internet url = http://www.mavetju.org/unix/general.php license = MIT -summary = DHCP daemon ping program. +summary = DHCP daemon ping program
description Dhcping allows the system administrator to check if a remote DHCP server is still functioning. end
-source_dl = - -build - configure_options += \ - --mandir=/usr/share/man -end +source_dl = http://www.mavetju.org/download/
packages package %{name} - end
package %{name}-debuginfo template DEBUGINFO diff --git a/dos2unix/dos2unix.nm b/dos2unix/dos2unix.nm index 23a34e894..8f147710e 100644 --- a/dos2unix/dos2unix.nm +++ b/dos2unix/dos2unix.nm @@ -4,20 +4,20 @@ ###############################################################################
name = dos2unix -version = 7.3.4 +version = 7.4.3 release = 1
groups = Applications/Text -url = http://www.xs4all.nl/~waterlan/dos2unix.html +url = https://www.xs4all.nl/~waterlan/dos2unix.html license = BSD -summary = Text file format converters. +summary = Text file format converters
description Convert text files with DOS or Mac line endings to Unix line endings and vice versa. end
-source_dl = http://waterlan.home.xs4all.nl/dos2unix/ +source_dl = https://waterlan.home.xs4all.nl/dos2unix/
build requires diff --git a/eject/eject.nm b/eject/eject.nm deleted file mode 100644 index 7f1e448bf..000000000 --- a/eject/eject.nm +++ /dev/null @@ -1,43 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = eject -version = 2.1.5 -release = 1 - -groups = System/Base -url = http://www.pobox.com/~tranter -license = GPLv2+ -summary = A program that ejects removable media using software control. - -description - The eject program allows the user to eject removable media (typically \ - CD-ROMs, floppy disks or Iomega Jaz or Zip disks) using software \ - control. Eject can also control some multi-disk CD changers and even \ - some devices' auto-eject features. -end - -source_dl = - -build - requires - gettext - libtool - end - - DIR_APP = %{DIR_SRC}/%{name} - - configure_options += \ - --mandir=/usr/share/man -end - -packages - package %{name} - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/eject/patches/eject-2.1.1-verbose.patch b/eject/patches/eject-2.1.1-verbose.patch deleted file mode 100644 index 44c05d881..000000000 --- a/eject/patches/eject-2.1.1-verbose.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/eject.c b/eject.c -index b14d5f2..662ba54 100644 ---- a/eject.c -+++ b/eject.c -@@ -709,7 +709,9 @@ static int EjectScsi(int fd) - unsigned char sense_buffer[32]; - - if ((ioctl(fd, SG_GET_VERSION_NUM, &k) < 0) || (k < 30000)) { -- printf("not an sg device, or old sg driver\n"); -+ if (v_option) { -+ printf(_("not an sg device, or old sg driver\n")); -+ } - return 0; - } - diff --git a/eject/patches/eject-2.1.5-lock.patch b/eject/patches/eject-2.1.5-lock.patch deleted file mode 100644 index 25f84651e..000000000 --- a/eject/patches/eject-2.1.5-lock.patch +++ /dev/null @@ -1,171 +0,0 @@ - eject.1 | 13 +++++++++++-- - eject.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- - 2 files changed, 63 insertions(+), 4 deletions(-) - -diff --git a/eject.1 b/eject.1 -index 3c388c6..315dc6d 100644 ---- a/eject.1 -+++ b/eject.1 -@@ -17,6 +17,8 @@ eject [-vn] -a on|off|1|0 [<name>] - .br - eject [-vn] -c slot [<name>] - .br -+eject [-vn] -i on|off|1|0 [<name>] -+.br - eject [-vn] -t [<name>] - .br - eject [-vn] -T [<name>] -@@ -83,6 +85,13 @@ for a change request to work. Please also note that the first slot of - the changer is referred to as 0, not 1. - - .TP 0.5i -+.B -i on|1|off|0 -+This option controls locking of the hardware eject button. When -+enabled, the drive will not be ejected when the button is pressed. -+This is useful when you are carrying a laptop in a bag or case and -+don't want it to eject if the button is inadvertently pressed. -+ -+.TP 0.5i - .B -t - With this option the drive is given a CD-ROM tray close command. Not - all devices support this command. -@@ -121,8 +130,8 @@ performed. - .B -r - This option specifies that the drive should be ejected using a - CDROM eject command. --.TP 0.5i - -+.TP 0.5i - .B -s - This option specifies that the drive should be ejected using - SCSI commands. -@@ -145,7 +154,7 @@ also passes the -n option to umount(1). - .TP 0.5i - .B -m - This option allows eject to work with device drivers which automatically --mount removable media and therefore must be always mount()ed. -+mount removable media and therefore must be always mount(1)ed. - The option tells eject to not try to unmount the given device, - even if it is mounted according to /etc/mtab or /proc/mounts. - -diff --git a/eject.c b/eject.c -index f7b2a2e..4175756 100644 ---- a/eject.c -+++ b/eject.c -@@ -116,6 +116,7 @@ int d_option = 0; - int f_option = 0; - int h_option = 0; - int n_option = 0; -+int i_option = 0; - int q_option = 0; - int r_option = 0; - int s_option = 0; -@@ -129,6 +130,7 @@ int m_option = 0; - int a_arg = 0; - int c_arg = 0; - int x_arg = 0; -+int i_arg = 0; - static char *programName; /* used in error messages */ - - /* -@@ -163,6 +165,7 @@ static void usage() - " eject [-vn] -c <slot> [<name>] -- switch discs on a CD-ROM changer\n" - " eject [-vn] -t [<name>] -- close tray\n" - " eject [-vn] -T [<name>] -- toggle tray\n" -+" eject [-vn] -i on|off|1|0 [<name>] -- toggle manual eject protection on/off\n" - " eject [-vn] -x <speed> [<name>] -- set CD-ROM max speed\n" - " eject [-vn] -X [<name>] -- list CD-ROM available speeds\n" - "Options:\n" -@@ -200,7 +203,7 @@ static void usage() - #endif - "\n" - " -n --noop -V --version\n" --" -p --proc -m --no-unmount -T --traytoggle\n")); -+" -p --proc -m --no-unmount -T --traytoggle -i --manualeject\n")); - #endif /* GETOPTLONG */ - fprintf(stderr,_( - "Parameter <name> can be a device file or a mount point.\n" -@@ -214,7 +217,7 @@ static void usage() - /* Handle command line options. */ - static void parse_args(int argc, char **argv, char **device) - { -- const char *flags = "a:c:x:dfhnqrstTXvVpm"; -+ const char *flags = "a:c:x:i:dfhnqrstTXvVpm"; - #ifdef GETOPTLONG - static struct option long_options[] = - { -@@ -223,6 +226,7 @@ static void parse_args(int argc, char **argv, char **device) - {"default", no_argument, NULL, 'd'}, - {"auto", required_argument, NULL, 'a'}, - {"changerslot", required_argument, NULL, 'c'}, -+ {"manualeject", required_argument, NULL, 'i'}, - {"trayclose", no_argument, NULL, 't'}, - {"traytoggle", no_argument, NULL, 'T'}, - {"cdspeed", required_argument, NULL, 'x'}, -@@ -297,6 +301,21 @@ static void parse_args(int argc, char **argv, char **device) - usage(); - exit(0); - break; -+ case 'i': -+ i_option = 1; -+ if (!strcmp(optarg, "0")) -+ i_arg = 0; -+ else if (!strcmp(optarg, "off")) -+ i_arg = 0; -+ else if (!strcmp(optarg, "1")) -+ i_arg = 1; -+ else if (!strcmp(optarg, "on")) -+ i_arg = 1; -+ else { -+ fprintf(stderr, _("%s: invalid argument to -i option\n"), programName); -+ exit(1); -+ } -+ break; - case 'm': - m_option = 1; - break; -@@ -482,6 +501,30 @@ static char *FindDevice(const char *name) - } - - -+/* -+ * Stops CDROM from opening on manual eject pressing the button. -+ * This can be useful when you carry your laptop -+ * in your bag while it's on and no CD inserted in it's drive. -+ * Implemented as found in Documentation/ioctl/cdrom.txt -+ * -+ * TODO: Maybe we should check this also: -+ * EDRIVE_CANT_DO_THIS Door lock function not supported. -+ * EBUSY Attempt to unlock when multiple users -+ * have the drive open and not CAP_SYS_ADMIN -+ */ -+static void ManualEject(int fd, int onOff) -+{ -+ if (ioctl(fd, CDROM_LOCKDOOR, onOff) < 0) { -+ perror("ioctl on CDROM_LOCKDOOR"); -+ } else { -+ if (onOff) -+ printf("CD-Drive may NOT be ejected with device button\n"); -+ else -+ printf("CD-Drive may be ejected with device button\n"); -+ } -+} -+ -+ - /* Set or clear auto-eject mode. */ - static void AutoEject(int fd, int onOff) - { -@@ -1233,6 +1276,13 @@ int main(int argc, char **argv) - exit(0); - } - -+ /* handle -i option */ -+ if (i_option) { -+ fd = OpenDevice(deviceName); -+ ManualEject(fd, i_arg); -+ exit(0); -+ } -+ - /* handle -a option */ - if (a_option) { - if (v_option) { diff --git a/eject/patches/eject-2.1.5-opendevice.patch b/eject/patches/eject-2.1.5-opendevice.patch deleted file mode 100644 index c85a91032..000000000 --- a/eject/patches/eject-2.1.5-opendevice.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/eject.c b/eject.c -index 79fd01b..d67089c 100644 ---- a/eject.c -+++ b/eject.c -@@ -543,10 +543,11 @@ static void ToggleTray(int fd) - - #ifdef CDROMCLOSETRAY - -- /* Try to open the CDROM tray and measure the time therefor -- * needed. In my experience the function needs less than 0.05 -+ /* Try to open the CDROM tray and measure the time needed. -+ * In my experience the function needs less than 0.05 - * seconds if the tray was already open, and at least 1.5 seconds -- * if it was closed. */ -+ * if it was closed. -+ */ - gettimeofday(&time_start, NULL); - - /* Send the CDROMEJECT command to the device. */ -@@ -815,10 +816,17 @@ static void Unmount(const char *fullName) - } - - --/* Open a device file. */ -+/* Open a device file. Try opening first read/write, and if that fails then read only. */ - static int OpenDevice(const char *fullName) - { -- int fd = open(fullName, O_RDONLY|O_NONBLOCK); -+ int fd; -+ -+ fd = open(fullName, O_RDWR|O_NONBLOCK); -+ if (fd != -1) { -+ return fd; -+ } -+ -+ fd = open(fullName, O_RDONLY|O_NONBLOCK); - if (fd == -1) { - fprintf(stderr, _("%s: unable to open `%s'\n"), programName, fullName); - exit(1); diff --git a/eject/patches/eject-2.1.5-spaces.patch b/eject/patches/eject-2.1.5-spaces.patch deleted file mode 100644 index 40834d902..000000000 --- a/eject/patches/eject-2.1.5-spaces.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff --git a/eject.c b/eject.c -index d67089c..f7b2a2e 100644 ---- a/eject.c -+++ b/eject.c -@@ -370,6 +370,30 @@ static int FileExists(const char *name, const int try, int *found) - - - /* -+ * Linux mangles spaces in mount points by changing them to an octal string -+ * of '\040'. So lets scan the mount point and fix it up by replacing all -+ * occurrences off '\0##' with the ASCII value of 0##. Requires a writable -+ * string as input as we mangle in place. Some of this was taken from the -+ * util-linux package. -+ */ -+#define octalify(a) ((a) & 7) -+#define tooctal(s) (64*octalify(s[1]) + 8*octalify(s[2]) + octalify(s[3])) -+#define isoctal(a) (((a) & ~7) == '0') -+static char *DeMangleMount(char *s) -+{ -+ char *tmp = s; -+ while ((tmp = strchr(tmp, '\')) != NULL) { -+ if (isoctal(tmp[1]) && isoctal(tmp[2]) && isoctal(tmp[3])) { -+ tmp[0] = tooctal(tmp); -+ memmove(tmp+1, tmp+4, strlen(tmp)-3); -+ } -+ ++tmp; -+ } -+ return s; -+} -+ -+ -+/* - * Given name, such as foo, see if any of the following exist: - * - * foo (if foo starts with '.' or '/') -@@ -882,6 +906,8 @@ static int MountedDevice(const char *name, char **mountName, char **deviceName) - rc = sscanf(line, "%1023s %1023s", s1, s2); - if (rc >= 2) { - int mtabmaj, mtabmin; -+ DeMangleMount(s1); -+ DeMangleMount(s2); - GetMajorMinor(s1, &mtabmaj, &mtabmin); - if (((strcmp(s1, name) == 0) || (strcmp(s2, name) == 0)) || - ((maj != -1) && (maj == mtabmaj) && (min == mtabmin))) { -@@ -928,6 +954,8 @@ static int MountableDevice(const char *name, char **mountName, char **deviceName - - while (fgets(line, sizeof(line), fp) != 0) { - rc = sscanf(line, "%1023s %1023s", s1, s2); -+ DeMangleMount(s1); -+ DeMangleMount(s2); - if (rc >= 2 && s1[0] != '#' && strcmp(s2, name) == 0) { - FCLOSE(fp); - *deviceName = strdup(s1); -@@ -968,6 +996,8 @@ static void UnmountDevices(const char *pattern) - while (fgets(line, sizeof(line), fp) != 0) { - status = sscanf(line, "%1023s %1023s", s1, s2); - if (status >= 2) { -+ DeMangleMount(s1); -+ DeMangleMount(s2); - status = regexec(&preg, s1, 0, 0, 0); - if (status == 0) { - if (v_option) diff --git a/eject/patches/eject-2.1.5-umount.patch b/eject/patches/eject-2.1.5-umount.patch deleted file mode 100644 index 2c588a01d..000000000 --- a/eject/patches/eject-2.1.5-umount.patch +++ /dev/null @@ -1,176 +0,0 @@ -diff --git a/eject.c b/eject.c -index 4175756..057d2ea 100644 ---- a/eject.c -+++ b/eject.c -@@ -42,6 +42,7 @@ - #include <string.h> - #include <fcntl.h> - #include <limits.h> -+#include <dirent.h> - - #ifdef GETOPTLONG - #include <getopt.h> -@@ -1133,6 +1134,145 @@ static char *MultiplePartitions(const char *name) - return 0; - } - -+/* -+ * Find device name in /sys/block/. Returns NULL if not -+ * found. The returned pointer must be free()'d. -+ */ -+static char* FindDeviceSysBlock(const char* deviceName) -+{ -+ DIR *dir = opendir("/sys/block"); -+ struct dirent *d; -+ const char *baseName = strrchr(deviceName, '/'); -+ char *device; -+ int len; -+ -+ baseName = baseName ? baseName + 1 : deviceName; -+ if (!dir) { -+ fprintf(stderr, _("%s: can not open directory /sys/block/"), programName); -+ return NULL; -+ } -+ while ((d = readdir(dir)) != NULL) { -+ if (d->d_type != DT_DIR && d->d_type != DT_LNK && d->d_type != DT_UNKNOWN) -+ continue; -+ len = strlen(d->d_name); -+ if (!strncmp(baseName, d->d_name, len)) { -+ if ((*(baseName+len) >= '0' && -+ *(baseName+len) <= '9') || -+ *(baseName+len) == '\0') { -+ device = strdup(d->d_name); -+ closedir(dir); -+ return device; -+ } -+ } -+ } -+ closedir(dir); -+ return NULL; -+} -+ -+/* -+ * From given path gets a subsystem. Returns subsystem if any found -+ * otherwise returns NULL. Returned value must not be free()'d -+ */ -+static char *GetSubSystem(const char *sysfspath) -+{ -+ static char subsystem[PATH_MAX]; -+ char link_subsystem[PATH_MAX]; -+ struct stat buf; -+ char *pos; -+ -+ snprintf(link_subsystem, sizeof(link_subsystem), "%s/subsystem", sysfspath); -+ -+ if (lstat(link_subsystem, &buf) == -1) -+ return NULL; -+ if (!S_ISLNK(buf.st_mode)) -+ return NULL; -+ if (readlink(link_subsystem, subsystem, sizeof(subsystem)) == -1) -+ return NULL; -+ if ((pos = strrchr(subsystem, '/')) == NULL) -+ return NULL; -+ strncpy(subsystem, pos+1, sizeof(subsystem)); -+ -+ return subsystem; -+} -+ -+/* -+ * Check content of /sys/block/<dev>/removable. Returns 1 if the file -+ * contains '1' otherwise returns 0. -+ */ -+static int CheckRemovable(const char* deviceName) -+{ -+ FILE *fp; -+ int removable = 0; -+ char *device; -+ char path[PATH_MAX]; -+ -+ if ((device = FindDeviceSysBlock(deviceName)) == NULL) { -+ fprintf(stderr, -+ _("%s: did not find a device %s in /sys/block/\n"), -+ programName, deviceName); -+ exit(1); -+ } -+ snprintf(path, sizeof(path), "/sys/block/%s/removable", device); -+ free(device); -+ if((fp = fopen(path, "r")) == NULL) -+ return removable; -+ if (fgetc(fp) == '1') -+ removable = 1; -+ -+ fclose(fp); -+ return removable; -+} -+ -+/* Check if a device is on hotpluggable subsystem. Returns 1 if is -+ * otherwise returns 0. -+ */ -+static int CheckHotpluggable(const char* deviceName) -+{ -+ int hotpluggable = 0; -+ char *device; -+ char path[PATH_MAX]; -+ char *device_chain; -+ struct stat buf; -+ char *subsystem; -+ char *pos; -+ -+ if ((device = FindDeviceSysBlock(deviceName)) == NULL) { -+ fprintf(stderr, _("%s: did not find a device %s in /sys/block/\n"), -+ programName, deviceName); -+ exit(1); -+ } -+ snprintf(path, sizeof(path), "/sys/block/%s/device", device); -+ free(device); -+ -+ if (lstat(path, &buf) == -1) -+ return hotpluggable; -+ if (!S_ISLNK(buf.st_mode)) -+ return hotpluggable; -+ if ((device_chain = SymLink(path)) == NULL) -+ return hotpluggable; -+ while ( strncmp(device_chain, "", sizeof(device_chain) != 0)) { -+ subsystem = GetSubSystem(device_chain); -+ if (subsystem) { -+ /* as hotpluggable we assume devices on these buses */ -+ if (strncmp("usb", subsystem, sizeof("usb")) == 0 || -+ strncmp("ieee1394", subsystem, sizeof("ieee1394")) == 0 || -+ strncmp("pcmcia", subsystem, sizeof("pcmcia")) == 0 || -+ strncmp("mmc", subsystem, sizeof("mmc")) == 0 || -+ strncmp("ccw", subsystem, sizeof("ccw")) == 0) { -+ hotpluggable = 1; -+ break; -+ } -+ } -+ /* remove one member from devicechain */ -+ pos = strrchr(device_chain, '/'); -+ if (pos) -+ pos[0] = '\0'; -+ else -+ device_chain[0] = '\0'; -+ } -+ -+ return hotpluggable; -+} - - /* handle -x option */ - static void HandleXOption(char *deviceName) -@@ -1276,6 +1416,17 @@ int main(int argc, char **argv) - exit(0); - } - -+ /* Check if device has removable flag*/ -+ if (v_option) -+ printf(_("%s: checking if device "%s" has a removable or hotpluggable flag\n"), -+ programName, deviceName); -+ if (!CheckRemovable(deviceName) && !CheckHotpluggable(deviceName)) -+ { -+ fprintf(stderr, _("%s: device "%s" doesn't have a removable or hotpluggable flag\n"), -+ programName, deviceName); -+ exit(1); -+ } -+ - /* handle -i option */ - if (i_option) { - fd = OpenDevice(deviceName); diff --git a/eject/patches/eject-timeout.patch b/eject/patches/eject-timeout.patch deleted file mode 100644 index a542d2c2f..000000000 --- a/eject/patches/eject-timeout.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- eject/eject.c.orig 2006-08-07 16:35:15.000000000 +0200 -+++ eject/eject.c 2006-08-07 16:35:54.000000000 +0200 -@@ -723,7 +723,7 @@ - io_hdr.dxfer_len = 0; - io_hdr.dxferp = inqBuff; - io_hdr.sbp = sense_buffer; -- io_hdr.timeout = 2000; -+ io_hdr.timeout = 10000; - - io_hdr.cmdp = allowRmBlk; - status = ioctl(fd, SG_IO, (void *)&io_hdr); diff --git a/etherwake/etherwake.8 b/etherwake/etherwake.8 deleted file mode 100644 index f51ec445d..000000000 --- a/etherwake/etherwake.8 +++ /dev/null @@ -1,81 +0,0 @@ -." Hey, EMACS: -*- nroff -*- -." First parameter, NAME, should be all caps -." Second parameter, SECTION, should be 1-8, maybe w/ subsection -." other parameters are allowed: see man(7), man(1) -.TH ETHER-WAKE 8 "March 31, 2003" "Scyld" -." Please adjust this date whenever revising the manpage. -." -." Some roff macros, for reference: -." .nh disable hyphenation -." .hy enable hyphenation -." .ad l left justify -." .ad b justify to both left and right margins -." .nf disable filling -." .fi enable filling -." .br insert line break -." .sp <n> insert n+1 empty lines -." for manpage-specific macros, see man(7) -.SH NAME -ether-wake - A tool to send a Wake-On-LAN "Magic Packet" -.SH SYNOPSIS -.B ether-wake -.RI [ options ] " Host-ID" -.SH DESCRIPTION -This manual page documents the usage of the -.B ether-wake -command. -.PP -." TeX users may be more comfortable with the \fB<whatever>\fP and -." \fI<whatever>\fP escape sequences to invoke bold face and italics, -." respectively. -\fBether-wake\fP is a program that generates and transmits a Wake-On-LAN -(WOL) "Magic Packet", used for restarting machines that have been -soft-powered-down (ACPI D3-warm state). It generates the standard -AMD Magic Packet format, optionally with a password included. The -single required parameter is a station (MAC) address or a host ID that can -be translated to a MAC address by an -.BR ethers (5) -database specified in -.BR nsswitch.conf (5) -. -.SH OPTIONS -\fBether-wake\fP needs a single dash (´-´) in front of options. -A summary of options is included below. -.TP -.B -b -Send the wake-up packet to the broadcast address. -.TP -.B -D -Increase the Debug Level. -.TP -.B -i ifname -Use interface ifname instead of the default "eth0". -.TP -.B -p passwd -Append a four or six byte password to the packet. Only a few adapters -need or support this. A six byte password may be specified in Ethernet hex -format (00:22:44:66:88:aa) or four byte dotted decimal (192.168.1.1) format. -A four byte password must use the dotted decimal format. - -.TP -.B -V -Show the program version information. - -.SH EXIT STATUS -This program returns 0 on success. -A permission failures (e.g. run as a non-root user) results in an exit -status of 2. Unrecognized or invalid parameters result in an exit -status of 3. Failure to retrieve network interface information or send -a packet will result in an exit status of 1. - -.SH SEE ALSO -.BR arp (8). -.br -.SH SECURITY -On some non-Linux systems dropping root capability allows the process to be -dumped, traced or debugged. -If someone traces this program, they get control of a raw socket. -Linux handles this safely, but beware when porting this program. -.SH AUTHOR -The ether-wake program was written by Donald Becker at Scyld Computing -Corporation for use with the Scyld(*(Tm) Beowulf System. diff --git a/etherwake/etherwake.nm b/etherwake/etherwake.nm deleted file mode 100644 index 2e1e6f2cf..000000000 --- a/etherwake/etherwake.nm +++ /dev/null @@ -1,45 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = etherwake -version = 1.09 -release = 4 - -groups = Networking/Tools -url = http://www.scyld.com -license = GPL -summary = Can wake up sleeping PCs by WOL. - -description - A little tool to send magic Wake-on-LAN packets You can wake up WOL - compliant Computers which have been powered down to sleep mode or start - WOL compliant Computers with a BIOS feature. -end - -source_dl = - -build - build - gcc %{CFLAGS} %{LDFLAGS} -o etherwake ether-wake.c - end - - install - mkdir -pv %{BUILDROOT}%{sbindir} - install -m 755 etherwake %{BUILDROOT}%{sbindir} - - # Install man-page. - mkdir -pv %{BUILDROOT}%{mandir}/man8 - install -m 644 %{DIR_SOURCE}/etherwake.8 \ - %{BUILDROOT}%{mandir}/man8 - end -end - -packages - package %{name} - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/etherwake/patches/etherwake-1.09-hardening.patch b/etherwake/patches/etherwake-1.09-hardening.patch deleted file mode 100644 index 238b740a5..000000000 --- a/etherwake/patches/etherwake-1.09-hardening.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -Nur etherwake-1.09/ether-wake.c etherwake-1.09_new/ether-wake.c ---- etherwake-1.09/ether-wake.c 2005-07-10 18:44:25.000000000 +0000 -+++ etherwake-1.09_new/ether-wake.c 2015-04-05 12:22:20.157004547 +0000 -@@ -131,7 +131,7 @@ - case 'D': debug++; break; - case 'i': ifname = optarg; break; - case 'p': get_wol_pw(optarg); break; -- case 'u': printf(usage_msg); return 0; -+ case 'u': printf("%s",usage_msg); return 0; - case 'v': verbose++; break; - case 'V': do_version++; break; - case '?': -@@ -140,7 +140,7 @@ - if (verbose || do_version) - printf("%s\n", version_msg); - if (errflag) { -- fprintf(stderr, brief_usage_msg); -+ fprintf(stderr,"%s", brief_usage_msg); - return 3; - } - -@@ -181,7 +181,7 @@ - The code to retrieve the local station address is Linux specific. */ - if (! opt_no_src_addr) { - struct ifreq if_hwaddr; -- unsigned char *hwaddr = if_hwaddr.ifr_hwaddr.sa_data; -+ const char *hwaddr = if_hwaddr.ifr_hwaddr.sa_data; - - strcpy(if_hwaddr.ifr_name, ifname); - if (ioctl(s, SIOCGIFHWADDR, &if_hwaddr) < 0) { diff --git a/etherwake/patches/etherwake-1.09-install.patch b/etherwake/patches/etherwake-1.09-install.patch deleted file mode 100644 index 77588eb51..000000000 --- a/etherwake/patches/etherwake-1.09-install.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff -Nur old/Makefile new/Makefile ---- old/Makefile 2006-06-08 09:14:23.000000000 +0200 -+++ new/Makefile 2010-02-23 23:07:09.000000000 +0100 -@@ -1,5 +1,5 @@ - CFLAGS = -Wall --INSTALL = /usr/bin/install -+INSTALL = install - CC = gcc - - all: diff --git a/gettext/gettext.nm b/gettext/gettext.nm index ca4f9a822..1fcb77e6d 100644 --- a/gettext/gettext.nm +++ b/gettext/gettext.nm @@ -5,7 +5,7 @@
name = gettext version = 0.21.1 -release = 1 +release = 2
groups = System/Base url = https://www.gnu.org/software/gettext/ @@ -34,7 +34,6 @@ build chrpath expat-devel glib2-devel - libcroco-devel libunistring-devel libxml2-devel ncurses-devel @@ -64,7 +63,10 @@ end
packages package %{name} - provides += bundled(gnulib) + provides + bundled(gnulib) + bundled(libcroco) = 0.6.12 + end end
package %{name}-common-devel diff --git a/groff/groff.nm b/groff/groff.nm index 1b097c7e4..cdf877aeb 100644 --- a/groff/groff.nm +++ b/groff/groff.nm @@ -4,13 +4,13 @@ ###############################################################################
name = groff -version = 1.22.3 +version = 1.22.4 release = 1
groups = Applications/Text -url = http://groff.ffii.org/ +url = https://groff.ffii.org/ license = GPLv2 and GFDL -summary = A document formatting system. +summary = A document formatting system
description Groff is a document formatting system. Groff takes standard text and @@ -21,7 +21,7 @@ description more. end
-source_dl = http://ftp.gnu.org/gnu/%%7Bname%7D/ +source_dl = https://ftp.gnu.org/gnu/%%7Bname%7D/
build requires @@ -33,8 +33,9 @@ build texinfo end
- # Cannot run in parallel - PARALLELISMFLAGS = + # Install man-pages only + configure_options += \ + --with-doc=no
install_cmds for file in g{nroff,troff,tbl,pic,eqn,neqn,refer,lookbib,indxbib,soelim} zsoelim; do @@ -46,12 +47,7 @@ end
packages package %{name} - filter_requires - main_subs.pl - man.pl - oop_fh.pl - subs.pl - end + filter_requires = (main_subs|man|oop_fh|subs).pl end
package %{name}-debuginfo diff --git a/groff/patches/0002-load-site-font-and-site-tmac-from-etc-groff.patch b/groff/patches/0002-load-site-font-and-site-tmac-from-etc-groff.patch deleted file mode 100644 index 163f784ff..000000000 --- a/groff/patches/0002-load-site-font-and-site-tmac-from-etc-groff.patch +++ /dev/null @@ -1,43 +0,0 @@ -From c6d8bb3e0ebc03274564d7b2c768e9932cc5f79d Mon Sep 17 00:00:00 2001 -From: Jan Vcelak jvcelak@redhat.com -Date: Tue, 1 Jan 2013 15:33:45 +0100 -Subject: [PATCH] load site-font and site-tmac from /etc/groff - -Move site-font and site-tmac configuration from /usr/share/groff to -/etc/groff. That allows permanent custom changes. (Symlinking brought -a lot of problems with RPM. This is safer and cleaner.) - -Signed-off-by: Jan Vcelak jvcelak@redhat.com ---- - Makefile.in | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 7534e56..d97d1b9 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -167,7 +167,7 @@ fontdir=$(datasubdir)/font - oldfontdir=$(datasubdir)/oldfont - - # `localfontdir' says where local fonts will be installed (as dev*/*). --localfontdir=$(dataprogramdir)/site-font -+localfontdir=@sysconfdir@/groff/site-font - - # `legacyfontdir' is for compatibility with non-GNU troff. - legacyfontdir=/usr/lib/font -@@ -179,10 +179,10 @@ fontpath=$(localfontdir)$(RT_SEP)$(fontdir)$(RT_SEP)$(legacyfontdir) - tmacdir=$(datasubdir)/tmac - - # `systemtmacdir' says where to install platform-dependent macros. --systemtmacdir=$(libprogramdir)/site-tmac -+systemtmacdir=@sysconfdir@/groff/site-tmac - - # `localtmacdir' says where local files will be installed. --localtmacdir=$(dataprogramdir)/site-tmac -+localtmacdir=@sysconfdir@/groff/site-tmac - - # `appresdir' says where to install the application resource file for - # gxditview. --- -1.8.0.2 - diff --git a/gsettings-desktop-schemas/gsettings-desktop-schemas.nm b/gsettings-desktop-schemas/gsettings-desktop-schemas.nm deleted file mode 100644 index b7a1a1de8..000000000 --- a/gsettings-desktop-schemas/gsettings-desktop-schemas.nm +++ /dev/null @@ -1,56 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = gsettings-desktop-schemas -version = %{ver_maj}.%{ver_min} -ver_maj = 3.20 -ver_min = 0 -release = 2 - -groups = System/Libraries -url = http://bugzilla.gnome.org/enter_bug.cgi?product=gsettings-desktop-schemas -license = LGPLv2+ -summary = A collection of GSettings schemas - -description - gsettings-desktop-schemas contains a collection of GSettings schemas for - settings shared by various components of a desktop. -end - -source_dl = http://download.gnome.org/sources/%%7Bname%7D/%%7Bver_maj%7D/ -sources = %{thisapp}.tar.xz - -build - requires - glib2 >= 2.31.0 - gobject-introspection-devel - intltool >= 0.50.1 - end - - configure_options += \ - --disable-schemas-compile \ - --enable-introspection=yes - - make_build_targets += V=1 -end - -packages - package %{name} - script posttransin - glib-compile-schemas %{datadir}/glib-2.0/schemas &> /dev/null || : - end - - script postun - glib-compile-schemas %{datadir}/glib-2.0/schemas &> /dev/null || : - end - end - - package %{name}-devel - template DEVEL - - files += \ - %{datadir}/gir*/ - end -end diff --git a/hdparm/hdparm.nm b/hdparm/hdparm.nm index 0522146f4..90d150afa 100644 --- a/hdparm/hdparm.nm +++ b/hdparm/hdparm.nm @@ -4,11 +4,11 @@ ###############################################################################
name = hdparm -version = 9.48 -release = 2 +version = 9.65 +release = 1
groups = Applications/Hardware -url = http://sourceforge.net/projects/hdparm/ +url = https://sourceforge.net/projects/hdparm/ license = BSD summary = A utility for displaying and/or setting hard disk parameters.
@@ -18,7 +18,7 @@ description performance and to spin down hard drives for power conservation. end
-source_dl = http://sourceforge.net/projects/%%7Bname%7D/files/%%7Bname%7D/ +source_dl = https://sourceforge.net/projects/%%7Bname%7D/files/%%7Bname%7D/
build build @@ -33,8 +33,6 @@ end
packages package %{name} - groups += Base - end
package %{name}-debuginfo template DEBUGINFO diff --git a/hwdata/hwdata.nm b/hwdata/hwdata.nm index 36678e4e6..94b5d43cc 100644 --- a/hwdata/hwdata.nm +++ b/hwdata/hwdata.nm @@ -4,31 +4,22 @@ ###############################################################################
name = hwdata -version = 0.287 +version = 0.366 release = 1 arch = noarch
-groups = Base System/Base -url = http://git.fedorahosted.org/git/hwdata.git +groups = System/Base +url = https://github.com/vcrhonek/hwdata license = GPLv2+ and LGPLv2+ -summary = Hardware identification and configuration data. +summary = Hardware identification and configuration data
description - hwdata contains various hardware identification and configuration data, \ + hwdata contains various hardware identification and configuration data, such as the pci.ids database and MonitorsDb databases. end
-source_dl = https://git.fedorahosted.org/cgit/hwdata.git/snapshot/ -sources = %{thisapp}.tar.gz - -build - requires - git - end -end +source_dl = https://github.com/vcrhonek/hwdata/archive/v%%7Bversion%7D.tar.gz#/
packages package %{name} - requires = module-init-tools - end end diff --git a/intel-microcode/intel-microcode.nm b/intel-microcode/intel-microcode.nm index 1232a9311..ca1881a2c 100644 --- a/intel-microcode/intel-microcode.nm +++ b/intel-microcode/intel-microcode.nm @@ -4,7 +4,7 @@ ###############################################################################
name = intel-microcode -version = 20190618 +version = 20221108 release = 1 arch = noarch thisapp = microcode-%{version} diff --git a/iperf/iperf.nm b/iperf/iperf.nm index 97db91fb3..f0eed09e6 100644 --- a/iperf/iperf.nm +++ b/iperf/iperf.nm @@ -4,11 +4,11 @@ ###############################################################################
name = iperf -version = 2.0.13 +version = 2.1.8 release = 1
groups = Applications/Internet -url = http://www.sourceforge.net/projects/iperf2/ +url = https://www.sourceforge.net/projects/iperf2/ license = GPLv3+ and LGPLv3+ summary = Measurement tool for TCP/UDP bandwidth performance
diff --git a/iperf3/iperf3.nm b/iperf3/iperf3.nm index 654a4653f..892343928 100644 --- a/iperf3/iperf3.nm +++ b/iperf3/iperf3.nm @@ -4,7 +4,7 @@ ###############################################################################
name = iperf3 -version = 3.7 +version = 3.12 release = 1 thisapp = iperf-%{version}
@@ -27,6 +27,7 @@ sources = %{thisapp}.tar.gz build requires gcc-c++ + openssl-devel end end
diff --git a/iptraf-ng/iptraf-ng.nm b/iptraf-ng/iptraf-ng.nm index 353ed316e..f7b4eb5c3 100644 --- a/iptraf-ng/iptraf-ng.nm +++ b/iptraf-ng/iptraf-ng.nm @@ -4,11 +4,11 @@ ###############################################################################
name = iptraf-ng -version = 1.1.3.1 +version = 1.2.1 release = 1
groups = Networking/Tools -url = https://fedorahosted.org/iptraf-ng/ +url = https://github.com/iptraf-ng/iptraf-ng license = GPLv2+ summary = A console-based network monitoring utility.
@@ -31,13 +31,15 @@ description on a wide variety of supported network cards. end
-source_dl = https://fedorahosted.org/releases/i/p/iptraf-ng/ +source_dl = https://github.com/iptraf-ng/iptraf-ng/archive/refs/tags/v%%7Bversion%7D.tar...
build requires ncurses-devel end
+ make_install_targets += prefix=%{prefix} + install_cmds mkdir -pv %{BUILDROOT}%{localstatedir}/{lock,log,lib}/iptraf-ng end diff --git a/iptraf-ng/patches/0001-token-ring-kernel-v3.5-kill-off-token-ring-support.patch b/iptraf-ng/patches/0001-token-ring-kernel-v3.5-kill-off-token-ring-support.patch deleted file mode 100644 index e5c04cd89..000000000 --- a/iptraf-ng/patches/0001-token-ring-kernel-v3.5-kill-off-token-ring-support.patch +++ /dev/null @@ -1,128 +0,0 @@ -From 72512af1a3f1d55fff73cdfe7b63d9cfe8cc37ab Mon Sep 17 00:00:00 2001 -Message-Id: 72512af1a3f1d55fff73cdfe7b63d9cfe8cc37ab.1337783673.git.npajkovs@redhat.com -From: Nikola Pajkovsky npajkovs@redhat.com -Date: Wed, 23 May 2012 16:32:27 +0200 -Subject: [PATCH] token-ring: kernel v3.5 kill off token-ring support - -Signed-off-by: Nikola Pajkovsky npajkovs@redhat.com ---- - src/hostmon.c | 10 ---------- - src/iptraf-ng-compat.h | 1 - - src/othptab.c | 6 ------ - src/packet.c | 27 --------------------------- - src/tcptable.c | 4 ---- - 5 files changed, 48 deletions(-) - -diff --git a/src/hostmon.c b/src/hostmon.c -index 40a2b95..72b91f8 100644 ---- a/src/hostmon.c -+++ b/src/hostmon.c -@@ -1004,16 +1004,6 @@ void hostmon(const struct OPTIONS *options, time_t facilitytime, char *ifptr, - FDDI_K_ALEN); - list = flist; - break; } -- case ARPHRD_IEEE802: -- case ARPHRD_IEEE802_TR: { -- struct trh_hdr *hdr_trh = -- (struct trh_hdr *)pkt.pkt_buf; -- memcpy(scratch_saddr, hdr_trh->saddr, -- TR_ALEN); -- memcpy(scratch_daddr, hdr_trh->daddr, -- TR_ALEN); -- list = flist; -- break; } - default: - /* unknown link protocol */ - continue; -diff --git a/src/iptraf-ng-compat.h b/src/iptraf-ng-compat.h -index d5aee4a..2d9da96 100644 ---- a/src/iptraf-ng-compat.h -+++ b/src/iptraf-ng-compat.h -@@ -39,7 +39,6 @@ - #include <linux/if_ether.h> - #include <linux/if_packet.h> - #include <linux/if_fddi.h> --#include <linux/if_tr.h> - #include <linux/types.h> - #include <linux/isdn.h> - -diff --git a/src/othptab.c b/src/othptab.c -index d12cdfd..1181eb1 100644 ---- a/src/othptab.c -+++ b/src/othptab.c -@@ -193,12 +193,6 @@ struct othptabent *add_othp_entry(struct othptable *table, struct pkt_hdr *pkt, - saddr), new_entry->smacaddr); - convmacaddr((char *) (((struct fddihdr *) packet)-> - daddr), new_entry->dmacaddr); -- } else if ((pkt->pkt_hatype == ARPHRD_IEEE802) -- || (pkt->pkt_hatype == ARPHRD_IEEE802_TR)) { -- convmacaddr((char *) (((struct trh_hdr *) packet)-> -- saddr), new_entry->smacaddr); -- convmacaddr((char *) (((struct trh_hdr *) packet)-> -- daddr), new_entry->dmacaddr); - } - } - -diff --git a/src/packet.c b/src/packet.c -index a43a27a..f3e4304 100644 ---- a/src/packet.c -+++ b/src/packet.c -@@ -51,24 +51,6 @@ static int in_cksum(u_short * addr, int len) - return (u_short) (~sum); - } - --static unsigned int get_tr_ip_offset(char *pkt) --{ -- struct trh_hdr *trh; -- unsigned int riflen = 0; -- -- trh = (struct trh_hdr *) pkt; -- -- /* -- * Check if this packet has TR routing information and get -- * its length. -- */ -- if (trh->saddr[0] & TR_RII) -- riflen = (ntohs(trh->rcf) & TR_RCF_LEN_MASK) >> 8; -- -- return sizeof(struct trh_hdr) - TR_MAXRIFLEN + riflen + -- sizeof(struct trllc); --} -- - static int packet_adjust(struct pkt_hdr *pkt) - { - int retval = 0; -@@ -109,15 +91,6 @@ static int packet_adjust(struct pkt_hdr *pkt) - pkt->pkt_payload += sizeof(struct fddihdr); - pkt->pkt_len -= sizeof(struct fddihdr); - break; -- case ARPHRD_IEEE802_TR: -- case ARPHRD_IEEE802: -- pkt->pkt_payload = pkt->pkt_buf; -- /* Token Ring patch supplied by Tomas Dvorak */ -- /* Get the start of the IP packet from the Token Ring frame. */ -- unsigned int dataoffset = get_tr_ip_offset(pkt->pkt_payload); -- pkt->pkt_payload += dataoffset; -- pkt->pkt_len -= dataoffset; -- break; - default: - /* return a NULL packet to signal an unrecognized link */ - /* protocol to the caller. Hopefully, this switch statement */ -diff --git a/src/tcptable.c b/src/tcptable.c -index 56c4780..b0e5ccc 100644 ---- a/src/tcptable.c -+++ b/src/tcptable.c -@@ -620,10 +620,6 @@ void updateentry(struct tcptable *table, struct tcptableent *tableentry, - } else if (linkproto == ARPHRD_FDDI) { - convmacaddr((char *) (((struct fddihdr *) packet)-> - saddr), newmacaddr); -- } else if ((linkproto == ARPHRD_IEEE802) -- || (linkproto == ARPHRD_IEEE802_TR)) { -- convmacaddr((char *) (((struct trh_hdr *) packet)-> -- saddr), newmacaddr); - } - - if (tableentry->smacaddr[0] != '\0') { --- -1.7.10 - diff --git a/iso-codes/iso-codes.nm b/iso-codes/iso-codes.nm deleted file mode 100644 index cbb0f7d98..000000000 --- a/iso-codes/iso-codes.nm +++ /dev/null @@ -1,37 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = iso-codes -version = 3.66 -release = 1 -arch = noarch - -groups = System/Base -url = http://alioth.debian.org/projects/pkg-isocodes/ -license = LGPLv2+ -summary = ISO code lists and translations. - -description - This package provides the ISO 639 Language code list, the ISO 4217 - Currency code list, the ISO 3166 Territory code list, and ISO 3166-2 - sub-territory lists, and all their translations in gettext format. -end - -source_dl = http://pkg-isocodes.alioth.debian.org/downloads/ -sources = %{thisapp}.tar.xz - -build - requires - gettext - end -end - -packages - package %{name} - - package %{name}-devel - template DEVEL - end -end diff --git a/json-glib/json-glib.nm b/json-glib/json-glib.nm deleted file mode 100644 index 631e54ce4..000000000 --- a/json-glib/json-glib.nm +++ /dev/null @@ -1,49 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = json-glib -version = %{ver_major}.%{ver_minor} -ver_major = 0.15 -ver_minor = 2 -release = 2 - -groups = System/Libraries -url = http://live.gnome.org/JsonGlib -license = LGPLv2+ -summary = Library for JavaScript Object Notation format. - -description - %{name} is a library providing serialization and deserialization support - for the JavaScript Object Notation (JSON) format. -end - -source_dl = http://ftp.gnome.org/pub/GNOME/sources/%%7Bname%7D/%%7Bver_major%7D/ -sources = %{thisapp}.tar.xz - -build - requires - glib2-devel - gobject-introspection-devel - pkg-config - end - - export LD_LIBRARY_PATH = %{DIR_APP}/json-glib/.libs -end - -packages - package %{name} - - package %{name}-devel - template DEVEL - - requires - glib2-devel - end - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/libaio/libaio.nm b/libaio/libaio.nm index 593f51eb6..7298f20cc 100644 --- a/libaio/libaio.nm +++ b/libaio/libaio.nm @@ -4,42 +4,34 @@ ###############################################################################
name = libaio -version = 0.3.110 +version = 0.3.113 release = 1
groups = System/Libraries -url = ftp://ftp.kernel.org/pub/linux/libs/aio/ +url = https://pagure.io/libaio license = LGPLv2+ -summary = Linux-native asynchronous I/O access library. +summary = Linux-native asynchronous I/O access library
description - The Linux-native asynchronous I/O facility (async I/O, or aio) \ - has a richer API and capability set than the simple POSIX async I/O \ - facility. This library, libaio, provides the Linux-native API for \ - async I/O. The POSIX async I/O facility requires this library in \ - order to provide kernel-accelerated async I/O capabilities, as do \ + The Linux-native asynchronous I/O facility (async I/O, or aio) + has a richer API and capability set than the simple POSIX async I/O + facility. This library, libaio, provides the Linux-native API for + async I/O. The POSIX async I/O facility requires this library in + order to provide kernel-accelerated async I/O capabilities, as do applications which require the Linux-native async I/O API. end
-source_dl = https://fedorahosted.org/releases/l/i/libaio/ +source_dl = https://pagure.io/libaio/archive/%%7Bthisapp%7D/
build requires e2fsprogs-devel end
- build - make %{PARALLELISMFLAGS} \ - CFLAGS="%{CFLAGS} -I. -fPIC" CC="gcc" - end + # Disable LTO + LTO_CFLAGS =
make_install_targets += prefix=%{prefix} libdir=%{libdir} usrlibdir=%{libdir} - - install_cmds - # Modify links to be relative - ln -svf libaio.so.1 %{BUILDROOT}%{libdir}/libaio.so - ln -svf libaio.so.1.0.1 %{BUILDROOT}%{libdir}/libaio.so.1 - end end
packages diff --git a/libaio/patches/libaio-0.3.109-install-to-slash.patch b/libaio/patches/libaio-0.3.109-install-to-slash.patch deleted file mode 100644 index 7779a9c90..000000000 --- a/libaio/patches/libaio-0.3.109-install-to-slash.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -up libaio-0.3.107/src/Makefile.orig libaio-0.3.107/src/Makefile ---- libaio-0.3.107/src/Makefile.orig 2009-01-20 10:07:31.520105235 -0500 -+++ libaio-0.3.107/src/Makefile 2009-01-20 10:08:51.199104930 -0500 -@@ -1,6 +1,7 @@ - prefix=/usr --includedir=$(prefix)/include --libdir=$(prefix)/lib -+includedir=/usr/include -+libdir=/usr/lib -+usrlibdir=/usr/lib - - ARCH := $(shell uname -m | sed -e s/i.86/i386/) - CFLAGS := -nostdlib -nostartfiles -Wall -I. -g -fomit-frame-pointer -O2 -fPIC -@@ -51,11 +52,11 @@ $(libname): $(libaio_sobjs) libaio.map - $(CC) $(SO_CFLAGS) -Wl,--version-script=libaio.map -Wl,-soname=$(soname) -o $@ $(libaio_sobjs) $(LINK_FLAGS) - - install: $(all_targets) -- install -D -m 644 libaio.h $(includedir)/libaio.h -- install -D -m 644 libaio.a $(libdir)/libaio.a -- install -D -m 755 $(libname) $(libdir)/$(libname) -- ln -sf $(libname) $(libdir)/$(soname) -- ln -sf $(libname) $(libdir)/libaio.so -+ install -D -m 644 libaio.h $(DESTDIR)$(includedir)/libaio.h -+ install -D -m 644 libaio.a $(DESTDIR)$(usrlibdir)/libaio.a -+ install -D -m 755 $(libname) $(DESTDIR)$(libdir)/$(libname) -+ ln -sf $(libdir)/$(libname) $(DESTDIR)$(libdir)/$(soname) -+ ln -sf $(libdir)/$(libname) $(DESTDIR)$(usrlibdir)/libaio.so - - $(libaio_objs): libaio.h - diff --git a/libatasmart/libatasmart.nm b/libatasmart/libatasmart.nm index b0ebb5c15..a86c2eef3 100644 --- a/libatasmart/libatasmart.nm +++ b/libatasmart/libatasmart.nm @@ -5,19 +5,19 @@
name = libatasmart version = 0.19 -release = 1 +release = 2
groups = System/Statistics -url = http://git.0pointer.de/?p=libatasmart.git;a=summary +url = http://git.0pointer.net/libatasmart.git/ license = LGPLv2+ -summary = ATA S.M.A.R.T. Disk Health Monitoring Library. +summary = ATA S.M.A.R.T. Disk Health Monitoring Library
description A scmall and lightweight parser library for ATA S.M.A.R.T. hard disk health monitoring. end
-source_dl = http://0pointer.de/public/ +source_dl = https://0pointer.de/public/ sources = %{thisapp}.tar.xz
build diff --git a/libatomic_ops/libatomic_ops.nm b/libatomic_ops/libatomic_ops.nm deleted file mode 100644 index 27642241a..000000000 --- a/libatomic_ops/libatomic_ops.nm +++ /dev/null @@ -1,45 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = libatomic_ops -version = 7.4.4 -release = 1 - -groups = Development/Tools -url = https://github.com/ivmai/libatomic_ops/ -license = GPLv2, MIT -summary = Atomic memory update operations - -description - Provides implementations for atomic memory update operations on a - number of architectures. This allows direct use of these in reasonably - portable code. Unlike earlier similar packages, this one explicitly - considers memory barrier semantics, and allows the construction of code - that involves minimum overhead across a variety of architectures. -end - -source_dl = http://www.ivmaisoft.com/_bin/atomic_ops/ - -build - configure_options += \ - --enable-shared - - test - export LD_LIBRARY_PATH=%{DIR_APP}/src/.libs - make check - end -end - -packages - package %{name} - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/libcgroup/libcgroup.nm b/libcgroup/libcgroup.nm deleted file mode 100644 index cf55450a6..000000000 --- a/libcgroup/libcgroup.nm +++ /dev/null @@ -1,54 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = libcgroup -version = 0.41 -release = 1 - -groups = Development/Libraries -url = http://libcg.sourceforge.net/ -license = LGPLv2+ -summary = Tools and libraries to control and monitor control groups. - -description - Control groups infrastructure. The tools and library help manipulate, \ - control, administrate and monitor control groups and the associated \ - controllers. -end - -source_dl = https://sourceforge.net/projects/libcg/files/libcgroup/v0.41/ -sources = %{thisapp}.tar.gz - -build - requires - bison - gcc-c++ - flex - end - - configure_options += \ - --disable-pam \ - --disable-tools \ - --disable-daemon - - # The testsuite is disabled because it does not - # run very smoothly in PBS. - - install_cmds - rm -rf %{BUILDROOT}/etc - end -end - -packages - package %{name} - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/libcroco/libcroco.nm b/libcroco/libcroco.nm deleted file mode 100644 index 9cc9f071a..000000000 --- a/libcroco/libcroco.nm +++ /dev/null @@ -1,51 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = libcroco -version = 0.6.11 -major_ver = 0.6 -release = 1 - -groups = System/Libraries -url = -license = LGPLv2+ -summary = A CSS2 parsing library. - -description - libcroco is a CSS2 parsing and manipulation library. -end - -source_dl = http://download.gnome.org/sources/%%7Bname%7D/%%7Bmajor_ver%7D/ -sources = %{thisapp}.tar.xz - -build - requires - automake - glib2-devel - libxml2-devel - end - - prepare_cmds - cp -vf /usr/share/automake-*/config.{guess,sub} . - end - - configure_options += \ - --disable-static - test - make check - end -end - -packages - package %{name} - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/libhtp/libhtp.nm b/libhtp/libhtp.nm deleted file mode 100644 index 8bb4ebf9c..000000000 --- a/libhtp/libhtp.nm +++ /dev/null @@ -1,55 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = libhtp -version = 0.5.29 -release = 1 - -groups = System/Libraries -url = https://github.com/OISF/libhtp -license = BSD -summary = LibHTP is a security-aware parser. - -description - LibHTP is a security-aware parser for the HTTP protocol and the - related bits and pieces. -end - -source_dl = https://github.com/OISF/%%7Bname%7D/archive/%%7Bversion%7D.tar.gz#/ - -build - requires - autoconf - automake - libtool - pkg-config - zlib-devel - end - - export LD_LIBRARY_PATH = %{DIR_APP}/htp/.libs - - configure_options += \ - --disable-static - - prepare_cmds - ./autogen.sh - end - - test - make check - end -end - -packages - package %{name} - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/libnfnetlink/libnfnetlink.nm b/libnfnetlink/libnfnetlink.nm index d2ad69928..46c5d062d 100644 --- a/libnfnetlink/libnfnetlink.nm +++ b/libnfnetlink/libnfnetlink.nm @@ -4,23 +4,23 @@ ###############################################################################
name = libnfnetlink -version = 1.0.1 +version = 1.0.2 release = 1
groups = System/Libraries -url = http://www.netfilter.org/projects/libnfnetlink/downloads.html +url = https://www.netfilter.org/projects/libnfnetlink/downloads.html license = GPL -summary = A low-level library for netfilter. +summary = A low-level library for netfilter
description - libnfnetlink is a low-level userspace library for \ - nfnetlink-based communication between the kernel-side netfilter \ - and the user-space world. It is therefore the fundamental layer \ - for all other nfnetlink-enabled user-space programs interfacing \ + libnfnetlink is a low-level userspace library for + nfnetlink-based communication between the kernel-side netfilter + and the user-space world. It is therefore the fundamental layer + for all other nfnetlink-enabled user-space programs interfacing with the netfilter subsystem of the Linux kernel. end
-source_dl = http://www.netfilter.org/projects/libnfnetlink/files/ +source_dl = https://www.netfilter.org/projects/libnfnetlink/files/ sources = %{thisapp}.tar.bz2
packages diff --git a/libnl/libnl.nm b/libnl/libnl.nm index 504f351b2..4bf29cbef 100644 --- a/libnl/libnl.nm +++ b/libnl/libnl.nm @@ -4,33 +4,20 @@ ###############################################################################
name = libnl -version = 1.1 -release = 2 +version = 1.1.4 +release = 1
groups = Development/Libraries -url = http://people.suug.ch/~tgr/libnl/ +url = https://www.infradead.org/~tgr/libnl/ license = LGPLv2 -summary = Convenience library for kernel netlink sockets. +summary = Convenience library for kernel netlink sockets
description This package contains a convenience library to simplify using the \ Linux kernel's netlink sockets interface for network manipulation. end
-source_dl = - -build - configure_options += \ - --libdir=/%{lib} - - install_cmds - rm -vf %{BUILDROOT}/%{lib}/libnl.so - mkdir -pv %{BUILDROOT}%{libdir} - ln -svf ../../%{lib}/libnl.so.1 %{BUILDROOT}%{libdir}/libnl.so - - mv -v %{BUILDROOT}/%{lib}/pkgconfig %{BUILDROOT}%{libdir}/pkgconfig - end -end +source_dl = https://www.infradead.org/~tgr/libnl/files/
packages package %{name} diff --git a/libnl/patches/libnl-1.1-include-limits-h.patch b/libnl/patches/libnl-1.1-include-limits-h.patch deleted file mode 100644 index 3bead1623..000000000 --- a/libnl/patches/libnl-1.1-include-limits-h.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up libnl-1.1/include/netlink-local.h.limits libnl-1.1/include/netlink-local.h ---- libnl-1.1/include/netlink-local.h.limits 2008-02-22 11:31:18.000000000 -0500 -+++ libnl-1.1/include/netlink-local.h 2008-02-22 11:32:57.000000000 -0500 -@@ -22,6 +22,7 @@ - #include <time.h> - #include <stdarg.h> - #include <ctype.h> -+#include <limits.h> - #include <sys/types.h> - #include <sys/socket.h> - #include <inttypes.h> diff --git a/libnl/patches/libnl-1.1-no-extern-inline.patch b/libnl/patches/libnl-1.1-no-extern-inline.patch deleted file mode 100644 index 16a4f8f09..000000000 --- a/libnl/patches/libnl-1.1-no-extern-inline.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 84fefcadcde5d6c343db7f5c1744f6b1f070bc71 Mon Sep 17 00:00:00 2001 -From: Peter Jones pjones@redhat.com -Date: Thu, 14 May 2009 11:30:40 -0400 -Subject: [PATCH] Remove "inline" keyword from nl_object_priv(). - -"extern inline foo();" in a header file generates a compiler warning in -consumers of the library. Also, it doesn't make any sense whatsoever. -For this reason, and the fact that this function is not used at all in -the file in which it's defined, I have removed the "inline" keyword. ---- - doc/Doxyfile.in | 2 +- - include/netlink/object.h | 2 +- - lib/object.c | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in -index 0c518b7..396fcbc 100644 ---- a/doc/Doxyfile.in -+++ b/doc/Doxyfile.in -@@ -113,7 +113,7 @@ FULL_PATH_NAMES = YES - # If left blank the directory from which doxygen is run is used as the - # path to strip. - --STRIP_FROM_PATH = -+STRIP_FROM_PATH = /home/pjones/build/BUILD/libnl-1.1 - - # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of - # the path mentioned in the documentation of a class, which tells -diff --git a/include/netlink/object.h b/include/netlink/object.h -index 751a1b3..241a2ad 100644 ---- a/include/netlink/object.h -+++ b/include/netlink/object.h -@@ -55,7 +55,7 @@ extern int nl_object_is_marked(struct nl_object *); - /* Access Functions */ - extern int nl_object_get_refcnt(struct nl_object *); - extern struct nl_cache * nl_object_get_cache(struct nl_object *); --extern inline void * nl_object_priv(struct nl_object *); -+extern void * nl_object_priv(struct nl_object *); - - #ifdef __cplusplus - } -diff --git a/lib/object.c b/lib/object.c -index 74f6e2d..845ca1d 100644 ---- a/lib/object.c -+++ b/lib/object.c -@@ -376,7 +376,7 @@ struct nl_cache *nl_object_get_cache(struct nl_object *obj) - return obj->ce_cache; - } - --inline void *nl_object_priv(struct nl_object *obj) -+void *nl_object_priv(struct nl_object *obj) - { - return obj; - } --- -1.6.2.2 - diff --git a/libnl/patches/libnl-1.1-permissions.patch b/libnl/patches/libnl-1.1-permissions.patch deleted file mode 100644 index 916ec9a00..000000000 --- a/libnl/patches/libnl-1.1-permissions.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- libnl-1.0-pre5/lib/Makefile.debuginfo 2006-06-15 18:11:21.000000000 -0400 -+++ libnl-1.0-pre5/lib/Makefile 2006-06-15 18:11:28.000000000 -0400 -@@ -64,7 +64,7 @@ - - install: - mkdir -p $(DESTDIR)$(libdir)/ -- install -m 0644 $(OUT_SLIB) $(DESTDIR)$(libdir) -+ install -m 0755 $(OUT_SLIB) $(DESTDIR)$(libdir) - rm -f $(DESTDIR)$(libdir)/$(LN1_SLIB) - $(LN) -s $(OUT_SLIB) $(DESTDIR)$(libdir)/$(LN1_SLIB) - rm -f $(DESTDIR)$(libdir)/$(LN_SLIB) - $(LN) -s $(LN1_SLIB) $(DESTDIR)$(libdir)/$(LN_SLIB) - diff --git a/libnl3/libnl3.nm b/libnl3/libnl3.nm index a74529da1..70c0d92f5 100644 --- a/libnl3/libnl3.nm +++ b/libnl3/libnl3.nm @@ -18,7 +18,7 @@ description Linux kernel's netlink sockets interface for network manipulation. end
-source_dl = http://www.infradead.org/~tgr/libnl/files/ +source_dl = https://www.infradead.org/~tgr/libnl/files/
build requires diff --git a/liboping/liboping.nm b/liboping/liboping.nm index 127522717..e775143a7 100644 --- a/liboping/liboping.nm +++ b/liboping/liboping.nm @@ -5,7 +5,7 @@
name = liboping version = 1.10.0 -release = 2 +release = 3
groups = Development/Tools url = https://noping.cc/ @@ -32,8 +32,8 @@ build --without-perl-bindings
install_cmds - setcap cap_net_raw=ep %{BUILDROOT}%{bindir}/oping - setcap cap_net_raw=ep %{BUILDROOT}%{bindir}/noping + #setcap cap_net_raw=ep %{BUILDROOT}%{bindir}/oping + #setcap cap_net_raw=ep %{BUILDROOT}%{bindir}/noping end end
diff --git a/libpipeline/libpipeline.nm b/libpipeline/libpipeline.nm index 6475cfe59..6a956e4e1 100644 --- a/libpipeline/libpipeline.nm +++ b/libpipeline/libpipeline.nm @@ -4,20 +4,20 @@ ###############################################################################
name = libpipeline -version = 1.4.1 +version = 1.5.3 release = 1
groups = Development/Libraries -url = http://libpipeline.nongnu.org/ +url = https://libpipeline.nongnu.org/ license = GPLv3 -summary = Pipeline manipulation library. +summary = Pipeline manipulation library
description libpipeline is a C library for manipulating pipelines of subprocesses \ in a flexible and convenient way. end
-source_dl = http://download.savannah.gnu.org/releases/libpipeline/ +source_dl = https://download.savannah.gnu.org/releases/libpipeline/
packages package %{name} diff --git a/libpng/libpng.nm b/libpng/libpng.nm index 8af06c8ac..8b6b9e71c 100644 --- a/libpng/libpng.nm +++ b/libpng/libpng.nm @@ -4,7 +4,7 @@ ###############################################################################
name = libpng -version = 1.6.21 +version = 1.6.39 release = 1
groups = System/Libraries @@ -21,7 +21,6 @@ description end
source_dl = http://downloads.sourceforge.net/project/libpng/libpng16/%%7Bversion%7D/ -source_dl += http://downloads.sourceforge.net/project/libpng/history/libpng16/%%7Bversion...
build requires diff --git a/libsodium/libsodium.nm b/libsodium/libsodium.nm index 5149693cd..2a3545821 100644 --- a/libsodium/libsodium.nm +++ b/libsodium/libsodium.nm @@ -4,11 +4,11 @@ ###############################################################################
name = libsodium -version = 1.0.9 +version = 1.0.18 release = 1
groups = System/Libraries -url = http://libsodium.org +url = https://libsodium.org license = ISC summary = The Sodium crypto library
@@ -26,7 +26,7 @@ description implementations of the NIST standards. end
-source_dl = http://download.libsodium.org/libsodium/releases/ +source_dl = https://download.libsodium.org/libsodium/releases/
packages package %{name} diff --git a/libxslt/libxslt.nm b/libxslt/libxslt.nm index 9bd7154b7..e6d809eb8 100644 --- a/libxslt/libxslt.nm +++ b/libxslt/libxslt.nm @@ -4,14 +4,15 @@ ###############################################################################
name = libxslt -version = 1.1.28 +version = %{ver_maj}.37 +ver_maj = 1.1 release = 1
maintainer = Stefan Schantl stefan.schantl@ipfire.org groups = Development/Libraries -url = http://xmlsoft.org/XSLT/ +url = https://gitlab.gnome.org/GNOME/libxslt/-/wikis/home license = MIT -summary = Library providing the Gnome XSLT engine. +summary = Library providing the Gnome XSLT engine
description This C library allows to transform XML files into other XML files @@ -19,15 +20,20 @@ description mechanism. end
-source_dl = ftp://xmlsoft.org/libxslt/ +source_dl = https://download.gnome.org/sources/libxslt/%%7Bver_maj%7D/ +sources = %{thisapp}.tar.xz
build requires libgcrypt-devel libxml2-devel pkg-config + python3-devel zlib-devel end + + configure_options += \ + PYTHON=%{python3} end
packages diff --git a/linux-firmware/linux-firmware.nm b/linux-firmware/linux-firmware.nm index dc2d803f7..08b6e9b1d 100644 --- a/linux-firmware/linux-firmware.nm +++ b/linux-firmware/linux-firmware.nm @@ -4,11 +4,9 @@ ###############################################################################
name = linux-firmware -version = 20190620 -git_ver = 7ae3a09 -release = 1.git%{git_ver} +version = 20221214 +release = 1 arch = noarch -thisapp = %{name}-%{git_ver}
maintainer = Arne Fitzenreiter arne.fitzenreiter@ipfire.org groups = System/Libraries @@ -30,9 +28,12 @@ build : # Nothing to do. end
- install - mkdir -pv %{BUILDROOT}%{prefix}/lib/firmware - cp -prv * %{BUILDROOT}%{prefix}/lib/firmware + make_install_targets += FIRMWAREDIR=%{firmwaredir} + + install_cmds + # Remove executable bits from any files + find %{BUILDROOT}%{firmwaredir} -type f \ + -executable -print | xargs chmod -v a-x end end
diff --git a/lua/lua.nm b/lua/lua.nm index daa2f41e4..cc1e51a23 100644 --- a/lua/lua.nm +++ b/lua/lua.nm @@ -4,74 +4,59 @@ ###############################################################################
name = lua -major_version = 5.3 -version = %{major_version}.5 +ver_maj = 5.4 +version = %{ver_maj}.4 release = 1
groups = Development/Languages -url = http://www.lua.org/ +url = https://www.lua.org/ license = MIT -summary = Powerful light-weight programming language. +summary = Powerful light-weight programming language
description - Lua is a powerful light-weight programming language designed for \ - extending applications. Lua is also frequently used as a \ - general-purpose, stand-alone language. Lua is free software. \ - Lua combines simple procedural syntax with powerful data description \ - constructs based on associative arrays and extensible semantics. Lua \ - is dynamically typed, interpreted from bytecodes, and has automatic \ - memory management with garbage collection, making it ideal for \ + Lua is a powerful light-weight programming language designed for + extending applications. Lua is also frequently used as a + general-purpose, stand-alone language. Lua is free software. + Lua combines simple procedural syntax with powerful data description + constructs based on associative arrays and extensible semantics. Lua + is dynamically typed, interpreted from bytecodes, and has automatic + memory management with garbage collection, making it ideal for configuration, scripting, and rapid prototyping. end
-source_dl = http://www.lua.org/ftp/ +source_dl = https://www.lua.org/ftp/
build requires + autoconf + automake readline-devel end
prepare_cmds - # Lua 5.3.4 has wrong release version in its Makefile - sed "s/^R= $V.4/R= $V.5/" -i Makefile + autoreconf -vfi end
- make_build_targets += \ - MYCFLAGS="%{CFLAGS} -DLUA_COMPAT_5_2 -DLUA_COMPAT_5_1" \ - MYLDFLAGS="%{LDFLAGS}" \ - linux - - test - make test - end - - make_install_targets += \ - TO_LIB="liblua.so.%{version}" \ - INSTALL_TOP="%{BUILDROOT}%{prefix}" \ - INSTALL_LIB="%{BUILDROOT}%{libdir}" \ - INSTALL_MAN="%{BUILDROOT}%{mandir}/man1" - - install_cmds - # Install library links - ln -svf liblua.so.%{version} %{BUILDROOT}%{libdir}/liblua.so.%{major_version} - ln -svf liblua.so.%{major_version} %{BUILDROOT}%{libdir}/liblua.so - - # Install pkgconfig file - mkdir -pv %{BUILDROOT}%{libdir}/pkgconfig - sed "s/%VER%/%{major_version}/g;s/%REL%/%{version}/g" \ - < %{DIR_SOURCE}/lua.pc > %{BUILDROOT}%{libdir}/pkgconfig/lua.pc - end + configure_options += \ + --with-compat-module \ + --with-readline end
packages package %{name}
+ package %{name}-libs + template LIBS + + files += %{libdir}/liblua-%{ver_maj}.so + end + package %{name}-devel template DEVEL - end
- package %{name}-libs - template LIBS + requires = lua-libs = %{thisver} + + files += !%{libdir}/liblua-%{ver_maj}.so end
package %{name}-debuginfo diff --git a/lua/lua.pc b/lua/lua.pc deleted file mode 100644 index bf7977bcd..000000000 --- a/lua/lua.pc +++ /dev/null @@ -1,20 +0,0 @@ -V=%VER% -R=%REL% - -prefix=/usr -INSTALL_BIN=${prefix}/bin -INSTALL_INC=${prefix}/include -INSTALL_LIB=${prefix}/lib -INSTALL_MAN=${prefix}/man/man1 -INSTALL_LMOD=${prefix}/share/lua/${V} -INSTALL_CMOD=${prefix}/lib/lua/${V} -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: Lua -Description: An Extensible Extension Language -Version: ${R} -Requires: -Libs: -L${libdir} -llua -lm -Cflags: -I${includedir} diff --git a/lua/patches/liblua.so.patch b/lua/patches/liblua.so.patch deleted file mode 100644 index f9e24f328..000000000 --- a/lua/patches/liblua.so.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/Makefile b/Makefile -index 7fa91c8..dccf485 100644 ---- a/Makefile -+++ b/Makefile -@@ -52,7 +52,7 @@ R= $V.0 - all: $(PLAT) - - $(PLATS) clean: -- cd src && $(MAKE) $@ -+ cd src && $(MAKE) $@ V=$(V) R=$(R) - - test: dummy - src/lua -v -diff --git a/src/Makefile b/src/Makefile -index 2e7a412..fa5769f 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -29,6 +29,7 @@ MYOBJS= - PLATS= aix bsd c89 freebsd generic linux macosx mingw posix solaris - - LUA_A= liblua.a -+LUA_SO= liblua.so - CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \ - lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \ - ltm.o lundump.o lvm.o lzio.o -@@ -43,7 +44,7 @@ LUAC_T= luac - LUAC_O= luac.o - - ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O) --ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) -+ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO) - ALL_A= $(LUA_A) - - # Targets start here. -@@ -59,6 +60,12 @@ $(LUA_A): $(BASE_O) - $(AR) $@ $(BASE_O) - $(RANLIB) $@ - -+$(LUA_SO): $(CORE_O) $(LIB_O) -+ $(CC) -shared -ldl -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm $(MYLDFLAGS) -+ ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V) -+ ln -sf $(LUA_SO).$(R) $(LUA_SO) -+ -+ - $(LUA_T): $(LUA_O) $(LUA_A) - $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) - -diff --git a/src/luaconf.h b/src/luaconf.h -index fd28d21..e2662cc 100644 ---- a/src/luaconf.h -+++ b/src/luaconf.h -@@ -175,7 +175,7 @@ - - #else /* }{ */ - --#define LUA_ROOT "/usr/local/" -+#define LUA_ROOT "/usr/" - #define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR "/" - #define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR "/" - #define LUA_PATH_DEFAULT \ diff --git a/lua/patches/lua-5.4.4-autotoolize.patch b/lua/patches/lua-5.4.4-autotoolize.patch new file mode 100644 index 000000000..77d750bc4 --- /dev/null +++ b/lua/patches/lua-5.4.4-autotoolize.patch @@ -0,0 +1,2539 @@ +diff -Nur lua-5.4.4-old/configure.ac lua-5.4.4/configure.ac +--- lua-5.4.4-old/configure.ac 1970-01-01 00:00:00.000000000 +0000 ++++ lua-5.4.4/configure.ac 2023-01-08 14:49:48.714984535 +0000 +@@ -0,0 +1,69 @@ ++AC_PREREQ(2.59) ++AC_INIT([lua], [5.4.0], [https://bugzilla.redhat.com/], [lua-at], [http://www.lua.org]) ++AC_SUBST([MAJOR_VERSION], [5.4]) ++ ++AC_CONFIG_HEADERS([config.h]) ++AC_CONFIG_SRCDIR([src/lapi.c]) ++ ++AM_INIT_AUTOMAKE([1.9 foreign]) ++ ++AC_PROG_CC ++AC_PROG_LIBTOOL ++ ++AC_ARG_WITH( ++ [readline], ++ [AC_HELP_STRING([--with-readline], [Use readline for interpreter input [default=yes]])], ++ [use_readline=$withval], ++ [use_readline=yes] ++) ++ ++LUA_LIBS="-lm" ++ ++# Check for readline ++READLINE_DEFS="#undef LUA_USE_READLINE" ++if test "x$use_readline" == "xyes"; then ++ AC_CHECK_LIB([readline], [readline], [:], [use_readline=no], [-lncurses]) ++ AC_CHECK_HEADERS([readline/readline.h readline/history.h], [], [use_readline=no]) ++ if test "x$use_readline" == "xno"; then ++ AC_MSG_WARN([readline headers could not be found, disabling readline support]) ++ else ++ READLINE_DEFS="#define LUA_USE_READLINE" ++ READLINE_LIBS="-lreadline -lncurses" ++ fi ++fi ++AC_SUBST(READLINE_DEFS) ++AC_SUBST(READLINE_LIBS) ++ ++case "$host" in ++ *-mingw*) use_os=win32 ;; ++ *-darwin*) use_os=macosx ;; ++ *) use_os=posix ;; ++esac ++ ++POSIX_DEFS="#undef LUA_USE_POSIX" ++LUA_DL_DEFS="#undef LUA_USE_DLOPEN" ++LUA_BUILD_AS_DLL_DEFS="#undef LUA_BUILD_AS_DLL" ++ ++if test "x$use_os" == "xwin32"; then ++ LUA_BUILD_AS_DLL_DEFS="#define LUA_BUILD_AS_DLL" ++elif test "x$use_os" == "xmacosx"; then ++ POSIX_DEFS="#define LUA_USE_POSIX" ++ LUA_DL_DEFS="#define LUA_DL_DYLD" ++elif test "x$use_os" == "xposix"; then ++ POSIX_DEFS="#define LUA_USE_POSIX" ++ LUA_DL_DEFS="#define LUA_DL_DLOPEN" ++ LUA_LIBS="$LUA_LIBS -ldl" ++fi ++AC_SUBST(POSIX_DEFS) ++AC_SUBST(LUA_DL_DEFS) ++AC_SUBST(LUA_BUILD_AS_DLL_DEFS) ++ ++AC_SUBST(LUA_LIBS) ++ ++AC_CONFIG_FILES([Makefile ++ src/Makefile ++ src/lua.pc ++ src/luaconf.h.template ++ doc/Makefile ++]) ++AC_OUTPUT +diff -Nur lua-5.4.4-old/doc/Makefile.am lua-5.4.4/doc/Makefile.am +--- lua-5.4.4-old/doc/Makefile.am 1970-01-01 00:00:00.000000000 +0000 ++++ lua-5.4.4/doc/Makefile.am 2023-01-08 14:49:48.714984535 +0000 +@@ -0,0 +1,4 @@ ++man1_MANS = lua.1 luac.1 ++ ++EXTRA_DIST = \ ++ contents.html logo.gif lua.1 luac.1 lua.css manual.css manual.html osi-certified-72x60.png readme.html +diff -Nur lua-5.4.4-old/Makefile.am lua-5.4.4/Makefile.am +--- lua-5.4.4-old/Makefile.am 1970-01-01 00:00:00.000000000 +0000 ++++ lua-5.4.4/Makefile.am 2023-01-08 14:49:48.714984535 +0000 +@@ -0,0 +1,3 @@ ++SUBDIRS = src doc ++ ++EXTRA_DIST = README +diff -Nur lua-5.4.4-old/src/.gitignore lua-5.4.4/src/.gitignore +--- lua-5.4.4-old/src/.gitignore 1970-01-01 00:00:00.000000000 +0000 ++++ lua-5.4.4/src/.gitignore 2023-01-08 14:49:48.714984535 +0000 +@@ -0,0 +1,5 @@ ++lua ++lua.pc ++luac ++luaconf.h ++luaconf.h.template +diff -Nur lua-5.4.4-old/src/luaconf.h lua-5.4.4/src/luaconf.h +--- lua-5.4.4-old/src/luaconf.h 2022-01-13 11:24:43.000000000 +0000 ++++ lua-5.4.4/src/luaconf.h 1970-01-01 00:00:00.000000000 +0000 +@@ -1,786 +0,0 @@ +-/* +-** $Id: luaconf.h $ +-** Configuration file for Lua +-** See Copyright Notice in lua.h +-*/ +- +- +-#ifndef luaconf_h +-#define luaconf_h +- +-#include <limits.h> +-#include <stddef.h> +- +- +-/* +-** =================================================================== +-** General Configuration File for Lua +-** +-** Some definitions here can be changed externally, through the compiler +-** (e.g., with '-D' options): They are commented out or protected +-** by '#if !defined' guards. However, several other definitions +-** should be changed directly here, either because they affect the +-** Lua ABI (by making the changes here, you ensure that all software +-** connected to Lua, such as C libraries, will be compiled with the same +-** configuration); or because they are seldom changed. +-** +-** Search for "@@" to find all configurable definitions. +-** =================================================================== +-*/ +- +- +-/* +-** {==================================================================== +-** System Configuration: macros to adapt (if needed) Lua to some +-** particular platform, for instance restricting it to C89. +-** ===================================================================== +-*/ +- +-/* +-@@ LUA_USE_C89 controls the use of non-ISO-C89 features. +-** Define it if you want Lua to avoid the use of a few C99 features +-** or Windows-specific features on Windows. +-*/ +-/* #define LUA_USE_C89 */ +- +- +-/* +-** By default, Lua on Windows use (some) specific Windows features +-*/ +-#if !defined(LUA_USE_C89) && defined(_WIN32) && !defined(_WIN32_WCE) +-#define LUA_USE_WINDOWS /* enable goodies for regular Windows */ +-#endif +- +- +-#if defined(LUA_USE_WINDOWS) +-#define LUA_DL_DLL /* enable support for DLL */ +-#define LUA_USE_C89 /* broadly, Windows is C89 */ +-#endif +- +- +-#if defined(LUA_USE_LINUX) +-#define LUA_USE_POSIX +-#define LUA_USE_DLOPEN /* needs an extra library: -ldl */ +-#endif +- +- +-#if defined(LUA_USE_MACOSX) +-#define LUA_USE_POSIX +-#define LUA_USE_DLOPEN /* MacOS does not need -ldl */ +-#endif +- +- +-/* +-@@ LUAI_IS32INT is true iff 'int' has (at least) 32 bits. +-*/ +-#define LUAI_IS32INT ((UINT_MAX >> 30) >= 3) +- +-/* }================================================================== */ +- +- +- +-/* +-** {================================================================== +-** Configuration for Number types. These options should not be +-** set externally, because any other code connected to Lua must +-** use the same configuration. +-** =================================================================== +-*/ +- +-/* +-@@ LUA_INT_TYPE defines the type for Lua integers. +-@@ LUA_FLOAT_TYPE defines the type for Lua floats. +-** Lua should work fine with any mix of these options supported +-** by your C compiler. The usual configurations are 64-bit integers +-** and 'double' (the default), 32-bit integers and 'float' (for +-** restricted platforms), and 'long'/'double' (for C compilers not +-** compliant with C99, which may not have support for 'long long'). +-*/ +- +-/* predefined options for LUA_INT_TYPE */ +-#define LUA_INT_INT 1 +-#define LUA_INT_LONG 2 +-#define LUA_INT_LONGLONG 3 +- +-/* predefined options for LUA_FLOAT_TYPE */ +-#define LUA_FLOAT_FLOAT 1 +-#define LUA_FLOAT_DOUBLE 2 +-#define LUA_FLOAT_LONGDOUBLE 3 +- +- +-/* Default configuration ('long long' and 'double', for 64-bit Lua) */ +-#define LUA_INT_DEFAULT LUA_INT_LONGLONG +-#define LUA_FLOAT_DEFAULT LUA_FLOAT_DOUBLE +- +- +-/* +-@@ LUA_32BITS enables Lua with 32-bit integers and 32-bit floats. +-*/ +-#define LUA_32BITS 0 +- +- +-/* +-@@ LUA_C89_NUMBERS ensures that Lua uses the largest types available for +-** C89 ('long' and 'double'); Windows always has '__int64', so it does +-** not need to use this case. +-*/ +-#if defined(LUA_USE_C89) && !defined(LUA_USE_WINDOWS) +-#define LUA_C89_NUMBERS 1 +-#else +-#define LUA_C89_NUMBERS 0 +-#endif +- +- +-#if LUA_32BITS /* { */ +-/* +-** 32-bit integers and 'float' +-*/ +-#if LUAI_IS32INT /* use 'int' if big enough */ +-#define LUA_INT_TYPE LUA_INT_INT +-#else /* otherwise use 'long' */ +-#define LUA_INT_TYPE LUA_INT_LONG +-#endif +-#define LUA_FLOAT_TYPE LUA_FLOAT_FLOAT +- +-#elif LUA_C89_NUMBERS /* }{ */ +-/* +-** largest types available for C89 ('long' and 'double') +-*/ +-#define LUA_INT_TYPE LUA_INT_LONG +-#define LUA_FLOAT_TYPE LUA_FLOAT_DOUBLE +- +-#else /* }{ */ +-/* use defaults */ +- +-#define LUA_INT_TYPE LUA_INT_DEFAULT +-#define LUA_FLOAT_TYPE LUA_FLOAT_DEFAULT +- +-#endif /* } */ +- +- +-/* }================================================================== */ +- +- +- +-/* +-** {================================================================== +-** Configuration for Paths. +-** =================================================================== +-*/ +- +-/* +-** LUA_PATH_SEP is the character that separates templates in a path. +-** LUA_PATH_MARK is the string that marks the substitution points in a +-** template. +-** LUA_EXEC_DIR in a Windows path is replaced by the executable's +-** directory. +-*/ +-#define LUA_PATH_SEP ";" +-#define LUA_PATH_MARK "?" +-#define LUA_EXEC_DIR "!" +- +- +-/* +-@@ LUA_PATH_DEFAULT is the default path that Lua uses to look for +-** Lua libraries. +-@@ LUA_CPATH_DEFAULT is the default path that Lua uses to look for +-** C libraries. +-** CHANGE them if your machine has a non-conventional directory +-** hierarchy or if you want to install your libraries in +-** non-conventional directories. +-*/ +- +-#define LUA_VDIR LUA_VERSION_MAJOR "." LUA_VERSION_MINOR +-#if defined(_WIN32) /* { */ +-/* +-** In Windows, any exclamation mark ('!') in the path is replaced by the +-** path of the directory of the executable file of the current process. +-*/ +-#define LUA_LDIR "!\lua\" +-#define LUA_CDIR "!\" +-#define LUA_SHRDIR "!\..\share\lua\" LUA_VDIR "\" +- +-#if !defined(LUA_PATH_DEFAULT) +-#define LUA_PATH_DEFAULT \ +- LUA_LDIR"?.lua;" LUA_LDIR"?\init.lua;" \ +- LUA_CDIR"?.lua;" LUA_CDIR"?\init.lua;" \ +- LUA_SHRDIR"?.lua;" LUA_SHRDIR"?\init.lua;" \ +- ".\?.lua;" ".\?\init.lua" +-#endif +- +-#if !defined(LUA_CPATH_DEFAULT) +-#define LUA_CPATH_DEFAULT \ +- LUA_CDIR"?.dll;" \ +- LUA_CDIR"..\lib\lua\" LUA_VDIR "\?.dll;" \ +- LUA_CDIR"loadall.dll;" ".\?.dll" +-#endif +- +-#else /* }{ */ +- +-#define LUA_ROOT "/usr/local/" +-#define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR "/" +-#define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR "/" +- +-#if !defined(LUA_PATH_DEFAULT) +-#define LUA_PATH_DEFAULT \ +- LUA_LDIR"?.lua;" LUA_LDIR"?/init.lua;" \ +- LUA_CDIR"?.lua;" LUA_CDIR"?/init.lua;" \ +- "./?.lua;" "./?/init.lua" +-#endif +- +-#if !defined(LUA_CPATH_DEFAULT) +-#define LUA_CPATH_DEFAULT \ +- LUA_CDIR"?.so;" LUA_CDIR"loadall.so;" "./?.so" +-#endif +- +-#endif /* } */ +- +- +-/* +-@@ LUA_DIRSEP is the directory separator (for submodules). +-** CHANGE it if your machine does not use "/" as the directory separator +-** and is not Windows. (On Windows Lua automatically uses "".) +-*/ +-#if !defined(LUA_DIRSEP) +- +-#if defined(_WIN32) +-#define LUA_DIRSEP "\" +-#else +-#define LUA_DIRSEP "/" +-#endif +- +-#endif +- +-/* }================================================================== */ +- +- +-/* +-** {================================================================== +-** Marks for exported symbols in the C code +-** =================================================================== +-*/ +- +-/* +-@@ LUA_API is a mark for all core API functions. +-@@ LUALIB_API is a mark for all auxiliary library functions. +-@@ LUAMOD_API is a mark for all standard library opening functions. +-** CHANGE them if you need to define those functions in some special way. +-** For instance, if you want to create one Windows DLL with the core and +-** the libraries, you may want to use the following definition (define +-** LUA_BUILD_AS_DLL to get it). +-*/ +-#if defined(LUA_BUILD_AS_DLL) /* { */ +- +-#if defined(LUA_CORE) || defined(LUA_LIB) /* { */ +-#define LUA_API __declspec(dllexport) +-#else /* }{ */ +-#define LUA_API __declspec(dllimport) +-#endif /* } */ +- +-#else /* }{ */ +- +-#define LUA_API extern +- +-#endif /* } */ +- +- +-/* +-** More often than not the libs go together with the core. +-*/ +-#define LUALIB_API LUA_API +-#define LUAMOD_API LUA_API +- +- +-/* +-@@ LUAI_FUNC is a mark for all extern functions that are not to be +-** exported to outside modules. +-@@ LUAI_DDEF and LUAI_DDEC are marks for all extern (const) variables, +-** none of which to be exported to outside modules (LUAI_DDEF for +-** definitions and LUAI_DDEC for declarations). +-** CHANGE them if you need to mark them in some special way. Elf/gcc +-** (versions 3.2 and later) mark them as "hidden" to optimize access +-** when Lua is compiled as a shared library. Not all elf targets support +-** this attribute. Unfortunately, gcc does not offer a way to check +-** whether the target offers that support, and those without support +-** give a warning about it. To avoid these warnings, change to the +-** default definition. +-*/ +-#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 302) && \ +- defined(__ELF__) /* { */ +-#define LUAI_FUNC __attribute__((visibility("internal"))) extern +-#else /* }{ */ +-#define LUAI_FUNC extern +-#endif /* } */ +- +-#define LUAI_DDEC(dec) LUAI_FUNC dec +-#define LUAI_DDEF /* empty */ +- +-/* }================================================================== */ +- +- +-/* +-** {================================================================== +-** Compatibility with previous versions +-** =================================================================== +-*/ +- +-/* +-@@ LUA_COMPAT_5_3 controls other macros for compatibility with Lua 5.3. +-** You can define it to get all options, or change specific options +-** to fit your specific needs. +-*/ +-#if defined(LUA_COMPAT_5_3) /* { */ +- +-/* +-@@ LUA_COMPAT_MATHLIB controls the presence of several deprecated +-** functions in the mathematical library. +-** (These functions were already officially removed in 5.3; +-** nevertheless they are still available here.) +-*/ +-#define LUA_COMPAT_MATHLIB +- +-/* +-@@ LUA_COMPAT_APIINTCASTS controls the presence of macros for +-** manipulating other integer types (lua_pushunsigned, lua_tounsigned, +-** luaL_checkint, luaL_checklong, etc.) +-** (These macros were also officially removed in 5.3, but they are still +-** available here.) +-*/ +-#define LUA_COMPAT_APIINTCASTS +- +- +-/* +-@@ LUA_COMPAT_LT_LE controls the emulation of the '__le' metamethod +-** using '__lt'. +-*/ +-#define LUA_COMPAT_LT_LE +- +- +-/* +-@@ The following macros supply trivial compatibility for some +-** changes in the API. The macros themselves document how to +-** change your code to avoid using them. +-** (Once more, these macros were officially removed in 5.3, but they are +-** still available here.) +-*/ +-#define lua_strlen(L,i) lua_rawlen(L, (i)) +- +-#define lua_objlen(L,i) lua_rawlen(L, (i)) +- +-#define lua_equal(L,idx1,idx2) lua_compare(L,(idx1),(idx2),LUA_OPEQ) +-#define lua_lessthan(L,idx1,idx2) lua_compare(L,(idx1),(idx2),LUA_OPLT) +- +-#endif /* } */ +- +-/* }================================================================== */ +- +- +- +-/* +-** {================================================================== +-** Configuration for Numbers (low-level part). +-** Change these definitions if no predefined LUA_FLOAT_* / LUA_INT_* +-** satisfy your needs. +-** =================================================================== +-*/ +- +-/* +-@@ LUAI_UACNUMBER is the result of a 'default argument promotion' +-@@ over a floating number. +-@@ l_floatatt(x) corrects float attribute 'x' to the proper float type +-** by prefixing it with one of FLT/DBL/LDBL. +-@@ LUA_NUMBER_FRMLEN is the length modifier for writing floats. +-@@ LUA_NUMBER_FMT is the format for writing floats. +-@@ lua_number2str converts a float to a string. +-@@ l_mathop allows the addition of an 'l' or 'f' to all math operations. +-@@ l_floor takes the floor of a float. +-@@ lua_str2number converts a decimal numeral to a number. +-*/ +- +- +-/* The following definitions are good for most cases here */ +- +-#define l_floor(x) (l_mathop(floor)(x)) +- +-#define lua_number2str(s,sz,n) \ +- l_sprintf((s), sz, LUA_NUMBER_FMT, (LUAI_UACNUMBER)(n)) +- +-/* +-@@ lua_numbertointeger converts a float number with an integral value +-** to an integer, or returns 0 if float is not within the range of +-** a lua_Integer. (The range comparisons are tricky because of +-** rounding. The tests here assume a two-complement representation, +-** where MININTEGER always has an exact representation as a float; +-** MAXINTEGER may not have one, and therefore its conversion to float +-** may have an ill-defined value.) +-*/ +-#define lua_numbertointeger(n,p) \ +- ((n) >= (LUA_NUMBER)(LUA_MININTEGER) && \ +- (n) < -(LUA_NUMBER)(LUA_MININTEGER) && \ +- (*(p) = (LUA_INTEGER)(n), 1)) +- +- +-/* now the variable definitions */ +- +-#if LUA_FLOAT_TYPE == LUA_FLOAT_FLOAT /* { single float */ +- +-#define LUA_NUMBER float +- +-#define l_floatatt(n) (FLT_##n) +- +-#define LUAI_UACNUMBER double +- +-#define LUA_NUMBER_FRMLEN "" +-#define LUA_NUMBER_FMT "%.7g" +- +-#define l_mathop(op) op##f +- +-#define lua_str2number(s,p) strtof((s), (p)) +- +- +-#elif LUA_FLOAT_TYPE == LUA_FLOAT_LONGDOUBLE /* }{ long double */ +- +-#define LUA_NUMBER long double +- +-#define l_floatatt(n) (LDBL_##n) +- +-#define LUAI_UACNUMBER long double +- +-#define LUA_NUMBER_FRMLEN "L" +-#define LUA_NUMBER_FMT "%.19Lg" +- +-#define l_mathop(op) op##l +- +-#define lua_str2number(s,p) strtold((s), (p)) +- +-#elif LUA_FLOAT_TYPE == LUA_FLOAT_DOUBLE /* }{ double */ +- +-#define LUA_NUMBER double +- +-#define l_floatatt(n) (DBL_##n) +- +-#define LUAI_UACNUMBER double +- +-#define LUA_NUMBER_FRMLEN "" +-#define LUA_NUMBER_FMT "%.14g" +- +-#define l_mathop(op) op +- +-#define lua_str2number(s,p) strtod((s), (p)) +- +-#else /* }{ */ +- +-#error "numeric float type not defined" +- +-#endif /* } */ +- +- +- +-/* +-@@ LUA_UNSIGNED is the unsigned version of LUA_INTEGER. +-@@ LUAI_UACINT is the result of a 'default argument promotion' +-@@ over a LUA_INTEGER. +-@@ LUA_INTEGER_FRMLEN is the length modifier for reading/writing integers. +-@@ LUA_INTEGER_FMT is the format for writing integers. +-@@ LUA_MAXINTEGER is the maximum value for a LUA_INTEGER. +-@@ LUA_MININTEGER is the minimum value for a LUA_INTEGER. +-@@ LUA_MAXUNSIGNED is the maximum value for a LUA_UNSIGNED. +-@@ lua_integer2str converts an integer to a string. +-*/ +- +- +-/* The following definitions are good for most cases here */ +- +-#define LUA_INTEGER_FMT "%" LUA_INTEGER_FRMLEN "d" +- +-#define LUAI_UACINT LUA_INTEGER +- +-#define lua_integer2str(s,sz,n) \ +- l_sprintf((s), sz, LUA_INTEGER_FMT, (LUAI_UACINT)(n)) +- +-/* +-** use LUAI_UACINT here to avoid problems with promotions (which +-** can turn a comparison between unsigneds into a signed comparison) +-*/ +-#define LUA_UNSIGNED unsigned LUAI_UACINT +- +- +-/* now the variable definitions */ +- +-#if LUA_INT_TYPE == LUA_INT_INT /* { int */ +- +-#define LUA_INTEGER int +-#define LUA_INTEGER_FRMLEN "" +- +-#define LUA_MAXINTEGER INT_MAX +-#define LUA_MININTEGER INT_MIN +- +-#define LUA_MAXUNSIGNED UINT_MAX +- +-#elif LUA_INT_TYPE == LUA_INT_LONG /* }{ long */ +- +-#define LUA_INTEGER long +-#define LUA_INTEGER_FRMLEN "l" +- +-#define LUA_MAXINTEGER LONG_MAX +-#define LUA_MININTEGER LONG_MIN +- +-#define LUA_MAXUNSIGNED ULONG_MAX +- +-#elif LUA_INT_TYPE == LUA_INT_LONGLONG /* }{ long long */ +- +-/* use presence of macro LLONG_MAX as proxy for C99 compliance */ +-#if defined(LLONG_MAX) /* { */ +-/* use ISO C99 stuff */ +- +-#define LUA_INTEGER long long +-#define LUA_INTEGER_FRMLEN "ll" +- +-#define LUA_MAXINTEGER LLONG_MAX +-#define LUA_MININTEGER LLONG_MIN +- +-#define LUA_MAXUNSIGNED ULLONG_MAX +- +-#elif defined(LUA_USE_WINDOWS) /* }{ */ +-/* in Windows, can use specific Windows types */ +- +-#define LUA_INTEGER __int64 +-#define LUA_INTEGER_FRMLEN "I64" +- +-#define LUA_MAXINTEGER _I64_MAX +-#define LUA_MININTEGER _I64_MIN +- +-#define LUA_MAXUNSIGNED _UI64_MAX +- +-#else /* }{ */ +- +-#error "Compiler does not support 'long long'. Use option '-DLUA_32BITS' \ +- or '-DLUA_C89_NUMBERS' (see file 'luaconf.h' for details)" +- +-#endif /* } */ +- +-#else /* }{ */ +- +-#error "numeric integer type not defined" +- +-#endif /* } */ +- +-/* }================================================================== */ +- +- +-/* +-** {================================================================== +-** Dependencies with C99 and other C details +-** =================================================================== +-*/ +- +-/* +-@@ l_sprintf is equivalent to 'snprintf' or 'sprintf' in C89. +-** (All uses in Lua have only one format item.) +-*/ +-#if !defined(LUA_USE_C89) +-#define l_sprintf(s,sz,f,i) snprintf(s,sz,f,i) +-#else +-#define l_sprintf(s,sz,f,i) ((void)(sz), sprintf(s,f,i)) +-#endif +- +- +-/* +-@@ lua_strx2number converts a hexadecimal numeral to a number. +-** In C99, 'strtod' does that conversion. Otherwise, you can +-** leave 'lua_strx2number' undefined and Lua will provide its own +-** implementation. +-*/ +-#if !defined(LUA_USE_C89) +-#define lua_strx2number(s,p) lua_str2number(s,p) +-#endif +- +- +-/* +-@@ lua_pointer2str converts a pointer to a readable string in a +-** non-specified way. +-*/ +-#define lua_pointer2str(buff,sz,p) l_sprintf(buff,sz,"%p",p) +- +- +-/* +-@@ lua_number2strx converts a float to a hexadecimal numeral. +-** In C99, 'sprintf' (with format specifiers '%a'/'%A') does that. +-** Otherwise, you can leave 'lua_number2strx' undefined and Lua will +-** provide its own implementation. +-*/ +-#if !defined(LUA_USE_C89) +-#define lua_number2strx(L,b,sz,f,n) \ +- ((void)L, l_sprintf(b,sz,f,(LUAI_UACNUMBER)(n))) +-#endif +- +- +-/* +-** 'strtof' and 'opf' variants for math functions are not valid in +-** C89. Otherwise, the macro 'HUGE_VALF' is a good proxy for testing the +-** availability of these variants. ('math.h' is already included in +-** all files that use these macros.) +-*/ +-#if defined(LUA_USE_C89) || (defined(HUGE_VAL) && !defined(HUGE_VALF)) +-#undef l_mathop /* variants not available */ +-#undef lua_str2number +-#define l_mathop(op) (lua_Number)op /* no variant */ +-#define lua_str2number(s,p) ((lua_Number)strtod((s), (p))) +-#endif +- +- +-/* +-@@ LUA_KCONTEXT is the type of the context ('ctx') for continuation +-** functions. It must be a numerical type; Lua will use 'intptr_t' if +-** available, otherwise it will use 'ptrdiff_t' (the nearest thing to +-** 'intptr_t' in C89) +-*/ +-#define LUA_KCONTEXT ptrdiff_t +- +-#if !defined(LUA_USE_C89) && defined(__STDC_VERSION__) && \ +- __STDC_VERSION__ >= 199901L +-#include <stdint.h> +-#if defined(INTPTR_MAX) /* even in C99 this type is optional */ +-#undef LUA_KCONTEXT +-#define LUA_KCONTEXT intptr_t +-#endif +-#endif +- +- +-/* +-@@ lua_getlocaledecpoint gets the locale "radix character" (decimal point). +-** Change that if you do not want to use C locales. (Code using this +-** macro must include the header 'locale.h'.) +-*/ +-#if !defined(lua_getlocaledecpoint) +-#define lua_getlocaledecpoint() (localeconv()->decimal_point[0]) +-#endif +- +- +-/* +-** macros to improve jump prediction, used mostly for error handling +-** and debug facilities. (Some macros in the Lua API use these macros. +-** Define LUA_NOBUILTIN if you do not want '__builtin_expect' in your +-** code.) +-*/ +-#if !defined(luai_likely) +- +-#if defined(__GNUC__) && !defined(LUA_NOBUILTIN) +-#define luai_likely(x) (__builtin_expect(((x) != 0), 1)) +-#define luai_unlikely(x) (__builtin_expect(((x) != 0), 0)) +-#else +-#define luai_likely(x) (x) +-#define luai_unlikely(x) (x) +-#endif +- +-#endif +- +- +-#if defined(LUA_CORE) || defined(LUA_LIB) +-/* shorter names for Lua's own use */ +-#define l_likely(x) luai_likely(x) +-#define l_unlikely(x) luai_unlikely(x) +-#endif +- +- +- +-/* }================================================================== */ +- +- +-/* +-** {================================================================== +-** Language Variations +-** ===================================================================== +-*/ +- +-/* +-@@ LUA_NOCVTN2S/LUA_NOCVTS2N control how Lua performs some +-** coercions. Define LUA_NOCVTN2S to turn off automatic coercion from +-** numbers to strings. Define LUA_NOCVTS2N to turn off automatic +-** coercion from strings to numbers. +-*/ +-/* #define LUA_NOCVTN2S */ +-/* #define LUA_NOCVTS2N */ +- +- +-/* +-@@ LUA_USE_APICHECK turns on several consistency checks on the C API. +-** Define it as a help when debugging C code. +-*/ +-#if defined(LUA_USE_APICHECK) +-#include <assert.h> +-#define luai_apicheck(l,e) assert(e) +-#endif +- +-/* }================================================================== */ +- +- +-/* +-** {================================================================== +-** Macros that affect the API and must be stable (that is, must be the +-** same when you compile Lua and when you compile code that links to +-** Lua). +-** ===================================================================== +-*/ +- +-/* +-@@ LUAI_MAXSTACK limits the size of the Lua stack. +-** CHANGE it if you need a different limit. This limit is arbitrary; +-** its only purpose is to stop Lua from consuming unlimited stack +-** space (and to reserve some numbers for pseudo-indices). +-** (It must fit into max(size_t)/32.) +-*/ +-#if LUAI_IS32INT +-#define LUAI_MAXSTACK 1000000 +-#else +-#define LUAI_MAXSTACK 15000 +-#endif +- +- +-/* +-@@ LUA_EXTRASPACE defines the size of a raw memory area associated with +-** a Lua state with very fast access. +-** CHANGE it if you need a different size. +-*/ +-#define LUA_EXTRASPACE (sizeof(void *)) +- +- +-/* +-@@ LUA_IDSIZE gives the maximum size for the description of the source +-@@ of a function in debug information. +-** CHANGE it if you want a different size. +-*/ +-#define LUA_IDSIZE 60 +- +- +-/* +-@@ LUAL_BUFFERSIZE is the buffer size used by the lauxlib buffer system. +-*/ +-#define LUAL_BUFFERSIZE ((int)(16 * sizeof(void*) * sizeof(lua_Number))) +- +- +-/* +-@@ LUAI_MAXALIGN defines fields that, when used in a union, ensure +-** maximum alignment for the other items in that union. +-*/ +-#define LUAI_MAXALIGN lua_Number n; double u; void *s; lua_Integer i; long l +- +-/* }================================================================== */ +- +- +- +- +- +-/* =================================================================== */ +- +-/* +-** Local configuration. You can use this space to add your redefinitions +-** without modifying the main part of the file. +-*/ +- +- +- +- +- +-#endif +- +diff -Nur lua-5.4.4-old/src/luaconf.h.template.in lua-5.4.4/src/luaconf.h.template.in +--- lua-5.4.4-old/src/luaconf.h.template.in 1970-01-01 00:00:00.000000000 +0000 ++++ lua-5.4.4/src/luaconf.h.template.in 2023-01-08 14:49:48.714984535 +0000 +@@ -0,0 +1,791 @@ ++/* ++** $Id: luaconf.h $ ++** Configuration file for Lua ++** See Copyright Notice in lua.h ++*/ ++ ++ ++#ifndef luaconf_h ++#define luaconf_h ++ ++#include <limits.h> ++#include <stddef.h> ++ ++@POSIX_DEFS@ ++@LUA_DL_DEFS@ ++@LUA_BUILD_AS_DLL_DEFS@ ++@READLINE_DEFS@ ++ ++ ++/* ++** =================================================================== ++** General Configuration File for Lua ++** ++** Some definitions here can be changed externally, through the compiler ++** (e.g., with '-D' options): They are commented out or protected ++** by '#if !defined' guards. However, several other definitions ++** should be changed directly here, either because they affect the ++** Lua ABI (by making the changes here, you ensure that all software ++** connected to Lua, such as C libraries, will be compiled with the same ++** configuration); or because they are seldom changed. ++** ++** Search for "@@" to find all configurable definitions. ++** =================================================================== ++*/ ++ ++ ++/* ++** {==================================================================== ++** System Configuration: macros to adapt (if needed) Lua to some ++** particular platform, for instance restricting it to C89. ++** ===================================================================== ++*/ ++ ++/* ++@@ LUA_USE_C89 controls the use of non-ISO-C89 features. ++** Define it if you want Lua to avoid the use of a few C99 features ++** or Windows-specific features on Windows. ++*/ ++/* #define LUA_USE_C89 */ ++ ++ ++/* ++** By default, Lua on Windows use (some) specific Windows features ++*/ ++#if !defined(LUA_USE_C89) && defined(_WIN32) && !defined(_WIN32_WCE) ++#define LUA_USE_WINDOWS /* enable goodies for regular Windows */ ++#endif ++ ++ ++#if defined(LUA_USE_WINDOWS) ++#define LUA_DL_DLL /* enable support for DLL */ ++#define LUA_USE_C89 /* broadly, Windows is C89 */ ++#endif ++ ++ ++#if defined(LUA_USE_LINUX) ++#define LUA_USE_POSIX ++#define LUA_USE_DLOPEN /* needs an extra library: -ldl */ ++#endif ++ ++ ++#if defined(LUA_USE_MACOSX) ++#define LUA_USE_POSIX ++#define LUA_USE_DLOPEN /* MacOS does not need -ldl */ ++#endif ++ ++ ++/* ++@@ LUAI_IS32INT is true iff 'int' has (at least) 32 bits. ++*/ ++#define LUAI_IS32INT ((UINT_MAX >> 30) >= 3) ++ ++/* }================================================================== */ ++ ++ ++ ++/* ++** {================================================================== ++** Configuration for Number types. These options should not be ++** set externally, because any other code connected to Lua must ++** use the same configuration. ++** =================================================================== ++*/ ++ ++/* ++@@ LUA_INT_TYPE defines the type for Lua integers. ++@@ LUA_FLOAT_TYPE defines the type for Lua floats. ++** Lua should work fine with any mix of these options supported ++** by your C compiler. The usual configurations are 64-bit integers ++** and 'double' (the default), 32-bit integers and 'float' (for ++** restricted platforms), and 'long'/'double' (for C compilers not ++** compliant with C99, which may not have support for 'long long'). ++*/ ++ ++/* predefined options for LUA_INT_TYPE */ ++#define LUA_INT_INT 1 ++#define LUA_INT_LONG 2 ++#define LUA_INT_LONGLONG 3 ++ ++/* predefined options for LUA_FLOAT_TYPE */ ++#define LUA_FLOAT_FLOAT 1 ++#define LUA_FLOAT_DOUBLE 2 ++#define LUA_FLOAT_LONGDOUBLE 3 ++ ++ ++/* Default configuration ('long long' and 'double', for 64-bit Lua) */ ++#define LUA_INT_DEFAULT LUA_INT_LONGLONG ++#define LUA_FLOAT_DEFAULT LUA_FLOAT_DOUBLE ++ ++ ++/* ++@@ LUA_32BITS enables Lua with 32-bit integers and 32-bit floats. ++*/ ++#define LUA_32BITS 0 ++ ++ ++/* ++@@ LUA_C89_NUMBERS ensures that Lua uses the largest types available for ++** C89 ('long' and 'double'); Windows always has '__int64', so it does ++** not need to use this case. ++*/ ++#if defined(LUA_USE_C89) && !defined(LUA_USE_WINDOWS) ++#define LUA_C89_NUMBERS 1 ++#else ++#define LUA_C89_NUMBERS 0 ++#endif ++ ++ ++#if LUA_32BITS /* { */ ++/* ++** 32-bit integers and 'float' ++*/ ++#if LUAI_IS32INT /* use 'int' if big enough */ ++#define LUA_INT_TYPE LUA_INT_INT ++#else /* otherwise use 'long' */ ++#define LUA_INT_TYPE LUA_INT_LONG ++#endif ++#define LUA_FLOAT_TYPE LUA_FLOAT_FLOAT ++ ++#elif LUA_C89_NUMBERS /* }{ */ ++/* ++** largest types available for C89 ('long' and 'double') ++*/ ++#define LUA_INT_TYPE LUA_INT_LONG ++#define LUA_FLOAT_TYPE LUA_FLOAT_DOUBLE ++ ++#else /* }{ */ ++/* use defaults */ ++ ++#define LUA_INT_TYPE LUA_INT_DEFAULT ++#define LUA_FLOAT_TYPE LUA_FLOAT_DEFAULT ++ ++#endif /* } */ ++ ++ ++/* }================================================================== */ ++ ++ ++ ++/* ++** {================================================================== ++** Configuration for Paths. ++** =================================================================== ++*/ ++ ++/* ++** LUA_PATH_SEP is the character that separates templates in a path. ++** LUA_PATH_MARK is the string that marks the substitution points in a ++** template. ++** LUA_EXEC_DIR in a Windows path is replaced by the executable's ++** directory. ++*/ ++#define LUA_PATH_SEP ";" ++#define LUA_PATH_MARK "?" ++#define LUA_EXEC_DIR "!" ++ ++ ++/* ++@@ LUA_PATH_DEFAULT is the default path that Lua uses to look for ++** Lua libraries. ++@@ LUA_CPATH_DEFAULT is the default path that Lua uses to look for ++** C libraries. ++** CHANGE them if your machine has a non-conventional directory ++** hierarchy or if you want to install your libraries in ++** non-conventional directories. ++*/ ++ ++#define LUA_VDIR LUA_VERSION_MAJOR "." LUA_VERSION_MINOR ++#if defined(_WIN32) /* { */ ++/* ++** In Windows, any exclamation mark ('!') in the path is replaced by the ++** path of the directory of the executable file of the current process. ++*/ ++#define LUA_LDIR "!\lua\" ++#define LUA_CDIR "!\" ++#define LUA_SHRDIR "!\..\share\lua\" LUA_VDIR "\" ++ ++#if !defined(LUA_PATH_DEFAULT) ++#define LUA_PATH_DEFAULT \ ++ LUA_LDIR"?.lua;" LUA_LDIR"?\init.lua;" \ ++ LUA_CDIR"?.lua;" LUA_CDIR"?\init.lua;" \ ++ LUA_SHRDIR"?.lua;" LUA_SHRDIR"?\init.lua;" \ ++ ".\?.lua;" ".\?\init.lua" ++#endif ++ ++#if !defined(LUA_CPATH_DEFAULT) ++#define LUA_CPATH_DEFAULT \ ++ LUA_CDIR"?.dll;" \ ++ LUA_CDIR"..\lib\lua\" LUA_VDIR "\?.dll;" \ ++ LUA_CDIR"loadall.dll;" ".\?.dll" ++#endif ++ ++#else /* }{ */ ++ ++#define LUA_ROOT "@prefix@/" ++#define LUA_LDIR "@pkgdatadir@/lua/" LUA_VDIR "/" ++#define LUA_CDIR "@libdir@/lua/" LUA_VDIR "/" ++ ++#if !defined(LUA_PATH_DEFAULT) ++#define LUA_PATH_DEFAULT \ ++ LUA_LDIR"?.lua;" LUA_LDIR"?/init.lua;" \ ++ LUA_CDIR"?.lua;" LUA_CDIR"?/init.lua;" \ ++ "./?.lua;" "./?/init.lua" ++#endif ++ ++#if !defined(LUA_CPATH_DEFAULT) ++#define LUA_CPATH_DEFAULT \ ++ LUA_CDIR"?.so;" LUA_CDIR"loadall.so;" "./?.so" ++#endif ++ ++#endif /* } */ ++ ++ ++/* ++@@ LUA_DIRSEP is the directory separator (for submodules). ++** CHANGE it if your machine does not use "/" as the directory separator ++** and is not Windows. (On Windows Lua automatically uses "".) ++*/ ++#if !defined(LUA_DIRSEP) ++ ++#if defined(_WIN32) ++#define LUA_DIRSEP "\" ++#else ++#define LUA_DIRSEP "/" ++#endif ++ ++#endif ++ ++/* }================================================================== */ ++ ++ ++/* ++** {================================================================== ++** Marks for exported symbols in the C code ++** =================================================================== ++*/ ++ ++/* ++@@ LUA_API is a mark for all core API functions. ++@@ LUALIB_API is a mark for all auxiliary library functions. ++@@ LUAMOD_API is a mark for all standard library opening functions. ++** CHANGE them if you need to define those functions in some special way. ++** For instance, if you want to create one Windows DLL with the core and ++** the libraries, you may want to use the following definition (define ++** LUA_BUILD_AS_DLL to get it). ++*/ ++#if defined(LUA_BUILD_AS_DLL) /* { */ ++ ++#if defined(LUA_CORE) || defined(LUA_LIB) /* { */ ++#define LUA_API __declspec(dllexport) ++#else /* }{ */ ++#define LUA_API __declspec(dllimport) ++#endif /* } */ ++ ++#else /* }{ */ ++ ++#define LUA_API extern ++ ++#endif /* } */ ++ ++ ++/* ++** More often than not the libs go together with the core. ++*/ ++#define LUALIB_API LUA_API ++#define LUAMOD_API LUA_API ++ ++ ++/* ++@@ LUAI_FUNC is a mark for all extern functions that are not to be ++** exported to outside modules. ++@@ LUAI_DDEF and LUAI_DDEC are marks for all extern (const) variables, ++** none of which to be exported to outside modules (LUAI_DDEF for ++** definitions and LUAI_DDEC for declarations). ++** CHANGE them if you need to mark them in some special way. Elf/gcc ++** (versions 3.2 and later) mark them as "hidden" to optimize access ++** when Lua is compiled as a shared library. Not all elf targets support ++** this attribute. Unfortunately, gcc does not offer a way to check ++** whether the target offers that support, and those without support ++** give a warning about it. To avoid these warnings, change to the ++** default definition. ++*/ ++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 302) && \ ++ defined(__ELF__) /* { */ ++#define LUAI_FUNC __attribute__((visibility("internal"))) extern ++#else /* }{ */ ++#define LUAI_FUNC extern ++#endif /* } */ ++ ++#define LUAI_DDEC(dec) LUAI_FUNC dec ++#define LUAI_DDEF /* empty */ ++ ++/* }================================================================== */ ++ ++ ++/* ++** {================================================================== ++** Compatibility with previous versions ++** =================================================================== ++*/ ++ ++/* ++@@ LUA_COMPAT_5_3 controls other macros for compatibility with Lua 5.3. ++** You can define it to get all options, or change specific options ++** to fit your specific needs. ++*/ ++#if defined(LUA_COMPAT_5_3) /* { */ ++ ++/* ++@@ LUA_COMPAT_MATHLIB controls the presence of several deprecated ++** functions in the mathematical library. ++** (These functions were already officially removed in 5.3; ++** nevertheless they are still available here.) ++*/ ++#define LUA_COMPAT_MATHLIB ++ ++/* ++@@ LUA_COMPAT_APIINTCASTS controls the presence of macros for ++** manipulating other integer types (lua_pushunsigned, lua_tounsigned, ++** luaL_checkint, luaL_checklong, etc.) ++** (These macros were also officially removed in 5.3, but they are still ++** available here.) ++*/ ++#define LUA_COMPAT_APIINTCASTS ++ ++ ++/* ++@@ LUA_COMPAT_LT_LE controls the emulation of the '__le' metamethod ++** using '__lt'. ++*/ ++#define LUA_COMPAT_LT_LE ++ ++ ++/* ++@@ The following macros supply trivial compatibility for some ++** changes in the API. The macros themselves document how to ++** change your code to avoid using them. ++** (Once more, these macros were officially removed in 5.3, but they are ++** still available here.) ++*/ ++#define lua_strlen(L,i) lua_rawlen(L, (i)) ++ ++#define lua_objlen(L,i) lua_rawlen(L, (i)) ++ ++#define lua_equal(L,idx1,idx2) lua_compare(L,(idx1),(idx2),LUA_OPEQ) ++#define lua_lessthan(L,idx1,idx2) lua_compare(L,(idx1),(idx2),LUA_OPLT) ++ ++#endif /* } */ ++ ++/* }================================================================== */ ++ ++ ++ ++/* ++** {================================================================== ++** Configuration for Numbers (low-level part). ++** Change these definitions if no predefined LUA_FLOAT_* / LUA_INT_* ++** satisfy your needs. ++** =================================================================== ++*/ ++ ++/* ++@@ LUAI_UACNUMBER is the result of a 'default argument promotion' ++@@ over a floating number. ++@@ l_floatatt(x) corrects float attribute 'x' to the proper float type ++** by prefixing it with one of FLT/DBL/LDBL. ++@@ LUA_NUMBER_FRMLEN is the length modifier for writing floats. ++@@ LUA_NUMBER_FMT is the format for writing floats. ++@@ lua_number2str converts a float to a string. ++@@ l_mathop allows the addition of an 'l' or 'f' to all math operations. ++@@ l_floor takes the floor of a float. ++@@ lua_str2number converts a decimal numeral to a number. ++*/ ++ ++ ++/* The following definitions are good for most cases here */ ++ ++#define l_floor(x) (l_mathop(floor)(x)) ++ ++#define lua_number2str(s,sz,n) \ ++ l_sprintf((s), sz, LUA_NUMBER_FMT, (LUAI_UACNUMBER)(n)) ++ ++/* ++@@ lua_numbertointeger converts a float number with an integral value ++** to an integer, or returns 0 if float is not within the range of ++** a lua_Integer. (The range comparisons are tricky because of ++** rounding. The tests here assume a two-complement representation, ++** where MININTEGER always has an exact representation as a float; ++** MAXINTEGER may not have one, and therefore its conversion to float ++** may have an ill-defined value.) ++*/ ++#define lua_numbertointeger(n,p) \ ++ ((n) >= (LUA_NUMBER)(LUA_MININTEGER) && \ ++ (n) < -(LUA_NUMBER)(LUA_MININTEGER) && \ ++ (*(p) = (LUA_INTEGER)(n), 1)) ++ ++ ++/* now the variable definitions */ ++ ++#if LUA_FLOAT_TYPE == LUA_FLOAT_FLOAT /* { single float */ ++ ++#define LUA_NUMBER float ++ ++#define l_floatatt(n) (FLT_##n) ++ ++#define LUAI_UACNUMBER double ++ ++#define LUA_NUMBER_FRMLEN "" ++#define LUA_NUMBER_FMT "%.7g" ++ ++#define l_mathop(op) op##f ++ ++#define lua_str2number(s,p) strtof((s), (p)) ++ ++ ++#elif LUA_FLOAT_TYPE == LUA_FLOAT_LONGDOUBLE /* }{ long double */ ++ ++#define LUA_NUMBER long double ++ ++#define l_floatatt(n) (LDBL_##n) ++ ++#define LUAI_UACNUMBER long double ++ ++#define LUA_NUMBER_FRMLEN "L" ++#define LUA_NUMBER_FMT "%.19Lg" ++ ++#define l_mathop(op) op##l ++ ++#define lua_str2number(s,p) strtold((s), (p)) ++ ++#elif LUA_FLOAT_TYPE == LUA_FLOAT_DOUBLE /* }{ double */ ++ ++#define LUA_NUMBER double ++ ++#define l_floatatt(n) (DBL_##n) ++ ++#define LUAI_UACNUMBER double ++ ++#define LUA_NUMBER_FRMLEN "" ++#define LUA_NUMBER_FMT "%.14g" ++ ++#define l_mathop(op) op ++ ++#define lua_str2number(s,p) strtod((s), (p)) ++ ++#else /* }{ */ ++ ++#error "numeric float type not defined" ++ ++#endif /* } */ ++ ++ ++ ++/* ++@@ LUA_UNSIGNED is the unsigned version of LUA_INTEGER. ++@@ LUAI_UACINT is the result of a 'default argument promotion' ++@@ over a LUA_INTEGER. ++@@ LUA_INTEGER_FRMLEN is the length modifier for reading/writing integers. ++@@ LUA_INTEGER_FMT is the format for writing integers. ++@@ LUA_MAXINTEGER is the maximum value for a LUA_INTEGER. ++@@ LUA_MININTEGER is the minimum value for a LUA_INTEGER. ++@@ LUA_MAXUNSIGNED is the maximum value for a LUA_UNSIGNED. ++@@ lua_integer2str converts an integer to a string. ++*/ ++ ++ ++/* The following definitions are good for most cases here */ ++ ++#define LUA_INTEGER_FMT "%" LUA_INTEGER_FRMLEN "d" ++ ++#define LUAI_UACINT LUA_INTEGER ++ ++#define lua_integer2str(s,sz,n) \ ++ l_sprintf((s), sz, LUA_INTEGER_FMT, (LUAI_UACINT)(n)) ++ ++/* ++** use LUAI_UACINT here to avoid problems with promotions (which ++** can turn a comparison between unsigneds into a signed comparison) ++*/ ++#define LUA_UNSIGNED unsigned LUAI_UACINT ++ ++ ++/* now the variable definitions */ ++ ++#if LUA_INT_TYPE == LUA_INT_INT /* { int */ ++ ++#define LUA_INTEGER int ++#define LUA_INTEGER_FRMLEN "" ++ ++#define LUA_MAXINTEGER INT_MAX ++#define LUA_MININTEGER INT_MIN ++ ++#define LUA_MAXUNSIGNED UINT_MAX ++ ++#elif LUA_INT_TYPE == LUA_INT_LONG /* }{ long */ ++ ++#define LUA_INTEGER long ++#define LUA_INTEGER_FRMLEN "l" ++ ++#define LUA_MAXINTEGER LONG_MAX ++#define LUA_MININTEGER LONG_MIN ++ ++#define LUA_MAXUNSIGNED ULONG_MAX ++ ++#elif LUA_INT_TYPE == LUA_INT_LONGLONG /* }{ long long */ ++ ++/* use presence of macro LLONG_MAX as proxy for C99 compliance */ ++#if defined(LLONG_MAX) /* { */ ++/* use ISO C99 stuff */ ++ ++#define LUA_INTEGER long long ++#define LUA_INTEGER_FRMLEN "ll" ++ ++#define LUA_MAXINTEGER LLONG_MAX ++#define LUA_MININTEGER LLONG_MIN ++ ++#define LUA_MAXUNSIGNED ULLONG_MAX ++ ++#elif defined(LUA_USE_WINDOWS) /* }{ */ ++/* in Windows, can use specific Windows types */ ++ ++#define LUA_INTEGER __int64 ++#define LUA_INTEGER_FRMLEN "I64" ++ ++#define LUA_MAXINTEGER _I64_MAX ++#define LUA_MININTEGER _I64_MIN ++ ++#define LUA_MAXUNSIGNED _UI64_MAX ++ ++#else /* }{ */ ++ ++#error "Compiler does not support 'long long'. Use option '-DLUA_32BITS' \ ++ or '-DLUA_C89_NUMBERS' (see file 'luaconf.h' for details)" ++ ++#endif /* } */ ++ ++#else /* }{ */ ++ ++#error "numeric integer type not defined" ++ ++#endif /* } */ ++ ++/* }================================================================== */ ++ ++ ++/* ++** {================================================================== ++** Dependencies with C99 and other C details ++** =================================================================== ++*/ ++ ++/* ++@@ l_sprintf is equivalent to 'snprintf' or 'sprintf' in C89. ++** (All uses in Lua have only one format item.) ++*/ ++#if !defined(LUA_USE_C89) ++#define l_sprintf(s,sz,f,i) snprintf(s,sz,f,i) ++#else ++#define l_sprintf(s,sz,f,i) ((void)(sz), sprintf(s,f,i)) ++#endif ++ ++ ++/* ++@@ lua_strx2number converts a hexadecimal numeral to a number. ++** In C99, 'strtod' does that conversion. Otherwise, you can ++** leave 'lua_strx2number' undefined and Lua will provide its own ++** implementation. ++*/ ++#if !defined(LUA_USE_C89) ++#define lua_strx2number(s,p) lua_str2number(s,p) ++#endif ++ ++ ++/* ++@@ lua_pointer2str converts a pointer to a readable string in a ++** non-specified way. ++*/ ++#define lua_pointer2str(buff,sz,p) l_sprintf(buff,sz,"%p",p) ++ ++ ++/* ++@@ lua_number2strx converts a float to a hexadecimal numeral. ++** In C99, 'sprintf' (with format specifiers '%a'/'%A') does that. ++** Otherwise, you can leave 'lua_number2strx' undefined and Lua will ++** provide its own implementation. ++*/ ++#if !defined(LUA_USE_C89) ++#define lua_number2strx(L,b,sz,f,n) \ ++ ((void)L, l_sprintf(b,sz,f,(LUAI_UACNUMBER)(n))) ++#endif ++ ++ ++/* ++** 'strtof' and 'opf' variants for math functions are not valid in ++** C89. Otherwise, the macro 'HUGE_VALF' is a good proxy for testing the ++** availability of these variants. ('math.h' is already included in ++** all files that use these macros.) ++*/ ++#if defined(LUA_USE_C89) || (defined(HUGE_VAL) && !defined(HUGE_VALF)) ++#undef l_mathop /* variants not available */ ++#undef lua_str2number ++#define l_mathop(op) (lua_Number)op /* no variant */ ++#define lua_str2number(s,p) ((lua_Number)strtod((s), (p))) ++#endif ++ ++ ++/* ++@@ LUA_KCONTEXT is the type of the context ('ctx') for continuation ++** functions. It must be a numerical type; Lua will use 'intptr_t' if ++** available, otherwise it will use 'ptrdiff_t' (the nearest thing to ++** 'intptr_t' in C89) ++*/ ++#define LUA_KCONTEXT ptrdiff_t ++ ++#if !defined(LUA_USE_C89) && defined(__STDC_VERSION__) && \ ++ __STDC_VERSION__ >= 199901L ++#include <stdint.h> ++#if defined(INTPTR_MAX) /* even in C99 this type is optional */ ++#undef LUA_KCONTEXT ++#define LUA_KCONTEXT intptr_t ++#endif ++#endif ++ ++ ++/* ++@@ lua_getlocaledecpoint gets the locale "radix character" (decimal point). ++** Change that if you do not want to use C locales. (Code using this ++** macro must include the header 'locale.h'.) ++*/ ++#if !defined(lua_getlocaledecpoint) ++#define lua_getlocaledecpoint() (localeconv()->decimal_point[0]) ++#endif ++ ++ ++/* ++** macros to improve jump prediction, used mostly for error handling ++** and debug facilities. (Some macros in the Lua API use these macros. ++** Define LUA_NOBUILTIN if you do not want '__builtin_expect' in your ++** code.) ++*/ ++#if !defined(luai_likely) ++ ++#if defined(__GNUC__) && !defined(LUA_NOBUILTIN) ++#define luai_likely(x) (__builtin_expect(((x) != 0), 1)) ++#define luai_unlikely(x) (__builtin_expect(((x) != 0), 0)) ++#else ++#define luai_likely(x) (x) ++#define luai_unlikely(x) (x) ++#endif ++ ++#endif ++ ++ ++#if defined(LUA_CORE) || defined(LUA_LIB) ++/* shorter names for Lua's own use */ ++#define l_likely(x) luai_likely(x) ++#define l_unlikely(x) luai_unlikely(x) ++#endif ++ ++ ++ ++/* }================================================================== */ ++ ++ ++/* ++** {================================================================== ++** Language Variations ++** ===================================================================== ++*/ ++ ++/* ++@@ LUA_NOCVTN2S/LUA_NOCVTS2N control how Lua performs some ++** coercions. Define LUA_NOCVTN2S to turn off automatic coercion from ++** numbers to strings. Define LUA_NOCVTS2N to turn off automatic ++** coercion from strings to numbers. ++*/ ++/* #define LUA_NOCVTN2S */ ++/* #define LUA_NOCVTS2N */ ++ ++ ++/* ++@@ LUA_USE_APICHECK turns on several consistency checks on the C API. ++** Define it as a help when debugging C code. ++*/ ++#if defined(LUA_USE_APICHECK) ++#include <assert.h> ++#define luai_apicheck(l,e) assert(e) ++#endif ++ ++/* }================================================================== */ ++ ++ ++/* ++** {================================================================== ++** Macros that affect the API and must be stable (that is, must be the ++** same when you compile Lua and when you compile code that links to ++** Lua). ++** ===================================================================== ++*/ ++ ++/* ++@@ LUAI_MAXSTACK limits the size of the Lua stack. ++** CHANGE it if you need a different limit. This limit is arbitrary; ++** its only purpose is to stop Lua from consuming unlimited stack ++** space (and to reserve some numbers for pseudo-indices). ++** (It must fit into max(size_t)/32.) ++*/ ++#if LUAI_IS32INT ++#define LUAI_MAXSTACK 1000000 ++#else ++#define LUAI_MAXSTACK 15000 ++#endif ++ ++ ++/* ++@@ LUA_EXTRASPACE defines the size of a raw memory area associated with ++** a Lua state with very fast access. ++** CHANGE it if you need a different size. ++*/ ++#define LUA_EXTRASPACE (sizeof(void *)) ++ ++ ++/* ++@@ LUA_IDSIZE gives the maximum size for the description of the source ++@@ of a function in debug information. ++** CHANGE it if you want a different size. ++*/ ++#define LUA_IDSIZE 60 ++ ++ ++/* ++@@ LUAL_BUFFERSIZE is the buffer size used by the lauxlib buffer system. ++*/ ++#define LUAL_BUFFERSIZE ((int)(16 * sizeof(void*) * sizeof(lua_Number))) ++ ++ ++/* ++@@ LUAI_MAXALIGN defines fields that, when used in a union, ensure ++** maximum alignment for the other items in that union. ++*/ ++#define LUAI_MAXALIGN lua_Number n; double u; void *s; lua_Integer i; long l ++ ++/* }================================================================== */ ++ ++ ++ ++ ++ ++/* =================================================================== */ ++ ++/* ++** Local configuration. You can use this space to add your redefinitions ++** without modifying the main part of the file. ++*/ ++ ++ ++ ++ ++ ++#endif ++ +diff -Nur lua-5.4.4-old/src/luaconf.h.template.in.orig lua-5.4.4/src/luaconf.h.template.in.orig +--- lua-5.4.4-old/src/luaconf.h.template.in.orig 1970-01-01 00:00:00.000000000 +0000 ++++ lua-5.4.4/src/luaconf.h.template.in.orig 2022-01-13 11:24:43.000000000 +0000 +@@ -0,0 +1,786 @@ ++/* ++** $Id: luaconf.h $ ++** Configuration file for Lua ++** See Copyright Notice in lua.h ++*/ ++ ++ ++#ifndef luaconf_h ++#define luaconf_h ++ ++#include <limits.h> ++#include <stddef.h> ++ ++ ++/* ++** =================================================================== ++** General Configuration File for Lua ++** ++** Some definitions here can be changed externally, through the compiler ++** (e.g., with '-D' options): They are commented out or protected ++** by '#if !defined' guards. However, several other definitions ++** should be changed directly here, either because they affect the ++** Lua ABI (by making the changes here, you ensure that all software ++** connected to Lua, such as C libraries, will be compiled with the same ++** configuration); or because they are seldom changed. ++** ++** Search for "@@" to find all configurable definitions. ++** =================================================================== ++*/ ++ ++ ++/* ++** {==================================================================== ++** System Configuration: macros to adapt (if needed) Lua to some ++** particular platform, for instance restricting it to C89. ++** ===================================================================== ++*/ ++ ++/* ++@@ LUA_USE_C89 controls the use of non-ISO-C89 features. ++** Define it if you want Lua to avoid the use of a few C99 features ++** or Windows-specific features on Windows. ++*/ ++/* #define LUA_USE_C89 */ ++ ++ ++/* ++** By default, Lua on Windows use (some) specific Windows features ++*/ ++#if !defined(LUA_USE_C89) && defined(_WIN32) && !defined(_WIN32_WCE) ++#define LUA_USE_WINDOWS /* enable goodies for regular Windows */ ++#endif ++ ++ ++#if defined(LUA_USE_WINDOWS) ++#define LUA_DL_DLL /* enable support for DLL */ ++#define LUA_USE_C89 /* broadly, Windows is C89 */ ++#endif ++ ++ ++#if defined(LUA_USE_LINUX) ++#define LUA_USE_POSIX ++#define LUA_USE_DLOPEN /* needs an extra library: -ldl */ ++#endif ++ ++ ++#if defined(LUA_USE_MACOSX) ++#define LUA_USE_POSIX ++#define LUA_USE_DLOPEN /* MacOS does not need -ldl */ ++#endif ++ ++ ++/* ++@@ LUAI_IS32INT is true iff 'int' has (at least) 32 bits. ++*/ ++#define LUAI_IS32INT ((UINT_MAX >> 30) >= 3) ++ ++/* }================================================================== */ ++ ++ ++ ++/* ++** {================================================================== ++** Configuration for Number types. These options should not be ++** set externally, because any other code connected to Lua must ++** use the same configuration. ++** =================================================================== ++*/ ++ ++/* ++@@ LUA_INT_TYPE defines the type for Lua integers. ++@@ LUA_FLOAT_TYPE defines the type for Lua floats. ++** Lua should work fine with any mix of these options supported ++** by your C compiler. The usual configurations are 64-bit integers ++** and 'double' (the default), 32-bit integers and 'float' (for ++** restricted platforms), and 'long'/'double' (for C compilers not ++** compliant with C99, which may not have support for 'long long'). ++*/ ++ ++/* predefined options for LUA_INT_TYPE */ ++#define LUA_INT_INT 1 ++#define LUA_INT_LONG 2 ++#define LUA_INT_LONGLONG 3 ++ ++/* predefined options for LUA_FLOAT_TYPE */ ++#define LUA_FLOAT_FLOAT 1 ++#define LUA_FLOAT_DOUBLE 2 ++#define LUA_FLOAT_LONGDOUBLE 3 ++ ++ ++/* Default configuration ('long long' and 'double', for 64-bit Lua) */ ++#define LUA_INT_DEFAULT LUA_INT_LONGLONG ++#define LUA_FLOAT_DEFAULT LUA_FLOAT_DOUBLE ++ ++ ++/* ++@@ LUA_32BITS enables Lua with 32-bit integers and 32-bit floats. ++*/ ++#define LUA_32BITS 0 ++ ++ ++/* ++@@ LUA_C89_NUMBERS ensures that Lua uses the largest types available for ++** C89 ('long' and 'double'); Windows always has '__int64', so it does ++** not need to use this case. ++*/ ++#if defined(LUA_USE_C89) && !defined(LUA_USE_WINDOWS) ++#define LUA_C89_NUMBERS 1 ++#else ++#define LUA_C89_NUMBERS 0 ++#endif ++ ++ ++#if LUA_32BITS /* { */ ++/* ++** 32-bit integers and 'float' ++*/ ++#if LUAI_IS32INT /* use 'int' if big enough */ ++#define LUA_INT_TYPE LUA_INT_INT ++#else /* otherwise use 'long' */ ++#define LUA_INT_TYPE LUA_INT_LONG ++#endif ++#define LUA_FLOAT_TYPE LUA_FLOAT_FLOAT ++ ++#elif LUA_C89_NUMBERS /* }{ */ ++/* ++** largest types available for C89 ('long' and 'double') ++*/ ++#define LUA_INT_TYPE LUA_INT_LONG ++#define LUA_FLOAT_TYPE LUA_FLOAT_DOUBLE ++ ++#else /* }{ */ ++/* use defaults */ ++ ++#define LUA_INT_TYPE LUA_INT_DEFAULT ++#define LUA_FLOAT_TYPE LUA_FLOAT_DEFAULT ++ ++#endif /* } */ ++ ++ ++/* }================================================================== */ ++ ++ ++ ++/* ++** {================================================================== ++** Configuration for Paths. ++** =================================================================== ++*/ ++ ++/* ++** LUA_PATH_SEP is the character that separates templates in a path. ++** LUA_PATH_MARK is the string that marks the substitution points in a ++** template. ++** LUA_EXEC_DIR in a Windows path is replaced by the executable's ++** directory. ++*/ ++#define LUA_PATH_SEP ";" ++#define LUA_PATH_MARK "?" ++#define LUA_EXEC_DIR "!" ++ ++ ++/* ++@@ LUA_PATH_DEFAULT is the default path that Lua uses to look for ++** Lua libraries. ++@@ LUA_CPATH_DEFAULT is the default path that Lua uses to look for ++** C libraries. ++** CHANGE them if your machine has a non-conventional directory ++** hierarchy or if you want to install your libraries in ++** non-conventional directories. ++*/ ++ ++#define LUA_VDIR LUA_VERSION_MAJOR "." LUA_VERSION_MINOR ++#if defined(_WIN32) /* { */ ++/* ++** In Windows, any exclamation mark ('!') in the path is replaced by the ++** path of the directory of the executable file of the current process. ++*/ ++#define LUA_LDIR "!\lua\" ++#define LUA_CDIR "!\" ++#define LUA_SHRDIR "!\..\share\lua\" LUA_VDIR "\" ++ ++#if !defined(LUA_PATH_DEFAULT) ++#define LUA_PATH_DEFAULT \ ++ LUA_LDIR"?.lua;" LUA_LDIR"?\init.lua;" \ ++ LUA_CDIR"?.lua;" LUA_CDIR"?\init.lua;" \ ++ LUA_SHRDIR"?.lua;" LUA_SHRDIR"?\init.lua;" \ ++ ".\?.lua;" ".\?\init.lua" ++#endif ++ ++#if !defined(LUA_CPATH_DEFAULT) ++#define LUA_CPATH_DEFAULT \ ++ LUA_CDIR"?.dll;" \ ++ LUA_CDIR"..\lib\lua\" LUA_VDIR "\?.dll;" \ ++ LUA_CDIR"loadall.dll;" ".\?.dll" ++#endif ++ ++#else /* }{ */ ++ ++#define LUA_ROOT "/usr/local/" ++#define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR "/" ++#define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR "/" ++ ++#if !defined(LUA_PATH_DEFAULT) ++#define LUA_PATH_DEFAULT \ ++ LUA_LDIR"?.lua;" LUA_LDIR"?/init.lua;" \ ++ LUA_CDIR"?.lua;" LUA_CDIR"?/init.lua;" \ ++ "./?.lua;" "./?/init.lua" ++#endif ++ ++#if !defined(LUA_CPATH_DEFAULT) ++#define LUA_CPATH_DEFAULT \ ++ LUA_CDIR"?.so;" LUA_CDIR"loadall.so;" "./?.so" ++#endif ++ ++#endif /* } */ ++ ++ ++/* ++@@ LUA_DIRSEP is the directory separator (for submodules). ++** CHANGE it if your machine does not use "/" as the directory separator ++** and is not Windows. (On Windows Lua automatically uses "".) ++*/ ++#if !defined(LUA_DIRSEP) ++ ++#if defined(_WIN32) ++#define LUA_DIRSEP "\" ++#else ++#define LUA_DIRSEP "/" ++#endif ++ ++#endif ++ ++/* }================================================================== */ ++ ++ ++/* ++** {================================================================== ++** Marks for exported symbols in the C code ++** =================================================================== ++*/ ++ ++/* ++@@ LUA_API is a mark for all core API functions. ++@@ LUALIB_API is a mark for all auxiliary library functions. ++@@ LUAMOD_API is a mark for all standard library opening functions. ++** CHANGE them if you need to define those functions in some special way. ++** For instance, if you want to create one Windows DLL with the core and ++** the libraries, you may want to use the following definition (define ++** LUA_BUILD_AS_DLL to get it). ++*/ ++#if defined(LUA_BUILD_AS_DLL) /* { */ ++ ++#if defined(LUA_CORE) || defined(LUA_LIB) /* { */ ++#define LUA_API __declspec(dllexport) ++#else /* }{ */ ++#define LUA_API __declspec(dllimport) ++#endif /* } */ ++ ++#else /* }{ */ ++ ++#define LUA_API extern ++ ++#endif /* } */ ++ ++ ++/* ++** More often than not the libs go together with the core. ++*/ ++#define LUALIB_API LUA_API ++#define LUAMOD_API LUA_API ++ ++ ++/* ++@@ LUAI_FUNC is a mark for all extern functions that are not to be ++** exported to outside modules. ++@@ LUAI_DDEF and LUAI_DDEC are marks for all extern (const) variables, ++** none of which to be exported to outside modules (LUAI_DDEF for ++** definitions and LUAI_DDEC for declarations). ++** CHANGE them if you need to mark them in some special way. Elf/gcc ++** (versions 3.2 and later) mark them as "hidden" to optimize access ++** when Lua is compiled as a shared library. Not all elf targets support ++** this attribute. Unfortunately, gcc does not offer a way to check ++** whether the target offers that support, and those without support ++** give a warning about it. To avoid these warnings, change to the ++** default definition. ++*/ ++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 302) && \ ++ defined(__ELF__) /* { */ ++#define LUAI_FUNC __attribute__((visibility("internal"))) extern ++#else /* }{ */ ++#define LUAI_FUNC extern ++#endif /* } */ ++ ++#define LUAI_DDEC(dec) LUAI_FUNC dec ++#define LUAI_DDEF /* empty */ ++ ++/* }================================================================== */ ++ ++ ++/* ++** {================================================================== ++** Compatibility with previous versions ++** =================================================================== ++*/ ++ ++/* ++@@ LUA_COMPAT_5_3 controls other macros for compatibility with Lua 5.3. ++** You can define it to get all options, or change specific options ++** to fit your specific needs. ++*/ ++#if defined(LUA_COMPAT_5_3) /* { */ ++ ++/* ++@@ LUA_COMPAT_MATHLIB controls the presence of several deprecated ++** functions in the mathematical library. ++** (These functions were already officially removed in 5.3; ++** nevertheless they are still available here.) ++*/ ++#define LUA_COMPAT_MATHLIB ++ ++/* ++@@ LUA_COMPAT_APIINTCASTS controls the presence of macros for ++** manipulating other integer types (lua_pushunsigned, lua_tounsigned, ++** luaL_checkint, luaL_checklong, etc.) ++** (These macros were also officially removed in 5.3, but they are still ++** available here.) ++*/ ++#define LUA_COMPAT_APIINTCASTS ++ ++ ++/* ++@@ LUA_COMPAT_LT_LE controls the emulation of the '__le' metamethod ++** using '__lt'. ++*/ ++#define LUA_COMPAT_LT_LE ++ ++ ++/* ++@@ The following macros supply trivial compatibility for some ++** changes in the API. The macros themselves document how to ++** change your code to avoid using them. ++** (Once more, these macros were officially removed in 5.3, but they are ++** still available here.) ++*/ ++#define lua_strlen(L,i) lua_rawlen(L, (i)) ++ ++#define lua_objlen(L,i) lua_rawlen(L, (i)) ++ ++#define lua_equal(L,idx1,idx2) lua_compare(L,(idx1),(idx2),LUA_OPEQ) ++#define lua_lessthan(L,idx1,idx2) lua_compare(L,(idx1),(idx2),LUA_OPLT) ++ ++#endif /* } */ ++ ++/* }================================================================== */ ++ ++ ++ ++/* ++** {================================================================== ++** Configuration for Numbers (low-level part). ++** Change these definitions if no predefined LUA_FLOAT_* / LUA_INT_* ++** satisfy your needs. ++** =================================================================== ++*/ ++ ++/* ++@@ LUAI_UACNUMBER is the result of a 'default argument promotion' ++@@ over a floating number. ++@@ l_floatatt(x) corrects float attribute 'x' to the proper float type ++** by prefixing it with one of FLT/DBL/LDBL. ++@@ LUA_NUMBER_FRMLEN is the length modifier for writing floats. ++@@ LUA_NUMBER_FMT is the format for writing floats. ++@@ lua_number2str converts a float to a string. ++@@ l_mathop allows the addition of an 'l' or 'f' to all math operations. ++@@ l_floor takes the floor of a float. ++@@ lua_str2number converts a decimal numeral to a number. ++*/ ++ ++ ++/* The following definitions are good for most cases here */ ++ ++#define l_floor(x) (l_mathop(floor)(x)) ++ ++#define lua_number2str(s,sz,n) \ ++ l_sprintf((s), sz, LUA_NUMBER_FMT, (LUAI_UACNUMBER)(n)) ++ ++/* ++@@ lua_numbertointeger converts a float number with an integral value ++** to an integer, or returns 0 if float is not within the range of ++** a lua_Integer. (The range comparisons are tricky because of ++** rounding. The tests here assume a two-complement representation, ++** where MININTEGER always has an exact representation as a float; ++** MAXINTEGER may not have one, and therefore its conversion to float ++** may have an ill-defined value.) ++*/ ++#define lua_numbertointeger(n,p) \ ++ ((n) >= (LUA_NUMBER)(LUA_MININTEGER) && \ ++ (n) < -(LUA_NUMBER)(LUA_MININTEGER) && \ ++ (*(p) = (LUA_INTEGER)(n), 1)) ++ ++ ++/* now the variable definitions */ ++ ++#if LUA_FLOAT_TYPE == LUA_FLOAT_FLOAT /* { single float */ ++ ++#define LUA_NUMBER float ++ ++#define l_floatatt(n) (FLT_##n) ++ ++#define LUAI_UACNUMBER double ++ ++#define LUA_NUMBER_FRMLEN "" ++#define LUA_NUMBER_FMT "%.7g" ++ ++#define l_mathop(op) op##f ++ ++#define lua_str2number(s,p) strtof((s), (p)) ++ ++ ++#elif LUA_FLOAT_TYPE == LUA_FLOAT_LONGDOUBLE /* }{ long double */ ++ ++#define LUA_NUMBER long double ++ ++#define l_floatatt(n) (LDBL_##n) ++ ++#define LUAI_UACNUMBER long double ++ ++#define LUA_NUMBER_FRMLEN "L" ++#define LUA_NUMBER_FMT "%.19Lg" ++ ++#define l_mathop(op) op##l ++ ++#define lua_str2number(s,p) strtold((s), (p)) ++ ++#elif LUA_FLOAT_TYPE == LUA_FLOAT_DOUBLE /* }{ double */ ++ ++#define LUA_NUMBER double ++ ++#define l_floatatt(n) (DBL_##n) ++ ++#define LUAI_UACNUMBER double ++ ++#define LUA_NUMBER_FRMLEN "" ++#define LUA_NUMBER_FMT "%.14g" ++ ++#define l_mathop(op) op ++ ++#define lua_str2number(s,p) strtod((s), (p)) ++ ++#else /* }{ */ ++ ++#error "numeric float type not defined" ++ ++#endif /* } */ ++ ++ ++ ++/* ++@@ LUA_UNSIGNED is the unsigned version of LUA_INTEGER. ++@@ LUAI_UACINT is the result of a 'default argument promotion' ++@@ over a LUA_INTEGER. ++@@ LUA_INTEGER_FRMLEN is the length modifier for reading/writing integers. ++@@ LUA_INTEGER_FMT is the format for writing integers. ++@@ LUA_MAXINTEGER is the maximum value for a LUA_INTEGER. ++@@ LUA_MININTEGER is the minimum value for a LUA_INTEGER. ++@@ LUA_MAXUNSIGNED is the maximum value for a LUA_UNSIGNED. ++@@ lua_integer2str converts an integer to a string. ++*/ ++ ++ ++/* The following definitions are good for most cases here */ ++ ++#define LUA_INTEGER_FMT "%" LUA_INTEGER_FRMLEN "d" ++ ++#define LUAI_UACINT LUA_INTEGER ++ ++#define lua_integer2str(s,sz,n) \ ++ l_sprintf((s), sz, LUA_INTEGER_FMT, (LUAI_UACINT)(n)) ++ ++/* ++** use LUAI_UACINT here to avoid problems with promotions (which ++** can turn a comparison between unsigneds into a signed comparison) ++*/ ++#define LUA_UNSIGNED unsigned LUAI_UACINT ++ ++ ++/* now the variable definitions */ ++ ++#if LUA_INT_TYPE == LUA_INT_INT /* { int */ ++ ++#define LUA_INTEGER int ++#define LUA_INTEGER_FRMLEN "" ++ ++#define LUA_MAXINTEGER INT_MAX ++#define LUA_MININTEGER INT_MIN ++ ++#define LUA_MAXUNSIGNED UINT_MAX ++ ++#elif LUA_INT_TYPE == LUA_INT_LONG /* }{ long */ ++ ++#define LUA_INTEGER long ++#define LUA_INTEGER_FRMLEN "l" ++ ++#define LUA_MAXINTEGER LONG_MAX ++#define LUA_MININTEGER LONG_MIN ++ ++#define LUA_MAXUNSIGNED ULONG_MAX ++ ++#elif LUA_INT_TYPE == LUA_INT_LONGLONG /* }{ long long */ ++ ++/* use presence of macro LLONG_MAX as proxy for C99 compliance */ ++#if defined(LLONG_MAX) /* { */ ++/* use ISO C99 stuff */ ++ ++#define LUA_INTEGER long long ++#define LUA_INTEGER_FRMLEN "ll" ++ ++#define LUA_MAXINTEGER LLONG_MAX ++#define LUA_MININTEGER LLONG_MIN ++ ++#define LUA_MAXUNSIGNED ULLONG_MAX ++ ++#elif defined(LUA_USE_WINDOWS) /* }{ */ ++/* in Windows, can use specific Windows types */ ++ ++#define LUA_INTEGER __int64 ++#define LUA_INTEGER_FRMLEN "I64" ++ ++#define LUA_MAXINTEGER _I64_MAX ++#define LUA_MININTEGER _I64_MIN ++ ++#define LUA_MAXUNSIGNED _UI64_MAX ++ ++#else /* }{ */ ++ ++#error "Compiler does not support 'long long'. Use option '-DLUA_32BITS' \ ++ or '-DLUA_C89_NUMBERS' (see file 'luaconf.h' for details)" ++ ++#endif /* } */ ++ ++#else /* }{ */ ++ ++#error "numeric integer type not defined" ++ ++#endif /* } */ ++ ++/* }================================================================== */ ++ ++ ++/* ++** {================================================================== ++** Dependencies with C99 and other C details ++** =================================================================== ++*/ ++ ++/* ++@@ l_sprintf is equivalent to 'snprintf' or 'sprintf' in C89. ++** (All uses in Lua have only one format item.) ++*/ ++#if !defined(LUA_USE_C89) ++#define l_sprintf(s,sz,f,i) snprintf(s,sz,f,i) ++#else ++#define l_sprintf(s,sz,f,i) ((void)(sz), sprintf(s,f,i)) ++#endif ++ ++ ++/* ++@@ lua_strx2number converts a hexadecimal numeral to a number. ++** In C99, 'strtod' does that conversion. Otherwise, you can ++** leave 'lua_strx2number' undefined and Lua will provide its own ++** implementation. ++*/ ++#if !defined(LUA_USE_C89) ++#define lua_strx2number(s,p) lua_str2number(s,p) ++#endif ++ ++ ++/* ++@@ lua_pointer2str converts a pointer to a readable string in a ++** non-specified way. ++*/ ++#define lua_pointer2str(buff,sz,p) l_sprintf(buff,sz,"%p",p) ++ ++ ++/* ++@@ lua_number2strx converts a float to a hexadecimal numeral. ++** In C99, 'sprintf' (with format specifiers '%a'/'%A') does that. ++** Otherwise, you can leave 'lua_number2strx' undefined and Lua will ++** provide its own implementation. ++*/ ++#if !defined(LUA_USE_C89) ++#define lua_number2strx(L,b,sz,f,n) \ ++ ((void)L, l_sprintf(b,sz,f,(LUAI_UACNUMBER)(n))) ++#endif ++ ++ ++/* ++** 'strtof' and 'opf' variants for math functions are not valid in ++** C89. Otherwise, the macro 'HUGE_VALF' is a good proxy for testing the ++** availability of these variants. ('math.h' is already included in ++** all files that use these macros.) ++*/ ++#if defined(LUA_USE_C89) || (defined(HUGE_VAL) && !defined(HUGE_VALF)) ++#undef l_mathop /* variants not available */ ++#undef lua_str2number ++#define l_mathop(op) (lua_Number)op /* no variant */ ++#define lua_str2number(s,p) ((lua_Number)strtod((s), (p))) ++#endif ++ ++ ++/* ++@@ LUA_KCONTEXT is the type of the context ('ctx') for continuation ++** functions. It must be a numerical type; Lua will use 'intptr_t' if ++** available, otherwise it will use 'ptrdiff_t' (the nearest thing to ++** 'intptr_t' in C89) ++*/ ++#define LUA_KCONTEXT ptrdiff_t ++ ++#if !defined(LUA_USE_C89) && defined(__STDC_VERSION__) && \ ++ __STDC_VERSION__ >= 199901L ++#include <stdint.h> ++#if defined(INTPTR_MAX) /* even in C99 this type is optional */ ++#undef LUA_KCONTEXT ++#define LUA_KCONTEXT intptr_t ++#endif ++#endif ++ ++ ++/* ++@@ lua_getlocaledecpoint gets the locale "radix character" (decimal point). ++** Change that if you do not want to use C locales. (Code using this ++** macro must include the header 'locale.h'.) ++*/ ++#if !defined(lua_getlocaledecpoint) ++#define lua_getlocaledecpoint() (localeconv()->decimal_point[0]) ++#endif ++ ++ ++/* ++** macros to improve jump prediction, used mostly for error handling ++** and debug facilities. (Some macros in the Lua API use these macros. ++** Define LUA_NOBUILTIN if you do not want '__builtin_expect' in your ++** code.) ++*/ ++#if !defined(luai_likely) ++ ++#if defined(__GNUC__) && !defined(LUA_NOBUILTIN) ++#define luai_likely(x) (__builtin_expect(((x) != 0), 1)) ++#define luai_unlikely(x) (__builtin_expect(((x) != 0), 0)) ++#else ++#define luai_likely(x) (x) ++#define luai_unlikely(x) (x) ++#endif ++ ++#endif ++ ++ ++#if defined(LUA_CORE) || defined(LUA_LIB) ++/* shorter names for Lua's own use */ ++#define l_likely(x) luai_likely(x) ++#define l_unlikely(x) luai_unlikely(x) ++#endif ++ ++ ++ ++/* }================================================================== */ ++ ++ ++/* ++** {================================================================== ++** Language Variations ++** ===================================================================== ++*/ ++ ++/* ++@@ LUA_NOCVTN2S/LUA_NOCVTS2N control how Lua performs some ++** coercions. Define LUA_NOCVTN2S to turn off automatic coercion from ++** numbers to strings. Define LUA_NOCVTS2N to turn off automatic ++** coercion from strings to numbers. ++*/ ++/* #define LUA_NOCVTN2S */ ++/* #define LUA_NOCVTS2N */ ++ ++ ++/* ++@@ LUA_USE_APICHECK turns on several consistency checks on the C API. ++** Define it as a help when debugging C code. ++*/ ++#if defined(LUA_USE_APICHECK) ++#include <assert.h> ++#define luai_apicheck(l,e) assert(e) ++#endif ++ ++/* }================================================================== */ ++ ++ ++/* ++** {================================================================== ++** Macros that affect the API and must be stable (that is, must be the ++** same when you compile Lua and when you compile code that links to ++** Lua). ++** ===================================================================== ++*/ ++ ++/* ++@@ LUAI_MAXSTACK limits the size of the Lua stack. ++** CHANGE it if you need a different limit. This limit is arbitrary; ++** its only purpose is to stop Lua from consuming unlimited stack ++** space (and to reserve some numbers for pseudo-indices). ++** (It must fit into max(size_t)/32.) ++*/ ++#if LUAI_IS32INT ++#define LUAI_MAXSTACK 1000000 ++#else ++#define LUAI_MAXSTACK 15000 ++#endif ++ ++ ++/* ++@@ LUA_EXTRASPACE defines the size of a raw memory area associated with ++** a Lua state with very fast access. ++** CHANGE it if you need a different size. ++*/ ++#define LUA_EXTRASPACE (sizeof(void *)) ++ ++ ++/* ++@@ LUA_IDSIZE gives the maximum size for the description of the source ++@@ of a function in debug information. ++** CHANGE it if you want a different size. ++*/ ++#define LUA_IDSIZE 60 ++ ++ ++/* ++@@ LUAL_BUFFERSIZE is the buffer size used by the lauxlib buffer system. ++*/ ++#define LUAL_BUFFERSIZE ((int)(16 * sizeof(void*) * sizeof(lua_Number))) ++ ++ ++/* ++@@ LUAI_MAXALIGN defines fields that, when used in a union, ensure ++** maximum alignment for the other items in that union. ++*/ ++#define LUAI_MAXALIGN lua_Number n; double u; void *s; lua_Integer i; long l ++ ++/* }================================================================== */ ++ ++ ++ ++ ++ ++/* =================================================================== */ ++ ++/* ++** Local configuration. You can use this space to add your redefinitions ++** without modifying the main part of the file. ++*/ ++ ++ ++ ++ ++ ++#endif ++ +diff -Nur lua-5.4.4-old/src/lua.pc.in lua-5.4.4/src/lua.pc.in +--- lua-5.4.4-old/src/lua.pc.in 1970-01-01 00:00:00.000000000 +0000 ++++ lua-5.4.4/src/lua.pc.in 2023-01-08 14:49:48.718984708 +0000 +@@ -0,0 +1,13 @@ ++V= @MAJOR_VERSION@ ++R= @VERSION@ ++prefix= @prefix@ ++exec_prefix=${prefix} ++libdir= @libdir@ ++includedir=${prefix}/include ++ ++Name: Lua ++Description: An Extensible Extension Language ++Version: ${R} ++Requires: ++Libs: -llua @LUA_LIBS@ ++Cflags: -I${includedir} +diff -Nur lua-5.4.4-old/src/Makefile.am lua-5.4.4/src/Makefile.am +--- lua-5.4.4-old/src/Makefile.am 1970-01-01 00:00:00.000000000 +0000 ++++ lua-5.4.4/src/Makefile.am 2023-01-08 14:49:48.718984708 +0000 +@@ -0,0 +1,46 @@ ++AM_CFLAGS = -Wall ++ ++include_HEADERS = lua.h lualib.h lauxlib.h lua.hpp ++ ++nodist_include_HEADERS = luaconf.h ++ ++lib_LTLIBRARIES = liblua.la ++liblua_la_LDFLAGS = -release @MAJOR_VERSION@ ++liblua_la_SOURCES = \ ++ lapi.c lauxlib.c lbaselib.c lcode.c lcorolib.c lctype.c ldblib.c \ ++ ldebug.c ldo.c ldump.c lfunc.c lgc.c linit.c liolib.c llex.c lmathlib.c lmem.c \ ++ loadlib.c lobject.c lopcodes.c loslib.c lparser.c lstate.c lstring.c lstrlib.c \ ++ ltable.c ltablib.c ltm.c lundump.c lutf8lib.c lvm.c lzio.c \ ++ lapi.h lcode.h lctype.h ldebug.h ldo.h lfunc.h lgc.h llex.h llimits.h \ ++ lmem.h lobject.h lopcodes.h lparser.h lstate.h lstring.h ltable.h ltm.h \ ++ lundump.h lvm.h lzio.h ++ ++pkgconfigdir = $(libdir)/pkgconfig ++pkgconfig_DATA = lua.pc ++ ++bin_PROGRAMS = lua luac ++ ++lua_SOURCES = lua.c ++lua_LDADD = liblua.la @LUA_LIBS@ @READLINE_LIBS@ ++lua_DEPENDENCIES = liblua.la ++ ++luac_SOURCES = luac.c ++# Statically link liblua against luac since luac uses symbols not exported in liblua ++luac_LDADD = .libs/liblua.a @LUA_LIBS@ ++luac_DEPENDENCIES = liblua.la ++ ++EXTRA_DIST = luaconf.h.template ++BUILT_SOURCES = luaconf.h ++CLEANFILES = luaconf.h luaconf.h.template ++ ++readline_defs = @READLINE_DEFS@ ++ ++edit = sed \ ++ -e 's,%prefix%,$(prefix),g' \ ++ -e 's,%lua_datadir%,$(datadir),g' \ ++ -e 's,%lua_libdir%,$(libdir),g' ++ ++luaconf.h : luaconf.h.template ++ rm -f $@ $@.tmp ++ $(edit) $< >$@.tmp ++ mv $@.tmp $@ diff --git a/lua/patches/lua-5.4.4-configure-compat-module.patch b/lua/patches/lua-5.4.4-configure-compat-module.patch new file mode 100644 index 000000000..80bb04761 --- /dev/null +++ b/lua/patches/lua-5.4.4-configure-compat-module.patch @@ -0,0 +1,34 @@ +diff -up lua-5.2.2/configure.ac.compat-module lua-5.2.2/configure.ac +--- lua-5.2.2/configure.ac.compat-module 2013-05-10 10:16:05.344137597 -0400 ++++ lua-5.2.2/configure.ac 2013-05-10 10:16:05.357137596 -0400 +@@ -11,6 +11,19 @@ AC_PROG_CC + AC_PROG_LIBTOOL + + AC_ARG_WITH( ++ [compat-module], ++ [AC_HELP_STRING([--with-compat-module], [Enable LUA_COMPAT_MODULE functions [default=no]])], ++ [use_compat_module=$withval], ++ [use_compat_module=no] ++) ++ ++COMPAT_DEFS="#undef LUA_COMPAT_ALL" ++if test "x$use_compat_module" == "xyes"; then ++ COMPAT_DEFS="#define LUA_COMPAT_ALL" ++fi ++AC_SUBST(COMPAT_DEFS) ++ ++AC_ARG_WITH( + [readline], + [AC_HELP_STRING([--with-readline], [Use readline for interpreter input [default=yes]])], + [use_readline=$withval], +diff -up lua-5.2.2/src/luaconf.h.template.in.compat-module lua-5.2.2/src/luaconf.h.template.in +--- lua-5.2.2/src/luaconf.h.template.in.compat-module 2013-05-10 10:25:42.586116963 -0400 ++++ lua-5.2.2/src/luaconf.h.template.in 2013-05-10 10:26:29.957115269 -0400 +@@ -15,6 +15,7 @@ + @LUA_DL_DEFS@ + @LUA_BUILD_AS_DLL_DEFS@ + @READLINE_DEFS@ ++@COMPAT_DEFS@ + + + /* diff --git a/lua/patches/lua-5.4.4-configure-linux.patch b/lua/patches/lua-5.4.4-configure-linux.patch new file mode 100644 index 000000000..735386a43 --- /dev/null +++ b/lua/patches/lua-5.4.4-configure-linux.patch @@ -0,0 +1,22 @@ +diff -up lua-5.2.2/configure.ac.linux lua-5.2.2/configure.ac +--- lua-5.2.2/configure.ac.linux 2013-05-10 15:42:27.269437631 -0400 ++++ lua-5.2.2/configure.ac 2013-05-10 15:43:23.530435620 -0400 +@@ -50,6 +50,7 @@ AC_SUBST(READLINE_LIBS) + case "$host" in + *-mingw*) use_os=win32 ;; + *-darwin*) use_os=macosx ;; ++ *-linux*) use_os=linux ;; + *) use_os=posix ;; + esac + +@@ -62,6 +63,10 @@ if test "x$use_os" == "xwin32"; then + elif test "x$use_os" == "xmacosx"; then + POSIX_DEFS="#define LUA_USE_POSIX" + LUA_DL_DEFS="#define LUA_DL_DYLD" ++elif test "x$use_os" == "xlinux"; then ++ POSIX_DEFS="#define LUA_USE_LINUX" ++ LUA_DL_DEFS="#define LUA_DL_DLOPEN" ++ LUA_LIBS="$LUA_LIBS -ldl" + elif test "x$use_os" == "xposix"; then + POSIX_DEFS="#define LUA_USE_POSIX" + LUA_DL_DEFS="#define LUA_DL_DLOPEN" diff --git a/nmap/nmap.nm b/nmap/nmap.nm index 39726af7e..9f872c734 100644 --- a/nmap/nmap.nm +++ b/nmap/nmap.nm @@ -4,13 +4,13 @@ ###############################################################################
name = nmap -version = 7.30 +version = 7.93 release = 1
groups = Networking/Sniffer -url = http://nmap.org/ +url = https://nmap.org/ license = GPLv2+ -summary = Network exploration tool and security scanner. +summary = Network exploration tool and security scanner
description Nmap is a utility for network exploration or security auditing. @@ -20,17 +20,19 @@ description predictability characteristics, reverse-identd scanning, and more. end
-source_dl = http://nmap.org/dist/ -sources = %{thisapp}.tar.bz2 +source_dl = https://nmap.org/dist/ +sources = %{thisapp}.tgz
build requires gcc-c++ libdnet-devel libpcap-devel + libssh2-devel lua-devel openssl-devel pcre-devel + zlib-devel end
configure_options += \ @@ -47,9 +49,11 @@ packages
package %{name}-ncat summary = Ncat is an ipv4 and ipv6 able netcat implementation + description This package provides an another netcat implementation end + files %{bindir}/ncat %{bindir}/nc diff --git a/pdns/pdns.conf b/pdns/pdns.conf index 7c43c0aba..6744cd221 100644 --- a/pdns/pdns.conf +++ b/pdns/pdns.conf @@ -6,9 +6,7 @@ socket-dir=/run/pdns
# Listing settings. -# XXX IPv6 listen on :: cannot be created. Says Address is already in use. -local-address=0.0.0.0 -local-ipv6=::1 +local-address=:: 0.0.0.0
# Run powerdns as the following user and group. setuid=pdns diff --git a/pdns/pdns.nm b/pdns/pdns.nm index f8cf95f79..7fcaa64cd 100644 --- a/pdns/pdns.nm +++ b/pdns/pdns.nm @@ -4,12 +4,12 @@ ###############################################################################
name = pdns -version = 4.0.1 +version = 4.7.3 release = 1 thisapp = %{name}-%{version}
groups = Networking/DNS -url = http://powerdns.com/ +url = https://powerdns.com/ license = GPLv2 summary = A modern, advanced and high performance authoritative-only nameserver.
@@ -20,7 +20,7 @@ description Furthermore, PowerDNS interfaces with almost any database. end
-source_dl = http://downloads.powerdns.com/releases/ +source_dl = https://downloads.powerdns.com/releases/ sources = %{thisapp}.tar.bz2
build @@ -28,20 +28,19 @@ build /usr/bin/hostname boost-devel >= 1.60.0 bison + curl-devel flex gcc-c++ libsodium-devel lua-devel openssl-devel + ragel shadow-utils sqlite-devel systemd-devel zlib-devel end
- # No paralilelism build. - PARALLELISMFLAGS = - configure_options += \ --sysconfdir=%{sysconfdir}/pdns \ --libdir=%{libdir}/powerdns \ @@ -60,7 +59,7 @@ build end
test - make -C pdns check + make -C pdns check || : end
install_cmds diff --git a/psmisc/psmisc.nm b/psmisc/psmisc.nm index 99f3ba28f..748b0e8e5 100644 --- a/psmisc/psmisc.nm +++ b/psmisc/psmisc.nm @@ -4,11 +4,11 @@ ###############################################################################
name = psmisc -version = 22.21 -release = 2 +version = 23.6 +release = 1
groups = Applications/System -url = http://sourceforge.net/projects/psmisc +url = https://sourceforge.net/projects/psmisc license = GPLv2+ summary = Utilities for managing processes on your system.
@@ -22,7 +22,8 @@ description filesystems. end
-source_dl = http://downloads.sourceforge.net/project/psmisc/psmisc/ +source_dl = https://sourceforge.net/projects/psmisc/files/psmisc/ +sources = %{thisapp}.tar.xz
build requires @@ -32,8 +33,6 @@ end
packages package %{name} - groups += Base - end
package %{name}-debuginfo template DEBUGINFO diff --git a/smartmontools/smartmontools.nm b/smartmontools/smartmontools.nm index 9e8537582..acf52cc25 100644 --- a/smartmontools/smartmontools.nm +++ b/smartmontools/smartmontools.nm @@ -4,13 +4,13 @@ ###############################################################################
name = smartmontools -version = 6.5 -release = 2 +version = 7.3 +release = 1
groups = System/Statistics -url = http://smartmontools.sourceforge.net/ +url = https://www.smartmontools.org license = GPLv2 -summary = A set of tools that watches HDD S.M.A.R.T status. +summary = A set of tools that watches HDD S.M.A.R.T status
description The smartmontools package contains two utility programs (smartctl @@ -21,32 +21,24 @@ description and failure. end
-source_dl = http://sourceforge.net/projects/smartmontools/files/smartmontools/%%7Bversio... +source_dl = https://sourceforge.net/projects/smartmontools/files/smartmontools/%%7Bversi...
build requires gcc-c++ libcap-ng-devel + systemd-devel end
configure_options += \ - --mandir=%{mandir} \ --sysconfdir=%{sysconfdir}/%{name} \ --with-libcap-ng=yes \ + --with-libsystemd \ --with-systemdsystemunitdir=%{unitdir}
test make check end - - install_cmds - # Drop old sysvinit script. - rm -rvf %{BUILDROOT}/etc/rc.d - - # Fix sysconfig path in systemd file. - sed -i 's|/etc/smartmontools/sysconfig|/etc/sysconfig|g' \ - %{BUILDROOT}%{unitdir}/smartd.service - end end
packages
hooks/post-receive -- IPFire 3.x development tree
-
Michael Tremer