include $(TOPDIR)/rules.mk
PKG_NAME:=libexif
-PKG_VERSION:=0.6.23
+PKG_VERSION:=0.6.24
PKG_RELEASE:=$(AUTORELEASE)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://github.com/libexif/libexif/releases/download/v$(PKG_VERSION)
-PKG_HASH:=a740a99920eb81ae0aa802bb46e683ce6e0cde061c210f5d5bde5b8572380431
+PKG_HASH:=d47564c433b733d83b6704c70477e0a4067811d184ec565258ac563d8223f6ae
PK_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
PKG_LICENSE:=LGPL-2.1-or-later
include $(TOPDIR)/rules.mk
PKG_NAME:=libjpeg-turbo
-PKG_VERSION:=2.1.1
+PKG_VERSION:=2.1.2
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/$(PKG_NAME)
-PKG_HASH:=b76aaedefb71ba882cbad4e9275b30c2ae493e3195be0a099425b5c6b99bd510
+PKG_HASH:=09b96cb8cbff9ea556a9c2d173485fd19488844d55276ed4f42240e1e2073ce5
PKG_MAINTAINER:=Rosen Penev <rosenp@gmail.com>
PKG_LICENSE:=BSD-3-Clause IJG zlib
include $(TOPDIR)/rules.mk
PKG_NAME:=libmpdclient
-PKG_VERSION:=2.19
-PKG_RELEASE:=1
+PKG_VERSION:=2.20
+PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://www.musicpd.org/download/libmpdclient/2
-PKG_HASH:=158aad4c2278ab08e76a3f2b0166c99b39fae00ee17231bd225c5a36e977a189
+PKG_HASH:=18793f68e939c3301e34d8fcadea1f7daa24143941263cecadb80126194e277d
PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
PKG_LICENSE:=BSD-3-Clause
include $(TOPDIR)/rules.mk
PKG_NAME:=libnetfilter_log
-PKG_VERSION:=1.0.1
-PKG_RELEASE:=3
+PKG_VERSION:=1.0.2
+PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:= \
http://www.netfilter.org/projects/libnetfilter_log/files/ \
ftp://ftp.netfilter.org/pub/libnetfilter_log/
-PKG_HASH:=74e0fe75753dba3ac114531b5e73240452c789a3f3adccf5c51217da1d933b21
+PKG_HASH:=e3f408575614d849e4726b45e90c7ebb0e6744b04859555a9ce6ec40744ffeea
PKG_MAINTAINER:=Yousong Zhou <yszhou4tech@gmail.com>
PKG_FIXUP:=autoreconf
+++ /dev/null
-From 8858b8eacd1385f99796ead78b3a7157c5e93121 Mon Sep 17 00:00:00 2001
-From: Jan Engelhardt <jengelh@inai.de>
-Date: Sun, 24 Jun 2012 14:57:14 +0200
-Subject: [PATCH 1/6] build: remove unnecessary pkgconfig->config.status
- dependency
-
-The flags obtained from pkgconfig are in essence preprocessor ones.
-
-Signed-off-by: Jan Engelhardt <jengelh@inai.de>
----
- Make_global.am | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/Make_global.am
-+++ b/Make_global.am
-@@ -1,2 +1,2 @@
--AM_CPPFLAGS = -I${top_srcdir}/include
--AM_CFLAGS = -Wall ${LIBNFNETLINK_CFLAGS}
-+AM_CPPFLAGS = -I${top_srcdir}/include ${LIBNFNETLINK_CFLAGS}
-+AM_CFLAGS = -Wall
+++ /dev/null
-From fee63b81ee432d0b3e03ffcf9f54cda99476f267 Mon Sep 17 00:00:00 2001
-From: Jan Engelhardt <jengelh@inai.de>
-Date: Sun, 24 Jun 2012 14:57:48 +0200
-Subject: [PATCH 2/6] build: remove unused lines in Makefile.am
-
-Signed-off-by: Jan Engelhardt <jengelh@inai.de>
----
- Makefile.am | 2 --
- 1 file changed, 2 deletions(-)
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,6 +1,4 @@
--AM_CPPFLAGS = -I$(top_srcdir)/include
- SUBDIRS = include src utils
--LINKOPTS = -lnfnetlink
-
- ACLOCAL_AMFLAGS = -I m4
-
+++ /dev/null
-From 1aa23946431ac593568ccac0e0b6925e7dfd7bd3 Mon Sep 17 00:00:00 2001
-From: Jan Engelhardt <jengelh@inai.de>
-Date: Mon, 8 Oct 2012 15:15:07 +0200
-Subject: [PATCH 3/6] build: resolve automake-1.12 warnings
-
-am/ltlibrary.am: warning: 'libnetfilter_log.la': linking libtool
-libraries using a non-POSIX archiver requires 'AM_PROG_AR' in
-'configure.ac'
-
-Signed-off-by: Jan Engelhardt <jengelh@inai.de>
----
- configure.ac | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -7,6 +7,7 @@ AC_CONFIG_MACRO_DIR([m4])
-
- AM_INIT_AUTOMAKE([-Wall foreign subdir-objects
- tar-pax no-dist-gzip dist-bzip2 1.6])
-+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
-
- dnl kernel style compile messages
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+++ /dev/null
-From 7529487f70e244cd31ef84b037b1c32749c134a7 Mon Sep 17 00:00:00 2001
-From: Eric Leblond <eric@regit.org>
-Date: Sun, 4 Nov 2012 09:29:44 +0100
-Subject: [PATCH 4/6] Add include needed for integer type definition.
-
----
- include/libnetfilter_log/libnetfilter_log.h | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/include/libnetfilter_log/libnetfilter_log.h
-+++ b/include/libnetfilter_log/libnetfilter_log.h
-@@ -9,6 +9,7 @@
- #ifndef __LIBNETFILTER_LOG_H
- #define __LIBNETFILTER_LOG_H
-
-+#include <sys/types.h>
- #include <libnetfilter_log/linux_nfnetlink_log.h>
-
- struct nflog_handle;
+++ /dev/null
-From 2f22d3c4453135c27873b9014e9dc5b5712804df Mon Sep 17 00:00:00 2001
-From: Gustavo Zacarias <gustavo@zacarias.com.ar>
-Date: Tue, 10 Sep 2013 16:23:31 -0300
-Subject: [PATCH 5/6] configure: uclinux is also linux
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,7 +20,7 @@ AC_PROG_INSTALL
- AC_PROG_LN_S
-
- case "$host" in
--*-*-linux*) ;;
-+*-*-linux* | *-*-uclinux*) ;;
- *) AC_MSG_ERROR([Linux only, dude!]);;
- esac
-
+++ /dev/null
-From a1b392b4156db984ab2b695a4a70d113f70cb9b8 Mon Sep 17 00:00:00 2001
-From: Matthieu Crapet <Matthieu.Crapet@ingenico.com>
-Date: Wed, 5 Feb 2014 14:18:57 +0100
-Subject: [PATCH 6/6] configure: add --without-ipulog option to disable
- libipulog build
-
-This is a compat library used for netfilter ULOG target.
-ULOG only works with IPv4. NFLOG has replaced ULOG.
-
-Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com>
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
----
- configure.ac | 5 +++++
- include/libnetfilter_log/Makefile.am | 5 ++++-
- src/Makefile.am | 6 +++++-
- utils/Makefile.am | 7 +++++--
- 4 files changed, 19 insertions(+), 4 deletions(-)
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -24,6 +24,11 @@ case "$host" in
- *) AC_MSG_ERROR([Linux only, dude!]);;
- esac
-
-+AC_ARG_WITH([ipulog],
-+ AC_HELP_STRING([--without-ipulog], [don't build libipulog compat library]),
-+ [ipulog_skip=1], [ipulog_skip=0])
-+AM_CONDITIONAL([BUILD_IPULOG], [test $ipulog_skip = 0])
-+
- dnl Dependencies
- PKG_CHECK_MODULES([LIBNFNETLINK], [libnfnetlink >= 0.0.41])
-
---- a/include/libnetfilter_log/Makefile.am
-+++ b/include/libnetfilter_log/Makefile.am
-@@ -1,3 +1,6 @@
-
--pkginclude_HEADERS = libnetfilter_log.h libipulog.h linux_nfnetlink_log.h
-+pkginclude_HEADERS = libnetfilter_log.h linux_nfnetlink_log.h
-
-+if BUILD_IPULOG
-+pkginclude_HEADERS += libipulog.h
-+endif
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -22,14 +22,18 @@ LIBVERSION=2:0:1
-
- include ${top_srcdir}/Make_global.am
-
--lib_LTLIBRARIES = libnetfilter_log.la libnetfilter_log_libipulog.la
-+lib_LTLIBRARIES = libnetfilter_log.la
-
- libnetfilter_log_la_LDFLAGS = -Wc,-nostartfiles -lnfnetlink \
- -version-info $(LIBVERSION)
- libnetfilter_log_la_SOURCES = libnetfilter_log.c
- libnetfilter_log_la_LIBADD = ${LIBNFNETLINK_LIBS}
-
-+if BUILD_IPULOG
-+lib_LTLIBRARIES += libnetfilter_log_libipulog.la
-+
- libnetfilter_log_libipulog_la_LDFLAGS = -Wc,-nostartfiles \
- -version-info 1:0:0
- libnetfilter_log_libipulog_la_LIBADD = libnetfilter_log.la
- libnetfilter_log_libipulog_la_SOURCES = libipulog_compat.c
-+endif
---- a/utils/Makefile.am
-+++ b/utils/Makefile.am
-@@ -1,12 +1,15 @@
- include ${top_srcdir}/Make_global.am
-
--check_PROGRAMS = nfulnl_test ulog_test
-+check_PROGRAMS = nfulnl_test
-
- nfulnl_test_SOURCES = nfulnl_test.c
- nfulnl_test_LDADD = ../src/libnetfilter_log.la
- nfulnl_test_LDFLAGS = -dynamic
-
-+if BUILD_IPULOG
-+check_PROGRAMS += ulog_test
-+
- ulog_test_SOURCES = ulog_test.c
- ulog_test_LDADD = ../src/libnetfilter_log_libipulog.la ../src/libnetfilter_log.la
- ulog_test_LDFLAGS = -dynamic
--
-+endif
+++ /dev/null
-From 614d8b6cfb969c6102ef320de22b1eb199efce2a Mon Sep 17 00:00:00 2001
-From: Felix Janda <felix.janda@posteo.de>
-Date: Sat, 16 May 2015 13:37:53 +0200
-Subject: include: Sync with current kernel headers
-
-Signed-off-by: Felix Janda <felix.janda@posteo.de>
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
----
- include/libnetfilter_log/linux_nfnetlink_log.h | 51 +++++++++++++-------------
- 1 file changed, 25 insertions(+), 26 deletions(-)
-
---- a/include/libnetfilter_log/linux_nfnetlink_log.h
-+++ b/include/libnetfilter_log/linux_nfnetlink_log.h
-@@ -20,33 +20,31 @@ enum nfulnl_msg_types {
- };
-
- struct nfulnl_msg_packet_hdr {
-- u_int16_t hw_protocol; /* hw protocol (network order) */
-- u_int8_t hook; /* netfilter hook */
-- u_int8_t _pad;
--} __attribute__ ((packed));
-+ __be16 hw_protocol; /* hw protocol (network order) */
-+ __u8 hook; /* netfilter hook */
-+ __u8 _pad;
-+};
-
- struct nfulnl_msg_packet_hw {
-- u_int16_t hw_addrlen;
-- u_int16_t _pad;
-- u_int8_t hw_addr[8];
--} __attribute__ ((packed));
-+ __be16 hw_addrlen;
-+ __u16 _pad;
-+ __u8 hw_addr[8];
-+};
-
- struct nfulnl_msg_packet_timestamp {
-- aligned_u64 sec;
-- aligned_u64 usec;
--} __attribute__ ((packed));
--
--#define NFULNL_PREFIXLEN 30 /* just like old log target */
-+ __aligned_be64 sec;
-+ __aligned_be64 usec;
-+};
-
- enum nfulnl_attr_type {
- NFULA_UNSPEC,
- NFULA_PACKET_HDR,
-- NFULA_MARK, /* u_int32_t nfmark */
-+ NFULA_MARK, /* __u32 nfmark */
- NFULA_TIMESTAMP, /* nfulnl_msg_packet_timestamp */
-- NFULA_IFINDEX_INDEV, /* u_int32_t ifindex */
-- NFULA_IFINDEX_OUTDEV, /* u_int32_t ifindex */
-- NFULA_IFINDEX_PHYSINDEV, /* u_int32_t ifindex */
-- NFULA_IFINDEX_PHYSOUTDEV, /* u_int32_t ifindex */
-+ NFULA_IFINDEX_INDEV, /* __u32 ifindex */
-+ NFULA_IFINDEX_OUTDEV, /* __u32 ifindex */
-+ NFULA_IFINDEX_PHYSINDEV, /* __u32 ifindex */
-+ NFULA_IFINDEX_PHYSOUTDEV, /* __u32 ifindex */
- NFULA_HWADDR, /* nfulnl_msg_packet_hw */
- NFULA_PAYLOAD, /* opaque data payload */
- NFULA_PREFIX, /* string prefix */
-@@ -71,23 +69,23 @@ enum nfulnl_msg_config_cmds {
- };
-
- struct nfulnl_msg_config_cmd {
-- u_int8_t command; /* nfulnl_msg_config_cmds */
-+ __u8 command; /* nfulnl_msg_config_cmds */
- } __attribute__ ((packed));
-
- struct nfulnl_msg_config_mode {
-- u_int32_t copy_range;
-- u_int8_t copy_mode;
-- u_int8_t _pad;
-+ __be32 copy_range;
-+ __u8 copy_mode;
-+ __u8 _pad;
- } __attribute__ ((packed));
-
- enum nfulnl_attr_config {
- NFULA_CFG_UNSPEC,
- NFULA_CFG_CMD, /* nfulnl_msg_config_cmd */
- NFULA_CFG_MODE, /* nfulnl_msg_config_mode */
-- NFULA_CFG_NLBUFSIZ, /* u_int32_t buffer size */
-- NFULA_CFG_TIMEOUT, /* u_int32_t in 1/100 s */
-- NFULA_CFG_QTHRESH, /* u_int32_t */
-- NFULA_CFG_FLAGS, /* u_int16_t */
-+ NFULA_CFG_NLBUFSIZ, /* __u32 buffer size */
-+ NFULA_CFG_TIMEOUT, /* __u32 in 1/100 s */
-+ NFULA_CFG_QTHRESH, /* __u32 */
-+ NFULA_CFG_FLAGS, /* __u16 */
- __NFULA_CFG_MAX
- };
- #define NFULA_CFG_MAX (__NFULA_CFG_MAX -1)
-@@ -95,6 +93,7 @@ enum nfulnl_attr_config {
- #define NFULNL_COPY_NONE 0x00
- #define NFULNL_COPY_META 0x01
- #define NFULNL_COPY_PACKET 0x02
-+/* 0xff is reserved, don't use it for new copy modes. */
-
- #define NFULNL_CFG_F_SEQ 0x0001
- #define NFULNL_CFG_F_SEQ_GLOBAL 0x0002
+++ /dev/null
-From 721ea5ec049e12afdd7c182f2899ab6d92914e68 Mon Sep 17 00:00:00 2001
-From: Ken-ichirou MATSUZAWA <chamaken@gmail.com>
-Date: Fri, 11 Sep 2015 12:12:11 +0900
-Subject: include: Sync with kernel headers
-
-Signed-off-by: Ken-ichirou MATSUZAWA <chamas@h4.dion.ne.jp>
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
----
- include/libnetfilter_log/linux_nfnetlink_log.h | 9 ++++-----
- 1 file changed, 4 insertions(+), 5 deletions(-)
-
---- a/include/libnetfilter_log/linux_nfnetlink_log.h
-+++ b/include/libnetfilter_log/linux_nfnetlink_log.h
-@@ -1,16 +1,12 @@
- #ifndef _NFNETLINK_LOG_H
- #define _NFNETLINK_LOG_H
-
--#ifndef aligned_u64
--#define aligned_u64 unsigned long long __attribute__((aligned(8)))
--#endif
--
- /* This file describes the netlink messages (i.e. 'protocol packets'),
- * and not any kind of function definitions. It is shared between kernel and
- * userspace. Don't put kernel specific stuff in here */
-
- #include <linux/types.h>
--#include <libnfnetlink/linux_nfnetlink.h>
-+#include <linux/netfilter/nfnetlink.h>
-
- enum nfulnl_msg_types {
- NFULNL_MSG_PACKET, /* packet from kernel to userspace */
-@@ -55,6 +51,8 @@ enum nfulnl_attr_type {
- NFULA_HWTYPE, /* hardware type */
- NFULA_HWHEADER, /* hardware header */
- NFULA_HWLEN, /* hardware header length */
-+ NFULA_CT, /* nf_conntrack_netlink.h */
-+ NFULA_CT_INFO, /* enum ip_conntrack_info */
-
- __NFULA_MAX
- };
-@@ -97,5 +95,6 @@ enum nfulnl_attr_config {
-
- #define NFULNL_CFG_F_SEQ 0x0001
- #define NFULNL_CFG_F_SEQ_GLOBAL 0x0002
-+#define NFULNL_CFG_F_CONNTRACK 0x0004
-
- #endif /* _NFNETLINK_LOG_H */
include $(TOPDIR)/rules.mk
PKG_NAME:=libupnp
-PKG_VERSION:=1.14.7
+PKG_VERSION:=1.14.12
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=@SF/pupnp
-PKG_HASH:=7b66ac4a86bc0e218e2771ac274b2945bc4154bf9054e57b14afb67c26ac7c24
+PKG_HASH:=091c80aada1e939c2294245c122be2f5e337cc932af7f7d40504751680b5b5ac
PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
PKG_LICENSE:=BSD-3-Clause
include $(TOPDIR)/rules.mk
PKG_NAME:=ariang
-PKG_VERSION:=1.2.2
+PKG_VERSION:=1.2.3
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).zip
PKG_SOURCE_URL:=https://github.com/mayswind/AriaNg/releases/download/$(PKG_VERSION)
-PKG_HASH:=be5b050f5aaa10e27446c392f2e7d35b19908a591cd5ea3d2ab1228c7d350e3b
+PKG_HASH:=061af099d5772933889254ef926f34f973fd8c0ed82e24c7520b242eba00763f
UNPACK_CMD=unzip -q -d $(1) $(DL_DIR)/$(PKG_SOURCE)
PKG_MAINTAINER:=Ansuel Smith <ansuelsmth@gmail.com>
$(CP) \
$(PKG_BUILD_DIR)/{langs,css,js,fonts} \
$(PKG_BUILD_DIR)/index.html \
- $(PKG_BUILD_DIR)/index.manifest \
$(PKG_BUILD_DIR)/LICENSE \
- $(PKG_BUILD_DIR)/{favicon.*,*.png} \
+ $(PKG_BUILD_DIR)/favicon.* \
$(PKG_BUILD_DIR)/robots.txt \
$(1)/www/ariang
endef
include $(TOPDIR)/rules.mk
PKG_NAME:=bwm-ng
-PKG_VERSION:=0.6.1
-PKG_RELEASE:=1
+PKG_VERSION:=0.6.3
+PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.gropp.org/bwm-ng
-PKG_HASH:=027cf3c960cd96fc9ffacdf7713df62d0fc55eeef4a1388289f8a62ae5e50df0
+PKG_HASH:=c1a552b6ff48ea3e4e10110a7c188861abc4750befc67c6caaba8eb3ecf67f46
+
PKG_MAINTAINER:=Julen Landa Alustiza <julen@zokormazo.info>
PKG_LICENSE:=GPL2-2.0
PKG_LICENSE_FILES:=COPYING
+PKG_FIXUP:=autoreconf
PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1
source "$(SOURCE)/Config.in"
endef
-define Build/Configure
- $(call Build/Configure/Default, \
+CONFIGURE_ARGS += \
$(if $(CONFIG_BWMNG_CONFIGFILE),--enable,--disable)-configfile \
$(if $(CONFIG_BWMNG_HTML),--enable,--disable)-html \
$(if $(CONFIG_BWMNG_CSV),--enable,--disable)-csv \
$(if $(CONFIG_BWMNG_GETOPT_LONG),--with,--without)-getopt_long \
--with-strip \
--with-procnetdev \
- --with-diskstats \
- )
-endef
+ --with-diskstats
define Package/bwm-ng/install
$(INSTALL_DIR) $(1)/usr/bin
+++ /dev/null
-From d5daf15c2098040b8b01753d3cdce8c1c79fc528 Mon Sep 17 00:00:00 2001
-From: David Seifert <soap@gentoo.org>
-Date: Fri, 10 Feb 2017 21:30:49 +0100
-Subject: [PATCH] Use `static inline` instead of `inline`
-
-`inline` by itself is not portably guaranteed to emit
-an external definition when needed in C99. The current
-code base implicitly relies on GNU89 inline semantics,
-which _always_ emit an external definition. More recent
-versions of GCC and Clang switch to C99/C11 inline semantics
-by default, which fails with undefined references.
-
-See also:
-* http://www.greenend.org.uk/rjk/tech/inline.html
-* https://clang.llvm.org/compatibility.html#inline
-* http://blahg.josefsipek.net/?p=529
----
- src/bwm-ng.c | 4 ++--
- src/help.c | 4 ++--
- src/options.c | 16 ++++++++--------
- src/output.c | 22 +++++++++++-----------
- src/process.c | 28 ++++++++++++++--------------
- 5 files changed, 37 insertions(+), 37 deletions(-)
-
---- a/src/bwm-ng.c
-+++ b/src/bwm-ng.c
-@@ -26,7 +26,7 @@
-
- /* handle interrupt signal */
- void sigint(int sig) FUNCATTR_NORETURN;
--inline void init(void);
-+static inline void init(void);
-
- /* clear stuff and exit */
- #ifdef __STDC__
-@@ -98,7 +98,7 @@ void sigint(int sig) {
- deinit(0, NULL);
- }
-
--inline void init(void) {
-+static inline void init(void) {
- if_count=0;
- delay=500;
- #if EXTENDED_STATS
---- a/src/help.c
-+++ b/src/help.c
-@@ -24,9 +24,9 @@
- #include "global_vars.h"
- #include "help.h"
-
--inline void print_help_line(const char *short_c,const char * long_c,const char *descr);
-+static inline void print_help_line(const char *short_c,const char * long_c,const char *descr);
-
--inline void print_help_line(const char *short_c,const char * long_c,const char *descr) {
-+static inline void print_help_line(const char *short_c,const char * long_c,const char *descr) {
- #ifdef LONG_OPTIONS
- printf(" %-23s",long_c);
- #else
---- a/src/options.c
-+++ b/src/options.c
-@@ -30,12 +30,12 @@ static char* getToken(char** str, const
- char *trim_whitespace(char *str);
- int read_config(const char *config_file);
- #endif
--inline int str2output_unit(char *optarg);
-+static inline int str2output_unit(char *optarg);
- #if EXTENDED_STATS
--inline int str2output_type(char *optarg);
-+static inline int str2output_type(char *optarg);
- #endif
--inline int str2out_method(char *optarg);
--inline int str2in_method(char *optarg);
-+static inline int str2out_method(char *optarg);
-+static inline int str2in_method(char *optarg);
-
- #ifdef CONFIG_FILE
- /******************************************************************************
-@@ -65,7 +65,7 @@ static char* getToken(char** str, const
- /******************************************************************************/
- #endif
-
--inline int str2output_unit(char *optarg) {
-+static inline int str2output_unit(char *optarg) {
- if (optarg) {
- if (!strcasecmp(optarg,"bytes")) return BYTES_OUT;
- if (!strcasecmp(optarg,"bits")) return BITS_OUT;
-@@ -76,7 +76,7 @@ inline int str2output_unit(char *optarg)
- }
-
- #if EXTENDED_STATS
--inline int str2output_type(char *optarg) {
-+static inline int str2output_type(char *optarg) {
- if (optarg) {
- if (!strcasecmp(optarg,"rate")) return RATE_OUT;
- if (!strcasecmp(optarg,"max")) return MAX_OUT;
-@@ -87,7 +87,7 @@ inline int str2output_type(char *optarg)
- }
- #endif
-
--inline int str2out_method(char *optarg) {
-+static inline int str2out_method(char *optarg) {
- if (optarg) {
- if (!strcasecmp(optarg,"plain")) return PLAIN_OUT;
- #ifdef HAVE_CURSES
-@@ -109,7 +109,7 @@ inline int str2out_method(char *optarg)
- }
-
-
--inline int str2in_method(char *optarg) {
-+static inline int str2in_method(char *optarg) {
- if (optarg) {
- #ifdef PROC_NET_DEV
- if (!strcasecmp(optarg,"proc")) return PROC_IN;
---- a/src/output.c
-+++ b/src/output.c
-@@ -25,13 +25,13 @@
- #include "output.h"
-
- inline static const char *output_type2str(void);
--inline const char *input2str(void);
--inline const char *show_all_if2str(void);
--inline ullong direction2value(char mode,struct inout_long stats);
-+static inline const char *input2str(void);
-+static inline const char *show_all_if2str(void);
-+static inline ullong direction2value(char mode,struct inout_long stats);
- #if EXTENDED_STATS
--inline double direction_max2value(char mode,struct inouttotal_double stats,int items);
-+static inline double direction_max2value(char mode,struct inouttotal_double stats,int items);
- #endif
--inline char *dyn_byte_value2str(double value,char *str,int buf_size);
-+static inline char *dyn_byte_value2str(double value,char *str,int buf_size);
- char *values2str(char mode,t_iface_speed_stats stats,t_iface_stats full_stats,float multiplier,char *str,int buf_size);
-
- inline static const char *output_type2str(void) {
-@@ -59,7 +59,7 @@ inline static const char *output_type2st
- }
-
-
--inline const char *input2str(void) {
-+static inline const char *input2str(void) {
- switch (input_method) {
- #ifdef SYSCTL
- case SYSCTL_IN:
-@@ -121,7 +121,7 @@ inline const char *input2str(void) {
- return "";
- }
-
--inline const char *show_all_if2str(void) {
-+static inline const char *show_all_if2str(void) {
- switch (show_all_if) {
- case 1:
- return " (all)";
-@@ -262,7 +262,7 @@ int print_header(int option) {
- }
-
-
--inline ullong direction2value(char mode,struct inout_long stats) {
-+static inline ullong direction2value(char mode,struct inout_long stats) {
- switch (mode) {
- case 0:
- return stats.in;
-@@ -275,7 +275,7 @@ inline ullong direction2value(char mode,
- }
-
- #if EXTENDED_STATS
--inline double direction_max2value(char mode,struct inouttotal_double stats,int items) {
-+static inline double direction_max2value(char mode,struct inouttotal_double stats,int items) {
- switch (mode) {
- case 0:
- return (double)(stats.in/items);
-@@ -288,7 +288,7 @@ inline double direction_max2value(char m
- }
- #endif
-
--inline char *dyn_byte_value2str(double value,char *str,int buf_size) {
-+static inline char *dyn_byte_value2str(double value,char *str,int buf_size) {
- if (dynamic) {
- if (value<1024)
- snprintf(str,buf_size,"%15.2f ",value);
-@@ -306,7 +306,7 @@ inline char *dyn_byte_value2str(double v
- return str;
- }
-
--inline char *dyn_bit_value2str(double value,char *str,int buf_size) {
-+static inline char *dyn_bit_value2str(double value,char *str,int buf_size) {
- if (dynamic) {
- if (value<1000)
- snprintf(str,buf_size,"%15.2f ",value);
---- a/src/process.c
-+++ b/src/process.c
-@@ -26,19 +26,19 @@
-
- short show_iface(char *instr, char *searchstr,char iface_is_up);
- #if HAVE_GETTIMEOFDAY
--inline long tvdiff(struct timeval newer, struct timeval older);
-+static inline long tvdiff(struct timeval newer, struct timeval older);
- float get_time_delay(int iface_num);
- #endif
--inline ullong calc_new_values(ullong new, ullong old);
-+static inline ullong calc_new_values(ullong new, ullong old);
- t_iface_speed_stats convert2calced_values(t_iface_speed_stats new, t_iface_speed_stats old);
- t_iface_speed_stats convert2calced_disk_values(t_iface_speed_stats new, t_iface_speed_stats old);
- #if EXTENDED_STATS
--inline void sub_avg_values(struct inouttotal_double *values,struct inouttotal_double data);
--inline void add_avg_values(struct inouttotal_double *values,struct inouttotal_double data);
--inline void save_avg_values(struct inouttotal_double *values,struct inouttotal_double *data,struct inout_long calced_stats,float multiplier);
-+static inline void sub_avg_values(struct inouttotal_double *values,struct inouttotal_double data);
-+static inline void add_avg_values(struct inouttotal_double *values,struct inouttotal_double data);
-+static inline void save_avg_values(struct inouttotal_double *values,struct inouttotal_double *data,struct inout_long calced_stats,float multiplier);
- void save_avg(struct t_avg *avg,struct iface_speed_stats calced_stats,float multiplier);
--inline void save_sum(struct inout_long *stats,struct inout_long new_stats_values);
--inline void save_max(struct inouttotal_double *stats,struct inout_long calced_stats,float multiplier);
-+static inline void save_sum(struct inout_long *stats,struct inout_long new_stats_values);
-+static inline void save_max(struct inouttotal_double *stats,struct inout_long calced_stats,float multiplier);
- #endif
-
- /* returns the whether to show the iface or not
-@@ -74,7 +74,7 @@ short show_iface(char *instr, char *sear
-
- #if HAVE_GETTIMEOFDAY
- /* Returns: the time difference in milliseconds. */
--inline long tvdiff(struct timeval newer, struct timeval older) {
-+static inline long tvdiff(struct timeval newer, struct timeval older) {
- return labs((newer.tv_sec-older.tv_sec)*1000+
- (newer.tv_usec-older.tv_usec)/1000);
- }
-@@ -92,7 +92,7 @@ float get_time_delay(int iface_num) {
- #endif
-
- /* basically new-old, but handles "overflow" of source aswell */
--inline ullong calc_new_values(ullong new, ullong old) {
-+static inline ullong calc_new_values(ullong new, ullong old) {
- /* FIXME: WRAP_AROUND _might_ be wrong for libstatgrab, where the type is always long long */
- return (new>=old) ? (ullong)(new-old) : (ullong)((
- #ifdef HAVE_LIBKSTAT
-@@ -133,13 +133,13 @@ t_iface_speed_stats convert2calced_disk_
-
- #if EXTENDED_STATS
- /* sub old values from cached for avg stats */
--inline void sub_avg_values(struct inouttotal_double *values,struct inouttotal_double data) {
-+static inline void sub_avg_values(struct inouttotal_double *values,struct inouttotal_double data) {
- values->in-=data.in;
- values->out-=data.out;
- values->total-=data.total;
- }
-
--inline void add_avg_values(struct inouttotal_double *values,struct inouttotal_double data) {
-+static inline void add_avg_values(struct inouttotal_double *values,struct inouttotal_double data) {
- values->in+=data.in;
- values->out+=data.out;
- values->total+=data.total;
-@@ -148,7 +148,7 @@ inline void add_avg_values(struct inoutt
-
- /* put new-old bytes in inout_long struct into a inouttotal_double struct
- * and add values to cached .value struct */
--inline void save_avg_values(struct inouttotal_double *values,struct inouttotal_double *data,struct inout_long calced_stats,float multiplier) {
-+static inline void save_avg_values(struct inouttotal_double *values,struct inouttotal_double *data,struct inout_long calced_stats,float multiplier) {
- data->in=calced_stats.in*multiplier;
- data->out=calced_stats.out*multiplier;
- data->total=(calced_stats.in+calced_stats.out)*multiplier;
-@@ -198,13 +198,13 @@ void save_avg(struct t_avg *avg,struct i
- }
-
- /* add current in and out bytes to totals struct */
--inline void save_sum(struct inout_long *stats,struct inout_long new_stats_values) {
-+static inline void save_sum(struct inout_long *stats,struct inout_long new_stats_values) {
- stats->in+=new_stats_values.in;
- stats->out+=new_stats_values.out;
- }
-
- /* lookup old max values and save new if higher */
--inline void save_max(struct inouttotal_double *stats,struct inout_long calced_stats,float multiplier) {
-+static inline void save_max(struct inouttotal_double *stats,struct inout_long calced_stats,float multiplier) {
- if (multiplier*calced_stats.in > stats->in)
- stats->in=multiplier*calced_stats.in;
- if (multiplier*calced_stats.out>stats->out)
include $(TOPDIR)/rules.mk
PKG_NAME:=mpc
-PKG_VERSION:=0.33
-PKG_RELEASE:=1
+PKG_VERSION:=0.34
+PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://www.musicpd.org/download/mpc/0
-PKG_HASH:=4f40ccbe18f5095437283cfc525a97815e983cbfd3a29e48ff610fa4f1bf1296
+PKG_HASH:=691e3f3654bc10d022bb0310234d0bc2d8c075a698f09924d9ebed8f506fda20
PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
PKG_LICENSE:=GPL-2.0-or-later
include $(TOPDIR)/rules.mk
PKG_NAME:=mpd
-PKG_VERSION:=0.23.2
+PKG_VERSION:=0.23.5
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://www.musicpd.org/download/mpd/0.23
-PKG_HASH:=74ec75689746baaeab7c65d70019f96f70b31b658cb25cfd2ebcca03f65acddf
+PKG_HASH:=f22c2c25093a05f4566f9cd7207cfbcd8405af67ed29a989bcf8905f80b7a299
PKG_MAINTAINER:=
PKG_LICENSE:=GPL-2.0-or-later
include $(TOPDIR)/rules.mk
PKG_NAME:=upmpdcli
-PKG_VERSION:=1.5.12
+PKG_VERSION:=1.5.13
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://www.lesbonscomptes.com/upmpdcli/downloads
-PKG_HASH:=1d7b6ab360c2549a7e3eff4f261471761dd837e18327a3ca29de1981c090ff3b
+PKG_HASH:=c7726f0d4062ae253159102e499759bd513d3c68bfe16c44997ee3fba35509f8
PKG_MAINTAINER:=
PKG_LICENSE:=LGPL-2.1-or-later
include $(TOPDIR)/rules.mk
PKG_NAME:=bluez
-PKG_VERSION:=5.60
+PKG_VERSION:=5.62
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@KERNEL/linux/bluetooth/
-PKG_HASH:=710999580d01ee59ec585e5e7c07fd94eddedc001aa26fe7464c546f9d945304
+PKG_HASH:=38090a5b750e17fc08d3e52178ed8d3254c5f4bd2c48830d5c1955b88e3bc0c2
PKG_LICENSE:=GPL-2.0-or-later
PKG_LICENSE_FILES:=COPYING
--- a/Makefile.in
+++ b/Makefile.in
-@@ -3326,7 +3326,7 @@ unit_tests = $(am__append_52) unit/test-
- @CLIENT_TRUE@ client/gatt.h client/gatt.c
+@@ -3342,7 +3342,7 @@ unit_tests = $(am__append_54) unit/test-
+ @CLIENT_TRUE@ client/admin.c
@CLIENT_TRUE@client_bluetoothctl_LDADD = gdbus/libgdbus-internal.la src/libshared-glib.la \
-@CLIENT_TRUE@ $(GLIB_LIBS) $(DBUS_LIBS) -lreadline
@ZSH_COMPLETIONS_TRUE@zshcompletiondir = $(ZSH_COMPLETIONDIR)
@ZSH_COMPLETIONS_TRUE@dist_zshcompletion_DATA = completion/zsh/_bluetoothctl
-@@ -3559,7 +3559,7 @@ unit_tests = $(am__append_52) unit/test-
+@@ -3575,7 +3575,7 @@ unit_tests = $(am__append_54) unit/test-
@MESH_TRUE@@TOOLS_TRUE@tools_meshctl_LDADD = gdbus/libgdbus-internal.la src/libshared-glib.la \
@MESH_TRUE@@TOOLS_TRUE@ lib/libbluetooth-internal.la \
@MESH_TRUE@@TOOLS_TRUE@tools_mesh_cfgclient_SOURCES = tools/mesh-cfgclient.c \
@MESH_TRUE@@TOOLS_TRUE@ tools/mesh/model.h tools/mesh/config-model.h \
-@@ -3630,7 +3630,7 @@ unit_tests = $(am__append_52) unit/test-
+@@ -3646,7 +3646,7 @@ unit_tests = $(am__append_54) unit/test-
@READLINE_TRUE@ tools/obex-client-tool.c
@READLINE_TRUE@tools_obex_client_tool_LDADD = lib/libbluetooth-internal.la \
@READLINE_TRUE@tools_obex_server_tool_SOURCES = $(gobex_sources) $(btio_sources) \
@READLINE_TRUE@ tools/obex-server-tool.c
-@@ -3639,15 +3639,15 @@ unit_tests = $(am__append_52) unit/test-
+@@ -3655,15 +3655,15 @@ unit_tests = $(am__append_54) unit/test-
@READLINE_TRUE@tools_bluetooth_player_SOURCES = tools/bluetooth-player.c
@READLINE_TRUE@tools_bluetooth_player_LDADD = gdbus/libgdbus-internal.la \
@READLINE_TRUE@ src/libshared-glib.la \
@DEPRECATED_TRUE@@READLINE_TRUE@attrib_gatttool_SOURCES = attrib/gatttool.c attrib/att.c attrib/gatt.c \
@DEPRECATED_TRUE@@READLINE_TRUE@ attrib/gattrib.c btio/btio.c \
-@@ -3656,7 +3656,7 @@ unit_tests = $(am__append_52) unit/test-
+@@ -3672,7 +3672,7 @@ unit_tests = $(am__append_54) unit/test-
@DEPRECATED_TRUE@@READLINE_TRUE@ client/display.h
@DEPRECATED_TRUE@@READLINE_TRUE@attrib_gatttool_LDADD = lib/libbluetooth-internal.la \
--- a/src/adapter.c
+++ b/src/adapter.c
-@@ -560,7 +560,8 @@ static void settings_changed(struct btd_
- g_dbus_emit_property_changed(dbus_conn, adapter->path,
- ADAPTER_INTERFACE, "Discoverable");
- store_adapter_info(adapter);
+@@ -606,7 +606,9 @@ static void settings_changed(struct btd_
+ */
+ if (!adapter->discovery_discoverable)
+ store_adapter_info(adapter);
- btd_adv_manager_refresh(adapter->adv_manager);
++
+ if (adapter->supported_settings & MGMT_SETTING_LE)
+ btd_adv_manager_refresh(adapter->adv_manager);
}
include $(TOPDIR)/rules.mk
PKG_NAME:=canutils
-PKG_VERSION:=2021.06.0
+PKG_VERSION:=2021.08.0
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/linux-can/can-utils/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=f7874457224c89f8b2eb55ab741935ddb7f1c9bc52de2642330b0799f89d1040
+PKG_HASH:=c9b8f29515ad34af7f78450ec55c983abc5393e86b1f128a92ac0dfd141baaf7
PKG_BUILD_DIR:=$(BUILD_DIR)/can-utils-$(PKG_VERSION)
PKG_MAINTAINER:=Anton Glukhov <anton.a.glukhov@gmail.com>
include $(TOPDIR)/rules.mk
PKG_NAME:=less
-PKG_VERSION:=590
+PKG_VERSION:=598
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:= @GNU/less \
http://www.greenwoodsoftware.com/less
-PKG_HASH:=6aadf54be8bf57d0e2999a3c5d67b1de63808bb90deb8f77b028eafae3a08e10
+PKG_HASH:=64e0eb24534ac70d15ff3a36c8853f7a48196aa230d2a104707fc4ff1a45e982
PKG_LICENSE:=GPL-3.0-or-later
PKG_LICENSE_FILES:=COPYING
include $(TOPDIR)/rules.mk
PKG_NAME:=tang
-PKG_VERSION:=10
+PKG_VERSION:=11
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://github.com/latchset/$(PKG_NAME)/releases/download/v$(PKG_VERSION)/
-PKG_HASH:=082f17e031708ab5e2f88c9b767d228bcf92a0d089fdb164d4ae93845cbd2a48
+PKG_HASH:=ef5d3ae56030f20c290594b9be89ad9ec469dd385676595e1c7a2bfdc3f45d8f
PKG_MAINTAINER:=Tibor Dudlák <tibor.dudlak@gmail.com>
PKG_LICENSE:=GPL-3.0-or-later
endef
define Package/tang/install
+ $(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_DIR) $(1)/usr/libexec
$(INSTALL_DIR) $(1)/etc/xinetd.d/
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/libexec/tangd* $(1)/usr/libexec/
- $(INSTALL_BIN) ./files/tangdw $(1)/usr/libexec/
- $(CP) ./files/tangdx $(1)/etc/xinetd.d/
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/tang-show-keys $(1)/usr/bin/
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/libexec/tangd* $(1)/usr/libexec/
+ $(INSTALL_BIN) ./files/tangdw $(1)/usr/libexec/
+ $(CP) ./files/tangdx $(1)/etc/xinetd.d/
endef
define Package/tang/postinst
+++ /dev/null
---- a/meson.build
-+++ b/meson.build
-@@ -54,7 +54,7 @@ compiler = meson.get_compiler('c')
- if not compiler.has_header('http_parser.h',args : '-I/usr/local/include')
- error('http-parser devel files not found.')
- endif
--http_parser = compiler.find_library('http_parser',dirs:['/usr/lib','/usr/local/lib'])
-+http_parser = compiler.find_library('http_parser')
-
- licenses = ['COPYING']
- libexecbins = []
include $(TOPDIR)/rules.mk
PKG_NAME:=unrar
-PKG_VERSION:=6.0.7
+PKG_VERSION:=6.1.3
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=unrarsrc-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://www.rarlab.com/rar
-PKG_HASH:=a7029942006cbcced3f3b7322ec197683f8e7be408972ca08099b196c038f518
+PKG_HASH:=d05022442009202a792e588bec58921c123ff046fc755f7f2272871a5bd79636
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-$(BUILD_VARIANT)/unrar
PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com>, \
include $(TOPDIR)/rules.mk
PKG_NAME:=yara
-PKG_VERSION:=4.1.1
+PKG_VERSION:=4.1.3
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/VirusTotal/yara/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=5f85c69606fad5cdb42e8f8101c96f6962a4928667395d9471e5aaea961e9b1d
+PKG_HASH:=3610ddd0c3645b8b9cfa7cfbafc0146f2df751ad8d6cd261a638bfff81efbc32
PKG_MAINTAINER:=Marko Ratkaj <marko.ratkaj@sartura.hr>
PKG_LICENSE:=BSD-3-Clause