include $(TOPDIR)/rules.mk
PKG_NAME:=netdata
-PKG_VERSION:=1.9.0
+PKG_VERSION:=1.10.0
PKG_RELEASE:=1
PKG_MAINTAINER:=
PKG_LICENSE:=GPL-3.0
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://github.com/firehol/netdata/releases/download/v$(PKG_VERSION)
-PKG_HASH:=2358f2239e2d62da82af9f8b9ec8e6b1d37ac6cb009a15cf4c1d2cc2638a87e7
+PKG_HASH:=0514fc002c5c5fb730156b3fe928965b22327833c6c17e22b7097eda657e77a2
PKG_INSTALL:=1
PKG_FIXUP:=autoreconf
# You can uncomment and change any of the options below.
# The value shown in the commented settings, is the default value.
#
-# Notes about plugins
-#
-# tc - QoS stats (if wanted)
-# cgcroups - No support in OpenWRT/LEDE by default
-# charts.d - REQUIRES bash, enable here and edit charts.d.conf
-# node.d - REQUIRES node.js
-# python.d - REQUIRES python and PyYAML, edit python.d.conf to enable
-# apps - none atm
-# health - Disabled by default
-# KSM - No support in OpenWRT/LEDE by default
# global netdata configuration
[global]
# glibc malloc arena max for plugins = 1
- # glibc malloc arena max for netdata = 1
+ # hostname = LEDE
+ # history = 4036
+ update every = 2
# config directory = /etc/netdata
- # plugins directory = /usr/libexec/netdata/plugins.d
+ # log directory = /var/log/netdata
# web files directory = /usr/share/netdata/web
# cache directory = /var/cache/netdata
# lib directory = /var/lib/netdata
- # log directory = /var/log/netdata
- # host access prefix =
# home directory = /var/cache/netdata
- # debug flags = 0x00000000
+ # plugins directory = "/usr/lib/netdata/plugins.d" "/etc/netdata/custom-plugins.d"
+ # memory mode = save
+ # host access prefix =
memory deduplication (ksm) = no
+ # TZ environment variable = :/etc/localtime
+ # timezone = UTC
+ # debug flags = 0x0000000000000000
debug log = syslog
error log = syslog
access log = none
# errors flood protection period = 1200
# errors to trigger flood protection = 200
- memory mode = ram
- # hostname = LEDE
- # history = 3600
- # update every = 1
- update every = 2
- # pthread stack size = 8388608
- run as user = nobody
+ run as user = root
+ # OOM score = 1000
+ # process scheduling policy = idle
+ # process nice level = 19
+ # pthread stack size = 81920
+ # cleanup obsolete charts after seconds = 3600
+ # gap when lost iterations above = 1
+ # cleanup orphan hosts after seconds = 3600
+ # delete obsolete charts files = yes
+ # delete orphan hosts files = yes
[web]
- web files owner = root
- web files group = root
+ # mode = static-threaded
+ # listen backlog = 4096
# default port = 19999
# bind to = *
+ # web files owner = nobody
+ # web files group = nogroup
+ # disconnect idle clients after seconds = 60
+ # timeout for first request = 60
+ # respect do not track policy = no
+ # x-frame-options response header =
+ allow connections from = localhost 10.* 192.168.* 172.16.* 172.17.* 172.18.* 172.19.* 172.20.* 172.21.* 172.22.* 172.23.* 172.24.* 172.25.* 172.26.* 172.27.* 172.28.* 172.29.* 172.30.* 172.31.*
+ allow dashboard from = localhost 10.* 192.168.* 172.16.* 172.17.* 172.18.* 172.19.* 172.20.* 172.21.* 172.22.* 172.23.* 172.24.* 172.25.* 172.26.* 172.27.* 172.28.* 172.29.* 172.30.* 172.31.*
+ # allow badges from = *
+ # allow streaming from = *
+ # allow netdata.conf from = localhost fd* 10.* 192.168.* 172.16.* 172.17.* 172.18.* 172.19.* 172.20.* 172.21.* 172.22.* 172.23.* 172.24.* 172.25.* 172.26.* 172.27.* 172.28.* 172.29.* 172.30.* 172.31.*
+ # enable gzip compression = yes
+ # gzip compression strategy = default
+ # gzip compression level = 3
+ # web server threads = 2
+ # web server max sockets = 512
[plugins]
- # PATH environment variable = /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin
- tc = no
- # idlejitter = yes
+ # PATH environment variable = /usr/sbin:/usr/bin:/sbin:/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin
+ # PYTHONPATH environment variable =
# proc = yes
# diskspace = yes
- cgroups = no
- # checks = no
- # plugins directory = /usr/libexec/netdata/plugins.d
- enable running new plugins = no
+ # cgroups = yes
+ # tc = yes
+ # idlejitter = yes
+ # enable running new plugins = yes
# check for new plugins every = 60
+ apps = no
charts.d = no
- # plugins directory = /usr/libexec/netdata/plugins.d
+ fping = no
node.d = no
python.d = no
- apps = no
- fping = no
-
-[registry]
- # enabled = no
- # registry db directory = /var/lib/netdata/registry
- # netdata unique id file = /var/lib/netdata/registry/netdata.public.unique.id
- # registry db file = /var/lib/netdata/registry/registry.db
- # registry log file = /var/lib/netdata/registry/registry-log.db
- # registry save db every new entries = 1000000
- # registry expire idle persons days = 365
- # registry domain =
- # registry to announce = https://registry.my-netdata.io
- # registry hostname = LEDE
- # verify browser cookies support = yes
- # max URL length = 1024
- # max URL name length = 50
[health]
enabled = no
- # health db directory = /var/lib/netdata/health
- # health db file = /var/lib/netdata/health/health-log.db
- # health configuration directory = /etc/netdata/health.d
- # script to execute on alarm = /usr/libexec/netdata/plugins.d/alarm-notify.sh
# in memory max health log entries = 1000
+ # script to execute on alarm = /usr/lib/netdata/plugins.d/alarm-notify.sh
+ # health configuration directory = /etc/netdata/health.d
# run at least every seconds = 10
+ # postpone alarms during hibernation for seconds = 60
# rotate log every lines = 2000
-[backend]
- # enabled = no
- # data source = average
- # type = graphite
- # destination = localhost
- # prefix = netdata
- # hostname = LEDE
- # update every = 10
- # buffer on failures = 10
- # timeout ms = 20000
-
-# per plugin configuration
-
-[plugin:fping]
- # update every = 1
- # command options =
-
-[plugin:proc]
- # netdata server resources = yes
- # /proc/stat = yes
- # /proc/uptime = yes
- # /proc/loadavg = yes
- # /proc/sys/kernel/random/entropy_avail = yes
- # /proc/interrupts = yes
- # /proc/softirqs = yes
- # /proc/vmstat = yes
- # /proc/meminfo = yes
- /sys/kernel/mm/ksm = no
- /sys/devices/system/edac/mc = no
- /sys/devices/system/node = no
- # /proc/net/dev = yes
- /proc/net/netstat = no
- /proc/net/snmp = no
- /proc/net/snmp6 = no
- /proc/net/softnet_stat = no
- /proc/net/ip_vs/stats = no
- # /proc/net/stat/conntrack = yes
- /proc/net/stat/synproxy = no
- # /proc/diskstats = yes
- /proc/net/rpc/nfsd = no
- /proc/net/rpc/nfs = no
- # ipc = yes
- /proc/spl/kstat/zfs/arcstats = no
-
-[plugin:proc:/proc/stat]
- # cpu utilization = yes
- # per cpu core utilization = yes
- # cpu interrupts = yes
- # context switches = yes
- # processes started = yes
- # processes running = yes
- # filename to monitor = /proc/stat
-[plugin:proc:/proc/interrupts]
- # interrupts per core = yes
- # filename to monitor = /proc/interrupts
-
-[plugin:proc:/proc/softirqs]
- # interrupts per core = yes
- # filename to monitor = /proc/softirqs
-
-[plugin:proc:/proc/net/dev]
- # enable new interfaces detected at runtime = auto
- # bandwidth for all interfaces = auto
- # packets for all interfaces = auto
- # errors for all interfaces = auto
- # drops for all interfaces = auto
- # fifo for all interfaces = auto
- # compressed packets for all interfaces = auto
- # frames, collisions, carrier counters for all interfaces = auto
- # disable by default interfaces matching = lo fireqos* *-ifb
- # filename to monitor = /proc/net/dev
-
-[plugin:proc:/proc/net/dev:eth0]
- # enabled = yes
- # bandwidth = auto
- # packets = auto
- # errors = auto
- # drops = auto
- # fifo = auto
- # compressed = auto
- # events = auto
-
-[plugin:proc:/proc/diskstats]
- # enable new disks detected at runtime = yes
- # performance metrics for physical disks = auto
- # performance metrics for virtual disks = auto
- # performance metrics for partitions = no
- # bandwidth for all disks = auto
- # operations for all disks = auto
- # merged operations for all disks = auto
- # i/o time for all disks = auto
- # queued operations for all disks = auto
- # utilization percentage for all disks = auto
- # backlog for all disks = auto
- # filename to monitor = /proc/diskstats
- # path to get block device infos = /sys/dev/block/%lu:%lu/%s
- # path to get h/w sector size = /sys/block/%s/queue/hw_sector_size
- # path to get h/w sector size for partitions = /sys/dev/block/%lu:%lu/subsystem/%s/../queue/hw_sector_size
- # performance metrics for disks with major 8 = yes
-
-[plugin:proc:/proc/diskstats:sda]
- # enable = yes
- # enable performance metrics = yes
- # bandwidth = auto
- # operations = auto
- # merged operations = auto
- # i/o time = auto
- # queued operations = auto
- # utilization percentage = auto
- # backlog = auto
-
-[plugin:proc:/proc/net/rpc/nfsd]
- # filename to monitor = /proc/net/rpc/nfsd
- # read cache = yes
- # file handles = yes
- # I/O = yes
- # threads = yes
- # read ahead = yes
- # network = yes
- # rpc = yes
- # NFS v2 procedures = yes
- # NFS v3 procedures = yes
- # NFS v4 procedures = yes
- # NFS v4 operations = yes
+[statsd]
+ enabled = no
+ # update every (flushInterval) = 1
+ # udp messages to process at once = 10
+ # create private charts for metrics matching = *
+ # max private charts allowed = 200
+ # max private charts hard limit = 1000
+ # private charts memory mode = save
+ # private charts history = 4036
+ # decimal detail = 1000
+ # disconnect idle tcp clients after seconds = 600
+ # private charts hidden = no
+ # histograms and timers percentile (percentThreshold) = 95.00000
+ # add dimension for number of events received = yes
+ # gaps on gauges (deleteGauges) = no
+ # gaps on counters (deleteCounters) = no
+ # gaps on meters (deleteMeters) = no
+ # gaps on sets (deleteSets) = no
+ # gaps on histograms (deleteHistograms) = no
+ # gaps on timers (deleteTimers) = no
+ # statsd server max TCP sockets = 256
+ # listen backlog = 4096
+ # default port = 8125
+ # bind to = udp:localhost tcp:localhost
-[plugin:proc:/proc/net/rpc/nfs]
- # filename to monitor = /proc/net/rpc/nfs
- # network = yes
- # rpc = yes
- # NFS v2 procedures = yes
- # NFS v3 procedures = yes
- # NFS v4 procedures = yes
include $(TOPDIR)/rules.mk
PKG_NAME:=ldbus
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_MIRROR_HASH:=0e39a80e126a77a937226e49ae0246e1fd4600a03dee6bdee5ac822963a234e1
PKG_SOURCE_PROTO:=git
PKG_MAINTAINER:=Enrico Mioso <mrkiko.rs@gmail.com>
PKG_LICENSE:=MIT
-PKG_FLAGS := nonshared
-
PKG_BUILD_DEPENDS:=luarocks/host
include $(INCLUDE_DIR)/package.mk
include $(TOPDIR)/rules.mk
PKG_NAME:=php
-PKG_VERSION:=7.2.3
-PKG_RELEASE:=1
+PKG_VERSION:=7.2.4
+PKG_RELEASE:=2
PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de>
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=http://www.php.net/distributions/
-PKG_HASH:=b3a94f1b562f413c0b96f54bc309706d83b29ac65d9b172bc7ed9fb40a5e651f
+PKG_HASH:=7916b1bd148ddfd46d7f8f9a517d4b09cd8a8ad9248734e7c8dd91ef17057a88
PKG_FIXUP:=libtool autoreconf
PKG_BUILD_PARALLEL:=1
--- /dev/null
+From 8d35a423838eb462cd39ee535c5d003073cc5f22 Mon Sep 17 00:00:00 2001
+From: Anatol Belski <ab@php.net>
+Date: Sat, 31 Mar 2018 18:51:03 +0200
+Subject: [PATCH] Utilize the recommended way to handle the icu namespace
+
+---
+ ext/intl/breakiterator/breakiterator_class.cpp | 1 +
+ ext/intl/breakiterator/breakiterator_class.h | 2 ++
+ ext/intl/breakiterator/breakiterator_methods.cpp | 2 ++
+ ext/intl/breakiterator/codepointiterator_internal.cpp | 2 ++
+ ext/intl/breakiterator/codepointiterator_internal.h | 3 +++
+ ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp | 3 +++
+ ext/intl/calendar/calendar_class.cpp | 3 +++
+ ext/intl/calendar/calendar_class.h | 2 ++
+ ext/intl/calendar/calendar_methods.cpp | 2 ++
+ ext/intl/calendar/gregoriancalendar_methods.cpp | 7 +++++++
+ ext/intl/common/common_date.cpp | 3 +++
+ ext/intl/common/common_date.h | 2 ++
+ ext/intl/common/common_enum.h | 1 +
+ ext/intl/dateformat/dateformat_format_object.cpp | 6 ++++++
+ ext/intl/dateformat/dateformat_helpers.cpp | 2 ++
+ ext/intl/dateformat/dateformat_helpers.h | 5 +++++
+ ext/intl/intl_convertcpp.h | 2 ++
+ ext/intl/msgformat/msgformat_helpers.cpp | 10 ++++++++++
+ ext/intl/timezone/timezone_class.cpp | 2 ++
+ ext/intl/timezone/timezone_class.h | 2 ++
+ ext/intl/timezone/timezone_methods.cpp | 4 ++++
+ 21 files changed, 66 insertions(+)
+
+--- a/ext/intl/breakiterator/breakiterator_class.cpp
++++ b/ext/intl/breakiterator/breakiterator_class.cpp
+@@ -38,6 +38,7 @@ extern "C" {
+ }
+
+ using PHP::CodePointBreakIterator;
++using U_ICU_NAMESPACE::RuleBasedBreakIterator;
+
+ /* {{{ Global variables */
+ zend_class_entry *BreakIterator_ce_ptr;
+--- a/ext/intl/breakiterator/breakiterator_class.h
++++ b/ext/intl/breakiterator/breakiterator_class.h
+@@ -26,6 +26,8 @@
+
+ #ifndef USE_BREAKITERATOR_POINTER
+ typedef void BreakIterator;
++#else
++using U_ICU_NAMESPACE::BreakIterator;
+ #endif
+
+ typedef struct {
+--- a/ext/intl/breakiterator/breakiterator_methods.cpp
++++ b/ext/intl/breakiterator/breakiterator_methods.cpp
+@@ -32,6 +32,8 @@ extern "C" {
+ }
+
+ using PHP::CodePointBreakIterator;
++using U_ICU_NAMESPACE::BreakIterator;
++using U_ICU_NAMESPACE::Locale;
+
+ U_CFUNC PHP_METHOD(BreakIterator, __construct)
+ {
+--- a/ext/intl/breakiterator/codepointiterator_internal.cpp
++++ b/ext/intl/breakiterator/codepointiterator_internal.cpp
+@@ -33,6 +33,8 @@ typedef union {
+
+ using namespace PHP;
+
++using U_ICU_NAMESPACE::UCharCharacterIterator;
++
+ UOBJECT_DEFINE_RTTI_IMPLEMENTATION(CodePointBreakIterator);
+
+ CodePointBreakIterator::CodePointBreakIterator()
+--- a/ext/intl/breakiterator/codepointiterator_internal.h
++++ b/ext/intl/breakiterator/codepointiterator_internal.h
+@@ -18,8 +18,11 @@
+ #define CODEPOINTITERATOR_INTERNAL_H
+
+ #include <unicode/brkiter.h>
++#include <unicode/unistr.h>
+
+ using U_ICU_NAMESPACE::BreakIterator;
++using U_ICU_NAMESPACE::CharacterIterator;
++using U_ICU_NAMESPACE::UnicodeString;
+
+ namespace PHP {
+
+--- a/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp
++++ b/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp
+@@ -26,6 +26,9 @@ extern "C" {
+ #include "../intl_convertcpp.h"
+ #include "../intl_common.h"
+
++using U_ICU_NAMESPACE::RuleBasedBreakIterator;
++using U_ICU_NAMESPACE::Locale;
++
+ static inline RuleBasedBreakIterator *fetch_rbbi(BreakIterator_object *bio) {
+ return (RuleBasedBreakIterator*)bio->biter;
+ }
+--- a/ext/intl/calendar/calendar_class.cpp
++++ b/ext/intl/calendar/calendar_class.cpp
+@@ -34,6 +34,9 @@ extern "C" {
+ #include <assert.h>
+ }
+
++using U_ICU_NAMESPACE::GregorianCalendar;
++using U_ICU_NAMESPACE::Locale;
++
+ /* {{{ Global variables */
+ zend_class_entry *Calendar_ce_ptr;
+ zend_class_entry *GregorianCalendar_ce_ptr;
+--- a/ext/intl/calendar/calendar_class.h
++++ b/ext/intl/calendar/calendar_class.h
+@@ -26,6 +26,8 @@
+
+ #ifndef USE_CALENDAR_POINTER
+ typedef void Calendar;
++#else
++using U_ICU_NAMESPACE::Calendar;
+ #endif
+
+ typedef struct {
+--- a/ext/intl/calendar/calendar_methods.cpp
++++ b/ext/intl/calendar/calendar_methods.cpp
+@@ -40,6 +40,8 @@ extern "C" {
+ }
+ #include "../common/common_enum.h"
+
++using U_ICU_NAMESPACE::Locale;
++
+ U_CFUNC PHP_METHOD(IntlCalendar, __construct)
+ {
+ zend_throw_exception( NULL,
+--- a/ext/intl/calendar/gregoriancalendar_methods.cpp
++++ b/ext/intl/calendar/gregoriancalendar_methods.cpp
+@@ -23,6 +23,8 @@
+ #include <unicode/locid.h>
+ #include <unicode/calendar.h>
+ #include <unicode/gregocal.h>
++#include <unicode/ustring.h>
++
+ extern "C" {
+ #include "../php_intl.h"
+ #include "../intl_common.h"
+@@ -34,6 +36,11 @@ extern "C" {
+ #include "zend_exceptions.h"
+ }
+
++using U_ICU_NAMESPACE::GregorianCalendar;
++using U_ICU_NAMESPACE::Locale;
++using U_ICU_NAMESPACE::UnicodeString;
++using U_ICU_NAMESPACE::StringPiece;
++
+ static inline GregorianCalendar *fetch_greg(Calendar_object *co) {
+ return (GregorianCalendar*)co->ucal;
+ }
+--- a/ext/intl/common/common_date.cpp
++++ b/ext/intl/common/common_date.cpp
+@@ -25,6 +25,9 @@ extern "C" {
+ #include <ext/date/php_date.h>
+ }
+
++using U_ICU_NAMESPACE::TimeZone;
++using U_ICU_NAMESPACE::UnicodeString;
++
+ #include "zend_portability.h"
+
+ /* {{{ timezone_convert_datetimezone
+--- a/ext/intl/common/common_date.h
++++ b/ext/intl/common/common_date.h
+@@ -28,6 +28,8 @@ U_CDECL_END
+
+ #include <unicode/timezone.h>
+
++using U_ICU_NAMESPACE::TimeZone;
++
+ U_CFUNC TimeZone *timezone_convert_datetimezone(int type, void *object, int is_datetime, intl_error *outside_error, const char *func);
+ U_CFUNC int intl_datetime_decompose(zval *z, double *millis, TimeZone **tz,
+ intl_error *err, const char *func);
+--- a/ext/intl/common/common_enum.h
++++ b/ext/intl/common/common_enum.h
+@@ -75,6 +75,7 @@ U_CFUNC zval *zoi_with_current_get_curre
+ U_CFUNC void zoi_with_current_invalidate_current(zend_object_iterator *iter);
+
+ #ifdef __cplusplus
++using U_ICU_NAMESPACE::StringEnumeration;
+ U_CFUNC void IntlIterator_from_StringEnumeration(StringEnumeration *se, zval *object);
+ #endif
+
+--- a/ext/intl/dateformat/dateformat_format_object.cpp
++++ b/ext/intl/dateformat/dateformat_format_object.cpp
+@@ -33,6 +33,12 @@ extern "C" {
+ #include "../common/common_date.h"
+ }
+
++using U_ICU_NAMESPACE::Locale;
++using U_ICU_NAMESPACE::DateFormat;
++using U_ICU_NAMESPACE::GregorianCalendar;
++using U_ICU_NAMESPACE::StringPiece;
++using U_ICU_NAMESPACE::SimpleDateFormat;
++
+ static const DateFormat::EStyle valid_styles[] = {
+ DateFormat::kNone,
+ DateFormat::kFull,
+--- a/ext/intl/dateformat/dateformat_helpers.cpp
++++ b/ext/intl/dateformat/dateformat_helpers.cpp
+@@ -28,6 +28,8 @@ extern "C" {
+ #include "../calendar/calendar_class.h"
+ }
+
++using U_ICU_NAMESPACE::GregorianCalendar;
++
+ int datefmt_process_calendar_arg(zval* calendar_zv,
+ Locale const& locale,
+ const char *func_name,
+--- a/ext/intl/dateformat/dateformat_helpers.h
++++ b/ext/intl/dateformat/dateformat_helpers.h
+@@ -22,11 +22,16 @@
+ #endif
+
+ #include <unicode/calendar.h>
++#include <unicode/datefmt.h>
+
+ extern "C" {
+ #include "../php_intl.h"
+ }
+
++using U_ICU_NAMESPACE::Locale;
++using U_ICU_NAMESPACE::Calendar;
++using U_ICU_NAMESPACE::DateFormat;
++
+ int datefmt_process_calendar_arg(zval* calendar_zv,
+ Locale const& locale,
+ const char *func_name,
+--- a/ext/intl/intl_convertcpp.h
++++ b/ext/intl/intl_convertcpp.h
+@@ -26,6 +26,8 @@
+ #include <unicode/unistr.h>
+ #include <zend_types.h>
+
++using U_ICU_NAMESPACE::UnicodeString;
++
+ int intl_stringFromChar(UnicodeString &ret, char *str, size_t str_len, UErrorCode *status);
+
+ zend_string* intl_charFromString(const UnicodeString &from, UErrorCode *status);
+--- a/ext/intl/msgformat/msgformat_helpers.cpp
++++ b/ext/intl/msgformat/msgformat_helpers.cpp
+@@ -76,6 +76,16 @@ MessageFormatAdapter::getMessagePattern(
+ #endif
+ U_NAMESPACE_END
+
++using U_ICU_NAMESPACE::Formattable;
++using U_ICU_NAMESPACE::Format;
++using U_ICU_NAMESPACE::DateFormat;
++using U_ICU_NAMESPACE::MessageFormat;
++#ifdef HAS_MESSAGE_PATTERN
++using U_ICU_NAMESPACE::MessagePattern;
++#endif
++using U_ICU_NAMESPACE::MessageFormatAdapter;
++using U_ICU_NAMESPACE::FieldPosition;
++
+ U_CFUNC int32_t umsg_format_arg_count(UMessageFormat *fmt)
+ {
+ int32_t fmt_count = 0;
+--- a/ext/intl/timezone/timezone_class.cpp
++++ b/ext/intl/timezone/timezone_class.cpp
+@@ -37,6 +37,8 @@ extern "C" {
+ #include <ext/date/php_date.h>
+ }
+
++using U_ICU_NAMESPACE::Calendar;
++
+ /* {{{ Global variables */
+ U_CDECL_BEGIN
+ zend_class_entry *TimeZone_ce_ptr = NULL;
+--- a/ext/intl/timezone/timezone_class.h
++++ b/ext/intl/timezone/timezone_class.h
+@@ -29,6 +29,8 @@
+
+ #ifndef USE_TIMEZONE_POINTER
+ typedef void TimeZone;
++#else
++using U_ICU_NAMESPACE::TimeZone;
+ #endif
+
+ typedef struct {
+--- a/ext/intl/timezone/timezone_methods.cpp
++++ b/ext/intl/timezone/timezone_methods.cpp
+@@ -23,6 +23,7 @@
+ #include <unicode/locid.h>
+ #include <unicode/timezone.h>
+ #include <unicode/ustring.h>
++#include <unicode/calendar.h>
+ #include "intl_convertcpp.h"
+
+ #include "../common/common_date.h"
+@@ -37,6 +38,9 @@ extern "C" {
+ }
+ #include "common/common_enum.h"
+
++using U_ICU_NAMESPACE::Locale;
++using U_ICU_NAMESPACE::Calendar;
++
+ U_CFUNC PHP_METHOD(IntlTimeZone, __construct)
+ {
+ zend_throw_exception( NULL,
--- /dev/null
+From d8200e48857aeaf09f7127751efc5632ef7660a7 Mon Sep 17 00:00:00 2001
+From: Anatol Belski <ab@php.net>
+Date: Sun, 1 Apr 2018 01:03:40 +0200
+Subject: [PATCH] Simplify namespace access
+
+The icu namespace is an alias which resolves to the real namespace.
+---
+ ext/intl/breakiterator/breakiterator_class.cpp | 2 +-
+ ext/intl/breakiterator/breakiterator_class.h | 2 +-
+ ext/intl/breakiterator/breakiterator_methods.cpp | 4 ++--
+ ext/intl/breakiterator/codepointiterator_internal.cpp | 2 +-
+ ext/intl/breakiterator/codepointiterator_internal.h | 6 +++---
+ ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp | 4 ++--
+ ext/intl/calendar/calendar_class.cpp | 4 ++--
+ ext/intl/calendar/calendar_class.h | 2 +-
+ ext/intl/calendar/calendar_methods.cpp | 2 +-
+ ext/intl/calendar/gregoriancalendar_methods.cpp | 8 ++++----
+ ext/intl/common/common_date.cpp | 4 ++--
+ ext/intl/common/common_date.h | 2 +-
+ ext/intl/common/common_enum.h | 2 +-
+ ext/intl/dateformat/dateformat_format_object.cpp | 10 +++++-----
+ ext/intl/dateformat/dateformat_helpers.cpp | 2 +-
+ ext/intl/dateformat/dateformat_helpers.h | 6 +++---
+ ext/intl/intl_convertcpp.h | 2 +-
+ ext/intl/msgformat/msgformat_helpers.cpp | 14 +++++++-------
+ ext/intl/timezone/timezone_class.cpp | 2 +-
+ ext/intl/timezone/timezone_class.h | 2 +-
+ ext/intl/timezone/timezone_methods.cpp | 4 ++--
+ 21 files changed, 43 insertions(+), 43 deletions(-)
+
+--- a/ext/intl/breakiterator/breakiterator_class.cpp
++++ b/ext/intl/breakiterator/breakiterator_class.cpp
+@@ -38,7 +38,7 @@ extern "C" {
+ }
+
+ using PHP::CodePointBreakIterator;
+-using U_ICU_NAMESPACE::RuleBasedBreakIterator;
++using icu::RuleBasedBreakIterator;
+
+ /* {{{ Global variables */
+ zend_class_entry *BreakIterator_ce_ptr;
+--- a/ext/intl/breakiterator/breakiterator_class.h
++++ b/ext/intl/breakiterator/breakiterator_class.h
+@@ -27,7 +27,7 @@
+ #ifndef USE_BREAKITERATOR_POINTER
+ typedef void BreakIterator;
+ #else
+-using U_ICU_NAMESPACE::BreakIterator;
++using icu::BreakIterator;
+ #endif
+
+ typedef struct {
+--- a/ext/intl/breakiterator/breakiterator_methods.cpp
++++ b/ext/intl/breakiterator/breakiterator_methods.cpp
+@@ -32,8 +32,8 @@ extern "C" {
+ }
+
+ using PHP::CodePointBreakIterator;
+-using U_ICU_NAMESPACE::BreakIterator;
+-using U_ICU_NAMESPACE::Locale;
++using icu::BreakIterator;
++using icu::Locale;
+
+ U_CFUNC PHP_METHOD(BreakIterator, __construct)
+ {
+--- a/ext/intl/breakiterator/codepointiterator_internal.cpp
++++ b/ext/intl/breakiterator/codepointiterator_internal.cpp
+@@ -33,7 +33,7 @@ typedef union {
+
+ using namespace PHP;
+
+-using U_ICU_NAMESPACE::UCharCharacterIterator;
++using icu::UCharCharacterIterator;
+
+ UOBJECT_DEFINE_RTTI_IMPLEMENTATION(CodePointBreakIterator);
+
+--- a/ext/intl/breakiterator/codepointiterator_internal.h
++++ b/ext/intl/breakiterator/codepointiterator_internal.h
+@@ -20,9 +20,9 @@
+ #include <unicode/brkiter.h>
+ #include <unicode/unistr.h>
+
+-using U_ICU_NAMESPACE::BreakIterator;
+-using U_ICU_NAMESPACE::CharacterIterator;
+-using U_ICU_NAMESPACE::UnicodeString;
++using icu::BreakIterator;
++using icu::CharacterIterator;
++using icu::UnicodeString;
+
+ namespace PHP {
+
+--- a/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp
++++ b/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp
+@@ -26,8 +26,8 @@ extern "C" {
+ #include "../intl_convertcpp.h"
+ #include "../intl_common.h"
+
+-using U_ICU_NAMESPACE::RuleBasedBreakIterator;
+-using U_ICU_NAMESPACE::Locale;
++using icu::RuleBasedBreakIterator;
++using icu::Locale;
+
+ static inline RuleBasedBreakIterator *fetch_rbbi(BreakIterator_object *bio) {
+ return (RuleBasedBreakIterator*)bio->biter;
+--- a/ext/intl/calendar/calendar_class.cpp
++++ b/ext/intl/calendar/calendar_class.cpp
+@@ -34,8 +34,8 @@ extern "C" {
+ #include <assert.h>
+ }
+
+-using U_ICU_NAMESPACE::GregorianCalendar;
+-using U_ICU_NAMESPACE::Locale;
++using icu::GregorianCalendar;
++using icu::Locale;
+
+ /* {{{ Global variables */
+ zend_class_entry *Calendar_ce_ptr;
+--- a/ext/intl/calendar/calendar_class.h
++++ b/ext/intl/calendar/calendar_class.h
+@@ -27,7 +27,7 @@
+ #ifndef USE_CALENDAR_POINTER
+ typedef void Calendar;
+ #else
+-using U_ICU_NAMESPACE::Calendar;
++using icu::Calendar;
+ #endif
+
+ typedef struct {
+--- a/ext/intl/calendar/calendar_methods.cpp
++++ b/ext/intl/calendar/calendar_methods.cpp
+@@ -40,7 +40,7 @@ extern "C" {
+ }
+ #include "../common/common_enum.h"
+
+-using U_ICU_NAMESPACE::Locale;
++using icu::Locale;
+
+ U_CFUNC PHP_METHOD(IntlCalendar, __construct)
+ {
+--- a/ext/intl/calendar/gregoriancalendar_methods.cpp
++++ b/ext/intl/calendar/gregoriancalendar_methods.cpp
+@@ -36,10 +36,10 @@ extern "C" {
+ #include "zend_exceptions.h"
+ }
+
+-using U_ICU_NAMESPACE::GregorianCalendar;
+-using U_ICU_NAMESPACE::Locale;
+-using U_ICU_NAMESPACE::UnicodeString;
+-using U_ICU_NAMESPACE::StringPiece;
++using icu::GregorianCalendar;
++using icu::Locale;
++using icu::UnicodeString;
++using icu::StringPiece;
+
+ static inline GregorianCalendar *fetch_greg(Calendar_object *co) {
+ return (GregorianCalendar*)co->ucal;
+--- a/ext/intl/common/common_date.cpp
++++ b/ext/intl/common/common_date.cpp
+@@ -25,8 +25,8 @@ extern "C" {
+ #include <ext/date/php_date.h>
+ }
+
+-using U_ICU_NAMESPACE::TimeZone;
+-using U_ICU_NAMESPACE::UnicodeString;
++using icu::TimeZone;
++using icu::UnicodeString;
+
+ #include "zend_portability.h"
+
+--- a/ext/intl/common/common_date.h
++++ b/ext/intl/common/common_date.h
+@@ -28,7 +28,7 @@ U_CDECL_END
+
+ #include <unicode/timezone.h>
+
+-using U_ICU_NAMESPACE::TimeZone;
++using icu::TimeZone;
+
+ U_CFUNC TimeZone *timezone_convert_datetimezone(int type, void *object, int is_datetime, intl_error *outside_error, const char *func);
+ U_CFUNC int intl_datetime_decompose(zval *z, double *millis, TimeZone **tz,
+--- a/ext/intl/common/common_enum.h
++++ b/ext/intl/common/common_enum.h
+@@ -75,7 +75,7 @@ U_CFUNC zval *zoi_with_current_get_curre
+ U_CFUNC void zoi_with_current_invalidate_current(zend_object_iterator *iter);
+
+ #ifdef __cplusplus
+-using U_ICU_NAMESPACE::StringEnumeration;
++using icu::StringEnumeration;
+ U_CFUNC void IntlIterator_from_StringEnumeration(StringEnumeration *se, zval *object);
+ #endif
+
+--- a/ext/intl/dateformat/dateformat_format_object.cpp
++++ b/ext/intl/dateformat/dateformat_format_object.cpp
+@@ -33,11 +33,11 @@ extern "C" {
+ #include "../common/common_date.h"
+ }
+
+-using U_ICU_NAMESPACE::Locale;
+-using U_ICU_NAMESPACE::DateFormat;
+-using U_ICU_NAMESPACE::GregorianCalendar;
+-using U_ICU_NAMESPACE::StringPiece;
+-using U_ICU_NAMESPACE::SimpleDateFormat;
++using icu::Locale;
++using icu::DateFormat;
++using icu::GregorianCalendar;
++using icu::StringPiece;
++using icu::SimpleDateFormat;
+
+ static const DateFormat::EStyle valid_styles[] = {
+ DateFormat::kNone,
+--- a/ext/intl/dateformat/dateformat_helpers.cpp
++++ b/ext/intl/dateformat/dateformat_helpers.cpp
+@@ -28,7 +28,7 @@ extern "C" {
+ #include "../calendar/calendar_class.h"
+ }
+
+-using U_ICU_NAMESPACE::GregorianCalendar;
++using icu::GregorianCalendar;
+
+ int datefmt_process_calendar_arg(zval* calendar_zv,
+ Locale const& locale,
+--- a/ext/intl/dateformat/dateformat_helpers.h
++++ b/ext/intl/dateformat/dateformat_helpers.h
+@@ -28,9 +28,9 @@ extern "C" {
+ #include "../php_intl.h"
+ }
+
+-using U_ICU_NAMESPACE::Locale;
+-using U_ICU_NAMESPACE::Calendar;
+-using U_ICU_NAMESPACE::DateFormat;
++using icu::Locale;
++using icu::Calendar;
++using icu::DateFormat;
+
+ int datefmt_process_calendar_arg(zval* calendar_zv,
+ Locale const& locale,
+--- a/ext/intl/intl_convertcpp.h
++++ b/ext/intl/intl_convertcpp.h
+@@ -26,7 +26,7 @@
+ #include <unicode/unistr.h>
+ #include <zend_types.h>
+
+-using U_ICU_NAMESPACE::UnicodeString;
++using icu::UnicodeString;
+
+ int intl_stringFromChar(UnicodeString &ret, char *str, size_t str_len, UErrorCode *status);
+
+--- a/ext/intl/msgformat/msgformat_helpers.cpp
++++ b/ext/intl/msgformat/msgformat_helpers.cpp
+@@ -76,15 +76,15 @@ MessageFormatAdapter::getMessagePattern(
+ #endif
+ U_NAMESPACE_END
+
+-using U_ICU_NAMESPACE::Formattable;
+-using U_ICU_NAMESPACE::Format;
+-using U_ICU_NAMESPACE::DateFormat;
+-using U_ICU_NAMESPACE::MessageFormat;
++using icu::Formattable;
++using icu::Format;
++using icu::DateFormat;
++using icu::MessageFormat;
+ #ifdef HAS_MESSAGE_PATTERN
+-using U_ICU_NAMESPACE::MessagePattern;
++using icu::MessagePattern;
+ #endif
+-using U_ICU_NAMESPACE::MessageFormatAdapter;
+-using U_ICU_NAMESPACE::FieldPosition;
++using icu::MessageFormatAdapter;
++using icu::FieldPosition;
+
+ U_CFUNC int32_t umsg_format_arg_count(UMessageFormat *fmt)
+ {
+--- a/ext/intl/timezone/timezone_class.cpp
++++ b/ext/intl/timezone/timezone_class.cpp
+@@ -37,7 +37,7 @@ extern "C" {
+ #include <ext/date/php_date.h>
+ }
+
+-using U_ICU_NAMESPACE::Calendar;
++using icu::Calendar;
+
+ /* {{{ Global variables */
+ U_CDECL_BEGIN
+--- a/ext/intl/timezone/timezone_class.h
++++ b/ext/intl/timezone/timezone_class.h
+@@ -30,7 +30,7 @@
+ #ifndef USE_TIMEZONE_POINTER
+ typedef void TimeZone;
+ #else
+-using U_ICU_NAMESPACE::TimeZone;
++using icu::TimeZone;
+ #endif
+
+ typedef struct {
+--- a/ext/intl/timezone/timezone_methods.cpp
++++ b/ext/intl/timezone/timezone_methods.cpp
+@@ -38,8 +38,8 @@ extern "C" {
+ }
+ #include "common/common_enum.h"
+
+-using U_ICU_NAMESPACE::Locale;
+-using U_ICU_NAMESPACE::Calendar;
++using icu::Locale;
++using icu::Calendar;
+
+ U_CFUNC PHP_METHOD(IntlTimeZone, __construct)
+ {
include $(TOPDIR)/rules.mk
PKG_NAME:=ruby
-PKG_VERSION:=2.5.0
+PKG_VERSION:=2.5.1
PKG_RELEASE:=1
# First two numbes
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://cache.ruby-lang.org/pub/ruby/$(PKG_ABI_VERSION)/
-PKG_HASH:=1da0afed833a0dab94075221a615c14487b05d0c407f991c8080d576d985b49b
+PKG_HASH:=886ac5eed41e3b5fc699be837b0087a6a5a3d10f464087560d2d21b3e71b754d
PKG_MAINTAINER:=Luiz Angelo Daros de Luca <luizluca@gmail.com>
PKG_LICENSE:=BSD-2-Clause
PKG_LICENSE_FILES:=COPYING
include $(TOPDIR)/rules.mk
PKG_NAME:=glib2
-PKG_VERSION:=2.56.0
+PKG_VERSION:=2.56.1
PKG_RELEASE:=1
PKG_SOURCE:=glib-$(PKG_VERSION).tar.xz
PKG_BUILD_DIR:=$(BUILD_DIR)/glib-$(PKG_VERSION)
PKG_SOURCE_URL:=@GNOME/glib/2.56
-PKG_HASH:=ecef6e17e97b8d9150d0e8a4b3edee1ac37331213b8a2a87a083deea408a0fc7
+PKG_HASH:=40ef3f44f2c651c7a31aedee44259809b6f03d3d20be44545cd7d177221c0b8d
PKG_BUILD_PARALLEL:=1
HOST_BUILD_PARALLEL:=1
--- /dev/null
+--- a/gio/gthreadedresolver.c
++++ b/gio/gthreadedresolver.c
+@@ -871,6 +871,8 @@ do_lookup_records (GTask *task,
+
+ #ifdef HAVE_RES_NQUERY
+
++#ifdef HAVE_RES_NQUERY
++
+ #if defined(HAVE_RES_NDESTROY)
+ res_ndestroy (&res);
+ #elif defined(HAVE_RES_NCLOSE)
+@@ -881,6 +883,8 @@ do_lookup_records (GTask *task,
+
+ #endif /* HAVE_RES_NQUERY */
+
++#endif
++
+ #else
+
+ DNS_STATUS status;
include $(TOPDIR)/rules.mk
PKG_NAME:=icu4c
-PKG_VERSION:=60.2
+PKG_VERSION:=61.1
PKG_RELEASE:=1
-PKG_SOURCE:=$(PKG_NAME)-60_2-src.tgz
+PKG_SOURCE:=$(PKG_NAME)-61_1-src.tgz
PKG_SOURCE_URL:=http://download.icu-project.org/files/$(PKG_NAME)/$(PKG_VERSION)
-PKG_HASH:=f073ea8f35b926d70bb33e6577508aa642a8b316a803f11be20af384811db418
+PKG_HASH:=d007f89ae8a2543a53525c74359b65b36412fa84b3349f1400be6dcf409fafef
PKG_LICENSE:=ICU-1.8.1+
PKG_LICENSE_FILES:=LICENSE
CATEGORY:=Libraries
URL:=https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git
TITLE:=Library for interacting with Linux's GPIO character device
- DEPENDS:=@GPIO_SUPPORT
+ DEPENDS:=@GPIO_SUPPORT @(LINUX_4_9||LINUX_4_14)
endef
define Package/libgpiod/description
--- /dev/null
+#
+# Copyright (C) 2017-2018 Daniel Engberg <daniel.engberg.lists@pyret.net>
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libidn2
+PKG_VERSION:=2.0.4
+PKG_RELEASE:=1
+PKG_MAINTAINER:=Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
+PKG_LICENSE:=GPL-2.0-or-later LGPL-3.0-or-later
+PKG_LICENSE_FILES:=COPYING COPYINGv2 COPYING.LESSERv3
+
+PKG_SOURCE_URL:=@GNU/libidn
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_HASH:=644b6b03b285fb0ace02d241d59483d98bc462729d8bb3608d5cad5532f3d2f0
+
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
+
+define Package/idn2/Default
+ SECTION:=net
+ CATEGORY:=Network
+ URL:=http://www.gnu.org/software/libidn/
+endef
+
+define Package/idn2/Default/description
+ Libidn2 is a free software implementation of IDNA2008,
+ Punycode and TR46 in library form. It contains
+ functionality to convert internationalized domain
+ names to and from ASCII Compatible Encoding (ACE),
+ following the IDNA2008 and TR46 standards.
+endef
+
+define Package/idn2
+ $(call Package/idn2/Default)
+ SUBMENU:=IP Addresses and Names
+ TITLE:=GNU IDN2 (Internationalized Domain Name) tool
+ DEPENDS:=+libidn2
+endef
+
+define Package/idn2/description
+$(call Package/idn2/Default/description)
+
+ Command line tool using libidn2
+
+endef
+
+define Package/libidn2
+ SECTION:=libs
+ CATEGORY:=Libraries
+ DEPENDS:=+libunistring $(ICONV_DEPENDS) $(INTL_DEPENDS)
+ TITLE:=International domain name library (IDNA2008, Punycode and TR46)
+ URL:=https://www.gnu.org/software/libidn/#libidn2
+endef
+
+define Package/libidn2/description
+$(call Package/idn2/Default/description)
+
+ Library only package
+
+endef
+
+CONFIGURE_ARGS += \
+ --disable-rpath \
+ --disable-doc
+
+define Build/InstallDev
+ $(INSTALL_DIR) $(1)/usr/include
+ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/idn2.h $(1)/usr/include
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{la,so}* $(1)/usr/lib/
+ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libidn2.pc $(1)/usr/lib/pkgconfig/
+endef
+
+define Package/idn2/install
+ $(INSTALL_DIR) $(1)/usr/bin
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
+endef
+
+define Package/libidn2/install
+ $(INSTALL_DIR) $(1)/usr/lib/
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,idn2))
+$(eval $(call BuildPackage,libidn2))
include $(TOPDIR)/rules.mk
PKG_NAME:=libtirpc
-PKG_VERSION:=1.0.2
+PKG_VERSION:=1.0.3
PKG_RELEASE:=1
PKG_SOURCE_URL:=@SF/libtirpc
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_HASH:=723c5ce92706cbb601a8db09110df1b4b69391643158f20ff587e20e7c5f90f5
+PKG_HASH:=86c3a78fc1bddefa96111dd233124c703b22a78884203c55c3e06b3be6a0fd5e
PKG_MAINTAINER:=Andy Walsh <andy.walsh44+github@gmail.com>
PKG_LICENSE:=BSD-3-Clause
+++ /dev/null
-From 20badc3e3608953fb5b36bb2e16fa51bd731aebc Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 18 Apr 2017 09:35:35 -0700
-Subject: [PATCH] replace __bzero() with memset() API
-
-memset is available across all libc implementation
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Pending
-
- src/des_impl.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/des_impl.c b/src/des_impl.c
-index 9dbccaf..15bec2a 100644
---- a/src/des_impl.c
-+++ b/src/des_impl.c
-@@ -588,7 +588,7 @@ _des_crypt (char *buf, unsigned len, struct desparams *desp)
- }
- tin0 = tin1 = tout0 = tout1 = xor0 = xor1 = 0;
- tbuf[0] = tbuf[1] = 0;
-- __bzero (schedule, sizeof (schedule));
-+ memset (schedule, 0, sizeof (schedule));
-
- return (1);
- }
---
-2.12.2
-
--- /dev/null
+From 7aa1fe6a0f9280571117c30c03c2cc521cd86ec3 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Sat, 23 Jun 2012 21:58:07 +0200
+Subject: [PATCH] uClibc without RPC support and musl does not install rpcent.h
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+[yann.morin.1998@free.fr: update for 0.3.1]
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+[joerg.krause@embedded.rocks: musl fix]
+Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
+[bernd.kuhls@t-online.de: update for 1.0.2]
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ tirpc/rpc/rpcent.h | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/tirpc/rpc/rpcent.h b/tirpc/rpc/rpcent.h
+index 147f909..4a58180 100644
+--- a/tirpc/rpc/rpcent.h
++++ b/tirpc/rpc/rpcent.h
+@@ -48,8 +48,9 @@
+ extern "C" {
+ #endif
+
+-/* These are defined in /usr/include/rpc/netdb.h */
+-#if !defined(__GLIBC__) || defined(__UCLIBC__)
++/* These are defined in /usr/include/rpc/netdb.h, unless we are using
++ the C library without RPC support. */
++#if defined(__UCLIBC__) && !defined(__UCLIBC_HAS_RPC__) || !defined(__GLIBC__)
+ struct rpcent {
+ char *r_name; /* name of server for this rpc program */
+ char **r_aliases; /* alias list */
+--
+1.9.1
+
--- /dev/null
+From 79975eb4104667be85abd06874c258438826b674 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks>
+Date: Fri, 24 Jul 2015 14:45:52 +0200
+Subject: [PATCH] Disable DES authentification support
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+uClibc and musl does not provide DES authentication.
+
+Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
+[peda@axentia.se: update for 1.0.1]
+Signed-off-by: Peter Rosin <peda@axentia.se>
+[bernd.kuhls@t-online.de: update for 1.0.2]
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ src/Makefile.am | 2 +-
+ src/rpc_soc.c | 32 --------------------------------
+ 2 files changed, 1 insertion(+), 33 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 960a522..3a88e31 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -22,9 +22,8 @@ libtirpc_la_SOURCES = auth_none.c auth_unix.c authunix_prot.c bindresvport.c cln
+ pmap_prot.c pmap_prot2.c pmap_rmt.c rpc_prot.c rpc_commondata.c \
+ rpc_callmsg.c rpc_generic.c rpc_soc.c rpcb_clnt.c rpcb_prot.c \
+ rpcb_st_xdr.c svc.c svc_auth.c svc_dg.c svc_auth_unix.c svc_auth_none.c \
+- svc_auth_des.c \
+ svc_generic.c svc_raw.c svc_run.c svc_simple.c svc_vc.c getpeereid.c \
+- auth_des.c authdes_prot.c debug.c des_crypt.c des_impl.c
++ debug.c
+
+ ## XDR
+ libtirpc_la_SOURCES += xdr.c xdr_rec.c xdr_array.c xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c xdr_sizeof.c
+diff --git a/src/svc_auth.c b/src/svc_auth.c
+--- a/src/svc_auth.c
++++ b/src/svc_auth.c
+@@ -114,9 +114,6 @@ _gss_authenticate(rqst, msg, no_dispatch)
+ case AUTH_SHORT:
+ dummy = _svcauth_short(rqst, msg);
+ return (dummy);
+- case AUTH_DES:
+- dummy = _svcauth_des(rqst, msg);
+- return (dummy);
+ #ifdef HAVE_RPCSEC_GSS
+ case RPCSEC_GSS:
+ dummy = _svcauth_gss(rqst, msg, no_dispatch);
+diff --git a/src/rpc_soc.c b/src/rpc_soc.c
+index e146ed4..161a1ec 100644
+--- a/src/rpc_soc.c
++++ b/src/rpc_soc.c
+@@ -522,86 +521,6 @@ clnt_broadcast(prog, vers, proc, xargs, argsp, xresults, resultsp, eachresult)
+ }
+
+ /*
+- * Create the client des authentication object. Obsoleted by
+- * authdes_seccreate().
+- */
+-AUTH *
+-authdes_create(servername, window, syncaddr, ckey)
+- char *servername; /* network name of server */
+- u_int window; /* time to live */
+- struct sockaddr *syncaddr; /* optional hostaddr to sync with */
+- des_block *ckey; /* optional conversation key to use */
+-{
+- AUTH *nauth;
+- char hostname[NI_MAXHOST];
+-
+- if (syncaddr) {
+- /*
+- * Change addr to hostname, because that is the way
+- * new interface takes it.
+- */
+- switch (syncaddr->sa_family) {
+- case AF_INET:
+- if (getnameinfo(syncaddr, sizeof(struct sockaddr_in), hostname,
+- sizeof hostname, NULL, 0, 0) != 0)
+- goto fallback;
+- break;
+- case AF_INET6:
+- if (getnameinfo(syncaddr, sizeof(struct sockaddr_in6), hostname,
+- sizeof hostname, NULL, 0, 0) != 0)
+- goto fallback;
+- break;
+- default:
+- goto fallback;
+- }
+- nauth = authdes_seccreate(servername, window, hostname, ckey);
+- return (nauth);
+- }
+-fallback:
+- return authdes_seccreate(servername, window, NULL, ckey);
+-}
+-
+-/*
+- * Create the client des authentication object. Obsoleted by
+- * authdes_pk_seccreate().
+- */
+-extern AUTH *authdes_pk_seccreate(const char *, netobj *, u_int, const char *,
+- const des_block *, nis_server *);
+-
+-AUTH *
+-authdes_pk_create(servername, pkey, window, syncaddr, ckey)
+- char *servername; /* network name of server */
+- netobj *pkey; /* public key */
+- u_int window; /* time to live */
+- struct sockaddr *syncaddr; /* optional hostaddr to sync with */
+- des_block *ckey; /* optional conversation key to use */
+-{
+- AUTH *nauth;
+- char hostname[NI_MAXHOST];
+-
+- if (syncaddr) {
+- /*
+- * Change addr to hostname, because that is the way
+- * new interface takes it.
+- */
+- switch (syncaddr->sa_family) {
+- case AF_INET:
+- if (getnameinfo(syncaddr, sizeof(struct sockaddr_in), hostname,
+- sizeof hostname, NULL, 0, 0) != 0)
+- goto fallback;
+- break;
+- default:
+- goto fallback;
+- }
+- nauth = authdes_pk_seccreate(servername, pkey, window, hostname, ckey, NULL);
+- return (nauth);
+- }
+-fallback:
+- return authdes_pk_seccreate(servername, pkey, window, NULL, ckey, NULL);
+-}
+-
+-
+-/*
+ * Create a client handle for a unix connection. Obsoleted by clnt_vc_create()
+ */
+ CLIENT *
+--
+2.4.6
+
+++ /dev/null
-From 7aa1fe6a0f9280571117c30c03c2cc521cd86ec3 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Sat, 23 Jun 2012 21:58:07 +0200
-Subject: [PATCH] uClibc without RPC support and musl does not install rpcent.h
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-[yann.morin.1998@free.fr: update for 0.3.1]
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
-[joerg.krause@embedded.rocks: musl fix]
-Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
-[bernd.kuhls@t-online.de: update for 1.0.2]
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
----
- tirpc/rpc/rpcent.h | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/tirpc/rpc/rpcent.h b/tirpc/rpc/rpcent.h
-index 147f909..4a58180 100644
---- a/tirpc/rpc/rpcent.h
-+++ b/tirpc/rpc/rpcent.h
-@@ -48,8 +48,9 @@
- extern "C" {
- #endif
-
--/* These are defined in /usr/include/rpc/netdb.h */
--#if !defined(__GLIBC__) || defined(__UCLIBC__)
-+/* These are defined in /usr/include/rpc/netdb.h, unless we are using
-+ the C library without RPC support. */
-+#if defined(__UCLIBC__) && !defined(__UCLIBC_HAS_RPC__) || !defined(__GLIBC__)
- struct rpcent {
- char *r_name; /* name of server for this rpc program */
- char **r_aliases; /* alias list */
---
-1.9.1
-
+++ /dev/null
-Add key_secretkey_is_set to exported symbols map
-
-key_secret_is_set is a typo in libtirpc map
-Patch taken from
-
-https://sourceforge.net/p/libtirpc/discussion/637321/thread/fd73d431/
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-Index: libtirpc-1.0.1/src/libtirpc.map
-===================================================================
---- libtirpc-1.0.1.orig/src/libtirpc.map
-+++ libtirpc-1.0.1/src/libtirpc.map
-@@ -298,7 +298,7 @@ TIRPC_0.3.2 {
- key_gendes;
- key_get_conv;
- key_setsecret;
-- key_secret_is_set;
-+ key_secretkey_is_set;
- key_setnet;
- netname2host;
- netname2user;
--- /dev/null
+--- a/tirpc/rpc/types.h 2018-03-27
++++ b/tirpc/rpc/types.h 2018-03-27
+@@ -66,7 +66,7 @@ typedef int32_t rpc_inline_t;
+ #define mem_free(ptr, bsize) free(ptr)
+
+
+-#if defined __APPLE_CC__ || defined __FreeBSD__
++#if defined __APPLE_CC__ || defined __FreeBSD__ || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+ # define __u_char_defined
+ # define __daddr_t_defined
+ #endif
+++ /dev/null
-From 79975eb4104667be85abd06874c258438826b674 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks>
-Date: Fri, 24 Jul 2015 14:45:52 +0200
-Subject: [PATCH] Disable DES authentification support
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-uClibc and musl does not provide DES authentication.
-
-Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
-[peda@axentia.se: update for 1.0.1]
-Signed-off-by: Peter Rosin <peda@axentia.se>
-[bernd.kuhls@t-online.de: update for 1.0.2]
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
----
- src/Makefile.am | 2 +-
- src/rpc_soc.c | 32 --------------------------------
- 2 files changed, 1 insertion(+), 33 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 960a522..3a88e31 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -22,9 +22,8 @@ libtirpc_la_SOURCES = auth_none.c auth_unix.c authunix_prot.c bindresvport.c cln
- pmap_prot.c pmap_prot2.c pmap_rmt.c rpc_prot.c rpc_commondata.c \
- rpc_callmsg.c rpc_generic.c rpc_soc.c rpcb_clnt.c rpcb_prot.c \
- rpcb_st_xdr.c svc.c svc_auth.c svc_dg.c svc_auth_unix.c svc_auth_none.c \
-- svc_auth_des.c \
- svc_generic.c svc_raw.c svc_run.c svc_simple.c svc_vc.c getpeereid.c \
-- auth_des.c authdes_prot.c debug.c des_crypt.c des_impl.c
-+ debug.c
-
- ## XDR
- libtirpc_la_SOURCES += xdr.c xdr_rec.c xdr_array.c xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c xdr_sizeof.c
-diff --git a/src/svc_auth.c b/src/svc_auth.c
---- a/src/svc_auth.c
-+++ b/src/svc_auth.c
-@@ -114,9 +114,6 @@ _gss_authenticate(rqst, msg, no_dispatch)
- case AUTH_SHORT:
- dummy = _svcauth_short(rqst, msg);
- return (dummy);
-- case AUTH_DES:
-- dummy = _svcauth_des(rqst, msg);
-- return (dummy);
- #ifdef HAVE_RPCSEC_GSS
- case RPCSEC_GSS:
- dummy = _svcauth_gss(rqst, msg, no_dispatch);
-diff --git a/src/rpc_soc.c b/src/rpc_soc.c
-index e146ed4..161a1ec 100644
---- a/src/rpc_soc.c
-+++ b/src/rpc_soc.c
-@@ -522,86 +521,6 @@ clnt_broadcast(prog, vers, proc, xargs, argsp, xresults, resultsp, eachresult)
- }
-
- /*
-- * Create the client des authentication object. Obsoleted by
-- * authdes_seccreate().
-- */
--AUTH *
--authdes_create(servername, window, syncaddr, ckey)
-- char *servername; /* network name of server */
-- u_int window; /* time to live */
-- struct sockaddr *syncaddr; /* optional hostaddr to sync with */
-- des_block *ckey; /* optional conversation key to use */
--{
-- AUTH *nauth;
-- char hostname[NI_MAXHOST];
--
-- if (syncaddr) {
-- /*
-- * Change addr to hostname, because that is the way
-- * new interface takes it.
-- */
-- switch (syncaddr->sa_family) {
-- case AF_INET:
-- if (getnameinfo(syncaddr, sizeof(struct sockaddr_in), hostname,
-- sizeof hostname, NULL, 0, 0) != 0)
-- goto fallback;
-- break;
-- case AF_INET6:
-- if (getnameinfo(syncaddr, sizeof(struct sockaddr_in6), hostname,
-- sizeof hostname, NULL, 0, 0) != 0)
-- goto fallback;
-- break;
-- default:
-- goto fallback;
-- }
-- nauth = authdes_seccreate(servername, window, hostname, ckey);
-- return (nauth);
-- }
--fallback:
-- return authdes_seccreate(servername, window, NULL, ckey);
--}
--
--/*
-- * Create the client des authentication object. Obsoleted by
-- * authdes_pk_seccreate().
-- */
--extern AUTH *authdes_pk_seccreate(const char *, netobj *, u_int, const char *,
-- const des_block *, nis_server *);
--
--AUTH *
--authdes_pk_create(servername, pkey, window, syncaddr, ckey)
-- char *servername; /* network name of server */
-- netobj *pkey; /* public key */
-- u_int window; /* time to live */
-- struct sockaddr *syncaddr; /* optional hostaddr to sync with */
-- des_block *ckey; /* optional conversation key to use */
--{
-- AUTH *nauth;
-- char hostname[NI_MAXHOST];
--
-- if (syncaddr) {
-- /*
-- * Change addr to hostname, because that is the way
-- * new interface takes it.
-- */
-- switch (syncaddr->sa_family) {
-- case AF_INET:
-- if (getnameinfo(syncaddr, sizeof(struct sockaddr_in), hostname,
-- sizeof hostname, NULL, 0, 0) != 0)
-- goto fallback;
-- break;
-- default:
-- goto fallback;
-- }
-- nauth = authdes_pk_seccreate(servername, pkey, window, hostname, ckey, NULL);
-- return (nauth);
-- }
--fallback:
-- return authdes_pk_seccreate(servername, pkey, window, NULL, ckey, NULL);
--}
--
--
--/*
- * Create a client handle for a unix connection. Obsoleted by clnt_vc_create()
- */
- CLIENT *
---
-2.4.6
-
+++ /dev/null
-From 18f8a605e176f0362da22fd1203eb7cedb136aaf Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 20 Jun 2017 22:06:35 +0200
-Subject: [PATCH] include stdint.h for uintptr_t
-
-Fixes
-| ../../libtirpc-1.0.1/src/xdr_sizeof.c:93:13: error: 'uintptr_t' undeclared (first use in this function); did you mean '__intptr_t'?
-| if (len < (uintptr_t)xdrs->x_base) {
-| ^~~~~~~~~
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Signed-off-by: Dmitrii Kolesnichenko <dmitrii@synopsys.com>
----
- src/xdr_sizeof.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/xdr_sizeof.c b/src/xdr_sizeof.c
-index d23fbd1..79d6707 100644
---- a/src/xdr_sizeof.c
-+++ b/src/xdr_sizeof.c
-@@ -39,6 +39,7 @@
- #include <rpc/xdr.h>
- #include <sys/types.h>
- #include <stdlib.h>
-+#include <stdint.h>
- #include "un-namespace.h"
-
- /* ARGSUSED */
---
-2.9.4
-
include $(TOPDIR)/rules.mk
PKG_NAME:=p11-kit
-PKG_VERSION:=0.23.1
-PKG_RELEASE:=2
+PKG_VERSION:=0.23.10
+PKG_RELEASE:=1
PKG_MAINTAINER:=Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_HASH:=e57371669f3b157141b86c429bd9c29741994b2f5ff115fcb8a03e751b0f6ac4
-PKG_SOURCE_URL:=http://p11-glue.freedesktop.org/releases/
+PKG_HASH:=f9212a3f225ef543e13fae9945527d66c0cbb67246320035dd94fab2bce5ae43
+PKG_SOURCE_URL:=https://github.com/p11-glue/$(PKG_NAME)/releases/download/$(PKG_VERSION)
PKG_INSTALL:=1
SECTION:=libs
CATEGORY:=Libraries
TITLE:=A library that provides a way to load and enumerate PKCS11 modules.
- URL:=http://p11-glue.freedesktop.org/p11-kit.html
+ URL:=https://p11-glue.github.io/p11-glue/p11-kit.html
DEPENDS:=+libtasn1 +libpthread
endef
include $(TOPDIR)/rules.mk
PKG_NAME:=postgresql
-PKG_VERSION:=9.6.6
+PKG_VERSION:=9.6.8
PKG_RELEASE:=1
PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
PKG_LICENSE:=PostgreSQL
http://ftp.postgresql.org/pub/source/v$(PKG_VERSION) \
ftp://ftp.postgresql.org/pub/source/v$(PKG_VERSION)
-PKG_HASH:=399cdffcb872f785ba67e25d275463d74521566318cfef8fe219050d063c8154
+PKG_HASH:=eafdb3b912e9ec34bdd28b651d00226a6253ba65036cb9a41cad2d9e82e3eb70
PKG_USE_MIPS16:=0
PKG_FIXUP:=autoreconf
define Package/libpq
SECTION:=libs
CATEGORY:=Libraries
- DEPENDS:=+zlib +libreadline +libpthread +libncursesw
+ DEPENDS:=+libpthread
TITLE:=PostgreSQL client library
URL:=http://www.postgresql.org/
SUBMENU:=database
define Package/pgsql-cli
SECTION:=utils
CATEGORY:=Utilities
- DEPENDS:=+libpq +librt
+ DEPENDS:=+libncursesw +libpq +libreadline +librt +zlib
TITLE:=Command Line Interface (CLI) to PostgreSQL databases
URL:=http://www.postgresql.org/
SUBMENU:=database
define Package/pgsql-cli-extra
SECTION:=utils
CATEGORY:=Utilities
- DEPENDS:=+libpq +librt
+ DEPENDS:=+libncursesw +libpq +libreadline +librt +zlib
TITLE:=Command Line extras for PostgreSQL databases
URL:=http://www.postgresql.org/
SUBMENU:=database
define Package/pgsql-server
SECTION:=utils
CATEGORY:=Utilities
- DEPENDS:=+libpq +librt +pgsql-cli
+ DEPENDS:=+pgsql-cli
TITLE:=PostgreSQL databases Server
URL:=http://www.postgresql.org/
SUBMENU:=database
--without-tcl \
--with-zlib="yes" \
--enable-depend \
- $(if $(CONFIG_TARGET_avr32),--disable-spinlocks)
-
-EXTRA_CFLAGS:= -I$(PKG_BUILD_DIR)/src/include/
+ $(if $(CONFIG_arc),--disable-spinlocks)
# Need a native ecpg, pg_config and zic for build
define Host/Compile
$(SED) 's@ECPG = ../../preproc/ecpg@ECPG = $(STAGING_DIR_HOSTPKG)/bin/ecpg@' $(PKG_BUILD_DIR)/src/interfaces/ecpg/test/Makefile.regress
endef
-TARGET_CFLAGS += $(FPIC) -lpthread
-
# because PROFILE means something else in the project Makefile
unexport PROFILE
#
-# Copyright (C) 2017 Ian Leonard <antonlacon@gmail.com>
+# Copyright (C) 2017
-2018 Ian Leonard <antonlacon@gmail.com>
# Copyright (C) 2018 Ted Hess <thess@kitschensync.net>
#
# This is free software, licensed under the GNU General Public License v2.
PKG_NAME:=ffmpeg
PKG_VERSION:=3.2.10
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://ffmpeg.org/releases/
hevc \
vc1 \
+FFMPEG_PATENTED_ENCODERS:=$(FFMPEG_PATENDED_DECODERS)
+
FFMPEG_PATENTED_MUXERS:= \
h264 \
hevc \
+ vc1 \
+
+FFMPEG_PATENTED_DEMUXERS:=$(FFMPEG_PATENTED_MUXERS)
FFMPEG_PATENTED_PARSERS:= \
h264 \
--enable-avresample \
$(if $(CONFIG_BUILD_PATENTED),, \
$(call FFMPEG_DISABLE,decoder,$(FFMPEG_PATENTED_DECODERS)) \
+ $(call FFMPEG_DISABLE,encoder,$(FFMPEG_PATENTED_ENCODERS)) \
$(call FFMPEG_DISABLE,muxer,$(FFMPEG_PATENTED_MUXERS)) \
+ $(call FFMPEG_DISABLE,demuxer,$(FFMPEG_PATENTED_DEMUXERS)) \
$(call FFMPEG_DISABLE,parser,$(FFMPEG_PATENTED_PARSERS))) \
$(if $(CONFIG_PACKAGE_libopus),--enable-libopus)
ifeq ($(CONFIG_SOFT_FLOAT),y)
FFMPEG_CONFIGURE+= \
--enable-gpl \
$(if $(CONFIG_PACKAGE_lame-lib),--enable-libmp3lame) \
- $(if $(CONFIG_PACKAGE_libx264),--enable-libx264 --enable-nonfree)
+ $(if $(CONFIG_PACKAGE_libx264),--enable-libx264)
endif
endif
include $(TOPDIR)/rules.mk
PKG_NAME:=acme
-PKG_SOURCE_VERSION:=7b40cbe8c1a52041351524bcde4b37665a7cdf79
+PKG_SOURCE_VERSION:=db3264ab8c8ee1aee1a84407702db4375f67765b
PKG_VERSION:=1.6
-PKG_RELEASE:=3
+PKG_RELEASE:=4
PKG_LICENSE:=GPLv3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE).tar.xz
-PKG_MIRROR_HASH:=008c6f779bcbbccbde9cdd2b37b07f7a1f5a0678ee9533ce3060690b63edf2c0
+PKG_MIRROR_HASH:=a881b86fef2b754739fc0024efdf061312fecaf613502434770b18191bda741d
PKG_SOURCE_URL:=git://github.com/Neilpang/acme.sh.git
PKG_SOURCE_PROTO:=git
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)
PKG_NAME:=autossh
PKG_VERSION:=1.4e
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
PKG_SOURCE_URL:=http://www.harding.motd.ca/autossh/
option gatetime '0'
option monitorport '20000'
option poll '600'
+ option enabled '0'
[ "$ACTION" = "ifdown" ] && {
/etc/init.d/autossh stop
}
-
+
}
config_get gatetime "$section" 'gatetime'
config_get monitorport "$section" 'monitorport'
config_get poll "$section" 'poll'
+ config_get_bool enabled "$section" 'enabled' '1'
+
+ [ "$enabled" = 1 ] || exit 0
export AUTOSSH_GATETIME="${gatetime:-30}"
export AUTOSSH_POLL="${poll:-600}"
include $(TOPDIR)/rules.mk
PKG_NAME:=chrony
-PKG_VERSION:=3.2
-PKG_RELEASE:=1
+PKG_VERSION:=3.3
+PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://download.tuxfamily.org/chrony/
-PKG_HASH:=329f6718dd8c3ece3eee78be1f4821cbbeb62608e7d23f25da293cfa433c4116
+PKG_HASH:=0d1fb2d5875032f2d5a86f3770374c87ee4c941916f64171e81f7684f2a73128
PKG_MAINTAINER:=Miroslav Lichvar <mlichvar0@gmail.com>
PKG_LICENSE:=GPL-2.0
--chronyrundir=/var/run/chrony \
--disable-readline \
--disable-rtc \
+ --disable-sechash \
--with-user=chrony
CONFIGURE_VARS+=CPPFLAGS=-DNDEBUG
--- /dev/null
+--- a/src/chilli.c
++++ b/src/chilli.c
+@@ -4297,8 +4297,10 @@ static int chilliauth_cb(struct radius_t
+ while (!differ && r1 > 0 && r2 > 0);
+ }
+
+- if (newfd) safe_close(newfd); newfd=0;
+- if (oldfd) safe_close(oldfd); oldfd=0;
++ if (newfd) safe_close(newfd);
++ newfd=0;
++ if (oldfd) safe_close(oldfd);
++ oldfd=0;
+
+ if (differ) {
+ log_dbg("Writing out new hs.conf file with administraive-user settings");
+--- a/src/redir.c
++++ b/src/redir.c
+@@ -3176,9 +3176,11 @@ pid_t redir_fork(int in, int out) {
+ }
+
+ #if defined(F_DUPFD)
+- if (fcntl(in,F_GETFL,0) == -1) return -1; safe_close(0);
++ if (fcntl(in,F_GETFL,0) == -1) return -1;
++ safe_close(0);
+ if (fcntl(in,F_DUPFD,0) == -1) return -1;
+- if (fcntl(out,F_GETFL,1) == -1) return -1; safe_close(1);
++ if (fcntl(out,F_GETFL,1) == -1) return -1;
++ safe_close(1);
+ if (fcntl(out,F_DUPFD,1) == -1) return -1;
+ #else
+ if (dup2(in,0) == -1) return -1;
PKG_NAME:=isc-dhcp
UPSTREAM_NAME:=dhcp
PKG_VERSION:=4.4.0
-PKG_RELEASE:=1
+PKG_RELEASE:=4
PKG_LICENSE:=BSD-3-Clause
PKG_LICENSE_FILES:=LICENSE
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/dhcrelay $(1)/usr/sbin
$(INSTALL_DIR) $(1)/etc/config
- $(INSTALL_DATA) ./files/etc/config/dhcrelay $(1)/etc/config
+ $(INSTALL_DATA) ./files/dhcrelay.conf $(1)/etc/config
$(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_BIN) ./files/dhcrelay4.init $(1)/etc/init.d/dhcrelay4
endef
if [ -n "$gateway" ] ; then
echo " option routers $gateway;"
fi
+ config_list_foreach "$cfg" "dhcp_option" append_dhcp_options
echo "}"
done
}
config_foreach static_host_add host "$@"
}
+typeof() {
+ echo "$1" | awk '
+/^\d+\.\d+\.\d+\.\d+$/ { print "ip\n"; next; }
+/^(true|false)$/ { print "bool\n"; next; }
+/^\d+$/ { print "integer\n"; next; }
+/^"[^"]*"$/ { print "string\n"; next; }
+ { print "other\n"; next; }
+'
+}
+
+append_dhcp_options() {
+ local tuple="$1"
+
+ # strip redundant "option:" prefix
+ tuple="${tuple#option:}"
+
+ local tag="${tuple%%,*}"
+ local values="${tuple#$tag,}"
+
+ local formatted value
+ local IFS=$', \n'
+ for value in $values; do
+ # detect type of $value and quote if necessary
+ case $(typeof "$value") in
+ ip|bool|integer|string)
+ ;;
+ other)
+ value="\"$value\""
+ ;;
+ esac
+ formatted="$formatted${formatted:+, }$value"
+ done
+ echo " option $tag $formatted;"
+}
+
gen_dhcp_subnet() {
+ local cfg="$1"
+
echo "subnet $NETWORK netmask $NETMASK {"
echo " range $START $END;"
echo " option subnet-mask $netmask;"
fi
echo " option routers $gateway;"
echo " option domain-name-servers $DNS;"
+ config_list_foreach "$cfg" "dhcp_option" append_dhcp_options
echo "}"
}
gateway="$IP"
fi
- gen_dhcp_subnet >> $config_file
+ gen_dhcp_subnet "$cfg" >> $config_file
}
general_config() {
config_get max_lease_time "isc_dhcpd" "max_lease_time" 86400
config_get log_facility "isc_dhcpd" "log_facility"
+ config_get domain "isc_dhcpd" "domain"
+
[ $always_broadcast -eq 1 ] && echo "always-broadcast true;"
[ $authoritative -eq 1 ] && echo "authoritative;"
[ $boot_unknown_clients -eq 0 ] && echo "boot-unknown-clients false;"
fi
echo "default-lease-time $default_lease_time;"
echo "max-lease-time $max_lease_time;"
+
+ [ -n "$domain" ] && echo "option domain-name \"$domain\";"
}
start_service() {
touch $lease_file
fi
- dhcp_ifs=""
+ local domain dhcp_ifs
if [ -e "/etc/dhcpd.conf" ] ; then
config_file="/etc/dhcpd.conf"
--- /dev/null
+
+config dhcrelay ipv4
+ option 'enabled' '0'
+
+ # IP address of the server
+ option 'dhcpserver' '192.0.2.10'
+
+ # network interfaces to listen on (e.g. lan or wan)
+ option 'interfaces' ''
+ option 'upstream_interfaces' ''
+ option 'downstream_interfaces' ''
+
+ # What to do about packets that already have a relay option:
+ # 'append': Forward and append our own relay option
+ # 'replace': Forward, but replace theirs with ours (default)
+ # 'forward': Forward without changes
+ # 'discard': Don't forward
+ option 'relay_mode' ''
+
+ # enable RFC3527 link selection sub-option and use the IP address of
+ # the specified network interface as "uplink" IP address (e.g. wan)
+ option 'link_selection' ''
+
+config dhcrelay ipv6
+# option dhcpserver '2001:db8:1::1'
+ option upper 'eth1'
+ list lower 'eth0.2'
+ list lower 'eth0.3'
+
append args "-i $ifname"
fi
done
+ config_get interfaces ipv4 upstream_interfaces
+ for net in $interfaces; do
+ if network_get_device ifname "$net"; then
+ append args "-iu $ifname"
+ fi
+ done
+ config_get interfaces ipv4 downstream_interfaces
+ for net in $interfaces; do
+ if network_get_device ifname "$net"; then
+ append args "-id $ifname"
+ fi
+ done
# link selection sub-option (RFC3527)
local link_selection
+++ /dev/null
-
-config dhcrelay ipv4
- option 'enabled' '0'
-
- # IP address of the server
- option 'dhcpserver' '192.0.2.10'
-
- # network interfaces to listen on (e.g. lan or wan)
- option 'interfaces' ''
-
- # What to do about packets that already have a relay option:
- # 'append': Forward and append our own relay option
- # 'replace': Forward, but replace theirs with ours (default)
- # 'forward': Forward without changes
- # 'discard': Don't forward
- option 'relay_mode' ''
-
- # enable RFC3527 link selection sub-option and use the IP address of
- # the specified network interface as "uplink" IP address (e.g. wan)
- option 'link_selection' ''
-
-config dhcrelay ipv6
-# option dhcpserver '2001:db8:1::1'
- option upper 'eth1'
- list lower 'eth0.2'
- list lower 'eth0.3'
-
include $(TOPDIR)/rules.mk
PKG_NAME:=knot
-PKG_VERSION:=2.6.5
+PKG_VERSION:=2.6.6
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://secure.nic.cz/files/knot-dns/
-PKG_HASH:=33cd676706e2baeb37cf3879ccbc91a1e1cd1ee5d7a082adff4d1e753ce49d46
+PKG_HASH:=9119d8a56828a596d246431492be8c015f918de65ba793d76071122567c3080a
PKG_MAINTAINER:=Daniel Salzman <daniel.salzman@nic.cz>
PKG_LICENSE:=GPL-3.0 LGPL-2.0 0BSD MIT OLDAP-2.8
include $(TOPDIR)/rules.mk
PKG_NAME:=linuxptp
-PKG_VERSION:=1.8
-PKG_RELEASE:=4
+PKG_VERSION:=1.9.2
+PKG_RELEASE:=1
PKG_MAINTAINER:=Wojciech Dubowik <Wojciech.Dubowik@neratec.com>
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
PKG_SOURCE_URL:=@SF/$(PKG_NAME)/v$(PKG_VERSION)
-PKG_HASH:=fa8e00f6ec73cefa7bb313dce7f60dfe5eb9e2bde3353594e9ac18edc93e5165
+PKG_HASH:=7f662e65c66c37ff211dc525476626875c2b74162ded05c8a25d036fb963b8d0
PKG_LICENSE:=GPL-2.0
PKG_LICENSE_FILES:=COPYING
+++ /dev/null
---- a/raw.c
-+++ b/raw.c
-@@ -20,7 +20,6 @@
- #include <fcntl.h>
- #include <linux/filter.h>
- #include <linux/if_ether.h>
--#include <net/ethernet.h>
- #include <net/if.h>
- #include <netinet/in.h>
- #include <netpacket/packet.h>
---- a/util.h
-+++ b/util.h
-@@ -20,6 +20,8 @@
- #ifndef HAVE_UTIL_H
- #define HAVE_UTIL_H
-
-+#include <time.h>
-+
- #include "ddt.h"
- #include "ether.h"
-
+++ /dev/null
-From 60db5d0b0fd8be9afede7e8a14e708f5429f2023 Mon Sep 17 00:00:00 2001
-From: Florian Fainelli <f.fainelli@gmail.com>
-Date: Sun, 7 May 2017 11:16:06 -0700
-Subject: [PATCH] udp: Avoid including netdb.h
-
-netdb.h pulls in a large chain of include files:
-rpc/netdb.h
-rpc/types.h
-
-rpc/types.h re-defines TRUE/FALSE and does it in this way:
-
- #ifndef FALSE
- # define FALSE (0)
- #endif
-
- #ifndef TRUE
- # define TRUE (1)
- #endif
-
-And this later causes build problems that appear in this way:
-
-mipsel-linux-gnu-gcc -Wall -DVER=1.8 -D_GNU_SOURCE -DHAVE_CLOCK_ADJTIME
--DHAVE_POSIX_SPAWN -DHAVE_ONESTEP_SYNC -Os -pipe -mno-branch-likely
--mips32r2 -mtune=24kc -fno-caller-saves -Wno-unused-result
--D_FORTIFY_SOURCE=1 -Wl,-z,now -Wl,-z,relro
--I/home/florian/dev/openwrt/trunk/staging_dir/target-mipsel-unknown-linux-gnu_glibc/usr/include
--I/home/florian/dev/openwrt/trunk/staging_dir/target-mipsel-unknown-linux-gnu_glibc/include
--I/home/florian/dev/toolchains/stbgcc-4.8-1.5/usr/include
--I/home/florian/dev/toolchains/stbgcc-4.8-1.5/include
--DHAVE_CLOCK_ADJTIME -DHAVE_POSIX_SPAWN -DHAVE_ONESTEP_SYNC -c -o
-udp.o udp.c
-In file included from
-/home/florian/dev/openwrt/trunk/staging_dir/target-mipsel-unknown-linux-gnu_glibc/usr/include/rpc/netdb.h:45:0,
- from
-/home/florian/dev/toolchains/stbgcc-4.8-1.5/mipsel-linux-gnu/sys-root/usr/include/netdb.h:32,
- from udp.c:23:
-pdt.h:25:7: error: expected identifier before '(' token
- enum {FALSE, TRUE};
- ^
-<builtin>: recipe for target 'udp.o' failed
-
-Upon inspection, it does not appear that netdb.h is providing any useful
-definition or declaration, so let's just remove its inclusion.
-
-Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
----
- udp.c | 1 -
- udp6.c | 1 -
- 2 files changed, 2 deletions(-)
-
-diff --git a/udp.c b/udp.c
-index 6dabc31836fe..530a2ee3748d 100644
---- a/udp.c
-+++ b/udp.c
-@@ -20,7 +20,6 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <net/if.h>
--#include <netdb.h>
- #include <netinet/in.h>
- #include <stdio.h>
- #include <stdlib.h>
-diff --git a/udp6.c b/udp6.c
-index c229cac0c41c..89e27bf9e863 100644
---- a/udp6.c
-+++ b/udp6.c
-@@ -20,7 +20,6 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <net/if.h>
--#include <netdb.h>
- #include <netinet/in.h>
- #include <stdio.h>
- #include <stdlib.h>
---
-2.11.0
-
include $(TOPDIR)/rules.mk
PKG_NAME:=mwan3
-PKG_VERSION:=2.6.11
-PKG_RELEASE:=2
+PKG_VERSION:=2.6.14
+PKG_RELEASE:=1
PKG_MAINTAINER:=Florian Eckert <fe@dev.tdt.de>
PKG_LICENSE:=GPLv2
+config globals 'globals'
+ option mmx_mask '0x3F00'
+ option local_source 'lan'
+
config interface 'wan'
option enabled '1'
list track_ip '8.8.4.4'
list track_ip '8.8.8.8'
list track_ip '208.67.222.222'
list track_ip '208.67.220.220'
+ option family 'ipv4'
option reliability '2'
option count '1'
option timeout '2'
option down '3'
option up '8'
-config interface 'wan2'
+config interface 'wan6'
+ option enabled '0'
+ list track_ip '2001:4860:4860::8844'
+ list track_ip '2001:4860:4860::8888'
+ list track_ip '2620:0:ccd::2'
+ list track_ip '2620:0:ccc::2'
+ option family 'ipv6'
+ option reliability '2'
+ option count '1'
+ option timeout '2'
+ option interval '5'
+ option down '3'
+ option up '8'
+
+config interface 'wanb'
option enabled '0'
list track_ip '8.8.8.8'
list track_ip '208.67.220.220'
+ option family 'ipv4'
+ option reliability '1'
+ option count '1'
+ option timeout '2'
+ option interval '5'
+ option down '3'
+ option up '8'
+
+config interface 'wanb6'
+ option enabled '0'
+ list track_ip '2001:4860:4860::8888'
+ list track_ip '2620:0:ccc::2'
+ option family 'ipv6'
option reliability '1'
option count '1'
option timeout '2'
option metric '2'
option weight '3'
-config member 'wan2_m1_w2'
- option interface 'wan2'
+config member 'wanb_m1_w2'
+ option interface 'wanb'
+ option metric '1'
+ option weight '2'
+
+config member 'wanb_m2_w2'
+ option interface 'wanb'
+ option metric '2'
+ option weight '2'
+
+config member 'wan6_m1_w3'
+ option interface 'wan6'
+ option metric '1'
+ option weight '3'
+
+config member 'wan6_m2_w3'
+ option interface 'wan6'
+ option metric '2'
+ option weight '3'
+
+config member 'wanb6_m1_w2'
+ option interface 'wanb6'
option metric '1'
option weight '2'
-config member 'wan2_m2_w2'
- option interface 'wan2'
+config member 'wanb6_m2_w2'
+ option interface 'wanb6'
option metric '2'
option weight '2'
config policy 'wan_only'
list use_member 'wan_m1_w3'
+ list use_member 'wan6_m1_w3'
-config policy 'wan2_only'
- list use_member 'wan2_m1_w2'
+config policy 'wanb_only'
+ list use_member 'wanb_m1_w2'
+ list use_member 'wanb6_m1_w2'
config policy 'balanced'
list use_member 'wan_m1_w3'
- list use_member 'wan2_m1_w2'
+ list use_member 'wanb_m1_w2'
+ list use_member 'wan6_m1_w3'
+ list use_member 'wanb6_m1_w2'
-config policy 'wan_wan2'
+config policy 'wan_wanb'
list use_member 'wan_m1_w3'
- list use_member 'wan2_m2_w2'
+ list use_member 'wanb_m2_w2'
+ list use_member 'wan6_m1_w3'
+ list use_member 'wanb6_m2_w2'
-config policy 'wan2_wan'
+config policy 'wanb_wan'
list use_member 'wan_m2_w3'
- list use_member 'wan2_m1_w2'
+ list use_member 'wanb_m1_w2'
+ list use_member 'wan6_m2_w3'
+ list use_member 'wanb6_m1_w2'
config rule 'https'
option sticky '1'
MWAN3_INTERFACE_MAX=$(uci_get_state mwan3 globals iface_max)
else
config_load mwan3
- config_get MMX_MASK globals mmx_mask '0xff00'
+ config_get MMX_MASK globals mmx_mask '0x3F00'
echo "$MMX_MASK" > "${MWAN3_STATUS_DIR}/mmx_mask"
$LOG notice "Using firewall mask ${MMX_MASK}"
fi
}
-case "$1" in
- list)
- json_init
- json_add_object "status"
- json_add_string "section" "x"
- json_add_string "interface" "x"
- json_close_object
- json_dump
- ;;
- call)
- case "$2" in
- status)
- local section iface
- read input;
- json_load "$input"
- json_get_var section section
- json_get_var iface interface
-
- config_load mwan3
+main () {
+
+ case "$1" in
+ list)
json_init
- case "$section" in
- interfaces)
- json_add_object interfaces
- config_foreach get_mwan3_status interface "${iface}"
- json_close_object
- ;;
- connected)
- json_add_object connected
- json_add_array ipv4
- report_connected_v4
- json_close_array
- json_add_array ipv6
- report_connected_v6
- json_close_array
- json_close_object
- ;;
- *)
- # interfaces
- json_add_object interfaces
- config_foreach get_mwan3_status interface
- json_close_object
- # connected
- json_add_object connected
- json_add_array ipv4
- report_connected_v4
- json_close_array
- json_add_array ipv6
- report_connected_v6
- json_close_array
- json_close_object
- ;;
- esac
+ json_add_object "status"
+ json_add_string "section" "x"
+ json_add_string "interface" "x"
+ json_close_object
json_dump
;;
- esac
- ;;
-esac
+ call)
+ case "$2" in
+ status)
+ local section iface
+ read input;
+ json_load "$input"
+ json_get_var section section
+ json_get_var iface interface
+
+ config_load mwan3
+ json_init
+ case "$section" in
+ interfaces)
+ json_add_object interfaces
+ config_foreach get_mwan3_status interface "${iface}"
+ json_close_object
+ ;;
+ connected)
+ json_add_object connected
+ json_add_array ipv4
+ report_connected_v4
+ json_close_array
+ json_add_array ipv6
+ report_connected_v6
+ json_close_array
+ json_close_object
+ ;;
+ *)
+ # interfaces
+ json_add_object interfaces
+ config_foreach get_mwan3_status interface
+ json_close_object
+ # connected
+ json_add_object connected
+ json_add_array ipv4
+ report_connected_v4
+ json_close_array
+ json_add_array ipv6
+ report_connected_v6
+ json_close_array
+ json_close_object
+ ;;
+ esac
+ json_dump
+ ;;
+ esac
+ ;;
+ esac
+}
+
+main "$@"
score=0
else
echo "online" > /var/run/mwan3track/$1/STATUS
+ env -i ACTION="connected" INTERFACE="$1" DEVICE="$2" /sbin/hotplug-call iface
fi
while true; do
if [ $? -eq 0 ]; then
let host_up_count++
echo "up" > /var/run/mwan3track/$1/TRACK_${track_ip}
+ if [ $score -le $up ]; then
+ $LOG info "Check ($track_method) success for target \"$track_ip\" on interface $1 ($2)"
+ fi
else
let lost++
echo "down" > /var/run/mwan3track/$1/TRACK_${track_ip}
+ if [ $score -gt $up ]; then
+ $LOG info "Check ($track_method) failed for target \"$track_ip\" on interface $1 ($2)"
+ fi
fi
else
echo "skipped" > /var/run/mwan3track/$1/TRACK_${track_ip}
if [ $score -eq $up ]; then
$LOG notice "Interface $1 ($2) is online"
echo "online" > /var/run/mwan3track/$1/STATUS
- env -i ACTION="connected" INTERFACE="$1" DEVICE="$2" /sbin/hotplug-call iface
env -i ACTION=ifup INTERFACE=$1 DEVICE=$2 /sbin/hotplug-call iface
exit 0
fi
$(INSTALL_DIR) $(2)/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/net-snmp-config $(2)/bin/
$(SED) 's,=/usr,=$(STAGING_DIR)/usr,g' $(2)/bin/net-snmp-config
+ $(INSTALL_DIR) $(STAGING_DIR)/usr/bin
$(LN) $(STAGING_DIR)/host/bin/net-snmp-config $(STAGING_DIR)/usr/bin/
$(INSTALL_DIR) $(1)/usr/include
include $(TOPDIR)/rules.mk
PKG_NAME:=nmap
-PKG_VERSION:=7.60
+PKG_VERSION:=7.70
PKG_RELEASE:=1
PKG_MAINTAINER:=Nuno Goncalves <nunojpg@gmail.com>
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://nmap.org/dist/
-PKG_HASH:=a8796ecc4fa6c38aad6139d9515dc8113023a82e9d787e5a5fb5fa1b05516f21
+PKG_HASH:=847b068955f792f4cc247593aca6dc3dc4aae12976169873247488de147a6e18
PKG_LICENSE:=GPL-2.0
PKG_LICENSE_FILES:=COPYING
include $(TOPDIR)/rules.mk
PKG_NAME:=openssh
-PKG_VERSION:=7.6p1
+PKG_VERSION:=7.7p1
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \
https://ftp.spline.de/pub/OpenBSD/OpenSSH/portable/ \
https://anorien.csc.warwick.ac.uk/pub/OpenBSD/OpenSSH/portable/
-PKG_HASH:=a323caeeddfe145baaa0db16e98d784b1fbc7dd436a6bf1f479dfd5cd1d21723
+PKG_HASH:=d73be7e684e99efcd024be15a30bffcbe41b012b2f7b3c9084aed621775e6b8f
PKG_LICENSE:=BSD ISC
PKG_LICENSE_FILES:=LICENCE
--- a/ssh_config
+++ b/ssh_config
-@@ -48,3 +48,6 @@
+@@ -44,3 +44,6 @@
# VisualHostKey no
# ProxyCommand ssh -q -W %h:%p gateway.example.com
# RekeyLimit 1G 1h
+#IPQoS AF21 AF11
--- a/sshd_config
+++ b/sshd_config
-@@ -107,6 +107,9 @@ AuthorizedKeysFile .ssh/authorized_keys
+@@ -106,6 +106,9 @@ AuthorizedKeysFile .ssh/authorized_keys
# no default banner path
#Banner none
include $(TOPDIR)/rules.mk
PKG_NAME:=travelmate
-PKG_VERSION:=1.1.3
+PKG_VERSION:=1.2.0
PKG_RELEASE:=1
PKG_LICENSE:=GPL-3.0+
PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
* strong LuCI-Support with builtin interface wizard and a wireless station manager
* fast uplink connections
* support all kinds of uplinks, incl. hidden and enterprise uplinks
-* trigger- or automatic-mode support, the latter one is the default and checks the existing uplink connection regardless of ifdown event trigger actions every n seconds
-* checks continuously the signal quality for conditional uplink (dis-) connections
+* continuously checks the existing uplink connection (quality), e.g. for conditional uplink (dis-) connections
* captive portal detection with internet online check and a 'heartbeat' function to keep the uplink connection up & running
* support of devices with multiple radios
* procd init and hotplug support
* runtime information available via LuCI & via 'status' init command
* status & debug logging to syslog
+* optional: the LuCI frontend shows the WiFi QR codes from all configured Access Points. It allows you to connect your Android or iOS devices to your router’s WiFi using the QR code
## Prerequisites
* [OpenWrt](https://openwrt.org), tested with the stable release series (17.01.x) and with the latest OpenWrt snapshot
* iwinfo for wlan scanning, uclient-fetch for captive portal detection
+* optional: qrencode 4.x for QR code support
## Installation & Usage
* download the package [here](https://downloads.openwrt.org/snapshots/packages/x86_64/packages)
* install 'travelmate' (_opkg install travelmate_)
* configure your network:
* recommended: use the LuCI frontend with builtin interface wizard and a wireless station manager
- * manual: see detailed configure steps below
+ * manual: see detailed configuration steps below
* at least you need one configured AP and one STA interface
## LuCI travelmate companion package
* usually the pre-configured travelmate setup works quite well and no manual config overrides are needed, all listed options apply to the 'global' section:
* trm\_enabled => main switch to enable/disable the travelmate service (bool/default: '0', disabled)
* trm\_debug => enable/disable debug logging (bool/default: '0', disabled)
- * trm\_automatic => keep travelmate in an active state (bool/default: '1', enabled)
* trm\_captive => enable/disable the captive portal detection (bool/default: '1', enabled)
* trm\_minquality => minimum signal quality threshold as percent for conditional uplink (dis-) connections (int/default: '35', valid range: 20-80)
* trm\_maxwait => how long (in seconds) should travelmate wait for a successful wlan interface reload action (int/default: '30', valid range: 20-40)
* trm\_maxretry => how many times should travelmate try to connect to an uplink (int/default: '3', valid range: 1-10)
- * trm\_timeout => timeout in seconds for "automatic mode" (int/default: '60', valid range: 30-300)
+ * trm\_timeout => overall retry timeout in seconds (int/default: '60', valid range: 30-300)
* trm\_radio => limit travelmate to a dedicated radio, e.g. 'radio0' (default: not set, use all radios)
* trm\_iface => main uplink / procd trigger network interface (default: trm_wwan)
- * trm\_triggerdelay => additional trigger delay in seconds before travelmate processing starts (int/default: '2')
+ * trm\_triggerdelay => additional trigger delay in seconds before travelmate processing begins (int/default: '2')
## Runtime information
**receive travelmate runtime information:**
<pre><code>
+~# /etc/init.d/travelmate status
::: travelmate runtime information
- + travelmate_status : connected (net ok/55)
- + travelmate_version : 1.1.0
- + station_id : Turris/-
+ + travelmate_status : connected (net ok/37)
+ + travelmate_version : 1.2.0
+ + station_id : blackhole/01:02:03:04:05:06
+ station_interface : trm_wwan
- + station_radio : radio1
- + last_rundate : 19.02.2018 17:02:25
- + system : GL.iNet GL-AR750, OpenWrt SNAPSHOT r5988+25-60e07ffec5
+ + station_radio : radio0
+ + last_rundate : 04.04.2018 13:00:24
+ + system : GL.iNet GL-AR750, OpenWrt SNAPSHOT r6588-16efb0c1c6
</code></pre>
## Manual Setup
option device 'radio0'
option network 'trm_wwan'
option mode 'sta'
- option ssid 'example_01'
+ option ssid 'example_usual'
option encryption 'psk2+ccmp'
option key 'abc'
option disabled '1'
option device 'radio0'
option network 'trm_wwan'
option mode 'sta'
- option ssid 'example_02'
+ option ssid 'example_hidden'
+ option bssid '00:11:22:33:44:55'
option encryption 'psk2+ccmp'
option key 'xyz'
option disabled '1'
</code></pre>
## FAQ
-**Q:** What's about 'trigger' and 'automatic' mode?
-**A:** In "trigger" mode travelmate will be triggered solely by procd interface down events, whenever an uplink disappears travelmate tries n times (default 3) to find a new uplink or reconnect to the old one. The 'automatic' mode keeps travelmate in an active state and checks every n seconds the connection status / the uplink availability regardless of procd event trigger.
-
**Q:** What happen with misconfigured uplinks, e.g. due to outdated wlan passwords?
-**A:** Travelmate tries n times (default 3) to connect, then the respective uplink SSID will be marked / renamed to '_SSID_\_err'. In this case use the builtin wireless station manager to update your wireless credentials.
+**A:** Travelmate tries n times (default 3) to connect, then the respective uplink SSID will be marked / renamed to '_SSID_\_err' and travelmate no longer attends this uplink. In this case use the builtin wireless station manager to update your wireless credentials.
+**Q:** How to connect to hidden uplinks?
+**A:** See 'example\_hidden' STA configuration above, option 'SSID' and 'BSSID' must be specified for successful connections.
## Support
Please join the travelmate discussion in this [forum thread](https://forum.lede-project.org/t/travelmate-support-thread/5155) or contact me by [mail](mailto:dev@brenken.org)
config travelmate 'global'
option trm_enabled '0'
- option trm_automatic '1'
option trm_captive '1'
option trm_iface 'trm_wwan'
option trm_triggerdelay '2'
trm_init="/etc/init.d/travelmate"
trm_script="/usr/bin/travelmate.sh"
+trm_pidfile="/var/run/travelmate.pid"
boot()
{
fi
}
+reload_service()
+{
+ [ -s "${trm_pidfile}" ] && return 1
+ "${trm_init}" restart
+}
+
stop_service()
{
local rtfile="$(uci_get travelmate global trm_rtfile)"
service_triggers()
{
- local auto="$(uci_get travelmate global trm_automatic)"
+ local trigger="$(uci_get travelmate global trm_iface)"
+ local delay="$(uci_get travelmate global trm_triggerdelay)"
- if [ "${auto}" = "0" ]
- then
- local trigger="$(uci_get travelmate global trm_iface)"
- local delay="$(uci_get travelmate global trm_triggerdelay)"
-
- PROCD_RELOAD_DELAY=$((${delay:-2} * 1000))
- procd_add_interface_trigger "interface.*.down" "${trigger}" "${trm_init}" start
- fi
+ PROCD_RELOAD_DELAY=$((${delay:-2} * 1000))
+ procd_add_interface_trigger "interface.*.down" "${trigger}" "${trm_init}" reload
procd_add_reload_trigger "travelmate"
}
#
LC_ALL=C
PATH="/usr/sbin:/usr/bin:/sbin:/bin"
-trm_ver="1.1.3"
+trm_ver="1.2.0"
trm_sysver="unknown"
trm_enabled=0
trm_debug=0
-trm_automatic=1
trm_captive=1
trm_captiveurl="http://captive.apple.com"
trm_minquality=35
trm_fetch="$(command -v uclient-fetch)"
trm_iwinfo="$(command -v iwinfo)"
trm_wpa="$(command -v wpa_supplicant)"
+trm_action="${1:-"start"}"
+trm_pidfile="/var/run/travelmate.pid"
# load travelmate environment
#
if [ ${trm_enabled} -ne 1 ]
then
f_log "info" "travelmate is currently disabled, please set 'trm_enabled' to '1' to use this service"
+ config_load wireless
+ config_foreach f_prep wifi-iface
+ uci_commit wireless
+ ubus call network reload
exit 0
fi
fi
elif [ "${mode}" = "rev" ]
then
- wait=$((${trm_maxwait}/3))
+ wait=$(( ${trm_maxwait} / 3 ))
sleep ${wait}
break
else
fi
if [ "${mode}" = "initial" ] && [ "${trm_captive}" -eq 1 ] && [ "${trm_ifstatus}" = "true" ]
then
- result="$(${trm_fetch} --timeout=$((${trm_maxwait}/3)) --spider "${trm_captiveurl}" 2>&1 | awk '/^Redirected/{printf "%s" "net cp \047"$NF"\047";exit}/^Download completed/{printf "%s" "net ok";exit}/^Failed|^Connection error/{printf "%s" "net nok";exit}')"
+ result="$(${trm_fetch} --timeout=$(( ${trm_maxwait} / 3 )) --spider "${trm_captiveurl}" 2>&1 | awk '/^Redirected/{printf "%s" "net cp \047"$NF"\047";exit}/^Download completed/{printf "%s" "net ok";exit}/^Failed|^Connection error/{printf "%s" "net nok";exit}')"
if [ -n "${result}" ] && ([ -z "${trm_connection}" ] || [ "${result}" != "${trm_connection%/*}" ])
then
trm_connection="${result}/${trm_ifquality}"
break
fi
fi
- wait=$((wait+1))
+ wait=$(( wait + 1 ))
sleep 1
done
- f_log "debug" "f_check::: mode: ${mode}, name: ${ifname:-"-"}, status: ${trm_ifstatus}, quality: ${trm_ifquality}, connection: ${trm_connection:-"-"}, wait: ${wait}, max_wait: ${trm_maxwait}, min_quality: ${trm_minquality}, captive: ${trm_captive}, automatic: ${trm_automatic}"
+ f_log "debug" "f_check::: mode: ${mode}, name: ${ifname:-"-"}, status: ${trm_ifstatus}, quality: ${trm_ifquality}, connection: ${trm_connection:-"-"}, wait: ${wait}, max_wait: ${trm_maxwait}, min_quality: ${trm_minquality}, captive: ${trm_captive}"
}
# update runtime information
then
uci_commit wireless
f_log "info" "interface '${sta_iface}' on '${sta_radio}' connected to uplink '${sta_essid:-"-"}/${sta_bssid:-"-"}' (${trm_sysver})"
- f_check "initial"
return 0
elif [ ${cnt} -eq ${trm_maxretry} ]
then
IFS=" "
done
fi
- cnt=$((cnt+1))
- sleep $((${trm_maxwait}/6))
+ cnt=$(( cnt + 1 ))
+ sleep $(( ${trm_maxwait} / 6 ))
done
done
if [ ! -s "${trm_rtfile}" ]
# control travelmate actions
#
-f_envload
-f_main
-while [ ${trm_automatic} -eq 1 ]
+while true
do
- sleep ${trm_timeout}
+ if [ -z "${trm_action}" ]
+ then
+ > "${trm_pidfile}"
+ sleep ${trm_timeout}
+ else
+ printf '%s' "${$}" > "${trm_pidfile}"
+ trm_action=""
+ fi
f_envload
f_main
done
-exit 0
+
include $(TOPDIR)/rules.mk
PKG_NAME:=wifidog-ng
-PKG_VERSION:=1.3.0
+PKG_VERSION:=1.5.2
PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git
PKG_SOURCE_VERSION:=v$(PKG_VERSION)
PKG_SOURCE_URL=https://github.com/zhaojh329/wifidog-ng.git
-PKG_MIRROR_HASH:=a65ecad48dd3668a1f7416fd7882386a57b8bccf503e353224dbca54c398f052
+PKG_MIRROR_HASH:=0e8c1196d08f0a91819c3b87457ec55151c80dfc1114d5f8b97b9c3870cfc7c4
PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_SOURCE_SUBDIR)
endef
define Package/wifidog-ng/default/install
- $(INSTALL_DIR) $(1)/usr/bin $(1)/etc/init.d $(1)/etc/config $(1)/etc/wifidog-ng
+ $(INSTALL_DIR) $(1)/usr/bin $(1)/etc/init.d $(1)/etc/config \
+ $(1)/etc/wifidog-ng $(1)//etc/hotplug.d/dhcp
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/wifidog-ng $(1)/usr/bin
$(INSTALL_BIN) ./files/wifidog-ng.init $(1)/etc/init.d/wifidog-ng
$(INSTALL_CONF) ./files/wifidog-ng.config $(1)/etc/config/wifidog-ng
$(INSTALL_CONF) ./files/wifidog-ng.key $(1)/etc/wifidog-ng
$(INSTALL_CONF) ./files/wifidog-ng.crt $(1)/etc/wifidog-ng
+ $(INSTALL_DATA) ./files/wifidog-ng.hotplug $(1)/etc/hotplug.d/dhcp/00-wifidog-ng
endef
Package/wifidog-ng-nossl/install = $(Package/wifidog-ng/default/install)
config authserver
option host 'authserver.com'
option port 80
+ option ssl 0
option path '/wifidog/'
option login_path 'login'
option portal_path 'portal'
--- /dev/null
+[ "$ACTION" = "add" -o "$ACTION" = "update" ] || exit 0
+ubus list wifidog-ng > /dev/null 2>&1 || exit 0
+ubus call wifidog-ng roam "{\"mac\":\"$MACADDR\", \"ip\":\"$IPADDR\"}"
BIN=/usr/bin/wifidog-ng
-parse_whitelist() {
+parse_whitelist_mac() {
local cfg="$1"
- local domain mac
+ local mac
uci_validate_section wifidog-ng whitelist "${1}" \
- 'domain:list(host)' \
- 'mac:list(macaddr)'
+ 'mac:macaddr'
[ $? -ne 0 ] && {
- echo "validation failed" >&2
+ echo "validation whitelist_mac failed" >&2
exit 1
}
+}
+
+parse_whitelist_domain() {
+ local cfg="$1"
+ local domain
+
+ uci_validate_section wifidog-ng whitelist "${1}" \
+ 'domain:host'
- for m in $mac; do
- echo "!$m" > /proc/wifidog-ng/term
- done
+ [ $? -ne 0 ] && {
+ echo "validation whitelist_domain failed" >&2
+ exit 1
+ }
}
start_service() {
modprobe wifidog-ng
- ipset create wifidog-ng-mac hash:mac
- ipset create wifidog-ng-ip hash:ip timeout 10000
-
config_load wifidog-ng
- config_foreach parse_whitelist whitelist
+ config_foreach parse_whitelist_mac whitelist_mac
+ config_foreach parse_whitelist_domain whitelist_domain
procd_open_instance
procd_set_param command $BIN
stop_service() {
rmmod wifidog-ng
-
- ipset destroy wifidog-ng-mac
- ipset destroy wifidog-ng-ip
}
PKG_RELEASE:=5
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.xinetd.org
+PKG_SOURCE_URL:=https://github.com/xinetd-org/xinetd/archive
PKG_HASH:=bf4e060411c75605e4dcbdf2ac57c6bd9e1904470a2f91e01ba31b50a80a5be3
PKG_LICENSE:=xinetd
PKG_LICENSE_FILES:=COPYRIGHT
SECTION:=net
CATEGORY:=Network
TITLE:=A powerful and secure super-server
- URL:=http://www.xinetd.org/
+ URL:=https://github.com/xinetd-org
PKG_MAINTAINER:=Jonathan McCrohan <jmccrohan@gmail.com>
endef
rm -rf $CONFIG_PATH
# Create link from CONFIG_PATH to config_path
- if [ -n "$config_path" -a $config_path != $CONFIG_PATH ]; then
+ if [ -n "$config_path" -a "$config_path" != $CONFIG_PATH ]; then
if [ ! -d "$config_path" ]; then
echo "ZeroTier config_path does not exist: $config_path"
return
include $(TOPDIR)/rules.mk
PKG_NAME:=znc
-PKG_VERSION:=1.6.5
+PKG_VERSION:=1.6.6
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://znc.in/releases \
- http://znc.in/releases/archive
-PKG_HASH:=2f0225d49c53a01f8d94feea4619a6fe92857792bb3401a4eb1edd65f0342aca
+PKG_SOURCE_URL:=https://znc.in/releases \
+ https://znc.in/releases/archive
+PKG_HASH:=7fb841bc71dc1749b1dc081e9eaf22ceb56ebb03c6b1d8804a4f9eb8bbd59525
PKG_MAINTAINER:=Jonas Gorski <jogo@openwrt.org>
PKG_LICENSE:=Apache-2.0
PKG_USE_MIPS16:=0
PKG_BUILD_PARALLEL:=1
-PKG_CONFIG_DEPENDS := CONFIG_ZNC_ICU
+PKG_CONFIG_DEPENDS:= CONFIG_ZNC_ICU
define Package/znc/default
SUBMENU:=Instant Messaging
SECTION:=net
CATEGORY:=Network
TITLE:=ZNC
- URL:=http://en.znc.in/
+ URL:=https://znc.in/
USERID:=znc:znc
endef
include $(TOPDIR)/rules.mk
PKG_NAME:=fdk-aac
-PKG_VERSION:=0.1.5-20171220
+PKG_VERSION:=0.1.6
PKG_RELEASE:=1
PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
PKG_LICENSE:=Fraunhofer-FDK-AAC-for-Android
PKG_LICENSE_FILES:=NOTICE
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL=https://github.com/mstorsjo/fdk-aac/
-PKG_SOURCE_SUBDIR=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=89aeea5f292306c429550e4c9fe55d865c903600
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_MIRROR_HASH:=ef3c368dfd9c97ea2243103556354c40c1160db5f11c7f0c0162e659b33323cf
+PKG_SOURCE_URL=https://codeload.github.com/mstorsjo/fdk-aac/tar.gz/v$(PKG_VERSION)?
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_HASH:=adbcd793e406e1b88b3c1c41382d49f8c27371485b823c0fdab69c9124fd2ce3
PKG_FIXUP:=autoreconf
include $(TOPDIR)/rules.mk
PKG_NAME:=ccid
-PKG_VERSION:=1.4.28
+PKG_VERSION:=1.4.29
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=https://alioth.debian.org/frs/download.php/file/4230
-PKG_HASH:=875836ac5d9d952b40dc1a253a726e74361671864d81337285a3260268f8ade0
+PKG_SOURCE_URL:=https://ccid.apdu.fr/files/
+PKG_HASH:=a5432ae845730493c04e59304b5c0c6103cd0e2c8827df57d69469a3eaaab84d
PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
PKG_LICENSE:=LGPL-2.1+
PKG_LICENSE_FILES:=COPYING
CATEGORY:=Libraries
DEPENDS:=+libusb-1.0 +libpcsclite
TITLE:=Generic USB CCID smart card reader driver
- URL:=http://pcsclite.alioth.debian.org/ccid.html
+ URL:=https://ccid.apdu.fr/
endef
define Package/ccid/description
include $(TOPDIR)/rules.mk
PKG_NAME:=nano
-PKG_VERSION:=2.9.4
+PKG_VERSION:=2.9.5
PKG_RELEASE:=1
PKG_LICENSE:=GPL-3.0+
PKG_LICENSE_FILES:=COPYING
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@GNU/nano
-PKG_HASH:=2cf9726e735f5c962af63d27c2faaead5936e45adec983659fb9e4af88ffa35a
+PKG_HASH:=7b8d181cb57f42fa86a380bb9ad46abab859b60383607f731b65a9077f4b4e19
PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1
TITLE:=Open-ZWave Device Configs
endef
+TARGET_CPPFLAGS+=-Wno-format -Wno-format-security
+
MAKE_FLAGS += \
LD="$(TARGET_CROSS)g++" \
LIBDIR="$(PKG_BUILD_DIR)" \
+++ /dev/null
---- a/Makefile
-+++ b/Makefile
-@@ -18,15 +18,12 @@
-
- all:
- CPPFLAGS=$(CPPFLAGS) $(MAKE) -C $(top_srcdir)/cpp/build/ -$(MAKEFLAGS)
-- CPPFLAGS=$(CPPFLAGS) $(MAKE) -C $(top_srcdir)/cpp/examples/MinOZW/ -$(MAKEFLAGS)
-
- install:
- $(MAKE) -C $(top_srcdir)/cpp/build/ -$(MAKEFLAGS) $(MAKECMDGOALS)
-- $(MAKE) -C $(top_srcdir)/cpp/examples/MinOZW/ -$(MAKEFLAGS) $(MAKECMDGOALS)
-
- clean:
- $(MAKE) -C $(top_srcdir)/cpp/build/ -$(MAKEFLAGS) $(MAKECMDGOALS)
-- $(MAKE) -C $(top_srcdir)/cpp/examples/MinOZW/ -$(MAKEFLAGS) $(MAKECMDGOALS)
-
- cpp/src/vers.cpp:
- CPPFLAGS=$(CPPFLAGS) $(MAKE) -C $(top_srcdir)/cpp/build/ -$(MAKEFLAGS) cpp/src/vers.cpp
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=https://alioth.debian.org/frs/download.php/file/4235
+PKG_SOURCE_URL:=https://pcsclite.apdu.fr/files/
PKG_HASH:=5a27262586eff39cfd5c19aadc8891dd71c0818d3d629539bd631b958be689c9
PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
PKG_LICENSE:=BSD-3-Clause
define Package/pcsc-lite/Default
TITLE:=Access a smart card using SCard API (PC/SC)
- URL:=http://pcsclite.alioth.debian.org/
+ URL:=https://pcsclite.apdu.fr/
endef
define Package/pcsc-lite/Default/description
include $(TOPDIR)/rules.mk
PKG_NAME:=tio
-PKG_VERSION:=1.28
+PKG_VERSION:=1.29
PKG_RELEASE:=1
PKG_MAINTAINER:=
PKG_LICENSE:=GPL-2.0+
PKG_SOURCE_URL:=https://github.com/$(PKG_NAME)/$(PKG_NAME)/releases/download/v$(PKG_VERSION)/
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_HASH:=bb5fa22b2ca5c2eeb811f57e1af45ae5a2b852eed1aabbeb3a419cc3b4d4d22a
+PKG_HASH:=371a11b69dd2e1b1af3ca2a1c570408b1452ae4523fe954d250f04b6b2147d23
PKG_FIXUP:=autoreconf
include $(TOPDIR)/rules.mk
PKG_NAME:=unrar
-PKG_VERSION:=5.5.8
+PKG_VERSION:=5.6.1
PKG_RELEASE:=1
PKG_SOURCE:=unrarsrc-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.rarlab.com/rar
-PKG_HASH:=9b66e4353a9944bc140eb2a919ff99482dd548f858f5e296d809e8f7cdb2fcf4
+PKG_SOURCE_URL:=https://www.rarlab.com/rar
+PKG_HASH:=67c339dffa95f6c1bedcca40045e99de5852919dbfaa06e4a9c8f18cd5064e70
PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com>, \
Ted Hess <thess@kitschensync.net>
PKG_LICENSE:=UnRAR
PKG_LICENSE_FILES:=license.txt
+PKG_CPE_ID:=cpe:/a:rarlab:unrar
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-$(BUILD_VARIANT)/unrar
PKG_INSTALL:=1
define Package/unrar/Default
TITLE:=UnRAR
SUBMENU:=Compression
- URL:=http://www.rarlab.com/
+ URL:=https://www.rarlab.com/
DEPENDS:=$(CXX_DEPENDS) +libpthread
endef
# Linux using GCC
-CXX=c++
--CXXFLAGS=-O2
+-CXXFLAGS=-O2 -Wno-logical-op-parentheses -Wno-switch -Wno-dangling-else
+#CXX=c++
-+#CXXFLAGS=-O2
++#CXXFLAGS=-O2 -Wno-logical-op-parentheses -Wno-switch -Wno-dangling-else
LIBFLAGS=-fPIC
DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DRAR_SMP
STRIP=strip
projects / feed / packages.git / commitdiff