[ptxdist] [PATCH v2 0/8] network packages updates

[ptxdist] [PATCH v2 0/8] network packages updates

[Markus Pargmann]

Hi,

this is v2 of this network series with some small changes, see below.

Regards,

Markus


Changes in v2:
 - Added dnsmasq compiletime options
 - Cleanup of batctl makefile


Markus Pargmann (8):
  iproute2: version bump 3.9.0 -> 3.14.0
  iw: version bump 3.3 -> 3.14
  network: Add batctl
  crda: version bump 1.1.3 -> 3.13
  dnsmasq: version bump 2.47 -> 2.70
  iperf: version bump 2.0.4 -> 2.0.5
  wireshark: version bump 1.10.5 -> 1.10.6
  libjpeg: version bump 8a -> 9a, add binaries

 patches/crda-1.1.3/series                          |  4 --
 .../0001-key2pub-Fix-ssl-keys.c-generation.patch   | 38 ++++++++++++++++
 .../0002-Pregenerate-keys-ssl.c.patch}             | 40 ++++++-----------
 .../0003-udev-Fix-rule-for-initial-setup.patch     | 23 ++++++++++
 .../crda-3.13/0004-Makefile-Fix-libreg-build.patch | 48 ++++++++++++++++++++
 patches/crda-3.13/series                           |  4 ++
 .../fix_early_termination.diff                     |  0
 patches/{iperf-2.0.4 => iperf-2.0.5}/series        |  0
 .../0001-build-system-fixes.patch                  | 14 ++++--
 patches/{iproute2-3.9.0 => iproute2-3.14.0}/series |  0
 rules/batctl.in                                    |  8 ++++
 rules/batctl.make                                  | 51 ++++++++++++++++++++++
 rules/crda.make                                    |  9 ++--
 rules/dnsmasq.in                                   | 31 +++++++++++++
 rules/dnsmasq.make                                 | 23 ++++++++--
 rules/iperf.make                                   |  4 +-
 rules/iproute2.make                                |  4 +-
 rules/iw.make                                      |  6 +--
 rules/libjpeg.in                                   | 15 ++++++-
 rules/libjpeg.make                                 |  8 +++-
 rules/wireshark.make                               |  4 +-
 21 files changed, 280 insertions(+), 54 deletions(-)
 delete mode 100644 patches/crda-1.1.3/series
 create mode 100644 patches/crda-3.13/0001-key2pub-Fix-ssl-keys.c-generation.patch
 rename patches/{crda-1.1.3/0001-Pregenerate-keys-ssl.c.patch => crda-3.13/0002-Pregenerate-keys-ssl.c.patch} (60%)
 create mode 100644 patches/crda-3.13/0003-udev-Fix-rule-for-initial-setup.patch
 create mode 100644 patches/crda-3.13/0004-Makefile-Fix-libreg-build.patch
 create mode 100644 patches/crda-3.13/series
 rename patches/{iperf-2.0.4 => iperf-2.0.5}/fix_early_termination.diff (100%)
 rename patches/{iperf-2.0.4 => iperf-2.0.5}/series (100%)
 rename patches/{iproute2-3.9.0 => iproute2-3.14.0}/0001-build-system-fixes.patch (68%)
 rename patches/{iproute2-3.9.0 => iproute2-3.14.0}/series (100%)
 create mode 100644 rules/batctl.in
 create mode 100644 rules/batctl.make

-- 
2.0.0.rc0


-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH v2 1/8] iproute2: version bump 3.9.0 -> 3.14.0

[Markus Pargmann]

Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
---
 .../0001-build-system-fixes.patch                          | 14 ++++++++++----
 patches/{iproute2-3.9.0 => iproute2-3.14.0}/series         |  0
 rules/iproute2.make                                        |  4 ++--
 3 files changed, 12 insertions(+), 6 deletions(-)
 rename patches/{iproute2-3.9.0 => iproute2-3.14.0}/0001-build-system-fixes.patch (68%)
 rename patches/{iproute2-3.9.0 => iproute2-3.14.0}/series (100%)

