IPFire-SCM February 2021

ipfire-scm@lists.ipfire.org

1 participants
37 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 6dc206ab6943aff5820a462d42e827d3e7852990
by Michael Tremer 16 Feb '21

16 Feb '21

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 2.x development tree". The branch, next has been updated via 6dc206ab6943aff5820a462d42e827d3e7852990 (commit) via 44558ee19c46d2d4bdefb16d5d65ae04b069b104 (commit) via a810c2ae8f5f2a77303bca7c5f896297c48b4ca0 (commit) from 5459c8a4b792d26c5963df2f3e33c44effc825f2 (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 6dc206ab6943aff5820a462d42e827d3e7852990 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Feb 16 18:00:16 2021 +0000 Drop /usr/lib/sse2 This is now unused Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 44558ee19c46d2d4bdefb16d5d65ae04b069b104 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Feb 16 17:55:29 2021 +0000 openssl: Drop SSE2-optimized version Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit a810c2ae8f5f2a77303bca7c5f896297c48b4ca0 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Feb 16 17:43:12 2021 +0000 gmp: Drop SSE2-optimized version on i586 The next version of glibc has removed support for this and this patch removes it. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/aarch64/stage2 | 2 -- config/rootfiles/common/armv5tel/gmp | 17 -------------- config/rootfiles/common/{aarch64 => }/gmp | 0 config/rootfiles/common/i586/gmp | 19 ---------------- config/rootfiles/common/i586/openssl-sse2 | 1 - config/rootfiles/common/stage2 | 2 -- config/rootfiles/common/x86_64/gmp | 17 -------------- config/rootfiles/common/x86_64/stage2 | 2 -- config/rootfiles/core/155/filelists/files | 1 + .../rootfiles/core/155/filelists/i586/openssl-sse2 | 1 - config/rootfiles/core/155/update.sh | 4 +++- lfs/gmp | 26 ++-------------------- lfs/openssl | 19 ++-------------- lfs/stage2 | 2 +- make.sh | 1 - src/scripts/filesystem-cleanup | 1 - 16 files changed, 9 insertions(+), 106 deletions(-) delete mode 100644 config/rootfiles/common/armv5tel/gmp rename config/rootfiles/common/{aarch64 => }/gmp (100%) delete mode 100644 config/rootfiles/common/i586/gmp delete mode 100644 config/rootfiles/common/i586/openssl-sse2 delete mode 100644 config/rootfiles/common/x86_64/gmp delete mode 120000 config/rootfiles/core/155/filelists/i586/openssl-sse2 Difference in files: diff --git a/config/rootfiles/common/aarch64/stage2 b/config/rootfiles/common/aarch64/stage2 index 8556c9c28..1db148203 100644 --- a/config/rootfiles/common/aarch64/stage2 +++ b/config/rootfiles/common/aarch64/stage2 @@ -84,7 +84,6 @@ usr/lib/libgcc_s.so.1 #usr/lib/libstdc++.la #usr/lib/libstdc++.so usr/lib/libstdc++.so.6 -#usr/lib/sse2 usr/lib64 #usr/local #usr/local/bin @@ -112,7 +111,6 @@ usr/local/bin/update-lang-cache usr/local/bin/update-location-database #usr/local/include #usr/local/lib -#usr/local/lib/sse2 #usr/local/sbin #usr/local/share #usr/local/share/doc diff --git a/config/rootfiles/common/armv5tel/gmp b/config/rootfiles/common/armv5tel/gmp deleted file mode 100644 index c1d6a7d9d..000000000 --- a/config/rootfiles/common/armv5tel/gmp +++ /dev/null @@ -1,17 +0,0 @@ -#usr/include/gmp.h -#usr/include/gmpxx.h -#usr/lib/libgmp.a -#usr/lib/libgmp.la -#usr/lib/libgmp.so -usr/lib/libgmp.so.10 -usr/lib/libgmp.so.10.4.0 -#usr/lib/libgmpxx.a -#usr/lib/libgmpxx.la -#usr/lib/libgmpxx.so -usr/lib/libgmpxx.so.4 -usr/lib/libgmpxx.so.4.6.0 -#usr/lib/pkgconfig/gmp.pc -#usr/lib/pkgconfig/gmpxx.pc -#usr/share/info/gmp.info -#usr/share/info/gmp.info-1 -#usr/share/info/gmp.info-2 diff --git a/config/rootfiles/common/aarch64/gmp b/config/rootfiles/common/gmp similarity index 100% rename from config/rootfiles/common/aarch64/gmp rename to config/rootfiles/common/gmp diff --git a/config/rootfiles/common/i586/gmp b/config/rootfiles/common/i586/gmp deleted file mode 100644 index c0ec9a9b6..000000000 --- a/config/rootfiles/common/i586/gmp +++ /dev/null @@ -1,19 +0,0 @@ -#usr/include/gmp.h -#usr/include/gmpxx.h -#usr/lib/libgmp.a -#usr/lib/libgmp.la -#usr/lib/libgmp.so -usr/lib/libgmp.so.10 -usr/lib/libgmp.so.10.4.0 -#usr/lib/libgmpxx.a -#usr/lib/libgmpxx.la -#usr/lib/libgmpxx.so -usr/lib/libgmpxx.so.4 -usr/lib/libgmpxx.so.4.6.0 -#usr/lib/pkgconfig/gmp.pc -#usr/lib/pkgconfig/gmpxx.pc -usr/lib/sse2/libgmp.so.10 -usr/lib/sse2/libgmp.so.10.4.0 -#usr/share/info/gmp.info -#usr/share/info/gmp.info-1 -#usr/share/info/gmp.info-2 diff --git a/config/rootfiles/common/i586/openssl-sse2 b/config/rootfiles/common/i586/openssl-sse2 deleted file mode 100644 index d366bd47f..000000000 --- a/config/rootfiles/common/i586/openssl-sse2 +++ /dev/null @@ -1 +0,0 @@ -usr/lib/sse2/libcrypto.so.1.1 diff --git a/config/rootfiles/common/stage2 b/config/rootfiles/common/stage2 index 2c4f715dd..d7b454884 100644 --- a/config/rootfiles/common/stage2 +++ b/config/rootfiles/common/stage2 @@ -84,7 +84,6 @@ usr/lib/libgcc_s.so.1 #usr/lib/libstdc++.la #usr/lib/libstdc++.so usr/lib/libstdc++.so.6 -#usr/lib/sse2 #usr/local #usr/local/bin #usr/local/bin/archive.files @@ -111,7 +110,6 @@ usr/local/bin/update-ids-ruleset usr/local/bin/update-location-database #usr/local/include #usr/local/lib -#usr/local/lib/sse2 #usr/local/sbin #usr/local/share #usr/local/share/doc diff --git a/config/rootfiles/common/x86_64/gmp b/config/rootfiles/common/x86_64/gmp deleted file mode 100644 index c1d6a7d9d..000000000 --- a/config/rootfiles/common/x86_64/gmp +++ /dev/null @@ -1,17 +0,0 @@ -#usr/include/gmp.h -#usr/include/gmpxx.h -#usr/lib/libgmp.a -#usr/lib/libgmp.la -#usr/lib/libgmp.so -usr/lib/libgmp.so.10 -usr/lib/libgmp.so.10.4.0 -#usr/lib/libgmpxx.a -#usr/lib/libgmpxx.la -#usr/lib/libgmpxx.so -usr/lib/libgmpxx.so.4 -usr/lib/libgmpxx.so.4.6.0 -#usr/lib/pkgconfig/gmp.pc -#usr/lib/pkgconfig/gmpxx.pc -#usr/share/info/gmp.info -#usr/share/info/gmp.info-1 -#usr/share/info/gmp.info-2 diff --git a/config/rootfiles/common/x86_64/stage2 b/config/rootfiles/common/x86_64/stage2 index ee41d2fb0..d0f013b1a 100644 --- a/config/rootfiles/common/x86_64/stage2 +++ b/config/rootfiles/common/x86_64/stage2 @@ -84,7 +84,6 @@ usr/lib/libgcc_s.so.1 #usr/lib/libstdc++.la #usr/lib/libstdc++.so usr/lib/libstdc++.so.6 -#usr/lib/sse2 usr/lib64 #usr/local #usr/local/bin @@ -112,7 +111,6 @@ usr/local/bin/update-lang-cache usr/local/bin/update-location-database #usr/local/include #usr/local/lib -#usr/local/lib/sse2 #usr/local/sbin #usr/local/share #usr/local/share/doc diff --git a/config/rootfiles/core/155/filelists/files b/config/rootfiles/core/155/filelists/files index 722152c17..688cfb1ac 100644 --- a/config/rootfiles/core/155/filelists/files +++ b/config/rootfiles/core/155/filelists/files @@ -1,2 +1,3 @@ srv/web/ipfire/cgi-bin/country.cgi srv/web/ipfire/cgi-bin/wirelessclient.cgi +usr/local/bin/filesystem-cleanup diff --git a/config/rootfiles/core/155/filelists/i586/openssl-sse2 b/config/rootfiles/core/155/filelists/i586/openssl-sse2 deleted file mode 120000 index f424713d6..000000000 --- a/config/rootfiles/core/155/filelists/i586/openssl-sse2 +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/openssl-sse2 \ No newline at end of file diff --git a/config/rootfiles/core/155/update.sh b/config/rootfiles/core/155/update.sh index f7b2e8279..0f5d37848 100644 --- a/config/rootfiles/core/155/update.sh +++ b/config/rootfiles/core/155/update.sh @@ -32,7 +32,9 @@ for (( i=1; i<=$core; i++ )); do done # Remove files -rm -vf \ +rm -vrf \ + /usr/lib/sse2 \ + /usr/local/lib/sse2 \ /lib/libpcre.so.0 \ /lib/libpcre.so.0.0.1 diff --git a/lfs/gmp b/lfs/gmp index d09100981..ed92cf30e 100644 --- a/lfs/gmp +++ b/lfs/gmp @@ -34,13 +34,8 @@ TARGET = $(DIR_INFO)/$(THISAPP) ifeq "$(BUILD_ARCH)" "i586" CONFIGURE_ARGS = ABI=32 - BUILDTARGET_PENTIUM4 = $(patsubst $(BUILD_ARCH)-%,pentium4-%,$(BUILDTARGET)) endif -CONFIGURE_OPTIONS = \ - --prefix=/usr \ - --enable-cxx - ############################################################################### # Top-level Rules ############################################################################### @@ -82,26 +77,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && \ $(CONFIGURE_ARGS) \ ./configure \ - --build=$(BUILDTARGET) \ - $(CONFIGURE_OPTIONS) + --prefix=/usr \ + --enable-cxx cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install - -ifeq "$(BUILD_ARCH)" "i586" - # Build SSE/SSE2 optimised version for x86 - cd $(DIR_APP) && make clean - cd $(DIR_APP) && \ - $(CONFIGURE_ARGS) \ - ./configure \ - --build=$(BUILDTARGET_PENTIUM4) \ - $(CONFIGURE_OPTIONS) \ - CFLAGS="$(CFLAGS) -march=pentium4" \ - CXXFLAGS="$(CXXFLAGS) -march=pentium4" - cd $(DIR_APP) && make $(MAKETUNING) - - -mkdir -pv /usr/lib/sse2 - cd $(DIR_APP) && install -v -m 755 .libs/libgmp.so.10.4.0 /usr/lib/sse2 -endif - @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/openssl b/lfs/openssl index ea7eff135..a50d686f0 100644 --- a/lfs/openssl +++ b/lfs/openssl @@ -35,11 +35,6 @@ TARGET = $(DIR_INFO)/$(THISAPP)$(KCFG) CFLAGS += -DPURIFY -Wa,--noexecstack -# Enable SSE2 for this build -ifeq "$(KCFG)" "-sse2" - CFLAGS+= -march=i686 -mmmx -msse -msse2 -mfpmath=sse -endif - export RPM_OPT_FLAGS = $(CFLAGS) CONFIGURE_OPTIONS = \ @@ -72,11 +67,7 @@ ifeq "$(BUILD_ARCH)" "x86_64" endif ifeq "$(BUILD_ARCH)" "i586" - OPENSSL_ARCH = linux-elf - - ifneq "$(KCFG)" "-sse2" - OPENSSL_ARCH += no-sse2 - endif + OPENSSL_ARCH = linux-elf no-sse2 endif ############################################################################### @@ -132,15 +123,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && make depend cd $(DIR_APP) && make $(MAKETUNING) -ifeq "$(KCFG)" "-sse2" - -mkdir -pv /usr/lib/sse2 - cd $(DIR_APP) && install -m 755 \ - libcrypto.so.1.1 /usr/lib/sse2 -else - # Install everything. + # Install everything cd $(DIR_APP) && make install install -m 0644 $(DIR_SRC)/config/ssl/openssl.cnf /etc/ssl -endif @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/stage2 b/lfs/stage2 index 2863d6b69..bacc9e031 100644 --- a/lfs/stage2 +++ b/lfs/stage2 @@ -53,7 +53,7 @@ $(TARGET) : -mkdir -pv /{media/{floppy,cdrom,usbkey},sbin,srv,var} -install -dv -m 0750 /root -install -dv -m 1777 /tmp /var/tmp - -mkdir -pv /usr/{,local/}{bin,include,lib{,/sse2},sbin,src} + -mkdir -pv /usr/{,local/}{bin,include,lib,sbin,src} -mkdir -pv /usr/{,local/}share/{doc,info,locale,man} -mkdir -v /usr/{,local/}share/{misc,terminfo,xt_geoip,zoneinfo} -mkdir -pv /usr/{,local/}share/man/man{1..8} diff --git a/make.sh b/make.sh index a0c71ce73..eb00087f6 100755 --- a/make.sh +++ b/make.sh @@ -1145,7 +1145,6 @@ buildipfire() { lfsmake2 initscripts lfsmake2 backup lfsmake2 openssl - [ "${BUILD_ARCH}" = "i586" ] && lfsmake2 openssl KCFG='-sse2' lfsmake2 kmod lfsmake2 udev lfsmake2 popt diff --git a/src/scripts/filesystem-cleanup b/src/scripts/filesystem-cleanup index f4d4f7df2..932e7dc6c 100644 --- a/src/scripts/filesystem-cleanup +++ b/src/scripts/filesystem-cleanup @@ -22,7 +22,6 @@ ############################################################################ PATHS=( - /usr/lib/sse2 /usr/lib /lib ) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5459c8a4b792d26c5963df2f3e33c44effc825f2
by Michael Tremer 16 Feb '21

16 Feb '21

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 9aa6f9a89f4e57a93bf6b1a751ef6abb9dc7812e
by Michael Tremer 16 Feb '21

