diff --git a/devel/gcc/patches/020-disable-check-for-sys-sdt-h.patch b/devel/gcc/patches/020-disable-check-for-sys-sdt-h.patch new file mode 100644 index 00000000..51bb1485 --- /dev/null +++ b/devel/gcc/patches/020-disable-check-for-sys-sdt-h.patch @@ -0,0 +1,46 @@ +@@ -0,0 +1,45 @@ +diff --git a/gcc/configure b/gcc/configure +index 3793681..bcda752 100755 +--- a/gcc/configure ++++ b/gcc/configure +@@ -26876,19 +26876,6 @@ $as_echo "#define TARGET_LIBC_PROVIDES_SSP 1" >>confdefs.h + + fi + +-# Test for on the target. +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking sys/sdt.h in the target C library" >&5 +-$as_echo_n "checking sys/sdt.h in the target C library... " >&6; } +-have_sys_sdt_h=no +-if test -f $target_header_dir/sys/sdt.h; then +- have_sys_sdt_h=yes +- +-$as_echo "#define HAVE_SYS_SDT_H 1" >>confdefs.h +- +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_sys_sdt_h" >&5 +-$as_echo "$have_sys_sdt_h" >&6; } + + # Check if TFmode long double should be used by default or not. + # Some glibc targets used DFmode long double, but with glibc 2.4 +diff --git a/gcc/configure.ac b/gcc/configure.ac +index 3ee1d67..e321218 100644 +--- a/gcc/configure.ac ++++ b/gcc/configure.ac +@@ -4796,16 +4796,6 @@ if test x$gcc_cv_libc_provides_ssp = xyes; then + [Define if your target C library provides stack protector support]) + fi + +-# Test for on the target. +-GCC_TARGET_TEMPLATE([HAVE_SYS_SDT_H]) +-AC_MSG_CHECKING(sys/sdt.h in the target C library) +-have_sys_sdt_h=no +-if test -f $target_header_dir/sys/sdt.h; then +- have_sys_sdt_h=yes +- AC_DEFINE(HAVE_SYS_SDT_H, 1, +- [Define if your target C library provides sys/sdt.h]) +-fi +-AC_MSG_RESULT($have_sys_sdt_h) + + # Check if TFmode long double should be used by default or not. + # Some glibc targets used DFmode long double, but with glibc 2.4 diff --git a/devel/gcc/patches/970-replace-memcpy-memset.patch b/devel/gcc/patches/970-replace-memcpy-memset.patch new file mode 100644 index 00000000..c0680b5e --- /dev/null +++ b/devel/gcc/patches/970-replace-memcpy-memset.patch @@ -0,0 +1,44 @@ +diff --recursive -u gcc-7.4.0-vanilla/libitm/beginend.cc gcc-7.4.0/libitm/beginend.cc +--- gcc-7.4.0-vanilla/libitm/beginend.cc 2017-01-01 07:07:43.905435000 -0500 ++++ gcc-7.4.0/libitm/beginend.cc 2019-11-09 00:31:10.093128945 -0500 +@@ -431,7 +431,7 @@ + // Save everything that we might have to restore on restarts or aborts. + jb = tx->jb; + undolog_size = tx->undolog.size(); +- memcpy(&alloc_actions, &tx->alloc_actions, sizeof(alloc_actions)); ++ alloc_actions = tx->alloc_actions; + user_actions_size = tx->user_actions.size(); + id = tx->id; + prop = tx->prop; +@@ -449,7 +449,7 @@ + // commits of nested transactions. Allocation actions must be committed + // before committing the snapshot. + tx->jb = jb; +- memcpy(&tx->alloc_actions, &alloc_actions, sizeof(alloc_actions)); ++ tx->alloc_actions = alloc_actions; + tx->id = id; + tx->prop = prop; + } +@@ -485,7 +485,7 @@ + prop = cp->prop; + if (cp->disp != abi_disp()) + set_abi_disp(cp->disp); +- memcpy(&alloc_actions, &cp->alloc_actions, sizeof(alloc_actions)); ++ alloc_actions = cp->alloc_actions; + nesting = cp->nesting; + } + else +diff --recursive -u gcc-7.4.0-vanilla/libitm/method-ml.cc gcc-7.4.0/libitm/method-ml.cc +--- gcc-7.4.0-vanilla/libitm/method-ml.cc 2017-01-01 07:07:43.905435000 -0500 ++++ gcc-7.4.0/libitm/method-ml.cc 2019-11-09 01:12:58.674388557 -0500 +@@ -138,7 +138,9 @@ + // This store is only executed while holding the serial lock, so relaxed + // memory order is sufficient here. Same holds for the memset. + time.store(0, memory_order_relaxed); +- memset(orecs, 0, sizeof(atomic) * L2O_ORECS); ++ void *p = orecs; ++ memset(p, 0, sizeof(atomic) * L2O_ORECS); ++ + } + }; + diff --git a/libs/libuv/Makefile b/libs/libuv/Makefile index 80c8b678..de49ee37 100644 --- a/libs/libuv/Makefile +++ b/libs/libuv/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libuv -PKG_VERSION:=1.32.0 +PKG_VERSION:=1.34.2 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://dist.libuv.org/dist/v$(PKG_VERSION)/ -PKG_HASH:=203927683d53d1b82eee766c8ffecfa8ed0e392679c15d5ad3a23504eda0ed1f +PKG_HASH:=65d93b4504ef5f3ec784c0c186f4ba8abd1031292c7f15dda8111d7e319adf46 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-v$(PKG_VERSION) PKG_MAINTAINER:=Marko Ratkaj diff --git a/libs/libuvc/Makefile b/libs/libuvc/Makefile index 063c478b..08dc939f 100644 --- a/libs/libuvc/Makefile +++ b/libs/libuvc/Makefile @@ -8,19 +8,18 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libuvc -PKG_VERSION=0.0.5-20140812-$(PKG_SOURCE_VERSION) +PKG_VERSION:=0.0.6 PKG_RELEASE:=1 PKG_MAINTAINER:=Roger D -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/ktossell/libuvc.git -PKG_SOURCE_VERSION:=2c6403405872aa865999b95ba15944295adf6c38 - -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_MIRROR_HASH:=93f33620e00276989211d9c129a6d8b5e0f45df8d23235ff0c53c823c52a5ef5 -PKG_LICENSE:=BSD +PKG_SOURCE_URL:=https://codeload.github.com/ktossell/libuvc/tar.gz/v$(PKG_VERSION)? +PKG_HASH:=42175a53c1c704365fdc782b44233925e40c9344fbb7f942181c1090f06e2873 +PKG_LICENSE:=BSD +PKG_LICENSE_FILES:=LICENSE.txt + +PKG_BUILD_PARALLEL:=1 PKG_INSTALL:=1 CMAKE_INSTALL:=1 @@ -32,11 +31,11 @@ define Package/libuvc CATEGORY:=Libraries TITLE:=libuvc DEPENDS:=+libusb-1.0 +libjpeg - URL:=https://int80k.com/libuvc + URL:=https://int80k.com/libuvc endef define Package/libuvc/description - This package contains libuvc is a cross-platform library for USB video devices, + This package contains libuvc is a cross-platform library for USB video devices, built atop libusb. endef diff --git a/libs/uw-imap/Makefile b/libs/uw-imap/Makefile index 9fe5509c..ab820225 100644 --- a/libs/uw-imap/Makefile +++ b/libs/uw-imap/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=uw-imap PKG_VERSION:=2007f -PKG_RELEASE:=1 +PKG_RELEASE:=3 PKG_SOURCE:=imap-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:= \ diff --git a/libs/uw-imap/patches/010-imap-2007f-openssl-1.1.patch b/libs/uw-imap/patches/010-imap-2007f-openssl-1.1.patch new file mode 100644 index 00000000..1aa36ee2 --- /dev/null +++ b/libs/uw-imap/patches/010-imap-2007f-openssl-1.1.patch @@ -0,0 +1,86 @@ +From c3f68d987c00284d91ad6599a013b7111662545b Mon Sep 17 00:00:00 2001 +From: Sebastian Andrzej Siewior +Date: Fri, 2 Sep 2016 21:33:33 +0000 +Subject: [PATCH] uw-imap: compile against openssl 1.1.0 + +I *think* I replaced access to cert->name with certificate's subject name. I +assume that the re-aranged C-code is doing the same thing. A double check +wouldn't hurt :) + +Signed-off-by: Sebastian Andrzej Siewior +--- + src/osdep/unix/ssl_unix.c | 28 +++++++++++++++++----------- + 1 file changed, 17 insertions(+), 11 deletions(-) + +diff --git a/src/osdep/unix/ssl_unix.c b/src/osdep/unix/ssl_unix.c +index 3bfdff3..836e9fa 100644 +--- a/src/osdep/unix/ssl_unix.c ++++ b/src/osdep/unix/ssl_unix.c +@@ -59,7 +59,7 @@ typedef struct ssl_stream { + static SSLSTREAM *ssl_start(TCPSTREAM *tstream,char *host,unsigned long flags); + static char *ssl_start_work (SSLSTREAM *stream,char *host,unsigned long flags); + static int ssl_open_verify (int ok,X509_STORE_CTX *ctx); +-static char *ssl_validate_cert (X509 *cert,char *host); ++static char *ssl_validate_cert (X509 *cert,char *host, char *cert_subj); + static long ssl_compare_hostnames (unsigned char *s,unsigned char *pat); + static char *ssl_getline_work (SSLSTREAM *stream,unsigned long *size, + long *contd); +@@ -210,6 +210,7 @@ static char *ssl_start_work (SSLSTREAM *stream,char *host,unsigned long flags) + BIO *bio; + X509 *cert; + unsigned long sl,tl; ++ char cert_subj[250]; + char *s,*t,*err,tmp[MAILTMPLEN]; + sslcertificatequery_t scq = + (sslcertificatequery_t) mail_parameters (NIL,GET_SSLCERTIFICATEQUERY,NIL); +@@ -266,14 +267,19 @@ static char *ssl_start_work (SSLSTREAM *stream,char *host,unsigned long flags) + if (SSL_write (stream->con,"",0) < 0) + return ssl_last_error ? ssl_last_error : "SSL negotiation failed"; + /* need to validate host names? */ +- if (!(flags & NET_NOVALIDATECERT) && +- (err = ssl_validate_cert (cert = SSL_get_peer_certificate (stream->con), +- host))) { +- /* application callback */ +- if (scq) return (*scq) (err,host,cert ? cert->name : "???") ? NIL : ""; ++ if (!(flags & NET_NOVALIDATECERT)) { ++ ++ cert_subj[0] = '\0'; ++ cert = SSL_get_peer_certificate(stream->con); ++ if (cert) ++ X509_NAME_oneline(X509_get_subject_name(cert), cert_subj, sizeof(cert_subj)); ++ err = ssl_validate_cert (cert, host, cert_subj); ++ if (err) ++ /* application callback */ ++ if (scq) return (*scq) (err,host,cert ? cert_subj : "???") ? NIL : ""; + /* error message to return via mm_log() */ +- sprintf (tmp,"*%.128s: %.255s",err,cert ? cert->name : "???"); +- return ssl_last_error = cpystr (tmp); ++ sprintf (tmp,"*%.128s: %.255s",err,cert ? cert_subj : "???"); ++ return ssl_last_error = cpystr (tmp); + } + return NIL; + } +@@ -313,7 +319,7 @@ static int ssl_open_verify (int ok,X509_STORE_CTX *ctx) + * Returns: NIL if validated, else string of error message + */ + +-static char *ssl_validate_cert (X509 *cert,char *host) ++static char *ssl_validate_cert (X509 *cert,char *host, char *cert_subj) + { + int i,n; + char *s,*t,*ret; +@@ -322,9 +328,9 @@ static char *ssl_validate_cert (X509 *cert,char *host) + /* make sure have a certificate */ + if (!cert) ret = "No certificate from server"; + /* and that it has a name */ +- else if (!cert->name) ret = "No name in certificate"; ++ else if (cert_subj[0] == '\0') ret = "No name in certificate"; + /* locate CN */ +- else if (s = strstr (cert->name,"/CN=")) { ++ else if (s = strstr (cert_subj,"/CN=")) { + if (t = strchr (s += 4,'/')) *t = '\0'; + /* host name matches pattern? */ + ret = ssl_compare_hostnames (host,s) ? NIL : +-- +2.9.3 + diff --git a/libs/uw-imap/patches/020-deprecated-openssl.patch b/libs/uw-imap/patches/020-deprecated-openssl.patch new file mode 100644 index 00000000..41ea0e52 --- /dev/null +++ b/libs/uw-imap/patches/020-deprecated-openssl.patch @@ -0,0 +1,12 @@ +diff --git a/src/osdep/unix/ssl_unix.c b/src/osdep/unix/ssl_unix.c +index 3bfdff3..3ed1cb5 100644 +--- a/src/osdep/unix/ssl_unix.c ++++ b/src/osdep/unix/ssl_unix.c +@@ -35,6 +35,7 @@ + #include + #include + #include ++#include + #undef crypt + + #define SSLBUFLEN 8192 diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index 060b5d85..8038e3d5 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -371,7 +371,7 @@ endef define Package/libffmpeg-full $(call Package/libffmpeg/Default) TITLE+= (full) - DEPENDS+= +alsa-lib +PACKAGE_libopus:libopus \ + DEPENDS+= +alsa-lib +libopus \ +SOFT_FLOAT:shine \ +!SOFT_FLOAT:lame-lib \ +PACKAGE_libx264:libx264 \ diff --git a/net/ddns-scripts/files/update_cloudflare_com_v4.sh b/net/ddns-scripts/files/update_cloudflare_com_v4.sh index f78bce0b..baab937e 100755 --- a/net/ddns-scripts/files/update_cloudflare_com_v4.sh +++ b/net/ddns-scripts/files/update_cloudflare_com_v4.sh @@ -29,6 +29,7 @@ # used variables local __HOST __DOMAIN __TYPE __URLBASE __PRGBASE __RUNPROG __DATA __IPV6 __ZONEID __RECID __PROXIED local __URLBASE="https://api.cloudflare.com/client/v4" +local __TTL=120 # split __HOST __DOMAIN from $domain # given data: @@ -84,7 +85,7 @@ cloudflare_transfer() { done # check for error - grep -q '"success":true' $DATFILE || { + grep -q '"success":\s*true' $DATFILE || { write_log 4 "CloudFlare reported an error:" write_log 7 "$(cat $DATFILE)" # report error return 1 # HTTP-Fehler @@ -127,13 +128,12 @@ fi __PRGBASE="$__PRGBASE --header 'X-Auth-Email: $username' " __PRGBASE="$__PRGBASE --header 'X-Auth-Key: $password' " __PRGBASE="$__PRGBASE --header 'Content-Type: application/json' " -# __PRGBASE="$__PRGBASE --header 'Accept: application/json' " # read zone id for registered domain.TLD __RUNPROG="$__PRGBASE --request GET '$__URLBASE/zones?name=$__DOMAIN'" cloudflare_transfer || return 1 # extract zone id -__ZONEID=$(grep -o '"id":"[^"]*' $DATFILE | grep -o '[^"]*$' | head -1) +__ZONEID=$(grep -o '"id":\s*"[^"]*' $DATFILE | grep -o '[^"]*$' | head -1) [ -z "$__ZONEID" ] && { write_log 4 "Could not detect 'zone id' for domain.tld: '$__DOMAIN'" return 127 @@ -143,14 +143,14 @@ __ZONEID=$(grep -o '"id":"[^"]*' $DATFILE | grep -o '[^"]*$' | head -1) __RUNPROG="$__PRGBASE --request GET '$__URLBASE/zones/$__ZONEID/dns_records?name=$__HOST&type=$__TYPE'" cloudflare_transfer || return 1 # extract record id -__RECID=$(grep -o '"id":"[^"]*' $DATFILE | grep -o '[^"]*$' | head -1) +__RECID=$(grep -o '"id":\s*"[^"]*' $DATFILE | grep -o '[^"]*$' | head -1) [ -z "$__RECID" ] && { write_log 4 "Could not detect 'record id' for host.domain.tld: '$__HOST'" return 127 } # extract current stored IP -__DATA=$(grep -o '"content":"[^"]*' $DATFILE | grep -o '[^"]*$' | head -1) +__DATA=$(grep -o '"content":\s*"[^"]*' $DATFILE | grep -o '[^"]*$' | head -1) # check data [ $use_ipv6 -eq 0 ] \ @@ -178,11 +178,11 @@ __DATA=$(grep -o '"content":"[^"]*' $DATFILE | grep -o '[^"]*$' | head -1) # update is needed # let's build data to send # set proxied parameter -__PROXIED=$(grep -o '"proxied":[^",]*' $DATFILE | grep -o '[^:]*$') +__PROXIED=$(grep -o '"proxied":\s*[^",]*' $DATFILE | grep -o '[^:]*$') # use file to work around " needed for json cat > $DATFILE << EOF -{"id":"$__ZONEID","type":"$__TYPE","name":"$__HOST","content":"$__IP","proxied":$__PROXIED} +{"id":"$__ZONEID","type":"$__TYPE","name":"$__HOST","content":"$__IP","ttl":$__TTL,"proxied":$__PROXIED} EOF # let's complete transfer command @@ -190,4 +190,3 @@ __RUNPROG="$__PRGBASE --request PUT --data @$DATFILE '$__URLBASE/zones/$__ZONEID cloudflare_transfer || return 1 return 0 - diff --git a/net/miniupnpd/files/upnpd.config b/net/miniupnpd/files/upnpd.config index 9a65bfa6..682bf81c 100644 --- a/net/miniupnpd/files/upnpd.config +++ b/net/miniupnpd/files/upnpd.config @@ -1,17 +1,17 @@ config upnpd config - option enabled 0 + option enabled 1 option enable_natpmp 1 option enable_upnp 1 option secure_mode 1 option log_output 0 - option download 1024 - option upload 512 - #by default, looked up dynamically from ubus + option download 20480 + option upload 2048 + #by default, looked up dynamically from ubus #option external_iface wan option internal_iface lan option port 5000 option upnp_lease_file /var/upnp.leases - + config perm_rule option action allow option ext_ports 1024-65535 @@ -20,8 +20,8 @@ config perm_rule option comment "Allow high ports" config perm_rule - option action deny - option ext_ports 0-65535 - option int_addr 0.0.0.0/0 - option int_ports 0-65535 - option comment "Default deny" + option action deny + option ext_ports 0-65535 + option int_addr 0.0.0.0/0 + option int_ports 0-65535 + option comment "Default deny" diff --git a/sound/forked-daapd/Makefile b/sound/forked-daapd/Makefile index f0a7b5a3..37055296 100644 --- a/sound/forked-daapd/Makefile +++ b/sound/forked-daapd/Makefile @@ -35,7 +35,7 @@ URL:=https://github.com/ejurgensen/forked-daapd DEPENDS:=+libgpg-error +libgcrypt +libgdbm +zlib +libexpat +libunistring \ +libevent2 +libdaemon +libantlr3c +confuse +libopus +alsa-lib +libffmpeg-full \ +mxml +libavahi-client +sqlite3-cli +libplist +libcurl +libjson-c \ - +libprotobuf-c +libgnutls +libsodium +libwebsockets $(ICONV_DEPENDS) + +libprotobuf-c +libgnutls +libsodium +libwebsockets-full $(ICONV_DEPENDS) endef define Package/forked-daapd/description @@ -58,7 +58,7 @@ CONFIGURE_ARGS += \ --enable-webinterface \ --disable-spotify \ --with-libplist \ - --with-libwebsockets \ + --with-libwebsockets-full \ --with-alsa \ --without-pulseaudio \ --without-libevent_pthreads diff --git a/sound/pulseaudio/Makefile b/sound/pulseaudio/Makefile index 9d8d8efb..1688f7c3 100644 --- a/sound/pulseaudio/Makefile +++ b/sound/pulseaudio/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2011-2016 OpenWrt.org +# Copyright (C) 2011-2018 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,24 +8,23 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pulseaudio -PKG_VERSION:=11.1 -PKG_RELEASE:=2 +PKG_VERSION:=12.2 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://freedesktop.org/software/pulseaudio/releases/ -PKG_HASH:=f2521c525a77166189e3cb9169f75c2ee2b82fa3fcf9476024fbc2c3a6c9cd9e -PKG_LICENSE:=LGPL-2.1+ -PKG_LICENSE_FILES:=GPL LICENSE +PKG_HASH:=809668ffc296043779c984f53461c2b3987a45b7a25eb2f0a1d11d9f23ba4055 -PKG_BUILD_DEPENDS:=intltool/host +PKG_LICENSE:=LGPL-2.1-or-later +PKG_LICENSE_FILES:=GPL LICENSE +PKG_CPE_ID:=cpe:/a:pulseaudio:pulseaudio PKG_FIXUP:=autoreconf +PKG_INSTALL:=1 +PKG_BUILD_PARALLEL:=1 +PKG_BUILD_DEPENDS:=intltool/host glib2/host PKG_USE_MIPS16:=0 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) - -PKG_INSTALL = 1 - include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk @@ -49,7 +48,6 @@ endef define Package/pulseaudio-daemon-avahi $(call Package/pulseaudio/Default) DEPENDS+=+dbus +libavahi-client +sbc -# DEPENDS+=+avahi-daemon TITLE+= (avahi/bluez) VARIANT:=avahi endef @@ -119,11 +117,11 @@ CONFIGURE_ARGS += \ --disable-jack \ --disable-asyncns \ --disable-lirc \ + --disable-tests \ --disable-udev \ --without-fftw \ --without-soxr \ --without-speex -# --disable-bluez ifeq ($(BUILD_VARIANT),avahi) CONFIGURE_ARGS += \ @@ -140,9 +138,6 @@ endif CONFIGURE_VARS += \ PKG_CONFIG_LIBDIR="$(STAGING_DIR)/usr/lib/pkgconfig" -#SUPP_LIBS:=-L$(INTL_PREFIX)/lib -L$(ICONV_PREFIX)/lib -TARGET_CFLAGS += -std=gnu99 - define Build/InstallDev $(INSTALL_DIR) \ $(1)/usr/lib/pkgconfig \ diff --git a/sound/pulseaudio/patches/010-also-include.patch b/sound/pulseaudio/patches/010-also-include.patch new file mode 100644 index 00000000..aec5b17a --- /dev/null +++ b/sound/pulseaudio/patches/010-also-include.patch @@ -0,0 +1,130 @@ +From 993d3fd89e5611997f1e165bf03edefb0204b0a4 Mon Sep 17 00:00:00 2001 +From: Olaf Hering +Date: Wed, 27 Mar 2019 09:35:05 +0100 +Subject: [PATCH] alsa: Use correct header path + +Consumers are expected to use instead of +. + +This is in preparation of an change to pkgconfig(alsa) to +not pollute CFLAGS with -I/usr/include/alsa anymore. + +Signed-off-by: Olaf Hering +--- + src/modules/alsa/alsa-mixer.c | 2 +- + src/modules/alsa/alsa-mixer.h | 2 +- + src/modules/alsa/alsa-sink.c | 2 +- + src/modules/alsa/alsa-source.c | 2 +- + src/modules/alsa/alsa-ucm.c | 2 +- + src/modules/alsa/alsa-util.c | 2 +- + src/modules/alsa/alsa-util.h | 2 +- + src/modules/alsa/module-alsa-source.c | 2 +- + 8 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c +index 5cb99c8fd..cd99a75f8 100644 +--- a/src/modules/alsa/alsa-mixer.c ++++ b/src/modules/alsa/alsa-mixer.c +@@ -23,7 +23,7 @@ + #endif + + #include +-#include ++#include + #include + + #ifdef HAVE_VALGRIND_MEMCHECK_H +diff --git a/src/modules/alsa/alsa-mixer.h b/src/modules/alsa/alsa-mixer.h +index 3ea4d7329..65b071165 100644 +--- a/src/modules/alsa/alsa-mixer.h ++++ b/src/modules/alsa/alsa-mixer.h +@@ -21,7 +21,7 @@ + along with PulseAudio; if not, see . + ***/ + +-#include ++#include + + #include + #include +diff --git a/src/modules/alsa/alsa-sink.c b/src/modules/alsa/alsa-sink.c +index 28143402a..4b46708ce 100644 +--- a/src/modules/alsa/alsa-sink.c ++++ b/src/modules/alsa/alsa-sink.c +@@ -25,7 +25,7 @@ + #include + #include + +-#include ++#include + + #ifdef HAVE_VALGRIND_MEMCHECK_H + #include +diff --git a/src/modules/alsa/alsa-source.c b/src/modules/alsa/alsa-source.c +index 8129220b0..c8bf649e1 100644 +--- a/src/modules/alsa/alsa-source.c ++++ b/src/modules/alsa/alsa-source.c +@@ -25,7 +25,7 @@ + #include + #include + +-#include ++#include + + #include + #include +diff --git a/src/modules/alsa/alsa-ucm.c b/src/modules/alsa/alsa-ucm.c +index 341c8012e..0a40ca8fe 100644 +--- a/src/modules/alsa/alsa-ucm.c ++++ b/src/modules/alsa/alsa-ucm.c +@@ -27,7 +27,7 @@ + #include + #include + #include +-#include ++#include + + #ifdef HAVE_VALGRIND_MEMCHECK_H + #include +diff --git a/src/modules/alsa/alsa-util.c b/src/modules/alsa/alsa-util.c +index e8d712e72..bd0a47e50 100644 +--- a/src/modules/alsa/alsa-util.c ++++ b/src/modules/alsa/alsa-util.c +@@ -23,7 +23,7 @@ + #endif + + #include +-#include ++#include + + #include + #include +diff --git a/src/modules/alsa/alsa-util.h b/src/modules/alsa/alsa-util.h +index 6b27339ec..4ceaa06ee 100644 +--- a/src/modules/alsa/alsa-util.h ++++ b/src/modules/alsa/alsa-util.h +@@ -21,7 +21,7 @@ + along with PulseAudio; if not, see . + ***/ + +-#include ++#include + + #include + #include +diff --git a/src/modules/alsa/module-alsa-source.c b/src/modules/alsa/module-alsa-source.c +index af6800dd2..747ba9342 100644 +--- a/src/modules/alsa/module-alsa-source.c ++++ b/src/modules/alsa/module-alsa-source.c +@@ -24,7 +24,7 @@ + + #include + +-#include ++#include + + #ifdef HAVE_VALGRIND_MEMCHECK_H + #include +-- +2.22.0 + diff --git a/utils/containerd/Makefile b/utils/containerd/Makefile index e669c6b1..3da8c8cb 100644 --- a/utils/containerd/Makefile +++ b/utils/containerd/Makefile @@ -1,15 +1,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=containerd -PKG_VERSION:=1.2.10 +PKG_VERSION:=1.2.13 PKG_RELEASE:=1 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/containerd/containerd/tar.gz/v${PKG_VERSION}? -PKG_HASH:=a0965e1492fca558629826f1aa89a9675de3d451cec67540400b30c0bf6ac387 -PKG_SOURCE_VERSION:=b34a5c8af56e510852c35414db4c1f4fa6172339 +PKG_HASH:=0811057ab67b78ce911416e793edaeb14b3f1e105d67b8e67b6302e0eab572e4 +PKG_SOURCE_VERSION:=7ad184331fa3e55e52b890ea95e65ba581ae3429 PKG_MAINTAINER:=Gerard Ryan @@ -39,7 +39,7 @@ define Package/containerd CATEGORY:=Utilities TITLE:=containerd container runtime URL:=https://containerd.io/ - DEPENDS:=$(GO_ARCH_DEPENDS) @HAS_FPU @TARGET_x86_64||arm||aarch64 +btrfs-progs +runc +CONTAINERD_SECCOMP:libseccomp + DEPENDS:=$(GO_ARCH_DEPENDS) @(aarch64||arm||x86_64) +btrfs-progs +runc +CONTAINERD_SECCOMP:libseccomp MENU:=1 endef @@ -49,14 +49,7 @@ endef GO_PKG_INSTALL_ALL:=1 MAKE_PATH:=$(GO_PKG_WORK_DIR_NAME)/build/src/$(GO_PKG) -MAKE_VARS += \ - GOPATH=$(GO_PKG_BUILD_DIR) \ - GOCACHE=$(GO_PKG_CACHE_DIR) \ - GOTMPDIR=$(GO_PKG_TMP_DIR) \ - GOROOT_FINAL=$(GO_TARGET_ROOT) \ - CC=$(TARGET_CC) \ - CXX=$(TARGET_CXX) \ - $(call GoPackage/Environment) +MAKE_VARS += $(call GoPackage/Environment) MAKE_FLAGS += \ DESTDIR="$(PKG_INSTALL_DIR)" \ VERSION=$(PKG_VERSION) \ diff --git a/utils/docker-ce/Config.in b/utils/docker-ce/Config.in index 8d00a2d9..578dcb73 100644 --- a/utils/docker-ce/Config.in +++ b/utils/docker-ce/Config.in @@ -1,9 +1,10 @@ menu "Kernel features for Docker" - depends on PACKAGE_docker-ce - config DOCKER_KERNEL_OPTIONS bool "Enable Basic kernel support for Docker" default y + select KERNEL_CGROUPS + select KERNEL_CGROUP_CPUACCT + select KERNEL_CGROUP_SCHED select KERNEL_NAMESPACES select KERNEL_CPUSETS select KERNEL_MEMCG @@ -26,7 +27,7 @@ menu "Kernel features for Docker" config DOCKER_RES_SHAPE bool "Enables support for resource shaping" - default y + default n select KERNEL_MEMCG_SWAP select KERNEL_MEMCG_SWAP_ENABLED select KERNEL_BLK_DEV_THROTTLING @@ -58,7 +59,7 @@ menu "Kernel features for Docker" config DOCKER_NET_MACVLAN bool "Enables macvlan kernel support" - default y + default n select PACKAGE_kmod-macvlan select PACKAGE_kmod-dummy @@ -72,7 +73,7 @@ menu "Kernel features for Docker" menu "Storage" config DOCKER_STO_EXT4 bool "Enables support for ext3 or ext4 as the backing filesystem" - default y + default n select KERNEL_EXT4_FS_POSIX_ACL config DOCKER_STO_BTRFS diff --git a/utils/docker-ce/Makefile b/utils/docker-ce/Makefile index 98695bf8..adbaa6b7 100644 --- a/utils/docker-ce/Makefile +++ b/utils/docker-ce/Makefile @@ -1,15 +1,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=docker-ce -PKG_VERSION:=19.03.3 +PKG_VERSION:=19.03.8 PKG_RELEASE:=2 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=components/cli/LICENSE components/engine/LICENSE PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/docker/docker-ce/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=63b0d28608f32573b9c03fa46247c6f959e9c08133ddf30a71276919de0194c0 -PKG_SOURCE_VERSION:=a872fc2f86 +PKG_HASH:=781c69e00e98f64fb167ee61de764882bd4926a873d98ce6f370d3cd3435b501 +PKG_SOURCE_VERSION:=afacb8b7f0 # SHA1 used within the docker executables PKG_MAINTAINER:=Gerard Ryan @@ -22,9 +22,9 @@ define CheckExpectedSrcVer endef # values from respective '.installer' files at https://github.com/docker/docker-ce/blob/v$(PKG_VERSION)/components/engine/hack/dockerfile/install/ -$(eval $(call CheckExpectedSrcVer,../containerd/Makefile,b34a5c8af56e510852c35414db4c1f4fa6172339)) -$(eval $(call CheckExpectedSrcVer,../libnetwork/Makefile,45c710223c5fbf04dc3028b9a90b51892e36ca7f)) -$(eval $(call CheckExpectedSrcVer,../runc/Makefile,3e425f80a8c931f88e6d94a8c831b9d5aa481657)) +$(eval $(call CheckExpectedSrcVer,../containerd/Makefile,7ad184331fa3e55e52b890ea95e65ba581ae3429)) +$(eval $(call CheckExpectedSrcVer,../libnetwork/Makefile,9fd385be8302dbe1071a3ce124891893ff27f90f)) +$(eval $(call CheckExpectedSrcVer,../runc/Makefile,dc9208a3303feef5b3839f4323d9beb36df0a9dd)) $(eval $(call CheckExpectedSrcVer,../tini/Makefile,fec3683b971d9c3ef73f284f176672c44b448662)) PKG_BUILD_DEPENDS:=golang/host @@ -44,11 +44,10 @@ define Package/docker-ce CATEGORY:=Utilities TITLE:=Docker Community Edition URL:=https://www.docker.com/ - DEPENDS:=$(GO_ARCH_DEPENDS) @HAS_FPU @TARGET_x86_64||arm||aarch64 +btrfs-progs +ca-certificates +cgroupfs-mount +containerd +libdevmapper +libnetwork +tini \ - +DOCKER_SECCOMP:libseccomp +iptables-mod-extra +kmod-br-netfilter +kmod-ikconfig +kmod-nf-conntrack-netlink +kmod-nf-ipvs +kmod-veth \ - +@KERNEL_CGROUPS +@KERNEL_CGROUP_CPUACCT +@KERNEL_CGROUP_SCHED + DEPENDS:=$(GO_ARCH_DEPENDS) @(aarch64||arm||x86_64) +btrfs-progs +ca-certificates +cgroupfs-mount +containerd +libdevmapper +libnetwork +tini \ + +DOCKER_SECCOMP:libseccomp +iptables-mod-extra +kmod-br-netfilter +kmod-ikconfig +kmod-nf-conntrack-netlink +kmod-nf-ipvs +kmod-veth USERID:=docker:docker - + MENU:=1 endef define Package/docker-ce/description @@ -79,13 +78,7 @@ endif define Build/Compile ( \ - export GOPATH=$(GO_PKG_BUILD_DIR) \ - GOCACHE=$(GO_PKG_CACHE_DIR) \ - GOTMPDIR=$(GO_PKG_TMP_DIR) \ - GOROOT_FINAL=$(GO_TARGET_ROOT) \ - CC=$(TARGET_CC) \ - CXX=$(TARGET_CXX) \ - $(call GoPackage/Environment) \ + export $(call GoPackage/Environment) \ GITCOMMIT=$(PKG_SOURCE_VERSION) \ DOCKER_GITCOMMIT=$(PKG_SOURCE_VERSION) \ DOCKER_BUILDTAGS='$(BUILDTAGS)' \ diff --git a/utils/docker-ce/patches/002-gcc-name-fix.patch b/utils/docker-ce/patches/002-gcc-name-fix.patch deleted file mode 100644 index 2cbeab99..00000000 --- a/utils/docker-ce/patches/002-gcc-name-fix.patch +++ /dev/null @@ -1,25 +0,0 @@ -Index: docker-ce-18.09.0/components/engine/hack/make/.binary -=================================================================== ---- a/components/engine/hack/make/.binary -+++ b/components/engine/hack/make/.binary -@@ -54,17 +54,17 @@ - export CGO_ENABLED=1 - ;; - 7) -- export CC=arm-linux-gnueabihf-gcc -+ export CC=arm-openwrt-linux-gcc - export CGO_ENABLED=1 - ;; - esac - ;; - linux/arm64) -- export CC=aarch64-linux-gnu-gcc -+ export CC=aarch64-openwrt-linux-gcc - export CGO_ENABLED=1 - ;; - linux/amd64) -- export CC=x86_64-linux-gnu-gcc -+ export CC=x86_64-openwrt-linux-gcc - export CGO_ENABLED=1 - ;; - esac diff --git a/utils/docker-ce/patches/002-imporve-hardcoded-CC-on-cross-compile.patch b/utils/docker-ce/patches/002-imporve-hardcoded-CC-on-cross-compile.patch new file mode 100644 index 00000000..b134cdf5 --- /dev/null +++ b/utils/docker-ce/patches/002-imporve-hardcoded-CC-on-cross-compile.patch @@ -0,0 +1,58 @@ +From 2fdfb4404ab811cb00227a3de111437b829e55cf Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Wed, 17 Jul 2019 17:34:04 +0800 +Subject: [PATCH] imporve hardcoded CC on cross compile + +Since commit applied in moby [61a3285 Support cross-compile for arm] +it hardcoded var-CC to support cross-compile for arm + +Correct it with "${parameter:-word}" format, it is helpful for user +define toolchains + +(Use Default Values. If parameter is unset or null, the expansion of +word is substituted. Otherwise, the value of parameter is substituted.) + +Signed-off-by: Hongxu Jia +Upstream-commit: 3c701e4db1b8646c2324ae524b4e7ca1b1147a07 +Component: engine +--- + components/engine/hack/make/.binary | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/components/engine/hack/make/.binary b/components/engine/hack/make/.binary +index 53de6749e5..66f4ca05f3 100644 +--- a/components/engine/hack/make/.binary ++++ b/components/engine/hack/make/.binary +@@ -44,27 +44,27 @@ if [ "$(go env GOOS)/$(go env GOARCH)" != "$(go env GOHOSTOS)/$(go env GOHOSTARC + # must be cross-compiling! + case "$(go env GOOS)/$(go env GOARCH)" in + windows/amd64) +- export CC=x86_64-w64-mingw32-gcc ++ export CC="${CC:-x86_64-w64-mingw32-gcc}" + export CGO_ENABLED=1 + ;; + linux/arm) + case "${GOARM}" in + 5|"") +- export CC=arm-linux-gnueabi-gcc ++ export CC="${CC:-arm-linux-gnueabi-gcc}" + export CGO_ENABLED=1 + ;; + 7) +- export CC=arm-linux-gnueabihf-gcc ++ export CC="${CC:-arm-linux-gnueabihf-gcc}" + export CGO_ENABLED=1 + ;; + esac + ;; + linux/arm64) +- export CC=aarch64-linux-gnu-gcc ++ export CC="${CC:-aarch64-linux-gnu-gcc}" + export CGO_ENABLED=1 + ;; + linux/amd64) +- export CC=x86_64-linux-gnu-gcc ++ export CC="${CC:-x86_64-linux-gnu-gcc}" + export CGO_ENABLED=1 + ;; + esac diff --git a/utils/libnetwork/Makefile b/utils/libnetwork/Makefile index 8974be9d..2c737785 100644 --- a/utils/libnetwork/Makefile +++ b/utils/libnetwork/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libnetwork -PKG_RELEASE:=2 +PKG_RELEASE:=1 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE @@ -12,9 +12,9 @@ GO_PKG_BUILD_PKG:= \ PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://$(GO_PKG) -PKG_SOURCE_VERSION:=45c710223c5fbf04dc3028b9a90b51892e36ca7f -PKG_SOURCE_DATE:=2019-10-15 -PKG_MIRROR_HASH:=776d0f6e870ce4432cc09ba75f3b075ef29cd797dcf9d631d726df4a2b7cbf28 +PKG_SOURCE_VERSION:=9fd385be8302dbe1071a3ce124891893ff27f90f +PKG_SOURCE_DATE:=2020-01-03 +PKG_MIRROR_HASH:=16cea9d9978b11869029bc9ae0da533c2d7fdf4b9c1f7905bf6c98f443347831 PKG_MAINTAINER:=Gerard Ryan @@ -29,7 +29,7 @@ define Package/libnetwork CATEGORY:=Utilities TITLE:=networking for containers URL:=https://github.com/docker/libnetwork - DEPENDS:=$(GO_ARCH_DEPENDS) @HAS_FPU @TARGET_x86_64||arm||aarch64 + DEPENDS:=$(GO_ARCH_DEPENDS) @(aarch64||arm||x86_64) endef define Package/libnetwork/description diff --git a/utils/pigz/Makefile b/utils/pigz/Makefile new file mode 100644 index 00000000..7f76a088 --- /dev/null +++ b/utils/pigz/Makefile @@ -0,0 +1,35 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=pigz +PKG_VERSION:=2.4 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=https://zlib.net/pigz/ +PKG_HASH:=a4f816222a7b4269bd232680590b579ccc72591f1bb5adafcd7208ca77e14f73 + +PKG_MAINTAINER:=Ken Wong +PKG_LICENSE:=CUSTOM +PKG_LICENSE_FILES:=README +PKG_CPE_ID:=cpe:/a:zlib:pigz + +PKG_BUILD_PARALLEL:=1 + +include $(INCLUDE_DIR)/package.mk + +define Package/pigz + SECTION:=utils + CATEGORY:=Utilities + SUBMENU:=Compression + TITLE:=pigz + URL:=https://zlib.net/pigz + DEPENDS:=+zlib +endef + +define Package/pigz/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/pigz $(1)/usr/bin/pigz +endef + +$(eval $(call BuildPackage,pigz)) + diff --git a/utils/pigz/patches/001.patch b/utils/pigz/patches/001.patch new file mode 100644 index 00000000..b75daa1b --- /dev/null +++ b/utils/pigz/patches/001.patch @@ -0,0 +1,14 @@ +--- a/Makefile 2019-05-22 19:54:23.980451289 +0800 ++++ b/Makefile 2019-06-10 10:32:58.054675929 +0800 +@@ -1,7 +1,7 @@ +-CC=gcc +-CFLAGS=-O3 -Wall -Wextra -Wno-unknown-pragmas +-LDFLAGS= +-LIBS=-lm -lpthread -lz ++CC?=gcc ++CFLAGS?=-O3 -Wall -Wextra -Wno-unknown-pragmas ++LDFLAGS?= ++LIBS?=-lm -lpthread -lz + ZOPFLI=zopfli/src/zopfli/ + ZOP=deflate.o blocksplitter.o tree.o lz77.o cache.o hash.o util.o squeeze.o katajainen.o + diff --git a/utils/runc/Makefile b/utils/runc/Makefile index 754302ea..eef25fa8 100644 --- a/utils/runc/Makefile +++ b/utils/runc/Makefile @@ -1,18 +1,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=runc -PKG_VERSION:=1.0.0-rc8+91-3e425f80 +PKG_VERSION:=1.0.0-rc10 PKG_RELEASE:=1 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://github.com/opencontainers/runc -PKG_MIRROR_HASH:=361658b3c61b9c727091aa10ba693f234a64aae592bb683005244a22e2778cfc -PKG_HASH:=efe4ff9bbe49b19074346d65c914d809c0a3e90d062ea9619fe240f931f0b700 -PKG_SOURCE_VERSION:=3e425f80a8c931f88e6d94a8c831b9d5aa481657 -PKG_SOURCE_PROTO:=git -PKG_SOURCE_DATE:=2019-10-15 +PKG_SOURCE_URL:=https://codeload.github.com/opencontainers/runc/tar.gz/v${PKG_VERSION}? +PKG_HASH:=6b44985023347fb9c5a2cc6f761df8c41cc2c84a7a68a6e6acf834dff6653a9a +PKG_SOURCE_VERSION:=dc9208a3303feef5b3839f4323d9beb36df0a9dd PKG_MAINTAINER:=Gerard Ryan @@ -42,7 +39,7 @@ define Package/runc CATEGORY:=Utilities TITLE:=runc container runtime URL:=https://www.opencontainers.org/ - DEPENDS:=$(GO_ARCH_DEPENDS) @HAS_FPU @TARGET_x86_64||arm||aarch64 +RUNC_SECCOMP:libseccomp + DEPENDS:=$(GO_ARCH_DEPENDS) @(aarch64||arm||x86_64) +RUNC_SECCOMP:libseccomp MENU:=1 endef @@ -52,14 +49,7 @@ endef GO_PKG_INSTALL_ALL:=1 MAKE_PATH:=$(GO_PKG_WORK_DIR_NAME)/build/src/$(GO_PKG) -MAKE_VARS += \ - GOPATH=$(GO_PKG_BUILD_DIR) \ - GOCACHE=$(GO_PKG_CACHE_DIR) \ - GOTMPDIR=$(GO_PKG_TMP_DIR) \ - GOROOT_FINAL=$(GO_TARGET_ROOT) \ - CC=$(TARGET_CC) \ - CXX=$(TARGET_CXX) \ - $(call GoPackage/Environment) +MAKE_VARS += $(call GoPackage/Environment) MAKE_FLAGS += \ COMMIT=$(PKG_SOURCE_VERSION) @@ -89,4 +79,4 @@ define Package/runc/install $(INSTALL_BIN) $(GO_PKG_BUILD_DIR)/src/$(GO_PKG)/runc $(1)/usr/sbin/ endef -$(eval $(call BuildPackage,runc)) \ No newline at end of file +$(eval $(call BuildPackage,runc))