[OpenWrt-Devel] [PATCH 2/2] rtorrent 0.9.2 update
this patches updates rtorrent to 0.9.2
Signed-off-by: Peter Wagner tripo...@gmx.atdiff --git a/net/rtorrent/Makefile b/net/rtorrent/Makefile
index 7dad009..d8d2414 100644
--- a/net/rtorrent/Makefile
+++ b/net/rtorrent/Makefile
@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=rtorrent
-PKG_VERSION:=0.8.6
+PKG_VERSION:=0.9.2
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://libtorrent.rakshasa.no/downloads
-PKG_MD5SUM:=b804c45c01c40312926bcea6b55bb084
+PKG_MD5SUM:=72c3e9ab859bda7cc8aa96c0b508b09f
PKG_FIXUP:=autoreconf
PKG_BUILD_PARALLEL:=1
@@ -45,7 +45,8 @@ CONFIGURE_ARGS+= \
--enable-shared \
--disable-static \
--disable-debug \
- --with-xmlrpc-c
+ --with-xmlrpc-c \
+ USE_EXECINFO=1
define Build/Configure
( cd $(PKG_BUILD_DIR); ./autogen.sh );
diff --git a/net/rtorrent/patches/100-fix-cross_compile.patch b/net/rtorrent/patches/100-fix-cross_compile.patch
index b52a952..c641540 100644
--- a/net/rtorrent/patches/100-fix-cross_compile.patch
+++ b/net/rtorrent/patches/100-fix-cross_compile.patch
@@ -1,22 +1,30 @@
-Index: rtorrent-0.8.6/scripts/common.m4
-===
rtorrent-0.8.6.orig/scripts/common.m4
-+++ rtorrent-0.8.6/scripts/common.m4
-@@ -184,7 +184,7 @@ AC_DEFUN([TORRENT_CHECK_MADVISE], [
+--- a/configure.ac
b/configure.ac
+@@ -4,7 +4,6 @@ AC_DEFINE(API_VERSION, 6, api version)
+
+ AM_INIT_AUTOMAKE
+ AM_CONFIG_HEADER(config.h)
+-AM_PATH_CPPUNIT(1.9.6)
+
+ AC_PROG_CXX
+ AC_PROG_LIBTOOL
+--- a/scripts/common.m4
b/scripts/common.m4
+@@ -223,7 +223,7 @@ dnl Need to fix this so that it uses t
AC_DEFUN([TORRENT_CHECK_EXECINFO], [
AC_MSG_CHECKING(for execinfo.h)
-- AC_RUN_IFELSE(
-+ AC_LINK_IFELSE(
- [[#include execinfo.h
+- AC_RUN_IFELSE([AC_LANG_SOURCE([
++ AC_LINK_IFELSE([AC_LANG_SOURCE([
+ #include execinfo.h
int main() { backtrace((void**)0, 0); backtrace_symbols((char**)0, 0); return 0;}
- ]],
-@@ -199,7 +199,7 @@ AC_DEFUN([TORRENT_CHECK_EXECINFO], [
+ ])],
+@@ -238,7 +238,7 @@ AC_DEFUN([TORRENT_CHECK_EXECINFO], [
AC_DEFUN([TORRENT_CHECK_ALIGNED], [
AC_MSG_CHECKING(the byte alignment)
-- AC_RUN_IFELSE(
-+ AC_LINK_IFELSE(
- [[#include inttypes.h
+- AC_RUN_IFELSE([AC_LANG_SOURCE([
++ AC_LINK_IFELSE([AC_LANG_SOURCE([
+ #include inttypes.h
int main() {
char buf[8] = { 0, 0, 0, 0, 1, 0, 0, 0 };
diff --git a/net/rtorrent/patches/120-fix-ncurses.patch b/net/rtorrent/patches/120-fix-ncurses.patch
index e460927..f491de3 100644
--- a/net/rtorrent/patches/120-fix-ncurses.patch
+++ b/net/rtorrent/patches/120-fix-ncurses.patch
@@ -1,13 +1,11 @@
-Index: rtorrent-0.8.6/src/display/canvas.h
-===
rtorrent-0.8.6.orig/src/display/canvas.h
-+++ rtorrent-0.8.6/src/display/canvas.h
+--- a/src/display/canvas.h
b/src/display/canvas.h
@@ -48,7 +48,7 @@ class Canvas {
public:
typedef std::vectorAttributes attributes_list;
-- Canvas(int x = 0, int y = 0, int width = 0, int height = 0) :
-+ Canvas(int x = 0, int y = 0, int width = 1, int height = 1) :
- m_window(newwin(height, width, y, x)) {}
+- Canvas(int x = 0, int y = 0, int width = 0, int height = 0);
++ Canvas(int x = 0, int y = 0, int width = 1, int height = 1);
~Canvas() { delwin(m_window); }
+ voidrefresh() { wnoutrefresh(m_window); }
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 1/2] libtorrent 0.13.2 update
this patches updates libtorrent to 0.13.2
Signed-off-by: Peter Wagner tripo...@gmx.atdiff --git a/libs/libtorrent/Makefile b/libs/libtorrent/Makefile
index 42c0ee1..aaa0dde 100644
--- a/libs/libtorrent/Makefile
+++ b/libs/libtorrent/Makefile
@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=libtorrent
-PKG_VERSION:=0.12.6
+PKG_VERSION:=0.13.2
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://libtorrent.rakshasa.no/downloads
-PKG_MD5SUM:=037499ed708aaf72988cee60e5a8d96b
+PKG_MD5SUM:=96c0b81501357df402ab592f59ecaeab
PKG_FIXUP:=autoreconf
PKG_BUILD_PARALLEL:=1
diff --git a/libs/libtorrent/patches/000-upstream-gcc46-fixes.patch b/libs/libtorrent/patches/000-upstream-gcc46-fixes.patch
deleted file mode 100644
index d8bea4f..000
--- a/libs/libtorrent/patches/000-upstream-gcc46-fixes.patch
+++ /dev/null
@@ -1,31 +0,0 @@
a/src/data/memory_chunk.cc
-+++ b/src/data/memory_chunk.cc
-@@ -71,7 +71,7 @@ MemoryChunk::MemoryChunk(char* ptr, char
- if (page_align() = m_pagesize)
- throw internal_error(MemoryChunk::MemoryChunk(...) received an page alignment = page size);
-
-- if ((ptrdiff_t)ptr % m_pagesize)
-+ if ((std::ptrdiff_t)ptr % m_pagesize)
- throw internal_error(MemoryChunk::MemoryChunk(...) is not aligned to a page);
- }
-
a/src/torrent/data/block.h
-+++ b/src/torrent/data/block.h
-@@ -40,6 +40,7 @@
- #include vector
- #include torrent/common.h
- #include torrent/data/block_transfer.h
-+#include cstdlib
-
- namespace torrent {
-
a/src/torrent/data/block_transfer.h
-+++ b/src/torrent/data/block_transfer.h
-@@ -39,6 +39,7 @@
-
- #include torrent/common.h
- #include torrent/data/piece.h
-+#include cstdlib
-
- namespace torrent {
-
diff --git a/libs/libtorrent/patches/100-fix_cross_compile.patch b/libs/libtorrent/patches/100-fix_cross_compile.patch
index 7030718..81eb97d 100644
--- a/libs/libtorrent/patches/100-fix_cross_compile.patch
+++ b/libs/libtorrent/patches/100-fix_cross_compile.patch
@@ -1,31 +1,41 @@
+--- a/configure.ac
b/configure.ac
+@@ -17,7 +17,6 @@ AC_SUBST(LIBTORRENT_INTERFACE_VERSION_NO
+
+ AM_INIT_AUTOMAKE
+ AM_CONFIG_HEADER(config.h)
+-AM_PATH_CPPUNIT(1.9.6)
+ AC_DISABLE_STATIC
+
+ AM_DISABLE_STATIC
--- a/scripts/checks.m4
+++ b/scripts/checks.m4
@@ -96,7 +96,7 @@ AC_DEFUN([TORRENT_CHECK_KQUEUE], [
AC_DEFUN([TORRENT_CHECK_KQUEUE_SOCKET_ONLY], [
AC_MSG_CHECKING(whether kqueue supports pipes and ptys)
-- AC_RUN_IFELSE(
-+ AC_LINK_IFELSE(
- [[#include fcntl.h
+- AC_RUN_IFELSE([AC_LANG_SOURCE([
++ AC_LINK_IFELSE([AC_LANG_SOURCE([
+ #include fcntl.h
#include stdlib.h
#include unistd.h
--- a/scripts/common.m4
+++ b/scripts/common.m4
-@@ -184,7 +184,7 @@ AC_DEFUN([TORRENT_CHECK_MADVISE], [
+@@ -223,7 +223,7 @@ dnl Need to fix this so that it uses t
AC_DEFUN([TORRENT_CHECK_EXECINFO], [
AC_MSG_CHECKING(for execinfo.h)
-- AC_RUN_IFELSE(
-+ AC_LINK_IFELSE(
- [[#include execinfo.h
+- AC_RUN_IFELSE([AC_LANG_SOURCE([
++ AC_LINK_IFELSE([AC_LANG_SOURCE([
+ #include execinfo.h
int main() { backtrace((void**)0, 0); backtrace_symbols((char**)0, 0); return 0;}
- ]],
-@@ -199,7 +199,7 @@ AC_DEFUN([TORRENT_CHECK_EXECINFO], [
+ ])],
+@@ -238,7 +238,7 @@ AC_DEFUN([TORRENT_CHECK_EXECINFO], [
AC_DEFUN([TORRENT_CHECK_ALIGNED], [
AC_MSG_CHECKING(the byte alignment)
-- AC_RUN_IFELSE(
-+ AC_LINK_IFELSE(
- [[#include inttypes.h
+- AC_RUN_IFELSE([AC_LANG_SOURCE([
++ AC_LINK_IFELSE([AC_LANG_SOURCE([
+ #include inttypes.h
int main() {
char buf[8] = { 0, 0, 0, 0, 1, 0, 0, 0 };
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH 2/2] [v2] rtorrent 0.9.2 update
this patches updates rtorrent to 0.9.2
removes accidently added debug stuff
Signed-off-by: Peter Wagner tripo...@gmx.atdiff --git a/net/rtorrent/Makefile b/net/rtorrent/Makefile
index 7dad009..dac4b62 100644
--- a/net/rtorrent/Makefile
+++ b/net/rtorrent/Makefile
@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=rtorrent
-PKG_VERSION:=0.8.6
+PKG_VERSION:=0.9.2
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://libtorrent.rakshasa.no/downloads
-PKG_MD5SUM:=b804c45c01c40312926bcea6b55bb084
+PKG_MD5SUM:=72c3e9ab859bda7cc8aa96c0b508b09f
PKG_FIXUP:=autoreconf
PKG_BUILD_PARALLEL:=1
diff --git a/net/rtorrent/patches/100-fix-cross_compile.patch b/net/rtorrent/patches/100-fix-cross_compile.patch
index b52a952..c641540 100644
--- a/net/rtorrent/patches/100-fix-cross_compile.patch
+++ b/net/rtorrent/patches/100-fix-cross_compile.patch
@@ -1,22 +1,30 @@
-Index: rtorrent-0.8.6/scripts/common.m4
-===
rtorrent-0.8.6.orig/scripts/common.m4
-+++ rtorrent-0.8.6/scripts/common.m4
-@@ -184,7 +184,7 @@ AC_DEFUN([TORRENT_CHECK_MADVISE], [
+--- a/configure.ac
b/configure.ac
+@@ -4,7 +4,6 @@ AC_DEFINE(API_VERSION, 6, api version)
+
+ AM_INIT_AUTOMAKE
+ AM_CONFIG_HEADER(config.h)
+-AM_PATH_CPPUNIT(1.9.6)
+
+ AC_PROG_CXX
+ AC_PROG_LIBTOOL
+--- a/scripts/common.m4
b/scripts/common.m4
+@@ -223,7 +223,7 @@ dnl Need to fix this so that it uses t
AC_DEFUN([TORRENT_CHECK_EXECINFO], [
AC_MSG_CHECKING(for execinfo.h)
-- AC_RUN_IFELSE(
-+ AC_LINK_IFELSE(
- [[#include execinfo.h
+- AC_RUN_IFELSE([AC_LANG_SOURCE([
++ AC_LINK_IFELSE([AC_LANG_SOURCE([
+ #include execinfo.h
int main() { backtrace((void**)0, 0); backtrace_symbols((char**)0, 0); return 0;}
- ]],
-@@ -199,7 +199,7 @@ AC_DEFUN([TORRENT_CHECK_EXECINFO], [
+ ])],
+@@ -238,7 +238,7 @@ AC_DEFUN([TORRENT_CHECK_EXECINFO], [
AC_DEFUN([TORRENT_CHECK_ALIGNED], [
AC_MSG_CHECKING(the byte alignment)
-- AC_RUN_IFELSE(
-+ AC_LINK_IFELSE(
- [[#include inttypes.h
+- AC_RUN_IFELSE([AC_LANG_SOURCE([
++ AC_LINK_IFELSE([AC_LANG_SOURCE([
+ #include inttypes.h
int main() {
char buf[8] = { 0, 0, 0, 0, 1, 0, 0, 0 };
diff --git a/net/rtorrent/patches/120-fix-ncurses.patch b/net/rtorrent/patches/120-fix-ncurses.patch
index e460927..f491de3 100644
--- a/net/rtorrent/patches/120-fix-ncurses.patch
+++ b/net/rtorrent/patches/120-fix-ncurses.patch
@@ -1,13 +1,11 @@
-Index: rtorrent-0.8.6/src/display/canvas.h
-===
rtorrent-0.8.6.orig/src/display/canvas.h
-+++ rtorrent-0.8.6/src/display/canvas.h
+--- a/src/display/canvas.h
b/src/display/canvas.h
@@ -48,7 +48,7 @@ class Canvas {
public:
typedef std::vectorAttributes attributes_list;
-- Canvas(int x = 0, int y = 0, int width = 0, int height = 0) :
-+ Canvas(int x = 0, int y = 0, int width = 1, int height = 1) :
- m_window(newwin(height, width, y, x)) {}
+- Canvas(int x = 0, int y = 0, int width = 0, int height = 0);
++ Canvas(int x = 0, int y = 0, int width = 1, int height = 1);
~Canvas() { delwin(m_window); }
+ voidrefresh() { wnoutrefresh(m_window); }
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] Basic support for the AsiaRF RT5350 based AWM002 module and evaluation board.
On 23/07/13 02:10, jonsm...@gmail.com wrote: I'm happy with whatever we pick, it isn't hard to edit them. How about this... AWM002.dtsi -- the module (with m25p80 flash specified) AWM002-EVB.dtsi -- the baseboard AWM002-EVB-4M.dts -- these include the first two and add the specific flash flash chip AWM002-EVB-8M.dts Where do the partitions go? The dts files? is the flash on the module or on the carrier board ? ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] Basic support for the AsiaRF RT5350 based AWM002 module and evaluation board.
On Tue, Jul 23, 2013 at 2:10 AM, jonsm...@gmail.com jonsm...@gmail.com wrote: On Mon, Jul 22, 2013 at 6:00 PM, Jonas Gorski j...@openwrt.org wrote: On Mon, Jul 22, 2013 at 9:38 PM, John Crispin j...@phrozen.org wrote: On 22/07/13 21:37, jonsm...@gmail.com wrote: Here's a photo - you can see how it is a module mounted on a baseboard. http://www.ayyari.com/pic/AYYAR.jpg these 2 file have essentially the same info in them which made me wonder, but i understand now why this is so ... target/linux/ramips/dts/AWM002-EVB-4M.dts target/linux/ramips/dts/AWM002-EVB-8M.dts i am not really happy with having 5 dts files to essentially describe one biard, but unless i can come up with a better solution tomorrow i will merge the patch as is. Since both are identical except for the part they include, everything in them could be moved into the top dtsi, and the dtsi files with the flashchip made to .dts. Also somehow the one other thing that should be different between the two versions, the firmware partion's size, is defined for the top .dtsi; that one should actually be in the .dts files. Looking at it, it is defined as ~32 MiB, so there is some reliance on the kernel doing the right thing and shrinking it to the right size. And if we are doing that, then there is no reason at all anymore for having different dtsi files, as we can then also use m25p80's ability to autodetect the flash chip and get rid of the dual size thingy. I'm happy with whatever we pick, it isn't hard to edit them. How about this... AWM002.dtsi -- the module (with m25p80 flash specified) AWM002-EVB.dtsi -- the baseboard Is there a specific reason why you can't merge these two? AWM002-EVB-4M.dts -- these include the first two and add the specific flash flash chip AWM002-EVB-8M.dts Where do the partitions go? The dts files? Yes. Jonas ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] Basic support for the AsiaRF RT5350 based AWM002 module and evaluation board.
On Tue, Jul 23, 2013 at 6:01 AM, John Crispin j...@phrozen.org wrote: On 23/07/13 02:10, jonsm...@gmail.com wrote: I'm happy with whatever we pick, it isn't hard to edit them. How about this... AWM002.dtsi -- the module (with m25p80 flash specified) AWM002-EVB.dtsi -- the baseboard AWM002-EVB-4M.dts -- these include the first two and add the specific flash flash chip AWM002-EVB-8M.dts Where do the partitions go? The dts files? is the flash on the module or on the carrier board ? Flash is on the module. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel -- Jon Smirl jonsm...@gmail.com ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [Patch] ramips: fix HG255D VLAN initial detect issue
Signed-off-by: Leon Xu ylx...@gmail.com --- --- trunk/target/linux/ramips/base-files/etc/uci-defaults/02_network 2013-07-23 20:23:33.147107880 +0800 +++ trunk.old/target/linux/ramips/base-files/etc/uci-defaults/02_network 2013-07-23 18:57:38.898526000 +0800 @@ -86,6 +86,7 @@ f5d8235-v1 | \ f5d8235-v2 | \ + hg255d | \ ur-326n4g) ucidef_set_interfaces_lan_wan eth0.1 eth0.2 ucidef_add_switch switch0 1 1 --- ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [Patch] ramips: fix HG255D VLAN initial detect issue
On 23/07/13 14:38, Leon Xu wrote: Signed-off-by: Leon Xuylx...@gmail.com --- --- trunk/target/linux/ramips/base-files/etc/uci-defaults/02_network 2013-07-23 20:23:33.147107880 +0800 +++ trunk.old/target/linux/ramips/base-files/etc/uci-defaults/02_network 2013-07-23 18:57:38.898526000 +0800 @@ -86,6 +86,7 @@ f5d8235-v1 | \ f5d8235-v2 | \ + hg255d | \ ur-326n4g) ucidef_set_interfaces_lan_wan eth0.1 eth0.2 ucidef_add_switch switch0 1 1 --- ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel applied, thanks ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCHv2] minidlna: update to 1.1.0
Cezary, could you post your full minidlna package for comparison? I could not find it in your packages repo on github. On Tue, Jul 23, 2013 at 12:31 AM, Cezary Jackiewicz cezary.jackiew...@gmail.com wrote: Dnia 2013-07-22, o godz. 21:52:42 Catalin Patulea c...@vv.carleton.ca napisał(a): Based on original patch from alpha sparc alphasp...@gmail.com. - upstream renamed binary to minidlnad and moved to sbin - drop patches (merged upstream) - fix passing configure params - need to pass pidfile path explicitly now Kernel.mk is also not necessary 1.1.0 -- Pozdrawiam, Cezary Jackiewicz ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] Basic support for the AsiaRF RT5350 based AWM002 module and evaluation board.
Hi. The flash is in the moule. Here is the patch for AWM002 https://github.com/ayyaris/ayyar Ayyari Il giorno 23/lug/2013, alle ore 06:01, John Crispin j...@phrozen.org ha scritto: On 23/07/13 02:10, jonsm...@gmail.com wrote: I'm happy with whatever we pick, it isn't hard to edit them. How about this... AWM002.dtsi -- the module (with m25p80 flash specified) AWM002-EVB.dtsi -- the baseboard AWM002-EVB-4M.dts -- these include the first two and add the specific flash flash chip AWM002-EVB-8M.dts Where do the partitions go? The dts files? is the flash on the module or on the carrier board ? ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH v4] authsae 80211s authentication daemon
This patch adds authsae open80211s authentication daemon (http://open80211s.org) It's a rework of Peter Naulls patch (http://patchwork.openwrt.org/patch/1350/) I've excluded the sample conf file as it's useless when used with mac80211.sh (Emanuel Taube patch) Authsae is 58 Ko (OPENSSL_WITH_EC option adds 35Ko to libopenssl) Signed-off-by: Peter Naulls pe...@chocky.org Signed-off-by: Etienne CHAMPETIER etienne.champet...@free.fr diff --git a/package/network/services/authsae/Makefile b/package/network/services/authsae/Makefile new file mode 100644 index 000..63320ae --- /dev/null +++ b/package/network/services/authsae/Makefile @@ -0,0 +1,42 @@ + +# Copyright (C) 2007-2013 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=authsae +PKG_VERSION:=2013-06-25 +PKG_RELEASE=$(PKG_SOURCE_VERSION) + +PKG_SOURCE_PROTO:=git +PKG_SOURCE_URL:=git://github.com/cozybit/authsae.git +PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_VERSION:=e2f67612101dc83f2c459d8ddc75c34bc83e1e83 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz + +PKG_BUILD_PARALLEL:=1 +CMAKE_INSTALL:=1 + +CMAKE_OPTIONS += -DSYSCONF_INSTALL_DIR=/etc + +include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/cmake.mk + +define Package/authsae + SECTION:=net + CATEGORY:=Network + TITLE:=80211s mesh security + DEPENDS=+libopenssl +libconfig +libnl +@OPENSSL_WITH_EC +endef + +TARGET_CFLAGS += -D_GNU_SOURCE + +define Package/authsae/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin +endef + +$(eval $(call BuildPackage,authsae)) ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH v3] authsae: adapt uci scripts to use authsae
This patch modifies the uci scripts to be able to
start meshd-nl80211 for encrypted mesh networks,
therefor a new script (authsae.sh) is inserted.
Signed-off-by: Emanuel Taube emanuel.ta...@gmail.com
[etienne.champet...@free.fr: just update mac80211.sh path]
Signed-off-by: Etienne CHAMPETIER etienne.champet...@free.fr
diff --git a/package/kernel/mac80211/files/lib/wifi/mac80211.sh
b/package/kernel/mac80211/files/lib/wifi/mac80211.sh
index 20f6bfa..2a75d67 100644
--- a/package/kernel/mac80211/files/lib/wifi/mac80211.sh
+++ b/package/kernel/mac80211/files/lib/wifi/mac80211.sh
@@ -251,7 +251,7 @@ disable_mac80211() (
include /lib/network
for wdev in $(list_phy_interfaces $phy); do
[ -f /var/run/$wdev.pid ] kill $(cat /var/run/$wdev.pid)
/dev/null 21
- for pid in `pidof wpa_supplicant`; do
+ for pid in `pidof wpa_supplicant` `pidof meshd-nl80211`; do
grep $wdev /proc/$pid/cmdline /dev/null \
kill $pid
done
@@ -370,8 +370,13 @@ enable_mac80211() {
[ $apidx -gt 1 ] || iw phy $phy interface
add $ifname type managed
;;
mesh)
- config_get mesh_id $vif mesh_id
- iw phy $phy interface add $ifname type mp
mesh_id $mesh_id
+ config_get key $vif key
+ if [ -n $key ]; then
+ iw phy $phy interface add $ifname
type mp
+ else
+ config_get mesh_id $vif mesh_id
+ iw phy $phy interface add $ifname
type mp mesh_id $mesh_id
+ fi
;;
monitor)
iw phy $phy interface add $ifname type
monitor
@@ -426,9 +431,16 @@ enable_mac80211() {
rm -f /var/run/hostapd-$phy.conf
for vif in $vifs; do
config_get mode $vif mode
- [ $mode = ap ] || continue
- mac80211_hostapd_setup_bss $phy $vif
- start_hostapd=1
+ case $mode in
+ ap)
+ mac80211_hostapd_setup_bss $phy $vif
+ start_hostapd=1
+ ;;
+ mesh)
+ config_get key $vif key
+ [ -n $key ] authsae_start_interface
$device $vif
+ ;;
+ esac
done
[ -n $start_hostapd ] {
diff --git a/package/network/services/authsae/Makefile
b/package/network/services/authsae/Makefile
index edd5e1d..86ccd5e 100644
--- a/package/network/services/authsae/Makefile
+++ b/package/network/services/authsae/Makefile
@@ -37,6 +37,8 @@ TARGET_CFLAGS += -D_GNU_SOURCE
define Package/authsae/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin
+ $(INSTALL_DIR) $(1)/lib/wifi
+ $(INSTALL_DATA) ./files/lib/wifi/authsae.sh $(1)/lib/wifi/
endef
$(eval $(call BuildPackage,authsae))
diff --git a/package/network/services/authsae/files/lib/wifi/authsae.sh
b/package/network/services/authsae/files/lib/wifi/authsae.sh
new file mode 100644
index 000..daa43eb
--- /dev/null
+++ b/package/network/services/authsae/files/lib/wifi/authsae.sh
@@ -0,0 +1,53 @@
+authsae_start_interface() {
+ local device=$1 # to use the correct channel
+ local vif=$2
+ local band
+
+ cfgfile=/var/run/authsae-$vif.cfg
+ config_get channel $device channel
+ config_get hwmode $device hwmode
+ config_get htmode $device htmode
+ config_get ifname $vif ifname
+ config_get key $vif key
+ config_get mesh_id $vif mesh_id
+ config_get mcast_rate $vif mcast_rate 12
+
+ case $htmode in
+ HT20|HT40+|HT40-) htmode=$htmode;;
+ NOHT|none|*) htmode=none;;
+ esac
+
+ case $hwmode in
+ *g*) band=11g;;
+ *a*) band=11a;;
+ esac
+
+ cat $cfgfile EOF
+authsae:
+{
+ sae:
+ {
+debug = 0;
+password = $key;
+group = [19, 26, 21, 25, 20];
+blacklist = 5;
+thresh = 5;
+lifetime = 3600;
+ };
+ meshd:
+ {
+meshid = $mesh_id;
+interface = $ifname;
+passive = 0;
+debug = 0;
+mediaopt = 1;
+band = $band;
+channel = $channel;
+htmode = $htmode;
+mcast-rate = $mcast_rate;
+ };
+};
+EOF
+ ifconfig $ifname up
+ meshd-nl80211 -i $ifname -s $mesh_id -c $cfgfile -B
+}
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH v3] authsae: adapt uci scripts to use authsae
From: Emanuel Taube emanuel.ta...@gmail.com
This patch modifies the uci scripts to be able to
start meshd-nl80211 for encrypted mesh networks,
therefor a new script (authsae.sh) is inserted.
Signed-off-by: Emanuel Taube emanuel.ta...@gmail.com
[etienne.champet...@free.fr: just update mac80211.sh path]
Signed-off-by: Etienne CHAMPETIER etienne.champet...@free.fr
diff --git a/package/kernel/mac80211/files/lib/wifi/mac80211.sh
b/package/kernel/mac80211/files/lib/wifi/mac80211.sh
index 20f6bfa..2a75d67 100644
--- a/package/kernel/mac80211/files/lib/wifi/mac80211.sh
+++ b/package/kernel/mac80211/files/lib/wifi/mac80211.sh
@@ -251,7 +251,7 @@ disable_mac80211() (
include /lib/network
for wdev in $(list_phy_interfaces $phy); do
[ -f /var/run/$wdev.pid ] kill $(cat /var/run/$wdev.pid)
/dev/null 21
- for pid in `pidof wpa_supplicant`; do
+ for pid in `pidof wpa_supplicant` `pidof meshd-nl80211`; do
grep $wdev /proc/$pid/cmdline /dev/null \
kill $pid
done
@@ -370,8 +370,13 @@ enable_mac80211() {
[ $apidx -gt 1 ] || iw phy $phy interface
add $ifname type managed
;;
mesh)
- config_get mesh_id $vif mesh_id
- iw phy $phy interface add $ifname type mp
mesh_id $mesh_id
+ config_get key $vif key
+ if [ -n $key ]; then
+ iw phy $phy interface add $ifname
type mp
+ else
+ config_get mesh_id $vif mesh_id
+ iw phy $phy interface add $ifname
type mp mesh_id $mesh_id
+ fi
;;
monitor)
iw phy $phy interface add $ifname type
monitor
@@ -426,9 +431,16 @@ enable_mac80211() {
rm -f /var/run/hostapd-$phy.conf
for vif in $vifs; do
config_get mode $vif mode
- [ $mode = ap ] || continue
- mac80211_hostapd_setup_bss $phy $vif
- start_hostapd=1
+ case $mode in
+ ap)
+ mac80211_hostapd_setup_bss $phy $vif
+ start_hostapd=1
+ ;;
+ mesh)
+ config_get key $vif key
+ [ -n $key ] authsae_start_interface
$device $vif
+ ;;
+ esac
done
[ -n $start_hostapd ] {
diff --git a/package/network/services/authsae/Makefile
b/package/network/services/authsae/Makefile
index edd5e1d..86ccd5e 100644
--- a/package/network/services/authsae/Makefile
+++ b/package/network/services/authsae/Makefile
@@ -37,6 +37,8 @@ TARGET_CFLAGS += -D_GNU_SOURCE
define Package/authsae/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin
+ $(INSTALL_DIR) $(1)/lib/wifi
+ $(INSTALL_DATA) ./files/lib/wifi/authsae.sh $(1)/lib/wifi/
endef
$(eval $(call BuildPackage,authsae))
diff --git a/package/network/services/authsae/files/lib/wifi/authsae.sh
b/package/network/services/authsae/files/lib/wifi/authsae.sh
new file mode 100644
index 000..daa43eb
--- /dev/null
+++ b/package/network/services/authsae/files/lib/wifi/authsae.sh
@@ -0,0 +1,53 @@
+authsae_start_interface() {
+ local device=$1 # to use the correct channel
+ local vif=$2
+ local band
+
+ cfgfile=/var/run/authsae-$vif.cfg
+ config_get channel $device channel
+ config_get hwmode $device hwmode
+ config_get htmode $device htmode
+ config_get ifname $vif ifname
+ config_get key $vif key
+ config_get mesh_id $vif mesh_id
+ config_get mcast_rate $vif mcast_rate 12
+
+ case $htmode in
+ HT20|HT40+|HT40-) htmode=$htmode;;
+ NOHT|none|*) htmode=none;;
+ esac
+
+ case $hwmode in
+ *g*) band=11g;;
+ *a*) band=11a;;
+ esac
+
+ cat $cfgfile EOF
+authsae:
+{
+ sae:
+ {
+debug = 0;
+password = $key;
+group = [19, 26, 21, 25, 20];
+blacklist = 5;
+thresh = 5;
+lifetime = 3600;
+ };
+ meshd:
+ {
+meshid = $mesh_id;
+interface = $ifname;
+passive = 0;
+debug = 0;
+mediaopt = 1;
+band = $band;
+channel = $channel;
+htmode = $htmode;
+mcast-rate = $mcast_rate;
+ };
+};
+EOF
+ ifconfig $ifname up
+ meshd-nl80211 -i $ifname -s $mesh_id -c $cfgfile -B
+}
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] [packages] AllJoyn: New package (updated)
from: AllJoyn Project (Qualcomm Innovation Center, Inc.)
maintain...@alljoyn.org
Add AllJoyn v. 3.3.2 as a new package to OpenWrt.
AllJoyn is a peer-to-peer networking technology. Project details can be
found at http://www.alljoyn.org.
Signed-off-by: Steve Kinneberg ste...@quicinc.com
---
This is an updated version of AllJoyn from my previous submission. This
patch completely supersedes the previous patch as that has not been
applied yet.
Index: package/network/services/alljoyn/files/alljoyn.config
===
--- package/network/services/alljoyn/files/alljoyn.config (revision 0)
+++ package/network/services/alljoyn/files/alljoyn.config (working copy)
@@ -0,0 +1,27 @@
+
+config transport 'unix'
+ option enable '1'
+ option path 'alljoyn'
+ option abstract '1'
+
+config transport 'ip'
+ option enable '1'
+ option max_incomplete_conn '16'
+ option max_complete_conn '96'
+ option bus_port '9955'
+ option auth_timeout '2'
+ option advertise_daemon '1'
+ option all_networks '0'
+ list networks 'lan'
+
+config transport 'ice'
+ option enable '1'
+ option max_incomplete_conn '16'
+ option max_complete_conn '64'
+ option server 'https://rdvs.alljoyn.org'
+ option auth_timeout '4'
+ option all_networks '1'
+
+config transport 'bluetooth'
+ option enable '0'
+
Index: package/network/services/alljoyn/files/alljoyn.defaults
===
--- package/network/services/alljoyn/files/alljoyn.defaults (revision 0)
+++ package/network/services/alljoyn/files/alljoyn.defaults (working copy)
@@ -0,0 +1,9 @@
+#! /bin/sh
+uci batch EOF
+add ucitrack alljoyn
+set ucitrack.@alljoyn[-1].init=alljoyn
+add_list ucitrack.@network[-1].affects=alljoyn
+commit ucitrack
+EOF
+/etc/init.d/alljoyn enable
+exit 0
Index: package/network/services/alljoyn/files/alljoyn.init
===
--- package/network/services/alljoyn/files/alljoyn.init (revision 0)
+++ package/network/services/alljoyn/files/alljoyn.init (working copy)
@@ -0,0 +1,224 @@
+#!/bin/sh /etc/rc.common
+
+# Copyright (C) 2013 Qualcomm Innovation Center, Inc.
+#
+#Licensed under the Apache License, Version 2.0 (the License);
+#you may not use this file except in compliance with the License.
+#You may obtain a copy of the License at
+#
+#http://www.apache.org/licenses/LICENSE-2.0
+#
+#Unless required by applicable law or agreed to in writing, software
+#distributed under the License is distributed on an AS IS BASIS,
+#WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#See the License for the specific language governing permissions and
+#limitations under the License.
+#
+
+START=65
+
+SERVICE_PID_FILE=/var/run/alljoyn.pid
+
+CONFIGFILE=/var/etc/alljoyn.conf
+
+
+check() {
+local flag
+
+config_get_bool flag $1 $2 0
+
+test $flag == 1
+return $?
+}
+
+
+process_network() {
+local network=$1
+local var=$2
+local ifname
+
+config_get ifname $network ifname
+if [ -n $ifname ]; then
+ append ${var} ${ifname} ,
+fi
+}
+
+process_networks() {
+local section=$1
+
+if check $section all_networks; then
+ export ${section}_networks=*
+else
+ config_list_foreach $section networks process_network
${section}_networks
+
+ if [ $section == ip ]; then
+ # special case IP until multiple interfaces are properly supported
for IP
+ local len
+ config_get len ip networks_LENGTH
+
+ if [ $len == 1 ]; then
+ local network
+ config_get network ip networks_ITEM1
+ config_get addr $network ipaddr
+ fi
+ fi
+fi
+}
+
+
+process_unix_transport() {
+if check unix enable; then
+ local path
+ local abstract
+
+
+ config_get path unix path alljoyn
+ config_get_bool abstract unix abstract 1
+
+ if [ -n $abstract ]; then
+ path=abstract=$path
+ else
+ path=path=$path
+ fi
+ export ${NO_EXPORT:+-n} listen_specs=${listen_specs}
+ listenunix:${path}/listen
+
+ config_get unix_auth_timeout unix auth_timeout $unix_auth_timeout
+fi
+}
+
+
+process_ip_transport() {
+if check ip enable; then
+ local port
+ local addr=0.0.0.0
+
+ if check ip advertise_daemon; then
+ export ${NO_EXPORT:+-n} ip_advertise_daemon=tcp
+property router_advertisement_prefix=\org.alljoyn.BusNode.\/
+ /tcp
+ fi
+
+ process_networks ip
+
+ config_get port ip bus_port 9955
+
+ export ${NO_EXPORT:+-n} listen_specs=${listen_specs}
+ listentcp:addr=${addr},port=${port}/listen
+
+ config_get ip_max_incomplete_conn ip max_incomplete_conn
$ip_max_incomplete_conn
+
[OpenWrt-Devel] fwknop package update
The following patch updates fwknop to the newest release, v 2.5. I`m not familiar with the standard procedures for package updates after the official release. If possible, it would be great to update the package in 12.09 as well. Signed-off-by: Jonathan Bennett jbscienc...@gmail.com diff --git a/net/fwknop/Makefile b/net/fwknop/Makefile index 24d7385..80575a8 100644 --- a/net/fwknop/Makefile +++ b/net/fwknop/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fwknop -PKG_VERSION:=2.0 +PKG_VERSION:=2.5 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://www.cipherdyne.org/fwknop/download -PKG_MD5SUM:=96de4c5a4ae75a8618ef80269c6a70ad +PKG_MD5SUM:=b9f28aba92c959946e540a822a623964 PKG_INSTALL:=1 diff --git a/net/fwknop/patches/001-fix_config.patch b/net/fwknop/patches/001-fix_config.patch index 5ae4a94..93a261f 100644 --- a/net/fwknop/patches/001-fix_config.patch +++ b/net/fwknop/patches/001-fix_config.patch @@ -1,20 +1,20 @@ a/server/fwknopd.conf -+++ b/server/fwknopd.conf -@@ -29,7 +29,12 @@ - # Define the ethernet interface on which we will sniff packets. - # Default if not set is eth0. +--- a/server/fwknopd.conf.inst b/server/fwknopd.conf.inst +@@ -37,7 +37,12 @@ + # Default if not set is eth0. The '-i intf' command line option overrides + # the PCAP_INTF setting. # -#PCAP_INTF eth0; -+ +# The following line is changed specifically for Openwrt. +# Openwrt defaults to using eth1 as its wan port. If using PPPoE, +# Then this needs to be set to pppoe-wan. + +PCAP_INTF eth1; ++ # By default fwknopd does not put the pcap interface into promiscuous mode. # Set this to 'Y' to enable promiscuous sniffing. -@@ -252,8 +257,13 @@ +@@ -279,8 +284,13 @@ # The IPT_FORWARD_ACCESS variable is only used if ENABLE_IPT_FORWARDING is # enabled. # ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] Basic support for the AsiaRF RT5350 based AWM002 module and evaluation board.
So have we made a decision on how to structure this? It doesn't really matter to me, I will go along with anything we pick. On Tue, Jul 23, 2013 at 12:15 PM, Abdennaby Ayyari lix...@gmail.com wrote: Hi. The flash is in the moule. Here is the patch for AWM002 https://github.com/ayyaris/ayyar Ayyari Il giorno 23/lug/2013, alle ore 06:01, John Crispin j...@phrozen.org ha scritto: On 23/07/13 02:10, jonsm...@gmail.com wrote: I'm happy with whatever we pick, it isn't hard to edit them. How about this... AWM002.dtsi -- the module (with m25p80 flash specified) AWM002-EVB.dtsi -- the baseboard AWM002-EVB-4M.dts -- these include the first two and add the specific flash flash chip AWM002-EVB-8M.dts Where do the partitions go? The dts files? is the flash on the module or on the carrier board ? ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel -- Jon Smirl jonsm...@gmail.com ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] Initial support for AirLive AIR3GII
On Thu, 2012-11-22 at 15:08 +0100, Cezary Jackiewicz wrote: AirLive AIR3GII is Ralink RT5350F based device with 100Mbps switch, USB port, 4MB flash and 32MB ram. Works: ethernet (LAN WAN), wps button, led, USB, sysupgrade Does not work: wifi (chip RT5350), reset button [ 13.39] phy0 - rt2800_init_eeprom: Error - Invalid RT chipset 0x5350 detected. [ 13.40] phy0 - rt2x00lib_probe_dev: Error - Failed to allocate device. Other problem: LAN leds is reverse (lights when not cable connected and vice versa) I saw TL-MR3020 on this page, so I ordered it: http://www.rakuten.com/pr/product.aspx?sku=245965249 That turned out to be a misnomer. It's actually this device: http://www.newegg.com/Product/Product.aspx?Item=9SIA0U00H07470 Functionally, the hardware seems similar to the Air3GII, but I would like confirmation from someone who has one of those. This device has a red LED, a green LED, and a blue LED. When running an OpenWrt build for Air3GII, airlive:green:mobile (GPIO 9) is the blue LED and rt2800pci-phy0::radio is the red LED. The green one comes on when Ethernet is unplugged, and off when plugged back in. I can find no programmatic way to control it. The reset button is GPIO 10. GPIO's 7 and 8 do not appear to have any function. There is a toggle switch labeled 3G and DHCP on the outside, but I have so far not found a way to detect its position programmatically. It has no other buttons, LED's, or switches. Can you please build current trunk for your device and tell me how it differs? Thanks. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
