From e9bb94840288d35b90ca43574b698c43403a7ec4 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Wed, 22 Mar 2023 15:46:13 +0800 Subject: [PATCH 01/13] CI: Add local feed for CI-built packages To test each package, the CI-built target package (ipk) file is installed, but currently the target package's dependencies are installed from the standard opkg feeds. There are cases when the CI-built target packages should be installed/tested together: * If a pull request contains several new packages that depend on each other, the test step will fail as the new dependencies cannot be found in the current packages feed. * If a pull request upgrades a source package that builds several target packages that depend on each other, the test step may fail due to the version/ABI mismatch between a newer target package and the older dependencies installed from the packages feed. This sets up a local feed for the CI-built packages so that dependencies are also installed from the same set of packages. Signed-off-by: Jeffery To --- .github/workflows/entrypoint.sh | 9 +++++++-- .github/workflows/multi-arch-test-build.yml | 15 ++++++++++++++- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/entrypoint.sh b/.github/workflows/entrypoint.sh index 8f00a8468..76dd8cbcc 100755 --- a/.github/workflows/entrypoint.sh +++ b/.github/workflows/entrypoint.sh @@ -2,7 +2,12 @@ # not enabling `errtrace` and `pipefail` since those are bash specific set -o errexit # failing commands causes script to fail -set -o nounset # undefined variables causes script to fail +set -o nounset # undefined variables causes script to fail + +echo "src/gz packages_ci file:///ci" >> /etc/opkg/distfeeds.conf + +FINGERPRINT="$(usign -F -p /ci/packages_ci.pub)" +cp /ci/packages_ci.pub "/etc/opkg/keys/$FINGERPRINT" mkdir -p /var/lock/ @@ -11,7 +16,7 @@ opkg update [ -n "${CI_HELPER:=''}" ] || CI_HELPER="/ci/.github/workflows/ci_helpers.sh" for PKG in /ci/*.ipk; do - tar -xzOf "$PKG" ./control.tar.gz | tar xzf - ./control + tar -xzOf "$PKG" ./control.tar.gz | tar xzf - ./control # package name including variant PKG_NAME=$(sed -ne 's#^Package: \(.*\)$#\1#p' ./control) # package version without release diff --git a/.github/workflows/multi-arch-test-build.yml b/.github/workflows/multi-arch-test-build.yml index 514c276f2..1d281eda7 100644 --- a/.github/workflows/multi-arch-test-build.yml +++ b/.github/workflows/multi-arch-test-build.yml @@ -82,14 +82,25 @@ jobs: echo "Building $PACKAGES" echo "PACKAGES=$PACKAGES" >> $GITHUB_ENV + - name: Generate build keys + run: | + sudo apt-get install -y signify-openbsd + signify-openbsd -G -n -c 'DO NOT USE - OpenWrt packages feed CI' -p packages_ci.pub -s packages_ci.sec + EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64) + echo "KEY_BUILD<<$EOF" >> $GITHUB_ENV + cat packages_ci.sec >> $GITHUB_ENV + echo "$EOF" >> $GITHUB_ENV + - name: Build uses: openwrt/gh-action-sdk@v5 env: ARCH: ${{ matrix.arch }}-${{ env.BRANCH }} FEEDNAME: packages_ci + INDEX: 1 + KEY_BUILD: ${{ env.KEY_BUILD }} - name: Move created packages to project dir - run: cp bin/packages/${{ matrix.arch }}/packages_ci/*.ipk . || true + run: cp bin/packages/${{ matrix.arch }}/packages_ci/* . || true - name: Collect metadata run: | @@ -132,6 +143,8 @@ jobs: with: name: ${{env.ARCHIVE_NAME}}-packages path: | + Packages + Packages.* *.ipk PKG-INFO From 8b144f0dc3eb4f4aaccbc74193df5e6f0956ae04 Mon Sep 17 00:00:00 2001 From: Christian Marangi Date: Thu, 20 Apr 2023 07:43:53 +0200 Subject: [PATCH 02/13] nginx: split DAV_EXT from standard nginx DAV config Split DAV_EXT from standard nginx DAV config as additional WebDAV methods are provided by an external module. Signed-off-by: Christian Marangi --- net/nginx/Config_ssl.in | 8 ++++++++ net/nginx/Makefile | 11 ++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/net/nginx/Config_ssl.in b/net/nginx/Config_ssl.in index df54624d3..02dd8094a 100644 --- a/net/nginx/Config_ssl.in +++ b/net/nginx/Config_ssl.in @@ -15,6 +15,14 @@ config NGINX_DAV Enable the HTTP and WebDAV methods PUT, DELETE, MKCOL, COPY and MOVE. default n +config NGINX_DAV_EXT + bool + prompt "Enable WebDAV EXT module" + select NGINX_DAV + help + Enable the WebDAV methods PROPFIND, OPTIONS, LOCK, UNLOCK. + default n + config NGINX_UBUS bool prompt "Enable UBUS module" diff --git a/net/nginx/Makefile b/net/nginx/Makefile index aa43193ca..86a7a212f 100644 --- a/net/nginx/Makefile +++ b/net/nginx/Makefile @@ -27,6 +27,7 @@ PKG_BUILD_FLAGS:=gc-sections PKG_CONFIG_DEPENDS := \ CONFIG_NGINX_DAV \ + CONFIG_NGINX_DAV_EXT \ CONFIG_NGINX_FLV \ CONFIG_NGINX_UBUS \ CONFIG_NGINX_STUB_STATUS \ @@ -248,7 +249,10 @@ ifneq ($(BUILD_VARIANT),all-module) ADDITIONAL_MODULES += --with-http_flv_module endif ifeq ($(CONFIG_NGINX_DAV),y) - ADDITIONAL_MODULES += --with-http_dav_module --add-module=$(PKG_BUILD_DIR)/nginx-dav-ext-module + ADDITIONAL_MODULES += --with-http_dav_module + endif + ifeq ($(CONFIG_NGINX_DAV_EXT),y) + ADDITIONAL_MODULES += --add-module=$(PKG_BUILD_DIR)/nginx-dav-ext-module endif ifeq ($(CONFIG_NGINX_UBUS),y) ADDITIONAL_MODULES += --add-module=$(PKG_BUILD_DIR)/nginx-ubus-module @@ -297,6 +301,7 @@ else CONFIG_NGINX_NAXSI:=y CONFIG_NGINX_LUA:=y CONFIG_NGINX_DAV:=y + CONFIG_NGINX_DAV_EXT:=y CONFIG_NGINX_UBUS:=y ADDITIONAL_MODULES += --with-ipv6 --with-http_stub_status_module --with-http_flv_module \ --with-http_dav_module \ @@ -508,7 +513,7 @@ endef define Build/Patch $(if $(QUILT),rm -rf $(PKG_BUILD_DIR)/patches; mkdir -p $(PKG_BUILD_DIR)/patches) $(call PatchDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/nginx,nginx/) -ifneq "$(or $(CONFIG_NGINX_DAV),$(QUILT))" "" +ifneq "$(or $(CONFIG_NGINX_DAV_EXT),$(QUILT))" "" $(call PatchDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/dav-nginx,dav-nginx/) endif ifneq "$(or $(CONFIG_NGINX_LUA),$(QUILT))" "" @@ -562,7 +567,7 @@ ifeq ($(CONFIG_NGINX_TS_MODULE),y) $(Prepare/nginx-ts) endif -ifneq "$(or $(CONFIG_NGINX_DAV),$(QUILT))" "" +ifneq "$(or $(CONFIG_NGINX_DAV_EXT),$(QUILT))" "" $(eval $(call Download,nginx-dav-ext-module)) $(Prepare/nginx-dav-ext-module) endif From 1f9baddd4386c044f7cf2dc084857d0f2d94ade5 Mon Sep 17 00:00:00 2001 From: Luca Barbato Date: Thu, 20 Apr 2023 18:52:32 +0000 Subject: [PATCH 03/13] rust: update to 1.69.0 Signed-off-by: Luca Barbato --- lang/rust/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/rust/Makefile b/lang/rust/Makefile index b574b718a..01fb0c558 100644 --- a/lang/rust/Makefile +++ b/lang/rust/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=rust -PKG_VERSION:=1.68.2 +PKG_VERSION:=1.69.0 PKG_RELEASE:=1 PKG_SOURCE:=rustc-$(PKG_VERSION)-src.tar.gz PKG_SOURCE_URL:=https://static.rust-lang.org/dist/ -PKG_HASH:=93339c23f7cd4d0c45db58e18b4c6e16d6070f4277aad9d2492d23294bf32e96 +PKG_HASH:=fb05971867ad6ccabbd3720279f5a94b99f61024923187b56bb5c455fa3cf60f HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/rustc-$(PKG_VERSION)-src PKG_MAINTAINER:=Luca Barbato From 018fcf3ccd3c65c92f7c9467ab35f345fbd2c1ae Mon Sep 17 00:00:00 2001 From: Hirokazu MORIKAWA Date: Sat, 15 Apr 2023 21:56:03 +0900 Subject: [PATCH 04/13] icu: bump to 73.1 Description: It updates to CLDR 43 locale data with various additions and corrections. ICU 73 improves Japanese and Korean short-text line breaking, reduces C++ memory use in date formatting, and promotes the Java person name formatter from tech preview to draft. ICU 73 and CLDR 43 are minor releases, mostly focused on bug fixes and small enhancements. (The fall CLDR/ICU releases will update to Unicode 15.1 which is planned for September.) ICU 73 updates to the time zone data version 2023c (2023-mar). Note that pre-1970 data for a number of time zones has been removed, as has been the case in the upstream tzdata release since 2021b. Signed-off-by: Hirokazu MORIKAWA --- libs/icu/Makefile | 9 +++++---- libs/icu/patches/010-max_align_t.patch | 6 +++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/libs/icu/Makefile b/libs/icu/Makefile index b34c226f4..cc6b86fc3 100644 --- a/libs/icu/Makefile +++ b/libs/icu/Makefile @@ -8,14 +8,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=icu4c -MAJOR_VERSION:=72 +MAJOR_VERSION:=73 MINOR_VERSION:=1 PKG_VERSION:=$(MAJOR_VERSION).$(MINOR_VERSION) -PKG_RELEASE:=2 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(MAJOR_VERSION)_$(MINOR_VERSION)-src.tgz PKG_SOURCE_URL:=https://github.com/unicode-org/icu/releases/download/release-$(MAJOR_VERSION)-$(MINOR_VERSION) -PKG_HASH:=a2d2d38217092a7ed56635e34467f92f976b370e20182ad325edea6681a71d68 +PKG_HASH:=a457431de164b4aa7eca00ed134d00dfbf88a77c6986a10ae7774fc076bb8c45 PKG_LICENSE:=ICU PKG_LICENSE_FILES:=LICENSE @@ -25,6 +25,7 @@ PKG_MAINTAINER:=Hirokazu MORIKAWA PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 +HOST_BUILD_PARALLEL:=1 PKG_BUILD_DEPENDS:=icu/host HOST_BUILD_DEPENDS:=python3/host @@ -104,7 +105,7 @@ HOST_CONFIGURE_VARS:= ifeq ($(HOST_OS),Darwin) HOST_CONFIGURE_ARGS:= MacOSX else -HOST_CONFIGURE_ARGS:= Linux/gcc +HOST_CONFIGURE_ARGS:= Linux/gcc endif HOST_CONFIGURE_ARGS+= \ --disable-debug \ diff --git a/libs/icu/patches/010-max_align_t.patch b/libs/icu/patches/010-max_align_t.patch index e8bd7f4bb..5dcf56896 100644 --- a/libs/icu/patches/010-max_align_t.patch +++ b/libs/icu/patches/010-max_align_t.patch @@ -29,7 +29,7 @@ *pErrorCode=U_MEMORY_ALLOCATION_ERROR; --- a/common/utext.cpp +++ b/common/utext.cpp -@@ -569,7 +569,7 @@ enum { +@@ -572,7 +572,7 @@ enum { struct ExtendedUText { UText ut; @@ -38,7 +38,7 @@ }; static const UText emptyText = UTEXT_INITIALIZER; -@@ -584,7 +584,7 @@ utext_setup(UText *ut, int32_t extraSpac +@@ -587,7 +587,7 @@ utext_setup(UText *ut, int32_t extraSpac // We need to heap-allocate storage for the new UText int32_t spaceRequired = sizeof(UText); if (extraSpace > 0) { @@ -46,7 +46,7 @@ + spaceRequired = sizeof(ExtendedUText) + extraSpace - sizeof(max_align_t); } ut = (UText *)uprv_malloc(spaceRequired); - if (ut == NULL) { + if (ut == nullptr) { --- a/tools/toolutil/toolutil.cpp +++ b/tools/toolutil/toolutil.cpp @@ -267,7 +267,7 @@ struct UToolMemory { From 0c10c224be81f9221dabfab449855ab6718d2a0c Mon Sep 17 00:00:00 2001 From: Paul Fertser Date: Fri, 21 Apr 2023 16:32:27 +0000 Subject: [PATCH 05/13] treewide: remove AUTORELEASE Automatically compute and substitute current values for all $(AUTORELEASE) instances as this feature is deprecated and shouldn't be used. The following temporary change was made to the core: diff --git a/rules.mk b/rules.mk index 57d7995d4fa8..f16367de87a8 100644 --- a/rules.mk +++ b/rules.mk @@ -429,7 +429,7 @@ endef abi_version_str = $(subst -,,$(subst _,,$(subst .,,$(1)))) COMMITCOUNT = $(if $(DUMP),0,$(call commitcount)) -AUTORELEASE = $(if $(DUMP),0,$(call commitcount,1)) +AUTORELEASE = $(if $(DUMP),0,$(shell sed -i "s/\$$(AUTORELEASE)/$(call commitcount,1)/" $(CURDIR)/Makefile)) all: FORCE: ; And this command used to fix affected packages: for i in $(cd feeds/packages; git grep -l PKG_RELEASE:=.*AUTORELEASE | \ sed 's^.*/\([^/]*\)/Makefile^\1^';); do make package/$i/download done Signed-off-by: Paul Fertser --- admin/btop/Makefile | 2 +- admin/debian-archive-keyring/Makefile | 2 +- admin/netdata/Makefile | 2 +- admin/nload/Makefile | 2 +- admin/syslog-ng/Makefile | 2 +- devel/bison/Makefile | 2 +- devel/diffutils/Makefile | 2 +- devel/flex/Makefile | 2 +- devel/gitlab-runner/Makefile | 2 +- devel/m4/Makefile | 2 +- devel/pkgconf/Makefile | 2 +- ipv6/generate-ipv6-address/Makefile | 2 +- kernel/ovpn-dco/Makefile | 2 +- lang/erlang/Makefile | 2 +- lang/lua-cs-bouncer/Makefile | 2 +- lang/lua-ev/Makefile | 2 +- lang/lua-openssl/Makefile | 2 +- lang/luaposix/Makefile | 2 +- lang/luv/Makefile | 2 +- lang/node-javascript-obfuscator/Makefile | 2 +- lang/perl-file-next/Makefile | 2 +- lang/perl-net-dns/Makefile | 2 +- lang/python/django-restframework/Makefile | 2 +- lang/python/openpyxl/Makefile | 2 +- lang/python/python-awesomeversion/Makefile | 2 +- lang/python/python-docutils/Makefile | 2 +- lang/python/python-gnupg/Makefile | 2 +- lang/python/python-greenlet/Makefile | 2 +- lang/python/python-idna/Makefile | 2 +- lang/python/python-paho-mqtt/Makefile | 2 +- lang/python/python-stem/Makefile | 2 +- lang/python/python-ubus/Makefile | 2 +- lang/python/python-uci/Makefile | 2 +- lang/python/python-websockets/Makefile | 2 +- lang/python/python3-asgiref/Makefile | 2 +- lang/python/python3-django-cors-headers/Makefile | 2 +- lang/python/python3-drf-nested-routers/Makefile | 2 +- lang/python/python3-sqlparse/Makefile | 2 +- lang/python/ruamel-yaml/Makefile | 2 +- lang/tcl/Makefile | 2 +- libs/alsa-lib/Makefile | 2 +- libs/alsa-ucm-conf/Makefile | 2 +- libs/boringssl/Makefile | 2 +- libs/check/Makefile | 2 +- libs/cyrus-sasl/Makefile | 2 +- libs/expat/Makefile | 2 +- libs/file/Makefile | 2 +- libs/flac/Makefile | 2 +- libs/freetype/Makefile | 2 +- libs/gdbm/Makefile | 2 +- libs/glib2/Makefile | 2 +- libs/gnu-efi/Makefile | 2 +- libs/gnutls/Makefile | 2 +- libs/h2o/Makefile | 2 +- libs/ipfs-http-client/Makefile | 2 +- libs/jose/Makefile | 2 +- libs/jsoncpp/Makefile | 2 +- libs/leptonica/Makefile | 2 +- libs/libaio/Makefile | 2 +- libs/libassuan/Makefile | 2 +- libs/libcap-ng/Makefile | 2 +- libs/libcoap/Makefile | 2 +- libs/libconfig/Makefile | 2 +- libs/libdnet/Makefile | 2 +- libs/libdvbcsa/Makefile | 2 +- libs/libesmtp/Makefile | 2 +- libs/libev/Makefile | 2 +- libs/libevdev/Makefile | 2 +- libs/libexif/Makefile | 2 +- libs/libextractor/Makefile | 2 +- libs/libfido2/Makefile | 2 +- libs/libfstrm/Makefile | 2 +- libs/libgcrypt/Makefile | 2 +- libs/libgee/Makefile | 2 +- libs/libgpg-error/Makefile | 2 +- libs/libical/Makefile | 2 +- libs/libidn/Makefile | 2 +- libs/libidn2/Makefile | 2 +- libs/libinput/Makefile | 2 +- libs/libksba/Makefile | 2 +- libs/liblz4/Makefile | 2 +- libs/libmariadb/Makefile | 2 +- libs/libmicrohttpd/Makefile | 2 +- libs/libmpdclient/Makefile | 2 +- libs/libnetconf2/Makefile | 2 +- libs/libnetfilter-log/Makefile | 2 +- libs/libnpupnp/Makefile | 2 +- libs/libogg/Makefile | 2 +- libs/liboping/Makefile | 2 +- libs/liborcania/Makefile | 2 +- libs/libpfring/Makefile | 2 +- libs/libpng/Makefile | 2 +- libs/libradiotap/Makefile | 2 +- libs/libre2/Makefile | 2 +- libs/libseccomp/Makefile | 2 +- libs/libshout/Makefile | 2 +- libs/libslirp/Makefile | 2 +- libs/libtasn1/Makefile | 2 +- libs/libtins/Makefile | 2 +- libs/libudev-zero/Makefile | 2 +- libs/libulfius/Makefile | 2 +- libs/libupnp/Makefile | 2 +- libs/libupnpp/Makefile | 2 +- libs/libuv/Makefile | 2 +- libs/libuwifi/Makefile | 2 +- libs/libuwsc/Makefile | 2 +- libs/libvpx/Makefile | 2 +- libs/libwslay/Makefile | 2 +- libs/libxslt/Makefile | 2 +- libs/libyaml-cpp/Makefile | 2 +- libs/libyang/Makefile | 2 +- libs/log4cplus/Makefile | 2 +- libs/loudmouth/Makefile | 2 +- libs/minizip/Makefile | 2 +- libs/neon/Makefile | 2 +- libs/nlohmannjson/Makefile | 2 +- libs/p11-kit/Makefile | 2 +- libs/poco/Makefile | 2 +- libs/protobuf/Makefile | 2 +- libs/spice/Makefile | 2 +- libs/sx1302_hal/Makefile | 2 +- libs/taglib/Makefile | 2 +- libs/xmlrpc-c/Makefile | 2 +- libs/xr_usb_serial_common/Makefile | 2 +- libs/yubico-pam/Makefile | 2 +- libs/zlog/Makefile | 2 +- mail/dovecot/Makefile | 2 +- mail/exim/Makefile | 2 +- mail/mblaze/Makefile | 2 +- mail/msmtp/Makefile | 2 +- mail/mutt/Makefile | 2 +- multimedia/grilo-plugins/Makefile | 2 +- multimedia/grilo/Makefile | 2 +- multimedia/mjpg-streamer/Makefile | 2 +- multimedia/rtpmidid/Makefile | 2 +- multimedia/ttymidi-sysex/Makefile | 2 +- multimedia/v4l2rtspserver/Makefile | 2 +- net/apinger/Makefile | 2 +- net/ariang/Makefile | 2 +- net/atftp/Makefile | 2 +- net/basicstation/Makefile | 2 +- net/bcp38/Makefile | 2 +- net/bridge-utils/Makefile | 2 +- net/bwm-ng/Makefile | 2 +- net/chrony/Makefile | 2 +- net/cni-route-override/Makefile | 2 +- net/coova-chilli/Makefile | 2 +- net/cshark/Makefile | 2 +- net/dante/Makefile | 2 +- net/davfs2/Makefile | 2 +- net/dns-over-https/Makefile | 2 +- net/fail2ban/Makefile | 2 +- net/hcxdumptool/Makefile | 2 +- net/hcxtools/Makefile | 2 +- net/hs20/Makefile | 2 +- net/httptunnel/Makefile | 2 +- net/ieee8021xclient/Makefile | 2 +- net/inadyn/Makefile | 2 +- net/iperf/Makefile | 2 +- net/irssi/Makefile | 2 +- net/jool/Makefile | 2 +- net/kea/Makefile | 2 +- net/keepalived/Makefile | 2 +- net/lksctp-tools/Makefile | 2 +- net/mbusd/Makefile | 2 +- net/mdns-repeater/Makefile | 2 +- net/memcached/Makefile | 2 +- net/miniupnpc/Makefile | 2 +- net/mstpd/Makefile | 2 +- net/mtr/Makefile | 2 +- net/net-snmp/Makefile | 2 +- net/netopeer2/Makefile | 2 +- net/ngircd/Makefile | 2 +- net/nut/Makefile | 2 +- net/opentracker/Makefile | 2 +- net/openvswitch/Makefile | 2 +- net/pingcheck/Makefile | 2 +- net/privoxy/Makefile | 2 +- net/qcsuper/Makefile | 2 +- net/ratechecker/Makefile | 2 +- net/rclone-ng/Makefile | 2 +- net/rclone-webui-react/Makefile | 2 +- net/restic-rest-server/Makefile | 2 +- net/rpcbind/Makefile | 2 +- net/rsync/Makefile | 2 +- net/samplicator/Makefile | 2 +- net/scapy/Makefile | 2 +- net/snort/Makefile | 2 +- net/softethervpn5/Makefile | 2 +- net/softflowd/Makefile | 2 +- net/spoofer/Makefile | 2 +- net/sqm-scripts/Makefile | 2 +- net/sshfs/Makefile | 2 +- net/sstp-client/Makefile | 2 +- net/stunnel/Makefile | 2 +- net/sysrepo/Makefile | 2 +- net/tgt/Makefile | 2 +- net/tinc/Makefile | 2 +- net/trojan-go/Makefile | 2 +- net/udhcpsnoop/Makefile | 2 +- net/udpxy/Makefile | 2 +- net/uradvd/Makefile | 2 +- net/vnstat2/Makefile | 2 +- net/vsftpd/Makefile | 2 +- net/wavemon/Makefile | 2 +- net/wg-installer/Makefile | 2 +- net/wsdd2/Makefile | 2 +- net/xtables-addons/Makefile | 2 +- sound/alsa-utils/Makefile | 2 +- sound/mpc/Makefile | 2 +- sound/mpg123/Makefile | 2 +- sound/pulseaudio/Makefile | 2 +- sound/shairport-sync/Makefile | 2 +- sound/upmpdcli/Makefile | 2 +- utils/acl/Makefile | 2 +- utils/airos-dfs-reset/Makefile | 2 +- utils/ap51-flash/Makefile | 2 +- utils/at/Makefile | 2 +- utils/attr/Makefile | 2 +- utils/auc/Makefile | 2 +- utils/audit/Makefile | 2 +- utils/bash/Makefile | 2 +- utils/bcm27xx-eeprom/Makefile | 2 +- utils/beep/Makefile | 2 +- utils/bluez-tools/Makefile | 2 +- utils/bossa/Makefile | 2 +- utils/btrfs-progs/Makefile | 2 +- utils/canutils/Makefile | 2 +- utils/catatonit/Makefile | 2 +- utils/crelay/Makefile | 2 +- utils/dbus/Makefile | 2 +- utils/domoticz/Makefile | 2 +- utils/fatresize/Makefile | 2 +- utils/fish/Makefile | 2 +- utils/fontconfig/Makefile | 2 +- utils/fuse-overlayfs/Makefile | 2 +- utils/fuse3/Makefile | 2 +- utils/gl-puli-mcu/Makefile | 2 +- utils/gpsd/Makefile | 2 +- utils/gptfdisk/Makefile | 2 +- utils/gzip/Makefile | 2 +- utils/haserl/Makefile | 2 +- utils/haveged/Makefile | 2 +- utils/hdparm/Makefile | 2 +- utils/hfsprogs/Makefile | 2 +- utils/hplip/Makefile | 2 +- utils/kitty-terminfo/Makefile | 2 +- utils/klish/Makefile | 2 +- utils/less/Makefile | 2 +- utils/librespeed-cli/Makefile | 2 +- utils/mandoc/Makefile | 2 +- utils/mariadb/Makefile | 2 +- utils/minicom/Makefile | 2 +- utils/mksh/Makefile | 2 +- utils/moreutils/Makefile | 2 +- utils/mtools/Makefile | 2 +- utils/nnn/Makefile | 2 +- utils/nsutils/Makefile | 2 +- utils/ntfs-3g/Makefile | 2 +- utils/oci-runtime-tools/Makefile | 2 +- utils/opendoas/Makefile | 2 +- utils/opensc/Makefile | 2 +- utils/parted/Makefile | 2 +- utils/passh/Makefile | 2 +- utils/pcsc-lite/Makefile | 2 +- utils/powertop/Makefile | 2 +- utils/prometheus/Makefile | 2 +- utils/readsb/Makefile | 2 +- utils/realtek-poe/Makefile | 2 +- utils/rtl_433/Makefile | 2 +- utils/runc/Makefile | 2 +- utils/semodule-utils/Makefile | 2 +- utils/sexpect/Makefile | 2 +- utils/sipcalc/Makefile | 2 +- utils/slirp4netns/Makefile | 2 +- utils/smartmontools/Makefile | 2 +- utils/sms-tool/Makefile | 2 +- utils/spi-tools/Makefile | 2 +- utils/stm32flash/Makefile | 2 +- utils/sumo/Makefile | 2 +- utils/sysstat/Makefile | 2 +- utils/tang/Makefile | 2 +- utils/tar/Makefile | 2 +- utils/taskwarrior/Makefile | 2 +- utils/tcsh/Makefile | 2 +- utils/tessdata/Makefile | 2 +- utils/tesseract/Makefile | 2 +- utils/tinyionice/Makefile | 2 +- utils/tmux/Makefile | 2 +- utils/ubnt-manager/Makefile | 2 +- utils/uledd/Makefile | 2 +- utils/unrar/Makefile | 2 +- utils/whois/Makefile | 2 +- utils/yara/Makefile | 2 +- utils/zstd/Makefile | 2 +- 295 files changed, 295 insertions(+), 295 deletions(-) diff --git a/admin/btop/Makefile b/admin/btop/Makefile index 281249570..8b8888b50 100644 --- a/admin/btop/Makefile +++ b/admin/btop/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=btop PKG_VERSION:=1.2.13 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL=https://codeload.github.com/aristocratos/btop/tar.gz/v$(PKG_VERSION)? diff --git a/admin/debian-archive-keyring/Makefile b/admin/debian-archive-keyring/Makefile index 21c906afe..cf2d179be 100644 --- a/admin/debian-archive-keyring/Makefile +++ b/admin/debian-archive-keyring/Makefile @@ -3,7 +3,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=debian-archive-keyring PKG_VERSION:=2021.1.1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=debian-archive-keyring_2021.1.1_all.deb PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/d/debian-archive-keyring/ diff --git a/admin/netdata/Makefile b/admin/netdata/Makefile index f4d00786d..3552536e6 100644 --- a/admin/netdata/Makefile +++ b/admin/netdata/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=netdata PKG_VERSION:=1.33.1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=4 PKG_MAINTAINER:=Josef Schlehofer , Daniel Engberg PKG_LICENSE:=GPL-3.0-or-later diff --git a/admin/nload/Makefile b/admin/nload/Makefile index b987507c2..77abc29cb 100644 --- a/admin/nload/Makefile +++ b/admin/nload/Makefile @@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nload PKG_VERSION:=0.7.4 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/rolandriegel/nload/tar.gz/v$(PKG_VERSION)? diff --git a/admin/syslog-ng/Makefile b/admin/syslog-ng/Makefile index a225b6afa..7a214f152 100644 --- a/admin/syslog-ng/Makefile +++ b/admin/syslog-ng/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=syslog-ng PKG_VERSION:=4.1.1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_MAINTAINER:=Josef Schlehofer PKG_LICENSE:=LGPL-2.1-or-later GPL-2.0-or-later diff --git a/devel/bison/Makefile b/devel/bison/Makefile index 94183f9d9..09cd23309 100644 --- a/devel/bison/Makefile +++ b/devel/bison/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bison PKG_VERSION:=3.8.2 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNU/$(PKG_NAME) diff --git a/devel/diffutils/Makefile b/devel/diffutils/Makefile index a75a2b5d6..98333df2a 100644 --- a/devel/diffutils/Makefile +++ b/devel/diffutils/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=diffutils PKG_VERSION:=3.8 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNU/diffutils diff --git a/devel/flex/Makefile b/devel/flex/Makefile index 3b7d1ce1c..a61d95358 100644 --- a/devel/flex/Makefile +++ b/devel/flex/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=flex PKG_VERSION:=2.6.4 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=4 PKG_CPE_ID:=cpe:/a:flex_project:flex PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz diff --git a/devel/gitlab-runner/Makefile b/devel/gitlab-runner/Makefile index 4e1ac59ac..575db4707 100644 --- a/devel/gitlab-runner/Makefile +++ b/devel/gitlab-runner/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gitlab-runner PKG_VERSION:=14.3.2 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://gitlab.com/gitlab-org/gitlab-runner/-/archive/v$(PKG_VERSION) diff --git a/devel/m4/Makefile b/devel/m4/Makefile index b4937b1be..89635807b 100644 --- a/devel/m4/Makefile +++ b/devel/m4/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=m4 PKG_VERSION:=1.4.19 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE_URL:=@GNU/m4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz diff --git a/devel/pkgconf/Makefile b/devel/pkgconf/Makefile index c2a2415f4..171358d55 100644 --- a/devel/pkgconf/Makefile +++ b/devel/pkgconf/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pkgconf PKG_VERSION:=1.8.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://distfiles.dereferenced.org/pkgconf diff --git a/ipv6/generate-ipv6-address/Makefile b/ipv6/generate-ipv6-address/Makefile index 701b3c78d..304f064dc 100644 --- a/ipv6/generate-ipv6-address/Makefile +++ b/ipv6/generate-ipv6-address/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=generate-ipv6-address PKG_VERSION:=0.1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=3 PKG_SOURCE:=generate-ipv6-address-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.irif.fr/~jch/software/files/ diff --git a/kernel/ovpn-dco/Makefile b/kernel/ovpn-dco/Makefile index bf52f627a..e278a0eb3 100644 --- a/kernel/ovpn-dco/Makefile +++ b/kernel/ovpn-dco/Makefile @@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=ovpn-dco PKG_SOURCE_DATE:=2022-10-23 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=3 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=https://github.com/OpenVPN/ovpn-dco.git diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile index f26fc11b7..e1428ffbf 100644 --- a/lang/erlang/Makefile +++ b/lang/erlang/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=erlang PKG_VERSION:=24.2 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=3 PKG_SOURCE:=otp_src_$(PKG_VERSION).tar.gz PKG_SOURCE_URL:= http://www.erlang.org/download/ diff --git a/lang/lua-cs-bouncer/Makefile b/lang/lua-cs-bouncer/Makefile index 96d4ddf86..3f8f75930 100644 --- a/lang/lua-cs-bouncer/Makefile +++ b/lang/lua-cs-bouncer/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lua-cs-bouncer PKG_SOURCE_DATE:=2022-01-18 PKG_SOURCE_VERSION:=e0f68b1265c386715c1d6ab79fe9063c0a9e3d3a -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_DATE).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/crowdsecurity/$(PKG_NAME)/tar.gz/$(PKG_SOURCE_VERSION)? diff --git a/lang/lua-ev/Makefile b/lang/lua-ev/Makefile index b1000d980..7a6a3fb32 100644 --- a/lang/lua-ev/Makefile +++ b/lang/lua-ev/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lua-ev PKG_VERSION:=1.5 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/brimworks/lua-ev/tar.gz/v$(PKG_VERSION)? diff --git a/lang/lua-openssl/Makefile b/lang/lua-openssl/Makefile index 5257fb757..29f70453d 100644 --- a/lang/lua-openssl/Makefile +++ b/lang/lua-openssl/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lua-openssl -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/zhaozg/lua-openssl.git diff --git a/lang/luaposix/Makefile b/lang/luaposix/Makefile index 9c0b9b1e9..2739f863f 100644 --- a/lang/luaposix/Makefile +++ b/lang/luaposix/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luaposix PKG_VERSION:=35.1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE_URL:=https://codeload.github.com/$(PKG_NAME)/$(PKG_NAME)/tar.gz/v$(PKG_VERSION)? PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz diff --git a/lang/luv/Makefile b/lang/luv/Makefile index 3ee45d2d8..b0e43f5bf 100644 --- a/lang/luv/Makefile +++ b/lang/luv/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luv PKG_VERSION:=1.40.0-0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/luvit/luv/releases/download/$(PKG_VERSION) diff --git a/lang/node-javascript-obfuscator/Makefile b/lang/node-javascript-obfuscator/Makefile index 48b2a6d3a..281656331 100644 --- a/lang/node-javascript-obfuscator/Makefile +++ b/lang/node-javascript-obfuscator/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NPM_NAME:=javascript-obfuscator PKG_NAME:=node-$(PKG_NPM_NAME) PKG_VERSION:=2.19.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz PKG_SOURCE_URL:=https://registry.npmjs.org/$(PKG_NPM_NAME)/-/ diff --git a/lang/perl-file-next/Makefile b/lang/perl-file-next/Makefile index 62fe434b0..f28afd740 100644 --- a/lang/perl-file-next/Makefile +++ b/lang/perl-file-next/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=perl-file-next PKG_VERSION:=1.18 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/P/PE/PETDANCE/ PKG_SOURCE:=File-Next-$(PKG_VERSION).tar.gz diff --git a/lang/perl-net-dns/Makefile b/lang/perl-net-dns/Makefile index 1b290bf9a..fef558922 100644 --- a/lang/perl-net-dns/Makefile +++ b/lang/perl-net-dns/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=perl-net-dns PKG_VERSION:=1.35 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE_NAME:=Net-DNS PKG_SOURCE:=$(PKG_SOURCE_NAME)-$(PKG_VERSION).tar.gz diff --git a/lang/python/django-restframework/Makefile b/lang/python/django-restframework/Makefile index 5c8006b37..fd53be8e3 100644 --- a/lang/python/django-restframework/Makefile +++ b/lang/python/django-restframework/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=django-restframework PKG_VERSION:=3.14.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PYPI_NAME:=djangorestframework PKG_HASH:=579a333e6256b09489cbe0a067e66abe55c6595d8926be6b99423786334350c8 diff --git a/lang/python/openpyxl/Makefile b/lang/python/openpyxl/Makefile index 97883020c..0edb95176 100644 --- a/lang/python/openpyxl/Makefile +++ b/lang/python/openpyxl/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-openpyxl PKG_VERSION:=3.0.10 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_MAINTAINER:=Alexandru Ardelean PKG_LICENSE:=MIT diff --git a/lang/python/python-awesomeversion/Makefile b/lang/python/python-awesomeversion/Makefile index 73fc231eb..0a7dd9de7 100644 --- a/lang/python/python-awesomeversion/Makefile +++ b/lang/python/python-awesomeversion/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-awesomeversion PKG_VERSION:=21.8.1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PYPI_NAME:=awesomeversion PKG_HASH:=a72f3fff12df257e30f5e25a8550fc4da62e7591d5fdb70714f5c96827c37645 diff --git a/lang/python/python-docutils/Makefile b/lang/python/python-docutils/Makefile index f167ce653..23fcd4c82 100644 --- a/lang/python/python-docutils/Makefile +++ b/lang/python/python-docutils/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=docutils PKG_VERSION:=0.19 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PYPI_NAME:=$(PKG_NAME) PKG_HASH:=33995a6753c30b7f577febfc2c50411fec6aac7f7ffeb7c4cfe5991072dcf9e6 diff --git a/lang/python/python-gnupg/Makefile b/lang/python/python-gnupg/Makefile index acd4f4452..c04a5de74 100644 --- a/lang/python/python-gnupg/Makefile +++ b/lang/python/python-gnupg/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-gnupg PKG_VERSION:=0.4.7 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PYPI_NAME:=$(PKG_NAME) PKG_HASH:=2061f56b1942c29b92727bf9aecbd3cea3893acc9cccbdc7eb4604285efe4ac7 diff --git a/lang/python/python-greenlet/Makefile b/lang/python/python-greenlet/Makefile index cc9b4f896..25ee383a0 100644 --- a/lang/python/python-greenlet/Makefile +++ b/lang/python/python-greenlet/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-greenlet PKG_VERSION:=1.1.2 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PYPI_NAME:=greenlet PKG_HASH:=e30f5ea4ae2346e62cedde8794a56858a67b878dd79f7df76a0767e356b1744a diff --git a/lang/python/python-idna/Makefile b/lang/python/python-idna/Makefile index 537aba53a..0844a87c1 100644 --- a/lang/python/python-idna/Makefile +++ b/lang/python/python-idna/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-idna PKG_VERSION:=3.3 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PYPI_NAME:=idna PKG_HASH:=9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d diff --git a/lang/python/python-paho-mqtt/Makefile b/lang/python/python-paho-mqtt/Makefile index fd9e627ca..c8aea07de 100644 --- a/lang/python/python-paho-mqtt/Makefile +++ b/lang/python/python-paho-mqtt/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-paho-mqtt PKG_VERSION:=1.6.1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_MAINTAINER:=Josef Schlehofer , Alexandru Ardelean PKG_LICENSE:=EPL-1.0 Eclipse Distribution License v1.0 diff --git a/lang/python/python-stem/Makefile b/lang/python/python-stem/Makefile index 2c342fab1..e1b486afe 100644 --- a/lang/python/python-stem/Makefile +++ b/lang/python/python-stem/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-stem PKG_VERSION:=1.8.1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PYPI_NAME:=stem PKG_HASH:=81d43a7c668ba9d7bc1103b2e7a911e9d148294b373d27a59ae8da79ef7a3e2f diff --git a/lang/python/python-ubus/Makefile b/lang/python/python-ubus/Makefile index c980399fd..161440a04 100644 --- a/lang/python/python-ubus/Makefile +++ b/lang/python/python-ubus/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-ubus PKG_VERSION:=0.1.1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PYPI_NAME:=ubus PKG_HASH:=7e57bda989bc35b48c7075d03ec2818226e722bbf1bde138d7e7ea26d462682a diff --git a/lang/python/python-uci/Makefile b/lang/python/python-uci/Makefile index 7308c3f26..46fbd79a9 100644 --- a/lang/python/python-uci/Makefile +++ b/lang/python/python-uci/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-uci PKG_VERSION:=0.9.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PYPI_NAME:=pyuci PKG_HASH:=865a45d48fb5d363f1230e94fa2c5b01ae6487f02f2180b0a6f78193a70166e2 diff --git a/lang/python/python-websockets/Makefile b/lang/python/python-websockets/Makefile index dcf594a29..737ea39f4 100644 --- a/lang/python/python-websockets/Makefile +++ b/lang/python/python-websockets/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-websockets PKG_VERSION:=10.3 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PYPI_NAME:=websockets PKG_HASH:=fc06cc8073c8e87072138ba1e431300e2d408f054b27047d047b549455066ff4 diff --git a/lang/python/python3-asgiref/Makefile b/lang/python/python3-asgiref/Makefile index 6052dbd15..d92ec91b9 100644 --- a/lang/python/python3-asgiref/Makefile +++ b/lang/python/python3-asgiref/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=asgiref PKG_VERSION:=3.4.1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PYPI_NAME:=asgiref PKG_HASH:=4ef1ab46b484e3c706329cedeff284a5d40824200638503f5768edb6de7d58e9 diff --git a/lang/python/python3-django-cors-headers/Makefile b/lang/python/python3-django-cors-headers/Makefile index 8d8ab2a1d..3d7b8533b 100644 --- a/lang/python/python3-django-cors-headers/Makefile +++ b/lang/python/python3-django-cors-headers/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=django-cors-headers PKG_VERSION:=3.10.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PYPI_NAME:=django-cors-headers PKG_HASH:=cd6f4360f5246569c149dc1c40c907c191f1ec45551e10d2a2e2e68512652f78 diff --git a/lang/python/python3-drf-nested-routers/Makefile b/lang/python/python3-drf-nested-routers/Makefile index 46d82c35d..1e7e50ae3 100644 --- a/lang/python/python3-drf-nested-routers/Makefile +++ b/lang/python/python3-drf-nested-routers/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=drf-nested-routers PKG_VERSION:=0.93.4 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PYPI_NAME:=drf-nested-routers PKG_HASH:=01aa556b8c08608bb74fb34f6ca065a5183f2cda4dc0478192cc17a2581d71b0 diff --git a/lang/python/python3-sqlparse/Makefile b/lang/python/python3-sqlparse/Makefile index 256170c50..1b003f95a 100644 --- a/lang/python/python3-sqlparse/Makefile +++ b/lang/python/python3-sqlparse/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sqlparse PKG_VERSION:=0.4.2 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PYPI_NAME:=sqlparse PKG_HASH:=0c00730c74263a94e5a9919ade150dfc3b19c574389985446148402998287dae diff --git a/lang/python/ruamel-yaml/Makefile b/lang/python/ruamel-yaml/Makefile index 46c8e67be..5863f4ab1 100644 --- a/lang/python/ruamel-yaml/Makefile +++ b/lang/python/ruamel-yaml/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ruamel-yaml PKG_VERSION:=0.17.17 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PYPI_NAME:=ruamel.yaml PKG_HASH:=9751de4cbb57d4bfbf8fc394e125ed4a2f170fbff3dc3d78abf50be85924f8be diff --git a/lang/tcl/Makefile b/lang/tcl/Makefile index 3b337473d..04bc64f32 100644 --- a/lang/tcl/Makefile +++ b/lang/tcl/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tcl TCL_MAJOR_VERSION:=8.6 PKG_VERSION:=${TCL_MAJOR_VERSION}.11 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)$(PKG_VERSION)-src.tar.gz PKG_SOURCE_URL:=@SF/$(PKG_NAME) diff --git a/libs/alsa-lib/Makefile b/libs/alsa-lib/Makefile index 95ab3730e..1efd068a1 100644 --- a/libs/alsa-lib/Makefile +++ b/libs/alsa-lib/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=alsa-lib PKG_VERSION:=1.2.6.1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=ftp://ftp.alsa-project.org/pub/lib/ \ diff --git a/libs/alsa-ucm-conf/Makefile b/libs/alsa-ucm-conf/Makefile index 6c92a1add..153f0739e 100644 --- a/libs/alsa-ucm-conf/Makefile +++ b/libs/alsa-ucm-conf/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=alsa-ucm-conf PKG_VERSION:=1.2.6.2 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=ftp://ftp.alsa-project.org/pub/lib/ \ diff --git a/libs/boringssl/Makefile b/libs/boringssl/Makefile index 9c38a70ea..6185b780f 100644 --- a/libs/boringssl/Makefile +++ b/libs/boringssl/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=boringssl PKG_VERSION:=20210608 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://boringssl.googlesource.com/boringssl diff --git a/libs/check/Makefile b/libs/check/Makefile index 717e88f4b..e8881734b 100644 --- a/libs/check/Makefile +++ b/libs/check/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=check PKG_VERSION:=0.15.2 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/libcheck/check/releases/download/$(PKG_VERSION) diff --git a/libs/cyrus-sasl/Makefile b/libs/cyrus-sasl/Makefile index 9f0f16ab4..88964f5ff 100644 --- a/libs/cyrus-sasl/Makefile +++ b/libs/cyrus-sasl/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=cyrus-sasl PKG_VERSION:=2.1.28 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_MAINTAINER:=W. Michael Petullo diff --git a/libs/expat/Makefile b/libs/expat/Makefile index fd9c3f842..a0f6a241e 100644 --- a/libs/expat/Makefile +++ b/libs/expat/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=expat PKG_VERSION:=2.5.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@SF/expat \ diff --git a/libs/file/Makefile b/libs/file/Makefile index 7cad8660c..e12dc946c 100644 --- a/libs/file/Makefile +++ b/libs/file/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=file PKG_VERSION:=5.41 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://download.openpkg.org/components/cache/file/ \ diff --git a/libs/flac/Makefile b/libs/flac/Makefile index 98a0e322c..218aa237e 100644 --- a/libs/flac/Makefile +++ b/libs/flac/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=flac PKG_VERSION:=1.3.4 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://downloads.xiph.org/releases/flac/ diff --git a/libs/freetype/Makefile b/libs/freetype/Makefile index af7955ff6..313ab9b56 100644 --- a/libs/freetype/Makefile +++ b/libs/freetype/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=freetype PKG_VERSION:=2.11.1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@SF/freetype diff --git a/libs/gdbm/Makefile b/libs/gdbm/Makefile index c9be1c5f6..616fcb34e 100644 --- a/libs/gdbm/Makefile +++ b/libs/gdbm/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gdbm PKG_VERSION:=1.21 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/gdbm diff --git a/libs/glib2/Makefile b/libs/glib2/Makefile index 226242dc5..076423fb0 100644 --- a/libs/glib2/Makefile +++ b/libs/glib2/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=glib2 PKG_VERSION:=2.74.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=3 PKG_SOURCE:=glib-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNOME/glib/$(word 1,$(subst ., ,$(PKG_VERSION))).$(word 2,$(subst ., ,$(PKG_VERSION))) diff --git a/libs/gnu-efi/Makefile b/libs/gnu-efi/Makefile index 58660c9ad..3125069cc 100644 --- a/libs/gnu-efi/Makefile +++ b/libs/gnu-efi/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gnu-efi PKG_VERSION:=3.0.9 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/vathpela/gnu-efi.git diff --git a/libs/gnutls/Makefile b/libs/gnutls/Makefile index 6ab3bfcfc..3246bb254 100644 --- a/libs/gnutls/Makefile +++ b/libs/gnutls/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gnutls PKG_VERSION:=3.7.8 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_BUILD_FLAGS:=no-mips16 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz diff --git a/libs/h2o/Makefile b/libs/h2o/Makefile index 59f2e3047..e7529d1e2 100644 --- a/libs/h2o/Makefile +++ b/libs/h2o/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=h2o PKG_VERSION:=2.2.6 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=13 PKG_SOURCE_URL:=https://codeload.github.com/h2o/h2o/tar.gz/v${PKG_VERSION}? PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz diff --git a/libs/ipfs-http-client/Makefile b/libs/ipfs-http-client/Makefile index c434e349a..6a853eb6e 100644 --- a/libs/ipfs-http-client/Makefile +++ b/libs/ipfs-http-client/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ipfs-http-client -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/vasild/cpp-ipfs-http-client.git diff --git a/libs/jose/Makefile b/libs/jose/Makefile index 1be469718..419519727 100644 --- a/libs/jose/Makefile +++ b/libs/jose/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=jose PKG_VERSION:=11 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=6 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/latchset/$(PKG_NAME)/releases/download/v$(PKG_VERSION)/ diff --git a/libs/jsoncpp/Makefile b/libs/jsoncpp/Makefile index 6024e4629..6db1219f0 100644 --- a/libs/jsoncpp/Makefile +++ b/libs/jsoncpp/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=jsoncpp PKG_VERSION:=1.9.5 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/open-source-parsers/jsoncpp/tar.gz/$(PKG_VERSION)? diff --git a/libs/leptonica/Makefile b/libs/leptonica/Makefile index 4997ce945..79b055981 100644 --- a/libs/leptonica/Makefile +++ b/libs/leptonica/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=leptonica PKG_VERSION:=1.80.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.leptonica.org/source/ diff --git a/libs/libaio/Makefile b/libs/libaio/Makefile index 850199f73..e83687677 100644 --- a/libs/libaio/Makefile +++ b/libs/libaio/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libaio PKG_VERSION:=0.3.113 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://releases.pagure.org/libaio diff --git a/libs/libassuan/Makefile b/libs/libassuan/Makefile index 5e1437f37..2e1f05b10 100644 --- a/libs/libassuan/Makefile +++ b/libs/libassuan/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libassuan PKG_VERSION:=2.5.5 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://gnupg.org/ftp/gcrypt/$(PKG_NAME) diff --git a/libs/libcap-ng/Makefile b/libs/libcap-ng/Makefile index ab3c6272a..c18d2a903 100644 --- a/libs/libcap-ng/Makefile +++ b/libs/libcap-ng/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libcap-ng PKG_VERSION:=0.8.3 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://people.redhat.com/sgrubb/libcap-ng diff --git a/libs/libcoap/Makefile b/libs/libcoap/Makefile index eef8820fd..c49aeb7aa 100644 --- a/libs/libcoap/Makefile +++ b/libs/libcoap/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libcoap PKG_VERSION:=4.3.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/obgm/libcoap/tar.gz/v$(PKG_VERSION)? diff --git a/libs/libconfig/Makefile b/libs/libconfig/Makefile index f902c1354..b2b91df99 100644 --- a/libs/libconfig/Makefile +++ b/libs/libconfig/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libconfig PKG_VERSION:=1.7.3 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://hyperrealm.github.io/libconfig/dist/ diff --git a/libs/libdnet/Makefile b/libs/libdnet/Makefile index c1e694065..f0f0bbc0d 100644 --- a/libs/libdnet/Makefile +++ b/libs/libdnet/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libdnet PKG_VERSION:=1.16.1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/ofalk/libdnet/tar.gz/$(PKG_NAME)-$(PKG_VERSION)? diff --git a/libs/libdvbcsa/Makefile b/libs/libdvbcsa/Makefile index 1976ce04d..62a89e9ca 100644 --- a/libs/libdvbcsa/Makefile +++ b/libs/libdvbcsa/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libdvbcsa -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE_VERSION:=bc6c0b164a87ce05e9925785cc6fb3f54c02b026 PKG_HASH:=2d761c9e094642f2c9aa7e66534c6147a59d0d0bc709ec0f2fdbb34bf020d8ec diff --git a/libs/libesmtp/Makefile b/libs/libesmtp/Makefile index 5f7d7a979..d4b6f6c7f 100644 --- a/libs/libesmtp/Makefile +++ b/libs/libesmtp/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libesmtp PKG_VERSION:=1.1.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_MAINTAINER:=Othmar Truniger PKG_LICENSE:=LGPL-2.0-or-later diff --git a/libs/libev/Makefile b/libs/libev/Makefile index 61173841e..017c6eb9e 100644 --- a/libs/libev/Makefile +++ b/libs/libev/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libev PKG_VERSION:=4.33 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://dist.schmorp.de/libev/Attic/ diff --git a/libs/libevdev/Makefile b/libs/libevdev/Makefile index b10929670..8043681fa 100644 --- a/libs/libevdev/Makefile +++ b/libs/libevdev/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libevdev PKG_VERSION:=1.13.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://www.freedesktop.org/software/libevdev/ diff --git a/libs/libexif/Makefile b/libs/libexif/Makefile index aaa184a01..3d53a6c23 100644 --- a/libs/libexif/Makefile +++ b/libs/libexif/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libexif PKG_VERSION:=0.6.24 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://github.com/libexif/libexif/releases/download/v$(PKG_VERSION) diff --git a/libs/libextractor/Makefile b/libs/libextractor/Makefile index d01ef29bc..df85a4f8b 100644 --- a/libs/libextractor/Makefile +++ b/libs/libextractor/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libextractor PKG_VERSION:=1.11 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=3 # ToDo: # - package missing optional dependencies: libexiv2, gsf, librpm, smf, tidy diff --git a/libs/libfido2/Makefile b/libs/libfido2/Makefile index 0ede55e16..84a68b1d8 100644 --- a/libs/libfido2/Makefile +++ b/libs/libfido2/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libfido2 PKG_VERSION:=1.12.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/Yubico/libfido2/tar.gz/$(PKG_VERSION)? diff --git a/libs/libfstrm/Makefile b/libs/libfstrm/Makefile index cf04b574f..da9175651 100644 --- a/libs/libfstrm/Makefile +++ b/libs/libfstrm/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libfstrm PKG_VERSION:=0.6.1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=fstrm-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://dl.farsightsecurity.com/dist/fstrm/ diff --git a/libs/libgcrypt/Makefile b/libs/libgcrypt/Makefile index 457960d55..6b9933b88 100644 --- a/libs/libgcrypt/Makefile +++ b/libs/libgcrypt/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libgcrypt PKG_VERSION:=1.10.1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://www.gnupg.org/ftp/gcrypt/libgcrypt/ diff --git a/libs/libgee/Makefile b/libs/libgee/Makefile index 8615a15e8..b7dbabdad 100644 --- a/libs/libgee/Makefile +++ b/libs/libgee/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libgee PKG_VERSION:=0.20.6 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNOME/libgee/0.20 diff --git a/libs/libgpg-error/Makefile b/libs/libgpg-error/Makefile index 77182fa5d..6195326f3 100644 --- a/libs/libgpg-error/Makefile +++ b/libs/libgpg-error/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libgpg-error PKG_VERSION:=1.46 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://mirrors.dotsrc.org/gcrypt/libgpg-error \ diff --git a/libs/libical/Makefile b/libs/libical/Makefile index 3d6c88b14..4e88bc5d8 100644 --- a/libs/libical/Makefile +++ b/libs/libical/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libical PKG_VERSION:=3.0.9 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_HASH:=bd26d98b7fcb2eb0cd5461747bbb02024ebe38e293ca53a7dfdcb2505265a728 diff --git a/libs/libidn/Makefile b/libs/libidn/Makefile index 4237df272..80f785f1d 100644 --- a/libs/libidn/Makefile +++ b/libs/libidn/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libidn PKG_VERSION:=1.41 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/libidn diff --git a/libs/libidn2/Makefile b/libs/libidn2/Makefile index ccc26857e..d080cfcda 100644 --- a/libs/libidn2/Makefile +++ b/libs/libidn2/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libidn2 PKG_VERSION:=2.3.4 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE_URL:=@GNU/libidn PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz diff --git a/libs/libinput/Makefile b/libs/libinput/Makefile index 7a34b5718..03fdf8711 100644 --- a/libs/libinput/Makefile +++ b/libs/libinput/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libinput PKG_VERSION:=1.19.4 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://www.freedesktop.org/software/libinput diff --git a/libs/libksba/Makefile b/libs/libksba/Makefile index 635066c57..558ea47f8 100644 --- a/libs/libksba/Makefile +++ b/libs/libksba/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libksba PKG_VERSION:=1.6.2 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://gnupg.org/ftp/gcrypt/$(PKG_NAME) diff --git a/libs/liblz4/Makefile b/libs/liblz4/Makefile index c73804026..81db887e8 100644 --- a/libs/liblz4/Makefile +++ b/libs/liblz4/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lz4 PKG_VERSION:=1.9.4 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/lz4/lz4/tar.gz/v$(PKG_VERSION)? diff --git a/libs/libmariadb/Makefile b/libs/libmariadb/Makefile index f4b756ec0..f304f3e0c 100644 --- a/libs/libmariadb/Makefile +++ b/libs/libmariadb/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libmariadb PKG_VERSION:=3.1.18 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=mariadb-connector-c-$(PKG_VERSION)-src.tar.gz PKG_SOURCE_URL := \ diff --git a/libs/libmicrohttpd/Makefile b/libs/libmicrohttpd/Makefile index 8fb5f19d7..9037deae1 100644 --- a/libs/libmicrohttpd/Makefile +++ b/libs/libmicrohttpd/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libmicrohttpd PKG_VERSION:=0.9.75 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/libmicrohttpd diff --git a/libs/libmpdclient/Makefile b/libs/libmpdclient/Makefile index 2ffb42b1b..1b1e4dd3a 100644 --- a/libs/libmpdclient/Makefile +++ b/libs/libmpdclient/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libmpdclient PKG_VERSION:=2.20 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://www.musicpd.org/download/libmpdclient/2 diff --git a/libs/libnetconf2/Makefile b/libs/libnetconf2/Makefile index 9bdf424c2..2b201f283 100644 --- a/libs/libnetconf2/Makefile +++ b/libs/libnetconf2/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libnetconf2 PKG_VERSION:=2.0.24 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/CESNET/libnetconf2/tar.gz/v$(PKG_VERSION)? diff --git a/libs/libnetfilter-log/Makefile b/libs/libnetfilter-log/Makefile index 15c5d2d1f..f29e3cce8 100644 --- a/libs/libnetfilter-log/Makefile +++ b/libs/libnetfilter-log/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libnetfilter_log PKG_VERSION:=1.0.2 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:= \ diff --git a/libs/libnpupnp/Makefile b/libs/libnpupnp/Makefile index 9eb961af8..54e7f2b21 100644 --- a/libs/libnpupnp/Makefile +++ b/libs/libnpupnp/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libnpupnp PKG_VERSION:=5.0.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.lesbonscomptes.com/upmpdcli/downloads diff --git a/libs/libogg/Makefile b/libs/libogg/Makefile index bd80514be..93b502ae0 100644 --- a/libs/libogg/Makefile +++ b/libs/libogg/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libogg PKG_VERSION:=1.3.5 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://downloads.xiph.org/releases/ogg/ diff --git a/libs/liboping/Makefile b/libs/liboping/Makefile index 8973dd5c9..d2c72b179 100644 --- a/libs/liboping/Makefile +++ b/libs/liboping/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=liboping PKG_VERSION:=1.10.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=3 PKG_MAINTAINER:=Jo-Philipp Wich PKG_LICENSE:=LGPL-2.1-or-later diff --git a/libs/liborcania/Makefile b/libs/liborcania/Makefile index 5dd3651ff..7591b46f5 100644 --- a/libs/liborcania/Makefile +++ b/libs/liborcania/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=liborcania PKG_VERSION:=2.3.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/babelouest/orcania/tar.gz/v$(PKG_VERSION)? diff --git a/libs/libpfring/Makefile b/libs/libpfring/Makefile index 6123c87b3..f02e3ed48 100644 --- a/libs/libpfring/Makefile +++ b/libs/libpfring/Makefile @@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=libpfring PKG_VERSION:=8.0.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/ntop/PF_RING/tar.gz/$(PKG_VERSION)? diff --git a/libs/libpng/Makefile b/libs/libpng/Makefile index f900ddaa5..cd4aef7a7 100644 --- a/libs/libpng/Makefile +++ b/libs/libpng/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libpng PKG_VERSION:=1.6.38 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@SF/libpng diff --git a/libs/libradiotap/Makefile b/libs/libradiotap/Makefile index 478961390..bfcfcc8bf 100644 --- a/libs/libradiotap/Makefile +++ b/libs/libradiotap/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libradiotap PKG_VERSION:=2020-06-22 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=5 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/radiotap/radiotap-library.git diff --git a/libs/libre2/Makefile b/libs/libre2/Makefile index 972cbf29b..76a679fef 100644 --- a/libs/libre2/Makefile +++ b/libs/libre2/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=re2 PKG_VERSION:=2021-02-02 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/google/re2/tar.gz/$(PKG_VERSION)? diff --git a/libs/libseccomp/Makefile b/libs/libseccomp/Makefile index 248432424..6025a271d 100644 --- a/libs/libseccomp/Makefile +++ b/libs/libseccomp/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libseccomp PKG_VERSION:=2.5.4 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_BUILD_FLAGS:=no-mips16 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz diff --git a/libs/libshout/Makefile b/libs/libshout/Makefile index c76bdb3e7..811e6a1a3 100644 --- a/libs/libshout/Makefile +++ b/libs/libshout/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libshout PKG_VERSION:=2.4.6 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://downloads.us.xiph.org/releases/libshout/ diff --git a/libs/libslirp/Makefile b/libs/libslirp/Makefile index 3d46e7871..a9c7dbfcc 100644 --- a/libs/libslirp/Makefile +++ b/libs/libslirp/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libslirp PKG_VERSION:=4.7.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://gitlab.freedesktop.org/slirp/$(PKG_NAME)/-/archive/v$(PKG_VERSION) diff --git a/libs/libtasn1/Makefile b/libs/libtasn1/Makefile index 7e70b2212..36116ad1a 100644 --- a/libs/libtasn1/Makefile +++ b/libs/libtasn1/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libtasn1 PKG_VERSION:=4.19.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/$(PKG_NAME) diff --git a/libs/libtins/Makefile b/libs/libtins/Makefile index b9bf27322..b511626bd 100644 --- a/libs/libtins/Makefile +++ b/libs/libtins/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libtins PKG_VERSION:=4.4 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/mfontanini/libtins/tar.gz/v$(PKG_VERSION)? diff --git a/libs/libudev-zero/Makefile b/libs/libudev-zero/Makefile index d6e208abe..7cb991f75 100644 --- a/libs/libudev-zero/Makefile +++ b/libs/libudev-zero/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libudev-zero PKG_VERSION:=1.0.1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/illiliti/libudev-zero/tar.gz/$(PKG_VERSION)? diff --git a/libs/libulfius/Makefile b/libs/libulfius/Makefile index 07ba49cc3..6512da8d1 100644 --- a/libs/libulfius/Makefile +++ b/libs/libulfius/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libulfius PKG_VERSION:=2.7.10 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/babelouest/ulfius/tar.gz/v$(PKG_VERSION)? diff --git a/libs/libupnp/Makefile b/libs/libupnp/Makefile index d00859dbe..001855344 100644 --- a/libs/libupnp/Makefile +++ b/libs/libupnp/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libupnp PKG_VERSION:=1.14.12 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@SF/pupnp diff --git a/libs/libupnpp/Makefile b/libs/libupnpp/Makefile index 5e1ce429c..1690b67e2 100644 --- a/libs/libupnpp/Makefile +++ b/libs/libupnpp/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libupnpp PKG_VERSION:=0.22.2 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.lesbonscomptes.com/upmpdcli/downloads diff --git a/libs/libuv/Makefile b/libs/libuv/Makefile index 4e297b6b0..37738c6fd 100644 --- a/libs/libuv/Makefile +++ b/libs/libuv/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libuv PKG_VERSION:=1.44.1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://dist.libuv.org/dist/v$(PKG_VERSION)/ diff --git a/libs/libuwifi/Makefile b/libs/libuwifi/Makefile index ca96feb4c..0bab688a7 100644 --- a/libs/libuwifi/Makefile +++ b/libs/libuwifi/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libuwifi PKG_VERSION:=2020-03-10 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/br101/libuwifi.git diff --git a/libs/libuwsc/Makefile b/libs/libuwsc/Makefile index 0f861ea2b..94753ae07 100644 --- a/libs/libuwsc/Makefile +++ b/libs/libuwsc/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libuwsc PKG_VERSION:=3.3.5 -PKG_RELEASE:=$(AUTORELEASE).1 +PKG_RELEASE:=5.1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL=https://github.com/zhaojh329/libuwsc/releases/download/v$(PKG_VERSION) diff --git a/libs/libvpx/Makefile b/libs/libvpx/Makefile index 743ccadc4..830f2d7fa 100644 --- a/libs/libvpx/Makefile +++ b/libs/libvpx/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libvpx PKG_VERSION:=1.12.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://chromium.googlesource.com/webm/libvpx diff --git a/libs/libwslay/Makefile b/libs/libwslay/Makefile index 63bf5a27a..6af483031 100644 --- a/libs/libwslay/Makefile +++ b/libs/libwslay/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libwslay PKG_VERSION:=1.1.1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=5 PKG_SOURCE:=release-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/tatsuhiro-t/wslay/tar.gz/release-$(PKG_VERSION)? diff --git a/libs/libxslt/Makefile b/libs/libxslt/Makefile index b4a3c5747..1edc610b9 100644 --- a/libs/libxslt/Makefile +++ b/libs/libxslt/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libxslt PKG_VERSION:=1.1.37 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNOME/libxslt/$(basename $(PKG_VERSION)) diff --git a/libs/libyaml-cpp/Makefile b/libs/libyaml-cpp/Makefile index 829ec7dd5..15072b515 100644 --- a/libs/libyaml-cpp/Makefile +++ b/libs/libyaml-cpp/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libyaml-cpp PKG_VERSION:=0.7.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=yaml-cpp-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/jbeder/yaml-cpp/tar.gz/yaml-cpp-$(PKG_VERSION)? diff --git a/libs/libyang/Makefile b/libs/libyang/Makefile index 22988ab4e..4053f5dd6 100644 --- a/libs/libyang/Makefile +++ b/libs/libyang/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libyang PKG_VERSION:=2.0.112 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/CESNET/libyang/tar.gz/v$(PKG_VERSION)? diff --git a/libs/log4cplus/Makefile b/libs/log4cplus/Makefile index c4e103fd2..569320a8d 100644 --- a/libs/log4cplus/Makefile +++ b/libs/log4cplus/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=log4cplus PKG_VERSION:=2.0.8 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@SF/$(PKG_NAME) diff --git a/libs/loudmouth/Makefile b/libs/loudmouth/Makefile index ff9cabd19..512390489 100644 --- a/libs/loudmouth/Makefile +++ b/libs/loudmouth/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=loudmouth PKG_VERSION:=1.5.4 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/mcabber/loudmouth/tar.gz/$(PKG_VERSION)? diff --git a/libs/minizip/Makefile b/libs/minizip/Makefile index e38ed167c..f6a76216d 100644 --- a/libs/minizip/Makefile +++ b/libs/minizip/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=minizip-ng PKG_VERSION:=3.0.4 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/zlib-ng/minizip-ng/tar.gz/$(PKG_VERSION)? diff --git a/libs/neon/Makefile b/libs/neon/Makefile index b54b7a602..9df650b81 100644 --- a/libs/neon/Makefile +++ b/libs/neon/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=neon PKG_VERSION:=0.32.4 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://notroj.github.io/neon diff --git a/libs/nlohmannjson/Makefile b/libs/nlohmannjson/Makefile index d9b1b5b73..26101344b 100644 --- a/libs/nlohmannjson/Makefile +++ b/libs/nlohmannjson/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nlohmannjson PKG_VERSION:=3.10.2 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).zip PKG_SOURCE_URL:=https://codeload.github.com/nlohmann/json/zip/v$(PKG_VERSION)? diff --git a/libs/p11-kit/Makefile b/libs/p11-kit/Makefile index 2eccfe3f9..0d4948dc0 100644 --- a/libs/p11-kit/Makefile +++ b/libs/p11-kit/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=p11-kit PKG_VERSION:=0.24.1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/p11-glue/p11-kit/releases/download/$(PKG_VERSION) diff --git a/libs/poco/Makefile b/libs/poco/Makefile index d14ed96bb..3f79f4853 100644 --- a/libs/poco/Makefile +++ b/libs/poco/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=poco PKG_VERSION:=1.11.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 ifeq ($(BUILD_VARIANT),all) _PKG_VERSION:=${PKG_VERSION}-all diff --git a/libs/protobuf/Makefile b/libs/protobuf/Makefile index 7bf304c8f..de6aa5a40 100644 --- a/libs/protobuf/Makefile +++ b/libs/protobuf/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=protobuf PKG_VERSION:=3.17.3 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-cpp-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/google/protobuf/releases/download/v$(PKG_VERSION) diff --git a/libs/spice/Makefile b/libs/spice/Makefile index 9247bb7d7..0606b0629 100644 --- a/libs/spice/Makefile +++ b/libs/spice/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=spice PKG_VERSION:=0.15.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://www.spice-space.org/download/releases/spice-server diff --git a/libs/sx1302_hal/Makefile b/libs/sx1302_hal/Makefile index 6fc3c4d6a..661968d38 100644 --- a/libs/sx1302_hal/Makefile +++ b/libs/sx1302_hal/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sx1302_hal PKG_VERSION:=2.1.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/Lora-net/sx1302_hal/tar.gz/V$(PKG_VERSION)? diff --git a/libs/taglib/Makefile b/libs/taglib/Makefile index f75c39735..cdfc64d77 100644 --- a/libs/taglib/Makefile +++ b/libs/taglib/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=taglib PKG_VERSION:=1.13 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/taglib/taglib/tar.gz/v$(PKG_VERSION)? diff --git a/libs/xmlrpc-c/Makefile b/libs/xmlrpc-c/Makefile index 1d573b4e4..49e43a3e3 100644 --- a/libs/xmlrpc-c/Makefile +++ b/libs/xmlrpc-c/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xmlrpc-c PKG_VERSION:=1.51.07 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz PKG_SOURCE_URL:=@SF/xmlrpc-c/Xmlrpc-c%20Super%20Stable/$(PKG_VERSION) diff --git a/libs/xr_usb_serial_common/Makefile b/libs/xr_usb_serial_common/Makefile index d8f46e9f8..b8e7ee62f 100644 --- a/libs/xr_usb_serial_common/Makefile +++ b/libs/xr_usb_serial_common/Makefile @@ -4,7 +4,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=usb-serial-xr_usb_serial_common PKG_SOURCE_DATE:=2022-03-30 PKG_SOURCE_VERSION:=ecc6ebe0141b97942d774e6c6be37a330cc11a74 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/kasbert/epsolar-tracer diff --git a/libs/yubico-pam/Makefile b/libs/yubico-pam/Makefile index 7c641f670..165c92fff 100644 --- a/libs/yubico-pam/Makefile +++ b/libs/yubico-pam/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=yubico-pam PKG_VERSION:=2.27 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=pam_yubico-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://developers.yubico.com/yubico-pam/Releases diff --git a/libs/zlog/Makefile b/libs/zlog/Makefile index b1e62619e..03b69c9d1 100644 --- a/libs/zlog/Makefile +++ b/libs/zlog/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=zlog PKG_VERSION:=1.2.15 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/HardySimpson/$(PKG_NAME)/archive/refs/tags/$(PKG_VERSION).tar.gz? diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile index f6bbf75cd..d1c034eda 100644 --- a/mail/dovecot/Makefile +++ b/mail/dovecot/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dovecot PKG_VERSION:=2.3.18 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://dovecot.org/releases/2.3 diff --git a/mail/exim/Makefile b/mail/exim/Makefile index b2b9af9df..8abf0337f 100644 --- a/mail/exim/Makefile +++ b/mail/exim/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=exim PKG_VERSION:=4.96 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://ftp.exim.org/pub/exim/exim4/ diff --git a/mail/mblaze/Makefile b/mail/mblaze/Makefile index 1512ea44c..98baddfc6 100644 --- a/mail/mblaze/Makefile +++ b/mail/mblaze/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mblaze PKG_VERSION:=1.2 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://leahneukirchen.org/releases diff --git a/mail/msmtp/Makefile b/mail/msmtp/Makefile index 737c88314..e953eb4e5 100644 --- a/mail/msmtp/Makefile +++ b/mail/msmtp/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=msmtp PKG_VERSION:=1.8.19 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://marlam.de/msmtp/releases diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile index 12b75ffd5..f0d94e03b 100644 --- a/mail/mutt/Makefile +++ b/mail/mutt/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mutt PKG_VERSION:=2.1.5 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE_URL:=https://bitbucket.org/mutt/mutt/downloads/ \ http://ftp.mutt.org/pub/mutt/ diff --git a/multimedia/grilo-plugins/Makefile b/multimedia/grilo-plugins/Makefile index dc7234cb7..8b69e6b5a 100644 --- a/multimedia/grilo-plugins/Makefile +++ b/multimedia/grilo-plugins/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=grilo-plugins PKG_VERSION:=0.3.14 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNOME/grilo-plugins/0.3/ diff --git a/multimedia/grilo/Makefile b/multimedia/grilo/Makefile index 7508396e7..ea5850109 100644 --- a/multimedia/grilo/Makefile +++ b/multimedia/grilo/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=grilo PKG_VERSION:=0.3.14 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNOME/grilo/0.3/ diff --git a/multimedia/mjpg-streamer/Makefile b/multimedia/mjpg-streamer/Makefile index 5fc943c87..b05652784 100644 --- a/multimedia/mjpg-streamer/Makefile +++ b/multimedia/mjpg-streamer/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mjpg-streamer PKG_VERSION:=1.0.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=5 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/jacksonliam/mjpg-streamer/tar.gz/v$(PKG_VERSION)? diff --git a/multimedia/rtpmidid/Makefile b/multimedia/rtpmidid/Makefile index a2c956569..44e45e6cc 100644 --- a/multimedia/rtpmidid/Makefile +++ b/multimedia/rtpmidid/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=rtpmidid -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE_DATE:=2022-07-07 PKG_SOURCE_VERSION:=eab5cd80c5326c1b3720736442e1c2f7e2fa50d7 diff --git a/multimedia/ttymidi-sysex/Makefile b/multimedia/ttymidi-sysex/Makefile index 7f4fb8426..d655231d3 100644 --- a/multimedia/ttymidi-sysex/Makefile +++ b/multimedia/ttymidi-sysex/Makefile @@ -3,7 +3,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ttymidi-sysex PKG_SOURCE_DATE:=2021-05-07 PKG_SOURCE_VERSION:=e519a1167253e24ae35caed0371fed5bd4f26061 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=3 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/cchaussat/ttymidi-sysex diff --git a/multimedia/v4l2rtspserver/Makefile b/multimedia/v4l2rtspserver/Makefile index aee5cdce7..b07eb1e56 100644 --- a/multimedia/v4l2rtspserver/Makefile +++ b/multimedia/v4l2rtspserver/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=v4l2rtspserver PKG_VERSION:=0.3.7 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=8 #cannot use codeload as this uses submodules PKG_SOURCE_PROTO:=git diff --git a/net/apinger/Makefile b/net/apinger/Makefile index ea89ffdc6..b2f537275 100644 --- a/net/apinger/Makefile +++ b/net/apinger/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=apinger PKG_SOURCE_DATE:=2015-04-09 PKG_SOURCE_VERSION:=78eb328721ba1a10571c19df95acddcb5f0c17c8 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=5 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/Jajcus/apinger diff --git a/net/ariang/Makefile b/net/ariang/Makefile index af89ca8af..4787a0e0b 100644 --- a/net/ariang/Makefile +++ b/net/ariang/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ariang PKG_VERSION:=1.3.2 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).zip PKG_SOURCE_URL:=https://github.com/mayswind/AriaNg/releases/download/$(PKG_VERSION) diff --git a/net/atftp/Makefile b/net/atftp/Makefile index e94ce8237..9478f0697 100644 --- a/net/atftp/Makefile +++ b/net/atftp/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=atftp PKG_VERSION:=0.7.5 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/$(PKG_NAME) diff --git a/net/basicstation/Makefile b/net/basicstation/Makefile index a547a0602..c405f5b0b 100644 --- a/net/basicstation/Makefile +++ b/net/basicstation/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=basicstation PKG_VERSION:=2.0.6 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/lorabasics/basicstation/tar.gz/v$(PKG_VERSION)? diff --git a/net/bcp38/Makefile b/net/bcp38/Makefile index 694b56279..adcf4ca1b 100644 --- a/net/bcp38/Makefile +++ b/net/bcp38/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bcp38 PKG_VERSION:=5 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=11 PKG_LICENCE:=GPL-3.0-or-later include $(INCLUDE_DIR)/package.mk diff --git a/net/bridge-utils/Makefile b/net/bridge-utils/Makefile index 1e75d03ac..775d8cf70 100644 --- a/net/bridge-utils/Makefile +++ b/net/bridge-utils/Makefile @@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=bridge-utils PKG_VERSION:=1.7.1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/linux/utils/net/bridge-utils diff --git a/net/bwm-ng/Makefile b/net/bwm-ng/Makefile index 1f9ef2069..b68696bba 100644 --- a/net/bwm-ng/Makefile +++ b/net/bwm-ng/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bwm-ng PKG_VERSION:=0.6.3 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.gropp.org/bwm-ng diff --git a/net/chrony/Makefile b/net/chrony/Makefile index f4c277b75..5efaff473 100644 --- a/net/chrony/Makefile +++ b/net/chrony/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=chrony PKG_VERSION:=4.3 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://download.tuxfamily.org/chrony/ diff --git a/net/cni-route-override/Makefile b/net/cni-route-override/Makefile index d24228bb6..69ced50ba 100644 --- a/net/cni-route-override/Makefile +++ b/net/cni-route-override/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=cni-route-override PKG_VERSION:=0.1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/redhat-nfvpe/$(PKG_NAME).git diff --git a/net/coova-chilli/Makefile b/net/coova-chilli/Makefile index 88b98ab44..b96fccbc1 100644 --- a/net/coova-chilli/Makefile +++ b/net/coova-chilli/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=coova-chilli PKG_VERSION:=1.6 -PKG_RELEASE:=$(AUTORELEASE).1 +PKG_RELEASE:=9.1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/coova/coova-chilli/tar.gz/$(PKG_VERSION)? diff --git a/net/cshark/Makefile b/net/cshark/Makefile index a16e7cccc..e9470f144 100644 --- a/net/cshark/Makefile +++ b/net/cshark/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=cshark PKG_SOURCE_DATE:=2020-07-22 PKG_SOURCE_VERSION:=c0d32fb6df3cd095fecac8aefe8d188170246403 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=3 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/cloudshark/cshark.git diff --git a/net/dante/Makefile b/net/dante/Makefile index 568ac7c29..535903c8e 100644 --- a/net/dante/Makefile +++ b/net/dante/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dante PKG_VERSION:=1.4.3 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.inet.no/dante/files/ diff --git a/net/davfs2/Makefile b/net/davfs2/Makefile index e75dafc2d..2def7a52b 100644 --- a/net/davfs2/Makefile +++ b/net/davfs2/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=davfs2 PKG_VERSION:=1.6.1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SAVANNAH/davfs2 diff --git a/net/dns-over-https/Makefile b/net/dns-over-https/Makefile index 48f6f296c..eff63a40e 100644 --- a/net/dns-over-https/Makefile +++ b/net/dns-over-https/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dns-over-https PKG_VERSION:=2.3.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/m13253/dns-over-https/tar.gz/v${PKG_VERSION}? diff --git a/net/fail2ban/Makefile b/net/fail2ban/Makefile index dd3d9b8cb..1d36a36d2 100644 --- a/net/fail2ban/Makefile +++ b/net/fail2ban/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fail2ban PKG_VERSION:=0.11.2 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=7 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/fail2ban/fail2ban/tar.gz/$(PKG_VERSION)? diff --git a/net/hcxdumptool/Makefile b/net/hcxdumptool/Makefile index 066ba0e70..022f03c52 100644 --- a/net/hcxdumptool/Makefile +++ b/net/hcxdumptool/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=hcxdumptool PKG_VERSION:=6.2.4 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/zerbea/hcxdumptool/tar.gz/$(PKG_VERSION)? diff --git a/net/hcxtools/Makefile b/net/hcxtools/Makefile index 1d503e510..36e7d9501 100644 --- a/net/hcxtools/Makefile +++ b/net/hcxtools/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=hcxtools PKG_VERSION:=6.2.4 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/zerbea/hcxtools/tar.gz/$(PKG_VERSION)? diff --git a/net/hs20/Makefile b/net/hs20/Makefile index 72e223e54..894179a6c 100644 --- a/net/hs20/Makefile +++ b/net/hs20/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=hs20 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=8 PKG_SOURCE_URL:=http://w1.fi/hostap.git PKG_SOURCE_PROTO:=git diff --git a/net/httptunnel/Makefile b/net/httptunnel/Makefile index 7340b4607..c19b74029 100644 --- a/net/httptunnel/Makefile +++ b/net/httptunnel/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=httptunnel PKG_VERSION:=3.3 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/larsbrinkhoff/httptunnel.git diff --git a/net/ieee8021xclient/Makefile b/net/ieee8021xclient/Makefile index a56a57904..62a4f2738 100644 --- a/net/ieee8021xclient/Makefile +++ b/net/ieee8021xclient/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ieee8021xclient -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=3 PKG_LICENSE:=GPL-2.0-or-later include $(INCLUDE_DIR)/package.mk diff --git a/net/inadyn/Makefile b/net/inadyn/Makefile index 12be435a9..f6f6421ec 100644 --- a/net/inadyn/Makefile +++ b/net/inadyn/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=inadyn PKG_VERSION:=2.9.1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/troglobit/inadyn/releases/download/v$(PKG_VERSION) diff --git a/net/iperf/Makefile b/net/iperf/Makefile index 3e13a04a2..159e1b1c2 100644 --- a/net/iperf/Makefile +++ b/net/iperf/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=iperf PKG_VERSION:=2.1.8 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_HASH:=8e2cf2fbc9d0d4d1cf9d109b1e328459f9622993dc9a4c5a7dc8a2088fb7beaf diff --git a/net/irssi/Makefile b/net/irssi/Makefile index 554f3115d..c5d2cb2e5 100644 --- a/net/irssi/Makefile +++ b/net/irssi/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=irssi PKG_VERSION:=1.2.3 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/irssi/irssi/releases/download/$(PKG_VERSION)/ diff --git a/net/jool/Makefile b/net/jool/Makefile index ae06bed41..fbefb3949 100644 --- a/net/jool/Makefile +++ b/net/jool/Makefile @@ -9,7 +9,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=jool PKG_VERSION:=4.1.8 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_LICENSE:=GPL-2.0-only PKG_LICENSE_FILES:=COPYING diff --git a/net/kea/Makefile b/net/kea/Makefile index a630f41c0..f269b4141 100644 --- a/net/kea/Makefile +++ b/net/kea/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=kea PKG_VERSION:=2.0.3 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://ftp.isc.org/isc/kea/$(PKG_VERSION) diff --git a/net/keepalived/Makefile b/net/keepalived/Makefile index 0c0e8d23a..217b12c13 100644 --- a/net/keepalived/Makefile +++ b/net/keepalived/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=keepalived PKG_VERSION:=2.2.7 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=10 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.keepalived.org/software diff --git a/net/lksctp-tools/Makefile b/net/lksctp-tools/Makefile index 1cb4ea973..b3e067618 100644 --- a/net/lksctp-tools/Makefile +++ b/net/lksctp-tools/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lksctp-tools PKG_VERSION:=1.0.19 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/sctp/lksctp-tools/tar.gz/v$(PKG_VERSION)? diff --git a/net/mbusd/Makefile b/net/mbusd/Makefile index 856486aac..0595efc28 100644 --- a/net/mbusd/Makefile +++ b/net/mbusd/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mbusd PKG_VERSION:=0.5.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=4 PKG_SOURCE_URL:=https://codeload.github.com/3cky/mbusd/tar.gz/v$(PKG_VERSION)? PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz diff --git a/net/mdns-repeater/Makefile b/net/mdns-repeater/Makefile index 016fd26f8..fd39de3d6 100644 --- a/net/mdns-repeater/Makefile +++ b/net/mdns-repeater/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mdns-repeater -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE_URL:=https://github.com/kennylevinsen/mdns-repeater.git PKG_SOURCE_PROTO=git diff --git a/net/memcached/Makefile b/net/memcached/Makefile index 053b4d4c0..c4f05388e 100644 --- a/net/memcached/Makefile +++ b/net/memcached/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=memcached PKG_VERSION:=1.6.17 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://memcached.org/files diff --git a/net/miniupnpc/Makefile b/net/miniupnpc/Makefile index a386457fd..2882640f3 100644 --- a/net/miniupnpc/Makefile +++ b/net/miniupnpc/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=miniupnpc PKG_VERSION:=2.2.3 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://miniupnp.tuxfamily.org/files diff --git a/net/mstpd/Makefile b/net/mstpd/Makefile index 4a124e661..3bea93c49 100644 --- a/net/mstpd/Makefile +++ b/net/mstpd/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mstpd PKG_VERSION:=0.1.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/mstpd/mstpd/tar.gz/$(PKG_VERSION)? diff --git a/net/mtr/Makefile b/net/mtr/Makefile index a340898ce..87fe732cb 100644 --- a/net/mtr/Makefile +++ b/net/mtr/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mtr PKG_VERSION:=0.95 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/traviscross/mtr/tar.gz/v$(PKG_VERSION)? diff --git a/net/net-snmp/Makefile b/net/net-snmp/Makefile index 6205736cb..b700e4761 100644 --- a/net/net-snmp/Makefile +++ b/net/net-snmp/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=net-snmp PKG_VERSION:=5.9.1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=5 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/net-snmp diff --git a/net/netopeer2/Makefile b/net/netopeer2/Makefile index cce33eda8..10adad115 100644 --- a/net/netopeer2/Makefile +++ b/net/netopeer2/Makefile @@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=netopeer2 PKG_VERSION:=2.0.35 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/CESNET/Netopeer2/tar.gz/v$(PKG_VERSION)? diff --git a/net/ngircd/Makefile b/net/ngircd/Makefile index d3943277b..d877ad5f6 100644 --- a/net/ngircd/Makefile +++ b/net/ngircd/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ngircd PKG_VERSION:=26.1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://ngircd.barton.de/pub/ngircd diff --git a/net/nut/Makefile b/net/nut/Makefile index 53c0a84d8..d40eca8f2 100644 --- a/net/nut/Makefile +++ b/net/nut/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nut PKG_VERSION:=2.8.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.networkupstools.org/source/2.8/ diff --git a/net/opentracker/Makefile b/net/opentracker/Makefile index 7989f5da0..689f139ff 100644 --- a/net/opentracker/Makefile +++ b/net/opentracker/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=opentracker -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://erdgeist.org/gitweb/opentracker diff --git a/net/openvswitch/Makefile b/net/openvswitch/Makefile index fa1fa5d34..7f47c2822 100644 --- a/net/openvswitch/Makefile +++ b/net/openvswitch/Makefile @@ -17,7 +17,7 @@ include ./openvswitch.mk # PKG_NAME:=openvswitch PKG_VERSION:=$(ovs_version) -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.openvswitch.org/releases/ PKG_HASH:=e03bfab7ca82d81a7d3a36de4f390a3b5210e3f39657671f922877cd4ea6dc73 diff --git a/net/pingcheck/Makefile b/net/pingcheck/Makefile index a42460830..ea2561def 100644 --- a/net/pingcheck/Makefile +++ b/net/pingcheck/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pingcheck PKG_VERSION:=2022-03-01 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/br101/pingcheck diff --git a/net/privoxy/Makefile b/net/privoxy/Makefile index a7f5227b8..f59920cf3 100644 --- a/net/privoxy/Makefile +++ b/net/privoxy/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=privoxy PKG_VERSION:=3.0.33 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=4 PKG_SOURCE:=privoxy-$(PKG_VERSION)-stable-src.tar.gz PKG_SOURCE_URL:=@SF/ijbswa diff --git a/net/qcsuper/Makefile b/net/qcsuper/Makefile index 2bff07879..6f77bbdd1 100644 --- a/net/qcsuper/Makefile +++ b/net/qcsuper/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=qcsuper PKG_VERSION:=2022-08-11 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/P1sec/QCSuper.git diff --git a/net/ratechecker/Makefile b/net/ratechecker/Makefile index f06cdcade..37fe90951 100644 --- a/net/ratechecker/Makefile +++ b/net/ratechecker/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ratechecker -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://bitbucket.org/comnets/ratechecker.git diff --git a/net/rclone-ng/Makefile b/net/rclone-ng/Makefile index 184fbf495..b668fc588 100644 --- a/net/rclone-ng/Makefile +++ b/net/rclone-ng/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=rclone-ng PKG_VERSION:=0.5.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=RcloneNg-v$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/ElonH/RcloneNg/releases/download/v$(PKG_VERSION)/ diff --git a/net/rclone-webui-react/Makefile b/net/rclone-webui-react/Makefile index d2adee888..c81a7d2ee 100644 --- a/net/rclone-webui-react/Makefile +++ b/net/rclone-webui-react/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=rclone-webui-react PKG_VERSION:=2.0.5 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).zip PKG_SOURCE_URL:=https://github.com/rclone/rclone-webui-react/releases/download/v$(PKG_VERSION)/currentbuild.zip? diff --git a/net/restic-rest-server/Makefile b/net/restic-rest-server/Makefile index fedd526fa..e0d45525b 100644 --- a/net/restic-rest-server/Makefile +++ b/net/restic-rest-server/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=restic-rest-server PKG_VERSION:=0.11.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_BUILD_DIR:=$(BUILD_DIR)/rest-server-$(PKG_VERSION) PKG_SOURCE:=rest-server-$(PKG_VERSION).tar.gz diff --git a/net/rpcbind/Makefile b/net/rpcbind/Makefile index 9bdeec02f..f36abb204 100644 --- a/net/rpcbind/Makefile +++ b/net/rpcbind/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=rpcbind PKG_VERSION:=1.2.6 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE_URL:=@SF/rpcbind PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 diff --git a/net/rsync/Makefile b/net/rsync/Makefile index fc4cd5097..76a72b7dc 100644 --- a/net/rsync/Makefile +++ b/net/rsync/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=rsync PKG_VERSION:=3.2.7 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://download.samba.org/pub/$(PKG_NAME)/src diff --git a/net/samplicator/Makefile b/net/samplicator/Makefile index 667d595d4..92c4874fd 100644 --- a/net/samplicator/Makefile +++ b/net/samplicator/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=samplicator -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/sleinen/samplicator.git diff --git a/net/scapy/Makefile b/net/scapy/Makefile index 6cf711bd8..987872e47 100644 --- a/net/scapy/Makefile +++ b/net/scapy/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=scapy PKG_VERSION:=2.4.5 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PYPI_NAME:=$(PKG_NAME) PKG_HASH:=bc707e3604784496b6665a9e5b2a69c36cc9fb032af4864b29051531b24c8593 diff --git a/net/snort/Makefile b/net/snort/Makefile index ee605c4fd..f5e246df4 100644 --- a/net/snort/Makefile +++ b/net/snort/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=snort PKG_VERSION:=2.9.19 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_LICENSE:=GPL-2.0 PKG_MAINTAINER:=W. Michael Petullo diff --git a/net/softethervpn5/Makefile b/net/softethervpn5/Makefile index 350086dd1..fbe314548 100644 --- a/net/softethervpn5/Makefile +++ b/net/softethervpn5/Makefile @@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=softethervpn5 PKG_VERSION:=5.02.5180 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=3 PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYING diff --git a/net/softflowd/Makefile b/net/softflowd/Makefile index 1e4c292ef..a8d1982d5 100644 --- a/net/softflowd/Makefile +++ b/net/softflowd/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=softflowd PKG_VERSION:=1.0.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=5 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/irino/softflowd/tar.gz/softflowd-$(PKG_VERSION)? diff --git a/net/spoofer/Makefile b/net/spoofer/Makefile index 1cb4a1e7b..0ff984f92 100644 --- a/net/spoofer/Makefile +++ b/net/spoofer/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=spoofer PKG_VERSION:=1.4.8 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.caida.org/projects/spoofer/downloads diff --git a/net/sqm-scripts/Makefile b/net/sqm-scripts/Makefile index d4e5e1710..51833b9d0 100644 --- a/net/sqm-scripts/Makefile +++ b/net/sqm-scripts/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sqm-scripts PKG_SOURCE_VERSION:=7ce734ea191240c85c86b83cbf18701655b0359c PKG_VERSION:=1.5.2 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/tohojo/sqm-scripts diff --git a/net/sshfs/Makefile b/net/sshfs/Makefile index 738793b04..b66b28ed9 100644 --- a/net/sshfs/Makefile +++ b/net/sshfs/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sshfs PKG_VERSION:=3.7.2 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/libfuse/sshfs/releases/download/$(PKG_NAME)-$(PKG_VERSION) diff --git a/net/sstp-client/Makefile b/net/sstp-client/Makefile index 973131794..7010fba52 100644 --- a/net/sstp-client/Makefile +++ b/net/sstp-client/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sstp-client PKG_VERSION:=1.0.15 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/sstp-client/$(PKG_VERSION) diff --git a/net/stunnel/Makefile b/net/stunnel/Makefile index 98013c7e2..e0406666b 100644 --- a/net/stunnel/Makefile +++ b/net/stunnel/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=stunnel PKG_VERSION:=5.67 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=4 PKG_LICENSE:=GPL-2.0-or-later PKG_MAINTAINER:=Florian Eckert diff --git a/net/sysrepo/Makefile b/net/sysrepo/Makefile index ec2c2ce19..8061e263d 100644 --- a/net/sysrepo/Makefile +++ b/net/sysrepo/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sysrepo PKG_VERSION:=2.0.53 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/sysrepo/sysrepo/tar.gz/v$(PKG_VERSION)? diff --git a/net/tgt/Makefile b/net/tgt/Makefile index 2a5c113c1..46720dddf 100644 --- a/net/tgt/Makefile +++ b/net/tgt/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tgt PKG_VERSION:=1.0.83 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/fujita/tgt/tar.gz/v$(PKG_VERSION)? diff --git a/net/tinc/Makefile b/net/tinc/Makefile index f605240ce..4f7018c5b 100644 --- a/net/tinc/Makefile +++ b/net/tinc/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tinc PKG_VERSION:=1.1pre18 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://tinc-vpn.org/packages diff --git a/net/trojan-go/Makefile b/net/trojan-go/Makefile index 1f05030e7..37072332c 100644 --- a/net/trojan-go/Makefile +++ b/net/trojan-go/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=trojan-go PKG_VERSION:=0.10.6 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/p4gefau1t/trojan-go/tar.gz/v$(PKG_VERSION)? diff --git a/net/udhcpsnoop/Makefile b/net/udhcpsnoop/Makefile index 4912ac268..c362582fa 100644 --- a/net/udhcpsnoop/Makefile +++ b/net/udhcpsnoop/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=udhcpsnoop -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_LICENSE:=BSD-3-Clause PKG_MAINTAINER:=John Crispin diff --git a/net/udpxy/Makefile b/net/udpxy/Makefile index d2af1d595..76b11db95 100644 --- a/net/udpxy/Makefile +++ b/net/udpxy/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=udpxy PKG_VERSION:=1.0-25.1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/pcherenkov/udpxy/tar.gz/$(PKG_VERSION)? diff --git a/net/uradvd/Makefile b/net/uradvd/Makefile index 577c4fc0a..9cc8b7dec 100644 --- a/net/uradvd/Makefile +++ b/net/uradvd/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=uradvd -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=https://github.com/freifunk-gluon/uradvd.git diff --git a/net/vnstat2/Makefile b/net/vnstat2/Makefile index 0aab4271b..290cc3273 100644 --- a/net/vnstat2/Makefile +++ b/net/vnstat2/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=vnstat2 PKG_VERSION:=2.10 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=vnstat-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://humdi.net/vnstat diff --git a/net/vsftpd/Makefile b/net/vsftpd/Makefile index 895a39b38..ad74c7f92 100644 --- a/net/vsftpd/Makefile +++ b/net/vsftpd/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=vsftpd PKG_VERSION:=3.0.5 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://security.appspot.com/downloads/ diff --git a/net/wavemon/Makefile b/net/wavemon/Makefile index 9f59e2d3c..65c69b370 100644 --- a/net/wavemon/Makefile +++ b/net/wavemon/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=wavemon PKG_VERSION:=0.9.3 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/uoaerg/wavemon/tar.gz/v$(PKG_VERSION)? diff --git a/net/wg-installer/Makefile b/net/wg-installer/Makefile index c238faa88..2c7bc4247 100644 --- a/net/wg-installer/Makefile +++ b/net/wg-installer/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=wg-installer -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=28 PKG_MAINTAINER:=Nick Hainke diff --git a/net/wsdd2/Makefile b/net/wsdd2/Makefile index 74689c667..1c5c1bd06 100644 --- a/net/wsdd2/Makefile +++ b/net/wsdd2/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=wsdd2 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/Netgear/wsdd2.git diff --git a/net/xtables-addons/Makefile b/net/xtables-addons/Makefile index 87b9afa66..ce0b9236c 100644 --- a/net/xtables-addons/Makefile +++ b/net/xtables-addons/Makefile @@ -8,7 +8,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=xtables-addons PKG_VERSION:=3.21 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_HASH:=2e09ac129a14f5e9c23b115ebcdfff4aa84e2aeba1268dbdf39b2d752bd71e19 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz diff --git a/sound/alsa-utils/Makefile b/sound/alsa-utils/Makefile index f8f90e4ba..17e9ac6fe 100644 --- a/sound/alsa-utils/Makefile +++ b/sound/alsa-utils/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=alsa-utils PKG_VERSION:=1.2.6 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=ftp://ftp.alsa-project.org/pub/utils/ \ diff --git a/sound/mpc/Makefile b/sound/mpc/Makefile index 3747b8edc..ede126f0b 100644 --- a/sound/mpc/Makefile +++ b/sound/mpc/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mpc PKG_VERSION:=0.34 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://www.musicpd.org/download/mpc/0 diff --git a/sound/mpg123/Makefile b/sound/mpg123/Makefile index 6c7b89431..c6d202e93 100644 --- a/sound/mpg123/Makefile +++ b/sound/mpg123/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mpg123 PKG_VERSION:=1.31.1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@SF/mpg123 diff --git a/sound/pulseaudio/Makefile b/sound/pulseaudio/Makefile index 0b400a42e..24f604e9d 100644 --- a/sound/pulseaudio/Makefile +++ b/sound/pulseaudio/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pulseaudio PKG_VERSION:=14.2 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=10 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://freedesktop.org/software/pulseaudio/releases diff --git a/sound/shairport-sync/Makefile b/sound/shairport-sync/Makefile index 08172bf0a..653aab7d0 100644 --- a/sound/shairport-sync/Makefile +++ b/sound/shairport-sync/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=shairport-sync PKG_VERSION:=3.3.9 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/mikebrady/shairport-sync/tar.gz/$(PKG_VERSION)? diff --git a/sound/upmpdcli/Makefile b/sound/upmpdcli/Makefile index 8cd88f660..6d7a0626c 100644 --- a/sound/upmpdcli/Makefile +++ b/sound/upmpdcli/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=upmpdcli PKG_VERSION:=1.5.19 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.lesbonscomptes.com/upmpdcli/downloads diff --git a/utils/acl/Makefile b/utils/acl/Makefile index 221018184..8fa85ddc2 100644 --- a/utils/acl/Makefile +++ b/utils/acl/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=acl PKG_VERSION:=2.3.1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://git.savannah.nongnu.org/cgit/acl.git/snapshot diff --git a/utils/airos-dfs-reset/Makefile b/utils/airos-dfs-reset/Makefile index 353795f82..2633e72a4 100644 --- a/utils/airos-dfs-reset/Makefile +++ b/utils/airos-dfs-reset/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=airos-dfs-reset PKG_VERSION:=1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_MAINTAINER:=Simon Polack PKG_LICENSE:=GPL-2.0-only diff --git a/utils/ap51-flash/Makefile b/utils/ap51-flash/Makefile index c7181205e..ca28b1901 100644 --- a/utils/ap51-flash/Makefile +++ b/utils/ap51-flash/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ap51-flash PKG_VERSION:=2022.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/ap51-flash/ap51-flash/releases/download/v$(PKG_VERSION) diff --git a/utils/at/Makefile b/utils/at/Makefile index 18b250d70..b4f1d197a 100644 --- a/utils/at/Makefile +++ b/utils/at/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=at PKG_VERSION:=3.2.2 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 diff --git a/utils/attr/Makefile b/utils/attr/Makefile index 88ca5c19f..e23740f71 100644 --- a/utils/attr/Makefile +++ b/utils/attr/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=attr PKG_VERSION:=2.5.1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://git.savannah.nongnu.org/cgit/attr.git/snapshot diff --git a/utils/auc/Makefile b/utils/auc/Makefile index 950dd9d82..bec42a1dd 100644 --- a/utils/auc/Makefile +++ b/utils/auc/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=auc PKG_VERSION:=0.3.2 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_LICENSE:=GPL-3.0 include $(INCLUDE_DIR)/package.mk diff --git a/utils/audit/Makefile b/utils/audit/Makefile index b376a18d6..b610b55c5 100644 --- a/utils/audit/Makefile +++ b/utils/audit/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=audit PKG_VERSION:=2.8.5 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=7 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://people.redhat.com/sgrubb/audit diff --git a/utils/bash/Makefile b/utils/bash/Makefile index 061729a9b..2908e6b7c 100644 --- a/utils/bash/Makefile +++ b/utils/bash/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bash PKG_VERSION:=5.2.15 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/bash diff --git a/utils/bcm27xx-eeprom/Makefile b/utils/bcm27xx-eeprom/Makefile index b114ee11a..8b9851e6a 100644 --- a/utils/bcm27xx-eeprom/Makefile +++ b/utils/bcm27xx-eeprom/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bcm27xx-eeprom PKG_VERSION:=v2022.04.26-138a1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/raspberrypi/rpi-eeprom/tar.gz/$(PKG_VERSION)? diff --git a/utils/beep/Makefile b/utils/beep/Makefile index eb96e318b..85d246cdc 100644 --- a/utils/beep/Makefile +++ b/utils/beep/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=beep PKG_VERSION:=1.4.12 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=6 PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=COPYING diff --git a/utils/bluez-tools/Makefile b/utils/bluez-tools/Makefile index 953694686..e36d2eaa5 100644 --- a/utils/bluez-tools/Makefile +++ b/utils/bluez-tools/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bluez-tools PKG_VERSION:=20201025.f653217 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_MAINTAINER:=Karl Osterseher diff --git a/utils/bossa/Makefile b/utils/bossa/Makefile index 8ec04d475..41f456ba6 100644 --- a/utils/bossa/Makefile +++ b/utils/bossa/Makefile @@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bossa PKG_VERSION:=1.9.1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/shumatech/BOSSA/tar.gz/$(PKG_VERSION)? diff --git a/utils/btrfs-progs/Makefile b/utils/btrfs-progs/Makefile index 8e6f306cf..fd4d1f913 100644 --- a/utils/btrfs-progs/Makefile +++ b/utils/btrfs-progs/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=btrfs-progs PKG_VERSION:=6.0.1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/linux/kernel/people/kdave/btrfs-progs diff --git a/utils/canutils/Makefile b/utils/canutils/Makefile index f85d15e80..f1a5d6085 100644 --- a/utils/canutils/Makefile +++ b/utils/canutils/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=canutils PKG_VERSION:=2021.08.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/linux-can/can-utils/tar.gz/v$(PKG_VERSION)? diff --git a/utils/catatonit/Makefile b/utils/catatonit/Makefile index ea20575f6..5d78af25e 100644 --- a/utils/catatonit/Makefile +++ b/utils/catatonit/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=catatonit PKG_VERSION:=0.1.7 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/openSUSE/catatonit.git diff --git a/utils/crelay/Makefile b/utils/crelay/Makefile index 1905da302..816304045 100644 --- a/utils/crelay/Makefile +++ b/utils/crelay/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=crelay PKG_VERSION:=0.14.1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/ondrej1024/crelay/tar.gz/V$(PKG_VERSION)? diff --git a/utils/dbus/Makefile b/utils/dbus/Makefile index 40ae4c1eb..e7db64deb 100644 --- a/utils/dbus/Makefile +++ b/utils/dbus/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dbus PKG_VERSION:=1.13.18 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=12 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://dbus.freedesktop.org/releases/dbus diff --git a/utils/domoticz/Makefile b/utils/domoticz/Makefile index c1a2b0269..7d1f5ce39 100644 --- a/utils/domoticz/Makefile +++ b/utils/domoticz/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=domoticz PKG_VERSION:=2022.1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=5 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/domoticz/domoticz/tar.gz/$(PKG_VERSION)? diff --git a/utils/fatresize/Makefile b/utils/fatresize/Makefile index a51f12118..ce91f1444 100644 --- a/utils/fatresize/Makefile +++ b/utils/fatresize/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fatresize PKG_VERSION:=1.1.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/ya-mouse/fatresize.git diff --git a/utils/fish/Makefile b/utils/fish/Makefile index a4864ada1..e4f2de002 100644 --- a/utils/fish/Makefile +++ b/utils/fish/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fish PKG_VERSION:=3.5.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/fish-shell/fish-shell/releases/download/$(PKG_VERSION) diff --git a/utils/fontconfig/Makefile b/utils/fontconfig/Makefile index e2af73b25..54d8f0e02 100644 --- a/utils/fontconfig/Makefile +++ b/utils/fontconfig/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fontconfig PKG_VERSION:=2.13.94 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://fontconfig.org/release/ diff --git a/utils/fuse-overlayfs/Makefile b/utils/fuse-overlayfs/Makefile index 6abafc83c..5d5526153 100644 --- a/utils/fuse-overlayfs/Makefile +++ b/utils/fuse-overlayfs/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fuse-overlayfs PKG_VERSION:=1.7.1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/containers/fuse-overlayfs/tar.gz/v$(PKG_VERSION)? diff --git a/utils/fuse3/Makefile b/utils/fuse3/Makefile index aa9f370bc..3a47a8a76 100644 --- a/utils/fuse3/Makefile +++ b/utils/fuse3/Makefile @@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=fuse3 PKG_VERSION:=3.10.5 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE:=fuse-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/libfuse/libfuse/releases/download/fuse-$(PKG_VERSION) diff --git a/utils/gl-puli-mcu/Makefile b/utils/gl-puli-mcu/Makefile index a0be04b82..d33e9288f 100644 --- a/utils/gl-puli-mcu/Makefile +++ b/utils/gl-puli-mcu/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gl-puli-mcu PKG_VERSION:=1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_MAINTAINER:=Nuno Goncalves PKG_LICENSE:=GPL-3.0-or-later diff --git a/utils/gpsd/Makefile b/utils/gpsd/Makefile index 33c885bd3..a78e6f91a 100644 --- a/utils/gpsd/Makefile +++ b/utils/gpsd/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gpsd PKG_VERSION:=3.23.1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@SAVANNAH/$(PKG_NAME) diff --git a/utils/gptfdisk/Makefile b/utils/gptfdisk/Makefile index f466377cf..9f2955307 100644 --- a/utils/gptfdisk/Makefile +++ b/utils/gptfdisk/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gptfdisk PKG_VERSION:=1.0.8 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=5 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/$(PKG_NAME) diff --git a/utils/gzip/Makefile b/utils/gzip/Makefile index 0e04dc500..0e06ac440 100644 --- a/utils/gzip/Makefile +++ b/utils/gzip/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gzip PKG_VERSION:=1.11 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNU/gzip diff --git a/utils/haserl/Makefile b/utils/haserl/Makefile index b7be32394..752f3e5b5 100644 --- a/utils/haserl/Makefile +++ b/utils/haserl/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=haserl PKG_VERSION:=0.9.36 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/haserl diff --git a/utils/haveged/Makefile b/utils/haveged/Makefile index bbb60cff6..b83d7105f 100644 --- a/utils/haveged/Makefile +++ b/utils/haveged/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=haveged PKG_VERSION:=1.9.18 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/jirka-h/haveged/tar.gz/v$(PKG_VERSION)? diff --git a/utils/hdparm/Makefile b/utils/hdparm/Makefile index 3c33b08a0..a41a16f33 100644 --- a/utils/hdparm/Makefile +++ b/utils/hdparm/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=hdparm PKG_VERSION:=9.65 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/$(PKG_NAME) diff --git a/utils/hfsprogs/Makefile b/utils/hfsprogs/Makefile index fd4b00b09..a3c05c413 100644 --- a/utils/hfsprogs/Makefile +++ b/utils/hfsprogs/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=hfsprogs PKG_VERSION:=540.1.linux3 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE:=diskdev_cmds-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://src.fedoraproject.org/repo/pkgs/hfsplus-tools/$(PKG_SOURCE)/0435afc389b919027b69616ad1b05709 diff --git a/utils/hplip/Makefile b/utils/hplip/Makefile index 867469b9d..9ba7ad89a 100644 --- a/utils/hplip/Makefile +++ b/utils/hplip/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=hplip PKG_VERSION:=3.21.6 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/hplip diff --git a/utils/kitty-terminfo/Makefile b/utils/kitty-terminfo/Makefile index fa5d9edce..b8324abde 100644 --- a/utils/kitty-terminfo/Makefile +++ b/utils/kitty-terminfo/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=kitty-terminfo PKG_VERSION:=0.24.4 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_LICENSE:=GPL-3.0-only diff --git a/utils/klish/Makefile b/utils/klish/Makefile index 4c13efadd..018af96bb 100644 --- a/utils/klish/Makefile +++ b/utils/klish/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=klish PKG_VERSION:=2.2.3 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://libcode.org/attachments/download/82 diff --git a/utils/less/Makefile b/utils/less/Makefile index c3ca1af28..8d40056e2 100644 --- a/utils/less/Makefile +++ b/utils/less/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=less PKG_VERSION:=598 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:= @GNU/less \ diff --git a/utils/librespeed-cli/Makefile b/utils/librespeed-cli/Makefile index 07117a8d4..82ad2cb12 100644 --- a/utils/librespeed-cli/Makefile +++ b/utils/librespeed-cli/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=librespeed-cli PKG_VERSION:=1.0.10 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/librespeed/speedtest-cli/tar.gz/v${PKG_VERSION}? diff --git a/utils/mandoc/Makefile b/utils/mandoc/Makefile index 1d66b3676..2eae42a1c 100644 --- a/utils/mandoc/Makefile +++ b/utils/mandoc/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mandoc PKG_VERSION:=1.14.6 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://mandoc.bsd.lv/snapshots/ diff --git a/utils/mariadb/Makefile b/utils/mariadb/Makefile index 1f9f50922..cf9c26666 100644 --- a/utils/mariadb/Makefile +++ b/utils/mariadb/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mariadb PKG_VERSION:=10.9.3 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL := https://archive.mariadb.org/$(PKG_NAME)-$(PKG_VERSION)/source diff --git a/utils/minicom/Makefile b/utils/minicom/Makefile index 4972d4a02..3891effd0 100644 --- a/utils/minicom/Makefile +++ b/utils/minicom/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=minicom PKG_VERSION:=2.8 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://salsa.debian.org/minicom-team/minicom/-/archive/$(PKG_VERSION) diff --git a/utils/mksh/Makefile b/utils/mksh/Makefile index c9efde4da..e68f63b08 100644 --- a/utils/mksh/Makefile +++ b/utils/mksh/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mksh PKG_VERSION:=59c -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=3 PKG_MAINTAINER:=Thorsten Glaser PKG_LICENSE:=MirOS diff --git a/utils/moreutils/Makefile b/utils/moreutils/Makefile index 5f99feac0..ddb545aaa 100644 --- a/utils/moreutils/Makefile +++ b/utils/moreutils/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=moreutils PKG_VERSION:=0.65 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://git.kitenet.net/index.cgi/moreutils.git/snapshot diff --git a/utils/mtools/Makefile b/utils/mtools/Makefile index 6a529be45..19f012c02 100644 --- a/utils/mtools/Makefile +++ b/utils/mtools/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mtools PKG_VERSION:=4.0.39 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@GNU/mtools diff --git a/utils/nnn/Makefile b/utils/nnn/Makefile index ecb1caa79..6120a9bfe 100644 --- a/utils/nnn/Makefile +++ b/utils/nnn/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nnn PKG_VERSION:=4.4 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/jarun/nnn/tar.gz/v$(PKG_VERSION)? diff --git a/utils/nsutils/Makefile b/utils/nsutils/Makefile index 33eba5dc2..7143a5de1 100644 --- a/utils/nsutils/Makefile +++ b/utils/nsutils/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nsutils BASE_VERSION:=0.2 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/rd235/nsutils.git diff --git a/utils/ntfs-3g/Makefile b/utils/ntfs-3g/Makefile index 20553907f..a43a4dce5 100644 --- a/utils/ntfs-3g/Makefile +++ b/utils/ntfs-3g/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ntfs-3g PKG_VERSION:=2022.5.17 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)_ntfsprogs-$(PKG_VERSION).tgz PKG_SOURCE_URL:=https://www.tuxera.com/opensource/ diff --git a/utils/oci-runtime-tools/Makefile b/utils/oci-runtime-tools/Makefile index 7b69ddebb..51e481ef2 100644 --- a/utils/oci-runtime-tools/Makefile +++ b/utils/oci-runtime-tools/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=oci-runtime-tools PKG_VERSION:=1.0.0-pre20210326 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=3 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE diff --git a/utils/opendoas/Makefile b/utils/opendoas/Makefile index 23882d521..c24299e76 100644 --- a/utils/opendoas/Makefile +++ b/utils/opendoas/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=opendoas PKG_VERSION:=6.8.2 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/Duncaen/OpenDoas/releases/download/v$(PKG_VERSION) diff --git a/utils/opensc/Makefile b/utils/opensc/Makefile index be01913a5..649b7f381 100644 --- a/utils/opensc/Makefile +++ b/utils/opensc/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=opensc PKG_VERSION:=0.22.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_HASH:=8d4e5347195ebea332be585df61dcc470331c26969e4b0447c851fb0844c7186 PKG_LICENSE:=LGPL-2.1-or-later diff --git a/utils/parted/Makefile b/utils/parted/Makefile index 66d9d8950..709ac7f6d 100644 --- a/utils/parted/Makefile +++ b/utils/parted/Makefile @@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=parted PKG_VERSION:=3.4 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://ftp.gnu.org/gnu/parted/ diff --git a/utils/passh/Makefile b/utils/passh/Makefile index c12fa3397..b845c946b 100644 --- a/utils/passh/Makefile +++ b/utils/passh/Makefile @@ -3,7 +3,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=passh PKG_VERSION:=1.0.1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/clarkwang/passh/tar.gz/v$(PKG_VERSION)? diff --git a/utils/pcsc-lite/Makefile b/utils/pcsc-lite/Makefile index 62aefa757..0f18ef2bb 100644 --- a/utils/pcsc-lite/Makefile +++ b/utils/pcsc-lite/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pcsc-lite PKG_VERSION:=1.9.9 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://pcsclite.apdu.fr/files/ diff --git a/utils/powertop/Makefile b/utils/powertop/Makefile index 86bbbb58f..a0ad7c637 100644 --- a/utils/powertop/Makefile +++ b/utils/powertop/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=powertop PKG_VERSION:=2.14 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_VERSION:=v$(PKG_VERSION) diff --git a/utils/prometheus/Makefile b/utils/prometheus/Makefile index c511b70dd..131ce4b7a 100644 --- a/utils/prometheus/Makefile +++ b/utils/prometheus/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=prometheus PKG_VERSION:=2.25.2 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/prometheus/prometheus/tar.gz/v${PKG_VERSION}? diff --git a/utils/readsb/Makefile b/utils/readsb/Makefile index 844fc0d51..cde0caaa3 100644 --- a/utils/readsb/Makefile +++ b/utils/readsb/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=readsb PKG_VERSION:=3.9.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/Mictronics/readsb/tar.gz/v$(PKG_VERSION)? diff --git a/utils/realtek-poe/Makefile b/utils/realtek-poe/Makefile index fbdab7bd1..c994df133 100644 --- a/utils/realtek-poe/Makefile +++ b/utils/realtek-poe/Makefile @@ -3,7 +3,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=realtek-poe -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_LICENSE:=GPL-2.0 PKG_MAINTAINER:=Martin Kennedy diff --git a/utils/rtl_433/Makefile b/utils/rtl_433/Makefile index 98df58a50..5a2d3d492 100644 --- a/utils/rtl_433/Makefile +++ b/utils/rtl_433/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=rtl_433 PKG_VERSION:=21.12 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/merbanan/rtl_433/tar.gz/$(PKG_VERSION)? diff --git a/utils/runc/Makefile b/utils/runc/Makefile index ea2529184..442a0900a 100644 --- a/utils/runc/Makefile +++ b/utils/runc/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=runc PKG_VERSION:=1.1.4 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE diff --git a/utils/semodule-utils/Makefile b/utils/semodule-utils/Makefile index 06b7e06b4..99ccf4d51 100644 --- a/utils/semodule-utils/Makefile +++ b/utils/semodule-utils/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=semodule-utils PKG_VERSION:=3.3 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/SELinuxProject/selinux/releases/download/$(PKG_VERSION) diff --git a/utils/sexpect/Makefile b/utils/sexpect/Makefile index e0e503beb..932b720f9 100644 --- a/utils/sexpect/Makefile +++ b/utils/sexpect/Makefile @@ -3,7 +3,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sexpect PKG_VERSION:=2.3.11 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/clarkwang/sexpect/tar.gz/v$(PKG_VERSION)? diff --git a/utils/sipcalc/Makefile b/utils/sipcalc/Makefile index 323458e73..c8cc8f5b3 100644 --- a/utils/sipcalc/Makefile +++ b/utils/sipcalc/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sipcalc PKG_SOURCE_DATE:=2014-10-24 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/sii/sipcalc diff --git a/utils/slirp4netns/Makefile b/utils/slirp4netns/Makefile index 044409d05..b3badba72 100644 --- a/utils/slirp4netns/Makefile +++ b/utils/slirp4netns/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=slirp4netns PKG_VERSION:=1.2.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/rootless-containers/slirp4netns/archive/v$(PKG_VERSION) diff --git a/utils/smartmontools/Makefile b/utils/smartmontools/Makefile index 8281736b5..0536ca35f 100644 --- a/utils/smartmontools/Makefile +++ b/utils/smartmontools/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=smartmontools PKG_VERSION:=7.3 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/smartmontools diff --git a/utils/sms-tool/Makefile b/utils/sms-tool/Makefile index 1b36529a2..e206c48e8 100644 --- a/utils/sms-tool/Makefile +++ b/utils/sms-tool/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sms-tool -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE_URL:=https://github.com/obsy/sms_tool PKG_SOURCE_PROTO:=git diff --git a/utils/spi-tools/Makefile b/utils/spi-tools/Makefile index a60e27468..72cf5728c 100644 --- a/utils/spi-tools/Makefile +++ b/utils/spi-tools/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=spi-tools PKG_VERSION:=1.0.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/cpb-/spi-tools/tar.gz/$(PKG_VERSION)? diff --git a/utils/stm32flash/Makefile b/utils/stm32flash/Makefile index d30c364bb..7609c0f77 100644 --- a/utils/stm32flash/Makefile +++ b/utils/stm32flash/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=stm32flash PKG_VERSION:=0.7 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/$(PKG_NAME) diff --git a/utils/sumo/Makefile b/utils/sumo/Makefile index 8890977d6..1f2fe8a00 100644 --- a/utils/sumo/Makefile +++ b/utils/sumo/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sumo PKG_VERSION:=1.12.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-src-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/sumo diff --git a/utils/sysstat/Makefile b/utils/sysstat/Makefile index b71267193..3625f5410 100644 --- a/utils/sysstat/Makefile +++ b/utils/sysstat/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sysstat PKG_VERSION:=12.4.5 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://pagesperso-orange.fr/sebastien.godard/ diff --git a/utils/tang/Makefile b/utils/tang/Makefile index 73133c5b0..6dff7c88c 100644 --- a/utils/tang/Makefile +++ b/utils/tang/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tang PKG_VERSION:=11 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/latchset/$(PKG_NAME)/releases/download/v$(PKG_VERSION)/ diff --git a/utils/tar/Makefile b/utils/tar/Makefile index 832c45235..efd0421d1 100644 --- a/utils/tar/Makefile +++ b/utils/tar/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tar PKG_VERSION:=1.34 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNU/tar diff --git a/utils/taskwarrior/Makefile b/utils/taskwarrior/Makefile index 611b350b7..5439c7e93 100644 --- a/utils/taskwarrior/Makefile +++ b/utils/taskwarrior/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=taskwarrior PKG_VERSION:=2.5.3 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=3 PKG_SOURCE:=task-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.taskwarrior.org/download diff --git a/utils/tcsh/Makefile b/utils/tcsh/Makefile index 3a1482594..3496f9783 100644 --- a/utils/tcsh/Makefile +++ b/utils/tcsh/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tcsh PKG_VERSION:=6.22.04 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:= \ diff --git a/utils/tessdata/Makefile b/utils/tessdata/Makefile index 376d16c19..8c58c50d5 100644 --- a/utils/tessdata/Makefile +++ b/utils/tessdata/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tessdata PKG_VERSION:=4.1.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/tesseract-ocr/tessdata/tar.gz/$(PKG_VERSION)? diff --git a/utils/tesseract/Makefile b/utils/tesseract/Makefile index 55a9f3052..db43e08e6 100644 --- a/utils/tesseract/Makefile +++ b/utils/tesseract/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tesseract PKG_VERSION:=4.1.1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/tesseract-ocr/tesseract/tar.gz/$(PKG_VERSION)? diff --git a/utils/tinyionice/Makefile b/utils/tinyionice/Makefile index cb8282416..4c6592150 100644 --- a/utils/tinyionice/Makefile +++ b/utils/tinyionice/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tinyionice PKG_VERSION:=1.0.1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/xyproto/tinyionice/tar.gz/v${PKG_VERSION}? diff --git a/utils/tmux/Makefile b/utils/tmux/Makefile index 17b585b33..a1a1c0a71 100644 --- a/utils/tmux/Makefile +++ b/utils/tmux/Makefile @@ -3,7 +3,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tmux PKG_VERSION:=3.3a -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/tmux/tmux/tar.gz/$(PKG_VERSION)? diff --git a/utils/ubnt-manager/Makefile b/utils/ubnt-manager/Makefile index 8416eff13..8c3cd6d72 100644 --- a/utils/ubnt-manager/Makefile +++ b/utils/ubnt-manager/Makefile @@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ubnt-manager PKG_VERSION:=1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_MAINTAINER:=Nick Hainke PKG_LICENSE:=GPL-2.0-only diff --git a/utils/uledd/Makefile b/utils/uledd/Makefile index cbed552ea..b74f37f73 100644 --- a/utils/uledd/Makefile +++ b/utils/uledd/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=uledd -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/blogic/uledd.git diff --git a/utils/unrar/Makefile b/utils/unrar/Makefile index 22e194ca3..b84357d41 100644 --- a/utils/unrar/Makefile +++ b/utils/unrar/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=unrar PKG_VERSION:=6.1.3 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE:=unrarsrc-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.rarlab.com/rar diff --git a/utils/whois/Makefile b/utils/whois/Makefile index d87c1cd21..0fa689fbc 100644 --- a/utils/whois/Makefile +++ b/utils/whois/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=whois PKG_VERSION:=5.5.10 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/w/whois diff --git a/utils/yara/Makefile b/utils/yara/Makefile index e7734a1d0..98bbc9233 100644 --- a/utils/yara/Makefile +++ b/utils/yara/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=yara PKG_VERSION:=4.2.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/VirusTotal/yara/tar.gz/v$(PKG_VERSION)? diff --git a/utils/zstd/Makefile b/utils/zstd/Makefile index 9e9b2e348..359bd7ab9 100644 --- a/utils/zstd/Makefile +++ b/utils/zstd/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=zstd PKG_VERSION:=1.5.2 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/facebook/zstd/releases/download/v$(PKG_VERSION) From b607e193988e77a70fab96744cf36af353ebc804 Mon Sep 17 00:00:00 2001 From: Javier Marcet Date: Sat, 22 Apr 2023 10:46:19 +0200 Subject: [PATCH 06/13] docker-compose: Update to version 2.17.3 Signed-off-by: Javier Marcet --- utils/docker-compose/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/docker-compose/Makefile b/utils/docker-compose/Makefile index 6ea5c0e59..ae63e4f3e 100644 --- a/utils/docker-compose/Makefile +++ b/utils/docker-compose/Makefile @@ -1,14 +1,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=compose -PKG_VERSION:=2.17.2 +PKG_VERSION:=2.17.3 PKG_RELEASE:=1 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE PKG_SOURCE:=v$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/docker/compose/tar.gz/v${PKG_VERSION}? -PKG_HASH:=d6e6de858ecdb0104991c86c66dde5dd4fb6a1160d707308d8ad3167450c8094 +PKG_HASH:=e5e9bdfc3a827240381b656da88f92b408ea2e203c3f8cfd9e0bbfe03f825f16 PKG_MAINTAINER:=Javier Marcet From 5f3840c765711577d9b39ff3908a2fa1c8522dd9 Mon Sep 17 00:00:00 2001 From: Philip Prindeville Date: Fri, 21 Apr 2023 12:02:28 -0600 Subject: [PATCH 07/13] strongswan: local_gateway unused in swanctl.init Signed-off-by: Philip Prindeville --- net/strongswan/Makefile | 2 +- net/strongswan/files/swanctl.init | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/net/strongswan/Makefile b/net/strongswan/Makefile index 7f0e0c960..7b5275ba7 100644 --- a/net/strongswan/Makefile +++ b/net/strongswan/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=strongswan PKG_VERSION:=5.9.10 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://download.strongswan.org/ https://download2.strongswan.org/ diff --git a/net/strongswan/files/swanctl.init b/net/strongswan/files/swanctl.init index f32ca21c4..e05c7228d 100644 --- a/net/strongswan/files/swanctl.init +++ b/net/strongswan/files/swanctl.init @@ -418,7 +418,6 @@ config_connection() { local enabled local gateway - local local_gateway local local_sourceip local local_ip local remote_gateway @@ -478,10 +477,6 @@ config_connection() { [ "$gateway" = "any" ] && remote_gateway="%any" || remote_gateway="$gateway" - local ipdest - [ "$remote_gateway" = "%any" ] && ipdest="1.1.1.1" || ipdest="$remote_gateway" - local_gateway=`ip -o route get $ipdest | awk '/ src / { gsub(/^.* src /,""); gsub(/ .*$/, ""); print $0}'` - if [ -n "$local_key" ]; then [ "$(dirname "$local_key")" != "." ] && \ fatal "local_key $local_key can't be pathname" From d1ad585ca9aa322ac98eb664488750a50a571e97 Mon Sep 17 00:00:00 2001 From: Kirill Fertikov Date: Sat, 22 Apr 2023 00:48:21 +0500 Subject: [PATCH 08/13] shadowsocks-libev: ACL support Link: https://github.com/openwrt/packages/pull/20647 Signed-off-by: Kirill Fertikov [indentation fix] Signed-off-by: Yousong Zhou --- net/shadowsocks-libev/Makefile | 2 +- net/shadowsocks-libev/files/shadowsocks-libev.init | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/net/shadowsocks-libev/Makefile b/net/shadowsocks-libev/Makefile index 3642746e9..0c4ce1bd6 100644 --- a/net/shadowsocks-libev/Makefile +++ b/net/shadowsocks-libev/Makefile @@ -14,7 +14,7 @@ include $(TOPDIR)/rules.mk # PKG_NAME:=shadowsocks-libev PKG_VERSION:=3.3.5 -PKG_RELEASE:=8 +PKG_RELEASE:=9 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/shadowsocks/shadowsocks-libev/releases/download/v$(PKG_VERSION) diff --git a/net/shadowsocks-libev/files/shadowsocks-libev.init b/net/shadowsocks-libev/files/shadowsocks-libev.init index f9aee76a7..5330b8735 100644 --- a/net/shadowsocks-libev/files/shadowsocks-libev.init +++ b/net/shadowsocks-libev/files/shadowsocks-libev.init @@ -81,6 +81,7 @@ ss_xxx() { [ -z "$mtu" ] || json_add_int mtu "$mtu" [ -z "$timeout" ] || json_add_int timeout "$timeout" [ -z "$user" ] || json_add_string user "$user" + [ -z "$acl" ] || json_add_string acl "$acl" json_dump -i >"$confjson" procd_open_instance "$cfgtype.$cfg" @@ -273,7 +274,8 @@ validate_server_section() { } validate_ss_local_section() { - validate_common_client_options_ ss_local "$1" "$2" + validate_common_client_options_ ss_local "$1" "$2" \ + 'acl:file' } validate_ss_redir_section() { @@ -307,7 +309,8 @@ validate_ss_server_section() { 'local_address:ipaddr' \ 'local_ipv4_address:ip4addr' \ 'local_ipv6_address:ip6addr' \ - 'bind_address:ipaddr' + 'bind_address:ipaddr' \ + 'acl:file' } validate_ss_tunnel_section() { From 837c0f7f1c33857800b32bb910cfc7d5c6ea674e Mon Sep 17 00:00:00 2001 From: Andrew Sim Date: Sun, 23 Apr 2023 07:15:45 +0200 Subject: [PATCH 09/13] ksmbd-tools: update to 3.4.8 release Changelog: https://github.com/cifsd-team/ksmbd-tools/releases/tag/3.4.8 Maintainer: nobody Compile tested: Mediatek filogic, Asus TUF AX4200, lastest master Run tested: Mediatek filogic, Asus TUF AX4200, lastest master Signed-off-by: Andrew Sim --- net/ksmbd-tools/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/ksmbd-tools/Makefile b/net/ksmbd-tools/Makefile index a526cfe2a..84e8f3e57 100644 --- a/net/ksmbd-tools/Makefile +++ b/net/ksmbd-tools/Makefile @@ -5,8 +5,8 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/cifsd-team/ksmbd-tools -PKG_SOURCE_VERSION:=3.4.7 -PKG_MIRROR_HASH:=9128ecac1a2c463e689ed42fd71952a0eafe956f8bcd1b04af58c7bc66a8baee +PKG_SOURCE_VERSION:=3.4.8 +PKG_MIRROR_HASH:=e374c6e5053e82bc321e13927dbf3baf0d636205516564324686d002c084c5d6 PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=COPYING From 65d052d9b830f3fe15b423ea7e13e0891075b070 Mon Sep 17 00:00:00 2001 From: Vladimir Ermakov Date: Thu, 20 Apr 2023 12:23:19 +0200 Subject: [PATCH 10/13] qemu: update to 8.0.0 - Update version to 8.0.0 - Refresh patches - Update configure opttions to disable libdw Signed-off-by: Vladimir Ermakov --- utils/qemu/Makefile | 5 +++-- .../0001-configure-allow-disable-fortify_source.patch | 4 ++-- ...oke-separate-applets-for-guest-shutdown-modes.patch | 10 +++++----- utils/qemu/patches/0010-no-tests.patch | 4 ++-- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/utils/qemu/Makefile b/utils/qemu/Makefile index 8e5819c40..167df82dc 100644 --- a/utils/qemu/Makefile +++ b/utils/qemu/Makefile @@ -9,10 +9,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=qemu -PKG_VERSION:=7.2.0 +PKG_VERSION:=8.0.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -PKG_HASH:=5b49ce2687744dad494ae90a898c52204a3406e84d072482a1e1be854eeb2157 +PKG_HASH:=bb60f0341531181d6cc3969dd19a013d0427a87f918193970d9adb91131e56d0 PKG_SOURCE_URL:=http://download.qemu.org/ PKG_LICENSE:=GPL-2.0-only PKG_LICENSE_FILES:=LICENSE tcg/LICENSE @@ -430,6 +430,7 @@ CONFIGURE_ARGS += \ --disable-alsa \ --disable-pa \ --disable-vduse-blk-export \ + --disable-libdw \ CONFIGURE_ARGS += --target-list='$(foreach target,$(qemu-target-list),$(if $(CONFIG_PACKAGE_qemu-$(target)),$(target)))' CONFIGURE_ARGS += $(if $(CONFIG_PACKAGE_qemu-ga),--enable-guest-agent) diff --git a/utils/qemu/patches/0001-configure-allow-disable-fortify_source.patch b/utils/qemu/patches/0001-configure-allow-disable-fortify_source.patch index e4404a987..42d41305e 100644 --- a/utils/qemu/patches/0001-configure-allow-disable-fortify_source.patch +++ b/utils/qemu/patches/0001-configure-allow-disable-fortify_source.patch @@ -11,9 +11,9 @@ OpenWrt base build system decide flavor of fortify_source to use --- a/configure +++ b/configure -@@ -896,6 +896,8 @@ for opt do +@@ -895,6 +895,8 @@ for opt do ;; - --enable-jemalloc) meson_option_parse --enable-malloc=jemalloc jemalloc + --disable-vfio-user-server) vfio_user_server="disabled" ;; + --disable-fortify-source) fortify_source="no" + ;; diff --git a/utils/qemu/patches/0007-qga-invoke-separate-applets-for-guest-shutdown-modes.patch b/utils/qemu/patches/0007-qga-invoke-separate-applets-for-guest-shutdown-modes.patch index 2c7e39e12..53c82f990 100644 --- a/utils/qemu/patches/0007-qga-invoke-separate-applets-for-guest-shutdown-modes.patch +++ b/utils/qemu/patches/0007-qga-invoke-separate-applets-for-guest-shutdown-modes.patch @@ -13,17 +13,17 @@ https://gitlab.alpinelinux.org/alpine/aports/commit/76b81b486480fd9c3294cd420bcf --- a/qga/commands-posix.c +++ b/qga/commands-posix.c -@@ -74,6 +74,7 @@ static void ga_wait_child(pid_t pid, int - void qmp_guest_shutdown(bool has_mode, const char *mode, Error **errp) +@@ -76,6 +76,7 @@ static void ga_wait_child(pid_t pid, int + void qmp_guest_shutdown(const char *mode, Error **errp) { const char *shutdown_flag; + const char *fallback_cmd = NULL; Error *local_err = NULL; pid_t pid; int status; -@@ -95,10 +96,13 @@ void qmp_guest_shutdown(bool has_mode, c +@@ -97,10 +98,13 @@ void qmp_guest_shutdown(const char *mode slog("guest-shutdown called, mode: %s", mode); - if (!has_mode || strcmp(mode, "powerdown") == 0) { + if (!mode || strcmp(mode, "powerdown") == 0) { shutdown_flag = powerdown_flag; + fallback_cmd = "/sbin/poweroff"; } else if (strcmp(mode, "halt") == 0) { @@ -35,7 +35,7 @@ https://gitlab.alpinelinux.org/alpine/aports/commit/76b81b486480fd9c3294cd420bcf } else { error_setg(errp, "mode is invalid (valid values are: halt|powerdown|reboot"); -@@ -123,6 +127,7 @@ void qmp_guest_shutdown(bool has_mode, c +@@ -125,6 +129,7 @@ void qmp_guest_shutdown(const char *mode execl("/sbin/shutdown", "shutdown", "-h", shutdown_flag, "+0", "hypervisor initiated shutdown", (char *)NULL); #endif diff --git a/utils/qemu/patches/0010-no-tests.patch b/utils/qemu/patches/0010-no-tests.patch index e8bfe84c6..c5e99a1bf 100644 --- a/utils/qemu/patches/0010-no-tests.patch +++ b/utils/qemu/patches/0010-no-tests.patch @@ -1,6 +1,6 @@ --- a/meson.build +++ b/meson.build -@@ -3142,10 +3142,6 @@ subdir('common-user') +@@ -3191,10 +3191,6 @@ subdir('common-user') subdir('bsd-user') subdir('linux-user') @@ -11,7 +11,7 @@ # accel modules tcg_real_module_ss = ss.source_set() tcg_real_module_ss.add_all(when: 'CONFIG_TCG_MODULAR', if_true: tcg_module_ss) -@@ -3633,10 +3629,6 @@ subdir('scripts') +@@ -3682,10 +3678,6 @@ subdir('scripts') subdir('tools') subdir('pc-bios') subdir('docs') From 6035e4884de6fda3d3f2f89f9f33d1965c9377f8 Mon Sep 17 00:00:00 2001 From: Vladimir Ermakov Date: Thu, 20 Apr 2023 14:26:50 +0200 Subject: [PATCH 11/13] qemu: add zstd option Signed-off-by: Vladimir Ermakov --- utils/qemu/Makefile | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/utils/qemu/Makefile b/utils/qemu/Makefile index 167df82dc..509b03f38 100644 --- a/utils/qemu/Makefile +++ b/utils/qemu/Makefile @@ -91,7 +91,7 @@ define Package/qemu-img SUBMENU:=Virtualization TITLE:=QEMU Image utility URL:=http://www.qemu.org - DEPENDS:=+glib2 $(QEMU_DEPS_IN_HOST) + DEPENDS:=+glib2 +QEMU_ZSTD:libzstd $(QEMU_DEPS_IN_HOST) endef define Package/qemu-img/install @@ -106,7 +106,7 @@ define Package/qemu-nbd SUBMENU:=Virtualization TITLE:=QEMU Network Block Device Utility URL:=http://www.qemu.org - DEPENDS:=+glib2 $(QEMU_DEPS_IN_HOST) +kmod-nbd + DEPENDS:=+glib2 +QEMU_ZSTD:libzstd $(QEMU_DEPS_IN_HOST) +kmod-nbd endef define Package/qemu-nbd/install @@ -198,6 +198,7 @@ define qemu-target +QEMU_UI_SPICE:libspice-server \ +QEMU_DEV_USB:libusb-1.0 \ +QEMU_SECCOMP:libseccomp \ + +QEMU_ZSTD:libzstd \ $(if $(filter %-softmmu,$(1)),+libncurses +libfdt +libslirp +libudev +pixman +qemu-firmware-efi $(ICONV_DEPENDS)) endef @@ -265,6 +266,10 @@ config QEMU_SECCOMP Build QEMU with support for seccomp filters. Select libseccomp which also pulls-in the needed kernel features. +config QEMU_ZSTD + bool "QEMU ZSTD compression support" + default n + endif endef @@ -275,6 +280,7 @@ PKG_CONFIG_DEPENDS += \ CONFIG_QEMU_UI_SPICE \ CONFIG_QEMU_DEV_USB \ CONFIG_QEMU_SECCOMP \ + CONFIG_QEMU_ZSTD \ # QEMU configure script does not recognize these options @@ -424,7 +430,7 @@ CONFIGURE_ARGS += \ --disable-werror \ --disable-xen-pci-passthrough \ --disable-xkbcommon \ - --disable-zstd \ + --$(if $(CONFIG_QEMU_ZSTD),enable,disable)-zstd \ --disable-selinux \ --disable-oss \ --disable-alsa \ From c5d9b3ded28e13d34ae522179da609b2406f5cd8 Mon Sep 17 00:00:00 2001 From: Dirk Brenken Date: Sun, 23 Apr 2023 22:03:09 +0200 Subject: [PATCH 12/13] banip: release 0.8.4-1 * add support for a custom feeds file (/etc/banip/banip.custom.feeds). Add new or edit existing banIP feeds on your own with the integrated custom feed editor (LuCI-component * add a new option 'ban_blockpolicy' to overrule the default bblock policy (block all chains), see readme for details * change the feed file format and add a new ipthreat feed, see readme * refine (debug) logging * multiple small fixes and improvements * readme update * luci update (separate commit) Signed-off-by: Dirk Brenken --- net/banip/Makefile | 6 +- net/banip/files/README.md | 117 ++++++++++++------------ net/banip/files/banip-functions.sh | 123 +++++++++++++++---------- net/banip/files/banip-service.sh | 26 ++++-- net/banip/files/banip.custom.feeds | 0 net/banip/files/banip.feeds | 140 +++++++++++------------------ 6 files changed, 207 insertions(+), 205 deletions(-) create mode 100644 net/banip/files/banip.custom.feeds diff --git a/net/banip/Makefile b/net/banip/Makefile index eabaadb58..dbee9b992 100644 --- a/net/banip/Makefile +++ b/net/banip/Makefile @@ -7,8 +7,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=banip -PKG_VERSION:=0.8.3 -PKG_RELEASE:=2 +PKG_VERSION:=0.8.4 +PKG_RELEASE:=1 PKG_LICENSE:=GPL-3.0-or-later PKG_MAINTAINER:=Dirk Brenken @@ -33,6 +33,7 @@ define Package/banip/conffiles /etc/config/banip /etc/banip/banip.allowlist /etc/banip/banip.blocklist +/etc/banip/banip.custom.feeds endef define Build/Prepare @@ -63,6 +64,7 @@ define Package/banip/install $(INSTALL_CONF) ./files/banip.blocklist $(1)/etc/banip $(INSTALL_CONF) ./files/banip.countries $(1)/etc/banip $(INSTALL_CONF) ./files/banip.feeds $(1)/etc/banip + $(INSTALL_CONF) ./files/banip.custom.feeds $(1)/etc/banip endef $(eval $(call BuildPackage,banip)) diff --git a/net/banip/files/README.md b/net/banip/files/README.md index f4116889b..00cb83f5b 100644 --- a/net/banip/files/README.md +++ b/net/banip/files/README.md @@ -7,7 +7,7 @@ IP address blocking is commonly used to protect against brute force attacks, pre ## Main Features * banIP supports the following fully pre-configured domain blocklist feeds (free for private usage, for commercial use please check their individual licenses). - **Please note:** the columns "WAN-INP", "WAN-FWD" and "LAN-FWD" show for which chains the feeds are suitable in common scenarios, e.g. the first entry should be limited to the LAN forward chain - see the config options 'ban\_blockinput', 'ban\_blockforwardwan' and 'ban\_blockforwardlan' below. + **Please note:** By default every feed blocks all supported chains. The columns "WAN-INP", "WAN-FWD" and "LAN-FWD" show for which chains the feeds are suitable in common scenarios, e.g. the first entry should be limited to the LAN forward chain - see the config options 'ban\_blockpolicy', 'ban\_blockinput', 'ban\_blockforwardwan' and 'ban\_blockforwardlan' below. | Feed | Focus | WAN-INP | WAN-FWD | LAN-FWD | Information | | :------------------ | :----------------------------- | :-----: | :-----: | :-----: | :----------------------------------------------------------- | @@ -34,6 +34,7 @@ IP address blocking is commonly used to protect against brute force attacks, pre | greensnow | suspicious server IPs | x | x | | [Link](https://greensnow.co) | | iblockads | Advertising IPs | | | x | [Link](https://www.iblocklist.com) | | iblockspy | Malicious spyware IPs | x | x | | [Link](https://www.iblocklist.com) | +| ipthreat | hacker and botnet TPs | x | x | | [Link](https://ipthreat.net) | | myip | real-time IP blocklist | x | x | | [Link](https://myip.ms) | | nixspam | iX spam protection | x | x | | [Link](http://www.nixspam.org) | | oisdbig | OISD-big IPs | | | x | [Link](https://github.com/dibdot/banIP-IP-blocklists) | @@ -77,7 +78,7 @@ IP address blocking is commonly used to protect against brute force attacks, pre * Minimal status & error logging to syslog, enable debug logging to receive more output * Procd based init system support (start/stop/restart/reload/status/report/search/survey/lookup) * Procd network interface trigger support -* Ability to add new banIP feeds on your own +* Add new or edit existing banIP feeds on your own with the integrated custom feed editor ## Prerequisites * **[OpenWrt](https://openwrt.org)**, latest stable release or a snapshot with nft/firewall 4 support @@ -123,56 +124,57 @@ Available commands: ## banIP config options -| Option | Type | Default | Description | -| :---------------------- | :----- | :---------------------------- | :------------------------------------------------------------------------------------ | -| ban_enabled | option | 0 | enable the banIP service | -| ban_nicelimit | option | 0 | ulimit nice level of the banIP service (range 0-19) | -| ban_filelimit | option | 1024 | ulimit max open/number of files (range 1024-4096) | -| ban_loglimit | option | 100 | the logread monitor scans only the last n lines of the logfile | -| ban_logcount | option | 1 | how many times the IP must appear in the log to be considered as suspicious | -| ban_logterm | list | regex | various regex for logfile parsing (default: dropbear, sshd, luci, nginx, asterisk) | -| ban_autodetect | option | 1 | auto-detect wan interfaces, devices and subnets | -| ban_debug | option | 0 | enable banIP related debug logging | -| ban_loginput | option | 1 | log drops in the wan-input chain | -| ban_logforwardwan | option | 1 | log drops in the wan-forward chain | -| ban_logforwardlan | option | 0 | log rejects in the lan-forward chain | -| ban_autoallowlist | option | 1 | add wan IPs/subnets automatically to the local allowlist | -| ban_autoblocklist | option | 1 | add suspicious attacker IPs automatically to the local blocklist | -| ban_allowlistonly | option | 0 | restrict the internet access from/to a small number of secure websites/IPs | -| ban_basedir | option | /tmp | base working directory while banIP processing | -| ban_reportdir | option | /tmp/banIP-report | directory where banIP stores the report files | -| ban_backupdir | option | /tmp/banIP-backup | directory where banIP stores the compressed backup files | -| ban_protov4 | option | - / autodetect | enable IPv4 support | -| ban_protov6 | option | - / autodetect | enable IPv4 support | -| ban_ifv4 | list | - / autodetect | logical wan IPv4 interfaces, e.g. 'wan' | -| ban_ifv6 | list | - / autodetect | logical wan IPv6 interfaces, e.g. 'wan6' | -| ban_dev | list | - / autodetect | wan device(s), e.g. 'eth2' | -| ban_trigger | list | - | logical startup trigger interface(s), e.g. 'wan' | -| ban_triggerdelay | option | 10 | trigger timeout before banIP processing begins | -| ban_triggeraction | option | start | trigger action on ifup events, e.g. start, restart or reload | -| ban_deduplicate | option | 1 | deduplicate IP addresses across all active sets | -| ban_splitsize | option | 0 | split ext. sets after every n lines/members (saves RAM) | -| ban_cores | option | - / autodetect | limit the cpu cores used by banIP (saves RAM) | -| ban_nftloglevel | option | warn | nft loglevel, values: emerg, alert, crit, err, warn, notice, info, debug, audit | -| ban_nftpriority | option | -200 | nft priority for the banIP table (default is the prerouting table priority) | -| ban_nftpolicy | option | memory | nft policy for banIP-related sets, values: memory, performance | -| ban_nftexpiry | option | - | expiry time for auto added blocklist members, e.g. '5m', '2h' or '1d' | -| ban_feed | list | - | external download feeds, e.g. 'yoyo', 'doh', 'country' or 'talos' (see feed table) | -| ban_asn | list | - | ASNs for the 'asn' feed, e.g.'32934' | -| ban_country | list | - | country iso codes for the 'country' feed, e.g. 'ru' | -| ban_blockinput | list | - | limit a feed to the wan-input chain, e.g. 'country' | -| ban_blockforwardwan | list | - | limit a feed to the wan-forward chain, e.g. 'debl' | -| ban_blockforwardlan | list | - | limit a feed to the lan-forward chain, e.g. 'doh' | -| ban_fetchcmd | option | - / autodetect | 'uclient-fetch', 'wget', 'curl' or 'aria2c' | -| ban_fetchparm | option | - / autodetect | set the config options for the selected download utility | -| ban_fetchinsecure | option | 0 | don't check SSL server certificates during download | -| ban_mailreceiver | option | - | receiver address for banIP related notification E-Mails | -| ban_mailsender | option | no-reply@banIP | sender address for banIP related notification E-Mails | -| ban_mailtopic | option | banIP notification | topic for banIP related notification E-Mails | -| ban_mailprofile | option | ban_notify | mail profile used in 'msmtp' for banIP related notification E-Mails | -| ban_mailnotification | option | 0 | receive E-Mail notifications with every banIP run | -| ban_reportelements | option | 1 | list set elements in the report, disable this to speed up the report significantly | -| ban_resolver | option | - | external resolver used for DNS lookups | +| Option | Type | Default | Description | +| :---------------------- | :----- | :---------------------------- | :-------------------------------------------------------------------------------------------- | +| ban_enabled | option | 0 | enable the banIP service | +| ban_nicelimit | option | 0 | ulimit nice level of the banIP service (range 0-19) | +| ban_filelimit | option | 1024 | ulimit max open/number of files (range 1024-4096) | +| ban_loglimit | option | 100 | scan only the last n log entries permanently. Set it to '0' to disable the monitor | +| ban_logcount | option | 1 | how many times the IP must appear in the log to be considered as suspicious | +| ban_logterm | list | regex | various regex for logfile parsing (default: dropbear, sshd, luci, nginx, asterisk) | +| ban_autodetect | option | 1 | auto-detect wan interfaces, devices and subnets | +| ban_debug | option | 0 | enable banIP related debug logging | +| ban_loginput | option | 1 | log drops in the wan-input chain | +| ban_logforwardwan | option | 1 | log drops in the wan-forward chain | +| ban_logforwardlan | option | 0 | log rejects in the lan-forward chain | +| ban_autoallowlist | option | 1 | add wan IPs/subnets automatically to the local allowlist | +| ban_autoblocklist | option | 1 | add suspicious attacker IPs automatically to the local blocklist | +| ban_allowlistonly | option | 0 | restrict the internet access from/to a small number of secure websites/IPs | +| ban_basedir | option | /tmp | base working directory while banIP processing | +| ban_reportdir | option | /tmp/banIP-report | directory where banIP stores the report files | +| ban_backupdir | option | /tmp/banIP-backup | directory where banIP stores the compressed backup files | +| ban_protov4 | option | - / autodetect | enable IPv4 support | +| ban_protov6 | option | - / autodetect | enable IPv4 support | +| ban_ifv4 | list | - / autodetect | logical wan IPv4 interfaces, e.g. 'wan' | +| ban_ifv6 | list | - / autodetect | logical wan IPv6 interfaces, e.g. 'wan6' | +| ban_dev | list | - / autodetect | wan device(s), e.g. 'eth2' | +| ban_trigger | list | - | logical startup trigger interface(s), e.g. 'wan' | +| ban_triggerdelay | option | 10 | trigger timeout before banIP processing begins | +| ban_triggeraction | option | start | trigger action on ifup events, e.g. start, restart or reload | +| ban_deduplicate | option | 1 | deduplicate IP addresses across all active sets | +| ban_splitsize | option | 0 | split ext. sets after every n lines/members (saves RAM) | +| ban_cores | option | - / autodetect | limit the cpu cores used by banIP (saves RAM) | +| ban_nftloglevel | option | warn | nft loglevel, values: emerg, alert, crit, err, warn, notice, info, debug | +| ban_nftpriority | option | -200 | nft priority for the banIP table (default is the prerouting table priority) | +| ban_nftpolicy | option | memory | nft policy for banIP-related sets, values: memory, performance | +| ban_nftexpiry | option | - | expiry time for auto added blocklist members, e.g. '5m', '2h' or '1d' | +| ban_feed | list | - | external download feeds, e.g. 'yoyo', 'doh', 'country' or 'talos' (see feed table) | +| ban_asn | list | - | ASNs for the 'asn' feed, e.g.'32934' | +| ban_country | list | - | country iso codes for the 'country' feed, e.g. 'ru' | +| ban_blockpolicy | option | - | limit the default block policy to a certain chain, e.g. 'input', 'forwardwan' or 'forwardlan' | +| ban_blockinput | list | - | limit a feed to the wan-input chain, e.g. 'country' | +| ban_blockforwardwan | list | - | limit a feed to the wan-forward chain, e.g. 'debl' | +| ban_blockforwardlan | list | - | limit a feed to the lan-forward chain, e.g. 'doh' | +| ban_fetchcmd | option | - / autodetect | 'uclient-fetch', 'wget', 'curl' or 'aria2c' | +| ban_fetchparm | option | - / autodetect | set the config options for the selected download utility | +| ban_fetchinsecure | option | 0 | don't check SSL server certificates during download | +| ban_mailreceiver | option | - | receiver address for banIP related notification E-Mails | +| ban_mailsender | option | no-reply@banIP | sender address for banIP related notification E-Mails | +| ban_mailtopic | option | banIP notification | topic for banIP related notification E-Mails | +| ban_mailprofile | option | ban_notify | mail profile used in 'msmtp' for banIP related notification E-Mails | +| ban_mailnotification | option | 0 | receive E-Mail notifications with every banIP run | +| ban_reportelements | option | 1 | list set elements in the report, disable this to speed up the report significantly | +| ban_resolver | option | - | external resolver used for DNS lookups | ## Examples **banIP report information** @@ -343,8 +345,8 @@ password Finally add a valid E-Mail receiver address. **change existing banIP feeds or add a new one** -The banIP blocklist feeds are stored in an external JSON file '/etc/banip/banip.feeds'. -A valid JSON source object contains the following required information, e.g.: +The banIP default blocklist feeds are stored in an external JSON file '/etc/banip/banip.feeds'. All custom changes should be stored in an external JSON file '/etc/banip/banip.custom.feeds' (empty by default). It's recommended to use the LuCI based Custom Feed Editor to make changes to this file. +A valid JSON source object contains the following information, e.g.: ``` [...] "tor": { @@ -352,13 +354,12 @@ A valid JSON source object contains the following required information, e.g.: "url_6": "https://raw.githubusercontent.com/SecOps-Institute/Tor-IP-Addresses/master/tor-exit-nodes.lst", "rule_4": "/^(([0-9]{1,3}\\.){3}(1?[0-9][0-9]?|2[0-4][0-9]|25[0-5])(\\/(1?[0-9]|2?[0-9]|3?[0-2]))?)$/{printf \"%s,\\n\",$1}", "rule_6": "/^(([0-9A-f]{0,4}:){1,7}[0-9A-f]{0,4}:?(\\/(1?[0-2][0-8]|[0-9][0-9]))?)$/{printf \"%s,\\n\",$1}", - "focus": "tor exit nodes", - "descurl": "https://github.com/SecOps-Institute/Tor-IP-Addresses" + "descr": "tor exit nodes", + "flag": "" }, [...] ``` -Add an unique object name (no spaces, no special chars) and make the required changes: adapt at least the URL the regex to the new feed. -**Please note:** if you're going to add new feeds, **always** make a backup of your work, cause this file is always overwritten with the maintainers version on every banIP update. +Add an unique feed name (no spaces, no special chars) and make the required changes: adapt at least the URL, the regex and the description for a new feed. The flag is optional, currently only 'gz' is supported to process archive downloads. ## Support Please join the banIP discussion in this [forum thread](https://forum.openwrt.org/t/banip-support-thread/16985) or contact me by mail diff --git a/net/banip/files/banip-functions.sh b/net/banip/files/banip-functions.sh index 3b485e3bd..18fd331d8 100644 --- a/net/banip/files/banip-functions.sh +++ b/net/banip/files/banip-functions.sh @@ -14,6 +14,7 @@ ban_basedir="/tmp" ban_backupdir="/tmp/banIP-backup" ban_reportdir="/tmp/banIP-report" ban_feedfile="/etc/banip/banip.feeds" +ban_customfeedfile="/etc/banip/banip.custom.feeds" ban_allowlist="/etc/banip/banip.allowlist" ban_blocklist="/etc/banip/banip.blocklist" ban_mailtemplate="/etc/banip/banip.tpl" @@ -55,6 +56,7 @@ ban_deduplicate="1" ban_splitsize="0" ban_autodetect="1" ban_feed="" +ban_blockpolicy="" ban_blockinput="" ban_blockforwardwan="" ban_blockforwardlan="" @@ -93,8 +95,6 @@ f_system() { [ "${core}" = "0" ] && core="1" ban_cores="$((cpu * core))" fi - - f_log "debug" "f_system ::: system: ${ban_sysver:-"n/a"}, version: ${ban_ver:-"n/a"}, memory: ${ban_memory:-"0"}, cpu_cores: ${ban_cores}" } # create directories @@ -146,7 +146,13 @@ f_rmdir() { f_char() { local char="${1}" - [ "${char}" = "1" ] && printf "%s" "✔" || printf "%s" "✘" + if [ "${char}" = "1" ]; then + printf "%s" "✔" + elif [ "${char}" = "0" ] || [ -z "${char}" ]; then + printf "%s" "✘" + else + printf "%s" "${char}" + fi } # trim strings @@ -425,6 +431,22 @@ f_getsub() { f_log "debug" "f_getsub ::: auto/update: ${ban_autoallowlist}/${update}, subnet(s): ${ban_sub:-"-"}" } +# get feed information +# +f_getfeed() { + json_init + if [ -s "${ban_customfeedfile}" ]; then + if ! json_load_file "${ban_customfeedfile}" >/dev/null 2>&1; then + f_log "info" "banIP custom feed file can't be loaded" + if ! json_load_file "${ban_feedfile}" >/dev/null 2>&1; then + f_log "err" "banIP feed file can't be loaded" + fi + fi + elif ! json_load_file "${ban_feedfile}" >/dev/null 2>&1; then + f_log "err" "banIP feed file can't be loaded" + fi +} + # get set elements # f_getelements() { @@ -500,8 +522,27 @@ f_down() { [ "${ban_logforwardwan}" = "1" ] && log_forwardwan="log level ${ban_nftloglevel} prefix \"banIP/fwd-wan/drp/${feed}: \"" [ "${ban_logforwardlan}" = "1" ] && log_forwardlan="log level ${ban_nftloglevel} prefix \"banIP/fwd-lan/rej/${feed}: \"" - # set source block direction + # set feed block direction # + if [ "${ban_blockpolicy}" = "input" ]; then + if ! printf "%s" "${ban_blockinput}" | "${ban_grepcmd}" -q "${feed%v*}" && + ! printf "%s" "${ban_blockforwardwan}" | "${ban_grepcmd}" -q "${feed%v*}" && + ! printf "%s" "${ban_blockforwardlan}" | "${ban_grepcmd}" -q "${feed%v*}"; then + ban_blockinput="${ban_blockinput} ${feed%v*}" + fi + elif [ "${ban_blockpolicy}" = "forwardwan" ]; then + if ! printf "%s" "${ban_blockinput}" | "${ban_grepcmd}" -q "${feed%v*}" && + ! printf "%s" "${ban_blockforwardwan}" | "${ban_grepcmd}" -q "${feed%v*}" && + ! printf "%s" "${ban_blockforwardlan}" | "${ban_grepcmd}" -q "${feed%v*}"; then + ban_blockforwardwan="${ban_blockforwardwan} ${feed%v*}" + fi + elif [ "${ban_blockpolicy}" = "forwardlan" ]; then + if ! printf "%s" "${ban_blockinput}" | "${ban_grepcmd}" -q "${feed%v*}" && + ! printf "%s" "${ban_blockforwardwan}" | "${ban_grepcmd}" -q "${feed%v*}" && + ! printf "%s" "${ban_blockforwardlan}" | "${ban_grepcmd}" -q "${feed%v*}"; then + ban_blockforwardlan="${ban_blockforwardlan} ${feed%v*}" + fi + fi if printf "%s" "${ban_blockinput}" | "${ban_grepcmd}" -q "${feed%v*}"; then feed_direction="input" fi @@ -596,7 +637,7 @@ f_down() { fi fi } >"${tmp_nft}" - feed_rc="${?}" + feed_rc="0" elif [ "${feed%v*}" = "blocklist" ]; then { printf "%s\n\n" "#!/usr/sbin/nft -f" @@ -637,7 +678,7 @@ f_down() { [ -z "${feed_direction##*forwardlan*}" ] && printf "%s\n" "add rule inet banIP lan-forward ip6 daddr @${feed} ${log_forwardlan} counter reject with icmpv6 type admin-prohibited" fi } >"${tmp_nft}" - feed_rc="${?}" + feed_rc="0" # handle external downloads # elif [ "${restore_rc}" != "0" ] && [ "${feed_url}" != "local" ]; then @@ -712,7 +753,7 @@ f_down() { if [ -n "${ban_splitsize//[![:digit]]/}" ] && [ "${ban_splitsize//[![:digit]]/}" -gt "0" ]; then if ! "${ban_awkcmd}" "NR%${ban_splitsize//[![:digit]]/}==1{file=\"${tmp_file}.\"++i;}{ORS=\" \";print > file}" "${tmp_split}" 2>/dev/null; then rm -f "${tmp_file}".* - f_log "info" "failed to split ${feed} set to size '${ban_splitsize//[![:digit]]/}'" + f_log "info" "failed to split '${feed}' Set to size '${ban_splitsize//[![:digit]]/}'" fi else "${ban_awkcmd}" '{ORS=" ";print}' "${tmp_split}" 2>/dev/null >"${tmp_file}.1" @@ -768,7 +809,7 @@ f_down() { continue fi if ! "${ban_nftcmd}" add element inet banIP "${feed}" "{ $(cat "${split_file}") }" >/dev/null 2>&1; then - f_log "info" "failed to add split file '${split_file##*.}' to ${feed} set" + f_log "info" "failed to add split file '${split_file##*.}' to '${feed}' Set" fi rm -f "${split_file}" done @@ -777,7 +818,7 @@ f_down() { fi fi else - f_log "info" "empty feed ${feed} will be skipped" + f_log "info" "empty feed '${feed}' will be skipped" fi fi rm -f "${tmp_split}" "${tmp_nft}" @@ -817,15 +858,18 @@ f_restore() { # remove disabled feeds # f_rmset() { - local tmp_del ruleset_raw table_sets handle set del_set feed_log feed_rc + local feedlist tmp_del ruleset_raw table_sets handle set del_set feed_log feed_rc + f_getfeed + json_get_keys feedlist tmp_del="${ban_tmpfile}.final.delete" ruleset_raw="$("${ban_nftcmd}" -tj list ruleset 2>/dev/null)" table_sets="$(printf "%s\n" "${ruleset_raw}" | jsonfilter -qe '@.nftables[@.set.table="banIP"].set.name')" { printf "%s\n\n" "#!/usr/sbin/nft -f" for set in ${table_sets}; do - if ! printf "%s" "allowlist blocklist ${ban_feed}" | "${ban_grepcmd}" -q "${set%v*}"; then + if ! printf "%s" "allowlist blocklist ${ban_feed}" | "${ban_grepcmd}" -q "${set%v*}" || + ! printf "%s" "allowlist blocklist ${feedlist}" | "${ban_grepcmd}" -q "${set%v*}"; then del_set="${del_set}${set}, " rm -f "${ban_backupdir}/banIP.${set}.gz" printf "%s\n" "flush set inet banIP ${set}" @@ -853,7 +897,7 @@ f_rmset() { # generate status information # f_genstatus() { - local object duration set table_sets cnt_elements="0" split="0" status="${1}" + local object duration set table_sets cnt_elements="0" custom="0" split="0" status="${1}" [ -z "${ban_dev}" ] && f_conf if [ "${status}" = "active" ]; then @@ -869,6 +913,7 @@ f_genstatus() { fi runtime="action: ${ban_action:-"-"}, duration: ${duration:-"-"}, date: $(date "+%Y-%m-%d %H:%M:%S")" fi + [ -s ${ban_customfeedfile} ] && custom="1" [ ${ban_splitsize:-"0"} -gt "0" ] && split="1" : >"${ban_rtfile}" @@ -878,51 +923,33 @@ f_genstatus() { json_add_string "version" "${ban_ver}" json_add_string "element_count" "${cnt_elements}" json_add_array "active_feeds" - if [ "${status}" != "active" ]; then + for object in ${table_sets:-"-"}; do json_add_object - json_add_string "feed" "-" + json_add_string "feed" "${object}" json_close_object - else - for object in ${table_sets}; do - json_add_object - json_add_string "feed" "${object}" - json_close_object - done - fi + done json_close_array json_add_array "active_devices" - if [ "${status}" != "active" ]; then + for object in ${ban_dev:-"-"}; do json_add_object - json_add_string "device" "-" + json_add_string "device" "${object}" json_close_object - else - for object in ${ban_dev}; do - json_add_object - json_add_string "device" "${object}" - json_close_object - done - for object in ${ban_ifv4} ${ban_ifv6}; do - json_add_object - json_add_string "interface" "${object}" - json_close_object - done - fi + done + for object in ${ban_ifv4:-"-"} ${ban_ifv6:-"-"}; do + json_add_object + json_add_string "interface" "${object}" + json_close_object + done json_close_array json_add_array "active_subnets" - if [ "${status}" != "active" ]; then + for object in ${ban_sub:-"-"}; do json_add_object - json_add_string "subnet" "-" + json_add_string "subnet" "${object}" json_close_object - else - for object in ${ban_sub}; do - json_add_object - json_add_string "subnet" "${object}" - json_close_object - done - fi + done json_close_array json_add_string "nft_info" "priority: ${ban_nftpriority}, policy: ${ban_nftpolicy}, loglevel: ${ban_nftloglevel}, expiry: ${ban_nftexpiry:-"-"}" - json_add_string "run_info" "base: ${ban_basedir}, backup: ${ban_backupdir}, report: ${ban_reportdir}, feed: ${ban_feedfile}" + json_add_string "run_info" "base: ${ban_basedir}, backup: ${ban_backupdir}, report: ${ban_reportdir}, feed/custom: ${ban_feedfile}/$(f_char ${custom})" json_add_string "run_flags" "auto: $(f_char ${ban_autodetect}), proto (4/6): $(f_char ${ban_protov4})/$(f_char ${ban_protov6}), log (wan-inp/wan-fwd/lan-fwd): $(f_char ${ban_loginput})/$(f_char ${ban_logforwardwan})/$(f_char ${ban_logforwardlan}), dedup: $(f_char ${ban_deduplicate}), split: $(f_char ${split}), allowed only: $(f_char ${ban_allowlistonly})" json_add_string "last_run" "${runtime:-"-"}" json_add_string "system_info" "cores: ${ban_cores}, memory: ${ban_memory}, device: ${ban_sysver}" @@ -1024,18 +1051,18 @@ f_lookup() { done if [ -n "${elementsv4}" ]; then if ! "${ban_nftcmd}" add element inet banIP "${feed}v4" "{ ${elementsv4} }" >/dev/null 2>&1; then - f_log "info" "failed to add lookup file to ${feed}v4 set" + f_log "info" "failed to add lookup file to '${feed}v4' Set" fi fi if [ -n "${elementsv6}" ]; then if ! "${ban_nftcmd}" add element inet banIP "${feed}v6" "{ ${elementsv6} }" >/dev/null 2>&1; then - f_log "info" "failed to add lookup file to ${feed}v6 set" + f_log "info" "failed to add lookup file to '${feed}v6' Set" fi fi end_time="$(date "+%s")" duration="$(((end_time - start_time) / 60))m $(((end_time - start_time) % 60))s" - f_log "info" "Lookup summary for the local ${feed}: Domains processed: ${cnt_domain}, IPs added: ${cnt_ip}, Duration: ${duration}" + f_log "debug" "feed: ${feed}, domains: ${cnt_domain}, IPs: ${cnt_ip}, duration: ${duration}" } # table statistics diff --git a/net/banip/files/banip-service.sh b/net/banip/files/banip-service.sh index 10f0b9747..ed2b9914c 100755 --- a/net/banip/files/banip-service.sh +++ b/net/banip/files/banip-service.sh @@ -15,6 +15,7 @@ ban_funlib="/usr/lib/banip-functions.sh" # f_conf f_log "info" "start banIP processing (${ban_action})" +f_log "debug" "f_system ::: system: ${ban_sysver:-"n/a"}, version: ${ban_ver:-"n/a"}, memory: ${ban_memory:-"0"}, cpu_cores: ${ban_cores}" f_genstatus "processing" f_tmp f_fetch @@ -58,10 +59,7 @@ f_log "info" "start banIP download processes" if [ "${ban_allowlistonly}" = "1" ]; then ban_feed="" else - json_init - if ! json_load_file "${ban_feedfile}" >/dev/null 2>&1; then - f_log "err" "banIP feed file can't be loaded" - fi + f_getfeed [ "${ban_deduplicate}" = "1" ] && printf "\n" >"${ban_tmpfile}.deduplicate" fi @@ -82,9 +80,12 @@ for feed in allowlist ${ban_feed} blocklist; do continue fi - # read external feed information + # external feeds # if ! json_select "${feed}" >/dev/null 2>&1; then + f_log "info" "unknown feed '${feed}' will be removed" + uci_remove_list banip global ban_feed "${feed}" + uci_commit "banip" continue fi json_objects="url_4 rule_4 url_6 rule_6 flag" @@ -92,6 +93,16 @@ for feed in allowlist ${ban_feed} blocklist; do eval json_get_var feed_"${object}" '${object}' >/dev/null 2>&1 done json_select .. + + # skip incomplete feeds + # + if { { [ -n "${feed_url_4}" ] && [ -z "${feed_rule_4}" ]; } || { [ -z "${feed_url_4}" ] && [ -n "${feed_rule_4}" ]; }; } || + { { [ -n "${feed_url_6}" ] && [ -z "${feed_rule_6}" ]; } || { [ -z "${feed_url_6}" ] && [ -n "${feed_rule_6}" ]; }; } || + { [ -z "${feed_url_4}" ] && [ -z "${feed_rule_4}" ] && [ -z "${feed_url_6}" ] && [ -z "${feed_rule_6}" ]; }; then + f_log "info" "incomplete feed '${feed}' will be skipped" + continue + fi + # handle IPv4/IPv6 feeds with the same/single download URL # if [ "${feed_url_4}" = "${feed_url_6}" ]; then @@ -149,11 +160,12 @@ if [ "${ban_mailnotification}" = "1" ] && [ -n "${ban_mailreceiver}" ] && [ -x " f_mail ) & fi +json_cleanup rm -rf "${ban_lock}" # start detached log service # -if [ -x "${ban_logreadcmd}" ] && [ -n "${ban_logterm%%??}" ]; then +if [ -x "${ban_logreadcmd}" ] && [ -n "${ban_logterm%%??}" ] && [ "${ban_loglimit}" != "0" ]; then f_log "info" "start detached banIP log service" nft_expiry="$(printf "%s" "${ban_nftexpiry}" | grep -oE "([0-9]+[h|m|s]$)")" @@ -197,7 +209,7 @@ if [ -x "${ban_logreadcmd}" ] && [ -n "${ban_logterm%%??}" ]; then # start detached no-op service loop # else - f_log "info" "start detached no-op banIP service (logterms are missing)" + f_log "info" "start detached no-op banIP service" while :; do sleep 1 done diff --git a/net/banip/files/banip.custom.feeds b/net/banip/files/banip.custom.feeds new file mode 100644 index 000000000..e69de29bb diff --git a/net/banip/files/banip.feeds b/net/banip/files/banip.feeds index 527c844e3..90f6d63be 100644 --- a/net/banip/files/banip.feeds +++ b/net/banip/files/banip.feeds @@ -4,46 +4,40 @@ "url_6": "https://raw.githubusercontent.com/dibdot/banIP-IP-blocklists/main/adaway-ipv6.txt", "rule_4": "/^(([0-9]{1,3}\\.){3}(1?[0-9][0-9]?|2[0-4][0-9]|25[0-5])(\\/(1?[0-9]|2?[0-9]|3?[0-2]))?)[[:space:]]/{printf \"%s,\\n\",$1}", "rule_6": "/^(([0-9A-f]{0,4}:){1,7}[0-9A-f]{0,4}:?(\\/(1?[0-2][0-8]|[0-9][0-9]))?)[[:space:]]/{printf \"%s,\\n\",$1}", - "focus": "adaway IPs", - "descurl": "https://github.com/dibdot/banIP-IP-blocklists" + "descr": "adaway IPs" }, "adguard": { "url_4": "https://raw.githubusercontent.com/dibdot/banIP-IP-blocklists/main/adguard-ipv4.txt", "url_6": "https://raw.githubusercontent.com/dibdot/banIP-IP-blocklists/main/adguard-ipv6.txt", "rule_4": "/^(([0-9]{1,3}\\.){3}(1?[0-9][0-9]?|2[0-4][0-9]|25[0-5])(\\/(1?[0-9]|2?[0-9]|3?[0-2]))?)[[:space:]]/{printf \"%s,\\n\",$1}", "rule_6": "/^(([0-9A-f]{0,4}:){1,7}[0-9A-f]{0,4}:?(\\/(1?[0-2][0-8]|[0-9][0-9]))?)[[:space:]]/{printf \"%s,\\n\",$1}", - "focus": "adguard IPs", - "descurl": "https://github.com/dibdot/banIP-IP-blocklists" + "descr": "adguard IPs" }, "adguardtrackers": { "url_4": "https://raw.githubusercontent.com/dibdot/banIP-IP-blocklists/main/adguardtrackers-ipv4.txt", "url_6": "https://raw.githubusercontent.com/dibdot/banIP-IP-blocklists/main/adguardtrackers-ipv6.txt", "rule_4": "/^(([0-9]{1,3}\\.){3}(1?[0-9][0-9]?|2[0-4][0-9]|25[0-5])(\\/(1?[0-9]|2?[0-9]|3?[0-2]))?)[[:space:]]/{printf \"%s,\\n\",$1}", "rule_6": "/^(([0-9A-f]{0,4}:){1,7}[0-9A-f]{0,4}:?(\\/(1?[0-2][0-8]|[0-9][0-9]))?)[[:space:]]/{printf \"%s,\\n\",$1}", - "focus": "adguardtracker IPs", - "descurl": "https://github.com/dibdot/banIP-IP-blocklists" + "descr": "adguardtracker IPs" }, "antipopads": { "url_4": "https://raw.githubusercontent.com/dibdot/banIP-IP-blocklists/main/antipopads-ipv4.txt", "url_6": "https://raw.githubusercontent.com/dibdot/banIP-IP-blocklists/main/antipopads-ipv6.txt", "rule_4": "/^(([0-9]{1,3}\\.){3}(1?[0-9][0-9]?|2[0-4][0-9]|25[0-5])(\\/(1?[0-9]|2?[0-9]|3?[0-2]))?)[[:space:]]/{printf \"%s,\\n\",$1}", "rule_6": "/^(([0-9A-f]{0,4}:){1,7}[0-9A-f]{0,4}:?(\\/(1?[0-2][0-8]|[0-9][0-9]))?)[[:space:]]/{printf \"%s,\\n\",$1}", - "focus": "antipopads IPs", - "descurl": "https://github.com/dibdot/banIP-IP-blocklists" + "descr": "antipopads IPs" }, "asn": { "url_4": "https://asn.ipinfo.app/api/text/list/", "url_6": "https://asn.ipinfo.app/api/text/list/", "rule_4": "/^(([0-9]{1,3}\\.){3}(1?[0-9][0-9]?|2[0-4][0-9]|25[0-5])(\\/(1?[0-9]|2?[0-9]|3?[0-2]))?)$/{printf \"%s,\\n\",$1}", "rule_6": "/^(([0-9A-f]{0,4}:){1,7}[0-9A-f]{0,4}:?(\\/(1?[0-2][0-8]|[0-9][0-9]))?)$/{printf \"%s,\\n\",$1}", - "focus": "ASN IPs", - "descurl": "https://asn.ipinfo.app" + "descr": "ASN IPs" }, "backscatterer": { "url_4": "http://wget-mirrors.uceprotect.net/rbldnsd-all/ips.backscatterer.org.gz", "rule_4": "/^(([0-9]{1,3}\\.){3}(1?[0-9][0-9]?|2[0-4][0-9]|25[0-5])(\\/(1?[0-9]|2?[0-9]|3?[0-2]))?)$/{printf \"%s,\\n\",$1}", - "focus": "backscatterer IPs", - "descurl": "https://www.uceprotect.net/en/index.php", + "descr": "backscatterer IPs", "flag": "gz" }, "bogon": { @@ -51,130 +45,114 @@ "url_6": "https://www.team-cymru.org/Services/Bogons/fullbogons-ipv6.txt", "rule_4": "/^(([0-9]{1,3}\\.){3}(1?[0-9][0-9]?|2[0-4][0-9]|25[0-5])(\\/(1?[0-9]|2?[0-9]|3?[0-2]))?)$/{printf \"%s,\\n\",$1}", "rule_6": "/^(([0-9A-f]{0,4}:){1,7}[0-9A-f]{0,4}:?(\\/(1?[0-2][0-8]|[0-9][0-9]))?)$/{printf \"%s,\\n\",$1}", - "focus": "bogon prefixes", - "descurl": "https://team-cymru.com" + "descr": "bogon prefixes" }, "cinsscore": { "url_4": "https://cinsscore.com/list/ci-badguys.txt", "rule_4": "/^(([0-9]{1,3}\\.){3}(1?[0-9][0-9]?|2[0-4][0-9]|25[0-5])(\\/(1?[0-9]|2?[0-9]|3?[0-2]))?)$/{printf \"%s,\\n\",$1}", - "focus": "suspicious attacker IPs", - "descurl": "https://cinsscore.com/#list" + "descr": "suspicious attacker IPs" }, "country": { "url_4": "https://www.ipdeny.com/ipblocks/data/aggregated/", "url_6": "https://www.ipdeny.com/ipv6/ipaddresses/aggregated/", "rule_4": "/^(([0-9]{1,3}\\.){3}(1?[0-9][0-9]?|2[0-4][0-9]|25[0-5])(\\/(1?[0-9]|2?[0-9]|3?[0-2]))?)$/{printf \"%s,\\n\",$1}", "rule_6": "/^(([0-9A-f]{0,4}:){1,7}[0-9A-f]{0,4}:?(\\/(1?[0-2][0-8]|[0-9][0-9]))?)$/{printf \"%s,\\n\",$1}", - "focus": "country blocks", - "descurl": "http://www.ipdeny.com/ipblocks" + "descr": "country blocks" }, "darklist": { "url_4": "https://darklist.de/raw.php", "rule_4": "/^(([0-9]{1,3}\\.){3}(1?[0-9][0-9]?|2[0-4][0-9]|25[0-5])(\\/(1?[0-9]|2?[0-9]|3?[0-2]))?)$/{printf \"%s,\\n\",$1}", - "focus": "suspicious attacker IPs", - "descurl": "https://darklist.de" + "descr": "suspicious attacker IPs" }, "debl": { "url_4": "https://www.blocklist.de/downloads/export-ips_all.txt", "url_6": "https://www.blocklist.de/downloads/export-ips_all.txt", "rule_4": "/^(([0-9]{1,3}\\.){3}(1?[0-9][0-9]?|2[0-4][0-9]|25[0-5])(\\/(1?[0-9]|2?[0-9]|3?[0-2]))?)$/{printf \"%s,\\n\",$1}", "rule_6": "/^(([0-9A-f]{0,4}:){1,7}[0-9A-f]{0,4}:?(\\/(1?[0-2][0-8]|[0-9][0-9]))?)$/{printf \"%s,\\n\",$1}", - "focus": "fail2ban IP blacklist", - "descurl": "https://www.blocklist.de" + "descr": "fail2ban IP blacklist" }, "doh": { "url_4": "https://raw.githubusercontent.com/dibdot/DoH-IP-blocklists/master/doh-ipv4.txt", "url_6": "https://raw.githubusercontent.com/dibdot/DoH-IP-blocklists/master/doh-ipv6.txt", "rule_4": "/^(([0-9]{1,3}\\.){3}(1?[0-9][0-9]?|2[0-4][0-9]|25[0-5])(\\/(1?[0-9]|2?[0-9]|3?[0-2]))?)[[:space:]]/{printf \"%s,\\n\",$1}", "rule_6": "/^(([0-9A-f]{0,4}:){1,7}[0-9A-f]{0,4}:?(\\/(1?[0-2][0-8]|[0-9][0-9]))?)[[:space:]]/{printf \"%s,\\n\",$1}", - "focus": "public DoH-Provider", - "descurl": "https://github.com/dibdot/DoH-IP-blocklists" + "descr": "public DoH-Provider" }, "drop": { "url_4": "https://www.spamhaus.org/drop/drop.txt", "url_6": "https://www.spamhaus.org/drop/dropv6.txt", "rule_4": "/^(([0-9]{1,3}\\.){3}(1?[0-9][0-9]?|2[0-4][0-9]|25[0-5])(\\/(1?[0-9]|2?[0-9]|3?[0-2]))?)[[:space:]]/{printf \"%s,\\n\",$1}", "rule_6": "/^(([0-9A-f]{0,4}:){1,7}[0-9A-f]{0,4}:?(\\/(1?[0-2][0-8]|[0-9][0-9]))?)[[:space:]]/{printf \"%s,\\n\",$1}", - "focus": "spamhaus drop compilation", - "descurl": "https://www.spamhaus.org" + "descr": "spamhaus drop compilation" }, "dshield": { "url_4": "https://feeds.dshield.org/block.txt", "rule_4": "/^(([0-9]{1,3}\\.){3}(1?[0-9][0-9]?|2[0-4][0-9]|25[0-5])(\\/(1?[0-9]|2?[0-9]|3?[0-2]))?)[[:space:]]/{printf \"%s/%s,\\n\",$1,$3}", - "focus": "dshield IP blocklist", - "descurl": "https://www.dshield.org" + "descr": "dshield IP blocklist" }, "edrop": { "url_4": "https://www.spamhaus.org/drop/edrop.txt", "rule_4": "/^(([0-9]{1,3}\\.){3}(1?[0-9][0-9]?|2[0-4][0-9]|25[0-5])(\\/(1?[0-9]|2?[0-9]|3?[0-2]))?)[[:space:]]/{printf \"%s,\\n\",$1}", - "focus": "spamhaus edrop compilation", - "descurl": "https://www.spamhaus.org" + "descr": "spamhaus edrop compilation" }, "feodo": { "url_4": "https://feodotracker.abuse.ch/downloads/ipblocklist.txt", "rule_4": "BEGIN{RS=\"\\r\\n\"}/^(([0-9]{1,3}\\.){3}(1?[0-9][0-9]?|2[0-4][0-9]|25[0-5])(\\/(1?[0-9]|2?[0-9]|3?[0-2]))?)$/{printf \"%s,\\n\",$1}", - "focus": "feodo tracker", - "descurl": "https://feodotracker.abuse.ch" + "descr": "feodo tracker" }, "firehol1": { "url_4": "https://iplists.firehol.org/files/firehol_level1.netset", "rule_4": "/^(([0-9]{1,3}\\.){3}(1?[0-9][0-9]?|2[0-4][0-9]|25[0-5])(\\/(1?[0-9]|2?[0-9]|3?[0-2]))?)$/{printf \"%s,\\n\",$1}", - "focus": "firehol level 1 compilation", - "descurl": "https://iplists.firehol.org/?ipset=firehol_level1" + "descr": "firehol level 1 compilation" }, "firehol2": { "url_4": "https://iplists.firehol.org/files/firehol_level2.netset", "rule_4": "/^(([0-9]{1,3}\\.){3}(1?[0-9][0-9]?|2[0-4][0-9]|25[0-5])(\\/(1?[0-9]|2?[0-9]|3?[0-2]))?)$/{printf \"%s,\\n\",$1}", - "focus": "firehol level 2 compilation", - "descurl": "https://iplists.firehol.org/?ipset=firehol_level2" + "descr": "firehol level 2 compilation" }, "firehol3": { "url_4": "https://iplists.firehol.org/files/firehol_level3.netset", "rule_4": "/^(([0-9]{1,3}\\.){3}(1?[0-9][0-9]?|2[0-4][0-9]|25[0-5])(\\/(1?[0-9]|2?[0-9]|3?[0-2]))?)$/{printf \"%s,\\n\",$1}", - "focus": "firehol level 3 compilation", - "descurl": "https://iplists.firehol.org/?ipset=firehol_level3" + "descr": "firehol level 3 compilation" }, "firehol4": { "url_4": "https://iplists.firehol.org/files/firehol_level4.netset", "rule_4": "/^(([0-9]{1,3}\\.){3}(1?[0-9][0-9]?|2[0-4][0-9]|25[0-5])(\\/(1?[0-9]|2?[0-9]|3?[0-2]))?)$/{if(!seen[$1]++)printf \"%s,\\n\",$1}", - "focus": "firehol level 4 compilation", - "descurl": "https://iplists.firehol.org/?ipset=firehol_level4" + "descr": "firehol level 4 compilation" }, "greensnow": { "url_4": "https://blocklist.greensnow.co/greensnow.txt", "rule_4": "/^(([0-9]{1,3}\\.){3}(1?[0-9][0-9]?|2[0-4][0-9]|25[0-5])(\\/(1?[0-9]|2?[0-9]|3?[0-2]))?)$/{printf \"%s,\\n\",$1}", - "focus": "suspicious server IPs", - "descurl": "https://greensnow.co" + "descr": "suspicious server IPs" }, "iblockads": { "url_4": "https://list.iblocklist.com/?list=dgxtneitpuvgqqcpfulq&fileformat=cidr&archiveformat=gz", "rule_4": "/^(([0-9]{1,3}\\.){3}(1?[0-9][0-9]?|2[0-4][0-9]|25[0-5])(\\/(1?[0-9]|2?[0-9]|3?[0-2]))?)$/{printf \"%s,\\n\",$1}", - "focus": "advertising IPs", - "descurl": "https://www.iblocklist.com", - "flag": "gz", - "login": true + "descr": "advertising IPs", + "flag": "gz" }, "iblockspy": { "url_4": "https://list.iblocklist.com/?list=llvtlsjyoyiczbkjsxpf&fileformat=cidr&archiveformat=gz", "rule_4": "/^(([0-9]{1,3}\\.){3}(1?[0-9][0-9]?|2[0-4][0-9]|25[0-5])(\\/(1?[0-9]|2?[0-9]|3?[0-2]))?)$/{printf \"%s,\\n\",$1}", - "focus": "malicious spyware IPs", - "descurl": "https://www.iblocklist.com", - "flag": "gz", - "login": true + "descr": "malicious spyware IPs", + "flag": "gz" + }, + "ipthreat": { + "url_4": "https://lists.ipthreat.net/file/ipthreat-lists/threat/threat-30.txt", + "rule_4": "/^(([0-9]{1,3}\\.){3}(1?[0-9][0-9]?|2[0-4][0-9]|25[0-5])(\\/(1?[0-9]|2?[0-9]|3?[0-2]))?)[-[:space:]]?/{printf \"%s,\\n\",$1}", + "descr": "hacker and botnet IPs" }, "myip": { "url_4": "https://myip.ms/files/blacklist/general/latest_blacklist.txt", "url_6": "https://myip.ms/files/blacklist/general/latest_blacklist.txt", "rule_4": "/^(([0-9]{1,3}\\.){3}(1?[0-9][0-9]?|2[0-4][0-9]|25[0-5])(\\/(1?[0-9]|2?[0-9]|3?[0-2]))?)[[:space:]]/{printf \"%s,\\n\",$1}", "rule_6": "/^(([0-9A-f]{0,4}:){1,7}[0-9A-f]{0,4}:?(\\/(1?[0-2][0-8]|[0-9][0-9]))?)[[:space:]]/{printf \"%s,\\n\",$1}", - "focus": "real-time IP blocklist", - "descurl": "https://myip.ms" + "descr": "real-time IP blocklist" }, "nixspam": { "url_4": "https://www.nixspam.net/download/nixspam-ip.dump.gz", "rule_4": "/(([0-9]{1,3}\\.){3}(1?[0-9][0-9]?|2[0-4][0-9]|25[0-5])(\\/(1?[0-9]|2?[0-9]|3?[0-2]))?)[[:space:]]/{printf \"%s,\\n\",$2}", - "focus": "iX spam protection", - "descurl": "https://www.nixspam.net", + "descr": "iX spam protection", "flag": "gz" }, "oisdbig": { @@ -182,122 +160,104 @@ "url_6": "https://raw.githubusercontent.com/dibdot/banIP-IP-blocklists/main/oisdbig-ipv6.txt", "rule_4": "/^(([0-9]{1,3}\\.){3}(1?[0-9][0-9]?|2[0-4][0-9]|25[0-5])(\\/(1?[0-9]|2?[0-9]|3?[0-2]))?)[[:space:]]/{printf \"%s,\\n\",$1}", "rule_6": "/^(([0-9A-f]{0,4}:){1,7}[0-9A-f]{0,4}:?(\\/(1?[0-2][0-8]|[0-9][0-9]))?)[[:space:]]/{printf \"%s,\\n\",$1}", - "focus": "OISD-big IPs", - "descurl": "https://github.com/dibdot/banIP-IP-blocklists" + "descr": "OISD-big IPs" }, "oisdnsfw": { "url_4": "https://raw.githubusercontent.com/dibdot/banIP-IP-blocklists/main/oisdnsfw-ipv4.txt", "url_6": "https://raw.githubusercontent.com/dibdot/banIP-IP-blocklists/main/oisdnsfw-ipv6.txt", "rule_4": "/^(([0-9]{1,3}\\.){3}(1?[0-9][0-9]?|2[0-4][0-9]|25[0-5])(\\/(1?[0-9]|2?[0-9]|3?[0-2]))?)[[:space:]]/{printf \"%s,\\n\",$1}", "rule_6": "/^(([0-9A-f]{0,4}:){1,7}[0-9A-f]{0,4}:?(\\/(1?[0-2][0-8]|[0-9][0-9]))?)[[:space:]]/{printf \"%s,\\n\",$1}", - "focus": "OISD-nsfw IPs", - "descurl": "https://github.com/dibdot/banIP-IP-blocklists" + "descr": "OISD-nsfw IPs" }, "oisdsmall": { "url_4": "https://raw.githubusercontent.com/dibdot/banIP-IP-blocklists/main/oisdsmall-ipv4.txt", "url_6": "https://raw.githubusercontent.com/dibdot/banIP-IP-blocklists/main/oisdsmall-ipv6.txt", "rule_4": "/^(([0-9]{1,3}\\.){3}(1?[0-9][0-9]?|2[0-4][0-9]|25[0-5])(\\/(1?[0-9]|2?[0-9]|3?[0-2]))?)[[:space:]]/{printf \"%s,\\n\",$1}", "rule_6": "/^(([0-9A-f]{0,4}:){1,7}[0-9A-f]{0,4}:?(\\/(1?[0-2][0-8]|[0-9][0-9]))?)[[:space:]]/{printf \"%s,\\n\",$1}", - "focus": "OISD-small IPs", - "descurl": "https://github.com/dibdot/banIP-IP-blocklists" + "descr": "OISD-small IPs" }, "proxy": { "url_4": "https://iplists.firehol.org/files/proxylists.ipset", "rule_4": "/^(([0-9]{1,3}\\.){3}(1?[0-9][0-9]?|2[0-4][0-9]|25[0-5])(\\/(1?[0-9]|2?[0-9]|3?[0-2]))?)$/{printf \"%s,\\n\",$1}", - "focus": "open proxies", - "descurl": "https://iplists.firehol.org/?ipset=proxylists" + "descr": "open proxies" }, "sslbl": { "url_4": "https://sslbl.abuse.ch/blacklist/sslipblacklist.csv", "rule_4": "BEGIN{FS=\",\"}/(([0-9]{1,3}\\.){3}(1?[0-9][0-9]?|2[0-4][0-9]|25[0-5])(\\/(1?[0-9]|2?[0-9]|3?[0-2]))?)/{printf \"%s,\\n\",$2}", - "focus": "SSL botnet IPs", - "descurl": "https://sslbl.abuse.ch" + "descr": "SSL botnet IPs" }, "stevenblack": { "url_4": "https://raw.githubusercontent.com/dibdot/banIP-IP-blocklists/main/stevenblack-ipv4.txt", "url_6": "https://raw.githubusercontent.com/dibdot/banIP-IP-blocklists/main/stevenblack-ipv6.txt", "rule_4": "/^(([0-9]{1,3}\\.){3}(1?[0-9][0-9]?|2[0-4][0-9]|25[0-5])(\\/(1?[0-9]|2?[0-9]|3?[0-2]))?)[[:space:]]/{printf \"%s,\\n\",$1}", "rule_6": "/^(([0-9A-f]{0,4}:){1,7}[0-9A-f]{0,4}:?(\\/(1?[0-2][0-8]|[0-9][0-9]))?)[[:space:]]/{printf \"%s,\\n\",$1}", - "focus": "stevenblack IPs", - "descurl": "https://github.com/dibdot/banIP-IP-blocklists" + "descr": "stevenblack IPs" }, "talos": { "url_4": "https://www.talosintelligence.com/documents/ip-blacklist", "rule_4": "/^(([0-9]{1,3}\\.){3}(1?[0-9][0-9]?|2[0-4][0-9]|25[0-5])(\\/(1?[0-9]|2?[0-9]|3?[0-2]))?)$/{printf \"%s,\\n\",$1}", - "focus": "talos IPs", - "descurl": "https://talosintelligence.com/reputation_center" + "descr": "talos IPs" }, "threat": { "url_4": "https://rules.emergingthreats.net/fwrules/emerging-Block-IPs.txt", "rule_4": "/^(([0-9]{1,3}\\.){3}(1?[0-9][0-9]?|2[0-4][0-9]|25[0-5])(\\/(1?[0-9]|2?[0-9]|3?[0-2]))?)$/{printf \"%s,\\n\",$1}", - "focus": "emerging threats", - "descurl": "https://rules.emergingthreats.net" + "descr": "emerging threats" }, "threatview": { "url_4": "https://threatview.io/Downloads/IP-High-Confidence-Feed.txt", "rule_4": "/^(([0-9]{1,3}\\.){3}(1?[0-9][0-9]?|2[0-4][0-9]|25[0-5])(\\/(1?[0-9]|2?[0-9]|3?[0-2]))?)$/{printf \"%s,\\n\",$1}", - "focus": "malicious IPs", - "descurl": "https://threatview.io" + "descr": "malicious IPs" }, "tor": { "url_4": "https://raw.githubusercontent.com/SecOps-Institute/Tor-IP-Addresses/master/tor-exit-nodes.lst", "url_6": "https://raw.githubusercontent.com/SecOps-Institute/Tor-IP-Addresses/master/tor-exit-nodes.lst", "rule_4": "/^(([0-9]{1,3}\\.){3}(1?[0-9][0-9]?|2[0-4][0-9]|25[0-5])(\\/(1?[0-9]|2?[0-9]|3?[0-2]))?)$/{printf \"%s,\\n\",$1}", "rule_6": "/^(([0-9A-f]{0,4}:){1,7}[0-9A-f]{0,4}:?(\\/(1?[0-2][0-8]|[0-9][0-9]))?)$/{printf \"%s,\\n\",$1}", - "focus": "tor exit nodes", - "descurl": "https://github.com/SecOps-Institute/Tor-IP-Addresses" + "descr": "tor exit nodes" }, "uceprotect1": { "url_4": "http://wget-mirrors.uceprotect.net/rbldnsd-all/dnsbl-1.uceprotect.net.gz", "rule_4": "/^(([0-9]{1,3}\\.){3}(1?[0-9][0-9]?|2[0-4][0-9]|25[0-5])(\\/(1?[0-9]|2?[0-9]|3?[0-2]))?)$/{printf \"%s,\\n\",$1}", - "focus": "spam protection level 1", - "descurl": "http://www.uceprotect.net/en/index.php", + "descr": "spam protection level 1", "flag": "gz" }, "uceprotect2": { "url_4": "http://wget-mirrors.uceprotect.net/rbldnsd-all/dnsbl-2.uceprotect.net.gz", "rule_4": "BEGIN{IGNORECASE=1}/^(([0-9]{1,3}\\.){3}(1?[0-9][0-9]?|2[0-4][0-9]|25[0-5])(\\/(1?[0-9]|2?[0-9]|3?[0-2]))?)([[:space:]]NET)/{printf \"%s,\\n\",$1}", - "focus": "spam protection level 2", - "descurl": "http://www.uceprotect.net/en/index.php", + "descr": "spam protection level 2", "flag": "gz" }, "uceprotect3": { "url_4": "http://wget-mirrors.uceprotect.net/rbldnsd-all/dnsbl-3.uceprotect.net.gz", "rule_4": "BEGIN{IGNORECASE=1}/^(([0-9]{1,3}\\.){3}(1?[0-9][0-9]?|2[0-4][0-9]|25[0-5])(\\/(1?[0-9]|2?[0-9]|3?[0-2]))?)([[:space:]]YOUR)/{printf \"%s,\\n\",$1}", - "focus": "spam protection level 3", - "descurl": "http://www.uceprotect.net/en/index.php", + "descr": "spam protection level 3", "flag": "gz" }, "urlhaus": { "url_4": "https://urlhaus.abuse.ch/downloads/ids/", "rule_4": "match($0,/(([0-9]{1,3}\\.){3}(1?[0-9][0-9]?|2[0-4][0-9]|25[0-5]))/){printf \"%s,\\n\",substr($0,RSTART,RLENGTH)}", - "focus": "urlhaus IDS IPs", - "descurl": "https://urlhaus.abuse.ch" + "descr": "urlhaus IDS IPs" }, "urlvir": { "url_4": "https://iplists.firehol.org/files/urlvir.ipset", "rule_4": "/^(([0-9]{1,3}\\.){3}(1?[0-9][0-9]?|2[0-4][0-9]|25[0-5])(\\/(1?[0-9]|2?[0-9]|3?[0-2]))?)$/{printf \"%s,\\n\",$1}", - "focus": "malware related IPs", - "descurl": "https://iplists.firehol.org/?ipset=urlvir" + "descr": "malware related IPs" }, "voip": { "url_4": "https://voipbl.org/update/", "rule_4": "BEGIN{RS=\"(([0-9]{1,3}\\\\.){3}(1?[0-9][0-9]?|2[0-4][0-9]|25[0-5])(\\\\/(1?[0-9]|2?[0-9]|3?[0-2]))?)\"}{if(RT)printf \"%s,\\n\",RT}", - "focus": "VoIP fraud blocklist", - "descurl": "https://voipbl.org" + "descr": "VoIP fraud blocklist" }, "webclient": { "url_4": "https://iplists.firehol.org/files/firehol_webclient.netset", "rule_4": "/^(([0-9]{1,3}\\.){3}(1?[0-9][0-9]?|2[0-4][0-9]|25[0-5])(\\/(1?[0-9]|2?[0-9]|3?[0-2]))?)$/{printf \"%s,\\n\",$1}", - "focus": "malware related IPs", - "descurl": "https://iplists.firehol.org/?ipset=firehol_webclient" + "descr": "malware related IPs" }, "yoyo": { "url_4": "https://raw.githubusercontent.com/dibdot/banIP-IP-blocklists/main/yoyo-ipv4.txt", "url_6": "https://raw.githubusercontent.com/dibdot/banIP-IP-blocklists/main/yoyo-ipv6.txt", "rule_4": "/^(([0-9]{1,3}\\.){3}(1?[0-9][0-9]?|2[0-4][0-9]|25[0-5])(\\/(1?[0-9]|2?[0-9]|3?[0-2]))?)[[:space:]]/{printf \"%s,\\n\",$1}", "rule_6": "/^(([0-9A-f]{0,4}:){1,7}[0-9A-f]{0,4}:?(\\/(1?[0-2][0-8]|[0-9][0-9]))?)[[:space:]]/{printf \"%s,\\n\",$1}", - "focus": "yoyo IPs", - "descurl": "https://github.com/dibdot/banIP-IP-blocklists" + "descr": "yoyo IPs" } } From fbbe30622a9c066c26c3debe3742ca92a7a48feb Mon Sep 17 00:00:00 2001 From: John Audia Date: Sat, 22 Apr 2023 08:05:57 -0400 Subject: [PATCH 13/13] snort3: update to 3.1.60.0 Upstream bump Signed-off-by: John Audia --- net/snort3/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/snort3/Makefile b/net/snort3/Makefile index dd5b41ad9..8252bad5c 100644 --- a/net/snort3/Makefile +++ b/net/snort3/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=snort3 -PKG_VERSION:=3.1.59.0 +PKG_VERSION:=3.1.60.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/snort3/snort3/archive/refs/tags/ -PKG_HASH:=b4cfbce5b36ca546aac55a2545468a143643867ad9bc8560fe364eb9e10c074b +PKG_HASH:=295bbeea93ead7835379d9c9332b1f82f9ecdd3741aeed267caf85bb887126a1 PKG_MAINTAINER:=W. Michael Petullo PKG_LICENSE:=GPL-2.0-only