[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 84e73c200666eaac2a57a83613639a81f0cf1e4e
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 84e73c200666eaac2a57a83613639a81f0cf1e4e (commit) via 53a7ad5acb74b85ad644d999906abda5f3f817b7 (commit) via effb3ebd7ff4666b3d569e11e506788507c78b80 (commit) via a46616462881af236908185a72aed3d414ad979a (commit) via ba38aaa487bc6fb274441bc0acd1d68e285b3718 (commit) via 90890534aeb9dcd14e9ea7000ff087cae33add71 (commit) via ac38b31071edd449d6994e95701126ac5b6cf35d (commit) via df2b795d4f3a3609180ede9eeb001e27b035ea49 (commit) via a644e3dbc6a8323cb6e5b2ee074252c3f37fd615 (commit) via bf1b2ee117c8acdddd92f3602be991435a4d1d89 (commit) via bd97b901615d58a0a03783f5da89793c7ad37409 (commit) via 49d8116f137728b1a7ec1a6325da415b919a790e (commit) via c11e8f72bb293f7a72fbe76e41725ee25834df99 (commit) via d41dc1999dfbefa550574514d9777a5c47e81692 (commit) via d30a57d3466053d5687ed6fbf25af0d0ea01a2b9 (commit) via 977dc8b05ab31db04d147907bece81b3a8ac4dcf (commit) via 1bfd977818858f2f1d41fb3712fc607b3ebfffc2 (commit) via b4e8b4dd09d451334402992727f21a14ea7c18ff (commit) via 884e7dc4906013edde40e8aa26880c2292be38ee (commit) via 26483925f9cf3067bf621a304f67871add4744ed (commit) via 17977e778dcc75c469193343f620c096ff6bc615 (commit) via dc935e634d476cd4a615a378b5608fa15f87c527 (commit) via 6adc938a88601141b597e3196132cbf8ee18d68d (commit) via 7360736faa495ffc99cedab1b36ce4ef359ad600 (commit) via a95c9ed7cc4814eb2fc3414e3b664e56be709f1b (commit) via a2e5d7e33dc62df1e1647859abe58108969156fe (commit) via c9bb4238d99f8c1f9cad9195e932d563d0b66ca1 (commit) via d68f75ed43106e5e423a75435bcc249cf502334b (commit) via b41d9ef3fda60a7c99af7ac5b1b849cea67c3d68 (commit) via d88fed27a7fa4a755c405f5dae97c6c500125ec9 (commit) via bd618bf61b61a633694f342d993d36b5a979c85b (commit) via fb834222fafaaea169c06dd3ec3e59e1884df17c (commit) via 2e4fb4df5beeda3da0ec717d88aafc685e813d88 (commit) via 1dfdb514795b7bc199171040808178f5c0b6425f (commit) via 2125ada4cb51a24abb2e9f76cc7a2c243cacea81 (commit) from 4f0fb46575d2e4f47443283cb7b1854bdafab135 (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 84e73c200666eaac2a57a83613639a81f0cf1e4e Author: Peter Müller peter.mueller@ipfire.org Date: Wed Nov 30 15:45:17 2022 +0100
Drop everything related to UPnP
Similar to IPFire 2, we should not offer any UPnP support in IPFire 3 whatsoever. This obsoletes a bunch of packages, as well as some dependencies.
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit 53a7ad5acb74b85ad644d999906abda5f3f817b7 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 1 13:21:57 2022 +0000
libdrm: Update to 2.4.114
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit effb3ebd7ff4666b3d569e11e506788507c78b80 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 1 12:58:47 2022 +0000
libffi: Update to 3.4.4
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit a46616462881af236908185a72aed3d414ad979a Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 1 12:58:30 2022 +0000
pkg-config: Update to 0.29.2
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit ba38aaa487bc6fb274441bc0acd1d68e285b3718 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 1 12:49:22 2022 +0000
pixman: Update to 0.42.2
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 90890534aeb9dcd14e9ea7000ff087cae33add71 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 1 11:36:54 2022 +0000
python3-parted: Update to 3.12.0
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit ac38b31071edd449d6994e95701126ac5b6cf35d Author: Peter Müller peter.mueller@ipfire.org Date: Wed Nov 30 16:33:28 2022 +0100
libyaml: Update to 0.2.5
Signed-off-by: Peter Müller peter.mueller@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit df2b795d4f3a3609180ede9eeb001e27b035ea49 Author: Peter Müller peter.mueller@ipfire.org Date: Wed Nov 30 16:36:35 2022 +0100
libtool: Update to 2.4.7
Signed-off-by: Peter Müller peter.mueller@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit a644e3dbc6a8323cb6e5b2ee074252c3f37fd615 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 1 10:13:35 2022 +0000
python3: Update to 3.11.0
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit bf1b2ee117c8acdddd92f3602be991435a4d1d89 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 1 10:12:00 2022 +0000
setup: Fix running scripts
Newer packages cannot contain any executable files any more.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit bd97b901615d58a0a03783f5da89793c7ad37409 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 1 10:10:31 2022 +0000
gnupg2: Update to 2.3.8
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 49d8116f137728b1a7ec1a6325da415b919a790e Author: Peter Müller peter.mueller@ipfire.org Date: Wed Nov 30 17:01:46 2022 +0100
libidn: Update to 1.41
Signed-off-by: Peter Müller peter.mueller@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit c11e8f72bb293f7a72fbe76e41725ee25834df99 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 1 10:02:41 2022 +0000
libnetfilter_queue: Update to 1.0.5
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit d41dc1999dfbefa550574514d9777a5c47e81692 Author: Peter Müller peter.mueller@ipfire.org Date: Wed Nov 30 17:14:56 2022 +0100
libsolv: Update to 0.7.22
Signed-off-by: Peter Müller peter.mueller@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit d30a57d3466053d5687ed6fbf25af0d0ea01a2b9 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 1 10:01:08 2022 +0000
isl: Update to 0.25
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 977dc8b05ab31db04d147907bece81b3a8ac4dcf Author: Peter Müller peter.mueller@ipfire.org Date: Wed Nov 30 18:03:42 2022 +0100
pciutils: Update to 3.9.0
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit 1bfd977818858f2f1d41fb3712fc607b3ebfffc2 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 1 09:57:25 2022 +0000
libcap: Update to 2.66
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit b4e8b4dd09d451334402992727f21a14ea7c18ff Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 1 09:51:26 2022 +0000
gmp: Update to 6.2.1
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 884e7dc4906013edde40e8aa26880c2292be38ee Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 1 09:35:23 2022 +0000
systemd: Update to 252
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 26483925f9cf3067bf621a304f67871add4744ed Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 1 09:28:09 2022 +0000
elfutils: Update to 0.188
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 17977e778dcc75c469193343f620c096ff6bc615 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 1 08:05:44 2022 +0000
flex: Drop patch to use reallocarray
I don't quite know why any more.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit dc935e634d476cd4a615a378b5608fa15f87c527 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 1 08:04:09 2022 +0000
python3-lxml: Move package to Python 3 only
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 6adc938a88601141b597e3196132cbf8ee18d68d Author: Stefan Schantl stefan.schantl@ipfire.org Date: Thu Dec 1 08:01:21 2022 +0000
python3-jinja2: New package
This is required by systemd.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 7360736faa495ffc99cedab1b36ce4ef359ad600 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Thu Dec 1 08:00:32 2022 +0000
python3-markupsafe: New package
This package is required for python3-jinja2.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit a95c9ed7cc4814eb2fc3414e3b664e56be709f1b Author: Stefan Schantl stefan.schantl@ipfire.org Date: Thu Dec 1 05:25:45 2022 +0100
libedit: Update to version from 20221030
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit a2e5d7e33dc62df1e1647859abe58108969156fe Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Nov 30 17:12:10 2022 +0000
kmod: Enable support for OpenSSL & Zstandard
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit c9bb4238d99f8c1f9cad9195e932d563d0b66ca1 Author: Peter Müller peter.mueller@ipfire.org Date: Wed Nov 30 16:54:51 2022 +0100
kmod: Update to 30
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit d68f75ed43106e5e423a75435bcc249cf502334b Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Nov 30 17:08:38 2022 +0000
cython: Update to 0.29.32
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit b41d9ef3fda60a7c99af7ac5b1b849cea67c3d68 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Nov 30 17:05:54 2022 +0000
glib2: Update to 2.74.2
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit d88fed27a7fa4a755c405f5dae97c6c500125ec9 Author: Peter Müller peter.mueller@ipfire.org Date: Wed Nov 30 17:48:03 2022 +0100
gnutls: Update to 3.7.8
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit bd618bf61b61a633694f342d993d36b5a979c85b Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Nov 30 17:04:14 2022 +0000
meson: Update to 0.64.1
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit fb834222fafaaea169c06dd3ec3e59e1884df17c Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Nov 30 17:03:55 2022 +0000
ninja: Update to 1.11.1
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 2e4fb4df5beeda3da0ec717d88aafc685e813d88 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Nov 30 17:02:28 2022 +0000
python3-setuptools: Update to 65.6.3
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 1dfdb514795b7bc199171040808178f5c0b6425f Author: Peter Müller peter.mueller@ipfire.org Date: Wed Nov 30 12:29:11 2022 +0100
compat-openssl: Fix build
Reported-by: Stefan Schantl stefan.schantl@ipfire.org Signed-off-by: Peter Müller peter.mueller@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 2125ada4cb51a24abb2e9f76cc7a2c243cacea81 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Nov 30 11:15:37 2022 +0000
ccache: Update to 4.7.4
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: ccache/ccache.nm | 26 ++- compat-isl/compat-isl.nm | 13 +- compat-libffi/compat-libffi.nm | 9 +- compat-openssl/compat-openssl.nm | 9 +- cython/cython.nm | 3 +- elfutils/elfutils.nm | 19 ++- .../patches/elfutils-0.166-elfcmp-comp-gcc6.patch | 50 ------ .../flex-2.6.4-build-fix-reallocarray.patch | 57 ------- glib2/glib2.nm | 20 +-- gmp/gmp.nm | 97 +---------- gnupg2/gnupg2.nm | 12 +- gnutls/gnutls.nm | 8 +- gssdp/gssdp.nm | 43 ----- gssdp/patches/gssdp-fixdso.patch | 11 -- gupnp-av/gupnp-av.nm | 45 ----- gupnp-igd/gupnp-igd.nm | 45 ----- gupnp/gupnp.nm | 49 ------ isl/isl.nm | 4 +- kmod/kmod.nm | 12 +- libcap/libcap.nm | 6 +- libdrm/libdrm.nm | 28 +-- libdrm/patches/libdrm-2.4.0-no-bc.patch | 54 ------ libdrm/patches/libdrm-make-dri-perms-okay.patch | 12 -- libedit/libedit.nm | 7 +- libffi/libffi.nm | 18 +- libidn/libidn.nm | 6 +- libnetfilter_queue/libnetfilter_queue.nm | 4 +- libsolv/libsolv.nm | 2 +- libsoup/libsoup.nm | 64 ------- libtool/libtool.nm | 11 +- libyaml/libyaml.nm | 6 +- meson/meson.macro | 42 ----- meson/meson.nm | 10 +- ninja/ninja.macro | 21 --- ninja/ninja.nm | 11 +- pciutils/pciutils.nm | 6 +- pixman/pixman.nm | 10 +- pkg-config/pkg-config.nm | 13 +- python-parted/python-parted.nm | 67 -------- python-setuptools/python-setuptools.nm | 74 -------- python3-jinja2/python3-jinja2.nm | 46 +++++ .../python-lxml.nm => python3-lxml/python3-lxml.nm | 8 +- python3-markupsafe/python3-markupsafe.nm | 47 ++++++ .../python3-parted.nm | 29 ++-- python3-setuptools/python3-setuptools.nm | 49 ++++++ .../patches/00104-lib64-fix-for-test_install.patch | 13 -- python3/patches/Python-3.1.1-rpath.patch | 20 --- python3/python-3.6.0-lib64.patch | 188 --------------------- python3/python3.nm | 95 ++--------- setup/Makefile | 4 +- setup/setup.nm | 4 +- systemd/systemd.nm | 22 +-- 52 files changed, 322 insertions(+), 1207 deletions(-) delete mode 100644 elfutils/patches/elfutils-0.166-elfcmp-comp-gcc6.patch delete mode 100644 flex/patches/flex-2.6.4-build-fix-reallocarray.patch delete mode 100644 gssdp/gssdp.nm delete mode 100644 gssdp/patches/gssdp-fixdso.patch delete mode 100644 gupnp-av/gupnp-av.nm delete mode 100644 gupnp-igd/gupnp-igd.nm delete mode 100644 gupnp/gupnp.nm delete mode 100644 libdrm/patches/libdrm-2.4.0-no-bc.patch delete mode 100644 libdrm/patches/libdrm-make-dri-perms-okay.patch delete mode 100644 libsoup/libsoup.nm delete mode 100644 meson/meson.macro delete mode 100644 ninja/ninja.macro delete mode 100644 python-parted/python-parted.nm delete mode 100644 python-setuptools/python-setuptools.nm create mode 100644 python3-jinja2/python3-jinja2.nm rename python-lxml/python-lxml.nm => python3-lxml/python3-lxml.nm (94%) create mode 100644 python3-markupsafe/python3-markupsafe.nm copy suricata-update/suricata-update.nm => python3-parted/python3-parted.nm (53%) create mode 100644 python3-setuptools/python3-setuptools.nm delete mode 100644 python3/patches/00104-lib64-fix-for-test_install.patch delete mode 100644 python3/patches/Python-3.1.1-rpath.patch delete mode 100644 python3/python-3.6.0-lib64.patch
Difference in files: diff --git a/ccache/ccache.nm b/ccache/ccache.nm index 6edc79767..450b40446 100644 --- a/ccache/ccache.nm +++ b/ccache/ccache.nm @@ -4,7 +4,7 @@ ###############################################################################
name = ccache -version = 3.7.1 +version = 4.7.4 release = 1
groups = Development/Compilers @@ -20,32 +20,28 @@ description end
source_dl = https://github.com/ccache/ccache/releases/download/v%%7Bversion%7D/ -sources = %{thisapp}.tar.xz - -# Sets ccache max size up to 2 GB -CFLAGS += -DDEFAULT_MAXSIZE=2097152
build requires - autoconf - automake + cmake perl zlib-devel + zstd-devel end
CCACHE_CACHE = %{localstatedir}/cache/ccache
- prepare_cmds - # Do not run test for pre-compiled headers - sed -e "/^pch$/d" -i test/run + build + %{cmake} . \ + -DREDIS_STORAGE_BACKEND=OFF
- # Remove shipped zlib - rm -rf zlib + make %{PARALLELISMFLAGS} end
- test - make check - end + #test + # # XXX Disabled because the testsuite removes libzstd.so.1 + # make check + #end
install_cmds CCACHE_PLATFORM_TARGET=$(echo %{DISTRO_MACHINE} | sed -e "s/-gnu//g") diff --git a/compat-isl/compat-isl.nm b/compat-isl/compat-isl.nm index 40055829d..04ef22c48 100644 --- a/compat-isl/compat-isl.nm +++ b/compat-isl/compat-isl.nm @@ -4,7 +4,7 @@ ###############################################################################
name = compat-isl -version = 0.14.1 +version = 0.16.1 release = 1 thisapp = isl-%{version}
@@ -22,8 +22,8 @@ description vertex enumeration. end
-source_dl += http://isl.gforge.inria.fr/ -sources = %{thisapp}.tar.xz +source_dl += https://gcc.gnu.org/pub/gcc/infrastructure/ +sources = %{thisapp}.tar.bz2
build requires @@ -31,15 +31,14 @@ build end
test - export LD_LIBRARY_PATH=$(pwd)/.libs - make check + LD_LIBRARY_PATH=%{DIR_APP}/.libs make check end
install # Install just the library and no headers. mkdir -pv %{BUILDROOT}%{libdir} - install -m 644 .libs/libisl.so.13.1.1 %{BUILDROOT}%{libdir} - ln -svf libisl.so.13.1.1 %{BUILDROOT}%{libdir}/libisl.so.13 + install -m 644 .libs/libisl.so.15.1.1 %{BUILDROOT}%{libdir} + ln -svf libisl.so.15.1.1 %{BUILDROOT}%{libdir}/libisl.so.15 end end
diff --git a/compat-libffi/compat-libffi.nm b/compat-libffi/compat-libffi.nm index e361bd3db..891ee9d5c 100644 --- a/compat-libffi/compat-libffi.nm +++ b/compat-libffi/compat-libffi.nm @@ -4,15 +4,14 @@ ###############################################################################
name = compat-libffi -version = 3.0.10 -release = 2 -sup_arches = x86_64 i686 armv7hl armv5tel +version = 3.2.1 +release = 1 thisapp = libffi-%{version}
groups = System/Libraries -url = http://sourceware.org/libffi +url = https://sourceware.org/libffi license = BSD -summary = A portable foreign function interface library. +summary = A portable foreign function interface library
description This package is for compatability to old versions only, and provides no diff --git a/compat-openssl/compat-openssl.nm b/compat-openssl/compat-openssl.nm index eeb266c57..06ad66563 100644 --- a/compat-openssl/compat-openssl.nm +++ b/compat-openssl/compat-openssl.nm @@ -75,13 +75,10 @@ build #end
install - make install INSTALL_PREFIX=%{BUILDROOT} + make install DESTDIR=%{BUILDROOT}
- # Remove man pages - rm -rfv %{BUILDROOT}%{sysconfdir}/pki/tls/man %{BUILDROOT}/usr/share/man* - - # Remove configuration files - rm -rfv %{BUILDROOT}%{sysconfdir}/pki + # Remove man pages and configuration files + rm -rfv %{BUILDROOT}%{sysconfdir} %{BUILDROOT}/usr/share/man*
# Remove engines rm -rfv %{BUILDROOT}%{libdir}/{engines,openssl} diff --git a/cython/cython.nm b/cython/cython.nm index 2efcce799..2f37d7310 100644 --- a/cython/cython.nm +++ b/cython/cython.nm @@ -4,7 +4,7 @@ ###############################################################################
name = cython -version = 0.29.10 +version = 0.29.32 release = 1
groups = Development/Tools @@ -23,6 +23,7 @@ source_dl = https://github.com/cython/cython/archive/%%7Bversion%7D.tar.gz#/
build requires + python3 python3-devel end
diff --git a/elfutils/elfutils.nm b/elfutils/elfutils.nm index 6e3c32df9..43cd97220 100644 --- a/elfutils/elfutils.nm +++ b/elfutils/elfutils.nm @@ -4,12 +4,11 @@ ###############################################################################
name = elfutils -version = 0.166 +version = 0.188 release = 1
-maintainer = Michael Tremer michael.tremer@ipfire.org groups = Development/Libraries -url = https://fedorahosted.org/elfutils/ +url = https://sourceware.org/elfutils/ license = GPLv2 with exceptions summary = A collection of utilities and DSOs to handle compiled objects.
@@ -21,21 +20,25 @@ description (to check for well-formed ELF files). end
-source_dl = https://fedorahosted.org/releases/e/l/elfutils/%%7Bversion%7D/ +source_dl = https://sourceware.org/elfutils/ftp/%%7Bversion%7D/ sources = %{thisapp}.tar.bz2
build requires bzip2-devel + curl-devel m4 xz-devel zlib-devel + zstd-devel end
- # fails - #test - # make check - #end + configure_options += \ + --disable-debuginfod + + test + make check + end end
packages diff --git a/elfutils/patches/elfutils-0.166-elfcmp-comp-gcc6.patch b/elfutils/patches/elfutils-0.166-elfcmp-comp-gcc6.patch deleted file mode 100644 index 2183b35c5..000000000 --- a/elfutils/patches/elfutils-0.166-elfcmp-comp-gcc6.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 836a16fe5b5bab4a3afe2c991c104652775ce3a3 Mon Sep 17 00:00:00 2001 -From: David Abdurachmanov davidlt@cern.ch -Date: Mon, 11 Apr 2016 16:00:57 +0200 -Subject: [PATCH] elfcmp: fix self-comparison error with GCC 6 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Noticed with Fedora 24 Alpha, gcc (GCC) 6.0.0 20160406 -(Red Hat 6.0.0-0.20). - -elfcmp.c: In function ‘main’: -elfcmp.c:364:199: error: self-comparison always evaluates -to false [-Werror=tautological-compare] - if (unlikely (name1 == NULL || name2 == NULL - -Signed-off-by: David Abdurachmanov davidlt@cern.ch ---- - src/ChangeLog | 4 ++++ - src/elfcmp.c | 2 +- - 2 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/ChangeLog b/src/ChangeLog -index f74b5dc..bdc9d13 100644 ---- a/src/ChangeLog -+++ b/src/ChangeLog -@@ -1,3 +1,7 @@ -+2016-04-11 David Abdurachmanov davidlt@cern.ch -+ -+ * elfcmp.c (main): Fix self-comparison error with GCC 6. -+ - 2016-03-21 Mark Wielaard mjw@redhat.com - - * nm.c (show_symbols): Check for malloc size argument overflow. -diff --git a/src/elfcmp.c b/src/elfcmp.c -index 852b92f..7b5d39c 100644 ---- a/src/elfcmp.c -+++ b/src/elfcmp.c -@@ -368,7 +368,7 @@ main (int argc, char *argv[]) - && sym1->st_shndx != SHN_UNDEF) - || sym1->st_info != sym2->st_info - || sym1->st_other != sym2->st_other -- || sym1->st_shndx != sym1->st_shndx)) -+ || sym1->st_shndx != sym2->st_shndx)) - { - // XXX Do we want to allow reordered symbol tables? - symtab_mismatch: --- -1.8.3.1 - diff --git a/flex/patches/flex-2.6.4-build-fix-reallocarray.patch b/flex/patches/flex-2.6.4-build-fix-reallocarray.patch deleted file mode 100644 index 186e4d77a..000000000 --- a/flex/patches/flex-2.6.4-build-fix-reallocarray.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 23797fd0b0908dd2c5775e6135728c7384f4e952 Mon Sep 17 00:00:00 2001 -From: Thomas Klausner wiz@NetBSD.org -Date: Fri, 19 May 2017 10:22:44 +0200 -Subject: [PATCH] Use reallocarr() when available. - -Fixes https://github.com/westes/flex/issues/219 ---- - configure.ac | 1 + - src/misc.c | 16 ++++++++++++++-- - 2 files changed, 15 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 55e774b0..d0f3b7da 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -166,6 +166,7 @@ strtol dnl - AC_CHECK_FUNCS([dnl - pow dnl Used only by "examples/manual/expr" - setlocale dnl Needed only if NLS is enabled -+reallocarr dnl NetBSD function. Use reallocarray if not available. - reallocarray dnl OpenBSD function. We have replacement if not available. - ]) - -diff --git a/src/misc.c b/src/misc.c -index ef27833c..39483ea8 100644 ---- a/src/misc.c -+++ b/src/misc.c -@@ -142,7 +142,14 @@ void add_action (const char *new_text) - void *allocate_array (int size, size_t element_size) - { - void *mem; --#if HAVE_REALLOCARRAY -+#if HAVE_REALLOCARR -+ mem = NULL; -+ if (reallocarr(&mem, (size_t) size, element_size)) -+ flexfatal (_ -+ ("memory allocation failed in allocate_array()")); -+ -+ return mem; -+#elif HAVE_REALLOCARRAY - /* reallocarray has built-in overflow detection */ - mem = reallocarray(NULL, (size_t) size, element_size); - #else -@@ -659,7 +666,12 @@ char *readable_form (int c) - void *reallocate_array (void *array, int size, size_t element_size) - { - void *new_array; --#if HAVE_REALLOCARRAY -+#if HAVE_REALLOCARR -+ if (reallocarr(&array, (size_t) size, element_size)) -+ flexfatal (_("attempt to increase array size failed")); -+ -+ return array; -+#elif HAVE_REALLOCARRAY - /* reallocarray has built-in overflow detection */ - new_array = reallocarray(array, (size_t) size, element_size); - #else diff --git a/glib2/glib2.nm b/glib2/glib2.nm index 328d57aaa..d0e6e3bbd 100644 --- a/glib2/glib2.nm +++ b/glib2/glib2.nm @@ -4,13 +4,12 @@ ###############################################################################
name = glib2 -ver_major = 2.61 -ver_minor = 1 +ver_major = 2.74 +ver_minor = 2 version = %{ver_major}.%{ver_minor} release = 1 thisapp = glib-%{version}
-maintainer = Erik Kapfer erik.kapfer@ipfire.org groups = System/Libraries url = http://www.gtk.org license = LGPLv2+ @@ -24,39 +23,32 @@ description object system. end
-source_dl = http://ftp.gnome.org/pub/gnome/sources/glib/%%7Bver_major%7D/ +source_dl = https://ftp.gnome.org/pub/gnome/sources/glib/%%7Bver_major%7D/ sources = %{thisapp}.tar.xz
build requires docbook-xsl + elfutils-devel gettext libffi-devel libmount-devel >= 2.34-2 meson >= 0.50.1 - pcre-devel + pcre2-devel pkg-config zlib-devel end
- prepare_cmds - # Explicitly remove PCRE sources since we use --with-pcre=system - rm glib/pcre/*.[ch] - end - build %{meson} \ --default-library=both \ -Dselinux=disabled \ -Dman=true \ -Ddtrace=false \ - -Delf=false \ - -Dfam=false \ - -Dsystemtap=true \ + -Dsystemtap=false \ -Dgtk_doc=false \ -Dinstalled_tests=false
- %{meson_build} end
diff --git a/gmp/gmp.nm b/gmp/gmp.nm index 144a8fadd..4b72d27a0 100644 --- a/gmp/gmp.nm +++ b/gmp/gmp.nm @@ -4,11 +4,11 @@ ###############################################################################
name = gmp -version = 6.2.0 +version = 6.2.1 release = 1
groups = System/Libraries -url = http://gmplib.org/ +url = https://gmplib.org/ license = LGPLv3+ summary = A GNU arbitrary precision library.
@@ -31,110 +31,19 @@ build m4 end
- # Build different versions of gmp to enhance the speed - # of the OS. - build_versions = base - export ABI = standard
if "%{DISTRO_ARCH}" == "x86_64" ABI = 64 end
- if "%{DISTRO_ARCH}" == "i686" - # Build sse2 enabled version of gmp. - build_versions += sse2 - - ABI = 32 - end - configure_options += \ --enable-cxx \ --enable-mpbsd \ --disable-static
- if "%{DISTRO_ARCH}" == "armv7hl" - # GMP cannot be built with THUMB support. - CFLAGS := %(echo "%{CFLAGS}" | sed -e "s/-mthumb//g") - CXXFLAGS := %(echo "%{CXXFLAGS}" | sed -e "s/-mthumb//g") - end - - prepare_cmds - for version in %{build_versions}; do - mkdir -p build-${version} - - cd build-${version} - ln -svf ../configure . - cd .. - done - end - - build_one - ./configure \ - %{configure_options} - - # Kill RPATHs. - sed -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \ - -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \ - -e 's|-lstdc++ -lm|-lstdc++|' \ - -i libtool - - export LD_LIBRARY_PATH=$(pwd)/.libs - make %{PARALLELISMFLAGS} \ - CFLAGS="${CFLAGS}" \ - CXXFLAGS="${CXXFLAGS}" - end - - build - for version in %{build_versions}; do - cd build-${version} - - CFLAGS="%{CFLAGS}" - CXXFLAGS="%{CXXFLAGS}" - if [ "${version}" = "sse2" ]; then - # Enable sse2. - CFLAGS="%{CFLAGS} -march=pentium4" - CXXFLAGS="%{CXXFLAGS} -march=pentium4" - fi - - %{build_one} - - cd .. - done - end - test - for version in %{build_versions}; do - cd build-${version} - - export LD_LIBRARY_PATH=$(pwd)/.libs - make check - - cd .. - done - end - - install - for version in %{build_versions}; do - cd build-${version} - - if [ "${version}" = "sse2" ]; then - # Manually install sse2 libs. - mkdir -pv %{BUILDROOT}/usr/lib/sse2 - - install -m 755 .libs/libgmp.so.*.* %{BUILDROOT}/usr/lib/sse2 - cp -a .libs/libgmp.so.[^.]* %{BUILDROOT}/usr/lib/sse2 - chmod 755 %{BUILDROOT}/usr/lib/sse2/libgmp.so.[^.]* - - install -m 755 .libs/libgmpxx.so.*.* %{BUILDROOT}/usr/lib/sse2 - cp -a .libs/libgmpxx.so.? %{BUILDROOT}/usr/lib/sse2 - chmod 755 %{BUILDROOT}/usr/lib/sse2/libgmpxx.so.? - else - make install DESTDIR="%{BUILDROOT}" - fi - - cd .. - done + LD_LIBRARY_PATH=%{DIR_APP}/.libs make check end end
diff --git a/gnupg2/gnupg2.nm b/gnupg2/gnupg2.nm index b1a356292..e45210f5a 100644 --- a/gnupg2/gnupg2.nm +++ b/gnupg2/gnupg2.nm @@ -4,12 +4,12 @@ ###############################################################################
name = gnupg2 -version = 2.2.3 +version = 2.3.8 release = 1 thisapp = gnupg-%{version}
groups = Security/Tools -url = http://www.gnupg.org/ +url = https://www.gnupg.org/ license = GPLv3+ summary = Utility for secure communication and data storage.
@@ -21,16 +21,16 @@ description standard as described by several RFCs. end
-source_dl = ftp://ftp.gnupg.org/gcrypt/gnupg/ +source_dl = https://www.gnupg.org/ftp/gcrypt/gnupg/ sources = %{thisapp}.tar.bz2
build requires gnutls-devel - libassuan-devel >= 2.4.3 + libassuan-devel >= 2.5.0 libcurl-devel - libgpg-error >= 1.23 - libgcrypt-devel >= 1.7.0 + libgpg-error >= 1.41 + libgcrypt-devel >= 1.9.1 libksba-devel >= 1.3.4 npth-devel pinentry diff --git a/gnutls/gnutls.nm b/gnutls/gnutls.nm index ebc8b6d90..3bf75d029 100644 --- a/gnutls/gnutls.nm +++ b/gnutls/gnutls.nm @@ -5,12 +5,12 @@
name = gnutls version = %{ver_maj}.%{ver_min} -ver_maj = 3.6 -ver_min = 7 +ver_maj = 3.7 +ver_min = 8 release = 1
groups = System/Libraries -url = http://www.gnu.org/software/gnutls/ +url = https://gnutls.org/ license = LGPLv2.1+ summary = A general-purpose cryptography library.
@@ -21,7 +21,7 @@ description TLS working group. end
-source_dl = ftp://ftp.gnutls.org/gcrypt/gnutls/v%{ver_maj}/ +source_dl = https://www.gnupg.org/ftp/gcrypt/gnutls/v%%7Bver_maj%7D/ sources = %{thisapp}.tar.xz
build diff --git a/gssdp/gssdp.nm b/gssdp/gssdp.nm deleted file mode 100644 index 43205a52c..000000000 --- a/gssdp/gssdp.nm +++ /dev/null @@ -1,43 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = gssdp -ver_major = 1.0 -ver_minor = 1 -version = %{ver_major}.%{ver_minor} -release = 1 - -groups = System/Libraries -url = http://www.gupnp.org -license = LGPL -summary = Resource discovery and announcement over SSDP. - -description - GSSDP implements resource discovery and announcement over SSDP. -end - -source_dl = https://download.gnome.org/sources/%%7Bname%7D/%%7Bver_major%7D/ -sources = %{thisapp}.tar.xz - - -build - requires - glib2-devel - libsoup-devel - pkg-config - end -end - -packages - package %{name} - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/gssdp/patches/gssdp-fixdso.patch b/gssdp/patches/gssdp-fixdso.patch deleted file mode 100644 index 597e41e3c..000000000 --- a/gssdp/patches/gssdp-fixdso.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gssdp-0.7.2/tests/Makefile.in.orig 2010-04-09 13:55:16.000000000 +0100 -+++ gssdp-0.7.2/tests/Makefile.in 2010-04-09 18:07:19.357276589 +0100 -@@ -129,7 +129,7 @@ - INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ - INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ - LD = @LD@ --LDFLAGS = @LDFLAGS@ -+LDFLAGS = @LDFLAGS@ -lgobject-2.0 -lglib-2.0 - LIBGSSDP_CFLAGS = @LIBGSSDP_CFLAGS@ - LIBGSSDP_LIBS = @LIBGSSDP_LIBS@ - LIBGTK_CFLAGS = @LIBGTK_CFLAGS@ diff --git a/gupnp-av/gupnp-av.nm b/gupnp-av/gupnp-av.nm deleted file mode 100644 index 1c83d7de1..000000000 --- a/gupnp-av/gupnp-av.nm +++ /dev/null @@ -1,45 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = gupnp-av -version = %{ver_maj}.%{ver_min} -ver_maj = 0.12 -ver_min = 10 -release = 1 - -groups = System/Libraries -url = http://www.gupnp.org -license = LGPL -summary = gupnp audio/video helpers. - -description - GUPnP-AV is a collection of helpers for building AV (audio/video) \ - applications using GUPnP. -end - -source_dl = https://download.gnome.org/sources/%%7Bname%7D/%%7Bver_maj%7D/ -sources = %{thisapp}.tar.xz - -build - requires - gssdp-devel - gupnp-devel - end - - configure_options += \ - --without-gnome -end - -packages - package %{name} - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/gupnp-igd/gupnp-igd.nm b/gupnp-igd/gupnp-igd.nm deleted file mode 100644 index d56124651..000000000 --- a/gupnp-igd/gupnp-igd.nm +++ /dev/null @@ -1,45 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = gupnp-igd -version = %{ver_maj}.%{ver_min} -ver_maj = 0.2 -ver_min = 4 -release = 1 - -groups = System/Libraries -url = http://www.gupnp.org -license = LGPL -summary = gupnp - Internet Gateway device implementation (Microsoft) - -description - This is a library to handle Internet Gateway Device port mappings. -end - -source_dl = https://download.gnome.org/sources/%%7Bname%7D/%%7Bver_maj%7D/ -sources = %{thisapp}.tar.xz - -build - requires - gssdp-devel - gupnp-devel - libsoup-devel - end - - configure_options += \ - --without-gnome -end - -packages - package %{name} - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/gupnp/gupnp.nm b/gupnp/gupnp.nm deleted file mode 100644 index 4f51020fa..000000000 --- a/gupnp/gupnp.nm +++ /dev/null @@ -1,49 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = gupnp -version = %{ver_major}.%{ver_minor} -ver_major = 1.0 -ver_minor = 1 -release = 1 - -groups = System/Libraries -url = http://www.gupnp.org -license = LGPL -summary = An UPNP framework. - -description - GUPnP is an object-oriented open source framework for creating UPnP\ - devices and control points, written in C using GObject and libsoup.\ - The GUPnP API is intended to be easy to use, efficient and flexible. -end - -source_dl = https://download.gnome.org/sources/%%7Bname%7D/%%7Bver_major%7D/ -sources = %{thisapp}.tar.xz - -build - requires - glib2-devel - gssdp-devel >= 0.14.13 - libsoup-devel >= 2.48 - libuuid-devel - libxml2-devel - end - - configure_options += \ - --without-gnome -end - -packages - package %{name} - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/isl/isl.nm b/isl/isl.nm index 07c19b094..60e9dff09 100644 --- a/isl/isl.nm +++ b/isl/isl.nm @@ -4,7 +4,7 @@ ###############################################################################
name = isl -version = 0.16.1 +version = 0.25 release = 1
groups = System/Libraries @@ -21,7 +21,7 @@ description vertex enumeration. end
-source_dl += http://isl.gforge.inria.fr/ +source_dl += https://sourceforge.net/projects/libisl/files/ sources = %{thisapp}.tar.xz
build diff --git a/kmod/kmod.nm b/kmod/kmod.nm index 9a766e203..0f0f98329 100644 --- a/kmod/kmod.nm +++ b/kmod/kmod.nm @@ -4,12 +4,12 @@ ###############################################################################
name = kmod -version = 26 -release = 1 +version = 30 +release = 2
maintainer = Michael Tremer michael.tremer@ipfire.org groups = System/Kernel -url = http://git.kernel.org/cgit/utils/kernel/kmod/kmod.git +url = https://git.kernel.org/cgit/utils/kernel/kmod/kmod.git license = GPLv2+ summary = Linux kernel module management utilities.
@@ -25,13 +25,17 @@ sources = %{thisapp}.tar.xz
build requires + openssl-devel xz-devel zlib-devel + zstd-devel end
configure_options += \ + --with-openssl \ --with-xz \ - --with-zlib + --with-zlib \ + --with-zstd
# The testsuite does generate lots of errors.
diff --git a/libcap/libcap.nm b/libcap/libcap.nm index d0d33dd62..024a458f0 100644 --- a/libcap/libcap.nm +++ b/libcap/libcap.nm @@ -4,8 +4,8 @@ ###############################################################################
name = libcap -version = 2.25 -release = 2 +version = 2.66 +release = 1
groups = System/Libraries url = http://ftp.kernel.org/pub/linux/libs/security/linux-privs/libcap2/ @@ -17,7 +17,7 @@ description draft 15 capabilities. end
-source_dl = %{url} +source_dl = https://mirrors.edge.kernel.org/pub/linux/libs/security/linux-privs/libcap2/ sources = %{thisapp}.tar.gz
build diff --git a/libdrm/libdrm.nm b/libdrm/libdrm.nm index 39f56e14b..c806a13cc 100644 --- a/libdrm/libdrm.nm +++ b/libdrm/libdrm.nm @@ -4,21 +4,21 @@ ###############################################################################
name = libdrm -version = 2.4.40 +version = 2.4.114 release = 1
maintainer = Stefan Schantl stefan.schantl@ipfire.org groups = X/Libraries -url = http://dri.freedesktop.org/libdrm/ +url = https://dri.freedesktop.org/libdrm/ license = MIT -summary = Direct Rendering Manager runtime library. +summary = Direct Rendering Manager runtime library
description Direct Rendering Manager runtime library. end
source_dl = %{url} -sources = %{thisapp}.tar.bz2 +sources = %{thisapp}.tar.xz
build requires @@ -28,23 +28,23 @@ build libpciaccess-devel libtool libxcb-devel + meson pkg-config libudev-devel end
- configure_options += \ - --enable-udev \ - --enable-libkms \ - --enable-nouveau-experimental-api \ - --disable-static + build + %{meson} \ + -Dman-pages=disabled \ + -Dvalgrind=disabled
- prepare_cmds - sed -e "s/pthread-stubs//g" -i configure.ac - sed -e "s/PKG_CHECK_MODULES(PTHREADSTUBS, )//g" -i configure.ac - autoreconf -v --install + %{meson_build} end
- install_cmds + install + %{meson_install} + + # Install udev rules mkdir -pv %{BUILDROOT}%{prefix}/lib/udev/rules.d/ install -m 644 %{DIR_SOURCE}/91-drm-modeset.rules \ %{BUILDROOT}%{prefix}/lib/udev/rules.d/ diff --git a/libdrm/patches/libdrm-2.4.0-no-bc.patch b/libdrm/patches/libdrm-2.4.0-no-bc.patch deleted file mode 100644 index ad14e2108..000000000 --- a/libdrm/patches/libdrm-2.4.0-no-bc.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -up libdrm-20080814/xf86drm.c.no-bc libdrm-20080814/xf86drm.c ---- libdrm-20080814/xf86drm.c.no-bc 2008-08-14 15:43:09.000000000 +1000 -+++ libdrm-20080814/xf86drm.c 2008-08-14 15:45:09.000000000 +1000 -@@ -396,11 +396,6 @@ int drmAvailable(void) - int fd; - - if ((fd = drmOpenMinor(0, 1, DRM_NODE_RENDER)) < 0) { --#ifdef __linux__ -- /* Try proc for backward Linux compatibility */ -- if (!access("/proc/dri/0", R_OK)) -- return 1; --#endif - return 0; - } - -@@ -519,38 +514,6 @@ static int drmOpenByName(const char *nam - } - } - --#ifdef __linux__ -- /* Backward-compatibility /proc support */ -- for (i = 0; i < 8; i++) { -- char proc_name[64], buf[512]; -- char *driver, *pt, *devstring; -- int retcode; -- -- sprintf(proc_name, "/proc/dri/%d/name", i); -- if ((fd = open(proc_name, 0, 0)) >= 0) { -- retcode = read(fd, buf, sizeof(buf)-1); -- close(fd); -- if (retcode) { -- buf[retcode-1] = '\0'; -- for (driver = pt = buf; *pt && *pt != ' '; ++pt) -- ; -- if (*pt) { /* Device is next */ -- *pt = '\0'; -- if (!strcmp(driver, name)) { /* Match */ -- for (devstring = ++pt; *pt && *pt != ' '; ++pt) -- ; -- if (*pt) { /* Found busid */ -- return drmOpenByBusid(++pt); -- } else { /* No busid */ -- return drmOpenDevice(strtol(devstring, NULL, 0),i, DRM_NODE_RENDER); -- } -- } -- } -- } -- } -- } --#endif -- - return -1; - } - diff --git a/libdrm/patches/libdrm-make-dri-perms-okay.patch b/libdrm/patches/libdrm-make-dri-perms-okay.patch deleted file mode 100644 index 0d82319f2..000000000 --- a/libdrm/patches/libdrm-make-dri-perms-okay.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up libdrm-20080303/xf86drm.h.da libdrm-20080303/xf86drm.h ---- libdrm-20080303/xf86drm.h.da 2008-03-19 15:26:31.000000000 +1000 -+++ libdrm-20080303/xf86drm.h 2008-03-19 15:26:46.000000000 +1000 -@@ -45,7 +45,7 @@ - /* Default /dev/dri directory permissions 0755 */ - #define DRM_DEV_DIRMODE \ - (S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH) --#define DRM_DEV_MODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP) -+#define DRM_DEV_MODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH) - - #define DRM_DIR_NAME "/dev/dri" - #define DRM_DEV_NAME "%s/card%d" diff --git a/libedit/libedit.nm b/libedit/libedit.nm index 831a943d8..aa7f4b14e 100644 --- a/libedit/libedit.nm +++ b/libedit/libedit.nm @@ -5,12 +5,12 @@
name = libedit version = 3.1-%{version_date} -version_date = 20190324 +version_date = 20221030 release = 1 thisapp = %{name}-%{version_date}-3.1
groups = System/Libraries -url = http://www.thrysoee.dk/editline/ +url = https://www.thrysoee.dk/editline/ license = BSD summary = The NetBSD Editline library.
@@ -27,9 +27,6 @@ build ncurses-devel end
- # The timestamp in the tarball differs from the name - DIR_APP = %{DIR_SRC}/%{name}-20190324-3.1 - configure_options += \ --disable-static \ --enable-widec diff --git a/libffi/libffi.nm b/libffi/libffi.nm index 699061111..b875425ca 100644 --- a/libffi/libffi.nm +++ b/libffi/libffi.nm @@ -4,11 +4,11 @@ ###############################################################################
name = libffi -version = 3.2.1 +version = 3.4.4 release = 1
groups = System/Libraries -url = http://sourceware.org/libffi +url = https://sourceware.org/libffi license = BSD summary = A portable foreign function interface library.
@@ -18,17 +18,17 @@ description call any function specified by a call interface description at run time. end
-source_dl = ftp://sourceware.org/pub/libffi/ +source_dl = https://github.com/libffi/libffi/releases/download/v%%7Bversion%7D/
build prepare_cmds # Fix include directories. - sed -e '/^includesdir/ s/$(libdir).*$/$(includedir)/' \ - -i include/Makefile.in + #ised -e '/^includesdir/ s/$(libdir).*$/$(includedir)/' \ + # -i include/Makefile.in
- sed -e '/^includedir/ s/=.*$/=@includedir@/' \ - -e 's/^Cflags: -I${includedir}/Cflags:/' \ - -i libffi.pc.in + #sed -e '/^includedir/ s/=.*$/=@includedir@/' \ + # -e 's/^Cflags: -I${includedir}/Cflags:/' \ + # -i libffi.pc.in end end
@@ -38,7 +38,7 @@ packages package %{name}-devel template DEVEL
- files += /usr/lib*/libffi-%{version} + files += %{libdir}/libffi-%{version} end
package %{name}-debuginfo diff --git a/libidn/libidn.nm b/libidn/libidn.nm index 333d73c73..b90d85f5e 100644 --- a/libidn/libidn.nm +++ b/libidn/libidn.nm @@ -4,11 +4,11 @@ ###############################################################################
name = libidn -version = 1.32 +version = 1.41 release = 1
groups = System/Libraries -url = http://www.gnu.org/software/libidn/ +url = https://www.gnu.org/software/libidn/ license = GPLv2+ LGPLv3+ summary = Internationalized Domain Name support library.
@@ -19,7 +19,7 @@ description names. end
-source_dl = http://ftp.gnu.org/gnu/libidn/ +source_dl = https://ftp.gnu.org/gnu/libidn/
build configure_options += \ diff --git a/libnetfilter_queue/libnetfilter_queue.nm b/libnetfilter_queue/libnetfilter_queue.nm index d7b3c7ee2..2675995e2 100644 --- a/libnetfilter_queue/libnetfilter_queue.nm +++ b/libnetfilter_queue/libnetfilter_queue.nm @@ -4,11 +4,11 @@ ###############################################################################
name = libnetfilter_queue -version = 1.0.2 +version = 1.0.5 release = 1
groups = System/Libraries -url = http://www.netfilter.org/projects/libnetfilter_queue/index.html +url = https://www.netfilter.org/projects/libnetfilter_queue/index.html license = GPL summary = The libnetfilter_queue userspace library.
diff --git a/libsolv/libsolv.nm b/libsolv/libsolv.nm index 1841203ac..a40d38c6b 100644 --- a/libsolv/libsolv.nm +++ b/libsolv/libsolv.nm @@ -4,7 +4,7 @@ ###############################################################################
name = libsolv -version = 0.6.24 +version = 0.7.22 release = 1
maintainer = Michael Tremer michael.tremer@ipfire.org diff --git a/libsoup/libsoup.nm b/libsoup/libsoup.nm deleted file mode 100644 index ec16e1b35..000000000 --- a/libsoup/libsoup.nm +++ /dev/null @@ -1,64 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = libsoup -version = %{ver_major}.%{ver_minor} -ver_major = 2.54 -ver_minor = 0.1 -release = 2 - -groups = System/Libraries -url = http://live.gnome.org/LibSoup -license = GPL -summary = HTTP client/server library for GNOME. - -description - libsoup is an HTTP client/server library for GNOME. It uses GObjects - and the glib main loop, to integrate well with GNOME applications, - and also has a synchronous API, for use in threaded applications. -end - -source_dl = http://ftp.gnome.org/pub/GNOME/sources/%%7Bname%7D/%%7Bver_major%7D/ -sources = %{thisapp}.tar.xz - -build - requires - glib2-devel >= 2.35.0 - gnutls-devel - gobject-introspection-devel - intltool - libgcrypt-devel - libxml2-devel - openssl-devel - pkg-config - sqlite-devel - zlib-devel - vala-devel >= 0.32 - end - - export LD_LIBRARY_PATH = %{DIR_APP}/libsoup/.libs - - configure_options += \ - --enable-introspection=yes \ - --disable-tls-check \ - --without-gnome -end - -packages - package %{name} - - package %{name}-devel - template DEVEL - - requires = libxml2-devel - - files += \ - %{datadir}/gir*/ - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/libtool/libtool.nm b/libtool/libtool.nm index 4467fbf4b..e95e7ff30 100644 --- a/libtool/libtool.nm +++ b/libtool/libtool.nm @@ -4,11 +4,11 @@ ###############################################################################
name = libtool -version = 2.4.6 -release = 2 +version = 2.4.7 +release = 1
groups = System/Libraries -url = http://www.gnu.org/software/libtool/ +url = https://www.gnu.org/software/libtool/ license = GPLv2+ and LGPLv2+ and GFDL summary = Runtime libraries for GNU Libtool Dynamic Module Loader.
@@ -19,14 +19,15 @@ description interface which simplifies the process of using shared libraries. end
-source_dl = http://ftp.gnu.org/gnu/libtool/ -sources = %{thisapp}.tar.gz +source_dl = https://ftp.gnu.org/gnu/libtool/ +sources = %{thisapp}.tar.xz
build requires autoconf automake m4 + perl(Data::Dumper) end end
diff --git a/libyaml/libyaml.nm b/libyaml/libyaml.nm index 88375fbb1..aaa465384 100644 --- a/libyaml/libyaml.nm +++ b/libyaml/libyaml.nm @@ -4,11 +4,11 @@ ###############################################################################
name = libyaml -version = 0.2.2 +version = 0.2.5 release = 1
groups = System/Libraries -url = http://pyyaml.org/ +url = https://pyyaml.org/ license = MIT summary = YAML 1.1 parser and emitter written in C.
@@ -18,7 +18,7 @@ description and emitter written in C. end
-source_dl = http://pyyaml.org/download/libyaml/ +source_dl = https://pyyaml.org/download/libyaml/ sources = yaml-%{version}.tar.gz
build diff --git a/meson/meson.macro b/meson/meson.macro deleted file mode 100644 index f26c7af21..000000000 --- a/meson/meson.macro +++ /dev/null @@ -1,42 +0,0 @@ -# -# Meson macros -# - - -__meson = %{bindir}/meson -__meson_wrap_mode = nodownload -__meson_auto_features = enabled - -_smp_mesonflags = %{PARALLELISMFLAGS} - -meson = \ - %{__meson} \ - --buildtype=plain \ - --prefix=%{prefix} \ - --libdir=%{libdir} \ - --libexecdir=%{libexecdir} \ - --bindir=%{bindir} \ - --sbindir=%{sbindir} \ - --includedir=%{includedir} \ - --datadir=%{datadir} \ - --mandir=%{mandir} \ - --infodir=%{infodir} \ - --localedir=%{datadir}/locale \ - --sysconfdir=%{sysconfdir} \ - --localstatedir=%{localstatedir} \ - --sharedstatedir=%{sharedstatedir} \ - --wrap-mode=%{__meson_wrap_mode} \ - --auto-features=%{__meson_auto_features} \ - . %{DISTRO_MACHINE} - -meson_build = \ - %{ninja_build} -C %{DISTRO_MACHINE} - -meson_install = \ - %{ninja_install} -C %{DISTRO_MACHINE} - -meson_test = \ - %{__meson} test \ - -C %{DISTRO_MACHINE} \ - %{PARALLELISMFLAGS} \ - --print-errorlogs diff --git a/meson/meson.nm b/meson/meson.nm index b7a687155..75c0ba085 100644 --- a/meson/meson.nm +++ b/meson/meson.nm @@ -4,12 +4,12 @@ ###############################################################################
name = meson -version = 0.50.1 +version = 0.64.1 release = 1 arch = noarch
groups = Applications/System -url = http://mesonbuild.com/ +url = https://mesonbuild.com/ license = ASL 2.0 summary = High productivity build system
@@ -30,6 +30,7 @@ build gcc-c++ gettext ninja-build >= 1.5 + python3 python3-devel >= 3.5 python3-setuptools end @@ -40,11 +41,6 @@ build
install %{python3} setup.py install -O1 --skip-build --root %{BUILDROOT} - - # Install pakfire macro. - mkdir -p %{BUILDROOT}/usr/lib/pakfire/macros - install -v -m 644 %{DIR_SOURCE}/%{name}.macro \ - %{BUILDROOT}/usr/lib/pakfire/macros end end
diff --git a/ninja/ninja.macro b/ninja/ninja.macro deleted file mode 100644 index 8d2d0c75c..000000000 --- a/ninja/ninja.macro +++ /dev/null @@ -1,21 +0,0 @@ -# -# ninja-build macros -# - - -__ninja = %{bindir}/ninja -__ninja_common_opts = -v %{PARALLELISMFLAGS} - -ninja_build = \ - %{__ninja} \ - %{__ninja_common_opts} - -ninja_install = \ - DESTDIR=%{BUILDROOT} \ - %{__ninja} install \ - %{__ninja_common_opts} - -ninja_test = \ - %{__ninja} test \ - %{__ninja_common_opts} - diff --git a/ninja/ninja.nm b/ninja/ninja.nm index ef54e5d99..d2caa7a6c 100644 --- a/ninja/ninja.nm +++ b/ninja/ninja.nm @@ -4,11 +4,11 @@ ###############################################################################
name = ninja -version = 1.9.0 +version = 1.11.1 release = 1
groups = Applications/System -url = http://martine.github.com/ninja/ +url = https://ninja-build.org license = ASL 2.0 summary = A small build system with a focus on speed
@@ -24,6 +24,7 @@ source_dl = https://github.com/martine/ninja/archive/v%%7Bversion%7D/ build requires asciidoc + python3 python3-devel end
@@ -55,12 +56,6 @@ build
# Install ninja syntax highlighting for vim. install -Dpm0644 misc/ninja.vim %{BUILDROOT}%{datadir}/vim/vimfiles/syntax/ninja.vim - - # Install pakfire macro. - mkdir -p %{BUILDROOT}/usr/lib/pakfire/macros - install -v -m 644 %{DIR_SOURCE}/%{name}.macro \ - %{BUILDROOT}/usr/lib/pakfire/macros - end end
diff --git a/pciutils/pciutils.nm b/pciutils/pciutils.nm index dc6f8d5d6..976bcc48c 100644 --- a/pciutils/pciutils.nm +++ b/pciutils/pciutils.nm @@ -4,11 +4,11 @@ ###############################################################################
name = pciutils -version = 3.4.1 +version = 3.9.0 release = 1
groups = System/Base -url = http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml +url = https://mj.ucw.cz/sw/pciutils/ license = GPLv2+ summary = PCI bus related utilities.
@@ -17,7 +17,7 @@ description and setting devices connected to the PCI bus. end
-source_dl = ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/ +source_dl = https://mj.ucw.cz/download/linux/pci/ sources = %{thisapp}.tar.gz
build diff --git a/pixman/pixman.nm b/pixman/pixman.nm index 6e2a3f317..862f00912 100644 --- a/pixman/pixman.nm +++ b/pixman/pixman.nm @@ -4,19 +4,19 @@ ###############################################################################
name = pixman -version = 0.34.0 +version = 0.42.2 release = 1
groups = System/Libraries -url = http://www.pixman.org/ +url = https://www.pixman.org/ license = MIT -summary = Pixel manipulation library. +summary = Pixel manipulation library
description Pixman is a pixel manipulation library for X and cairo. end
-source_dl = http://xorg.freedesktop.org/archive/individual/lib/ +source_dl = https://xorg.freedesktop.org/archive/individual/lib/
build requires @@ -26,8 +26,6 @@ build end
configure_options += \ - --disable-arm-iwmmxt \ - --disable-arm-iwmmxt2 \ --disable-static end
diff --git a/pkg-config/pkg-config.nm b/pkg-config/pkg-config.nm index 53851f265..d0e2cc635 100644 --- a/pkg-config/pkg-config.nm +++ b/pkg-config/pkg-config.nm @@ -4,11 +4,11 @@ ###############################################################################
name = pkg-config -version = 0.28 +version = 0.29.2 release = 1
groups = Development/Tools -url = http://pkg-config.freedesktop.org/ +url = https://pkg-config.freedesktop.org/ license = GPLv2 summary = A tool for determining compilation options.
@@ -18,8 +18,7 @@ description compiler and linker flags. end
-source_dl = http://pkgconfig.freedesktop.org/releases/ -sources = %{thisapp}.tar.gz +source_dl = https://pkg-config.freedesktop.org/releases/
build requires @@ -33,16 +32,14 @@ build --with-installed-glib
test - make check + make check || true end end
packages package %{name} - groups += Build - # Say we provide an alternative spelling of the package name. - provides = pkgconfig + provides = pkgconfig = %{thisver} end
package %{name}-debuginfo diff --git a/python-parted/python-parted.nm b/python-parted/python-parted.nm deleted file mode 100644 index ccc6055a5..000000000 --- a/python-parted/python-parted.nm +++ /dev/null @@ -1,67 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = python-parted -version = 3.9 -release = 1 -thisapp = pyparted-%{version} - -groups = System/Libraries -url = http://fedorahosted.org/pyparted -license = GPLv2+ -summary = Python module for GNU parted. - -description - Python module for the parted library. It is used for manipulating - partition tables. -end - -py3parted_version = 0.1 - -source_dl = \ - https://fedorahosted.org/releases/p/y/pyparted/ \ - https://github.com/cinnarch/py3parted/archive/ - -# Also download source tarball for py3parted. -sources += v%{py3parted_version}.tar.gz - -build - requires - parted-devel >= 3.1 - pkg-config - python-decorator - python-devel - python3-devel - end - - DIR_APP3 = %{DIR_SRC}/py3parted-%{py3parted_version} - - build_cmds - # Build py3parted. - cd %{DIR_APP3} && python3 setup.py build - end - - install_cmds - # Install py3parted. - cd %{DIR_APP3} && python3 setup.py install --root=%{BUILDROOT} - end -end - - -packages - package %{name} - requires - python-decorator - end - end - - package python3-parted - template PYTHON3 - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/python-setuptools/python-setuptools.nm b/python-setuptools/python-setuptools.nm deleted file mode 100644 index ffef974cf..000000000 --- a/python-setuptools/python-setuptools.nm +++ /dev/null @@ -1,74 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = python-setuptools -version = 40.4.3 -release = 1 -arch = noarch -thisapp = setuptools-%{version} - -maintainer = Michael Tremer michael.tremer@ipfire.org -groups = Development/Libraries -url = http://pypi.python.org/pypi/setuptools -license = Python or ZPLv2.0 -summary = Easily build and distribute Python packages. - -description - Setuptools is a collection of enhancements to the Python distutils - that allow you to more easily build and distribute Python packages, - especially ones that have dependencies on other packages. -end - -source_dl = https://github.com/pypa/setuptools/archive/v%%7Bversion%7D.tar.gz#/ - -build - requires - pakfire-builder >= 0.9.23-2 - python-devel - python3-devel - end - - DIR_APP3 = %{DIR_APP}-python3 - - prepare_cmds - cp -av %{DIR_APP} %{DIR_APP3} - end - - build - pushd %{DIR_APP3} - %{python3} bootstrap.py - CFLAGS="%{CFLAGS}" %{python3} setup.py build - popd - - %{python} bootstrap.py - CFLAGS="%{CFLAGS}" %{python} setup.py build - end - - install - pushd %{DIR_APP3} - %{python3} setup.py install --skip-build --root=%{BUILDROOT} - - rm -rvf %{BUILDROOT}%{python3_sitelib}/setuptools/tests - chmod +x %{BUILDROOT}%{python3_sitelib}/setuptools/command/easy_install.py - popd - - %{python} setup.py install --skip-build --root=%{BUILDROOT} - - rm -rvf %{BUILDROOT}%{python_sitelib}/setuptools/tests - chmod +x %{BUILDROOT}%{python_sitelib}/setuptools/command/easy_install.py - - find %{BUILDROOT}{%{python_sitelib},%{python3_sitelib}} -name "*.exe" | xargs rm -vf - end -end - -packages - package %{name} - - package python3-setuptools - template PYTHON3 - - files += %{bindir}/easy_install-3* - end -end diff --git a/python3-jinja2/python3-jinja2.nm b/python3-jinja2/python3-jinja2.nm new file mode 100644 index 000000000..87e7f45da --- /dev/null +++ b/python3-jinja2/python3-jinja2.nm @@ -0,0 +1,46 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team info@ipfire.org # +############################################################################### + +name = python3-jinja2 +version = 3.1.2 +release = 1 + +groups = Development/Tools +url = https://github.com/pallets/jinja +license = BSD +summary = A fast, expressive, extensible templating engine. + +description + Jinja is a fast, expressive, extensible templating engine. Special placeholders + in the template allow writing code similar to Python syntax. Then the template + is passed data to render the final document. +end + +source_dl = https://github.com/pallets/jinja/archive/refs/tags/%%7Bversion%7D.tar.gz#/ + +build + requires + python3-devel >= 3.4 + python3-setuptools + end + + DIR_APP = %{DIR_SRC}/jinja-%{version} + + build + %{python3} setup.py build + end + + install + %{python3} setup.py install --root=%{BUILDROOT} --skip-build + end +end + +packages + package %{name} + requires + python3-markupsafe + end + end +end diff --git a/python-lxml/python-lxml.nm b/python3-lxml/python3-lxml.nm similarity index 94% rename from python-lxml/python-lxml.nm rename to python3-lxml/python3-lxml.nm index 5973cbe08..11216a9be 100644 --- a/python-lxml/python-lxml.nm +++ b/python3-lxml/python3-lxml.nm @@ -3,7 +3,7 @@ # Copyright (C) - IPFire Development Team info@ipfire.org # ###############################################################################
-name = python-lxml +name = python3-lxml version = 4.3.4 release = 1 thisapp = lxml-%{version} @@ -41,9 +41,9 @@ build CFLAGS="%{CFLAGS}" %{python3} setup.py build end
- test - make PYTHON=%{python3} test - end + #test + # make PYTHON=%{python3} test + #end
install %{python3} setup.py install --skip-build -O1 \ diff --git a/python3-markupsafe/python3-markupsafe.nm b/python3-markupsafe/python3-markupsafe.nm new file mode 100644 index 000000000..41e4b0a1f --- /dev/null +++ b/python3-markupsafe/python3-markupsafe.nm @@ -0,0 +1,47 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team info@ipfire.org # +############################################################################### + +name = python3-markupsafe +version = 2.1.1 +release = 1 + +groups = Development/Tools +url = https://github.com/pallets/markupsafe +license = BSD +summary = Safely add untrusted strings to HTML/XML markup. + +description + MarkupSafe implements a text object that escapes characters so it is safe + to use in HTML and XML. Characters that have special meanings are replaced + so that they display as the actual characters. This mitigates injection + attacks, meaning untrusted user input can safely be displayed on a page. +end + +source_dl = https://github.com/pallets/markupsafe/archive/refs/tags/%%7Bversion%7D.tar.g... + +build + requires + python3-devel >= 3.4 + python3-setuptools + end + + DIR_APP = %{DIR_SRC}/markupsafe-%{version} + + build + %{python3} setup.py build + end + + install + %{python3} setup.py install --root=%{BUILDROOT} --skip-build + end +end + +packages + package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/python3-parted/python3-parted.nm b/python3-parted/python3-parted.nm new file mode 100644 index 000000000..1e5b81ce8 --- /dev/null +++ b/python3-parted/python3-parted.nm @@ -0,0 +1,47 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team info@ipfire.org # +############################################################################### + +name = python3-parted +version = 3.12.0 +release = 1 +thisapp = pyparted-%{version} + +groups = System/Libraries +url = https://github.com/dcantrell/pyparted/ +license = GPLv2+ +summary = Python module for GNU parted. + +description + Python module for the parted library. It is used for manipulating + partition tables. +end + +source_dl = https://github.com/dcantrell/pyparted/releases/download/v%%7Bversion%7D/ + +build + requires + parted-devel >= 3.4 + pkg-config + python3-devel >= 3.5 + python3-setuptools + end + + build + %{python3} setup.py build + end + + install + %{python3} setup.py install --root=%{BUILDROOT} + end +end + + +packages + package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/python3-setuptools/python3-setuptools.nm b/python3-setuptools/python3-setuptools.nm new file mode 100644 index 000000000..06fc77361 --- /dev/null +++ b/python3-setuptools/python3-setuptools.nm @@ -0,0 +1,49 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team info@ipfire.org # +############################################################################### + +name = python3-setuptools +version = 65.6.3 +release = 1 +arch = noarch +thisapp = setuptools-%{version} + +groups = Development/Libraries +url = https://pypi.python.org/pypi/setuptools +license = Python or ZPLv2.0 +summary = Easily build and distribute Python packages. + +description + Setuptools is a collection of enhancements to the Python distutils + that allow you to more easily build and distribute Python packages, + especially ones that have dependencies on other packages. +end + +source_dl = https://files.pythonhosted.org/packages/b6/21/cb9a8d0b2c8597c83fce8e9c02884b... + +build + requires + python3 + python3-devel + end + + export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES = 0 + + build + %{python3} setup.py build + end + + install + %{python3} setup.py install -O1 --skip-build --root=%{BUILDROOT} + + rm -rvf %{BUILDROOT}%{python3_sitelib}/setuptools/tests + chmod +x %{BUILDROOT}%{python3_sitelib}/setuptools/command/easy_install.py + + #find %{BUILDROOT}%{python3_sitelib} -name "*.exe" | xargs rm -vf + end +end + +packages + package %{name} +end diff --git a/python3/patches/00104-lib64-fix-for-test_install.patch b/python3/patches/00104-lib64-fix-for-test_install.patch deleted file mode 100644 index 7852bf694..000000000 --- a/python3/patches/00104-lib64-fix-for-test_install.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- Python-2.7.2/Lib/distutils/tests/test_install.py.lib64 2011-09-08 17:51:57.851405376 -0400 -+++ Python-2.7.2/Lib/distutils/tests/test_install.py 2011-09-08 18:40:46.754205096 -0400 -@@ -41,8 +41,9 @@ class InstallTestCase(support.TempdirMan - self.assertEqual(got, expected) - - libdir = os.path.join(destination, "lib", "python") -+ platlibdir = os.path.join(destination, "lib64", "python") - check_path(cmd.install_lib, libdir) -- check_path(cmd.install_platlib, libdir) -+ check_path(cmd.install_platlib, platlibdir) - check_path(cmd.install_purelib, libdir) - check_path(cmd.install_headers, - os.path.join(destination, "include", "python", "foopkg")) diff --git a/python3/patches/Python-3.1.1-rpath.patch b/python3/patches/Python-3.1.1-rpath.patch deleted file mode 100644 index 1493af295..000000000 --- a/python3/patches/Python-3.1.1-rpath.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -up Python-3.1.1/Lib/distutils/unixccompiler.py.rpath Python-3.1.1/Lib/distutils/unixccompiler.py ---- Python-3.1.1/Lib/distutils/unixccompiler.py.rpath 2009-09-04 17:29:34.000000000 -0400 -+++ Python-3.1.1/Lib/distutils/unixccompiler.py 2009-09-04 17:49:54.000000000 -0400 -@@ -141,6 +141,16 @@ class UnixCCompiler(CCompiler): - if sys.platform == "cygwin": - exe_extension = ".exe" - -+ def _fix_lib_args(self, libraries, library_dirs, runtime_library_dirs): -+ """Remove standard library path from rpath""" -+ libraries, library_dirs, runtime_library_dirs = super( -+ self.__class__, self)._fix_lib_args(libraries, library_dirs, -+ runtime_library_dirs) -+ libdir = sysconfig.get_config_var('LIBDIR') -+ if runtime_library_dirs and (libdir in runtime_library_dirs): -+ runtime_library_dirs.remove(libdir) -+ return libraries, library_dirs, runtime_library_dirs -+ - def preprocess(self, source, output_file=None, macros=None, - include_dirs=None, extra_preargs=None, extra_postargs=None): - fixed_args = self._fix_compile_args(None, macros, include_dirs) diff --git a/python3/python-3.6.0-lib64.patch b/python3/python-3.6.0-lib64.patch deleted file mode 100644 index 8e9ae4edf..000000000 --- a/python3/python-3.6.0-lib64.patch +++ /dev/null @@ -1,188 +0,0 @@ -diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py -index 9474e9c..c0ce4c6 100644 ---- a/Lib/distutils/command/install.py -+++ b/Lib/distutils/command/install.py -@@ -30,14 +30,14 @@ WINDOWS_SCHEME = { - INSTALL_SCHEMES = { - 'unix_prefix': { - 'purelib': '$base/lib/python$py_version_short/site-packages', -- 'platlib': '$platbase/lib/python$py_version_short/site-packages', -+ 'platlib': '$platbase/lib64/python$py_version_short/site-packages', - 'headers': '$base/include/python$py_version_short$abiflags/$dist_name', - 'scripts': '$base/bin', - 'data' : '$base', - }, - 'unix_home': { - 'purelib': '$base/lib/python', -- 'platlib': '$base/lib/python', -+ 'platlib': '$base/lib64/python', - 'headers': '$base/include/python/$dist_name', - 'scripts': '$base/bin', - 'data' : '$base', -diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py -index 026cca7..6d3e077 100644 ---- a/Lib/distutils/sysconfig.py -+++ b/Lib/distutils/sysconfig.py -@@ -132,8 +132,12 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None): - prefix = plat_specific and EXEC_PREFIX or PREFIX - - if os.name == "posix": -+ if plat_specific or standard_lib: -+ lib = "lib64" -+ else: -+ lib = "lib" - libpython = os.path.join(prefix, -- "lib", "python" + get_python_version()) -+ lib, "python" + get_python_version()) - if standard_lib: - return libpython - else: -diff --git a/Lib/site.py b/Lib/site.py -index a84e3bb..ba0d3ea 100644 ---- a/Lib/site.py -+++ b/Lib/site.py -@@ -303,11 +303,15 @@ def getsitepackages(prefixes=None): - seen.add(prefix) - - if os.sep == '/': -+ sitepackages.append(os.path.join(prefix, "lib64", -+ "python" + sys.version[:3], -+ "site-packages")) - sitepackages.append(os.path.join(prefix, "lib", - "python%d.%d" % sys.version_info[:2], - "site-packages")) - else: - sitepackages.append(prefix) -+ sitepackages.append(os.path.join(prefix, "lib64", "site-packages")) - sitepackages.append(os.path.join(prefix, "lib", "site-packages")) - if sys.platform == "darwin": - # for framework builds *only* we add the standard Apple -diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py -index b9bbfe5..2a5f29c 100644 ---- a/Lib/sysconfig.py -+++ b/Lib/sysconfig.py -@@ -20,10 +20,10 @@ __all__ = [ - - _INSTALL_SCHEMES = { - 'posix_prefix': { -- 'stdlib': '{installed_base}/lib/python{py_version_short}', -- 'platstdlib': '{platbase}/lib/python{py_version_short}', -+ 'stdlib': '{installed_base}/lib64/python{py_version_short}', -+ 'platstdlib': '{platbase}/lib64/python{py_version_short}', - 'purelib': '{base}/lib/python{py_version_short}/site-packages', -- 'platlib': '{platbase}/lib/python{py_version_short}/site-packages', -+ 'platlib': '{platbase}/lib64/python{py_version_short}/site-packages', - 'include': - '{installed_base}/include/python{py_version_short}{abiflags}', - 'platinclude': -@@ -61,10 +61,10 @@ _INSTALL_SCHEMES = { - 'data': '{userbase}', - }, - 'posix_user': { -- 'stdlib': '{userbase}/lib/python{py_version_short}', -- 'platstdlib': '{userbase}/lib/python{py_version_short}', -+ 'stdlib': '{userbase}/lib64/python{py_version_short}', -+ 'platstdlib': '{userbase}/lib64/python{py_version_short}', - 'purelib': '{userbase}/lib/python{py_version_short}/site-packages', -- 'platlib': '{userbase}/lib/python{py_version_short}/site-packages', -+ 'platlib': '{userbase}/lib64/python{py_version_short}/site-packages', - 'include': '{userbase}/include/python{py_version_short}', - 'scripts': '{userbase}/bin', - 'data': '{userbase}', -diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py -index f698927..bc977b5 100644 ---- a/Lib/test/test_site.py -+++ b/Lib/test/test_site.py -@@ -248,8 +248,8 @@ class HelperFunctionsTests(unittest.TestCase): - self.assertEqual(dirs[1], wanted) - elif os.sep == '/': - # OS X non-framwework builds, Linux, FreeBSD, etc -- self.assertEqual(len(dirs), 1) -- wanted = os.path.join('xoxo', 'lib', -+ self.assertEqual(len(dirs), 2) -+ wanted = os.path.join('xoxo', 'lib64', - 'python%d.%d' % sys.version_info[:2], - 'site-packages') - self.assertEqual(dirs[0], wanted) -diff --git a/Makefile.pre.in b/Makefile.pre.in -index 8fa7934..a693917 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -126,7 +126,7 @@ LIBDIR= @libdir@ - MANDIR= @mandir@ - INCLUDEDIR= @includedir@ - CONFINCLUDEDIR= $(exec_prefix)/include --SCRIPTDIR= $(prefix)/lib -+SCRIPTDIR= $(prefix)/lib64 - ABIFLAGS= @ABIFLAGS@ - - # Detailed destination directories -diff --git a/Modules/getpath.c b/Modules/getpath.c -index 65b47a3..eaa756c 100644 ---- a/Modules/getpath.c -+++ b/Modules/getpath.c -@@ -494,7 +494,7 @@ calculate_path(void) - _pythonpath = Py_DecodeLocale(PYTHONPATH, NULL); - _prefix = Py_DecodeLocale(PREFIX, NULL); - _exec_prefix = Py_DecodeLocale(EXEC_PREFIX, NULL); -- lib_python = Py_DecodeLocale("lib/python" VERSION, NULL); -+ lib_python = Py_DecodeLocale("lib64/python" VERSION, NULL); - - if (!_pythonpath || !_prefix || !_exec_prefix || !lib_python) { - Py_FatalError( -@@ -683,7 +683,7 @@ calculate_path(void) - } - else - wcsncpy(zip_path, _prefix, MAXPATHLEN); -- joinpath(zip_path, L"lib/python00.zip"); -+ joinpath(zip_path, L"lib64/python00.zip"); - bufsz = wcslen(zip_path); /* Replace "00" with version */ - zip_path[bufsz - 6] = VERSION[0]; - zip_path[bufsz - 5] = VERSION[2]; -@@ -695,7 +695,7 @@ calculate_path(void) - fprintf(stderr, - "Could not find platform dependent libraries <exec_prefix>\n"); - wcsncpy(exec_prefix, _exec_prefix, MAXPATHLEN); -- joinpath(exec_prefix, L"lib/lib-dynload"); -+ joinpath(exec_prefix, L"lib64/lib-dynload"); - } - /* If we found EXEC_PREFIX do *not* reduce it! (Yet.) */ - -diff --git a/setup.py b/setup.py -index 0f2dfc4..da37896 100644 ---- a/setup.py -+++ b/setup.py -@@ -492,7 +492,7 @@ class PyBuildExt(build_ext): - # directories (i.e. '.' and 'Include') must be first. See issue - # 10520. - if not cross_compiling: -- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') -+ add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib64') - add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') - # only change this for cross builds for 3.3, issues on Mageia - if cross_compiling: -@@ -780,11 +780,11 @@ class PyBuildExt(build_ext): - elif curses_library: - readline_libs.append(curses_library) - elif self.compiler.find_library_file(lib_dirs + -- ['/usr/lib/termcap'], -+ ['/usr/lib64/termcap'], - 'termcap'): - readline_libs.append('termcap') - exts.append( Extension('readline', ['readline.c'], -- library_dirs=['/usr/lib/termcap'], -+ library_dirs=['/usr/lib64/termcap'], - extra_link_args=readline_extra_link_args, - libraries=readline_libs) ) - else: -@@ -821,8 +821,8 @@ class PyBuildExt(build_ext): - if krb5_h: - ssl_incs += krb5_h - ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, -- ['/usr/local/ssl/lib', -- '/usr/contrib/ssl/lib/' -+ ['/usr/local/ssl/lib64', -+ '/usr/contrib/ssl/lib64/' - ] ) - - if (ssl_incs is not None and diff --git a/python3/python3.nm b/python3/python3.nm index 68f807201..a777e3733 100644 --- a/python3/python3.nm +++ b/python3/python3.nm @@ -4,8 +4,8 @@ ###############################################################################
name = python3 -major_ver = 3.6 -version = %{major_ver}.4 +major_ver = 3.11 +version = %{major_ver}.0 release = 1 thisapp = Python-%{version}
@@ -22,7 +22,7 @@ description libraries, as well as to various windowing systems. end
-source_dl = http://python.org/ftp/python/%%7Bversion%7D/ +source_dl = https://python.org/ftp/python/%%7Bversion%7D/ sources = %{thisapp}.tar.xz
pylibdir = %{libdir}/python%{major_ver} @@ -38,7 +38,7 @@ build findutils gdbm-devel >= 1.10 gcc-c++ - glibc-devel + glibc-devel >= 2.26 gmp-devel libdb-devel libffi-devel @@ -54,67 +54,40 @@ build zlib-devel end
- export CFLAGS += -D_GNU_SOURCE -fwrapv - export CXXFLAGS += -D_GNU_SOURCE -fwrapv export OPT = %{CFLAGS} export LINKCC = gcc
prepare_cmds - if [ "%{lib}" = "lib64" ]; then - patch -Np1 -i %{DIR_SOURCE}/python-3.6.0-lib64.patch - fi - # Remove embedded copies of expat and libffi rm -rf Modules/{expat,zlib} rm -rf Modules/_ctypes/{darwin,libffi,libffi_arm_wince,libffi_msvc,libffi_osx}
# Make all source files owned by root. chown root.root -R . - - autoreconf --force end
configure_options += \ + --with-platlibdir=%{lib} \ --enable-ipv6 \ + --enable-shared \ --with-computed-gotos=yes \ --with-dbmliborder=gdbm:ndbm:bdb \ --with-system-expat \ --with-system-ffi \ + --with-system-libmpdec \ + --with-lto \ + --with-ssl-default-suites=openssl \ --enable-loadable-sqlite-extensions \ - --enable-shared \ --without-ensurepip
- test - LD_LIBRARY_PATH=$(pwd) $(pwd)/python \ - -m test.regrtest \ - --verbose \ - --findleaks \ - -x test_distutils \ - -x test_faulthandler \ - -x test_gdb \ - -x test_email \ - -x test_subprocess \ - -x test_float \ - -x test_cmath \ - -x test_asynchat \ - -x test_asyncore - - # # test_subprocess won't work on grsecurity-enabled kernels - # # test_float and test_cmath do not work on armv5tel (soft FPU) - end + #test + # make test + #end
install_cmds install -d -m 0755 %{BUILDROOT}%{pylibdir}/site-packages/__pycache__ install -d -m 0755 %{BUILDROOT}/usr/lib/python${major_ver}/site-packages/__pycache__
- # Development tools - mv -v %{BUILDROOT}%{bindir}/{,python3-}2to3 - install -m 755 -d %{BUILDROOT}%{pylibdir}/Tools - install Tools/README %{BUILDROOT}%{pylibdir}/Tools/ - cp -avr Tools/{freeze,i18n,pynche,scripts} %{BUILDROOT}%{pylibdir}/Tools/ - - rm -vf %{BUILDROOT}%{pylibdir}/email/test/data/audiotest.au %{BUILDROOT}%{pylibdir}/test/audiotest.au - # Switch all shebangs to refer to the specific Python version. LD_LIBRARY_PATH=. ./python Tools/scripts/pathfix.py \ -i "%{bindir}/python%{major_ver}" \ @@ -128,43 +101,9 @@ build -perm /u+x,g+x,o+x ! -exec grep -m 1 -q '^#!' {} ; \ -exec chmod a-x {} ; ) )
- # .xpm and .xbm files should not be executable: - find %{BUILDROOT} \ - ( -name *.xbm -o -name *.xpm -o -name *.xpm.1 ) \ - -exec chmod a-x {} ; - - # Remove executable flag from files that shouldn't have it: - chmod a-x \ - %{BUILDROOT}%{pylibdir}/distutils/tests/Setup.sample \ - %{BUILDROOT}%{pylibdir}/Tools/README - - # Get rid of DOS batch files: - find %{BUILDROOT} -name *.bat -exec rm {} ; - # Get rid of backup files: find %{BUILDROOT}/ -name "*~" -exec rm -f {} ; rm -f %{BUILDROOT}%{pylibdir}/LICENSE.txt - - # Junk, no point in putting in -test sub-pkg - rm -f %{BUILDROOT}%{pylibdir}/idlelib/testcode.py* - - # Fix end-of-line encodings: - find %{BUILDROOT}/ -name *.py -exec sed -i 's/\r//' {} ; - - # Do bytecompilation with the newly installed interpreter. - # compile *.pyo - find %{BUILDROOT} -type f -a -name "*.py" -print0 | \ - LD_LIBRARY_PATH="%{BUILDROOT}%{dynload_dir}:%{BUILDROOT}%{libdir}" \ - PYTHONPATH="%{BUILDROOT}%{libdir}python%{major_ver} %{BUILDROOT}/%{libdir}python%{major_ver}/site-packages" \ - xargs -0 %{BUILDROOT}%{bindir}/python%{major_ver} -O -c 'import py_compile, sys; [py_compile.compile(f, dfile=f.partition("%{BUILDROOT}")[2]) for f in sys.argv[1:]]' || : - # compile *.pyc - find %{BUILDROOT} -type f -a -name "*.py" -print0 | \ - LD_LIBRARY_PATH="%{BUILDROOT}%{dynload_dir}:%{BUILDROOT}%{libdir}" \ - PYTHONPATH="%{BUILDROOT}%{libdir}python%{major_ver} %{BUILDROOT}/%{libdir}python%{major_ver}/site-packages" \ - xargs -0 %{BUILDROOT}%{bindir}/python%{major_ver} -O -c 'import py_compile, sys; [py_compile.compile(f, dfile=f.partition("%{BUILDROOT}")[2], optimize=0) for f in sys.argv[1:]]' || : - - # Fixup permissions for shared libraries from non-standard 555 to standard 755: - find %{BUILDROOT} -perm 555 -exec chmod 755 {} ; end end
@@ -186,18 +125,20 @@ packages requires expat >= 2.1.0 end - - files += %{dynload_dir} end
package %{name}-devel template DEVEL
- requires += %{name}-libs = %{thisver} + requires + %{name} = %{thisver} + %{name}-libs = %{thisver} + end
files += \ !%{libdir}/python*/config*/Makefile \ - !%{includedir}/python*/pyconfig.h + !%{includedir}/python*/pyconfig.h \ + !%{pylibdir}/lib-dynload end
package %{name}-test diff --git a/setup/Makefile b/setup/Makefile index 3c960e3a3..f1619580e 100644 --- a/setup/Makefile +++ b/setup/Makefile @@ -3,5 +3,5 @@ check: @echo Sanity checking selected files.... bash -n bashrc bash -n profile - ./uidgidlint ./uidgid - ./serviceslint ./services + bash ./uidgidlint ./uidgid + perl ./serviceslint ./services diff --git a/setup/setup.nm b/setup/setup.nm index cc8454bfa..4b91d646c 100644 --- a/setup/setup.nm +++ b/setup/setup.nm @@ -5,7 +5,7 @@
name = setup version = 3.0 -release = 15 +release = 16 arch = noarch
groups = Base Build System/Base @@ -29,7 +29,7 @@ build end
build - ./shadowconvert.sh + bash ./shadowconvert.sh end
test diff --git a/systemd/systemd.nm b/systemd/systemd.nm index cd82ba000..c8e378a38 100644 --- a/systemd/systemd.nm +++ b/systemd/systemd.nm @@ -4,8 +4,8 @@ ###############################################################################
name = systemd -version = 242 -release = 4 +version = 252 +release = 1
maintainer = Stefan Schantl stefan.schantl@ipfire.org groups = System/Base @@ -47,6 +47,7 @@ build gperf hwdata intltool >= 0.51.0 + kbd kmod-devel >= 15 libacl-devel libblkid-devel @@ -61,6 +62,7 @@ build pam-devel pciutils-devel python3-devel + python3-jinja2 python3-lxml setup >= 3.0-13 usbutils @@ -88,8 +90,7 @@ build -Dsysusers=false \ -Dtimesyncd=false \ -Dtimedated=false \ - -Dpolkit=false \ - -Dstatic=false + -Dpolkit=false
prepare_cmds %{create_groups} @@ -107,9 +108,6 @@ build # Create dummy machine-id file, which is required for some tests. touch %{sysconfdir}/machine-id
- # Generate temporary machine-id, which is required at least by the id128 test. - systemd-machine-id-setup - # Run the testsuite. ninja test -v %{PARALLELISMFLAGS} -C build || true end @@ -187,9 +185,6 @@ build -e "s/^#ImportKernel=.*$/ImportKernel=yes/" \ -i %{BUILDROOT}/etc/systemd/journald.conf
- # Install legacy tmpfile to autocreate /run/lock on startup. - install -v -m 644 %{DIR_APP}/tmpfiles.d/legacy.conf %{BUILDROOT}%{prefix}/lib/tmpfiles.d/ - # Remove udev rules for "predictable" network device renaming. # http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterface... rm -vf %{BUILDROOT}/usr/lib/udev/rules.d/80-net-name-slot.rules @@ -230,8 +225,6 @@ end
packages package %{name} - groups += Base - prerequires += authconfig
requires @@ -245,6 +238,7 @@ packages end
provides + /bin/systemctl /bin/systemd /sbin/halt /sbin/init @@ -252,8 +246,10 @@ packages /sbin/reboot /sbin/shutdown
- syslog udev = %{thisver} + systemd-units = %{thisver} + + syslog end
conflicts
hooks/post-receive -- IPFire 3.x development tree
-
Michael Tremer