summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-07-15 18:32:13 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2010-07-15 18:32:13 +0200
commit71582bdd2080c6d7fb446d4cea10c93cf781419d (patch)
treebeaabc3d8dfed77d2c2838d804020b780d2d7c35 /package
parentee120a704a2d193bb763c87e31fce38c58f75d1e (diff)
parent6c739ba5d6d6f47b983c1ba39df6f73b79f78810 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package')
-rw-r--r--package/asterisk/Makefile2
-rw-r--r--package/pmacct/patches/patch-src_nfprobe_plugin_netflow9_c33
-rw-r--r--package/strace/Makefile2
-rw-r--r--package/twm/Makefile2
-rw-r--r--package/weechat/patches/patch-src_gui_gui-completion_c11
-rw-r--r--package/xinit/Makefile2
-rw-r--r--package/xterm/Makefile1
-rw-r--r--package/xvinfo/Makefile2
8 files changed, 48 insertions, 7 deletions
diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile
index 6cc6cfa52..eeac91c7f 100644
--- a/package/asterisk/Makefile
+++ b/package/asterisk/Makefile
@@ -22,6 +22,8 @@ endif
PKG_URL:= http://www.asterisk.org
PKG_SITES:= http://downloads.asterisk.org/pub/telephony/asterisk/releases/
+PKG_TARGET_DEPENDS:= !foxboard
+
PKG_DESCR_CHAN_MGCP:= Media Gateway Control Protocol implementation
PKG_DESCR_CHAN_SKINNY:= Skinny Client Control Protocol implementation
PKG_DESCR_CHAN_IAX2:= Support for the Inter Asterisk Protocol
diff --git a/package/pmacct/patches/patch-src_nfprobe_plugin_netflow9_c b/package/pmacct/patches/patch-src_nfprobe_plugin_netflow9_c
index 4787952fb..a0f757c8f 100644
--- a/package/pmacct/patches/patch-src_nfprobe_plugin_netflow9_c
+++ b/package/pmacct/patches/patch-src_nfprobe_plugin_netflow9_c
@@ -1,7 +1,6 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- pmacct-0.11.6.orig/src/nfprobe_plugin/netflow9.c 2007-02-12 23:00:40.000000000 +0100
-+++ pmacct-0.11.6/src/nfprobe_plugin/netflow9.c 2009-05-30 16:28:41.207303809 +0200
-@@ -298,8 +298,8 @@ nf9_init_template(void)
+--- pmacct-0.12.2.orig/src/nfprobe_plugin/netflow9.c 2010-04-21 16:53:36.000000000 +0200
++++ pmacct-0.12.2/src/nfprobe_plugin/netflow9.c 2010-07-15 15:11:23.575859230 +0200
+@@ -396,8 +396,8 @@ nf9_init_template(void)
*/
rcount = 0;
@@ -12,7 +11,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
v4_template.r[rcount].type = htons(NF9_LAST_SWITCHED);
v4_template.r[rcount].length = htons(4);
-@@ -443,8 +443,8 @@ nf9_init_template(void)
+@@ -588,8 +588,8 @@ nf9_init_template(void)
v4_int_template.tot_rec_len += v4_int_template.r[idx].length;
rcount = 0;
@@ -23,7 +22,18 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
v6_template.r[rcount].type = htons(NF9_LAST_SWITCHED);
v6_template.r[rcount].length = htons(4);
-@@ -598,8 +598,8 @@ nf_flow_to_flowset(const struct FLOW *fl
+@@ -786,8 +786,8 @@ nf9_init_options_template(void)
+ int rcount, idx;
+
+ rcount = 0;
+- bzero(&options_template, sizeof(options_template));
+- bzero(&options_int_template, sizeof(options_int_template));
++ memset(&options_template, 0, sizeof(options_template));
++ memset(&options_int_template, 0, sizeof(options_int_template));
+
+ options_template.r[rcount].type = htons(NF9_OPT_SCOPE_SYSTEM);
+ options_template.r[rcount].length = htons(0);
+@@ -826,8 +826,8 @@ nf_flow_to_flowset(const struct FLOW *fl
char *ftoft_ptr_0 = ftoft_buf_0;
char *ftoft_ptr_1 = ftoft_buf_1;
@@ -34,7 +44,16 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
*len_used = nflows = ret_len = 0;
rec32 = htonl(timeval_sub_ms(&flow->flow_last, system_boot_time));
-@@ -707,7 +707,7 @@ send_netflow_v9(struct FLOW **flows, int
+@@ -916,7 +916,7 @@ nf_options_to_flowset(u_char *packet, u_
+ u_int8_t rec8;
+ char *ftoft_ptr_0 = ftoft_buf_0;
+
+- bzero(ftoft_buf_0, sizeof(ftoft_buf_0));
++ memset(ftoft_buf_0, 0, sizeof(ftoft_buf_0));
+ *len_used = nflows = ret_len = 0;
+
+ rec8 = 1; /* NF9_FLOW_SAMPLER_ID */
+@@ -975,7 +975,7 @@ send_netflow_v9(struct FLOW **flows, int
last_valid = num_packets = 0;
for (j = 0; j < num_flows;) {
diff --git a/package/strace/Makefile b/package/strace/Makefile
index 8a0bfb694..0e5e5a625 100644
--- a/package/strace/Makefile
+++ b/package/strace/Makefile
@@ -13,6 +13,8 @@ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=strace/}
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+PKG_TARGET_DEPENDS:= !foxboard
+
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,STRACE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/twm/Makefile b/package/twm/Makefile
index 97380e066..7e2a70482 100644
--- a/package/twm/Makefile
+++ b/package/twm/Makefile
@@ -14,6 +14,8 @@ PKG_BUILDDEP+= xorg-server
PKG_URL:= http://xorg.freedesktop.org
PKG_SITES:= http://xorg.freedesktop.org/archive/individual/app/
+PKG_TARGET_DEPENDS:= !foxboard
+
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,TWM,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/weechat/patches/patch-src_gui_gui-completion_c b/package/weechat/patches/patch-src_gui_gui-completion_c
new file mode 100644
index 000000000..b1601a13e
--- /dev/null
+++ b/package/weechat/patches/patch-src_gui_gui-completion_c
@@ -0,0 +1,11 @@
+--- weechat-0.3.2.orig/src/gui/gui-completion.c 2010-04-08 16:05:14.000000000 +0200
++++ weechat-0.3.2/src/gui/gui-completion.c 2010-07-15 16:41:35.415870907 +0200
+@@ -1658,7 +1658,7 @@ gui_completion_build_list (struct t_gui_
+ }
+ if (repeat_last)
+ {
+- pos_space = rindex (HOOK_COMMAND(ptr_hook, completion), ' ');
++ pos_space = strrchr (HOOK_COMMAND(ptr_hook, completion), ' ');
+ gui_completion_build_list_template (completion,
+ (pos_space) ?
+ pos_space + 1 : HOOK_COMMAND(ptr_hook,
diff --git a/package/xinit/Makefile b/package/xinit/Makefile
index fbdf6554d..ef20573e5 100644
--- a/package/xinit/Makefile
+++ b/package/xinit/Makefile
@@ -14,6 +14,8 @@ PKG_BUILDDEP+= xorg-server
PKG_URL:= http://xorg.freedesktop.org
PKG_SITES:= http://xorg.freedesktop.org/archive/individual/app/
+PKG_TARGET_DEPENDS:= !foxboard
+
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,XINIT,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/xterm/Makefile b/package/xterm/Makefile
index f46431c45..210349007 100644
--- a/package/xterm/Makefile
+++ b/package/xterm/Makefile
@@ -14,6 +14,7 @@ PKG_URL:= http://invisible-island.net/xterm/xterm.html
PKG_SITES:= ftp://invisible-island.net/xterm/
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz
+PKG_TARGET_DEPENDS:= !foxboard
include $(TOPDIR)/mk/package.mk
diff --git a/package/xvinfo/Makefile b/package/xvinfo/Makefile
index 59315974b..124e263a7 100644
--- a/package/xvinfo/Makefile
+++ b/package/xvinfo/Makefile
@@ -14,6 +14,8 @@ KG_BUILDDEP+= xorg-server
PKG_URL:= http://xorg.freedesktop.org/
PKG_SITES:= http://xorg.freedesktop.org/archive/individual/app/
+PKG_TARGET_DEPENDS:= !foxboard
+
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,XVINFO,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))