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
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
+--- 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;
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"
include $(TOPDIR)/rules.mk
PKG_NAME:=linuxptp
-PKG_VERSION:=1.8
-PKG_RELEASE:=4
+PKG_VERSION:=1.9
+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:=5fb1e4889ccb06f887fc2972fc8b89d17a4cb6355406854f916ebc8d7f51580e
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
-
--- /dev/null
+From d14f11fd329a7da94c0d0190a169f743eb91031b Mon Sep 17 00:00:00 2001
+From: Richard Cochran <richardcochran@gmail.com>
+Date: Mon, 2 Apr 2018 20:19:51 -0700
+Subject: [PATCH] msg: Append multiple TLVs correctly.
+
+The logic that adds TLVs to the end of a message mixes up the 'L'
+length in "TLV" with the total TLV length. As a result, the second
+and subsequent TLVs will corrupt the previous TLV in the buffer. This
+patch corrects the code to find the correct offset for the second and
+following appended TLVs.
+
+Note that the stack does not currently trigger this latent bug because
+only single TLVs are appended.
+
+Fixes: 4a8877f90462 ("msg: Introduce method for appending multiple TLVs on transmit.")
+
+Signed-off-by: Richard Cochran <richardcochran@gmail.com>
+---
+ msg.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/msg.c b/msg.c
+index b7e1053..c004568 100644
+--- a/msg.c
++++ b/msg.c
+@@ -151,6 +151,8 @@ static struct tlv_extra *msg_tlv_prepare(struct ptp_message *msg, int length)
+ tmp = TAILQ_LAST(&msg->tlv_list, tlv_list);
+ if (tmp) {
+ ptr = (uint8_t *) tmp->tlv;
++ ptr += sizeof(tmp->tlv->type);
++ ptr += sizeof(tmp->tlv->length);
+ ptr += tmp->tlv->length;
+ }
+
+--
+2.7.4
+
include $(TOPDIR)/rules.mk
PKG_NAME:=mwan3
-PKG_VERSION:=2.6.11
+PKG_VERSION:=2.6.12
PKG_RELEASE:=2
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}"
$(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:=wifidog-ng
-PKG_VERSION:=1.4.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:=f9c48e09baff777c3437363068f31bc47b943ef4768d68fb8530ea855b5d9997
+PKG_MIRROR_HASH:=0e8c1196d08f0a91819c3b87457ec55151c80dfc1114d5f8b97b9c3870cfc7c4
PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_SOURCE_SUBDIR)
config authserver
option host 'authserver.com'
option port 80
+ option ssl 0
option path '/wifidog/'
option login_path 'login'
option portal_path 'portal'
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
projects / feed / packages.git / commitdiff