# HG changeset patch
# User Stanislas Leduc <shann@slitaz.org>
# Date 1680446084 0
# Node ID e937cb65232c58fab2d62b212b3697fd5eac7e97
# Parent  82efffdfec116cfc293edc8891db6d49229db1a9
Up openssl 1.1.1n (bump packages curl, git, wget, python), up cherokee 1.2.104 and bdeps (automake, openldap, cyrus-sasl)

diff -r 82efffdfec11 -r e937cb65232c autoconf/receipt
--- a/autoconf/receipt	Wed Mar 15 11:41:38 2023 +0000
+++ b/autoconf/receipt	Sun Apr 02 14:34:44 2023 +0000
@@ -1,11 +1,11 @@
 # SliTaz package receipt.
 
 PACKAGE="autoconf"
-VERSION="2.68"
+VERSION="2.71"
 CATEGORY="development"
 SHORT_DESC="Tool to automatically configure software source code."
 MAINTAINER="pankso@slitaz.org"
-TARBALL="$PACKAGE-$VERSION.tar.bz2"
+TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://www.gnu.org/software/autoconf/"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 
diff -r 82efffdfec11 -r e937cb65232c cherokee-dev/receipt
--- a/cherokee-dev/receipt	Wed Mar 15 11:41:38 2023 +0000
+++ b/cherokee-dev/receipt	Sun Apr 02 14:34:44 2023 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="cherokee-dev"
-VERSION="1.2.101"
+VERSION="1.2.104"
 CATEGORY="development"
 SHORT_DESC="devel files for cherokee"
 MAINTAINER="slaxemulator@gmail.com"
diff -r 82efffdfec11 -r e937cb65232c cherokee/receipt
--- a/cherokee/receipt	Wed Mar 15 11:41:38 2023 +0000
+++ b/cherokee/receipt	Sun Apr 02 14:34:44 2023 +0000
@@ -1,17 +1,18 @@
 # SliTaz package receipt.
 
 PACKAGE="cherokee"
-VERSION="1.2.101"
+VERSION="1.2.104"
 CATEGORY="network"
 SHORT_DESC="A very fast, fiexible and easy to configure Web Server."
-MAINTAINER="slaxemulator@gmail.com"
-TARBALL="$PACKAGE-$VERSION.tar.gz"
+MAINTAINER="shann@slitaz.org"
+TARBALL="$PACKAGE-webserver.zip"
 WEB_SITE="http://www.cherokee-project.com/"
-WGET_URL="http://www.cherokee-project.com/download/1.2/$VERSION/$TARBALL"
+WGET_URL="https://github.com/shannara/cherokee-webserver/archive/master.zip"
 PROVIDE="lighttpd"
 
-DEPENDS="pcre cyrus-sasl openssl python libmysqlclient libldap ffmpeg"
-BUILD_DEPENDS="pcre-dev cyrus-sasl-dev openssl-dev openldap-dev python-dev pam-dev libmysqlclient ffmpeg-dev gettext autoconf automake"
+DEPENDS="pcre cyrus-sasl openssl python libldap" #libmysqlclient ffmpeg
+BUILD_DEPENDS="autoconf automake libtool pcre-dev cyrus-sasl-dev openssl-dev \
+openldap-dev python-dev pam-dev gettext" #libmysqlclient ffmpeg-dev
 
 # Rules to configure and make the package.
 compile_rules()
@@ -20,8 +21,7 @@
 	# Use subdirectory for logs
 	sed -i -r 's|(%localstatedir%/log)|\1/cherokee|' cherokee.conf.sample.pre
 
-	autoreconf -v
-	./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+	./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
 		--with-wwwroot=/var/www/cherokee --disable-static \
 		--with-wwwuser=www --with-wwwgroup=www \
 		--enable-os-string="SliTaz" \
diff -r 82efffdfec11 -r e937cb65232c curl-dev/receipt
--- a/curl-dev/receipt	Wed Mar 15 11:41:38 2023 +0000
+++ b/curl-dev/receipt	Sun Apr 02 14:34:44 2023 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="curl-dev"
-VERSION="7.23.1"
+VERSION="7.63.0"
 CATEGORY="development"
 SHORT_DESC="Tool and libs for transferring files with URL syntax."
 MAINTAINER="pankso@slitaz.org"
diff -r 82efffdfec11 -r e937cb65232c curl/receipt
--- a/curl/receipt	Wed Mar 15 11:41:38 2023 +0000
+++ b/curl/receipt	Sun Apr 02 14:34:44 2023 +0000
@@ -1,17 +1,17 @@
 # SliTaz package receipt.
 
 PACKAGE="curl"
-VERSION="7.23.1"
+VERSION="7.63.0"
 CATEGORY="network"
 SHORT_DESC="Tool and libs for transferring files with URL syntax."
 MAINTAINER="pankso@slitaz.org"
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WEB_SITE="http://curl.haxx.se/"
-#WGET_URL="http://curl.haxx.se/download/$TARBALL"
-WGET_URL="http://mirror.slitaz.org/sources/packages-4.0/c/$TARBALL"
+WGET_URL="http://curl.haxx.se/download/$TARBALL"
+#WGET_URL="http://mirror.slitaz.org/sources/packages-4.0/c/$TARBALL"
 
 DEPENDS="libssl libcurl zlib libidn"
-BUILD_DEPENDS="openssl-dev libidn-dev"
+BUILD_DEPENDS="libcrypto-dev openssl-dev libidn-dev"
 
 # Rules to configure and make the package.
 compile_rules()
@@ -19,6 +19,7 @@
 	cd $src
 	./configure \
 		--disable-ldap \
+		--with-ssl \
 		$CONFIGURE_ARGS &&
 	make && make install
 }
diff -r 82efffdfec11 -r e937cb65232c cyrus-sasl-dev/receipt
--- a/cyrus-sasl-dev/receipt	Wed Mar 15 11:41:38 2023 +0000
+++ b/cyrus-sasl-dev/receipt	Sun Apr 02 14:34:44 2023 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="cyrus-sasl-dev"
-VERSION="2.1.23"
+VERSION="2.1.28"
 CATEGORY="network"
 SHORT_DESC="SASL authentication server development files"
 MAINTAINER="pascal.bellard@slitaz.org"
diff -r 82efffdfec11 -r e937cb65232c cyrus-sasl/receipt
--- a/cyrus-sasl/receipt	Wed Mar 15 11:41:38 2023 +0000
+++ b/cyrus-sasl/receipt	Sun Apr 02 14:34:44 2023 +0000
@@ -1,13 +1,14 @@
 # SliTaz package receipt.
 
 PACKAGE="cyrus-sasl"
-VERSION="2.1.23"
+VERSION="2.1.28"
 CATEGORY="network"
 SHORT_DESC="SASL authentication server."
 MAINTAINER="pascal.bellard@slitaz.org"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://cyrusimap.web.cmu.edu/"
-WGET_URL="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/$TARBALL"
+#WGET_URL="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/$TARBALL"
+WGET_URL="https://github.com/cyrusimap/$PACKAGE/releases/download/$PACKAGE-$VERSION/$TARBALL"
 
 DEPENDS="libldap openssl libdb libsasl libsasl-modules libcomerr3"
 BUILD_DEPENDS="openldap-dev db-dev openssl-dev"
diff -r 82efffdfec11 -r e937cb65232c git/receipt
--- a/git/receipt	Wed Mar 15 11:41:38 2023 +0000
+++ b/git/receipt	Sun Apr 02 14:34:44 2023 +0000
@@ -1,14 +1,14 @@
 # SliTaz package receipt.
 
 PACKAGE="git"
-VERSION="1.7.9.1"
+VERSION="2.21.0"
 CATEGORY="development"
 SHORT_DESC="Fast version control system"
 MAINTAINER="b1+slitaz@nagel.org"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="https://git-scm.com/"
 #WGET_URL="http://git-core.googlecode.com/files/$TARBALL"
-WGET_URL="http://mirror.slitaz.org/sources/packages-4.0/g/$TARBALL"
+WGET_URL="https://www.kernel.org/pub/software/scm/git/$TARBALL"
 
 DEPENDS="zlib openssl curl expat"
 BUILD_DEPENDS="zlib-dev openssl-dev curl-dev expat-dev perl python-dev bzip2"
diff -r 82efffdfec11 -r e937cb65232c libcrypto-dev/receipt
--- a/libcrypto-dev/receipt	Wed Mar 15 11:41:38 2023 +0000
+++ b/libcrypto-dev/receipt	Sun Apr 02 14:34:44 2023 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="libcrypto-dev"
-VERSION="1.0.2u"
+VERSION="1.1.1n"
 CATEGORY="development"
 SHORT_DESC="General purpose cryptographic shared library devel files."
 MAINTAINER="pascal.bellard@slitaz.org"
diff -r 82efffdfec11 -r e937cb65232c libcrypto/receipt
--- a/libcrypto/receipt	Wed Mar 15 11:41:38 2023 +0000
+++ b/libcrypto/receipt	Sun Apr 02 14:34:44 2023 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="libcrypto"
-VERSION="1.0.2u"
+VERSION="1.1.1n"
 CATEGORY="security"
 SHORT_DESC="General purpose cryptographic shared library."
 MAINTAINER="pascal.bellard@slitaz.org"
diff -r 82efffdfec11 -r e937cb65232c libcurl/receipt
--- a/libcurl/receipt	Wed Mar 15 11:41:38 2023 +0000
+++ b/libcurl/receipt	Sun Apr 02 14:34:44 2023 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="libcurl"
-VERSION="7.23.1"
+VERSION="7.63.0"
 CATEGORY="network"
 SHORT_DESC="Curl library files."
 MAINTAINER="pankso@slitaz.org"
diff -r 82efffdfec11 -r e937cb65232c libldap/receipt
--- a/libldap/receipt	Wed Mar 15 11:41:38 2023 +0000
+++ b/libldap/receipt	Sun Apr 02 14:34:44 2023 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="libldap"
-VERSION="2.4.25"
+VERSION="2.4.46"
 CATEGORY="misc"
 SHORT_DESC="LDAP database libraries."
 MAINTAINER="pascal.bellard@slitaz.org"
diff -r 82efffdfec11 -r e937cb65232c libssl/receipt
--- a/libssl/receipt	Wed Mar 15 11:41:38 2023 +0000
+++ b/libssl/receipt	Sun Apr 02 14:34:44 2023 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="libssl"
-VERSION="1.0.2u"
+VERSION="1.1.1n"
 CATEGORY="development"
 SHORT_DESC="OpenSSL libraries."
 MAINTAINER="pascal.bellard@slitaz.org"
diff -r 82efffdfec11 -r e937cb65232c openldap-dev/receipt
--- a/openldap-dev/receipt	Wed Mar 15 11:41:38 2023 +0000
+++ b/openldap-dev/receipt	Sun Apr 02 14:34:44 2023 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="openldap-dev"
-VERSION="2.4.25"
+VERSION="2.4.46"
 CATEGORY="development"
 SHORT_DESC="LDAP database development files."
 MAINTAINER="pascal.bellard@slitaz.org"
diff -r 82efffdfec11 -r e937cb65232c openldap/receipt
--- a/openldap/receipt	Wed Mar 15 11:41:38 2023 +0000
+++ b/openldap/receipt	Sun Apr 02 14:34:44 2023 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="openldap"
-VERSION="2.4.25"
+VERSION="2.4.46"
 CATEGORY="misc"
 SHORT_DESC="LDAP database system."
 MAINTAINER="pascal.bellard@slitaz.org"
@@ -27,6 +27,7 @@
 		--libexecdir=/usr/lib/$PACKAGE \
 		--localstatedir=/var/lib/$PACKAGE  \
 		--enable-crypt \
+		--with-tls=openssl \
 		--with-threads \
 		$CONFIGURE_ARGS &&
 	which soelim || find -name Makefile | xargs sed -i 's/soelim/cat/'
diff -r 82efffdfec11 -r e937cb65232c openssl-dev/receipt
--- a/openssl-dev/receipt	Wed Mar 15 11:41:38 2023 +0000
+++ b/openssl-dev/receipt	Sun Apr 02 14:34:44 2023 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="openssl-dev"
-VERSION="1.0.2u"
+VERSION="1.1.1n"
 CATEGORY="development"
 SHORT_DESC="Open source Secure Sockets Layer devel files."
 MAINTAINER="pascal.bellard@slitaz.org"
diff -r 82efffdfec11 -r e937cb65232c openssl/receipt
--- a/openssl/receipt	Wed Mar 15 11:41:38 2023 +0000
+++ b/openssl/receipt	Sun Apr 02 14:34:44 2023 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="openssl"
-VERSION="1.0.2u"
+VERSION="1.1.1n"
 CATEGORY="security"
 SHORT_DESC="Open source Secure Sockets Layer."
 MAINTAINER="pascal.bellard@slitaz.org"
@@ -23,17 +23,19 @@
 	# Add -Wa,--noexecstack here so that libcrypto's assembler modules will be
 	# marked as not requiring an executable stack (compatibility improvement).
 	./config --prefix=/usr --openssldir=/etc/ssl shared zlib enable-md2 \
-		-Wa,--noexecstack &&
+		no-ssl3-method -Wa,--noexecstack &&
 	
 	sed -i 's/\(basename .*\)`/\1 || true `/' Makefile &&
 	make &&
-	make INSTALL_PREFIX=$PWD/_pkg MANDIR=$PWD/_pkg/usr/share/man install
+	make DESTDIR=$PWD/_pkg MANDIR=$PWD/_pkg/usr/share/man \
+	install_sw install_ssldirs
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr
+	mkdir -p $fs/usr/lib
 	cp -a $_pkg/etc $fs
 	cp -a $_pkg/usr/bin $fs/usr
+	cp -a $_pkg/usr/lib/engines* $fs/usr/lib
 }
diff -r 82efffdfec11 -r e937cb65232c python/receipt
--- a/python/receipt	Wed Mar 15 11:41:38 2023 +0000
+++ b/python/receipt	Sun Apr 02 14:34:44 2023 +0000
@@ -25,6 +25,8 @@
 	sed -i "/progname =/s/python/python${_pybasever}/" Python/pythonrun.c
 	# Enable built-in SQLite3 module to load extensions (fix FS#22122)
 	sed -i "/SQLITE_OMIT_LOAD_EXTENSION/d" setup.py
+	# Enable SSL module
+	patch -p1 < $stuff/python_enablessl.patch
 	./configure \
 		--enable-shared \
 		--build=$HOST_SYSTEM \
diff -r 82efffdfec11 -r e937cb65232c python/stuff/python_enablessl.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/python/stuff/python_enablessl.patch	Sun Apr 02 14:34:44 2023 +0000
@@ -0,0 +1,17 @@
+--- a/Modules/Setup.dist
++++ b/Modules/Setup.dist
+@@ -215,10 +215,10 @@
+ 
+ # Socket module helper for SSL support; you must comment out the other
+ # socket line above, and possibly edit the SSL variable:
+-#SSL=/usr/local/ssl
+-#_ssl _ssl.c \
+-#	-DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \
+-#	-L$(SSL)/lib -lssl -lcrypto
++SSL=/usr
++_ssl _ssl.c \
++	-DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \
++	-L$(SSL)/lib -lssl -lcrypto
+ 
+ # The crypt module is now disabled by default because it breaks builds
+ # on many systems (where -lcrypt is needed), e.g. Linux (I believe).
diff -r 82efffdfec11 -r e937cb65232c wget/receipt
--- a/wget/receipt	Wed Mar 15 11:41:38 2023 +0000
+++ b/wget/receipt	Sun Apr 02 14:34:44 2023 +0000
@@ -1,11 +1,11 @@
 # SliTaz package receipt.
 
 PACKAGE="wget"
-VERSION="1.17.1"
+VERSION="1.20.1"
 CATEGORY="utilities"
 SHORT_DESC="retrieve files from the web"
 MAINTAINER="sygne@ombres.eu"
-TARBALL="$PACKAGE-$VERSION.tar.xz"
+TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://www.gnu.org/software/wget/wget.html"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"