16 Feb '21

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 2.x development tree". The branch, master has been updated via 9aa6f9a89f4e57a93bf6b1a751ef6abb9dc7812e (commit) via 08c83af39fbd226728f0da40d25ea62e77e05fb4 (commit) via b31cd7d0fc12e45c2875c9619d063e1e7310e9fe (commit) via 55209df391e11bf97ec1cda2dbf90aa365c75761 (commit) via e902ebe3be6931f6c632b105ad8fe6997afb305c (commit) via 5cdf3b8c78b4c7292b304af6c0b928a3083cd5f4 (commit) via d95f3606831fd03f4bdfdd4bed0f891489907d0d (commit) from 896fa74d68e83b344235dbd147b0e429aafb14d3 (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 9aa6f9a89f4e57a93bf6b1a751ef6abb9dc7812e Merge: 08c83af39 55209df39 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Feb 16 17:36:41 2021 +0000 Merge remote-tracking branch 'ms/wifi-fixes' commit 08c83af39fbd226728f0da40d25ea62e77e05fb4 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Feb 16 17:36:22 2021 +0000 core154: Ship openssl Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b31cd7d0fc12e45c2875c9619d063e1e7310e9fe Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Feb 16 17:28:17 2021 +0000 openssl: Update to 1.1.1j Null pointer deref in X509_issuer_and_serial_hash() (CVE-2021-23841) ==================================================================== Severity: Moderate The OpenSSL public API function X509_issuer_and_serial_hash() attempts to create a unique hash value based on the issuer and serial number data contained within an X509 certificate. However it fails to correctly handle any errors that may occur while parsing the issuer field (which might occur if the issuer field is maliciously constructed). This may subsequently result in a NULL pointer deref and a crash leading to a potential denial of service attack. The function X509_issuer_and_serial_hash() is never directly called by OpenSSL itself so applications are only vulnerable if they use this function directly and they use it on certificates that may have been obtained from untrusted sources. OpenSSL versions 1.1.1i and below are affected by this issue. Users of these versions should upgrade to OpenSSL 1.1.1j. OpenSSL versions 1.0.2x and below are affected by this issue. However OpenSSL 1.0.2 is out of support and no longer receiving public updates. Premium support customers of OpenSSL 1.0.2 should upgrade to 1.0.2y. Other users should upgrade to 1.1.1j. This issue was reported to OpenSSL on 15th December 2020 by Tavis Ormandy from Google. The fix was developed by Matt Caswell. Incorrect SSLv2 rollback protection (CVE-2021-23839) ==================================================== Severity: Low OpenSSL 1.0.2 supports SSLv2. If a client attempts to negotiate SSLv2 with a server that is configured to support both SSLv2 and more recent SSL and TLS versions then a check is made for a version rollback attack when unpadding an RSA signature. Clients that support SSL or TLS versions greater than SSLv2 are supposed to use a special form of padding. A server that supports greater than SSLv2 is supposed to reject connection attempts from a client where this special form of padding is present, because this indicates that a version rollback has occurred (i.e. both client and server support greater than SSLv2, and yet this is the version that is being requested). The implementation of this padding check inverted the logic so that the connection attempt is accepted if the padding is present, and rejected if it is absent. This means that such as server will accept a connection if a version rollback attack has occurred. Further the server will erroneously reject a connection if a normal SSLv2 connection attempt is made. Only OpenSSL 1.0.2 servers from version 1.0.2s to 1.0.2x are affected by this issue. In order to be vulnerable a 1.0.2 server must: 1) have configured SSLv2 support at compile time (this is off by default), 2) have configured SSLv2 support at runtime (this is off by default), 3) have configured SSLv2 ciphersuites (these are not in the default ciphersuite list) OpenSSL 1.1.1 does not have SSLv2 support and therefore is not vulnerable to this issue. The underlying error is in the implementation of the RSA_padding_check_SSLv23() function. This also affects the RSA_SSLV23_PADDING padding mode used by various other functions. Although 1.1.1 does not support SSLv2 the RSA_padding_check_SSLv23() function still exists, as does the RSA_SSLV23_PADDING padding mode. Applications that directly call that function or use that padding mode will encounter this issue. However since there is no support for the SSLv2 protocol in 1.1.1 this is considered a bug and not a security issue in that version. OpenSSL 1.0.2 is out of support and no longer receiving public updates. Premium support customers of OpenSSL 1.0.2 should upgrade to 1.0.2y. Other users should upgrade to 1.1.1j. This issue was reported to OpenSSL on 21st January 2021 by D. Katz and Joel Luellwitz from Trustwave. The fix was developed by Matt Caswell. Integer overflow in CipherUpdate (CVE-2021-23840) ================================================= Severity: Low Calls to EVP_CipherUpdate, EVP_EncryptUpdate and EVP_DecryptUpdate may overflow the output length argument in some cases where the input length is close to the maximum permissable length for an integer on the platform. In such cases the return value from the function call will be 1 (indicating success), but the output length value will be negative. This could cause applications to behave incorrectly or crash. OpenSSL versions 1.1.1i and below are affected by this issue. Users of these versions should upgrade to OpenSSL 1.1.1j. OpenSSL versions 1.0.2x and below are affected by this issue. However OpenSSL 1.0.2 is out of support and no longer receiving public updates. Premium support customers of OpenSSL 1.0.2 should upgrade to 1.0.2y. Other users should upgrade to 1.1.1j. This issue was reported to OpenSSL on 13th December 2020 by Paul Kehrer. The fix was developed by Matt Caswell. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 55209df391e11bf97ec1cda2dbf90aa365c75761 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Feb 16 17:44:45 2021 +0100 wlanclient: Do not force using legacy interface to talk to the kernel "wireless extensions" is the old interface to speak to the kernel. All newer drivers support nl80211 now. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit e902ebe3be6931f6c632b105ad8fe6997afb305c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Feb 16 17:41:23 2021 +0100 wirelessclient.cgi: Show when 802.11w is active Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 5cdf3b8c78b4c7292b304af6c0b928a3083cd5f4 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Feb 16 17:37:07 2021 +0100 wirelessclient.cgi: Show when actually connected using WPA3 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit d95f3606831fd03f4bdfdd4bed0f891489907d0d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Feb 16 17:34:02 2021 +0100 wirelessclient.cgi: Show when using WPA3 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/openssl | 4 +++ .../100 => core/154}/filelists/i586/openssl-sse2 | 0 .../{oldcore/100 => core/154}/filelists/openssl | 0 doc/language_issues.de | 1 + doc/language_issues.en | 1 + doc/language_issues.es | 1 + doc/language_issues.fr | 1 + doc/language_issues.it | 1 + doc/language_issues.nl | 1 + doc/language_issues.pl | 1 + doc/language_issues.ru | 1 + doc/language_issues.tr | 1 + doc/language_missings | 8 ++++++ html/cgi-bin/wirelessclient.cgi | 30 +++++++++++++++++++++- langs/en/cgi-bin/en.pl | 1 + lfs/openssl | 4 +-- src/initscripts/system/wlanclient | 4 +-- 17 files changed, 54 insertions(+), 6 deletions(-) copy config/rootfiles/{oldcore/100 => core/154}/filelists/i586/openssl-sse2 (100%) copy config/rootfiles/{oldcore/100 => core/154}/filelists/openssl (100%) Difference in files: diff --git a/config/rootfiles/common/openssl b/config/rootfiles/common/openssl index df6bbe320..989670262 100644 --- a/config/rootfiles/common/openssl +++ b/config/rootfiles/common/openssl @@ -869,6 +869,7 @@ usr/lib/libssl.so.1.1 #usr/share/doc/openssl/html/man3/DH_check_pub_key_ex.html #usr/share/doc/openssl/html/man3/DH_clear_flags.html #usr/share/doc/openssl/html/man3/DH_compute_key.html +#usr/share/doc/openssl/html/man3/DH_compute_key_padded.html #usr/share/doc/openssl/html/man3/DH_free.html #usr/share/doc/openssl/html/man3/DH_generate_key.html #usr/share/doc/openssl/html/man3/DH_generate_parameters.html @@ -1983,6 +1984,7 @@ usr/lib/libssl.so.1.1 #usr/share/doc/openssl/html/man3/OCSP_REQUEST_new.html #usr/share/doc/openssl/html/man3/OCSP_REQ_CTX_add1_header.html #usr/share/doc/openssl/html/man3/OCSP_REQ_CTX_free.html +#usr/share/doc/openssl/html/man3/OCSP_REQ_CTX_i2d.html #usr/share/doc/openssl/html/man3/OCSP_REQ_CTX_set1_req.html #usr/share/doc/openssl/html/man3/OCSP_RESPBYTES_free.html #usr/share/doc/openssl/html/man3/OCSP_RESPBYTES_new.html @@ -4838,6 +4840,7 @@ usr/lib/libssl.so.1.1 #usr/share/man/man3/DH_check_pub_key_ex.3 #usr/share/man/man3/DH_clear_flags.3 #usr/share/man/man3/DH_compute_key.3 +#usr/share/man/man3/DH_compute_key_padded.3 #usr/share/man/man3/DH_free.3 #usr/share/man/man3/DH_generate_key.3 #usr/share/man/man3/DH_generate_parameters.3 @@ -5952,6 +5955,7 @@ usr/lib/libssl.so.1.1 #usr/share/man/man3/OCSP_REQUEST_new.3 #usr/share/man/man3/OCSP_REQ_CTX_add1_header.3 #usr/share/man/man3/OCSP_REQ_CTX_free.3 +#usr/share/man/man3/OCSP_REQ_CTX_i2d.3 #usr/share/man/man3/OCSP_REQ_CTX_set1_req.3 #usr/share/man/man3/OCSP_RESPBYTES_free.3 #usr/share/man/man3/OCSP_RESPBYTES_new.3 diff --git a/config/rootfiles/core/154/filelists/i586/openssl-sse2 b/config/rootfiles/core/154/filelists/i586/openssl-sse2 new file mode 120000 index 000000000..f424713d6 --- /dev/null +++ b/config/rootfiles/core/154/filelists/i586/openssl-sse2 @@ -0,0 +1 @@ +../../../../common/i586/openssl-sse2 \ No newline at end of file diff --git a/config/rootfiles/core/154/filelists/openssl b/config/rootfiles/core/154/filelists/openssl new file mode 120000 index 000000000..e011a9266 --- /dev/null +++ b/config/rootfiles/core/154/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/doc/language_issues.de b/doc/language_issues.de index aae7ca565..5d079036a 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -889,6 +889,7 @@ WARNING: untranslated string: smb daemon = SMB Daemon WARNING: untranslated string: user management = User Management WARNING: untranslated string: winbind daemon = Winbind Daemon WARNING: untranslated string: wlan client encryption wpa3 = WPA3 +WARNING: untranslated string: wlan client management frame protection = Management Frame Protection WARNING: untranslated string: wlanap 802.11w disabled = Disabled WARNING: untranslated string: wlanap 802.11w enforced = Enforced WARNING: untranslated string: wlanap 802.11w optional = Optional diff --git a/doc/language_issues.en b/doc/language_issues.en index 434115902..6e30eb995 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -2132,6 +2132,7 @@ WARNING: untranslated string: wlan client group cipher = Group cipher WARNING: untranslated string: wlan client group key algorithm = GKA WARNING: untranslated string: wlan client identity = Identity WARNING: untranslated string: wlan client invalid key length = Invalid key length. +WARNING: untranslated string: wlan client management frame protection = Management Frame Protection WARNING: untranslated string: wlan client method = Method WARNING: untranslated string: wlan client new entry = Create new wireless client configuration WARNING: untranslated string: wlan client new network = New network diff --git a/doc/language_issues.es b/doc/language_issues.es index 2feec8924..82d65d99c 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -1509,6 +1509,7 @@ WARNING: untranslated string: wlan client group cipher = Group cipher WARNING: untranslated string: wlan client group key algorithm = GKA WARNING: untranslated string: wlan client identity = Identity WARNING: untranslated string: wlan client invalid key length = Invalid key length. +WARNING: untranslated string: wlan client management frame protection = Management Frame Protection WARNING: untranslated string: wlan client method = Method WARNING: untranslated string: wlan client new entry = Create new wireless client configuration WARNING: untranslated string: wlan client new network = New network diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 835352cf5..942be73ec 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -919,3 +919,4 @@ WARNING: untranslated string: routing config changed = unknown string WARNING: untranslated string: token = Token: WARNING: untranslated string: token not set = No Token has been given. WARNING: untranslated string: wlan client encryption wpa3 = WPA3 +WARNING: untranslated string: wlan client management frame protection = Management Frame Protection diff --git a/doc/language_issues.it b/doc/language_issues.it index 152ce4786..98074e59f 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -1197,6 +1197,7 @@ WARNING: untranslated string: wlan client eap state = EAP Status WARNING: untranslated string: wlan client encryption eap = EAP WARNING: untranslated string: wlan client encryption wpa3 = WPA3 WARNING: untranslated string: wlan client identity = Identity +WARNING: untranslated string: wlan client management frame protection = Management Frame Protection WARNING: untranslated string: wlan client method = Method WARNING: untranslated string: wlan client password = Password WARNING: untranslated string: wlan client tls cipher = TLS Cipher diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 683c08f44..8eebbd57f 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -1237,6 +1237,7 @@ WARNING: untranslated string: wlan client eap state = EAP Status WARNING: untranslated string: wlan client encryption eap = EAP WARNING: untranslated string: wlan client encryption wpa3 = WPA3 WARNING: untranslated string: wlan client identity = Identity +WARNING: untranslated string: wlan client management frame protection = Management Frame Protection WARNING: untranslated string: wlan client method = Method WARNING: untranslated string: wlan client password = Password WARNING: untranslated string: wlan client tls cipher = TLS Cipher diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 2feec8924..82d65d99c 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -1509,6 +1509,7 @@ WARNING: untranslated string: wlan client group cipher = Group cipher WARNING: untranslated string: wlan client group key algorithm = GKA WARNING: untranslated string: wlan client identity = Identity WARNING: untranslated string: wlan client invalid key length = Invalid key length. +WARNING: untranslated string: wlan client management frame protection = Management Frame Protection WARNING: untranslated string: wlan client method = Method WARNING: untranslated string: wlan client new entry = Create new wireless client configuration WARNING: untranslated string: wlan client new network = New network diff --git a/doc/language_issues.ru b/doc/language_issues.ru index cbd25d176..43c1f8c08 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -1502,6 +1502,7 @@ WARNING: untranslated string: wlan client group cipher = Group cipher WARNING: untranslated string: wlan client group key algorithm = GKA WARNING: untranslated string: wlan client identity = Identity WARNING: untranslated string: wlan client invalid key length = Invalid key length. +WARNING: untranslated string: wlan client management frame protection = Management Frame Protection WARNING: untranslated string: wlan client method = Method WARNING: untranslated string: wlan client new entry = Create new wireless client configuration WARNING: untranslated string: wlan client new network = New network diff --git a/doc/language_issues.tr b/doc/language_issues.tr index e4c25f931..439a58890 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -1067,6 +1067,7 @@ WARNING: untranslated string: vulnerable = Vulnerable WARNING: untranslated string: whois results from = WHOIS results from WARNING: untranslated string: winbind daemon = Winbind Daemon WARNING: untranslated string: wlan client encryption wpa3 = WPA3 +WARNING: untranslated string: wlan client management frame protection = Management Frame Protection WARNING: untranslated string: wlanap 802.11w disabled = Disabled WARNING: untranslated string: wlanap 802.11w enforced = Enforced WARNING: untranslated string: wlanap 802.11w optional = Optional diff --git a/doc/language_missings b/doc/language_missings index 1956eac48..0d89426ca 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -65,6 +65,7 @@ < wlanap 802.11w enforced < wlanap 802.11w optional < wlan client encryption wpa3 +< wlan client management frame protection ############################################################################ # Checking cgi-bin translations for language: es # ############################################################################ @@ -927,6 +928,7 @@ < wlan client group key algorithm < wlan client identity < wlan client invalid key length +< wlan client management frame protection < wlan client method < wlan client new entry < wlan client new network @@ -974,6 +976,7 @@ < token not set < upload fcdsl.o < wlan client encryption wpa3 +< wlan client management frame protection ############################################################################ # Checking cgi-bin translations for language: it # ############################################################################ @@ -1339,6 +1342,7 @@ < wlan client encryption eap < wlan client encryption wpa3 < wlan client identity +< wlan client management frame protection < wlan client method < wlan client password < wlan client tls cipher @@ -1777,6 +1781,7 @@ < wlan client encryption eap < wlan client encryption wpa3 < wlan client identity +< wlan client management frame protection < wlan client method < wlan client password < wlan client tls cipher @@ -2643,6 +2648,7 @@ < wlan client group key algorithm < wlan client identity < wlan client invalid key length +< wlan client management frame protection < wlan client method < wlan client new entry < wlan client new network @@ -3529,6 +3535,7 @@ < wlan client group key algorithm < wlan client identity < wlan client invalid key length +< wlan client management frame protection < wlan client method < wlan client new entry < wlan client new network @@ -3738,6 +3745,7 @@ < wlanap neighbor scan warning < wlanap ssid < wlan client encryption wpa3 +< wlan client management frame protection < working < zoneconf access native < zoneconf access none diff --git a/html/cgi-bin/wirelessclient.cgi b/html/cgi-bin/wirelessclient.cgi index e8c3c9628..d8637ccd2 100644 --- a/html/cgi-bin/wirelessclient.cgi +++ b/html/cgi-bin/wirelessclient.cgi @@ -324,6 +324,8 @@ END $encryption_mode = $Lang::tr{'wlan client encryption wpa'}; } elsif ($config[3] eq "WPA2") { $encryption_mode = $Lang::tr{'wlan client encryption wpa2'}; + } elsif ($config[3] eq "WPA3") { + $encryption_mode = $Lang::tr{'wlan client encryption wpa3'}; } elsif ($config[3] eq "EAP") { $encryption_mode = $Lang::tr{'wlan client encryption eap'}; } @@ -682,6 +684,19 @@ sub ShowStatus() { </tr> END + if ($status{'pmf'} eq "1") { + print <<END; + <tr> + <td width='20%'> + $Lang::tr{'wlan client management frame protection'} + </td> + <td width='80%'> + $Lang::tr{'active'} + </td> + </tr> +END + } + if ($status{'EAP state'}) { my $selected_method = $status{'selectedMethod'}; $selected_method =~ s/\d+ $(.*)$/$1/e; @@ -736,12 +751,25 @@ END } if (($status{'pairwise_cipher'} ne "NONE") || ($status{'group_cipher'} ne "NONE")) { - print <<END; + if ($status{'key_mgmt'} eq "SAE") { + print <<END; + <tr> + <td colspan='2'> + <strong>$Lang::tr{'wlan client encryption wpa3'}</strong> + </td> + </tr> +END + } else { + print <<END; <tr> <td colspan='2'> <strong>$Lang::tr{'wlan client encryption wpa'}</strong> </td> </tr> +END + } + + print <<END; <tr> <td width='20%'> $Lang::tr{'wlan client pairwise cipher'} diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 22e8a4cc6..95a1cfda4 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -2956,6 +2956,7 @@ 'wlan client group key algorithm' => 'GKA', 'wlan client identity' => 'Identity', 'wlan client invalid key length' => 'Invalid key length.', +'wlan client management frame protection' => 'Management Frame Protection', 'wlan client method' => 'Method', 'wlan client new entry' => 'Create new wireless client configuration', 'wlan client new network' => 'New network', diff --git a/lfs/openssl b/lfs/openssl index 16e20b439..ea7eff135 100644 --- a/lfs/openssl +++ b/lfs/openssl @@ -24,7 +24,7 @@ include Config -VER = 1.1.1i +VER = 1.1.1j THISAPP = openssl-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -87,7 +87,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 08987c3cf125202e2b0840035efb392c +$(DL_FILE)_MD5 = cccaa064ed860a2b4d1303811bf5c682 install : $(TARGET) diff --git a/src/initscripts/system/wlanclient b/src/initscripts/system/wlanclient index 4b3938b46..338a743ab 100644 --- a/src/initscripts/system/wlanclient +++ b/src/initscripts/system/wlanclient @@ -275,9 +275,7 @@ function wpa_supplicant_start() { # Build wpa_supplicant command line. local wpa_suppl_cmd="wpa_supplicant -B -qqq -i${device} -c${config}" - if device_is_wireless ${device}; then - wpa_suppl_cmd="${wpa_suppl_cmd} -Dwext" - else + if ! device_is_wireless ${device}; then wpa_suppl_cmd="${wpa_suppl_cmd} -Dwired" fi hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 9572ae7b1dc13902e39b4ad21e49cb33b2beee09
by Michael Tremer 16 Feb '21

