diff options
Diffstat (limited to 'source')
-rwxr-xr-x | source/a/aaa_libraries/aaa_libraries.SlackBuild | 2 | ||||
-rw-r--r-- | source/a/aaa_libraries/symlinks-to-tracked-libs | 2 | ||||
-rwxr-xr-x | source/ap/at/at.SlackBuild | 2 | ||||
-rw-r--r-- | source/l/expat/178d26f50af21ec23d6e43814b9b602590b5865c.patch | 115 | ||||
-rw-r--r-- | source/l/expat/5c168279c5ad4668e5e48fe13374fe7a7de4b573.patch | 75 | ||||
-rw-r--r-- | source/l/expat/5f100ffa78b74da8020b71d1582a8979193c1359.patch | 45 | ||||
-rwxr-xr-x | source/l/expat/expat.SlackBuild | 8 | ||||
-rwxr-xr-x | source/l/lcms2/lcms2.SlackBuild | 10 |
8 files changed, 10 insertions, 249 deletions
diff --git a/source/a/aaa_libraries/aaa_libraries.SlackBuild b/source/a/aaa_libraries/aaa_libraries.SlackBuild index d4f71f8fc..5203eb1d1 100755 --- a/source/a/aaa_libraries/aaa_libraries.SlackBuild +++ b/source/a/aaa_libraries/aaa_libraries.SlackBuild @@ -23,7 +23,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=aaa_libraries VERSION=${VERSION:-15.0} -BUILD=${BUILD:-18} +BUILD=${BUILD:-19} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/a/aaa_libraries/symlinks-to-tracked-libs b/source/a/aaa_libraries/symlinks-to-tracked-libs index 446349744..064b41705 100644 --- a/source/a/aaa_libraries/symlinks-to-tracked-libs +++ b/source/a/aaa_libraries/symlinks-to-tracked-libs @@ -58,7 +58,7 @@ /usr/lib/libidn.so.12 /usr/lib/libidn2.so.0 /usr/lib/libjpeg.so.62 -/usr/lib/libjson-c.so.4 +/usr/lib/libjson-c.so.5 /usr/lib/libturbojpeg.so.0 /usr/lib/liblber-2.4.so.2 /usr/lib/libldap-2.4.so.2 diff --git a/source/ap/at/at.SlackBuild b/source/ap/at/at.SlackBuild index caf048316..60b0254d0 100755 --- a/source/ap/at/at.SlackBuild +++ b/source/ap/at/at.SlackBuild @@ -84,7 +84,7 @@ CFLAGS="$SLKCFLAGS" \ # Does not like parallel builds: make || exit 1 -make install IROOT=$PKG || exit +make install DESTDIR=$PKG || exit mv $PKG/etc/at.deny $PKG/etc/at.deny.new chown root:root $PKG/var $PKG/var/spool diff --git a/source/l/expat/178d26f50af21ec23d6e43814b9b602590b5865c.patch b/source/l/expat/178d26f50af21ec23d6e43814b9b602590b5865c.patch deleted file mode 100644 index c2b55ca85..000000000 --- a/source/l/expat/178d26f50af21ec23d6e43814b9b602590b5865c.patch +++ /dev/null @@ -1,115 +0,0 @@ -From 847a645152f5ebc10ac63b74b604d0c1a79fae40 Mon Sep 17 00:00:00 2001 -From: Samanta Navarro <ferivoz@riseup.net> -Date: Sat, 22 Jan 2022 17:48:00 +0100 -Subject: [PATCH 1/3] lib: Detect and prevent integer overflow in XML_GetBuffer - (CVE-2022-23852) - ---- - expat/lib/xmlparse.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c -index d54af683..5ce31402 100644 ---- a/expat/lib/xmlparse.c -+++ b/expat/lib/xmlparse.c -@@ -2067,6 +2067,11 @@ XML_GetBuffer(XML_Parser parser, int len) { - keep = (int)EXPAT_SAFE_PTR_DIFF(parser->m_bufferPtr, parser->m_buffer); - if (keep > XML_CONTEXT_BYTES) - keep = XML_CONTEXT_BYTES; -+ /* Detect and prevent integer overflow */ -+ if (keep > INT_MAX - neededSize) { -+ parser->m_errorCode = XML_ERROR_NO_MEMORY; -+ return NULL; -+ } - neededSize += keep; - #endif /* defined XML_CONTEXT_BYTES */ - if (neededSize - -From acf956f14bf79a5e6383a969aaffec98bfbc2e44 Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping <sebastian@pipping.org> -Date: Sun, 23 Jan 2022 18:17:04 +0100 -Subject: [PATCH 2/3] tests: Cover integer overflow in XML_GetBuffer - (CVE-2022-23852) - ---- - expat/tests/runtests.c | 27 +++++++++++++++++++++++++++ - 1 file changed, 27 insertions(+) - -diff --git a/expat/tests/runtests.c b/expat/tests/runtests.c -index e89e8220..579dad1a 100644 ---- a/expat/tests/runtests.c -+++ b/expat/tests/runtests.c -@@ -3847,6 +3847,30 @@ START_TEST(test_get_buffer_2) { - } - END_TEST - -+/* Test for signed integer overflow CVE-2022-23852 */ -+#if defined(XML_CONTEXT_BYTES) -+START_TEST(test_get_buffer_3_overflow) { -+ XML_Parser parser = XML_ParserCreate(NULL); -+ assert(parser != NULL); -+ -+ const char *const text = "\n"; -+ const int expectedKeepValue = (int)strlen(text); -+ -+ // After this call, variable "keep" in XML_GetBuffer will -+ // have value expectedKeepValue -+ if (XML_Parse(parser, text, (int)strlen(text), XML_FALSE /* isFinal */) -+ == XML_STATUS_ERROR) -+ xml_failure(parser); -+ -+ assert(expectedKeepValue > 0); -+ if (XML_GetBuffer(parser, INT_MAX - expectedKeepValue + 1) != NULL) -+ fail("enlarging buffer not failed"); -+ -+ XML_ParserFree(parser); -+} -+END_TEST -+#endif // defined(XML_CONTEXT_BYTES) -+ - /* Test position information macros */ - START_TEST(test_byte_info_at_end) { - const char *text = "<doc></doc>"; -@@ -11731,6 +11755,9 @@ make_suite(void) { - tcase_add_test(tc_basic, test_empty_parse); - tcase_add_test(tc_basic, test_get_buffer_1); - tcase_add_test(tc_basic, test_get_buffer_2); -+#if defined(XML_CONTEXT_BYTES) -+ tcase_add_test(tc_basic, test_get_buffer_3_overflow); -+#endif - tcase_add_test(tc_basic, test_byte_info_at_end); - tcase_add_test(tc_basic, test_byte_info_at_error); - tcase_add_test(tc_basic, test_byte_info_at_cdata); - -From 99cec436fbd9444f57ee74ca8ae4c0a13e561a4f Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping <sebastian@pipping.org> -Date: Sat, 22 Jan 2022 17:49:17 +0100 -Subject: [PATCH 3/3] Changes: Document CVE-2022-23852 - ---- - expat/Changes | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/expat/Changes b/expat/Changes -index 7540d38c..64d75d05 100644 ---- a/expat/Changes -+++ b/expat/Changes -@@ -2,6 +2,18 @@ NOTE: We are looking for help with a few things: - https://github.com/libexpat/libexpat/labels/help%20wanted - If you can help, please get in touch. Thanks! - -+Release x.x.x xxx xxxxxxx xx xxxx -+ Security fixes: -+ #550 CVE-2022-23852 -- Fix signed integer overflow -+ (undefined behavior) in function XML_GetBuffer -+ (that is also called by function XML_Parse internally) -+ for when XML_CONTEXT_BYTES is defined to >0 (which is both -+ common and default). -+ Impact is denial of service or more. -+ -+ Special thanks to: -+ Samanta Navarro -+ - Release 2.4.3 Sun January 16 2022 - Security fixes: - #531 #534 CVE-2021-45960 -- Fix issues with left shifts by >=29 places diff --git a/source/l/expat/5c168279c5ad4668e5e48fe13374fe7a7de4b573.patch b/source/l/expat/5c168279c5ad4668e5e48fe13374fe7a7de4b573.patch deleted file mode 100644 index da0875ab7..000000000 --- a/source/l/expat/5c168279c5ad4668e5e48fe13374fe7a7de4b573.patch +++ /dev/null @@ -1,75 +0,0 @@ -From ede41d1e186ed2aba88a06e84cac839b770af3a1 Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping <sebastian@pipping.org> -Date: Wed, 26 Jan 2022 02:36:43 +0100 -Subject: [PATCH 1/2] lib: Prevent integer overflow in doProlog - (CVE-2022-23990) - -The change from "int nameLen" to "size_t nameLen" -addresses the overflow on "nameLen++" in code -"for (; name[nameLen++];)" right above the second -change in the patch. ---- - expat/lib/xmlparse.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c -index 5ce31402..d1d17005 100644 ---- a/expat/lib/xmlparse.c -+++ b/expat/lib/xmlparse.c -@@ -5372,7 +5372,7 @@ doProlog(XML_Parser parser, const ENCODING *enc, const char *s, const char *end, - if (dtd->in_eldecl) { - ELEMENT_TYPE *el; - const XML_Char *name; -- int nameLen; -+ size_t nameLen; - const char *nxt - = (quant == XML_CQUANT_NONE ? next : next - enc->minBytesPerChar); - int myindex = nextScaffoldPart(parser); -@@ -5388,7 +5388,13 @@ doProlog(XML_Parser parser, const ENCODING *enc, const char *s, const char *end, - nameLen = 0; - for (; name[nameLen++];) - ; -- dtd->contentStringLen += nameLen; -+ -+ /* Detect and prevent integer overflow */ -+ if (nameLen > UINT_MAX - dtd->contentStringLen) { -+ return XML_ERROR_NO_MEMORY; -+ } -+ -+ dtd->contentStringLen += (unsigned)nameLen; - if (parser->m_elementDeclHandler) - handleDefault = XML_FALSE; - } - -From 6e3449594fb2f61c92fc561f51f82196fdd15d63 Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping <sebastian@pipping.org> -Date: Wed, 26 Jan 2022 02:51:39 +0100 -Subject: [PATCH 2/2] Changes: Document CVE-2022-23990 - ---- - expat/Changes | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/expat/Changes b/expat/Changes -index 5ff5da5e..ec1f7604 100644 ---- a/expat/Changes -+++ b/expat/Changes -@@ -10,12 +10,18 @@ Release x.x.x xxx xxxxxxx xx xxxx - for when XML_CONTEXT_BYTES is defined to >0 (which is both - common and default). - Impact is denial of service or more. -+ #551 CVE-2022-23990 -- Fix unsigned integer overflow in function -+ doProlog triggered by large content in element type -+ declarations when there is an element declaration handler -+ present (from a prior call to XML_SetElementDeclHandler). -+ Impact is denial of service or more. - - Bug fixes: - #544 #545 xmlwf: Fix a memory leak on output file opening error - - Special thanks to: - hwt0415 -+ Roland Illig - Samanta Navarro - and - Clang LeakSan and the Clang team diff --git a/source/l/expat/5f100ffa78b74da8020b71d1582a8979193c1359.patch b/source/l/expat/5f100ffa78b74da8020b71d1582a8979193c1359.patch deleted file mode 100644 index 59404f309..000000000 --- a/source/l/expat/5f100ffa78b74da8020b71d1582a8979193c1359.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 85a6f8fcdb2bc1530934f8cf684bdab86f1f2a1c Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping <sebastian@pipping.org> -Date: Thu, 20 Jan 2022 04:41:47 +0100 -Subject: [PATCH] xmlwf: Fix a memory leak on output file opening error - ---- - expat/Changes | 6 ++++++ - expat/xmlwf/xmlwf.c | 4 ++-- - 2 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/expat/Changes b/expat/Changes -index 64d75d05..5ff5da5e 100644 ---- a/expat/Changes -+++ b/expat/Changes -@@ -11,8 +11,14 @@ Release x.x.x xxx xxxxxxx xx xxxx - common and default). - Impact is denial of service or more. - -+ Bug fixes: -+ #544 #545 xmlwf: Fix a memory leak on output file opening error -+ - Special thanks to: -+ hwt0415 - Samanta Navarro -+ and -+ Clang LeakSan and the Clang team - - Release 2.4.3 Sun January 16 2022 - Security fixes: -diff --git a/expat/xmlwf/xmlwf.c b/expat/xmlwf/xmlwf.c -index 29118bb6..b6f300b0 100644 ---- a/expat/xmlwf/xmlwf.c -+++ b/expat/xmlwf/xmlwf.c -@@ -1175,9 +1175,9 @@ tmain(int argc, XML_Char **argv) { - if (! userData.fp) { - tperror(outName); - exitCode = XMLWF_EXIT_OUTPUT_ERROR; -+ free(outName); -+ XML_ParserFree(parser); - if (continueOnError) { -- free(outName); -- cleanupUserData(&userData); - continue; - } else { - break; diff --git a/source/l/expat/expat.SlackBuild b/source/l/expat/expat.SlackBuild index 3a26b2b9a..167c9c5c6 100755 --- a/source/l/expat/expat.SlackBuild +++ b/source/l/expat/expat.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008, 2009, 2010, 2011, 2013, 2017, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2011, 2013, 2017, 2018, 2022 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=expat VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -74,10 +74,6 @@ chown -R root:root . find . -perm 777 -exec chmod 755 {} \+ find . -perm 664 -exec chmod 644 {} \+ -zcat $CWD/178d26f50af21ec23d6e43814b9b602590b5865c.patch.gz | patch -p2 --verbose || exit 1 -zcat $CWD/5f100ffa78b74da8020b71d1582a8979193c1359.patch.gz | patch -p2 --verbose || exit 1 -zcat $CWD/5c168279c5ad4668e5e48fe13374fe7a7de4b573.patch.gz | patch -p2 --verbose || exit 1 - CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/source/l/lcms2/lcms2.SlackBuild b/source/l/lcms2/lcms2.SlackBuild index 64a22a5f6..6151d9e7a 100755 --- a/source/l/lcms2/lcms2.SlackBuild +++ b/source/l/lcms2/lcms2.SlackBuild @@ -25,8 +25,8 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=lcms2 -VERSION=${VERSION:-$(echo Little-CMS-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -79,9 +79,9 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf Little-CMS-${VERSION} -tar xvf $CWD/Little-CMS-$VERSION.tar.?z || exit 1 -cd Little-CMS-${VERSION} || exit 1 +rm -rf ${PKGNAM}-${VERSION} +tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z || exit 1 +cd ${PKGNAM}-${VERSION} || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ |