Merge pull request #17719 from BKPepe/ffmpeg-update

author Josef Schlehofer <pepe.schlehofer@gmail.com>

Wed, 2 Feb 2022 10:10:47 +0000 (11:10 +0100)

committer GitHub <noreply@github.com>

Wed, 2 Feb 2022 10:10:47 +0000 (11:10 +0100)
author Josef Schlehofer <pepe.schlehofer@gmail.com>
Wed, 2 Feb 2022 10:10:47 +0000 (11:10 +0100)
committer GitHub <noreply@github.com>
Wed, 2 Feb 2022 10:10:47 +0000 (11:10 +0100)
diff --git a/lang/lyaml/Makefile b/lang/lyaml/Makefile

index 94b6b11bc69b139fd0f5aef70b955fcf6332326f..ac7311acfdba8c1f2a04650e9e424ad30058550c 100755 (executable)
--- a/lang/lyaml/Makefile
+++ b/lang/lyaml/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
  
  PKG_NAME:=lyaml
  PKG_VERSION:=6.2.7
-PKG_RELEASE:=1
+PKG_RELEASE:=2
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
  PKG_SOURCE_URL:=https://codeload.github.com/gvvaughan/lyaml/tar.gz/v$(PKG_VERSION)?
@@ -12,9 +12,12 @@ PKG_MAINTAINER:=Mathew McBride <matt@traverse.com.au>
  PKG_LICENSE:=MIT
  PKG_LICENSE_FILES:=LICENSE
  
-PKG_BUILD_DEPENDS:=lua/host luarocks/host
+PKG_BUILD_DEPENDS:=lua/host luarocks/host HOST_OS_MACOS:fakeuname/host
  
  include $(INCLUDE_DIR)/package.mk
+ifeq ($(CONFIG_HOST_OS_MACOS),y)
+    include ../../utils/fakeuname/fakeuname.mk
+endif
  
  define Package/lyaml
    SUBMENU:=Lua
@@ -43,6 +46,7 @@ define Build/Compile
         CFLAGS="$(TARGET_CFLAGS) $(FPIC)" \
         LDFLAGS="$(TARGET_LDFLAGS)" \
         CC="$(TARGET_CC)" LD="$(TARGET_CC)" \
+       $(if $(CONFIG_HOST_OS_MACOS),PATH=$(FAKEUNAME_PATH):$(TARGET_PATH_PKG)) \
         luarocks make --pack-binary-rock lyaml-$(PKG_VERSION)-1.rockspec \
                 LUA_LIBDIR=$(STAGING_DIR)/usr/lib/lua \
                 YAML_DIR=$(STAGING_DIR)/usr \
diff --git a/lang/node/Makefile b/lang/node/Makefile

index 1dd6c7b1970be50a30ccd12bca0e4a02ee7ce203..251a6121e023c25c68bc56a814be1d837e9645f0 100644 (file)
--- a/lang/node/Makefile
+++ b/lang/node/Makefile
@@ -8,12 +8,12 @@
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=node
-PKG_VERSION:=v14.18.2
+PKG_VERSION:=v14.18.3
  PKG_RELEASE:=1
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
  PKG_SOURCE_URL:=https://nodejs.org/dist/$(PKG_VERSION)
-PKG_HASH:=3e8a9ce10f8bcd3628eb6dd049f7f03c84ba9219be6f9743e2221154b9cc680b
+PKG_HASH:=783ac443cd343dd6c68d2abcf7e59e7b978a6a428f6a6025f9b84918b769d608
  
  PKG_MAINTAINER:=Hirokazu MORIKAWA <morikw2@gmail.com>, Adrian Panella <ianchi74@outlook.com>
  PKG_LICENSE:=MIT
diff --git a/lang/php8/Makefile b/lang/php8/Makefile

index bdc8ee10218dedb8553d523b40928e933fd85253..6a4cbfd8cf411febfe29f3162ce932b098198dfd 100644 (file)
--- a/lang/php8/Makefile
+++ b/lang/php8/Makefile
@@ -6,7 +6,7 @@
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=php
-PKG_VERSION:=8.1.1
+PKG_VERSION:=8.1.2
  PKG_RELEASE:=1
  
  PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de>
@@ -16,7 +16,7 @@ PKG_CPE_ID:=cpe:/a:php:php
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
  PKG_SOURCE_URL:=http://www.php.net/distributions/
-PKG_HASH:=33c09d76d0a8bbb5dd930d9dd32e6bfd44e9efcf867563759eb5492c3aff8856
+PKG_HASH:=6b448242fd360c1a9f265b7263abf3da25d28f2b2b0f5465533b69be51a391dd
  
  PKG_BUILD_PARALLEL:=1
  PKG_USE_MIPS16:=0
diff --git a/lang/php8/patches/0025-php-5.4.9-fixheader.patch b/lang/php8/patches/0025-php-5.4.9-fixheader.patch

index 68ec1b68730fcf7f2cce5e80740ced030df092e5..f85b326e9444c39c406b4e764ba00a9af975ccfa 100644 (file)
--- a/lang/php8/patches/0025-php-5.4.9-fixheader.patch
+++ b/lang/php8/patches/0025-php-5.4.9-fixheader.patch
@@ -9,7 +9,7 @@ Make generated php_config.h constant across rebuilds.
  
  --- a/configure.ac
  +++ b/configure.ac
-@@ -1387,7 +1387,7 @@ PHP_REMOVE_USR_LIB(LDFLAGS)
+@@ -1389,7 +1389,7 @@ PHP_REMOVE_USR_LIB(LDFLAGS)
   EXTRA_LDFLAGS="$EXTRA_LDFLAGS $PHP_LDFLAGS"
   EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM $PHP_LDFLAGS"
   
diff --git a/lang/php8/patches/1004-disable-phar-command.patch b/lang/php8/patches/1004-disable-phar-command.patch

index 6aee0977ad65b42937eb020472f471a88808a1b4..f60d94b9d799058119bf4fd8b5abb666be1a63bb 100644 (file)
--- a/lang/php8/patches/1004-disable-phar-command.patch
+++ b/lang/php8/patches/1004-disable-phar-command.patch
@@ -11,7 +11,7 @@
   
  --- a/configure.ac
  +++ b/configure.ac
-@@ -1564,13 +1564,13 @@ CFLAGS_CLEAN="$CFLAGS \$(PROF_FLAGS)"
+@@ -1566,13 +1566,13 @@ CFLAGS_CLEAN="$CFLAGS \$(PROF_FLAGS)"
   CFLAGS="\$(CFLAGS_CLEAN) $standard_libtool_flag"
   CXXFLAGS="$CXXFLAGS $standard_libtool_flag \$(PROF_FLAGS)"
   
diff --git a/lang/python/micropython/Makefile b/lang/python/micropython/Makefile

index b5dccf483959fe0ce3d14fbd2fce473c8dae73dc..e63f93f4bddcced700428b76debec04dfcdf8e33 100644 (file)
--- a/lang/python/micropython/Makefile
+++ b/lang/python/micropython/Makefile
@@ -8,12 +8,12 @@
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=micropython
-PKG_VERSION:=1.17
+PKG_VERSION:=1.18
  PKG_RELEASE:=1
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
  PKG_SOURCE_URL:=https://github.com/micropython/micropython/releases/download/v$(PKG_VERSION)
-PKG_HASH:=e322f915cee784de0f8614779cdb88fce175956975b3864e2d1898a53638a2f7
+PKG_HASH:=96fc71b42ed331c64e1adc5a830ec4f29f2975c23e8751109c03f32b80fa3eb4
  
  PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>
  PKG_LICENSE:=MIT
diff --git a/lang/python/micropython/patches/000-Makefile-no-errors.patch b/lang/python/micropython/patches/000-Makefile-no-errors.patch

index 4ecd2e6aef574a85c0cf15afa1b68010a1d3432a..a32ee2903ecccb0c4e8dc54b0b47b41c44278a0a 100644 (file)
--- a/lang/python/micropython/patches/000-Makefile-no-errors.patch
+++ b/lang/python/micropython/patches/000-Makefile-no-errors.patch
@@ -1,6 +1,6 @@
  --- a/ports/unix/Makefile
  +++ b/ports/unix/Makefile
-@@ -38,7 +38,7 @@ INC +=  -I$(TOP)
+@@ -36,7 +36,7 @@ INC +=  -I$(TOP)
   INC += -I$(BUILD)
   
   # compiler settings
diff --git a/lang/python/micropython/patches/030-target-no-darwin.patch b/lang/python/micropython/patches/030-target-no-darwin.patch

index c0b858d5f125eeecb471b66634167342c846547e..b814c998e7d7c665d90b528196d8009bad4b5562 100644 (file)
--- a/lang/python/micropython/patches/030-target-no-darwin.patch
+++ b/lang/python/micropython/patches/030-target-no-darwin.patch
@@ -1,6 +1,6 @@
  --- a/ports/unix/Makefile
  +++ b/ports/unix/Makefile
-@@ -26,7 +26,7 @@ QSTR_DEFS = qstrdefsport.h
+@@ -24,7 +24,7 @@ QSTR_DEFS = qstrdefsport.h
   QSTR_GLOBAL_DEPENDENCIES = $(VARIANT_DIR)/mpconfigvariant.h
   
   # OS name, for simple autoconfig
diff --git a/lang/tcl/Makefile b/lang/tcl/Makefile

index 65930f4a51fa06effa197f9cad63bd56304a48db..3b337473d7699df1a91570c63591f5fba2765c1d 100644 (file)
--- a/lang/tcl/Makefile
+++ b/lang/tcl/Makefile
@@ -23,6 +23,7 @@ PKG_LICENSE:=TCL
  PKG_LICENSE_FILES:=license.terms
  PKG_CPE_ID:=cpe:/a:tcl_tk:tcl_tk
  
+PKG_BUILD_DEPENDS:=HOST_OS_MACOS:fakeuname/host
  PKG_FIXUP:=autoreconf
  PKG_INSTALL:=1
  PKG_BUILD_PARALLEL:=1
@@ -31,6 +32,10 @@ HOST_BUILD_PARALLEL:=1
  include $(INCLUDE_DIR)/host-build.mk
  include $(INCLUDE_DIR)/package.mk
  
+ifeq ($(CONFIG_HOST_OS_MACOS),y)
+    include ../../utils/fakeuname/fakeuname.mk
+endif
+
  define Package/tcl
    SUBMENU:=Tcl
    SECTION:=lang
@@ -52,6 +57,7 @@ endef
  CONFIGURE_PATH := unix
  
  CONFIGURE_VARS += \
+       $(if $(CONFIG_HOST_OS_MACOS),PATH=$(FAKEUNAME_PATH):$(PATH)) \
         tcl_cv_strtod_unbroken=ok
  
  CONFIGURE_ARGS += \
diff --git a/libs/flac/Makefile b/libs/flac/Makefile

index 9541210761cc801a1a0ebe60dc41964a3c3d32a0..d4511a087917e5c7c69f03a13d06d3e5bc786ed3 100644 (file)
--- a/libs/flac/Makefile
+++ b/libs/flac/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
  
  PKG_NAME:=flac
  PKG_VERSION:=1.3.3
-PKG_RELEASE:=1
+PKG_RELEASE:=2
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
  PKG_SOURCE_URL:=https://downloads.xiph.org/releases/flac/
@@ -38,6 +38,7 @@ CONFIGURE_ARGS += \
         --disable-cpplibs \
         --disable-sse \
         --disable-altivec \
+       --disable-vsx \
         --disable-doxgen-docs \
         --disable-local-xmms-plugin \
         --disable-xmms-plugin \
diff --git a/libs/libdrm/patches/010-64bit.patch b/libs/libdrm/patches/010-64bit.patch

new file mode 100644 (file)

index 0000000..adc7e55
--- /dev/null
+++ b/libs/libdrm/patches/010-64bit.patch
@@ -0,0 +1,12 @@
+--- a/include/drm/drm.h
++++ b/include/drm/drm.h
+@@ -38,6 +38,9 @@
+ 
+ #if   defined(__linux__)
+ 
++#ifndef __SANE_USERSPACE_TYPES__
++#define __SANE_USERSPACE_TYPES__      /* For PPC64, to get LL64 types */
++#endif
+ #include <linux/types.h>
+ #include <asm/ioctl.h>
+ typedef unsigned int drm_handle_t;
diff --git a/libs/libowfat/Makefile b/libs/libowfat/Makefile

index 7f7c4534f7c3d402865801a0d53fa59775f98b0e..8e57a5547dfb4fbb98903b286f1247f7b294cb3a 100644 (file)
--- a/libs/libowfat/Makefile
+++ b/libs/libowfat/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
  
  PKG_NAME:=libowfat
  PKG_VERSION:=0.32
-PKG_RELEASE:=2
+PKG_RELEASE:=3
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
  PKG_SOURCE_URL:=https://www.fefe.de/libowfat
@@ -37,6 +37,8 @@ endef
  TARGET_CFLAGS += $(FPIC)
  LOWFAT_MAKEOPTS = $(TARGET_CONFIGURE_OPTS) \
         CFLAGS="$(TARGET_CFLAGS) -I$(PKG_BUILD_DIR) -I$(STAGING_DIR)/usr/include" \
+       CCC="$(TARGET_CC)" \
+       CROSS="$(TARGET_CROSS)" \
         DEBUG="$(DEBUG)" \
         VERSION="$(PKG_VERSION)" \
         OS="Linux"
diff --git a/libs/libradiotap/patches/010-format.patch b/libs/libradiotap/patches/010-format.patch

new file mode 100644 (file)

index 0000000..e90e04f
--- /dev/null
+++ b/libs/libradiotap/patches/010-format.patch
@@ -0,0 +1,16 @@
+--- a/parse.c
++++ b/parse.c
+@@ -1,3 +1,4 @@
++#include <inttypes.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/mman.h>
+@@ -39,7 +40,7 @@ static void print_radiotap_namespace(str
+ {
+       switch (iter->this_arg_index) {
+       case IEEE80211_RADIOTAP_TSFT:
+-              printf("\tTSFT: %llu\n", le64toh(*(unsigned long long *)iter->this_arg));
++              printf("\tTSFT: %" PRIu64 "\n", le64toh(*(uint64_t *)iter->this_arg));
+               break;
+       case IEEE80211_RADIOTAP_FLAGS:
+               printf("\tflags: %02x\n", *iter->this_arg);
diff --git a/libs/mtdev/Makefile b/libs/mtdev/Makefile

index 605041027162d83cc6c168d720a57acd0d795184..3d49227cbec21be0cedfe6bf2d08b6ec0d818578 100644 (file)
--- a/libs/mtdev/Makefile
+++ b/libs/mtdev/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
  
  PKG_NAME:=mtdev
  PKG_VERSION:=1.1.6
-PKG_RELEASE:=1
+PKG_RELEASE:=2
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_SOURCE_URL:=http://bitmath.org/code/mtdev/
diff --git a/libs/mtdev/patches/010-format.patch b/libs/mtdev/patches/010-format.patch

new file mode 100644 (file)

index 0000000..c456c4b
--- /dev/null
+++ b/libs/mtdev/patches/010-format.patch
@@ -0,0 +1,11 @@
+--- a/test/mtdev-test.c
++++ b/test/mtdev-test.c
+@@ -38,7 +38,7 @@
+ #endif
+ 
+ /* year-proof millisecond event time */
+-typedef uint64_t mstime_t;
++typedef unsigned long long mstime_t;
+ 
+ static int use_event(const struct input_event *ev)
+ {
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile

index aba96ca917160107d247d3099fd0e76dade5f5be..9691a117508d975f307088e458fce70dc3599114 100644 (file)
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
  
  PKG_NAME:=postfix
  PKG_VERSION:=3.5.8
-PKG_RELEASE:=2
+PKG_RELEASE:=3
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
  PKG_SOURCE_URL:= \
diff --git a/mail/postfix/patches/500-crosscompile.patch b/mail/postfix/patches/500-crosscompile.patch

index c7448a3a1a3b7a36737eaa780bd1a63aec52447e..0988099a96f55606123230f24bee1eaa5a607f28 100644 (file)
--- a/mail/postfix/patches/500-crosscompile.patch
+++ b/mail/postfix/patches/500-crosscompile.patch
@@ -5,15 +5,17 @@
   case $# in
    # Officially supported usage.
  - 0) SYSTEM=`(uname -s) 2>/dev/null`
-+ 0) SYSTEM="OpenWRT"
++ 0) SYSTEM="OpenWrt"
       RELEASE=`(uname -r) 2>/dev/null`
       # No ${x%%y} support in Solaris 11 /bin/sh
       RELEASE_MAJOR=`expr "$RELEASE" : '\([0-9]*\)'` || exit 1
-@@ -242,6 +242,15 @@ case "$SYSTEM" in
+@@ -242,6 +242,17 @@ case "$SYSTEM" in
   esac
   
   case "$SYSTEM.$RELEASE" in
-+   OpenWRT*)    SYSTYPE=LINUX$RELEASE_MAJOR
++   OpenWrt*)    SYSTYPE=LINUX5
++              AR="${CC-gcc}-ar"
++              RANLIB="${CC-gcc}-ranlib"
  +              SYSLIBS="$SYSLIBS -ldl"
  +              : ${SHLIB_SUFFIX=.so}
  +              : ${SHLIB_CFLAGS=-fPIC}
diff --git a/multimedia/gerbera/patches/010-fmt.patch b/multimedia/gerbera/patches/010-fmt.patch

new file mode 100644 (file)

index 0000000..72668a8
--- /dev/null
+++ b/multimedia/gerbera/patches/010-fmt.patch
@@ -0,0 +1,39 @@
+From 82d84ac5e62c23e717198fc7b2ef190ff95e70d1 Mon Sep 17 00:00:00 2001
+From: kyak <bas@bmail.ru>
+Date: Wed, 12 Jan 2022 19:41:37 +0300
+Subject: [PATCH] Fix for fmt > 8.0
+
+---
+ src/util/logger.h | 15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+--- a/src/util/logger.h
++++ b/src/util/logger.h
+@@ -32,7 +32,9 @@
+ #ifndef __LOGGER_H__
+ #define __LOGGER_H__
+ 
++#include <fmt/format.h>
+ #include <spdlog/spdlog.h>
++#include <type_traits>
+ 
+ #define log_debug SPDLOG_DEBUG
+ #define log_info SPDLOG_INFO
+@@ -40,4 +42,17 @@
+ #define log_error SPDLOG_ERROR
+ #define log_js SPDLOG_INFO
+ 
++#if FMT_VERSION >= 80100
++template <typename T>
++struct fmt::formatter<T, std::enable_if_t<std::is_enum_v<T>, char>>
++    : formatter<std::underlying_type_t<T>> {
++    template <typename FormatContext>
++    auto format(const T& value, FormatContext& ctx) -> decltype(ctx.out())
++    {
++        return fmt::formatter<std::underlying_type_t<T>>::format(
++            static_cast<std::underlying_type_t<T>>(value), ctx);
++    }
++};
++#endif
++
+ #endif // __LOGGER_H__
diff --git a/multimedia/tvheadend/Makefile b/multimedia/tvheadend/Makefile

index f5fd791065a5f2ec1f785876ca575053a50d7e0f..f5656dc416d79c5aa19fd340cdd15ebcd96373c4 100644 (file)
--- a/multimedia/tvheadend/Makefile
+++ b/multimedia/tvheadend/Makefile
@@ -187,7 +187,17 @@ endif
  ##     CONFIGURE_ARGS += --disable-libopus
  ##endif
  
+#required to cross-compile hdhomerun on non-Linux build host
+MAKE_FLAGS += \
+       OS=Linux
+
+#required to always have "build.linux" dir, not "build.darwin" on macos
+CONFIGURE_VARS += \
+       PLATFORM=linux
+
+#--platfrom=linux is required to cross-compile tvheadend on non-Linux build host
  CONFIGURE_ARGS += \
+       --platform=linux \
         --arch=$(ARCH) \
         --disable-libsystemd_daemon \
         --disable-dbus_1 \
@@ -230,7 +240,7 @@ define Build/Prepare
                 > $(PKG_BUILD_DIR)/debian/changelog
  endef
  
-define Package/conffiles
+define Package/tvheadend/conffiles
  /etc/config/tvheadend
  endef
  
diff --git a/net/bind/Makefile b/net/bind/Makefile

index df952d66d8fccc70589e8062cc136b3214e84415..7a05d1c6f929677e5cb109b57d4622d8a0f2c35e 100644 (file)
--- a/net/bind/Makefile
+++ b/net/bind/Makefile
@@ -9,7 +9,7 @@
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=bind
-PKG_VERSION:=9.17.20
+PKG_VERSION:=9.18.0
  PKG_RELEASE:=$(AUTORELEASE)
  USERID:=bind=57:bind=57
  
@@ -22,7 +22,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
  PKG_SOURCE_URL:= \
         https://www.mirrorservice.org/sites/ftp.isc.org/isc/bind9/$(PKG_VERSION) \
         https://ftp.isc.org/isc/bind9/$(PKG_VERSION)
-PKG_HASH:=93a961f6b4072af260c5d900299eb660defec035f9a000c864ea5b78869a4d35
+PKG_HASH:=56525bf5caf01fd8fd9d90910880cc0f8a90a27a97d169187d651d4ecf0c411c
  
  PKG_FIXUP:=autoreconf
  PKG_REMOVE_FILES:=aclocal.m4 libtool.m4
@@ -69,7 +69,7 @@ endef
  define Package/bind-server
    $(call Package/bind/Default)
    TITLE+= DNS server
-  DEPENDS+= libcap
+  DEPENDS+= +libcap
  endef
  
  define Package/bind-server/config
diff --git a/net/bridge-utils/Makefile b/net/bridge-utils/Makefile

index dc837c9bbd06afe1973518930e0e98828e4a9806..1e75d03ac6f24793ac52484e53c17c6f7a0d7d34 100644 (file)
--- a/net/bridge-utils/Makefile
+++ b/net/bridge-utils/Makefile
@@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk
  include $(INCLUDE_DIR)/kernel.mk
  
  PKG_NAME:=bridge-utils
-PKG_VERSION:=1.7
-PKG_RELEASE:=2
+PKG_VERSION:=1.7.1
+PKG_RELEASE:=$(AUTORELEASE)
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=@KERNEL/linux/kernel/people/shemminger/bridge-utils
-PKG_HASH:=939987e659b1a4c36ae46f44b6687f373bc5c916a9eab91f775630f5e38b997e
+PKG_SOURCE_URL:=@KERNEL/linux/utils/net/bridge-utils
+PKG_HASH:=a61d8be4f1a1405c60c8ef38d544f0c18c05b33b9b07e5b4b31033536165e60e
  
  PKG_MAINTAINER:=Nikolay Martynov <mar.kolya@gmail.com>
  PKG_LICENSE:=GPL-2.0-or-later
diff --git a/net/bridge-utils/patches/010-limits.patch b/net/bridge-utils/patches/010-limits.patch

new file mode 100644 (file)

index 0000000..a3aa624
--- /dev/null
+++ b/net/bridge-utils/patches/010-limits.patch
@@ -0,0 +1,20 @@
+--- a/libbridge/libbridge_devif.c
++++ b/libbridge/libbridge_devif.c
+@@ -24,6 +24,7 @@
+ #include <string.h>
+ #include <dirent.h>
+ #include <fcntl.h>
++#include <limits.h>
+ 
+ #include "libbridge.h"
+ #include "libbridge_private.h"
+--- a/libbridge/libbridge_init.c
++++ b/libbridge/libbridge_init.c
+@@ -24,6 +24,7 @@
+ #include <dirent.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <limits.h>
+ 
+ #include "libbridge.h"
+ #include "libbridge_private.h"
diff --git a/net/chaosvpn/Makefile b/net/chaosvpn/Makefile

