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 6e8f918394bee991c7d388ca1c5fd2ce16f5743d (commit) via d41dc4958c55c7ddfd7a95fff9ebe1079aa5cfc5 (commit) via 1ff51fee8bc53b2e385aace1841e57697eadad30 (commit) via 75faffedac9e36acd910d96ed790c178ed77710d (commit) from 424b6970b4e4951e2202a7b5e9609c091e65cacb (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 6e8f918394bee991c7d388ca1c5fd2ce16f5743d Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Mar 9 10:02:02 2023 +0000
Drop all compat-* packages
We have been building a fresh bootstrap where all packages have been rebuilt and linked against the current version of those libraries.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit d41dc4958c55c7ddfd7a95fff9ebe1079aa5cfc5 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Mar 9 10:00:33 2023 +0000
ldapvi: Source cannot be downloaded using HTTPS
The server seems to present an invalid certificate.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 1ff51fee8bc53b2e385aace1841e57697eadad30 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Mar 8 13:55:07 2023 +0000
lldpd: Disable seccomp support on aarch64
lldpd does not support seccomp on aarch64 and aborts with an corresponding error during compile time when enabled.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 75faffedac9e36acd910d96ed790c178ed77710d Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Mar 8 13:54:31 2023 +0000
openssl: Update to 3.0.8
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: compat-cyrus-sasl/compat-cyrus-sasl.nm | 74 ------- .../patches/cyrus-sasl-2.1.23-db5.patch | 22 --- compat-db/compat-db.nm | 219 --------------------- compat-gdbm/compat-gdbm.nm | 63 ------ compat-gmp/compat-gmp.nm | 77 -------- compat-gmp/patches/gmp-fix-tscan.patch0 | 13 -- compat-gnutls/compat-gnutls.nm | 80 -------- compat-gnutls/patches/gnutls-3.1.11-nosrp.patch | 12 -- compat-gnutls/patches/gnutls-3.2.7-rpath.patch | 12 -- compat-icu/compat-icu.nm | 73 ------- compat-isl/compat-isl.nm | 59 ------ compat-libffi/compat-libffi.nm | 48 ----- compat-libgcrypt/compat-libgcrypt.nm | 62 ------ compat-libmpc/compat-libmpc.nm | 68 ------- compat-libpng/compat-libpng.nm | 61 ------ compat-libxcrypt/compat-libxcrypt.nm | 52 ----- .../patches/libxcrypt-4.4.33-hashes.patch | 14 -- compat-mpfr/compat-mpfr.nm | 49 ----- compat-ncurses/compat-ncurses.nm | 123 ------------ .../0001-Fix-errors-in-type-conversion.patch | 153 -------------- compat-nettle/compat-nettle.nm | 64 ------ compat-openssl/compat-openssl.nm | 125 ------------ compat-pcre/compat-pcre.nm | 75 ------- compat-readline/compat-readline.nm | 66 ------- .../patches/readline-5.0-no_rpath.patch | 13 -- compat-xz/compat-xz.nm | 62 ------ ldapvi/ldapvi.nm | 2 +- lldpd/lldpd.nm | 12 +- openssl/openssl.nm | 4 +- 29 files changed, 12 insertions(+), 1745 deletions(-) delete mode 100644 compat-cyrus-sasl/compat-cyrus-sasl.nm delete mode 100644 compat-cyrus-sasl/patches/cyrus-sasl-2.1.23-db5.patch delete mode 100644 compat-db/compat-db.nm delete mode 100644 compat-gdbm/compat-gdbm.nm delete mode 100644 compat-gmp/compat-gmp.nm delete mode 100644 compat-gmp/patches/gmp-fix-tscan.patch0 delete mode 100644 compat-gnutls/compat-gnutls.nm delete mode 100644 compat-gnutls/patches/gnutls-3.1.11-nosrp.patch delete mode 100644 compat-gnutls/patches/gnutls-3.2.7-rpath.patch delete mode 100644 compat-icu/compat-icu.nm delete mode 100644 compat-isl/compat-isl.nm delete mode 100644 compat-libffi/compat-libffi.nm delete mode 100644 compat-libgcrypt/compat-libgcrypt.nm delete mode 100644 compat-libmpc/compat-libmpc.nm delete mode 100644 compat-libpng/compat-libpng.nm delete mode 100644 compat-libxcrypt/compat-libxcrypt.nm delete mode 100644 compat-libxcrypt/patches/libxcrypt-4.4.33-hashes.patch delete mode 100644 compat-mpfr/compat-mpfr.nm delete mode 100644 compat-ncurses/compat-ncurses.nm delete mode 100644 compat-ncurses/patches/0001-Fix-errors-in-type-conversion.patch delete mode 100644 compat-nettle/compat-nettle.nm delete mode 100644 compat-openssl/compat-openssl.nm delete mode 100644 compat-pcre/compat-pcre.nm delete mode 100644 compat-readline/compat-readline.nm delete mode 100644 compat-readline/patches/readline-5.0-no_rpath.patch delete mode 100644 compat-xz/compat-xz.nm
Difference in files: diff --git a/compat-cyrus-sasl/compat-cyrus-sasl.nm b/compat-cyrus-sasl/compat-cyrus-sasl.nm deleted file mode 100644 index 38dd9d427..000000000 --- a/compat-cyrus-sasl/compat-cyrus-sasl.nm +++ /dev/null @@ -1,74 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = compat-cyrus-sasl -version = 2.1.25 -release = 2.1 - -thisapp = cyrus-sasl-%{version} - -groups = System/Libraries -url = http://asg.web.cmu.edu/sasl/sasl-library.html -license = BSD -summary = The Cyrus SASL library. - -description - The cyrus-sasl package contains the Cyrus implementation of SASL. - SASL is the Simple Authentication and Security Layer, a method for - adding authentication support to connection-based protocols. -end - -source_dl = ftp://ftp.cyrusimap.org/cyrus-sasl/ - -build - requires - automake - libdb-devel - openssl-devel - pam-devel - end - - prepare_cmds - # for aarch64 - for i in $(find . -name config.guess -or -name config.sub); do - cp -vf %{datadir}/automake-*/config.{guess,sub} $(dirname ${i}) - done - end - - configure_options += \ - --sysconfdir=/etc \ - --with-configdir=%{libdir}/sasl2:/etc/sasl2 \ - --with-plugindir=%{libdir}/sasl2 \ - --with-dbpath=/var/lib/sasl/sasldb2 \ - --with-saslauthd=/var/run/saslauthd \ - --mandir=/usr/share/man - - PARALLELISMFLAGS = # Disabled - - install - # Only install libraries. - mkdir -pv %{BUILDROOT}%{libdir} - install -m 755 lib/.libs/libsasl2.so.2.0.25 %{BUILDROOT}%{libdir} - ln -svf libsasl2.so.2.0.25 %{BUILDROOT}%{libdir}/libpcre.so.2 - end -end - -packages - package %{name} - provides - cyrus-sasl = %{thisver} - cyrus-sasl-libs = %{thisver} - end - - conflicts - cyrus-sasl <= %{thisver} - cyrus-sasl-libs <= %{thisver} - end - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/compat-cyrus-sasl/patches/cyrus-sasl-2.1.23-db5.patch b/compat-cyrus-sasl/patches/cyrus-sasl-2.1.23-db5.patch deleted file mode 100644 index ff831cd99..000000000 --- a/compat-cyrus-sasl/patches/cyrus-sasl-2.1.23-db5.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/sasldb/db_berkeley.c -+++ b/sasldb/db_berkeley.c -@@ -100,7 +100,7 @@ static int berkeleydb_open(const sasl_ut - ret = db_create(mbdb, NULL, 0); - if (ret == 0 && *mbdb != NULL) - { --#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1 -+#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1)) - ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660); - #else - ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660); ---- a/utils/dbconverter-2.c -+++ b/utils/dbconverter-2.c -@@ -214,7 +214,7 @@ static int berkeleydb_open(const char *p - ret = db_create(mbdb, NULL, 0); - if (ret == 0 && *mbdb != NULL) - { --#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1 -+#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1)) - ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664); - #else - ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664); diff --git a/compat-db/compat-db.nm b/compat-db/compat-db.nm deleted file mode 100644 index 37d319d8e..000000000 --- a/compat-db/compat-db.nm +++ /dev/null @@ -1,219 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = compat-db -version = %{main_version} -# Release cannot be reset because the sub-packages won't get updated -release = 9 -thisapp = db-%{version} - -maintainer = Michael Tremer michael.tremer@ipfire.org -groups = System/Libraries -url = http://www.oracle.com/technology/products/berkeley-db/ -license = Proprietary -summary = The Berkeley DB database compatibility library. - -description - Berkeley DB (BDB) is a computer software library that provides - a high-performance embedded database. - - This package contains various version that were used in the - past. Some software may depend on them though. -end - -version_db46 = 4.6.21 -version_db47 = 4.7.25 -version_db48 = 4.8.30 -version_db52 = 5.2.36 -version_db53 = 5.3.28 -versions = %{version_db53} %{version_db52} %{version_db48} %{version_db47} %{version_db46} -main_version = %{version_db53} - -source_dl = http://download.oracle.com/berkeley-db/ -sources = db-%{version_db53}.tar.gz -sources += db-%{version_db52}.tar.gz -sources += db-%{version_db48}.tar.gz -sources += db-%{version_db47}.tar.gz -sources += db-%{version_db46}.tar.gz - -build - requires - gcc-c++ - end - - CFLAGS += -fno-strict-aliasing - CFLAGS += -Wno-format - - configure_options += \ - --enable-compat185 \ - --enable-cxx \ - --disable-static - - build - for version in %{versions}; do - cd %{DIR_SRC}/db-${version}/build_unix - ../dist/configure \ - %{configure_options} - - %{MACRO_FIX_LIBTOOL} - - make %{PARALLELISMFLAGS} - done - end - - install - for version in %{versions}; do - cd %{DIR_SRC}/db-${version}/build_unix - make install DESTDIR=%{BUILDROOT} \ - docdir=%{datadir}/doc/db-${version} - - # Remove unversioned libs. - rm -vf %{BUILDROOT}%{libdir}/libdb*-{5,4}.so - - # Move binaries. - tag=$(echo ${version} | cut -c1,3) - for bin in %{BUILDROOT}%{bindir}/*db_*; do - t=$(echo ${bin} | sed "s/db_/db${tag}_/g") - mv -v ${bin} ${t} - done - - # Move libs. - major=$(echo ${version} | cut -c1-3) - mkdir -pv %{BUILDROOT}%{libdir}/db${version} - pushd %{BUILDROOT}%{libdir}/db${version} - ln -svf ../libdb-${major}.so libdb.so - ln -svf ../libdb_cxx-${major}.so libdb_cxx.so - popd - rm -vf %{BUILDROOT}%{libdir}/libdb{,_cxx}.so - - # Move headers. - mkdir -pv %{BUILDROOT}%{includedir}/db-${version} - mv -v %{BUILDROOT}%{includedir}/*.h \ - %{BUILDROOT}%{includedir}/db-${version}/ - ln -svf --relative \ - %{BUILDROOT}%{includedir}/db-${version} \ - %{BUILDROOT}%{includedir}/db-${major} - - # Remove documentation. - rm -rf %{BUILDROOT}%{datadir}/doc - done - - # Link latest headers into /usr/include - for file in %{BUILDROOT}%{includedir}/db-%{main_version}/*.h; do - ln -svf --relative ${file} %{BUILDROOT}%{includedir}/ - done - end -end - -packages - package %{name} - requires - compat-db53 = %{version_db53}-%{_release} - compat-db52 = %{version_db52}-%{_release} - compat-db48 = %{version_db48}-%{_release} - compat-db47 = %{version_db47}-%{_release} - compat-db46 = %{version_db46}-%{_release} - end - end - - template COMPATDB - version = %{version_db%{version_tag}} - - summary = The Berkeley DB database %{version} compatibility library. - description - The Berkeley Database (Berkeley DB) is a programmatic toolkit that provides - embedded database support for both traditional and client/server applications. - - This package contains Berkeley DB library version %{version} used for compatibility. - end - - files - %{bindir}/berkeley_db%{version_tag}_* - %{bindir}/db%{version_tag}_* - %{libdir}/db%{version} - %{libdir}/libdb*-%{version_major}.so - end - - obsoletes - db4 < 1:%{version_major} - db4-devel < 1:%{version_major} - db4-cxx < 1:%{version_major} - db4-utils < 1:%{version_major} - - libdb <= %{version_major} - end - - conflicts - libdb = %{version_major} - end - end - - package %{name}53 - template COMPATDB - - version_tag = 53 - version_major = 5.3 - end - - package %{name}52 - template COMPATDB - - version_tag = 52 - version_major = 5.2 - end - - package %{name}48 - template COMPATDB - - version_tag = 48 - version_major = 4.8 - end - - package %{name}47 - template COMPATDB - - version_tag = 47 - version_major = 4.7 - end - - package %{name}46 - template COMPATDB - - version_tag = 46 - version_major = 4.6 - end - - package %{name}-headers - summary = The Berkeley DB database compatibility headers. - description - The Berkeley Database (Berkeley DB) is a programmatic toolkit that provides - embedded database support for both traditional and client/server applications. - - This package contains Berkeley DB library headers used for compatibility. - end - - files = %{includedir} - - requires - compat-db = %{main_version}-%{_release} - end - - provides - libdb-devel = %{version_db53} - libdb-devel = %{version_db52} - db4-devel = %{version_db48} - db4-devel = %{version_db47} - db4-devel = %{version_db46} - end - - conflicts - libdb-devel - end - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/compat-gdbm/compat-gdbm.nm b/compat-gdbm/compat-gdbm.nm deleted file mode 100644 index c86db05db..000000000 --- a/compat-gdbm/compat-gdbm.nm +++ /dev/null @@ -1,63 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = compat-gdbm -version = 1.12 -release = 1 -thisapp = gdbm-%{version} - -groups = Development/Tools -url = http://www.gnu.org/software/gdbm/ -license = GPLv2+ -summary = The GDBM package contains the GNU Database Manager. - -description - The GDBM package contains the GNU Database Manager. This is a disk file \ - format database which stores key/data-pairs in single files. The actual \ - data of any record being stored is indexed by a unique key, which can be \ - retrieved in less time than if it was stored in a text file. -end - -source_dl = https://ftp.gnu.org/gnu/gdbm/ - -build - CFLAGS += -fcommon - - install - make install \ - prefix=%{BUILDROOT}%{prefix} \ - libdir=%{BUILDROOT}%{libdir} \ - includedir=%{BUILDROOT}%{includedir} \ - mandir=%{BUILDROOT}%{mandir} \ - infodir=%{BUILDROOT}%{infodir} - - # Remove all man pages provided by gdbm-devel - rm -rfv %{BUILDROOT}%{mandir}/man3 - end -end - -packages - package %{name} - conflicts - gdbm <= %{version} - end - end - - package %{name}-devel - template DEVEL - - requires - compat-gdbm = %{thisver} - end - - conflicts - gdbm-devel - end - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/compat-gmp/compat-gmp.nm b/compat-gmp/compat-gmp.nm deleted file mode 100644 index 60168433a..000000000 --- a/compat-gmp/compat-gmp.nm +++ /dev/null @@ -1,77 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = compat-gmp -version = 4.3.2 -release = 1.1 -thisapp = gmp-%{version} - -groups = System/Libraries -url = http://gmplib.org/ -license = LGPLv3+ -summary = A GNU arbitrary precision library. - -description - The gmp package contains GNU MP, a library for arbitrary precision - arithmetic, signed integers operations, rational numbers and floating - point numbers. GNU MP is designed for speed, for both small and very - large operands. GNU MP is fast because it uses fullwords as the basic - arithmetic type, it uses fast algorithms, it carefully optimizes - assembly code for many CPUs' most common inner loops, and it generally - emphasizes speed over simplicity/elegance in its operations. -end - -source_dl += https://gmplib.org/download/gmp/archive/ ftp://ftp.gnu.org/gnu/gmp/ -sources = %{thisapp}.tar.xz - -build - requires - gcc-c++ - m4 - end - - export ABI = standard - - if "%{DISTRO_ARCH}" == "x86_64" - ABI = 64 - end - - if "%{DISTRO_ARCH}" == "i686" - ABI = 32 - end - - configure_options += \ - --enable-cxx \ - --enable-mpbsd \ - --disable-static - - test - export LD_LIBRARY_PATH=$(pwd)/.libs - make check - end - - install - # Install just the library and no headers. - mkdir -pv %{BUILDROOT}%{libdir} - install -m 644 .libs/libgmp.so.3.5.2 %{BUILDROOT}%{libdir} - ln -svf libgmp.so.3.5.2 %{BUILDROOT}%{libdir}/libgmp.so.3 - end -end - -packages - package %{name} - provides - gmp = %{thisver} - end - - obsoletes - gmp <= %{thisver} - end - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/compat-gmp/patches/gmp-fix-tscan.patch0 b/compat-gmp/patches/gmp-fix-tscan.patch0 deleted file mode 100644 index cddbfe079..000000000 --- a/compat-gmp/patches/gmp-fix-tscan.patch0 +++ /dev/null @@ -1,13 +0,0 @@ -https://gmplib.org/list-archives/gmp-bugs/2011-October/002417.html - ---- tests/mpz/t-scan.c 2011-05-08 11:49:29.000000000 +0200 -+++ tests/mpz/t-scan.c 2011-10-10 16:37:13.657829003 +0200 -@@ -79,7 +79,7 @@ - - for (isize = 0; isize <= size; isize++) - { -- for (oindex = 0; oindex <= numberof (offset); oindex++) -+ for (oindex = 0; oindex < numberof (offset); oindex++) - { - o = offset[oindex]; - if ((int) isize*GMP_NUMB_BITS < -o) diff --git a/compat-gnutls/compat-gnutls.nm b/compat-gnutls/compat-gnutls.nm deleted file mode 100644 index 3ae618164..000000000 --- a/compat-gnutls/compat-gnutls.nm +++ /dev/null @@ -1,80 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = compat-gnutls -version = %{ver_maj}.%{ver_min} -ver_maj = 3.3 -ver_min = 25 -release = 3.1 -thisapp = gnutls-%{version} - -groups = System/Libraries -url = http://www.gnu.org/software/gnutls/ -license = LGPLv2.1+ -summary = A general-purpose cryptography library. - -description - GnuTLS is a project that aims to develop a library which provides - a secure layer, over a reliable transport layer. Currently the - GnuTLS library implements the proposed standards by the IETF's - TLS working group. -end - -source_dl = https://www.gnupg.org/ftp/gcrypt/gnutls/v%%7Bver_maj%7D/ -sources = %{thisapp}.tar.xz - -build - requires - gettext - libgcrypt-devel - libidn-devel - libtasn1-devel >= 3.2 - lzo-devel - nettle-devel >= 3.2 - perl - p11-kit-devel >= 0.23.1 - readline-devel - texinfo - zlib-devel - end - - # Build library without an executable stack. - CFLAGS += -Wa,--noexecstack - - configure_options += \ - --with-included-libcfg \ - --disable-openssl-compatibility \ - --disable-srp-authentication \ - --disable-non-suiteb-curves \ - --disable-guile - - # Test suite does not work when srp is disabled. - test - export LD_LIBRARY_PATH=$(pwd)/lib/.libs - make check - end - - install - # Install just the library and no headers. - mkdir -pv %{BUILDROOT}%{libdir} - cp -avf lib/.libs/libgnutls.so.* %{BUILDROOT}%{libdir} - end -end - -packages - package %{name} - provides - gnutls = %{thisver} - end - - obsoletes - gnutls <= %{thisver} - end - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/compat-gnutls/patches/gnutls-3.1.11-nosrp.patch b/compat-gnutls/patches/gnutls-3.1.11-nosrp.patch deleted file mode 100644 index 29227c08c..000000000 --- a/compat-gnutls/patches/gnutls-3.1.11-nosrp.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up gnutls-3.1.10/tests/srp/mini-srp.c.noecc gnutls-3.1.10/tests/srp/mini-srp.c ---- gnutls-3.1.10/tests/srp/mini-srp.c.noecc 2013-03-21 21:42:28.000000000 +0100 -+++ gnutls-3.1.10/tests/srp/mini-srp.c 2013-03-25 13:42:20.753422209 +0100 -@@ -27,7 +27,7 @@ - #include <stdio.h> - #include <stdlib.h> - --#if defined(_WIN32) -+#if defined(_WIN32) || !defined(ENABLE_SRP) - - int main() - { diff --git a/compat-gnutls/patches/gnutls-3.2.7-rpath.patch b/compat-gnutls/patches/gnutls-3.2.7-rpath.patch deleted file mode 100644 index 4e6aed37a..000000000 --- a/compat-gnutls/patches/gnutls-3.2.7-rpath.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur gnutls-3.2.7.orig/configure gnutls-3.2.7/configure ---- gnutls-3.2.7.orig/configure 2013-11-23 11:09:49.000000000 +0100 -+++ gnutls-3.2.7/configure 2013-11-25 16:53:05.559440656 +0100 -@@ -39652,7 +39652,7 @@ - shlibpath_overrides_runpath=unknown - version_type=none - dynamic_linker="$host_os ld.so" --sys_lib_dlsearch_path_spec="/lib /usr/lib" -+sys_lib_dlsearch_path_spec="/lib /usr/lib /lib64 /usr/lib64" - need_lib_prefix=unknown - hardcode_into_libs=no - diff --git a/compat-icu/compat-icu.nm b/compat-icu/compat-icu.nm deleted file mode 100644 index 8ca0f6ac5..000000000 --- a/compat-icu/compat-icu.nm +++ /dev/null @@ -1,73 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = compat-icu -version = %{ver_major}.%{ver_minor}.%{ver_plevel} -ver_major = 56 -ver_minor = 1 -ver_plevel = -release = 1 -thisapp = icu-%{version} - -groups = Development/Tools -url = http://www.icu-project.org -license = MIT and UCD and Public Domain -summary = International Components for Unicode. - -description - Tools and utilities for developing with icu. -end - -source_dl = https://github.com/unicode-org/icu/releases/download/release-%%7Bver_major%7... -sources = icu4c-%{ver_major}_%{ver_minor}-src.tgz - -build - DIR_APP = %{DIR_SRC}/icu/source - - configure_options += \ - --disable-static \ - --with-data-packaging=library \ - --disable-samples - - prepare_cmds - sed -i 's|-nodefaultlibs -nostdlib||' config/mh-linux - end - - configure_cmds - # There is no source/doc/html/search/ directory - sed -i '/^\s+$(INSTALL_DATA) $(docsrchfiles) $(DESTDIR)$(docdir)/$(docsubsrchdir)\s*$/d' Makefile - - # The configure --disable-renaming and possibly other options result in icu/source/uconfig.h.prepend - # being created, include that content in icu/source/common/unicode/uconfig.h to propagate to consumer packages. - test -f uconfig.h.prepend && sed -e '/^#define __UCONFIG_H__/ r uconfig.h.prepend' \ - -i common/unicode/uconfig.h - end - - test - make check - end - - install - # Install just the library and no headers. - mkdir -pv %{BUILDROOT}%{libdir} - cp -av lib/*.so.* %{BUILDROOT}%{libdir} - end -end - -packages - package %{name} - provides - icu = %{thisver} - end - - obsoletes - icu <= %{thisver} - end - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/compat-isl/compat-isl.nm b/compat-isl/compat-isl.nm deleted file mode 100644 index 04ef22c48..000000000 --- a/compat-isl/compat-isl.nm +++ /dev/null @@ -1,59 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = compat-isl -version = 0.16.1 -release = 1 -thisapp = isl-%{version} - -groups = System/Libraries -url = http://isl.gforge.inria.fr/ -license = MIT -summary = Integer Set Library - -description - isl is a library for manipulating sets and relations of integer points - bounded by linear constraints. Supported operations on sets include - intersection, union, set difference, emptiness check, convex hull, - (integer) affine hull, integer projection, computing the lexicographic - minimum using parametric integer programming, coalescing and parametric - vertex enumeration. -end - -source_dl += https://gcc.gnu.org/pub/gcc/infrastructure/ -sources = %{thisapp}.tar.bz2 - -build - requires - gmp-devel - end - - test - 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.15.1.1 %{BUILDROOT}%{libdir} - ln -svf libisl.so.15.1.1 %{BUILDROOT}%{libdir}/libisl.so.15 - end -end - -packages - package %{name} - provides - isl = %{thisver} - end - - obsoletes - isl <= %{thisver} - end - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/compat-libffi/compat-libffi.nm b/compat-libffi/compat-libffi.nm deleted file mode 100644 index 891ee9d5c..000000000 --- a/compat-libffi/compat-libffi.nm +++ /dev/null @@ -1,48 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = compat-libffi -version = 3.2.1 -release = 1 -thisapp = libffi-%{version} - -groups = System/Libraries -url = https://sourceware.org/libffi -license = BSD -summary = A portable foreign function interface library - -description - This package is for compatability to old versions only, and provides no - Development libraries. - - The libffi library provides a portable, high level programming - interface to various calling conventions. This allows a programmer to - call any function specified by a call interface description at run time. -end - -source_dl = ftp://sourceware.org/pub/libffi/ - -build - install_cmds - # Remove all development files, because nothing - # should link against this. - rm -rvf %{BUILDROOT}%{libdir}/pkgconfig - rm -rvf %{BUILDROOT}%{libdir}/libffi-%{version} - rm -rvf %{BUILDROOT}%{libdir}/*.so - rm -rvf %{BUILDROOT}%{mandir} - end -end - -packages - package %{name} - obsoletes - libffi <= %{thisver} - end - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/compat-libgcrypt/compat-libgcrypt.nm b/compat-libgcrypt/compat-libgcrypt.nm deleted file mode 100644 index 552399f0b..000000000 --- a/compat-libgcrypt/compat-libgcrypt.nm +++ /dev/null @@ -1,62 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = compat-libgcrypt -version = 1.5.4 -release = 2 -thisapp = libgcrypt-%{version} - -groups = System/Libraries -url = http://www.gnupg.org/ -license = LGPLv2.1+ -summary = A general-purpose cryptography library - -description - Libgcrypt is a general purpose crypto library based on the code used - in GNU Privacy Guard. -end - -source_dl = ftp://ftp.gnupg.org/gcrypt/libgcrypt/ -sources = %{thisapp}.tar.bz2 - -build - requires - gcc-c++ - libgpg-error-devel - end - - export LD_LIBRARY_PATH = %{DIR_APP}/src/.libs - - configure_options += \ - --enable-noexecstack - - test - make check - end - - install - # Install just the library and no headers. - mkdir -pv %{BUILDROOT}%{libdir} - - install -m 755 src/.libs/libgcrypt.so.11.8.3 %{BUILDROOT}%{libdir} - ln -svf libgcrypt.so.11.8.3 %{BUILDROOT}%{libdir}/libgcrypt.so.11 - end -end - -packages - package %{name} - provides - libgcrypt = %{thisver} - end - - obsoletes - libgcrypt <= %{thisver} - end - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/compat-libmpc/compat-libmpc.nm b/compat-libmpc/compat-libmpc.nm deleted file mode 100644 index f50e711b1..000000000 --- a/compat-libmpc/compat-libmpc.nm +++ /dev/null @@ -1,68 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = compat-libmpc -version = 0.9 -release = 2 - -thisapp = mpc-%{version} - -groups = System/Libraries -url = http://www.multiprecision.org/ -license = LGPLv2.1+ -summary = Mpc is a C library for the arithmetic of complex numbers. - -description - Mpc is a C library for the arithmetic of complex numbers with - arbitrarily high precision and correct rounding of the result. - It is built upon and follows the same principles as Mpfr. -end - -source_dl = http://www.multiprecision.org/mpc/download/ - -build - requires - gmp-devel >= 4.3.2 - mpfr-devel >= 2.4.2 - end - - export LD_LIBRARY_PATH = %{DIR_APP}/src/.libs - export EGREP = egrep - - configure_options += \ - --disable-static \ - --enable-shared - - test - make check - end - - install - # Only install libraries. - mkdir -pv %{BUILDROOT}%{libdir} - install -m 644 src/.libs/libmpc.so.2.0.0 %{BUILDROOT}%{libdir} - ln -svf libmpc.so.2.0.0 %{BUILDROOT}%{libdir}/libmpc.so.2 - end -end - -packages - package %{name} - provides - mpc = %{thisver} - end - - obsoletes - mpc-compat - end - - conflicts - mpc <= %{thisver} - end - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/compat-libpng/compat-libpng.nm b/compat-libpng/compat-libpng.nm deleted file mode 100644 index 44b424b97..000000000 --- a/compat-libpng/compat-libpng.nm +++ /dev/null @@ -1,61 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = compat-libpng -version = 1.5.18 -release = 1 -thisapp = libpng-%{version} - -groups = System/Libraries -url = http://www.libpng.org/pub/png/ -license = zlib -summary = A library of functions for manipulating PNG image format files. - -description - The libpng package contains a library of functions for creating and - manipulating PNG (Portable Network Graphics) image format files. - PNG is a bit-mapped graphics format similar to the GIF format. PNG - was created to replace the GIF format, since GIF uses a patented - data compression algorithm. -end - -source_dl += http://downloads.sourceforge.net/project/libpng/libpng15/%%7Bversion%7D/ -source_dl += http://downloads.sourceforge.net/project/libpng/history/libpng15/%%7Bversion... - -sources = %{thisapp}.tar.xz - -build - requires - pkg-config - zlib-devel - end - - install - # Install just the library and no headers. - mkdir -pv %{BUILDROOT}%{libdir} - install -m 755 .libs/libpng15.so.15.18.0 %{BUILDROOT}%{libdir} - ln -svf libpng15.so.15.18.0 %{BUILDROOT}%{libdir}/libpng15.so.15 - end -end - -packages - package %{name} - provides - libpng = %{thisver} - end - - obsoletes - libpng-compat - end - - conflicts - libpng <= %{thisver} - end - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/compat-libxcrypt/compat-libxcrypt.nm b/compat-libxcrypt/compat-libxcrypt.nm deleted file mode 100644 index de696a2d7..000000000 --- a/compat-libxcrypt/compat-libxcrypt.nm +++ /dev/null @@ -1,52 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = compat-libxcrypt -version = 4.4.33 -release = 1 -thisapp = libxcrypt-%{version} - -groups = System/Libraries -url = https://github.com/besser82/libxcrypt/ -license = LGPLv2.1 -summary = Extended crypt library for descrypt, md5crypt, bcrypt, and others - -description - This package provides a version of libxcrypt which is compatible with - the old glibc interface. -end - -source_dl = https://github.com/besser82/libxcrypt/releases/download/v%%7Bversion%7D/ -sources = %{thisapp}.tar.xz - -build - requires - perl - end - - configure_options += \ - --disable-static \ - --enable-hashes=strong,glibc \ - --enable-obsolete-api=glibc \ - --disable-failure-tokens - - test - LD_LIBRARY_PATH="%{DIR_APP}/.libs" make check - end - - install - mkdir -pv %{BUILDROOT}%{libdir} - install -v -m 755 .libs/libcrypt.so.1.1.0 %{BUILDROOT}%{libdir}/libcrypt.so.1.1.0 - ln -svf libcrypt.so.1.1.0 %{BUILDROOT}%{libdir}/libcrypt.so.1 - end -end - -packages - package %{name} - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/compat-libxcrypt/patches/libxcrypt-4.4.33-hashes.patch b/compat-libxcrypt/patches/libxcrypt-4.4.33-hashes.patch deleted file mode 100644 index 42f5d67a7..000000000 --- a/compat-libxcrypt/patches/libxcrypt-4.4.33-hashes.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/build-aux/scripts/expand-selected-hashes b/build-aux/scripts/expand-selected-hashes -index 10d0bcc..2558c42 100644 ---- a/build-aux/scripts/expand-selected-hashes -+++ b/build-aux/scripts/expand-selected-hashes -@@ -50,9 +50,6 @@ sub expand_selected { - push @errors, "'$w' is not a hash or group name\n"; - } - } -- if (scalar(%enabled) == 0) { -- push @errors, "no hashes are enabled\n"; -- } - die join q{}, @errors if @errors; - return keys %enabled; - } diff --git a/compat-mpfr/compat-mpfr.nm b/compat-mpfr/compat-mpfr.nm deleted file mode 100644 index f97c1d549..000000000 --- a/compat-mpfr/compat-mpfr.nm +++ /dev/null @@ -1,49 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = compat-mpfr -version = 3.1.6 -release = 1 -thisapp = mpfr-%{version} - -groups = System/Libraries -url = http://www.mpfr.org/ -license = LGPLv2+ and GPLv2+ and GFDL -summary = A C library for multiple-precision floating-point computations. - -description - The MPFR library is a C library for multiple-precision floating-point - computations with correct rounding. The MPFR is efficient and - also has a well-defined semantics. It copies the good ideas from the - ANSI/IEEE-754 standard for double-precision floating-point arithmetic - (53-bit mantissa). MPFR is based on the GMP multiple-precision - library. -end - -source_dl = https://ftp.gnu.org/gnu/mpfr/ - -build - requires - gmp-devel - end - - test - make check LD_LIBRARY_PATH="%{DIR_APP}/src/.libs" - end - - install - mkdir -pv %{BUILDROOT}%{libdir} - install -v -m 755 src/.libs/libmpfr.so.4.1.6 %{BUILDROOT}%{libdir}/libmpfr.so.4.1.6 - ln -svf libmpfr.so.4.1.6 %{BUILDROOT}%{libdir}/libmpfr.so.4 - end -end - -packages - package %{name} - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/compat-ncurses/compat-ncurses.nm b/compat-ncurses/compat-ncurses.nm deleted file mode 100644 index 6e36d848a..000000000 --- a/compat-ncurses/compat-ncurses.nm +++ /dev/null @@ -1,123 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = compat-ncurses -version = 5.9 -release = 13 -thisapp = ncurses-%{version} - -groups = System/Base -url = http://invisible-island.net/ncurses/ncurses.html -license = MIT -summary = Ncurses support utilities. - -description - The curses library routines are a terminal-independent method of - updating character screens with reasonable optimization. The ncurses - (new curses) library is a freely distributable replacement for the - discontinued 4.4 BSD classic curses library. -end - -source_dl = https://ftp.gnu.org/gnu/ncurses/ - -build - requires - gcc-c++ - end - - export CPPFLAGS += -P - CXXFLAGS += -std=c++98 - - configure_options += \ - --with-shared \ - --without-debug \ - --without-ada \ - --with-ospeed=unsigned \ - --with-chtype=long \ - --enable-hard-tabs \ - --enable-xmc-glitch \ - --enable-colorfgbg \ - --with-terminfo-dirs=%{sysconfdir}/terminfo:%{datadir}/terminfo \ - --enable-overwrite \ - --enable-pc-files \ - --with-termlib=tinfo - - export PKG_CONFIG_LIBDIR=%{libdir}/pkgconfig - - build - mkdir -pv narrowc widec - - # Build narrowc version. - cd narrowc - ln -svf ../configure . - ./configure %{configure_options} --with-ticlib - make %{PARALLELISMFLAGS} libs - make %{PARALLELISMFLAGS} -C progs - - # Build widec version. - cd ../widec - ln -svf ../configure . - ./configure %{configure_options} --enable-widec --without-progs - make %{PARALLELISMFLAGS} libs - cd .. - end - - install - make -C narrowc DESTDIR=%{BUILDROOT} install.libs - rm -rvf %{BUILDROOT}%{libdir}/libtinfo.* - make -C widec DESTDIR=%{BUILDROOT} install.libs - - chmod -v 755 %{BUILDROOT}%{libdir}/lib*.so.*.* - - # don't require -ltinfo when linking with --no-add-needed - for l in %{BUILDROOT}%{libdir}/libncurses{,w}.so; do - soname=$(basename $(readlink $l)) - rm -f $l - echo "INPUT($soname -ltinfo)" > $l - done - - rm -f %{BUILDROOT}%{libdir}/libcurses{,w}.so - echo "INPUT(-lncurses)" > %{BUILDROOT}%{libdir}/libcurses.so - echo "INPUT(-lncursesw)" > %{BUILDROOT}%{libdir}/libcursesw.so - echo "INPUT(-ltinfo)" > %{BUILDROOT}%{libdir}/libtermcap.so - - rm -vf %{BUILDROOT}%{libdir}/terminfo - rm -vf %{BUILDROOT}%{libdir}/pkgconfig/{*_g,ncurses++*}.pc - end -end - -packages - package %{name} - template LIBS - - provides - ncurses-libs = %{thisver} - end - - obsoletes - ncurses-libs <= %{thisver} - end - end - - package compat-ncurses-devel - template DEVEL - - requires - compat-ncurses = %{thisver} - end - - provides - ncurses-devel = %{thisver} - end - - obsoletes - ncurses-devel <= %{thisver} - end - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/compat-ncurses/patches/0001-Fix-errors-in-type-conversion.patch b/compat-ncurses/patches/0001-Fix-errors-in-type-conversion.patch deleted file mode 100644 index 18ecf3051..000000000 --- a/compat-ncurses/patches/0001-Fix-errors-in-type-conversion.patch +++ /dev/null @@ -1,153 +0,0 @@ -From 6e12cb73e23e8e9488c6db1c4710bb4b3d2b48c3 Mon Sep 17 00:00:00 2001 -From: Adam Jiang jiang.adam@gmail.com -Date: Fri, 1 Aug 2014 19:58:40 +0900 -Subject: [PATCH 1/2] Fix errors in type conversion - -Basically, converting to 'void*' is not a good idea. However, if that -conversion is unavoidable, it should be done in a proper way. 'const_cast' -itself could not convert type 'T*' to 'void *', this patch adds -'reintepret_cast' to do it correctly. - -At the same time, function that returns on 'const' member like 'void*' should -not be declared as 'const'. ---- - c++/cursesf.h | 12 +++++++----- - c++/cursesm.h | 10 +++++----- - c++/cursesp.h | 9 +++++---- - 3 files changed, 17 insertions(+), 14 deletions(-) - -diff --git a/c++/cursesf.h b/c++/cursesf.h -index 70a30c3..23b3022 100644 ---- a/c++/cursesf.h -+++ b/c++/cursesf.h -@@ -673,7 +673,8 @@ protected: - const T* p_UserData = STATIC_CAST(T*)(0)) - : NCursesForm(nlines,ncols,begin_y,begin_x) { - if (form) -- set_user (const_cast<void *>(p_UserData)); -+ set_user (const_cast<void *>(reinterpret_cast<const void*> -+ (p_UserData))); - } - - public: -@@ -683,7 +684,7 @@ public: - bool autoDelete_Fields=FALSE) - : NCursesForm (Fields, with_frame, autoDelete_Fields) { - if (form) -- set_user (const_cast<void *>(p_UserData)); -+ set_user (const_cast<void *>(reinterpret_cast<const void*>(p_UserData))); - }; - - NCursesUserForm (NCursesFormField Fields[], -@@ -697,19 +698,20 @@ public: - : NCursesForm (Fields, nlines, ncols, begin_y, begin_x, - with_frame, autoDelete_Fields) { - if (form) -- set_user (const_cast<void *>(p_UserData)); -+ set_user (const_cast<void *>(reinterpret_cast<const void*> -+ (p_UserData))); - }; - - virtual ~NCursesUserForm() { - }; - -- inline T* UserData (void) const { -+ inline T* UserData (void) { - return reinterpret_cast<T*>(get_user ()); - }; - - inline virtual void setUserData (const T* p_UserData) { - if (form) -- set_user (const_cast<void *>(p_UserData)); -+ set_user (const_cast<void *>(reinterpret_cast<const void*>(p_UserData))); - } - - }; -diff --git a/c++/cursesm.h b/c++/cursesm.h -index d9c2273..545ed49 100644 ---- a/c++/cursesm.h -+++ b/c++/cursesm.h -@@ -631,7 +631,7 @@ protected: - const T* p_UserData = STATIC_CAST(T*)(0)) - : NCursesMenu(nlines,ncols,begin_y,begin_x) { - if (menu) -- set_user (const_cast<void *>(p_UserData)); -+ set_user (const_cast<void *>(reinterpret_cast<const void*>(p_UserData))); - } - - public: -@@ -641,7 +641,7 @@ public: - bool autoDelete_Items=FALSE) - : NCursesMenu (Items, with_frame, autoDelete_Items) { - if (menu) -- set_user (const_cast<void *>(p_UserData)); -+ set_user (const_cast<void *>(reinterpret_cast<const void*>(p_UserData))); - }; - - NCursesUserMenu (NCursesMenuItem Items[], -@@ -653,19 +653,19 @@ public: - bool with_frame=FALSE) - : NCursesMenu (Items, nlines, ncols, begin_y, begin_x, with_frame) { - if (menu) -- set_user (const_cast<void *>(p_UserData)); -+ set_user (const_cast<void *>(reinterpret_cast<const void*>(p_UserData))); - }; - - virtual ~NCursesUserMenu() { - }; - -- inline T* UserData (void) const { -+ inline T* UserData (void) { - return reinterpret_cast<T*>(get_user ()); - }; - - inline virtual void setUserData (const T* p_UserData) { - if (menu) -- set_user (const_cast<void *>(p_UserData)); -+ set_user (const_cast<void *>(reinterpret_cast<const void*>(p_UserData))); - } - }; - -diff --git a/c++/cursesp.h b/c++/cursesp.h -index 9b63d6d..661e4a9 100644 ---- a/c++/cursesp.h -+++ b/c++/cursesp.h -@@ -236,7 +236,8 @@ public: - : NCursesPanel (nlines, ncols, begin_y, begin_x) - { - if (p) -- set_user (const_cast<void *>(p_UserData)); -+ set_user (const_cast<void *>(reinterpret_cast<const void*> -+ (p_UserData))); - }; - // This creates an user panel of the requested size with associated - // user data pointed to by p_UserData. -@@ -244,14 +245,14 @@ public: - NCursesUserPanel(const T* p_UserData = STATIC_CAST(T*)(0)) : NCursesPanel() - { - if (p) -- set_user(const_cast<void *>(p_UserData)); -+ set_user(const_cast<void *>(reinterpret_cast<const void*>(p_UserData))); - }; - // This creates an user panel associated with the ::stdscr and user data - // pointed to by p_UserData. - - virtual ~NCursesUserPanel() {}; - -- T* UserData (void) const -+ T* UserData (void) - { - return reinterpret_cast<T*>(get_user ()); - }; -@@ -260,7 +261,7 @@ public: - virtual void setUserData (const T* p_UserData) - { - if (p) -- set_user (const_cast<void *>(p_UserData)); -+ set_user (const_cast<void *>(reinterpret_cast<const void*>(p_UserData))); - } - // Associate the user panel with the user data pointed to by p_UserData. - }; --- -1.8.5.2 (Apple Git-48) - diff --git a/compat-nettle/compat-nettle.nm b/compat-nettle/compat-nettle.nm deleted file mode 100644 index 5e17e3df3..000000000 --- a/compat-nettle/compat-nettle.nm +++ /dev/null @@ -1,64 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = compat-nettle -version = 2.7.1 -release = 1 -thisapp = nettle-%{version} - -groups = System/Libraries -url = http://www.lysator.liu.se/~nisse/nettle/ -license = LGPL -summary = A low-level cryptographic library. - -description - Nettle is a cryptographic library that is designed to fit easily in - more or less any context: In crypto toolkits for object-oriented - languages (C++, Python, Pike, ...), in applications like LSH or GNUPG, - or even in kernel space. -end - -source_dl = http://www.lysator.liu.se/~nisse/archive/ - -build - requires - gmp-devel - m4 - end - - configure_options += \ - --enable-shared - - test - make check - end - - install - # Install just the library and no headers. - mkdir -pv %{BUILDROOT}%{libdir} - - install -m 755 libhogweed.so %{BUILDROOT}%{libdir}/libhogweed.so.2.5 - ln -svf libhogweed.so.2.5 %{BUILDROOT}%{libdir}/libhogweed.so.2 - - install -m 755 libnettle.so %{BUILDROOT}%{libdir}/libnettle.so.4.7 - ln -svf libnettle.so.4.7 %{BUILDROOT}%{libdir}/libnettle.so.4 - end -end - -packages - package %{name} - provides - nettle = %{thisver} - end - - obsoletes - nettle <= %{thisver} - end - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/compat-openssl/compat-openssl.nm b/compat-openssl/compat-openssl.nm deleted file mode 100644 index ae35bc356..000000000 --- a/compat-openssl/compat-openssl.nm +++ /dev/null @@ -1,125 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = compat-openssl -version = 1.1.1s -release = 2.1 -thisapp = openssl-%{version} - -maintainer = Michael Tremer michael.tremer@ipfire.org -groups = System/Libraries -url = https://www.openssl.org/ -license = OpenSSL -summary = A general purpose cryptography library with TLS implementation. - -description - The OpenSSL toolkit provides support for secure communications between - machines. OpenSSL includes a certificate management tool and shared - libraries which provide various cryptographic algorithms and protocols. -end - -source_dl = https://openssl.org/source/ - -build - requires - bc - gnutls-devel - perl - perl(FindBin) - perl(File::Copy) - perl(File::Compare) - perl(Test::Harness) - util-linux - zlib-devel - end - - CFLAGS += -DPURIFY - export RPM_OPT_FLAGS = %{CFLAGS} %{LDFLAGS} - - prepare_cmds - sed -e 's/SHLIB_VERSION_NUMBER "1.0.0"/SHLIB_VERSION_NUMBER "%{version}"/' \ - -i include/openssl/opensslv.h - - find crypto/ -name Makefile -exec \ - sed 's/^ASFLAGS=/&-Wa,--noexecstack /' -i {} ; - end - - # Set default ssl_arch. - ssl_arch = linux-%{DISTRO_ARCH} - - build - ./Configure \ - --prefix=/usr \ - --libdir=%{libdir} \ - --openssldir=/etc/pki/tls \ - shared \ - zlib-dynamic \ - enable-camellia \ - enable-md2 \ - enable-seed \ - enable-rfc3779 \ - no-idea \ - no-mdc2 \ - no-rc5 \ - no-ec2m \ - no-srp \ - -DSSL_FORBID_ENULL \ - %{ssl_arch} - - # Build. - make depend - make all - end - - #test - # - # #make test - #end - - install - make install DESTDIR=%{BUILDROOT} - - # Remove man pages and configuration files - rm -rfv %{BUILDROOT}%{sysconfdir} %{BUILDROOT}/usr/share/man* - - # Remove engines - rm -rfv %{BUILDROOT}%{libdir}/{engines,openssl} - - # Remove binaries - rm -rfv %{BUILDROOT}%{bindir} - end -end - -packages - package %{name} - requires - ca-certificates - end - - provides - openssl-libs = %{thisver} - end - - obsoletes - openssl-libs <= %{thisver} - end - end - - package %{name}-devel - template DEVEL - - provides - openssl-devel = %{thisver} - end - - obsoletes - openssl-devel <= %{thisver} - end - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/compat-pcre/compat-pcre.nm b/compat-pcre/compat-pcre.nm deleted file mode 100644 index 259d63f07..000000000 --- a/compat-pcre/compat-pcre.nm +++ /dev/null @@ -1,75 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = compat-pcre -version = 8.21 -release = 2 - -thisapp = pcre-%{version} - -groups = System/Libraries -url = http://www.pcre.org/ -license = BSD -summary = Perl-compatible regular expression library. - -description - Perl-compatible regular expression library. PCRE has its own native - API, but a set of "wrapper" functions that are based on the POSIX - API are also supplied in the library libpcreposix. -end - -source_dl = http://sourceforge.net/projects/pcre/files/pcre/%%7Bversion%7D/ - -build - requires - bzip2-devel - gcc-c++ - readline-devel - zlib-devel - end - - configure_options += \ - --disable-static \ - --docdir=/usr/share/doc/pcre-%{version} \ - --disable-jit \ - --enable-pcre8 \ - --enable-pcre16 \ - --enable-pcre32 \ - --enable-utf \ - --enable-unicode-properties \ - --enable-pcretest-libreadline - - test - export LD_LIBRARY_PATH=$(pwd)/.libs - make check - end - - install - # Only install libraries. - mkdir -pv %{BUILDROOT}%{libdir} - install -m 755 .libs/libpcre.so.0.0.1 %{BUILDROOT}%{libdir} - ln -svf libpcre.so.0.0.1 %{BUILDROOT}%{libdir}/libpcre.so.0 - end -end - -packages - package %{name} - provides - pcre = %{thisver} - end - - obsoletes - pcre-compat - end - - conflicts - pcre <= %{thisver} - end - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/compat-readline/compat-readline.nm b/compat-readline/compat-readline.nm deleted file mode 100644 index 66727a3ff..000000000 --- a/compat-readline/compat-readline.nm +++ /dev/null @@ -1,66 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = compat-readline -version = 7.0 -release = 1 - -thisapp = readline-%{version} - -groups = System/Libraries -url = ftp://ftp.gnu.org/gnu/readline/ -license = GPLv3+ -summary = A library for editing typed command lines - -description - The Readline library provides a set of functions that allow users to - edit command lines. Both Emacs and vi editing modes are available. - The Readline library includes additional functions for maintaining a - list of previously-entered command lines for recalling or editing - those lines, and for performing csh-like history expansion on - previous commands. -end - -source_dl = ftp://ftp.gnu.org/gnu/readline/ - -build - requires - ncurses-devel - end - - make_build_targets += \ - SHLIB_LIBS=-lncurses - - test - make check - end - - install - # Only install libraries. - mkdir -pv %{BUILDROOT}%{libdir} - - install -m 755 shlib/libhistory.so.7.0 %{BUILDROOT}%{libdir} - ln -svf libhistory.so.7.0 %{BUILDROOT}%{libdir}/libhistory.so.7 - - install -m 755 shlib/libreadline.so.7.0 %{BUILDROOT}%{libdir} - ln -svf libreadline.so.7.0 %{BUILDROOT}%{libdir}/libreadline.so.7 - end -end - -packages - package %{name} - provides - readline = %{thisver} - end - - conflicts - readline <= %{thisver} - end - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/compat-readline/patches/readline-5.0-no_rpath.patch b/compat-readline/patches/readline-5.0-no_rpath.patch deleted file mode 100644 index befad63e4..000000000 --- a/compat-readline/patches/readline-5.0-no_rpath.patch +++ /dev/null @@ -1,13 +0,0 @@ -ripped from Fedora - ---- a/support/shobj-conf -+++ b/support/shobj-conf -@@ -102,7 +102,7 @@ - SHOBJ_LD='${CC}' - SHOBJ_LDFLAGS='-shared -Wl,-soname,$@' - -- SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir) -Wl,-soname,`basename $@ $(SHLIB_MINOR)`' -+ SHLIB_XLDFLAGS='-Wl,-soname,`basename $@ $(SHLIB_MINOR)`' - SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)' - ;; - diff --git a/compat-xz/compat-xz.nm b/compat-xz/compat-xz.nm deleted file mode 100644 index 9acf280a2..000000000 --- a/compat-xz/compat-xz.nm +++ /dev/null @@ -1,62 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = compat-xz -version = 4.999.9beta -release = 1 - -thisapp = xz-%{version} - -groups = Applications/Compression -url = http://tukaani.org/xz/ -license = LGPLv2+ -summary = LZMA Utils. - -description - LZMA provides very high compression ratio and fast decompression. The - core of the LZMA utils is Igor Pavlov's LZMA SDK containing the actual - LZMA encoder/decoder. LZMA utils add a few scripts which provide - gzip-like command line interface and a couple of other LZMA related - tools. -end - -source_dl = http://tukaani.org/xz/ -sources = %{thisapp}.tar.xz - -build - configure_options += \ - --disable-rpath - - test - export LD_LIBRARY_PATH=$(pwd)/src/liblzma/.libs - make check - end - - install - # Only install libraries. - mkdir -pv %{BUILDROOT}%{libdir} - cp -vr src/liblzma/.libs/liblzma.so.0* %{BUILDROOT}%{libdir} - end -end - -packages - package %{name} - provides - xz = %{thisver} - end - - obsoletes - xz-compat - end - - conflicts - xz <= %{thisver} - end - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/ldapvi/ldapvi.nm b/ldapvi/ldapvi.nm index f1b939b0f..7b7bf5da8 100644 --- a/ldapvi/ldapvi.nm +++ b/ldapvi/ldapvi.nm @@ -18,7 +18,7 @@ description it as vipw(1) for LDAP. end
-source_dl = https://www.lichteblau.com/download/ +source_dl = http://www.lichteblau.com/download/
build requires diff --git a/lldpd/lldpd.nm b/lldpd/lldpd.nm index 9d35918e6..54f00168d 100644 --- a/lldpd/lldpd.nm +++ b/lldpd/lldpd.nm @@ -5,7 +5,7 @@
name = lldpd version = 1.0.16 -release = 1 +release = 1.1
groups = Networking/Tools url = https://lldpd.github.io @@ -23,7 +23,7 @@ build requires libcap-devel libevent-devel - libseccomp-devel + (libseccomp-devel if arch(x86_64)) libxml2-devel pkg-config readline-devel @@ -33,11 +33,17 @@ build configure_options += \ --without-embedded-libevent \ --with-readline \ - --with-seccomp \ --with-xml \ --with-privsep-user=lldpd \ --with-privsep-group=lldpd
+ # lldpd does not support seccomp on aarch64. + if "%{DISTRO_ARCH}" == "aarch64" + configure_options += --without-seccomp + else + configure_options += --with-seccomp + end + prepare_cmds %{create_user} end diff --git a/openssl/openssl.nm b/openssl/openssl.nm index e26aa3fba..58d932b1a 100644 --- a/openssl/openssl.nm +++ b/openssl/openssl.nm @@ -4,8 +4,8 @@ ###############################################################################
name = openssl -version = 3.0.7 -release = 1.1 +version = 3.0.8 +release = 1
maintainer = Michael Tremer michael.tremer@ipfire.org groups = System/Libraries
hooks/post-receive -- IPFire 3.x development tree