Re: [OpenWrt-Devel] [PATCH 2/5] netifd: Link layer state awareness support on device level

2014-02-18 Thread Hans Dedecker
Hi Felix,

Regarding the resubmitted netifd linksensing patches (which solve the
original issue reported in
https://dev.openwrt.org/ticket/14590) did you have some time to review them
?
I noticed two other netifd patches were applied from the same patch series
but none of the linksensing and bridge mtu patches.

Thx,
Hans

On Tue, Feb 11, 2014 at 10:30 AM, Hans Dedecker  wrote:

> Device layer is informed by netlink events regarding the link layer
> status. Link
> layer status change results in a DEV_EVENT_LINK_UP/DEV_EVENT_LINK_DOWN
> broadcast
> event for a given device.
>
> Depends on uloop error callback patch.
>
> Solves issue reported in https://dev.openwrt.org/ticket/14590
>
> Signed-off-by: Hans Dedecker 
> Acked-by: Karl Vogel 
> ---
>  device.c   |   29 ++-
>  device.h   |4 ++
>  system-linux.c |  154
> +++
>  3 files changed, 162 insertions(+), 25 deletions(-)
>
> diff --git a/device.c b/device.c
> index feeb290..6a770ac 100644
> --- a/device.c
> +++ b/device.c
> @@ -211,7 +211,7 @@ int device_claim(struct device_user *dep)
> return 0;
>
> dep->claimed = true;
> -   D(DEVICE, "Claim %s %s, new refcount: %d\n", dev->type->name,
> dev->ifname, dev->active + 1);
> +   D(DEVICE, "Claim %s %s, new active count: %d\n", dev->type->name,
> dev->ifname, dev->active + 1);
> if (++dev->active != 1)
> return 0;
>
> @@ -237,7 +237,7 @@ void device_release(struct device_user *dep)
>
> dep->claimed = false;
> dev->active--;
> -   D(DEVICE, "Release %s %s, new refcount: %d\n", dev->type->name,
> dev->ifname, dev->active);
> +   D(DEVICE, "Release %s %s, new active count: %d\n",
> dev->type->name, dev->ifname, dev->active);
> assert(dev->active >= 0);
>
> if (dev->active)
> @@ -394,6 +394,26 @@ void device_set_present(struct device *dev, bool
> state)
> device_refresh_present(dev);
>  }
>
> +void device_set_link(struct device *dev, bool state)
> +{
> +   if (dev->link_active == state)
> +   return;
> +
> +   netifd_log_message(L_NOTICE, "%s '%s' link is %s\n",
> dev->type->name, dev->ifname, state ? "up" : "down" );
> +
> +   dev->link_active = state;
> +   device_broadcast_event(dev, state ? DEV_EVENT_LINK_UP :
> DEV_EVENT_LINK_DOWN);
> +}
> +
> +void device_set_ifindex(struct device *dev, int ifindex)
> +{
> +   if (dev->ifindex == ifindex)
> +   return;
> +
> +   dev->ifindex = ifindex;
> +   device_broadcast_event(dev, DEV_EVENT_UPDATE_IFINDEX);
> +}
> +
>  static int device_refcount(struct device *dev)
>  {
> struct list_head *list;
> @@ -435,6 +455,9 @@ void device_add_user(struct device_user *dep, struct
> device *dev)
> dep->cb(dep, DEV_EVENT_ADD);
> if (dev->active)
> dep->cb(dep, DEV_EVENT_UP);
> +
> +   if (dev->link_active)
> +   dep->cb(dep, DEV_EVENT_LINK_UP);
> }
>  }
>
> @@ -667,6 +690,8 @@ device_dump_status(struct blob_buf *b, struct device
> *dev)
> return;
>
> blobmsg_add_u8(b, "up", !!dev->active);
> +   blobmsg_add_u8(b, "carrier", !!dev->link_active);
> +
> if (dev->type->dump_info)
> dev->type->dump_info(dev, b);
> else
> diff --git a/device.h b/device.h
> index d63ffe3..dd57927 100644
> --- a/device.h
> +++ b/device.h
> @@ -68,6 +68,7 @@ enum device_event {
> DEV_EVENT_REMOVE,
>
> DEV_EVENT_UPDATE_IFNAME,
> +   DEV_EVENT_UPDATE_IFINDEX,
>
> DEV_EVENT_SETUP,
> DEV_EVENT_TEARDOWN,
> @@ -122,6 +123,7 @@ struct device {
> bool sys_present;
> bool present;
> int active;
> +   bool link_active;
>
> bool external;
> bool disabled;
> @@ -178,6 +180,8 @@ void device_remove_user(struct device_user *dep);
>  void device_broadcast_event(struct device *dev, enum device_event ev);
>
>  void device_set_present(struct device *dev, bool state);
> +void device_set_link(struct device *dev, bool state);
> +void device_set_ifindex(struct device *dev, int ifindex);
>  void device_refresh_present(struct device *dev);
>  int device_claim(struct device_user *dep);
>  void device_release(struct device_user *dep);
> diff --git a/system-linux.c b/system-linux.c
> index e1b9924..f0cea34 100644
> --- a/system-linux.c
> +++ b/system-linux.c
> @@ -58,7 +58,7 @@
>  struct event_socket {
> struct uloop_fd uloop;
> struct nl_sock *sock;
> -   struct nl_cb *cb;
> +   int bufsize;
>  };
>
>  static int sock_ioctl = -1;
> @@ -73,7 +73,38 @@ static void
>  handler_nl_event(struct uloop_fd *u, unsigned int events)
>  {
> struct event_socket *ev = container_of(u, struct event_socket,
> uloop);
> -   nl_recvmsgs(ev->sock, ev->cb);
> +   int err;
> +   socklen_t errlen = sizeof(err);
> +
> +   if (!u->error) {
> +  

Re: [OpenWrt-Devel] [PATCHv2] dropbear: update to 2013.62

2014-02-18 Thread Catalin Patulea
Can I get another round of review on this?

On Sat, Feb 15, 2014 at 9:08 PM, Catalin Patulea  wrote:
> Upstream changelog:
> https://matt.ucc.asn.au/dropbear/CHANGES
>
> This adds elliptic curve cryptography (ECC) support as an option, disabled
> by default.
>
> dropbear mips 34kc uClibc binary size:
> before: 161,672 bytes
> after, without ECC (default): 164,968
> after, with ECC: 198,008
>
> Signed-off-by: Catalin Patulea 
> ---
>  package/network/services/dropbear/Config.in|   27 
> 
>  package/network/services/dropbear/Makefile |   24 +++--
>  .../dropbear/patches/100-pubkey_path.patch |4 +--
>  .../dropbear/patches/110-change_user.patch |2 +-
>  .../dropbear/patches/120-openwrt_options.patch |   21 +--
>  .../dropbear/patches/140-disable_assert.patch  |2 +-
>  .../patches/150-dbconvert_standalone.patch |6 ++---
>  .../dropbear/patches/200-lcrypt_bsdfix.patch   |8 +++---
>  .../dropbear/patches/500-set-default-path.patch|2 +-
>  9 files changed, 67 insertions(+), 29 deletions(-)
>  create mode 100644 package/network/services/dropbear/Config.in
>
> diff --git a/package/network/services/dropbear/Config.in 
> b/package/network/services/dropbear/Config.in
> new file mode 100644
> index 000..e2a7610
> --- /dev/null
> +++ b/package/network/services/dropbear/Config.in
> @@ -0,0 +1,27 @@
> +menu "Configuration"
> +   depends on PACKAGE_dropbear
> +
> +config DROPBEAR_ECC
> +   bool "Elliptic curve cryptography (ECC)"
> +   default n
> +   help
> +   Enables elliptic curve cryptography (ECC) support in key 
> exchange and public key
> +   authentication.
> +
> +   Key exchange algorithms:
> + ecdh-sha2-nistp256
> + ecdh-sha2-nistp384
> + ecdh-sha2-nistp521
> + curve25519-sha...@libssh.org
> +
> +   Public key algorithms:
> + ecdsa-sha2-nistp256
> + ecdsa-sha2-nistp384
> + ecdsa-sha2-nistp521
> +
> +   Does not generate ECC host keys by default (ECC key exchange 
> will not be used,
> +   only ECC public key auth).
> +
> +   Increases binary size by about 36 kB (MIPS).
> +
> +endmenu
> diff --git a/package/network/services/dropbear/Makefile 
> b/package/network/services/dropbear/Makefile
> index 02be761..c7d0a96 100644
> --- a/package/network/services/dropbear/Makefile
> +++ b/package/network/services/dropbear/Makefile
> @@ -8,26 +8,32 @@
>  include $(TOPDIR)/rules.mk
>
>  PKG_NAME:=dropbear
> -PKG_VERSION:=2013.59
> +PKG_VERSION:=2013.62
>  PKG_RELEASE:=1
>
>  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
>  PKG_SOURCE_URL:= \
> http://matt.ucc.asn.au/dropbear/releases/ \
> https://dropbear.nl/mirror/releases/
> -PKG_MD5SUM:=6c1e6c2c297f4034488ffc95e8b7e6e9
> +PKG_MD5SUM:=ca2c7932a1399cf361f795aaa3843998
>
>  PKG_LICENSE:=MIT
>  PKG_LICENSE_FILES:=LICENSE libtomcrypt/LICENSE libtommath/LICENSE
>
>  PKG_BUILD_PARALLEL:=1
>
> +PKG_CONFIG_DEPENDS:=CONFIG_DROPBEAR_ECC
> +
>  include $(INCLUDE_DIR)/package.mk
>
>  define Package/dropbear/Default
>URL:=http://matt.ucc.asn.au/dropbear/
>  endef
>
> +define Package/dropbear/config
> +   source "$(SOURCE)/Config.in"
> +endef
> +
>  define Package/dropbear
>$(call Package/dropbear/Default)
>SECTION:=net
> @@ -72,6 +78,20 @@ CONFIGURE_ARGS += \
>  TARGET_CFLAGS += -DARGTYPE=3 -ffunction-sections -fdata-sections
>  TARGET_LDFLAGS += -Wl,--gc-sections
>
> +define Build/Prepare
> +   $(call Build/Prepare/Default)
> +   # Enforce that all replacements are made, otherwise options.h has 
> changed
> +   # format and this logic is broken.
> +   for OPTION in DROPBEAR_ECDSA DROPBEAR_ECDH DROPBEAR_CURVE25519; do \
> + awk 'BEGIN { rc = 1 } \
> +  /'OPTION'/ { 0 = "$(if $(CONFIG_DROPBEAR_ECC),,// 
> )#define 'OPTION'"; rc = 0 } \
> +  { print } \
> +  END { exit(rc) }' $(PKG_BUILD_DIR)/options.h \
> +  >$(PKG_BUILD_DIR)/options.h.new && \
> + mv $(PKG_BUILD_DIR)/options.h.new $(PKG_BUILD_DIR)/options.h || 
> exit 1; \
> +   done
> +endef
> +
>  define Build/Compile
> +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
> $(TARGET_CONFIGURE_OPTS) \
> diff --git a/package/network/services/dropbear/patches/100-pubkey_path.patch 
> b/package/network/services/dropbear/patches/100-pubkey_path.patch
> index c1802f5..456874b 100644
> --- a/package/network/services/dropbear/patches/100-pubkey_path.patch
> +++ b/package/network/services/dropbear/patches/100-pubkey_path.patch
> @@ -1,6 +1,6 @@
>  --- a/svr-authpubkey.c
>  +++ b/svr-authpubkey.c
> -@@ -209,17 +209,21 @@ static int checkpubkey(unsigned char* al
> +@@ -208,17 +208,21 @@ static int checkpubkey(unsigned char* al
> goto out;
> }
>
> @

Re: [OpenWrt-Devel] [PATCH] [packages] sslh: Bump to v1.15

2014-02-18 Thread Jonathan McCrohan
On 14/01/14 00:14, Jonathan McCrohan wrote:
> Any chance that I could get an ACK or NAK to this trivial version bump
> patch [1]?

Ping?

Jon

> [1] http://patchwork.openwrt.org/patch/4206/
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


Re: [OpenWrt-Devel] [RFC] menuconfig policy?

2014-02-18 Thread Russell Senior
> "etienne" == etienne champetier  writes:

Russell> The question becomes: Is this acceptable for OpenWrt?  If
Russell> not, is there a better way?

Russell> I understand there is a convention that the userspace parts
Russell> depend on the kernel parts, so that the kernel parts are
Russell> auto-selected upon selecting the user-space parts, e.g. in
Russell> iptables and ppp.  And, we are happy to do that here.
Russell> However, in the batman-adv case, people who want it are going
Russell> to go looking in the Kernel section and not in the Network
Russell> section and might not even think to look for batctl unless it
Russell> is grouped together as it is now.  Thoughts?

etienne> Why not simply put a comment about batctl in kmod-batman-adv
etienne> ?

That's possible.  But it still means a substantial change in behavior
for users.  Previously, selecting kmod-batman-adv alone gave you
batctl (similar to the userspace parts of madwifi, iirc).  I'm afraid
users are going to miss batctl unless there is some stronger linkage.


-- 
Russell Senior, President
russ...@personaltelco.net
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


Re: [OpenWrt-Devel] [RFC] menuconfig policy?

2014-02-18 Thread etienne . champetier
Hi

- Mail original -
> De: "Russell Senior" 
> À: "OpenWrt Development List" 
> Envoyé: Mardi 18 Février 2014 18:27:23
> Objet: [OpenWrt-Devel] [RFC] menuconfig policy?
> 
> 
> I am working with the batman-adv people to split the feeds/routing
> batman-adv package into separate kmod and user-space parts.  There is
> a user-space utility (not strictly required) called batctl that is
> currently included in the batman-adv Makefile.  The current Makefile
> provides an option to also build batctl (defaults on, but can be
> disabled), and then includes (or not) the batctl binary in the
> batman-adv package.  Batctl source is distributed in a separate
> tarball, and the Makefile does various contortions to build them in
> separate subdirectories of the $PKG_BUILD_DIR.
> 
> In splitting the two parts into separate packages, a problem arises
> insofar as how to "default on" the batctl package when selecting
> kmod-batman-adv?  What I suggested is to modify the existing
> Config.in
> to point at PACKAGE_batctl instead of KMOD_BATMAN_ADV_BATCTL (see
> patch fragment befow).  This results in an option for an associated
> userspace tool, batctl, appearing in the Kernel section of the
> Makefile, in addition to the Network section.  Selection/deselection
> appears to be coherent between the two sections (shows the same state
> in both places).
> 
> diff --git a/batman-adv/Config.in b/batman-adv/Config.in
> index 1330525..aeefd35 100644
> --- a/batman-adv/Config.in
> +++ b/batman-adv/Config.in
> @@ -19,11 +19,12 @@ config KMOD_BATMAN_ADV_NC
> depends on PACKAGE_kmod-batman-adv
> default n
>  
> -config KMOD_BATMAN_ADV_BATCTL
> -   bool "enable batctl"
> +config PACKAGE_batctl
> +   tristate "enable batctl"
> depends on PACKAGE_kmod-batman-adv
> default y
> help
>   batctl is a more intuitive managment utility for
>   B.A.T.M.A.N.-Advanced.
>   It is an easier method for configuring batman-adv and
>   provides some additional tools for debugging as well.
> +
> 
> The question becomes: Is this acceptable for OpenWrt?  If not, is
> there a better way?
> 
> I understand there is a convention that the userspace parts depend on
> the kernel parts, so that the kernel parts are auto-selected upon
> selecting the user-space parts, e.g. in iptables and ppp.  And, we
> are
> happy to do that here.  However, in the batman-adv case, people who
> want it are going to go looking in the Kernel section and not in the
> Network section and might not even think to look for batctl unless it
> is grouped together as it is now.  Thoughts?
>

Why not simply put a comment about batctl in kmod-batman-adv ?

> Thanks!
> 
> 
> --
> Russell Senior, President
> russ...@personaltelco.net
> ___
> 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] [RFC] menuconfig policy?

2014-02-18 Thread Russell Senior

I am working with the batman-adv people to split the feeds/routing
batman-adv package into separate kmod and user-space parts.  There is
a user-space utility (not strictly required) called batctl that is
currently included in the batman-adv Makefile.  The current Makefile
provides an option to also build batctl (defaults on, but can be
disabled), and then includes (or not) the batctl binary in the
batman-adv package.  Batctl source is distributed in a separate
tarball, and the Makefile does various contortions to build them in
separate subdirectories of the $PKG_BUILD_DIR.

In splitting the two parts into separate packages, a problem arises
insofar as how to "default on" the batctl package when selecting
kmod-batman-adv?  What I suggested is to modify the existing Config.in
to point at PACKAGE_batctl instead of KMOD_BATMAN_ADV_BATCTL (see
patch fragment befow).  This results in an option for an associated
userspace tool, batctl, appearing in the Kernel section of the
Makefile, in addition to the Network section.  Selection/deselection
appears to be coherent between the two sections (shows the same state
in both places).

diff --git a/batman-adv/Config.in b/batman-adv/Config.in
index 1330525..aeefd35 100644
--- a/batman-adv/Config.in
+++ b/batman-adv/Config.in
@@ -19,11 +19,12 @@ config KMOD_BATMAN_ADV_NC
depends on PACKAGE_kmod-batman-adv
default n
 
-config KMOD_BATMAN_ADV_BATCTL
-   bool "enable batctl"
+config PACKAGE_batctl
+   tristate "enable batctl"
depends on PACKAGE_kmod-batman-adv
default y
help
  batctl is a more intuitive managment utility for 
B.A.T.M.A.N.-Advanced.
  It is an easier method for configuring batman-adv and
  provides some additional tools for debugging as well.
+

The question becomes: Is this acceptable for OpenWrt?  If not, is
there a better way?  

I understand there is a convention that the userspace parts depend on
the kernel parts, so that the kernel parts are auto-selected upon
selecting the user-space parts, e.g. in iptables and ppp.  And, we are
happy to do that here.  However, in the batman-adv case, people who
want it are going to go looking in the Kernel section and not in the
Network section and might not even think to look for batctl unless it
is grouped together as it is now.  Thoughts?

Thanks!


-- 
Russell Senior, President
russ...@personaltelco.net
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


[OpenWrt-Devel] [PATCH][packages]gst-plugins-base: use upstream fix for ivorbis plugin build fail

2014-02-18 Thread John Vogel
Previously, I submitted a patch "[PATCH v2][packages]gst-plugins-base: disable 
building ivorbis plugin" that disables ivorbis plugin build. Michel Stempin 
pointed out an upstream patch that fixes the issue directly in the vorbis 
decoder header. I had missed this patch in my previous searches.

This patch reverts the disabling of ivorbis and adds the upstream fix. I have 
tested this patch and it fixes the build issue. Thanks to Michel Stempin for 
bringing this to my attention and pointing me to the upstream fix.

Signed-off-by John Vogel 

--
diff --git a/multimedia/gst-plugins-base/Makefile 
b/multimedia/gst-plugins-base/Makefile
index 9951c3f..9c16586 100644
--- a/multimedia/gst-plugins-base/Makefile
+++ b/multimedia/gst-plugins-base/Makefile
@@ -86,7 +86,6 @@ CONFIGURE_ARGS += \
$(call GST_COND_SELECT,gio) \
--disable-gnome_vfs \
--disable-gst_v4l \
-   --disable-ivorbis \
--disable-libvisual \
$(call GST_COND_SELECT,ogg) \
--disable-oggtest \
diff --git 
a/multimedia/gst-plugins-base/patches/004-vorbisdec-support_modern_Tremor_versions.patch
 
b/multimedia/gst-plugins-base/patches/004-vorbisdec-support_modern_Tremor_versions.patch
new file mode 100644
index 000..be357e3
--- /dev/null
+++ 
b/multimedia/gst-plugins-base/patches/004-vorbisdec-support_modern_Tremor_versions.patch
@@ -0,0 +1,135 @@
+From 787e896bdeb6c67d13a918ec55d3826fa010fb90 Mon Sep 17 00:00:00 2001
+From: Peter Korsgaard 
+Date: Wed, 25 Jan 2012 22:53:04 +
+Subject: vorbisdec: support modern Tremor versions
+
+Tremor changed to use standard libogg rather than its own incompatible
+copy back in Aug 2010 (r17375), causing gst-plugin-base build to fail.
+
+Tremolo so far unfortunately hasn't been updated. Restructure
+vorbisdeclib.h so the int/float logic is seperate from the ogg handling,
+and only use the legacy _ogg_packet_wrapper code for Tremolo.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=668726
+---
+(limited to 'ext/vorbis/gstvorbisdeclib.h')
+
+diff --git a/ext/vorbis/gstvorbisdeclib.h b/ext/vorbis/gstvorbisdeclib.h
+index ca00af9..e147591 100644
+--- a/ext/vorbis/gstvorbisdeclib.h
 b/ext/vorbis/gstvorbisdeclib.h
+@@ -29,11 +29,6 @@
+ 
+ #ifndef TREMOR
+ 
+-#include 
+-
+-typedef float  vorbis_sample_t;
+-typedef ogg_packet ogg_packet_wrapper;
+-
+ #define GST_VORBIS_DEC_DESCRIPTION "decode raw vorbis streams to float audio"
+ 
+ #define GST_VORBIS_DEC_SRC_CAPS \
+@@ -47,6 +42,42 @@ typedef ogg_packet ogg_packet_wrapper;
+ 
+ #define GST_VORBIS_DEC_GLIB_TYPE_NAME  GstVorbisDec
+ 
++#else /* TREMOR */
++
++#define GST_VORBIS_DEC_DESCRIPTION "decode raw vorbis streams to integer 
audio"
++
++#define GST_VORBIS_DEC_SRC_CAPS \
++GST_STATIC_CAPS ("audio/x-raw-int, "   \
++"rate = (int) [ 1, MAX ], "\
++"channels = (int) [ 1, 6 ], "  \
++"endianness = (int) BYTE_ORDER, "  \
++"width = (int) { 16, 32 }, "   \
++"depth = (int) 16, "   \
++"signed = (boolean) true")
++
++#define GST_VORBIS_DEC_DEFAULT_SAMPLE_WIDTH   (16)
++
++/* we need a different type name here */
++#define GST_VORBIS_DEC_GLIB_TYPE_NAME  GstIVorbisDec
++
++/* and still have it compile */
++typedef struct _GstVorbisDec   GstIVorbisDec;
++typedef struct _GstVorbisDecClass  GstIVorbisDecClass;
++
++#endif /* TREMOR */
++
++#ifndef USE_TREMOLO
++
++#ifdef TREMOR
++ #include 
++ typedef ogg_int32_tvorbis_sample_t;
++#else
++ #include 
++ typedef float  vorbis_sample_t;
++#endif
++
++typedef ogg_packet ogg_packet_wrapper;
++
+ static inline guint8 *
+ gst_ogg_packet_data (ogg_packet * p)
+ {
+@@ -72,17 +103,11 @@ gst_ogg_packet_from_wrapper (ogg_packet_wrapper * packet)
+   return packet;
+ }
+ 
+-#else
+-
+-#ifdef USE_TREMOLO
+-  #include 
+-  #include 
+-  typedef ogg_int16_tvorbis_sample_t;
+-#else
+-  #include 
+-  typedef ogg_int32_tvorbis_sample_t;
+-#endif
++#else /* USE_TREMOLO */
+ 
++#include 
++#include 
++typedef ogg_int16_tvorbis_sample_t;
+ typedef struct _ogg_packet_wrapper ogg_packet_wrapper;
+ 
+ struct _ogg_packet_wrapper {
+@@ -91,26 +116,6 @@ struct _ogg_packet_wrapper {
+   ogg_buffer  buf;
+ };
+ 
+-#define GST_VORBIS_DEC_DESCRIPTION "decode raw vorbis streams to integer 
audio"
+-
+-#define GST_VORBIS_DEC_SRC_CAPS \
+-GST_STATIC_CAPS ("audio/x-raw-int, "   \
+-"rate = (int) [ 1, MAX ], "\
+-"channels = (int) [ 1, 6 ], "  \
+-"endianness = (int) BYTE_ORDER, "  \
+-"width = (int) { 16, 32 }, "   \
+-"depth = (int) 16, "   \
+-"signed = (boolean) true")
+-
+-#define GST_VORBIS_DEC_DEFAULT_SAMPLE_WIDTH   (16)
+-
+-/* we need a different type name here */
+-#define GST_VORBIS_DEC_GLIB_TYPE_NAME

[OpenWrt-Devel] [PATCH] Fix unaligned access hacks for tcp timestamps

2014-02-18 Thread Dave Täht
From: Dave Taht 

This missing bit of the hack saves hugely on instruction traps
on tcp connections to ar71xx based routers.
---
 .../patches-3.10/902-unaligned_access_hacks.patch  |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/target/linux/ar71xx/patches-3.10/902-unaligned_access_hacks.patch 
b/target/linux/ar71xx/patches-3.10/902-unaligned_access_hacks.patch
index a0b5824..4144d45 100644
--- a/target/linux/ar71xx/patches-3.10/902-unaligned_access_hacks.patch
+++ b/target/linux/ar71xx/patches-3.10/902-unaligned_access_hacks.patch
@@ -884,9 +884,11 @@
options++;
} else
tpi->seq = 0;
+diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
+index e15d330..c6496eb 100644
 --- a/net/ipv4/tcp_input.c
 +++ b/net/ipv4/tcp_input.c
-@@ -3625,14 +3625,16 @@ static bool tcp_parse_aligned_timestamp(
+@@ -3625,14 +3625,16 @@ static bool tcp_parse_aligned_timestamp(struct 
tcp_sock *tp, const struct tcphdr
  {
const __be32 *ptr = (const __be32 *)(th + 1);
  
@@ -900,8 +902,9 @@
 -  tp->rx_opt.rcv_tsval = ntohl(*ptr);
 +  tp->rx_opt.rcv_tsval = get_unaligned_be32(ptr);
++ptr;
-   if (*ptr)
+-  if (*ptr)
 -  tp->rx_opt.rcv_tsecr = ntohl(*ptr) - tp->tsoffset;
++  if (net_hdr_word(ptr))
 +  tp->rx_opt.rcv_tsecr = get_unaligned_be32(ptr) -
 + tp->tsoffset;
else
-- 
1.7.9.5
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


Re: [OpenWrt-Devel] How to use ethernet port as lan or wan port in WR703N

2014-02-18 Thread bjzhougong
Hi All
Thanks for your response!
My question is not how to enable eth1 port. I want to know how it configure one 
port to lan or wan port in WR703N.
Now I think it use bridge, and i will study to get more information about 
bridge in WR703N




bjzhougong

From: Aleksandr Kolesnik
Date: 2014-02-18 21:26
To: bjzhougong; OpenWrt Development List
Subject: Re: [OpenWrt-Devel] How to use ethernet port as lan or wan port in 
WR703N
you need to build own image where enable eth1 port. eth1 connected to internal 
switch. Read topics https://forum.openwrt.org/viewtopic.php?id=48907 and 
https://forum.openwrt.org/viewtopic.php?id=48892



2014-02-18 15:04 GMT+02:00 bjzhougong :

Thanks for All

but in WR703N's network config, it doesn't has switch:
config interface 'loopback'
option ifname 'lo'
option proto 'static'
option ipaddr '127.0.0.1'
option netmask '255.0.0.0'

config interface 'lan'
#option ifname 'eth0'
option type 'bridge'
option proto 'static'
option ipaddr '192.168.22.1'
option netmask '255.255.255.0'

config interface 'wan'
option ifname 'eth0'
option proto 'dhcp'




bjzhougong

From: camden lindsay
Date: 2014-02-18 06:23
To: OpenWrt Development List
CC: bjzhougong
Subject: Re: [OpenWrt-Devel] How to use ethernet port as lan or wan port in 
WR703N
It sounds like you have to re-configure the switch, to have the port
that is currently 'wan' on the same vlan as the LAN.

see http://wiki.openwrt.org/doc/uci/network/switch

On Mon, Feb 17, 2014 at 2:04 PM, jonsm...@gmail.com  wrote:
> On Mon, Feb 17, 2014 at 4:48 PM, Hartmut Knaack  wrote:
>> jonsm...@gmail.com schrieb:
>>> The switch (esw) configuration separates the LAN and WAN ports.
>> But according to the wiki, the 703n has only one ethernet port and no switch.
>
> AR9331 has the switch on chip.
> http://www.eeboard.com/wp-content/uploads/downloads/2013/08/AR9331.pdf
>
>
>>>
>>> On Mon, Feb 17, 2014 at 4:07 PM, Hartmut Knaack  wrote:
 bjzhougong schrieb:
> Dear Sirs.
>
>>> As we know, we can configure "network.lan.interface" or 
>>> "network.wan.interface" as eth0 to use ethernet port as lan or wan port 
>>> on WR703N.
>>> I think it should need to do anything in driver for switch ethernet 
>>> port,
>>> and I want to know what happened between user space and kernel space 
>>> after we run "/etc/init.d/network restart",
>>> Thanks for any idea about this!
> If there is any help? Thanks!
 Not sure, what exactly you want to know. When running "/etc/init.d/network 
 restart", all the configured options in /etc/config/network get 
 configured. See http://wiki.openwrt.org/doc/uci/network for more 
 information about available options.
 When changing a certain network device from WAN to LAN, it is mainly about 
 switching the configuration from being DHCP master or slave, and some 
 routing configurations.
> --
> bjzhougong
>
>
>
>
> ___
> 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 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 mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

[OpenWrt-Devel] [PATCH] [packages] add new package Knot DNS 1.4.3

2014-02-18 Thread Daniel Salzman

This patch adds new packages:
- knot (Knot DNS server 1.4.3)
- knot-utils (kdig, khost, knsupdate and knsec3hash)
- knot-tests (unittests for Knot server)

Signed-off-by: Daniel Salzman 
---
diff --git a/net/knot/Makefile b/net/knot/Makefile
index e69de29..6583db1 100644
--- a/net/knot/Makefile
+++ b/net/knot/Makefile
@@ -0,0 +1,118 @@
+#
+# Copyright (C) 2014 CZ.NIC, z.s.p.o. 
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=knot
+PKG_VERSION:=1.4.3
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_URL:=https://secure.nic.cz/files/knot-dns/
+PKG_MD5SUM:=8a950ac0f2148944e25421c635727003
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_PARALLEL:=1
+PKG_FIXUP:=autoreconf
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/knot/Default
+   SECTION:=net
+   CATEGORY:=Network
+   TITLE:=Authoritative DNS server
+   URL:=https://www.knot-dns.cz
+   MAINTAINER:=daniel.salz...@nic.cz
+   SUBMENU:=IP Addresses and Names
+   DEPENDS:=+libopenssl +liburcu
+endef
+
+define Package/knot
+   $(call Package/knot/Default)
+   TITLE+= (server)
+endef
+
+define Package/knot-utils
+   $(call Package/knot/Default)
+   TITLE+= (utils)
+endef
+
+define Package/knot-tests
+   $(call Package/knot/Default)
+   TITLE+= (tests)
+endef
+
+define Package/knot/description
+   High-performance authoritative-only DNS server.
+endef
+
+define Package/knot-utils/description
+   DNS utilities: kdig, khost, knsupdate and knsec3hash.
+endef
+
+define Package/knot-tests/description
+   Unit tests for Knot DNS server.
+   Usage: cd /usr/share/knot/tests
+  ./runtests -l TESTS -b /tmp
+endef
+
+CONFIGURE_ARGS += --enable-recvmmsg=no \
+  --disable-fastparser \
+  --with-rundir=/var/run \
+  --with-storage=/etc/knot
+
+TARGET_CFLAGS += -std=gnu99 -DPSELECT_COMPAT
+
+define Build/Compile
+   $(MAKE) -C $(PKG_BUILD_DIR)
+   $(MAKE) -C $(PKG_BUILD_DIR) check-compile-only
+   $(MAKE) -C $(PKG_BUILD_DIR)/src/zscanner check-compile-only
+endef
+
+define Package/knot/install
+   $(INSTALL_DIR) $(1)/usr/sbin
+   $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/knotc $(1)/usr/sbin/
+   $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/knotd $(1)/usr/sbin/
+   $(INSTALL_DIR) $(1)/etc/knot
+   $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/knot/knot.sample.conf 
$(1)/etc/knot/knot.conf
+   $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/knot/example.com.zone 
$(1)/etc/knot/
+   $(INSTALL_DIR) $(1)/etc/init.d
+   $(INSTALL_BIN) ./files/knotd.init $(1)/etc/init.d/knotd
+endef
+
+define Package/knot-utils/install
+   $(INSTALL_DIR) $(1)/usr/bin
+   $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/kdig $(1)/usr/bin/
+   $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/khost $(1)/usr/bin/
+   $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/knsupdate $(1)/usr/bin/
+   $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/knsec3hash $(1)/usr/bin/
+endef
+
+define Package/knot-tests/install
+   $(INSTALL_DIR) $(1)/usr/share/knot/tests
+   cat $(PKG_BUILD_DIR)/tests/TESTS | while read test_name; do \
+   $(INSTALL_BIN) $(PKG_BUILD_DIR)/tests/test_name 
$(1)/usr/share/knot/tests/ ; \
+   done
+   $(INSTALL_BIN) $(PKG_BUILD_DIR)/tests/runtests 
$(1)/usr/share/knot/tests/
+   $(INSTALL_DIR) $(1)/usr/share/knot/tests/data
+   $(INSTALL_CONF) $(PKG_BUILD_DIR)/tests/TESTS $(1)/usr/share/knot/tests/
+   $(INSTALL_CONF) $(PKG_BUILD_DIR)/tests/data/sample_conf 
$(1)/usr/share/knot/tests/data/
+
+   $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/zscanner/tests/zscanner-tool 
$(1)/usr/share/knot/tests/
+   $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/zscanner/tests/zscanner.sh 
$(1)/usr/share/knot/tests/
+   $(INSTALL_DIR) $(1)/usr/share/knot/tests/tap
+   $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/zscanner/tests/tap/libtap.sh 
$(1)/usr/share/knot/tests/tap/
+   $(INSTALL_CONF) $(PKG_BUILD_DIR)/src/zscanner/tests/zscanner-TESTS 
$(1)/usr/share/knot/tests/
+   cat $(PKG_BUILD_DIR)/src/zscanner/tests/TESTS >> 
$(1)/usr/share/knot/tests/TESTS
+   cp -a $(PKG_BUILD_DIR)/src/zscanner/tests/data 
$(1)/usr/share/knot/tests/
+endef
+
+$(eval $(call BuildPackage,knot))
+$(eval $(call BuildPackage,knot-utils))
+$(eval $(call BuildPackage,knot-tests))
diff --git a/net/knot/files/knotd.init b/net/knot/files/knotd.init
index e69de29..23d3bd5 100644
--- a/net/knot/files/knotd.init
+++ b/net/knot/files/knotd.init
@@ -0,0 +1,45 @@
+#!/bin/sh /etc/rc.common
+START=70
+
+knot_bin="/usr/sbin/knotd"
+knot_ctl="/usr/sbin/knotc"
+config_file="/etc/knot/knot.conf"
+pid_file="/var/run/knot.pid"
+
+start() {
+  echo "Starting Knot DNS"
+
+  if [ -e $pid_file ]; then
+ echo "  Already running with PID `

[OpenWrt-Devel] [PATCH 2/2] Improved random number support for mips

2014-02-18 Thread Dave Täht
From: Dave Taht 

The basic mips patch (deleted here) is not the full architecture
for faster random number generation. This patchset adds better
inlining specific to mips architectures.
---
 .../307-mips-Reimplement-get_cycles.patch  |   69 -
 ...w-architectures-to-optionally-define-rand.patch |   90 +
 ...zed-support-for-get_cycles-and-random_get.patch |  102 
 ...-mainline-linux-doesnt-have-prid_imp_mask.patch |   28 ++
 4 files changed, 220 insertions(+), 69 deletions(-)
 delete mode 100644 
target/linux/generic/patches-3.10/307-mips-Reimplement-get_cycles.patch
 create mode 100644 
target/linux/generic/patches-3.10/350-random-allow-architectures-to-optionally-define-rand.patch
 create mode 100644 
target/linux/generic/patches-3.10/351-MIPS-optimized-support-for-get_cycles-and-random_get.patch
 create mode 100644 
target/linux/generic/patches-3.10/352-mips-mainline-linux-doesnt-have-prid_imp_mask.patch

diff --git 
a/target/linux/generic/patches-3.10/307-mips-Reimplement-get_cycles.patch 
b/target/linux/generic/patches-3.10/307-mips-Reimplement-get_cycles.patch
deleted file mode 100644
index 6a8f5b1..000
--- a/target/linux/generic/patches-3.10/307-mips-Reimplement-get_cycles.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 9c9b415c50bc298ac61412dff856eae2f54889ee Mon Sep 17 00:00:00 2001
-From: Ralf Baechle 
-Date: Thu, 12 Sep 2013 13:47:32 +0200
-Subject: [PATCH] MIPS: Reimplement get_cycles().
-
-This essentially reverts commit efb9ca08b5a2374b29938cdcab417ce4feb14b54
-(kernel.org) / 58020a106879a8b372068741c81f0015c9b0b96dbv [[MIPS] Change
-get_cycles to always return 0.]
-
-Most users of get_cycles() invoke it as a timing interface.  That's why
-in modern kernels it was never very much missed for.  /dev/random however
-uses get_cycles() in the how the jitter in the interrupt timing contains
-some useful entropy.
-
-Signed-off-by: Ralf Baechle 

- arch/mips/include/asm/timex.h |   33 -
- 1 file changed, 32 insertions(+), 1 deletion(-)
-
 a/arch/mips/include/asm/timex.h
-+++ b/arch/mips/include/asm/timex.h
-@@ -10,6 +10,7 @@
- 
- #ifdef __KERNEL__
- 
-+#include 
- #include 
- 
- /*
-@@ -33,9 +34,38 @@
- 
- typedef unsigned int cycles_t;
- 
-+/*
-+ * On R4000/R4400 before version 5.0 an erratum exists such that if the
-+ * cycle counter is read in the exact moment that it is matching the
-+ * compare register, no interrupt will be generated.
-+ *
-+ * There is a suggested workaround and also the erratum can't strike if
-+ * the compare interrupt isn't being used as the clock source device.
-+ * However for now the implementaton of this function doesn't get these
-+ * fine details right.
-+ */
- static inline cycles_t get_cycles(void)
- {
--  return 0;
-+  switch (cpu_data[0].cputype) {
-+  case CPU_R4400PC:
-+  case CPU_R4400SC:
-+  case CPU_R4400MC:
-+  if ((read_c0_prid() & 0xff) >= 0x0050)
-+  return read_c0_count();
-+  break;
-+
-+case CPU_R4000PC:
-+case CPU_R4000SC:
-+case CPU_R4000MC:
-+  break;
-+
-+  default:
-+  if (cpu_has_counter)
-+  return read_c0_count();
-+  break;
-+  }
-+
-+  return 0;   /* no usable counter */
- }
- 
- #endif /* __KERNEL__ */
diff --git 
a/target/linux/generic/patches-3.10/350-random-allow-architectures-to-optionally-define-rand.patch
 
b/target/linux/generic/patches-3.10/350-random-allow-architectures-to-optionally-define-rand.patch
new file mode 100644
index 000..c2d2e1c
--- /dev/null
+++ 
b/target/linux/generic/patches-3.10/350-random-allow-architectures-to-optionally-define-rand.patch
@@ -0,0 +1,90 @@
+From e4e35c9ea9893df758bb24a0027f018a5427e39d Mon Sep 17 00:00:00 2001
+From: Theodore Ts'o 
+Date: Sat, 21 Sep 2013 13:58:22 -0400
+Subject: [PATCH 1/2] random: allow architectures to optionally define
+ random_get_entropy()
+
+Allow architectures which have a disabled get_cycles() function to
+provide a random_get_entropy() function which provides a fine-grained,
+rapidly changing counter that can be used by the /dev/random driver.
+
+For example, an architecture might have a rapidly changing register
+used to control random TLB cache eviction, or DRAM refresh that
+doesn't meet the requirements of get_cycles(), but which is good
+enough for the needs of the random driver.
+
+Signed-off-by: "Theodore Ts'o" 
+Cc: sta...@vger.kernel.org
+---
+ drivers/char/random.c |8 
+ include/linux/timex.h |   14 ++
+ 2 files changed, 18 insertions(+), 4 deletions(-)
+
+diff --git a/drivers/char/random.c b/drivers/char/random.c
+index 81eefa1..5c4626a 100644
+--- a/drivers/char/random.c
 b/drivers/char/random.c
+@@ -643,7 +643,7 @@ struct timer_rand_state {
+  */
+ void add_device_randomness(const void *buf, unsigned int size)
+ {
+-  unsigned long time = get_cycles() ^ jiffies;
++  u

[OpenWrt-Devel] [PATCH 1/2] Improve fq_codel hashing for 6in4 6to4 801.ad and IPIP cases

2014-02-18 Thread Dave Täht
From: Dave Taht 

This is a backport of code to improve the quality of fq_codel
hashing for 3.10 for some encapsulated protocols.

Not needed in 3.11 and later.
---
 .../686-flow_dissector-clean-up-IPIP-case.patch|   30 
 ...ow_dissector-add-support-for-IPPROTO_IPV6.patch |   30 
 ...88-net-flow_dissector-add-802.1ad-support.patch |   29 +++
 3 files changed, 89 insertions(+)
 create mode 100644 
target/linux/generic/patches-3.10/686-flow_dissector-clean-up-IPIP-case.patch
 create mode 100644 
target/linux/generic/patches-3.10/687-flow_dissector-add-support-for-IPPROTO_IPV6.patch
 create mode 100644 
target/linux/generic/patches-3.10/688-net-flow_dissector-add-802.1ad-support.patch

diff --git 
a/target/linux/generic/patches-3.10/686-flow_dissector-clean-up-IPIP-case.patch 
b/target/linux/generic/patches-3.10/686-flow_dissector-clean-up-IPIP-case.patch
new file mode 100644
index 000..151c148
--- /dev/null
+++ 
b/target/linux/generic/patches-3.10/686-flow_dissector-clean-up-IPIP-case.patch
@@ -0,0 +1,30 @@
+From de03a7f8eddba389668e3c35d4a31d985d29778f Mon Sep 17 00:00:00 2001
+From: Tom Herbert 
+Date: Mon, 29 Jul 2013 11:07:36 -0700
+Subject: [PATCH 3/5] flow_dissector: clean up IPIP case
+
+Explicitly set proto to ETH_P_IP and jump directly to ip processing.
+
+Signed-off-by: Tom Herbert 
+Signed-off-by: David S. Miller 
+---
+ net/core/flow_dissector.c |3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c
+index 00ee068..3259446 100644
+--- a/net/core/flow_dissector.c
 b/net/core/flow_dissector.c
+@@ -139,7 +139,8 @@ ipv6:
+   break;
+   }
+   case IPPROTO_IPIP:
+-  goto again;
++  proto = htons(ETH_P_IP);
++  goto ip;
+   default:
+   break;
+   }
+-- 
+1.7.9.5
+
diff --git 
a/target/linux/generic/patches-3.10/687-flow_dissector-add-support-for-IPPROTO_IPV6.patch
 
b/target/linux/generic/patches-3.10/687-flow_dissector-add-support-for-IPPROTO_IPV6.patch
new file mode 100644
index 000..2f8ab3e
--- /dev/null
+++ 
b/target/linux/generic/patches-3.10/687-flow_dissector-add-support-for-IPPROTO_IPV6.patch
@@ -0,0 +1,30 @@
+From 9c60237cd842c337539b1d72582b8cc410aeb3a6 Mon Sep 17 00:00:00 2001
+From: Tom Herbert 
+Date: Mon, 29 Jul 2013 11:07:42 -0700
+Subject: [PATCH 4/5] flow_dissector: add support for IPPROTO_IPV6
+
+Support IPPROTO_IPV6 similar to IPPROTO_IPIP
+
+Signed-off-by: Tom Herbert 
+Signed-off-by: David S. Miller 
+---
+ net/core/flow_dissector.c |3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c
+index 3259446..ade9ff1 100644
+--- a/net/core/flow_dissector.c
 b/net/core/flow_dissector.c
+@@ -141,6 +141,9 @@ ipv6:
+   case IPPROTO_IPIP:
+   proto = htons(ETH_P_IP);
+   goto ip;
++  case IPPROTO_IPV6:
++  proto = htons(ETH_P_IPV6);
++  goto ipv6;
+   default:
+   break;
+   }
+-- 
+1.7.9.5
+
diff --git 
a/target/linux/generic/patches-3.10/688-net-flow_dissector-add-802.1ad-support.patch
 
b/target/linux/generic/patches-3.10/688-net-flow_dissector-add-802.1ad-support.patch
new file mode 100644
index 000..49d9e1b
--- /dev/null
+++ 
b/target/linux/generic/patches-3.10/688-net-flow_dissector-add-802.1ad-support.patch
@@ -0,0 +1,29 @@
+From 017879b546ee5f85d13f90236a251d56605c9e86 Mon Sep 17 00:00:00 2001
+From: Eric Dumazet 
+Date: Tue, 6 Aug 2013 04:35:06 -0700
+Subject: [PATCH 5/5] net: flow_dissector: add 802.1ad support
+
+Same behavior than 802.1q : finds the encapsulated protocol and
+skip 32bit header.
+
+Signed-off-by: Eric Dumazet 
+Signed-off-by: David S. Miller 
+---
+ net/core/flow_dissector.c |1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c
+index ade9ff1..159737c 100644
+--- a/net/core/flow_dissector.c
 b/net/core/flow_dissector.c
+@@ -65,6 +65,7 @@ ipv6:
+   nhoff += sizeof(struct ipv6hdr);
+   break;
+   }
++  case __constant_htons(ETH_P_8021AD):
+   case __constant_htons(ETH_P_8021Q): {
+   const struct vlan_hdr *vlan;
+   struct vlan_hdr _vlan;
+-- 
+1.7.9.5
+
-- 
1.7.9.5
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


Re: [OpenWrt-Devel] How to compute kernel version

2014-02-18 Thread Nils Rennebarth

On 17.02.2014 23:48, Florian Fainelli wrote:

There are  multiple reasons:
- LINUX_UNAME_VERSION is determined way before the actual kernel is
built, using $(LINUX_VERSION) which is set by platforms

Yes, I was confused by LINUX_VERMAGIC which uses files generated during kernel 
build, but then
falls back to "unknown" when these are not present.

But the value of LINUX_UNAME_VERSION is used exclusively while installing 
modules, so it
would in principle be possible to delay its usage until the kernel has been 
built.


- back in the days when trunk supported 2.4 kernels, that file was not present

ok, for 2.4 kernels, we could fall back to the original generation.


- as the comment states in top-level Linux sources, this file might
not be present, and cannot always be relied on

I hadn't been able to find such a comment. In fact what I found is

# Read KERNELRELEASE from include/config/kernel.release (if it exists)
KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null)

and

# Store (new) KERNELRELEASE string in include/config/kernel.release
include/config/kernel.release: include/config/auto.conf FORCE
$(call filechk,kernel.release)

which seem to indicate that the file isn't that unreliable any more.


The reason I am that insistent is, that it would be nice to support all of the 
kernel's
version numbering schemes for custom kernels as well, including support for 
loading modules
of such a kernel, e.g. the localversion files which are at the moment 
officially unsupported
by openwrt.

Best regards, Nils

--
Nils Rennebarth
Software developer

bintec elmeg security GmbH

Mönchhaldenstraße 28
D-70191 Stuttgart
Germany

Tel: +49-711-900600-64
Email: nils.renneba...@bintec-elmeg.com
www: www.bintec-elmeg.com

Location: Nuremberg, Local Court Nuremberg, HRB 25481
Managing Director: Bernd Büttner


The information contained in this e-mail has been carefully researched,
but the possibility of it being inapplicable in individual cases cannot
be ruled out. We therefore regret that we cannot accept responsibility
or liability of any kind whatsoever for the correctness of the
information given. Please notify us if you discover that information is
inapplicable.
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


Re: [OpenWrt-Devel] How to use ethernet port as lan or wan port in WR703N

2014-02-18 Thread Aleksandr Kolesnik
you need to build own image where enable eth1 port. eth1 connected to
internal switch. Read topics
https://forum.openwrt.org/viewtopic.php?id=48907 and
https://forum.openwrt.org/viewtopic.php?id=48892


2014-02-18 15:04 GMT+02:00 bjzhougong :

>  Thanks for All
>
> but in WR703N's network config, it doesn't has switch:
>  config interface 'loopback'
> option ifname 'lo'
> option proto 'static'
> option ipaddr '127.0.0.1'
> option netmask '255.0.0.0'
>
> config interface 'lan'
> #option ifname 'eth0'
> option type 'bridge'
> option proto 'static'
> option ipaddr '192.168.22.1'
> option netmask '255.255.255.0'
>
> config interface 'wan'
> option ifname 'eth0'
> option proto 'dhcp'
>
> --
> bjzhougong
>
>  *From:* camden lindsay 
> *Date:* 2014-02-18 06:23
> *To:* OpenWrt Development List 
> *CC:* bjzhougong 
> *Subject:* Re: [OpenWrt-Devel] How to use ethernet port as lan or wan
> port in WR703N
>  It sounds like you have to re-configure the switch, to have the port
> that is currently 'wan' on the same vlan as the LAN.
>
> see http://wiki.openwrt.org/doc/uci/network/switch
>
> On Mon, Feb 17, 2014 at 2:04 PM, jonsm...@gmail.com  > wrote:
> > On Mon, Feb 17, 2014 at 4:48 PM, Hartmut Knaack  wrote:
> >> jonsm...@gmail.com schrieb:
> >>> The switch (esw) configuration separates the LAN and WAN ports.
>
> >> But according to the wiki, the 703n has only one ethernet port and no 
> >> switch.
> >
> > AR9331 has the switch on chip.
> > http://www.eeboard.com/wp-content/uploads/downloads/2013/08/AR9331.pdf
> >
> >
> >>>
> >>> On Mon, Feb 17, 2014 at 4:07 PM, Hartmut Knaack  > wrote:
>  bjzhougong schrieb:
> > Dear Sirs.
> >
>
> >>> As we know, we can configure "network.lan.interface" or 
> >>> "network.wan.interface" as eth0 to use ethernet port as lan or wan 
> >>> port on WR703N.
>
> >>> I think it should need to do anything in driver for switch ethernet 
> >>> port,
>
> >>> and I want to know what happened between user space and kernel space 
> >>> after we run "/etc/init.d/network restart",
> >>> Thanks for any idea about this!
> > If there is any help? Thanks!
>
>  Not sure, what exactly you want to know. When running 
>  "/etc/init.d/network restart", all the configured options in 
>  /etc/config/network get configured. See
> http://wiki.openwrt.org/doc/uci/network
>  for more information about available options.
>
>  When changing a certain network device from WAN to LAN, it is mainly 
>  about switching the configuration from being DHCP master or slave, and 
>  some routing configurations.
>
> > --
> > bjzhougong
> >
> >
> >
> >
> > ___
> > 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 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 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] openwrt-devel Digest, Vol 98, Issue 62

2014-02-18 Thread bjzhougong

>look this topic https://forum.openwrt.org/viewtopic.php?id=48907 and
>https://forum.openwrt.org/viewtopic.php?id=48892
>looks like ath_register_eth(1) not selected, so device detect only one wan
>port

Yes, it only call ath_register_eth(0). so device detect only one wan port.
But I can modify network config to use this port as lan or wan port.
I want to know what happend after we restart network.


2014-02-18 0:23 GMT+02:00 camden lindsay :

> It sounds like you have to re-configure the switch, to have the port
> that is currently 'wan' on the same vlan as the LAN.
>
> see http://wiki.openwrt.org/doc/uci/network/switch
>
> On Mon, Feb 17, 2014 at 2:04 PM, jonsm...@gmail.com 
> wrote:
> > On Mon, Feb 17, 2014 at 4:48 PM, Hartmut Knaack  wrote:
> >> jonsm...@gmail.com schrieb:
> >>> The switch (esw) configuration separates the LAN and WAN ports.
> >> But according to the wiki, the 703n has only one ethernet port and no
> switch.
> >
> > AR9331 has the switch on chip.
> > http://www.eeboard.com/wp-content/uploads/downloads/2013/08/AR9331.pdf
> >
> >
> >>>
> >>> On Mon, Feb 17, 2014 at 4:07 PM, Hartmut Knaack 
> wrote:
> >>>> bjzhougong schrieb:
> >>>>> Dear Sirs.
> >>>>>
> >>>>>>> As we know, we can configure "network.lan.interface" or
> "network.wan.interface" as eth0 to use ethernet port as lan or wan port on
> WR703N.
> >>>>>>> I think it should need to do anything in driver for switch
> ethernet port,
> >>>>>>> and I want to know what happened between user space and kernel
> space after we run "/etc/init.d/network restart",
> >>>>>>> Thanks for any idea about this!
> >>>>> If there is any help? Thanks!
> >>>> Not sure, what exactly you want to know. When running
> "/etc/init.d/network restart", all the configured options in
> /etc/config/network get configured. See
> http://wiki.openwrt.org/doc/uci/network for more information about
> available options.
> >>>> When changing a certain network device from WAN to LAN, it is mainly
> about switching the configuration from being DHCP master or slave, and some
> routing configurations.
> >>>>>
> --
> >>>>> bjzhougong
> >>>>>
> >>>>>
> >>>>>
> >>>>>
> >>>>> ___
> >>>>> 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 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 mailing list
> openwrt-devel@lists.openwrt.org
> https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
>
-- next part --
An HTML attachment was scrubbed...
URL: 
<http://lists.openwrt.org/pipermail/openwrt-devel/attachments/20140218/3c7c9ceb/attachment.html>

--

Subject: Digest Footer

___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


--

End of openwrt-devel Digest, Vol 98, Issue 62
*___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


Re: [OpenWrt-Devel] [PATCH] tspc / gw6c : fixed sed separator // Delete tspc, gw6c

2014-02-18 Thread Dirk Neukirchen
On 18.02.2014 08:04, Michel Stempin wrote:
> Signed-off-by: Michel Stempin 
> ---
>  ipv6/tspc/patches/002-sed-separator.patch |   22 ++
>  1 file changed, 22 insertions(+)
>  create mode 100644 ipv6/tspc/patches/002-sed-separator.patch
> 
> diff --git a/ipv6/tspc/patches/002-sed-separator.patch 
> b/ipv6/tspc/patches/002-sed-separator.patch
> new file mode 100644
> index 000..12c1cef
> --- /dev/null
> +++ b/ipv6/tspc/patches/002-sed-separator.patch

Remove this package.

Reasons:
- tspc is deprecated and gw6c should be used
according to https://dev.openwrt.org/ticket/2125

tspc was removed from Debian a while ago

I discovered this after seeing the DL from Debian 404'd

- now gw6c isnt available on Debian anymore 
- DL of gw6c from openwrt currently is not working

probably one should switch to gogoc package ?

see https://packages.debian.org/sid/gogoc



smime.p7s
Description: S/MIME Cryptographic Signature
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


Re: [OpenWrt-Devel] How to use ethernet port as lan or wan port in WR703N

2014-02-18 Thread bjzhougong
Thanks for All

but in WR703N's network config, it doesn't has switch:
config interface 'loopback'
option ifname 'lo'
option proto 'static'
option ipaddr '127.0.0.1'
option netmask '255.0.0.0'

config interface 'lan'
#option ifname 'eth0'
option type 'bridge'
option proto 'static'
option ipaddr '192.168.22.1'
option netmask '255.255.255.0'

config interface 'wan'
option ifname 'eth0'
option proto 'dhcp'




bjzhougong

From: camden lindsay
Date: 2014-02-18 06:23
To: OpenWrt Development List
CC: bjzhougong
Subject: Re: [OpenWrt-Devel] How to use ethernet port as lan or wan port in 
WR703N
It sounds like you have to re-configure the switch, to have the port
that is currently 'wan' on the same vlan as the LAN.

see http://wiki.openwrt.org/doc/uci/network/switch

On Mon, Feb 17, 2014 at 2:04 PM, jonsm...@gmail.com  wrote:
> On Mon, Feb 17, 2014 at 4:48 PM, Hartmut Knaack  wrote:
>> jonsm...@gmail.com schrieb:
>>> The switch (esw) configuration separates the LAN and WAN ports.
>> But according to the wiki, the 703n has only one ethernet port and no switch.
>
> AR9331 has the switch on chip.
> http://www.eeboard.com/wp-content/uploads/downloads/2013/08/AR9331.pdf
>
>
>>>
>>> On Mon, Feb 17, 2014 at 4:07 PM, Hartmut Knaack  wrote:
 bjzhougong schrieb:
> Dear Sirs.
>
>>> As we know, we can configure "network.lan.interface" or 
>>> "network.wan.interface" as eth0 to use ethernet port as lan or wan port 
>>> on WR703N.
>>> I think it should need to do anything in driver for switch ethernet 
>>> port,
>>> and I want to know what happened between user space and kernel space 
>>> after we run "/etc/init.d/network restart",
>>> Thanks for any idea about this!
> If there is any help? Thanks!
 Not sure, what exactly you want to know. When running "/etc/init.d/network 
 restart", all the configured options in /etc/config/network get 
 configured. See http://wiki.openwrt.org/doc/uci/network for more 
 information about available options.
 When changing a certain network device from WAN to LAN, it is mainly about 
 switching the configuration from being DHCP master or slave, and some 
 routing configurations.
> --
> bjzhougong
>
>
>
>
> ___
> 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 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 mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


Re: [OpenWrt-Devel] [PATCH] debootstrap: bumped version from 1.0.55 to 1.0.55~bpo70+1

2014-02-18 Thread Dirk Neukirchen
On 18.02.2014 08:02, Michel Stempin wrote:
> Signed-off-by: Michel Stempin 
> -PKG_VERSION:=1.0.55
> +PKG_VERSION:=1.0.55~bpo70+1
>  PKG_RELEASE:=1
>  


I have 1.0.56 locally and it builds fine too.
Just noticed that 1.0.59 is available.
According to the changelog these are security related (CA, https)

Any reason to stick to 1.0.55~... ?



smime.p7s
Description: S/MIME Cryptographic Signature
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


Re: [OpenWrt-Devel] Fixes to BB trunk bot build

2014-02-18 Thread Dirk Neukirchen
On 18.02.2014 08:02, Michel Stempin wrote:
> The following posts is list of patches against current trunk that fixes 20+ 
> packages during the "all-included" bot build, at least for the ramips RT5350F 
> target.
> 
> As the changes are mostly fixes of broken package dependencies and bumps to 
> new versions, these are likely to also fix builds for most other targets too.
> 

answering here to keep the message number down:

i have the same trivial patches for
- elfutils
- icecast
- taskwarrior
on my end

PS: If you want to "clean" your package tree further you can try
some trivial  whitespace fixes that I posted in a tar.gz on the mailing list:
https://lists.openwrt.org/pipermail/openwrt-devel/2014-February/023719.html





smime.p7s
Description: S/MIME Cryptographic Signature
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


Re: [OpenWrt-Devel] [PATCH] tiff: added missing dependency on liblzma

2014-02-18 Thread Dirk Neukirchen
On 18.02.2014 08:04, Michel Stempin wrote:
> Signed-off-by: Michel Stempin 
> ---
>  libs/tiff/Makefile |2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/libs/tiff/Makefile b/libs/tiff/Makefile
> index a79b6b2..97071fc 100644
> --- a/libs/tiff/Makefile
> +++ b/libs/tiff/Makefile
> @@ -36,7 +36,7 @@ $(call Package/tiff/Default)
>SECTION:=libs
>CATEGORY:=Libraries
>TITLE+= library
> -  DEPENDS:=+zlib +libjpeg
> +  DEPENDS:=+zlib +libjpeg +liblzma
>  endef
>  
>  define Package/libtiffxx
> 

There is a patch from Jiri Slachta requesting removal :)
http://patchwork.openwrt.org/patch/4230/


Despite that: if some decision is reached on this package:

Remove " --with-apple-opengl-framework \ "

Reasoning:
It is not available anymore.
from logs/package/feeds/packages/tiff/compile.txt:
configure: WARNING: unrecognized options: --disable-nls, 
--with-apple-opengl-framework

"HAVE_APPLE_OPENGL_FRAMEWORK" is still in the source in one file
but not checked since 4.x release / from autoconf
(according to : http://comments.gmane.org/gmane.comp.video.tiff/6158 )




smime.p7s
Description: S/MIME Cryptographic Signature
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


Re: [OpenWrt-Devel] [PATCH] lttng-tools: forced autoreconf

2014-02-18 Thread Dirk Neukirchen
On 18.02.2014 08:04, Michel Stempin wrote:
> Signed-off-by: Michel Stempin 
> ---
>  devel/lttng-tools/Makefile |1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/devel/lttng-tools/Makefile b/devel/lttng-tools/Makefile
> index 371a5b9..f6b92b4 100644
> --- a/devel/lttng-tools/Makefile
> +++ b/devel/lttng-tools/Makefile
> @@ -11,6 +11,7 @@ PKG_NAME:=lttng-tools
>  PKG_VERSION:=2.1.0
>  PKG_RELEASE:=1
>  
> +PKG_FIXUP:=autoreconf
>  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
>  PKG_SOURCE_URL:=https://lttng.org/files/$(PKG_NAME)
>  PKG_MD5SUM:=cfc35db9eb2d4ae09a65c006a70204f6
> 

Your patch missed a refresh it seems - but
it was already integrated anyway, see: https://dev.openwrt.org/changeset/39553



smime.p7s
Description: S/MIME Cryptographic Signature
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


Re: [OpenWrt-Devel] [PATCH] tor-alpha: added mirror site

2014-02-18 Thread Dirk Neukirchen
On 18.02.2014 08:04, Michel Stempin wrote:
> Signed-off-by: Michel Stempin 
> ---
>  net/tor-alpha/Makefile |3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/net/tor-alpha/Makefile b/net/tor-alpha/Makefile
> index 8824ab1..5d4f292 100644
> --- a/net/tor-alpha/Makefile
> +++ b/net/tor-alpha/Makefile
> @@ -13,7 +13,8 @@ PKG_RELEASE:=1
>  
>  PKG_SOURCE:=tor-$(PKG_VERSION).tar.gz
>  PKG_SOURCE_URL:=https://www.torproject.org/dist \
> - https://archive.torproject.org/tor-package-archive
> + https://archive.torproject.org/tor-package-archive \
> + http://tor.mirror.tn/dist
>  PKG_MD5SUM:=d05da33b2c99978adc55c78ead8b25d2
>  
>  PKG_BUILD_DEPENDS:=libminiupnpc libnatpmp
> 

Your added mirror was announced on the mailing list [1] but its 
not listed on their mirror list at all
Maybe take one from that list instead?
https://www.torproject.org/getinvolved/mirrors.html.en

[1] https://lists.torproject.org/pipermail/tor-mirrors/2011-October/thread.html



smime.p7s
Description: S/MIME Cryptographic Signature
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


Re: [OpenWrt-Devel] [PATCH] wview: added missing dependency on libopenssl

2014-02-18 Thread Dirk Neukirchen
On 18.02.2014 08:04, Michel Stempin wrote:
> Signed-off-by: Michel Stempin 
> ---
>  utils/wview/Makefile |2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/utils/wview/Makefile b/utils/wview/Makefile
> index f231fa7..d74e30a 100644
> --- a/utils/wview/Makefile
> +++ b/utils/wview/Makefile
> @@ -22,7 +22,7 @@ include $(INCLUDE_DIR)/package.mk
>  define Package/wview
>SECTION:=utils
>CATEGORY:=Utilities
> -  DEPENDS:=+libcurl +zlib +libpng +libgd +libreadline +libsqlite3 
> +libusb-1.0 +radlib +sqlite3-cli
> +  DEPENDS:=+libcurl +zlib +libpng +libgd +libreadline +libsqlite3 
> +libusb-1.0 +radlib +sqlite3-cli +libopenssl
>TITLE:=Wview Weather Station Software
>URL:=http://www.wviewweather.com/
>  endef
> 

have the same trivial patch locally 
libopenssl because of curl and remote upload with ssh (HTTP and FTP wview 
modules use -lssl)



smime.p7s
Description: S/MIME Cryptographic Signature
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


Re: [OpenWrt-Devel] [PATCH] fxload: fixed include path for Linux UAPI

2014-02-18 Thread Michel Stempin


Le 18/02/2014 11:16, Dirk Neukirchen a écrit :
> On 18.02.2014 08:02, Michel Stempin wrote:
>> Signed-off-by: Michel Stempin 
>> ---
>>  utils/fxload/Makefile |2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/utils/fxload/Makefile b/utils/fxload/Makefile
>> index f961d52..93e63c1 100644
>> --- a/utils/fxload/Makefile
>> +++ b/utils/fxload/Makefile
>> @@ -28,7 +28,7 @@ endef
>>  
>>  define Build/Compile
>>  $(call Build/Compile/Default, \
>> -CFLAGS="$(TARGET_CFLAGS) -I$(LINUX_DIR)/include" \
>> +CFLAGS="$(TARGET_CFLAGS) 
>> -I$(LINUX_DIR)/$(LINUX_UAPI_DIR)include" \
>>  )
>>  endef
>>  
>>
> 
> I did send the same patch in November for that 
> http://patchwork.openwrt.org/patch/4481/
> As you can see there are many other patches from End 2013 that still need 
> integration

So why are these kind of one-line fixes still not integrated, then?

It doesn't require much time to review and should be pretty safe to apply, is 
it?

-- 
Michel
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


Re: [OpenWrt-Devel] How to use ethernet port as lan or wan port in WR703N

2014-02-18 Thread Aleksandr Kolesnik
look this topic https://forum.openwrt.org/viewtopic.php?id=48907 and
https://forum.openwrt.org/viewtopic.php?id=48892
looks like ath_register_eth(1) not selected, so device detect only one wan
port


2014-02-18 0:23 GMT+02:00 camden lindsay :

> It sounds like you have to re-configure the switch, to have the port
> that is currently 'wan' on the same vlan as the LAN.
>
> see http://wiki.openwrt.org/doc/uci/network/switch
>
> On Mon, Feb 17, 2014 at 2:04 PM, jonsm...@gmail.com 
> wrote:
> > On Mon, Feb 17, 2014 at 4:48 PM, Hartmut Knaack  wrote:
> >> jonsm...@gmail.com schrieb:
> >>> The switch (esw) configuration separates the LAN and WAN ports.
> >> But according to the wiki, the 703n has only one ethernet port and no
> switch.
> >
> > AR9331 has the switch on chip.
> > http://www.eeboard.com/wp-content/uploads/downloads/2013/08/AR9331.pdf
> >
> >
> >>>
> >>> On Mon, Feb 17, 2014 at 4:07 PM, Hartmut Knaack 
> wrote:
>  bjzhougong schrieb:
> > Dear Sirs.
> >
> >>> As we know, we can configure "network.lan.interface" or
> "network.wan.interface" as eth0 to use ethernet port as lan or wan port on
> WR703N.
> >>> I think it should need to do anything in driver for switch
> ethernet port,
> >>> and I want to know what happened between user space and kernel
> space after we run "/etc/init.d/network restart",
> >>> Thanks for any idea about this!
> > If there is any help? Thanks!
>  Not sure, what exactly you want to know. When running
> "/etc/init.d/network restart", all the configured options in
> /etc/config/network get configured. See
> http://wiki.openwrt.org/doc/uci/network for more information about
> available options.
>  When changing a certain network device from WAN to LAN, it is mainly
> about switching the configuration from being DHCP master or slave, and some
> routing configurations.
> >
> --
> > bjzhougong
> >
> >
> >
> >
> > ___
> > 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 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 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] l2tpv3tun: added include paths to Linux UABI and fixed dependencies on libnl

2014-02-18 Thread Michel Stempin


Le 18/02/2014 11:09, Dirk Neukirchen a écrit :
> On 18.02.2014 08:03, Michel Stempin wrote:
>> Signed-off-by: Michel Stempin 
>> ---
>>  net/l2tpv3tun/Makefile |4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/net/l2tpv3tun/Makefile b/net/l2tpv3tun/Makefile
>> index f965569..2a6fab1 100644
>> --- a/net/l2tpv3tun/Makefile
>> +++ b/net/l2tpv3tun/Makefile
>> @@ -36,9 +36,9 @@ endef
>>  
>>  MAKE_FLAGS += \
>>  CC="$(TARGET_CC)" \
>> -CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include 
>> -I$(LINUX_DIR)/include" \
>> +CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include 
>> -I$(STAGING_DIR)/usr/include/libnl3 -I$(LINUX_DIR)/$(LINUX_UAPI_DIR)" \
>>  LD="$(TARGET_CC)" \
>> -LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib -lnl -lnl-genl"
>> +LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib -lnl-3 -lnl-genl-3"
>>  
>>  define Package/l2tpv3tun/install
>>  $(INSTALL_DIR) $(1)/usr/bin
>>
> Fixing the package is probably nice to have, but 
>  
> - it was replaced by iproute2-3.4 ("ip l2tp", May 2012 ) [1]
> - BB has 3.11 currently (upstream: 3.12)
> - no IPv6 in contrast to iproute2 [2]
> 
> [1] http://sourceforge.net/mailarchive/message.php?msg_id=29409550
> [2] 
> https://git.kernel.org/cgit/linux/kernel/git/shemminger/iproute2.git/commit/?id=6618e334ba6bb0a5638ac30cc4662103e7ec9f1e

Yes, I was only trying to fix this broken package.

Probably the best solution would be to remove this package altogether.

Who is taking this decision?

-- 
Michel
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


Re: [OpenWrt-Devel] [PATCHv3 3/3] b53: mdio: Avoid re-registering the same switch device

2014-02-18 Thread Jonas Gorski
On Tue, Feb 18, 2014 at 10:52 AM, Helmut Schaa
 wrote:
> On Tue, Feb 18, 2014 at 10:46 AM, Helmut Schaa
>  wrote:
>> On Mon, Feb 17, 2014 at 5:37 PM, Jonas Gorski  wrote:
>>> On Thu, Feb 13, 2014 at 5:00 PM, Helmut Schaa
>>>  wrote:
 When setting the associated interface down and up again a new
 switch device will be registered due to b53_phy_config_init
 doing the necessary allocations and registrations.

 Instead, register the switch device already in b53_phy_probe.

 Signed-off-by: Helmut Schaa 
 ---
>>>
>>> It would be good to have some changelog here to know what changed
>>> between v1, v2 and v3.
>>
>> Right, sorry bout that ...
>>
>>> As far as I can tell you are now dropping the
>>> ethX alias completely?
>>
>> Correct, since the netdev is only known when attaching to the phy
>> which caused the problem I wanted to fix in the first place ...
>>
>> And I agree with your previous comment that it is not safe to
>> replace the phy name on attaching the netdev to the phy (for various
>> reasons) ...
>>
>> Now, the name is consistent, but the dev_name of the actual switch
>> is used. Which means you will get a switch device called "bcm53018"
>> or "bcm53125" (would be bad if you have multiple switches).
>
> Actually, this is what the mmap and spi versions do as far as I can see.
> Helmut

You are thinking too complicated here, all switches are also available
under a generic switchX name, so usually you only need to do ethX =>
switch0 replacement (unless there are two switches, but I never saw
such a device yet on bcm47xx or bcm63xx).

The bigger problem is the conversion from the old kmod-switch
standard, where you had to explicitly untag the cpu if you wanted it
untagged with 'u', and the cpu was always implicitly tagged.


Jonas
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


Re: [OpenWrt-Devel] [PATCH] fxload: fixed include path for Linux UAPI

2014-02-18 Thread Dirk Neukirchen
On 18.02.2014 08:02, Michel Stempin wrote:
> Signed-off-by: Michel Stempin 
> ---
>  utils/fxload/Makefile |2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/utils/fxload/Makefile b/utils/fxload/Makefile
> index f961d52..93e63c1 100644
> --- a/utils/fxload/Makefile
> +++ b/utils/fxload/Makefile
> @@ -28,7 +28,7 @@ endef
>  
>  define Build/Compile
>   $(call Build/Compile/Default, \
> - CFLAGS="$(TARGET_CFLAGS) -I$(LINUX_DIR)/include" \
> + CFLAGS="$(TARGET_CFLAGS) 
> -I$(LINUX_DIR)/$(LINUX_UAPI_DIR)include" \
>   )
>  endef
>  
> 

I did send the same patch in November for that 
http://patchwork.openwrt.org/patch/4481/
As you can see there are many other patches from End 2013 that still need 
integration



smime.p7s
Description: S/MIME Cryptographic Signature
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


Re: [OpenWrt-Devel] [PATCH] l2tpv3tun: added include paths to Linux UABI and fixed dependencies on libnl

2014-02-18 Thread Dirk Neukirchen
On 18.02.2014 08:03, Michel Stempin wrote:
> Signed-off-by: Michel Stempin 
> ---
>  net/l2tpv3tun/Makefile |4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/net/l2tpv3tun/Makefile b/net/l2tpv3tun/Makefile
> index f965569..2a6fab1 100644
> --- a/net/l2tpv3tun/Makefile
> +++ b/net/l2tpv3tun/Makefile
> @@ -36,9 +36,9 @@ endef
>  
>  MAKE_FLAGS += \
>   CC="$(TARGET_CC)" \
> - CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include 
> -I$(LINUX_DIR)/include" \
> + CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include 
> -I$(STAGING_DIR)/usr/include/libnl3 -I$(LINUX_DIR)/$(LINUX_UAPI_DIR)" \
>   LD="$(TARGET_CC)" \
> - LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib -lnl -lnl-genl"
> + LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib -lnl-3 -lnl-genl-3"
>  
>  define Package/l2tpv3tun/install
>   $(INSTALL_DIR) $(1)/usr/bin
> 
Fixing the package is probably nice to have, but 
 
- it was replaced by iproute2-3.4 ("ip l2tp", May 2012 ) [1]
- BB has 3.11 currently (upstream: 3.12)
- no IPv6 in contrast to iproute2 [2]

[1] http://sourceforge.net/mailarchive/message.php?msg_id=29409550
[2] 
https://git.kernel.org/cgit/linux/kernel/git/shemminger/iproute2.git/commit/?id=6618e334ba6bb0a5638ac30cc4662103e7ec9f1e



smime.p7s
Description: S/MIME Cryptographic Signature
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


Re: [OpenWrt-Devel] [PATCHv3 3/3] b53: mdio: Avoid re-registering the same switch device

2014-02-18 Thread Helmut Schaa
On Tue, Feb 18, 2014 at 10:46 AM, Helmut Schaa
 wrote:
> On Mon, Feb 17, 2014 at 5:37 PM, Jonas Gorski  wrote:
>> On Thu, Feb 13, 2014 at 5:00 PM, Helmut Schaa
>>  wrote:
>>> When setting the associated interface down and up again a new
>>> switch device will be registered due to b53_phy_config_init
>>> doing the necessary allocations and registrations.
>>>
>>> Instead, register the switch device already in b53_phy_probe.
>>>
>>> Signed-off-by: Helmut Schaa 
>>> ---
>>
>> It would be good to have some changelog here to know what changed
>> between v1, v2 and v3.
>
> Right, sorry bout that ...
>
>> As far as I can tell you are now dropping the
>> ethX alias completely?
>
> Correct, since the netdev is only known when attaching to the phy
> which caused the problem I wanted to fix in the first place ...
>
> And I agree with your previous comment that it is not safe to
> replace the phy name on attaching the netdev to the phy (for various
> reasons) ...
>
> Now, the name is consistent, but the dev_name of the actual switch
> is used. Which means you will get a switch device called "bcm53018"
> or "bcm53125" (would be bad if you have multiple switches).

Actually, this is what the mmap and spi versions do as far as I can see.
Helmut
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


Re: [OpenWrt-Devel] [PATCHv3 3/3] b53: mdio: Avoid re-registering the same switch device

2014-02-18 Thread Helmut Schaa
On Mon, Feb 17, 2014 at 5:37 PM, Jonas Gorski  wrote:
> On Thu, Feb 13, 2014 at 5:00 PM, Helmut Schaa
>  wrote:
>> When setting the associated interface down and up again a new
>> switch device will be registered due to b53_phy_config_init
>> doing the necessary allocations and registrations.
>>
>> Instead, register the switch device already in b53_phy_probe.
>>
>> Signed-off-by: Helmut Schaa 
>> ---
>
> It would be good to have some changelog here to know what changed
> between v1, v2 and v3.

Right, sorry bout that ...

> As far as I can tell you are now dropping the
> ethX alias completely?

Correct, since the netdev is only known when attaching to the phy
which caused the problem I wanted to fix in the first place ...

And I agree with your previous comment that it is not safe to
replace the phy name on attaching the netdev to the phy (for various
reasons) ...

Now, the name is consistent, but the dev_name of the actual switch
is used. Which means you will get a switch device called "bcm53018"
or "bcm53125" (would be bad if you have multiple switches).

> This will cause a lot of config breakage
> because bcm47xx and bcm63xx use ethX as the default switch name for
> most switch configs. We need to add a migration script first before
> this can be applied (it would be good to have one anyway for the
> kmod-switch -> swconfig migration.

Damn, didn't think about that :/
Due to the different names for different switch chips this will be
difficult I guess.

Any other ideas?
Add a mechanism to update the device name on phy_attach?

> The first two look good, and I will commit them as soon as I have
> time, so no need to resend them.

Thanks.
Helmut
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


Re: [OpenWrt-Devel] [PATCH] mc: added missing dependecy on libssh2

2014-02-18 Thread Michel Stempin


Le 18/02/2014 10:22, Dirk Neukirchen a écrit :
> On 18.02.2014 08:04, Michel Stempin wrote:
>> Signed-off-by: Michel Stempin 
>> ---
>>  utils/mc/Makefile |2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/utils/mc/Makefile b/utils/mc/Makefile
>> index f43c5a1..e036da3 100644
>> --- a/utils/mc/Makefile
>> +++ b/utils/mc/Makefile
>> @@ -24,7 +24,7 @@ include $(INCLUDE_DIR)/nls.mk
>>  define Package/mc
>>SECTION:=utils
>>CATEGORY:=Utilities
>> -  DEPENDS:=+glib2 +libncurses $(LIBRPC_DEPENDS) $(ICONV_DEPENDS)
>> +  DEPENDS:=+glib2 +libncurses $(LIBRPC_DEPENDS) $(ICONV_DEPENDS) +libssh2
>>TITLE:=midnight commander - a powerful file manager
>>URL:=http://www.midnight-commander.org/
>>SUBMENU:=filemanager
>>
> 
> libssh2 is needed for sftp and there is a configure switch for that:
> --enable-vfs-sftp   Support for SFTP filesystem [auto]
> 
> Maybe disable all vfs and have a minimal and a full package?
> --disable-vfs

Thanks for comments!

Maybe providing an option for vfs to mc in menuconfig?

-- 
Michel
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


Re: [OpenWrt-Devel] [PATCH] libfreefare: bumped version for 0.2.3 to 0.4.0

2014-02-18 Thread Dirk Neukirchen
I have this patch locally too it seems to compile fine (for X86)
on several build VMs (Debian Sid, Arch, Fedora)

On 18.02.2014 08:04, Michel Stempin wrote:
> Signed-off-by: Michel Stempin 
> ---
> -PKG_SOURCE_URL:=http://nfc-tools.googlecode.com/files
> +PKG_SOURCE_URL:=https://libfreefare.googlecode.com/files/

probably no trailing slash in pathname 

its 334 with trailing slash vs. 441 without :)



smime.p7s
Description: S/MIME Cryptographic Signature
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


Re: [OpenWrt-Devel] [PATCH] mc: added missing dependecy on libssh2

2014-02-18 Thread Dirk Neukirchen
On 18.02.2014 08:04, Michel Stempin wrote:
> Signed-off-by: Michel Stempin 
> ---
>  utils/mc/Makefile |2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/utils/mc/Makefile b/utils/mc/Makefile
> index f43c5a1..e036da3 100644
> --- a/utils/mc/Makefile
> +++ b/utils/mc/Makefile
> @@ -24,7 +24,7 @@ include $(INCLUDE_DIR)/nls.mk
>  define Package/mc
>SECTION:=utils
>CATEGORY:=Utilities
> -  DEPENDS:=+glib2 +libncurses $(LIBRPC_DEPENDS) $(ICONV_DEPENDS)
> +  DEPENDS:=+glib2 +libncurses $(LIBRPC_DEPENDS) $(ICONV_DEPENDS) +libssh2
>TITLE:=midnight commander - a powerful file manager
>URL:=http://www.midnight-commander.org/
>SUBMENU:=filemanager
> 

libssh2 is needed for sftp and there is a configure switch for that:
--enable-vfs-sftp   Support for SFTP filesystem [auto]

Maybe disable all vfs and have a minimal and a full package?
--disable-vfs





smime.p7s
Description: S/MIME Cryptographic Signature
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


Re: [OpenWrt-Devel] [PATCH] gw6c: fixed sed separator

2014-02-18 Thread Michel Stempin


Le 18/02/2014 09:45, Yousong Zhou a écrit :
> On Tue, Feb 18, 2014 at 08:03:06AM +0100, Michel Stempin wrote:
>> Signed-off-by: Michel Stempin 
>> ---
>>  ipv6/gw6c/patches/001-sed-separator.patch |   18 ++
>>  1 file changed, 18 insertions(+)
>>  create mode 100644 ipv6/gw6c/patches/001-sed-separator.patch
>>
>> diff --git a/ipv6/gw6c/patches/001-sed-separator.patch 
>> b/ipv6/gw6c/patches/001-sed-separator.patch
>> new file mode 100644
>> index 000..8d4c4bd
>> --- /dev/null
>> +++ b/ipv6/gw6c/patches/001-sed-separator.patch
>> @@ -0,0 +1,18 @@
>> +--- a/tspc-advanced/conf/Makefile
>>  b/tspc-advanced/conf/Makefile
>> +@@ -21,12 +21,12 @@
>> +fi
>> +@if [ -z "$(configdir)" ]; then \
>> + if [ -z "$(installdir)" ]; then \
>> +-  sed -e "s+@ifname_v4v6@+$(ifname_v4v6)+" -e 
>> "s+@ifname_tun@+$(ifname_tun)+" -e "s+@ifname@+$(ifname)+" -e 
>> "s+@conf_template@+$(conf_template)+" -e "s+@conf_gw6_dir@+`cd ..;pwd`+"  
>> gw6c.conf.in>$(BIN)/gw6c.conf.sample; \
>> ++  sed -e "s|@ifname_v4v6@|$(ifname_v4v6)|" -e 
>> "s|@ifname_tun@|$(ifname_tun)|" -e "s|@ifname@|$(ifname)|" -e 
>> "s|@conf_template@|$(conf_template)|" -e "s|@conf_gw6_dir@|`cd ..;pwd`|"  
>> gw6c.conf.in>$(BIN)/gw6c.conf.sample; \
> 
> Hi, just curious, what's wrong with using '+' as separators here. I
> compiled gw6c for ar71xx fine without this patch.

On my ramips RT5350 HAME-MPR1 target, my build directory is: 
"build_dir/target-mipsel_24kec+dsp_uClibc-0.9.33.2", thus the problem.

Michel
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


Re: [OpenWrt-Devel] [PATCH] at: added missing dependency on libpam

2014-02-18 Thread Dirk Neukirchen
On 18.02.2014 08:02, Michel Stempin wrote:
> Signed-off-by: Michel Stempin 
> ---
>  utils/at/Makefile |2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/utils/at/Makefile b/utils/at/Makefile
> index 7c02fb8..21bdc60 100644
> --- a/utils/at/Makefile
> +++ b/utils/at/Makefile
> @@ -20,7 +20,7 @@ include $(INCLUDE_DIR)/package.mk
>  define Package/at
>SECTION:=utils
>CATEGORY:=Utilities
> -  DEPENDS:=+libelf1
> +  DEPENDS:=+libelf1 +libpam
>TITLE:=Delayed job execution and batch processing
>URL:=http://packages.debian.org/stable/at
>MAINTAINER:=Luka Perkov 
> 

I have that fix in a local branch too, but
back in October that was declined see
https://lists.openwrt.org/pipermail/openwrt-devel/2013-October/022030.html

I did a little bit of reading in the at source and other sources.
libpam is an "automagic dependency" [1] and therefore a fix should be done
by editing the configure.ac / configure.in file (and probably sending it 
upstream)


[1] 
https://wiki.gentoo.org/wiki/Project:Quality_Assurance/Automagic_dependencies



smime.p7s
Description: S/MIME Cryptographic Signature
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


Re: [OpenWrt-Devel] [PATCH] gw6c: fixed sed separator

2014-02-18 Thread Yousong Zhou
On Tue, Feb 18, 2014 at 08:03:06AM +0100, Michel Stempin wrote:
> Signed-off-by: Michel Stempin 
> ---
>  ipv6/gw6c/patches/001-sed-separator.patch |   18 ++
>  1 file changed, 18 insertions(+)
>  create mode 100644 ipv6/gw6c/patches/001-sed-separator.patch
> 
> diff --git a/ipv6/gw6c/patches/001-sed-separator.patch 
> b/ipv6/gw6c/patches/001-sed-separator.patch
> new file mode 100644
> index 000..8d4c4bd
> --- /dev/null
> +++ b/ipv6/gw6c/patches/001-sed-separator.patch
> @@ -0,0 +1,18 @@
> +--- a/tspc-advanced/conf/Makefile
>  b/tspc-advanced/conf/Makefile
> +@@ -21,12 +21,12 @@
> + fi
> + @if [ -z "$(configdir)" ]; then \
> +  if [ -z "$(installdir)" ]; then \
> +-   sed -e "s+@ifname_v4v6@+$(ifname_v4v6)+" -e 
> "s+@ifname_tun@+$(ifname_tun)+" -e "s+@ifname@+$(ifname)+" -e 
> "s+@conf_template@+$(conf_template)+" -e "s+@conf_gw6_dir@+`cd ..;pwd`+"  
> gw6c.conf.in>$(BIN)/gw6c.conf.sample; \
> ++   sed -e "s|@ifname_v4v6@|$(ifname_v4v6)|" -e 
> "s|@ifname_tun@|$(ifname_tun)|" -e "s|@ifname@|$(ifname)|" -e 
> "s|@conf_template@|$(conf_template)|" -e "s|@conf_gw6_dir@|`cd ..;pwd`|"  
> gw6c.conf.in>$(BIN)/gw6c.conf.sample; \

Hi, just curious, what's wrong with using '+' as separators here. I
compiled gw6c for ar71xx fine without this patch.


yousong

> +  else \
> +-   sed -e "s+@ifname_v4v6@+$(ifname_v4v6)+" -e 
> "s+@ifname_tun@+$(ifname_tun)+" -e "s+@ifname@+$(ifname)+" -e 
> "s+@conf_template@+$(conf_template)+" -e "s+@conf_gw6_dir@+$(installdir)+" 
> gw6c.conf.in >$(BIN)/gw6c.conf.sample; \
> ++   sed -e "s|@ifname_v4v6@|$(ifname_v4v6)|" -e 
> "s|@ifname_tun@|$(ifname_tun)|" -e "s|@ifname@|$(ifname)|" -e 
> "s|@conf_template@|$(conf_template)|" -e "s|@conf_gw6_dir@|$(installdir)|" 
> gw6c.conf.in >$(BIN)/gw6c.conf.sample; \
> +  fi \
> + else \
> +- sed -e "s+@ifname_v4v6@+$(ifname_v4v6)+" -e 
> "s+@ifname_tun@+$(ifname_tun)+" -e "s+@ifname@+$(ifname)+" -e 
> "s+@conf_template@+$(conf_template)+" -e "s+@conf_gw6_dir@+$(configdir)+" 
> gw6c.conf.in >$(BIN)/gw6c.conf.sample; \
> ++ sed -e "s|@ifname_v4v6@|$(ifname_v4v6)|" -e 
> "s|@ifname_tun@|$(ifname_tun)|" -e "s|@ifname@|$(ifname)|" -e 
> "s|@conf_template@|$(conf_template)|" -e "s|@conf_gw6_dir@|$(configdir)|" 
> gw6c.conf.in >$(BIN)/gw6c.conf.sample; \
> + fi
> + chmod 700 $(BIN)/gw6c.conf.sample
> + 
> -- 
> 1.7.10.4
> ___
> 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