index 332935751493c8d6836c2312f8b1f0b49d31b835..347b6eba18151109641d54f49b8dd6dd31a7334f 100644 (file)
--- a/net/chaosvpn/Makefile
+++ b/net/chaosvpn/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
  PKG_NAME:=chaosvpn
  
  PKG_VERSION:=2.19
-PKG_RELEASE:=3
+PKG_RELEASE:=4
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
  PKG_SOURCE_URL:=https://codeload.github.com/ryd/chaosvpn/tar.gz/v$(PKG_VERSION)?
@@ -38,6 +38,7 @@ define Package/chaosvpn/conffiles
  endef
  
  MAKE_FLAGS += \
+               OS=Linux \
                 COPT="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)"
  
  define Package/chaosvpn/install
diff --git a/net/clamav/Makefile b/net/clamav/Makefile

index 3f9ef55d99f68a533049443d4b9b72fabbf33013..9503eeb9049e4723b827876dad0de9bdd94d2871 100644 (file)
--- a/net/clamav/Makefile
+++ b/net/clamav/Makefile
@@ -8,12 +8,12 @@
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=clamav
-PKG_VERSION:=0.104.0
+PKG_VERSION:=0.104.2
  PKG_RELEASE:=$(AUTORELEASE)
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
  PKG_SOURCE_URL:=https://www.clamav.net/downloads/production/
-PKG_HASH:=a079d64cd55d6184510adfe0f341b2f278f7fb1bcc080d28d374298160f19cb2
+PKG_HASH:=3e45e46d9aaeb3a6956ed30376237ab7c4cd9573bc0f5d6fc15c588d30978d9d
  
  PKG_MAINTAINER:=Marko Ratkaj <marko.ratkaj@sartura.hr> \
                 Lucian Cristian <lucian.cristian@gmail.com>
diff --git a/net/clamav/patches/100-cmake-fix-findcurses.patch b/net/clamav/patches/100-cmake-fix-findcurses.patch

new file mode 100644 (file)

