[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 87484f5c784e013229bc6d32430cdc8eb7b8a709

[git@ipfire.org]

[-- Attachment #1: Type: text/plain, Size: 3922 bytes --]

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  87484f5c784e013229bc6d32430cdc8eb7b8a709 (commit)
       via  b9c56c9e9cf261e5d35d060f2f0afce39c633d47 (commit)
       via  8b080ef12b63e94d82b44c09cc00af40d9e9fe8d (commit)
       via  c2646dff80ecd43986d4aafcb42d43303f362790 (commit)
      from  c8e4391eccf6cff06b7ee17d1a50912fe77faf32 (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 87484f5c784e013229bc6d32430cdc8eb7b8a709
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Thu Feb 22 18:52:03 2018 +0000

    openssl-compat: Do not try to apply missing padlock patch
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit b9c56c9e9cf261e5d35d060f2f0afce39c633d47
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Thu Feb 22 18:50:38 2018 +0000

    openssl-compat: Add missing library path
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 8b080ef12b63e94d82b44c09cc00af40d9e9fe8d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Feb 21 13:06:22 2018 +0000

    core120: Remove deprecated sshd configuration option
    
    This just created a warning and is now dropped
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit c2646dff80ecd43986d4aafcb42d43303f362790
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Feb 21 12:55:36 2018 +0000

    Revert "wget: Link against GnuTLS instead of OpenSSL"
    
    This reverts commit a46b159a8dc0d191ee57cf48b66be8a39fd7d9ec.
    
    wget 1.19.4 supports linking against OpenSSL 1.1.0.
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/core/120/update.sh | 3 +++
 lfs/openssl-compat                  | 3 +--
 lfs/wget                            | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

Difference in files:
diff --git a/config/rootfiles/core/120/update.sh b/config/rootfiles/core/120/update.sh
index aeff32674..c420152d2 100644
--- a/config/rootfiles/core/120/update.sh
+++ b/config/rootfiles/core/120/update.sh
@@ -65,6 +65,9 @@ fi
 # Start services
 /etc/init.d/apache restart
 
+# Remove deprecated SSH configuration option
+sed -e "/UsePrivilegeSeparation/d" -i /etc/ssh/sshd_config
+
 # This update needs a reboot...
 touch /var/run/need_reboot
 
diff --git a/lfs/openssl-compat b/lfs/openssl-compat
index 47c481d82..188baa073 100644
--- a/lfs/openssl-compat
+++ b/lfs/openssl-compat
@@ -121,7 +121,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
 	# i586 specific patches
 ifeq "$(BUILD_ARCH)" "i586"
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-1.0.2a_auto_enable_padlock.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-1.0.2a_disable_ssse3_for_amd.patch
 endif
 
@@ -143,7 +142,7 @@ endif
 
 	# Install libraries only
 	cd $(DIR_APP) && install -m 755 \
-		libcrypto.so.10 libssl.so.10
+		libcrypto.so.10 libssl.so.10 /usr/lib
 
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
diff --git a/lfs/wget b/lfs/wget
index 71b3abc48..7a5cdbb11 100644
--- a/lfs/wget
+++ b/lfs/wget
@@ -74,7 +74,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && ./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
-		--with-ssl=gnutls \
+		--with-ssl=openssl \
 		--disable-nls \
 		--disable-ipv6
 


hooks/post-receive
--
IPFire 2.x development tree