16 Feb '21

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 2.x development tree". The branch, next has been updated via 9572ae7b1dc13902e39b4ad21e49cb33b2beee09 (commit) via 1bffb208e81b2d6edb1ade9e4bb0c5312c798f91 (commit) from 7b42d2f89a59cf4efe82c46a6fc510a02cab7c6f (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 9572ae7b1dc13902e39b4ad21e49cb33b2beee09 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Feb 16 17:34:10 2021 +0000 core155: Ship openssl Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 1bffb208e81b2d6edb1ade9e4bb0c5312c798f91 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Feb 16 17:28:17 2021 +0000 openssl: Update to 1.1.1j Null pointer deref in X509_issuer_and_serial_hash() (CVE-2021-23841) ==================================================================== Severity: Moderate The OpenSSL public API function X509_issuer_and_serial_hash() attempts to create a unique hash value based on the issuer and serial number data contained within an X509 certificate. However it fails to correctly handle any errors that may occur while parsing the issuer field (which might occur if the issuer field is maliciously constructed). This may subsequently result in a NULL pointer deref and a crash leading to a potential denial of service attack. The function X509_issuer_and_serial_hash() is never directly called by OpenSSL itself so applications are only vulnerable if they use this function directly and they use it on certificates that may have been obtained from untrusted sources. OpenSSL versions 1.1.1i and below are affected by this issue. Users of these versions should upgrade to OpenSSL 1.1.1j. OpenSSL versions 1.0.2x and below are affected by this issue. However OpenSSL 1.0.2 is out of support and no longer receiving public updates. Premium support customers of OpenSSL 1.0.2 should upgrade to 1.0.2y. Other users should upgrade to 1.1.1j. This issue was reported to OpenSSL on 15th December 2020 by Tavis Ormandy from Google. The fix was developed by Matt Caswell. Incorrect SSLv2 rollback protection (CVE-2021-23839) ==================================================== Severity: Low OpenSSL 1.0.2 supports SSLv2. If a client attempts to negotiate SSLv2 with a server that is configured to support both SSLv2 and more recent SSL and TLS versions then a check is made for a version rollback attack when unpadding an RSA signature. Clients that support SSL or TLS versions greater than SSLv2 are supposed to use a special form of padding. A server that supports greater than SSLv2 is supposed to reject connection attempts from a client where this special form of padding is present, because this indicates that a version rollback has occurred (i.e. both client and server support greater than SSLv2, and yet this is the version that is being requested). The implementation of this padding check inverted the logic so that the connection attempt is accepted if the padding is present, and rejected if it is absent. This means that such as server will accept a connection if a version rollback attack has occurred. Further the server will erroneously reject a connection if a normal SSLv2 connection attempt is made. Only OpenSSL 1.0.2 servers from version 1.0.2s to 1.0.2x are affected by this issue. In order to be vulnerable a 1.0.2 server must: 1) have configured SSLv2 support at compile time (this is off by default), 2) have configured SSLv2 support at runtime (this is off by default), 3) have configured SSLv2 ciphersuites (these are not in the default ciphersuite list) OpenSSL 1.1.1 does not have SSLv2 support and therefore is not vulnerable to this issue. The underlying error is in the implementation of the RSA_padding_check_SSLv23() function. This also affects the RSA_SSLV23_PADDING padding mode used by various other functions. Although 1.1.1 does not support SSLv2 the RSA_padding_check_SSLv23() function still exists, as does the RSA_SSLV23_PADDING padding mode. Applications that directly call that function or use that padding mode will encounter this issue. However since there is no support for the SSLv2 protocol in 1.1.1 this is considered a bug and not a security issue in that version. OpenSSL 1.0.2 is out of support and no longer receiving public updates. Premium support customers of OpenSSL 1.0.2 should upgrade to 1.0.2y. Other users should upgrade to 1.1.1j. This issue was reported to OpenSSL on 21st January 2021 by D. Katz and Joel Luellwitz from Trustwave. The fix was developed by Matt Caswell. Integer overflow in CipherUpdate (CVE-2021-23840) ================================================= Severity: Low Calls to EVP_CipherUpdate, EVP_EncryptUpdate and EVP_DecryptUpdate may overflow the output length argument in some cases where the input length is close to the maximum permissable length for an integer on the platform. In such cases the return value from the function call will be 1 (indicating success), but the output length value will be negative. This could cause applications to behave incorrectly or crash. OpenSSL versions 1.1.1i and below are affected by this issue. Users of these versions should upgrade to OpenSSL 1.1.1j. OpenSSL versions 1.0.2x and below are affected by this issue. However OpenSSL 1.0.2 is out of support and no longer receiving public updates. Premium support customers of OpenSSL 1.0.2 should upgrade to 1.0.2y. Other users should upgrade to 1.1.1j. This issue was reported to OpenSSL on 13th December 2020 by Paul Kehrer. The fix was developed by Matt Caswell. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/openssl | 4 ++++ .../rootfiles/{oldcore/100 => core/155}/filelists/i586/openssl-sse2 | 0 config/rootfiles/{oldcore/100 => core/155}/filelists/openssl | 0 lfs/openssl | 4 ++-- 4 files changed, 6 insertions(+), 2 deletions(-) copy config/rootfiles/{oldcore/100 => core/155}/filelists/i586/openssl-sse2 (100%) copy config/rootfiles/{oldcore/100 => core/155}/filelists/openssl (100%) Difference in files: diff --git a/config/rootfiles/common/openssl b/config/rootfiles/common/openssl index df6bbe320..989670262 100644 --- a/config/rootfiles/common/openssl +++ b/config/rootfiles/common/openssl @@ -869,6 +869,7 @@ usr/lib/libssl.so.1.1 #usr/share/doc/openssl/html/man3/DH_check_pub_key_ex.html #usr/share/doc/openssl/html/man3/DH_clear_flags.html #usr/share/doc/openssl/html/man3/DH_compute_key.html +#usr/share/doc/openssl/html/man3/DH_compute_key_padded.html #usr/share/doc/openssl/html/man3/DH_free.html #usr/share/doc/openssl/html/man3/DH_generate_key.html #usr/share/doc/openssl/html/man3/DH_generate_parameters.html @@ -1983,6 +1984,7 @@ usr/lib/libssl.so.1.1 #usr/share/doc/openssl/html/man3/OCSP_REQUEST_new.html #usr/share/doc/openssl/html/man3/OCSP_REQ_CTX_add1_header.html #usr/share/doc/openssl/html/man3/OCSP_REQ_CTX_free.html +#usr/share/doc/openssl/html/man3/OCSP_REQ_CTX_i2d.html #usr/share/doc/openssl/html/man3/OCSP_REQ_CTX_set1_req.html #usr/share/doc/openssl/html/man3/OCSP_RESPBYTES_free.html #usr/share/doc/openssl/html/man3/OCSP_RESPBYTES_new.html @@ -4838,6 +4840,7 @@ usr/lib/libssl.so.1.1 #usr/share/man/man3/DH_check_pub_key_ex.3 #usr/share/man/man3/DH_clear_flags.3 #usr/share/man/man3/DH_compute_key.3 +#usr/share/man/man3/DH_compute_key_padded.3 #usr/share/man/man3/DH_free.3 #usr/share/man/man3/DH_generate_key.3 #usr/share/man/man3/DH_generate_parameters.3 @@ -5952,6 +5955,7 @@ usr/lib/libssl.so.1.1 #usr/share/man/man3/OCSP_REQUEST_new.3 #usr/share/man/man3/OCSP_REQ_CTX_add1_header.3 #usr/share/man/man3/OCSP_REQ_CTX_free.3 +#usr/share/man/man3/OCSP_REQ_CTX_i2d.3 #usr/share/man/man3/OCSP_REQ_CTX_set1_req.3 #usr/share/man/man3/OCSP_RESPBYTES_free.3 #usr/share/man/man3/OCSP_RESPBYTES_new.3 diff --git a/config/rootfiles/core/155/filelists/i586/openssl-sse2 b/config/rootfiles/core/155/filelists/i586/openssl-sse2 new file mode 120000 index 000000000..f424713d6 --- /dev/null +++ b/config/rootfiles/core/155/filelists/i586/openssl-sse2 @@ -0,0 +1 @@ +../../../../common/i586/openssl-sse2 \ No newline at end of file diff --git a/config/rootfiles/core/155/filelists/openssl b/config/rootfiles/core/155/filelists/openssl new file mode 120000 index 000000000..e011a9266 --- /dev/null +++ b/config/rootfiles/core/155/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/lfs/openssl b/lfs/openssl index 16e20b439..ea7eff135 100644 --- a/lfs/openssl +++ b/lfs/openssl @@ -24,7 +24,7 @@ include Config -VER = 1.1.1i +VER = 1.1.1j THISAPP = openssl-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -87,7 +87,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 08987c3cf125202e2b0840035efb392c +$(DL_FILE)_MD5 = cccaa064ed860a2b4d1303811bf5c682 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 896fa74d68e83b344235dbd147b0e429aafb14d3
by Michael Tremer 16 Feb '21

16 Feb '21

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 2.x development tree". The branch, master has been updated via 896fa74d68e83b344235dbd147b0e429aafb14d3 (commit) from 7c6a4babf851a13292f0cfa90ca9e3fbfc42525c (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 896fa74d68e83b344235dbd147b0e429aafb14d3 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Tue Feb 16 14:30:10 2021 +0100 dhcp.cgi: Fix incorrect { placement from patch 3724 - When patch 3724 was created for bug #10743 a curly bracket was placed in the wrong place This results in the overlap of two if loops meaning that there will be no validity check carried out on Default Lease Time if Deny Known Clients is not checked. - This patch moves the { bracket to the right location. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/dhcp.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Difference in files: diff --git a/html/cgi-bin/dhcp.cgi b/html/cgi-bin/dhcp.cgi index 2ebdde818..867614f2a 100644 --- a/html/cgi-bin/dhcp.cgi +++ b/html/cgi-bin/dhcp.cgi @@ -180,12 +180,12 @@ if ($dhcpsettings{'ACTION'} eq $Lang::tr{'save'}) { if (($dhcpsettings{"START_ADDR_${itf}"}) eq '' && ($dhcpsettings{"END_ADDR_${itf}"}) eq '') { $errormessage = "DHCP on ${itf}: " . $Lang::tr{'dhcp valid range required when deny known clients checked'}; goto ERROR; + } } if (!($dhcpsettings{"DEFAULT_LEASE_TIME_${itf}"} =~ /^\d+$/)) { $errormessage = "DHCP on ${itf}: " . $Lang::tr{'invalid default lease time'} . $dhcpsettings{'DEFAULT_LEASE_TIME_${itf}'}; goto ERROR; - } } if (!($dhcpsettings{"MAX_LEASE_TIME_${itf}"} =~ /^\d+$/)) { hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 7c6a4babf851a13292f0cfa90ca9e3fbfc42525c
by Michael Tremer 16 Feb '21

