[git.ipfire.org] IPFire 3.x development tree branch, master, updated. b40cdb8c182d8b4aa05c6e23cc67118c4aa4853c
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 b40cdb8c182d8b4aa05c6e23cc67118c4aa4853c (commit) via c10220b103d0b71706d56c8d11a69e5f51bcede0 (commit) via 8bcac5c8cda49b91fe68bef64c3ad975b80a43ca (commit) via 6fc53035ec05809c72429ac93c5886d10718cf19 (commit) via 4432bab591d09eeb9c6e9de994bb6d11d79aa6be (commit) via 7fdc5d5ce5467b24bee15a10bd443bc0f7bf71cc (commit) via 897b3d120cee6f8452a0e800c1a719206beda104 (commit) via 00c7a0fa7de61c549cd18826ec03881a90bd291e (commit) via 26fb56b60a3ec42b9b4be5af399a40c3cd6559f2 (commit) via 9c939762c1585db188807309e1bb0df803230115 (commit) from a54609626c4f45e00f8a45780ce553d1f60734d8 (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 b40cdb8c182d8b4aa05c6e23cc67118c4aa4853c Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Jun 25 09:50:27 2020 +0100
rsync: Update to 3.2.1
This now depends on openssl, and lz4 and zstd.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit c10220b103d0b71706d56c8d11a69e5f51bcede0 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Jun 23 10:01:47 2020 +0100
binutils: Update to 2.34
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 8bcac5c8cda49b91fe68bef64c3ad975b80a43ca Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Jun 23 09:58:44 2020 +0100
zstd: New package
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 6fc53035ec05809c72429ac93c5886d10718cf19 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Jun 22 22:40:49 2020 +0100
lz4: New package
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 4432bab591d09eeb9c6e9de994bb6d11d79aa6be Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Jun 22 22:38:42 2020 +0100
wpa_supplicant: Update to 2.9
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 7fdc5d5ce5467b24bee15a10bd443bc0f7bf71cc Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Jun 22 11:06:44 2020 +0100
openssl: Update to 1.1.1g
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 897b3d120cee6f8452a0e800c1a719206beda104 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Jun 22 11:06:16 2020 +0100
hostapd: Update to 2.9
The package has changed its home and now depends on OpenSSL >= 1.1.1
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 00c7a0fa7de61c549cd18826ec03881a90bd291e Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Jun 22 11:04:07 2020 +0100
gmp: Update to 6.2.0
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 26fb56b60a3ec42b9b4be5af399a40c3cd6559f2 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Jun 22 11:03:40 2020 +0100
libmpc: Update to 1.1.0
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 9c939762c1585db188807309e1bb0df803230115 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun May 10 19:49:46 2020 +0100
xz: Update to 5.2.5
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: binutils/binutils.nm | 2 +- gmp/gmp.nm | 2 +- hostapd/hostapd.nm | 8 +-- libmpc/libmpc.nm | 8 +-- lz4/lz4.nm | 53 +++++++++++++++ openssl/openssl.nm | 8 +-- openssl/patches/openssl-1.1.0-build.patch | 73 -------------------- openssl/patches/openssl-1.1.0-ca-dir.patch | 24 ------- openssl/patches/openssl-1.1.0-defaults.patch | 51 -------------- openssl/patches/openssl-1.1.0-disable-ssl3.patch | 86 ------------------------ openssl/patches/openssl-1.1.0-no-html.patch | 12 ---- openssl/patches/openssl-1.1.0g-tests.patch | 33 --------- rsync/rsync.nm | 23 +++++-- wpa_supplicant/wpa_supplicant.nm | 11 +-- xz/xz.nm | 2 +- zstd/zstd.nm | 52 ++++++++++++++ 16 files changed, 141 insertions(+), 307 deletions(-) create mode 100644 lz4/lz4.nm delete mode 100644 openssl/patches/openssl-1.1.0-build.patch delete mode 100644 openssl/patches/openssl-1.1.0-ca-dir.patch delete mode 100644 openssl/patches/openssl-1.1.0-defaults.patch delete mode 100644 openssl/patches/openssl-1.1.0-disable-ssl3.patch delete mode 100644 openssl/patches/openssl-1.1.0-no-html.patch delete mode 100644 openssl/patches/openssl-1.1.0g-tests.patch create mode 100644 zstd/zstd.nm
Difference in files: diff --git a/binutils/binutils.nm b/binutils/binutils.nm index b971bb375..1ced2515e 100644 --- a/binutils/binutils.nm +++ b/binutils/binutils.nm @@ -4,7 +4,7 @@ ###############################################################################
name = binutils -version = 2.32 +version = 2.34 release = 1
maintainer = Michael Tremer michael.tremer@ipfire.org diff --git a/gmp/gmp.nm b/gmp/gmp.nm index 7bcfabe23..144a8fadd 100644 --- a/gmp/gmp.nm +++ b/gmp/gmp.nm @@ -4,7 +4,7 @@ ###############################################################################
name = gmp -version = 6.1.2 +version = 6.2.0 release = 1
groups = System/Libraries diff --git a/hostapd/hostapd.nm b/hostapd/hostapd.nm index c4bc6861c..7d8e0bf0b 100644 --- a/hostapd/hostapd.nm +++ b/hostapd/hostapd.nm @@ -4,11 +4,11 @@ ###############################################################################
name = hostapd -version = 2.8 +version = 2.9 release = 1
groups = Networking/Tools -url = http://hostap.epitest.fi/hostapd/ +url = https://w1.fi/hostapd/ license = GPLv2+ summary = User space daemon to create Wifi Access points.
@@ -19,12 +19,12 @@ description RADIUS authentication server. end
-source_dl = http://hostap.epitest.fi/releases/ +source_dl = https://w1.fi/releases/
build requires libnl3-devel - openssl-devel + openssl-devel >= 1.1.1 end
prepare_cmds diff --git a/libmpc/libmpc.nm b/libmpc/libmpc.nm index 68a98528f..872eb55fb 100644 --- a/libmpc/libmpc.nm +++ b/libmpc/libmpc.nm @@ -4,7 +4,7 @@ ###############################################################################
name = libmpc -version = 1.0.3 +version = 1.1.0 release = 1 thisapp = mpc-%{version}
@@ -19,12 +19,12 @@ description It is built upon and follows the same principles as Mpfr. end
-source_dl = http://www.multiprecision.org/mpc/download/ +source_dl = https://ftp.gnu.org/gnu/mpc/
build requires - gmp-devel >= 4.3.2 - mpfr-devel >= 2.4.2 + gmp-devel >= 5.0.0 + mpfr-devel >= 3.0.0 end
configure_options += \ diff --git a/lz4/lz4.nm b/lz4/lz4.nm new file mode 100644 index 000000000..7449775a9 --- /dev/null +++ b/lz4/lz4.nm @@ -0,0 +1,53 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team info@ipfire.org # +############################################################################### + +name = lz4 +version = 1.9.2 +release = 1 + +groups = System/Libraries +url = http://www.lz4.org/ +license = GPLv2 +summary = Extremely fast compression algorithm + +description + LZ4 is lossless compression algorithm, providing compression speed + > 500 MB/s per core (>0.15 Bytes/cycle). + It features an extremely fast decoder, with speed in multiple GB/s + per core (~1 Byte/cycle). A high compression derivative, called + LZ4_HC, is available, trading customizable CPU time for compression + ratio. +end + +source_dl = https://github.com/lz4/lz4/archive/v%%7Bversion%7D.tar.gz#/ + +build + build + make -C lib PREFIX=%{prefix} %{PARALLELISMFLAGS} + make -C programs PREFIX=%{prefix} lz4 lz4c + end + + test + make check + end + + make_install_targets += PREFIX=%{prefix} libdir=%{libdir} +end + +packages + package %{name} + + package %{name}-libs + template LIBS + end + + package %{name}-devel + template DEVEL + end + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/openssl/openssl.nm b/openssl/openssl.nm index 6b0cd8d6e..3e8ed1b1f 100644 --- a/openssl/openssl.nm +++ b/openssl/openssl.nm @@ -4,7 +4,7 @@ ###############################################################################
name = openssl -version = 1.1.0g +version = 1.1.1g release = 1
maintainer = Michael Tremer michael.tremer@ipfire.org @@ -89,9 +89,6 @@ build end
test - # Revert ca-dir patch. Otherwise the tests will fail. - patch -Np1 -R < %{DIR_PATCHES}/openssl-1.1.0-ca-dir.patch - make test end
@@ -118,9 +115,6 @@ build
# Remove dist config rm -vf %{BUILDROOT}%{sysconfdir}/pki/tls/openssl.cnf.dist - - # Move executable stuff to %{bindir} - mv -v %{BUILDROOT}%{sysconfdir}/pki/tls/misc/{CA.pl,tsget} %{BUILDROOT}%{bindir} end end
diff --git a/openssl/patches/openssl-1.1.0-build.patch b/openssl/patches/openssl-1.1.0-build.patch deleted file mode 100644 index bedd95796..000000000 --- a/openssl/patches/openssl-1.1.0-build.patch +++ /dev/null @@ -1,73 +0,0 @@ -diff -up openssl-1.1.0f/Configurations/unix-Makefile.tmpl.build openssl-1.1.0f/Configurations/unix-Makefile.tmpl ---- openssl-1.1.0f/Configurations/unix-Makefile.tmpl.build 2017-06-02 13:51:39.621289504 +0200 -+++ openssl-1.1.0f/Configurations/unix-Makefile.tmpl 2017-06-02 13:54:45.298654812 +0200 -@@ -553,7 +553,7 @@ uninstall_runtime: - install_man_docs: - @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1) - @echo "*** Installing manpages" -- $(PERL) $(SRCDIR)/util/process_docs.pl \ -+ TZ=UTC $(PERL) $(SRCDIR)/util/process_docs.pl \ - --destdir=$(DESTDIR)$(MANDIR) --type=man --suffix=$(MANSUFFIX) - - uninstall_man_docs: -@@ -565,7 +565,7 @@ uninstall_man_docs: - install_html_docs: - @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1) - @echo "*** Installing HTML manpages" -- $(PERL) $(SRCDIR)/util/process_docs.pl \ -+ TZ=UTC $(PERL) $(SRCDIR)/util/process_docs.pl \ - --destdir=$(DESTDIR)$(HTMLDIR) --type=html - - uninstall_html_docs: -diff -up openssl-1.1.0f/Configurations/10-main.conf.build openssl-1.1.0f/Configurations/10-main.conf ---- openssl-1.1.0f/Configurations/10-main.conf.build 2017-05-25 14:46:17.000000000 +0200 -+++ openssl-1.1.0f/Configurations/10-main.conf 2017-06-02 13:51:39.622289528 +0200 -@@ -662,6 +662,7 @@ sub vms_info { - cflags => add("-m64 -DL_ENDIAN"), - perlasm_scheme => "linux64le", - shared_ldflag => add("-m64"), -+ multilib => "64", - }, - - "linux-armv4" => { -@@ -702,6 +703,7 @@ sub vms_info { - "linux-aarch64" => { - inherit_from => [ "linux-generic64", asm("aarch64_asm") ], - perlasm_scheme => "linux64", -+ multilib => "64", - }, - "linux-arm64ilp32" => { # https://wiki.linaro.org/Platform/arm64-ilp32 - inherit_from => [ "linux-generic32", asm("aarch64_asm") ], -diff -up openssl-1.1.0g/test/evptests.txt.build openssl-1.1.0g/test/evptests.txt ---- openssl-1.1.0g/test/evptests.txt.build 2017-11-02 15:29:05.000000000 +0100 -+++ openssl-1.1.0g/test/evptests.txt 2017-11-03 16:37:01.253671494 +0100 -@@ -3707,14 +3707,6 @@ MCowBQYDK2VuAyEA3p7bfXt9wbTTW2HC7OQ1Nz+D - - PrivPubKeyPair = Bob-25519:Bob-25519-PUBLIC - --Derive=Alice-25519 --PeerKey=Bob-25519-PUBLIC --SharedSecret=4A5D9D5BA4CE2DE1728E3BF480350F25E07E21C947D19E3376F09B3C1E161742 -- --Derive=Bob-25519 --PeerKey=Alice-25519-PUBLIC --SharedSecret=4A5D9D5BA4CE2DE1728E3BF480350F25E07E21C947D19E3376F09B3C1E161742 -- - # Illegal sign/verify operations with X25519 key - - Sign=Alice-25519 -@@ -3727,6 +3719,14 @@ Result = KEYOP_INIT_ERROR - Function = EVP_PKEY_verify_init - Reason = operation not supported for this keytype - -+Derive=Alice-25519 -+PeerKey=Bob-25519-PUBLIC -+SharedSecret=4A5D9D5BA4CE2DE1728E3BF480350F25E07E21C947D19E3376F09B3C1E161742 -+ -+Derive=Bob-25519 -+PeerKey=Alice-25519-PUBLIC -+SharedSecret=4A5D9D5BA4CE2DE1728E3BF480350F25E07E21C947D19E3376F09B3C1E161742 -+ - ## ECDH Tests: test with randomly generated keys for all the listed curves - - diff --git a/openssl/patches/openssl-1.1.0-ca-dir.patch b/openssl/patches/openssl-1.1.0-ca-dir.patch deleted file mode 100644 index 421559de5..000000000 --- a/openssl/patches/openssl-1.1.0-ca-dir.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up openssl-1.1.0-pre5/apps/CA.pl.in.ca-dir openssl-1.1.0-pre5/apps/CA.pl.in ---- openssl-1.1.0-pre5/apps/CA.pl.in.ca-dir 2016-07-18 15:19:40.118110405 +0200 -+++ openssl-1.1.0-pre5/apps/CA.pl.in 2016-07-18 15:21:06.531061337 +0200 -@@ -26,7 +26,7 @@ my $X509 = "$openssl x509"; - my $PKCS12 = "$openssl pkcs12"; - - # default openssl.cnf file has setup as per the following --my $CATOP = "./demoCA"; -+my $CATOP = "/etc/pki/CA"; - my $CAKEY = "cakey.pem"; - my $CAREQ = "careq.pem"; - my $CACERT = "cacert.pem"; -diff -up openssl-1.1.0-pre5/apps/openssl.cnf.ca-dir openssl-1.1.0-pre5/apps/openssl.cnf ---- openssl-1.1.0-pre5/apps/openssl.cnf.ca-dir 2016-07-18 15:19:40.114110315 +0200 -+++ openssl-1.1.0-pre5/apps/openssl.cnf 2016-07-18 15:19:48.492299467 +0200 -@@ -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/openssl/patches/openssl-1.1.0-defaults.patch b/openssl/patches/openssl-1.1.0-defaults.patch deleted file mode 100644 index 2a88cef92..000000000 --- a/openssl/patches/openssl-1.1.0-defaults.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff -up openssl-1.1.0-pre5/apps/openssl.cnf.defaults openssl-1.1.0-pre5/apps/openssl.cnf ---- openssl-1.1.0-pre5/apps/openssl.cnf.defaults 2016-04-19 16:57:52.000000000 +0200 -+++ openssl-1.1.0-pre5/apps/openssl.cnf 2016-07-18 14:22:08.252691017 +0200 -@@ -72,7 +72,7 @@ cert_opt = ca_default # Certificate fi - - default_days = 365 # how long to certify for - default_crl_days= 30 # how long before next CRL --default_md = default # use public key default MD -+default_md = sha256 # use SHA-256 by default - preserve = no # keep passed DN ordering - - # A few difference way of specifying how similar the request should look -@@ -104,6 +104,7 @@ emailAddress = optional - #################################################################### - [ req ] - default_bits = 2048 -+default_md = sha256 - default_keyfile = privkey.pem - distinguished_name = req_distinguished_name - attributes = req_attributes -@@ -126,17 +127,18 @@ string_mask = utf8only - - [ req_distinguished_name ] - countryName = Country Name (2 letter code) --countryName_default = AU -+countryName_default = XX - countryName_min = 2 - countryName_max = 2 - - stateOrProvinceName = State or Province Name (full name) --stateOrProvinceName_default = Some-State -+#stateOrProvinceName_default = Default Province - - localityName = Locality Name (eg, city) -+localityName_default = Default City - - 0.organizationName = Organization Name (eg, company) --0.organizationName_default = Internet Widgits Pty Ltd -+0.organizationName_default = Default Company Ltd - - # we can do this but it is not needed normally :-) - #1.organizationName = Second Organization Name (eg, company) -@@ -145,7 +147,7 @@ localityName = Locality Name (eg, city - organizationalUnitName = Organizational Unit Name (eg, section) - #organizationalUnitName_default = - --commonName = Common Name (e.g. server FQDN or YOUR name) -+commonName = Common Name (eg, your name or your server's hostname) - commonName_max = 64 - - emailAddress = Email Address diff --git a/openssl/patches/openssl-1.1.0-disable-ssl3.patch b/openssl/patches/openssl-1.1.0-disable-ssl3.patch deleted file mode 100644 index 267c02c62..000000000 --- a/openssl/patches/openssl-1.1.0-disable-ssl3.patch +++ /dev/null @@ -1,86 +0,0 @@ -diff -up openssl-1.1.0f/apps/s_client.c.disable-ssl3 openssl-1.1.0f/apps/s_client.c ---- openssl-1.1.0f/apps/s_client.c.disable-ssl3 2017-06-05 15:42:44.838853312 +0200 -+++ openssl-1.1.0f/apps/s_client.c 2017-07-17 14:50:06.468821871 +0200 -@@ -1486,6 +1486,9 @@ int s_client_main(int argc, char **argv) - if (sdebug) - ssl_ctx_security_debug(ctx, sdebug); - -+ if (min_version == SSL3_VERSION && max_version == SSL3_VERSION) -+ SSL_CTX_clear_options(ctx, SSL_OP_NO_SSLv3); -+ - if (ssl_config) { - if (SSL_CTX_config(ctx, ssl_config) == 0) { - BIO_printf(bio_err, "Error using configuration "%s"\n", -diff -up openssl-1.1.0f/apps/s_server.c.disable-ssl3 openssl-1.1.0f/apps/s_server.c ---- openssl-1.1.0f/apps/s_server.c.disable-ssl3 2017-05-25 14:46:18.000000000 +0200 -+++ openssl-1.1.0f/apps/s_server.c 2017-07-17 14:49:50.434447583 +0200 -@@ -1614,6 +1614,10 @@ int s_server_main(int argc, char *argv[] - } - if (sdebug) - ssl_ctx_security_debug(ctx, sdebug); -+ -+ if (min_version == SSL3_VERSION && max_version == SSL3_VERSION) -+ SSL_CTX_clear_options(ctx, SSL_OP_NO_SSLv3); -+ - if (ssl_config) { - if (SSL_CTX_config(ctx, ssl_config) == 0) { - BIO_printf(bio_err, "Error using configuration "%s"\n", -diff -up openssl-1.1.0/ssl/ssl_lib.c.disable-ssl3 openssl-1.1.0/ssl/ssl_lib.c ---- openssl-1.1.0/ssl/ssl_lib.c.disable-ssl3 2016-08-25 17:29:22.000000000 +0200 -+++ openssl-1.1.0/ssl/ssl_lib.c 2016-09-08 11:08:05.252082263 +0200 -@@ -2470,6 +2470,13 @@ SSL_CTX *SSL_CTX_new(const SSL_METHOD *m - * or by using the SSL_CONF library. - */ - ret->options |= SSL_OP_NO_COMPRESSION; -+ /* -+ * Disable SSLv3 by default. Applications can -+ * re-enable it by configuring -+ * SSL_CTX_clear_options(ctx, SSL_OP_NO_SSLv3); -+ * or by using the SSL_CONF library. -+ */ -+ ret->options |= SSL_OP_NO_SSLv3; - - ret->tlsext_status_type = -1; - -diff -up openssl-1.1.0/test/ssl_test.c.disable-ssl3 openssl-1.1.0/test/ssl_test.c ---- openssl-1.1.0/test/ssl_test.c.disable-ssl3 2016-09-08 11:08:05.252082263 +0200 -+++ openssl-1.1.0/test/ssl_test.c 2016-09-08 11:11:44.802005886 +0200 -@@ -258,6 +258,7 @@ static int execute_test(SSL_TEST_FIXTURE - SSL_TEST_SERVERNAME_CB_NONE) { - server2_ctx = SSL_CTX_new(TLS_server_method()); - TEST_check(server2_ctx != NULL); -+ SSL_CTX_clear_options(server2_ctx, SSL_OP_NO_SSLv3); - } - client_ctx = SSL_CTX_new(TLS_client_method()); - -@@ -266,11 +267,15 @@ static int execute_test(SSL_TEST_FIXTURE - resume_client_ctx = SSL_CTX_new(TLS_client_method()); - TEST_check(resume_server_ctx != NULL); - TEST_check(resume_client_ctx != NULL); -+ SSL_CTX_clear_options(resume_server_ctx, SSL_OP_NO_SSLv3); -+ SSL_CTX_clear_options(resume_client_ctx, SSL_OP_NO_SSLv3); - } - } - - TEST_check(server_ctx != NULL); - TEST_check(client_ctx != NULL); -+ SSL_CTX_clear_options(server_ctx, SSL_OP_NO_SSLv3); -+ SSL_CTX_clear_options(client_ctx, SSL_OP_NO_SSLv3); - - TEST_check(CONF_modules_load(conf, fixture.test_app, 0) > 0); - -diff -up openssl-1.1.0/test/ssltest_old.c.disable-ssl3 openssl-1.1.0/test/ssltest_old.c ---- openssl-1.1.0/test/ssltest_old.c.disable-ssl3 2016-08-25 17:29:23.000000000 +0200 -+++ openssl-1.1.0/test/ssltest_old.c 2016-09-08 11:08:05.253082286 +0200 -@@ -1456,6 +1456,11 @@ int main(int argc, char *argv[]) - ERR_print_errors(bio_err); - goto end; - } -+ -+ SSL_CTX_clear_options(c_ctx, SSL_OP_NO_SSLv3); -+ SSL_CTX_clear_options(s_ctx, SSL_OP_NO_SSLv3); -+ SSL_CTX_clear_options(s_ctx2, SSL_OP_NO_SSLv3); -+ - /* - * Since we will use low security ciphersuites and keys for testing set - * security level to zero by default. Tests can override this by adding diff --git a/openssl/patches/openssl-1.1.0-no-html.patch b/openssl/patches/openssl-1.1.0-no-html.patch deleted file mode 100644 index f6a941ea0..000000000 --- a/openssl/patches/openssl-1.1.0-no-html.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up openssl-1.1.0-pre5/Configurations/unix-Makefile.tmpl.nohtml openssl-1.1.0-pre5/Configurations/unix-Makefile.tmpl ---- openssl-1.1.0-pre5/Configurations/unix-Makefile.tmpl.no-html 2016-04-19 16:57:52.000000000 +0200 -+++ openssl-1.1.0-pre5/Configurations/unix-Makefile.tmpl 2016-07-18 13:58:55.060106243 +0200 -@@ -288,7 +288,7 @@ install_sw: all install_dev install_engi - - uninstall_sw: uninstall_runtime uninstall_engines uninstall_dev - --install_docs: install_man_docs install_html_docs -+install_docs: install_man_docs - - uninstall_docs: uninstall_man_docs uninstall_html_docs - $(RM) -r -v $(DESTDIR)$(DOCDIR) diff --git a/openssl/patches/openssl-1.1.0g-tests.patch b/openssl/patches/openssl-1.1.0g-tests.patch deleted file mode 100644 index c16c53311..000000000 --- a/openssl/patches/openssl-1.1.0g-tests.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- openssl-1.1.0g/test/recipes/40-test_rehash.t~ 2018-01-28 19:08:01.151912658 +0000 -+++ openssl-1.1.0g/test/recipes/40-test_rehash.t 2018-01-28 19:09:19.408454430 +0000 -@@ -23,7 +23,7 @@ - plan skip_all => "test_rehash is not available on this platform" - unless run(app(["openssl", "rehash", "-help"])); - --plan tests => 5; -+plan tests => 3; - - indir "rehash.$$" => sub { - prepare(); -@@ -42,21 +42,6 @@ - 'Testing rehash operations on empty directory'); - }, create => 1, cleanup => 1; - --indir "rehash.$$" => sub { -- prepare(); -- chmod 0500, curdir(); -- SKIP: { -- if (!ok(!open(FOO, ">unwritable.txt"), -- "Testing that we aren't running as a privileged user, such as root")) { -- close FOO; -- skip "It's pointless to run the next test as root", 1; -- } -- isnt(run(app(["openssl", "rehash", curdir()])), 1, -- 'Testing rehash operations on readonly directory'); -- } -- chmod 0700, curdir(); # make it writable again, so cleanup works --}, create => 1, cleanup => 1; -- - sub prepare { - my @pemsourcefiles = sort glob(srctop_file('test', "*.pem")); - my @destfiles = (); diff --git a/rsync/rsync.nm b/rsync/rsync.nm index 05a99f877..528dcfc0a 100644 --- a/rsync/rsync.nm +++ b/rsync/rsync.nm @@ -4,8 +4,8 @@ ###############################################################################
name = rsync -version = 3.1.2 -release = 2 +version = 3.2.1 +release = 1
groups = Applications/Internet url = http://rsync.samba.org/ @@ -30,8 +30,11 @@ build autoconf libacl-devel libattr-devel + lz4-devel + openssl-devel popt-devel zlib-devel + zstd-devel
# Testsuite. %{bindir}/setfacl @@ -39,8 +42,10 @@ build
configure_options += \ --without-included-popt \ - --without-included-zlib - + --without-included-zlib \ + --enable-openssl \ + --enable-zstd \ + --disable-xxhash
prepare_cmds # Fix permission issure. @@ -76,7 +81,6 @@ build INSTALLMAN="install -p"
install_cmds - # Install config file. mkdir -pv %{BUILDROOT}%{sysconfdir}
@@ -85,6 +89,10 @@ build
# Create directory for pidfile. mkdir -pv %{BUILDROOT}/run/rsyncd + + # Replace shebanh in rsync-ssl + sed -i -e "s@^#!.*@#!/bin/bash@" \ + %{BUILDROOT}%{bindir}/rsync-ssl end
end @@ -95,6 +103,11 @@ packages %{sysconfdir}/rsyncd.conf end
+ requires + # For rsync-ssl + %{bindir}/openssl + end + script postin systemctl daemon-reload >/dev/null 2>&1 || : end diff --git a/wpa_supplicant/wpa_supplicant.nm b/wpa_supplicant/wpa_supplicant.nm index 80307cd0a..0c2ce15c4 100644 --- a/wpa_supplicant/wpa_supplicant.nm +++ b/wpa_supplicant/wpa_supplicant.nm @@ -4,13 +4,13 @@ ###############################################################################
name = wpa_supplicant -version = 2.6 -release = 2 +version = 2.9 +release = 1
groups = Sytem/Base -url = http://hostap.epitest.fi/releases/ +url = https://w1.fi/wpa_supplicant/ license = BSD -summary = WPA/WPA2/IEEE 802.1X Supplicant. +summary = WPA/WPA2/IEEE 802.1X Supplicant
description wpa_supplicant is a WPA Supplicant for Linux, BSD and Windows with support @@ -20,10 +20,11 @@ description authentication/association of the wlan driver. end
-source_dl = http://hostap.epitest.fi/releases/ +source_dl = https://w1.fi/releases/
build requires + dbus-devel libnl3-devel ncurses-devel openssl-devel diff --git a/xz/xz.nm b/xz/xz.nm index c815baed2..90b363ac6 100644 --- a/xz/xz.nm +++ b/xz/xz.nm @@ -4,7 +4,7 @@ ###############################################################################
name = xz -version = 5.2.4 +version = 5.2.5 release = 1
groups = Applications/Compression diff --git a/zstd/zstd.nm b/zstd/zstd.nm new file mode 100644 index 000000000..e5afd342b --- /dev/null +++ b/zstd/zstd.nm @@ -0,0 +1,52 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team info@ipfire.org # +############################################################################### + +name = zstd +version = 1.4.5 +release = 1 + +groups = System/Libraries +url = http://facebook.github.io/zstd/ +license = GPLv2 +summary = Zstandard is a fast lossless compression algorithm + +description + Zstandard, or zstd as short version, is a fast lossless compression + algorithm, targeting real-time compression scenarios at zlib-level + and better compression ratios. It's backed by a very fast entropy + stage, provided by Huff0 and FSE library. +end + +source_dl = https://github.com/facebook/zstd/releases/download/v%%7Bversion%7D/ + +build + requires + lz4-devel + xz-devel + zlib-devel + end + + test + make check + end + + make_install_targets += prefix=%{prefix} libdir=%{libdir} +end + +packages + package %{name} + + package %{name}-libs + template LIBS + end + + package %{name}-devel + template DEVEL + end + + package %{name}-debuginfo + template DEBUGINFO + end +end
hooks/post-receive -- IPFire 3.x development tree
-
Michael Tremer