summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--package/collectd/Makefile21
-rw-r--r--package/collectd/patches/patch-configure29
-rw-r--r--package/collectd/patches/patch-src_Makefile_in11
-rw-r--r--package/gnutls/Makefile4
-rw-r--r--package/libnetfilter_conntrack/Makefile2
-rw-r--r--package/libnetfilter_conntrack/patches/patch-include_libnetfilter_conntrack_libnetfilter_conntrack_h228
-rw-r--r--package/libnetfilter_conntrack/patches/patch-src_main_c20
7 files changed, 305 insertions, 10 deletions
diff --git a/package/collectd/Makefile b/package/collectd/Makefile
index d37bb30ea..4203aace3 100644
--- a/package/collectd/Makefile
+++ b/package/collectd/Makefile
@@ -4,10 +4,10 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= collectd
-PKG_VERSION:= 5.4.0
+PKG_VERSION:= 5.4.1
PKG_RELEASE:= 1
-PKG_MD5SUM:= d4176b3066f3b85d85343d3648ea43f6
-PKG_DESCR:= System statistics collection daemon
+PKG_MD5SUM:= 6514ab3f7fd2135d2713f1ab25068841
+PKG_DESCR:= system statistics collection daemon
PKG_SECTION:= misc
PKG_BUILDDEP:= libtool
PKG_DEPENDS:= libpthread libltdl
@@ -15,7 +15,7 @@ PKG_URL:= http://collectd.org/
PKG_SITES:= http://collectd.org/files/
PKG_FLAVOURS_COLLECTD:= WITH_CPU WITH_LOAD WITH_MEMORY WITH_PING
-PKG_FLAVOURS_COLLECTD+= WITH_RRD
+PKG_FLAVOURS_COLLECTD+= WITH_RRD WITH_NETWORK WITH_UPTIME
PKGFD_WITH_RRD:= enable RRD output
PKGFB_WITH_RRD:= rrdtool
PKGFS_WITH_RRD:= librrd
@@ -23,6 +23,8 @@ PKGFD_WITH_CPU:= collect CPU statistics
PKGFD_WITH_LOAD:= collect system load statistics
PKGFD_WITH_MEMORY:= collect memory usage statistics
PKGFD_WITH_PING:= enable ping statistic plugin
+PKGFD_WITH_NETWORK:= enable network statistic plugin
+PKGFD_WITH_UPTIME:= enable uptime statistic plugin
include ${TOPDIR}/mk/package.mk
@@ -40,6 +42,12 @@ endif
ifneq (${ADK_PACKAGE_COLLECTD_WITH_PING},y)
DISABLE_PING:=--disable-ping
endif
+ifneq (${ADK_PACKAGE_COLLECTD_WITH_NETWORK},y)
+DISABLE_NETWORK:=--disable-network
+endif
+ifneq (${ADK_PACKAGE_COLLECTD_WITH_UPTIME},y)
+DISABLE_UPTIME:=--disable-uptime
+endif
CONFIGURE_ARGS+= --disable-aggregation \
--disable-apache \
@@ -75,7 +83,7 @@ CONFIGURE_ARGS+= --disable-aggregation \
${DISABLE_MEMORY} \
--disable-multimeter \
--disable-mysql \
- --disable-network \
+ ${DISABLE_NETWORK} \
--disable-nginx \
--disable-nfs \
--disable-ntpd \
@@ -106,7 +114,7 @@ CONFIGURE_ARGS+= --disable-aggregation \
--disable-thermal \
--disable-unixsock \
--disable-users \
- --disable-uptime \
+ ${DISABLE_UPTIME} \
--disable-uuid \
--disable-vserver \
--disable-wireless \
@@ -118,7 +126,6 @@ CONFIGURE_ARGS+= --disable-aggregation \
--without-libiptc \
--with-nan-emulation
-TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
XAKE_FLAGS+= LIBS='-lm -lltdl'
collectd-install:
diff --git a/package/collectd/patches/patch-configure b/package/collectd/patches/patch-configure
new file mode 100644
index 000000000..41e8e65c7
--- /dev/null
+++ b/package/collectd/patches/patch-configure
@@ -0,0 +1,29 @@
+--- collectd-5.4.1.orig/configure 2014-01-26 09:10:00.000000000 +0100
++++ collectd-5.4.1/configure 2014-04-10 16:56:47.000000000 +0200
+@@ -16812,7 +16812,7 @@ SAVE_CFLAGS="$CFLAGS"
+ # Emulate behavior of src/Makefile.am
+ if test "x$GCC" = "xyes"
+ then
+- CFLAGS="$CFLAGS -Wall -Werror"
++ CFLAGS="$CFLAGS -Wall"
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for strtok_r" >&5
+@@ -17388,7 +17388,7 @@ done
+ if test "x$GCC" = "xyes"
+ then
+ SAVE_CFLAGS="$CFLAGS"
+- CFLAGS="$CFLAGS -Wall -Wextra -Werror"
++ CFLAGS="$CFLAGS -Wall -Wextra"
+ fi
+
+ for ac_func in strptime
+@@ -23057,7 +23057,7 @@ then
+ SAVE_LDFLAGS="$LDFLAGS"
+ # trigger an error if Perl_load_module*() uses __attribute__nonnull__(3)
+ # (see issues #41 and #42)
+- CFLAGS="$CFLAGS $PERL_CFLAGS -Wall -Werror"
++ CFLAGS="$CFLAGS $PERL_CFLAGS -Wall"
+ LDFLAGS="$LDFLAGS $PERL_LDFLAGS"
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken Perl_load_module()" >&5
diff --git a/package/collectd/patches/patch-src_Makefile_in b/package/collectd/patches/patch-src_Makefile_in
new file mode 100644
index 000000000..e35859cfb
--- /dev/null
+++ b/package/collectd/patches/patch-src_Makefile_in
@@ -0,0 +1,11 @@
+--- collectd-5.4.1.orig/src/Makefile.in 2014-01-26 09:09:56.000000000 +0100
++++ collectd-5.4.1/src/Makefile.in 2014-04-10 19:13:47.000000000 +0200
+@@ -2235,7 +2235,7 @@ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = libcollectdclient $(am__append_1)
+-@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall -Werror
++@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall
+ AM_CPPFLAGS = -DPREFIX='"${prefix}"' \
+ -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' \
+ -DLOCALSTATEDIR='"${localstatedir}"' \
diff --git a/package/gnutls/Makefile b/package/gnutls/Makefile
index c75f02ea9..c1b993c14 100644
--- a/package/gnutls/Makefile
+++ b/package/gnutls/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= gnutls
-PKG_VERSION:= 3.2.12
+PKG_VERSION:= 3.2.13
PKG_RELEASE:= 1
-PKG_MD5SUM:= f507365940de8f095e1d867c6f0842f6
+PKG_MD5SUM:= 300e5f413054e2f4719c1c3b5179a611
PKG_DESCR:= GNU TLS library
PKG_SECTION:= crypto
PKG_DEPENDS:= libgcrypt libtasn1 zlib libnettle libgmp
diff --git a/package/libnetfilter_conntrack/Makefile b/package/libnetfilter_conntrack/Makefile
index 842eff7bd..90c74f5c1 100644
--- a/package/libnetfilter_conntrack/Makefile
+++ b/package/libnetfilter_conntrack/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libnetfilter_conntrack
PKG_VERSION:= 1.0.4
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 18cf80c4b339a3285e78822dbd4f08d7
PKG_DESCR:= API to connection tracking state table
PKG_SECTION:= libs
diff --git a/package/libnetfilter_conntrack/patches/patch-include_libnetfilter_conntrack_libnetfilter_conntrack_h b/package/libnetfilter_conntrack/patches/patch-include_libnetfilter_conntrack_libnetfilter_conntrack_h
new file mode 100644
index 000000000..b8d557cb7
--- /dev/null
+++ b/package/libnetfilter_conntrack/patches/patch-include_libnetfilter_conntrack_libnetfilter_conntrack_h
@@ -0,0 +1,228 @@
+--- libnetfilter_conntrack-1.0.4.orig/include/libnetfilter_conntrack/libnetfilter_conntrack.h 2013-08-06 15:22:55.000000000 +0200
++++ libnetfilter_conntrack-1.0.4/include/libnetfilter_conntrack/libnetfilter_conntrack.h 2014-04-10 14:29:23.000000000 +0200
+@@ -10,6 +10,7 @@
+ #ifndef _LIBNETFILTER_CONNTRACK_H_
+ #define _LIBNETFILTER_CONNTRACK_H_
+
++#include <stdint.h>
+ #include <netinet/in.h>
+ #include <libnfnetlink/linux_nfnetlink.h>
+ #include <libnfnetlink/libnfnetlink.h>
+@@ -37,9 +38,9 @@ struct nfct_handle;
+ /*
+ * [Open|close] a conntrack handler
+ */
+-extern struct nfct_handle *nfct_open(u_int8_t, unsigned);
++extern struct nfct_handle *nfct_open(uint8_t, unsigned);
+ extern struct nfct_handle *nfct_open_nfnl(struct nfnl_handle *nfnlh,
+- u_int8_t subsys_id,
++ uint8_t subsys_id,
+ unsigned int subscriptions);
+ extern int nfct_close(struct nfct_handle *cth);
+
+@@ -160,31 +161,31 @@ enum nf_conntrack_attr_grp {
+ };
+
+ struct nfct_attr_grp_ipv4 {
+- u_int32_t src, dst;
++ uint32_t src, dst;
+ };
+
+ struct nfct_attr_grp_ipv6 {
+- u_int32_t src[4], dst[4];
++ uint32_t src[4], dst[4];
+ };
+
+ struct nfct_attr_grp_port {
+- u_int16_t sport, dport;
++ uint16_t sport, dport;
+ };
+
+ struct nfct_attr_grp_icmp {
+- u_int16_t id;
+- u_int8_t code, type;
++ uint16_t id;
++ uint8_t code, type;
+ };
+
+ struct nfct_attr_grp_ctrs {
+- u_int64_t packets;
+- u_int64_t bytes;
++ uint64_t packets;
++ uint64_t bytes;
+ };
+
+ union nfct_attr_grp_addr {
+- u_int32_t ip;
+- u_int32_t ip6[4];
+- u_int32_t addr[4];
++ uint32_t ip;
++ uint32_t ip6[4];
++ uint32_t addr[4];
+ };
+
+ /* message type */
+@@ -302,19 +303,19 @@ extern void nfct_set_attr(struct nf_conn
+
+ extern void nfct_set_attr_u8(struct nf_conntrack *ct,
+ const enum nf_conntrack_attr type,
+- u_int8_t value);
++ uint8_t value);
+
+ extern void nfct_set_attr_u16(struct nf_conntrack *ct,
+ const enum nf_conntrack_attr type,
+- u_int16_t value);
++ uint16_t value);
+
+ extern void nfct_set_attr_u32(struct nf_conntrack *ct,
+ const enum nf_conntrack_attr type,
+- u_int32_t value);
++ uint32_t value);
+
+ extern void nfct_set_attr_u64(struct nf_conntrack *ct,
+ const enum nf_conntrack_attr type,
+- u_int64_t value);
++ uint64_t value);
+
+ extern void nfct_set_attr_l(struct nf_conntrack *ct,
+ const enum nf_conntrack_attr type,
+@@ -325,16 +326,16 @@ extern void nfct_set_attr_l(struct nf_co
+ extern const void *nfct_get_attr(const struct nf_conntrack *ct,
+ const enum nf_conntrack_attr type);
+
+-extern u_int8_t nfct_get_attr_u8(const struct nf_conntrack *ct,
++extern uint8_t nfct_get_attr_u8(const struct nf_conntrack *ct,
+ const enum nf_conntrack_attr type);
+
+-extern u_int16_t nfct_get_attr_u16(const struct nf_conntrack *ct,
++extern uint16_t nfct_get_attr_u16(const struct nf_conntrack *ct,
+ const enum nf_conntrack_attr type);
+
+-extern u_int32_t nfct_get_attr_u32(const struct nf_conntrack *ct,
++extern uint32_t nfct_get_attr_u32(const struct nf_conntrack *ct,
+ const enum nf_conntrack_attr type);
+
+-extern u_int64_t nfct_get_attr_u64(const struct nf_conntrack *ct,
++extern uint64_t nfct_get_attr_u64(const struct nf_conntrack *ct,
+ const enum nf_conntrack_attr type);
+
+ /* checker */
+@@ -477,20 +478,20 @@ extern struct nfct_filter *nfct_filter_c
+ extern void nfct_filter_destroy(struct nfct_filter *filter);
+
+ struct nfct_filter_proto {
+- u_int16_t proto;
+- u_int16_t state;
++ uint16_t proto;
++ uint16_t state;
+ };
+ struct nfct_filter_ipv4 {
+- u_int32_t addr;
+- u_int32_t mask;
++ uint32_t addr;
++ uint32_t mask;
+ };
+ struct nfct_filter_ipv6 {
+- u_int32_t addr[4];
+- u_int32_t mask[4];
++ uint32_t addr[4];
++ uint32_t mask[4];
+ };
+
+ enum nfct_filter_attr {
+- NFCT_FILTER_L4PROTO = 0, /* u_int32_t */
++ NFCT_FILTER_L4PROTO = 0, /* uint32_t */
+ NFCT_FILTER_L4PROTO_STATE, /* struct nfct_filter_proto */
+ NFCT_FILTER_SRC_IPV4, /* struct nfct_filter_ipv4 */
+ NFCT_FILTER_DST_IPV4, /* struct nfct_filter_ipv4 */
+@@ -505,7 +506,7 @@ extern void nfct_filter_add_attr(struct
+
+ extern void nfct_filter_add_attr_u32(struct nfct_filter *filter,
+ const enum nfct_filter_attr attr,
+- const u_int32_t value);
++ const uint32_t value);
+
+ enum nfct_filter_logic {
+ NFCT_FILTER_LOGIC_POSITIVE,
+@@ -525,13 +526,13 @@ extern int nfct_filter_detach(int fd);
+ struct nfct_filter_dump;
+
+ struct nfct_filter_dump_mark {
+- u_int32_t val;
+- u_int32_t mask;
++ uint32_t val;
++ uint32_t mask;
+ };
+
+ enum nfct_filter_dump_attr {
+ NFCT_FILTER_DUMP_MARK = 0, /* struct nfct_filter_dump_mark */
+- NFCT_FILTER_DUMP_L3NUM, /* u_int8_t */
++ NFCT_FILTER_DUMP_L3NUM, /* uint8_t */
+ NFCT_FILTER_DUMP_MAX
+ };
+
+@@ -545,7 +546,7 @@ void nfct_filter_dump_set_attr(struct nf
+
+ void nfct_filter_dump_set_attr_u8(struct nfct_filter_dump *filter_dump,
+ const enum nfct_filter_dump_attr type,
+- u_int8_t data);
++ uint8_t data);
+
+ /* low level API: netlink functions */
+
+@@ -553,8 +554,8 @@ extern __attribute__((deprecated)) int
+ nfct_build_conntrack(struct nfnl_subsys_handle *ssh,
+ void *req,
+ size_t size,
+- u_int16_t type,
+- u_int16_t flags,
++ uint16_t type,
++ uint16_t flags,
+ const struct nf_conntrack *ct);
+
+ extern __attribute__((deprecated))
+@@ -640,27 +641,27 @@ extern void nfexp_set_attr(struct nf_exp
+
+ extern void nfexp_set_attr_u8(struct nf_expect *exp,
+ const enum nf_expect_attr type,
+- u_int8_t value);
++ uint8_t value);
+
+ extern void nfexp_set_attr_u16(struct nf_expect *exp,
+ const enum nf_expect_attr type,
+- u_int16_t value);
++ uint16_t value);
+
+ extern void nfexp_set_attr_u32(struct nf_expect *exp,
+ const enum nf_expect_attr type,
+- u_int32_t value);
++ uint32_t value);
+
+ /* getter */
+ extern const void *nfexp_get_attr(const struct nf_expect *exp,
+ const enum nf_expect_attr type);
+
+-extern u_int8_t nfexp_get_attr_u8(const struct nf_expect *exp,
++extern uint8_t nfexp_get_attr_u8(const struct nf_expect *exp,
+ const enum nf_expect_attr type);
+
+-extern u_int16_t nfexp_get_attr_u16(const struct nf_expect *exp,
++extern uint16_t nfexp_get_attr_u16(const struct nf_expect *exp,
+ const enum nf_expect_attr type);
+
+-extern u_int32_t nfexp_get_attr_u32(const struct nf_expect *exp,
++extern uint32_t nfexp_get_attr_u32(const struct nf_expect *exp,
+ const enum nf_expect_attr type);
+
+ /* checker */
+@@ -700,8 +701,8 @@ extern __attribute__((deprecated))
+ int nfexp_build_expect(struct nfnl_subsys_handle *ssh,
+ void *req,
+ size_t size,
+- u_int16_t type,
+- u_int16_t flags,
++ uint16_t type,
++ uint16_t flags,
+ const struct nf_expect *exp);
+
+ extern __attribute__((deprecated))
diff --git a/package/libnetfilter_conntrack/patches/patch-src_main_c b/package/libnetfilter_conntrack/patches/patch-src_main_c
new file mode 100644
index 000000000..12ce50bc7
--- /dev/null
+++ b/package/libnetfilter_conntrack/patches/patch-src_main_c
@@ -0,0 +1,20 @@
+--- libnetfilter_conntrack-1.0.4.orig/src/main.c 2011-12-30 00:42:58.000000000 +0100
++++ libnetfilter_conntrack-1.0.4/src/main.c 2014-04-10 14:29:50.000000000 +0200
+@@ -13,7 +13,7 @@
+ #include "internal/internal.h"
+
+ struct nfct_handle *nfct_open_nfnl(struct nfnl_handle *nfnlh,
+- u_int8_t subsys_id,
++ uint8_t subsys_id,
+ unsigned int subscriptions)
+ {
+ struct nfct_handle *cth;
+@@ -81,7 +81,7 @@ out_free:
+ *
+ * On error, NULL is returned and errno is explicitly set.
+ */
+-struct nfct_handle *nfct_open(u_int8_t subsys_id, unsigned subscriptions)
++struct nfct_handle *nfct_open(uint8_t subsys_id, unsigned subscriptions)
+ {
+ struct nfnl_handle *nfnlh = nfnl_open();
+ struct nfct_handle *nfcth;
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-02 09:37:35 +0000