16 Feb '21

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 2.x development tree". The branch, master has been updated via 7c6a4babf851a13292f0cfa90ca9e3fbfc42525c (commit) from 0d58fcd2aa1240e96754aaf24665d4d1650e301a (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 7c6a4babf851a13292f0cfa90ca9e3fbfc42525c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Feb 16 11:50:16 2021 +0000 Revert "dhcpcd: Update to 9.3.4" This reverts commit d96d979e2a0bb199b5ae7bec75964f4091996268. Arne requested to revert this commit as well since dhcpcd still does not run without any problems on i586 systems. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/dhcpcd | 7 ++--- ...86_for_SECCOMP_as_it_just_uses_socketcall.patch | 36 ---------------------- 2 files changed, 2 insertions(+), 41 deletions(-) delete mode 100644 src/patches/dhcpcd/01_Fix_Linux_i386_for_SECCOMP_as_it_just_uses_socketcall.patch Difference in files: diff --git a/lfs/dhcpcd b/lfs/dhcpcd index 4e34e19d5..3bd33dc56 100644 --- a/lfs/dhcpcd +++ b/lfs/dhcpcd @@ -24,7 +24,7 @@ include Config -VER = 9.3.4 +VER = 9.1.4 THISAPP = dhcpcd-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = badb02dfc69fe9bbeec35a02efcdb4db +$(DL_FILE)_MD5 = dd77711cf3232002bb075f5210269f88 install : $(TARGET) @@ -70,9 +70,6 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dhcpcd/01_Fix_Linux_i386_for_SECCOMP_as_it_just_uses_socketcall.patch - cd $(DIR_APP) && ./configure --prefix="" --sysconfdir=/var/ipfire/dhcpc \ --dbdir=/var/ipfire/dhcpc \ --libexecdir=/var/ipfire/dhcpc \ diff --git a/src/patches/dhcpcd/01_Fix_Linux_i386_for_SECCOMP_as_it_just_uses_socketcall.patch b/src/patches/dhcpcd/01_Fix_Linux_i386_for_SECCOMP_as_it_just_uses_socketcall.patch deleted file mode 100644 index 9efcde219..000000000 --- a/src/patches/dhcpcd/01_Fix_Linux_i386_for_SECCOMP_as_it_just_uses_socketcall.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/src/privsep-linux.c b/src/privsep-linux.c -index 050a30cf..d31d720d 100644 ---- a/src/privsep-linux.c -+++ b/src/privsep-linux.c -@@ -32,6 +32,7 @@ - - #include <linux/audit.h> - #include <linux/filter.h> -+#include <linux/net.h> - #include <linux/seccomp.h> - #include <linux/sockios.h> - -@@ -304,6 +305,23 @@ static struct sock_filter ps_seccomp_filter[] = { - #ifdef __NR_sendto - SECCOMP_ALLOW(__NR_sendto), - #endif -+#ifdef __NR_socketcall -+ /* i386 needs this and demonstrates why SECCOMP -+ * is poor compared to OpenBSD pledge(2) and FreeBSD capsicum(4) -+ * as this is soooo tied to the kernel API which changes per arch -+ * and likely libc as well. */ -+ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_ACCEPT), -+ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_ACCEPT4), -+ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_LISTEN), -+ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_GETSOCKOPT), /* overflow */ -+ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_RECV), -+ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_RECVFROM), -+ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_RECVMSG), -+ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_SEND), -+ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_SENDMSG), -+ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_SENDTO), -+ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_SHUTDOWN), -+#endif - #ifdef __NR_shutdown - SECCOMP_ALLOW(__NR_shutdown), - #endif hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 7b42d2f89a59cf4efe82c46a6fc510a02cab7c6f
by Michael Tremer 15 Feb '21

15 Feb '21

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 2.x development tree". The branch, next has been updated via 7b42d2f89a59cf4efe82c46a6fc510a02cab7c6f (commit) via 6134b588a0570cf4d86ff47f63835dc5bd80a8fa (commit) via a605897cd00ca9bad90c44ed705721ae71f460e2 (commit) via 59bbf418ca18a772317d22d0a791d3c049de245f (commit) from 24c4594bef6f766261664084e7b524987ea56a54 (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 7b42d2f89a59cf4efe82c46a6fc510a02cab7c6f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Feb 15 13:14:13 2021 +0000 core155: Ship country.cgi Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 6134b588a0570cf4d86ff47f63835dc5bd80a8fa Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Fri Feb 12 20:40:38 2021 +0100 country.cgi: Fix for copy&paste typo Fixes typo in line 103 (<-> is no tab...) Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit a605897cd00ca9bad90c44ed705721ae71f460e2 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Feb 15 13:13:45 2021 +0000 core155: Ship sysvinit Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 59bbf418ca18a772317d22d0a791d3c049de245f Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Fri Feb 12 18:59:15 2021 +0100 sysvinit: Update to 2.98 - Update sysvinit from 2.88dsf to 2.98 - From version 2.89 mounpoint build was not enabled as standard - Patch created to modify Makefile to define mountpoint to be built - Update of rootfiles - Changelog is ~400 lines long from 2.88dsf to 2.98 - For details see the Changelog in the doc directory in the tarball Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/sysvinit | 4 ++++ config/rootfiles/core/155/filelists/files | 1 + config/rootfiles/{oldcore/66 => core/155}/filelists/sysvinit | 0 html/cgi-bin/country.cgi | 2 +- lfs/sysvinit | 7 ++++--- src/patches/sysvinit-2.98_build_mountpoint.patch | 12 ++++++++++++ 6 files changed, 22 insertions(+), 4 deletions(-) copy config/rootfiles/{oldcore/66 => core/155}/filelists/sysvinit (100%) create mode 100644 src/patches/sysvinit-2.98_build_mountpoint.patch Difference in files: diff --git a/config/rootfiles/common/sysvinit b/config/rootfiles/common/sysvinit index ede5aa50d..0b389a7c3 100644 --- a/config/rootfiles/common/sysvinit +++ b/config/rootfiles/common/sysvinit @@ -1,5 +1,6 @@ bin/mountpoint bin/pidof +#etc/inittab.d #sbin/bootlogd #sbin/fstab-decode sbin/halt @@ -14,6 +15,7 @@ sbin/telinit usr/bin/last usr/bin/lastb usr/bin/mesg +#usr/bin/readbootlog usr/bin/utmpdump usr/bin/wall #usr/include/initreq.h @@ -21,8 +23,10 @@ usr/bin/wall #usr/share/man/man1/lastb.1 #usr/share/man/man1/mesg.1 #usr/share/man/man1/mountpoint.1 +#usr/share/man/man1/readbootlog.1 #usr/share/man/man1/utmpdump.1 #usr/share/man/man1/wall.1 +#usr/share/man/man5/initctl.5 #usr/share/man/man5/initscript.5 #usr/share/man/man5/inittab.5 #usr/share/man/man8/bootlogd.8 diff --git a/config/rootfiles/core/155/filelists/files b/config/rootfiles/core/155/filelists/files index 23a48008d..722152c17 100644 --- a/config/rootfiles/core/155/filelists/files +++ b/config/rootfiles/core/155/filelists/files @@ -1 +1,2 @@ +srv/web/ipfire/cgi-bin/country.cgi srv/web/ipfire/cgi-bin/wirelessclient.cgi diff --git a/config/rootfiles/core/155/filelists/sysvinit b/config/rootfiles/core/155/filelists/sysvinit new file mode 120000 index 000000000..f3fb3304d --- /dev/null +++ b/config/rootfiles/core/155/filelists/sysvinit @@ -0,0 +1 @@ +../../../common/sysvinit \ No newline at end of file diff --git a/html/cgi-bin/country.cgi b/html/cgi-bin/country.cgi index 6519aa26c..30111dc21 100644 --- a/html/cgi-bin/country.cgi +++ b/html/cgi-bin/country.cgi @@ -100,7 +100,7 @@ print <<END <div align='center'> <table width='80%'> <tr> -<-><td align='center'><a href='$ENV{'HTTP_REFERER'}'><img src='/images/back.png' alt='$Lang::tr{'back'}' title='$Lang::tr{'back'}' /></a></td> + <td align='center'><a href='$ENV{'HTTP_REFERER'}'><img src='/images/back.png' alt='$Lang::tr{'back'}' title='$Lang::tr{'back'}' /></a></td> </tr> </table> </div> diff --git a/lfs/sysvinit b/lfs/sysvinit index 0306b5518..e7b715ea4 100644 --- a/lfs/sysvinit +++ b/lfs/sysvinit @@ -24,10 +24,10 @@ include Config -VER = 2.88dsf +VER = 2.98 THISAPP = sysvinit-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 6eda8a97b86e0a6f59dabbf25202aa6f +$(DL_FILE)_MD5 = e3254f7622ea5cf2322b1b386a98ba59 install : $(TARGET) @@ -72,6 +72,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) # Newer C libraries omit this include from sys/types.h. # https://lists.gnu.org/archive/html/bug-gnulib/2016-03/msg00018.html + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/sysvinit-2.98_build_mountpoint.patch cd $(DIR_APP) && sed -i src/mountpoint.c src/bootlogd.c \ -e "/include.*sys\/stat.h/a#include <sys/sysmacros.h>\n" cd $(DIR_APP) && sed -e "s/libcrypt.a/libcrypt.so/g" -i src/Makefile diff --git a/src/patches/sysvinit-2.98_build_mountpoint.patch b/src/patches/sysvinit-2.98_build_mountpoint.patch new file mode 100644 index 000000000..719eff558 --- /dev/null +++ b/src/patches/sysvinit-2.98_build_mountpoint.patch @@ -0,0 +1,12 @@ +diff -aup sysvinit-2.98/src/Makefile.orig sysvinit-2.98/src/Makefile +--- sysvinit-2.98/src/Makefile.orig 2021-02-12 14:31:56.325112868 +0100 ++++ sysvinit-2.98/src/Makefile 2021-02-12 14:31:56.257086870 +0100 +@@ -19,7 +19,7 @@ MANDB := s@^$'\\\\\"$[^\*-]*-\*- codin + # Leave empty if the mountpoint(1) command from util-linux 2.20 + # and above should be used, otherwise set it to yes. + # +-MNTPOINT= ++MNTPOINT=yes + + # For some known distributions we do not build all programs, otherwise we do. + BIN = hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 24c4594bef6f766261664084e7b524987ea56a54
by Michael Tremer 12 Feb '21

12 Feb '21

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 2.x development tree". The branch, next has been updated via 24c4594bef6f766261664084e7b524987ea56a54 (commit) via f90b0f24a21e95fea350262967558557b89145b8 (commit) via cdb7afe6de1d3dab78c73ea4a6ae4f7bd3ed877e (commit) via 73c4653f420074fb008748440d807590ffd964de (commit) via e7fadafc55ef72489745808a3e274f8fd7cebabd (commit) via 52c37b97d6c4324a38fee9222efa45a57da26667 (commit) via 074075afdcd4a65af8e4cac82ced2a42a6943fe6 (commit) via 54bed236cc90a1d44364420e19a63aeca0f121b5 (commit) via 18baaf4666702ddbeccd89c2149f24fc1b010af6 (commit) via 772178c24c296264d126b07ce3ed793e7834e744 (commit) via 5987dd200451c3cc3dcce96f640ea0f07a89b399 (commit) via bdc235b59aac86e3fc962c792e6a22bda733e956 (commit) via 45eaf0bfc5bb93f5ef456ea725248c8327d59f64 (commit) via b0c37190a50405c4226c806a667be8b9c8a06311 (commit) from d1ee557242b8428a190759467a98048f62a0451d (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 24c4594bef6f766261664084e7b524987ea56a54 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Feb 12 12:00:15 2021 +0000 core155: Ship wirelessclient.cgi Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit f90b0f24a21e95fea350262967558557b89145b8 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Thu Feb 11 13:41:29 2021 +0100 wirelessclient.cgi: Fix for bug #12571 - Wirelessclient shows priority 0 to be most preferred and priority 4 as least preferred. Based on forum posters experience and the wpa_supplicant man page it is the other way round. - This patch moves the least preferred title to priority 0 and vice versa - Will ask bug reporter to test out the patch and confirm it works. The page is only shown if you have a wifi connection on red. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit cdb7afe6de1d3dab78c73ea4a6ae4f7bd3ed877e Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Wed Feb 10 12:06:02 2021 +0100 python-xattr: Removal of addon - Update of attr causes current version of python-xattr to fail to build - Following input from Michael Tremer - This package was orihinally required for pakfire 3 which no longer depends on it - This is a python 2 module. Python 2 is EOL - lfs and rootfile removed from IPFire - make.sh updated to remove python-xattr entry Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 73c4653f420074fb008748440d807590ffd964de Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Feb 12 11:58:00 2021 +0000 core155: Ship attr Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit e7fadafc55ef72489745808a3e274f8fd7cebabd Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Wed Feb 10 12:05:44 2021 +0100 attr: Update to 2.4.48 - Update attr from 2.4.47 (2013) to 2.4.48 (2018) - Update rootfiles - Changelog in tarball only goes up to 2.4.44 so extracted changes from commits between 2.4.47 and release of 2.4.48 v2.4.48 attr: Fix segmentation fault Andreas Gruenbacher po: update Andreas Gruenbacher setfacl: Include errno.h Andreas Gruenbacher copy_action: drop unused alloca.h include Mike Frysinger include: add uninstall target to fix distcheck Mike Frysinger attr_copy_{fd,file}: sync changes between the files Mike Frysinger xattr.conf: do not copy security.evm Stefan Berger Cleanup visibility of API functions Yury Usishchev Cleanup config.h usage Yury Usishchev Use stdint types consistently Felix Janda walk_tree_rec: Add parentheses to clarify code Andreas Gruenbacher Reintroduce symbols that used to be syscall wrappers Dmitry V. Levin Do not export symbols that are not supposed to be exported Dmitry V. Levin Add explicit symbol versioning for attr_copy_action Dmitry V. Levin ignore configure.lineno Mike Frysinger walk_tree: mark internal variables as static Dmitry V. Levin Remove the attr.5 man page (moved to man-pages) Andreas Gruenbacher Remove <attr/xattr.h> and the syscall wrappers Andreas Gruenbacher Remove the section 2 man pages Andreas Gruenbacher Remove outdated tests from test/attr.test Andreas Gruenbacher Remove test/ext/fs.test Andreas Gruenbacher Add setfattr --raw option Andreas Gruenbacher Properly set and report empty attribute values Andreas Gruenbacher Man pages: Minor fixes Andreas Gruenbacher build: unbreak attr_copy_fd() and attr_copy_file(). Nick Alcock attr: Don't report a NULL attribute name when -l (list) fails Andreas Gruenbacher attr_list / attr_listf: Fix cursor off-by-one error Andreas Gruenbacher Portability fix: <alloca.h> is Linux specific Emmanuel Dreyfus Portability fixes Emmanuel Dreyfus telldir return value and seekdir second parameters are of type long Cristian Rodríguez License fixes Andreas Gruenbacher test: fix cleanup & running as root Mike Frysinger include examples/ in dist tarball Mike Frysinger build: ship a pkgconfig file for libattr Jan Engelhardt build: make use of an aux-dir to stow away helper scripts Jan Engelhardt avoid glibc-specific DECLS defines Mike Frysinger build: drop attrincludedir, use pkgincludedir Jan Engelhardt disable installation of man(2) pages by default Mike Frysinger po: regenerate files after move Mike Frysinger modernize build system Mike Frysinger test: make running parallel/out-of-tree safe Mike Frysinger move gettext logic into misc.h Mike Frysinger punt debian/rpm packaging logic Mike Frysinger Suppress deprecation warnings when building attr and libattr Andreas Gruenbacher Add a default /etc/xattr.conf file Andreas Gruenbacher Mark the Irix compatibility functions as deprecated Andreas Gruenbacher Make attr_get and attr_getf behave as described in the man page Andreas Gruenbacher Use autoreconf rather than autoconf to regenerate the files. Fabrice Bauzac .gitignore: ignore *~ and config.h.in. Fabrice Bauzac Fix ATTR_OP_REMOVE operation in attr_multi() Makefile: rename configure.in to configure.ac Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 52c37b97d6c4324a38fee9222efa45a57da26667 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Tue Feb 9 21:23:36 2021 +0100 lcd4linux: Update due to autoconf change - lcd4linux fails to build with autoconf-2.71 Required running of autoupdate on configure.in and autoreconf to solve files not found errors Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 074075afdcd4a65af8e4cac82ced2a42a6943fe6 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Feb 12 11:55:23 2021 +0000 core155: Ship collectd Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 54bed236cc90a1d44364420e19a63aeca0f121b5 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Tue Feb 9 21:23:25 2021 +0100 collectd: Update due to autoconf change - collectd fails to build with autoconf-2.71 Required running of autoupdate on configure.in and addition of --with-fp-layout=nothing to configure options Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 18baaf4666702ddbeccd89c2149f24fc1b010af6 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Tue Feb 9 21:23:13 2021 +0100 autoconf: Update to 2.71 - Update autoconf from 2.69 to 2.71 - Updated rootfile - Changelog Large amount of changes, especially in 2.70 - too many to add in here. Details of changes can be found in the NEWS file in the tarball Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 772178c24c296264d126b07ce3ed793e7834e744 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Feb 12 11:54:26 2021 +0000 core155: Ship unbound Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 5987dd200451c3cc3dcce96f640ea0f07a89b399 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Tue Feb 9 18:33:17 2021 +0100 unbound: Update to 1.13.1 For details see: https://nlnetlabs.nl/projects/unbound/download/#unbound-1-13-1 Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit bdc235b59aac86e3fc962c792e6a22bda733e956 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Feb 12 11:51:45 2021 +0000 Drop pcre-compat This version of the library is outdated for a long time and we have been shipping newer versions for long enough so that everyone should have been migrated by now. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 45eaf0bfc5bb93f5ef456ea725248c8327d59f64 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Feb 12 11:49:51 2021 +0000 core155: Ship pcre2 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b0c37190a50405c4226c806a667be8b9c8a06311 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Feb 9 16:10:07 2021 +0000 pcre2: New package pcre is no longer receiving any feature updates, but only bug fixes. pcre2 is the successor which is replacing pcre. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/attr | 28 +-- config/rootfiles/common/autoconf | 8 +- config/rootfiles/common/pcre-compat | 2 - config/rootfiles/common/pcre2 | 228 +++++++++++++++++++++ config/rootfiles/common/unbound | 2 +- .../{oldcore/106 => core/155}/filelists/attr | 0 .../{oldcore/125 => core/155}/filelists/collectd | 0 config/rootfiles/core/155/filelists/files | 1 + config/rootfiles/core/155/filelists/pcre2 | 1 + .../{oldcore/106 => core/155}/filelists/unbound | 0 config/rootfiles/core/155/update.sh | 5 + config/rootfiles/packages/python-xattr | 2 - html/cgi-bin/wirelessclient.cgi | 4 +- lfs/attr | 8 +- lfs/autoconf | 4 +- lfs/collectd | 4 +- lfs/lcd4linux | 4 +- lfs/pcre-compat | 80 -------- lfs/{nettle => pcre2} | 17 +- lfs/python-xattr | 82 -------- lfs/unbound | 6 +- make.sh | 9 +- 22 files changed, 283 insertions(+), 212 deletions(-) delete mode 100644 config/rootfiles/common/pcre-compat create mode 100644 config/rootfiles/common/pcre2 copy config/rootfiles/{oldcore/106 => core/155}/filelists/attr (100%) copy config/rootfiles/{oldcore/125 => core/155}/filelists/collectd (100%) create mode 120000 config/rootfiles/core/155/filelists/pcre2 copy config/rootfiles/{oldcore/106 => core/155}/filelists/unbound (100%) delete mode 100644 config/rootfiles/packages/python-xattr delete mode 100644 lfs/pcre-compat copy lfs/{nettle => pcre2} (92%) delete mode 100644 lfs/python-xattr Difference in files: diff --git a/config/rootfiles/common/attr b/config/rootfiles/common/attr index edfefa7e1..ba3ed7db7 100644 --- a/config/rootfiles/common/attr +++ b/config/rootfiles/common/attr @@ -1,24 +1,31 @@ usr/bin/attr usr/bin/getfattr usr/bin/setfattr +#usr/etc +#usr/etc/xattr.conf #usr/include/attr #usr/include/attr/attributes.h #usr/include/attr/error_context.h #usr/include/attr/libattr.h -#usr/include/attr/xattr.h #usr/lib/libattr.a #usr/lib/libattr.la #usr/lib/libattr.so usr/lib/libattr.so.1 -usr/lib/libattr.so.1.1.0 +usr/lib/libattr.so.1.1.2448 +#usr/lib/pkgconfig/libattr.pc #usr/share/doc/attr -#usr/share/doc/attr/CHANGES.gz +#usr/share/doc/attr/CHANGES #usr/share/doc/attr/COPYING #usr/share/doc/attr/COPYING.LGPL #usr/share/doc/attr/PORTING -#usr/share/doc/attr/README #usr/share/locale/cs/LC_MESSAGES/attr.mo #usr/share/locale/de/LC_MESSAGES/attr.mo +#usr/share/locale/en@boldquot +#usr/share/locale/en@boldquot/LC_MESSAGES +#usr/share/locale/en(a)boldquot/LC_MESSAGES/attr.mo +#usr/share/locale/en@quot +#usr/share/locale/en@quot/LC_MESSAGES +#usr/share/locale/en(a)quot/LC_MESSAGES/attr.mo #usr/share/locale/es/LC_MESSAGES/attr.mo #usr/share/locale/fr/LC_MESSAGES/attr.mo #usr/share/locale/gl/LC_MESSAGES/attr.mo @@ -28,18 +35,6 @@ usr/lib/libattr.so.1.1.0 #usr/share/man/man1/attr.1 #usr/share/man/man1/getfattr.1 #usr/share/man/man1/setfattr.1 -#usr/share/man/man2/fgetxattr.2 -#usr/share/man/man2/flistxattr.2 -#usr/share/man/man2/fremovexattr.2 -#usr/share/man/man2/fsetxattr.2 -#usr/share/man/man2/getxattr.2 -#usr/share/man/man2/lgetxattr.2 -#usr/share/man/man2/listxattr.2 -#usr/share/man/man2/llistxattr.2 -#usr/share/man/man2/lremovexattr.2 -#usr/share/man/man2/lsetxattr.2 -#usr/share/man/man2/removexattr.2 -#usr/share/man/man2/setxattr.2 #usr/share/man/man3/attr_get.3 #usr/share/man/man3/attr_getf.3 #usr/share/man/man3/attr_list.3 @@ -50,4 +45,3 @@ usr/lib/libattr.so.1.1.0 #usr/share/man/man3/attr_removef.3 #usr/share/man/man3/attr_set.3 #usr/share/man/man3/attr_setf.3 -#usr/share/man/man5/attr.5 diff --git a/config/rootfiles/common/autoconf b/config/rootfiles/common/autoconf index 3e28ae744..c9aeb7a87 100644 --- a/config/rootfiles/common/autoconf +++ b/config/rootfiles/common/autoconf @@ -10,6 +10,7 @@ #usr/share/autoconf/Autom4te/C4che.pm #usr/share/autoconf/Autom4te/ChannelDefs.pm #usr/share/autoconf/Autom4te/Channels.pm +#usr/share/autoconf/Autom4te/Config.pm #usr/share/autoconf/Autom4te/Configure_ac.pm #usr/share/autoconf/Autom4te/FileUtils.pm #usr/share/autoconf/Autom4te/General.pm @@ -37,6 +38,7 @@ #usr/share/autoconf/autoconf/programs.m4 #usr/share/autoconf/autoconf/specific.m4 #usr/share/autoconf/autoconf/status.m4 +#usr/share/autoconf/autoconf/trailer.m4 #usr/share/autoconf/autoconf/types.m4 #usr/share/autoconf/autom4te.cfg #usr/share/autoconf/autoscan @@ -46,6 +48,10 @@ #usr/share/autoconf/autotest/autotest.m4f #usr/share/autoconf/autotest/general.m4 #usr/share/autoconf/autotest/specific.m4 +#usr/share/autoconf/build-aux +#usr/share/autoconf/build-aux/config.guess +#usr/share/autoconf/build-aux/config.sub +#usr/share/autoconf/build-aux/install-sh #usr/share/autoconf/m4sugar #usr/share/autoconf/m4sugar/foreach.m4 #usr/share/autoconf/m4sugar/m4sh.m4 @@ -61,6 +67,4 @@ #usr/share/man/man1/autoreconf.1 #usr/share/man/man1/autoscan.1 #usr/share/man/man1/autoupdate.1 -#usr/share/man/man1/config.guess.1 -#usr/share/man/man1/config.sub.1 #usr/share/man/man1/ifnames.1 diff --git a/config/rootfiles/common/pcre-compat b/config/rootfiles/common/pcre-compat deleted file mode 100644 index ff1b77643..000000000 --- a/config/rootfiles/common/pcre-compat +++ /dev/null @@ -1,2 +0,0 @@ -lib/libpcre.so.0 -lib/libpcre.so.0.0.1 diff --git a/config/rootfiles/common/pcre2 b/config/rootfiles/common/pcre2 new file mode 100644 index 000000000..440af7b0d --- /dev/null +++ b/config/rootfiles/common/pcre2 @@ -0,0 +1,228 @@ +#usr/bin/pcre2-config +#usr/bin/pcre2grep +#usr/bin/pcre2test +#usr/include/pcre2.h +#usr/include/pcre2posix.h +#usr/lib/libpcre2-16.la +#usr/lib/libpcre2-16.so +usr/lib/libpcre2-16.so.0 +usr/lib/libpcre2-16.so.0.10.1 +#usr/lib/libpcre2-32.la +#usr/lib/libpcre2-32.so +usr/lib/libpcre2-32.so.0 +usr/lib/libpcre2-32.so.0.10.1 +#usr/lib/libpcre2-8.la +#usr/lib/libpcre2-8.so +usr/lib/libpcre2-8.so.0 +usr/lib/libpcre2-8.so.0.10.1 +#usr/lib/libpcre2-posix.la +#usr/lib/libpcre2-posix.so +usr/lib/libpcre2-posix.so.2 +usr/lib/libpcre2-posix.so.2.0.3 +#usr/lib/pkgconfig/libpcre2-16.pc +#usr/lib/pkgconfig/libpcre2-32.pc +#usr/lib/pkgconfig/libpcre2-8.pc +#usr/lib/pkgconfig/libpcre2-posix.pc +#usr/share/doc/pcre-pcre2-10.36 +#usr/share/doc/pcre-pcre2-10.36/AUTHORS +#usr/share/doc/pcre-pcre2-10.36/COPYING +#usr/share/doc/pcre-pcre2-10.36/ChangeLog +#usr/share/doc/pcre-pcre2-10.36/LICENCE +#usr/share/doc/pcre-pcre2-10.36/NEWS +#usr/share/doc/pcre-pcre2-10.36/README +#usr/share/doc/pcre-pcre2-10.36/html +#usr/share/doc/pcre-pcre2-10.36/html/NON-AUTOTOOLS-BUILD.txt +#usr/share/doc/pcre-pcre2-10.36/html/README.txt +#usr/share/doc/pcre-pcre2-10.36/html/index.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2-config.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_callout_enumerate.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_code_copy.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_code_copy_with_tables.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_code_free.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_compile.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_compile_context_copy.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_compile_context_create.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_compile_context_free.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_config.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_convert_context_copy.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_convert_context_create.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_convert_context_free.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_converted_pattern_free.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_dfa_match.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_general_context_copy.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_general_context_create.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_general_context_free.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_get_error_message.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_get_mark.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_get_match_data_size.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_get_ovector_count.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_get_ovector_pointer.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_get_startchar.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_jit_compile.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_jit_free_unused_memory.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_jit_match.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_jit_stack_assign.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_jit_stack_create.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_jit_stack_free.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_maketables.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_maketables_free.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_match.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_match_context_copy.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_match_context_create.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_match_context_free.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_match_data_create.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_match_data_create_from_pattern.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_match_data_free.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_pattern_convert.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_pattern_info.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_serialize_decode.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_serialize_encode.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_serialize_free.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_serialize_get_number_of_codes.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_set_bsr.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_set_callout.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_set_character_tables.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_set_compile_extra_options.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_set_compile_recursion_guard.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_set_depth_limit.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_set_glob_escape.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_set_glob_separator.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_set_heap_limit.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_set_match_limit.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_set_max_pattern_length.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_set_newline.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_set_offset_limit.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_set_parens_nest_limit.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_set_recursion_limit.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_set_recursion_memory_management.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_set_substitute_callout.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_substitute.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_substring_copy_byname.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_substring_copy_bynumber.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_substring_free.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_substring_get_byname.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_substring_get_bynumber.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_substring_length_byname.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_substring_length_bynumber.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_substring_list_free.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_substring_list_get.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_substring_nametable_scan.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2_substring_number_from_name.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2api.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2build.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2callout.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2compat.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2convert.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2demo.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2grep.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2jit.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2limits.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2matching.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2partial.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2pattern.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2perform.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2posix.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2sample.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2serialize.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2syntax.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2test.html +#usr/share/doc/pcre-pcre2-10.36/html/pcre2unicode.html +#usr/share/doc/pcre-pcre2-10.36/pcre2-config.txt +#usr/share/doc/pcre-pcre2-10.36/pcre2.txt +#usr/share/doc/pcre-pcre2-10.36/pcre2grep.txt +#usr/share/doc/pcre-pcre2-10.36/pcre2test.txt +#usr/share/man/man1/pcre2-config.1 +#usr/share/man/man1/pcre2grep.1 +#usr/share/man/man1/pcre2test.1 +#usr/share/man/man3/pcre2.3 +#usr/share/man/man3/pcre2_callout_enumerate.3 +#usr/share/man/man3/pcre2_code_copy.3 +#usr/share/man/man3/pcre2_code_copy_with_tables.3 +#usr/share/man/man3/pcre2_code_free.3 +#usr/share/man/man3/pcre2_compile.3 +#usr/share/man/man3/pcre2_compile_context_copy.3 +#usr/share/man/man3/pcre2_compile_context_create.3 +#usr/share/man/man3/pcre2_compile_context_free.3 +#usr/share/man/man3/pcre2_config.3 +#usr/share/man/man3/pcre2_convert_context_copy.3 +#usr/share/man/man3/pcre2_convert_context_create.3 +#usr/share/man/man3/pcre2_convert_context_free.3 +#usr/share/man/man3/pcre2_converted_pattern_free.3 +#usr/share/man/man3/pcre2_dfa_match.3 +#usr/share/man/man3/pcre2_general_context_copy.3 +#usr/share/man/man3/pcre2_general_context_create.3 +#usr/share/man/man3/pcre2_general_context_free.3 +#usr/share/man/man3/pcre2_get_error_message.3 +#usr/share/man/man3/pcre2_get_mark.3 +#usr/share/man/man3/pcre2_get_match_data_size.3 +#usr/share/man/man3/pcre2_get_ovector_count.3 +#usr/share/man/man3/pcre2_get_ovector_pointer.3 +#usr/share/man/man3/pcre2_get_startchar.3 +#usr/share/man/man3/pcre2_jit_compile.3 +#usr/share/man/man3/pcre2_jit_free_unused_memory.3 +#usr/share/man/man3/pcre2_jit_match.3 +#usr/share/man/man3/pcre2_jit_stack_assign.3 +#usr/share/man/man3/pcre2_jit_stack_create.3 +#usr/share/man/man3/pcre2_jit_stack_free.3 +#usr/share/man/man3/pcre2_maketables.3 +#usr/share/man/man3/pcre2_maketables_free.3 +#usr/share/man/man3/pcre2_match.3 +#usr/share/man/man3/pcre2_match_context_copy.3 +#usr/share/man/man3/pcre2_match_context_create.3 +#usr/share/man/man3/pcre2_match_context_free.3 +#usr/share/man/man3/pcre2_match_data_create.3 +#usr/share/man/man3/pcre2_match_data_create_from_pattern.3 +#usr/share/man/man3/pcre2_match_data_free.3 +#usr/share/man/man3/pcre2_pattern_convert.3 +#usr/share/man/man3/pcre2_pattern_info.3 +#usr/share/man/man3/pcre2_serialize_decode.3 +#usr/share/man/man3/pcre2_serialize_encode.3 +#usr/share/man/man3/pcre2_serialize_free.3 +#usr/share/man/man3/pcre2_serialize_get_number_of_codes.3 +#usr/share/man/man3/pcre2_set_bsr.3 +#usr/share/man/man3/pcre2_set_callout.3 +#usr/share/man/man3/pcre2_set_character_tables.3 +#usr/share/man/man3/pcre2_set_compile_extra_options.3 +#usr/share/man/man3/pcre2_set_compile_recursion_guard.3 +#usr/share/man/man3/pcre2_set_depth_limit.3 +#usr/share/man/man3/pcre2_set_glob_escape.3 +#usr/share/man/man3/pcre2_set_glob_separator.3 +#usr/share/man/man3/pcre2_set_heap_limit.3 +#usr/share/man/man3/pcre2_set_match_limit.3 +#usr/share/man/man3/pcre2_set_max_pattern_length.3 +#usr/share/man/man3/pcre2_set_newline.3 +#usr/share/man/man3/pcre2_set_offset_limit.3 +#usr/share/man/man3/pcre2_set_parens_nest_limit.3 +#usr/share/man/man3/pcre2_set_recursion_limit.3 +#usr/share/man/man3/pcre2_set_recursion_memory_management.3 +#usr/share/man/man3/pcre2_set_substitute_callout.3 +#usr/share/man/man3/pcre2_substitute.3 +#usr/share/man/man3/pcre2_substring_copy_byname.3 +#usr/share/man/man3/pcre2_substring_copy_bynumber.3 +#usr/share/man/man3/pcre2_substring_free.3 +#usr/share/man/man3/pcre2_substring_get_byname.3 +#usr/share/man/man3/pcre2_substring_get_bynumber.3 +#usr/share/man/man3/pcre2_substring_length_byname.3 +#usr/share/man/man3/pcre2_substring_length_bynumber.3 +#usr/share/man/man3/pcre2_substring_list_free.3 +#usr/share/man/man3/pcre2_substring_list_get.3 +#usr/share/man/man3/pcre2_substring_nametable_scan.3 +#usr/share/man/man3/pcre2_substring_number_from_name.3 +#usr/share/man/man3/pcre2api.3 +#usr/share/man/man3/pcre2build.3 +#usr/share/man/man3/pcre2callout.3 +#usr/share/man/man3/pcre2compat.3 +#usr/share/man/man3/pcre2convert.3 +#usr/share/man/man3/pcre2demo.3 +#usr/share/man/man3/pcre2jit.3 +#usr/share/man/man3/pcre2limits.3 +#usr/share/man/man3/pcre2matching.3 +#usr/share/man/man3/pcre2partial.3 +#usr/share/man/man3/pcre2pattern.3 +#usr/share/man/man3/pcre2perform.3 +#usr/share/man/man3/pcre2posix.3 +#usr/share/man/man3/pcre2sample.3 +#usr/share/man/man3/pcre2serialize.3 +#usr/share/man/man3/pcre2syntax.3 +#usr/share/man/man3/pcre2unicode.3 diff --git a/config/rootfiles/common/unbound b/config/rootfiles/common/unbound index 45fee4460..6d890daf0 100644 --- a/config/rootfiles/common/unbound +++ b/config/rootfiles/common/unbound @@ -11,7 +11,7 @@ etc/unbound/unbound.conf #usr/lib/libunbound.la #usr/lib/libunbound.so usr/lib/libunbound.so.8 -usr/lib/libunbound.so.8.1.11 +usr/lib/libunbound.so.8.1.12 #usr/lib/pkgconfig/libunbound.pc usr/sbin/unbound usr/sbin/unbound-anchor diff --git a/config/rootfiles/core/155/filelists/attr b/config/rootfiles/core/155/filelists/attr new file mode 120000 index 000000000..c80801751 --- /dev/null +++ b/config/rootfiles/core/155/filelists/attr @@ -0,0 +1 @@ +../../../common/attr \ No newline at end of file diff --git a/config/rootfiles/core/155/filelists/collectd b/config/rootfiles/core/155/filelists/collectd new file mode 120000 index 000000000..871b32f14 --- /dev/null +++ b/config/rootfiles/core/155/filelists/collectd @@ -0,0 +1 @@ +../../../common/collectd \ No newline at end of file diff --git a/config/rootfiles/core/155/filelists/files b/config/rootfiles/core/155/filelists/files index e69de29bb..23a48008d 100644 --- a/config/rootfiles/core/155/filelists/files +++ b/config/rootfiles/core/155/filelists/files @@ -0,0 +1 @@ +srv/web/ipfire/cgi-bin/wirelessclient.cgi diff --git a/config/rootfiles/core/155/filelists/pcre2 b/config/rootfiles/core/155/filelists/pcre2 new file mode 120000 index 000000000..4482caeae --- /dev/null +++ b/config/rootfiles/core/155/filelists/pcre2 @@ -0,0 +1 @@ +../../../common/pcre2 \ No newline at end of file diff --git a/config/rootfiles/core/155/filelists/unbound b/config/rootfiles/core/155/filelists/unbound new file mode 120000 index 000000000..66adf0924 --- /dev/null +++ b/config/rootfiles/core/155/filelists/unbound @@ -0,0 +1 @@ +../../../common/unbound \ No newline at end of file diff --git a/config/rootfiles/core/155/update.sh b/config/rootfiles/core/155/update.sh index 975cf0508..f7b2e8279 100644 --- a/config/rootfiles/core/155/update.sh +++ b/config/rootfiles/core/155/update.sh @@ -32,6 +32,9 @@ for (( i=1; i<=$core; i++ )); do done # Remove files +rm -vf \ + /lib/libpcre.so.0 \ + /lib/libpcre.so.0.0.1 # Stop services @@ -48,6 +51,8 @@ ldconfig /usr/local/bin/filesystem-cleanup # Start services +/etc/init.d/unbound restart +/etc/init.d/collectd restart /etc/init.d/squid restart # This update needs a reboot... diff --git a/config/rootfiles/packages/python-xattr b/config/rootfiles/packages/python-xattr deleted file mode 100644 index 747ff5c2a..000000000 --- a/config/rootfiles/packages/python-xattr +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/python2.7/site-packages/pyxattr-0.5.0-py2.7.egg-info -usr/lib/python2.7/site-packages/xattr.so diff --git a/html/cgi-bin/wirelessclient.cgi b/html/cgi-bin/wirelessclient.cgi index e8c3c9628..b1679c128 100644 --- a/html/cgi-bin/wirelessclient.cgi +++ b/html/cgi-bin/wirelessclient.cgi @@ -602,11 +602,11 @@ sub showEditBox() { </td> <td width='40%'> <select name='PRIO'> - <option value="0" $selected{'PRIO'}{'0'}>0 ($Lang::tr{'most preferred'})</option> + <option value="0" $selected{'PRIO'}{'0'}>0 ($Lang::tr{'least preferred'})</option> <option value="1" $selected{'PRIO'}{'1'}>1</option> <option value="2" $selected{'PRIO'}{'2'}>2</option> <option value="3" $selected{'PRIO'}{'3'}>3</option> - <option value="4" $selected{'PRIO'}{'4'}>4 ($Lang::tr{'least preferred'})</option> + <option value="4" $selected{'PRIO'}{'4'}>4 ($Lang::tr{'most preferred'})</option> </select> </td> <td colspan="2" width='40%'></td> diff --git a/lfs/attr b/lfs/attr index bdae19a11..f31c0f2b4 100644 --- a/lfs/attr +++ b/lfs/attr @@ -24,10 +24,10 @@ include Config -VER = 2.4.47 +VER = 2.4.48 THISAPP = attr-$(VER) -DL_FILE = $(THISAPP).src.tar.gz +DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 84f58dec00b60f2dc8fd1c9709291cc7 +$(DL_FILE)_MD5 = bc1e5cb5c96d99b24886f1f527d3bb3d install : $(TARGET) @@ -73,8 +73,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && ./configure cd $(DIR_APP) && make cd $(DIR_APP) && make install - cd $(DIR_APP) && make install-lib - cd $(DIR_APP) && make install-dev chmod -v 755 /usr/lib/libattr.so @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/autoconf b/lfs/autoconf index 4abc8353a..ed77c46ed 100644 --- a/lfs/autoconf +++ b/lfs/autoconf @@ -24,7 +24,7 @@ include Config -VER = 2.69 +VER = 2.71 THISAPP = autoconf-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -39,7 +39,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 50f97f4159805e374639a73e2636f22e +$(DL_FILE)_MD5 = 12cfa1687ffa2606337efe1a64416106 install : $(TARGET) diff --git a/lfs/collectd b/lfs/collectd index 0f99c4ce7..7c9744531 100644 --- a/lfs/collectd +++ b/lfs/collectd @@ -106,6 +106,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/silence-openvpn-errors.patch cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd-4.10.9-xfs-compile-fix.patch cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd-4.10-libiptc-build-fixes.patch + cd $(DIR_APP) && autoupdate -v configure.in cd $(DIR_APP) && autoreconf -vfi cd $(DIR_APP)/libltdl && autoreconf -vfi cd $(DIR_APP) && ./configure --prefix=/usr --localstatedir=/var \ @@ -116,7 +117,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --enable-{interface,iptables,irq,load,logfile,memory,multimeter} \ --enable-{network,nfs,ntpd,ping,processes,rrdtool,sensors,swap,syslog} \ --enable-{tcpconns,unixsock,users,wireless} \ - --with-librrd=/usr/share/rrdtool-1.2.30 + --with-librrd=/usr/share/rrdtool-1.2.30 \ + --with-fp-layout=nothing cd $(DIR_APP) && make install #collectd-4 does not support parallel build cp -vf $(DIR_SRC)/config/collectd/collectd.* /etc/ mv /etc/collectd.vpn /var/ipfire/ovpn/collectd.vpn diff --git a/lfs/lcd4linux b/lfs/lcd4linux index 198607e25..9121e6fa0 100644 --- a/lfs/lcd4linux +++ b/lfs/lcd4linux @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/lcd4linux TARGET = $(DIR_INFO)/$(THISAPP) PROG = lcd4linux -PAK_VER = 6 +PAK_VER = 7 DEPS = dpfhack libmpdclient @@ -78,6 +78,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) $(UPDATE_AUTOMAKE) + cd $(DIR_APP) && autoreconf -v -i + cd $(DIR_APP) && autoupdate -v configure.in cd $(DIR_APP) && ./configure --with-plugins=all,!qnaplog,!dbus --prefix=/usr cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/lfs/pcre-compat b/lfs/pcre2 similarity index 85% rename from lfs/pcre-compat rename to lfs/pcre2 index 5709a477b..d5d6c8e95 100644 --- a/lfs/pcre-compat +++ b/lfs/pcre2 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2019 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,10 +24,10 @@ include Config -VER = 7.7 +VER = 10.36 -THISAPP = pcre-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +THISAPP = pcre2-$(VER) +DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 4b2e9cde1f7227448dddba59843efa0b +$(DL_FILE)_MD5 = a5d9aa7d18b61b0226696510e60c9582 install : $(TARGET) @@ -69,12 +69,16 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - $(UPDATE_AUTOMAKE) - cd $(DIR_APP) && ./configure --prefix=/usr --enable-utf8 + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --disable-static \ + --enable-unicode \ + --enable-jit \ + --enable-pcre2-16 \ + --enable-pcre2-32 \ + --docdir=/usr/share/doc/pcre-$(THISAPP) cd $(DIR_APP) && make $(MAKETUNING) - - install -m 755 $(DIR_APP)/.libs/libpcre.so.0.0.1 /lib - ln -svf libpcre.so.0.0.1 /lib/libpcre.so.0 + cd $(DIR_APP) && make install @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/python-xattr b/lfs/python-xattr deleted file mode 100644 index a77d22a91..000000000 --- a/lfs/python-xattr +++ /dev/null @@ -1,82 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see <http://www.gnu.org/licenses/>. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 0.5.0 - -THISAPP = pyxattr-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = python-xattr -PAK_VER = 1 - -DEPS = - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 0f7ab1e185087329e40f7de218517c84 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -dist: - @$(PAK) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && python setup.py install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/unbound b/lfs/unbound index 69cb91d73..0bd437481 100644 --- a/lfs/unbound +++ b/lfs/unbound @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2021 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 1.13.0 +VER = 1.13.1 THISAPP = unbound-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 5a522f10c65332efe627098d2d24f947 +$(DL_FILE)_MD5 = 0cd660a40d733acc6e7cce43731cac62 install : $(TARGET) diff --git a/make.sh b/make.sh index 3c94509d3..a0c71ce73 100755 --- a/make.sh +++ b/make.sh @@ -1101,7 +1101,7 @@ buildbase() { lfsmake2 xz lfsmake2 lzip lfsmake2 pcre - lfsmake2 pcre-compat + lfsmake2 pcre2 lfsmake2 gettext lfsmake2 attr lfsmake2 acl @@ -1552,7 +1552,6 @@ buildipfire() { lfsmake2 python-distutils-extra lfsmake2 python-lzma lfsmake2 python-progressbar - lfsmake2 python-xattr lfsmake2 ddns lfsmake2 python3-setuptools lfsmake2 python3-setuptools-scm @@ -1817,9 +1816,9 @@ clean) for i in `mount | grep $BASEDIR | sed 's/^.*loop=$.*$)/\1/'`; do $LOSETUP -d $i 2>/dev/null done - for i in `mount | grep $BASEDIR | cut -d " " -f 1`; do - umount $i - done + #for i in `mount | grep $BASEDIR | cut -d " " -f 1`; do + # umount $i + #done stdumount for i in `seq 0 7`; do if ( losetup /dev/loop${i} 2>/dev/null | grep -q "/install/images" ); then hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. d1ee557242b8428a190759467a98048f62a0451d
by Michael Tremer 09 Feb '21

