From 0d6a639ce9bec90bf889b4414a8e2c288b2a74b5 Mon Sep 17 00:00:00 2001 From: Rmys Date: Wed, 18 Dec 2024 12:08:16 +0300 Subject: [PATCH] openssl3 rebuild --- system/base/cryptsetup/pspec.xml | 7 ++ system/base/curl/pspec.xml | 7 ++ system/base/libnghttp2/pspec.xml | 7 ++ system/base/libssh2/pspec.xml | 7 ++ system/base/mit-kerberos/pspec.xml | 7 ++ system/base/openssl/actions.py | 6 +- system/base/openssl/pspec.xml | 9 +- system/base/pycurl/pspec.xml | 7 ++ system/base/python/actions.py | 12 ++ .../files/0020-Disable-modules-and-SSL.patch | 108 ++++++++++++++++++ ...0022-Non-zero-exit-status-on-failure.patch | 46 ++++++++ .../0023-sqlite-loadable-extensions.patch | 52 +++++++++ system/base/python/pspec.xml | 12 +- system/base/python3/pspec.xml | 7 ++ system/base/sqlite/actions.py | 4 +- system/base/sqlite/pspec.xml | 11 +- system/devel/libarchive/pspec.xml | 7 ++ system/devel/rhash/pspec.xml | 7 ++ 18 files changed, 314 insertions(+), 9 deletions(-) create mode 100644 system/base/python/files/0020-Disable-modules-and-SSL.patch create mode 100644 system/base/python/files/0022-Non-zero-exit-status-on-failure.patch create mode 100644 system/base/python/files/0023-sqlite-loadable-extensions.patch diff --git a/system/base/cryptsetup/pspec.xml b/system/base/cryptsetup/pspec.xml index 23a88a95..53cdfb10 100644 --- a/system/base/cryptsetup/pspec.xml +++ b/system/base/cryptsetup/pspec.xml @@ -92,6 +92,13 @@ --> + + 2024-12-17 + 2.7.5 + Rebuild. + Pisi Linux Community + admin@pisilinux.org + 2024-09-03 2.7.5 diff --git a/system/base/curl/pspec.xml b/system/base/curl/pspec.xml index f9343c1e..e2082750 100644 --- a/system/base/curl/pspec.xml +++ b/system/base/curl/pspec.xml @@ -74,6 +74,13 @@ + + 2024-12-16 + 8.11.0 + Version bump. + Pisi Linux Community + admin@pisilinux.org + 2024-11-07 8.11.0 diff --git a/system/base/libnghttp2/pspec.xml b/system/base/libnghttp2/pspec.xml index c431ed1c..2c6d8fc3 100644 --- a/system/base/libnghttp2/pspec.xml +++ b/system/base/libnghttp2/pspec.xml @@ -51,6 +51,13 @@ + + 2024-12-17 + 1.64.0 + Rebuild. + Pisi Linux Community + admin@pisilinux.org + 2024-10-21 1.64.0 diff --git a/system/base/libssh2/pspec.xml b/system/base/libssh2/pspec.xml index 685c7e8e..a2df3596 100644 --- a/system/base/libssh2/pspec.xml +++ b/system/base/libssh2/pspec.xml @@ -48,6 +48,13 @@ + + 2024-12-17 + 1.11.0 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2023-05-31 1.11.0 diff --git a/system/base/mit-kerberos/pspec.xml b/system/base/mit-kerberos/pspec.xml index fb564306..f84bd9e0 100644 --- a/system/base/mit-kerberos/pspec.xml +++ b/system/base/mit-kerberos/pspec.xml @@ -76,6 +76,13 @@ + + 2024-12-17 + 1.21.3 + Rebuild. + Pisi Linux Community + admin@pisilinux.org + 2024-07-10 1.21.3 diff --git a/system/base/openssl/actions.py b/system/base/openssl/actions.py index 52eb478d..7770e8be 100755 --- a/system/base/openssl/actions.py +++ b/system/base/openssl/actions.py @@ -40,7 +40,7 @@ def setup(): def build(): autotools.make("depend") - autotools.make("-j1") + autotools.make() #autotools.make("rehash") def check(): @@ -59,7 +59,7 @@ def install(): autotools.rawInstall("DESTDIR=%s MANDIR=/usr/share/man" % get.installDIR()) # Rename conflicting manpages - pisitools.rename("/usr/share/man/man1/passwd.1", "ssl-passwd.1") + # pisitools.rename("/usr/share/man/man1/passwd.1", "ssl-passwd.1") #pisitools.rename("/usr/share/man/man3/rand.3", "ssl-rand.3") #pisitools.rename("/usr/share/man/man3/err.3", "ssl-err.3") @@ -88,4 +88,4 @@ def install(): pisitools.remove("/usr/lib/*.a") pisitools.dohtml("doc/*") - pisitools.dodoc("CHANGES*", "FAQ", "LICENSE", "NEWS", "README", "doc/*.txt") + pisitools.dodoc("CHANGES*", "LICENSE*", "NEWS*", "README*", "doc/*.txt") diff --git a/system/base/openssl/pspec.xml b/system/base/openssl/pspec.xml index dac6e6ab..b8bce00a 100755 --- a/system/base/openssl/pspec.xml +++ b/system/base/openssl/pspec.xml @@ -13,7 +13,7 @@ library Toolkit for SSL v2/v3 and TLS v1 OpenSSL is a cryptography toolkit implementing the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) network protocols and related cryptography standards required by them. - https://www.openssl.org/source/openssl-1.1.1w.tar.gz + https://github.com/openssl/openssl/releases/download/openssl-3.4.0/openssl-3.4.0.tar.gz @@ -98,6 +98,13 @@ + + 2024-12-01 + 3.4.0 + Version bump. + Pisi Linux Community + admin@pisilinux.org + 2024-05-18 1.1.1w diff --git a/system/base/pycurl/pspec.xml b/system/base/pycurl/pspec.xml index ebcd667e..be39ccb6 100644 --- a/system/base/pycurl/pspec.xml +++ b/system/base/pycurl/pspec.xml @@ -35,6 +35,13 @@ + + 2024-12-17 + 7.45.3 + Version bump. + Pisi Linux Community + admin@pisilinux.org + 2024-11-07 7.45.3 diff --git a/system/base/python/actions.py b/system/base/python/actions.py index 0c2a1f7a..0846e67a 100644 --- a/system/base/python/actions.py +++ b/system/base/python/actions.py @@ -15,6 +15,7 @@ WorkDir = "Python-%s" % get.srcVERSION() PythonVersion = "2.7" def setup(): + # shelltools.system("export PYTHON_DISABLE_SSL='1'") #shelltools.system("echo -e '\033[0;36mBuilding Bzip2\033[0m' ") #shelltools.makedirs("%s/temp/lib" %get.workDIR()) #shelltools.cd("bzip2-1.0.8") @@ -51,6 +52,17 @@ def setup(): #pisitools.cflags.add("-I%s/temp/include -O3" %get.workDIR()) #pisitools.ldflags.add("-L%s/temp/lib -lssl -lcrypto -lpthread -ldl" %get.workDIR()) + # shelltools.export("CFLAGS", "-I/usr/include/openssl-1.1 -O3") + # shelltools.export("LDFLAGS", "-L/usr/lib/openssl-1.1") + # shelltools.system('export OPT="${CFLAGS}"') + + # shelltools.export("CFLAGS", "-I/usr/include/openssl-1.1 -O3") + # shelltools.export("LDFLAGS", "-L/usr/lib/openssl-1.1 -lssl -lcrypto -lpthread -ldl") + # shelltools.export("PKG_CONFIG_PATH", "$PKG_CONFIG_PATH:/usr/lib/openssl-1.1/pkgconfig") + + # pisitools.cflags.add("-I/usr/include/openssl-1.1 -O3") + # pisitools.ldflags.add("-L/usr/lib/openssl-1.1 -lssl -lcrypto -lpthread -ldl") + autotools.autoreconf("-vif") # disable bsddb diff --git a/system/base/python/files/0020-Disable-modules-and-SSL.patch b/system/base/python/files/0020-Disable-modules-and-SSL.patch new file mode 100644 index 00000000..df6c3d50 --- /dev/null +++ b/system/base/python/files/0020-Disable-modules-and-SSL.patch @@ -0,0 +1,108 @@ +From 89fc66ee9aea78f3d5ee7ffacb94030cd21cc551 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Sun, 17 Jun 2018 11:14:43 -0400 +Subject: [PATCH 20/36] Disable modules and SSL + +--- + setup.py | 50 +++++++++++++++++++++++++++++++------------------- + 1 file changed, 31 insertions(+), 19 deletions(-) + +diff --git a/setup.py b/setup.py +index f764223d06..cc423edcb2 100644 +--- a/setup.py ++++ b/setup.py +@@ -33,7 +33,18 @@ host_platform = get_platform() + COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS")) + + # This global variable is used to hold the list of modules to be disabled. +-disabled_module_list = [] ++pdm_env = "PYTHON_DISABLE_MODULES" ++if pdm_env in os.environ: ++ disabled_module_list = os.environ[pdm_env].split() ++else: ++ disabled_module_list = [] ++ ++pds_env = "PYTHON_DISABLE_SSL" ++if pds_env in os.environ: ++ disable_ssl = os.environ[pds_env] ++else: ++ disable_ssl = 0 ++ + + def add_dir_to_list(dirlist, dir): + """Add the directory 'dir' to the list 'dirlist' (at the front) if +@@ -500,6 +511,7 @@ class PyBuildExt(build_ext): + os.unlink(tmpfile) + + def detect_modules(self): ++ global disable_ssl + # Ensure that /usr/local is always used + if not cross_compiling: + add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') +@@ -861,7 +873,7 @@ class PyBuildExt(build_ext): + ssl_incs = find_file('openssl/ssl.h', inc_dirs, + search_for_ssl_incs_in + ) +- if ssl_incs is not None: ++ if ssl_incs is not None and not disable_ssl: + krb5_h = find_file('krb5.h', inc_dirs, + ['/usr/kerberos/include']) + if krb5_h: +@@ -872,7 +884,8 @@ class PyBuildExt(build_ext): + ] ) + + if (ssl_incs is not None and +- ssl_libs is not None): ++ ssl_libs is not None and ++ not disable_ssl): + exts.append( Extension('_ssl', ['_ssl.c'], + include_dirs = ssl_incs, + library_dirs = ssl_libs, +@@ -904,7 +917,7 @@ class PyBuildExt(build_ext): + pass + + min_openssl_ver = 0x00907000 +- have_any_openssl = ssl_incs is not None and ssl_libs is not None ++ have_any_openssl = ssl_incs is not None and ssl_libs is not None and not disable_ssl + have_usable_openssl = (have_any_openssl and + openssl_ver >= min_openssl_ver) + +@@ -920,21 +933,20 @@ class PyBuildExt(build_ext): + print ("warning: openssl 0x%08x is too old for _hashlib" % + openssl_ver) + missing.append('_hashlib') +- if COMPILED_WITH_PYDEBUG or not have_usable_openssl: +- # The _sha module implements the SHA1 hash algorithm. +- exts.append( Extension('_sha', ['shamodule.c']) ) +- # The _md5 module implements the RSA Data Security, Inc. MD5 +- # Message-Digest Algorithm, described in RFC 1321. The +- # necessary files md5.c and md5.h are included here. +- exts.append( Extension('_md5', +- sources = ['md5module.c', 'md5.c'], +- depends = ['md5.h']) ) +- +- min_sha2_openssl_ver = 0x00908000 +- if COMPILED_WITH_PYDEBUG or openssl_ver < min_sha2_openssl_ver: +- # OpenSSL doesn't do these until 0.9.8 so we'll bring our own hash +- exts.append( Extension('_sha256', ['sha256module.c']) ) +- exts.append( Extension('_sha512', ['sha512module.c']) ) ++ ++ ### Build these unconditionally so emerge won't fail ++ ### when openssl is dropped/broken etc. ++ # The _sha module implements the SHA1 hash algorithm. ++ exts.append( Extension('_sha', ['shamodule.c']) ) ++ # The _md5 module implements the RSA Data Security, Inc. MD5 ++ # Message-Digest Algorithm, described in RFC 1321. The ++ # necessary files md5.c and md5.h are included here. ++ exts.append( Extension('_md5', ++ sources = ['md5module.c', 'md5.c'], ++ depends = ['md5.h']) ) ++ ++ exts.append( Extension('_sha256', ['sha256module.c']) ) ++ exts.append( Extension('_sha512', ['sha512module.c']) ) + + # Modules that provide persistent dictionary-like semantics. You will + # probably want to arrange for at least one of them to be available on +-- +2.38.1 + diff --git a/system/base/python/files/0022-Non-zero-exit-status-on-failure.patch b/system/base/python/files/0022-Non-zero-exit-status-on-failure.patch new file mode 100644 index 00000000..59ebcb67 --- /dev/null +++ b/system/base/python/files/0022-Non-zero-exit-status-on-failure.patch @@ -0,0 +1,46 @@ +From 8f3e8ab1448553bb8f65156345091351c4e09b3c Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Sun, 17 Jun 2018 11:14:43 -0400 +Subject: [PATCH 22/36] Non-zero exit status on failure + +https://bugs.gentoo.org/show_bug.cgi?id=281968 +https://bugs.python.org/issue6731 +--- + setup.py | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/setup.py b/setup.py +index fad7c39f25..469fa3c455 100644 +--- a/setup.py ++++ b/setup.py +@@ -46,6 +46,8 @@ else: + disable_ssl = 0 + + ++exit_status = 0 ++ + def add_dir_to_list(dirlist, dir): + """Add the directory 'dir' to the list 'dirlist' (at the front) if + 1) 'dir' is not already in 'dirlist' +@@ -347,7 +349,10 @@ class PyBuildExt(build_ext): + " detect_modules() for the module's name.") + print + ++ global exit_status ++ + if self.failed: ++ exit_status = 1 + failed = self.failed[:] + print + print "Failed to build these modules:" +@@ -2353,6 +2358,7 @@ def main(): + 'Tools/scripts/2to3', + 'Lib/smtpd.py'] + ) ++ sys.exit(exit_status) + + # --install-platlib + if __name__ == '__main__': +-- +2.38.1 + diff --git a/system/base/python/files/0023-sqlite-loadable-extensions.patch b/system/base/python/files/0023-sqlite-loadable-extensions.patch new file mode 100644 index 00000000..c3358e43 --- /dev/null +++ b/system/base/python/files/0023-sqlite-loadable-extensions.patch @@ -0,0 +1,52 @@ +From 8bb542dbafc6e6d097b39b24f46e7c55df1fbe53 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Sun, 17 Jun 2018 11:14:43 -0400 +Subject: [PATCH 23/36] sqlite loadable extensions + +https://bugs.gentoo.org/show_bug.cgi?id=335505 +https://bugs.python.org/issue10268 +--- + configure.ac | 9 +++++++++ + setup.py | 6 ++++-- + 2 files changed, 13 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index efe6922b5d..7561fe7f54 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2536,6 +2536,15 @@ else + TCLTK_LIBS="$with_tcltk_libs" + fi + ++# Check for support for loadable sqlite extensions ++AC_MSG_CHECKING(for --enable-loadable-sqlite-extensions) ++AC_ARG_ENABLE(loadable-sqlite-extensions, ++ AS_HELP_STRING([--enable-loadable-sqlite-extensions], [support loadable extensions in _sqlite module]), ++ [], ++ [enable_loadable_sqlite_extensions="no"]) ++ ++AC_MSG_RESULT($enable_loadable_sqlite_extensions) ++ + # Check for --with-dbmliborder + AC_MSG_CHECKING(for --with-dbmliborder) + AC_ARG_WITH(dbmliborder, +diff --git a/setup.py b/setup.py +index 469fa3c455..89946bcd55 100644 +--- a/setup.py ++++ b/setup.py +@@ -1252,8 +1252,10 @@ class PyBuildExt(build_ext): + else: + sqlite_defines.append(('MODULE_NAME', '\\"sqlite3\\"')) + +- # Comment this out if you want the sqlite3 module to be able to load extensions. +- sqlite_defines.append(("SQLITE_OMIT_LOAD_EXTENSION", "1")) ++ # Enable support for loadable extensions in the sqlite3 module ++ # if --enable-loadable-sqlite-extensions configure option is used. ++ if '--enable-loadable-sqlite-extensions' not in sysconfig.get_config_var("CONFIG_ARGS"): ++ sqlite_defines.append(("SQLITE_OMIT_LOAD_EXTENSION", "1")) + + if host_platform == 'darwin': + # In every directory on the search path search for a dynamic +-- +2.38.1 + diff --git a/system/base/python/pspec.xml b/system/base/python/pspec.xml index 8c8ba388..8e5e3cad 100644 --- a/system/base/python/pspec.xml +++ b/system/base/python/pspec.xml @@ -14,7 +14,7 @@ Python is a dynamic object-oriented programming language that can be used for many kinds of software development. It offers strong support for integration with other languages and tools, comes with extensive standard libraries, and can be learned in a few days. https://www.python.org/ftp/python/2.7.18/Python-2.7.18.tar.xz - + bzip2 @@ -45,6 +45,9 @@ gentoo/0015-Turkish-locale.patch + + + @@ -140,6 +143,13 @@ --> + + 2024-12-17- + 2.7.18 + Rebuild sqlite. + Mustafa Cinasal + muscnsl@gmail.com + 2024-11-05- 2.7.18 diff --git a/system/base/python3/pspec.xml b/system/base/python3/pspec.xml index 33195939..1d0ac17f 100644 --- a/system/base/python3/pspec.xml +++ b/system/base/python3/pspec.xml @@ -129,6 +129,13 @@ + + 2024-12-17 + 3.11.11 + Rebuild. + Pisi Linux Community + admin@pisilinux.org + 2024-12-05 3.11.11 diff --git a/system/base/sqlite/actions.py b/system/base/sqlite/actions.py index 07ef05fc..5bd5a227 100644 --- a/system/base/sqlite/actions.py +++ b/system/base/sqlite/actions.py @@ -65,9 +65,9 @@ def install(): pisitools.dodoc("README*") - shelltools.cd("%s/sqlite-doc-3470100" % get.workDIR()) + shelltools.cd("%s/sqlite-doc-3470200" % get.workDIR()) - pisitools.insinto("/usr/share/doc/sqlite", "../sqlite-doc-3470100/*") + pisitools.insinto("/usr/share/doc/sqlite", "../sqlite-doc-3470200/*") """ # fix permissions and remove obsolete files; https://bugs.archlinux.org/task/24605 shelltools.system("find %s -type f -perm 755 -exec ls -lha {} \;" % get.installDIR()) diff --git a/system/base/sqlite/pspec.xml b/system/base/sqlite/pspec.xml index a542767f..998acdcc 100644 --- a/system/base/sqlite/pspec.xml +++ b/system/base/sqlite/pspec.xml @@ -14,8 +14,8 @@ app:console An SQL Database Engine in a C Library SQLite is a small C library that implements a self-contained, embeddable, zero-configuration SQL database engine. Supports databases up to 2 terabytes in size. - https://www.sqlite.org/2024/sqlite-autoconf-3470100.tar.gz - https://www.sqlite.org/2024/sqlite-doc-3470100.zip + https://www.sqlite.org/2024/sqlite-autoconf-3470200.tar.gz + https://www.sqlite.org/2024/sqlite-doc-3470200.zip readline-devel @@ -105,6 +105,13 @@ --> + + 2024-12-18 + 3.47.2 + Version bump. + Pisi Linux Community + admin@pisilinux.org + 2024-12-05 3.47.1 diff --git a/system/devel/libarchive/pspec.xml b/system/devel/libarchive/pspec.xml index 4976b87f..11b76028 100644 --- a/system/devel/libarchive/pspec.xml +++ b/system/devel/libarchive/pspec.xml @@ -72,6 +72,13 @@ + + 2024-11-17 + 3.7.7 + Rebuild. + Pisi Linux Community + admin@pisilinux.org + 2024-10-14 3.7.7 diff --git a/system/devel/rhash/pspec.xml b/system/devel/rhash/pspec.xml index fc221f2f..3a2f9ef1 100755 --- a/system/devel/rhash/pspec.xml +++ b/system/devel/rhash/pspec.xml @@ -46,6 +46,13 @@ + + 2024-12-17 + 1.4.4 + Rebuild. + Mustafa Cinasal + muscnsl@gmail.com + 2023-10-26 1.4.4