index 0000000..cee304d
--- /dev/null
+++ b/net/clamav/patches/100-cmake-fix-findcurses.patch
@@ -0,0 +1,22 @@
+From 0f03ec698e67ea3c0f21ba021c922146d5ad07b2 Mon Sep 17 00:00:00 2001
+From: Carlos Velasco <carlos.velasco@nimastelecom.com>
+Date: Thu, 4 Nov 2021 09:11:06 +0100
+Subject: [PATCH] CMake: Fix FindCurses.cmake try packate ncursesw if ncurses
+ not found
+
+Change to pkg_search_module, first try to find ncurses pkg, if not found, then try with ncursesw pkg
+---
+ cmake/FindCURSES.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/cmake/FindCURSES.cmake
++++ b/cmake/FindCURSES.cmake
+@@ -43,7 +43,7 @@ The following cache variables may also b
+ 
+ find_package(PkgConfig QUIET)
+ # First try for NCurses
+-pkg_check_modules(PC_NCurses QUIET ncurses)
++pkg_search_module (PC_NCurses QUIET ncurses ncursesw)
+ 
+ find_path(NCURSES_INCLUDE_DIR
+   NAMES ncurses.h
diff --git a/net/coova-chilli/Makefile b/net/coova-chilli/Makefile

index 47c11ad14c03749ec1f4fef3d788da19b4024115..a4f1db7e0968affbcddfa7ce483a2a44031ad663 100644 (file)
--- a/net/coova-chilli/Makefile
+++ b/net/coova-chilli/Makefile
@@ -132,8 +132,6 @@ define Package/coova-chilli/install
         $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/chilli.conf $(1)/etc/
         $(INSTALL_DIR) $(1)/etc/chilli
         $(CP) $(PKG_INSTALL_DIR)/etc/chilli/* $(1)/etc/chilli/
-       $(INSTALL_DIR) $(1)/etc/hotplug.d/iface
-       $(INSTALL_DATA) ./files/chilli.hotplug $(1)/etc/hotplug.d/iface/30-chilli
         $(INSTALL_DIR) $(1)/usr/sbin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/chilli* $(1)/usr/sbin/
         $(INSTALL_DIR) $(1)/usr/lib/
diff --git a/net/coova-chilli/files/chilli.hotplug b/net/coova-chilli/files/chilli.hotplug

deleted file mode 100644 (file)

index e12812b..0000000
--- a/net/coova-chilli/files/chilli.hotplug
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-[ "$ACTION" == "ifup" ] || exit 0
-
-[ "$INTERFACE" = "wan" ] && {
-       /etc/init.d/chilli restart
-}
diff --git a/net/coova-chilli/files/chilli.init b/net/coova-chilli/files/chilli.init

index ab6ce7130c813ce54db45c3806444bc983cbb658..6770e94acad04dfaba668bbcfce8958c3ac74e71 100644 (file)
--- a/net/coova-chilli/files/chilli.init
+++ b/net/coova-chilli/files/chilli.init
@@ -6,6 +6,7 @@ USE_PROCD=1
  
  service_triggers() {
         procd_add_reload_trigger "chilli"
+       procd_add_interface_trigger "interface.*.up" "wan" /etc/init.d/chilli restart
  }
  
  config_cb() {
@@ -52,19 +53,24 @@ start_chilli() {
         config_get_bool disabled "$1" 'disabled' 0
         [ $disabled = 1 ] && return
  
-       procd_open_instance "$cfg"
-       procd_set_param command /usr/sbin/chilli
-       procd_set_param file "$chilli_conf"
-       procd_append_param command \
-               --fg \
-               --conf "${base}.conf" \
-               --pidfile "${base}.pid" \
-               --cmdsocket "${base}.sock" \
-               --unixipc "${base}.ipc"
-       procd_set_param respawn
-       procd_set_param stdout 1
-       procd_set_param stderr 1
-       procd_close_instance
+       . /lib/functions/network.sh
+
+       local wanif ipaddr
+       if network_find_wan wanif && network_get_ipaddr ipaddr "$wanif"; then
+               procd_open_instance "$cfg"
+               procd_set_param command /usr/sbin/chilli
+               procd_set_param file "$chilli_conf"
+               procd_append_param command \
+                       --fg \
+                       --conf "${base}.conf" \
+                       --pidfile "${base}.pid" \
+                       --cmdsocket "${base}.sock" \
+                       --unixipc "${base}.ipc"
+               procd_set_param respawn
+               procd_set_param stdout 1
+               procd_set_param stderr 1
+               procd_close_instance
+       fi
  }
  
  start_service() {
@@ -73,6 +79,9 @@ start_service() {
  }
  
  stop_service() {
+       for undofile in /var/run/chilli.tun*.sh; do
+               sh $undofile >& /dev/null
+       done
         rm -f /var/run/chilli_*
  }
  
diff --git a/net/crowdsec/Makefile b/net/crowdsec/Makefile

index e080451421a1c15f53fd7a115608889cca65dc80..85dd27f67d069a0c2b28669cd07daba13ca3be55 100644 (file)
--- a/net/crowdsec/Makefile
+++ b/net/crowdsec/Makefile
@@ -6,12 +6,12 @@
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=crowdsec
-PKG_VERSION:=1.2.3
+PKG_VERSION:=1.3.0
  PKG_RELEASE:=$(AUTORELEASE)
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
  PKG_SOURCE_URL:=https://codeload.github.com/crowdsecurity/crowdsec/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=c94163ac2b90864149bd5ced3b77ecb5c9e9a68d3c7a938f23e05ef72da69938
+PKG_HASH:=b81419d9a1af500c16a02f052ac6af54253a621ee1575131dfae0f578426d816
  
  PKG_LICENSE:=MIT
  PKG_LICENSE_FILES:=LICENSE
diff --git a/net/ddns-scripts/Makefile b/net/ddns-scripts/Makefile

index 34a366a5666114f41c0adcaa8cfbac8902d9666c..acd856411fea3ebc9ab833c3c3f33988dc6f2106 100644 (file)
--- a/net/ddns-scripts/Makefile
+++ b/net/ddns-scripts/Makefile
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
  
  PKG_NAME:=ddns-scripts
  PKG_VERSION:=2.8.2
-PKG_RELEASE:=21
+PKG_RELEASE:=23
  
  PKG_LICENSE:=GPL-2.0
  
@@ -237,6 +237,20 @@ define Package/ddns-scripts-transip/description
    "option param_opt" to contain the TTL of the DNS record to update
  endef
  
+define Package/ddns-scripts-one
+       $(call Package/ddns-scripts/Default)
+       TITLE:=Extension for one.com Control Panel
+       DEPENDS:=ddns-scripts +curl
+endef
+
+define Package/ddns-scrtips-one/description
+       Dynamic DNS Client scripts extension for "one.com".
+       It requires:
+       "option username" to be a valid Email for one.com Control Panel
+       "option password" to be the matching one.com Control Panel password
+       "option domain" to contain the domain / subdomain
+endef
+
  
  define Build/Configure
  endef
@@ -312,6 +326,7 @@ define Package/ddns-scripts-services/install
         rm $(1)/usr/share/ddns/default/pdns.json
         rm $(1)/usr/share/ddns/default/transip.nl.json
         rm $(1)/usr/share/ddns/default/ns1.com.json
+       rm $(1)/usr/share/ddns/default/one.com.json
  endef
  
  
@@ -562,6 +577,25 @@ exit 0
  endef
  
  
+define Package/ddns-scripts-one/install
+       $(INSTALL_DIR) $(1)/usr/lib/ddns
+       $(INSTALL_BIN) ./files/usr/lib/ddns/update_one_com.sh \
+               $(1)/usr/lib/ddns
+
+       $(INSTALL_DIR) $(1)/usr/share/ddns/default
+       $(INSTALL_DATA) ./files/usr/share/ddns/default/one.com.json \
+               $(1)/usr/share/ddns/default
+endef
+
+define Package/ddns-scripts-one/prerm
+#!/bin/sh
+if [-z "${IPKG_INSTROOT}" ]; then
+       /etc/init.d/ddns stop
+fi
+exit 0
+endef
+
+
  $(eval $(call BuildPackage,ddns-scripts))
  $(eval $(call BuildPackage,ddns-scripts-services))
  $(eval $(call BuildPackage,ddns-scripts-cloudflare))
@@ -577,3 +611,4 @@ $(eval $(call BuildPackage,ddns-scripts-gandi))
  $(eval $(call BuildPackage,ddns-scripts-pdns))
  $(eval $(call BuildPackage,ddns-scripts-transip))
  $(eval $(call BuildPackage,ddns-scripts-ns1))
+$(eval $(call BuildPackage,ddns-scripts-one))
diff --git a/net/ddns-scripts/files/usr/lib/ddns/update_one_com.sh b/net/ddns-scripts/files/usr/lib/ddns/update_one_com.sh

new file mode 100644 (file)

index 0000000..94ec2ef
--- /dev/null
+++ b/net/ddns-scripts/files/usr/lib/ddns/update_one_com.sh
@@ -0,0 +1,142 @@
+#!/bin/sh
+
+# ONE.COM DDNS SCRIPT
+# REQUIRES CURL
+# $ opkg install curl
+
+# SCRIPT BY LUGICO
+# CONTACT: main@lugico.de
+
+[ -z "$CURL" ] && [ -z "$CURL_SSL" ] && write_log 14 "one.com communication require cURL with SSL support. Please install"
+[ -z "$domain" ]   && write_log 14 "Service section not configured correctly! Missing 'domain'"
+[ -z "$username" ] && write_log 14 "Service section not configured correctly! Missing 'username'"
+[ -z "$password" ] && write_log 14 "Service section not configured correctly! Missing 'password'"
+
+. /usr/share/libubox/jshn.sh
+
+write_log 0 "one.com ddns script started"
+
+local __SUBDOMAIN __MAINDOMAIN __LOGINURL __RECORDID
+local __TTL=3600
+
+COOKIEJAR=$(mktemp /tmp/one_com_cookiejar.XXXXXX) || exit 1
+
+__SUBDOMAIN=$(echo $domain | sed -e 's/[^\.]*\.[^\.]*$//' -e 's/\.$//' )
+__MAINDOMAIN=$(echo $domain | sed -e "s/${__SUBDOMAIN}\.//" )
+
+
+# LOGGING IN
+# GET LOGIN POST URL FROM FORM
+__LOGINURL=$( $CURL \
+       -RsSL \
+       --stderr $ERRFILE \
+       -c $COOKIEJAR \
+       "https://www.one.com/admin/" \
+       | grep 'Login-form login autofill' \
+       | sed -e 's/.*action="//' -e 's/".*//' -e 's/\&amp;/\&/g' \
+)
+
+# POST LOGIN DATA
+$CURL \
+       -RsSL \
+       --stderr $ERRFILE \
+       -c $COOKIEJAR \
+       -b $COOKIEJAR \
+       "${__LOGINURL}" \
+       -H "Content-Type: application/x-www-form-urlencoded" \
+       -X POST \
+       -d "username=${username}&password=${password}&credentialId=" \
+       | grep "Invalid username or password." > $DATFILE
+
+if [ "$?" == "0" ] ; then
+       write_log 14 "Invalid credentials"
+       return 1
+fi
+
+
+# SETTING DOMAIN
+$CURL -RsSL \
+       --stderr $ERRFILE \
+       -c $COOKIEJAR \
+       -b $COOKIEJAR \
+       "https://www.one.com/admin/select-admin-domain.do?domain=${__MAINDOMAIN}" \
+       | grep "<meta name=\"one.com:active-domain\" content=\"${__MAINDOMAIN}\"/>" > $DATFILE
+
+if [ "$?" != "0" ] ; then
+       write_log 14 "Failed to select domain '${__MAINDOMAIN}'"
+       return 1
+fi
+
+
+# GETTING RECORD ID
+records=$( $CURL \
+       -RsSL \
+       --stderr $ERRFILE \
+       -c $COOKIEJAR \
+       -b $COOKIEJAR \
+       "https://www.one.com/admin/api/domains/${__MAINDOMAIN}/dns/custom_records"
+)
+
+json_load "$records"
+
+if json_is_a "result" "object" && \
+       json_select "result" && \
+       json_is_a "data" "array"
+then
+       json_select "data"
+       i=1
+       while json_is_a ${i} "object" ; do
+               json_select "${i}"
+               json_select "attributes"
+               json_get_var "prefix" "prefix"
+               json_close_object
+               if [ "$prefix" == "$__SUBDOMAIN" ] ; then
+                       json_get_var "__RECORDID" "id"
+                       write_log 0 "Found record id : ${__RECORDID}"
+                       break
+               fi
+               json_close_object
+               i=$(($i + 1))
+       done
+fi
+
+
+if [ "${__RECORDID}" == "" ] ; then
+       write_log 14 "domain record not found"
+       return 1
+fi
+
+
+# CREATING PATCH DATA
+json_init
+json_add_string "type" "dns_service_records"
+json_add_string "id" "${__RECORDID}"
+json_add_object "attributes"
+json_add_string "type" "A"
+json_add_string "prefix" "${__SUBDOMAIN}"
+json_add_string "content" "${__IP}"
+json_add_int "ttl" ${__TTL}
+patchdata=$(json_dump)
+
+
+# SENDING PATCH
+$CURL \
+       -RsSL \
+       --stderr $ERRFILE \
+       -c $COOKIEJAR \
+       -b $COOKIEJAR \
+       -X PATCH \
+       -d "$patchdata" \
+       -H "Content-Type: application/json" \
+       "https://www.one.com/admin/api/domains/${__MAINDOMAIN}/dns/custom_records/${__RECORDID}" \
+       | grep "priority" > $DATFILE
+
+if [ "$?" != "0" ] ; then
+       write_log 14 "one.com gave an unexpected response"
+       return 1
+fi
+
+rm $COOKIEJAR
+write_log 0 "one.com ddns script finished without errors"
+
+return 0
diff --git a/net/ddns-scripts/files/usr/share/ddns/default/one.com.json b/net/ddns-scripts/files/usr/share/ddns/default/one.com.json

new file mode 100644 (file)

index 0000000..9245a73
--- /dev/null
+++ b/net/ddns-scripts/files/usr/share/ddns/default/one.com.json
@@ -0,0 +1,6 @@
+{
+       "name": "one.com",
+       "ipv4": {
+               "url": "update_one_com.sh"
+       }
+}
diff --git a/net/ddns-scripts/samples/update_sample.sh b/net/ddns-scripts/samples/update_sample.sh

index 00b51cbd2ec894bbd719b8cf5ba0f715877015e3..316dfa52ff9844e0bc0c961319db8990f431477b 100644 (file)
--- a/net/ddns-scripts/samples/update_sample.sh
+++ b/net/ddns-scripts/samples/update_sample.sh
@@ -24,7 +24,7 @@ local __URL="http://[USERNAME]:[PASSWORD]@update.spdns.de/nic/update?hostname=[D
  [ -z "$password" ] && write_log 14 "Service section not configured correctly! Missing 'password'"
  
  # do replaces in URL
-__URL=$(echo $__URL |  | sed -e "s#\[USERNAME\]#$URL_USER#g" -e "s#\[PASSWORD\]#$URL_PASS#g" \
+__URL=$(echo $__URL | sed -e "s#\[USERNAME\]#$URL_USER#g" -e "s#\[PASSWORD\]#$URL_PASS#g" \
                              -e "s#\[PARAMENC\]#$URL_PENC#g" -e "s#\[PARAMOPT\]#$param_opt#g" \
                              -e "s#\[DOMAIN\]#$domain#g"     -e "s#\[IP\]#$__IP#g")
  [ $use_https -ne 0 ] && __URL=$(echo $__URL | sed -e 's#^http:#https:#')
diff --git a/net/dnsproxy/Makefile b/net/dnsproxy/Makefile

index ec9200607528f27fadc2fcce614a0b05c41644ec..509169fe6b52d1dd2f9c4552d18c4c83be7a31bb 100644 (file)
--- a/net/dnsproxy/Makefile
+++ b/net/dnsproxy/Makefile
@@ -5,12 +5,12 @@
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=dnsproxy
-PKG_VERSION:=0.40.5
+PKG_VERSION:=0.41.0
  PKG_RELEASE:=$(AUTORELESE)
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
  PKG_SOURCE_URL:=https://codeload.github.com/AdguardTeam/dnsproxy/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=8a0ccb81717533fc2c4a2bd65890f6805ddd11366294e49e441aa2f9cbfc8c9f
+PKG_HASH:=001b89436e4b9f3ac73fa98f838a733142ecd9ffa24387ce064eb1a5d99efbb2
  
  PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
  PKG_LICENSE:=Apache-2.0
diff --git a/net/isc-dhcp/Makefile b/net/isc-dhcp/Makefile

index 46921ba3f329ea87c4bdae4fc958ca2545de61f6..d89b4ca2e3f0b245cc4606a0807dbf7fbbe5f8e8 100644 (file)
--- a/net/isc-dhcp/Makefile
+++ b/net/isc-dhcp/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
  PKG_NAME:=isc-dhcp
  UPSTREAM_NAME:=dhcp
  PKG_VERSION:=4.4.1
-PKG_RELEASE:=18
+PKG_RELEASE:=19
  
  PKG_LICENSE:=BSD-3-Clause
  PKG_LICENSE_FILES:=LICENSE
@@ -194,6 +194,7 @@ CONFIGURE_ARGS += \
         --enable-paranoia               \
         --disable-dependency-tracking   \
         --with-randomdev=/dev/urandom \
+       ac_cv_path_AR=$(TARGET_AR) \
         ac_cv_file__dev_random=yes
  
  ifeq ($(BUILD_VARIANT),ipv4)
@@ -209,6 +210,8 @@ define Build/Compile
         $(MAKE) -C $(PKG_BUILD_DIR)                     \
                 BUILD_CC="$(HOSTCC_NOCACHE)"            \
                 CROSS_CC="$(TARGET_CC)"                 \
+               TARGET_AR="$(TARGET_AR)"                \
+               TARGET_RANLIB="$(TARGET_RANLIB)"        \
                 host_alias="$(GNU_TARGET_NAME)"         \
                 target_alias="$(GNU_TARGET_NAME)"       \
                 build_alias="$(GNU_HOST_NAME)"          \
@@ -217,6 +220,8 @@ define Build/Compile
                 DESTDIR="$(PKG_INSTALL_DIR)"            \
                 BUILD_CC="$(HOSTCC_NOCACHE)"            \
                 CROSS_CC="$(TARGET_CC)"                 \
+               TARGET_AR="$(TARGET_AR)"                \
+               TARGET_RANLIB="$(TARGET_RANLIB)"        \
                 host_alias="$(GNU_TARGET_NAME)"         \
                 target_alias="$(GNU_TARGET_NAME)"       \
                 build_alias="$(GNU_HOST_NAME)"          \
diff --git a/net/isc-dhcp/files/dhcpd.init b/net/isc-dhcp/files/dhcpd.init

index 680c112d132448bc3f413aba69e59a60bc35d18b..ab25b325843d4d354abec7ca1e64da923e99c9de 100755 (executable)
--- a/net/isc-dhcp/files/dhcpd.init
+++ b/net/isc-dhcp/files/dhcpd.init
@@ -247,7 +247,7 @@ static_srvhost_add() {
         config_get weight "$cfg" "weight"
         [ -n "$weight" ] || return 0
  
-       update "$srv.$domain." IN SRV "$priority" "$weight" "$port" "$target"
+       update "$srv.$domain." IN SRV "$priority" "$weight" "$port" "$target.$domain"
  }
  
  static_srvhosts() {
diff --git a/net/isc-dhcp/patches/510-bind-CC.patch b/net/isc-dhcp/patches/510-bind-CC.patch

index c100f71c3aeb2d06be8a324aace718e7f89fa676..a2acec3d5f3539104269d5cf47a08bd04710860f 100644 (file)
--- a/net/isc-dhcp/patches/510-bind-CC.patch
+++ b/net/isc-dhcp/patches/510-bind-CC.patch
@@ -5,7 +5,7 @@
                 rm -rf ${cleandirs} ${cleanfiles} ;                     \
                 (cd ${bindsrcdir} &&                                    \
  -                 ./configure ${bindconfig} > ${binddir}/configure.log); \
-+               export CC=${CROSS_CC} &&                               \
++               export CC=${CROSS_CC} AR=${TARGET_AR} RANLIB=${TARGET_RANLIB} && \
  +                ./configure ${bindconfig} --disable-atomic             \
  +               --disable-kqueue --disable-epoll --disable-kqueue      \
  +                --disable-epoll --disable-devpoll --without-openssl    \
diff --git a/net/isc-dhcp/patches/520-bind-no-catgets.patch b/net/isc-dhcp/patches/520-bind-no-catgets.patch

index ed8a4b063a17979c628f1fc0f116aae66f06f413..bd956032cd83ae7bd0b06d79b8a70167adaeaebe 100644 (file)
--- a/net/isc-dhcp/patches/520-bind-no-catgets.patch
+++ b/net/isc-dhcp/patches/520-bind-no-catgets.patch
@@ -3,7 +3,7 @@
  @@ -57,6 +57,7 @@ bind1:
                 rm -rf ${cleandirs} ${cleanfiles} ;                     \
                 (cd ${bindsrcdir} &&                                    \
-                export CC=${CROSS_CC} &&                               \
+                export CC=${CROSS_CC} AR=${TARGET_AR} RANLIB=${TARGET_RANLIB} && \
  +               ac_cv_func_catgets=no                                  \
                   ./configure ${bindconfig} --disable-atomic             \
                  --disable-kqueue --disable-epoll --disable-kqueue      \
diff --git a/net/knxd/Makefile b/net/knxd/Makefile

index 45fb9a05620b5567daa6734aaf3c0e13ea6a2ea5..f9d613f0441f897391cc848c062b8c77780cc0f8 100644 (file)
--- a/net/knxd/Makefile
+++ b/net/knxd/Makefile
@@ -12,7 +12,7 @@ include $(TOPDIR)/rules.mk
  
  PKG_NAME:=knxd
  PKG_VERSION:=0.14.53
-PKG_RELEASE:=1
+PKG_RELEASE:=2
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
  PKG_SOURCE_URL:=https://codeload.github.com/knxd/knxd/tar.gz/$(PKG_VERSION)?
diff --git a/net/knxd/patches/101_add_clang_suport_as_build_cc.patch b/net/knxd/patches/101_add_clang_suport_as_build_cc.patch

new file mode 100644 (file)

index 0000000..640fb20
--- /dev/null
+++ b/net/knxd/patches/101_add_clang_suport_as_build_cc.patch
@@ -0,0 +1,41 @@
+From: https://github.com/knxd/knxd/pull/531/commits/cb8a564d2c6250f712528e929892a5e7ddb74778
+
+From cb8a564d2c6250f712528e929892a5e7ddb74778 Mon Sep 17 00:00:00 2001
+From: "Sergey V. Lobanov" <sergey@lobanov.in>
+Date: Mon, 31 Jan 2022 01:34:20 +0300
+Subject: [PATCH] Add clang suport as build cc
+
+ccforbuild.m4 comes from gmp project (very old version).
+Current version does not support clang due to using GCC exit()
+builtin function. clang does not have exit() builtin function.
+
+GMP project fixed this issue by the commit https://gmplib.org/repo/gmp/rev/beda46a3c10d
+
+This patch backports "upstream" change (`exit(0)` relaced by
+`return 0` in conftest.c)
+
+Signed-off-by: Sergey V. Lobanov <sergey@lobanov.in>
+---
+ m4/ccforbuild.m4 | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/m4/ccforbuild.m4
++++ b/m4/ccforbuild.m4
+@@ -69,7 +69,7 @@ cat >conftest.c <<EOF
+ int
+ main ()
+ {
+-  exit(0);
++  return 0;
+ }
+ EOF
+ gmp_compile="$1 conftest.c"
+@@ -143,7 +143,7 @@ AC_CACHE_CHECK([for build system executa
+ int
+ main ()
+ {
+-  exit (0);
++  return 0;
+ }
+ EOF
+ for i in .exe ,ff8 ""; do
diff --git a/net/linuxptp/Makefile b/net/linuxptp/Makefile

index 2a30c8bb3469a8c0cd4c3685fbd6e8853eef8b79..762d5db6d77c03804d0d17b68b3c6583892ca1b9 100644 (file)
--- a/net/linuxptp/Makefile
+++ b/net/linuxptp/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
  
  PKG_NAME:=linuxptp
  PKG_VERSION:=3.1.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
  PKG_SOURCE_URL:=@SF/$(PKG_NAME)/v$(PKG_VERSION)
diff --git a/net/linuxptp/patches/010-64bit.patch b/net/linuxptp/patches/010-64bit.patch

new file mode 100644 (file)

index 0000000..043c35e
--- /dev/null
+++ b/net/linuxptp/patches/010-64bit.patch
@@ -0,0 +1,12 @@
+--- a/ts2phc_slave.c
++++ b/ts2phc_slave.c
+@@ -4,6 +4,9 @@
+  * @note Copyright (C) 2019 Balint Ferencz <fernya@sch.bme.hu>
+  * @note SPDX-License-Identifier: GPL-2.0+
+  */
++#ifndef __SANE_USERSPACE_TYPES__
++#define __SANE_USERSPACE_TYPES__      /* For PPC64, to get LL64 types */
++#endif
+ #include <errno.h>
+ #include <linux/ptp_clock.h>
+ #include <poll.h>
diff --git a/net/miniupnpd/Makefile b/net/miniupnpd/Makefile

index deeac1ccdf2053ba3b8ba971f318117a9345169e..2a1372755e29a110ec4342aef0887b5a947bea7c 100644 (file)
--- a/net/miniupnpd/Makefile
+++ b/net/miniupnpd/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
  
  PKG_NAME:=miniupnpd
  PKG_VERSION:=2.2.3
-PKG_RELEASE:=2
+PKG_RELEASE:=$(AUTORELEASE)
  
  PKG_SOURCE_URL:=https://miniupnp.tuxfamily.org/files
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@@ -41,7 +41,6 @@ endef
  
  define Package/miniupnpd-iptables
    $(call Package/miniupnpd/Default)
-  CONFLICTS:=miniupnpd-nftables
    DEPENDS+= \
         +IPV6:ip6tables \
         +IPV6:libip6tc \
@@ -58,6 +57,8 @@ define Package/miniupnpd-nftables
         +libnftnl
    TITLE+= (nftables)
    VARIANT:=nftables
+  DEFAULT_VARIANT:=1
+  CONFLICTS:=miniupnpd-iptables
  endef
  
  define Package/miniupnpd/conffiles/Default
diff --git a/net/nut/Makefile b/net/nut/Makefile

index 42839b7667a34158b8bafd874f621eedb698e27e..859da030c7dafd9d58662a901b26dcc907f75db4 100644 (file)
--- a/net/nut/Makefile
+++ b/net/nut/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
  
  PKG_NAME:=nut
  PKG_VERSION:=2.7.4
-PKG_RELEASE:=26
+PKG_RELEASE:=27
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
  PKG_SOURCE_URL:=http://www.networkupstools.org/source/2.7/
@@ -524,6 +524,9 @@ $(eval $(call DriverDescription,usb,nutdrv_qx,\
  $(eval $(call DriverDescription,neon,netxml-ups,\
          Driver for NetXML based UPS equipment))
  
+CONFIGURE_VARS += \
+       ac_cv_path_AR=$(TARGET_AR)
+
  CONFIGURE_ARGS += \
         --sysconfdir=/etc/nut \
         --datadir=/usr/share/nut \
@@ -542,6 +545,7 @@ CONFIGURE_ARGS += \
         --without-freeipmi \
         --$(if $(CONFIG_NUT_SSL),with,without)-ssl $(if $(CONFIG_NUT_SSL),--with-openssl) \
         --without-libltdl \
+       --without-macosx_ups \
         --with-statepath=/var/run/nut \
         --with-drvpath=/lib/nut \
         --with-user=root \
diff --git a/net/pdns/Makefile b/net/pdns/Makefile

index 27ed6af1c5f640907520de57c5e72dce72d63221..56cd7cea5c8dde28e615c5a218c34eaa80fdf072 100644 (file)
--- a/net/pdns/Makefile
+++ b/net/pdns/Makefile
@@ -1,12 +1,12 @@
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=pdns
-PKG_VERSION:=4.5.2
+PKG_VERSION:=4.6.0
  PKG_RELEASE:=$(AUTORELEASE)
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_SOURCE_URL:=https://downloads.powerdns.com/releases/
-PKG_HASH:=93d94a2500b1b3288dde0e76da7c40095382d93f0998d0f15449d1e6fc033641
+PKG_HASH:=b9effb7968a7badbb91eea431c73346482a67592684d84660edd8b7528cc1325
  
  PKG_MAINTAINER:=Peter van Dijk <peter.van.dijk@powerdns.com>
  PKG_LICENCE:=GPL-2.0-only
@@ -178,7 +178,7 @@ CONFIGURE_ARGS+= \
         --libdir=/usr/lib/powerdns  \
         --with-dynmodules="$(foreach backend,$(PDNS_BACKENDS),$(if $(CONFIG_PACKAGE_pdns-backend-$(backend)),$(PDNS_BACKEND_$(backend)_LIB),))" \
         --with-lua="lua" \
-       --with-modules="bind random" \
+       --with-modules="bind" \
         --with-mysql-lib=$(STAGING_DIR)/usr \
         --with-mysql-includes=$(STAGING_DIR)/usr \
         $(if $(CONFIG_PACKAGE_pdns-tools),--enable-tools,) \
diff --git a/net/pdns/files/pdns.conf-dist b/net/pdns/files/pdns.conf-dist

index 12e805e19d78ca949be3c10ff6b48443ef389ee6..9242373a2974b9d110c1e72fbbebc49614c20d3a 100644 (file)
--- a/net/pdns/files/pdns.conf-dist
+++ b/net/pdns/files/pdns.conf-dist
@@ -235,6 +235,11 @@
  #
  # domain-metadata-cache-ttl=
  
+#################################
+# edns-cookie-secret   When set, set a server cookie when responding to a query with a Client cookie (in hex)
+#
+# edns-cookie-secret=
+
  #################################
  # edns-subnet-processing       If we should act on EDNS Subnet options
  #
@@ -375,6 +380,11 @@
  #
  # max-generate-steps=0
  
+#################################
+# max-include-depth    Maximum number of nested $INCLUDE directives while processing a zone file
+#
+# max-include-depth=20
+
  #################################
  # max-nsec3-iterations Limit the number of NSEC3 hash iterations
  #
@@ -460,6 +470,16 @@
  #
  # primary=no
  
+#################################
+# proxy-protocol-from  A Proxy Protocol header is only allowed from these subnets, and is mandatory then too.
+#
+# proxy-protocol-from=
+
+#################################
+# proxy-protocol-maximum-size  The maximum size of a proxy protocol payload, including the TLV values
+#
+# proxy-protocol-maximum-size=512
+
  #################################
  # query-cache-ttl      Seconds to store query results in the QueryCache
  #
@@ -645,6 +665,11 @@
  #
  # webserver-allow-from=127.0.0.1,::1
  
+#################################
+# webserver-hash-plaintext-credentials Whether to hash passwords and api keys supplied in plaintext, to prevent keeping the plaintext version in memory at runtime
+#
+# webserver-hash-plaintext-credentials=no
+
  #################################
  # webserver-loglevel   Amount of logging in the webserver (none, normal, detailed)
  #
diff --git a/net/pdns/patches/100-pdns-disable-pdns.conf-dist.patch b/net/pdns/patches/100-pdns-disable-pdns.conf-dist.patch

index d32d84aa9eed67508dcf557516385363dfddcaf6..6f7293e36daab02c1399e3791ded6de2539eecfd 100644 (file)
--- a/net/pdns/patches/100-pdns-disable-pdns.conf-dist.patch
+++ b/net/pdns/patches/100-pdns-disable-pdns.conf-dist.patch
@@ -1,6 +1,6 @@
  --- a/pdns/Makefile.am
  +++ b/pdns/Makefile.am
-@@ -71,7 +71,6 @@ CLEANFILES = \
+@@ -72,7 +72,6 @@ CLEANFILES = \
         backends/gsql/gsqlbackend.gcda \
         backends/gsql/gsqlbackend.gcno \
         backends/gsql/gsqlbackend.gcov \
@@ -8,7 +8,7 @@
         apidocfiles.h
   
   if !HAVE_API_SWAGGER_JSON
-@@ -105,7 +104,6 @@ apidocfiles.h: api-swagger.yaml api-swag
+@@ -106,7 +105,6 @@ apidocfiles.h: api-swagger.yaml api-swag
         ./incfiles $^ > $@
   
   noinst_SCRIPTS = pdns.init
@@ -16,7 +16,7 @@
   
   sbin_PROGRAMS = pdns_server
   bin_PROGRAMS = \
-@@ -146,7 +144,7 @@ if IXFRDIST
+@@ -147,7 +145,7 @@ if IXFRDIST
   bin_PROGRAMS += \
         ixfrdist
   
@@ -25,12 +25,12 @@
         ixfrdist.example.yml
   endif
   
-@@ -1299,9 +1297,6 @@ dnspcap2protobuf_LDADD = \
+@@ -1313,9 +1311,6 @@ dnspcap2protobuf_LDADD = \
         $(BOOST_PROGRAM_OPTIONS_LIBS) \
         $(RT_LIBS)
   
  -pdns.conf-dist: pdns_server
--      $(AM_V_GEN)./pdns_server --config=default 2>/dev/null > $@
+-      $(AM_V_GEN)./pdns_server --config=default > $@
  -
   testrunner_SOURCES = \
         arguments.cc \
diff --git a/net/prosody/Makefile b/net/prosody/Makefile

index 7bac97154ad81bd00e816d6c3dddb3ecaa2ee032..8328b0c92636267a989b9c0337c0023f73d060d7 100644 (file)
--- a/net/prosody/Makefile
+++ b/net/prosody/Makefile
@@ -8,12 +8,12 @@
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=prosody
-PKG_VERSION:=0.11.7
+PKG_VERSION:=0.11.13
  PKG_RELEASE:=1
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
  PKG_SOURCE_URL:=https://prosody.im/downloads/source
-PKG_HASH:=28ffc07653485cb63e22b387d3ea4825ee2baaee0c5827de4d6053a35b1c8747
+PKG_HASH:=39c61b346a09b5125b604cb969e14206cbbcb86c81156ffc6ba2d62527cf0432
  
  PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de>
  PKG_LICENSE:=MIT/X11
diff --git a/net/proxychains-ng/Makefile b/net/proxychains-ng/Makefile

index 0ca7151bf29b09209c3b1393fe57c99248d30696..745b5e40bd4b934ff9d40e4b357a12de46ea70bc 100644 (file)
--- a/net/proxychains-ng/Makefile
+++ b/net/proxychains-ng/Makefile
@@ -1,5 +1,5 @@
  #
-# Copyright (C) 2019-2021 Daniel Bermond
+# Copyright (C) 2019-2022 Daniel Bermond
  #
  # This is free software, licensed under the GNU General Public License v2.
  # See /LICENSE for more information.
@@ -8,12 +8,12 @@
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=proxychains-ng
-PKG_VERSION:=4.15
+PKG_VERSION:=4.16
  PKG_RELEASE:=1
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
  PKG_SOURCE_URL:=https://codeload.github.com/rofl0r/proxychains-ng/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=c94edded38baa0447766f6e5d0ec1963bb27c7b55b2a78b305d6f58e171388f8
+PKG_HASH:=5f66908044cc0c504f4a7e618ae390c9a78d108d3f713d7839e440693f43b5e7
  
  PKG_MAINTAINER:=Daniel Bermond <dbermond@archlinux.org>
  PKG_LICENSE:=GPL-2.0-or-later
diff --git a/net/radsecproxy/Makefile b/net/radsecproxy/Makefile

index 5207e57194e703622e31746fb7b7c6aafa8c6895..0f89fac019babff1b316b2e6cfb564b03e9521e3 100644 (file)
--- a/net/radsecproxy/Makefile
+++ b/net/radsecproxy/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
  
  PKG_NAME:=radsecproxy
  PKG_VERSION:=1.9.0
-PKG_RELEASE:=2
+PKG_RELEASE:=3
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
  PKG_SOURCE_URL:=https://github.com/radsecproxy/radsecproxy/releases/download/$(PKG_VERSION)/
diff --git a/net/radsecproxy/patches/300-uninit.patch b/net/radsecproxy/patches/300-uninit.patch

new file mode 100644 (file)

index 0000000..578c868
--- /dev/null
+++ b/net/radsecproxy/patches/300-uninit.patch
@@ -0,0 +1,11 @@
+--- a/gconfig.c
++++ b/gconfig.c
+@@ -119,7 +119,7 @@ FILE *pushgconfpaths(struct gconffile **
+     int i;
+     FILE *f = NULL;
+     glob_t globbuf;
+-    char *path, *curfile = NULL, *dir;
++    char *path = NULL, *curfile = NULL, *dir;
+ 
+     /* if cfgpath is relative, make it relative to current config */
+     if (*cfgpath == '/')
diff --git a/net/samba4/Makefile b/net/samba4/Makefile

index daed0f488580a97481e9bd3b85b8b4cbf93425e9..d84caa0fc5f33d87e05518947437dd8f9be26180 100644 (file)
--- a/net/samba4/Makefile
+++ b/net/samba4/Makefile
@@ -2,7 +2,7 @@
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=samba
-PKG_VERSION:=4.14.7
+PKG_VERSION:=4.14.12
  PKG_RELEASE:=$(AUTORELEASE)
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@@ -13,7 +13,7 @@ PKG_SOURCE_URL:= \
                 http://www.nic.funet.fi/index/samba/pub/samba/stable/ \
                 http://samba.mirror.bit.nl/samba/ftp/stable/ \
                 https://download.samba.org/pub/samba/stable/
-PKG_HASH:=6f50353f9602aa20245eb18ceb00e7e5ec793df0974aebd5254c38f16d8f1906
+PKG_HASH:=155d9c2dfb06a18104422987590858bfe5e9783ebebe63882e7e7f07eaaa512d
  
  PKG_MAINTAINER:=Andy Walsh <andy.walsh44+github@gmail.com>
  PKG_LICENSE:=GPL-3.0-only
@@ -66,7 +66,7 @@ define Package/samba4-libs
         +PACKAGE_libpam:libpam \
         +SAMBA4_SERVER_VFS:attr \
         +SAMBA4_SERVER_AVAHI:libavahi-client \
-       +SAMBA4_SERVER_AD_DC:python3-cryptodome +SAMBA4_SERVER_AD_DC:libopenldap +SAMBA4_SERVER_AD_DC:jansson +SAMBA4_SERVER_AD_DC:libarchive +SAMBA4_SERVER_AD_DC:acl +SAMBA4_SERVER_AD_DC:attr
+       +SAMBA4_SERVER_AD_DC:python3-cryptodome +SAMBA4_SERVER_AD_DC:python3-markdown +SAMBA4_SERVER_AD_DC:python3-dns +SAMBA4_SERVER_AD_DC:libopenldap +SAMBA4_SERVER_AD_DC:jansson +SAMBA4_SERVER_AD_DC:libarchive +SAMBA4_SERVER_AD_DC:acl +SAMBA4_SERVER_AD_DC:attr
  endef
  
  define Package/samba4-server
@@ -259,7 +259,7 @@ ifdef CONFIG_KERNEL_IO_URING
         SAMBA4_VFS_MODULES_SHARED :=$(SAMBA4_VFS_MODULES_SHARED)vfs_io_uring,
  endif
  ifeq ($(CONFIG_SAMBA4_SERVER_VFS),y)
-       SAMBA4_VFS_MODULES_SHARED :=$(SAMBA4_VFS_MODULES_SHARED)vfs_fruit,vfs_shadow_copy2,vfs_recycle,vfs_fake_perms,vfs_readonly,vfs_cap,vfs_offline,vfs_crossrename,vfs_catia,vfs_streams_xattr,vfs_xattr_tdb,vfs_default_quota,
+       SAMBA4_VFS_MODULES_SHARED :=$(SAMBA4_VFS_MODULES_SHARED)vfs_fruit,vfs_shadow_copy2,vfs_recycle,vfs_fake_perms,vfs_readonly,vfs_cap,vfs_offline,vfs_crossrename,vfs_catia,vfs_streams_xattr,vfs_xattr_tdb,vfs_default_quota,vfs_widelinks,
  ifdef CONFIG_PACKAGE_kmod-fs-btrfs
         SAMBA4_VFS_MODULES_SHARED :=$(SAMBA4_VFS_MODULES_SHARED)vfs_btrfs,
  endif
diff --git a/net/samba4/patches/011-samba-4-14-disable-python-module-host-check.patch b/net/samba4/patches/011-samba-4-14-disable-python-module-host-check.patch

new file mode 100644 (file)

index 0000000..ee84f77
--- /dev/null
+++ b/net/samba4/patches/011-samba-4-14-disable-python-module-host-check.patch
@@ -0,0 +1,15 @@
+--- a/python/wscript
++++ b/python/wscript
+@@ -73,9 +73,9 @@ def configure(conf):
+         for module, package in selftest_pkgs.items():
+             find_third_party_module(conf, module, package)
+ 
+-    if not Options.options.without_ad_dc:
+-        for module, package in ad_dc_pkgs.items():
+-            find_third_party_module(conf, module, package)
++#    if not Options.options.without_ad_dc:
++#       for module, package in ad_dc_pkgs.items():
++#           find_third_party_module(conf, module, package)
+ 
+ 
+ def build(bld):
diff --git a/net/samba4/patches/101-do-not-check-xsltproc-manpages.patch b/net/samba4/patches/101-do-not-check-xsltproc-manpages.patch

index 39bbb77b78f53312cef14717af6e00f82f7e912d..abce345d8747bb81be8d2f8bfbf407f96b22ca9d 100644 (file)
--- a/net/samba4/patches/101-do-not-check-xsltproc-manpages.patch
+++ b/net/samba4/patches/101-do-not-check-xsltproc-manpages.patch
@@ -4,7 +4,7 @@ Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com>
  
  --- a/lib/ldb/wscript
  +++ b/lib/ldb/wscript
-@@ -143,7 +143,7 @@ def configure(conf):
+@@ -144,7 +144,7 @@ def configure(conf):
           conf.DEFINE('EXPECTED_SYSTEM_LDB_VERSION_RELEASE', int(v[2]))
   
       if conf.env.standalone_ldb:
diff --git a/net/softethervpn/Makefile b/net/softethervpn/Makefile

index 4c4141a02f42ea6d5c0366a1bc4f042b3872a403..b8b719519454d4b6f568042636ee945680321daa 100644 (file)
--- a/net/softethervpn/Makefile
+++ b/net/softethervpn/Makefile
@@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
  PKG_NAME:=softethervpn
  PKG_VERSION:=4.38-9760
  PKG_VERREL:=rtm
-PKG_RELEASE:=1
+PKG_RELEASE:=2
  
  PKG_SOURCE:=softether-src-v$(PKG_VERSION)-$(PKG_VERREL).tar.gz
  PKG_SOURCE_URL:=https://github.com/SoftEtherVPN/SoftEtherVPN_Stable/releases/download/v$(PKG_VERSION)-$(PKG_VERREL)
@@ -37,13 +37,16 @@ include $(INCLUDE_DIR)/host-build.mk
  HOST_MAKE_FLAGS += -C $(HOST_BUILD_DIR)
  
  # Select 32 or 64 bit Makefile for host build depending on host architecture
-HOST_MAKE_FLAGS += -f src/makefiles/linux_$(if $(shell uname -m | grep 64),64,32)bit.mak
+HOST_MAKE_FLAGS += \
+       -f src/makefiles/$(if $(CONFIG_HOST_OS_MACOS),macos,linux)_$(if $(shell uname -m | grep 64),64,32)bit.mak
  
  HOST_LDFLAGS += -Wl,-rpath$(comma)$(STAGING_DIR_HOSTPKG)/lib
  # Prevent calling upstream configure
  define Host/Configure
  endef
  
+HOST_CFLAGS += $(if $(CONFIG_HOST_OS_MACOS),-Wno-implicit-function-declaration,)
+
  define Host/Compile
         # Build hamcorebuilder using host compiler and let it generate
         # the hamcore.se2 archive file
diff --git a/net/softethervpn/patches/140_allow-to-redefine-ar-and-ranlib.patch b/net/softethervpn/patches/140_allow-to-redefine-ar-and-ranlib.patch

new file mode 100644 (file)

index 0000000..93fd43a
--- /dev/null
+++ b/net/softethervpn/patches/140_allow-to-redefine-ar-and-ranlib.patch
@@ -0,0 +1,1181 @@
+https://github.com/SoftEtherVPN/SoftEtherVPN_Stable/pull/20
+
+From cb1e3b34c353fe4a8c717b673359a1d1bfcb83af Mon Sep 17 00:00:00 2001
+From: "Sergey V. Lobanov" <sergey@lobanov.in>
+Date: Sat, 15 Jan 2022 02:24:13 +0300
+Subject: [PATCH] allow to redefine ar and ranlib
+
+Makefiles call 'ar r' and 'ranlib' command. It causes issues on
+cross-compilation (e.g. build on macos for linux target)
+
+This patch allows to redifine ar and ranlib using AR and RANLIB
+Makefile variables
+
+This patch is fully backward compatible. Default values for AR=ar
+and RANLIB=ranlib to reproduce current behaviour if these variables
+are not set.
+
+Signed-off-by: Sergey V. Lobanov <sergey@lobanov.in>
+---
+ src/makefiles/freebsd_32bit.mak        | 20 ++++++++++++--------
+ src/makefiles/freebsd_32bit_nobits.mak | 20 ++++++++++++--------
+ src/makefiles/freebsd_64bit.mak        | 20 ++++++++++++--------
+ src/makefiles/freebsd_64bit_nobits.mak | 20 ++++++++++++--------
+ src/makefiles/linux_32bit.mak          | 20 ++++++++++++--------
+ src/makefiles/linux_32bit_nobits.mak   | 20 ++++++++++++--------
+ src/makefiles/linux_64bit.mak          | 20 ++++++++++++--------
+ src/makefiles/linux_64bit_nobits.mak   | 20 ++++++++++++--------
+ src/makefiles/macos_32bit.mak          | 20 ++++++++++++--------
+ src/makefiles/macos_32bit_nobits.mak   | 20 ++++++++++++--------
+ src/makefiles/macos_64bit.mak          | 20 ++++++++++++--------
+ src/makefiles/macos_64bit_nobits.mak   | 20 ++++++++++++--------
+ src/makefiles/openbsd_32bit.mak        | 20 ++++++++++++--------
+ src/makefiles/openbsd_32bit_nobits.mak | 20 ++++++++++++--------
+ src/makefiles/openbsd_64bit.mak        | 20 ++++++++++++--------
+ src/makefiles/openbsd_64bit_nobits.mak | 20 ++++++++++++--------
+ src/makefiles/solaris_32bit.mak        | 20 ++++++++++++--------
+ src/makefiles/solaris_32bit_nobits.mak | 20 ++++++++++++--------
+ src/makefiles/solaris_64bit.mak        | 20 ++++++++++++--------
+ src/makefiles/solaris_64bit_nobits.mak | 20 ++++++++++++--------
+ 20 files changed, 240 insertions(+), 160 deletions(-)
+
+--- a/src/makefiles/freebsd_32bit.mak
++++ b/src/makefiles/freebsd_32bit.mak
+@@ -62,6 +62,10 @@
+ 
+ #CC=gcc
+ 
++AR=ar
++RANLIB=ranlib
++
++
+ OPTIONS_COMPILE_DEBUG=-D_DEBUG -DDEBUG -DUNIX -DUNIX_BSD -DBRIDGE_BPF -DNO_VLAN -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -I/usr/local/include -I/usr/include -g -fsigned-char
+ 
+ OPTIONS_LINK_DEBUG=-g -fsigned-char -L/usr/local/lib -L/usr/lib -lm -lpthread -lssl -lcrypto -liconv -lreadline -lncurses -lz
+@@ -361,8 +365,8 @@ bin/vpnserver/vpnserver: tmp/as/vpnserve
+ 
+ tmp/as/vpnserver.a: tmp/objs/vpnserver.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpnserver.a
+-      ar r tmp/as/vpnserver.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnserver.o
+-      ranlib tmp/as/vpnserver.a
++      $(AR) r tmp/as/vpnserver.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnserver.o
++      $(RANLIB) tmp/as/vpnserver.a
+ 
+ bin/vpnserver/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnserver/hamcore.se2
+@@ -376,8 +380,8 @@ bin/vpnclient/vpnclient: tmp/as/vpnclien
+ 
+ tmp/as/vpnclient.a: tmp/objs/vpnclient.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpnclient.a
+-      ar r tmp/as/vpnclient.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnclient.o
+-      ranlib tmp/as/vpnclient.a
++      $(AR) r tmp/as/vpnclient.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnclient.o
++      $(RANLIB) tmp/as/vpnclient.a
+ 
+ bin/vpnclient/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnclient/hamcore.se2
+@@ -391,8 +395,8 @@ bin/vpnbridge/vpnbridge: tmp/as/vpnbridg
+ 
+ tmp/as/vpnbridge.a: tmp/objs/vpnbridge.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpnbridge.a
+-      ar r tmp/as/vpnbridge.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnbridge.o
+-      ranlib tmp/as/vpnbridge.a
++      $(AR) r tmp/as/vpnbridge.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnbridge.o
++      $(RANLIB) tmp/as/vpnbridge.a
+ 
+ bin/vpnbridge/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnbridge/hamcore.se2
+@@ -406,8 +410,8 @@ bin/vpncmd/vpncmd: tmp/as/vpncmd.a bin/v
+ 
+ tmp/as/vpncmd.a: tmp/objs/vpncmd.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpncmd.a
+-      ar r tmp/as/vpncmd.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpncmd.o
+-      ranlib tmp/as/vpncmd.a
++      $(AR) r tmp/as/vpncmd.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpncmd.o
++      $(RANLIB) tmp/as/vpncmd.a
+ 
+ bin/vpncmd/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpncmd/hamcore.se2
+--- a/src/makefiles/freebsd_32bit_nobits.mak
++++ b/src/makefiles/freebsd_32bit_nobits.mak
+@@ -62,6 +62,10 @@
+ 
+ #CC=gcc
+ 
++AR=ar
++RANLIB=ranlib
++
++
+ OPTIONS_COMPILE_DEBUG=-D_DEBUG -DDEBUG -DUNIX -DUNIX_BSD -DBRIDGE_BPF -DNO_VLAN -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -I/usr/local/include -I/usr/include -g -fsigned-char
+ 
+ OPTIONS_LINK_DEBUG=-g -fsigned-char -L/usr/local/lib -L/usr/lib -lm -lpthread -lssl -lcrypto -liconv -lreadline -lncurses -lz
+@@ -361,8 +365,8 @@ bin/vpnserver/vpnserver: tmp/as/vpnserve
+ 
+ tmp/as/vpnserver.a: tmp/objs/vpnserver.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpnserver.a
+-      ar r tmp/as/vpnserver.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnserver.o
+-      ranlib tmp/as/vpnserver.a
++      $(AR) r tmp/as/vpnserver.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnserver.o
++      $(RANLIB) tmp/as/vpnserver.a
+ 
+ bin/vpnserver/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnserver/hamcore.se2
+@@ -376,8 +380,8 @@ bin/vpnclient/vpnclient: tmp/as/vpnclien
+ 
+ tmp/as/vpnclient.a: tmp/objs/vpnclient.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpnclient.a
+-      ar r tmp/as/vpnclient.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnclient.o
+-      ranlib tmp/as/vpnclient.a
++      $(AR) r tmp/as/vpnclient.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnclient.o
++      $(RANLIB) tmp/as/vpnclient.a
+ 
+ bin/vpnclient/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnclient/hamcore.se2
+@@ -391,8 +395,8 @@ bin/vpnbridge/vpnbridge: tmp/as/vpnbridg
+ 
+ tmp/as/vpnbridge.a: tmp/objs/vpnbridge.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpnbridge.a
+-      ar r tmp/as/vpnbridge.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnbridge.o
+-      ranlib tmp/as/vpnbridge.a
++      $(AR) r tmp/as/vpnbridge.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnbridge.o
++      $(RANLIB) tmp/as/vpnbridge.a
+ 
+ bin/vpnbridge/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnbridge/hamcore.se2
+@@ -406,8 +410,8 @@ bin/vpncmd/vpncmd: tmp/as/vpncmd.a bin/v
+ 
+ tmp/as/vpncmd.a: tmp/objs/vpncmd.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpncmd.a
+-      ar r tmp/as/vpncmd.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpncmd.o
+-      ranlib tmp/as/vpncmd.a
++      $(AR) r tmp/as/vpncmd.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpncmd.o
++      $(RANLIB) tmp/as/vpncmd.a
+ 
+ bin/vpncmd/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpncmd/hamcore.se2
+--- a/src/makefiles/freebsd_64bit.mak
++++ b/src/makefiles/freebsd_64bit.mak
+@@ -62,6 +62,10 @@
+ 
+ #CC=gcc
+ 
++AR=ar
++RANLIB=ranlib
++
++
+ OPTIONS_COMPILE_DEBUG=-D_DEBUG -DDEBUG -DUNIX -DUNIX_BSD -DBRIDGE_BPF -DNO_VLAN -DCPU_64 -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -I/usr/local/include -I/usr/include -g -fsigned-char -m64
+ 
+ OPTIONS_LINK_DEBUG=-g -fsigned-char -m64 -L/usr/local/lib -L/usr/lib -lm -lpthread -lssl -lcrypto -liconv -lreadline -lncurses -lz
+@@ -361,8 +365,8 @@ bin/vpnserver/vpnserver: tmp/as/vpnserve
+ 
+ tmp/as/vpnserver.a: tmp/objs/vpnserver.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpnserver.a
+-      ar r tmp/as/vpnserver.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnserver.o
+-      ranlib tmp/as/vpnserver.a
++      $(AR) r tmp/as/vpnserver.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnserver.o
++      $(RANLIB) tmp/as/vpnserver.a
+ 
+ bin/vpnserver/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnserver/hamcore.se2
+@@ -376,8 +380,8 @@ bin/vpnclient/vpnclient: tmp/as/vpnclien
+ 
+ tmp/as/vpnclient.a: tmp/objs/vpnclient.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpnclient.a
+-      ar r tmp/as/vpnclient.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnclient.o
+-      ranlib tmp/as/vpnclient.a
++      $(AR) r tmp/as/vpnclient.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnclient.o
++      $(RANLIB) tmp/as/vpnclient.a
+ 
+ bin/vpnclient/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnclient/hamcore.se2
+@@ -391,8 +395,8 @@ bin/vpnbridge/vpnbridge: tmp/as/vpnbridg
+ 
+ tmp/as/vpnbridge.a: tmp/objs/vpnbridge.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpnbridge.a
+-      ar r tmp/as/vpnbridge.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnbridge.o
+-      ranlib tmp/as/vpnbridge.a
++      $(AR) r tmp/as/vpnbridge.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnbridge.o
++      $(RANLIB) tmp/as/vpnbridge.a
+ 
+ bin/vpnbridge/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnbridge/hamcore.se2
+@@ -406,8 +410,8 @@ bin/vpncmd/vpncmd: tmp/as/vpncmd.a bin/v
+ 
+ tmp/as/vpncmd.a: tmp/objs/vpncmd.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpncmd.a
+-      ar r tmp/as/vpncmd.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpncmd.o
+-      ranlib tmp/as/vpncmd.a
++      $(AR) r tmp/as/vpncmd.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpncmd.o
++      $(RANLIB) tmp/as/vpncmd.a
+ 
+ bin/vpncmd/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpncmd/hamcore.se2
+--- a/src/makefiles/freebsd_64bit_nobits.mak
++++ b/src/makefiles/freebsd_64bit_nobits.mak
+@@ -62,6 +62,10 @@
+ 
+ #CC=gcc
+ 
++AR=ar
++RANLIB=ranlib
++
++
+ OPTIONS_COMPILE_DEBUG=-D_DEBUG -DDEBUG -DUNIX -DUNIX_BSD -DBRIDGE_BPF -DNO_VLAN -DCPU_64 -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -I/usr/local/include -I/usr/include -g -fsigned-char
+ 
+ OPTIONS_LINK_DEBUG=-g -fsigned-char -L/usr/local/lib -L/usr/lib -lm -lpthread -lssl -lcrypto -liconv -lreadline -lncurses -lz
+@@ -361,8 +365,8 @@ bin/vpnserver/vpnserver: tmp/as/vpnserve
+ 
+ tmp/as/vpnserver.a: tmp/objs/vpnserver.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpnserver.a
+-      ar r tmp/as/vpnserver.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnserver.o
+-      ranlib tmp/as/vpnserver.a
++      $(AR) r tmp/as/vpnserver.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnserver.o
++      $(RANLIB) tmp/as/vpnserver.a
+ 
+ bin/vpnserver/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnserver/hamcore.se2
+@@ -376,8 +380,8 @@ bin/vpnclient/vpnclient: tmp/as/vpnclien
+ 
+ tmp/as/vpnclient.a: tmp/objs/vpnclient.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpnclient.a
+-      ar r tmp/as/vpnclient.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnclient.o
+-      ranlib tmp/as/vpnclient.a
++      $(AR) r tmp/as/vpnclient.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnclient.o
++      $(RANLIB) tmp/as/vpnclient.a
+ 
+ bin/vpnclient/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnclient/hamcore.se2
+@@ -391,8 +395,8 @@ bin/vpnbridge/vpnbridge: tmp/as/vpnbridg
+ 
+ tmp/as/vpnbridge.a: tmp/objs/vpnbridge.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpnbridge.a
+-      ar r tmp/as/vpnbridge.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnbridge.o
+-      ranlib tmp/as/vpnbridge.a
++      $(AR) r tmp/as/vpnbridge.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnbridge.o
++      $(RANLIB) tmp/as/vpnbridge.a
+ 
+ bin/vpnbridge/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnbridge/hamcore.se2
+@@ -406,8 +410,8 @@ bin/vpncmd/vpncmd: tmp/as/vpncmd.a bin/v
+ 
+ tmp/as/vpncmd.a: tmp/objs/vpncmd.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpncmd.a
+-      ar r tmp/as/vpncmd.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpncmd.o
+-      ranlib tmp/as/vpncmd.a
++      $(AR) r tmp/as/vpncmd.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpncmd.o
++      $(RANLIB) tmp/as/vpncmd.a
+ 
+ bin/vpncmd/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpncmd/hamcore.se2
+--- a/src/makefiles/linux_32bit.mak
++++ b/src/makefiles/linux_32bit.mak
+@@ -62,6 +62,10 @@
+ 
+ #CC=gcc
+ 
++AR=ar
++RANLIB=ranlib
++
++
+ OPTIONS_COMPILE_DEBUG=-D_DEBUG -DDEBUG -DUNIX -DUNIX_LINUX -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -g -fsigned-char
+ 
+ OPTIONS_LINK_DEBUG=-g -fsigned-char -lm -ldl -lrt -lpthread -lssl -lcrypto -lreadline -lncurses -lz
+@@ -361,8 +365,8 @@ bin/vpnserver/vpnserver: tmp/as/vpnserve
+ 
+ tmp/as/vpnserver.a: tmp/objs/vpnserver.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpnserver.a
+-      ar r tmp/as/vpnserver.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnserver.o
+-      ranlib tmp/as/vpnserver.a
++      $(AR) r tmp/as/vpnserver.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnserver.o
++      $(RANLIB) tmp/as/vpnserver.a
+ 
+ bin/vpnserver/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnserver/hamcore.se2
+@@ -376,8 +380,8 @@ bin/vpnclient/vpnclient: tmp/as/vpnclien
+ 
+ tmp/as/vpnclient.a: tmp/objs/vpnclient.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpnclient.a
+-      ar r tmp/as/vpnclient.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnclient.o
+-      ranlib tmp/as/vpnclient.a
++      $(AR) r tmp/as/vpnclient.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnclient.o
++      $(RANLIB) tmp/as/vpnclient.a
+ 
+ bin/vpnclient/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnclient/hamcore.se2
+@@ -391,8 +395,8 @@ bin/vpnbridge/vpnbridge: tmp/as/vpnbridg
+ 
+ tmp/as/vpnbridge.a: tmp/objs/vpnbridge.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpnbridge.a
+-      ar r tmp/as/vpnbridge.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnbridge.o
+-      ranlib tmp/as/vpnbridge.a
++      $(AR) r tmp/as/vpnbridge.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnbridge.o
++      $(RANLIB) tmp/as/vpnbridge.a
+ 
+ bin/vpnbridge/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnbridge/hamcore.se2
+@@ -406,8 +410,8 @@ bin/vpncmd/vpncmd: tmp/as/vpncmd.a bin/v
+ 
+ tmp/as/vpncmd.a: tmp/objs/vpncmd.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpncmd.a
+-      ar r tmp/as/vpncmd.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpncmd.o
+-      ranlib tmp/as/vpncmd.a
++      $(AR) r tmp/as/vpncmd.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpncmd.o
++      $(RANLIB) tmp/as/vpncmd.a
+ 
+ bin/vpncmd/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpncmd/hamcore.se2
+--- a/src/makefiles/linux_32bit_nobits.mak
++++ b/src/makefiles/linux_32bit_nobits.mak
+@@ -62,6 +62,10 @@
+ 
+ #CC=gcc
+ 
++AR=ar
++RANLIB=ranlib
++
++
+ OPTIONS_COMPILE_DEBUG=-D_DEBUG -DDEBUG -DUNIX -DUNIX_LINUX -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -g -fsigned-char
+ 
+ OPTIONS_LINK_DEBUG=-g -fsigned-char -lm -ldl -lrt -lpthread -lssl -lcrypto -lreadline -lncurses -lz
+@@ -361,8 +365,8 @@ bin/vpnserver/vpnserver: tmp/as/vpnserve
+ 
+ tmp/as/vpnserver.a: tmp/objs/vpnserver.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpnserver.a
+-      ar r tmp/as/vpnserver.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnserver.o
+-      ranlib tmp/as/vpnserver.a
++      $(AR) r tmp/as/vpnserver.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnserver.o
++      $(RANLIB) tmp/as/vpnserver.a
+ 
+ bin/vpnserver/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnserver/hamcore.se2
+@@ -376,8 +380,8 @@ bin/vpnclient/vpnclient: tmp/as/vpnclien
+ 
+ tmp/as/vpnclient.a: tmp/objs/vpnclient.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpnclient.a
+-      ar r tmp/as/vpnclient.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnclient.o
+-      ranlib tmp/as/vpnclient.a
++      $(AR) r tmp/as/vpnclient.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnclient.o
++      $(RANLIB) tmp/as/vpnclient.a
+ 
+ bin/vpnclient/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnclient/hamcore.se2
+@@ -391,8 +395,8 @@ bin/vpnbridge/vpnbridge: tmp/as/vpnbridg
+ 
+ tmp/as/vpnbridge.a: tmp/objs/vpnbridge.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpnbridge.a
+-      ar r tmp/as/vpnbridge.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnbridge.o
+-      ranlib tmp/as/vpnbridge.a
++      $(AR) r tmp/as/vpnbridge.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnbridge.o
++      $(RANLIB) tmp/as/vpnbridge.a
+ 
+ bin/vpnbridge/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnbridge/hamcore.se2
+@@ -406,8 +410,8 @@ bin/vpncmd/vpncmd: tmp/as/vpncmd.a bin/v
+ 
+ tmp/as/vpncmd.a: tmp/objs/vpncmd.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpncmd.a
+-      ar r tmp/as/vpncmd.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpncmd.o
+-      ranlib tmp/as/vpncmd.a
++      $(AR) r tmp/as/vpncmd.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpncmd.o
++      $(RANLIB) tmp/as/vpncmd.a
+ 
+ bin/vpncmd/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpncmd/hamcore.se2
+--- a/src/makefiles/linux_64bit.mak
++++ b/src/makefiles/linux_64bit.mak
+@@ -62,6 +62,10 @@
+ 
+ #CC=gcc
+ 
++AR=ar
++RANLIB=ranlib
++
++
+ OPTIONS_COMPILE_DEBUG=-D_DEBUG -DDEBUG -DUNIX -DUNIX_LINUX -DCPU_64 -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -g -fsigned-char -m64
+ 
+ OPTIONS_LINK_DEBUG=-g -fsigned-char -m64 -lm -ldl -lrt -lpthread -lssl -lcrypto -lreadline -lncurses -lz
+@@ -361,8 +365,8 @@ bin/vpnserver/vpnserver: tmp/as/vpnserve
+ 
+ tmp/as/vpnserver.a: tmp/objs/vpnserver.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpnserver.a
+-      ar r tmp/as/vpnserver.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnserver.o
+-      ranlib tmp/as/vpnserver.a
++      $(AR) r tmp/as/vpnserver.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnserver.o
++      $(RANLIB) tmp/as/vpnserver.a
+ 
+ bin/vpnserver/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnserver/hamcore.se2
+@@ -376,8 +380,8 @@ bin/vpnclient/vpnclient: tmp/as/vpnclien
+ 
+ tmp/as/vpnclient.a: tmp/objs/vpnclient.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpnclient.a
+-      ar r tmp/as/vpnclient.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnclient.o
+-      ranlib tmp/as/vpnclient.a
++      $(AR) r tmp/as/vpnclient.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnclient.o
++      $(RANLIB) tmp/as/vpnclient.a
+ 
+ bin/vpnclient/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnclient/hamcore.se2
+@@ -391,8 +395,8 @@ bin/vpnbridge/vpnbridge: tmp/as/vpnbridg
+ 
+ tmp/as/vpnbridge.a: tmp/objs/vpnbridge.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpnbridge.a
+-      ar r tmp/as/vpnbridge.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnbridge.o
+-      ranlib tmp/as/vpnbridge.a
++      $(AR) r tmp/as/vpnbridge.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnbridge.o
++      $(RANLIB) tmp/as/vpnbridge.a
+ 
+ bin/vpnbridge/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnbridge/hamcore.se2
+@@ -406,8 +410,8 @@ bin/vpncmd/vpncmd: tmp/as/vpncmd.a bin/v
+ 
+ tmp/as/vpncmd.a: tmp/objs/vpncmd.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpncmd.a
+-      ar r tmp/as/vpncmd.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpncmd.o
+-      ranlib tmp/as/vpncmd.a
++      $(AR) r tmp/as/vpncmd.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpncmd.o
++      $(RANLIB) tmp/as/vpncmd.a
+ 
+ bin/vpncmd/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpncmd/hamcore.se2
+--- a/src/makefiles/linux_64bit_nobits.mak
++++ b/src/makefiles/linux_64bit_nobits.mak
+@@ -62,6 +62,10 @@
+ 
+ #CC=gcc
+ 
++AR=ar
++RANLIB=ranlib
++
++
+ OPTIONS_COMPILE_DEBUG=-D_DEBUG -DDEBUG -DUNIX -DUNIX_LINUX -DCPU_64 -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -g -fsigned-char
+ 
+ OPTIONS_LINK_DEBUG=-g -fsigned-char -lm -ldl -lrt -lpthread -lssl -lcrypto -lreadline -lncurses -lz
+@@ -361,8 +365,8 @@ bin/vpnserver/vpnserver: tmp/as/vpnserve
+ 
+ tmp/as/vpnserver.a: tmp/objs/vpnserver.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpnserver.a
+-      ar r tmp/as/vpnserver.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnserver.o
+-      ranlib tmp/as/vpnserver.a
++      $(AR) r tmp/as/vpnserver.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnserver.o
++      $(RANLIB) tmp/as/vpnserver.a
+ 
+ bin/vpnserver/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnserver/hamcore.se2
+@@ -376,8 +380,8 @@ bin/vpnclient/vpnclient: tmp/as/vpnclien
+ 
+ tmp/as/vpnclient.a: tmp/objs/vpnclient.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpnclient.a
+-      ar r tmp/as/vpnclient.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnclient.o
+-      ranlib tmp/as/vpnclient.a
++      $(AR) r tmp/as/vpnclient.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnclient.o
++      $(RANLIB) tmp/as/vpnclient.a
+ 
+ bin/vpnclient/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnclient/hamcore.se2
+@@ -391,8 +395,8 @@ bin/vpnbridge/vpnbridge: tmp/as/vpnbridg
+ 
+ tmp/as/vpnbridge.a: tmp/objs/vpnbridge.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpnbridge.a
+-      ar r tmp/as/vpnbridge.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnbridge.o
+-      ranlib tmp/as/vpnbridge.a
++      $(AR) r tmp/as/vpnbridge.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnbridge.o
++      $(RANLIB) tmp/as/vpnbridge.a
+ 
+ bin/vpnbridge/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnbridge/hamcore.se2
+@@ -406,8 +410,8 @@ bin/vpncmd/vpncmd: tmp/as/vpncmd.a bin/v
+ 
+ tmp/as/vpncmd.a: tmp/objs/vpncmd.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpncmd.a
+-      ar r tmp/as/vpncmd.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpncmd.o
+-      ranlib tmp/as/vpncmd.a
++      $(AR) r tmp/as/vpncmd.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpncmd.o
++      $(RANLIB) tmp/as/vpncmd.a
+ 
+ bin/vpncmd/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpncmd/hamcore.se2
+--- a/src/makefiles/macos_32bit.mak
++++ b/src/makefiles/macos_32bit.mak
+@@ -62,6 +62,10 @@
+ 
+ #CC=gcc
+ 
++AR=ar
++RANLIB=ranlib
++
++
+ OPTIONS_COMPILE_DEBUG=-D_DEBUG -DDEBUG -DUNIX -DUNIX_MACOS -DBRIDGE_PCAP -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -g -fsigned-char
+ 
+ OPTIONS_LINK_DEBUG=-g -fsigned-char -lm -lpthread -lssl -lcrypto -liconv -lreadline -lncurses -lz -lpcap
+@@ -361,8 +365,8 @@ bin/vpnserver/vpnserver: tmp/as/vpnserve
+ 
+ tmp/as/vpnserver.a: tmp/objs/vpnserver.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpnserver.a
+-      ar r tmp/as/vpnserver.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnserver.o
+-      ranlib tmp/as/vpnserver.a
++      $(AR) r tmp/as/vpnserver.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnserver.o
++      $(RANLIB) tmp/as/vpnserver.a
+ 
+ bin/vpnserver/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnserver/hamcore.se2
+@@ -376,8 +380,8 @@ bin/vpnclient/vpnclient: tmp/as/vpnclien
+ 
+ tmp/as/vpnclient.a: tmp/objs/vpnclient.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpnclient.a
+-      ar r tmp/as/vpnclient.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnclient.o
+-      ranlib tmp/as/vpnclient.a
++      $(AR) r tmp/as/vpnclient.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnclient.o
++      $(RANLIB) tmp/as/vpnclient.a
+ 
+ bin/vpnclient/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnclient/hamcore.se2
+@@ -391,8 +395,8 @@ bin/vpnbridge/vpnbridge: tmp/as/vpnbridg
+ 
+ tmp/as/vpnbridge.a: tmp/objs/vpnbridge.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpnbridge.a
+-      ar r tmp/as/vpnbridge.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnbridge.o
+-      ranlib tmp/as/vpnbridge.a
++      $(AR) r tmp/as/vpnbridge.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnbridge.o
++      $(RANLIB) tmp/as/vpnbridge.a
+ 
+ bin/vpnbridge/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnbridge/hamcore.se2
+@@ -406,8 +410,8 @@ bin/vpncmd/vpncmd: tmp/as/vpncmd.a bin/v
+ 
+ tmp/as/vpncmd.a: tmp/objs/vpncmd.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpncmd.a
+-      ar r tmp/as/vpncmd.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpncmd.o
+-      ranlib tmp/as/vpncmd.a
++      $(AR) r tmp/as/vpncmd.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpncmd.o
++      $(RANLIB) tmp/as/vpncmd.a
+ 
+ bin/vpncmd/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpncmd/hamcore.se2
+--- a/src/makefiles/macos_32bit_nobits.mak
++++ b/src/makefiles/macos_32bit_nobits.mak
+@@ -62,6 +62,10 @@
+ 
+ #CC=gcc
+ 
++AR=ar
++RANLIB=ranlib
++
++
+ OPTIONS_COMPILE_DEBUG=-D_DEBUG -DDEBUG -DUNIX -DUNIX_MACOS -DBRIDGE_PCAP -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -g -fsigned-char
+ 
+ OPTIONS_LINK_DEBUG=-g -fsigned-char -lm -lpthread -lssl -lcrypto -liconv -lreadline -lncurses -lz -lpcap
+@@ -361,8 +365,8 @@ bin/vpnserver/vpnserver: tmp/as/vpnserve
+ 
+ tmp/as/vpnserver.a: tmp/objs/vpnserver.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpnserver.a
+-      ar r tmp/as/vpnserver.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnserver.o
+-      ranlib tmp/as/vpnserver.a
++      $(AR) r tmp/as/vpnserver.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnserver.o
++      $(RANLIB) tmp/as/vpnserver.a
+ 
+ bin/vpnserver/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnserver/hamcore.se2
+@@ -376,8 +380,8 @@ bin/vpnclient/vpnclient: tmp/as/vpnclien
+ 
+ tmp/as/vpnclient.a: tmp/objs/vpnclient.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpnclient.a
+-      ar r tmp/as/vpnclient.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnclient.o
+-      ranlib tmp/as/vpnclient.a
++      $(AR) r tmp/as/vpnclient.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnclient.o
++      $(RANLIB) tmp/as/vpnclient.a
+ 
+ bin/vpnclient/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnclient/hamcore.se2
+@@ -391,8 +395,8 @@ bin/vpnbridge/vpnbridge: tmp/as/vpnbridg
+ 
+ tmp/as/vpnbridge.a: tmp/objs/vpnbridge.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpnbridge.a
+-      ar r tmp/as/vpnbridge.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnbridge.o
+-      ranlib tmp/as/vpnbridge.a
++      $(AR) r tmp/as/vpnbridge.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnbridge.o
++      $(RANLIB) tmp/as/vpnbridge.a
+ 
+ bin/vpnbridge/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnbridge/hamcore.se2
+@@ -406,8 +410,8 @@ bin/vpncmd/vpncmd: tmp/as/vpncmd.a bin/v
+ 
+ tmp/as/vpncmd.a: tmp/objs/vpncmd.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpncmd.a
+-      ar r tmp/as/vpncmd.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpncmd.o
+-      ranlib tmp/as/vpncmd.a
++      $(AR) r tmp/as/vpncmd.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpncmd.o
++      $(RANLIB) tmp/as/vpncmd.a
+ 
+ bin/vpncmd/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpncmd/hamcore.se2
+--- a/src/makefiles/macos_64bit.mak
++++ b/src/makefiles/macos_64bit.mak
+@@ -62,6 +62,10 @@
+ 
+ #CC=gcc
+ 
++AR=ar
++RANLIB=ranlib
++
++
+ OPTIONS_COMPILE_DEBUG=-D_DEBUG -DDEBUG -DUNIX -DUNIX_MACOS -DBRIDGE_PCAP -DCPU_64 -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -g -fsigned-char -m64
+ 
+ OPTIONS_LINK_DEBUG=-g -fsigned-char -m64 -lm -lpthread -lssl -lcrypto -liconv -lreadline -lncurses -lz -lpcap
+@@ -361,8 +365,8 @@ bin/vpnserver/vpnserver: tmp/as/vpnserve
+ 
+ tmp/as/vpnserver.a: tmp/objs/vpnserver.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpnserver.a
+-      ar r tmp/as/vpnserver.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnserver.o
+-      ranlib tmp/as/vpnserver.a
++      $(AR) r tmp/as/vpnserver.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnserver.o
++      $(RANLIB) tmp/as/vpnserver.a
+ 
+ bin/vpnserver/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnserver/hamcore.se2
+@@ -376,8 +380,8 @@ bin/vpnclient/vpnclient: tmp/as/vpnclien
+ 
+ tmp/as/vpnclient.a: tmp/objs/vpnclient.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpnclient.a
+-      ar r tmp/as/vpnclient.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnclient.o
+-      ranlib tmp/as/vpnclient.a
++      $(AR) r tmp/as/vpnclient.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnclient.o
++      $(RANLIB) tmp/as/vpnclient.a
+ 
+ bin/vpnclient/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnclient/hamcore.se2
+@@ -391,8 +395,8 @@ bin/vpnbridge/vpnbridge: tmp/as/vpnbridg
+ 
+ tmp/as/vpnbridge.a: tmp/objs/vpnbridge.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpnbridge.a
+-      ar r tmp/as/vpnbridge.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnbridge.o
+-      ranlib tmp/as/vpnbridge.a
++      $(AR) r tmp/as/vpnbridge.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnbridge.o
++      $(RANLIB) tmp/as/vpnbridge.a
+ 
+ bin/vpnbridge/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnbridge/hamcore.se2
+@@ -406,8 +410,8 @@ bin/vpncmd/vpncmd: tmp/as/vpncmd.a bin/v
+ 
+ tmp/as/vpncmd.a: tmp/objs/vpncmd.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpncmd.a
+-      ar r tmp/as/vpncmd.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpncmd.o
+-      ranlib tmp/as/vpncmd.a
++      $(AR) r tmp/as/vpncmd.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpncmd.o
++      $(RANLIB) tmp/as/vpncmd.a
+ 
+ bin/vpncmd/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpncmd/hamcore.se2
+--- a/src/makefiles/macos_64bit_nobits.mak
++++ b/src/makefiles/macos_64bit_nobits.mak
+@@ -62,6 +62,10 @@
+ 
+ #CC=gcc
+ 
++AR=ar
++RANLIB=ranlib
++
++
+ OPTIONS_COMPILE_DEBUG=-D_DEBUG -DDEBUG -DUNIX -DUNIX_MACOS -DBRIDGE_PCAP -DCPU_64 -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -g -fsigned-char
+ 
+ OPTIONS_LINK_DEBUG=-g -fsigned-char -lm -lpthread -lssl -lcrypto -liconv -lreadline -lncurses -lz -lpcap
+@@ -361,8 +365,8 @@ bin/vpnserver/vpnserver: tmp/as/vpnserve
+ 
+ tmp/as/vpnserver.a: tmp/objs/vpnserver.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpnserver.a
+-      ar r tmp/as/vpnserver.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnserver.o
+-      ranlib tmp/as/vpnserver.a
++      $(AR) r tmp/as/vpnserver.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnserver.o
++      $(RANLIB) tmp/as/vpnserver.a
+ 
+ bin/vpnserver/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnserver/hamcore.se2
+@@ -376,8 +380,8 @@ bin/vpnclient/vpnclient: tmp/as/vpnclien
+ 
+ tmp/as/vpnclient.a: tmp/objs/vpnclient.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpnclient.a
+-      ar r tmp/as/vpnclient.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnclient.o
+-      ranlib tmp/as/vpnclient.a
++      $(AR) r tmp/as/vpnclient.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnclient.o
++      $(RANLIB) tmp/as/vpnclient.a
+ 
+ bin/vpnclient/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnclient/hamcore.se2
+@@ -391,8 +395,8 @@ bin/vpnbridge/vpnbridge: tmp/as/vpnbridg
+ 
+ tmp/as/vpnbridge.a: tmp/objs/vpnbridge.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpnbridge.a
+-      ar r tmp/as/vpnbridge.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnbridge.o
+-      ranlib tmp/as/vpnbridge.a
++      $(AR) r tmp/as/vpnbridge.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnbridge.o
++      $(RANLIB) tmp/as/vpnbridge.a
+ 
+ bin/vpnbridge/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnbridge/hamcore.se2
+@@ -406,8 +410,8 @@ bin/vpncmd/vpncmd: tmp/as/vpncmd.a bin/v
+ 
+ tmp/as/vpncmd.a: tmp/objs/vpncmd.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpncmd.a
+-      ar r tmp/as/vpncmd.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpncmd.o
+-      ranlib tmp/as/vpncmd.a
++      $(AR) r tmp/as/vpncmd.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpncmd.o
++      $(RANLIB) tmp/as/vpncmd.a
+ 
+ bin/vpncmd/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpncmd/hamcore.se2
+--- a/src/makefiles/openbsd_32bit.mak
++++ b/src/makefiles/openbsd_32bit.mak
+@@ -62,6 +62,10 @@
+ 
+ #CC=gcc
+ 
++AR=ar
++RANLIB=ranlib
++
++
+ OPTIONS_COMPILE_DEBUG=-D_DEBUG -DDEBUG -DUNIX -DUNIX_BSD -DNO_VLAN -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -I/usr/local/include -g -fsigned-char
+ 
+ OPTIONS_LINK_DEBUG=-g -fsigned-char -L/usr/local/lib -lm -lpthread -lssl -lcrypto -liconv -lreadline -lncurses -lz
+@@ -361,8 +365,8 @@ bin/vpnserver/vpnserver: tmp/as/vpnserve
+ 
+ tmp/as/vpnserver.a: tmp/objs/vpnserver.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpnserver.a
+-      ar r tmp/as/vpnserver.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnserver.o
+-      ranlib tmp/as/vpnserver.a
++      $(AR) r tmp/as/vpnserver.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnserver.o
++      $(RANLIB) tmp/as/vpnserver.a
+ 
+ bin/vpnserver/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnserver/hamcore.se2
+@@ -376,8 +380,8 @@ bin/vpnclient/vpnclient: tmp/as/vpnclien
+ 
+ tmp/as/vpnclient.a: tmp/objs/vpnclient.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpnclient.a
+-      ar r tmp/as/vpnclient.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnclient.o
+-      ranlib tmp/as/vpnclient.a
++      $(AR) r tmp/as/vpnclient.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnclient.o
++      $(RANLIB) tmp/as/vpnclient.a
+ 
+ bin/vpnclient/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnclient/hamcore.se2
+@@ -391,8 +395,8 @@ bin/vpnbridge/vpnbridge: tmp/as/vpnbridg
+ 
+ tmp/as/vpnbridge.a: tmp/objs/vpnbridge.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpnbridge.a
+-      ar r tmp/as/vpnbridge.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnbridge.o
+-      ranlib tmp/as/vpnbridge.a
++      $(AR) r tmp/as/vpnbridge.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnbridge.o
++      $(RANLIB) tmp/as/vpnbridge.a
+ 
+ bin/vpnbridge/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnbridge/hamcore.se2
+@@ -406,8 +410,8 @@ bin/vpncmd/vpncmd: tmp/as/vpncmd.a bin/v
+ 
+ tmp/as/vpncmd.a: tmp/objs/vpncmd.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpncmd.a
+-      ar r tmp/as/vpncmd.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpncmd.o
+-      ranlib tmp/as/vpncmd.a
++      $(AR) r tmp/as/vpncmd.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpncmd.o
++      $(RANLIB) tmp/as/vpncmd.a
+ 
+ bin/vpncmd/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpncmd/hamcore.se2
+--- a/src/makefiles/openbsd_32bit_nobits.mak
++++ b/src/makefiles/openbsd_32bit_nobits.mak
+@@ -62,6 +62,10 @@
+ 
+ #CC=gcc
+ 
++AR=ar
++RANLIB=ranlib
++
++
+ OPTIONS_COMPILE_DEBUG=-D_DEBUG -DDEBUG -DUNIX -DUNIX_BSD -DNO_VLAN -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -I/usr/local/include -g -fsigned-char
+ 
+ OPTIONS_LINK_DEBUG=-g -fsigned-char -L/usr/local/lib -lm -lpthread -lssl -lcrypto -liconv -lreadline -lncurses -lz
+@@ -361,8 +365,8 @@ bin/vpnserver/vpnserver: tmp/as/vpnserve
+ 
+ tmp/as/vpnserver.a: tmp/objs/vpnserver.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpnserver.a
+-      ar r tmp/as/vpnserver.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnserver.o
+-      ranlib tmp/as/vpnserver.a
++      $(AR) r tmp/as/vpnserver.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnserver.o
++      $(RANLIB) tmp/as/vpnserver.a
+ 
+ bin/vpnserver/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnserver/hamcore.se2
+@@ -376,8 +380,8 @@ bin/vpnclient/vpnclient: tmp/as/vpnclien
+ 
+ tmp/as/vpnclient.a: tmp/objs/vpnclient.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpnclient.a
+-      ar r tmp/as/vpnclient.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnclient.o
+-      ranlib tmp/as/vpnclient.a
++      $(AR) r tmp/as/vpnclient.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnclient.o
++      $(RANLIB) tmp/as/vpnclient.a
+ 
+ bin/vpnclient/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnclient/hamcore.se2
+@@ -391,8 +395,8 @@ bin/vpnbridge/vpnbridge: tmp/as/vpnbridg
+ 
+ tmp/as/vpnbridge.a: tmp/objs/vpnbridge.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpnbridge.a
+-      ar r tmp/as/vpnbridge.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnbridge.o
+-      ranlib tmp/as/vpnbridge.a
++      $(AR) r tmp/as/vpnbridge.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnbridge.o
++      $(RANLIB) tmp/as/vpnbridge.a
+ 
+ bin/vpnbridge/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnbridge/hamcore.se2
+@@ -406,8 +410,8 @@ bin/vpncmd/vpncmd: tmp/as/vpncmd.a bin/v
+ 
+ tmp/as/vpncmd.a: tmp/objs/vpncmd.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpncmd.a
+-      ar r tmp/as/vpncmd.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpncmd.o
+-      ranlib tmp/as/vpncmd.a
++      $(AR) r tmp/as/vpncmd.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpncmd.o
++      $(RANLIB) tmp/as/vpncmd.a
+ 
+ bin/vpncmd/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpncmd/hamcore.se2
+--- a/src/makefiles/openbsd_64bit.mak
++++ b/src/makefiles/openbsd_64bit.mak
+@@ -62,6 +62,10 @@
+ 
+ #CC=gcc
+ 
++AR=ar
++RANLIB=ranlib
++
++
+ OPTIONS_COMPILE_DEBUG=-D_DEBUG -DDEBUG -DUNIX -DUNIX_BSD -DNO_VLAN -DCPU_64 -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -I/usr/local/include -g -fsigned-char -m64
+ 
+ OPTIONS_LINK_DEBUG=-g -fsigned-char -m64 -L/usr/local/lib -lm -lpthread -lssl -lcrypto -liconv -lreadline -lncurses -lz
+@@ -361,8 +365,8 @@ bin/vpnserver/vpnserver: tmp/as/vpnserve
+ 
+ tmp/as/vpnserver.a: tmp/objs/vpnserver.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpnserver.a
+-      ar r tmp/as/vpnserver.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnserver.o
+-      ranlib tmp/as/vpnserver.a
++      $(AR) r tmp/as/vpnserver.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnserver.o
++      $(RANLIB) tmp/as/vpnserver.a
+ 
+ bin/vpnserver/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnserver/hamcore.se2
+@@ -376,8 +380,8 @@ bin/vpnclient/vpnclient: tmp/as/vpnclien
+ 
+ tmp/as/vpnclient.a: tmp/objs/vpnclient.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpnclient.a
+-      ar r tmp/as/vpnclient.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnclient.o
+-      ranlib tmp/as/vpnclient.a
++      $(AR) r tmp/as/vpnclient.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnclient.o
++      $(RANLIB) tmp/as/vpnclient.a
+ 
+ bin/vpnclient/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnclient/hamcore.se2
+@@ -391,8 +395,8 @@ bin/vpnbridge/vpnbridge: tmp/as/vpnbridg
+ 
+ tmp/as/vpnbridge.a: tmp/objs/vpnbridge.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpnbridge.a
+-      ar r tmp/as/vpnbridge.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnbridge.o
+-      ranlib tmp/as/vpnbridge.a
++      $(AR) r tmp/as/vpnbridge.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnbridge.o
++      $(RANLIB) tmp/as/vpnbridge.a
+ 
+ bin/vpnbridge/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnbridge/hamcore.se2
+@@ -406,8 +410,8 @@ bin/vpncmd/vpncmd: tmp/as/vpncmd.a bin/v
+ 
+ tmp/as/vpncmd.a: tmp/objs/vpncmd.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpncmd.a
+-      ar r tmp/as/vpncmd.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpncmd.o
+-      ranlib tmp/as/vpncmd.a
++      $(AR) r tmp/as/vpncmd.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpncmd.o
++      $(RANLIB) tmp/as/vpncmd.a
+ 
+ bin/vpncmd/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpncmd/hamcore.se2
+--- a/src/makefiles/openbsd_64bit_nobits.mak
++++ b/src/makefiles/openbsd_64bit_nobits.mak
+@@ -62,6 +62,10 @@
+ 
+ #CC=gcc
+ 
++AR=ar
++RANLIB=ranlib
++
++
+ OPTIONS_COMPILE_DEBUG=-D_DEBUG -DDEBUG -DUNIX -DUNIX_BSD -DNO_VLAN -DCPU_64 -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -I/usr/local/include -g -fsigned-char
+ 
+ OPTIONS_LINK_DEBUG=-g -fsigned-char -L/usr/local/lib -lm -lpthread -lssl -lcrypto -liconv -lreadline -lncurses -lz
+@@ -361,8 +365,8 @@ bin/vpnserver/vpnserver: tmp/as/vpnserve
+ 
+ tmp/as/vpnserver.a: tmp/objs/vpnserver.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpnserver.a
+-      ar r tmp/as/vpnserver.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnserver.o
+-      ranlib tmp/as/vpnserver.a
++      $(AR) r tmp/as/vpnserver.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnserver.o
++      $(RANLIB) tmp/as/vpnserver.a
+ 
+ bin/vpnserver/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnserver/hamcore.se2
+@@ -376,8 +380,8 @@ bin/vpnclient/vpnclient: tmp/as/vpnclien
+ 
+ tmp/as/vpnclient.a: tmp/objs/vpnclient.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpnclient.a
+-      ar r tmp/as/vpnclient.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnclient.o
+-      ranlib tmp/as/vpnclient.a
++      $(AR) r tmp/as/vpnclient.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnclient.o
++      $(RANLIB) tmp/as/vpnclient.a
+ 
+ bin/vpnclient/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnclient/hamcore.se2
+@@ -391,8 +395,8 @@ bin/vpnbridge/vpnbridge: tmp/as/vpnbridg
+ 
+ tmp/as/vpnbridge.a: tmp/objs/vpnbridge.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpnbridge.a
+-      ar r tmp/as/vpnbridge.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnbridge.o
+-      ranlib tmp/as/vpnbridge.a
++      $(AR) r tmp/as/vpnbridge.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnbridge.o
++      $(RANLIB) tmp/as/vpnbridge.a
+ 
+ bin/vpnbridge/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnbridge/hamcore.se2
+@@ -406,8 +410,8 @@ bin/vpncmd/vpncmd: tmp/as/vpncmd.a bin/v
+ 
+ tmp/as/vpncmd.a: tmp/objs/vpncmd.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpncmd.a
+-      ar r tmp/as/vpncmd.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpncmd.o
+-      ranlib tmp/as/vpncmd.a
++      $(AR) r tmp/as/vpncmd.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpncmd.o
++      $(RANLIB) tmp/as/vpncmd.a
+ 
+ bin/vpncmd/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpncmd/hamcore.se2
+--- a/src/makefiles/solaris_32bit.mak
++++ b/src/makefiles/solaris_32bit.mak
+@@ -62,6 +62,10 @@
+ 
+ #CC=gcc
+ 
++AR=ar
++RANLIB=ranlib
++
++
+ OPTIONS_COMPILE_DEBUG=-D_DEBUG -DDEBUG -DUNIX -DUNIX_SOLARIS -DNO_VLAN -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -g -fsigned-char
+ 
+ OPTIONS_LINK_DEBUG=-g -fsigned-char -lm -lrt -lnsl -lsocket -ldl -lpthread -lssl -lcrypto -liconv -lreadline -lncurses -lz
+@@ -361,8 +365,8 @@ bin/vpnserver/vpnserver: tmp/as/vpnserve
+ 
+ tmp/as/vpnserver.a: tmp/objs/vpnserver.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpnserver.a
+-      ar r tmp/as/vpnserver.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnserver.o
+-      ranlib tmp/as/vpnserver.a
++      $(AR) r tmp/as/vpnserver.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnserver.o
++      $(RANLIB) tmp/as/vpnserver.a
+ 
+ bin/vpnserver/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnserver/hamcore.se2
+@@ -376,8 +380,8 @@ bin/vpnclient/vpnclient: tmp/as/vpnclien
+ 
+ tmp/as/vpnclient.a: tmp/objs/vpnclient.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpnclient.a
+-      ar r tmp/as/vpnclient.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnclient.o
+-      ranlib tmp/as/vpnclient.a
++      $(AR) r tmp/as/vpnclient.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnclient.o
++      $(RANLIB) tmp/as/vpnclient.a
+ 
+ bin/vpnclient/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnclient/hamcore.se2
+@@ -391,8 +395,8 @@ bin/vpnbridge/vpnbridge: tmp/as/vpnbridg
+ 
+ tmp/as/vpnbridge.a: tmp/objs/vpnbridge.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpnbridge.a
+-      ar r tmp/as/vpnbridge.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnbridge.o
+-      ranlib tmp/as/vpnbridge.a
++      $(AR) r tmp/as/vpnbridge.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnbridge.o
++      $(RANLIB) tmp/as/vpnbridge.a
+ 
+ bin/vpnbridge/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnbridge/hamcore.se2
+@@ -406,8 +410,8 @@ bin/vpncmd/vpncmd: tmp/as/vpncmd.a bin/v
+ 
+ tmp/as/vpncmd.a: tmp/objs/vpncmd.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpncmd.a
+-      ar r tmp/as/vpncmd.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpncmd.o
+-      ranlib tmp/as/vpncmd.a
++      $(AR) r tmp/as/vpncmd.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpncmd.o
++      $(RANLIB) tmp/as/vpncmd.a
+ 
+ bin/vpncmd/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpncmd/hamcore.se2
+--- a/src/makefiles/solaris_32bit_nobits.mak
++++ b/src/makefiles/solaris_32bit_nobits.mak
+@@ -62,6 +62,10 @@
+ 
+ #CC=gcc
+ 
++AR=ar
++RANLIB=ranlib
++
++
+ OPTIONS_COMPILE_DEBUG=-D_DEBUG -DDEBUG -DUNIX -DUNIX_SOLARIS -DNO_VLAN -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -g -fsigned-char
+ 
+ OPTIONS_LINK_DEBUG=-g -fsigned-char -lm -lrt -lnsl -lsocket -ldl -lpthread -lssl -lcrypto -liconv -lreadline -lncurses -lz
+@@ -361,8 +365,8 @@ bin/vpnserver/vpnserver: tmp/as/vpnserve
+ 
+ tmp/as/vpnserver.a: tmp/objs/vpnserver.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpnserver.a
+-      ar r tmp/as/vpnserver.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnserver.o
+-      ranlib tmp/as/vpnserver.a
++      $(AR) r tmp/as/vpnserver.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnserver.o
++      $(RANLIB) tmp/as/vpnserver.a
+ 
+ bin/vpnserver/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnserver/hamcore.se2
+@@ -376,8 +380,8 @@ bin/vpnclient/vpnclient: tmp/as/vpnclien
+ 
+ tmp/as/vpnclient.a: tmp/objs/vpnclient.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpnclient.a
+-      ar r tmp/as/vpnclient.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnclient.o
+-      ranlib tmp/as/vpnclient.a
++      $(AR) r tmp/as/vpnclient.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnclient.o
++      $(RANLIB) tmp/as/vpnclient.a
+ 
+ bin/vpnclient/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnclient/hamcore.se2
+@@ -391,8 +395,8 @@ bin/vpnbridge/vpnbridge: tmp/as/vpnbridg
+ 
+ tmp/as/vpnbridge.a: tmp/objs/vpnbridge.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpnbridge.a
+-      ar r tmp/as/vpnbridge.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnbridge.o
+-      ranlib tmp/as/vpnbridge.a
++      $(AR) r tmp/as/vpnbridge.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnbridge.o
++      $(RANLIB) tmp/as/vpnbridge.a
+ 
+ bin/vpnbridge/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnbridge/hamcore.se2
+@@ -406,8 +410,8 @@ bin/vpncmd/vpncmd: tmp/as/vpncmd.a bin/v
+ 
+ tmp/as/vpncmd.a: tmp/objs/vpncmd.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpncmd.a
+-      ar r tmp/as/vpncmd.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpncmd.o
+-      ranlib tmp/as/vpncmd.a
++      $(AR) r tmp/as/vpncmd.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpncmd.o
++      $(RANLIB) tmp/as/vpncmd.a
+ 
+ bin/vpncmd/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpncmd/hamcore.se2
+--- a/src/makefiles/solaris_64bit.mak
++++ b/src/makefiles/solaris_64bit.mak
+@@ -62,6 +62,10 @@
+ 
+ #CC=gcc
+ 
++AR=ar
++RANLIB=ranlib
++
++
+ OPTIONS_COMPILE_DEBUG=-D_DEBUG -DDEBUG -DUNIX -DUNIX_SOLARIS -DNO_VLAN -DCPU_64 -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -g -fsigned-char -m64
+ 
+ OPTIONS_LINK_DEBUG=-g -fsigned-char -m64 -lm -lrt -lnsl -lsocket -ldl -lpthread -lssl -lcrypto -liconv -lreadline -lncurses -lz
+@@ -361,8 +365,8 @@ bin/vpnserver/vpnserver: tmp/as/vpnserve
+ 
+ tmp/as/vpnserver.a: tmp/objs/vpnserver.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpnserver.a
+-      ar r tmp/as/vpnserver.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnserver.o
+-      ranlib tmp/as/vpnserver.a
++      $(AR) r tmp/as/vpnserver.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnserver.o
++      $(RANLIB) tmp/as/vpnserver.a
+ 
+ bin/vpnserver/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnserver/hamcore.se2
+@@ -376,8 +380,8 @@ bin/vpnclient/vpnclient: tmp/as/vpnclien
+ 
+ tmp/as/vpnclient.a: tmp/objs/vpnclient.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpnclient.a
+-      ar r tmp/as/vpnclient.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnclient.o
+-      ranlib tmp/as/vpnclient.a
++      $(AR) r tmp/as/vpnclient.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnclient.o
++      $(RANLIB) tmp/as/vpnclient.a
+ 
+ bin/vpnclient/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnclient/hamcore.se2
+@@ -391,8 +395,8 @@ bin/vpnbridge/vpnbridge: tmp/as/vpnbridg
+ 
+ tmp/as/vpnbridge.a: tmp/objs/vpnbridge.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpnbridge.a
+-      ar r tmp/as/vpnbridge.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnbridge.o
+-      ranlib tmp/as/vpnbridge.a
++      $(AR) r tmp/as/vpnbridge.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnbridge.o
++      $(RANLIB) tmp/as/vpnbridge.a
+ 
+ bin/vpnbridge/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnbridge/hamcore.se2
+@@ -406,8 +410,8 @@ bin/vpncmd/vpncmd: tmp/as/vpncmd.a bin/v
+ 
+ tmp/as/vpncmd.a: tmp/objs/vpncmd.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpncmd.a
+-      ar r tmp/as/vpncmd.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpncmd.o
+-      ranlib tmp/as/vpncmd.a
++      $(AR) r tmp/as/vpncmd.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpncmd.o
++      $(RANLIB) tmp/as/vpncmd.a
+ 
+ bin/vpncmd/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpncmd/hamcore.se2
+--- a/src/makefiles/solaris_64bit_nobits.mak
++++ b/src/makefiles/solaris_64bit_nobits.mak
+@@ -62,6 +62,10 @@
+ 
+ #CC=gcc
+ 
++AR=ar
++RANLIB=ranlib
++
++
+ OPTIONS_COMPILE_DEBUG=-D_DEBUG -DDEBUG -DUNIX -DUNIX_SOLARIS -DNO_VLAN -DCPU_64 -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -g -fsigned-char
+ 
+ OPTIONS_LINK_DEBUG=-g -fsigned-char -lm -lrt -lnsl -lsocket -ldl -lpthread -lssl -lcrypto -liconv -lreadline -lncurses -lz
+@@ -361,8 +365,8 @@ bin/vpnserver/vpnserver: tmp/as/vpnserve
+ 
+ tmp/as/vpnserver.a: tmp/objs/vpnserver.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpnserver.a
+-      ar r tmp/as/vpnserver.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnserver.o
+-      ranlib tmp/as/vpnserver.a
++      $(AR) r tmp/as/vpnserver.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnserver.o
++      $(RANLIB) tmp/as/vpnserver.a
+ 
+ bin/vpnserver/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnserver/hamcore.se2
+@@ -376,8 +380,8 @@ bin/vpnclient/vpnclient: tmp/as/vpnclien
+ 
+ tmp/as/vpnclient.a: tmp/objs/vpnclient.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpnclient.a
+-      ar r tmp/as/vpnclient.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnclient.o
+-      ranlib tmp/as/vpnclient.a
++      $(AR) r tmp/as/vpnclient.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnclient.o
++      $(RANLIB) tmp/as/vpnclient.a
+ 
+ bin/vpnclient/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnclient/hamcore.se2
+@@ -391,8 +395,8 @@ bin/vpnbridge/vpnbridge: tmp/as/vpnbridg
+ 
+ tmp/as/vpnbridge.a: tmp/objs/vpnbridge.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpnbridge.a
+-      ar r tmp/as/vpnbridge.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnbridge.o
+-      ranlib tmp/as/vpnbridge.a
++      $(AR) r tmp/as/vpnbridge.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnbridge.o
++      $(RANLIB) tmp/as/vpnbridge.a
+ 
+ bin/vpnbridge/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnbridge/hamcore.se2
+@@ -406,8 +410,8 @@ bin/vpncmd/vpncmd: tmp/as/vpncmd.a bin/v
+ 
+ tmp/as/vpncmd.a: tmp/objs/vpncmd.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR)
+       rm -f tmp/as/vpncmd.a
+-      ar r tmp/as/vpncmd.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpncmd.o
+-      ranlib tmp/as/vpncmd.a
++      $(AR) r tmp/as/vpncmd.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpncmd.o
++      $(RANLIB) tmp/as/vpncmd.a
+ 
+ bin/vpncmd/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2
+       cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpncmd/hamcore.se2
diff --git a/net/strongswan/Makefile b/net/strongswan/Makefile

index 2635696a72d93c56a434d0310de8fab126dfab73..5ffcff00d904af769a687d4e36c12d9b711a0a89 100644 (file)
--- a/net/strongswan/Makefile
+++ b/net/strongswan/Makefile
@@ -8,12 +8,12 @@
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=strongswan
-PKG_VERSION:=5.9.4
+PKG_VERSION:=5.9.5
  PKG_RELEASE:=$(AUTORELEASE)
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_SOURCE_URL:=https://download.strongswan.org/ https://download2.strongswan.org/
-PKG_HASH:=45fdf1a4c2af086d8ff5b76fd7b21d3b6f0890f365f83bf4c9a75dda26887518
+PKG_HASH:=983e4ef4a4c6c9d69f5fe6707c7fe0b2b9a9291943bbf4e008faab6bf91c0bdd
  PKG_LICENSE:=GPL-2.0-or-later
  PKG_MAINTAINER:=Philip Prindeville <philipp@redfish-solutions.com>, Noel Kuntze <noel.kuntze@thermi.consulting>
  PKG_CPE_ID:=cpe:/a:strongswan:strongswan
diff --git a/net/strongswan/patches/0900-src-Patch-for-building-with-musl-on-openwrt-taken-ve.patch b/net/strongswan/patches/0900-src-Patch-for-building-with-musl-on-openwrt-taken-ve.patch

index e60206773939784895315e102c264dc1dd00620c..da96d8da618ce3dac2aaf13e6d40260f3af47e1f 100644 (file)
--- a/net/strongswan/patches/0900-src-Patch-for-building-with-musl-on-openwrt-taken-ve.patch
+++ b/net/strongswan/patches/0900-src-Patch-for-building-with-musl-on-openwrt-taken-ve.patch
@@ -48,7 +48,7 @@ Subject: [PATCH 900/904] src: Patch for building with musl on openwrt (taken
   #include <linux/rtnetlink.h>
  --- a/src/libstrongswan/library.h
  +++ b/src/libstrongswan/library.h
-@@ -118,6 +118,7 @@
+@@ -119,6 +119,7 @@
   #include "utils/leak_detective.h"
   #include "plugins/plugin_loader.h"
   #include "settings/settings.h"
diff --git a/net/strongswan/patches/0904-gmpdh-Plugin-that-implements-gmp-DH-functions-in-an-.patch b/net/strongswan/patches/0904-gmpdh-Plugin-that-implements-gmp-DH-functions-in-an-.patch

index e972f9e88e0a95c696d35431d475b21abb34bd45..9e5d5fa364b5d85b5df99c4b5babb44f2b9f8356 100644 (file)
--- a/net/strongswan/patches/0904-gmpdh-Plugin-that-implements-gmp-DH-functions-in-an-.patch
+++ b/net/strongswan/patches/0904-gmpdh-Plugin-that-implements-gmp-DH-functions-in-an-.patch
@@ -52,7 +52,7 @@ Subject: [PATCH 904/904] gmpdh: Plugin that implements gmp DH functions in an
         src/libstrongswan/plugins/aesni/Makefile
  --- a/src/libstrongswan/Makefile.am
  +++ b/src/libstrongswan/Makefile.am
-@@ -345,6 +345,13 @@ if MONOLITHIC
+@@ -348,6 +348,13 @@ if MONOLITHIC
   endif
   endif
   
diff --git a/net/vnstat2/Makefile b/net/vnstat2/Makefile

index 3f31083ec7f6e75f8f051303fa3aefc3a9c59379..5be77cff6deb91026c98f428c249263820ff8520 100644 (file)
--- a/net/vnstat2/Makefile
+++ b/net/vnstat2/Makefile
@@ -6,12 +6,12 @@
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=vnstat2
-PKG_VERSION:=2.8
+PKG_VERSION:=2.9
  PKG_RELEASE:=$(AUTORELEASE)
  
  PKG_SOURCE:=vnstat-$(PKG_VERSION).tar.gz
  PKG_SOURCE_URL:=https://humdi.net/vnstat
-PKG_HASH:=03f858a7abf6bd85bb8cd595f3541fc3bd31f8f400ec092ef3034825ccb77c25
+PKG_HASH:=11a21475dea91706500aba7c63e24126703fd01f13b1f3acdf92baa5aead9dc7
  
  PKG_LICENSE:=GPL-2.0-only
  PKG_LICENSE_FILES:=COPYING
diff --git a/net/vnstat2/patches/100-noexit.patch b/net/vnstat2/patches/100-noexit.patch

index 8ef9ac2c5cfdfc240d752be7c9331f177d15e7e9..89580e9a951ad3bdc06f340e9f243b8f90c175f4 100644 (file)
--- a/net/vnstat2/patches/100-noexit.patch
+++ b/net/vnstat2/patches/100-noexit.patch
@@ -41,7 +41,7 @@
         uint64_t dbifcount;
  --- a/src/vnstatd.c
  +++ b/src/vnstatd.c
-@@ -248,6 +248,7 @@ void showhelp(void)
+@@ -249,6 +249,7 @@ void showhelp(void)
         printf("      --config <config file>   select used config file\n");
         printf("      --noadd                  prevent startup if database has no interfaces\n");
         printf("      --alwaysadd [mode]       automatically start monitoring all new interfaces\n");
@@ -49,7 +49,7 @@
         printf("      --initdb                 create empty database and exit\n\n");
   
         printf("See also \"man vnstatd\".\n");
-@@ -319,6 +320,8 @@ void parseargs(DSTATE *s, int argc, char
+@@ -322,6 +323,8 @@ void parseargs(DSTATE *s, int argc, char
                         } else {
                                 cfg.alwaysadd = 1;
                         }
diff --git a/net/wg-installer/Makefile b/net/wg-installer/Makefile

index b41f5f25e0f38e8319b038a81c63549d7d6121fd..c238faa881440cb92902511c2ce3bdda87bb5b7d 100644 (file)
--- a/net/wg-installer/Makefile
+++ b/net/wg-installer/Makefile
@@ -57,7 +57,7 @@ endef
  
  define Package/wg-installer-server-hotplug-babeld
         $(call Package/wg-installer-server)
-       DEPENDS:=wg-installer-server +coreutils-realpath
+       DEPENDS:=wg-installer-server
  endef
  
  define Package/wg-installer-server-hotplug-babeld/install
diff --git a/net/wg-installer/wg-server/hotplug.d/99-mesh-babeld b/net/wg-installer/wg-server/hotplug.d/99-mesh-babeld

index 49c2f1f18521806e631a690f2ae43d1a5b5615d7..d3ef3e39c49b2508136f02134f7272db18e06a15 100644 (file)
--- a/net/wg-installer/wg-server/hotplug.d/99-mesh-babeld
+++ b/net/wg-installer/wg-server/hotplug.d/99-mesh-babeld
@@ -12,25 +12,5 @@ if [ "${slicedint}" != "wg_" ]; then
  fi
  
  if [ "${ACTION}" = "add" ]; then
-       uci add babeld interface
-       uci set babeld.@interface[-1].ifname="${INTERFACE}"
-       uci get wgserver.@babeld_hotplug[0].rxcost
-       if [ $? -eq 0 ]; then
-               babeld_rxcost="$(uci get wgserver.@babeld_hotplug[0].rxcost)"
-               uci set babeld.@interface[-1].rxcost="$babeld_rxcost"
-       fi
-       uci -c "$(dirname "$(realpath /etc/config/babeld)")" commit babeld
-       /etc/init.d/babeld reload
-fi
-
-if [ "${ACTION}" = "remove" ]; then
-       i=0
-       while uci get babeld.@interface[$i] &> /dev/null ; do
-               if [ "$(uci get babeld.@interface[$i].ifname)" = "${INTERFACE}" ]; then
-                       uci delete babeld.@interface[$i]
-               fi
-               i=$((i+1));
-       done
-       uci -c "$(dirname "$(realpath /etc/config/babeld)")" commit babeld
-       /etc/init.d/babeld reload
+       ubus call babeld add_interface '{"ifname":'\""$INTERFACE"\"'}'
  fi
diff --git a/sound/fdk-aac/Makefile b/sound/fdk-aac/Makefile

index 794484bdc3bf08059726d76ae081427ae8dda176..4d429ba0ba13307b24b6a1e54f1a2c0ad621b9ca 100644 (file)
--- a/sound/fdk-aac/Makefile
+++ b/sound/fdk-aac/Makefile
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
  
  PKG_NAME:=fdk-aac
  PKG_VERSION:=2.0.1
-PKG_RELEASE:=4
+PKG_RELEASE:=5
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
  PKG_SOURCE_URL:=https://codeload.github.com/mstorsjo/fdk-aac/tar.gz/v$(PKG_VERSION)?
diff --git a/sound/fdk-aac/patches-free/050-inline.patch b/sound/fdk-aac/patches-free/050-inline.patch

new file mode 100644 (file)

index 0000000..3104dff
--- /dev/null
+++ b/sound/fdk-aac/patches-free/050-inline.patch
@@ -0,0 +1,65 @@
+From 7f328b93ee2aa8bb4e94613b6ed218e7525d8dc0 Mon Sep 17 00:00:00 2001
+From: David Seifert <soap@gentoo.org>
+Date: Sat, 10 Jul 2021 13:06:57 +0200
+Subject: [PATCH] Do not force inlining of indirect functions
+
+* A function called indirectly cannot be decorated
+  with `__attribute((always_inline))`, as this is
+  guaranteed to only work with direct calls:
+    https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63220#c1
+
+Bug: https://bugs.gentoo.org/798045
+---
+ libFDK/include/fft.h | 4 ++--
+ libFDK/src/fft.cpp   | 6 +++---
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+--- a/libFDK/include/fft.h
++++ b/libFDK/include/fft.h
+@@ -139,7 +139,7 @@ void ifft(int length, FIXP_DBL *pInput,
+  * bit scale headroom. The values are interleaved, real/imag pairs.
+  */
+ LNK_SECTION_CODE_L1
+-static FDK_FORCEINLINE void fft_4(FIXP_DBL *x) {
++static inline void fft_4(FIXP_DBL *x) {
+   FIXP_DBL a00, a10, a20, a30, tmp0, tmp1;
+ 
+   a00 = (x[0] + x[4]) >> 1; /* Re A + Re B */
+@@ -168,7 +168,7 @@ static FDK_FORCEINLINE void fft_4(FIXP_D
+ 
+ #ifndef FUNCTION_fft_8
+ LNK_SECTION_CODE_L1
+-static FDK_FORCEINLINE void fft_8(FIXP_DBL *x) {
++static inline void fft_8(FIXP_DBL *x) {
+   FIXP_SPK w_PiFOURTH = {{FIXP_SGL(0x5A82), FIXP_SGL(0x5A82)}};
+ 
+   FIXP_DBL a00, a10, a20, a30;
+--- a/libFDK/src/fft.cpp
++++ b/libFDK/src/fft.cpp
+@@ -170,7 +170,7 @@ amm-info@iis.fraunhofer.de
+ 
+ /* Performs the FFT of length 2. Input vector unscaled, output vector scaled
+  * with factor 0.5 */
+-static FDK_FORCEINLINE void fft2(FIXP_DBL *RESTRICT pDat) {
++static inline void fft2(FIXP_DBL *RESTRICT pDat) {
+   FIXP_DBL r1, i1;
+   FIXP_DBL r2, i2;
+ 
+@@ -196,7 +196,7 @@ static FDK_FORCEINLINE void fft2(FIXP_DB
+ 
+ #ifndef FUNCTION_fft3
+ /* Performs the FFT of length 3 according to the algorithm after winograd. */
+-static FDK_FORCEINLINE void fft3(FIXP_DBL *RESTRICT pDat) {
++static inline void fft3(FIXP_DBL *RESTRICT pDat) {
+   FIXP_DBL r1, r2;
+   FIXP_DBL s1, s2;
+   FIXP_DBL pD;
+@@ -233,7 +233,7 @@ static FDK_FORCEINLINE void fft3(FIXP_DB
+ 
+ /* performs the FFT of length 5 according to the algorithm after winograd */
+ /* This version works with a prescale of 2 instead of 3 */
+-static FDK_FORCEINLINE void fft5(FIXP_DBL *RESTRICT pDat) {
++static inline void fft5(FIXP_DBL *RESTRICT pDat) {
+   FIXP_DBL r1, r2, r3, r4;
+   FIXP_DBL s1, s2, s3, s4;
+   FIXP_DBL t;
diff --git a/sound/fdk-aac/patches/010-inline.patch b/sound/fdk-aac/patches/010-inline.patch

new file mode 100644 (file)

index 0000000..3104dff
--- /dev/null
+++ b/sound/fdk-aac/patches/010-inline.patch
@@ -0,0 +1,65 @@
+From 7f328b93ee2aa8bb4e94613b6ed218e7525d8dc0 Mon Sep 17 00:00:00 2001
+From: David Seifert <soap@gentoo.org>
+Date: Sat, 10 Jul 2021 13:06:57 +0200
+Subject: [PATCH] Do not force inlining of indirect functions
+
+* A function called indirectly cannot be decorated
+  with `__attribute((always_inline))`, as this is
+  guaranteed to only work with direct calls:
+    https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63220#c1
+
+Bug: https://bugs.gentoo.org/798045
+---
+ libFDK/include/fft.h | 4 ++--
+ libFDK/src/fft.cpp   | 6 +++---
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+--- a/libFDK/include/fft.h
++++ b/libFDK/include/fft.h
+@@ -139,7 +139,7 @@ void ifft(int length, FIXP_DBL *pInput,
+  * bit scale headroom. The values are interleaved, real/imag pairs.
+  */
+ LNK_SECTION_CODE_L1
+-static FDK_FORCEINLINE void fft_4(FIXP_DBL *x) {
++static inline void fft_4(FIXP_DBL *x) {
+   FIXP_DBL a00, a10, a20, a30, tmp0, tmp1;
+ 
+   a00 = (x[0] + x[4]) >> 1; /* Re A + Re B */
+@@ -168,7 +168,7 @@ static FDK_FORCEINLINE void fft_4(FIXP_D
+ 
+ #ifndef FUNCTION_fft_8
+ LNK_SECTION_CODE_L1
+-static FDK_FORCEINLINE void fft_8(FIXP_DBL *x) {
++static inline void fft_8(FIXP_DBL *x) {
+   FIXP_SPK w_PiFOURTH = {{FIXP_SGL(0x5A82), FIXP_SGL(0x5A82)}};
+ 
+   FIXP_DBL a00, a10, a20, a30;
+--- a/libFDK/src/fft.cpp
++++ b/libFDK/src/fft.cpp
+@@ -170,7 +170,7 @@ amm-info@iis.fraunhofer.de
+ 
+ /* Performs the FFT of length 2. Input vector unscaled, output vector scaled
+  * with factor 0.5 */
+-static FDK_FORCEINLINE void fft2(FIXP_DBL *RESTRICT pDat) {
++static inline void fft2(FIXP_DBL *RESTRICT pDat) {
+   FIXP_DBL r1, i1;
+   FIXP_DBL r2, i2;
+ 
+@@ -196,7 +196,7 @@ static FDK_FORCEINLINE void fft2(FIXP_DB
+ 
+ #ifndef FUNCTION_fft3
+ /* Performs the FFT of length 3 according to the algorithm after winograd. */
+-static FDK_FORCEINLINE void fft3(FIXP_DBL *RESTRICT pDat) {
++static inline void fft3(FIXP_DBL *RESTRICT pDat) {
+   FIXP_DBL r1, r2;
+   FIXP_DBL s1, s2;
+   FIXP_DBL pD;
+@@ -233,7 +233,7 @@ static FDK_FORCEINLINE void fft3(FIXP_DB
+ 
+ /* performs the FFT of length 5 according to the algorithm after winograd */
+ /* This version works with a prescale of 2 instead of 3 */
+-static FDK_FORCEINLINE void fft5(FIXP_DBL *RESTRICT pDat) {
++static inline void fft5(FIXP_DBL *RESTRICT pDat) {
+   FIXP_DBL r1, r2, r3, r4;
+   FIXP_DBL s1, s2, s3, s4;
+   FIXP_DBL t;
diff --git a/utils/auc/src/auc.c b/utils/auc/src/auc.c

index e732823e5b6ac6dd68c791bcfae41fb6a9c0cd79..e993a93916d14b8b00ccbf7facbd4ea5cef5b1f2 100644 (file)
--- a/utils/auc/src/auc.c
+++ b/utils/auc/src/auc.c
@@ -1430,6 +1430,7 @@ static void usage(const char *arg0)
  #endif
         fprintf(stdout, " -f\t\tuse force\n");
         fprintf(stdout, " -h\t\toutput help\n");
+       fprintf(stdout, " -n\t\tdry-run (don't download or upgrade)\n");
         fprintf(stdout, " -r\t\tcheck only for release upgrades\n");
         fprintf(stdout, " -F <fstype>\toverride filesystem type\n");
         fprintf(stdout, " -y\t\tdon't wait for user confirmation\n");
@@ -1451,9 +1452,10 @@ int main(int args, char *argv[]) {
         struct blob_attr *tbr[__REPLY_MAX];
         struct blob_attr *tb[__TARGET_MAX] = {}; /* make sure tb is NULL initialized even if blobmsg_parse isn't called */
         struct stat imgstat;
-       int check_only = 0;
-       int retry_delay = 0;
-       int upg_check = 0;
+       bool check_only = false;
+       bool retry_delay = false;
+       bool upg_check = false;
+       bool dry_run = false;
         int revcmp;
         int addargs;
         unsigned char argc = 1;
@@ -1485,7 +1487,7 @@ int main(int args, char *argv[]) {
                 }
  
                 if (!strncmp(argv[argc], "-c", 3))
-                       check_only = 1;
+                       check_only = true;
  
                 if (!strncmp(argv[argc], "-f", 3))
                         force = true;
@@ -1495,6 +1497,9 @@ int main(int args, char *argv[]) {
                         addargs = 1;
                 }
  
+               if (!strncmp(argv[argc], "-n", 3))
+                       dry_run = true;
+
                 if (!strncmp(argv[argc], "-r", 3))
                         release_only = true;
  
@@ -1686,7 +1691,6 @@ int main(int args, char *argv[]) {
                         }
                         use_get = true;
                 } else if (retry_delay) {
-                       fputc('\n', stderr);
                         retry_delay = 0;
                 }
  
@@ -1720,7 +1724,13 @@ int main(int args, char *argv[]) {
                  blobmsg_get_string(tb[TARGET_BINDIR]),
                  image_name);
  
-       fprintf(stderr, "Downloading image from %s\n", url);
+       if (dry_run) {
+               fprintf(stderr, "\nImage available at %s\n", url);
+               rc = 0;
+               goto freebranches;
+       }
+
+       fprintf(stderr, "\nDownloading image from %s\n", url);
         rc = server_request(url, NULL, NULL);
         if (rc)
                 goto freebranches;
@@ -1792,7 +1802,6 @@ freebranches:
                 fputc('\n', stderr);
         }
  
-       /* ToDo */
  freeboard:
         if (rootfs_type)
                 free(rootfs_type);
diff --git a/utils/bluelog/Makefile b/utils/bluelog/Makefile

index 3c60d6108d60d4e30a9fa5d4ca3a1f941411a749..35a0e2bf6c8fee276befb5bc2388296908847e6b 100644 (file)
--- a/utils/bluelog/Makefile
+++ b/utils/bluelog/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
  
  PKG_NAME:=bluelog
  PKG_VERSION:=1.1.2
-PKG_RELEASE:=4
+PKG_RELEASE:=5
  
  PKG_SOURCE:=Bluelog-$(PKG_VERSION).tar.gz
  PKG_SOURCE_URL:=https://codeload.github.com/MS3FGX/Bluelog/tar.gz/$(PKG_VERSION)?
@@ -78,7 +78,7 @@ MAKE_FLAGS += \
  define Build/Prepare
         $(eval $(call Download,oui.txt))
         $(Build/Prepare/Default)
-       zcat $(DL_DIR)/$(OUI_SOURCE) > $(PKG_BUILD_DIR)/oui.tmp
+       gzip -dc $(DL_DIR)/$(OUI_SOURCE) > $(PKG_BUILD_DIR)/oui.tmp
  endef
  
  define Package/bluelog/install
diff --git a/utils/canutils/patches/010-sane.patch b/utils/canutils/patches/010-sane.patch

new file mode 100644 (file)

index 0000000..d30477d
--- /dev/null
+++ b/utils/canutils/patches/010-sane.patch
@@ -0,0 +1,30 @@
+From e370ad5256f4a0b37f70a5b2e4a56f2c37235026 Mon Sep 17 00:00:00 2001
+From: Rosen Penev <rosenp@gmail.com>
+Date: Sun, 2 Jan 2022 15:21:50 -0800
+Subject: [PATCH] testj1939: fix 64-bit types for some platforms
+
+Revert commit that introduced PRIx64 to print an __u64, and added
+define to get the same types on all platforms.
+
+With __SANE_USERSPACE_TYPES__ the Linux headers use an unsigned long
+long for __u64 on all platforms, especially MIPS64.
+
+Fixes: eb9cfac9543b ("use PRIx64")
+Signed-off-by: Rosen Penev <rosenp@gmail.com>
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+---
+ libj1939.h  | 3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/libj1939.h
++++ b/libj1939.h
+@@ -10,6 +10,9 @@
+  * as published by the Free Software Foundation
+  */
+ 
++/* needed on some 644 bit platforms to get consistent 64-bit types */
++#define __SANE_USERSPACE_TYPES__
++
+ #include <sys/socket.h>
+ #include <linux/can.h>
+ #include <linux/can/j1939.h>
diff --git a/utils/cmdpad/Makefile b/utils/cmdpad/Makefile

index aa34f31fa6e238d942234f117567c5de377ffb1a..5be2f01bb58b7224cc5883ada15ed154026875d4 100644 (file)
--- a/utils/cmdpad/Makefile
+++ b/utils/cmdpad/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
  
  PKG_NAME:=cmdpad
  PKG_VERSION:=0.0.3
-PKG_RELEASE:=5
+PKG_RELEASE:=6
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
  PKG_SOURCE_URL:=@SF/cmdpad
diff --git a/utils/cmdpad/patches/160-format.patch b/utils/cmdpad/patches/160-format.patch

new file mode 100644 (file)

index 0000000..4c4f13d
--- /dev/null
+++ b/utils/cmdpad/patches/160-format.patch
@@ -0,0 +1,11 @@
+--- a/src/parse.c
++++ b/src/parse.c
+@@ -257,7 +257,7 @@ int ParseCommand( char * pchCommandLine)
+ 
+       pchValue = strtok( pchValue, ",") ; 
+       d2printf( "Value is '%s'\n", pchValue) ;
+-      if( (pchValue == NULL ) || ( sscanf( pchValue, "%d", &code) != 1) )
++      if( (pchValue == NULL ) || ( sscanf( pchValue, "%hu", &code) != 1) )
+       return -1 ;
+       
+       pchValue = strtok( NULL, ",") ;
diff --git a/utils/collectd/Makefile b/utils/collectd/Makefile

index 11f467dc56e1a0caa8e90bfd5dbf01308f501f5c..4b4e216f9800366e0cec253bfc0a75cdb50fd0bf 100644 (file)
--- a/utils/collectd/Makefile
+++ b/utils/collectd/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
  
  PKG_NAME:=collectd
  PKG_VERSION:=5.12.0
-PKG_RELEASE:=15
+PKG_RELEASE:=$(AUTORELEASE)
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_SOURCE_URL:=https://collectd.org/files/ \
@@ -229,7 +229,6 @@ $(call Package/collectd/Default)
    DEPENDS:= +libpthread \
           +zlib \
           +libltdl \
-         +libip4tc \
           +jshn \
           +PACKAGE_collectd-mod-lua:liblua
    MENU:=1
diff --git a/utils/conmon/Makefile b/utils/conmon/Makefile

index ca0c7f4365aa9fb7a0e3c43a03998d7e8fb374ef..d70832bd941252992f519db9d3c885a51644b3fa 100644 (file)
--- a/utils/conmon/Makefile
+++ b/utils/conmon/Makefile
@@ -1,12 +1,12 @@
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=conmon
-PKG_VERSION:=2.0.31
+PKG_VERSION:=2.0.32
  PKG_RELEASE:=$(AUTORELEASE)
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
  PKG_SOURCE_URL:=https://github.com/containers/$(PKG_NAME)/archive/v$(PKG_VERSION)
-PKG_HASH:=76286480065d4cf9b24610c159c683710fe9c8b9f753518f804f22bbb59796a8
+PKG_HASH:=0ffd17a185322779d14d9a64c39120900f1e0cc3297b18679a933f5f6ba06a75
  
  PKG_MAINTAINER:=Oskari Rauta <oskari.rauta@gmail.com>
  PKG_LICENSE:=Apache-2.0
diff --git a/utils/crun/Makefile b/utils/crun/Makefile

index d5b03ab9cc98ef8b889fd21899f443d45d3c0606..d9113716c319dfe636fed29f08217674414a5695 100644 (file)
--- a/utils/crun/Makefile
+++ b/utils/crun/Makefile
@@ -1,14 +1,14 @@
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=crun
-PKG_VERSION:=1.3
+PKG_VERSION:=1.4.1
  PKG_RELEASE:=$(AUTORELEASE)
  
  PKG_SOURCE_PROTO:=git
  PKG_SOURCE_URL:=https://github.com/containers/crun.git
-PKG_SOURCE_DATE:=2021-11-24
-PKG_SOURCE_VERSION:=536de8283fafe622ac969be51c8823fd8588c025
-PKG_MIRROR_HASH:=854860d733d39d9ff10d77cb642a0cfa9645f62437311ce32c506f392926d7a8
+PKG_SOURCE_DATE:=2022-01-24
+PKG_SOURCE_VERSION:=47279c5370d3ebbd9cf2fb1b36a79225be0080e5
+PKG_MIRROR_HASH:=02fbbc755cf6b16e7aea2ee18436c6f9de8eb97be14972406252bbc8374f56bb
  
  PKG_BUILD_DEPENDS:=argp-standalone
  PKG_BUILD_PARALLEL:=1
diff --git a/utils/fakeuname/Makefile b/utils/fakeuname/Makefile

new file mode 100644 (file)

index 0000000..26419bc
--- /dev/null
+++ b/utils/fakeuname/Makefile
@@ -0,0 +1,57 @@
+# Copyright (C) 2022 Sergey V. Lobanov <sergey@lobanov.in>
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=fakeuname
+PKG_RELEASE:=$(COMMITCOUNT)
+PKG_LICENSE:=GPL-2.0-or-later
+
+PKG_MAINTAINER:=Sergey V. Lobanov <sergey@lobanov.in>
+
+PKG_HOST_ONLY:=1
+
+define Package/fakeuname
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=Fake uname host tool for cross-compile purposes
+  BUILDONLY:=1
+endef
+
+define Package/fakeuname/description
+ Fakeuname is a host tool for cross-compile cross-platform builds
+ if configure or/and build scripts check uname output for target 
+ build and use invalid build flags. This tool should not be used 
+ in normal case if configure/build scripts allow to redefine 
+ required values instead of using uname output
+endef
+
+include $(INCLUDE_DIR)/kernel.mk
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/host-build.mk
+
+define Host/Configure
+endef
+
+define Host/Compile
+       { \
+           cat src/header.py.inc; \
+           echo machine = \"$(ARCH)\"; \
+           echo kernel_release = \"$(LINUX_UNAME_VERSION)\"; \
+           echo kernel_version = \"#0 $(shell date --date=@$(SOURCE_DATE_EPOCH))\"; \
+           cat src/footer.py.inc; \
+       } > $(HOST_BUILD_DIR)/$(PKG_NAME)
+endef
+
+define Host/Install
+       $(INSTALL_DIR) $(STAGING_DIR_HOSTPKG)/lib/$(PKG_NAME)
+       $(INSTALL_BIN) $(HOST_BUILD_DIR)/$(PKG_NAME) $(STAGING_DIR_HOSTPKG)/lib/$(PKG_NAME)/uname
+endef
+
+define Host/Clean
+       rm -rf "$(STAGING_DIR_HOSTPKG)/lib/$(PKG_NAME)"
+endef
+
+$(eval $(call HostBuild))
+$(eval $(call BuildPackage,fakeuname))
diff --git a/utils/fakeuname/fakeuname.mk b/utils/fakeuname/fakeuname.mk

new file mode 100644 (file)

index 0000000..b7692b3
--- /dev/null
+++ b/utils/fakeuname/fakeuname.mk
@@ -0,0 +1 @@
+FAKEUNAME_PATH=$(STAGING_DIR_HOSTPKG)/lib/fakeuname
diff --git a/utils/fakeuname/src/footer.py.inc b/utils/fakeuname/src/footer.py.inc

new file mode 100644 (file)

index 0000000..f1e916e
--- /dev/null
+++ b/utils/fakeuname/src/footer.py.inc
@@ -0,0 +1,20 @@
+
+args_dict = {
+    "-a" : "%s %s %s %s %s %s %s %s" % 
+            (kernel_name, nodename, kernel_release, kernel_version,
+            machine, processor, hardware_platform, operating_system),
+    "-m" : machine,
+    "-n" : nodename,
+    "-r" : kernel_release,
+    "-s" : kernel_name,
+    "-p" : processor,
+    "-v" : kernel_version,
+    "-i" : hardware_platform,
+    "-o" : operating_system,
+}
+
+input_args = sys.argv
+if len(input_args) == 1:
+    input_args = ["-s"]
+
+print(" ".join([args_dict[arg] for arg in input_args if arg in args_dict]))
diff --git a/utils/fakeuname/src/header.py.inc b/utils/fakeuname/src/header.py.inc

new file mode 100644 (file)

index 0000000..e11eba2
--- /dev/null
+++ b/utils/fakeuname/src/header.py.inc
@@ -0,0 +1,13 @@
+#!/usr/bin/env python3
+# Copyright 2022 Sergey V. Lobanov <sergey@lobanov.in>
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+import sys
+
+kernel_name="Linux"
+operating_system="GNU/Linux"
+nodename="OpenWrt"
+processor="unknown"
+hardware_platform="unknown"
+
diff --git a/utils/gpsd/Makefile b/utils/gpsd/Makefile

index 086da3b8c0bbb1760459405e27b36dd05f500d42..33c885bd370913f840b1831d88f682197c4a6aed 100644 (file)
--- a/utils/gpsd/Makefile
+++ b/utils/gpsd/Makefile
@@ -100,6 +100,7 @@ SCONS_VARS += \
         LINKFLAGS="$(TARGET_LDFLAGS)"
  
  SCONS_OPTIONS += \
+       target_platform=linux \
         dbus_export=no \
         tsip=no \
         fv18=no \
diff --git a/utils/gpsd/patches/003_sconscript-cross-platform-build-support.patch b/utils/gpsd/patches/003_sconscript-cross-platform-build-support.patch

new file mode 100644 (file)

index 0000000..68613de
--- /dev/null
+++ b/utils/gpsd/patches/003_sconscript-cross-platform-build-support.patch
@@ -0,0 +1,159 @@
+Backported from:
+
+https://gitlab.com/gpsd/gpsd/-/commit/28fb46ac70059d3b0eb64041c35ef83027bd8506
+https://gitlab.com/gpsd/gpsd/-/commit/c5ed9736d859fed0682e60e899e9617ac67da11b
+
+From c2b4d3fb9a9e011bdc2fb891b78c6ce13f0c7101 Mon Sep 17 00:00:00 2001
+From: "Sergey V. Lobanov" <sergey@lobanov.in>
+Date: Mon, 24 Jan 2022 16:01:54 -0800
+Subject: [PATCH] SConscript: Add target_platform config option.
+
+This patch adds an ability to redefine target platform using config
+optiont target_platform=<platform> to support cross-platform compilation.
+
+This allows cross cimpileg for openWRT (target_platform=linux) on
+osX (sys.platform() == darwin)
+
+Signed-off-by: Gary E. Miller <gem@rellim.com>
+---
+ SConscript | 41 +++++++++++++++++++++++++++--------------
+ 1 file changed, 27 insertions(+), 14 deletions(-)
+
+--- a/SConscript
++++ b/SConscript
+@@ -52,6 +52,7 @@ EnsurePythonVersion(2, 6)
+ # e.g. "scons-3" on CentOS 8.
+ scons_executable_name = os.path.basename(sys.argv[0]) or 'scons'
+ 
++
+ # Have scons rebuild an existing target when the source(s) MD5 changes
+ # Do not use time to prevent rebuilding when sources, like gpsd_config.h,
+ # are rebuilt, but with no changes.
+@@ -351,6 +352,7 @@ boolopts = (
+     ("gpsdclients",   True,  "gspd client programs"),
+     ("gpsd",          True,  "gpsd itself"),
+     ("implicit_link", imloads, "implicit linkage is supported in shared libs"),
++    # FIXME: should check for Pi, not for "linux"
+     ("magic_hat", sys.platform.startswith('linux'),
+      "special Linux PPS hack for Raspberry Pi et al"),
+     ("minimal", False, "turn off every option not set on the command line"),
+@@ -410,6 +412,10 @@ nonboolopts = (
+      "Prefix to the binary tools to use (gcc, ld, etc.)\n"
+      "For cross-compiling, or building with multiple local toolchains.\n"
+      ),
++    # If build and target platform are different, then redefining target
++    # platform might be necessary to use better build flags
++    ("target_platform", sys.platform,
++     "target platform for cross-compiling (linux, darwin, etc.)"),
+     ("target_python",  def_target_python,  "target Python version as command"),
+ )
+ 
+@@ -878,13 +884,16 @@ have_valgrind = False
+ # per SCons 4.0.1 doc: Section 23.9. Not Configuring When Cleaning Targets
+ if not cleaning and not helping:
+     # OS X aliases gcc to clang
++    if (sys.platform != config.env['target_platform']):
++        announce("Target system is: %s" % config.env['target_platform'])
++
+     announce("cc is %s, version %s" % (env['CC'], env['CCVERSION']))
+     # clang accepts -pthread, then warns it is unused.
+     if not config.CheckCC():
+         announce("ERROR: CC doesn't work")
+ 
+     if ((config.CheckCompilerOption("-pthread") and
+-         not sys.platform.startswith('darwin'))):
++         not config.env['target_platform'].startswith('darwin'))):
+         config.env.MergeFlags("-pthread")
+ 
+     confdefs = ["/* gpsd_config.h generated by scons, do not hand-hack. */\n"]
+@@ -935,7 +944,7 @@ if not cleaning and not helping:
+     # confdefs.append('#endif\n')
+     # Reinstated for FreeBSD (below) 16-Aug-2019
+ 
+-    if sys.platform.startswith('linux'):
++    if config.env['target_platform'].startswith('linux'):
+         # for cfmakeraw(), strsep(), etc. on CentOS 7
+         # glibc 2.19 and before
+         # sets __USE_MISC
+@@ -947,7 +956,7 @@ if not cleaning and not helping:
+         confdefs.append('#if !defined(_GNU_SOURCE)')
+         confdefs.append('#define _GNU_SOURCE 1')
+         confdefs.append('#endif\n')
+-    elif sys.platform.startswith('darwin'):
++    elif config.env['target_platform'].startswith('darwin'):
+         # strlcpy() and SIGWINCH need _DARWIN_C_SOURCE
+         confdefs.append('#if !defined(_DARWIN_C_SOURCE)')
+         confdefs.append('#define _DARWIN_C_SOURCE 1\n')
+@@ -962,7 +971,7 @@ if not cleaning and not helping:
+                         "-Wl,-compatibility_version,%s" % libgps_version,
+                         "-Wl,-install_name,%s/$TARGET.srcpath" %
+                         installdir('libdir', add_destdir=False)]
+-    elif sys.platform.startswith('freebsd'):
++    elif config.env['target_platform'].startswith('freebsd'):
+         # for isascii(), putenv(), nice(), strptime()
+         confdefs.append('#if !defined(_XOPEN_SOURCE)')
+         confdefs.append('#define _XOPEN_SOURCE 700')
+@@ -975,7 +984,7 @@ if not cleaning and not helping:
+         confdefs.append('#if !defined(__BSD_VISIBLE)')
+         confdefs.append("#define __BSD_VISIBLE 1\n")
+         confdefs.append('#endif\n')
+-    elif sys.platform.startswith('openbsd'):
++    elif config.env['target_platform'].startswith('openbsd'):
+         # required to define u_int in sys/time.h
+         confdefs.append('#if !defined(_BSD_SOURCE)')
+         confdefs.append("#define _BSD_SOURCE 1\n")
+@@ -984,12 +993,12 @@ if not cleaning and not helping:
+         confdefs.append('#if !defined(__BSD_VISIBLE)')
+         confdefs.append("#define __BSD_VISIBLE 1\n")
+         confdefs.append('#endif\n')
+-    elif sys.platform.startswith('netbsd'):
++    elif config.env['target_platform'].startswith('netbsd'):
+         # required to get strlcpy(), and more, from string.h
+         confdefs.append('#if !defined(_NETBSD_SOURCE)')
+         confdefs.append("#define _NETBSD_SOURCE 1\n")
+         confdefs.append('#endif\n')
+-    elif sys.platform.startswith('sunos5'):
++    elif config.env['target_platform'].startswith('sunos5'):
+         # tested with gcc-5.5 on slowlaris 10
+         # required to get isascii(), and more, from ctype.h
+         confdefs.append('#if !defined(__XPG4_CHAR_CLASS__)')
+@@ -1044,11 +1053,11 @@ if not cleaning and not helping:
+             ncurseslibs = ['!ncurses5-config --libs --cflags']
+         elif WhereIs('ncursesw5-config'):
+             ncurseslibs = ['!ncursesw5-config --libs --cflags']
+-        elif sys.platform.startswith('freebsd'):
++        elif config.env['target_platform'].startswith('freebsd'):
+             ncurseslibs = ['-lncurses']
+-        elif (sys.platform.startswith('darwin') or
+-              sys.platform.startswith('openbsd') or
+-              sys.platform.startswith('sunos5')):
++        elif (config.env['target_platform'].startswith('darwin') or
++              config.env['target_platform'].startswith('openbsd') or
++              config.env['target_platform'].startswith('sunos5')):
+             ncurseslibs = ['-lcurses']
+         else:
+             announce('Turning off ncurses support, library not found.')
+@@ -1064,7 +1073,8 @@ if not cleaning and not helping:
+                 announce("pkg_config is confused about the state "
+                          "of libusb-1.0.")
+                 usbflags = []
+-        elif sys.platform.startswith("freebsd"):
++        elif config.env['target_platform'].startswith('freebsd'):
++            # FIXME: shold directly test for libusb existence.
+             confdefs.append("#define HAVE_LIBUSB 1\n")
+             usbflags = ["-lusb"]
+         else:
+@@ -2498,8 +2508,11 @@ if qt_env:
+     binaryinstall.append(GPSLibraryInstall(qt_env, installdir('libdir'),
+                                            compiled_qgpsmmlib, libgps_version))
+ 
+-if ((not env['debug'] and not env['debug_opt'] and not env['profiling'] and
+-     not env['nostrip'] and not sys.platform.startswith('darwin'))):
++if ((not env['debug'] and
++     not env['debug_opt'] and
++     not env['profiling'] and
++     not env['nostrip'] and
++     not env['target_platform'].startswith('darwin'))):
+     env.AddPostAction(binaryinstall, '$STRIP $TARGET')
+ 
+ binaryinstall.append(env.Install(installdir('bindir'), bin_scripts))
diff --git a/utils/hdparm/patches/020-64bit.patch b/utils/hdparm/patches/020-64bit.patch

new file mode 100644 (file)

index 0000000..d7389fb
--- /dev/null
+++ b/utils/hdparm/patches/020-64bit.patch
@@ -0,0 +1,48 @@
+--- a/fibmap.c
++++ b/fibmap.c
+@@ -17,6 +17,9 @@
+ #include <errno.h>
+ #include <sys/ioctl.h>
+ #include <sys/stat.h>
++#ifndef __SANE_USERSPACE_TYPES__
++#define __SANE_USERSPACE_TYPES__      /* For PPC64, to get LL64 types */
++#endif
+ #include <linux/types.h>
+ #include <linux/fs.h>
+ 
+--- a/fwdownload.c
++++ b/fwdownload.c
+@@ -14,6 +14,9 @@
+ #include <errno.h>
+ #include <sys/ioctl.h>
+ #include <sys/stat.h>
++#ifndef __SANE_USERSPACE_TYPES__
++#define __SANE_USERSPACE_TYPES__      /* For PPC64, to get LL64 types */
++#endif
+ #include <linux/types.h>
+ #include <linux/fs.h>
+ #include <sys/mman.h>
+--- a/hdparm.c
++++ b/hdparm.c
+@@ -24,6 +24,9 @@
+ #include <sys/mount.h>
+ #include <sys/mman.h>
+ #include <sys/user.h>
++#ifndef __SANE_USERSPACE_TYPES__
++#define __SANE_USERSPACE_TYPES__      /* For PPC64, to get LL64 types */
++#endif
+ #include <linux/types.h>
+ #include <linux/fs.h>
+ #include <linux/major.h>
+--- a/identify.c
++++ b/identify.c
+@@ -4,6 +4,9 @@
+ #include <stdlib.h>
+ #include <errno.h>
+ #include <string.h>
++#ifndef __SANE_USERSPACE_TYPES__
++#define __SANE_USERSPACE_TYPES__      /* For PPC64, to get LL64 types */
++#endif
+ #include <linux/types.h>
+ #include <endian.h>
+ 
diff --git a/utils/lrzsz/Makefile b/utils/lrzsz/Makefile

index a1b9595135ed1e0f5122a5556dc7aca05fc7090c..9eab1b68139fad323c1835dddbad33a9f0d28894 100644 (file)
--- a/utils/lrzsz/Makefile
+++ b/utils/lrzsz/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
  
  PKG_NAME:=lrzsz
  PKG_VERSION:=0.12.20
-PKG_RELEASE:=2
+PKG_RELEASE:=3
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
  PKG_SOURCE_URL:=https://ohse.de/uwe/releases/
diff --git a/utils/lrzsz/patches/200-format.patch b/utils/lrzsz/patches/200-format.patch

new file mode 100644 (file)

index 0000000..0e244a0
--- /dev/null
+++ b/utils/lrzsz/patches/200-format.patch
@@ -0,0 +1,91 @@
+--- a/lib/long-options.c
++++ b/lib/long-options.c
+@@ -22,6 +22,7 @@
+ #endif
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <getopt.h>
+ #include "long-options.h"
+ 
+--- a/src/lrz.c
++++ b/src/lrz.c
+@@ -2319,7 +2319,7 @@ exec2(const char *s)
+       if (*s == '!')
+               ++s;
+       io_mode(0,0);
+-      execl("/bin/sh", "sh", "-c", s);
++      execl("/bin/sh", "sh", "-c", s, NULL);
+       zpfatal("execl");
+       exit(1);
+ }
+--- a/src/lsyslog.c
++++ b/src/lsyslog.c
+@@ -22,6 +22,7 @@
+ #ifdef ENABLE_SYSLOG
+ #include "zglobal.h"
+ #include <pwd.h>
++#include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #endif
+--- a/src/lsz.c
++++ b/src/lsz.c
+@@ -1997,7 +1997,7 @@ zsendfdata (struct zm_fileinfo *zi)
+               blklen = calc_blklen (total_sent);
+               total_sent += blklen + OVERHEAD;
+               if (Verbose > 2 && blklen != old)
+-                      vstringf (_("blklen now %d\n"), blklen);
++                      vstringf (_("blklen now %zu\n"), blklen);
+ #ifdef HAVE_MMAP
+               if (mm_addr) {
+                       if (zi->bytes_sent + blklen < mm_size)
+--- a/src/tcp.c
++++ b/src/tcp.c
+@@ -56,7 +56,7 @@ tcp_server (char *buf)
+       struct sockaddr_in s;
+       struct sockaddr_in t;
+       int on=1;
+-      size_t len;
++      socklen_t len;
+ 
+       if ((sock = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0) {
+               error(1,errno,"socket");
+@@ -91,7 +91,7 @@ tcp_accept (int d)
+ {
+       int so;
+       struct  sockaddr_in s;
+-      size_t namelen;
++      socklen_t namelen;
+       int num=0;
+ 
+       namelen = sizeof(s);
+--- a/src/zm.c
++++ b/src/zm.c
+@@ -451,7 +451,7 @@ zsda32(const char *buf, size_t length, i
+       int c;
+       unsigned long crc;
+       int i;
+-      VPRINTF(3,("zsdat32: %d %s", length, Zendnames[(frameend-ZCRCE)&3]));
++      VPRINTF(3,("zsdat32: %zu %s", length, Zendnames[(frameend-ZCRCE)&3]));
+ 
+       crc = 0xFFFFFFFFL;
+       zsendline_s(buf,length);
+--- a/src/zreadline.c
++++ b/src/zreadline.c
+@@ -68,13 +68,13 @@ readline_internal(unsigned int timeout)
+               else if (n==0)
+                       n=1;
+               if (Verbose > 5)
+-                      vstringf("Calling read: alarm=%d  Readnum=%d ",
++                      vstringf("Calling read: alarm=%u  Readnum=%zu ",
+                         n, readline_readnum);
+               signal(SIGALRM, zreadline_alarm_handler); 
+               alarm(n);
+       }
+       else if (Verbose > 5)
+-              vstringf("Calling read: Readnum=%d ",
++              vstringf("Calling read: Readnum=%zu ",
+                 readline_readnum);
+ 
+       readline_ptr=readline_buffer;
diff --git a/utils/nano/Makefile b/utils/nano/Makefile

index f12866d8924071e87d27e4a138b029948dd68f3d..2c07bda7bf0a35d6d2f8b745a695c4ca74f3ddc6 100644 (file)
--- a/utils/nano/Makefile
+++ b/utils/nano/Makefile
@@ -25,15 +25,27 @@ PKG_BUILD_PARALLEL:=1
  
  include $(INCLUDE_DIR)/package.mk
  
-define Package/nano
+define Package/nano/Default
    SUBMENU:=Editors
    SECTION:=utils
    CATEGORY:=Utilities
-  TITLE:=GNU nano - enhanced clone of the Pico text editor
    URL:=https://www.nano-editor.org/
    DEPENDS:=+libncurses
  endef
  
+define Package/nano
+  $(call Package/nano/Default)
+  TITLE:=GNU nano text editor (minimal features)
+  VARIANT:=tiny
+  DEFAULT_VARIANT:=1
+endef
+
+define Package/nano-plus
+  $(call Package/nano/Default)
+  TITLE:=GNU nano text editor (more features, Unicode)
+  VARIANT:=plus
+endef
+
  define Package/nano/description
    Nano is a small and simple text editor for use on the terminal.
  
@@ -44,11 +56,41 @@ define Package/nano/description
    Nano is an official GNU package.
  endef
  
-CONFIGURE_ARGS += \
+define Package/nano-plus/description
+  nano-plus - Additional features enabled, larger size than default nano.
+  (multibuffer, Unicode/UTF-8, help, justify, nanorc, some key bindings)
+
+  $(call Package/nano/description)
+endef
+
+ifeq ($(BUILD_VARIANT),plus)
+# plus variant with more features included
+  CONFIGURE_ARGS += \
+       --enable-help \
+       --enable-justify \
+       --enable-linenumbers \
+       --enable-multibuffer \
+       --enable-nanorc \
+       --enable-utf8 \
+       --disable-browser \
+       --disable-color \
+       --disable-comment \
+       --disable-extra \
+       --disable-histories \
+       --disable-libmagic \
+       --disable-mouse \
+       --disable-operatingdir \
+       --disable-speller \
+       --disable-tabcomp \
+       --disable-wordcomp
+else
+# default tiny variant
+  CONFIGURE_ARGS += \
         --enable-tiny \
-       --disable-utf8 \
+       --enable-linenumbers \
         --disable-color \
-       --enable-linenumbers
+       --disable-utf8
+endif
  
  CONFIGURE_VARS += \
         ac_cv_header_regex_h=no \
@@ -58,5 +100,10 @@ define Package/nano/install
         $(CP) $(PKG_INSTALL_DIR)/usr/bin/$(PKG_NAME) $(1)/usr/bin/
  endef
  
+define Package/nano-plus/install
+       $(call Package/nano/install,$1)
+endef
+
  $(eval $(call BuildPackage,nano))
+$(eval $(call BuildPackage,nano-plus))
  
diff --git a/utils/open2300/Makefile b/utils/open2300/Makefile

index fcbf5d8e0c50da12a922cace1a782ed4a23679f5..89593f5da5335ab563b21fe220a3f35ee46e9030 100644 (file)
--- a/utils/open2300/Makefile
+++ b/utils/open2300/Makefile
@@ -12,7 +12,7 @@ include $(TOPDIR)/rules.mk
  PKG_NAME:=open2300
  PKG_SOURCE_DATE:=2014-03-04
  PKG_SOURCE_VERSION:=1af8ae609da66f8e1b745533c19095c9758bfb0b
-PKG_RELEASE:=2
+PKG_RELEASE:=3
  
  PKG_SOURCE_PROTO:=git
  PKG_SOURCE_URL:=https://github.com/wezm/open2300
@@ -35,6 +35,9 @@ define Package/open2300/description
    This is an utility suite used to communicate with and collect data from a WS23XX wheather station.
  endef
  
+MAKE_FLAGS += \
+       UNAME=Linux
+
  define Package/open2300/install
         $(INSTALL_DIR) $(1)/usr/bin
         $(INSTALL_BIN) $(PKG_BUILD_DIR)/bin2300         $(1)/usr/bin/
diff --git a/utils/reptyr/Makefile b/utils/reptyr/Makefile

index 83dd6ba3ebf9559dbd52827f5bdcb90e94299f3a..191020747cf83b2628771c3df276f746691b09b9 100644 (file)
--- a/utils/reptyr/Makefile
+++ b/utils/reptyr/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
  
  PKG_NAME:=reptyr
  PKG_VERSION:=0.8.0
-PKG_RELEASE:=4
+PKG_RELEASE:=5
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
  PKG_SOURCE_URL:=https://github.com/nelhage/reptyr/archive/
@@ -34,6 +34,7 @@ define Package/reptyr/description
  endef
  
  MAKE_FLAGS+= \
+       UNAME_S=Linux \
         PREFIX=/usr
  
  define Package/reptyr/install
diff --git a/utils/sane-backends/Makefile b/utils/sane-backends/Makefile

index 82acefcb253f3ff805cb14b5ac2aae4e6b6da7de..67f035eb0af888f1a9d0277415bcc5485b3ee163 100644 (file)
--- a/utils/sane-backends/Makefile
+++ b/utils/sane-backends/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
  
  PKG_NAME:=sane-backends
  PKG_VERSION:=1.0.32
-PKG_RELEASE:=2
+PKG_RELEASE:=3
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
  PKG_SOURCE_URL:=https://gitlab.com/sane-project/backends/uploads/104f09c07d35519cc8e72e604f11643f
@@ -238,7 +238,7 @@ define Package/sane-frontends/install
  endef
  
  define Package/sane-backends-all/install
-       /bin/true
+       true
  endef
  
  define Build/InstallDev
diff --git a/utils/sockread/Makefile b/utils/sockread/Makefile

index d3c15d468a0079acffd6b73505dabf4898d19ad1..52daf82b1fec096ad22ec9c73dce38ae768c0374 100644 (file)
--- a/utils/sockread/Makefile
+++ b/utils/sockread/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
  
  PKG_NAME:=sockread
  PKG_VERSION:=1.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
  PKG_LICENSE:=CC0-1.0
  
  include $(INCLUDE_DIR)/package.mk
diff --git a/utils/sockread/src/main.c b/utils/sockread/src/main.c

index 06c21def4dbcb7234fa72f35fb118cbb410db2cd..c685bce71b89ce4eb9f9156bca6596f74bb85812 100644 (file)
--- a/utils/sockread/src/main.c
+++ b/utils/sockread/src/main.c
@@ -1,4 +1,4 @@
-
+#include <string.h>
  #include <stdio.h>
  #include <stdlib.h>
  #include <errno.h>
diff --git a/utils/stress-ng/Makefile b/utils/stress-ng/Makefile

index 4cc799365c19e8efd10d2da05750f9efb87097ed..2ae580036e26a051bd0bcf437c3581d5f74d103c 100644 (file)
--- a/utils/stress-ng/Makefile
+++ b/utils/stress-ng/Makefile
@@ -36,6 +36,9 @@ was designed to exercise various physical subsystems of a computer as well as
  the various operating system kernel interfaces.
  endef
  
+MAKE_FLAGS += \
+       KERNEL=Linux
+
  define Package/stress-ng/install
         $(INSTALL_DIR) $(1)/usr/bin
         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/stress-ng $(1)/usr/bin/
diff --git a/utils/telegraf/Makefile b/utils/telegraf/Makefile

index 9b5c64af095db97ed7935cff491136f7986c4d8e..024f0e1826859b29cd5becb0a0066fa477a00428 100644 (file)
--- a/utils/telegraf/Makefile
+++ b/utils/telegraf/Makefile
@@ -3,12 +3,12 @@
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=telegraf
-PKG_VERSION:=1.21.2
+PKG_VERSION:=1.21.3
  PKG_RELEASE:=1
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
  PKG_SOURCE_URL:=https://codeload.github.com/influxdata/telegraf/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=2a6c0722c6999c438d316d5971502aa79abd92134c265ee0e53596cc125d175b
+PKG_HASH:=c117b930e82969080204382a2aa9df8572d05b18cfa0caf0ff62cb840af5ce71
  
  PKG_MAINTAINER:=Jonathan Pagel <jonny_tischbein@systemli.org>
  PKG_LICENSE:=MIT
diff --git a/utils/yq/Makefile b/utils/yq/Makefile

index ca332f279aea4d9e59ce38d9ec98bdde751b18dc..2af4ee1b7b4a2a1805a4e55073935db6191c2fb2 100644 (file)
--- a/utils/yq/Makefile
+++ b/utils/yq/Makefile
@@ -1,12 +1,12 @@
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=yq
-PKG_VERSION:=4.16.2
+PKG_VERSION:=4.18.1
  PKG_RELEASE:=$(AUTORELEASE)
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
  PKG_SOURCE_URL:=https://codeload.github.com/mikefarah/yq/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=beb0f292d8375cddb82d25f11f5c203073c1d3e2437807450ddcad31758be8aa
+PKG_HASH:=9883f6292fc5b2cc697a2f7f7441965948545831265af8dad51a4b12696be086
  
  PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
  PKG_LICENSE:=MIT
author	Josef Schlehofer <pepe.schlehofer@gmail.com>
	Wed, 2 Feb 2022 10:10:47 +0000 (11:10 +0100)
committer	GitHub <noreply@github.com>
	Wed, 2 Feb 2022 10:10:47 +0000 (11:10 +0100)
lang/lyaml/Makefile		patch \| blob \| history
lang/node/Makefile		patch \| blob \| history
lang/php8/Makefile		patch \| blob \| history
lang/php8/patches/0025-php-5.4.9-fixheader.patch		patch \| blob \| history
lang/php8/patches/1004-disable-phar-command.patch		patch \| blob \| history
lang/python/micropython/Makefile		patch \| blob \| history
lang/python/micropython/patches/000-Makefile-no-errors.patch		patch \| blob \| history
lang/python/micropython/patches/030-target-no-darwin.patch		patch \| blob \| history
lang/tcl/Makefile		patch \| blob \| history
libs/flac/Makefile		patch \| blob \| history
libs/libdrm/patches/010-64bit.patch	[new file with mode: 0644]	patch \| blob
libs/libowfat/Makefile		patch \| blob \| history
libs/libradiotap/patches/010-format.patch	[new file with mode: 0644]	patch \| blob
libs/mtdev/Makefile		patch \| blob \| history
libs/mtdev/patches/010-format.patch	[new file with mode: 0644]	patch \| blob
mail/postfix/Makefile		patch \| blob \| history
mail/postfix/patches/500-crosscompile.patch		patch \| blob \| history
multimedia/gerbera/patches/010-fmt.patch	[new file with mode: 0644]	patch \| blob
multimedia/tvheadend/Makefile		patch \| blob \| history
net/bind/Makefile		patch \| blob \| history
net/bridge-utils/Makefile		patch \| blob \| history
net/bridge-utils/patches/010-limits.patch	[new file with mode: 0644]	patch \| blob
net/chaosvpn/Makefile		patch \| blob \| history
net/clamav/Makefile		patch \| blob \| history
net/clamav/patches/100-cmake-fix-findcurses.patch	[new file with mode: 0644]	patch \| blob
net/coova-chilli/Makefile		patch \| blob \| history
net/coova-chilli/files/chilli.hotplug	[deleted file]	patch \| blob \| history
net/coova-chilli/files/chilli.init		patch \| blob \| history
net/crowdsec/Makefile		patch \| blob \| history
net/ddns-scripts/Makefile		patch \| blob \| history
net/ddns-scripts/files/usr/lib/ddns/update_one_com.sh	[new file with mode: 0644]	patch \| blob
net/ddns-scripts/files/usr/share/ddns/default/one.com.json	[new file with mode: 0644]	patch \| blob
net/ddns-scripts/samples/update_sample.sh		patch \| blob \| history
net/dnsproxy/Makefile		patch \| blob \| history
net/isc-dhcp/Makefile		patch \| blob \| history
net/isc-dhcp/files/dhcpd.init		patch \| blob \| history
net/isc-dhcp/patches/510-bind-CC.patch		patch \| blob \| history
net/isc-dhcp/patches/520-bind-no-catgets.patch		patch \| blob \| history
net/knxd/Makefile		patch \| blob \| history
net/knxd/patches/101_add_clang_suport_as_build_cc.patch	[new file with mode: 0644]	patch \| blob
net/linuxptp/Makefile		patch \| blob \| history
net/linuxptp/patches/010-64bit.patch	[new file with mode: 0644]	patch \| blob
net/miniupnpd/Makefile		patch \| blob \| history
net/nut/Makefile		patch \| blob \| history
net/pdns/Makefile		patch \| blob \| history
net/pdns/files/pdns.conf-dist		patch \| blob \| history
net/pdns/patches/100-pdns-disable-pdns.conf-dist.patch		patch \| blob \| history
net/prosody/Makefile		patch \| blob \| history
net/proxychains-ng/Makefile		patch \| blob \| history
net/radsecproxy/Makefile		patch \| blob \| history
net/radsecproxy/patches/300-uninit.patch	[new file with mode: 0644]	patch \| blob
net/samba4/Makefile		patch \| blob \| history
net/samba4/patches/011-samba-4-14-disable-python-module-host-check.patch	[new file with mode: 0644]	patch \| blob
net/samba4/patches/101-do-not-check-xsltproc-manpages.patch		patch \| blob \| history
net/softethervpn/Makefile		patch \| blob \| history
net/softethervpn/patches/140_allow-to-redefine-ar-and-ranlib.patch	[new file with mode: 0644]	patch \| blob
net/strongswan/Makefile		patch \| blob \| history
net/strongswan/patches/0900-src-Patch-for-building-with-musl-on-openwrt-taken-ve.patch		patch \| blob \| history
net/strongswan/patches/0904-gmpdh-Plugin-that-implements-gmp-DH-functions-in-an-.patch		patch \| blob \| history
net/vnstat2/Makefile		patch \| blob \| history
net/vnstat2/patches/100-noexit.patch		patch \| blob \| history
net/wg-installer/Makefile		patch \| blob \| history
net/wg-installer/wg-server/hotplug.d/99-mesh-babeld		patch \| blob \| history
sound/fdk-aac/Makefile		patch \| blob \| history
sound/fdk-aac/patches-free/050-inline.patch	[new file with mode: 0644]	patch \| blob
sound/fdk-aac/patches/010-inline.patch	[new file with mode: 0644]	patch \| blob
utils/auc/src/auc.c		patch \| blob \| history
utils/bluelog/Makefile		patch \| blob \| history
utils/canutils/patches/010-sane.patch	[new file with mode: 0644]	patch \| blob
utils/cmdpad/Makefile		patch \| blob \| history
utils/cmdpad/patches/160-format.patch	[new file with mode: 0644]	patch \| blob
utils/collectd/Makefile		patch \| blob \| history
utils/conmon/Makefile		patch \| blob \| history
utils/crun/Makefile		patch \| blob \| history
utils/fakeuname/Makefile	[new file with mode: 0644]	patch \| blob
utils/fakeuname/fakeuname.mk	[new file with mode: 0644]	patch \| blob
utils/fakeuname/src/footer.py.inc	[new file with mode: 0644]	patch \| blob
utils/fakeuname/src/header.py.inc	[new file with mode: 0644]	patch \| blob
utils/gpsd/Makefile		patch \| blob \| history
utils/gpsd/patches/003_sconscript-cross-platform-build-support.patch	[new file with mode: 0644]	patch \| blob
utils/hdparm/patches/020-64bit.patch	[new file with mode: 0644]	patch \| blob
utils/lrzsz/Makefile		patch \| blob \| history
utils/lrzsz/patches/200-format.patch	[new file with mode: 0644]	patch \| blob
utils/nano/Makefile		patch \| blob \| history
utils/open2300/Makefile		patch \| blob \| history
utils/reptyr/Makefile		patch \| blob \| history
utils/sane-backends/Makefile		patch \| blob \| history
utils/sockread/Makefile		patch \| blob \| history
utils/sockread/src/main.c		patch \| blob \| history
utils/stress-ng/Makefile		patch \| blob \| history
utils/telegraf/Makefile		patch \| blob \| history
utils/yq/Makefile		patch \| blob \| history