Fix Python build against OpenSSL API

CH03-get-sources.sh

@@ -103,6 +103,7 @@ getSource "${mpc_dnl}" "${mpc_sha256}" "${mpc_tarball}"
 getSource "${mpfr_dnl}" "${mpfr_sha256}" "${mpfr_tarball}"
 getSource "${ncurses_dnl}" "${ncurses_sha256}" "${ncurses_tarball}"
 getSource "${ninja_dnl}" "${ninja_sha256}" "${ninja_tarball}"
+getSource "${openssl_dnl}" "${openssl_sha256}" "${openssl_tarball}"
 getSource "${patch_dnl}" "${patch_sha256}" "${patch_tarball}"
 getSource "${perl_dnl}" "${perl_sha256}" "${perl_tarball}"
 getSource "${pkgconf_dnl}" "${pkgconf_sha256}" "${pkgconf_tarball}"

CH8Build/CH08.49b-openssl.sh

@@ -0,0 +1,32 @@
+#!/bin/bash
+
+source versions.sh
+
+GLSOURCES="/sources"
+
+pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+
+[ -d openssl-${openssl_version} ] && rm -rf openssl-${openssl_version}
+
+tar -zxf ${openssl_tarball}
+
+cd openssl-${openssl_version}
+
+./configure --prefix=/opt/openssl \
+            --openssldir=/opt/openssl/ssl \
+            --libdir=lib \
+            shared \
+            zlib-dynamic
+
+make
+if [ $? -ne 0 ]; then
+  myfail "Failed building openssl"
+fi
+
+sed -i '/INSTALL_LIBS/s/libcrypto.a libssl.a//' Makefile
+make MANSUFFIX=ssl install
+if [ $? -ne 0 ]; then
+  myfail "Failed installing openssl"
+fi
+
+[ -d /usr/share/doc/openssl ] && mv /usr/share/doc/openssl /usr/share/doc/openssl-${openssl_version}

CH8Build/CH08.50-python.sh

@@ -12,8 +12,10 @@ tar -Jxf ${python_tarball}
 
 cd Python-${python_version}
 
+LDFLAGS="${LDFLAGS} -Wl,-rpath=/opt/openssl/lib" \
 ./configure --prefix=/usr \
             --enable-shared \
+            --with-openssl=/opt/openssl \
             --with-system-expat \
             --enable-optimizations
 

CH8Build/Master2.sh

@@ -152,7 +152,7 @@ else
   sleep 3
 fi
 
-# Disable OpenSSL
+# Disable LibreSSL
 pushd /usr/include
 mv openssl dis-openssl
 popd
@@ -160,6 +160,16 @@ pushd /usr/lib/pkgconfig
 mv libssl.pc dis-libssl.pc
 popd
 
+/bin/bash CH08.49b-openssl.sh
+
+if [ $? -ne 0 ]; then
+  echo "failed CH08.49b-openssl.sh"
+  exit 1
+else
+  echo "LFS Chapter 8 OpenSSL Complete"
+  sleep 3
+fi
+
 /bin/bash CH08.50-python.sh
 
 if [ $? -ne 0 ]; then
@@ -170,7 +180,7 @@ else
   sleep 3
 fi
 
-# re-enable OpenSSL
+# re-enable LibreSSL
 pushd /usr/include
 mv dis-openssl openssl
 popd

versions.sh

@@ -353,6 +353,11 @@ ninja_dnl="https://github.com/ninja-build/ninja/archive/v${ninja_version}/ninja-
 ninja_sha256="821bdff48a3f683bc4bb3b6f0b5fe7b2d647cf65d52aeb63328c91a6c6df285a"
 ninja_tarball="ninja-${ninja_version}.tar.gz"
 
+openssl_version="3.3.2"
+openssl_dnl="https://github.com/openssl/openssl/releases/download/openssl-${openssl_version}/openssl-${openssl_version}.tar.gz"
+openssl_sha256="2e8a40b01979afe8be0bbfb3de5dc1c6709fedb46d6c89c10da114ab5fc3d281"
+openssl_tarball="openssl-${openssl_version}.tar.gz"
+
 patch_version="2.7.6"
 patch_dnl="https://ftp.gnu.org/gnu/patch/patch-${patch_version}.tar.xz"
 patch_sha256="ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd"