wok-4.x rev 12477 tip

Up openssl 1.1.1n (bump packages curl, git, wget, python), up cherokee 1.2.104 and bdeps (automake, openldap, cyrus-sasl)
author Stanislas Leduc <shann@slitaz.org>
date Sun Apr 02 14:34:44 2023 +0000 (19 months ago)
parents 82efffdfec11
children
files autoconf/receipt cherokee-dev/receipt cherokee/receipt curl-dev/receipt curl/receipt cyrus-sasl-dev/receipt cyrus-sasl/receipt git/receipt libcrypto-dev/receipt libcrypto/receipt libcurl/receipt libldap/receipt libssl/receipt openldap-dev/receipt openldap/receipt openssl-dev/receipt openssl/receipt python/receipt python/stuff/python_enablessl.patch wget/receipt
line diff
     1.1 --- a/autoconf/receipt	Wed Mar 15 11:41:38 2023 +0000
     1.2 +++ b/autoconf/receipt	Sun Apr 02 14:34:44 2023 +0000
     1.3 @@ -1,11 +1,11 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="autoconf"
     1.7 -VERSION="2.68"
     1.8 +VERSION="2.71"
     1.9  CATEGORY="development"
    1.10  SHORT_DESC="Tool to automatically configure software source code."
    1.11  MAINTAINER="pankso@slitaz.org"
    1.12 -TARBALL="$PACKAGE-$VERSION.tar.bz2"
    1.13 +TARBALL="$PACKAGE-$VERSION.tar.gz"
    1.14  WEB_SITE="http://www.gnu.org/software/autoconf/"
    1.15  WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
    1.16  
     2.1 --- a/cherokee-dev/receipt	Wed Mar 15 11:41:38 2023 +0000
     2.2 +++ b/cherokee-dev/receipt	Sun Apr 02 14:34:44 2023 +0000
     2.3 @@ -1,7 +1,7 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="cherokee-dev"
     2.7 -VERSION="1.2.101"
     2.8 +VERSION="1.2.104"
     2.9  CATEGORY="development"
    2.10  SHORT_DESC="devel files for cherokee"
    2.11  MAINTAINER="slaxemulator@gmail.com"
     3.1 --- a/cherokee/receipt	Wed Mar 15 11:41:38 2023 +0000
     3.2 +++ b/cherokee/receipt	Sun Apr 02 14:34:44 2023 +0000
     3.3 @@ -1,17 +1,18 @@
     3.4  # SliTaz package receipt.
     3.5  
     3.6  PACKAGE="cherokee"
     3.7 -VERSION="1.2.101"
     3.8 +VERSION="1.2.104"
     3.9  CATEGORY="network"
    3.10  SHORT_DESC="A very fast, fiexible and easy to configure Web Server."
    3.11 -MAINTAINER="slaxemulator@gmail.com"
    3.12 -TARBALL="$PACKAGE-$VERSION.tar.gz"
    3.13 +MAINTAINER="shann@slitaz.org"
    3.14 +TARBALL="$PACKAGE-webserver.zip"
    3.15  WEB_SITE="http://www.cherokee-project.com/"
    3.16 -WGET_URL="http://www.cherokee-project.com/download/1.2/$VERSION/$TARBALL"
    3.17 +WGET_URL="https://github.com/shannara/cherokee-webserver/archive/master.zip"
    3.18  PROVIDE="lighttpd"
    3.19  
    3.20 -DEPENDS="pcre cyrus-sasl openssl python libmysqlclient libldap ffmpeg"
    3.21 -BUILD_DEPENDS="pcre-dev cyrus-sasl-dev openssl-dev openldap-dev python-dev pam-dev libmysqlclient ffmpeg-dev gettext autoconf automake"
    3.22 +DEPENDS="pcre cyrus-sasl openssl python libldap" #libmysqlclient ffmpeg
    3.23 +BUILD_DEPENDS="autoconf automake libtool pcre-dev cyrus-sasl-dev openssl-dev \
    3.24 +openldap-dev python-dev pam-dev gettext" #libmysqlclient ffmpeg-dev
    3.25  
    3.26  # Rules to configure and make the package.
    3.27  compile_rules()
    3.28 @@ -20,8 +21,7 @@
    3.29  	# Use subdirectory for logs
    3.30  	sed -i -r 's|(%localstatedir%/log)|\1/cherokee|' cherokee.conf.sample.pre
    3.31  
    3.32 -	autoreconf -v
    3.33 -	./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
    3.34 +	./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
    3.35  		--with-wwwroot=/var/www/cherokee --disable-static \
    3.36  		--with-wwwuser=www --with-wwwgroup=www \
    3.37  		--enable-os-string="SliTaz" \
     4.1 --- a/curl-dev/receipt	Wed Mar 15 11:41:38 2023 +0000
     4.2 +++ b/curl-dev/receipt	Sun Apr 02 14:34:44 2023 +0000
     4.3 @@ -1,7 +1,7 @@
     4.4  # SliTaz package receipt.
     4.5  
     4.6  PACKAGE="curl-dev"
     4.7 -VERSION="7.23.1"
     4.8 +VERSION="7.63.0"
     4.9  CATEGORY="development"
    4.10  SHORT_DESC="Tool and libs for transferring files with URL syntax."
    4.11  MAINTAINER="pankso@slitaz.org"
     5.1 --- a/curl/receipt	Wed Mar 15 11:41:38 2023 +0000
     5.2 +++ b/curl/receipt	Sun Apr 02 14:34:44 2023 +0000
     5.3 @@ -1,17 +1,17 @@
     5.4  # SliTaz package receipt.
     5.5  
     5.6  PACKAGE="curl"
     5.7 -VERSION="7.23.1"
     5.8 +VERSION="7.63.0"
     5.9  CATEGORY="network"
    5.10  SHORT_DESC="Tool and libs for transferring files with URL syntax."
    5.11  MAINTAINER="pankso@slitaz.org"
    5.12  TARBALL="$PACKAGE-$VERSION.tar.bz2"
    5.13  WEB_SITE="http://curl.haxx.se/"
    5.14 -#WGET_URL="http://curl.haxx.se/download/$TARBALL"
    5.15 -WGET_URL="http://mirror.slitaz.org/sources/packages-4.0/c/$TARBALL"
    5.16 +WGET_URL="http://curl.haxx.se/download/$TARBALL"
    5.17 +#WGET_URL="http://mirror.slitaz.org/sources/packages-4.0/c/$TARBALL"
    5.18  
    5.19  DEPENDS="libssl libcurl zlib libidn"
    5.20 -BUILD_DEPENDS="openssl-dev libidn-dev"
    5.21 +BUILD_DEPENDS="libcrypto-dev openssl-dev libidn-dev"
    5.22  
    5.23  # Rules to configure and make the package.
    5.24  compile_rules()
    5.25 @@ -19,6 +19,7 @@
    5.26  	cd $src
    5.27  	./configure \
    5.28  		--disable-ldap \
    5.29 +		--with-ssl \
    5.30  		$CONFIGURE_ARGS &&
    5.31  	make && make install
    5.32  }
     6.1 --- a/cyrus-sasl-dev/receipt	Wed Mar 15 11:41:38 2023 +0000
     6.2 +++ b/cyrus-sasl-dev/receipt	Sun Apr 02 14:34:44 2023 +0000
     6.3 @@ -1,7 +1,7 @@
     6.4  # SliTaz package receipt.
     6.5  
     6.6  PACKAGE="cyrus-sasl-dev"
     6.7 -VERSION="2.1.23"
     6.8 +VERSION="2.1.28"
     6.9  CATEGORY="network"
    6.10  SHORT_DESC="SASL authentication server development files"
    6.11  MAINTAINER="pascal.bellard@slitaz.org"
     7.1 --- a/cyrus-sasl/receipt	Wed Mar 15 11:41:38 2023 +0000
     7.2 +++ b/cyrus-sasl/receipt	Sun Apr 02 14:34:44 2023 +0000
     7.3 @@ -1,13 +1,14 @@
     7.4  # SliTaz package receipt.
     7.5  
     7.6  PACKAGE="cyrus-sasl"
     7.7 -VERSION="2.1.23"
     7.8 +VERSION="2.1.28"
     7.9  CATEGORY="network"
    7.10  SHORT_DESC="SASL authentication server."
    7.11  MAINTAINER="pascal.bellard@slitaz.org"
    7.12  TARBALL="$PACKAGE-$VERSION.tar.gz"
    7.13  WEB_SITE="http://cyrusimap.web.cmu.edu/"
    7.14 -WGET_URL="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/$TARBALL"
    7.15 +#WGET_URL="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/$TARBALL"
    7.16 +WGET_URL="https://github.com/cyrusimap/$PACKAGE/releases/download/$PACKAGE-$VERSION/$TARBALL"
    7.17  
    7.18  DEPENDS="libldap openssl libdb libsasl libsasl-modules libcomerr3"
    7.19  BUILD_DEPENDS="openldap-dev db-dev openssl-dev"
     8.1 --- a/git/receipt	Wed Mar 15 11:41:38 2023 +0000
     8.2 +++ b/git/receipt	Sun Apr 02 14:34:44 2023 +0000
     8.3 @@ -1,14 +1,14 @@
     8.4  # SliTaz package receipt.
     8.5  
     8.6  PACKAGE="git"
     8.7 -VERSION="1.7.9.1"
     8.8 +VERSION="2.21.0"
     8.9  CATEGORY="development"
    8.10  SHORT_DESC="Fast version control system"
    8.11  MAINTAINER="b1+slitaz@nagel.org"
    8.12  TARBALL="$PACKAGE-$VERSION.tar.gz"
    8.13  WEB_SITE="https://git-scm.com/"
    8.14  #WGET_URL="http://git-core.googlecode.com/files/$TARBALL"
    8.15 -WGET_URL="http://mirror.slitaz.org/sources/packages-4.0/g/$TARBALL"
    8.16 +WGET_URL="https://www.kernel.org/pub/software/scm/git/$TARBALL"
    8.17  
    8.18  DEPENDS="zlib openssl curl expat"
    8.19  BUILD_DEPENDS="zlib-dev openssl-dev curl-dev expat-dev perl python-dev bzip2"
     9.1 --- a/libcrypto-dev/receipt	Wed Mar 15 11:41:38 2023 +0000
     9.2 +++ b/libcrypto-dev/receipt	Sun Apr 02 14:34:44 2023 +0000
     9.3 @@ -1,7 +1,7 @@
     9.4  # SliTaz package receipt.
     9.5  
     9.6  PACKAGE="libcrypto-dev"
     9.7 -VERSION="1.0.2u"
     9.8 +VERSION="1.1.1n"
     9.9  CATEGORY="development"
    9.10  SHORT_DESC="General purpose cryptographic shared library devel files."
    9.11  MAINTAINER="pascal.bellard@slitaz.org"
    10.1 --- a/libcrypto/receipt	Wed Mar 15 11:41:38 2023 +0000
    10.2 +++ b/libcrypto/receipt	Sun Apr 02 14:34:44 2023 +0000
    10.3 @@ -1,7 +1,7 @@
    10.4  # SliTaz package receipt.
    10.5  
    10.6  PACKAGE="libcrypto"
    10.7 -VERSION="1.0.2u"
    10.8 +VERSION="1.1.1n"
    10.9  CATEGORY="security"
   10.10  SHORT_DESC="General purpose cryptographic shared library."
   10.11  MAINTAINER="pascal.bellard@slitaz.org"
    11.1 --- a/libcurl/receipt	Wed Mar 15 11:41:38 2023 +0000
    11.2 +++ b/libcurl/receipt	Sun Apr 02 14:34:44 2023 +0000
    11.3 @@ -1,7 +1,7 @@
    11.4  # SliTaz package receipt.
    11.5  
    11.6  PACKAGE="libcurl"
    11.7 -VERSION="7.23.1"
    11.8 +VERSION="7.63.0"
    11.9  CATEGORY="network"
   11.10  SHORT_DESC="Curl library files."
   11.11  MAINTAINER="pankso@slitaz.org"
    12.1 --- a/libldap/receipt	Wed Mar 15 11:41:38 2023 +0000
    12.2 +++ b/libldap/receipt	Sun Apr 02 14:34:44 2023 +0000
    12.3 @@ -1,7 +1,7 @@
    12.4  # SliTaz package receipt.
    12.5  
    12.6  PACKAGE="libldap"
    12.7 -VERSION="2.4.25"
    12.8 +VERSION="2.4.46"
    12.9  CATEGORY="misc"
   12.10  SHORT_DESC="LDAP database libraries."
   12.11  MAINTAINER="pascal.bellard@slitaz.org"
    13.1 --- a/libssl/receipt	Wed Mar 15 11:41:38 2023 +0000
    13.2 +++ b/libssl/receipt	Sun Apr 02 14:34:44 2023 +0000
    13.3 @@ -1,7 +1,7 @@
    13.4  # SliTaz package receipt.
    13.5  
    13.6  PACKAGE="libssl"
    13.7 -VERSION="1.0.2u"
    13.8 +VERSION="1.1.1n"
    13.9  CATEGORY="development"
   13.10  SHORT_DESC="OpenSSL libraries."
   13.11  MAINTAINER="pascal.bellard@slitaz.org"
    14.1 --- a/openldap-dev/receipt	Wed Mar 15 11:41:38 2023 +0000
    14.2 +++ b/openldap-dev/receipt	Sun Apr 02 14:34:44 2023 +0000
    14.3 @@ -1,7 +1,7 @@
    14.4  # SliTaz package receipt.
    14.5  
    14.6  PACKAGE="openldap-dev"
    14.7 -VERSION="2.4.25"
    14.8 +VERSION="2.4.46"
    14.9  CATEGORY="development"
   14.10  SHORT_DESC="LDAP database development files."
   14.11  MAINTAINER="pascal.bellard@slitaz.org"
    15.1 --- a/openldap/receipt	Wed Mar 15 11:41:38 2023 +0000
    15.2 +++ b/openldap/receipt	Sun Apr 02 14:34:44 2023 +0000
    15.3 @@ -1,7 +1,7 @@
    15.4  # SliTaz package receipt.
    15.5  
    15.6  PACKAGE="openldap"
    15.7 -VERSION="2.4.25"
    15.8 +VERSION="2.4.46"
    15.9  CATEGORY="misc"
   15.10  SHORT_DESC="LDAP database system."
   15.11  MAINTAINER="pascal.bellard@slitaz.org"
   15.12 @@ -27,6 +27,7 @@
   15.13  		--libexecdir=/usr/lib/$PACKAGE \
   15.14  		--localstatedir=/var/lib/$PACKAGE  \
   15.15  		--enable-crypt \
   15.16 +		--with-tls=openssl \
   15.17  		--with-threads \
   15.18  		$CONFIGURE_ARGS &&
   15.19  	which soelim || find -name Makefile | xargs sed -i 's/soelim/cat/'
    16.1 --- a/openssl-dev/receipt	Wed Mar 15 11:41:38 2023 +0000
    16.2 +++ b/openssl-dev/receipt	Sun Apr 02 14:34:44 2023 +0000
    16.3 @@ -1,7 +1,7 @@
    16.4  # SliTaz package receipt.
    16.5  
    16.6  PACKAGE="openssl-dev"
    16.7 -VERSION="1.0.2u"
    16.8 +VERSION="1.1.1n"
    16.9  CATEGORY="development"
   16.10  SHORT_DESC="Open source Secure Sockets Layer devel files."
   16.11  MAINTAINER="pascal.bellard@slitaz.org"
    17.1 --- a/openssl/receipt	Wed Mar 15 11:41:38 2023 +0000
    17.2 +++ b/openssl/receipt	Sun Apr 02 14:34:44 2023 +0000
    17.3 @@ -1,7 +1,7 @@
    17.4  # SliTaz package receipt.
    17.5  
    17.6  PACKAGE="openssl"
    17.7 -VERSION="1.0.2u"
    17.8 +VERSION="1.1.1n"
    17.9  CATEGORY="security"
   17.10  SHORT_DESC="Open source Secure Sockets Layer."
   17.11  MAINTAINER="pascal.bellard@slitaz.org"
   17.12 @@ -23,17 +23,19 @@
   17.13  	# Add -Wa,--noexecstack here so that libcrypto's assembler modules will be
   17.14  	# marked as not requiring an executable stack (compatibility improvement).
   17.15  	./config --prefix=/usr --openssldir=/etc/ssl shared zlib enable-md2 \
   17.16 -		-Wa,--noexecstack &&
   17.17 +		no-ssl3-method -Wa,--noexecstack &&
   17.18  	
   17.19  	sed -i 's/\(basename .*\)`/\1 || true `/' Makefile &&
   17.20  	make &&
   17.21 -	make INSTALL_PREFIX=$PWD/_pkg MANDIR=$PWD/_pkg/usr/share/man install
   17.22 +	make DESTDIR=$PWD/_pkg MANDIR=$PWD/_pkg/usr/share/man \
   17.23 +	install_sw install_ssldirs
   17.24  }
   17.25  
   17.26  # Rules to gen a SliTaz package suitable for Tazpkg.
   17.27  genpkg_rules()
   17.28  {
   17.29 -	mkdir -p $fs/usr
   17.30 +	mkdir -p $fs/usr/lib
   17.31  	cp -a $_pkg/etc $fs
   17.32  	cp -a $_pkg/usr/bin $fs/usr
   17.33 +	cp -a $_pkg/usr/lib/engines* $fs/usr/lib
   17.34  }
    18.1 --- a/python/receipt	Wed Mar 15 11:41:38 2023 +0000
    18.2 +++ b/python/receipt	Sun Apr 02 14:34:44 2023 +0000
    18.3 @@ -25,6 +25,8 @@
    18.4  	sed -i "/progname =/s/python/python${_pybasever}/" Python/pythonrun.c
    18.5  	# Enable built-in SQLite3 module to load extensions (fix FS#22122)
    18.6  	sed -i "/SQLITE_OMIT_LOAD_EXTENSION/d" setup.py
    18.7 +	# Enable SSL module
    18.8 +	patch -p1 < $stuff/python_enablessl.patch
    18.9  	./configure \
   18.10  		--enable-shared \
   18.11  		--build=$HOST_SYSTEM \
    19.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    19.2 +++ b/python/stuff/python_enablessl.patch	Sun Apr 02 14:34:44 2023 +0000
    19.3 @@ -0,0 +1,17 @@
    19.4 +--- a/Modules/Setup.dist
    19.5 ++++ b/Modules/Setup.dist
    19.6 +@@ -215,10 +215,10 @@
    19.7 + 
    19.8 + # Socket module helper for SSL support; you must comment out the other
    19.9 + # socket line above, and possibly edit the SSL variable:
   19.10 +-#SSL=/usr/local/ssl
   19.11 +-#_ssl _ssl.c \
   19.12 +-#	-DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \
   19.13 +-#	-L$(SSL)/lib -lssl -lcrypto
   19.14 ++SSL=/usr
   19.15 ++_ssl _ssl.c \
   19.16 ++	-DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \
   19.17 ++	-L$(SSL)/lib -lssl -lcrypto
   19.18 + 
   19.19 + # The crypt module is now disabled by default because it breaks builds
   19.20 + # on many systems (where -lcrypt is needed), e.g. Linux (I believe).
    20.1 --- a/wget/receipt	Wed Mar 15 11:41:38 2023 +0000
    20.2 +++ b/wget/receipt	Sun Apr 02 14:34:44 2023 +0000
    20.3 @@ -1,11 +1,11 @@
    20.4  # SliTaz package receipt.
    20.5  
    20.6  PACKAGE="wget"
    20.7 -VERSION="1.17.1"
    20.8 +VERSION="1.20.1"
    20.9  CATEGORY="utilities"
   20.10  SHORT_DESC="retrieve files from the web"
   20.11  MAINTAINER="sygne@ombres.eu"
   20.12 -TARBALL="$PACKAGE-$VERSION.tar.xz"
   20.13 +TARBALL="$PACKAGE-$VERSION.tar.gz"
   20.14  WEB_SITE="http://www.gnu.org/software/wget/wget.html"
   20.15  WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
   20.16