diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2021-11-14 03:25:43 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2021-11-14 03:25:43 +0100 |
commit | b488c69504c18398563538ac62f6ef665cee068e (patch) | |
tree | 83daa4aee89cea0c42f3659b5f668189ed5195c9 /package | |
parent | b1c3b3703dab3635af772b7476bb185d87066f88 (diff) | |
parent | 9cb13ad8c7d0c7862949368006d78dfe1b079665 (diff) |
Merge branch 'master' of gogs.waldemar-brodkorb.de:oss/openadk
Diffstat (limited to 'package')
33 files changed, 144 insertions, 326 deletions
diff --git a/package/DirectFB/Makefile b/package/DirectFB/Makefile index e669ee059..c3fec321b 100644 --- a/package/DirectFB/Makefile +++ b/package/DirectFB/Makefile @@ -4,16 +4,16 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= DirectFB -PKG_VERSION:= 1.6.3 -PKG_RELEASE:= 3 -PKG_EXTRAVER:= 1.6-0 -PKG_HASH:= 7a96aced0f69b2ec0810e9923068e61c21e6b19dd593e09394c872414df75e70 +PKG_VERSION:= 1.7.7 +PKG_EXTRAVER:= 1.7-7 +PKG_RELEASE:= 1 +PKG_HASH:= b785c638dc31b8fe3a7c81be1475c89b2255ab3d67b777c747d3fbc52f8027a3 PKG_DESCR:= thin graphic library for framebuffer devices PKG_SECTION:= libs/image PKG_DEPENDS:= libpng libjpeg-turbo libfreetype PKG_BUILDDEP:= libpng libjpeg-turbo freetype PKG_URL:= http://www.directfb.org/ -PKG_SITES:= http://directfb.org/downloads/Core/DirectFB-1.6/ +PKG_SITES:= https://distfiles.openadk.org/ PKG_LIBNAME:= directfb PKG_OPTS:= dev diff --git a/package/c-ares/Makefile b/package/c-ares/Makefile index 49200cabc..6da3e7c7a 100644 --- a/package/c-ares/Makefile +++ b/package/c-ares/Makefile @@ -4,13 +4,13 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= c-ares -PKG_VERSION:= 1.16.1 +PKG_VERSION:= 1.18.1 PKG_RELEASE:= 1 -PKG_HASH:= d08312d0ecc3bd48eee0a4cc0d2137c9f194e0a28de2028928c0f6cae85f86ce +PKG_HASH:= 1a7d52a8a84a9fbffb1be9133c0f6e17217d91ea5a6fa61f6b4729cda78ebbcf PKG_DESCR:= asynchronous dns library PKG_SECTION:= libs/net -PKG_URL:= http://c-ares.haxx.se -PKG_SITES:= http://c-ares.haxx.se/download/ +PKG_URL:= https://c-ares.org +PKG_SITES:= https://c-ares.org/download/ PKG_OPTS:= dev DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz diff --git a/package/coreutils/Makefile b/package/coreutils/Makefile index 60d33c19a..f5a1585a2 100644 --- a/package/coreutils/Makefile +++ b/package/coreutils/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= coreutils -PKG_VERSION:= 8.25 +PKG_VERSION:= 9.0 PKG_RELEASE:= 1 -PKG_HASH:= 31e67c057a5b32a582f26408c789e11c2e8d676593324849dcf5779296cdce87 +PKG_HASH:= ce30acdf4a41bc5bb30dd955e9eaa75fa216b4e3deb08889ed32433c7b3b97ce PKG_DESCR:= file, shell and text utilities PKG_SECTION:= base/apps PKG_NEEDS:= threads @@ -19,7 +19,6 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call HOST_template,COREUTILS,coreutils,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,COREUTILS,coreutils,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -AUTOTOOL_STYLE:= autoreconf CONFIGURE_ARGS+= --disable-rpath coreutils-install: diff --git a/package/coreutils/patches/patch-Makefile_am b/package/coreutils/patches/patch-Makefile_am deleted file mode 100644 index 20f1fff1d..000000000 --- a/package/coreutils/patches/patch-Makefile_am +++ /dev/null @@ -1,27 +0,0 @@ ---- coreutils-8.24.orig/Makefile.am 2015-07-03 22:07:38.000000000 +0200 -+++ coreutils-8.24/Makefile.am 2015-07-06 20:55:18.000000000 +0200 -@@ -17,7 +17,7 @@ - - ALL_RECURSIVE_TARGETS = - --SUBDIRS = po . gnulib-tests -+SUBDIRS = . gnulib-tests - - changelog_etc = \ - ChangeLog-2005 \ -@@ -35,8 +35,7 @@ changelog_etc = \ - old/sh-utils/ChangeLog.0 \ - old/sh-utils/NEWS \ - old/textutils/ChangeLog \ -- old/textutils/NEWS \ -- po/ChangeLog-2007 -+ old/textutils/NEWS - - EXTRA_DIST = \ - $(changelog_etc) \ -@@ -223,5 +222,4 @@ AM_CPPFLAGS = -Ilib -I$(top_srcdir)/lib - include $(top_srcdir)/lib/local.mk - include $(top_srcdir)/src/local.mk - include $(top_srcdir)/doc/local.mk --include $(top_srcdir)/man/local.mk - include $(top_srcdir)/tests/local.mk diff --git a/package/coreutils/patches/patch-configure_ac b/package/coreutils/patches/patch-configure_ac deleted file mode 100644 index 2ec02088f..000000000 --- a/package/coreutils/patches/patch-configure_ac +++ /dev/null @@ -1,14 +0,0 @@ ---- coreutils-8.24.orig/configure.ac 2015-06-26 19:05:22.000000000 +0200 -+++ coreutils-8.24/configure.ac 2015-07-06 20:55:57.000000000 +0200 -@@ -589,11 +589,6 @@ AM_CONDITIONAL([CROSS_COMPILING], [test - - ############################################################################ - --# As long as "grep 'PRI[diouxX]' po/*.pot" reports matches in --# translatable strings, we must use need-formatstring-macros here. --AM_GNU_GETTEXT([external], [need-formatstring-macros]) --AM_GNU_GETTEXT_VERSION([0.19.2]) -- - # For a test of uniq: it uses the $LOCALE_FR envvar. - gt_LOCALE_FR - diff --git a/package/coreutils/patches/patch-man_local_mk b/package/coreutils/patches/patch-man_local_mk deleted file mode 100644 index 5bf9e5cc1..000000000 --- a/package/coreutils/patches/patch-man_local_mk +++ /dev/null @@ -1,16 +0,0 @@ ---- coreutils-8.22.orig/man/local.mk 2013-12-04 15:48:30.000000000 +0100 -+++ coreutils-8.22/man/local.mk 2014-02-21 16:08:08.000000000 +0100 -@@ -18,12 +18,7 @@ - - EXTRA_DIST += man/help2man man/dummy-man - --## Graceful degradation for systems lacking perl. --if HAVE_PERL --run_help2man = $(PERL) -- $(srcdir)/man/help2man --else --run_help2man = $(SHELL) $(srcdir)/man/dummy-man --endif -+run_help2man = echo - - man1_MANS = @man1_MANS@ - EXTRA_DIST += $(man1_MANS:.1=.x) diff --git a/package/curl/Makefile b/package/curl/Makefile index df4ac926a..916567912 100644 --- a/package/curl/Makefile +++ b/package/curl/Makefile @@ -4,16 +4,16 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= curl -PKG_VERSION:= 7.75.0 +PKG_VERSION:= 7.79.1 PKG_RELEASE:= 1 -PKG_HASH:= fe0c49d8468249000bda75bcfdf9e30ff7e9a86d35f1a21f428d79c389d55675 +PKG_HASH:= 0606f74b1182ab732a17c11613cbbaf7084f2e6cca432642d0e3ad7c224c3689 PKG_DESCR:= client-side url transfer tool PKG_SECTION:= net/http PKG_DEPENDS:= libcurl PKG_BUILDDEP:= zlib PKG_NEEDS:= threads -PKG_URL:= http://curl.haxx.se/ -PKG_SITES:= http://curl.haxx.se/download/ +PKG_URL:= https://curl.se/ +PKG_SITES:= https://curl.se/download/ PKG_LIBNAME:= libcurl PKG_OPTS:= dev @@ -44,6 +44,8 @@ $(eval $(call HOST_template,CURL,curl,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,CURL,curl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBCURL,libcurl,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBCURL},${PKGSD_LIBCURL},${PKGSC_LIBCURL},${PKG_OPTS})) +HOST_CONFIGURE_ARGS+= --without-ssl + ifeq (${ADK_PACKAGE_CURL_WITH_LIBRESSL},y) CONFIGURE_ARGS+= --with-ssl="${STAGING_TARGET_DIR}/usr" \ --without-gnutls \ diff --git a/package/daq/Makefile b/package/daq/Makefile index 536edead0..3e72dca8c 100644 --- a/package/daq/Makefile +++ b/package/daq/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= daq -PKG_VERSION:= 2.0.6 +PKG_VERSION:= 2.0.7 PKG_RELEASE:= 1 -PKG_HASH:= d41da5f7793e66044e6927dd868c0525e7ee4ec1a3515bf74ef9a30cd9273af0 +PKG_HASH:= d1f6709bc5dbddee3fdf170cdc1e49fb926e2031d4869ecf367a8c47efc87279 PKG_DESCR:= data acquisition library PKG_SECTION:= libs/misc PKG_DEPENDS:= libpcap libdnet diff --git a/package/fetchmail/Makefile b/package/fetchmail/Makefile index 16504d91d..b94227c61 100644 --- a/package/fetchmail/Makefile +++ b/package/fetchmail/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= fetchmail -PKG_VERSION:= 6.3.26 +PKG_VERSION:= 6.4.23 PKG_RELEASE:= 1 -PKG_HASH:= 79b4c54cdbaf02c1a9a691d9948fcb1a77a1591a813e904283a8b614b757e850 +PKG_HASH:= 5f7a5e13731431134a2ca535bbced7adc666d3aeb93169a0830945d91f492300 PKG_DESCR:= fetch mail from a pop3 or imap server PKG_SECTION:= net/mail PKG_URL:= http://www.fetchmail.info @@ -22,7 +22,7 @@ include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,FETCHMAIL,fetchmail,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -AUTOTOOL_STYLE:= autoreconf +CONFIGURE_ENV+= ac_cv_have_decl_TLS1_3_VERSION=no CONFIGURE_ARGS+= --without-hesiod ifeq (${ADK_PACKAGE_FETCHMAIL_WITH_LIBRESSL},y) diff --git a/package/fetchmail/patches/patch-config_h_in b/package/fetchmail/patches/patch-config_h_in deleted file mode 100644 index ec8b9c74e..000000000 --- a/package/fetchmail/patches/patch-config_h_in +++ /dev/null @@ -1,13 +0,0 @@ ---- fetchmail-6.3.26.orig/config.h.in 2013-04-23 23:36:55.000000000 +0200 -+++ fetchmail-6.3.26/config.h.in 2016-09-29 16:00:20.679625413 +0200 -@@ -53,6 +53,10 @@ - if you don't. */ - #undef HAVE_DECL_SSLV2_CLIENT_METHOD - -+/* Define to 1 if you have the declaration of `SSLv3_client_method', and to 0 -+ if you don't. */ -+#undef HAVE_DECL_SSLV3_CLIENT_METHOD -+ - /* Define to 1 if you have the declaration of `strerror', and to 0 if you - don't. */ - #undef HAVE_DECL_STRERROR diff --git a/package/fetchmail/patches/patch-configure_ac b/package/fetchmail/patches/patch-configure_ac deleted file mode 100644 index 7126bbc5f..000000000 --- a/package/fetchmail/patches/patch-configure_ac +++ /dev/null @@ -1,10 +0,0 @@ ---- fetchmail-6.3.26.orig/configure.ac 2013-04-23 22:51:10.000000000 +0200 -+++ fetchmail-6.3.26/configure.ac 2016-09-29 16:00:20.683625569 +0200 -@@ -803,6 +803,7 @@ fi - - case "$LIBS" in *-lssl*) - AC_CHECK_DECLS([SSLv2_client_method],,,[#include <openssl/ssl.h>]) -+ AC_CHECK_DECLS([SSLv3_client_method],,,[#include <openssl/ssl.h>]) - ;; - esac - diff --git a/package/fetchmail/patches/patch-fetchmail_c b/package/fetchmail/patches/patch-fetchmail_c deleted file mode 100644 index 160afa85d..000000000 --- a/package/fetchmail/patches/patch-fetchmail_c +++ /dev/null @@ -1,15 +0,0 @@ ---- fetchmail-6.3.26.orig/fetchmail.c 2013-04-23 22:00:45.000000000 +0200 -+++ fetchmail-6.3.26/fetchmail.c 2016-09-29 16:00:20.683625569 +0200 -@@ -263,6 +263,12 @@ int main(int argc, char **argv) - #ifdef SSL_ENABLE - "+SSL" - #endif -+#if HAVE_DECL_SSLV2_CLIENT_METHOD + 0 == 0 -+ "-SSLv2" -+#endif -+#if HAVE_DECL_SSLV3_CLIENT_METHOD + 0 == 0 -+ "-SSLv3" -+#endif - #ifdef OPIE_ENABLE - "+OPIE" - #endif /* OPIE_ENABLE */ diff --git a/package/fetchmail/patches/patch-mxget_c b/package/fetchmail/patches/patch-mxget_c deleted file mode 100644 index 2dd74e8a3..000000000 --- a/package/fetchmail/patches/patch-mxget_c +++ /dev/null @@ -1,127 +0,0 @@ -$Id$ ---- fetchmail-6.3.9.orig/mxget.c 2007-06-10 10:32:47.000000000 +0200 -+++ fetchmail-6.3.9/mxget.c 2009-06-12 22:24:29.000000000 +0200 -@@ -56,6 +56,123 @@ - /* minimum possible size of MX record in packet */ - #define MIN_MX_SIZE 8 /* corresp to "a.com 0" w/ terminating space */ - -+/* from bind9 package: */ -+/* -+Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") -+Copyright (C) 1996-2003 Internet Software Consortium. -+ -+Permission to use, copy, modify, and distribute this software for any -+purpose with or without fee is hereby granted, provided that the above -+copyright notice and this permission notice appear in all copies. -+ -+THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH -+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY -+AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, -+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM -+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE -+OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -+PERFORMANCE OF THIS SOFTWARE. -+ -+$Id: COPYRIGHT,v 1.9.18.3 2007/01/08 02:41:59 marka Exp $ -+ -+Portions Copyright (C) 1996-2001 Nominum, Inc. -+ -+Permission to use, copy, modify, and distribute this software for any -+purpose with or without fee is hereby granted, provided that the above -+copyright notice and this permission notice appear in all copies. -+ -+THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES -+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR -+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT -+OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -+*/ -+#define NS_TYPE_ELT 0x40 /*%< EDNS0 extended label -+type -+*/ -+#define NS_CMPRSFLGS 0xc0 /*%< Flag bits indicating name compression. */ -+#define DNS_LABELTYPE_BITSTRING 0x41 -+static int -+labellen(const u_char *lp) -+{ -+ int bitlen; -+ u_char l = *lp; -+ -+ if ((l & NS_CMPRSFLGS) == NS_CMPRSFLGS) { -+ /* should be avoided by the caller */ -+ return(-1); -+ } -+ -+ if ((l & NS_CMPRSFLGS) == NS_TYPE_ELT) { -+ if (l == DNS_LABELTYPE_BITSTRING) { -+ if ((bitlen = *(lp + 1)) == 0) -+ bitlen = 256; -+ return((bitlen + 7 ) / 8 + 1); -+ } -+ return(-1); /*%< unknwon ELT */ -+ } -+ return(l); -+} -+/*% -+ * Advance *ptrptr to skip over the compressed name it points at. -+ * -+ * return: -+ *\li 0 on success, -1 (with errno set) on failure. -+ */ -+int -+ns_name_skip(const u_char **ptrptr, const u_char *eom) -+{ -+ const u_char *cp; -+ u_int n; -+ int l; -+ -+ cp = *ptrptr; -+ while (cp < eom && (n = *cp++) != 0) { -+ /* Check for indirection. */ -+ switch (n & NS_CMPRSFLGS) { -+ case 0: /*%< normal case, n == len */ -+ cp += n; -+ continue; -+ case NS_TYPE_ELT: /*%< EDNS0 extended label */ -+ if ((l = labellen(cp - 1)) < 0) { -+// errno = EMSGSIZE; /*%< XXX */ -+ return(-1); -+ } -+ cp += l; -+ continue; -+ case NS_CMPRSFLGS: /*%< indirection */ -+ cp++; -+ break; -+ default: /*%< illegal type */ -+// errno = EMSGSIZE; -+ return (-1); -+ } -+ break; -+ } -+ if (cp > eom) { -+// errno = EMSGSIZE; -+ return (-1); -+ } -+ *ptrptr = cp; -+ return (0); -+} -+ -+/*% -+ * Skip over a compressed domain name. Return the size or -1. -+ */ -+int -+dn_skipname(const u_char *ptr, const u_char *eom) { -+ const u_char *saveptr = ptr; -+ -+ if (ns_name_skip(&ptr, eom) == -1) -+ return (-1); -+ return (ptr - saveptr); -+} -+/* End from Bind9 package */ -+ -+ - struct mxentry *getmxrecords(const char *name) - /* get MX records for given host */ - { diff --git a/package/fetchmail/patches/patch-socket_c b/package/fetchmail/patches/patch-socket_c index 54f6ff27a..a4e3f2dbf 100644 --- a/package/fetchmail/patches/patch-socket_c +++ b/package/fetchmail/patches/patch-socket_c @@ -1,20 +1,20 @@ ---- fetchmail-6.3.26.orig/socket.c 2013-04-23 22:00:45.000000000 +0200 -+++ fetchmail-6.3.26/socket.c 2016-09-29 16:00:20.683625569 +0200 -@@ -910,11 +910,16 @@ int SSLOpen(int sock, char *mycert, char - #if HAVE_DECL_SSLV2_CLIENT_METHOD + 0 > 0 - _ctx[sock] = SSL_CTX_new(SSLv2_client_method()); - #else -- report(stderr, GT_("Your operating system does not support SSLv2.\n")); -+ report(stderr, GT_("Your OpenSSL version does not support SSLv2.\n")); - return -1; +--- fetchmail-6.4.23.orig/socket.c 2021-08-28 11:13:58.000000000 +0200 ++++ fetchmail-6.4.23/socket.c 2021-11-12 23:58:36.082986247 +0100 +@@ -966,17 +966,9 @@ static int OSSL10X_proto_version_logic(i + report(stderr, GT_("Your OpenSSL version does not support TLS v1.2.\n")); + return -1; #endif - } else if(!strcasecmp("ssl3",myproto)) { -+#if HAVE_DECL_SSLV3_CLIENT_METHOD + 0 > 0 - _ctx[sock] = SSL_CTX_new(SSLv3_client_method()); -+#else -+ report(stderr, GT_("Your OpenSSL version does not support SSLv3.\n")); -+ return -1; -+#endif - } else if(!strcasecmp("tls1",myproto)) { - _ctx[sock] = SSL_CTX_new(TLSv1_client_method()); - } else if (!strcasecmp("ssl23",myproto)) { +-#if defined(TLS1_3_VERSION) +- } else if (!strcasecmp("tls1.3", *myproto)) { +- _ctx[sock] = SSL_CTX_new(TLSv1_3_client_method()); +- } else if (!strcasecmp("tls1.3+", *myproto)) { +- *myproto = NULL; +- *avoid_ssl_versions |= SSL_OP_NO_TLSv1 | SSL_OP_NO_TLSv1_1 | SSL_OP_NO_TLSv1_2; +-#else + } else if(!strcasecmp("tls1.3",*myproto) || !strcasecmp("tls1.3+", *myproto)) { + report(stderr, GT_("Your OpenSSL version does not support TLS v1.3.\n")); + return -1; +-#endif + } else if (!strcasecmp("ssl23", *myproto) + || 0 == strcasecmp("auto", *myproto)) + { diff --git a/package/gcr/Makefile b/package/gcr/Makefile index dae86a4dc..438d06c96 100644 --- a/package/gcr/Makefile +++ b/package/gcr/Makefile @@ -10,7 +10,7 @@ PKG_RELEASE:= 2 PKG_HASH:= 90572c626d8a708225560c42b4421f7941315247fa1679d4ef569bde7f4bb379 PKG_DESCR:= gnome keyring library PKG_SECTION:= libs/crypto -PKG_BUILDDEP:= p11-kit +PKG_BUILDDEP:= p11-kit intltool-host libgtk3 PKG_URL:= https://wiki.gnome.org/action/show/Projects/GnomeKeyring PKG_SITES:= http://ftp.acc.umu.se/pub/gnome/sources/gcr/$(PKG_EXTRAVER)/ diff --git a/package/gdk-pixbuf/Makefile b/package/gdk-pixbuf/Makefile index 1d4df4dfd..647b01aff 100644 --- a/package/gdk-pixbuf/Makefile +++ b/package/gdk-pixbuf/Makefile @@ -10,7 +10,7 @@ PKG_RELEASE:= 1 PKG_HASH:= d55e5b383ee219bd0e23bf6ed4427d56a7db5379729a6e3e0a0e0eba9a8d8879 PKG_DESCR:= image loading and pixel buffer manipulation library PKG_SECTION:= libs/image -PKG_BUILDDEP:= libjpeg-turbo libtiff +PKG_BUILDDEP:= libjpeg-turbo libtiff glib libpng HOST_BUILDDEP:= glib-host libffi-host PKG_NEEDS:= c++ PKG_SITES:= $(MASTER_SITE_GNOME:=gdk-pixbuf/$(PKG_EXTRAVER)/) diff --git a/package/glib/patches/patch-gobject-2_0_pc_in b/package/glib/patches/patch-gobject-2_0_pc_in new file mode 100644 index 000000000..7c00fc7b5 --- /dev/null +++ b/package/glib/patches/patch-gobject-2_0_pc_in @@ -0,0 +1,10 @@ +--- glib-2.56.1.orig/gobject-2.0.pc.in 2016-10-22 07:12:49.000000000 +0200 ++++ glib-2.56.1/gobject-2.0.pc.in 2021-11-04 05:31:24.191433397 +0100 +@@ -7,6 +7,6 @@ Name: GObject + Description: GLib Type, Object, Parameter and Signal Library + Requires: glib-2.0 + Version: @VERSION@ +-Libs: -L${libdir} -lgobject-2.0 ++Libs: -L${libdir} -lgobject-2.0 -lffi + Libs.private: @LIBFFI_LIBS@ + Cflags: diff --git a/package/glibc/Makefile b/package/glibc/Makefile index b046edda2..874ec2f8a 100644 --- a/package/glibc/Makefile +++ b/package/glibc/Makefile @@ -46,10 +46,6 @@ do-install: ifneq ($(ADK_TARGET_USE_STATIC_LIBS_ONLY),y) ${INSTALL_DIR} ${IDIR_GLIBC}/$(ADK_TARGET_LIBC_PATH) $(CP) $(STAGING_TARGET_DIR)/lib/ld*.so* $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH) -ifeq ($(ADK_TARGET_ARCH_RISCV64),y) - ${INSTALL_DIR} ${IDIR_GLIBC}/$(ADK_TARGET_LIBC_PATH)/$(ADK_TARGET_ABI_RISCV) - $(CP) $(STAGING_TARGET_DIR)/lib/$(ADK_TARGET_ABI_RISCV)/ld*.so* ${IDIR_GLIBC}/$(ADK_TARGET_LIBC_PATH)/$(ADK_TARGET_ABI_RISCV) -endif for file in libc libpthread librt libcrypt libdl libm libanl libnsl libresolv libutil libnss_dns libnss_files; do \ $(CP) $(STAGING_TARGET_DIR)/$(ADK_TARGET_LIBC_ABI_PATH)/$$file.so* $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH); \ #$(CP) $(STAGING_TARGET_DIR)/$(ADK_TARGET_LIBC_ABI_PATH)/$$file-$(PKG_GLIBCVER).so $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH); \ diff --git a/package/gstreamer/Makefile b/package/gstreamer/Makefile index 07d54db05..a59bbf7d1 100644 --- a/package/gstreamer/Makefile +++ b/package/gstreamer/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= gstreamer -PKG_VERSION:= 1.8.2 -PKG_RELEASE:= 2 -PKG_HASH:= 9dbebe079c2ab2004ef7f2649fa317cabea1feb4fb5605c24d40744b90918341 +PKG_VERSION:= 1.19.3 +PKG_RELEASE:= 1 +PKG_HASH:= 906d7d4bf92f941586c0cbce717d9cad6aac36994e16fa6f2f153e07e3221bca PKG_DESCR:= opensource multimedia framework PKG_SECTION:= libs/video PKG_BUILDDEP:= glib @@ -19,10 +19,15 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,GSTREAMER,gstreamer,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -CONFIGURE_ARGS+= --disable-examples \ - --disable-tests \ - --disable-benchmarks \ - --disable-checks +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson + +MESON_FLAGS+= -Dcheck=disabled \ + -Ddoc=disabled \ + -Dexamples=disabled gstreamer-install: $(INSTALL_DIR) $(IDIR_GSTREAMER)/usr/lib diff --git a/package/icu4c/Makefile b/package/icu4c/Makefile index c2baf3090..57851e92f 100644 --- a/package/icu4c/Makefile +++ b/package/icu4c/Makefile @@ -4,18 +4,18 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= icu4c -PKG_VERSION:= 54.1 -PKG_RELEASE:= 2 -PKG_HASH:= d42bc9a8ca6a91c55eb0925c279f49e5b508d51ef26ac9850d9be55de5bb8ab3 +PKG_VERSION:= 70.1 +PKG_RELEASE:= 1 +PKG_HASH:= 8d205428c17bf13bb535300669ed28b338a157b1c01ae66d31d0d3e2d47c3fd5 PKG_DESCR:= unicode and globalization library PKG_SECTION:= libs/misc PKG_BUILDDEP:= icu4c-host PKG_NEEDS:= c++ PKG_URL:= http://icu-project.org -PKG_SITES:= http://download.icu-project.org/files/icu4c/$(PKG_VERSION)/ +PKG_SITES:= https://github.com/unicode-org/icu/releases/download/release-70-1/ PKG_OPTS:= dev -DISTFILES:= ${PKG_NAME}-54_1-src.tgz +DISTFILES:= ${PKG_NAME}-70_1-src.tgz WRKDIST= ${WRKDIR}/icu/source diff --git a/package/kexec-tools/Makefile b/package/kexec-tools/Makefile index 55737c7cc..5275de348 100644 --- a/package/kexec-tools/Makefile +++ b/package/kexec-tools/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= kexec-tools -PKG_VERSION:= 2.0.20 +PKG_VERSION:= 2.0.23 PKG_RELEASE:= 1 -PKG_HASH:= dad8077f0315445d1f6335579fc4ade222facf82a67124974c7be5303ba4f8c8 +PKG_HASH:= aa63cd6c7dd95b06ceba6240a7fdc6792789cada75a655e6714987175224241b PKG_DESCR:= kernel exec tools PKG_SECTION:= sys/misc PKG_DEPENDS:= zlib diff --git a/package/libffi/Makefile b/package/libffi/Makefile index c94c40e9a..4fe839dce 100644 --- a/package/libffi/Makefile +++ b/package/libffi/Makefile @@ -4,14 +4,14 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= libffi -PKG_VERSION:= 3.3 +PKG_VERSION:= 3.4.2 PKG_RELEASE:= 1 -PKG_HASH:= 72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056 +PKG_HASH:= 540fb721619a6aba3bdeef7d940d8e9e0e6d2c193595bc243241b77ff9e93620 PKG_DESCR:= foreign function interface library PKG_SECTION:= libs/misc HOST_BUILDDEP:= libtool-host PKG_URL:= http://sourceware.org/libffi/ -PKG_SITES:= ftp://sourceware.org/pub/libffi/ +PKG_SITES:= https://github.com/libffi/libffi/releases/download/v${PKG_VERSION}/ PKG_OPTS:= dev DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz @@ -24,8 +24,8 @@ $(eval $(call PKG_template,LIBFFI,libffi,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEP AUTOTOOL_STYLE:= autoreconf HOST_STYLE:= auto -HOST_CONFIGURE_ARGS+= --disable-builddir --with-pic -CONFIGURE_ARGS+= --disable-builddir --with-pic +HOST_CONFIGURE_ARGS+= --disable-builddir --with-pic --disable-symvers +CONFIGURE_ARGS+= --disable-builddir --with-pic --disable-symvers ifeq ($(ADK_PACKAGE_OPENJDK7),y) CONFIGURE_ARGS+= --enable-static diff --git a/package/libtiff/Makefile b/package/libtiff/Makefile index 7c0e72fce..960605be8 100644 --- a/package/libtiff/Makefile +++ b/package/libtiff/Makefile @@ -4,13 +4,13 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= tiff -PKG_VERSION:= 4.0.8 +PKG_VERSION:= 4.3.0 PKG_RELEASE:= 1 -PKG_HASH:= 59d7a5a8ccd92059913f246877db95a2918e6c04fb9d43fd74e5c3390dac2910 +PKG_HASH:= 0e46e5acb087ce7d1ac53cf4f56a09b221537fc86dfc5daaad1c2e89e1b37ac8 PKG_DESCR:= library for reading/writing tiff images PKG_SECTION:= libs/image PKG_NEEDS:= c++ -PKG_BUILDDEP:= cmake-host zlib xz +PKG_BUILDDEP:= zlib xz PKG_URL:= http://simplesystems.org/libtiff/ PKG_SITES:= http://download.osgeo.org/libtiff/ PKG_LIBNAME:= libtiff @@ -22,8 +22,6 @@ include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBTIFF,libtiff,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -CONFIG_STYLE:= cmake - libtiff-install: ${INSTALL_DIR} ${IDIR_LIBTIFF}/usr/lib ${CP} ${WRKINST}/usr/lib/libtiff.so* ${IDIR_LIBTIFF}/usr/lib/ diff --git a/package/libtiff/patches/patch-libtiff-4_pc_in b/package/libtiff/patches/patch-libtiff-4_pc_in new file mode 100644 index 000000000..4cd57a213 --- /dev/null +++ b/package/libtiff/patches/patch-libtiff-4_pc_in @@ -0,0 +1,14 @@ +--- tiff-4.3.0.orig/libtiff-4.pc.in 2021-03-05 14:01:43.000000000 +0100 ++++ tiff-4.3.0/libtiff-4.pc.in 2021-11-06 16:42:35.662674034 +0100 +@@ -1,7 +1,7 @@ +-prefix=@prefix@ +-exec_prefix=@exec_prefix@ +-libdir=@libdir@ +-includedir=@includedir@ ++prefix=/usr ++exec_prefix=${prefix} ++libdir=${exec_prefix}/lib ++includedir=${prefix}/include + + Name: libtiff + Description: Tag Image File Format (TIFF) library. diff --git a/package/meson/Makefile b/package/meson/Makefile index 8799b5463..94716a688 100644 --- a/package/meson/Makefile +++ b/package/meson/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= meson -PKG_VERSION:= 0.55.3 +PKG_VERSION:= 0.60.1 PKG_RELEASE:= 1 -PKG_HASH:= 2b276df50c5b13ccdbfb14d3333141e9e7985aca31b60400b3f3e0be2ee6897e +PKG_HASH:= b06f7d621b90e094be0ea2157fa435648e069f19182d8d9402aa039727652b0c PKG_DESCR:= build utility PKG_SECTION:= dev/tools HOST_BUILDDEP:= python3-host ninja-host @@ -42,6 +42,13 @@ meson-hostinstall: $(WRKBUILD)/cross-compilation.conf.in \ > $(STAGING_HOST_DIR)/etc/meson/cross-compilation.conf sed -i "s/\"/'/g" $(STAGING_HOST_DIR)/etc/meson/cross-compilation.conf + sed -e "s%@HOST_CFLAGS@%`printf '"%s", ' $(HOST_CFLAGS)`%g" \ + -e "s%@HOST_LDFLAGS@%`printf '"%s", ' $(HOST_LDFLAGS)`%g" \ + -e "s%@HOST_CXXFLAGS@%`printf '"%s", ' $(HOST_CXXFLAGS)`%g" \ + -e "s%@STAGING_HOST_DIR@%$(STAGING_HOST_DIR)%g" \ + $(WRKBUILD)/host-compilation.conf.in \ + > $(STAGING_HOST_DIR)/etc/meson/host-compilation.conf + sed -i "s/\"/'/g" $(STAGING_HOST_DIR)/etc/meson/host-compilation.conf include ${ADK_TOPDIR}/mk/host-bottom.mk include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/meson/src/host-compilation.conf.in b/package/meson/src/host-compilation.conf.in new file mode 100644 index 000000000..c67cec76e --- /dev/null +++ b/package/meson/src/host-compilation.conf.in @@ -0,0 +1,12 @@ +# Note: OpenADK's and Meson's terminologies differ about the meaning +# of 'build', 'host' and 'target': +# - OpenADK's 'host' is Meson's 'build' +# - OpenADK's 'target' is Meson's 'host' + +[binaries] +pkgconfig = '@STAGING_HOST_DIR@/usr/bin/pkg-config' +[properties] +c_args = [@HOST_CFLAGS@] +c_link_args = [@HOST_LDFLAGS@] +cpp_args = [@HOST_CXXFLAGS@] +cpp_link_args = [@HOST_LDFLAGS@] diff --git a/package/p5-html-parser/Makefile b/package/p5-html-parser/Makefile index 188c2fb98..7f5f09d10 100644 --- a/package/p5-html-parser/Makefile +++ b/package/p5-html-parser/Makefile @@ -4,14 +4,14 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= p5-html-parser -PKG_VERSION:= 3.71 +PKG_VERSION:= 3.76 PKG_RELEASE:= 1 -PKG_HASH:= be918b3749d3ff93627f72ee4b825683332ecb4c81c67a3a8d72b0435ffbd802 +PKG_HASH:= 64d9e2eb2b420f1492da01ec0e6976363245b4be9290f03f10b7d2cb63fa2f61 PKG_DESCR:= html parser class PKG_SECTION:= dev/perl PKG_DEPENDS:= perl PKG_BUILDDEP:= perl-host perl -PKG_SITES:= http://cpan.metacpan.org/authors/id/G/GA/GAAS/ +PKG_SITES:= https://cpan.metacpan.org/authors/id/O/OA/OALDERS/ DISTFILES:= HTML-Parser-${PKG_VERSION}.tar.gz WRKDIST= ${WRKDIR}/HTML-Parser-${PKG_VERSION} diff --git a/package/popt/Makefile b/package/popt/Makefile index 89dbd91c9..0a36d6b81 100644 --- a/package/popt/Makefile +++ b/package/popt/Makefile @@ -4,17 +4,18 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= popt -PKG_VERSION:= 1.16 -PKG_RELEASE:= 4 -PKG_HASH:= e728ed296fe9f069a0e005003c3d6b2dde3d9cad453422a10d6558616d304cc8 +PKG_VERSION:= 1.18 +PKG_RELEASE:= 1 +PKG_HASH:= 36245242c59b5a33698388e415a3e1efa2d48fc4aead91aeb2810b4c0744f4e3 PKG_DESCR:= command line option parsing library PKG_SECTION:= libs/misc PKG_URL:= http://rpm5.org/ -PKG_SITES:= https://distfiles.openadk.org/ +PKG_SITES:= https://github.com/rpm-software-management/popt/archive/refs/tags/ PKG_LIBNAME:= libpopt PKG_OPTS:= dev -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}-release.tar.gz +WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_NAME}-${PKG_VERSION}-release include ${ADK_TOPDIR}/mk/host.mk include ${ADK_TOPDIR}/mk/package.mk @@ -22,6 +23,8 @@ include ${ADK_TOPDIR}/mk/package.mk $(eval $(call HOST_template,POPT,popt,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,LIBPOPT,libpopt,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +AUTOTOOL_STYLE:= autogen + libpopt-install: ${INSTALL_DIR} ${IDIR_LIBPOPT}/usr/lib ${CP} ${WRKINST}/usr/lib/libpopt.so* ${IDIR_LIBPOPT}/usr/lib diff --git a/package/popt/patches/patch-ltmain_sh b/package/popt/patches/patch-ltmain_sh deleted file mode 100644 index 821e07bad..000000000 --- a/package/popt/patches/patch-ltmain_sh +++ /dev/null @@ -1,11 +0,0 @@ ---- popt-1.16.orig/ltmain.sh 2010-05-04 22:55:45.000000000 +0200 -+++ popt-1.16/ltmain.sh 2011-02-05 23:13:17.000000000 +0100 -@@ -4765,7 +4765,7 @@ func_mode_link () - # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC - # @file GCC response files - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) -+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto*) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - func_append compile_command " $arg" diff --git a/package/ppp/patches/patch-pppd_plugins_rp-pppoe_plugin_c b/package/ppp/patches/patch-pppd_plugins_rp-pppoe_plugin_c index 6a8cb0d8c..d6ec94c69 100644 --- a/package/ppp/patches/patch-pppd_plugins_rp-pppoe_plugin_c +++ b/package/ppp/patches/patch-pppd_plugins_rp-pppoe_plugin_c @@ -1,10 +1,11 @@ ---- ppp-2.4.6.orig/pppd/plugins/rp-pppoe/plugin.c 2014-01-02 05:42:08.000000000 +0100 -+++ ppp-2.4.6/pppd/plugins/rp-pppoe/plugin.c 2014-06-05 20:42:29.000000000 +0200 -@@ -46,7 +46,6 @@ static char const RCSID[] = - #include <unistd.h> - #include <fcntl.h> - #include <signal.h> --#include <net/ethernet.h> +--- ppp-2.4.7.orig/pppd/plugins/rp-pppoe/plugin.c 2014-08-09 14:31:39.000000000 +0200 ++++ ppp-2.4.7/pppd/plugins/rp-pppoe/plugin.c 2021-11-04 04:11:17.756625845 +0100 +@@ -49,6 +49,8 @@ static char const RCSID[] = + #include <net/ethernet.h> #include <net/if_arp.h> #include <linux/ppp_defs.h> ++#define _LINUX_IN_H ++#define _LINUX_IN6_H #include <linux/if_pppox.h> + + #ifndef _ROOT_PATH diff --git a/package/qingy/Makefile b/package/qingy/Makefile index 26e508d80..1a59fdb4f 100644 --- a/package/qingy/Makefile +++ b/package/qingy/Makefile @@ -21,6 +21,7 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,QINGY,qingy,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +TARGET_CFLAGS+= -fcommon TARGET_LDFLAGS+= -ltinfo CONFIGURE_ARGS+= --disable-screen-savers \ --disable-optimizations \ diff --git a/package/rsync/Makefile b/package/rsync/Makefile index 78147b6bb..52e9b6f2c 100644 --- a/package/rsync/Makefile +++ b/package/rsync/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= rsync -PKG_VERSION:= 3.2.2 +PKG_VERSION:= 3.2.3 PKG_RELEASE:= 1 -PKG_HASH:= 644bd3841779507665211fd7db8359c8a10670c57e305b4aab61b4e40037afa8 +PKG_HASH:= becc3c504ceea499f4167a260040ccf4d9f2ef9499ad5683c179a697146ce50e PKG_DESCR:= utility that provides fast incremental file transfer PKG_SECTION:= net/misc PKG_DEPENDS:= libpopt @@ -28,6 +28,7 @@ HOST_CONFIGURE_ARGS:= --disable-xxhash \ --disable-lz4 CONFIGURE_ARGS:= --disable-xxhash \ --disable-zstd \ + --disable-simd \ --disable-lz4 rsync-install: diff --git a/package/wolfssl/Makefile b/package/wolfssl/Makefile index 4a390a114..2e6841ca4 100644 --- a/package/wolfssl/Makefile +++ b/package/wolfssl/Makefile @@ -4,21 +4,23 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= wolfssl -PKG_VERSION:= 3.13.0 +PKG_VERSION:= 5.0.0 PKG_RELEASE:= 1 -PKG_HASH:= 196a3256a9044ecb89504ce77850342c82e676e7f2cad77f5584be3516b6060e +PKG_HASH:= 908390282cc613a3943533f3d922b3c18dee3289f498b6f944cb86a19a5eeb56 PKG_DESCR:= portable embedded ssl library PKG_SECTION:= libs/crypto PKG_URL:= http://www.wolfssl.com -PKG_SITES:= http://distfiles.openadk.org/ +PKG_SITES:= https://github.com/wolfSSL/wolfssl/archive/refs/tags/ PKG_OPTS:= dev -DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).zip +DISTFILES:= v$(PKG_VERSION)-stable.tar.gz +WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION}-stable include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,WOLFSSL,wolfssl,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) +AUTOTOOL_STYLE:= autogen CONFIGURE_ARGS+= --disable-examples CONFIGURE_ENV+= C_EXTRA_FLAGS='$(TARGET_CFLAGS)' |