From e0932334eafd178b48ec5a5e89433546d94b3e90 Mon Sep 17 00:00:00 2001
From: dave <dave@davepedu.com>
Date: Fri, 12 Nov 2021 21:39:50 -0800
Subject: [PATCH] update openssl

---
 src/Makefile                | 1 -
 src/trusty-3.10.0.sh        | 6 +++---
 ssl/trusty/build-inner.sh   | 2 +-
 ssl/trusty/build-user.sh    | 2 +-
 ssl/trusty/debian/changelog | 6 ++++++
 ssl/trusty/debian/rules     | 2 +-
 6 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index aa5ab51..8294d25 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -2,7 +2,6 @@
 
 PY3_SRC=./cpython/
 PY3_CONFFLAGS=--prefix=$(DESTDIR)/opt/extpython/_OPT_DIR_ --with-ensurepip=install ${EXTRA_PY_CONFIGURE_FLAGS}
-# --enable-optimizations
 
 all:
 	cd $(PY3_SRC) && \
diff --git a/src/trusty-3.10.0.sh b/src/trusty-3.10.0.sh
index cc2298e..d52f29a 100644
--- a/src/trusty-3.10.0.sh
+++ b/src/trusty-3.10.0.sh
@@ -24,11 +24,11 @@ export INSIDE_SCRIPT='#!/bin/bash -eux
 '
 
 # Extra args for python's configure script
-export EXTRA_PY_CONFIGURE_FLAGS=--with-openssl=/opt/extpython/ssl/1.1.1k
+export EXTRA_PY_CONFIGURE_FLAGS=--with-openssl=/opt/extpython/ssl/1.1.1l
 
 # Name of the rules makefile used to build the deb package
-export RULESFILE=rules.trusty-3.9.5
+export RULESFILE=rules.openssl-1.1.1l
 
 # Other arbitrary environment variables
 # trusty's native openssl is too old, so we ship a newer version. Embed the library path
-export LDFLAGS=-Wl,-rpath=/opt/extpython/ssl/1.1.1k/lib
+export LDFLAGS=-Wl,-rpath=/opt/extpython/ssl/1.1.1l/lib
diff --git a/ssl/trusty/build-inner.sh b/ssl/trusty/build-inner.sh
index 0700c7f..5b1952b 100755
--- a/ssl/trusty/build-inner.sh
+++ b/ssl/trusty/build-inner.sh
@@ -3,6 +3,6 @@
 sudo -Hu builder /src/build-user.sh
 
 # export the debs
-OUTDIR="/src/out/trusty/1.1.1k"
+OUTDIR="/src/out/trusty/1.1.1l"
 mkdir -p $OUTDIR
 cp /build/out/* $OUTDIR
diff --git a/ssl/trusty/build-user.sh b/ssl/trusty/build-user.sh
index 654a27e..6435823 100755
--- a/ssl/trusty/build-user.sh
+++ b/ssl/trusty/build-user.sh
@@ -9,7 +9,7 @@ mkdir work
 cd work
 
 mkdir openssl
-wget -O- -q http://artifact.scc.net.davepedu.com/repo/tar/openssl/openssl/openssl-1.1.1k.tar.gz | tar zxf - -C openssl/ --strip-components=1
+wget -O- -q http://artifact.scc.net.davepedu.com/repo/tar/openssl/openssl/openssl-1.1.1l.tar.gz | tar zxf - -C openssl/ --strip-components=1
 
 # generate debian metadata
 mkdir debian
diff --git a/ssl/trusty/debian/changelog b/ssl/trusty/debian/changelog
index 2b01738..0bced6f 100644
--- a/ssl/trusty/debian/changelog
+++ b/ssl/trusty/debian/changelog
@@ -1,3 +1,9 @@
+extpython-openssl-1-1 (1.1.1l) unstable; urgency=low
+
+  * Initial release
+
+ -- Dave Pedu <dave@davepedu.com>  ${BUILD_DATE}
+
 extpython-openssl-1-1 (1.1.1k) unstable; urgency=low
 
   * Initial release
diff --git a/ssl/trusty/debian/rules b/ssl/trusty/debian/rules
index 7a0452a..5428f30 100755
--- a/ssl/trusty/debian/rules
+++ b/ssl/trusty/debian/rules
@@ -7,7 +7,7 @@ override_dh_usrlocal:
 override_dh_strip:
 
 override_dh_shlibdeps:
-	dh_shlibdeps -l /opt/extpython/ssl/1.1.1k/lib
+	dh_shlibdeps -l /opt/extpython/ssl/1.1.1l/lib
 
 %:
 	dh $@