09 Feb '21

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 2.x development tree". The branch, next has been updated via d1ee557242b8428a190759467a98048f62a0451d (commit) via ec79b46309035de6edd2ac24e33895fce3fffc04 (commit) via 9e08985ed812cd8c31415522789620e2c797f76b (commit) via 614e2c8518475239b27d8d6a8f91b8d5f4ac69d0 (commit) via d154063e9603b792fd592ca501cf8228a62861e5 (commit) via 1dbd47ee061c3c38429c7accb76c3e7aafa435d8 (commit) via a3ebd7c206622eece9a36fbb1f2cbc70128994fa (commit) via 8e78605e4ec210f9b9951ce68fffd1830664725e (commit) from 178c7a6adc97fbbb436ca142734c70152e43b4b5 (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 d1ee557242b8428a190759467a98048f62a0451d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Feb 9 15:01:38 2021 +0000 core155: Ship qpdf Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit ec79b46309035de6edd2ac24e33895fce3fffc04 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Mon Feb 8 20:57:10 2021 +0100 qpdf: Update to 10.1.0 - Update qpdf from 10.0.1 to 10.1.0 - Update rootfile - Changelog 2021-01-05 Jay Berkenbilt <ejb(a)ql.org> * 10.1.0: release 2021-01-04 Jay Berkenbilt <ejb(a)ql.org> * When qpdf CLI extracts pages, it now only attempts to remove unreferenced resources from the pages that it is keeping. This change dramatically reduces the time it takes to extract a small number of pages from a large, complex file. * Move getNext()->write() calls in some pipelines to ensure that state gates properly reset even if the next pipeline's write throws an exception (fuzz issue 28262). 2021-01-03 Jay Berkenbilt <ejb(a)ql.org> * Don't include -o nospace with zsh completion setup so file completion works normally. Fixes #473. 2021-01-02 Jay Berkenbilt <ejb(a)ql.org> * Make QPDFPageObjectHelper methods pipeContents, parseContents, and addContentTokenFilter work with form XObjects. * Rename some QPDFPageObjectHelper methods and make them support form XObjects as well as pages. The old names will be preserved from compatibility. - pipePageContents -> pipeContents - parsePageContents -> parseContents * Add QPDFObjectHandle::parseAsContents to apply ParserCallbacks to a form XObject. * QPDFPageObjectHelper::externalizeInlineImages can be called with form XObjects as well as pages. * Bug fix: QPDFPageObjectHelper::externalizeInlineImages was not descending into form XObjects on a page. It now does this by default. In the extremely unlikely event that anyone was actually depending on the old behavior, it is available by passing shallow=true to the externalizeInlineImages call. * Bug fix: QPDFObjectHandle::filterPageContents was broken for pages with an array of content streams. This caused externalize-inline-images to also be broken for this case. 2021-01-01 Jay Berkenbilt <ejb(a)ql.org> * Add methods to QPDFPageObjectHelper: forEachXObject, forEachImage, forEachFormXObject to call a function on each XObject (or image or form XObject) in a page or form XObject, possibly recursing into nested form XObjects. * Add method QPDFPageObjectHelper::getFormXObjects to return a map of keys to form XObjects (non-recursively) from a page or form XObject. * Add method QPDFObjectHandle::isImage to test whether an object is an image. 2020-12-31 Jay Berkenbilt <ejb(a)ql.org> * QPDFPageObjectHelper::removeUnreferencedResources can now be called with a QPDFPageObjectHelper created from a form XObject. The method already recursed into form XObjects. * Rename some QPDFPageObjectHelper methods and make them support form XObjects as well as pages. The old names will be preserved from compatibility. - getPageImages -> getImages - filterPageContents -> filterContents * Add QPDFObjectHandle::isFormXObject to test whether an object is a form XObject. 2020-12-30 Jay Berkenbilt <ejb(a)ql.org> * Add QPDFPageObjectHelper::flattenRotation and --flatten-rotation option to the qpdf CLI. The flattenRotation method removes any /Rotate key from a page dictionary and implements the same rotation by modifying the page's contents such that the various page boxes are altered and the page renders identically. This can be used to work around buggy PDF applications that don't properly handle page rotation. The --flatten-rotation option to the qpdf CLI calls flattenRotation for every page. 2020-12-26 Jay Berkenbilt <ejb(a)ql.org> * Add QPDFObjectHandle::setFilterOnWrite, which can be used to tell QPDFWriter not to filter a stream on output even if it can. You can use this to prevent QPDFWriter from touching a stream (either uncompressing or compressing) that you have optimized or otherwise ensured looks exactly the way you want it, even if decode level or stream compression would otherwise cause QPDFWriter to modify the stream. * Add ostream << for QPDFObjGen. (Don't ask why it took 7.5 years for me to decide to do this.) 2020-12-25 Jay Berkenbilt <ejb(a)ql.org> * Refactor write code to eliminate an extra full traversal of objects in the file and to remove assumptions that preclude stream references from appearing in /DecodeParms of filterable streams. This results in an approximately 8% performance reduction in write times. 2020-12-23 Jay Berkenbilt <ejb(a)ql.org> * Allow library users to provide their own decoders for stream filters by deriving classes from QPDFStreamFilter and registering them using QPDF::registerStreamFilter. Registered stream filters provide code to validate and interpret /DecodeParms for a specific /Filter and also to provide a pipeline that will decode. Note that it is possible to encode to a filter type that is not supported even without this feature. See examples/pdf-custom-filter.cc for an example of using custom stream filters. 2020-12-22 Jay Berkenbilt <ejb(a)ql.org> * Add QPDFObjectHandle::makeDirect(bool allow_streams) -- if allow_streams is true, preserve indirect references to streams rather than throwing an exception. This allows the object to be made as direct as possible while preserving stream references. 2020-12-20 Jay Berkenbilt <ejb(a)ql.org> * Add qpdf_register_progress_reporter method to C API, corresponding to QPDFWriter::registerProgressReporter. Fixes #487. 2020-11-28 Jay Berkenbilt <ejb(a)ql.org> * Add new functions to the C API for manipulating QPDFObjectHandles. The new functions allow creation and modification of objects, which brings a lot of additional power to the C API. See include/qpdf/qpdf-c.h for details and examples/pdf-c-objects.c for a simple example. 2020-11-21 Jay Berkenbilt <ejb(a)ql.org> * 10.0.4: release * Fix QIntC::range_check to handle negative numbers properly (fuzz issue 26994). 2020-11-11 Jay Berkenbilt <ejb(a)ql.org> * Treat a direct page object as a runtime error rather than a logic error since it is actually possible to create a file that has this (fuzz issue 27393). 2020-11-09 Jay Berkenbilt <ejb(a)ql.org> * Handle "." appearing in --pages not preceded by a numeric range as a special case in command-line parsing code. 2020-11-04 Jay Berkenbilt <ejb(a)ql.org> * Ignore the value of the offset/generation field in an xref entry for a deleted object. Also attempt file recovery on lower-level exceptions thrown while reading the xref table. Fixes #482. 2020-10-31 Jay Berkenbilt <ejb(a)ql.org> * 10.0.3: release * Don't enter extension initialization in QPDFWriter on a direct object. Fixes stack overflow in pathological case of /Root being a direct object (fuzz issue 26761). * My previous fix to #449 (handling foreign streams with indirect objects in /Filter and/or /DecodeParms) was incorrect and caused other problems. There is a now a correct fix to the original problem. Fixes #478. 2020-10-27 Jay Berkenbilt <ejb(a)ql.org> * 10.0.2: release 2020-10-25 Jay Berkenbilt <ejb(a)ql.org> * When signing distribution files, generate sha256 checksums instead of md5, sha1, and sha512. sha256 seems to be more widely used, and there's no reason to use md5 or sha1 anymore. * Official Windows releases are now built using the openssl crypto provider. The native provider is still available for selection at runtime using the QPDF_CRYPTO_PROVIDER environment variable. * Bug fix: --no-warn was not suppressing some warnings that might be generated by --split-pages. 2020-10-23 Jay Berkenbilt <ejb(a)ql.org> * Bug fix: when concatenating content streams, insert a newline if needed to prevent the last token from the old stream from being merged with the first token of the new stream. Qpdf was mistakenly concatenating the streams without regard to the specification that content streams are to be broken on token boundaries. Fixes #444. * fix-qdf: handle empty streams better with ignore newline by treating them as empty even though, technically, a blank line would be required inside the Stream. This just makes it easier to add place-holder empty streams while editing qdf files by hand. 2020-10-22 Jay Berkenbilt <ejb(a)ql.org> * Fix memory leak that could occur if objects in object streams were resolved more than once and the objects within the object streams contained circular references. This leak could be triggered when qpdf was run with --object-streams=generate on files that already had object streams containing circular references (fuzz issue 23642). * Add QIntC::range_check for checking to see whether adding two numbers together will cause an overflow. * Fix loop detection problem when traversing page thumbnails during optimization (fuzz issue 23172). 2020-10-21 Jay Berkenbilt <ejb(a)ql.org> * Bug fix: properly handle copying foreign streams that have indirect /Filter or /DecodeParms keys when stream data has been replaced. The circumstances leading to this bug are very unusual but would cause qpdf to either generate an internal error or some other kind of warning situation if it would occur. Fixes #449. * Qpdf's build and CI has been migrated from Azure Pipelines (Azure DevOps) to GitHub Actions. * Remove some fuzz files that triggered Mal/PDFEx-H with some virus scanners. There's plenty of coverage in the fuzz corpus without these files, and it's a nuisance to have virus checkers remove them. Fixes #460. * Ensure that numeric conversion is not affected by the user's global locale setting. Fixes #459. * Add qpdf-<version>-linux-x86_64.zip to the list of built distributions. This is a simple zip file that contains just the qpdf executables and the dependent shared libraries that would not ordinarily be present on a base system. This minimal binary distribution works as is when used as a Lambda layer in AWS and could be suitable for inclusion in a docker image or other standalone Linux/x86_64 environment where you want minimal support for running the qpdf executable. Fixes #352. 2020-10-20 Jay Berkenbilt <ejb(a)ql.org> * Add --warning-exit-0 option to the qpdf command line. When specified, qpdf will exit with a status of 0 rather than 3 when there are warnings without errors. Combine with --no-warn to completely ignore warnings. * Bug fix: fix further cases in which errors were written to stdout. Fixes #438. * Build option: add --disable-rpath option to ./configure, which disables passing -rpath to the linker when building shared libraries with libtool. Fixes #422. 2020-10-16 Jay Berkenbilt <ejb(a)ql.org> * Accept pull request that improves how the Windows native crypto provider is obtained. * Accept pull request that improves performance in processing files in memory. * Accept pull requests that improve openssl configuration and error reporting. * Build using GitHub Actions. The intention is that this will replace Azure Pipelines as the official CI for qpdf for the next release. 2020-10-15 Jay Berkenbilt <ejb(a)ql.org> * Make many minor improvements to the build process and code health, including fixing a lgtm warning and compiler warnings from newer version of gcc and MSVC toolchains. Add several cosmetic improvements to build output in CI. * Added LL_FMT to config.h.in. This is populated automatically by autoconf, but if build with your own build system, you may need to define it as whatever the format string needed by printf for long long is. Usually this is "%lld", but it can be "%I64d" for some older Windows-based compilers. 2020-04-29 Jay Berkenbilt <ejb(a)ql.org> * Bug fix: qpdf --check was writing errors and warnings reported by checkLinearization to stdout instead of stderr. Fixes #438. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 9e08985ed812cd8c31415522789620e2c797f76b Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Mon Feb 8 20:56:58 2021 +0100 mpage: Update to 2.5.7 - Update mpage from 2.5.6 to 2.5.7 - No change to rootfile - Slight tuning of patch needed due to changes in source file - Changelog June 2017 - Released version 2.5.7 - Relicensed code under GPLv2 or later Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 614e2c8518475239b27d8d6a8f91b8d5f4ac69d0 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Mon Feb 8 20:56:40 2021 +0100 lzo: Update to 2.10 - Update lzo from 2.09 to 2.10 - Update rootfile - Changelog Changes in 2.10 (01 Mar 2017) * Improve CMake build support. * Add support for pkg-config. * Do not redefine "snprintf" so that the examples build with MSVC 2015. * Assorted cleanups. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit d154063e9603b792fd592ca501cf8228a62861e5 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Feb 9 11:52:11 2021 +0000 core155: Ship LZ4 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 1dbd47ee061c3c38429c7accb76c3e7aafa435d8 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Mon Feb 8 20:56:29 2021 +0100 lz4: Update to 1.9.3 - Update lz4 from 1.9.2 to 1.9.3 - Updated rootfile - Removed old patches and updated to new version name - Changelog v1.9.3 perf: highly improved speed in kernel space, by @terrelln perf: faster speed with Visual Studio, thanks to @wolfpld and @remittor perf: improved dictionary compression speed, by @felixhandte perf: fixed LZ4_compress_HC_destSize() ratio, detected by @hsiangkao perf: reduced stack usage in high compression mode, by @Yanpas api : LZ4_decompress_safe_partial() supports unknown compressed size, requested by @jfkthame api : improved LZ4F_compressBound() with automatic flushing, by Christopher Harvie api : can (de)compress to/from NULL without UBs api : fix alignment test on 32-bit systems (state initialization) api : fix LZ4_saveDictHC() in corner case scenario, detected by @IgorKorkin cli : `-l` legacy format is now compatible with `-m` multiple files, by Filipe Calasans cli : benchmark mode supports dictionary, by @rkoradi cli : fix --fast with large argument, detected by @picoHz build: link to user-defined memory functions with LZ4_USER_MEMORY_FUNCTIONS, suggested by Yuriy Levchenko build: contrib/cmake_unofficial/ moved to build/cmake/ build: visual/* moved to build/ build: updated meson script, by @neheb build: tinycc support, by Anton Kochkov install: Haiku support, by Jerome Duval doc : updated LZ4 frame format, clarify EndMark Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit a3ebd7c206622eece9a36fbb1f2cbc70128994fa Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Feb 9 11:50:08 2021 +0000 core155: Ship lcms2 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 8e78605e4ec210f9b9951ce68fffd1830664725e Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Mon Feb 8 20:56:11 2021 +0100 lcms2: Update to 2.12 - Update lcms2 from 2.9 to 2.12 - Updated rootfile - Changelog ----------------------- 2.12 Maintenance release ----------------------- Added new build-in sigmoidal tone curve Added XCode 12 project Added support for multichannel input up to 15 channels Fix LUT8 write matrix Fix version mess on 10/11 Fix tools & samples xgetopt Fix warnings on different function pointers Fix matlab MEX compilation plugin: cleanup and better SSE detection plugin: add lab to any on float plugin: it can now be compiled as C++ recover PDF documentation, but try to keep it under a resonable size. Prevent a rare but possible out-of-bounds read in postscript generator Remove unused variables ----------------------- 2.11 Maintenance release ----------------------- Fixed __cpuid() on fast float plugin to allow gnu gcc Fixed copy alpha bounds check Fixed data race condition on contexts pool Fixed LUT16 write matrix on multichannel V2 profiles ----------------------- 2.10 Featured release ----------------------- Added a compilation toggle to remove "register" keyword in API. Previously commercial, fast_float plug-in is now released as open source under GPL3 license. MD5 functions are now accesible through plug-in API. Added support for Visual Studio 2019 Bug fixing. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/lcms2 | 6 ++-- config/rootfiles/common/lz4 | 2 +- config/rootfiles/common/lzo | 1 + config/rootfiles/common/qpdf | 4 +-- .../{oldcore/110 => core/155}/filelists/lcms2 | 0 .../{oldcore/118 => core/155}/filelists/lz4 | 0 .../{oldcore/110 => core/155}/filelists/qpdf | 0 lfs/lcms2 | 4 +-- lfs/lz4 | 6 ++-- lfs/lzo | 4 +-- lfs/mpage | 4 +-- lfs/qpdf | 4 +-- src/patches/lz4-1.8.1.2_mod_install_path.patch | 36 ---------------------- ...path.patch => lz4-1.9.3_mod_install_path.patch} | 14 ++++----- src/patches/mpage25-config.patch | 16 +++++----- 15 files changed, 34 insertions(+), 67 deletions(-) copy config/rootfiles/{oldcore/110 => core/155}/filelists/lcms2 (100%) copy config/rootfiles/{oldcore/118 => core/155}/filelists/lz4 (100%) copy config/rootfiles/{oldcore/110 => core/155}/filelists/qpdf (100%) delete mode 100644 src/patches/lz4-1.8.1.2_mod_install_path.patch rename src/patches/{lz4-1.9.2_mod_install_path.patch => lz4-1.9.3_mod_install_path.patch} (61%) Difference in files: diff --git a/config/rootfiles/common/lcms2 b/config/rootfiles/common/lcms2 index 2ea591550..5a7d2f276 100644 --- a/config/rootfiles/common/lcms2 +++ b/config/rootfiles/common/lcms2 @@ -5,11 +5,13 @@ #usr/bin/transicc #usr/include/lcms2.h #usr/include/lcms2_plugin.h -#usr/lib/liblcms2.a #usr/lib/liblcms2.la #usr/lib/liblcms2.so usr/lib/liblcms2.so.2 -usr/lib/liblcms2.so.2.0.8 +usr/lib/liblcms2.so.2.0.12 #usr/lib/pkgconfig/lcms2.pc #usr/share/man/man1/jpgicc.1 +#usr/share/man/man1/linkicc.1 +#usr/share/man/man1/psicc.1 #usr/share/man/man1/tificc.1 +#usr/share/man/man1/transicc.1 diff --git a/config/rootfiles/common/lz4 b/config/rootfiles/common/lz4 index ab03c65f7..9a8abcd2b 100644 --- a/config/rootfiles/common/lz4 +++ b/config/rootfiles/common/lz4 @@ -9,7 +9,7 @@ usr/bin/lz4 #usr/lib/liblz4.a #usr/lib/liblz4.so usr/lib/liblz4.so.1 -usr/lib/liblz4.so.1.9.2 +usr/lib/liblz4.so.1.9.3 #usr/lib/pkgconfig/liblz4.pc #usr/share/man/man1/lz4.1 #usr/share/man/man1/lz4c.1 diff --git a/config/rootfiles/common/lzo b/config/rootfiles/common/lzo index 4ebc05cdb..92e7327ca 100644 --- a/config/rootfiles/common/lzo +++ b/config/rootfiles/common/lzo @@ -16,6 +16,7 @@ usr/lib/liblzo2.so usr/lib/liblzo2.so.2 usr/lib/liblzo2.so.2.0.0 +#usr/lib/pkgconfig/lzo2.pc #usr/share/doc/lzo-2.09 #usr/share/doc/lzo-2.09/AUTHORS #usr/share/doc/lzo-2.09/COPYING diff --git a/config/rootfiles/common/qpdf b/config/rootfiles/common/qpdf index 9f6d18ee6..581ba243f 100644 --- a/config/rootfiles/common/qpdf +++ b/config/rootfiles/common/qpdf @@ -41,6 +41,7 @@ usr/bin/qpdf #usr/include/qpdf/QPDFPageDocumentHelper.hh #usr/include/qpdf/QPDFPageLabelDocumentHelper.hh #usr/include/qpdf/QPDFPageObjectHelper.hh +#usr/include/qpdf/QPDFStreamFilter.hh #usr/include/qpdf/QPDFSystemError.hh #usr/include/qpdf/QPDFTokenizer.hh #usr/include/qpdf/QPDFWriter.hh @@ -50,11 +51,10 @@ usr/bin/qpdf #usr/include/qpdf/RandomDataProvider.hh #usr/include/qpdf/Types.h #usr/include/qpdf/qpdf-c.h -#usr/lib/libqpdf.a #usr/lib/libqpdf.la #usr/lib/libqpdf.so usr/lib/libqpdf.so.28 -usr/lib/libqpdf.so.28.0.1 +usr/lib/libqpdf.so.28.1.0 #usr/lib/pkgconfig/libqpdf.pc #usr/share/doc/qpdf #usr/share/doc/qpdf/qpdf-manual.html diff --git a/config/rootfiles/core/155/filelists/lcms2 b/config/rootfiles/core/155/filelists/lcms2 new file mode 120000 index 000000000..f72a39451 --- /dev/null +++ b/config/rootfiles/core/155/filelists/lcms2 @@ -0,0 +1 @@ +../../../common/lcms2 \ No newline at end of file diff --git a/config/rootfiles/core/155/filelists/lz4 b/config/rootfiles/core/155/filelists/lz4 new file mode 120000 index 000000000..65c31802e --- /dev/null +++ b/config/rootfiles/core/155/filelists/lz4 @@ -0,0 +1 @@ +../../../common/lz4 \ No newline at end of file diff --git a/config/rootfiles/core/155/filelists/qpdf b/config/rootfiles/core/155/filelists/qpdf new file mode 120000 index 000000000..2d6c43dec --- /dev/null +++ b/config/rootfiles/core/155/filelists/qpdf @@ -0,0 +1 @@ +../../../common/qpdf \ No newline at end of file diff --git a/lfs/lcms2 b/lfs/lcms2 index d3173f3ff..d4c01cbac 100644 --- a/lfs/lcms2 +++ b/lfs/lcms2 @@ -24,7 +24,7 @@ include Config -VER = 2.9 +VER = 2.12 THISAPP = lcms2-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 8de1b7724f578d2995c8fdfa35c3ad0e +$(DL_FILE)_MD5 = 8cb583c8447461896320b43ea9a688e0 install : $(TARGET) diff --git a/lfs/lz4 b/lfs/lz4 index 17b10cfed..b09191c5e 100644 --- a/lfs/lz4 +++ b/lfs/lz4 @@ -24,7 +24,7 @@ include Config -VER = 1.9.2 +VER = 1.9.3 THISAPP = lz4-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -41,7 +41,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 3898c56c82fb3d9455aefd48db48eaad +$(DL_FILE)_MD5 = 3a1ab1684e14fc1afc66228ce61b2db3 install : $(TARGET) @@ -74,7 +74,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/lz4-1.9.2_mod_install_path.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/lz4-1.9.3_mod_install_path.patch cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/lfs/lzo b/lfs/lzo index 58f25577d..93fe66d5c 100644 --- a/lfs/lzo +++ b/lfs/lzo @@ -24,7 +24,7 @@ include Config -VER = 2.09 +VER = 2.10 THISAPP = lzo-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = c7ffc9a103afe2d1bba0b015e7aa887f +$(DL_FILE)_MD5 = 39d3f3f9c55c87b1e5d6888e1420f4b5 install : $(TARGET) diff --git a/lfs/mpage b/lfs/mpage index 55a1eac65..e4376619c 100644 --- a/lfs/mpage +++ b/lfs/mpage @@ -24,7 +24,7 @@ include Config -VER = 2.5.6 +VER = 2.5.7 THISAPP = mpage-$(VER) DL_FILE = $(THISAPP).tgz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 489663c9246e47915cea931348e5175d +$(DL_FILE)_MD5 = 8d94338445345a554fd3bc664d48525a install : $(TARGET) diff --git a/lfs/qpdf b/lfs/qpdf index 600454bc3..af934c647 100644 --- a/lfs/qpdf +++ b/lfs/qpdf @@ -24,7 +24,7 @@ include Config -VER = 10.0.1 +VER = 10.1.0 THISAPP = qpdf-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = eb7fb7c6cd5d3036bf4f7a5e3f44d995 +$(DL_FILE)_MD5 = 6d72264ff68a9807418af4d7fc613e95 install : $(TARGET) diff --git a/src/patches/lz4-1.8.1.2_mod_install_path.patch b/src/patches/lz4-1.8.1.2_mod_install_path.patch deleted file mode 100644 index 8b9646e1c..000000000 --- a/src/patches/lz4-1.8.1.2_mod_install_path.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -Nur lz4-1.8.1.2.orig/lib/Makefile lz4-1.8.1.2/lib/Makefile ---- lz4-1.8.1.2.orig/lib/Makefile 2018-01-21 07:24:41.881357925 +0000 -+++ lz4-1.8.1.2/lib/Makefile 2018-01-21 07:25:44.823444081 +0000 -@@ -120,7 +120,7 @@ - # directory variables : GNU conventions prefer lowercase - # see https://www.gnu.org/prep/standards/html_node/Makefile-Conventions.html - # support both lower and uppercase (BSD), use uppercase in script --prefix ?= /usr/local -+prefix ?= /usr - PREFIX ?= $(prefix) - exec_prefix ?= $(PREFIX) - libdir ?= $(exec_prefix)/lib -diff -Nur lz4-1.8.1.2.orig/NEWS lz4-1.8.1.2/NEWS ---- lz4-1.8.1.2.orig/NEWS 2018-01-21 07:24:41.809360114 +0000 -+++ lz4-1.8.1.2/NEWS 2018-01-21 07:26:00.838957106 +0000 -@@ -96,7 +96,7 @@ - New : lz4 cli supports long commands (suggested by Takayuki Matsuoka) - New : lz4frame & lz4cli frame content size support - New : lz4frame supports skippable frames, as requested by Sergey Cherepanov --Changed: Default "make install" directory is /usr/local, as notified by Ron Johnson -+Changed: Default "make install" directory is /usr, as notified by Ron Johnson - New : lz4 cli supports "pass-through" mode, requested by Neil Wilson - New : datagen can generate sparse files - New : scan-build tests, thanks to kind help by Takayuki Matsuoka -diff -Nur lz4-1.8.1.2.orig/programs/Makefile lz4-1.8.1.2/programs/Makefile ---- lz4-1.8.1.2.orig/programs/Makefile 2018-01-21 07:24:41.881357925 +0000 -+++ lz4-1.8.1.2/programs/Makefile 2018-01-21 07:26:24.562235766 +0000 -@@ -121,7 +121,7 @@ - # directory variables : GNU conventions prefer lowercase - # see https://www.gnu.org/prep/standards/html_node/Makefile-Conventions.html - # support both lower and uppercase (BSD), use uppercase in script --prefix ?= /usr/local -+prefix ?= /usr - PREFIX ?= $(prefix) - exec_prefix ?= $(PREFIX) - bindir ?= $(exec_prefix)/bin diff --git a/src/patches/lz4-1.9.2_mod_install_path.patch b/src/patches/lz4-1.9.3_mod_install_path.patch similarity index 61% rename from src/patches/lz4-1.9.2_mod_install_path.patch rename to src/patches/lz4-1.9.3_mod_install_path.patch index 2eee0462e..3b674c4d8 100644 --- a/src/patches/lz4-1.9.2_mod_install_path.patch +++ b/src/patches/lz4-1.9.3_mod_install_path.patch @@ -1,6 +1,6 @@ -diff -Nur lz4-1.9.2.orig/lib/Makefile lz4-1.9.2/lib/Makefile ---- lz4-1.9.2.orig/lib/Makefile 2019-10-29 08:14:03.167415441 +0000 -+++ lz4-1.9.2/lib/Makefile 2019-10-29 08:14:43.243864994 +0000 +diff -au lz4-1.9.3/lib/Makefile.orig lz4-1.9.3/lib/Makefile +--- lz4-1.9.3/lib/Makefile.orig 2020-11-16 05:59:35.000000000 +0100 ++++ lz4-1.9.3/lib/Makefile 2021-02-08 13:05:10.478443593 +0100 @@ -144,7 +144,7 @@ # directory variables : GNU conventions prefer lowercase # see https://www.gnu.org/prep/standards/html_node/Makefile-Conventions.html @@ -10,10 +10,10 @@ diff -Nur lz4-1.9.2.orig/lib/Makefile lz4-1.9.2/lib/Makefile prefix ?= $(PREFIX) EXEC_PREFIX ?= $(prefix) exec_prefix ?= $(EXEC_PREFIX) -diff -Nur lz4-1.9.2.orig/programs/Makefile lz4-1.9.2/programs/Makefile ---- lz4-1.9.2.orig/programs/Makefile 2019-10-29 08:14:03.177415386 +0000 -+++ lz4-1.9.2/programs/Makefile 2019-10-29 08:14:30.267268628 +0000 -@@ -132,7 +132,7 @@ +diff -au lz4-1.9.3/programs/Makefile.orig lz4-1.9.3/programs/Makefile +--- lz4-1.9.3/programs/Makefile.orig 2020-11-16 05:59:35.000000000 +0100 ++++ lz4-1.9.3/programs/Makefile 2021-02-08 13:05:55.475676260 +0100 +@@ -146,7 +146,7 @@ # directory variables : GNU conventions prefer lowercase # see https://www.gnu.org/prep/standards/html_node/Makefile-Conventions.html # support both lower and uppercase (BSD), use lowercase in script diff --git a/src/patches/mpage25-config.patch b/src/patches/mpage25-config.patch index fefc54766..55bf34caf 100644 --- a/src/patches/mpage25-config.patch +++ b/src/patches/mpage25-config.patch @@ -1,7 +1,7 @@ -diff -up mpage-2.5.6/Makefile.config mpage-2.5.6/Makefile ---- mpage-2.5.6/Makefile.config 2004-05-30 21:38:31.000000000 +0200 -+++ mpage-2.5.6/Makefile 2009-03-27 11:11:14.652186064 +0100 -@@ -40,7 +40,7 @@ CC=gcc +diff -aup mpage-2.5.7/Makefile.orig mpage-2.5.7/Makefile +--- mpage-2.5.7/Makefile.orig 2017-06-28 10:07:41.000000000 +0200 ++++ mpage-2.5.7/Makefile 2021-02-08 13:35:23.219223469 +0100 +@@ -48,7 +48,7 @@ CC=gcc # See glob.c for all possibilities # # PAGESIZE=Letter @@ -10,7 +10,7 @@ diff -up mpage-2.5.6/Makefile.config mpage-2.5.6/Makefile # # Define your spooler type -@@ -50,7 +50,7 @@ PAGESIZE=A4 +@@ -58,7 +58,7 @@ PAGESIZE=A4 SPOOL_TYPE=BSD_SPOOLER # PREFIX=e:/usr # OS/2 type @@ -19,7 +19,7 @@ diff -up mpage-2.5.6/Makefile.config mpage-2.5.6/Makefile #PREFIX=/usr BINDIR=$(PREFIX)/bin LIBDIR=$(PREFIX)/share -@@ -73,7 +73,7 @@ SHEETMARGIN=18 +@@ -81,7 +81,7 @@ SHEETMARGIN=18 # DEFAULT_DUPLEX=0 @@ -28,7 +28,7 @@ diff -up mpage-2.5.6/Makefile.config mpage-2.5.6/Makefile ############################################################################ -@@ -107,7 +107,7 @@ O = .o +@@ -115,7 +115,7 @@ O = .o # If you are using gcc, you probably don't need to change anything here. # Linux: @@ -37,7 +37,7 @@ diff -up mpage-2.5.6/Makefile.config mpage-2.5.6/Makefile # AIX (xlC on aix 4): #CFLAGS = -O2 -s $(DEFS) -@@ -183,5 +183,4 @@ install: +@@ -191,5 +191,4 @@ install: if [ ! -d $(MANDIR) ] ; then mkdir -p $(MANDIR) ; fi cp mpage$(E) $(BINDIR) cp mpage.1 $(MANDIR) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 178c7a6adc97fbbb436ca142734c70152e43b4b5
by Michael Tremer 08 Feb '21

