[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 4f0fb46575d2e4f47443283cb7b1854bdafab135
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 4f0fb46575d2e4f47443283cb7b1854bdafab135 (commit) via 064958a4cec3648c5ef4c67d040c51f36ac926d6 (commit) via 36f93688716bb76b544ebba21384cc26eb4294e8 (commit) from d51e3b59e2b0849a5144c6aa54aa7ccb93f532f8 (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 4f0fb46575d2e4f47443283cb7b1854bdafab135 Author: Peter Müller peter.mueller@ipfire.org Date: Tue Nov 29 18:24:20 2022 +0100
Drop some unused and orphaned packages
Signed-off-by: Peter Müller peter.mueller@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 064958a4cec3648c5ef4c67d040c51f36ac926d6 Author: Peter Müller peter.mueller@ipfire.org Date: Tue Nov 29 18:16:33 2022 +0100
dbus: Update to 1.15.2
Signed-off-by: Peter Müller peter.mueller@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 36f93688716bb76b544ebba21384cc26eb4294e8 Author: Peter Müller peter.mueller@ipfire.org Date: Tue Nov 29 17:54:49 2022 +0100
compat-openssl: Update to 1.1.1s
This is required as a dependency for many other packages. However, it has to be noted that OpenSSL's testsuite currently fails, which is why it is temporarily disabled in order to resolve a blocker in IPFire 3 development.
Cc: 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
-----------------------------------------------------------------------
Summary of changes: beecrypt/beecrypt.nm | 63 ---------- beecrypt/patches/beecrypt-4.1.2-biarch.patch | 19 --- beecrypt/patches/beecrypt-4.2.1-build-system.patch | 91 --------------- beecrypt/patches/beecrypt-4.2.1-no-c++.patch | 16 --- compat-openssl/compat-openssl.nm | 41 ++----- compat-openssl/openssl.cnf | 94 --------------- .../patches/openssl-0.9.8a-no-rpath.patch | 11 -- .../patches/openssl-1.0.0-beta4-ca-dir.patch | 36 ------ .../patches/openssl-1.0.0-beta5-enginesdir.patch | 52 --------- .../patches/openssl-1.0.2a-version.patch | 83 ------------- .../patches/openssl-1.0.2e-rpmbuild.patch | 115 ------------------ dbus/dbus.nm | 7 +- debugedit/debugedit.nm | 38 ------ debugedit/patches/debugedit-5.3.5-DWARF-4.patch | 129 --------------------- .../patches/debugedit-5.3.5-support-aarch64.patch | 30 ----- debugedit/update/Makefile | 11 -- debugedit/update/README | 1 - debugedit/update/update.sh | 58 --------- ebtables/ebtables.nm | 56 --------- libVNCServer/libVNCServer.nm | 46 -------- powertop/powertop.nm | 42 ------- tunctl/tunctl.nm | 41 ------- 22 files changed, 13 insertions(+), 1067 deletions(-) delete mode 100644 beecrypt/beecrypt.nm delete mode 100644 beecrypt/patches/beecrypt-4.1.2-biarch.patch delete mode 100644 beecrypt/patches/beecrypt-4.2.1-build-system.patch delete mode 100644 beecrypt/patches/beecrypt-4.2.1-no-c++.patch delete mode 100644 compat-openssl/openssl.cnf delete mode 100644 compat-openssl/patches/openssl-0.9.8a-no-rpath.patch delete mode 100644 compat-openssl/patches/openssl-1.0.0-beta4-ca-dir.patch delete mode 100644 compat-openssl/patches/openssl-1.0.0-beta5-enginesdir.patch delete mode 100644 compat-openssl/patches/openssl-1.0.2a-version.patch delete mode 100644 compat-openssl/patches/openssl-1.0.2e-rpmbuild.patch delete mode 100644 debugedit/debugedit.nm delete mode 100644 debugedit/patches/debugedit-5.3.5-DWARF-4.patch delete mode 100644 debugedit/patches/debugedit-5.3.5-support-aarch64.patch delete mode 100644 debugedit/update/Makefile delete mode 100644 debugedit/update/README delete mode 100644 debugedit/update/update.sh delete mode 100644 ebtables/ebtables.nm delete mode 100644 libVNCServer/libVNCServer.nm delete mode 100644 powertop/powertop.nm delete mode 100644 tunctl/tunctl.nm
Difference in files: diff --git a/beecrypt/beecrypt.nm b/beecrypt/beecrypt.nm deleted file mode 100644 index 6d53a1e89..000000000 --- a/beecrypt/beecrypt.nm +++ /dev/null @@ -1,63 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = beecrypt -version = 4.2.1 -release = 3 - -groups = System/Libraries -url = http://beecrypt.sourceforge.net/ -license = LGPLv2+ -summary = An open source cryptography library. - -description - BeeCrypt is an ongoing project to provide a strong and fast cryptography - toolkit. Includes entropy sources, random generators, block ciphers, hash - functions, message authentication codes, multiprecision integer routines - and public key primitives. -end - -source_dl = http://downloads.sourceforge.net/sourceforge/%%7Bname%7D/ - -build - requires - autoconf - automake - gcc-c++ - libtool - end - - prepare_cmds - libtoolize - autoreconf -vfi - end - - # Getting weird linking errors without --disable-threads. - configure_options += \ - --disable-expert-mode \ - --disable-threads \ - --enable-openmp \ - --with-cplusplus=no \ - --with-java=no \ - --with-python=no - - make_build_targets += OPENMP_LIBS="-lgomp" - - test - make check - end -end - -packages - package %{name} - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/beecrypt/patches/beecrypt-4.1.2-biarch.patch b/beecrypt/patches/beecrypt-4.1.2-biarch.patch deleted file mode 100644 index 695eef078..000000000 --- a/beecrypt/patches/beecrypt-4.1.2-biarch.patch +++ /dev/null @@ -1,19 +0,0 @@ -Patch by Paul Nasrat pnasrat@redhat.com for beecrypt >= 4.1.2 to make multilib/multiarch -of beecrypt-devel working. - ---- beecrypt-4.1.2/gnu.h.in 2006-05-22 15:53:45.000000000 -0400 -+++ beecrypt-4.1.2/gnu.h.in.biarch 2006-05-22 15:53:49.000000000 -0400 -@@ -61,7 +61,12 @@ - * make assumptions about the size set by the configure script - */ - #if !defined(MP_WBITS) --# define MP_WBITS @MP_WBITS@ -+# include <bits/wordsize.h> -+#if __WORDSIZE == 32 -+# define MP_WBITS 32U -+#elif __WORDSIZE == 64 -+# define MP_WBITS 64U -+#endif - #endif - - #endif diff --git a/beecrypt/patches/beecrypt-4.2.1-build-system.patch b/beecrypt/patches/beecrypt-4.2.1-build-system.patch deleted file mode 100644 index b2bd64aea..000000000 --- a/beecrypt/patches/beecrypt-4.2.1-build-system.patch +++ /dev/null @@ -1,91 +0,0 @@ ---- beecrypt-4.2.1/configure.ac -+++ beecrypt-4.2.1/configure.ac -@@ -11,7 +11,7 @@ - - # Checks for package options - AC_ARG_ENABLE(expert-mode, [ --enable-expert-mode follow user-defined CFLAGS settings [[default=no]]],[ -- ac_enable_expert_mode=yes -+ ac_enable_expert_mode=$enableval - ],[ - if test "X$CFLAGS" != "X"; then - echo "enabling expert mode" -@@ -25,7 +25,7 @@ - if test "$ac_enable_expert_mode" = yes; then - AC_MSG_ERROR([--enable-debug cannot be used in conjunction with --enable-expert-mode]) - fi -- ac_enable_debug=yes -+ ac_enable_debug=$enableval - ],[ - ac_enable_debug=no - ]) -@@ -456,7 +456,7 @@ - ac_cv_python_include="-I`$PYTHON -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_inc()'`" - ]) - AC_CACHE_CHECK([where to install python libraries], ac_cv_python_libdir, [ -- ac_cv_python_libdir=`$PYTHON -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib()'` -+ ac_cv_python_libdir=`$PYTHON -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib(1, 0)'` - ]) - fi - fi ---- beecrypt-4.2.1/java/Makefile.am -+++ beecrypt-4.2.1/java/Makefile.am -@@ -26,7 +26,7 @@ - - INCLUDES = -I$(top_srcdir)/include - --libaltdir=$(prefix)/lib@LIBALT@ -+libaltdir=$(libdir) - - libalt_LTLIBRARIES = libbeecrypt_java.la - ---- beecrypt-4.2.1/acinclude.m4 -+++ beecrypt-4.2.1/acinclude.m4 -@@ -1589,20 +1589,5 @@ - AC_SUBST(TYPEDEF_BC_THREADID_T,$bc_typedef_bc_threadid_t) - ]) -- --AH_BOTTOM([ --#if ENABLE_THREADS --# ifndef _REENTRANT --# define _REENTRANT --# endif --# if LINUX --# define _LIBC_REENTRANT --# endif --#else --# ifdef _REENTRANT --# undef _REENTRANT --# endif --#endif --]) - - - dnl BEE_THREAD_LOCAL_STORAGE -@@ -1623,7 +1609,5 @@ - ]) - - AH_BOTTOM([ --#if !ENABLE_THREAD_LOCAL_STORAGE --# define __thread --#endif -+#include "config.threads.h" - ]) ---- beecrypt-4.2.1/config.threads.h -+++ beecrypt-4.2.1/config.threads.h -@@ -0,0 +1,16 @@ -+#if ENABLE_THREADS -+# ifndef _REENTRANT -+# define _REENTRANT -+# endif -+# if LINUX -+# define _LIBC_REENTRANT -+# endif -+#else -+# ifdef _REENTRANT -+# undef _REENTRANT -+# endif -+#endif -+ -+#if !ENABLE_THREAD_LOCAL_STORAGE -+# define __thread -+#endif diff --git a/beecrypt/patches/beecrypt-4.2.1-no-c++.patch b/beecrypt/patches/beecrypt-4.2.1-no-c++.patch deleted file mode 100644 index bb2d2272b..000000000 --- a/beecrypt/patches/beecrypt-4.2.1-no-c++.patch +++ /dev/null @@ -1,16 +0,0 @@ -Patch by Robert Scheck robert@fedoraproject.org for beecrypt >= 4.2.1 to avoid linking -against libstdc++. This patch is based on an old by Florian La Roche laroche@redhat.com -and Panu Matilainen pmatilai@redhat.com. For further information see Red Hat Bugzilla -for bug ID #165080. - ---- beecrypt-4.2.1/Makefile.am 2009-07-08 20:56:18.000000000 +0200 -+++ beecrypt-4.2.1/Makefile.am.no-c++ 2010-03-28 20:55:51.000000000 +0200 -@@ -62,7 +62,7 @@ - - lib_LTLIBRARIES = libbeecrypt.la - --libbeecrypt_la_SOURCES = aes.c base64.c beecrypt.c blockmode.c blockpad.c blowfish.c dhies.c dldp.c dlkp.c dlpk.c dlsvdp-dh.c dsa.c elgamal.c endianness.c entropy.c fips186.c hmac.c hmacmd5.c hmacsha1.c hmacsha224.c hmacsha256.c md4.c md5.c hmacsha384.c hmacsha512.c memchunk.c mp.c mpbarrett.c mpnumber.c mpprime.c mtprng.c pkcs1.c pkcs12.c ripemd128.c ripemd160.c ripemd256.c ripemd320.c rsa.c rsakp.c rsapk.c sha1.c sha224.c sha256.c sha384.c sha512.c sha2k32.c sha2k64.c timestamp.c cppglue.cxx -+libbeecrypt_la_SOURCES = aes.c base64.c beecrypt.c blockmode.c blockpad.c blowfish.c dhies.c dldp.c dlkp.c dlpk.c dlsvdp-dh.c dsa.c elgamal.c endianness.c entropy.c fips186.c hmac.c hmacmd5.c hmacsha1.c hmacsha224.c hmacsha256.c md4.c md5.c hmacsha384.c hmacsha512.c memchunk.c mp.c mpbarrett.c mpnumber.c mpprime.c mtprng.c pkcs1.c pkcs12.c ripemd128.c ripemd160.c ripemd256.c ripemd320.c rsa.c rsakp.c rsapk.c sha1.c sha224.c sha256.c sha384.c sha512.c sha2k32.c sha2k64.c timestamp.c # cppglue.cxx - libbeecrypt_la_DEPENDENCIES = $(BEECRYPT_OBJECTS) - libbeecrypt_la_LIBADD = blowfishopt.lo mpopt.lo sha1opt.lo $(OPENMP_LIBS) - libbeecrypt_la_LDFLAGS = -no-undefined -version-info $(LIBBEECRYPT_LT_CURRENT):$(LIBBEECRYPT_LT_REVISION):$(LIBBEECRYPT_LT_AGE) diff --git a/compat-openssl/compat-openssl.nm b/compat-openssl/compat-openssl.nm index c45089dfc..eeb266c57 100644 --- a/compat-openssl/compat-openssl.nm +++ b/compat-openssl/compat-openssl.nm @@ -4,13 +4,13 @@ ###############################################################################
name = compat-openssl -version = 1.0.2n +version = 1.1.1s release = 1 thisapp = openssl-%{version}
maintainer = Michael Tremer michael.tremer@ipfire.org groups = System/Libraries -url = http://www.openssl.org/ +url = https://www.openssl.org/ license = OpenSSL summary = A general purpose cryptography library with TLS implementation.
@@ -20,13 +20,14 @@ description libraries which provide various cryptographic algorithms and protocols. end
-source_dl = http://openssl.org/source/ +source_dl = https://openssl.org/source/
build requires bc gnutls-devel perl + perl(Test::Harness) util-linux zlib-devel end @@ -36,43 +37,24 @@ build
prepare_cmds sed -e 's/SHLIB_VERSION_NUMBER "1.0.0"/SHLIB_VERSION_NUMBER "%{version}"/' \ - -i crypto/opensslv.h + -i include/openssl/opensslv.h
find crypto/ -name Makefile -exec \ sed 's/^ASFLAGS=/&-Wa,--noexecstack /' -i {} ; - - # Generate a table with the compile settings for my perusal. - touch Makefile - make TABLE PERL=/usr/bin/perl end
# Set default ssl_arch. ssl_arch = linux-%{DISTRO_ARCH}
- if "%{DISTRO_ARCH}" == "i686" - # 386 implies no-sse2 - ssl_arch = linux-elf no-asm 386 - end - - if "%{DISTRO_ARCH}" == "armv5tel" - ssl_arch = linux-armv4 - end - - if "%{DISTRO_ARCH}" == "armv7hl" - ssl_arch = linux-armv4 - end - build ./Configure \ --prefix=/usr \ --openssldir=/etc/pki/tls \ - --enginesdir=%{libdir}/openssl/engines \ shared \ zlib-dynamic \ enable-camellia \ enable-md2 \ enable-seed \ - enable-tlsext \ enable-rfc3779 \ no-idea \ no-mdc2 \ @@ -85,17 +67,12 @@ build # Build. make depend make all - - # Generate hashes for the included certs. - make rehash end
- test - # Revert ca-dir patch. Otherwise the tests will fail. - patch -Np1 -R < %{DIR_PATCHES}/openssl-1.0.0-beta4-ca-dir.patch - - make test - end + #test + # + # #make test + #end
install make install INSTALL_PREFIX=%{BUILDROOT} diff --git a/compat-openssl/openssl.cnf b/compat-openssl/openssl.cnf deleted file mode 100644 index 41947652d..000000000 --- a/compat-openssl/openssl.cnf +++ /dev/null @@ -1,94 +0,0 @@ -HOME = . -RANDFILE = /var/tmp/.rnd -oid_section = new_oids - -[ new_oids ] - -[ ca ] -default_ca = IPFire - -[ IPFire ] -dir = /var/ipfire -certs = $dir/certs -crl_dir = $dir/crls -database = $dir/certs/index.txt -new_certs_dir = $dir/certs -certificate = $dir/ca/cacert.pem -serial = $dir/certs/serial -crl = $dir/crls/cacrl.pem -private_key = $dir/private/cakey.pem -RANDFILE = $dir/tmp/.rand -x509_extensions = usr_cert -default_days = 999999 -default_crl_days= 30 -default_md = md5 -preserve = no -policy = policy_match -email_in_dn = no - -[ policy_match ] -countryName = optional -stateOrProvinceName = optional -organizationName = optional -organizationalUnitName = optional -commonName = supplied -emailAddress = optional - -[ req ] -default_bits = 1024 -default_keyfile = privkey.pem -distinguished_name = req_distinguished_name -attributes = req_attributes -x509_extensions = v3_ca -string_mask = nombstr - -[ req_distinguished_name ] -countryName = Country Name (2 letter code) -countryName_default = DE -countryName_min = 2 -countryName_max = 2 - -stateOrProvinceName = State or Province Name (full name) -stateOrProvinceName_default = - -localityName = Locality Name (eg, city) -#localityName_default = - -0.organizationName = Organization Name (eg, company) -0.organizationName_default = IPFire - -organizationalUnitName = Organizational Unit Name (eg, section) -#organizationalUnitName_default = - -commonName = Common Name (eg, your name or your server's hostname) -commonName_max = 64 - -emailAddress = Email Address -emailAddress_max = 40 - -[ req_attributes ] -challengePassword = A challenge password -challengePassword_min = 4 -challengePassword_max = 20 -unstructuredName = An optional company name - -[ usr_cert ] -basicConstraints=CA:FALSE -nsComment = "OpenSSL Generated Certificate" -subjectKeyIdentifier=hash -authorityKeyIdentifier=keyid,issuer:always - -[ v3_req ] -basicConstraints = CA:FALSE -keyUsage = nonRepudiation, digitalSignature, keyEncipherment - -[ v3_ca ] -subjectKeyIdentifier=hash -authorityKeyIdentifier=keyid:always,issuer:always -basicConstraints = CA:true - -[ crl_ext ] -authorityKeyIdentifier=keyid:always,issuer:always - -[ engine ] -default = openssl diff --git a/compat-openssl/patches/openssl-0.9.8a-no-rpath.patch b/compat-openssl/patches/openssl-0.9.8a-no-rpath.patch deleted file mode 100644 index 8f8fb912e..000000000 --- a/compat-openssl/patches/openssl-0.9.8a-no-rpath.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- openssl-0.9.8a/Makefile.shared.no-rpath 2005-06-23 22:47:54.000000000 +0200 -+++ openssl-0.9.8a/Makefile.shared 2005-11-16 22:35:37.000000000 +0100 -@@ -153,7 +153,7 @@ - NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \ - SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX" - --DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)" -+DO_GNU_APP=LDFLAGS="$(CFLAGS)" - - #This is rather special. It's a special target with which one can link - #applications without bothering with any features that have anything to diff --git a/compat-openssl/patches/openssl-1.0.0-beta4-ca-dir.patch b/compat-openssl/patches/openssl-1.0.0-beta4-ca-dir.patch deleted file mode 100644 index 751cabdd9..000000000 --- a/compat-openssl/patches/openssl-1.0.0-beta4-ca-dir.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -up openssl-1.0.0-beta4/apps/CA.pl.in.ca-dir openssl-1.0.0-beta4/apps/CA.pl.in ---- openssl-1.0.0-beta4/apps/CA.pl.in.ca-dir 2006-04-28 02:30:49.000000000 +0200 -+++ openssl-1.0.0-beta4/apps/CA.pl.in 2009-11-12 12:33:13.000000000 +0100 -@@ -53,7 +53,7 @@ $VERIFY="$openssl verify"; - $X509="$openssl x509"; - $PKCS12="$openssl pkcs12"; - --$CATOP="./demoCA"; -+$CATOP="/etc/pki/CA"; - $CAKEY="cakey.pem"; - $CAREQ="careq.pem"; - $CACERT="cacert.pem"; -diff -up openssl-1.0.0-beta4/apps/CA.sh.ca-dir openssl-1.0.0-beta4/apps/CA.sh ---- openssl-1.0.0-beta4/apps/CA.sh.ca-dir 2009-10-15 19:27:47.000000000 +0200 -+++ openssl-1.0.0-beta4/apps/CA.sh 2009-11-12 12:35:14.000000000 +0100 -@@ -68,7 +68,7 @@ VERIFY="$OPENSSL verify" - X509="$OPENSSL x509" - PKCS12="openssl pkcs12" - --if [ -z "$CATOP" ] ; then CATOP=./demoCA ; fi -+if [ -z "$CATOP" ] ; then CATOP=/etc/pki/CA ; fi - CAKEY=./cakey.pem - CAREQ=./careq.pem - CACERT=./cacert.pem -diff -up openssl-1.0.0-beta4/apps/openssl.cnf.ca-dir openssl-1.0.0-beta4/apps/openssl.cnf ---- openssl-1.0.0-beta4/apps/openssl.cnf.ca-dir 2009-11-12 12:33:13.000000000 +0100 -+++ openssl-1.0.0-beta4/apps/openssl.cnf 2009-11-12 12:33:13.000000000 +0100 -@@ -39,7 +39,7 @@ default_ca = CA_default # The default c - #################################################################### - [ CA_default ] - --dir = ./demoCA # Where everything is kept -+dir = /etc/pki/CA # Where everything is kept - certs = $dir/certs # Where the issued certs are kept - crl_dir = $dir/crl # Where the issued crl are kept - database = $dir/index.txt # database index file. diff --git a/compat-openssl/patches/openssl-1.0.0-beta5-enginesdir.patch b/compat-openssl/patches/openssl-1.0.0-beta5-enginesdir.patch deleted file mode 100644 index d942d6e2b..000000000 --- a/compat-openssl/patches/openssl-1.0.0-beta5-enginesdir.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff -up openssl-1.0.0-beta5/Configure.enginesdir openssl-1.0.0-beta5/Configure ---- openssl-1.0.0-beta5/Configure.enginesdir 2010-01-20 18:07:05.000000000 +0100 -+++ openssl-1.0.0-beta5/Configure 2010-01-20 18:10:48.000000000 +0100 -@@ -622,6 +622,7 @@ my $idx_multilib = $idx++; - my $prefix=""; - my $libdir=""; - my $openssldir=""; -+my $enginesdir=""; - my $exe_ext=""; - my $install_prefix= "$ENV{'INSTALL_PREFIX'}"; - my $cross_compile_prefix=""; -@@ -833,6 +834,10 @@ PROCESS_ARGS: - { - $openssldir=$1; - } -+ elsif (/^--enginesdir=(.*)$/) -+ { -+ $enginesdir=$1; -+ } - elsif (/^--install.prefix=(.*)$/) - { - $install_prefix=$1; -@@ -1053,7 +1058,7 @@ chop $prefix if $prefix =~ /./$/; - - $openssldir=$prefix . "/ssl" if $openssldir eq ""; - $openssldir=$prefix . "/" . $openssldir if $openssldir !~ /(^/|^[a-zA-Z]:[\/])/; -- -+$enginesdir="$prefix/lib/engines" if $enginesdir eq ""; - - print "IsMK1MF=$IsMK1MF\n"; - -@@ -1673,7 +1678,7 @@ while (<IN>) - } - elsif (/^#define\s+ENGINESDIR/) - { -- my $foo = "$prefix/$libdir/engines"; -+ my $foo = "$enginesdir"; - $foo =~ s/\/\\/g; - print OUT "#define ENGINESDIR "$foo"\n"; - } -diff -up openssl-1.0.0-beta5/engines/Makefile.enginesdir openssl-1.0.0-beta5/engines/Makefile ---- openssl-1.0.0-beta5/engines/Makefile.enginesdir 2010-01-16 21:06:09.000000000 +0100 -+++ openssl-1.0.0-beta5/engines/Makefile 2010-01-20 18:07:05.000000000 +0100 -@@ -124,7 +124,7 @@ install: - sfx=".so"; \ - cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \ - fi; \ -- chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \ -+ chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \ - mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \ - done; \ - fi diff --git a/compat-openssl/patches/openssl-1.0.2a-version.patch b/compat-openssl/patches/openssl-1.0.2a-version.patch deleted file mode 100644 index 25dfff51b..000000000 --- a/compat-openssl/patches/openssl-1.0.2a-version.patch +++ /dev/null @@ -1,83 +0,0 @@ -diff -up openssl-1.0.2a/crypto/cversion.c.version openssl-1.0.2a/crypto/cversion.c ---- openssl-1.0.2a/crypto/cversion.c.version 2015-03-19 14:30:36.000000000 +0100 -+++ openssl-1.0.2a/crypto/cversion.c 2015-04-21 16:48:56.285535316 +0200 -@@ -62,7 +62,7 @@ - # include "buildinf.h" - #endif - --const char *SSLeay_version(int t) -+const char *_current_SSLeay_version(int t) - { - if (t == SSLEAY_VERSION) - return OPENSSL_VERSION_TEXT; -@@ -101,7 +101,40 @@ const char *SSLeay_version(int t) - return ("not available"); - } - --unsigned long SSLeay(void) -+const char *_original_SSLeay_version(int t) -+{ -+ if (t == SSLEAY_VERSION) -+ return "OpenSSL 1.0.0-fips 29 Mar 2010"; -+ else -+ return _current_SSLeay_version(t); -+} -+ -+const char *_original101_SSLeay_version(int t) -+{ -+ if (t == SSLEAY_VERSION) -+ return "OpenSSL 1.0.1e-fips 11 Feb 2013"; -+ else -+ return _current_SSLeay_version(t); -+} -+ -+unsigned long _original_SSLeay(void) -+{ -+ return (0x10000003L); -+} -+ -+unsigned long _original101_SSLeay(void) -+{ -+ return (0x1000105fL); -+} -+ -+unsigned long _current_SSLeay(void) - { - return (SSLEAY_VERSION_NUMBER); - } -+ -+__asm__(".symver _original_SSLeay,SSLeay@"); -+__asm__(".symver _original_SSLeay_version,SSLeay_version@"); -+__asm__(".symver _original101_SSLeay,SSLeay@OPENSSL_1.0.1"); -+__asm__(".symver _original101_SSLeay_version,SSLeay_version@OPENSSL_1.0.1"); -+__asm__(".symver _current_SSLeay,SSLeay@@OPENSSL_1.0.2"); -+__asm__(".symver _current_SSLeay_version,SSLeay_version@@OPENSSL_1.0.2"); -diff -up openssl-1.0.2a/Makefile.shared.version openssl-1.0.2a/Makefile.shared ---- openssl-1.0.2a/Makefile.shared.version 2015-04-21 16:43:02.624170648 +0200 -+++ openssl-1.0.2a/Makefile.shared 2015-04-21 16:43:02.676171879 +0200 -@@ -151,7 +151,7 @@ DO_GNU_SO=$(CALC_VERSIONS); \ - SHLIB_SUFFIX=; \ - ALLSYMSFLAGS='-Wl,--whole-archive'; \ - NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \ -- SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX" -+ SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,--default-symver,--version-script=version.map -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX" - - DO_GNU_APP=LDFLAGS="$(CFLAGS)" - -diff -up openssl-1.0.2a/version.map.version openssl-1.0.2a/version.map ---- openssl-1.0.2a/version.map.version 2015-04-21 16:43:02.676171879 +0200 -+++ openssl-1.0.2a/version.map 2015-04-21 16:51:49.621630589 +0200 -@@ -0,0 +1,13 @@ -+OPENSSL_1.0.1 { -+ global: -+ SSLeay; -+ SSLeay_version; -+ local: -+ _original*; -+ _current*; -+}; -+OPENSSL_1.0.2 { -+ global: -+ SSLeay; -+ SSLeay_version; -+} OPENSSL_1.0.1; diff --git a/compat-openssl/patches/openssl-1.0.2e-rpmbuild.patch b/compat-openssl/patches/openssl-1.0.2e-rpmbuild.patch deleted file mode 100644 index db1460cb7..000000000 --- a/compat-openssl/patches/openssl-1.0.2e-rpmbuild.patch +++ /dev/null @@ -1,115 +0,0 @@ -diff -up openssl-1.0.2e/Configure.rpmbuild openssl-1.0.2e/Configure ---- openssl-1.0.2e/Configure.rpmbuild 2015-12-03 15:04:23.000000000 +0100 -+++ openssl-1.0.2e/Configure 2015-12-04 13:20:22.996835604 +0100 -@@ -365,8 +365,8 @@ my %table=( - #### - # *-generic* is endian-neutral target, but ./config is free to - # throw in -D[BL]_ENDIAN, whichever appropriate... --"linux-generic32","gcc:-O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.$(SHLIB_MAJOR).$(SHLIB_MINOR)", --"linux-ppc", "gcc:-DB_ENDIAN -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${ppc32_asm}:linux32:dlfcn:linux-shared:-fPIC::.so.$(SHLIB_MAJOR).$(SHLIB_MINOR)", -+"linux-generic32","gcc:-Wall $(RPM_OPT_FLAGS)::-D_REENTRANT::-Wl,-z,relro -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC:$(RPM_OPT_FLAGS):.so.$(SHLIB_SONAMEVER)", -+"linux-ppc", "gcc:-DB_ENDIAN -Wall $(RPM_OPT_FLAGS)::-D_REENTRANT::-Wl,-z,relro -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${ppc32_asm}:linux32:dlfcn:linux-shared:-fPIC:$(RPM_OPT_FLAGS):.so.$(SHLIB_SONAMEVER)", - - ####################################################################### - # Note that -march is not among compiler options in below linux-armv4 -@@ -395,31 +395,31 @@ my %table=( - # - # ./Configure linux-armv4 -march=armv6 -D__ARM_MAX_ARCH__=8 - # --"linux-armv4", "gcc: -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.$(SHLIB_MAJOR).$(SHLIB_MINOR)", --"linux-aarch64","gcc: -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${aarch64_asm}:linux64:dlfcn:linux-shared:-fPIC::.so.$(SHLIB_MAJOR).$(SHLIB_MINOR)", -+"linux-armv4", "gcc:-Wall $(RPM_OPT_FLAGS)::-D_REENTRANT::-Wl,-z,relro -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC:$(RPM_OPT_FLAGS):.so.$(SHLIB_SONAMEVER)", -+"linux-aarch64","gcc:-DL_ENDIAN -Wall $(RPM_OPT_FLAGS)::-D_REENTRANT::-Wl,-z,relro -ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${aarch64_asm}:linux64:dlfcn:linux-shared:-fPIC:$(RPM_OPT_FLAGS):.so.$(SHLIB_SONAMEVER):::64", - # Configure script adds minimally required -march for assembly support, - # if no -march was specified at command line. mips32 and mips64 below - # refer to contemporary MIPS Architecture specifications, MIPS32 and - # MIPS64, rather than to kernel bitness. --"linux-mips32", "gcc:-mabi=32 -O3 -Wall -DBN_DIV3W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${mips32_asm}:o32:dlfcn:linux-shared:-fPIC::.so.$(SHLIB_MAJOR).$(SHLIB_MINOR)", --"linux-mips64", "gcc:-mabi=n32 -O3 -Wall -DBN_DIV3W::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${mips64_asm}:n32:dlfcn:linux-shared:-fPIC:-mabi=n32:.so.$(SHLIB_MAJOR).$(SHLIB_MINOR):::32", --"linux64-mips64", "gcc:-mabi=64 -O3 -Wall -DBN_DIV3W::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${mips64_asm}:64:dlfcn:linux-shared:-fPIC:-mabi=64:.so.$(SHLIB_MAJOR).$(SHLIB_MINOR):::64", -+"linux-mips32", "gcc:-mabi=32 -Wall $(RPM_OPT_FLAGS) -DBN_DIV3W::-D_REENTRANT::-Wl,-z,relro -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${mips32_asm}:o32:dlfcn:linux-shared:-fPIC:$(RPM_OPT_FLAGS):.so.$(SHLIB_SONAMEVER)", -+"linux-mips64", "gcc:-mabi=n32 -Wall $(RPM_OPT_FLAGS) -DBN_DIV3W::-D_REENTRANT::-Wl,-z,relro -ldl:SIXTY_FOUR_BIT RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${mips64_asm}:n32:dlfcn:linux-shared:-fPIC:-mabi=n32 $(RPM_OPT_FLAGS):.so.$(SHLIB_SONAMEVER):::32", -+"linux64-mips64", "gcc:-mabi=64 -Wall $(RPM_OPT_FLAGS) -DBN_DIV3W::-D_REENTRANT::-Wl,-z,relro -ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${mips64_asm}:64:dlfcn:linux-shared:-fPIC:-mabi=64 $(RPM_OPT_FLAGS):.so.$(SHLIB_SONAMEVER):::64", - #### IA-32 targets... - "linux-ia32-icc", "icc:-DL_ENDIAN -O2::-D_REENTRANT::-ldl -no_cpprt:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-KPIC::.so.$(SHLIB_MAJOR).$(SHLIB_MINOR)", --"linux-elf", "gcc:-DL_ENDIAN -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.$(SHLIB_MAJOR).$(SHLIB_MINOR)", -+"linux-elf", "gcc:-DL_ENDIAN -Wall $(RPM_OPT_FLAGS)::-D_REENTRANT::-Wl,-z,relro -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC:$(RPM_OPT_FLAGS):.so.$(SHLIB_SONAMEVER)", - "linux-aout", "gcc:-DL_ENDIAN -O3 -fomit-frame-pointer -march=i486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:a.out", - #### --"linux-generic64","gcc:-O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.$(SHLIB_MAJOR).$(SHLIB_MINOR)", --"linux-ppc64", "gcc:-m64 -DB_ENDIAN -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${ppc64_asm}:linux64:dlfcn:linux-shared:-fPIC:-m64:.so.$(SHLIB_MAJOR).$(SHLIB_MINOR):::64", --"linux-ppc64le","gcc:-m64 -DL_ENDIAN -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:$ppc64_asm:linux64le:dlfcn:linux-shared:-fPIC:-m64:.so.$(SHLIB_MAJOR).$(SHLIB_MINOR):::", --"linux-ia64", "gcc:-DL_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.$(SHLIB_MAJOR).$(SHLIB_MINOR)", -+"linux-generic64","gcc:-Wall $(RPM_OPT_FLAGS)::-D_REENTRANT::-Wl,-z,relro -ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC:$(RPM_OPT_FLAGS):.so.$(SHLIB_SONAMEVER):::64", -+"linux-ppc64", "gcc:-m64 -DB_ENDIAN -Wall $(RPM_OPT_FLAGS)::-D_REENTRANT::-Wl,-z,relro -ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${ppc64_asm}:linux64:dlfcn:linux-shared:-fPIC:-m64 $(RPM_OPT_FLAGS):.so.$(SHLIB_SONAMEVER):::64", -+"linux-ppc64le","gcc:-m64 -DL_ENDIAN -Wall $(RPM_OPT_FLAGS)::-D_REENTRANT::-Wl,-z,relro -ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:$ppc64_asm:linux64le:dlfcn:linux-shared:-fPIC:-m64 $(RPM_OPT_FLAGS):.so.$(SHLIB_SONAMEVER):::64", -+"linux-ia64", "gcc:-DL_ENDIAN -Wall $(RPM_OPT_FLAGS)::-D_REENTRANT::-Wl,-z,relro -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC:$(RPM_OPT_FLAGS):.so.$(SHLIB_SONAMEVER)", - "linux-ia64-icc","icc:-DL_ENDIAN -O2 -Wall::-D_REENTRANT::-ldl -no_cpprt:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.$(SHLIB_MAJOR).$(SHLIB_MINOR)", --"linux-x86_64", "gcc:-m64 -DL_ENDIAN -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.$(SHLIB_MAJOR).$(SHLIB_MINOR):::64", -+"linux-x86_64", "gcc:-m64 -DL_ENDIAN -Wall $(RPM_OPT_FLAGS)::-D_REENTRANT::-Wl,-z,relro -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64 $(RPM_OPT_FLAGS):.so.$(SHLIB_SONAMEVER):::64", - "linux-x86_64-clang", "clang: -m64 -DL_ENDIAN -O3 -Wall -Wextra $clang_disabled_warnings -Qunused-arguments::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.$(SHLIB_MAJOR).$(SHLIB_MINOR):::64", - "debug-linux-x86_64-clang", "clang: -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -m64 -DL_ENDIAN -g -Wall -Wextra $clang_disabled_warnings -Qunused-arguments::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.$(SHLIB_MAJOR).$(SHLIB_MINOR):::64", - "linux-x86_64-icc", "icc:-DL_ENDIAN -O2::-D_REENTRANT::-ldl -no_cpprt:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC::.so.$(SHLIB_MAJOR).$(SHLIB_MINOR):::64", - "linux-x32", "gcc:-mx32 -DL_ENDIAN -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-mx32:.so.$(SHLIB_MAJOR).$(SHLIB_MINOR):::x32", --"linux64-s390x", "gcc:-m64 -DB_ENDIAN -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${s390x_asm}:64:dlfcn:linux-shared:-fPIC:-m64:.so.$(SHLIB_MAJOR).$(SHLIB_MINOR):::64", -+"linux64-s390x", "gcc:-m64 -DB_ENDIAN -Wall $(RPM_OPT_FLAGS)::-D_REENTRANT::-Wl,-z,relro -ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${s390x_asm}:64:dlfcn:linux-shared:-fPIC:-m64 $(RPM_OPT_FLAGS):.so.$(SHLIB_SONAMEVER):::64", - #### So called "highgprs" target for z/Architecture CPUs - # "Highgprs" is kernel feature first implemented in Linux 2.6.32, see - # /proc/cpuinfo. The idea is to preserve most significant bits of -@@ -437,12 +437,12 @@ my %table=( - #### SPARC Linux setups - # Ray Miller ray.miller@computing-services.oxford.ac.uk has patiently - # assisted with debugging of following two configs. --"linux-sparcv8","gcc:-mcpu=v8 -DB_ENDIAN -O3 -fomit-frame-pointer -Wall -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv8_asm}:dlfcn:linux-shared:-fPIC::.so.$(SHLIB_MAJOR).$(SHLIB_MINOR)", -+"linux-sparcv8","gcc:-mcpu=v8 -DB_ENDIAN -Wall $(RPM_OPT_FLAGS) -DBN_DIV2W::-D_REENTRANT::-Wl,-z,relro -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv8_asm}:dlfcn:linux-shared:-fPIC:$(RPM_OPT_FLAGS):.so.$(SHLIB_SONAMEVER)", - # it's a real mess with -mcpu=ultrasparc option under Linux, but - # -Wa,-Av8plus should do the trick no matter what. --"linux-sparcv9","gcc:-m32 -mcpu=ultrasparc -DB_ENDIAN -O3 -fomit-frame-pointer -Wall -Wa,-Av8plus -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:linux-shared:-fPIC:-m32:.so.$(SHLIB_MAJOR).$(SHLIB_MINOR)", -+"linux-sparcv9","gcc:-m32 -mcpu=ultrasparc -DB_ENDIAN -Wall $(RPM_OPT_FLAGS) -Wa,-Av8plus -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-Wl,-z,relro -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:linux-shared:-fPIC:-m32 $(RPM_OPT_FLAGS):.so.$(SHLIB_SONAMEVER)", - # GCC 3.1 is a requirement --"linux64-sparcv9","gcc:-m64 -mcpu=ultrasparc -DB_ENDIAN -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:ULTRASPARC:-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.$(SHLIB_MAJOR).$(SHLIB_MINOR):::64", -+"linux64-sparcv9","gcc:-m64 -mcpu=ultrasparc -DB_ENDIAN -Wall $(RPM_OPT_FLAGS)::-D_REENTRANT:ULTRASPARC:-Wl,-z,relro -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:linux-shared:-fPIC:-m64 $(RPM_OPT_FLAGS):.so.$(SHLIB_SONAMEVER):::64", - #### Alpha Linux with GNU C and Compaq C setups - # Special notes: - # - linux-alpha+bwx-gcc is ment to be used from ./config only. If you -@@ -1767,7 +1767,7 @@ while (<IN>) - elsif ($shared_extension ne "" && $shared_extension =~ /^.s([ol]).[^.]*.[^.]*$/) - { - my $sotmp = $1; -- s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.$(SHLIB_MAJOR) .s$sotmp/; -+ s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.$(SHLIB_SONAMEVER) .s$sotmp/; - } - elsif ($shared_extension ne "" && $shared_extension =~ /^.[^.]*.[^.]*.dylib$/) - { -diff -up openssl-1.0.2e/Makefile.org.rpmbuild openssl-1.0.2e/Makefile.org ---- openssl-1.0.2e/Makefile.org.rpmbuild 2015-12-03 15:04:23.000000000 +0100 -+++ openssl-1.0.2e/Makefile.org 2015-12-04 13:18:44.913538616 +0100 -@@ -10,6 +10,7 @@ SHLIB_VERSION_HISTORY= - SHLIB_MAJOR= - SHLIB_MINOR= - SHLIB_EXT= -+SHLIB_SONAMEVER=10 - PLATFORM=dist - OPTIONS= - CONFIGURE_ARGS= -@@ -341,10 +342,9 @@ clean-shared: - link-shared: - @ set -e; for i in $(SHLIBDIRS); do \ - $(MAKE) -f $(HERE)/Makefile.shared -e $(BUILDENV) \ -- LIBNAME=$$i LIBVERSION=$(SHLIB_MAJOR).$(SHLIB_MINOR) \ -+ LIBNAME=$$i LIBVERSION=$(SHLIB_SONAMEVER) \ - LIBCOMPATVERSIONS=";$(SHLIB_VERSION_HISTORY)" \ - symlink.$(SHLIB_TARGET); \ -- libs="$$libs -l$$i"; \ - done - - build-shared: do_$(SHLIB_TARGET) link-shared -@@ -355,7 +355,7 @@ do_$(SHLIB_TARGET): - libs="$(LIBKRB5) $$libs"; \ - fi; \ - $(CLEARENV) && $(MAKE) -f Makefile.shared -e $(BUILDENV) \ -- LIBNAME=$$i LIBVERSION=$(SHLIB_MAJOR).$(SHLIB_MINOR) \ -+ LIBNAME=$$i LIBVERSION=$(SHLIB_SONAMEVER) \ - LIBCOMPATVERSIONS=";$(SHLIB_VERSION_HISTORY)" \ - LIBDEPS="$$libs $(EX_LIBS)" \ - link_a.$(SHLIB_TARGET); \ diff --git a/dbus/dbus.nm b/dbus/dbus.nm index bfa5ed0e6..e25427bee 100644 --- a/dbus/dbus.nm +++ b/dbus/dbus.nm @@ -4,12 +4,12 @@ ###############################################################################
name = dbus -version = 1.11.20 +version = 1.15.2 release = 1
maintainer = Stefan Schantl stefan.schantl@ipfire.org groups = System/Daemons -url = http://www.freedesktop.org/software/dbus/ +url = https://www.freedesktop.org/software/dbus/ license = GPLv2+ AFL summary = D-BUS message bus.
@@ -19,7 +19,8 @@ description per-user-login-session messaging facility. end
-source_dl = http://dbus.freedesktop.org/releases/dbus/ +source_dl = https://dbus.freedesktop.org/releases/dbus/ +sources = %{thisapp}.tar.xz
build requires diff --git a/debugedit/debugedit.nm b/debugedit/debugedit.nm deleted file mode 100644 index c1d6474d2..000000000 --- a/debugedit/debugedit.nm +++ /dev/null @@ -1,38 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = debugedit -version = 5.3.5 -release = 2 - -groups = Development/Tools -url = http://www.rpm5.org/ -license = GPLv2 -summary = Standalone version of debugedit - -description - This package contains a standalone version of debugedit from RPM5. -end - -build - requires - beecrypt-devel - elfutils-devel - popt-devel - end - - install - mkdir -pv %{BUILDROOT}%{bindir} - install -v -m 755 debugedit %{BUILDROOT}%{bindir}/debugedit - end -end - -packages - package %{name} - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/debugedit/patches/debugedit-5.3.5-DWARF-4.patch b/debugedit/patches/debugedit-5.3.5-DWARF-4.patch deleted file mode 100644 index 3e1406196..000000000 --- a/debugedit/patches/debugedit-5.3.5-DWARF-4.patch +++ /dev/null @@ -1,129 +0,0 @@ -add DWARF 4 support - -https://bugs.gentoo.org/400663 -https://bugzilla.redhat.com/show_bug.cgi?id=707677 - ---- debugedit-5.3.5/debugedit.c 2011-10-11 05:37:49.000000000 +0200 -+++ debugedit-5.3.5/debugedit.c 2012-01-25 01:27:23.487999039 +0100 -@@ -70,6 +70,10 @@ - #include <rpmtag.h> - - #define DW_TAG_partial_unit 0x3c -+#define DW_FORM_sec_offset 0x17 -+#define DW_FORM_exprloc 0x18 -+#define DW_FORM_flag_present 0x19 -+#define DW_FORM_ref_sig8 0x20 - - char *base_dir = NULL; - char *dest_dir = NULL; -@@ -246,6 +250,7 @@ - #define DEBUG_STR 8 - #define DEBUG_FRAME 9 - #define DEBUG_RANGES 10 -+#define DEBUG_TYPES 11 - { ".debug_info", NULL, NULL, 0, 0, 0 }, - { ".debug_abbrev", NULL, NULL, 0, 0, 0 }, - { ".debug_line", NULL, NULL, 0, 0, 0 }, -@@ -257,6 +262,7 @@ - { ".debug_str", NULL, NULL, 0, 0, 0 }, - { ".debug_frame", NULL, NULL, 0, 0, 0 }, - { ".debug_ranges", NULL, NULL, 0, 0, 0 }, -+ { ".debug_types", NULL, NULL, 0, 0, 0 }, - { NULL, NULL, NULL, 0, 0, 0 } - }; - -@@ -349,7 +355,8 @@ - goto no_memory; - } - form = read_uleb128 (ptr); -- if (form == 2 || form > DW_FORM_indirect) -+ if (form == 2 -+ || (form > DW_FORM_flag_present && form != DW_FORM_ref_sig8)) - { - error (0, 0, "%s: Unknown DWARF DW_FORM_%d", dso->filename, form); - htab_delete (h); -@@ -378,7 +385,6 @@ - canonicalize_path (const char *s, char *d) - { - char *rv = d; -- const char *sroot; - char *droot; - - if (IS_DIR_SEPARATOR (*s)) -@@ -394,7 +400,6 @@ - s++; - } - droot = d; -- sroot = s; - - while (*s) - { -@@ -513,7 +518,7 @@ - } - - value = read_16 (ptr); -- if (value != 2 && value != 3) -+ if (value != 2 && value != 3 && value != 4) - { - error (0, 0, "%s: DWARF version %d unhandled", dso->filename, - value); -@@ -529,8 +534,8 @@ - return 1; - } - -- opcode_base = ptr[4]; -- ptr = dir = ptr + 4 + opcode_base; -+ opcode_base = ptr[4 + (value >= 4)]; -+ ptr = dir = ptr + 4 + (value >= 4) + opcode_base; - - /* dir table: */ - value = 1; -@@ -758,7 +763,8 @@ - { - if (t->attr[i].attr == DW_AT_stmt_list) - { -- if (form == DW_FORM_data4) -+ if (form == DW_FORM_data4 -+ || form == DW_FORM_sec_offset) - { - list_offs = do_read_32_relocated (ptr); - found_list_offs = 1; -@@ -864,6 +870,8 @@ - else - ptr += 4; - break; -+ case DW_FORM_flag_present: -+ break; - case DW_FORM_addr: - ptr += ptr_size; - break; -@@ -878,10 +886,12 @@ - break; - case DW_FORM_ref4: - case DW_FORM_data4: -+ case DW_FORM_sec_offset: - ptr += 4; - break; - case DW_FORM_ref8: - case DW_FORM_data8: -+ case DW_FORM_ref_sig8: - ptr += 8; - break; - case DW_FORM_sdata: -@@ -910,6 +920,7 @@ - form = DW_FORM_block1; - break; - case DW_FORM_block: -+ case DW_FORM_exprloc: - len = read_uleb128 (ptr); - form = DW_FORM_block1; - assert (len < UINT_MAX); -@@ -1213,7 +1224,7 @@ - } - - cu_version = read_16 (ptr); -- if (cu_version != 2 && cu_version != 3) -+ if (cu_version != 2 && cu_version != 3 && cu_version != 4) - { - error (0, 0, "%s: DWARF version %d unhandled", dso->filename, - cu_version); diff --git a/debugedit/patches/debugedit-5.3.5-support-aarch64.patch b/debugedit/patches/debugedit-5.3.5-support-aarch64.patch deleted file mode 100644 index d7e92b678..000000000 --- a/debugedit/patches/debugedit-5.3.5-support-aarch64.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 389d260ca41a277de49ca0154966d549945d8635 Mon Sep 17 00:00:00 2001 -From: Kyle McMartin kmcmarti@redhat.com -Date: Sun, 16 Jun 2013 12:48:46 -0400 -Subject: [PATCH] debugedit: handle aarch64 debug_info relocations - (RhBug:974860) - -AArch64 generates a relocation which must be handled similar to other -architectures. Adding this patch allows debugedit to run against the -kernel debuginfo. - -Signed-off-by: Panu Matilainen pmatilai@redhat.com ---- - debugedit.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/debugedit.c b/debugedit.c -index a658d5b..434bab0 100644 ---- a/debugedit.c -+++ b/debugedit.c -@@ -1158,6 +1158,10 @@ edit_dwarf2 (DSO *dso) - if (rtype != R_ALPHA_REFLONG) - goto fail; - break; -+ case EM_AARCH64: -+ if (rtype != R_AARCH64_ABS32) -+ goto fail; -+ break; - default: - fail: - error (1, 0, "%s: Unhandled relocation %d in .debug_info section", diff --git a/debugedit/update/Makefile b/debugedit/update/Makefile deleted file mode 100644 index 946a12865..000000000 --- a/debugedit/update/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -CPPFLAGS += -I. -LDLIBS = -lelf -lpopt -lbeecrypt - -all: debugedit - -debugedit: debugedit.o hashtab.o - -clean: - rm -f *.o debugedit - -.PHONY: clean diff --git a/debugedit/update/README b/debugedit/update/README deleted file mode 100644 index 2a676aec1..000000000 --- a/debugedit/update/README +++ /dev/null @@ -1 +0,0 @@ -From https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-util/debugedit diff --git a/debugedit/update/update.sh b/debugedit/update/update.sh deleted file mode 100644 index 448624bd3..000000000 --- a/debugedit/update/update.sh +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/bash - -DISTDIR=/usr/portage/distfiles -PN=debugedit - -set -e - -echo "Getting updated index" -rm -f index.html -wget -q http://rpm5.org/ - -PV=$(sed -n '/Production:/{n;s:.*RPM ::;s:<.*::;p;q}' index.html) -PV=5.3.5 -echo "Latest upstream version: ${PV}" -rm -f index.html - -P="${PN}-${PV}" -A=${P}.tar.gz - -echo "Fetching latest rpm tarball" -r=rpm-${PV} -wget -nv http://rpm5.org/files/rpm/rpm-$%7BPV%.*%7D/$%7Br%7D.tar.gz - -echo "Unpacking ${r}" -rm -rf ${r} -tar xf ${r}.tar.gz - -echo "Creating ${P}" -rm -rf ${P} -mkdir ${P} -cp Makefile ${r}/tools/{hashtab.?,debugedit.c} ${P}/ -pushd ${P} >/dev/null -more=true -while ${more} ; do - more=false - for h in $(grep '#include' *.[ch] | awk '{print $NF}' | sed 's:[<>"]::g') ; do - [[ ${h} == */* ]] && continue - rh=$(find ../${r} -name ${h##*/}) - if [[ -n ${rh} ]] && [[ ! -e ${rh##*/} ]] ; then - # don't copy glibc includes - if ! grep -qs 'This file is part of the GNU C Library' ${rh} ; then - cp ${rh} ./ - more=true - fi - fi - done -done -popd >/dev/null -tar zcf ${A} ${P} - -echo "Testing build" -pushd ${P} >/dev/null -make -s -popd >/dev/null - -echo "Cleaning up" -rm -rf ${P} ${r} -du -b ${A} diff --git a/ebtables/ebtables.nm b/ebtables/ebtables.nm deleted file mode 100644 index 846ed96d4..000000000 --- a/ebtables/ebtables.nm +++ /dev/null @@ -1,56 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = ebtables -version = v2.0.10-4 -release = 2 - -groups = Networking/Tools -url = http://ebtables.sourceforge.net/ -license = GPLv2+ -summary = Ethernet Bridge frame table administration tool. - -description - Ethernet bridge tables is a firewalling tool to transparently filter network - traffic passing a bridge. The filtering possibilities are limited to link - layer filtering and some basic filtering on higher network layers. -end - -source_dl = http://downloads.sourceforge.net/ebtables/ - -build - CFLAGS += -Wall - - build - make CFLAGS="%{CFLAGS}" BINDIR="%{sbindir}" \ - LIBDIR="%{libdir}/ebtables" MANDIR="%{mandir}" %{PARALLELISMFLAGS} - end - - install - make install DESTDIR="%{BUILDROOT}" BINDIR="%{sbindir}" \ - LIBDIR="%{libdir}/ebtables" MANDIR="%{mandir}" - - # Remove unneded directories. - rm -rvf %{BUILDROOT}/etc/{rc.d,sysconfig} - end -end - -quality-agent - whitelist_rpath - %{libdir}/ebtables - end -end - -packages - package %{name} - filter_requires - libebt - end - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/libVNCServer/libVNCServer.nm b/libVNCServer/libVNCServer.nm deleted file mode 100644 index 2e94f0a07..000000000 --- a/libVNCServer/libVNCServer.nm +++ /dev/null @@ -1,46 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = libVNCServer -version = 0.9.9 -release = 1 - -groups = System/Libraries -url = http://libvncserver.sourceforge.net/ -license = GPLv2+ -summary = Library to make writing a vnc server easy. - -description - LibVNCServer makes writing a VNC server (or more correctly, a program - exporting a framebuffer via the Remote Frame Buffer protocol) easy. -end - -source_dl = http://sourceforge.net/projects/libvncserver/files/libvncserver/%%7Bversion%... -sources = LibVNCServer-%{version}.tar.gz - -build - requires - libjpeg-devel - zlib-devel - end - - DIR_APP = %{DIR_SRC}/LibVNCServer-%{version} - - configure_options += \ - --disable-static \ - --without-tightvnc-filetransfer -end - -packages - package %{name} - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/powertop/powertop.nm b/powertop/powertop.nm deleted file mode 100644 index 3dab3af7b..000000000 --- a/powertop/powertop.nm +++ /dev/null @@ -1,42 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = powertop -version = 2.6.1 -release = 1 - -groups = Applications/System -url = https://01.org/powertop/ -license = GPLv2 -summary = Power consumption monitor. - -description - PowerTOP is a Linux tool to diagnose issues with power consumption and - power management. In addition to being a diagnostic tool, PowerTOP also - has an interactive mode where the user can experiment various power - management settings for cases where the Linux distribution has not - enabled these settings. -end - -source_dl = https://01.org/sites/default/files/downloads/powertop/ - -build - requires - gcc-c++ - gettext - libnl-devel - ncurses-devel - pciutils-devel - zlib-devel - end -end - -packages - package %{name} - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/tunctl/tunctl.nm b/tunctl/tunctl.nm deleted file mode 100644 index 67d394a6a..000000000 --- a/tunctl/tunctl.nm +++ /dev/null @@ -1,41 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = tunctl -version = 1.5 -release = 3 - -groups = Networking/Tools -url = http://tunctl.sourceforge.net/ -license = GPL+ -summary = Create and remove virtual network interfaces. - -description - tunctl is a tool to set up and maintain persistent TUN/TAP network - interfaces, enabling user applications access to the wire side of a - virtual nework interface. Such interfaces is useful for connecting VPN - software, virtualization, emulation and a number of other similar - applications to the network stack. -end - -source_dl = http://sourceforge.net/projects/tunctl/files/tunctl/%%7Bversion%7D/%%7Bsourc... - -build - requires - docbook-utils - end - - prepare_cmds - sed -e "s/^CFLAGS.*/CFLAGS = %{CFLAGS} %{LDFLAGS}/" -i Makefile - end -end - -packages - package %{name} - - package %{name}-debuginfo - template DEBUGINFO - end -end
hooks/post-receive -- IPFire 3.x development tree
-
Michael Tremer