diff options
25 files changed, 369 insertions, 38 deletions
@@ -1,6 +1,6 @@ - fix ARM OABI support - fix watchdog for alix1c (mfgpt timers problem) - convert global ipv6 to flavours -- add support for brcm 2.6 +- add support for brcm 2.6 (flash support) - macos x build - help text for config/ needs adoption diff --git a/mk/modules.mk b/mk/modules.mk index 54c1deda0..d7383eef2 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -279,6 +279,10 @@ $(eval $(call KMOD_template,NET_KEY,net-key,\ $(MODULES_DIR)/kernel/net/key/af_key \ ,60)) +$(eval $(call KMOD_template,XFRM_USER,xfrm-user,\ + $(MODULES_DIR)/kernel/net/xfrm/xfrm_user \ +,61)) + $(eval $(call KMOD_template,INET_AH,inet-ah,\ $(MODULES_DIR)/kernel/net/ipv4/ah4 \ ,65)) 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/base-files/src/etc/profile b/package/base-files/src/etc/profile index b849feb49..0d8a4f240 100644 --- a/package/base-files/src/etc/profile +++ b/package/base-files/src/etc/profile @@ -1,9 +1,9 @@ export PATH=/bin:/sbin:/usr/bin:/usr/sbin export TERM=vt220 if [[ $(id -u) = 0 ]]; then - export PS1='# ' + export PS1='\u@\h:\w\# ' else - export PS1='$ ' + export PS1='\u@\h:\w\$ ' fi cat /etc/banner 2>&- [ -x /usr/bin/vim ] && alias vi=vim || alias vim=vi diff --git a/package/binutils/Makefile b/package/binutils/Makefile index cd33d5ac7..6959e8e96 100644 --- a/package/binutils/Makefile +++ b/package/binutils/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/toolchain/binutils/Makefile.inc PKG_DESCR:= binary utilities (nm, objdump, as, ..) PKG_SECTION:= lang +PKG_DEPENDS:= libbfd # subpackage PKG_NAME_LIBBFD:= libbfd @@ -17,7 +18,7 @@ PKG_HOST_DEPENDS:= !cygwin include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,BINUTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIBBFD,${PKG_NAME_LIBBFD},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_LIBBFD},${PKG_SECTION_LIBBFD})) +$(eval $(call PKG_template,LIBBFD,${PKG_NAME_LIBBFD},${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_LIBBFD},${PKG_SECTION_LIBBFD})) TCFLAGS+= -fPIC CONFIGURE_ARGS+= --disable-werror \ diff --git a/package/busybox/config/shell/Config.in b/package/busybox/config/shell/Config.in index 30ed639c2..6535f3eb6 100644 --- a/package/busybox/config/shell/Config.in +++ b/package/busybox/config/shell/Config.in @@ -130,7 +130,7 @@ config BUSYBOX_ASH_RANDOM_SUPPORT config BUSYBOX_ASH_EXPAND_PRMT bool "Expand prompt string" - default n + default y depends on BUSYBOX_ASH help "PS#" may contain volatile content, such as backquote commands. diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile index ef16a6e69..6f312d3a1 100644 --- a/package/ncurses/Makefile +++ b/package/ncurses/Makefile @@ -5,12 +5,13 @@ include ${TOPDIR}/rules.mk PKG_NAME:= ncurses PKG_VERSION:= 5.7 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= cce05daf61a64501ef6cd8da1f727ec6 -PKG_DESCR:= a terminal handling library and common terminal definitions +PKG_DESCR:= a terminal handling library PKG_SECTION:= libs PKG_URL:= http://www.gnu.org/software/ncurses/ PKG_SITES:= ${MASTER_SITE_GNU:=ncurses/} + PKG_DESCR_LIB_DEV:= development files for libncurses PKG_SECTION_LIB_DEV:= devel @@ -71,8 +72,8 @@ post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} ${CP} ${WRKINST}/usr/lib/lib{form,menu,ncurses,panel}.so* \ ${IDIR_LIBNCURSES}/usr/lib ${INSTALL_DIR} ${IDIR_LIBNCURSES}/usr/share/terminfo/ - for f in ansi dumb linux rxvt screen vt100 vt102 \ - vt220 wsvt25 xterm xterm-color xterm-xfree86; do \ + for f in ansi dumb linux screen vt100 vt102 \ + rxvt-unicode vt220 xterm xterm-color xterm-xfree86; do \ ${INSTALL_DIR} ${IDIR_LIBNCURSES}/usr/share/terminfo/$${f:0:1}; \ ${INSTALL_DATA} ${WRKINST}/usr/share/terminfo/*/$$f \ ${IDIR_LIBNCURSES}/usr/share/terminfo/$${f:0:1}/$$f; \ diff --git a/package/ncurses/patches/patch-misc_terminfo_src b/package/ncurses/patches/patch-misc_terminfo_src new file mode 100644 index 000000000..47535d1cb --- /dev/null +++ b/package/ncurses/patches/patch-misc_terminfo_src @@ -0,0 +1,174 @@ +--- ncurses-5.7.orig/misc/terminfo.src 2008-10-13 01:03:54.000000000 +0200 ++++ ncurses-5.7/misc/terminfo.src 2010-07-15 17:30:24.852569567 +0200 +@@ -3965,6 +3965,171 @@ rxvt-cygwin-native|rxvt terminal emulato + rxvt-16color|xterm with 16 colors like aixterm, + ncv#32, use=ibm+16color, use=rxvt, + ++# From: Thomas Dickey <dickey@clark.net> 04 Oct 1997 ++# Updated: Özgür Kesim <kesim@math.fu-berlin.de> 02 Nov 1997 ++# Updated: Marc Lehmann <pcg@goof.com>, 17 Feb 2005 ++# Updated: Marc Lehmann <schmorp@schmorp.de>, 04 Nov 2008: change init/reset sequences ++rxvt-unicode|rxvt-unicode terminal (X Window System), ++ am, ++ bce, ++ eo, ++ km, ++ msgr, ++ xenl, ++ hs, ++ cols#80, ++ it#8, ++ lines#24, ++ acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~-A.B+C\,D0EhFiG, ++ bel=^G, ++ blink=\E[5m, ++ bold=\E[1m, ++ civis=\E[?25l, ++ clear=\E[H\E[2J, ++ cnorm=\E[?25h, ++ cr=^M, ++ csr=\E[%i%p1%d;%p2%dr, ++ cub=\E[%p1%dD, ++ cub1=^H, ++ cud=\E[%p1%dB, ++ cud1=^J, ++ cuf=\E[%p1%dC, ++ cuf1=\E[C, ++ cup=\E[%i%p1%d;%p2%dH, ++ cuu=\E[%p1%dA, ++ cuu1=\E[A, ++ cvvis=\E[?25h, ++ dch=\E[%p1%dP, ++ dch1=\E[P, ++ dl=\E[%p1%dM, ++ dl1=\E[M, ++ ed=\E[J, ++ el=\E[K, ++ el1=\E[1K, ++ flash=\E[?5h$<20/>\E[?5l, ++ home=\E[H, ++ hpa=\E[%i%p1%dG, ++ ht=^I, ++ hts=\EH, ++ ich=\E[%p1%d@, ++ ich1=\E[@, ++ il=\E[%p1%dL, ++ il1=\E[L, ++ ind=^J, ++ is1=\E[\041p, ++ is2=\E[r\E[m\E[2J\E[?7;25h\E[?1;3;4;5;6;9;66;1000;1001;1049l\E[4l, ++ kDC=\E[3$, ++ kIC=\E2$, ++ kEND=\E[8$, ++ kHOM=\E[7$, ++ kLFT=\E[d, ++ kNXT=\E[6$, ++ kPRV=\E[5$, ++ kRIT=\E[c, ++ kbs=\177, ++ ka1=\EOw, ++ ka3=\EOy, ++ kb2=\EOu, ++ kc1=\EOq, ++ kc3=\EOs, ++ kcbt=\E[Z, ++ kcub1=\E[D, ++ kcud1=\E[B, ++ kcuf1=\E[C, ++ kcuu1=\E[A, ++ kdch1=\E[3~, ++ kel=\E[8\^, ++ kend=\E[8~, ++ kent=\EOM, ++ kf1=\E[11~, ++ kf10=\E[21~, ++ kf11=\E[23~, ++ kf12=\E[24~, ++ kf13=\E[25~, ++ kf14=\E[26~, ++ kf15=\E[28~, ++ kf16=\E[29~, ++ kf17=\E[31~, ++ kf18=\E[32~, ++ kf19=\E[33~, ++ kf2=\E[12~, ++ kf20=\E[34~, ++ kf3=\E[13~, ++ kf4=\E[14~, ++ kf5=\E[15~, ++ kf6=\E[17~, ++ kf7=\E[18~, ++ kf8=\E[19~, ++ kf9=\E[20~, ++ kfnd=\E[1~, ++ khome=\E[7~, ++ kich1=\E[2~, ++ kmous=\E[M, ++ knp=\E[6~, ++ kpp=\E[5~, ++ kslt=\E[4~, ++ rc=\E8, ++ rev=\E[7m, ++ ri=\EM, ++ rmso=\E[27m, ++ rmul=\E[24m, ++ rs1=\Ec, ++ rs2=\E[r\E[m\E[?7;25h\E[?1;3;4;5;6;9;66;1000;1001;1049l\E[4l, ++ sgr0=\E[m\017, ++ enacs=, ++ smacs=\E(0, ++ rmacs=\E(B, ++ smso=\E[7m, ++ smul=\E[4m, ++ tbc=\E[3g, ++ vpa=\E[%i%p1%dd, ++ colors#88, ++ pairs#256, ++ btns#5, ++ lm#0, ++ ccc, ++ npc, ++ mc5i, ++ ncv#0, ++ mir, ++ xon, ++ bw, ++ ech=\E[%p1%dX, ++ mc0=\E[i, ++ mc4=\E[4i, ++ mc5=\E[5i, ++ sitm=\E[3m, ++ ritm=\E[23m, ++ smam=\E[?7h, ++ rmam=\E[?7l, ++ smir=\E[4h, ++ rmir=\E[4l, ++ smcup=\E[?1049h, ++ rmcup=\E[r\E[?1049l, ++ smkx=\E=, ++ rmkx=\E>, ++ indn=\E[%p1%dS, ++ rin=\E[%p1%dT, ++ sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m%?%p9%t\E(0%e\E(B%;, ++ op=\E[39;49m, ++ setaf=\E[38;5;%p1%dm, ++ setab=\E[48;5;%p1%dm, ++ setf=%?%p1%{7}%>%t\E[38;5;%p1%dm%e\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m%;, ++ setb=%?%p1%{7}%>%t\E[48;5;%p1%dm%e\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m%;, ++ initc=\E]4;%p1%d;rgb\:%p2%{65535}%*%{1000}%/%4.4X/%p3%{65535}%*%{1000}%/%4.4X/%p4%{65535}%*%{1000}%/%4.4X\E\\, ++ sc=\E7, ++ s0ds=\E(B, ++ s1ds=\E(0, ++ s2ds=\E*B, ++ s3ds=\E+B, ++ u6=\E[%i%d;%dR, ++ u7=\E[6n, ++ u8=\E[?1;2c, ++ u9=\E[c, ++ tsl=\E]2;, ++ fsl=\007, ++ dsl=\E]2;\007, ++ + # mrxvt 0.5.3 + # + # mrxvt is based on rxvt 2.7.11, but has by default XTERM_FKEYS defined, which diff --git a/package/openswan/Makefile b/package/openswan/Makefile index a85dd29a2..4406fe3e2 100644 --- a/package/openswan/Makefile +++ b/package/openswan/Makefile @@ -4,16 +4,15 @@ include ${TOPDIR}/rules.mk PKG_NAME:= openswan -PKG_VERSION:= 2.6.26 +PKG_VERSION:= 2.6.27 PKG_RELEASE:= 1 -PKG_MD5SUM:= ac514a8c09d871407b16848c67d0d806 +PKG_MD5SUM:= 5177b7401bb89e84ca1c89029143441e PKG_DESCR:= IPSec software PKG_SECTION:= net/security PKG_DEPENDS:= ip libgmp PKG_BUILDDEP+= gmp -PKG_URL:= http://www.openswan.org -PKG_SITES:= http://www.openswan.org/download/ \ - ftp://ftp.openswan.org/openswan/ +PKG_URL:= http://www.openswan.org/ +PKG_SITES:= http://www.openswan.org/download/ PKG_NOPARALLEL:= 1 @@ -21,16 +20,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,OPENSWAN,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -#ifeq ($(ADK_COMPILE_OPENSWAN_WITH_NETKEY),y) -#XAKE_FLAGS+= USE_KLIPS=false USE_NETKEY=true -#endif - -#ifeq ($(ADK_COMPILE_OPENSWAN_WITH_KLIPS),y) -#XAKE_FLAGS+= USE_KLIPS=true USE_NETKEY=false -#endif - CONFIG_STYLE:= manual - XAKE_FLAGS+= KERNELSRC="${LINUX_DIR}" \ IPSECDIR="/usr/lib/ipsec" \ INC_USRLOCAL="/usr" \ diff --git a/package/pkgmaker b/package/pkgmaker index 225d47f47..e9e0abff5 100644 --- a/package/pkgmaker +++ b/package/pkgmaker @@ -318,7 +318,7 @@ lookup_section_string() { # print the first prompt's first word's value in a given Config.in file get_first_prompt() { - prompt="$(grep -m 1 "prompt " $1 | sed -n 's/.*"\([^ \.]*\)[ \.].*"/\1/p')" + prompt="$(grep "prompt " $1 |head -1| sed -n 's/.*"\([^ \.]*\)[ \.].*"/\1/p')" [[ -n $prompt ]] && echo $prompt } 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/strongswan/Makefile b/package/strongswan/Makefile new file mode 100644 index 000000000..b67311e3c --- /dev/null +++ b/package/strongswan/Makefile @@ -0,0 +1,60 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= strongswan +PKG_VERSION:= 4.4.0 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 22dae13782f493ec675d54b67d79a66d +PKG_DESCR:= IPsec software +PKG_SECTION:= net/security +PKG_DEPENDS:= libgmp ip libpthread kmod-net-key kmod-xfrm-user +PKG_DEPENDS+= kmod-inet-ah kmod-inet-esp kmod-inet-ipcomp +PKG_DEPENDS+= kmod-inet-xfrm-mode-tunnel kmod-inet-xfrm-mode-transport +PKG_DEPENDS+= kmod-crypto-sha1 kmod-crypto-aes kmod-crypto-md5 +PKG_DEPENDS+= kmod-crypto-des kmod-crypto-hmac +PKG_DEPENDS+= kmod-crypto-null kmod-crypto-cbc +PKG_BUILDDEP+= gmp +PKG_URL:= http://strongswan.org/index.htm +PKG_SITES:= http://download.strongswan.org/ + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,STRONGSWAN,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_ARGS+= --disable-tools \ + --disable-sha2 + +post-install: + $(INSTALL_DIR) $(IDIR_STRONGSWAN)/etc + $(INSTALL_DIR) $(IDIR_STRONGSWAN)/usr/sbin + $(INSTALL_DIR) $(IDIR_STRONGSWAN)/usr/lib + $(INSTALL_DIR) $(IDIR_STRONGSWAN)/usr/libexec/ipsec/plugins + $(CP) $(WRKINST)/usr/libexec/ipsec/plugins/*.so \ + $(IDIR_STRONGSWAN)/usr/libexec/ipsec/plugins + $(CP) $(WRKINST)/etc/* $(IDIR_STRONGSWAN)/etc + $(INSTALL_BIN) $(WRKINST)/usr/libexec/ipsec/charon \ + $(IDIR_STRONGSWAN)/usr/libexec/ipsec + $(INSTALL_BIN) $(WRKINST)/usr/libexec/ipsec/_pluto_adns \ + $(IDIR_STRONGSWAN)/usr/libexec/ipsec + $(INSTALL_BIN) $(WRKINST)/usr/libexec/ipsec/starter \ + $(IDIR_STRONGSWAN)/usr/libexec/ipsec + $(INSTALL_BIN) $(WRKINST)/usr/libexec/ipsec/_updown \ + $(IDIR_STRONGSWAN)/usr/libexec/ipsec + $(INSTALL_BIN) $(WRKINST)/usr/libexec/ipsec/whack \ + $(IDIR_STRONGSWAN)/usr/libexec/ipsec + $(INSTALL_BIN) $(WRKINST)/usr/libexec/ipsec/_copyright \ + $(IDIR_STRONGSWAN)/usr/libexec/ipsec + $(INSTALL_BIN) $(WRKINST)/usr/libexec/ipsec/pluto \ + $(IDIR_STRONGSWAN)/usr/libexec/ipsec + $(INSTALL_BIN) $(WRKINST)/usr/libexec/ipsec/stroke \ + $(IDIR_STRONGSWAN)/usr/libexec/ipsec + $(INSTALL_BIN) $(WRKINST)/usr/libexec/ipsec/_updown_espmark \ + $(IDIR_STRONGSWAN)/usr/libexec/ipsec + $(INSTALL_BIN) $(WRKINST)/usr/sbin/ipsec \ + $(IDIR_STRONGSWAN)/usr/sbin + $(CP) $(WRKINST)/usr/lib/lib*.so* \ + $(IDIR_STRONGSWAN)/usr/lib + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/strongswan/files/strongswan.conffiles b/package/strongswan/files/strongswan.conffiles new file mode 100644 index 000000000..852aa250d --- /dev/null +++ b/package/strongswan/files/strongswan.conffiles @@ -0,0 +1,3 @@ +/etc/ipsec.secrets +/etc/ipsec.conf +/etc/strongswan.conf diff --git a/package/strongswan/patches/patch-src_pluto_alg_info_c b/package/strongswan/patches/patch-src_pluto_alg_info_c new file mode 100644 index 000000000..8c65188c2 --- /dev/null +++ b/package/strongswan/patches/patch-src_pluto_alg_info_c @@ -0,0 +1,11 @@ +--- strongswan-4.4.0.orig/src/pluto/alg_info.c 2010-03-15 21:52:51.000000000 +0100 ++++ strongswan-4.4.0/src/pluto/alg_info.c 2010-07-13 22:49:11.775081075 +0200 +@@ -414,7 +414,7 @@ struct alg_info_esp *alg_info_esp_create + alg_info_esp = malloc_thing (struct alg_info_esp); + zero(alg_info_esp); + +- pfs_name=index (alg_str, ';'); ++ pfs_name=strchr (alg_str, ';'); + if (pfs_name) + { + memcpy(esp_buf, alg_str, pfs_name-alg_str); diff --git a/package/strongswan/patches/patch-src_starter_interfaces_c b/package/strongswan/patches/patch-src_starter_interfaces_c new file mode 100644 index 000000000..80d774a2e --- /dev/null +++ b/package/strongswan/patches/patch-src_starter_interfaces_c @@ -0,0 +1,20 @@ +--- strongswan-4.4.0.orig/src/starter/interfaces.c 2010-03-15 21:52:51.000000000 +0100 ++++ strongswan-4.4.0/src/starter/interfaces.c 2010-07-14 17:36:33.959074540 +0200 +@@ -56,7 +56,7 @@ get_defaultroute(defaultroute_t *default + ssize_t msglen; + int fd; + +- bzero(&rtu, sizeof(rtu)); ++ memset(&rtu, 0, sizeof(rtu)); + rtu.m.nh.nlmsg_len = NLMSG_LENGTH(sizeof(rtu.m.rt)); + rtu.m.nh.nlmsg_flags = NLM_F_REQUEST | NLM_F_DUMP; + rtu.m.nh.nlmsg_type = RTM_GETROUTE; +@@ -142,7 +142,7 @@ get_defaultroute(defaultroute_t *default + plog("could not open AF_INET socket"); + break; + } +- bzero(&req, sizeof(req)); ++ memset(&req, 0, sizeof(req)); + req.ifr_ifindex = iface_idx; + if (ioctl(fd, SIOCGIFNAME, &req) < 0 || + ioctl(fd, SIOCGIFADDR, &req) < 0) diff --git a/package/strongswan/patches/patch-src_starter_netkey_c b/package/strongswan/patches/patch-src_starter_netkey_c new file mode 100644 index 000000000..eae417f7b --- /dev/null +++ b/package/strongswan/patches/patch-src_starter_netkey_c @@ -0,0 +1,19 @@ +--- strongswan-4.4.0.orig/src/starter/netkey.c 2010-03-15 21:52:51.000000000 +0100 ++++ strongswan-4.4.0/src/starter/netkey.c 2010-07-14 19:05:06.911085736 +0200 +@@ -48,6 +48,8 @@ starter_netkey_init(void) + } + + /* make sure that all required IPsec modules are loaded */ ++ /* OpenADK loads all kernel modules already */ ++#if 0 + if (stat(PROC_MODULES, &stb) == 0) + { + ignore_result(system("modprobe -qv ah4")); +@@ -60,6 +62,7 @@ starter_netkey_init(void) + DBG(DBG_CONTROL, + DBG_log("Found netkey IPsec stack") + ) ++#endif + return TRUE; + } + 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})) diff --git a/target/Config.in b/target/Config.in index 98e9f179a..9db5efed1 100644 --- a/target/Config.in +++ b/target/Config.in @@ -293,6 +293,7 @@ config ADK_LINUX_MIPS64_LEMOTE select ADK_KPACKAGE_KMOD_MAC80211 select ADK_KPACKAGE_KMOD_SND select ADK_KPACKAGE_KMOD_SND_CS5535AUDIO + select ADK_KPACKAGE_KMOD_SND_OSSEMUL help Lemote Subnotebook. http://www.lemote.com/english/index.html diff --git a/target/lemote/files/etc/inittab b/target/lemote/files/etc/inittab index 6e32240bd..cedbc93ff 100644 --- a/target/lemote/files/etc/inittab +++ b/target/lemote/files/etc/inittab @@ -6,5 +6,4 @@ tty3::respawn:/sbin/getty -i -L tty3 115200 vt100 tty4::respawn:/sbin/getty -i -L tty4 115200 vt100 tty5::respawn:/sbin/getty -i -L tty5 115200 vt100 tty6::respawn:/sbin/getty -i -L tty6 115200 vt100 -tty7::respawn:/sbin/getty -i -L tty7 115200 vt100 tty11::respawn:/sbin/logread -f diff --git a/target/linux/config/Config.in.ipsec b/target/linux/config/Config.in.ipsec index 60497bc32..f1b17327a 100644 --- a/target/linux/config/Config.in.ipsec +++ b/target/linux/config/Config.in.ipsec @@ -7,15 +7,22 @@ config ADK_KPACKAGE_KMOD_NET_KEY help PF_KEYv2 socket family, compatible to KAME ones. +config ADK_KPACKAGE_KMOD_XFRM_USER + prompt "kmod-xfrm-user.................... IPsec usertools support" + tristate + default n + help + config ADK_KPACKAGE_KMOD_INET_AH - prompt "kmod-net-ipsec-ah................. IPsec AH support" + prompt "kmod-inet-ah...................... IPsec AH support" tristate + select ADK_KPACKAGE_KMOD_CRYPTO_HASH default n help Support for IPsec AH. config ADK_KPACKAGE_KMOD_INET_ESP - prompt "kmod-net-ipsec-esp................ IPsec ESP support" + prompt "kmod-inet-esp..................... IPsec ESP support" tristate select ADK_KPACKAGE_KMOD_CRYPTO_AEAD default n @@ -23,7 +30,7 @@ config ADK_KPACKAGE_KMOD_INET_ESP Support for IPsec ESP. config ADK_KPACKAGE_KMOD_INET_IPCOMP - prompt "kmod-net-ipsec-comp................ IP Payload Compression" + prompt "kmod-inet-ipcomp.................. IP Payload Compression" tristate default n help @@ -31,21 +38,21 @@ config ADK_KPACKAGE_KMOD_INET_IPCOMP typically needed for IPsec. config ADK_KPACKAGE_KMOD_INET_XFRM_MODE_TRANSPORT - prompt "kmod-net-ipsec-transport........... IPsec transport mode" + prompt "kmod-inet-xfrm-mode-transport..... IPsec transport mode" tristate default n help Support for IPsec transport mode. config ADK_KPACKAGE_KMOD_INET_XFRM_MODE_TUNNEL - prompt "kmod-net-ipsec-tunnel.............. IPsec tunnel mode" + prompt "kmod-inet-xfrm-mode-tunnel........ IPsec tunnel mode" tristate default n help Support for IPsec tunnel mode. config ADK_KPACKAGE_KMOD_INET_XFRM_MODE_BEET - prompt "kmod-net-ipsec-beet................ IPsec BEET mode" + prompt "kmod-inet-xfrm-mode-beet.......... IPsec BEET mode" tristate default n help |