diff --git a/patches/iproute2-3.9.0/0001-build-system-fixes.patch b/patches/iproute2-3.14.0/0001-build-system-fixes.patch
similarity index 68%
rename from patches/iproute2-3.9.0/0001-build-system-fixes.patch
rename to patches/iproute2-3.14.0/0001-build-system-fixes.patch
index df40efa..1d7a8fe 100644
--- a/patches/iproute2-3.9.0/0001-build-system-fixes.patch
+++ b/patches/iproute2-3.14.0/0001-build-system-fixes.patch
@@ -1,3 +1,4 @@
+From 21ba3bd71071e8d9062e54d52681defd1250c6a9 Mon Sep 17 00:00:00 2001
 From: Juergen Beisert <juergen@kreuzholzen.de>
 Date: Sun, 16 Jun 2013 11:17:42 +0200
 Subject: [PATCH] build system fixes
@@ -7,12 +8,14 @@ Add a mechanism to feed in CPPFLAGS for cross builds.
 
 Signed-off-by: Juergen Beisert <juergen@kreuzholzen.de>
 Signed-off-by: Jon Ringle <jon@ringle.org>
+[Rebased to 3.14.0]
+Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
 ---
  misc/Makefile | 6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/misc/Makefile b/misc/Makefile
-index a59ff87..4e65239 100644
+index 004bcc3..34af65c 100644
 --- a/misc/Makefile
 +++ b/misc/Makefile
 @@ -1,10 +1,14 @@
@@ -28,6 +31,9 @@ index a59ff87..4e65239 100644
 +TARGETS += arpd
 +endif
 +
- all: $(TARGETS)
- 
- ss: $(SSOBJ)
+ ifeq ($(HAVE_SELINUX),y)
+ 	LDLIBS += $(shell pkg-config --libs libselinux)
+ 	CFLAGS += $(shell pkg-config --cflags libselinux) -DHAVE_SELINUX
+-- 
+1.9.0
+
diff --git a/patches/iproute2-3.9.0/series b/patches/iproute2-3.14.0/series
similarity index 100%
rename from patches/iproute2-3.9.0/series
rename to patches/iproute2-3.14.0/series
diff --git a/rules/iproute2.make b/rules/iproute2.make
index 29f3bc2..8c0c4c6 100644
--- a/rules/iproute2.make
+++ b/rules/iproute2.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_IPROUTE2) += iproute2
 #
 # Paths and names
 #
-IPROUTE2_VERSION	:= 3.9.0
-IPROUTE2_MD5		:= fd9db28e4f411a1e74de65c919ae590f
+IPROUTE2_VERSION	:= 3.14.0
+IPROUTE2_MD5		:= bd9d7567bbb987c88120669f5e1a1092
 IPROUTE2		:= iproute2-$(IPROUTE2_VERSION)
 IPROUTE2_SUFFIX		:= tar.xz
 IPROUTE2_URL		:= $(call ptx/mirror, KERNEL, utils/net/iproute2/$(IPROUTE2).$(IPROUTE2_SUFFIX))
-- 
2.0.0.rc0


-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH v2 2/8] iw: version bump 3.3 -> 3.14

[Markus Pargmann]

Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
---
 rules/iw.make | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rules/iw.make b/rules/iw.make
index 9472a2e..6657571 100644
--- a/rules/iw.make
+++ b/rules/iw.make
@@ -16,10 +16,10 @@ PACKAGES-$(PTXCONF_IW) += iw
 #
 # Paths and names
 #
-IW_VERSION	:= 3.3
-IW_MD5		:= 146ad14cdeb39fb88b21efdbb28787d1
+IW_VERSION	:= 3.14
+IW_MD5		:= 66e41053f6fc0781b683b5b688442de6
 IW		:= iw-$(IW_VERSION)
-IW_SUFFIX	:= tar.bz2
+IW_SUFFIX	:= tar.xz
 IW_URL		:= http://www.kernel.org/pub/software/network/iw/$(IW).$(IW_SUFFIX)
 IW_SOURCE	:= $(SRCDIR)/$(IW).$(IW_SUFFIX)
 IW_DIR		:= $(BUILDDIR)/$(IW)
-- 
2.0.0.rc0


-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH v2 3/8] network: Add batctl

[Markus Pargmann]

Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
---

Notes:
    Changes in v2:
     - Cleanup of the make file

 rules/batctl.in   |  8 ++++++++
 rules/batctl.make | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+)
 create mode 100644 rules/batctl.in
 create mode 100644 rules/batctl.make

