From 799a94d301924237a14564057ccc8ac700ca25f2 Mon Sep 17 00:00:00 2001 From: idriskalp Date: Mon, 23 Dec 2019 01:33:57 +0300 Subject: [PATCH 01/25] db 6.2.38 --- system/base/db/pspec.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/system/base/db/pspec.xml b/system/base/db/pspec.xml index bafa0227..12333ed9 100644 --- a/system/base/db/pspec.xml +++ b/system/base/db/pspec.xml @@ -12,7 +12,7 @@ app:console Oracle Berkeley DB The Berkeley Database (Berkeley DB) is a programmatic toolkit that provides embedded database support for both traditional and client/server applications. The Berkeley DB includes B+tree, Extended Linear Hashing, Fixed and Variable-length record access methods, transactions, locking, logging, shared memory caching, and database recovery. The Berkeley DB supports C, C++, Java, and Perl APIs. It is used by many applications, including Python and Perl, so this should be installed on all systems. - http://download.oracle.com/berkeley-db/db-6.2.23.tar.gz + https://sourceforge.net/projects/pisilinux/files/source/db-6.2.38.tar.gz @@ -61,9 +61,9 @@ - 2019-10-03 - 6.2.23 - Rebuild + 2019-12-23 + 6.2.38 + Version bump idris Kalp idriskalp@gmail.com From 4ab0c31d3ad967c7794363c92c69a175b66e0e83 Mon Sep 17 00:00:00 2001 From: idriskalp Date: Mon, 23 Dec 2019 01:37:02 +0300 Subject: [PATCH 02/25] perl-Locale-gettext rebuild --- system/base/perl-Locale-gettext/pspec.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/system/base/perl-Locale-gettext/pspec.xml b/system/base/perl-Locale-gettext/pspec.xml index cbaecba9..f41448ec 100644 --- a/system/base/perl-Locale-gettext/pspec.xml +++ b/system/base/perl-Locale-gettext/pspec.xml @@ -32,6 +32,13 @@ + + 2019-12-23 + 1.07 + Rebuild + Idris Kalp + idriskalp@gmail.com + 2018-07-19 1.07 From 4bff8b08fd409ac607f6d50d486fca190c8d0461 Mon Sep 17 00:00:00 2001 From: idriskalp Date: Mon, 23 Dec 2019 01:54:34 +0300 Subject: [PATCH 03/25] libgpg-error 1.36 --- system/base/libgpg-error/pspec.xml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/system/base/libgpg-error/pspec.xml b/system/base/libgpg-error/pspec.xml index 0c39e8d1..03c3afd1 100644 --- a/system/base/libgpg-error/pspec.xml +++ b/system/base/libgpg-error/pspec.xml @@ -13,7 +13,7 @@ library Library for error values used by GnuPG components libgpg-error is a library that defines common error values for all GnuPG components. - https://ftp.osuosl.org/pub/blfs/conglomeration/libgpg-error/libgpg-error-1.29.tar.bz2 + https://www.gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.36.tar.bz2 @@ -61,6 +61,13 @@ + + 2019-12-23 + 1.36 + Version bump + Idris Kalp + idriskalp@gmail.com + 2019-01-01 1.29 From 59772d11aa062e6b4d665c9313b81be78797d84c Mon Sep 17 00:00:00 2001 From: idriskalp Date: Mon, 23 Dec 2019 02:01:04 +0300 Subject: [PATCH 04/25] libgcrypt 1.8.5 --- system/base/libgcrypt/pspec.xml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/system/base/libgcrypt/pspec.xml b/system/base/libgcrypt/pspec.xml index bed4cc7d..c71e0f1c 100644 --- a/system/base/libgcrypt/pspec.xml +++ b/system/base/libgcrypt/pspec.xml @@ -12,9 +12,9 @@ library General purpose crypto library Libgcrypt is a general purpose crypto library based on the code used in GNU Privacy Guard. - https://ftp.osuosl.org/pub/blfs/conglomeration/libgcrypt/libgcrypt-1.8.3.tar.bz2 + https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.8.5.tar.bz2 - libgpg-error-devel + libgpg-error-devel @@ -70,6 +70,13 @@ + + 2019-12-23 + 1.8.5 + Version bump + idris Kalp + idriskalp@gmail.com + 2018-12-31 1.8.3 From 9321348a12d7fe034eac55c47a2a9904021f5f6b Mon Sep 17 00:00:00 2001 From: idriskalp Date: Mon, 23 Dec 2019 02:02:37 +0300 Subject: [PATCH 05/25] libxslt 1.3.34 --- system/devel/libxslt/pspec.xml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/system/devel/libxslt/pspec.xml b/system/devel/libxslt/pspec.xml index a20fdd2b..e07136e3 100644 --- a/system/devel/libxslt/pspec.xml +++ b/system/devel/libxslt/pspec.xml @@ -12,9 +12,9 @@ library XSLT libraries and tools Libxslt is the XSLT C library developed for the GNOME project. XSLT itself is a an XML language to define transformation for XML. - ftp://ftp.xmlsoft.org/libxml2/libxslt-1.1.32.tar.gz + ftp://ftp.xmlsoft.org/libxml2/libxslt-1.1.34.tar.gz - libxml2-devel + libxml2-devel libgcrypt-devel @@ -77,7 +77,14 @@ - + + + 2019-12-23 + 1.1.34 + Version bump + Idris Kalp + idriskalp@gmail.com + 2019-01-22 1.1.32 From 19ddd3a3b4a6c414af538da0ff1742d854516608 Mon Sep 17 00:00:00 2001 From: idriskalp Date: Mon, 23 Dec 2019 02:05:55 +0300 Subject: [PATCH 06/25] cracklib 2.9.7 --- system/base/cracklib/pspec.xml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/system/base/cracklib/pspec.xml b/system/base/cracklib/pspec.xml index 163312db..29cab7d4 100644 --- a/system/base/cracklib/pspec.xml +++ b/system/base/cracklib/pspec.xml @@ -12,7 +12,7 @@ library Password Checking Library CrackLib tests passwords to determine whether they match certain security-oriented characteristics, with the purpose of stopping users from choosing passwords that are easy to guess. - https://github.com/cracklib/cracklib/releases/download/cracklib-2.9.6/cracklib-2.9.6.tar.gz + https://github.com/cracklib/cracklib/releases/download/v2.9.7/cracklib-2.9.7.tar.gz zlib-devel python-devel @@ -49,6 +49,13 @@ + + 2019-12-23 + 2.9.7 + Version bump + idris Kalp + idriskalp@gmail.com + 2018-07-15 2.9.6 From d78a3d7a8472cab6035ada7ddf76a01533dcb70a Mon Sep 17 00:00:00 2001 From: idriskalp Date: Mon, 23 Dec 2019 02:07:50 +0300 Subject: [PATCH 07/25] pam rebuild --- system/base/pam/pspec.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/system/base/pam/pspec.xml b/system/base/pam/pspec.xml index ecb9014b..ae0a4987 100644 --- a/system/base/pam/pspec.xml +++ b/system/base/pam/pspec.xml @@ -71,6 +71,13 @@ + + 2019-12-23 + 1.3.0 + Rebuild + idris Kalp + idriskalp@gmail.com + 2018-07-15 1.3.0 From abdb6acc874a4030f145f2b795e1619577d5149a Mon Sep 17 00:00:00 2001 From: idriskalp Date: Mon, 23 Dec 2019 02:09:01 +0300 Subject: [PATCH 08/25] shadow 4.8 --- system/base/shadow/pspec.xml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/system/base/shadow/pspec.xml b/system/base/shadow/pspec.xml index da80b092..36f49bf6 100644 --- a/system/base/shadow/pspec.xml +++ b/system/base/shadow/pspec.xml @@ -12,7 +12,7 @@ app:console Utilities to deal with user accounts The Shadow password file utilities package includes programs necessary to convert traditional V7 *NIX password files to the SVR4 shadow password format, and additional tools to maintain password and group files (that work with both shadow and non-shadow passwords). - https://github.com/shadow-maint/shadow/releases/download/4.6/shadow-4.6.tar.xz + https://github.com/shadow-maint/shadow/releases/download/4.8/shadow-4.8.tar.xz pam-devel gettext-devel @@ -70,6 +70,13 @@ + + 2019-12-23 + 4.8 + Version bump. + Idris Kalp + idriskalp@gmail.com + 2018-11-28 4.6 From 291f63f09377e946bd8b44757600a48269c620d4 Mon Sep 17 00:00:00 2001 From: idriskalp Date: Mon, 23 Dec 2019 03:43:21 +0300 Subject: [PATCH 09/25] coreutils ver bump --- system/base/coreutils/pspec.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/base/coreutils/pspec.xml b/system/base/coreutils/pspec.xml index f1e688a0..744920f0 100644 --- a/system/base/coreutils/pspec.xml +++ b/system/base/coreutils/pspec.xml @@ -56,7 +56,7 @@ - 2019-12-12 + 2019-12-23 8.31 Version bump. Idris Kalp From 671e2f07fc1bb3f024d5a39cd6093b8729530946 Mon Sep 17 00:00:00 2001 From: idriskalp Date: Mon, 23 Dec 2019 03:43:58 +0300 Subject: [PATCH 10/25] expat 2.2.9 --- system/base/expat/pspec.xml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/system/base/expat/pspec.xml b/system/base/expat/pspec.xml index 26c6e488..83c1a3fd 100644 --- a/system/base/expat/pspec.xml +++ b/system/base/expat/pspec.xml @@ -12,11 +12,10 @@ library XML parsing libraries This is expat, the C library for parsing XML, written by James Clark. Expat is a stream oriented XML parser. This means that you register handlers with the parser prior to starting the parse. These handlers are called when the parser discovers the associated structures in the document being parsed. A start tag is an example of the kind of structures for which you may register handlers. - mirrors://sourceforge/expat/expat-2.2.8.tar.bz2 + mirrors://sourceforge/expat/expat-2.2.9.tar.bz2 gnuconfig glibc-devel - readline-devel @@ -64,12 +63,12 @@ - - 2019-12-11 - 2.2.8 + + 2019-12-23 + 2.2.9 Version bump. - Mustafa Cinasal - muscnsl@gmail.com + Idris Kalp + idriskalp@gmail.com 2018-11-28 From 09cc8c48716657c2db5ad92b51497da564864d5d Mon Sep 17 00:00:00 2001 From: idriskalp Date: Mon, 23 Dec 2019 03:44:39 +0300 Subject: [PATCH 11/25] perl-XML-Parser 2.46 --- system/devel/perl-XML-Parser/pspec.xml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/system/devel/perl-XML-Parser/pspec.xml b/system/devel/perl-XML-Parser/pspec.xml index 11a76717..c203c153 100644 --- a/system/devel/perl-XML-Parser/pspec.xml +++ b/system/devel/perl-XML-Parser/pspec.xml @@ -12,10 +12,10 @@ library A Perl extension interface to James Clark's XML parser, expat This module provides an interface to James Clark's XML parser, expat. As in expat, a single instance of the parser can only parse one document. Calls to parsestring after the first for a given instance will die. - mirrors://cpan/authors/id/T/TO/TODDR/XML-Parser-2.44.tar.gz + mirrors://cpan/authors/id/T/TO/TODDR/XML-Parser-2.46.tar.gz expat-devel - perl + perl @@ -23,7 +23,7 @@ perl-XML-Parser expat - perl + perl /usr/share/doc @@ -33,6 +33,13 @@ + + 2019-12-23 + 2.46 + Version bump + Idris Kalp + idriskalp@gmail.com + 2018-07-19 2.44 From 0d8d88f0ca7bfaa4250e7f942683513166b91773 Mon Sep 17 00:00:00 2001 From: idriskalp Date: Mon, 23 Dec 2019 03:54:09 +0300 Subject: [PATCH 12/25] util-macros rebuild --- system/devel/util-macros/pspec.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/system/devel/util-macros/pspec.xml b/system/devel/util-macros/pspec.xml index 8923f7bd..1e127571 100644 --- a/system/devel/util-macros/pspec.xml +++ b/system/devel/util-macros/pspec.xml @@ -28,6 +28,13 @@ + + 2019-12-23 + 1.19.2 + Rebuild + Idris Kalp + idriskalp@gmail.com + 2019-01-07 1.19.2 From 056e92b1c7186d1e2ccf26aac9f8eb89dc68c0e2 Mon Sep 17 00:00:00 2001 From: idriskalp Date: Mon, 23 Dec 2019 03:54:29 +0300 Subject: [PATCH 13/25] sed 4.7 --- system/base/sed/actions.py | 0 system/base/sed/pspec.xml | 9 ++++++++- system/base/sed/translations.xml | 0 3 files changed, 8 insertions(+), 1 deletion(-) mode change 100644 => 100755 system/base/sed/actions.py mode change 100644 => 100755 system/base/sed/pspec.xml mode change 100644 => 100755 system/base/sed/translations.xml diff --git a/system/base/sed/actions.py b/system/base/sed/actions.py old mode 100644 new mode 100755 diff --git a/system/base/sed/pspec.xml b/system/base/sed/pspec.xml old mode 100644 new mode 100755 index 5c0207f2..a160841c --- a/system/base/sed/pspec.xml +++ b/system/base/sed/pspec.xml @@ -12,7 +12,7 @@ app:console GNU Stream Editor Sed is a stream editor. A stream editor is used to perform basic text transformations on an input stream (a file or input from a pipeline). - mirrors://gnu/sed/sed-4.5.tar.xz + mirrors://gnu/sed/sed-4.7.tar.xz gettext attr-devel @@ -36,6 +36,13 @@ + + 2019-12-23 + 4.7 + Version bump. + Idris Kalp + idriskalp@gmail.com + 2018-11-28 4.5 diff --git a/system/base/sed/translations.xml b/system/base/sed/translations.xml old mode 100644 new mode 100755 From 3bac59da0befe5076338b4626bc3466c02647f31 Mon Sep 17 00:00:00 2001 From: idriskalp Date: Mon, 23 Dec 2019 03:59:10 +0300 Subject: [PATCH 14/25] xorg-proto rebuild --- system/devel/xorg-proto/pspec.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/system/devel/xorg-proto/pspec.xml b/system/devel/xorg-proto/pspec.xml index 056fedc3..baa6ab6f 100644 --- a/system/devel/xorg-proto/pspec.xml +++ b/system/devel/xorg-proto/pspec.xml @@ -38,6 +38,13 @@ + + 2019-12-23 + 2019.2 + Rebuild + Rebuild + idriskalp@gmail.com + 2019-10-20 2019.2 From c20d0621ebe839c2332daf1b9bb83dfb61535db3 Mon Sep 17 00:00:00 2001 From: idriskalp Date: Mon, 23 Dec 2019 04:01:47 +0300 Subject: [PATCH 15/25] xorg-util version bump --- system/devel/xorg-util/pspec.xml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/system/devel/xorg-util/pspec.xml b/system/devel/xorg-util/pspec.xml index 2ab2ec18..9416d5f7 100644 --- a/system/devel/xorg-util/pspec.xml +++ b/system/devel/xorg-util/pspec.xml @@ -13,9 +13,9 @@ X.Org utilities xorg-util contains some Xorg X11 command-line utilities, but more importantly, X11 configuration and rule files. mirrors://xorg/individual/util/gccmakedep-1.0.3.tar.bz2 - mirrors://xorg/individual/util/imake-1.0.7.tar.bz2 + mirrors://xorg/individual/util/imake-1.0.8.tar.bz2 mirrors://xorg/individual/util/lndir-1.0.3.tar.bz2 - mirrors://xorg/individual/util/makedepend-1.0.5.tar.bz2 + mirrors://xorg/individual/util/makedepend-1.0.6.tar.bz2 mirrors://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2 xorg-proto @@ -36,6 +36,13 @@ + + 2019-12-23 + 7.6 + Version bump + Idris Kalp + idriskalp@gmail.com + 2019-01-07 7.6 From 7d0702a72899a8fb5855968055c2dde9629c89ce Mon Sep 17 00:00:00 2001 From: idriskalp Date: Mon, 23 Dec 2019 04:08:39 +0300 Subject: [PATCH 16/25] python bootstrap --- system/base/python/actions.py | 16 ++++++++++++++++ system/base/python/files/allowZip64.patch | 12 ++++++++++++ system/base/python/pspec.xml | 12 +++++++++++- 3 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 system/base/python/files/allowZip64.patch mode change 100644 => 100755 system/base/python/pspec.xml diff --git a/system/base/python/actions.py b/system/base/python/actions.py index 5b2d6481..c4089504 100644 --- a/system/base/python/actions.py +++ b/system/base/python/actions.py @@ -16,6 +16,19 @@ WorkDir = "Python-%s" % get.srcVERSION() PythonVersion = "2.7" def setup(): + shelltools.system("echo -e '\033[0;36mBuilding OpenSSL\033[0m' ") + shelltools.cd("openssl-1.1.1d") + shelltools.system("./Configure --prefix=%s/temp --openssldir=%s/temp/etc/ssl --libdir=lib no-shared linux-x86_64 -Wa,--noexecstack" %(get.workDIR(), get.workDIR())) + autotools.make() + autotools.make("install") + shelltools.cd("..") + shelltools.system("echo -e '\033[0;36mBuilding Bzip2\033[0m' ") + shelltools.cd("bzip2-1.0.8") + autotools.make('CC=%s AR=%s RANLIB=%s CFLAGS="%s -D_FILE_OFFSET_BITS=64 -fPIC" libbz2.a' % (get.CC(), get.AR(), get.RANLIB(), get.CFLAGS())) + shelltools.system("cp libbz2.a %s/temp/lib" % get.workDIR()) + shelltools.cd("..") + + pisitools.cflags.add("-fwrapv") # no rpath @@ -29,6 +42,8 @@ def setup(): "_ctypes/libffi_osx","_ctypes/libffi","_ctypes/darwin"]: shelltools.unlinkDir("Modules/%s" % dir) + shelltools.export("CFLAGS", "-I%s/temp/include -O3" %get.workDIR()) + shelltools.export("LDFLAGS", "-L%s/temp/lib -lssl -lcrypto -lbz2 -lpthread -ldl" %get.workDIR()) autotools.autoreconf("-vif") # disable bsddb @@ -61,5 +76,6 @@ def install(): pisitools.dosym("/usr/bin/python%s" % PythonVersion, "/usr/bin/python") pisitools.dosym("/usr/bin/python%s-config" % PythonVersion, "/usr/bin/python-config") pisitools.dosym("/usr/lib/python%s/pdb.py" % PythonVersion, "/usr/bin/pdb") + #pisitools.domove("/usr/lib/python2.7/lib-dynload/bz2_failed.so", "/usr/lib/python2.7/lib-dynload", "bz2.so") pisitools.dodoc("LICENSE", "README") diff --git a/system/base/python/files/allowZip64.patch b/system/base/python/files/allowZip64.patch new file mode 100644 index 00000000..4389f868 --- /dev/null +++ b/system/base/python/files/allowZip64.patch @@ -0,0 +1,12 @@ +diff -Nru Python-2.7.17.orig/Lib/zipfile.py Python-2.7.17/Lib/zipfile.py +--- Python-2.7.17.orig/Lib/zipfile.py 2019-10-19 21:38:44.000000000 +0300 ++++ Python-2.7.17/Lib/zipfile.py 2019-11-18 00:43:00.452488503 +0300 +@@ -746,7 +746,7 @@ + + fp = None # Set here since __del__ checks it + +- def __init__(self, file, mode="r", compression=ZIP_STORED, allowZip64=False): ++ def __init__(self, file, mode="r", compression=ZIP_STORED, allowZip64=True): + """Open the ZIP file with mode read "r", write "w" or append "a".""" + if mode not in ("r", "w", "a"): + raise RuntimeError('ZipFile() requires mode "r", "w", or "a"') diff --git a/system/base/python/pspec.xml b/system/base/python/pspec.xml old mode 100644 new mode 100755 index 5bcb0272..163dc956 --- a/system/base/python/pspec.xml +++ b/system/base/python/pspec.xml @@ -12,7 +12,9 @@ app:console An interpreted, interactive, object-orientated programming language 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. - http://www.python.org/ftp/python/2.7.15/Python-2.7.15.tar.xz + https://www.python.org/ftp/python/2.7.17/Python-2.7.17.tar.xz + ftp://ftp.openssl.org/source/openssl-1.1.1d.tar.gz + https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz bzip2 @@ -38,6 +40,7 @@ disable-egginfo.patch trfix_emaillib.patch + allowZip64.patch @@ -133,6 +136,13 @@ --> + + 2019-10-25- + 2.7.17 + Ver bump + Idris Kalp + idriskalp@gmail.com + 2018-07-15 2.7.15 From 109b4783df0449e5ee76220f2efc823d3ca1d17f Mon Sep 17 00:00:00 2001 From: idriskalp Date: Mon, 23 Dec 2019 04:08:52 +0300 Subject: [PATCH 17/25] bzip2 1.0.8 --- system/base/bzip2/actions.py | 1 + .../bzip2/files/bzip2-1.0.8-manpath.patch | 48 +++++++++++++++++++ system/base/bzip2/pspec.xml | 20 ++++---- 3 files changed, 61 insertions(+), 8 deletions(-) create mode 100644 system/base/bzip2/files/bzip2-1.0.8-manpath.patch diff --git a/system/base/bzip2/actions.py b/system/base/bzip2/actions.py index 904fb9af..926e7bb5 100755 --- a/system/base/bzip2/actions.py +++ b/system/base/bzip2/actions.py @@ -40,6 +40,7 @@ def install(): pisitools.dosym("libbz2.so.1", "/lib/libbz2.so") pisitools.dosym("libbz2.so.%s" % libversion, "/lib/libbz2.so.1") + pisitools.dohtml("manual.html") pisitools.dodoc("README", "CHANGES", "bzip2.txt") diff --git a/system/base/bzip2/files/bzip2-1.0.8-manpath.patch b/system/base/bzip2/files/bzip2-1.0.8-manpath.patch new file mode 100644 index 00000000..828bc42a --- /dev/null +++ b/system/base/bzip2/files/bzip2-1.0.8-manpath.patch @@ -0,0 +1,48 @@ +diff -Nru bzip2-1.0.8.orig/Makefile bzip2-1.0.8/Makefile +--- bzip2-1.0.8.orig/Makefile 2019-07-13 20:50:05.000000000 +0300 ++++ bzip2-1.0.8/Makefile 2019-12-13 16:35:37.615371592 +0300 +@@ -72,8 +72,8 @@ + install: bzip2 bzip2recover + if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi + if ( test ! -d $(PREFIX)/lib ) ; then mkdir -p $(PREFIX)/lib ; fi +- if ( test ! -d $(PREFIX)/man ) ; then mkdir -p $(PREFIX)/man ; fi +- if ( test ! -d $(PREFIX)/man/man1 ) ; then mkdir -p $(PREFIX)/man/man1 ; fi ++ if ( test ! -d $(PREFIX)/share/man ) ; then mkdir -p $(PREFIX)/share/man ; fi ++ if ( test ! -d $(PREFIX)/share/man/man1 ) ; then mkdir -p $(PREFIX)/share/man/man1 ; fi + if ( test ! -d $(PREFIX)/include ) ; then mkdir -p $(PREFIX)/include ; fi + cp -f bzip2 $(PREFIX)/bin/bzip2 + cp -f bzip2 $(PREFIX)/bin/bunzip2 +@@ -83,8 +83,8 @@ + chmod a+x $(PREFIX)/bin/bunzip2 + chmod a+x $(PREFIX)/bin/bzcat + chmod a+x $(PREFIX)/bin/bzip2recover +- cp -f bzip2.1 $(PREFIX)/man/man1 +- chmod a+r $(PREFIX)/man/man1/bzip2.1 ++ cp -f bzip2.1 $(PREFIX)/share/man/man1 ++ chmod a+r $(PREFIX)/share/man/man1/bzip2.1 + cp -f bzlib.h $(PREFIX)/include + chmod a+r $(PREFIX)/include/bzlib.h + cp -f libbz2.a $(PREFIX)/lib +@@ -99,14 +99,14 @@ + cp -f bzdiff $(PREFIX)/bin/bzdiff + ln -s -f $(PREFIX)/bin/bzdiff $(PREFIX)/bin/bzcmp + chmod a+x $(PREFIX)/bin/bzdiff +- cp -f bzgrep.1 bzmore.1 bzdiff.1 $(PREFIX)/man/man1 +- chmod a+r $(PREFIX)/man/man1/bzgrep.1 +- chmod a+r $(PREFIX)/man/man1/bzmore.1 +- chmod a+r $(PREFIX)/man/man1/bzdiff.1 +- echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzegrep.1 +- echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzfgrep.1 +- echo ".so man1/bzmore.1" > $(PREFIX)/man/man1/bzless.1 +- echo ".so man1/bzdiff.1" > $(PREFIX)/man/man1/bzcmp.1 ++ cp -f bzgrep.1 bzmore.1 bzdiff.1 $(PREFIX)/share/man/man1 ++ chmod a+r $(PREFIX)/share/man/man1/bzgrep.1 ++ chmod a+r $(PREFIX)/share/man/man1/bzmore.1 ++ chmod a+r $(PREFIX)/share/man/man1/bzdiff.1 ++ echo ".so man1/bzgrep.1" > $(PREFIX)/share/man/man1/bzegrep.1 ++ echo ".so man1/bzgrep.1" > $(PREFIX)/share/man/man1/bzfgrep.1 ++ echo ".so man1/bzmore.1" > $(PREFIX)/share/man/man1/bzless.1 ++ echo ".so man1/bzdiff.1" > $(PREFIX)/share/man/man1/bzcmp.1 + + clean: + rm -f *.o libbz2.a bzip2 bzip2recover \ diff --git a/system/base/bzip2/pspec.xml b/system/base/bzip2/pspec.xml index ffed2383..0c55ed72 100755 --- a/system/base/bzip2/pspec.xml +++ b/system/base/bzip2/pspec.xml @@ -12,13 +12,17 @@ app:console A high-quality data compressor bzip2 is high-quality data compressor. It typically compresses files to within 10% to 15% of the best available techniques (the PPM family of statistical compressors), whilst being around twice as fast at compression and six times faster at decompression. - https://sourceware.org/pub/bzip2/bzip2-1.0.6.tar.gz + https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz bzip2-1.0.2-progress.patch - bzip2-1.0.4-bzip2recover.patch - bzip2-1.0.4-man-links.patch - bzip2-1.0.6-saneso.patch - manpath.patch + + bzip2-1.0.4-makefile-CFLAGS.patch + + bzip2-1.0.6-nselectors-upper-bound-check.patch + + + bzip2-1.0.8-saneso.patch + bzip2-1.0.8-manpath.patch @@ -36,9 +40,9 @@ - 2019-10-01 - 1.0.6 - Rebuild + 2019-12-13 + 1.0.8 + Version bump Idris Kalp idriskalp@gmail.com From 1b0822c7f4d87335d1854c066d1eb8e8b5b2334b Mon Sep 17 00:00:00 2001 From: idriskalp Date: Mon, 23 Dec 2019 04:28:25 +0300 Subject: [PATCH 18/25] openssl 1.1.1d --- system/base/openssl/actions.py | 12 +- system/base/openssl/comar/package.py | 0 system/base/openssl/files/ca-dir.patch | 31 +++++ .../files/openssl-1.0.0-beta4-ca-dir.patch | 0 .../files/openssl-1.0.2a-x32-asm.patch | 43 +++++++ ...ssl-1.1.0l-fix-no-ec2m-in-ec_curve.c.patch | 30 +++++ ...ential-memleaks-w-BN_to_ASN1_INTEGER.patch | 107 ++++++++++++++++++ .../files/openssl-1.1.1d-fix-zlib.patch | 52 +++++++++ ...hed-AES-CBC-HMAC-SHA-implementations.patch | 62 ++++++++++ .../openssl/files/openssl-alpha-ccc.patch | 0 .../base/openssl/files/openssl-asflag.patch | 0 system/base/openssl/files/openssl-c_rehash.sh | 0 .../files/openssl-ca-certificates.patch | 0 system/base/openssl/files/openssl-find.patch | 0 .../base/openssl/files/openssl-include.patch | 0 .../base/openssl/files/openssl-ldflags.patch | 0 .../openssl/files/openssl-man-namespace.patch | 0 .../base/openssl/files/openssl-optflags.patch | 0 .../openssl/files/openssl-ssl-certificate.sh | 0 .../openssl/files/openssl_fix_for_x32.patch | 0 system/base/openssl/files/pic.patch | 0 system/base/openssl/pspec.xml | 31 +++-- system/base/openssl/translations.xml | 0 23 files changed, 353 insertions(+), 15 deletions(-) mode change 100644 => 100755 system/base/openssl/actions.py mode change 100644 => 100755 system/base/openssl/comar/package.py create mode 100644 system/base/openssl/files/ca-dir.patch mode change 100644 => 100755 system/base/openssl/files/openssl-1.0.0-beta4-ca-dir.patch create mode 100644 system/base/openssl/files/openssl-1.0.2a-x32-asm.patch create mode 100644 system/base/openssl/files/openssl-1.1.0l-fix-no-ec2m-in-ec_curve.c.patch create mode 100644 system/base/openssl/files/openssl-1.1.1d-fix-potential-memleaks-w-BN_to_ASN1_INTEGER.patch create mode 100644 system/base/openssl/files/openssl-1.1.1d-fix-zlib.patch create mode 100644 system/base/openssl/files/openssl-1.1.1d-reenable-the-stitched-AES-CBC-HMAC-SHA-implementations.patch mode change 100644 => 100755 system/base/openssl/files/openssl-alpha-ccc.patch mode change 100644 => 100755 system/base/openssl/files/openssl-asflag.patch mode change 100644 => 100755 system/base/openssl/files/openssl-c_rehash.sh mode change 100644 => 100755 system/base/openssl/files/openssl-ca-certificates.patch mode change 100644 => 100755 system/base/openssl/files/openssl-find.patch mode change 100644 => 100755 system/base/openssl/files/openssl-include.patch mode change 100644 => 100755 system/base/openssl/files/openssl-ldflags.patch mode change 100644 => 100755 system/base/openssl/files/openssl-man-namespace.patch mode change 100644 => 100755 system/base/openssl/files/openssl-optflags.patch mode change 100644 => 100755 system/base/openssl/files/openssl-ssl-certificate.sh mode change 100644 => 100755 system/base/openssl/files/openssl_fix_for_x32.patch mode change 100644 => 100755 system/base/openssl/files/pic.patch mode change 100644 => 100755 system/base/openssl/pspec.xml mode change 100644 => 100755 system/base/openssl/translations.xml diff --git a/system/base/openssl/actions.py b/system/base/openssl/actions.py old mode 100644 new mode 100755 index c5d560d4..52eb478d --- a/system/base/openssl/actions.py +++ b/system/base/openssl/actions.py @@ -17,7 +17,7 @@ def setup(): --openssldir=/etc/ssl \ shared -Wa,--noexecstack \ zlib enable-camellia enable-idea \ - enable-seed enable-tlsext enable-rfc3779 enable-rc5 \ + enable-seed enable-rfc3779 enable-rc5 \ enable-cms enable-md2 enable-mdc2 threads" if get.buildTYPE() == "_emul32": @@ -41,7 +41,7 @@ def setup(): def build(): autotools.make("depend") autotools.make("-j1") - autotools.make("rehash") + #autotools.make("rehash") def check(): #Revert ca-dir patch not to fail test @@ -56,12 +56,12 @@ def check(): #shelltools.system("patch -p1 < openssl-1.0.0-beta4-ca-dir.patch") def install(): - autotools.rawInstall("INSTALL_PREFIX=%s MANDIR=/usr/share/man" % get.installDIR()) + 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/man3/rand.3", "ssl-rand.3") - pisitools.rename("/usr/share/man/man3/err.3", "ssl-err.3") + #pisitools.rename("/usr/share/man/man3/rand.3", "ssl-rand.3") + #pisitools.rename("/usr/share/man/man3/err.3", "ssl-err.3") if get.buildTYPE() == "_emul32": #from distutils.dir_util import copy_tree @@ -74,7 +74,7 @@ def install(): # Move engines to /usr/lib/openssl/engines pisitools.dodir("/usr/lib/openssl") - pisitools.domove("/usr/lib/engines", "/usr/lib/openssl") + #pisitools.domove("/usr/lib/engines", "/usr/lib/openssl") # Certificate stuff pisitools.dobin("tools/c_rehash") diff --git a/system/base/openssl/comar/package.py b/system/base/openssl/comar/package.py old mode 100644 new mode 100755 diff --git a/system/base/openssl/files/ca-dir.patch b/system/base/openssl/files/ca-dir.patch new file mode 100644 index 00000000..a1402435 --- /dev/null +++ b/system/base/openssl/files/ca-dir.patch @@ -0,0 +1,31 @@ +--- apps/CA.pl.in 2018-09-11 14:48:19.000000000 +0200 ++++ apps/CA.pl.in 2018-09-11 16:16:32.125629435 +0200 +@@ -33,7 +33,7 @@ + my $PKCS12 = "$openssl pkcs12"; + + # default openssl.cnf file has setup as per the following +-my $CATOP = "./demoCA"; ++my $CATOP = "/etc/ssl"; + my $CAKEY = "cakey.pem"; + my $CAREQ = "careq.pem"; + my $CACERT = "cacert.pem"; +--- apps/openssl.cnf 2018-09-11 14:48:20.000000000 +0200 ++++ apps/openssl.cnf 2018-09-11 16:16:32.125629435 +0200 +@@ -43,7 +43,7 @@ + #################################################################### + [ CA_default ] + +-dir = ./demoCA # Where everything is kept ++dir = /etc/ssl # Where everything is kept + certs = $dir/certs # Where the issued certs are kept + crl_dir = $dir/crl # Where the issued crl are kept + database = $dir/index.txt # database index file. +@@ -327,7 +327,7 @@ + [ tsa_config1 ] + + # These are used by the TSA reply generation only. +-dir = ./demoCA # TSA root directory ++dir = /etc/ssl # TSA root directory + serial = $dir/tsaserial # The current serial number (mandatory) + crypto_device = builtin # OpenSSL engine to use for signing + signer_cert = $dir/tsacert.pem # The TSA signing certificate diff --git a/system/base/openssl/files/openssl-1.0.0-beta4-ca-dir.patch b/system/base/openssl/files/openssl-1.0.0-beta4-ca-dir.patch old mode 100644 new mode 100755 diff --git a/system/base/openssl/files/openssl-1.0.2a-x32-asm.patch b/system/base/openssl/files/openssl-1.0.2a-x32-asm.patch new file mode 100644 index 00000000..3a005c9b --- /dev/null +++ b/system/base/openssl/files/openssl-1.0.2a-x32-asm.patch @@ -0,0 +1,43 @@ +https://rt.openssl.org/Ticket/Display.html?id=3759&user=guest&pass=guest + +From 6257d59b3a68d2feb9d64317a1c556dc3813ee61 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Sat, 21 Mar 2015 06:01:25 -0400 +Subject: [PATCH] crypto: use bigint in x86-64 perl + +When building on x32 systems where the default type is 32bit, make sure +we can transparently represent 64bit integers. Otherwise we end up with +build errors like: +/usr/bin/perl asm/ghash-x86_64.pl elf > ghash-x86_64.s +Integer overflow in hexadecimal number at asm/../../perlasm/x86_64-xlate.pl line 201, <> line 890. +... +ghash-x86_64.s: Assembler messages: +ghash-x86_64.s:890: Error: junk '.15473355479995e+19' after expression + +We don't enable this globally as there are some cases where we'd get +32bit values interpreted as unsigned when we need them as signed. + +Reported-by: Bertrand Jacquin +URL: https://bugs.gentoo.org/542618 +--- + crypto/perlasm/x86_64-xlate.pl | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/crypto/perlasm/x86_64-xlate.pl b/crypto/perlasm/x86_64-xlate.pl +index aae8288..0bf9774 100755 +--- a/crypto/perlasm/x86_64-xlate.pl ++++ b/crypto/perlasm/x86_64-xlate.pl +@@ -195,6 +195,10 @@ my %globals; + sub out { + my $self = shift; + ++ # When building on x32 ABIs, the expanded hex value might be too ++ # big to fit into 32bits. Enable transparent 64bit support here ++ # so we can safely print it out. ++ use bigint; + if ($gas) { + # Solaris /usr/ccs/bin/as can't handle multiplications + # in $self->{value} +-- +2.3.3 + diff --git a/system/base/openssl/files/openssl-1.1.0l-fix-no-ec2m-in-ec_curve.c.patch b/system/base/openssl/files/openssl-1.1.0l-fix-no-ec2m-in-ec_curve.c.patch new file mode 100644 index 00000000..35a435df --- /dev/null +++ b/system/base/openssl/files/openssl-1.1.0l-fix-no-ec2m-in-ec_curve.c.patch @@ -0,0 +1,30 @@ +From bcf6a94c4bc912ad313ea21abdf7e83bbae450e5 Mon Sep 17 00:00:00 2001 +From: Nicola Tuveri +Date: Thu, 12 Sep 2019 01:57:47 +0300 +Subject: [PATCH] Fix no-ec2m in ec_curve.c (1.1.0) + +I made a mistake in d4a5dac9f9242c580fb9d0a4389440eccd3494a7 and +inverted the GF2m and GFp calls in ec_point_get_affine_coordinates, this +fixes it. +--- + crypto/ec/ec_curve.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/crypto/ec/ec_curve.c b/crypto/ec/ec_curve.c +index 2d28d7f70bb..6a58b3a23e0 100644 +--- a/crypto/ec/ec_curve.c ++++ b/crypto/ec/ec_curve.c +@@ -3200,11 +3200,11 @@ int ec_point_get_affine_coordinates(const EC_GROUP *group, + + #ifndef OPENSSL_NO_EC2M + if (field_nid == NID_X9_62_characteristic_two_field) { +- return EC_POINT_get_affine_coordinates_GFp(group, point, x, y, ctx); ++ return EC_POINT_get_affine_coordinates_GF2m(group, point, x, y, ctx); + } else + #endif /* !def(OPENSSL_NO_EC2M) */ + if (field_nid == NID_X9_62_prime_field) { +- return EC_POINT_get_affine_coordinates_GF2m(group, point, x, y, ctx); ++ return EC_POINT_get_affine_coordinates_GFp(group, point, x, y, ctx); + } else { + /* this should never happen */ + return 0; diff --git a/system/base/openssl/files/openssl-1.1.1d-fix-potential-memleaks-w-BN_to_ASN1_INTEGER.patch b/system/base/openssl/files/openssl-1.1.1d-fix-potential-memleaks-w-BN_to_ASN1_INTEGER.patch new file mode 100644 index 00000000..1f195d03 --- /dev/null +++ b/system/base/openssl/files/openssl-1.1.1d-fix-potential-memleaks-w-BN_to_ASN1_INTEGER.patch @@ -0,0 +1,107 @@ +From 515c728dbaa92211d2eafb0041ab9fcd258fdc41 Mon Sep 17 00:00:00 2001 +From: Bernd Edlinger +Date: Mon, 9 Sep 2019 19:12:25 +0200 +Subject: [PATCH] Fix potential memory leaks with BN_to_ASN1_INTEGER + +Reviewed-by: Paul Dale +Reviewed-by: Matt Caswell +(Merged from https://github.com/openssl/openssl/pull/9833) + +(cherry picked from commit f28bc7d386b25fb75625d0c62c6b2e6d21de0d09) +--- + crypto/ec/ec_asn1.c | 7 +++++-- + crypto/x509v3/v3_asid.c | 26 ++++++++++++++++++++------ + 2 files changed, 25 insertions(+), 8 deletions(-) + +diff --git a/crypto/ec/ec_asn1.c b/crypto/ec/ec_asn1.c +index 1ce1181fc10..7cbf8de9813 100644 +--- a/crypto/ec/ec_asn1.c ++++ b/crypto/ec/ec_asn1.c +@@ -446,6 +446,7 @@ ECPARAMETERS *EC_GROUP_get_ecparameters(const EC_GROUP *group, + unsigned char *buffer = NULL; + const EC_POINT *point = NULL; + point_conversion_form_t form; ++ ASN1_INTEGER *orig; + + if (params == NULL) { + if ((ret = ECPARAMETERS_new()) == NULL) { +@@ -496,8 +497,9 @@ ECPARAMETERS *EC_GROUP_get_ecparameters(const EC_GROUP *group, + ECerr(EC_F_EC_GROUP_GET_ECPARAMETERS, ERR_R_EC_LIB); + goto err; + } +- ret->order = BN_to_ASN1_INTEGER(tmp, ret->order); ++ ret->order = BN_to_ASN1_INTEGER(tmp, orig = ret->order); + if (ret->order == NULL) { ++ ret->order = orig; + ECerr(EC_F_EC_GROUP_GET_ECPARAMETERS, ERR_R_ASN1_LIB); + goto err; + } +@@ -505,8 +507,9 @@ ECPARAMETERS *EC_GROUP_get_ecparameters(const EC_GROUP *group, + /* set the cofactor (optional) */ + tmp = EC_GROUP_get0_cofactor(group); + if (tmp != NULL) { +- ret->cofactor = BN_to_ASN1_INTEGER(tmp, ret->cofactor); ++ ret->cofactor = BN_to_ASN1_INTEGER(tmp, orig = ret->cofactor); + if (ret->cofactor == NULL) { ++ ret->cofactor = orig; + ECerr(EC_F_EC_GROUP_GET_ECPARAMETERS, ERR_R_ASN1_LIB); + goto err; + } +diff --git a/crypto/x509v3/v3_asid.c b/crypto/x509v3/v3_asid.c +index 089f2ae29f0..ef2d64826fb 100644 +--- a/crypto/x509v3/v3_asid.c ++++ b/crypto/x509v3/v3_asid.c +@@ -256,6 +256,7 @@ static int extract_min_max(ASIdOrRange *aor, + static int ASIdentifierChoice_is_canonical(ASIdentifierChoice *choice) + { + ASN1_INTEGER *a_max_plus_one = NULL; ++ ASN1_INTEGER *orig; + BIGNUM *bn = NULL; + int i, ret = 0; + +@@ -298,9 +299,15 @@ static int ASIdentifierChoice_is_canonical(ASIdentifierChoice *choice) + */ + if ((bn == NULL && (bn = BN_new()) == NULL) || + ASN1_INTEGER_to_BN(a_max, bn) == NULL || +- !BN_add_word(bn, 1) || +- (a_max_plus_one = +- BN_to_ASN1_INTEGER(bn, a_max_plus_one)) == NULL) { ++ !BN_add_word(bn, 1)) { ++ X509V3err(X509V3_F_ASIDENTIFIERCHOICE_IS_CANONICAL, ++ ERR_R_MALLOC_FAILURE); ++ goto done; ++ } ++ ++ if ((a_max_plus_one = ++ BN_to_ASN1_INTEGER(bn, orig = a_max_plus_one)) == NULL) { ++ a_max_plus_one = orig; + X509V3err(X509V3_F_ASIDENTIFIERCHOICE_IS_CANONICAL, + ERR_R_MALLOC_FAILURE); + goto done; +@@ -351,6 +358,7 @@ int X509v3_asid_is_canonical(ASIdentifiers *asid) + static int ASIdentifierChoice_canonize(ASIdentifierChoice *choice) + { + ASN1_INTEGER *a_max_plus_one = NULL; ++ ASN1_INTEGER *orig; + BIGNUM *bn = NULL; + int i, ret = 0; + +@@ -416,9 +424,15 @@ static int ASIdentifierChoice_canonize(ASIdentifierChoice *choice) + */ + if ((bn == NULL && (bn = BN_new()) == NULL) || + ASN1_INTEGER_to_BN(a_max, bn) == NULL || +- !BN_add_word(bn, 1) || +- (a_max_plus_one = +- BN_to_ASN1_INTEGER(bn, a_max_plus_one)) == NULL) { ++ !BN_add_word(bn, 1)) { ++ X509V3err(X509V3_F_ASIDENTIFIERCHOICE_CANONIZE, ++ ERR_R_MALLOC_FAILURE); ++ goto done; ++ } ++ ++ if ((a_max_plus_one = ++ BN_to_ASN1_INTEGER(bn, orig = a_max_plus_one)) == NULL) { ++ a_max_plus_one = orig; + X509V3err(X509V3_F_ASIDENTIFIERCHOICE_CANONIZE, + ERR_R_MALLOC_FAILURE); + goto done; diff --git a/system/base/openssl/files/openssl-1.1.1d-fix-zlib.patch b/system/base/openssl/files/openssl-1.1.1d-fix-zlib.patch new file mode 100644 index 00000000..5d2f923a --- /dev/null +++ b/system/base/openssl/files/openssl-1.1.1d-fix-zlib.patch @@ -0,0 +1,52 @@ +From 86ed78676c660b553696cc10c682962522dfeb6c Mon Sep 17 00:00:00 2001 +From: Tomas Mraz +Date: Thu, 12 Sep 2019 12:27:36 +0200 +Subject: [PATCH] BIO_f_zlib: Properly handle BIO_CTRL_PENDING and + BIO_CTRL_WPENDING calls. + +There can be data to write in output buffer and data to read that were +not yet read in the input stream. + +Fixes #9866 + +Reviewed-by: Richard Levitte +(Merged from https://github.com/openssl/openssl/pull/9877) + +(cherry picked from commit 6beb8b39ba8e4cb005c1fcd2586ba19e17f04b95) +--- + crypto/comp/c_zlib.c | 22 ++++++++++++++++++++++ + 1 file changed, 22 insertions(+) + +diff --git a/crypto/comp/c_zlib.c b/crypto/comp/c_zlib.c +index d688deee5f2..7c1be358fd7 100644 +--- a/crypto/comp/c_zlib.c ++++ b/crypto/comp/c_zlib.c +@@ -598,6 +598,28 @@ static long bio_zlib_ctrl(BIO *b, int cmd, long num, void *ptr) + BIO_copy_next_retry(b); + break; + ++ case BIO_CTRL_WPENDING: ++ if (ctx->obuf == NULL) ++ return 0; ++ ++ if (ctx->odone) { ++ ret = ctx->ocount; ++ } else { ++ ret = ctx->ocount; ++ if (ret == 0) ++ /* Unknown amount pending but we are not finished */ ++ ret = 1; ++ } ++ if (ret == 0) ++ ret = BIO_ctrl(next, cmd, num, ptr); ++ break; ++ ++ case BIO_CTRL_PENDING: ++ ret = ctx->zin.avail_in; ++ if (ret == 0) ++ ret = BIO_ctrl(next, cmd, num, ptr); ++ break; ++ + default: + ret = BIO_ctrl(next, cmd, num, ptr); + break; diff --git a/system/base/openssl/files/openssl-1.1.1d-reenable-the-stitched-AES-CBC-HMAC-SHA-implementations.patch b/system/base/openssl/files/openssl-1.1.1d-reenable-the-stitched-AES-CBC-HMAC-SHA-implementations.patch new file mode 100644 index 00000000..dc8fe714 --- /dev/null +++ b/system/base/openssl/files/openssl-1.1.1d-reenable-the-stitched-AES-CBC-HMAC-SHA-implementations.patch @@ -0,0 +1,62 @@ +From 61cc715240d2d3f9511ca88043a3e9797c11482f Mon Sep 17 00:00:00 2001 +From: Richard Levitte +Date: Thu, 3 Oct 2019 08:28:31 +0200 +Subject: [PATCH] Define AESNI_ASM if AESNI assembler is included, and use it + +Because we have cases where basic assembler support isn't present, but +AESNI asssembler support is, we need a separate macro that indicates +that, and use it. + +Reviewed-by: Tomas Mraz +Reviewed-by: Paul Dale +(Merged from https://github.com/openssl/openssl/pull/10080) +--- + Configure | 1 + + crypto/evp/e_aes_cbc_hmac_sha1.c | 2 +- + crypto/evp/e_aes_cbc_hmac_sha256.c | 4 ++-- + 3 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/Configure b/Configure +index 811bee81f54..f498ac2f81b 100755 +--- a/Configure ++++ b/Configure +@@ -1376,6 +1376,7 @@ unless ($disabled{asm}) { + } + if ($target{aes_asm_src}) { + push @{$config{lib_defines}}, "AES_ASM" if ($target{aes_asm_src} =~ m/\baes-/);; ++ push @{$config{lib_defines}}, "AESNI_ASM" if ($target{aes_asm_src} =~ m/\baesni-/);; + # aes-ctr.fake is not a real file, only indication that assembler + # module implements AES_ctr32_encrypt... + push @{$config{lib_defines}}, "AES_CTR_ASM" if ($target{aes_asm_src} =~ s/\s*aes-ctr\.fake//); +diff --git a/crypto/evp/e_aes_cbc_hmac_sha1.c b/crypto/evp/e_aes_cbc_hmac_sha1.c +index c9f5969162c..27c36b46e7a 100644 +--- a/crypto/evp/e_aes_cbc_hmac_sha1.c ++++ b/crypto/evp/e_aes_cbc_hmac_sha1.c +@@ -33,7 +33,7 @@ typedef struct { + + #define NO_PAYLOAD_LENGTH ((size_t)-1) + +-#if defined(AES_ASM) && ( \ ++#if defined(AESNI_ASM) && ( \ + defined(__x86_64) || defined(__x86_64__) || \ + defined(_M_AMD64) || defined(_M_X64) ) + +diff --git a/crypto/evp/e_aes_cbc_hmac_sha256.c b/crypto/evp/e_aes_cbc_hmac_sha256.c +index d5178313ae3..cc622b6faa8 100644 +--- a/crypto/evp/e_aes_cbc_hmac_sha256.c ++++ b/crypto/evp/e_aes_cbc_hmac_sha256.c +@@ -34,7 +34,7 @@ typedef struct { + + # define NO_PAYLOAD_LENGTH ((size_t)-1) + +-#if defined(AES_ASM) && ( \ ++#if defined(AESNI_ASM) && ( \ + defined(__x86_64) || defined(__x86_64__) || \ + defined(_M_AMD64) || defined(_M_X64) ) + +@@ -947,4 +947,4 @@ const EVP_CIPHER *EVP_aes_256_cbc_hmac_sha256(void) + { + return NULL; + } +-#endif ++#endif /* AESNI_ASM */ diff --git a/system/base/openssl/files/openssl-alpha-ccc.patch b/system/base/openssl/files/openssl-alpha-ccc.patch old mode 100644 new mode 100755 diff --git a/system/base/openssl/files/openssl-asflag.patch b/system/base/openssl/files/openssl-asflag.patch old mode 100644 new mode 100755 diff --git a/system/base/openssl/files/openssl-c_rehash.sh b/system/base/openssl/files/openssl-c_rehash.sh old mode 100644 new mode 100755 diff --git a/system/base/openssl/files/openssl-ca-certificates.patch b/system/base/openssl/files/openssl-ca-certificates.patch old mode 100644 new mode 100755 diff --git a/system/base/openssl/files/openssl-find.patch b/system/base/openssl/files/openssl-find.patch old mode 100644 new mode 100755 diff --git a/system/base/openssl/files/openssl-include.patch b/system/base/openssl/files/openssl-include.patch old mode 100644 new mode 100755 diff --git a/system/base/openssl/files/openssl-ldflags.patch b/system/base/openssl/files/openssl-ldflags.patch old mode 100644 new mode 100755 diff --git a/system/base/openssl/files/openssl-man-namespace.patch b/system/base/openssl/files/openssl-man-namespace.patch old mode 100644 new mode 100755 diff --git a/system/base/openssl/files/openssl-optflags.patch b/system/base/openssl/files/openssl-optflags.patch old mode 100644 new mode 100755 diff --git a/system/base/openssl/files/openssl-ssl-certificate.sh b/system/base/openssl/files/openssl-ssl-certificate.sh old mode 100644 new mode 100755 diff --git a/system/base/openssl/files/openssl_fix_for_x32.patch b/system/base/openssl/files/openssl_fix_for_x32.patch old mode 100644 new mode 100755 diff --git a/system/base/openssl/files/pic.patch b/system/base/openssl/files/pic.patch old mode 100644 new mode 100755 diff --git a/system/base/openssl/pspec.xml b/system/base/openssl/pspec.xml old mode 100644 new mode 100755 index cf827893..70bba91c --- a/system/base/openssl/pspec.xml +++ b/system/base/openssl/pspec.xml @@ -13,10 +13,10 @@ 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.0.2q.tar.gz + https://www.openssl.org/source/openssl-1.1.1d.tar.gz - openssl-1.0.0-beta4-ca-dir.patch - + + zlib-devel @@ -25,16 +25,22 @@ sed - openssl-alpha-ccc.patch - openssl-optflags.patch - openssl-include.patch - openssl-man-namespace.patch - openssl-asflag.patch + + + + + + + openssl-1.0.2a-x32-asm.patch + + openssl-1.1.1d-fix-potential-memleaks-w-BN_to_ASN1_INTEGER.patch + openssl-1.1.1d-fix-zlib.patch + openssl-1.1.1d-reenable-the-stitched-AES-CBC-HMAC-SHA-implementations.patch @@ -92,6 +98,13 @@ + + 2019-12-23 + 1.1.1d + Version bump. + Idris Kalp + idriskalp@gmail.com + 2018-11-28 1.0.2q diff --git a/system/base/openssl/translations.xml b/system/base/openssl/translations.xml old mode 100644 new mode 100755 From 27b795f28ada917faf8a659eb402686b951c0bfb Mon Sep 17 00:00:00 2001 From: idriskalp Date: Mon, 23 Dec 2019 04:28:47 +0300 Subject: [PATCH 19/25] libssh2 1.9.0 --- system/base/libssh2/pspec.xml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/system/base/libssh2/pspec.xml b/system/base/libssh2/pspec.xml index cbaefbe4..1ee01d3a 100644 --- a/system/base/libssh2/pspec.xml +++ b/system/base/libssh2/pspec.xml @@ -12,7 +12,7 @@ library A library implementing the SSH2 protocol libssh2 is a library implementing the SSH2 protocol as defined by Internet Drafts: SECSH-TRANS, SECSH-USERAUTH, SECSH-CONNECTION, SECSH-ARCH, SECSH-FILEXFER, SECSH-DHGEX, SECSH-NUMBERS, and SECSH-PUBLICKEY. - https://www.libssh2.org/download/libssh2-1.8.0.tar.gz + https://www.libssh2.org/download/libssh2-1.9.0.tar.gz openssl-devel zlib-devel @@ -37,6 +37,8 @@ Development files for libssh2 libssh2 + openssl-devel + zlib-devel /usr/include @@ -46,6 +48,13 @@ + + 2019-12-23 + 1.9.0 + Version bump + Idris Kalp + idriskalp@gmail.com + 2018-07-15 1.8.0 From 55b9e548f1ef4e9fb4a3a254938b2dffeceaee83 Mon Sep 17 00:00:00 2001 From: idriskalp Date: Mon, 23 Dec 2019 18:21:19 +0300 Subject: [PATCH 20/25] libidn2 2.3.0 --- system/base/libidn2/actions.py | 8 ++++++-- system/base/libidn2/pspec.xml | 9 ++++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/system/base/libidn2/actions.py b/system/base/libidn2/actions.py index 2b676a76..aa743203 100644 --- a/system/base/libidn2/actions.py +++ b/system/base/libidn2/actions.py @@ -15,7 +15,8 @@ def setup(): --disable-csharp \ --disable-rpath \ --disable-gtk-doc \ - --disable-static" + --disable-static \ + --without-libunistring-prefix" if get.buildTYPE() == "emul32": options += " --bindir=/emul32/bin" @@ -28,7 +29,10 @@ def build(): autotools.make() def check(): - autotools.make("-C tests check") + if get.buildTYPE() != "emul32": + autotools.make("-C tests check") + else: + shelltools.system("echo 'No test in emul32'") def install(): autotools.rawInstall("DESTDIR=%s" % get.installDIR()) diff --git a/system/base/libidn2/pspec.xml b/system/base/libidn2/pspec.xml index 4ce60e9a..66cc8b62 100644 --- a/system/base/libidn2/pspec.xml +++ b/system/base/libidn2/pspec.xml @@ -14,7 +14,7 @@ library Internationalized Domain Names (IDN) implementation GNU Libidn is an implementation of the Stringprep, Punycode and IDNA specifications defined by the IETF Internationalized Domain Names (IDN) working group, used for internationalized domain names. The C library is available under the GNU Lesser General Public License. - http://ftp.gnu.org/gnu/libidn/libidn2-2.0.4.tar.gz + http://ftp.gnu.org/gnu/libidn/libidn2-2.3.0.tar.gz @@ -64,6 +64,13 @@ + + 2019-12-23 + 2.3.0 + Version bump + Idris Kalp + idriskalp@gmail.com + 2018-07-15 2.0.4 From e4a8fb2381e773265bc27c2936193f70208ac65b Mon Sep 17 00:00:00 2001 From: idriskalp Date: Mon, 23 Dec 2019 18:25:48 +0300 Subject: [PATCH 21/25] curl 7.67.0 --- system/base/curl/actions.py | 2 +- system/base/curl/pspec.xml | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/system/base/curl/actions.py b/system/base/curl/actions.py index e6316ab3..5259b331 100644 --- a/system/base/curl/actions.py +++ b/system/base/curl/actions.py @@ -53,4 +53,4 @@ def check(): def install(): autotools.rawInstall("DESTDIR=%s" % get.installDIR()) - pisitools.dodoc("CHANGES", "docs/FEATURES", "docs/MANUAL", "docs/FAQ", "docs/BUGS") + pisitools.dodoc("CHANGES", "docs/FEATURES", "docs/FAQ", "docs/BUGS") diff --git a/system/base/curl/pspec.xml b/system/base/curl/pspec.xml index dde828e0..8e4467ee 100644 --- a/system/base/curl/pspec.xml +++ b/system/base/curl/pspec.xml @@ -14,7 +14,7 @@ library A utility for getting files from remote servers curl is a command line tool for transferring data with URL syntax, supporting various protocols. - http://curl.haxx.se/download/curl-7.52.1.tar.bz2 + http://curl.haxx.se/download/curl-7.67.0.tar.bz2 glibc-devel zlib-devel @@ -64,6 +64,13 @@ + + 2019-12-23 + 7.67.0 + Version bump + Idris Kalp + idriskalp@gmail.com + 2018-07-15 7.52.1 From 7ad33dea495abbff55592e726d23944bdb5672ee Mon Sep 17 00:00:00 2001 From: idriskalp Date: Mon, 23 Dec 2019 18:28:07 +0300 Subject: [PATCH 22/25] pycurl 7.43.0.2 --- system/base/pycurl/pspec.xml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/system/base/pycurl/pspec.xml b/system/base/pycurl/pspec.xml index e617ebd7..f89c79f6 100644 --- a/system/base/pycurl/pspec.xml +++ b/system/base/pycurl/pspec.xml @@ -12,7 +12,7 @@ library Python cURL Module PycURL is a Python interface to libcurl. PycURL can be used to fetch objects identified by a URL from a Python program. - https://dl.bintray.com/pycurl/pycurl/pycurl-7.43.0.tar.gz + https://dl.bintray.com/pycurl/pycurl/pycurl-7.43.0.2.tar.gz curl-devel python-devel @@ -34,6 +34,13 @@ + + 2019-12-23 + 7.43.0.2 + Version bump + Idris Kalp + idriskalp@gmail.com + 2018-07-15 7.43.0 From a14c1d81b0e23d6617af3be0b31d622c37714c85 Mon Sep 17 00:00:00 2001 From: idriskalp Date: Mon, 23 Dec 2019 18:30:31 +0300 Subject: [PATCH 23/25] urlgrabber 4.0.0 --- system/base/urlgrabber/pspec.xml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/system/base/urlgrabber/pspec.xml b/system/base/urlgrabber/pspec.xml index 7bbcd1b9..728a8d7f 100644 --- a/system/base/urlgrabber/pspec.xml +++ b/system/base/urlgrabber/pspec.xml @@ -12,7 +12,7 @@ library High level cross-protocol url-grabber library for Python urlgrabber provides a clean library interface to protocol-independant file-access for Python programs - http://urlgrabber.baseurl.org/download/urlgrabber-3.10.1.tar.gz + http://urlgrabber.baseurl.org/download/urlgrabber-4.0.0.tar.gz python @@ -32,6 +32,13 @@ + + 2019-12-23 + 4.0.0 + Version bump + Idris Kalp + idriskalp@gmail.com + 2018-07-15 3.10.1 From d2d0d62b004f41a036650b28fd554c8d7a6d151e Mon Sep 17 00:00:00 2001 From: idriskalp Date: Mon, 23 Dec 2019 18:35:50 +0300 Subject: [PATCH 24/25] python rebuild --- system/base/python/actions.py | 15 +++++---------- system/base/python/pspec.xml | 1 - 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/system/base/python/actions.py b/system/base/python/actions.py index c4089504..fe07cfc6 100644 --- a/system/base/python/actions.py +++ b/system/base/python/actions.py @@ -16,19 +16,13 @@ WorkDir = "Python-%s" % get.srcVERSION() PythonVersion = "2.7" def setup(): - shelltools.system("echo -e '\033[0;36mBuilding OpenSSL\033[0m' ") - shelltools.cd("openssl-1.1.1d") - shelltools.system("./Configure --prefix=%s/temp --openssldir=%s/temp/etc/ssl --libdir=lib no-shared linux-x86_64 -Wa,--noexecstack" %(get.workDIR(), get.workDIR())) - autotools.make() - autotools.make("install") - shelltools.cd("..") shelltools.system("echo -e '\033[0;36mBuilding Bzip2\033[0m' ") + shelltools.makedirs("%s/temp/lib" %get.workDIR()) shelltools.cd("bzip2-1.0.8") autotools.make('CC=%s AR=%s RANLIB=%s CFLAGS="%s -D_FILE_OFFSET_BITS=64 -fPIC" libbz2.a' % (get.CC(), get.AR(), get.RANLIB(), get.CFLAGS())) - shelltools.system("cp libbz2.a %s/temp/lib" % get.workDIR()) + shelltools.system("cp libbz2.a %s/temp/lib/libbz2.a" % get.workDIR()) shelltools.cd("..") - pisitools.cflags.add("-fwrapv") # no rpath @@ -41,9 +35,10 @@ def setup(): for dir in ["expat","zlib","_ctypes/libffi_arm_wince","_ctypes/libffi_msvc", "_ctypes/libffi_osx","_ctypes/libffi","_ctypes/darwin"]: shelltools.unlinkDir("Modules/%s" % dir) - + shelltools.export("CFLAGS", "-I%s/temp/include -O3" %get.workDIR()) - shelltools.export("LDFLAGS", "-L%s/temp/lib -lssl -lcrypto -lbz2 -lpthread -ldl" %get.workDIR()) + shelltools.export("LDFLAGS", "-L%s/temp/lib -lbz2 -lpthread -ldl" %get.workDIR()) + autotools.autoreconf("-vif") # disable bsddb diff --git a/system/base/python/pspec.xml b/system/base/python/pspec.xml index 163dc956..8a33c314 100755 --- a/system/base/python/pspec.xml +++ b/system/base/python/pspec.xml @@ -13,7 +13,6 @@ An interpreted, interactive, object-orientated programming language 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.17/Python-2.7.17.tar.xz - ftp://ftp.openssl.org/source/openssl-1.1.1d.tar.gz https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz bzip2 From 2d0f9b07ec53940fcb200492de6a78b06a3a4a64 Mon Sep 17 00:00:00 2001 From: idriskalp Date: Mon, 23 Dec 2019 18:44:30 +0300 Subject: [PATCH 25/25] python3 3.8.1 --- system/base/python3/actions.py | 12 +++++++++++- system/base/python3/pspec.xml | 10 +++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/system/base/python3/actions.py b/system/base/python3/actions.py index 0ecf005d..36c42ec9 100644 --- a/system/base/python3/actions.py +++ b/system/base/python3/actions.py @@ -9,6 +9,13 @@ from pisi.actionsapi import pisitools from pisi.actionsapi import shelltools def setup(): + shelltools.system("echo -e '\033[0;36mBuilding Bzip2\033[0m' ") + shelltools.makedirs("%s/temp/lib" %get.workDIR()) + shelltools.cd("bzip2-1.0.8") + autotools.make('CC=%s AR=%s RANLIB=%s CFLAGS="%s -D_FILE_OFFSET_BITS=64 -fPIC" libbz2.a' % (get.CC(), get.AR(), get.RANLIB(), get.CFLAGS())) + shelltools.system("cp libbz2.a %s/temp/lib/libbz2.a" % get.workDIR()) + shelltools.cd("..") + pisitools.flags.add("-fwrapv") pisitools.dosed("Lib/cgi.py","^#.* /usr/local/bin/python","#!/usr/bin/python") @@ -20,7 +27,10 @@ def setup(): #shelltools.unlinkDir("Modules/_ctypes/libffi_msvc") shelltools.unlinkDir("Modules/_ctypes/libffi_osx") #shelltools.unlinkDir("Modules/_decimal/libmpdec") - + + shelltools.export("CFLAGS", "-I%s/temp/include -O3" %get.workDIR()) + shelltools.export("LDFLAGS", "-L%s/temp/lib -lbz2 -lpthread -ldl" %get.workDIR()) + autotools.rawConfigure("\ --prefix=/usr \ --enable-shared \ diff --git a/system/base/python3/pspec.xml b/system/base/python3/pspec.xml index b7210985..b98d505a 100644 --- a/system/base/python3/pspec.xml +++ b/system/base/python3/pspec.xml @@ -12,7 +12,8 @@ programming.language Next generation of the python high-level scripting language Next generation of the python high-level scripting language - https://www.python.org/ftp/python/3.8.0/Python-3.8.0.tar.xz + https://www.python.org/ftp/python/3.8.1/Python-3.8.1.tar.xz + https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz bzip2 @@ -123,6 +124,13 @@ + + 2019-12-23 + 3.8.1 + Version bump + Idris Kalp + idriskalp@gmail.com + 2019-12-10 3.8.0