08 Feb '21

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 2.x development tree". The branch, next has been updated via 178c7a6adc97fbbb436ca142734c70152e43b4b5 (commit) via df490025fee29fb776c06598e20ae8de987b3e9c (commit) from fe74afee4c3d7f3c6a26b543d9f385a502b5fbbe (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 178c7a6adc97fbbb436ca142734c70152e43b4b5 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Feb 8 10:56:33 2021 -0500 toolchain: Build libxcrypt earlier because gcc depends on it Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit df490025fee29fb776c06598e20ae8de987b3e9c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Feb 8 16:33:24 2021 +0000 qemu: Enable riscv64 targets Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/qemu | 2 ++ lfs/qemu | 14 ++++++++++++-- make.sh | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) Difference in files: diff --git a/config/rootfiles/packages/qemu b/config/rootfiles/packages/qemu index ee4b9f736..3792e7479 100644 --- a/config/rootfiles/packages/qemu +++ b/config/rootfiles/packages/qemu @@ -9,9 +9,11 @@ usr/bin/qemu-img usr/bin/qemu-io usr/bin/qemu-nbd usr/bin/qemu-pr-helper +usr/bin/qemu-riscv64 usr/bin/qemu-storage-daemon usr/bin/qemu-system-arm usr/bin/qemu-system-i386 +usr/bin/qemu-system-riscv64 usr/bin/qemu-system-x86_64 usr/bin/qemu-x86_64 usr/libexec/qemu-bridge-helper diff --git a/lfs/qemu b/lfs/qemu index 2ab1bf8c0..aa09fa0ca 100644 --- a/lfs/qemu +++ b/lfs/qemu @@ -33,10 +33,20 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) SUP_ARCH = i586 x86_64 PROG = qemu -PAK_VER = 29 +PAK_VER = 30 DEPS = libusbredir spice libseccomp +TARGETS = \ + i386-linux-user \ + x86_64-linux-user \ + arm-linux-user \ + riscv64-linux-user \ + i386-softmmu \ + x86_64-softmmu \ + arm-softmmu \ + riscv64-softmmu + ############################################################################### # Top-level Rules ############################################################################### @@ -84,7 +94,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --localstatedir=/var \ --enable-kvm \ --disable-attr \ - --target-list="i386-linux-user x86_64-linux-user arm-linux-user i386-softmmu x86_64-softmmu arm-softmmu" \ + --target-list="$(TARGETS)" \ --extra-cflags="$(CFLAGS)" \ --enable-spice \ --enable-usb-redir \ diff --git a/make.sh b/make.sh index 164fd7c72..3c94509d3 100755 --- a/make.sh +++ b/make.sh @@ -1027,11 +1027,11 @@ buildtoolchain() { lfsmake1 gcc PASS=1 lfsmake1 linux KCFG="-headers" lfsmake1 glibc + lfsmake1 libxcrypt lfsmake1 gcc PASS=L lfsmake1 binutils PASS=2 lfsmake1 gcc PASS=2 lfsmake1 zlib - lfsmake1 libxcrypt lfsmake1 ccache PASS=2 lfsmake1 tcl lfsmake1 expect hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM February 2021