diff --git a/rules/batctl.in b/rules/batctl.in
new file mode 100644
index 0000000..a41af49
--- /dev/null
+++ b/rules/batctl.in
@@ -0,0 +1,8 @@
+## SECTION=networking
+
+config BATCTL
+	tristate
+	prompt "B.A.T.M.A.N. - batctl"
+	select LIBNL3
+	help
+	  B.A.T.M.A.N batclt program to control/monitor batman interfaces
diff --git a/rules/batctl.make b/rules/batctl.make
new file mode 100644
index 0000000..69a10fb
--- /dev/null
+++ b/rules/batctl.make
@@ -0,0 +1,51 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2014 by Markus Pargmann <mpa@pengutronix.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_BATCTL) += batctl
+
+#
+# Paths and names
+#
+BATCTL_VERSION	:= 2014.1.0
+BATCTL_MD5		:= 92fd4cb60e38ec952fb5fdda4b2e6933
+BATCTL		:= batctl-$(BATCTL_VERSION)
+BATCTL_SUFFIX	:= tar.gz
+BATCTL_URL		:= http://downloads.open-mesh.org/batman/stable/sources/batctl/$(BATCTL).$(BATCTL_SUFFIX)
+BATCTL_SOURCE	:= $(SRCDIR)/$(BATCTL).$(BATCTL_SUFFIX)
+BATCTL_DIR		:= $(BUILDDIR)/$(BATCTL)
+BATCTL_LICENSE	:= unknown
+
+
+BATCTL_CONF_TOOL	:= NO
+BATCTL_MAKE_ENV	:= $(CROSS_ENV)
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/batctl.targetinstall:
+	@$(call targetinfo)
+
+	@$(call install_init, batctl)
+	@$(call install_fixup, batctl,PRIORITY,optional)
+	@$(call install_fixup, batctl,SECTION,base)
+	@$(call install_fixup, batctl,AUTHOR,"Markus Pargmann <mpa@pengutronix.de>")
+	@$(call install_fixup, batctl,DESCRIPTION,missing)
+
+	@$(call install_copy, batctl, 0, 0, 0755, $(BATCTL_DIR)/batctl, /usr/bin/batctl)
+
+	@$(call install_finish, batctl)
+
+	@$(call touch)
+
+# vim: syntax=make
-- 
2.0.0.rc0


-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH v2 4/8] crda: version bump 1.1.3 -> 3.13

[Markus Pargmann]

There are some problems in the new version which get fixed by the
additional patches.

Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
---
 patches/crda-1.1.3/series                          |  4 --
 .../0001-key2pub-Fix-ssl-keys.c-generation.patch   | 38 +++++++++++++++++
 .../0002-Pregenerate-keys-ssl.c.patch}             | 40 +++++++-----------
 .../0003-udev-Fix-rule-for-initial-setup.patch     | 23 +++++++++++
 .../crda-3.13/0004-Makefile-Fix-libreg-build.patch | 48 ++++++++++++++++++++++
 patches/crda-3.13/series                           |  4 ++
 rules/crda.make                                    |  9 ++--
 7 files changed, 132 insertions(+), 34 deletions(-)
 delete mode 100644 patches/crda-1.1.3/series
 create mode 100644 patches/crda-3.13/0001-key2pub-Fix-ssl-keys.c-generation.patch
 rename patches/{crda-1.1.3/0001-Pregenerate-keys-ssl.c.patch => crda-3.13/0002-Pregenerate-keys-ssl.c.patch} (60%)
 create mode 100644 patches/crda-3.13/0003-udev-Fix-rule-for-initial-setup.patch
 create mode 100644 patches/crda-3.13/0004-Makefile-Fix-libreg-build.patch
 create mode 100644 patches/crda-3.13/series

diff --git a/patches/crda-1.1.3/series b/patches/crda-1.1.3/series
deleted file mode 100644
index 348caf1..0000000
--- a/patches/crda-1.1.3/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-Pregenerate-keys-ssl.c.patch
-# aa6be6d26b37ec911763a7e1eefe3128  - git-ptx-patches magic
diff --git a/patches/crda-3.13/0001-key2pub-Fix-ssl-keys.c-generation.patch b/patches/crda-3.13/0001-key2pub-Fix-ssl-keys.c-generation.patch
new file mode 100644
index 0000000..b67e801
--- /dev/null
+++ b/patches/crda-3.13/0001-key2pub-Fix-ssl-keys.c-generation.patch
@@ -0,0 +1,38 @@
+From 7394c6f238fccd893f0927ef4e768165e561c3d2 Mon Sep 17 00:00:00 2001
+From: Markus Pargmann <mpa@pengutronix.de>
+Date: Thu, 17 Apr 2014 14:40:49 +0200
+Subject: [PATCH 1/4] key2pub: Fix ssl-keys.c generation
+
+This patch fixes the generated ssl-keys.c file. Without these fixes,
+crda does not compile with ssl.
+
+Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
+---
+ utils/key2pub.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/utils/key2pub.py b/utils/key2pub.py
+index 3e84cd2..7de45f7 100755
+--- a/utils/key2pub.py
++++ b/utils/key2pub.py
+@@ -59,7 +59,7 @@ def print_ssl_32(output, name, val):
+ 
+ def print_ssl(output, name, val):
+     import struct
+-    output.write('#include <stdint.h>\n')
++    output.write('#include <stdint.h>\n#include <openssl/bn.h>\n')
+     if len(struct.pack('@L', 0)) == 8:
+         return print_ssl_64(output, name, val)
+     else:
+@@ -78,7 +78,7 @@ struct pubkey {
+ 
+ #define KEYS(e,n)	{ KEY(e), KEY(n), }
+ 
+-static struct pubkey keys[] = {
++__attribute__((unused)) static struct pubkey keys[] = {
+ ''')
+     for n in xrange(n + 1):
+         output.write('	KEYS(e_%d, n_%d),\n' % (n, n))
+-- 
+1.9.0
+
diff --git a/patches/crda-1.1.3/0001-Pregenerate-keys-ssl.c.patch b/patches/crda-3.13/0002-Pregenerate-keys-ssl.c.patch
similarity index 60%
rename from patches/crda-1.1.3/0001-Pregenerate-keys-ssl.c.patch
rename to patches/crda-3.13/0002-Pregenerate-keys-ssl.c.patch
index 0fda5d1..10c19a2 100644
--- a/patches/crda-1.1.3/0001-Pregenerate-keys-ssl.c.patch
+++ b/patches/crda-3.13/0002-Pregenerate-keys-ssl.c.patch
@@ -1,38 +1,23 @@
+From a314b1075e456268abe3f571fd00fd63e9a59c9b Mon Sep 17 00:00:00 2001
 From: Jan Luebbe <jlu@pengutronix.de>
 Date: Thu, 26 Jan 2012 15:33:36 +0100
-Subject: [PATCH] Pregenerate keys-ssl.c
+Subject: [PATCH 2/4] Pregenerate keys-ssl.c
 
+Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
 ---
- Makefile   |    8 ++++----
- keys-ssl.c |   38 ++++++++++++++++++++++++++++++++++++++
- 2 files changed, 42 insertions(+), 4 deletions(-)
+ keys-ssl.c | 41 +++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 41 insertions(+)
  create mode 100644 keys-ssl.c
 
-diff --git a/Makefile b/Makefile
-index 084d8e5..80e3539 100644
---- a/Makefile
-+++ b/Makefile
-@@ -93,10 +93,10 @@ $(REG_BIN):
- 	$(NQ)
- 	$(Q) exit 1
- 
--keys-%.c: utils/key2pub.py $(wildcard $(PUBKEY_DIR)/*.pem)
--	$(NQ) '  GEN ' $@
--	$(NQ) '  Trusted pubkeys:' $(wildcard $(PUBKEY_DIR)/*.pem)
--	$(Q)./utils/key2pub.py --$* $(wildcard $(PUBKEY_DIR)/*.pem) $@
-+#keys-%.c: utils/key2pub.py $(wildcard $(PUBKEY_DIR)/*.pem)
-+#	$(NQ) '  GEN ' $@
-+#	$(NQ) '  Trusted pubkeys:' $(wildcard $(PUBKEY_DIR)/*.pem)
-+#	$(Q)./utils/key2pub.py --$* $(wildcard $(PUBKEY_DIR)/*.pem) $@
- 
- %.o: %.c regdb.h
- 	$(NQ) '  CC  ' $@
 diff --git a/keys-ssl.c b/keys-ssl.c
 new file mode 100644
-index 0000000..a8c1b7e
+index 0000000..7318c03
 --- /dev/null
 +++ b/keys-ssl.c
-@@ -0,0 +1,38 @@
+@@ -0,0 +1,41 @@
++#include <stdint.h>
++#include <openssl/bn.h>
++
 +static BN_ULONG e_0[1] = {
 +	0x00010001, 
 +};
@@ -68,6 +53,9 @@ index 0000000..a8c1b7e
 +
 +#define KEYS(e,n)	{ KEY(e), KEY(n), }
 +
-+static struct pubkey keys[] = {
++__attribute__((unused)) static struct pubkey keys[] = {
 +	KEYS(e_0, n_0),
 +};
+-- 
+1.9.0
+
diff --git a/patches/crda-3.13/0003-udev-Fix-rule-for-initial-setup.patch b/patches/crda-3.13/0003-udev-Fix-rule-for-initial-setup.patch
new file mode 100644
index 0000000..e91b154
--- /dev/null
+++ b/patches/crda-3.13/0003-udev-Fix-rule-for-initial-setup.patch
@@ -0,0 +1,23 @@
+From 2634bae34b4cb0870ee1f4f1cea228897307fe4c Mon Sep 17 00:00:00 2001
+From: Markus Pargmann <mpa@pengutronix.de>
+Date: Thu, 17 Apr 2014 11:59:59 +0200
+Subject: [PATCH 3/4] udev: Fix rule for initial setup
+
+Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
+---
+ udev/regulatory.rules | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/udev/regulatory.rules b/udev/regulatory.rules
+index 3d6add8..90ac539 100644
+--- a/udev/regulatory.rules
++++ b/udev/regulatory.rules
+@@ -2,4 +2,4 @@
+ # For more information see:
+ # http://wireless.kernel.org/en/developers/Regulatory/CRDA
+ 
+-KERNEL=="regulatory*", ACTION=="change", SUBSYSTEM=="platform", RUN+="$(SBINDIR)crda"
++KERNEL=="regulatory*", ACTION=="add|change", SUBSYSTEM=="platform", RUN+="$(SBINDIR)crda"
+-- 
+1.9.0
+
diff --git a/patches/crda-3.13/0004-Makefile-Fix-libreg-build.patch b/patches/crda-3.13/0004-Makefile-Fix-libreg-build.patch
new file mode 100644
index 0000000..3ca3ae7
--- /dev/null
+++ b/patches/crda-3.13/0004-Makefile-Fix-libreg-build.patch
@@ -0,0 +1,48 @@
+From c0074b4554322f16f3547e647cf2b15613e6f7bb Mon Sep 17 00:00:00 2001
+From: Markus Pargmann <mpa@pengutronix.de>
+Date: Thu, 17 Apr 2014 15:34:35 +0200
+Subject: [PATCH 4/4] Makefile: Fix libreg build
+
+Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
+---
+ Makefile | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 4a351c6..b07d8ad 100644
+--- a/Makefile
++++ b/Makefile
+@@ -5,8 +5,8 @@ REG_GIT?=git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-regdb.g
+ 
+ PREFIX ?= /usr/
+ MANDIR ?= $(PREFIX)/share/man/
+-INCLUDE_DIR ?= $(PREFIX)/include/reglib/
+-LIBDIR ?= $(PREFIX)/lib
++INCLUDE_DIR ?= /include/reglib/
++LIBDIR ?= /lib/
+ 
+ SBINDIR ?= /sbin/
+ 
+@@ -119,14 +119,14 @@ $(LIBREG): regdb.h reglib.h reglib.c
+ 
+ install-libreg-headers:
+ 	$(NQ) '  INSTALL  libreg-headers'
+-	$(Q)mkdir -p $(INCLUDE_DIR)
+-	$(Q)cp *.h $(INCLUDE_DIR)/
++	$(Q)$(MKDIR) $(DESTDIR)/$(INCLUDE_DIR)
++	$(Q)$(INSTALL) -m 644 -t $(DESTDIR)/$(INCLUDE_DIR) *.h
+ 
+ install-libreg:
+ 	$(NQ) '  INSTALL  libreg'
+-	$(Q)mkdir -p $(LIBDIR)
+-	$(Q)cp $(LIBREG) $(LIBDIR)/
+-	$(Q)ldconfig
++	$(Q)$(MKDIR) $(LIBDIR)
++	$(Q)$(INSTALL) -m 644 -t $(DESTDIR)/$(LIBDIR) $(LIBREG)
++#	$(Q)ldconfig
+ 
+ %.o: %.c regdb.h $(LIBREG)
+ 	$(NQ) '  CC  ' $@
+-- 
+1.9.0
+
diff --git a/patches/crda-3.13/series b/patches/crda-3.13/series
new file mode 100644
index 0000000..ae68329
--- /dev/null
+++ b/patches/crda-3.13/series
@@ -0,0 +1,4 @@
+0001-key2pub-Fix-ssl-keys.c-generation.patch
+0002-Pregenerate-keys-ssl.c.patch
+0003-udev-Fix-rule-for-initial-setup.patch
+0004-Makefile-Fix-libreg-build.patch
diff --git a/rules/crda.make b/rules/crda.make
index 18069e1..e9b8db9 100644
--- a/rules/crda.make
+++ b/rules/crda.make
@@ -16,11 +16,11 @@ PACKAGES-$(PTXCONF_CRDA) += crda
 #
 # Paths and names
 #
-CRDA_VERSION	:= 1.1.3
-CRDA_MD5	:= 29579185e06a75675507527243d28e5c
+CRDA_VERSION	:= 3.13
+CRDA_MD5	:= 66b1b0417c1ad19f0009a5c0c0c1aebc
 CRDA		:= crda-$(CRDA_VERSION)
-CRDA_SUFFIX	:= tar.bz2
-CRDA_URL	:= http://linuxwireless.org/download/crda/$(CRDA).$(CRDA_SUFFIX)
+CRDA_SUFFIX	:= tar.xz
+CRDA_URL	:= $(call ptx/mirror, KERNEL, ../software/network/crda/$(CRDA).$(CRDA_SUFFIX))
 CRDA_SOURCE	:= $(SRCDIR)/$(CRDA).$(CRDA_SUFFIX)
 CRDA_DIR	:= $(BUILDDIR)/$(CRDA)
 CRDA_LICENSE	:= unknown
@@ -58,6 +58,7 @@ $(STATEDIR)/crda.targetinstall:
 	@$(call install_copy, crda, 0, 0, 0755, -, /sbin/regdbdump)
 	@$(call install_copy, crda, 0, 0, 0644, -, \
 		/lib/udev/rules.d/85-regulatory.rules)
+	@$(call install_lib, crda, 0, 0, 0644, libreg)
 
 	# regulatory.bin was downloaded from:
 	# git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-regdb.git
-- 
2.0.0.rc0


-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH v2 5/8] dnsmasq: version bump 2.47 -> 2.70

[Markus Pargmann]

The newer version of dnsmasq now includes IPv6 router advertisement
support. This patch also changes to tar.xz.

Some new compile time options are added, including DNSSEC support.

Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
---

Notes:
    Changes in v2:
     - Added compiletime options introduced between 2.47 and 2.70
     - version bump to 2.70

 rules/dnsmasq.in   | 31 +++++++++++++++++++++++++++++++
 rules/dnsmasq.make | 23 ++++++++++++++++++++---
 2 files changed, 51 insertions(+), 3 deletions(-)

diff --git a/rules/dnsmasq.in b/rules/dnsmasq.in
index ed342d9..60499eb 100644
--- a/rules/dnsmasq.in
+++ b/rules/dnsmasq.in
@@ -41,6 +41,37 @@ config DNSMASQ_TFTP
 	help
 	  This includes TFTP services into dnsmasq
 
+config DNSMASQ_DHCP
+	bool
+	default y
+	prompt "include DHCP"
+	help
+	  This includes DHCP services into dnsmasq
+
+config DNSMASQ_SCRIPT
+	bool
+	default y
+	depends on DNSMASQ_DHCP
+	prompt "include lease script support"
+	help
+	  Without this option it is not possible to call scripts when a lease changes
+
+config DNSMASQ_SCRIPT_LUA
+	bool
+	default n
+	depends on DNSMASQ_SCRIPT
+	prompt "include lease script LUA support"
+	help
+	  This includes LUA script capabilities for lease scripts
+
+config DNSMASQ_DNSSEC
+	bool
+	default n
+	prompt "include DNSSEC support"
+	select NETTLE
+	help
+	  Without this option it is not possible to call scripts when a lease changes
+
 comment "runtime options   ---"
 
 choice
diff --git a/rules/dnsmasq.make b/rules/dnsmasq.make
index 675bf5c..9189c33 100644
--- a/rules/dnsmasq.make
+++ b/rules/dnsmasq.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_DNSMASQ) += dnsmasq
 #
 # Paths and names
 #
-DNSMASQ_VERSION		:= 2.47
-DNSMASQ_MD5		:= 4524081e56d0b935717d493e8e8d3e11
+DNSMASQ_VERSION		:= 2.70
+DNSMASQ_MD5		:= 1d654e80888ab5dbba015548fd284d46
 DNSMASQ			:= dnsmasq-$(DNSMASQ_VERSION)
-DNSMASQ_SUFFIX		:= tar.gz
+DNSMASQ_SUFFIX		:= tar.xz
 DNSMASQ_URL		:= http://www.thekelleys.org.uk/dnsmasq/$(DNSMASQ).$(DNSMASQ_SUFFIX)
 DNSMASQ_SOURCE		:= $(SRCDIR)/$(DNSMASQ).$(DNSMASQ_SUFFIX)
 DNSMASQ_DIR		:= $(BUILDDIR)/$(DNSMASQ)
@@ -38,10 +38,27 @@ DNSMASQ_COPT :=
 ifndef PTXCONF_DNSMASQ_TFTP
 DNSMASQ_COPT += -DNO_TFTP
 endif
+
 ifndef PTXCONF_GLOBAL_IPV6
 DNSMASQ_COPT += -DNO_IPV6
 endif
 
+ifndef PTXCONF_DNSMASQ_DHCP
+DNSMASQ_COPT += -DNO_DHCP
+else
+ifndef PTXCONF_DNSMASQ_SCRIPT
+DNSMASQ_COPT += -DNO_SCRIPT
+else
+ifndef PTXCONF_DNSMASQ_SCRIPT_LUA
+DNSMASQ_COPT += -DHAVE_LUASCRIPT
+endif
+endif
+endif
+
+ifdef DNSMASQ_DNSSEC
+DNSMASQ_COPT += -DHAVE_DNSSEC
+endif
+
 DNSMASQ_MAKEVARS := PREFIX=/usr AWK=awk COPTS='$(DNSMASQ_COPT)'
 
 $(STATEDIR)/dnsmasq.prepare:
-- 
2.0.0.rc0


-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH v2 6/8] iperf: version bump 2.0.4 -> 2.0.5

[Markus Pargmann]

Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
---
 patches/{iperf-2.0.4 => iperf-2.0.5}/fix_early_termination.diff | 0
 patches/{iperf-2.0.4 => iperf-2.0.5}/series                     | 0
 rules/iperf.make                                                | 4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename patches/{iperf-2.0.4 => iperf-2.0.5}/fix_early_termination.diff (100%)
 rename patches/{iperf-2.0.4 => iperf-2.0.5}/series (100%)

diff --git a/patches/iperf-2.0.4/fix_early_termination.diff b/patches/iperf-2.0.5/fix_early_termination.diff
similarity index 100%
rename from patches/iperf-2.0.4/fix_early_termination.diff
rename to patches/iperf-2.0.5/fix_early_termination.diff
diff --git a/patches/iperf-2.0.4/series b/patches/iperf-2.0.5/series
similarity index 100%
rename from patches/iperf-2.0.4/series
rename to patches/iperf-2.0.5/series
diff --git a/rules/iperf.make b/rules/iperf.make
index c5e08e9..8f73dfc 100644
--- a/rules/iperf.make
+++ b/rules/iperf.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_IPERF) += iperf
 #
 # Paths and names
 #
-IPERF_VERSION	:= 2.0.4
-IPERF_MD5	:= 8c5bc14cc2ea55f18f22afe3c23e3dcb
+IPERF_VERSION	:= 2.0.5
+IPERF_MD5	:= 44b5536b67719f4250faed632a3cd016
 IPERF		:= iperf-$(IPERF_VERSION)
 IPERF_SUFFIX	:= tar.gz
 IPERF_URL	:= $(call ptx/mirror, SF, iperf/$(IPERF).$(IPERF_SUFFIX))
-- 
2.0.0.rc0


-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH v2 7/8] wireshark: version bump 1.10.5 -> 1.10.6

[Markus Pargmann]

Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
---
 rules/wireshark.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/wireshark.make b/rules/wireshark.make
index 517dbbb..b3fcb93 100644
--- a/rules/wireshark.make
+++ b/rules/wireshark.make
@@ -18,8 +18,8 @@ PACKAGES-$(PTXCONF_WIRESHARK) += wireshark
 #
 # Paths and names
 #
-WIRESHARK_VERSION	:= 1.10.5
-WIRESHARK_MD5		:= a66894a62f05e1e7a3156a807f3296ea
+WIRESHARK_VERSION	:= 1.10.6
+WIRESHARK_MD5		:= c67435039d67ef1757bfff0ab88824ab
 WIRESHARK		:= wireshark-$(WIRESHARK_VERSION)
 WIRESHARK_SUFFIX	:= tar.bz2
 WIRESHARK_URL		:= http://www.wireshark.org/download/src/all-versions/$(WIRESHARK).$(WIRESHARK_SUFFIX)
-- 
2.0.0.rc0


-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH v2 8/8] libjpeg: version bump 8a -> 9a, add binaries

[Markus Pargmann]

cjpeg and djpeg are simple programs that use libjpeg to
compress/decompress jpeg images.

Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
---
 rules/libjpeg.in   | 15 +++++++++++++--
 rules/libjpeg.make |  8 ++++++--
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/rules/libjpeg.in b/rules/libjpeg.in
index 30cea58..e9f1b66 100644
--- a/rules/libjpeg.in
+++ b/rules/libjpeg.in
@@ -1,7 +1,18 @@
 ## SECTION=system_libraries
 
-config LIBJPEG
+menuconfig LIBJPEG
 	tristate
-	prompt "libjpeg"
+	prompt "libjpeg                       "
 	help
 	  libjpeg is a library for handling the JPEG (JFIF) image format.
+
+if LIBJPEG
+
+config LIBJPEG_BIN
+	bool
+	prompt "Install libjpeg binaries cjpeg and djpeg"
+	help
+	  cjpeg and djpeg are simple bineries to convert some basic image
+	  formats to jpeg (cjpeg) or convert them back from jpeg (djpeg)
+
+endif
diff --git a/rules/libjpeg.make b/rules/libjpeg.make
index c86d408..3ca715e 100644
--- a/rules/libjpeg.make
+++ b/rules/libjpeg.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_LIBJPEG) += libjpeg
 #
 # Paths and names
 #
-LIBJPEG_VERSION	:= 8a
-LIBJPEG_MD5	:= 5146e68be3633c597b0d14d3ed8fa2ea
+LIBJPEG_VERSION	:= 9a
+LIBJPEG_MD5	:= 3353992aecaee1805ef4109aadd433e7
 LIBJPEG_SUFFIX	:= tar.gz
 LIBJPEG		:= jpeg-$(LIBJPEG_VERSION)
 LIBJPEG_TARBALL	:= jpegsrc.v$(LIBJPEG_VERSION).$(LIBJPEG_SUFFIX)
@@ -47,6 +47,10 @@ $(STATEDIR)/libjpeg.targetinstall:
 	@$(call install_fixup, libjpeg,DESCRIPTION,missing)
 
 	@$(call install_lib, libjpeg, 0, 0, 0644, libjpeg)
+ifdef PTXCONF_LIBJPEG_BIN
+	@$(call install_copy, libjpeg, 0, 0, 0755, -, /usr/bin/cjpeg)
+	@$(call install_copy, libjpeg, 0, 0, 0755, -, /usr/bin/djpeg)
+endif
 
 	@$(call install_finish, libjpeg)
 
-- 
2.0.0.rc0


-- 
ptxdist mailing list
ptxdist@pengutronix.de