diff options
Diffstat (limited to 'dev-libs')
19 files changed, 96 insertions, 657 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz Binary files differindex fcbe76ae13b0..39c07c026b6f 100644 --- a/dev-libs/Manifest.gz +++ b/dev-libs/Manifest.gz diff --git a/dev-libs/apr-util/Manifest b/dev-libs/apr-util/Manifest index e4322c441f21..e2f4c585d227 100644 --- a/dev-libs/apr-util/Manifest +++ b/dev-libs/apr-util/Manifest @@ -1,8 +1,6 @@ AUX apr-util-1.5.3-sysroot.patch 1234 BLAKE2B 58e66e338ae936b7c206eda88a97f99785a88d79c32245c4c028f00b98a33d3f29764f66646e486d828d8cc655cbe59813236b7c5ca7060643771e4ab9b915c6 SHA512 44ee2a9cf61587f05d43976d40023f6313b310c3eeb37299840445e3faec7f0352367875f515b21d3b1fcdc8c082d8584a21cf8187deb1f6f69187c14f84f0b7 AUX apr-util-1.6.1-drop-my_init.patch 355 BLAKE2B c97c7cca701b5d6b0ffd4b4ef9842d3d564302dc949bc3b7dfad8777156006397a5941babc8228ec2faac5fc8e9530725620bc79913cdf0ac98e0cccedbb3300 SHA512 65afe683785958d66c78cf0d57fbe8fdd3170402e6a24cd6293940aef0d6bb7597b67b890a2cce316cd077663071a64dbeaa4b543fde3cdde2e7c734354d08fb -AUX apr-util-1.6.1-fix-gdbm-error-handling.patch 2272 BLAKE2B ca68b87d6f19614cfb18e1df4fe0122fbf08167de7781fb58ae0219f766c1795109ee050b2900daf63e597a455c647f5da274e90aa0e4a436e8c87c19f962c45 SHA512 9f246ff853407fe59d135481c9afff6b3ef26c753c41b52134dde44df269e25c1f3249980994a000b24417f30692bf62a044d450a47af259cdfb76fbb6b70b8d AUX apr-util-1.6.1-libtool.patch 533 BLAKE2B d942a897aaeeb543e4dbb4fbaac7b54f4ac0e6791a65fcf8d9c343b99f32f2a67ba8a19eee5277a711d7851ca139a5bed81f7a13dc3c72948f49e58fdacc8aea SHA512 6df7d11aedffef6f6147adf08b7e008e1c0d0a142b9abd6c4f7bed2df6a2c44131a629ee74c9a16e613dba62d27106ea137758981456b509055a437765795b04 -AUX apr-util-1.6.1-mariadb-support.patch 4929 BLAKE2B 9f8a06e657386f5f773642f36f0897bba5e55270e860f2f1edc86ebe44214395a64e70c3f984f324328a8f7a6276c86cb46caca16719ab3ad51aff995868818f SHA512 edd5e1cd7d31e7bfb1b166c162ad8c69c704c8e9a09e85770df3b625ed918ed52918a16728a9b4d69370ccc75ade32dd64ef73b31ce6e8dac7a360fe44ca34e7 AUX apr-util-1.6.1-my_bool.patch 311 BLAKE2B c0fdf523983dc75ff977c8f602678cdd7d0b3e539fc266891e2266fa3b60e0971e93d77f2e28ed95959d8ca62bca4f9f566fefea525c845d49ce545ee6b5a99a SHA512 ed7d7857be8b5d29cc17a7216c1b06134798eb5129d50389bb0d5484a46e19e3169f8cea80cab7f845548e528a2cd9909b72016a7216b402092ae15879db792c AUX apr-util-1.6.3-fix-pkgconfig-libs.patch 982 BLAKE2B f18aa34a3fa0766020ead08b946847bbd8647c7be3485fe78cdff71f742b335969d1065c5ecc8f91f098fb705e616fe78b2c9581aab3770dd736f2d7a36ca732 SHA512 eb1e98d1db892656990ddfc6757e138264790ca37f981d580c0ff16a6e01288a0214898c014ff5c8fbe8ca2eb2df98b17bf3ae61046ae12d20f3ca84f91494a5 DIST apr-util-1.6.3.tar.bz2 432692 BLAKE2B 5eb56c45ba9d87ff3e3769439a3a9a858a1947de68b34892c729f39736fc41117a41c630c3c4cfb07b444c4ee0d5853ec5be158e8fa0b0c0ab89f0cb51cc9c6d SHA512 8050a481eeda7532ef3751dbd8a5aa6c48354d52904a856ef9709484f4b0cc2e022661c49ddf55ec58253db22708ee0607dfa7705d9270e8fee117ae4f06a0fe diff --git a/dev-libs/apr-util/files/apr-util-1.6.1-fix-gdbm-error-handling.patch b/dev-libs/apr-util/files/apr-util-1.6.1-fix-gdbm-error-handling.patch deleted file mode 100644 index 92a4738e66a5..000000000000 --- a/dev-libs/apr-util/files/apr-util-1.6.1-fix-gdbm-error-handling.patch +++ /dev/null @@ -1,79 +0,0 @@ -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=889170 -# needs to be submitted upstream ---- apr-util.orig/dbm/apr_dbm_gdbm.c -+++ apr-util/dbm/apr_dbm_gdbm.c -@@ -36,13 +36,22 @@ - static apr_status_t g2s(int gerr) - { - if (gerr == -1) { -- /* ### need to fix this */ -- return APR_EGENERAL; -+ return APR_OS_START_USEERR + gdbm_errno; - } - - return APR_SUCCESS; - } - -+static apr_status_t gdat2s(datum d) -+{ -+ if (d.dptr == NULL) { -+ return APR_OS_START_USEERR + gdbm_errno; -+ } -+ -+ return APR_SUCCESS; -+} -+ -+ - static apr_status_t datum_cleanup(void *dptr) - { - if (dptr) -@@ -55,19 +64,15 @@ static apr_status_t set_error(apr_dbm_t - { - apr_status_t rv = APR_SUCCESS; - -- /* ### ignore whatever the DBM said (dbm_said); ask it explicitly */ -- -- if ((dbm->errcode = gdbm_errno) == GDBM_NO_ERROR) { -+ if (dbm_said == APR_SUCCESS) { -+ dbm->errcode = GDBM_NO_ERROR; - dbm->errmsg = NULL; - } - else { -+ dbm->errcode = dbm_said; - dbm->errmsg = gdbm_strerror(gdbm_errno); -- rv = APR_EGENERAL; /* ### need something better */ - } - -- /* captured it. clear it now. */ -- gdbm_errno = GDBM_NO_ERROR; -- - return rv; - } - -@@ -144,7 +149,7 @@ static apr_status_t vt_gdbm_fetch(apr_db - - /* store the error info into DBM, and return a status code. Also, note - that *pvalue should have been cleared on error. */ -- return set_error(dbm, APR_SUCCESS); -+ return set_error(dbm, gdat2s(rd)); - } - - static apr_status_t vt_gdbm_store(apr_dbm_t *dbm, apr_datum_t key, -@@ -203,7 +208,7 @@ static apr_status_t vt_gdbm_firstkey(apr - apr_pool_cleanup_null); - - /* store any error info into DBM, and return a status code. */ -- return set_error(dbm, APR_SUCCESS); -+ return set_error(dbm, gdat2s(rd)); - } - - static apr_status_t vt_gdbm_nextkey(apr_dbm_t *dbm, apr_datum_t *pkey) -@@ -223,7 +228,7 @@ static apr_status_t vt_gdbm_nextkey(apr_ - apr_pool_cleanup_null); - - /* store any error info into DBM, and return a status code. */ -- return set_error(dbm, APR_SUCCESS); -+ return set_error(dbm, gdat2s(rd)); - } - - static void vt_gdbm_freedatum(apr_dbm_t *dbm, apr_datum_t data) diff --git a/dev-libs/apr-util/files/apr-util-1.6.1-mariadb-support.patch b/dev-libs/apr-util/files/apr-util-1.6.1-mariadb-support.patch deleted file mode 100644 index 137e99f97637..000000000000 --- a/dev-libs/apr-util/files/apr-util-1.6.1-mariadb-support.patch +++ /dev/null @@ -1,116 +0,0 @@ -Backport of http://svn.apache.org/viewvc?rev=1872060&view=rev - ---- a/build/dbd.m4 -+++ b/build/dbd.m4 -@@ -163,10 +163,15 @@ AC_DEFUN([APU_CHECK_DBD_MYSQL], [ - old_cppflags="$CPPFLAGS" - old_ldflags="$LDFLAGS" - -+ my_library="mysqlclient" -+ - AC_ARG_WITH([mysql], APR_HELP_STRING([--with-mysql=DIR], [enable MySQL DBD driver]), - [ - if test "$withval" = "yes"; then - AC_PATH_PROG([MYSQL_CONFIG],[mysql_config]) -+ if test "x$MYSQL_CONFIG" = "x"; then -+ AC_PATH_TOOL([MYSQL_CONFIG],[mariadb_config]) -+ fi - if test "x$MYSQL_CONFIG" != 'x'; then - mysql_CPPFLAGS="`$MYSQL_CONFIG --include`" - mysql_LDFLAGS="`$MYSQL_CONFIG --libs_r | sed -e 's/-l[[^ ]]\+//g'`" -@@ -174,29 +179,37 @@ AC_DEFUN([APU_CHECK_DBD_MYSQL], [ - - APR_ADDTO(CPPFLAGS, [$mysql_CPPFLAGS]) - APR_ADDTO(LIBS, [$mysql_LIBS]) -+ -+ if $MYSQL_CONFIG --libs_r | grep -q mariadb; then -+ my_library="mariadb" -+ fi - fi - -- AC_CHECK_HEADERS([mysql.h my_global.h my_sys.h], -- AC_CHECK_LIB(mysqlclient, mysql_init, [apu_have_mysql=1]), -- [apu_have_mysql=0; break], -- [#include <my_global.h>]) -- if test "$apu_have_mysql" = "0"; then -- AC_CHECK_HEADERS([mysql/mysql.h mysql/my_global.h mysql/my_sys.h], -- AC_CHECK_LIB(mysqlclient, mysql_init, [apu_have_mysql=1]), -- [apu_have_mysql=0; break], -- [#include <mysql/my_global.h>]) -+ AC_CHECK_HEADERS([mysql.h errmsg.h], [apu_have_mysql=1], [apu_have_mysql=0; break]) -+ if test "$apr_have_mysql" = "0"; then -+ AC_CHECK_HEADERS([mysql/mysql.h mysql/errmsg.h], [apu_have_mysql=1], [apu_have_mysql=0; break]) - fi -- if test "$apu_have_mysql" != "0" && test "x$MYSQL_CONFIG" != 'x'; then -+ if test "$apr_have_mysql" = "1"; then -+ AC_CHECK_HEADERS([my_global.h my_sys.h mysql/my_global.h mysql/my_sys.h]) -+ AC_CHECK_LIB($my_library, mysql_init,, [apu_have_mysql=0]) -+ fi -+ if test "$apu_have_mysql" = "1" && test "x$MYSQL_CONFIG" != 'x'; then - APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$mysql_CPPFLAGS]) - fi - elif test "$withval" = "no"; then - : - else - AC_PATH_PROG([MYSQL_CONFIG],[mysql_config],,[$withval/bin]) -+ if test "x$MYSQL_CONFIG" = "x"; then -+ AC_PATH_TOOL([MYSQL_CONFIG],[mariadb_config],,[$withval/bin]) -+ fi - if test "x$MYSQL_CONFIG" != 'x'; then - mysql_CPPFLAGS="`$MYSQL_CONFIG --include`" - mysql_LDFLAGS="`$MYSQL_CONFIG --libs_r | sed -e 's/-l[[^ ]]\+//g'`" - mysql_LIBS="`$MYSQL_CONFIG --libs_r`" -+ if $MYSQL_CONFIG --libs_r | grep -q mariadb; then -+ my_library="mariadb" -+ fi - else - mysql_CPPFLAGS="-I$withval/include" - mysql_LDFLAGS="-L$withval/lib " -@@ -207,18 +220,15 @@ AC_DEFUN([APU_CHECK_DBD_MYSQL], [ - APR_ADDTO(LIBS, [$mysql_LIBS]) - - AC_MSG_NOTICE(checking for mysql in $withval) -- AC_CHECK_HEADERS([mysql.h my_global.h my_sys.h], -- AC_CHECK_LIB(mysqlclient, mysql_init, [apu_have_mysql=1]), -- [apu_have_mysql=0; break], -- [#include <my_global.h>]) -- -- if test "$apu_have_mysql" != "1"; then -- AC_CHECK_HEADERS([mysql/mysql.h mysql/my_global.h mysql/my_sys.h], -- AC_CHECK_LIB(mysqlclient, mysql_init, [apu_have_mysql=1]), -- [apu_have_mysql=0; break], -- [#include <mysql/my_global.h>]) -+ AC_CHECK_HEADERS([mysql.h errmsg.h], [apu_have_mysql=1], [apu_have_mysql=0; break]) -+ if test "$apr_have_mysql" = "0"; then -+ AC_CHECK_HEADERS([mysql/mysql.h mysql/errmsg.h], [apu_have_mysql=1], [apu_have_mysql=0; break]) -+ fi -+ if test "$apr_have_mysql" = "1"; then -+ AC_CHECK_HEADERS([my_global.h my_sys.h mysql/my_global.h mysql/my_sys.h]) -+ AC_CHECK_LIB($my_library, mysql_init,, [apu_have_mysql=0]) - fi -- if test "$apu_have_mysql" != "0"; then -+ if test "$apu_have_mysql" = "1"; then - APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$mysql_CPPFLAGS]) - fi - fi -@@ -229,7 +239,7 @@ AC_DEFUN([APU_CHECK_DBD_MYSQL], [ - dnl Since we have already done the AC_CHECK_LIB tests, if we have it, - dnl we know the library is there. - if test "$apu_have_mysql" = "1"; then -- APR_ADDTO(LDADD_dbd_mysql, [$mysql_LDFLAGS -lmysqlclient $mysql_LIBS]) -+ APR_ADDTO(LDADD_dbd_mysql, [$mysql_LDFLAGS -l$my_library $mysql_LIBS]) - fi - AC_SUBST(LDADD_dbd_mysql) - ---- a/dbd/apr_dbd_mysql.c -+++ b/dbd/apr_dbd_mysql.c -@@ -1262,7 +1262,9 @@ static apr_status_t thread_end(void *data) - - static void dbd_mysql_init(apr_pool_t *pool) - { -+#if MYSQL_VERSION_ID < 100000 - my_init(); -+#endif - mysql_thread_init(); - - /* FIXME: this is a guess; find out what it really does */ diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest index e8c538cb1a97..69f567d76898 100644 --- a/dev-libs/apr/Manifest +++ b/dev-libs/apr/Manifest @@ -1,12 +1,5 @@ -AUX apr-1.5.0-cross-types.patch 1969 BLAKE2B 1ded46da99aae4a225eef6c6c4e7ec8b27b61efb41a25176e620cec6c0be3ecb1b95eb0d93a446ca6940bec2bf53b4fa810fa28d49c7f655fa767a2c5366745c SHA512 8d91cff44c2926c5da120a3e7a4e54414c1e77cb1815d6683b490499914ca0934c3a1a1edb3dbd7dfd686e3342675ab64b0f498c21fe138befa6b454b5d5c1d8 -AUX apr-1.5.0-libtool.patch 514 BLAKE2B b9d33d1317293c7614a3f0f753e466c7f8acf0792ee5776c68ec9abcacc74d6c55fbd50a3996b06655635ff10e110fa2a8277eb343251dbf6229f8212f481e41 SHA512 e8c2a7a2b5c8171a0d2c8920e053bd861e4fb2044428cb3f6ffc9ccea05694c20b879411f86b967c4269918b5740b1450ecb0e720d74ea0fe9ac305f58ee88d5 AUX apr-1.5.0-mint.patch 872 BLAKE2B dda2941cbed87117a8a6c488bd8045894686aef0ba219ff489f67dd03b58fb07a05f9e67c54cdff330c65e579c41c992446a465104661bbacbb2525a5b9518eb SHA512 ba71f17ef9f61a8379139f05ca17eb583ad34cbc3ebf5c4f59d011662db6b5c963da5c466c093c3eb98372299d8f202d927a05b52cc7515270ac52fe44ec6daf -AUX apr-1.5.0-sysroot.patch 1309 BLAKE2B de3dc13a44a9d5071c249875322b7d6be9ed765176f8232b96a5e5088c5764dff8b810377b214999b59380522fdc9d0577217fe1acff5a7ab4b17461d6daf909 SHA512 48609c522225b47df96039174dafa043f77ce5b91f464b14250dd2b30590d6685c9baa03d4ca34937532c26afea8d208fb78158dfc8026a606ff90543b5c8d5d AUX apr-1.6.3-skip-known-failing-tests.patch 512 BLAKE2B 29607bce9a35853d824f8872557f361f3d5ffa0f2c7cd35e06cbf4d449e54f1b12978c0220b8ce4ae5d590ee9e04b5cd77af22876e3880deef115efbeb5a1dcc SHA512 ac097d28d5ae0b2437522da0578ff8bd049190d8df576e4e5298426f827b2bf69891e4f33bd1ffaf1a3c53143927e71f10d8362567121faa03cdf908d4fbc6c2 -AUX apr-1.7.0-CVE-2021-35940.patch 1749 BLAKE2B 256687934fd6b2af494198456d059f8a6edaaeb8b17f9186d0801bef489443faffefda3724d6c083f05811356c5168db31e5defbe19394699092090f7befdae6 SHA512 a2419817809dfd92a6d3b12e2067a802505d77d400fd47a4b9bb6fd5ae94c4be092e0d3b5894de429c6cc4a82d8133b801636bcab93d0f740c8f06a46516cd72 -AUX apr-1.7.0-autoconf-2.70.patch 1970 BLAKE2B b552e2bb1be932a692e2d1fad5124b5db9163e45b1bef1fe97082db28efd6f6079d75253e961ca257bd31f53f814bdb11a2c6554fd5d1925d26fe7b42664db42 SHA512 63a56be83f555a78f422f9ce7074e5c3a497a4996d32ead78d9e1a05fba2e0dbdfb135c34143676b8ad16e8276642843d5ed8b17a540be58c6bf7e9662896c2f -AUX apr-1.7.0-clang-16.patch 4341 BLAKE2B 3d8a7d0e62016c4fd7f1b851d06ef595f8ddbacc4af2e3142cc922c711c6b56b2b99158abdffa611e20407f53f95ef5dc6ffe24cca90457d6d381176e2ce27a0 SHA512 adef5a1bccb6ccd4627c7e8416168aec3e87cb071f3c313ac18f0d246c502d1fc8cc41196e2c49958c1c52d01ffc82758e12ece802cf19bc675813a8064c74f5 -AUX apr-1.7.0-dev-zero.patch 1314 BLAKE2B 22f334d721dccb71bfc3197c3b343d79f9fb33523558c0e46daad37b910aba066fd4b62e62a7875317ffa4db7dcc47004ee8bed245c7ba6fb90a67e18c1b8c6d SHA512 ad95469e7690efab945491156eb923eb95cc767bac1098b0a2ae7779cab5ea33875af23c47962cf49327cef91e02dbc3c8ecee9832978316a5c191dc20a7d07f AUX apr-1.7.2-fix-pkgconfig-libs.patch 963 BLAKE2B fb36bb31050286064e17c2a9c9f3d48ce9c0e42f8ee6cfcfa45ec79ad57670acf953f273d83419d3b053a38d9786600a240b8b082615e0e1fe7f15dcd2793e6c SHA512 0d8bb84b71f6f9f590afc15a48010383ef6b5b84b2b64fcbb9489adefa32137a1af7c0b7b216dd18f9c04b92492772f2d9f9564b9fbfbffc019bed8e43818cfe AUX apr-1.7.2-libtool.patch 517 BLAKE2B da77ee1d94bc2bd46d4ef97f18f018fbcc67cceb17162787f0e2f02e7ae205f80121166551a90b62e24d77c5f4313a2fa68b90dca713923b1a78e649bcca70da SHA512 4e09e88bd2d9e5f25a1edc52bdb632b0e73b28d971a9b0974bdcff9f8217ef2abe5c3ab3ef8a592e56c272bf928569e5a9be78bd3124afafb5954b6b8ee6d0eb AUX apr-1.7.2-respect-flags.patch 652 BLAKE2B e9cef7a8eff52a0d1799c261b377026849d8b65770a9e6b1d93f936d5d6533635827d6bdada9cbfdd8f274b191234d4b07ec7afa640383cac965562153c54164 SHA512 8305861c1196bbc5262bdc5d9fe87ef7d5d38d827d829455db2007036c70d749901bc3d2b63570528a70dfb3ff6171e78b54ceaea8c9646e4aa53c173440e70b diff --git a/dev-libs/apr/files/apr-1.5.0-cross-types.patch b/dev-libs/apr/files/apr-1.5.0-cross-types.patch deleted file mode 100644 index 266e5676817f..000000000000 --- a/dev-libs/apr/files/apr-1.5.0-cross-types.patch +++ /dev/null @@ -1,63 +0,0 @@ -use standard AC_CHECK_SIZEOF as it supports non-builtin types and -supports cross-compiling sanely - -https://issues.apache.org/bugzilla/show_bug.cgi?id=56053 - ---- a/configure.in -+++ b/configure.in -@@ -1684,7 +1684,7 @@ else - socklen_t_value="int" - fi - --APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], pid_t, 8) -+AC_CHECK_SIZEOF(pid_t) - - if test "$ac_cv_sizeof_pid_t" = "$ac_cv_sizeof_short"; then - pid_t_fmt='#define APR_PID_T_FMT "hd"' -@@ -1753,7 +1753,7 @@ APR_CHECK_TYPES_COMPATIBLE(ssize_t, long, [ssize_t_fmt="ld"]) - APR_CHECK_TYPES_COMPATIBLE(size_t, unsigned int, [size_t_fmt="u"]) - APR_CHECK_TYPES_COMPATIBLE(size_t, unsigned long, [size_t_fmt="lu"]) - --APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], ssize_t, 8) -+AC_CHECK_SIZEOF(ssize_t) - - AC_MSG_CHECKING([which format to use for apr_ssize_t]) - if test -n "$ssize_t_fmt"; then -@@ -1770,7 +1770,7 @@ fi - - ssize_t_fmt="#define APR_SSIZE_T_FMT \"$ssize_t_fmt\"" - --APR_CHECK_SIZEOF_EXTENDED([#include <stddef.h>], size_t, 8) -+AC_CHECK_SIZEOF(size_t) - - AC_MSG_CHECKING([which format to use for apr_size_t]) - if test -n "$size_t_fmt"; then -@@ -1787,7 +1787,7 @@ fi - - size_t_fmt="#define APR_SIZE_T_FMT \"$size_t_fmt\"" - --APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], off_t, 8) -+AC_CHECK_SIZEOF(off_t) - - if test "${ac_cv_sizeof_off_t}${apr_cv_use_lfs64}" = "4yes"; then - # Enable LFS -@@ -1866,7 +1866,7 @@ case $host in - ;; - *) - ino_t_value=ino_t -- APR_CHECK_SIZEOF_EXTENDED(AC_INCLUDES_DEFAULT, ino_t, $ac_cv_sizeof_long) -+ AC_CHECK_SIZEOF(ino_t) - if test $ac_cv_sizeof_ino_t = 4; then - if test $ac_cv_sizeof_long = 4; then - ino_t_value="unsigned long" -@@ -1886,8 +1886,8 @@ else - bigendian=0 - fi - --APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h> --#include <sys/uio.h>],struct iovec,0) -+AC_CHECK_SIZEOF(struct iovec,,[AC_INCLUDES_DEFAULT -+#include <sys/uio.h>]) - if test "$ac_cv_sizeof_struct_iovec" = "0"; then - have_iovec=0 - else diff --git a/dev-libs/apr/files/apr-1.5.0-libtool.patch b/dev-libs/apr/files/apr-1.5.0-libtool.patch deleted file mode 100644 index 5368a2689bdf..000000000000 --- a/dev-libs/apr/files/apr-1.5.0-libtool.patch +++ /dev/null @@ -1,17 +0,0 @@ -generate a local copy of libtool for use in compiling - -https://bugs.gentoo.org/374355 - ---- a/configure.in -+++ b/configure.in -@@ -260,9 +260,7 @@ case $host in - fi - else - dnl libtoolize requires that the following not be indented -- dnl should become LT_INIT(win32-dll) --AC_LIBTOOL_WIN32_DLL --AC_PROG_LIBTOOL -+LT_INIT(win32-dll) - # get libtool's setting of shlibpath_var - eval `grep "^shlibpath_var=[[A-Z_]]*$" $apr_builddir/libtool` - if test "x$shlibpath_var" = "x"; then diff --git a/dev-libs/apr/files/apr-1.5.0-sysroot.patch b/dev-libs/apr/files/apr-1.5.0-sysroot.patch deleted file mode 100644 index 54c9d649ef07..000000000000 --- a/dev-libs/apr/files/apr-1.5.0-sysroot.patch +++ /dev/null @@ -1,37 +0,0 @@ -https://bugs.gentoo.org/385775 - -utilize $SYSROOT to find the right includedir tree - -drop the -L/-R paths since we know our libdir is the standard path which -the compiler already knows how to locate - ---- a/apr-config.in -+++ b/apr-config.in -@@ -28,7 +28,7 @@ libdir="@libdir@" - datarootdir="@datadir@" - datadir="@datadir@" --installbuilddir="@installbuilddir@" --includedir="@includedir@" -+installbuilddir="${SYSROOT}@installbuilddir@" -+includedir="${SYSROOT}@includedir@" - - CC="@CC@" - CPP="@CPP@" -@@ -183,7 +183,7 @@ while test $# -gt 0; do - --link-ld) - if test "$location" = "installed"; then - ### avoid using -L if libdir is a "standard" location like /usr/lib -- flags="$flags -L$libdir -l${APR_LIBNAME}" -+ flags="$flags -l${APR_LIBNAME}" - else - ### this surely can't work since the library is in .libs? - flags="$flags -L$APR_BUILD_DIR -l${APR_LIBNAME}" -@@ -200,7 +200,7 @@ while test $# -gt 0; do - ### avoid using -L if libdir is a "standard" location like /usr/lib - # Since the user is specifying they are linking with libtool, we - # *know* that -R will be recognized by libtool. -- flags="$flags -L$libdir -R$libdir -l${APR_LIBNAME}" -+ flags="$flags -l${APR_LIBNAME}" - else - flags="$flags $LA_FILE" - fi diff --git a/dev-libs/apr/files/apr-1.7.0-CVE-2021-35940.patch b/dev-libs/apr/files/apr-1.7.0-CVE-2021-35940.patch deleted file mode 100644 index f23d729f523e..000000000000 --- a/dev-libs/apr/files/apr-1.7.0-CVE-2021-35940.patch +++ /dev/null @@ -1,53 +0,0 @@ - -SECURITY: CVE-2021-35940 (cve.mitre.org) - -Restore fix for CVE-2017-12613 which was missing in 1.7.x branch, though -was addressed in 1.6.x in 1.6.3 and later via r1807976. - -The fix was merged back to 1.7.x in r1891198. - -Since this was a regression in 1.7.0, a new CVE name has been assigned -to track this, CVE-2021-35940. - -Thanks to Iveta Cesalova <icesalov redhat.com> for reporting this issue. - -https://svn.apache.org/viewvc?view=revision&revision=1891198 - -Index: time/unix/time.c -=================================================================== ---- a/time/unix/time.c (revision 1891197) -+++ b/time/unix/time.c (revision 1891198) -@@ -142,6 +142,9 @@ - static const int dayoffset[12] = - {306, 337, 0, 31, 61, 92, 122, 153, 184, 214, 245, 275}; - -+ if (xt->tm_mon < 0 || xt->tm_mon >= 12) -+ return APR_EBADDATE; -+ - /* shift new year to 1st March in order to make leap year calc easy */ - - if (xt->tm_mon < 2) -Index: time/win32/time.c -=================================================================== ---- a/time/win32/time.c (revision 1891197) -+++ b/time/win32/time.c (revision 1891198) -@@ -54,6 +54,9 @@ - static const int dayoffset[12] = - {0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; - -+ if (tm->wMonth < 1 || tm->wMonth > 12) -+ return APR_EBADDATE; -+ - /* Note; the caller is responsible for filling in detailed tm_usec, - * tm_gmtoff and tm_isdst data when applicable. - */ -@@ -228,6 +231,9 @@ - static const int dayoffset[12] = - {306, 337, 0, 31, 61, 92, 122, 153, 184, 214, 245, 275}; - -+ if (xt->tm_mon < 0 || xt->tm_mon >= 12) -+ return APR_EBADDATE; -+ - /* shift new year to 1st March in order to make leap year calc easy */ - - if (xt->tm_mon < 2) diff --git a/dev-libs/apr/files/apr-1.7.0-autoconf-2.70.patch b/dev-libs/apr/files/apr-1.7.0-autoconf-2.70.patch deleted file mode 100644 index 488c3c59321d..000000000000 --- a/dev-libs/apr/files/apr-1.7.0-autoconf-2.70.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 5593f23e8e062da108ed585535e7281b87346ee1 Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich <slyfox@gentoo.org> -Date: Wed, 25 Nov 2020 09:36:25 +0000 -Subject: [PATCH] build/apr_common.m4: avoid explicit inclusion of - '"confdefs.h"' - -The failure is observed on `autoconf-2.69d` (soon to be released -as `autoconf-2.70`). There `int64_t` detection fails as: - -``` -$ autoreconf && ./configure -... -checking whether int64_t and int use fmt %d... no -checking whether int64_t and long use fmt %ld... no -checking whether int64_t and long long use fmt %lld... no -configure: error: could not determine the string function for int64_t -``` - -This happens because `./configure` always stumbles on warning: - -``` -configure:3350: gcc -c -g -O2 -Werror conftest.c >&5 -In file included from conftest.c:31: -confdefs.h:22: error: "__STDC_WANT_IEC_60559_ATTRIBS_EXT__" redefined [-Werror] - 22 | #define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1 - | -``` - -It's triggered by double inclusion of `"confdefs.h"` contents: -explicitly in `APR_TRY_COMPILE_NO_WARNING` macro and implicitly -via `AC_LANG_SOURCE` use. - -To fix it and avoid having to define `main()` declaration the change -uses `AC_LANG_PROGRAM` instead. - -Tested on both `autoconf-2.69` and `autoconf-2.69d`. - -Bug: https://bugs.gentoo.org/738156 -Bug: https://bugs.gentoo.org/750353 -Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org> ---- - build/apr_common.m4 | 8 ++------ - 1 file changed, 2 insertions(+), 6 deletions(-) - -diff --git a/build/apr_common.m4 b/build/apr_common.m4 -index f4e2dfd0a7..6f5782e674 100644 ---- a/build/apr_common.m4 -+++ b/build/apr_common.m4 -@@ -504,13 +504,9 @@ AC_DEFUN([APR_TRY_COMPILE_NO_WARNING], - CFLAGS="$CFLAGS -Werror" - fi - AC_COMPILE_IFELSE( -- [AC_LANG_SOURCE( -- [#include "confdefs.h" -- ] -- [[$1]] -- [int main(int argc, const char *const *argv) {] -+ [AC_LANG_PROGRAM( -+ [[$1]], - [[$2]] -- [ return 0; }] - )], [CFLAGS=$apr_save_CFLAGS - $3], [CFLAGS=$apr_save_CFLAGS - $4]) diff --git a/dev-libs/apr/files/apr-1.7.0-clang-16.patch b/dev-libs/apr/files/apr-1.7.0-clang-16.patch deleted file mode 100644 index 2244b07a14ff..000000000000 --- a/dev-libs/apr/files/apr-1.7.0-clang-16.patch +++ /dev/null @@ -1,174 +0,0 @@ -https://bugs.gentoo.org/870004 - -Fixed upstream, hopefully (it's hard to keep track of 1.7.x branch churn): -- https://bz.apache.org/bugzilla/show_bug.cgi?id=64753 -- https://bz.apache.org/bugzilla/show_bug.cgi?id=65087 ---- a/build/apr_common.m4 -+++ b/build/apr_common.m4 -@@ -467,6 +467,7 @@ changequote([, ])dnl - AC_MSG_CHECKING(size of $2) - AC_CACHE_VAL(AC_CV_NAME, - [AC_TRY_RUN([#include <stdio.h> -+#include <stdlib.h> - $1 - #ifdef WIN32 - #define binmode "b" -@@ -531,7 +532,8 @@ AC_TRY_RUN([ - #include <errno.h> - #include <string.h> - #include <stdio.h> --main() -+#include <stdlib.h> -+int main() - { - char buf[1024]; - if (strerror_r(ERANGE, buf, sizeof buf) < 1) { ---- a/build/apr_network.m4 -+++ b/build/apr_network.m4 -@@ -63,6 +63,10 @@ AC_DEFUN([APR_CHECK_WORKING_GETADDRINFO], [ - #ifdef HAVE_SYS_SOCKET_H - #include <sys/socket.h> - #endif -+#include <stdlib.h> -+ -+#include <netinet/in.h> -+#include <arpa/inet.h> - - int main(void) { - struct addrinfo hints, *ai; -@@ -136,6 +140,11 @@ dnl - AC_DEFUN([APR_CHECK_WORKING_GETNAMEINFO], [ - AC_CACHE_CHECK(for working getnameinfo, ac_cv_working_getnameinfo,[ - AC_TRY_RUN( [ -+#include <sys/socket.h> -+#include <netinet/in.h> -+#include <arpa/inet.h> -+#include <stdlib.h> -+ - #ifdef HAVE_NETDB_H - #include <netdb.h> - #endif -@@ -195,6 +204,8 @@ AC_DEFUN([APR_CHECK_NEGATIVE_EAI], [ - #include <netdb.h> - #endif - -+#include <stdlib.h> -+ - int main(void) { - if (EAI_ADDRFAMILY < 0) { - exit(0); -@@ -388,9 +399,14 @@ AC_DEFUN([APR_CHECK_TCP_NODELAY_INHERITED], [ - AC_CACHE_CHECK(if TCP_NODELAY setting is inherited from listening sockets, ac_cv_tcp_nodelay_inherited,[ - AC_TRY_RUN( [ - #include <stdio.h> -+#include <stdlib.h> -+ - #ifdef HAVE_SYS_TYPES_H - #include <sys/types.h> --#endif -+#end -+#ifdef HAVE_STRING_H -+#include <string.h> -+#endifif - #ifdef HAVE_SYS_SOCKET_H - #include <sys/socket.h> - #endif -@@ -734,6 +750,9 @@ AC_TRY_COMPILE([ - #ifdef HAVE_ARPA_INET_H - #include <arpa/inet.h> - #endif -+ -+#include <sys/socket.h> -+#include <netinet/in.h> - ],[ - inet_addr("127.0.0.1"); - ],[ -@@ -754,6 +773,9 @@ fi - AC_DEFUN([APR_CHECK_INET_NETWORK], [ - AC_CACHE_CHECK(for inet_network, ac_cv_func_inet_network,[ - AC_TRY_COMPILE([ -+#include <sys/socket.h> -+#include <netinet/in.h> -+ - #ifdef HAVE_SYS_TYPES_H - #include <sys/types.h> - #endif ---- a/configure.in -+++ b/configure.in -@@ -1440,8 +1440,6 @@ AC_CHECK_FUNCS(sigaction, [ have_sigaction="1" ], [ have_sigaction="0" ]) - AC_DECL_SYS_SIGLIST - - AC_CHECK_FUNCS(fork, [ fork="1" ], [ fork="0" ]) --APR_CHECK_INET_ADDR --APR_CHECK_INET_NETWORK - AC_SUBST(apr_inaddr_none) - AC_CHECK_FUNC(_getch) - AC_CHECK_FUNCS(strerror_r, [ strerror_r="1" ], [ strerror_r="0" ]) -@@ -1547,6 +1545,9 @@ APR_FLAG_HEADERS( - sys/un.h \ - sys/wait.h) - -+APR_CHECK_INET_ADDR -+APR_CHECK_INET_NETWORK -+ - # IRIX 6.5 has a problem in <netinet/tcp.h> which prevents it from - # being included by itself. Check for <netinet/tcp.h> manually, - # including another header file first. -@@ -2208,7 +2209,8 @@ AC_TRY_RUN([ - #include <sys/types.h> - #include <sys/time.h> - #include <sys/resource.h> --main() -+#include <stdlib.h> -+int main() - { - struct rlimit limit; - limit.rlim_cur = 0; -@@ -2247,7 +2249,7 @@ AC_TRY_RUN([ - #ifndef SEM_FAILED - #define SEM_FAILED (-1) - #endif --main() -+int main() - { - sem_t *psem; - const char *sem_name = "/apr_autoconf"; -@@ -2307,6 +2309,7 @@ if test "$threads" = "1"; then - AC_TRY_RUN([ - #include <sys/types.h> - #include <pthread.h> -+#include <stdlib.h> - int main() - { - pthread_mutex_t mutex; -@@ -2435,6 +2438,8 @@ int fd; - struct flock proc_mutex_lock_it = {0}; - const char *fname = "conftest.fcntl"; - -+int lockit(); -+ - int main() - { - int rc, status;; ---- a/poll/os2/pollset.c -+++ b/poll/os2/pollset.c -@@ -308,7 +308,7 @@ APR_DECLARE(apr_status_t) apr_pollset_wakeup(apr_pollset_t *pollset) - - - --APR_DECLARE(const char *) apr_poll_method_defname() -+APR_DECLARE(const char *) apr_poll_method_defname(void) - { - return "select"; - } ---- a/poll/unix/pollset.c -+++ b/poll/unix/pollset.c -@@ -188,7 +188,7 @@ APR_DECLARE(const char *) apr_pollset_method_name(apr_pollset_t *pollset) - return pollset->provider->name; - } - --APR_DECLARE(const char *) apr_poll_method_defname() -+APR_DECLARE(const char *) apr_poll_method_defname(void) - { - const apr_pollset_provider_t *provider = NULL; - diff --git a/dev-libs/apr/files/apr-1.7.0-dev-zero.patch b/dev-libs/apr/files/apr-1.7.0-dev-zero.patch deleted file mode 100644 index be6433dd46bc..000000000000 --- a/dev-libs/apr/files/apr-1.7.0-dev-zero.patch +++ /dev/null @@ -1,34 +0,0 @@ -APR (ab)uses AC_TRY_RUN to determine if: - -* We have /dev/zero -* We can mmap /dev/zero - -The APR ebuild sets ac_cv_file__dev_zero=yes when cross compiling -to fill in an answer for the first question, but the configure script -immediately defeats that when answering the second. - -AC_TRY_FUN takes four arguments: the test, and what happens on success, -failure, and cross-compiling. The APR script uses this as a "gate" to -clear ac_cv_file__dev_zero when /dev/zero exists but it turns out not -to be useable. They take a pessimistic approach: if you can't "prove" -it is mmap-able, clear the flag. - -This patch changes that to leave the flag alone while cross compiling; -just assume /dev/zero is mmap-able. It relies on ac_cv_file__dev_zero -to be correctly set for the target. The fourth parameter is changed to -[:] and not [] because [] engages autoconf's default cross-compiling -behavior, which raises an error. - -Signed-off-by: Alexandra Parker <alex.iris.parker@gmail.com> - ---- a/configure.in 2022-01-09 00:31:05.552582255 -0800 -+++ b/configure.in 2022-01-09 00:31:19.824582533 -0800 -@@ -1203,7 +1203,7 @@ - return 3; - } - return 0; -- }], [], [ac_cv_file__dev_zero=no], [ac_cv_file__dev_zero=no]) -+ }], [], [ac_cv_file__dev_zero=no], [:]) - - AC_MSG_RESULT($ac_cv_file__dev_zero) - fi diff --git a/dev-libs/jemalloc/Manifest b/dev-libs/jemalloc/Manifest index 508bab70d3de..1d88753e1f16 100644 --- a/dev-libs/jemalloc/Manifest +++ b/dev-libs/jemalloc/Manifest @@ -1,5 +1,6 @@ AUX jemalloc-5.3.0-backport-pr-2312.patch 4648 BLAKE2B 5d84d64e38bdc86f3b1f07ce5c7aa8d03d1ae88a646585c331d4a921ae1bed2c2dd6f193114e0506e6806b879238148ef9eba3fd35c98dedd72cbfe307c26c41 SHA512 f890b8f696a7c299f257373d14aab2f918b665d858a5ed5656ed3e6db9e43fe3677a1b5b86610493f1eb222c5cdefeb791ee5de6c9db40681589b2260b62f83c +AUX jemalloc-5.3.0-backport-pr-2338.patch 3716 BLAKE2B a147c7669cd5bfc0b8ba8b05f1c36704082672ae99773ddc103cabfb3e6778aa6675bdd8a76b646261b422568fba2a13970c2ac6ef9bbbaa7417da4de1b27196 SHA512 48cebc8d6b7ad2e8aeb0a18fd30763561ee2dfa8ea82db76108c19e4c7f22abb303427634fc5b3b4d7d34190a3d56e1eee6cdee96ea3517acb0041d7cb5ecf74 AUX jemalloc-5.3.0-gentoo-fixups.patch 1233 BLAKE2B 4654d1ecc2846281530b922e942dd68dcf4a4859ad087db4c5e163fd903c941b877fc2ad7e7a39b041e19ab74dc3af677132eb294394763f18f41dc9b126006f SHA512 4d1d4c22085cee554a5eaff0415c2401e528c1a496c4e06f9cc04fb8574ae19e9a271ea60cc368c3e0af65b26e72c86668a00fc38049281ac1bd79148551c142 DIST jemalloc-5.3.0.tar.bz2 736023 BLAKE2B 9ff51616c3fb086d7cc021c59b83e5f0304d886993f4b5194a6956ffaf742cc509d08a2cf81ead6966c39a44f35621b57550f4a5c726c4508fd2c86c7c056ab0 SHA512 22907bb052096e2caffb6e4e23548aecc5cc9283dce476896a2b1127eee64170e3562fa2e7db9571298814a7a2c7df6e8d1fbe152bd3f3b0c1abec22a2de34b1 -EBUILD jemalloc-5.3.0-r1.ebuild 1579 BLAKE2B 1956b1d296a8eaec4c311201835e9224d2d3cecf63fb9aa0de6ca2afca12ab625485db1ff0c9a1a299c15ddab94b6ad9b9522f537bb7096cfa85aa6d2fa0e4e3 SHA512 10aab6a63e6a925bc60742be63e132d6543a7f0bc2f59d304dfab46c197e455797a58c2ff91d44f7b06a401aa0b3ce74307cfb1a16c6f4ff1441ad30107127fe +EBUILD jemalloc-5.3.0-r1.ebuild 1629 BLAKE2B 490b42fac36dfe930b6f7da9a8e68fd0bb34ed967bc745a7e5f8bfc50ca6553b0b6bbf8ac3600c0e51b33b0baeaeb98e3582d56d9ca60e06d9f63c45ad8cd9e6 SHA512 466b9aca95af12146ffd36cbffed1758e9fb78becb247f8ae06b42d387f67bb1de68cfbd4a3a8bdeda8513f20f80651c6757cd3cf7c9f2e7b6790407cc254e20 MISC metadata.xml 551 BLAKE2B 590d998b8a6a2fd396d73017270f833cb8144bf57ea871ade8f53dd5c65a71e76591a9ec32813ea291758f0dae118aa8d6d69321b6cec8272a608f02031ee9c8 SHA512 8b9ea77ba31e1ed4482b30f8c69bc9fc725142260fa146a2f35c60adcfecadbcc2207adae3c4e3f909e2b43c581866737ff6b03af8e99427154fb1918c81d516 diff --git a/dev-libs/jemalloc/files/jemalloc-5.3.0-backport-pr-2338.patch b/dev-libs/jemalloc/files/jemalloc-5.3.0-backport-pr-2338.patch new file mode 100644 index 000000000000..6d4d4a11f741 --- /dev/null +++ b/dev-libs/jemalloc/files/jemalloc-5.3.0-backport-pr-2338.patch @@ -0,0 +1,83 @@ +Backport Musl fixes from PR #2338. + +Upstream PR: https://github.com/jemalloc/jemalloc/pull/2338 +Upstream commits: https://github.com/jemalloc/jemalloc/commit/45249cf5a9cfa13c2c62e68e272a391721523b4b, https://github.com/jemalloc/jemalloc/commit/aba1645f2d65a3b5c46958d7642b46ab3c142cf3 + +From aba1645f2d65a3b5c46958d7642b46ab3c142cf3 Mon Sep 17 00:00:00 2001 +From: Marvin Schmidt <marv@exherbo.org> +Date: Tue, 27 Sep 2022 07:03:14 +0200 +Subject: [PATCH] configure: Handle *-linux-musl* hosts properly + +This is the same as the `*-*-linux*` case with the two exceptions that +we don't set glibc=1 and don't define JEMALLOC_USE_CXX_THROW +--- + configure.ac | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 2bbf7d54a..f38b72d64 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -723,6 +723,19 @@ case "${host}" in + fi + zero_realloc_default_free="1" + ;; ++ *-*-linux-musl*) ++ dnl syscall(2) and secure_getenv(3) are exposed by _GNU_SOURCE. ++ JE_APPEND_VS(CPPFLAGS, -D_GNU_SOURCE) ++ abi="elf" ++ AC_DEFINE([JEMALLOC_PURGE_MADVISE_DONTNEED_ZEROS], [ ], [ ]) ++ AC_DEFINE([JEMALLOC_HAS_ALLOCA_H], [ ], [ ]) ++ AC_DEFINE([JEMALLOC_PROC_SYS_VM_OVERCOMMIT_MEMORY], [ ], [ ]) ++ AC_DEFINE([JEMALLOC_THREADED_INIT], [ ], [ ]) ++ if test "${LG_SIZEOF_PTR}" = "3"; then ++ default_retain="1" ++ fi ++ zero_realloc_default_free="1" ++ ;; + *-*-linux*) + dnl syscall(2) and secure_getenv(3) are exposed by _GNU_SOURCE. + JE_APPEND_VS(CPPFLAGS, -D_GNU_SOURCE) + +From 45249cf5a9cfa13c2c62e68e272a391721523b4b Mon Sep 17 00:00:00 2001 +From: Marvin Schmidt <marv@exherbo.org> +Date: Tue, 27 Sep 2022 07:00:13 +0200 +Subject: [PATCH] Fix exception specification error for hosts using musl libc + +It turns out that the previous commit did not suffice since the +JEMALLOC_SYS_NOTHROW definition also causes the same exception specification +errors as JEMALLOC_USE_CXX_THROW did: +``` +x86_64-pc-linux-musl-cc -std=gnu11 -Werror=unknown-warning-option -Wall -Wextra -Wshorten-64-to-32 -Wsign-compare -Wundef -Wno-format-zero-length -Wpointer- +arith -Wno-missing-braces -Wno-missing-field-initializers -pipe -g3 -fvisibility=hidden -Wimplicit-fallthrough -O3 -funroll-loops -march=native -O2 -pipe -c -march=native -O2 -pipe -D_GNU_SOURCE -D_REENTRANT -Iinclude -Iinclude -o src/background_thread.o src/background_thread.c +In file included from src/jemalloc_cpp.cpp:9: +In file included from include/jemalloc/internal/jemalloc_preamble.h:27: +include/jemalloc/internal/../jemalloc.h:254:32: error: exception specification in declaration does not match previous declaration + void JEMALLOC_SYS_NOTHROW *je_malloc(size_t size) + ^ +include/jemalloc/internal/../jemalloc.h:75:21: note: expanded from macro 'je_malloc' + ^ +/usr/x86_64-pc-linux-musl/include/stdlib.h:40:7: note: previous declaration is here +void *malloc (size_t); + ^ +``` + +On systems using the musl C library we have to omit the exception specification +on malloc function family like it's done for MacOS, FreeBSD and OpenBSD. +--- + include/jemalloc/jemalloc_macros.h.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/jemalloc/jemalloc_macros.h.in b/include/jemalloc/jemalloc_macros.h.in +index 2de3f27de..05d996be2 100644 +--- a/include/jemalloc/jemalloc_macros.h.in ++++ b/include/jemalloc/jemalloc_macros.h.in +@@ -142,7 +142,7 @@ + # define JEMALLOC_COLD + #endif + +-#if (defined(__APPLE__) || defined(__FreeBSD__)) && !defined(JEMALLOC_NO_RENAME) ++#if (defined(__APPLE__) || defined(__FreeBSD__) || (defined(__linux__) && !defined(__GLIBC__))) && !defined(JEMALLOC_NO_RENAME) + # define JEMALLOC_SYS_NOTHROW + #else + # define JEMALLOC_SYS_NOTHROW JEMALLOC_NOTHROW diff --git a/dev-libs/jemalloc/jemalloc-5.3.0-r1.ebuild b/dev-libs/jemalloc/jemalloc-5.3.0-r1.ebuild index 36af3bb44643..341374a74d7f 100644 --- a/dev-libs/jemalloc/jemalloc-5.3.0-r1.ebuild +++ b/dev-libs/jemalloc/jemalloc-5.3.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="8" @@ -18,6 +18,7 @@ HTML_DOCS=( doc/jemalloc.html ) PATCHES=( "${FILESDIR}/${PN}-5.3.0-gentoo-fixups.patch" "${FILESDIR}/${PN}-5.3.0-backport-pr-2312.patch" + "${FILESDIR}/${PN}-5.3.0-backport-pr-2338.patch" ) MULTILIB_WRAPPED_HEADERS=( /usr/include/jemalloc/jemalloc.h ) diff --git a/dev-libs/kpathsea/Manifest b/dev-libs/kpathsea/Manifest index 8e90af409223..9eca197d4151 100644 --- a/dev-libs/kpathsea/Manifest +++ b/dev-libs/kpathsea/Manifest @@ -5,5 +5,5 @@ DIST kpathsea-texmf.d-11.tar.xz 12616 BLAKE2B f64dcaae859d6c95d534907f6951942897 DIST texlive-20210325-source.tar.xz 54837368 BLAKE2B 66bd4bdd43ff53513004b9b9b90ababa0ab5efcf183a27864a3d39cde9cf90721456bda90c49ad6014f4b12d2e6293feaf9a8b152b85a89ffaa96bf5056347df SHA512 afd6eb24efaeac7c58d43ff24162aece919079a9ae02934509f068c7a3828223c33c14d9db11ff7fea3560b08a06f352446ba7f845eefb4a56a87b96f088f213 DIST tl-kpathsea-2021.tar.xz 32308 BLAKE2B 83052cefc5699d46ce104e4379d39eee8e86b514d25245a6104fc9940accf131790ae144ca11dbd3b99a31a06017495bb5a53afb1e49da71a2c9eec008200653 SHA512 398358b84ecb81fece969fbd3521b093f7e791feec828c218e6371c26d57956491328999517a65711d45dfb04c83fd643ef0fad6a0153590866eddf485d5c575 DIST tl-kpathsea.doc-2021.tar.xz 1066608 BLAKE2B 798ccf9953e4fa2037f81b56dfa30cf99c56c17e2942d5a0f2041b871958284f05150e5d7631b542896190f178327f009130e6bb07f60e8173ec1e9f12c4cda9 SHA512 8ecccee7ad99220f91139dcd9c2ce0bd19eb0e2fe74f0a965f68e59a28bd3de454624d6e014ef2a5c481a537acb95b08a9546a79abd8df429300043ecf973545 -EBUILD kpathsea-6.3.3_p20210325-r1.ebuild 3401 BLAKE2B 5970b21f3806264c1932fbcb0f2ccedea39d702991f313ef9ba247d86a8c55d2137d462271e72b5583fd91754adede9e513a3dbbb57f70142c22b085597857af SHA512 7fecf314c49f7005cd0dea295720378d8f1a6ba1c02402aed23fee4c741526c4774fd0428d642b94e8a062b5a2952f40bc4ac8a43d17b91d2dc04b18489e1b5a +EBUILD kpathsea-6.3.3_p20210325-r1.ebuild 3425 BLAKE2B 5ea07b4c16f396e960fc3be2150fcee06e744e26526ba34066bf0f01714d8bb1e1b574898c161625f99f1a793b1e0b536b74c44cc43a97432eb1e528d1a57596 SHA512 3bc07c1409181841d0b96538792e21c66348708881a2633afb744e2b687a5554a201fcab59959bdbfa80052714b37f972d898849af97c5d1a2032b8bae9a8f72 MISC metadata.xml 448 BLAKE2B b21dc893e893d1436adc5c3b486139cbf75bd1dd49318b2d552692705a1398d5bcb5e9d7c8a7757abee8b995a127d56702d497d263cc8d0dd2bb2a1c7b8443c5 SHA512 de08adc50b3edccebe1b625acedca999aa7c9aa4b117aacb7d40e4e7e8d7952b4e1d684f0124127a19cb008022c9effce1cd5f38f0bd216258fac8c32c220dd5 diff --git a/dev-libs/kpathsea/kpathsea-6.3.3_p20210325-r1.ebuild b/dev-libs/kpathsea/kpathsea-6.3.3_p20210325-r1.ebuild index 45e773f12628..070d1bdb0646 100644 --- a/dev-libs/kpathsea/kpathsea-6.3.3_p20210325-r1.ebuild +++ b/dev-libs/kpathsea/kpathsea-6.3.3_p20210325-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,8 +9,8 @@ TEXMFD_VERSION="11" DESCRIPTION="Path searching library for TeX-related files" HOMEPAGE="http://tug.org/texlive/" -SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-${PV#*_p}-source.tar.xz - https://dev.gentoo.org/~zlogene/distfiles/texlive/${PN}-texmf.d-${TEXMFD_VERSION}.tar.xz" +SRC_URI="https://dev.gentoo.org/~{zlogene,sam}/distfiles/texlive/texlive-${PV#*_p}-source.tar.xz + https://dev.gentoo.org/~{zlogene,sam}/distfiles/texlive/${PN}-texmf.d-${TEXMFD_VERSION}.tar.xz" LICENSE="GPL-2" SLOT="0/${PV%_p*}" @@ -24,12 +24,12 @@ EXTRA_TL_MODULES="kpathsea" EXTRA_TL_DOC_MODULES="kpathsea.doc" for i in ${EXTRA_TL_MODULES} ; do - SRC_URI="${SRC_URI} https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-${i}-${TL_VERSION}.tar.xz" + SRC_URI="${SRC_URI} https://dev.gentoo.org/~{zlogene,sam}/distfiles/texlive/tl-${i}-${TL_VERSION}.tar.xz" done SRC_URI="${SRC_URI} doc? ( " for i in ${EXTRA_TL_DOC_MODULES} ; do - SRC_URI="${SRC_URI} https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-${i}-${TL_VERSION}.tar.xz" + SRC_URI="${SRC_URI} https://dev.gentoo.org/~{zlogene,sam}/distfiles/texlive/tl-${i}-${TL_VERSION}.tar.xz" done SRC_URI="${SRC_URI} ) " diff --git a/dev-libs/ptexenc/Manifest b/dev-libs/ptexenc/Manifest index 00f88ba5a86b..a1b14d43bff9 100644 --- a/dev-libs/ptexenc/Manifest +++ b/dev-libs/ptexenc/Manifest @@ -1,3 +1,3 @@ DIST texlive-20210325-source.tar.xz 54837368 BLAKE2B 66bd4bdd43ff53513004b9b9b90ababa0ab5efcf183a27864a3d39cde9cf90721456bda90c49ad6014f4b12d2e6293feaf9a8b152b85a89ffaa96bf5056347df SHA512 afd6eb24efaeac7c58d43ff24162aece919079a9ae02934509f068c7a3828223c33c14d9db11ff7fea3560b08a06f352446ba7f845eefb4a56a87b96f088f213 -EBUILD ptexenc-1.3.9_p20210325-r1.ebuild 1214 BLAKE2B dda36e9d453544da0c07f11c5062caf1db0635334904895d06b5b64b5d51c7f559c2e0e05a95e885a45b359a5ea27b9c8b83b6381ed9695524c52356f324c39d SHA512 0e966cc098cbabc3f4335fe93d3ace158bd243e4c1c38fd5f81bd71fcabec4f1d7770ce33e174c04590a21b659416e4cca5db05b888976ee3a1a521f4d195fa9 +EBUILD ptexenc-1.3.9_p20210325-r1.ebuild 1220 BLAKE2B 531ccc0473fffe876b2f8a09c5f215f02f8b198f32463cf29ec21e32d66acef1a675f85813b287ed1883011002af5422474db7477497d648aaf2bd415b5f2301 SHA512 6322b216a3cffd2409c6ebfb74e85c1599aac0be499dc9d448aaa9eb7b0769a726697cd5c39fd6996f45a809a618555bf5662212a671ee068b2847209b1cb6f6 MISC metadata.xml 246 BLAKE2B b56c934f8eecd3492d6abe15cf5883fdbc1979c37abbc5ad196e345ee17bb865db5eab10ac7de93bbfce94c4e865bf6b86d5f8bc081b5cb1d3d58d1158b81921 SHA512 b61f56c5e078714565ff9e33c81217e788f78bae9cf10d6ca78a82703a8e08119dff3afa68306eced0b7c62db9220d28efa4c9782e943c991e30b25b9ead82f5 diff --git a/dev-libs/ptexenc/ptexenc-1.3.9_p20210325-r1.ebuild b/dev-libs/ptexenc/ptexenc-1.3.9_p20210325-r1.ebuild index f3313148fcb3..176d2c975430 100644 --- a/dev-libs/ptexenc/ptexenc-1.3.9_p20210325-r1.ebuild +++ b/dev-libs/ptexenc/ptexenc-1.3.9_p20210325-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,7 +7,7 @@ inherit libtool DESCRIPTION="Library for Japanese pTeX providing a better way of handling character encodings" HOMEPAGE="http://tutimura.ath.cx/ptexlive/?ptexenc" -SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-${PV#*_p}-source.tar.xz" +SRC_URI="https://dev.gentoo.org/~{zlogene,sam}/distfiles/texlive/texlive-${PV#*_p}-source.tar.xz" S="${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}" LICENSE="BSD" |