summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-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/grub/Makefile4
-rw-r--r--package/grub/files/core.img.i386-pcbin0 -> 33638 bytes
-rw-r--r--package/libgc/Makefile2
-rw-r--r--package/libgc/patches/patch-os_dep_c39
-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
-rw-r--r--package/libnfnetlink/Makefile2
-rw-r--r--package/libnfnetlink/patches/patch-include_libnfnetlink_libnfnetlink_h71
-rw-r--r--package/libnfnetlink/patches/patch-src_libnfnetlink_c233
-rw-r--r--package/w3m/Makefile4
15 files changed, 653 insertions, 17 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/grub/Makefile b/package/grub/Makefile
index 663d02d72..8d0b9ed48 100644
--- a/package/grub/Makefile
+++ b/package/grub/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= grub
PKG_VERSION:= 2.00
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= e927540b6eda8b024fb0391eeaa4091c
PKG_DESCR:= GRUB2 bootloader (source package)
PKG_SECTION:= boot
@@ -50,5 +50,7 @@ grub-install:
$(IDIR_GRUB)/usr/lib/grub/${GRUB_ARCH}/
${INSTALL_BIN} ${WRKINST}/usr/bin/* $(IDIR_GRUB)/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/sbin/* $(IDIR_GRUB)/usr/sbin
+ ${CP} ./files/core.img.${GRUB_ARCH} \
+ $(IDIR_GRUB)/usr/lib/grub/core.img
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/grub/files/core.img.i386-pc b/package/grub/files/core.img.i386-pc
new file mode 100644
index 000000000..7cde2740d
--- /dev/null
+++ b/package/grub/files/core.img.i386-pc
Binary files differ
diff --git a/package/libgc/Makefile b/package/libgc/Makefile
index 097559bde..731c7f98b 100644
--- a/package/libgc/Makefile
+++ b/package/libgc/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libgc
PKG_VERSION:= 7.4.0
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= f40d9a47c90d60791eeecb484f8df5ee
PKG_DESCR:= garbage collector library
PKG_SECTION:= libs
diff --git a/package/libgc/patches/patch-os_dep_c b/package/libgc/patches/patch-os_dep_c
new file mode 100644
index 000000000..6a5e00f87
--- /dev/null
+++ b/package/libgc/patches/patch-os_dep_c
@@ -0,0 +1,39 @@
+--- gc-7.4.0.orig/os_dep.c 2013-11-15 21:11:03.000000000 +0100
++++ gc-7.4.0/os_dep.c 2014-04-10 07:14:09.000000000 +0200
+@@ -16,36 +16,6 @@
+
+ #include "private/gc_priv.h"
+
+-#if defined(LINUX) && !defined(POWERPC) && !defined(NO_SIGCONTEXT_H)
+-# include <linux/version.h>
+-# if (LINUX_VERSION_CODE <= 0x10400)
+- /* Ugly hack to get struct sigcontext_struct definition. Required */
+- /* for some early 1.3.X releases. Will hopefully go away soon. */
+- /* in some later Linux releases, asm/sigcontext.h may have to */
+- /* be included instead. */
+-# define __KERNEL__
+-# include <asm/signal.h>
+-# undef __KERNEL__
+-# else
+- /* Kernels prior to 2.1.1 defined struct sigcontext_struct instead of */
+- /* struct sigcontext. libc6 (glibc2) uses "struct sigcontext" in */
+- /* prototypes, so we have to include the top-level sigcontext.h to */
+- /* make sure the former gets defined to be the latter if appropriate. */
+-# include <features.h>
+-# if 2 <= __GLIBC__
+-# if 2 == __GLIBC__ && 0 == __GLIBC_MINOR__
+- /* glibc 2.1 no longer has sigcontext.h. But signal.h */
+- /* has the right declaration for glibc 2.1. */
+-# include <sigcontext.h>
+-# endif /* 0 == __GLIBC_MINOR__ */
+-# else /* __GLIBC__ < 2 */
+- /* libc5 doesn't have <sigcontext.h>: go directly with the kernel */
+- /* one. Check LINUX_VERSION_CODE to see which we should reference. */
+-# include <asm/sigcontext.h>
+-# endif /* __GLIBC__ < 2 */
+-# endif
+-#endif /* LINUX && !POWERPC */
+-
+ #if !defined(OS2) && !defined(PCR) && !defined(AMIGA) && !defined(MACOS) \
+ && !defined(MSWINCE) && !defined(__CC_ARM)
+ # include <sys/types.h>
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;
diff --git a/package/libnfnetlink/Makefile b/package/libnfnetlink/Makefile
index 88d61245f..0d4da94dd 100644
--- a/package/libnfnetlink/Makefile
+++ b/package/libnfnetlink/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libnfnetlink
PKG_VERSION:= 1.0.1
-PKG_RELEASE:= 4
+PKG_RELEASE:= 5
PKG_MD5SUM:= 98927583d2016a9fb1936fed992e2c5e
PKG_DESCR:= netfilter related kernel/userspace communication
PKG_SECTION:= libs
diff --git a/package/libnfnetlink/patches/patch-include_libnfnetlink_libnfnetlink_h b/package/libnfnetlink/patches/patch-include_libnfnetlink_libnfnetlink_h
index 9754ebca8..d69bc16d0 100644
--- a/package/libnfnetlink/patches/patch-include_libnfnetlink_libnfnetlink_h
+++ b/package/libnfnetlink/patches/patch-include_libnfnetlink_libnfnetlink_h
@@ -1,6 +1,6 @@
--- libnfnetlink-1.0.1.orig/include/libnfnetlink/libnfnetlink.h 2010-05-09 23:31:56.000000000 +0200
-+++ libnfnetlink-1.0.1/include/libnfnetlink/libnfnetlink.h 2014-04-08 08:59:56.000000000 +0200
-@@ -15,6 +15,8 @@
++++ libnfnetlink-1.0.1/include/libnfnetlink/libnfnetlink.h 2014-04-10 07:47:04.000000000 +0200
+@@ -15,6 +15,7 @@
#define aligned_u64 unsigned long long __attribute__((aligned(8)))
#endif
@@ -8,3 +8,70 @@
#include <sys/socket.h> /* for sa_family_t */
#include <linux/netlink.h>
#include <libnfnetlink/linux_nfnetlink.h>
+@@ -55,7 +56,7 @@ struct nfnlhdr {
+ struct nfnl_callback {
+ int (*call)(struct nlmsghdr *nlh, struct nfattr *nfa[], void *data);
+ void *data;
+- u_int16_t attr_count;
++ uint16_t attr_count;
+ };
+
+ struct nfnl_handle;
+@@ -69,7 +70,7 @@ extern struct nfnl_handle *nfnl_open(voi
+ extern int nfnl_close(struct nfnl_handle *);
+
+ extern struct nfnl_subsys_handle *nfnl_subsys_open(struct nfnl_handle *,
+- u_int8_t, u_int8_t,
++ uint8_t, uint8_t,
+ unsigned int);
+ extern void nfnl_subsys_close(struct nfnl_subsys_handle *);
+
+@@ -88,8 +89,8 @@ extern int nfnl_sendiov(const struct nfn
+ const struct iovec *iov, unsigned int num,
+ unsigned int flags);
+ extern void nfnl_fill_hdr(struct nfnl_subsys_handle *, struct nlmsghdr *,
+- unsigned int, u_int8_t, u_int16_t, u_int16_t,
+- u_int16_t);
++ unsigned int, uint8_t, uint16_t, uint16_t,
++ uint16_t);
+ extern __attribute__((deprecated)) int
+ nfnl_talk(struct nfnl_handle *, struct nlmsghdr *, pid_t,
+ unsigned, struct nlmsghdr *,
+@@ -103,8 +104,8 @@ nfnl_listen(struct nfnl_handle *,
+ /* receiving */
+ extern ssize_t nfnl_recv(const struct nfnl_handle *h, unsigned char *buf, size_t len);
+ extern int nfnl_callback_register(struct nfnl_subsys_handle *,
+- u_int8_t type, struct nfnl_callback *cb);
+-extern int nfnl_callback_unregister(struct nfnl_subsys_handle *, u_int8_t type);
++ uint8_t type, struct nfnl_callback *cb);
++extern int nfnl_callback_unregister(struct nfnl_subsys_handle *, uint8_t type);
+ extern int nfnl_handle_packet(struct nfnl_handle *, char *buf, int len);
+
+ /* parsing */
+@@ -180,12 +181,12 @@ extern int nfnl_query(struct nfnl_handle
+
+ /* nfnl attribute handling functions */
+ extern int nfnl_addattr_l(struct nlmsghdr *, int, int, const void *, int);
+-extern int nfnl_addattr8(struct nlmsghdr *, int, int, u_int8_t);
+-extern int nfnl_addattr16(struct nlmsghdr *, int, int, u_int16_t);
+-extern int nfnl_addattr32(struct nlmsghdr *, int, int, u_int32_t);
++extern int nfnl_addattr8(struct nlmsghdr *, int, int, uint8_t);
++extern int nfnl_addattr16(struct nlmsghdr *, int, int, uint16_t);
++extern int nfnl_addattr32(struct nlmsghdr *, int, int, uint32_t);
+ extern int nfnl_nfa_addattr_l(struct nfattr *, int, int, const void *, int);
+-extern int nfnl_nfa_addattr16(struct nfattr *, int, int, u_int16_t);
+-extern int nfnl_nfa_addattr32(struct nfattr *, int, int, u_int32_t);
++extern int nfnl_nfa_addattr16(struct nfattr *, int, int, uint16_t);
++extern int nfnl_nfa_addattr32(struct nfattr *, int, int, uint32_t);
+ extern int nfnl_parse_attr(struct nfattr **, int, struct nfattr *, int);
+ #define nfnl_parse_nested(tb, max, nfa) \
+ nfnl_parse_attr((tb), (max), NFA_DATA((nfa)), NFA_PAYLOAD((nfa)))
+@@ -197,7 +198,7 @@ extern int nfnl_parse_attr(struct nfattr
+ ({ (tail)->nfa_len = (void *) NLMSG_TAIL(nlh) - (void *) tail; })
+
+ extern void nfnl_build_nfa_iovec(struct iovec *iov, struct nfattr *nfa,
+- u_int16_t type, u_int32_t len,
++ uint16_t type, uint32_t len,
+ unsigned char *val);
+ extern unsigned int nfnl_rcvbufsiz(const struct nfnl_handle *h,
+ unsigned int size);
diff --git a/package/libnfnetlink/patches/patch-src_libnfnetlink_c b/package/libnfnetlink/patches/patch-src_libnfnetlink_c
new file mode 100644
index 000000000..006da1f6d
--- /dev/null
+++ b/package/libnfnetlink/patches/patch-src_libnfnetlink_c
@@ -0,0 +1,233 @@
+--- libnfnetlink-1.0.1.orig/src/libnfnetlink.c 2012-08-13 19:56:29.000000000 +0200
++++ libnfnetlink-1.0.1/src/libnfnetlink.c 2014-04-10 07:37:41.000000000 +0200
+@@ -38,6 +38,7 @@
+
+ #include <stdlib.h>
+ #include <stdio.h>
++#include <stdint.h>
+ #include <unistd.h>
+ #include <errno.h>
+ #include <string.h>
+@@ -72,9 +73,9 @@
+
+ struct nfnl_subsys_handle {
+ struct nfnl_handle *nfnlh;
+- u_int32_t subscriptions;
+- u_int8_t subsys_id;
+- u_int8_t cb_count;
++ uint32_t subscriptions;
++ uint8_t subsys_id;
++ uint8_t cb_count;
+ struct nfnl_callback *cb; /* array of callbacks */
+ };
+
+@@ -86,11 +87,11 @@ struct nfnl_handle {
+ int fd;
+ struct sockaddr_nl local;
+ struct sockaddr_nl peer;
+- u_int32_t subscriptions;
+- u_int32_t seq;
+- u_int32_t dump;
+- u_int32_t rcv_buffer_size; /* for nfnl_catch */
+- u_int32_t flags;
++ uint32_t subscriptions;
++ uint32_t seq;
++ uint32_t dump;
++ uint32_t rcv_buffer_size; /* for nfnl_catch */
++ uint32_t flags;
+ struct nlmsghdr *last_nlhdr;
+ struct nfnl_subsys_handle subsys[NFNL_MAX_SUBSYS+1];
+ };
+@@ -145,7 +146,7 @@ unsigned int nfnl_portid(const struct nf
+ static int recalc_rebind_subscriptions(struct nfnl_handle *nfnlh)
+ {
+ int i, err;
+- u_int32_t new_subscriptions = nfnlh->subscriptions;
++ uint32_t new_subscriptions = nfnlh->subscriptions;
+
+ for (i = 0; i < NFNL_MAX_SUBSYS; i++)
+ new_subscriptions |= nfnlh->subsys[i].subscriptions;
+@@ -273,8 +274,8 @@ void nfnl_set_rcv_buffer_size(struct nfn
+ * a valid address that points to a nfnl_subsys_handle structure is returned.
+ */
+ struct nfnl_subsys_handle *
+-nfnl_subsys_open(struct nfnl_handle *nfnlh, u_int8_t subsys_id,
+- u_int8_t cb_count, u_int32_t subscriptions)
++nfnl_subsys_open(struct nfnl_handle *nfnlh, uint8_t subsys_id,
++ uint8_t cb_count, uint32_t subscriptions)
+ {
+ struct nfnl_subsys_handle *ssh;
+
+@@ -435,10 +436,10 @@ int nfnl_sendiov(const struct nfnl_handl
+ */
+ void nfnl_fill_hdr(struct nfnl_subsys_handle *ssh,
+ struct nlmsghdr *nlh, unsigned int len,
+- u_int8_t family,
+- u_int16_t res_id,
+- u_int16_t msg_type,
+- u_int16_t msg_flags)
++ uint8_t family,
++ uint16_t res_id,
++ uint16_t msg_type,
++ uint16_t msg_flags)
+ {
+ assert(ssh);
+ assert(nlh);
+@@ -848,14 +849,14 @@ int nfnl_nfa_addattr_l(struct nfattr *nf
+ }
+
+ /**
+- * nfnl_addattr8 - Add u_int8_t attribute to nlmsghdr
++ * nfnl_addattr8 - Add uint8_t attribute to nlmsghdr
+ *
+ * @n: netlink message header to which attribute is to be added
+ * @maxlen: maximum length of netlink message header
+ * @type: type of new attribute
+ * @data: content of new attribute
+ */
+-int nfnl_addattr8(struct nlmsghdr *n, int maxlen, int type, u_int8_t data)
++int nfnl_addattr8(struct nlmsghdr *n, int maxlen, int type, uint8_t data)
+ {
+ assert(n);
+ assert(maxlen > 0);
+@@ -865,7 +866,7 @@ int nfnl_addattr8(struct nlmsghdr *n, in
+ }
+
+ /**
+- * nfnl_nfa_addattr16 - Add u_int16_t attribute to struct nfattr
++ * nfnl_nfa_addattr16 - Add uint16_t attribute to struct nfattr
+ *
+ * @nfa: struct nfattr
+ * @maxlen: maximal length of nfattr buffer
+@@ -874,7 +875,7 @@ int nfnl_addattr8(struct nlmsghdr *n, in
+ *
+ */
+ int nfnl_nfa_addattr16(struct nfattr *nfa, int maxlen, int type,
+- u_int16_t data)
++ uint16_t data)
+ {
+ assert(nfa);
+ assert(maxlen > 0);
+@@ -884,7 +885,7 @@ int nfnl_nfa_addattr16(struct nfattr *nf
+ }
+
+ /**
+- * nfnl_addattr16 - Add u_int16_t attribute to nlmsghdr
++ * nfnl_addattr16 - Add uint16_t attribute to nlmsghdr
+ *
+ * @n: netlink message header to which attribute is to be added
+ * @maxlen: maximum length of netlink message header
+@@ -893,7 +894,7 @@ int nfnl_nfa_addattr16(struct nfattr *nf
+ *
+ */
+ int nfnl_addattr16(struct nlmsghdr *n, int maxlen, int type,
+- u_int16_t data)
++ uint16_t data)
+ {
+ assert(n);
+ assert(maxlen > 0);
+@@ -903,7 +904,7 @@ int nfnl_addattr16(struct nlmsghdr *n, i
+ }
+
+ /**
+- * nfnl_nfa_addattr32 - Add u_int32_t attribute to struct nfattr
++ * nfnl_nfa_addattr32 - Add uint32_t attribute to struct nfattr
+ *
+ * @nfa: struct nfattr
+ * @maxlen: maximal length of nfattr buffer
+@@ -912,7 +913,7 @@ int nfnl_addattr16(struct nlmsghdr *n, i
+ *
+ */
+ int nfnl_nfa_addattr32(struct nfattr *nfa, int maxlen, int type,
+- u_int32_t data)
++ uint32_t data)
+ {
+ assert(nfa);
+ assert(maxlen > 0);
+@@ -922,7 +923,7 @@ int nfnl_nfa_addattr32(struct nfattr *nf
+ }
+
+ /**
+- * nfnl_addattr32 - Add u_int32_t attribute to nlmsghdr
++ * nfnl_addattr32 - Add uint32_t attribute to nlmsghdr
+ *
+ * @n: netlink message header to which attribute is to be added
+ * @maxlen: maximum length of netlink message header
+@@ -931,7 +932,7 @@ int nfnl_nfa_addattr32(struct nfattr *nf
+ *
+ */
+ int nfnl_addattr32(struct nlmsghdr *n, int maxlen, int type,
+- u_int32_t data)
++ uint32_t data)
+ {
+ assert(n);
+ assert(maxlen > 0);
+@@ -979,7 +980,7 @@ int nfnl_parse_attr(struct nfattr *tb[],
+ *
+ */
+ void nfnl_build_nfa_iovec(struct iovec *iov, struct nfattr *nfa,
+- u_int16_t type, u_int32_t len, unsigned char *val)
++ uint16_t type, uint32_t len, unsigned char *val)
+ {
+ assert(iov);
+ assert(nfa);
+@@ -1114,7 +1115,7 @@ struct nlmsghdr *nfnl_get_msg_next(struc
+ * appropiately.
+ */
+ int nfnl_callback_register(struct nfnl_subsys_handle *ssh,
+- u_int8_t type, struct nfnl_callback *cb)
++ uint8_t type, struct nfnl_callback *cb)
+ {
+ assert(ssh);
+ assert(cb);
+@@ -1137,7 +1138,7 @@ int nfnl_callback_register(struct nfnl_s
+ * On sucess, 0 is returned. On error, -1 is returned and errno is
+ * set appropiately.
+ */
+-int nfnl_callback_unregister(struct nfnl_subsys_handle *ssh, u_int8_t type)
++int nfnl_callback_unregister(struct nfnl_subsys_handle *ssh, uint8_t type)
+ {
+ assert(ssh);
+
+@@ -1160,8 +1161,8 @@ int nfnl_check_attributes(const struct n
+ assert(nfa);
+
+ int min_len;
+- u_int8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type);
+- u_int8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type);
++ uint8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type);
++ uint8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type);
+ const struct nfnl_subsys_handle *ssh;
+ struct nfnl_callback *cb;
+
+@@ -1211,8 +1212,8 @@ static int __nfnl_handle_msg(struct nfnl
+ int len)
+ {
+ struct nfnl_subsys_handle *ssh;
+- u_int8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type);
+- u_int8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type);
++ uint8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type);
++ uint8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type);
+ int err = 0;
+
+ if (subsys_id > NFNL_MAX_SUBSYS)
+@@ -1242,7 +1243,7 @@ int nfnl_handle_packet(struct nfnl_handl
+ {
+
+ while (len >= NLMSG_SPACE(0)) {
+- u_int32_t rlen;
++ uint32_t rlen;
+ struct nlmsghdr *nlh = (struct nlmsghdr *)buf;
+
+ if (nlh->nlmsg_len < sizeof(struct nlmsghdr)
+@@ -1284,8 +1285,8 @@ static int nfnl_is_error(struct nfnl_han
+ static int nfnl_step(struct nfnl_handle *h, struct nlmsghdr *nlh)
+ {
+ struct nfnl_subsys_handle *ssh;
+- u_int8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type);
+- u_int8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type);
++ uint8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type);
++ uint8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type);
+
+ /* Is this an error message? */
+ if (nfnl_is_error(h, nlh)) {
diff --git a/package/w3m/Makefile b/package/w3m/Makefile
index cbb9ff78a..cd0ae7913 100644
--- a/package/w3m/Makefile
+++ b/package/w3m/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= w3m
PKG_VERSION:= 0.5.3
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= 1b845a983a50b8dec0169ac48479eacc
PKG_DESCR:= console web browser
PKG_SECTION:= browser
@@ -21,7 +21,7 @@ $(eval $(call PKG_template,W3M,w3m,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},
TARGET_LDFLAGS+= -lncurses -ltinfo
CONFIGURE_ENV+= ac_cv_func_setpgrp_void=yes
CONFIGURE_ARGS+= --with-termlib=ncurses \
- --enable-image=fb
+ --enable-image=no
w3m-install:
$(INSTALL_DIR) $(IDIR_W3M)/usr/bin
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 02:45:32 +0000