Commit 881c1d39 authored by Andreas Gnau's avatar Andreas Gnau
Browse files

Merge branch 'openwrt/openwrt-21.02' into devel

parents a3c5aeda c2657a2e
......@@ -2,12 +2,12 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=debian-archive-keyring
PKG_VERSION:=2019.1
PKG_RELEASE:=2
PKG_VERSION:=2021.1.1
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=debian-archive-keyring_2019.1_all.deb
PKG_SOURCE:=debian-archive-keyring_2021.1.1_all.deb
PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/d/debian-archive-keyring/
PKG_HASH:=9cefd8917f3d97a999c136aa87f04a3024408b5bc1de470de7d6dfa5e4bd4361
PKG_HASH:=56beca470dcd9b6d7e6c3c9e9d702101e01e9467e62810a8c357bd7b9c26251d
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
......
......@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=schroot
PKG_VERSION:=1.6.10
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.xz
PKG_SOURCE_URL:=http://deb.debian.org/debian/pool/main/s/schroot
......@@ -37,7 +37,7 @@ define Package/schroot/description
Securely enter a chroot and run a command or login shell.
endef
define Package/sudo/conffiles
define Package/schroot/conffiles
/etc/schroot/
endef
......
include $(TOPDIR)/rules.mk
PKG_NAME:=syslog-ng
PKG_VERSION:=3.31.2
PKG_RELEASE:=1
PKG_VERSION:=3.32.1
PKG_RELEASE:=$(AUTORELEASE)
PKG_MAINTAINER:=Josef Schlehofer <josef.schlehofer@nic.cz>
PKG_LICENSE:=LGPL-2.1-or-later GPL-2.0-or-later
......@@ -11,7 +11,7 @@ PKG_CPE_ID:=cpe:/a:balabit:syslog-ng
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/syslog-ng/syslog-ng/releases/download/$(PKG_NAME)-$(PKG_VERSION)/
PKG_HASH:=2eeb8e0dbbcb556fdd4e50bc9f29bc8c66c9b153026f87caa7567bd3139c186a
PKG_HASH:=19e3b76552d82c71c04230526925402c9f05fa5e6ea19b912b061850929b712d
PKG_BUILD_PARALLEL:=1
PKG_INSTALL:=1
......
include $(TOPDIR)/rules.mk
PKG_NAME:=delve
PKG_VERSION:=1.6.1
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/go-delve/delve/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=e73f7fc063632268d3bdf53486aeafd98cceb8f86f4af56903dedfebaefe690d
PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=LICENSE
PKG_MAINTAINER:=Niels Widger <niels@qacafe.com>
PKG_BUILD_DEPENDS:=golang/host
PKG_BUILD_PARALLEL:=1
PKG_USE_MIPS16:=0
GO_PKG:=github.com/go-delve/delve/
GO_PKG_BUILD_PKG:=github.com/go-delve/delve/cmd/dlv/
GO_PKG_LDFLAGS_X:=main.Build=$(PKG_VERSION)
include $(INCLUDE_DIR)/package.mk
include ../../lang/golang/golang-package.mk
# this is a subset of $(GO_ARCH_DEPENDS) as delve does not support all
# architectures, see build constraints in
# https://github.com/go-delve/delve/blob/v$(PKG_VERSION)/pkg/proc/native/support_sentinel.go
DELVE_GO_ARCH_DEPENDS:=@(aarch64||i386||x86_64)
define Package/delve
SECTION:=devel
CATEGORY:=Development
TITLE:=Debugger for the Go programming language
URL:=https://github.com/go-delve/delve
DEPENDS:=$(DELVE_GO_ARCH_DEPENDS)
endef
define Package/delve/description
Delve is a debugger for the Go programming language. The goal of the
project is to provide a simple, full featured debugging tool for Go.
Delve should be easy to invoke and easy to use. Chances are if you're
using a debugger, things aren't going your way. With that in mind,
Delve should stay out of your way as much as possible.
endef
$(eval $(call GoBinPackage,delve))
$(eval $(call BuildPackage,delve))
......@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=gitlab-runner
PKG_VERSION:=13.10.0
PKG_VERSION:=13.12.0
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://gitlab.com/gitlab-org/gitlab-runner/-/archive/v$(PKG_VERSION)
PKG_HASH:=f179d6c51867c2a7dcda4a537d152214b25734f78dcfb7bb05fe07b67c1a9b17
PKG_HASH:=5cf7c2af3a3682f1044ef374dfe7f014febba6e5a53fa442b7f114b10811831e
PKG_MAINTAINER:=Jan Pavlinec <jan.pavlinec@nic.cz>
PKG_LICENSE:=MIT
......
include $(TOPDIR)/rules.mk
PKG_NAME:=ksmbd
PKG_VERSION:=3.3.8
PKG_VERSION:=3.3.9
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/cifsd-team/cifsd/tar.gz/$(PKG_VERSION)?
PKG_HASH:=8c0d1beaa549053a476287972105f3cad53e9841983c54c2490f52a88e1a4828
PKG_HASH:=c196d1773b9f89221133780fd189b550acbc56ac93c2e79260a70eab9853b3e1
PKG_MAINTAINER:=Andy Walsh <andy.walsh44+github@gmail.com>
PKG_LICENSE:=GPL-2.0-or-later
......
......@@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
GO_VERSION_MAJOR_MINOR:=1.16
GO_VERSION_PATCH:=
GO_VERSION_PATCH:=5
PKG_NAME:=golang
PKG_VERSION:=$(GO_VERSION_MAJOR_MINOR)$(if $(GO_VERSION_PATCH),.$(GO_VERSION_PATCH))
......@@ -20,7 +20,7 @@ GO_SOURCE_URLS:=https://dl.google.com/go/ \
PKG_SOURCE:=go$(PKG_VERSION).src.tar.gz
PKG_SOURCE_URL:=$(GO_SOURCE_URLS)
PKG_HASH:=7688063d55656105898f323d90a79a39c378d86fe89ae192eb3b7fc46347c95a
PKG_HASH:=7bfa7e5908c7cc9e75da5ddf3066d7cbcf3fd9fa51945851325eebc17f50ba80
PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>
PKG_LICENSE:=BSD-3-Clause
......
......@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=luajit
PKG_VERSION:=2.1.0-beta3
PKG_RELEASE:=4
PKG_RELEASE:=5
PKG_SOURCE:=LuaJIT-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://luajit.org/download
......@@ -24,7 +24,7 @@ define Package/luajit
CATEGORY:=Languages
TITLE:=LuaJIT
URL:=https://www.luajit.org
DEPENDS:=@(i386||x86_64||arm||armeb||aarch64||powerpc||mips||mipsel||mips64)
DEPENDS:=@(i386||x86_64||arm||armeb||aarch64||(powerpc&&HAS_FPU)||mips||mipsel||mips64)
endef
define Package/luajit/description
......
......@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=node
PKG_VERSION:=v14.16.1
PKG_RELEASE:=2
PKG_VERSION:=v14.17.1
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://nodejs.org/dist/$(PKG_VERSION)
PKG_HASH:=e44adbbed6756c2c1a01258383e9f00df30c147b36e438f6369b5ef1069abac3
PKG_HASH:=ddf1d2d56ddf35ecd98c5ea5ddcd690b245899f289559b4330c921255f5a247f
PKG_MAINTAINER:=Hirokazu MORIKAWA <morikw2@gmail.com>, Adrian Panella <ianchi74@outlook.com>
PKG_LICENSE:=MIT
......@@ -141,8 +141,13 @@ define Package/node/install
endef
define Package/node-npm/install
$(INSTALL_DIR) $(1)/usr/lib/node_modules
$(CP) $(PKG_INSTALL_DIR)/usr/lib/node_modules/* $(1)/usr/lib/node_modules/
$(INSTALL_DIR) $(1)/usr/lib/node_modules/npm
$(CP) $(PKG_INSTALL_DIR)/usr/lib/node_modules/npm/{package.json,LICENSE} \
$(1)/usr/lib/node_modules/npm/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/node_modules/npm/{AUTHORS,*.md} \
$(1)/usr/lib/node_modules/npm/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/node_modules/npm/{node_modules,bin,lib} \
$(1)/usr/lib/node_modules/npm/
$(INSTALL_DIR) $(1)/usr/bin
$(LN) ../lib/node_modules/npm/bin/npm-cli.js $(1)/usr/bin/npm
$(LN) ../lib/node_modules/npm/bin/npx-cli.js $(1)/usr/bin/npx
......
--- a/lib/internal/modules/cjs/loader.js
+++ b/lib/internal/modules/cjs/loader.js
@@ -1179,7 +1179,8 @@ Module._initPaths = function() {
@@ -1202,7 +1202,8 @@ Module._initPaths = function() {
path.resolve(process.execPath, '..') :
path.resolve(process.execPath, '..', '..');
......@@ -9,4 +9,4 @@
+ path.resolve(prefixDir, 'lib', 'node_modules')];
if (homeDir) {
paths.unshift(path.resolve(homeDir, '.node_libraries'));
ArrayPrototypeUnshift(paths, path.resolve(homeDir, '.node_libraries'));
......@@ -20,7 +20,7 @@
result = clock_gettime(CLOCK_MONOTONIC, &ts);
--- a/deps/v8/src/base/platform/platform-posix.cc
+++ b/deps/v8/src/base/platform/platform-posix.cc
@@ -823,7 +823,7 @@ bool Thread::Start() {
@@ -839,7 +839,7 @@ bool Thread::Start() {
#if V8_OS_MACOSX
// Default on Mac OS X is 512kB -- bump up to 1MB
stack_size = 1 * 1024 * 1024;
......
--- a/tools/icu/icu-generic.gyp
+++ b/tools/icu/icu-generic.gyp
@@ -522,6 +522,7 @@
@@ -419,6 +419,7 @@
'target_name': 'genrb',
'type': 'executable',
'toolsets': [ 'host' ],
......@@ -8,7 +8,7 @@
'dependencies': [ 'icutools' ],
'sources': [
'<@(icu_src_genrb)'
@@ -538,6 +539,7 @@
@@ -435,6 +436,7 @@
'target_name': 'iculslocs',
'toolsets': [ 'host' ],
'type': 'executable',
......@@ -16,7 +16,7 @@
'dependencies': [ 'icutools' ],
'sources': [
'iculslocs.cc',
@@ -550,6 +552,7 @@
@@ -447,6 +449,7 @@
'target_name': 'icupkg',
'toolsets': [ 'host' ],
'type': 'executable',
......@@ -24,7 +24,7 @@
'dependencies': [ 'icutools' ],
'sources': [
'<@(icu_src_icupkg)',
@@ -561,6 +564,7 @@
@@ -458,6 +461,7 @@
'target_name': 'genccode',
'toolsets': [ 'host' ],
'type': 'executable',
......
--- a/tools/icu/icu-generic.gyp
+++ b/tools/icu/icu-generic.gyp
@@ -181,6 +181,7 @@
'<(icu_path)/source/i18n/uspoof_wsconf.h',
]}],
],
@@ -107,6 +107,7 @@
'sources': [
'<@(icu_src_i18n)'
],
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
'include_dirs': [
'<(icu_path)/source/i18n',
],
@@ -189,6 +190,7 @@
@@ -115,6 +116,7 @@
],
'dependencies': [ 'icuucx', 'icu_implementation', 'icu_uconfig', 'icu_uconfig_target' ],
'direct_dependent_settings': {
......@@ -16,7 +16,7 @@
'include_dirs': [
'<(icu_path)/source/i18n',
],
@@ -275,6 +277,7 @@
@@ -201,6 +203,7 @@
# full data - no trim needed
'sources': [ '<(SHARED_INTERMEDIATE_DIR)/icudt<(icu_ver_major)_dat.<(icu_asm_ext)' ],
'dependencies': [ 'genccode#host', 'icupkg#host', 'icu_implementation#host', 'icu_uconfig' ],
......@@ -24,7 +24,7 @@
'include_dirs': [
'<(icu_path)/source/common',
],
@@ -359,6 +362,7 @@
@@ -285,6 +288,7 @@
# This file contains the small ICU data
'sources': [ '<(SHARED_INTERMEDIATE_DIR)/icusmdt<(icu_ver_major)_dat.<(icu_asm_ext)' ],
# for umachine.h
......@@ -32,7 +32,7 @@
'include_dirs': [
'<(icu_path)/source/common',
],
@@ -375,6 +379,7 @@
@@ -301,6 +305,7 @@
'sources': [
'<@(icu_src_stubdata)'
],
......@@ -40,7 +40,7 @@
'include_dirs': [
'<(icu_path)/source/common',
],
@@ -443,6 +448,7 @@
@@ -340,6 +345,7 @@
'_XOPEN_SOURCE_EXTENDED=0',
]}],
],
......@@ -48,7 +48,7 @@
'include_dirs': [
'<(icu_path)/source/common',
],
@@ -452,6 +458,7 @@
@@ -349,6 +355,7 @@
'cflags_c': ['-std=c99'],
'export_dependent_settings': [ 'icu_uconfig', 'icu_uconfig_target' ],
'direct_dependent_settings': {
......@@ -56,7 +56,7 @@
'include_dirs': [
'<(icu_path)/source/common',
],
@@ -482,6 +489,7 @@
@@ -379,6 +386,7 @@
'<(icu_path)/source/tools/toolutil/dbgutil.cpp',
'<(icu_path)/source/tools/toolutil/dbgutil.h',
],
......@@ -64,7 +64,7 @@
'include_dirs': [
'<(icu_path)/source/common',
'<(icu_path)/source/i18n',
@@ -501,6 +509,7 @@
@@ -398,6 +406,7 @@
}]
],
'direct_dependent_settings': {
......
......@@ -13,7 +13,7 @@ Forwarded: https://github.com/nodejs/node/issues/33816
//
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the
@@ -1026,13 +1027,6 @@ function lookupAndConnect(self, options)
@@ -1028,13 +1029,6 @@ function lookupAndConnect(self, options)
hints: options.hints || 0
};
......
......@@ -9,7 +9,7 @@ PECL_NAME:=imagick
PECL_LONGNAME:=Image Processing (ImageMagick binding)
PKG_VERSION:=3.4.4
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_HASH:=8dd5aa16465c218651fc8993e1faecd982e6a597870fd4b937e9ece02d567077
PKG_NAME:=php7-pecl-imagick
......@@ -29,5 +29,7 @@ include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
include ../php7/pecl.mk
CONFIGURE_ARGS+= --with-imagick="$(STAGING_DIR)/usr"
$(eval $(call PHP7PECLPackage,imagick,$(PECL_LONGNAME),+imagemagick,30))
$(eval $(call BuildPackage,$(PKG_NAME)))
......@@ -6,7 +6,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=php
PKG_VERSION:=7.4.16
PKG_VERSION:=7.4.19
PKG_RELEASE:=1
PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de>
......@@ -16,7 +16,7 @@ PKG_CPE_ID:=cpe:/a:php:php
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=http://www.php.net/distributions/
PKG_HASH:=1c16cefaf88ded4c92eed6a8a41eb682bb2ef42429deb55f1c4ba159053fb98b
PKG_HASH:=6c17172c4a411ccb694d9752de899bb63c72a0a3ebe5089116bc13658a1467b2
PKG_BUILD_PARALLEL:=1
PKG_USE_MIPS16:=0
......
......@@ -5,11 +5,11 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=Jinja2
PKG_VERSION:=2.11.2
PKG_RELEASE:=1
PKG_VERSION:=2.11.3
PKG_RELEASE:=$(AUTORELEASE)
PYPI_NAME:=$(PKG_NAME)
PKG_HASH:=89aab215427ef59c34ad58735269eb58b1a5808103067f7bb9d5836c651b3bb0
PKG_HASH:=a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6
PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
PKG_LICENSE:=BSD-3-Clause
......
......@@ -8,11 +8,11 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=django
PKG_VERSION:=3.1.7
PKG_VERSION:=3.2.4
PKG_RELEASE:=1
PYPI_NAME:=Django
PKG_HASH:=32ce792ee9b6a0cbbec340123e229ac9f765dff8c2a4ae9247a14b2ba3a365a7
PKG_HASH:=66c9d8db8cc6fe938a28b7887c1596e42d522e27618562517cc8929eb7e7f296
PKG_MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com>, Peter Stadler <peter.stadler@student.uibk.ac.at>
PKG_LICENSE:=BSD-3-Clause
......
......@@ -7,11 +7,11 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=pillow
PKG_VERSION:=8.1.0
PKG_VERSION:=8.1.2
PKG_RELEASE:=1
PYPI_NAME:=Pillow
PKG_HASH:=887668e792b7edbfb1d3c9d8b5d8c859269a0f0eba4dda562adb95500f60dbba
PKG_HASH:=b07c660e014852d98a00a91adfbe25033898a9d90a8f39beb2437d22a203fc44
PKG_MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com>
PKG_LICENSE:=HPND
......
......@@ -8,11 +8,11 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=python-attrs
PKG_VERSION:=20.3.0
PKG_VERSION:=21.2.0
PKG_RELEASE:=1
PYPI_NAME:=attrs
PKG_HASH:=832aa3cde19744e49938b91fea06d69ecb9e649c93ba974535d08ad92164f700
PKG_HASH:=ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb
PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=LICENSE
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment