[ptxdist] [PATCHv2] inadyn: version bump to 1.99.13

[ptxdist] [PATCHv2] inadyn: version bump to 1.99.13

[Oliver Graute]

* bugfix issue #82: 'No rule to make target CHANGELOG'
* added menu option to select openssl

Signed-off-by: Oliver Graute <oliver.graute@neuhaus.de>
---
 .../inadyn-1.99.13/0001-ChangeLog_Issue-82.patch   |   17 +++++++++++++++
 patches/inadyn-1.99.13/autogen.sh                  |    7 ++++++
 patches/inadyn-1.99.13/series                      |    1 +
 rules/inadyn.in                                    |   11 +++++++++-
 rules/inadyn.make                                  |   23 +++++++++++++-------
 5 files changed, 50 insertions(+), 9 deletions(-)
 create mode 100644 patches/inadyn-1.99.13/0001-ChangeLog_Issue-82.patch
 create mode 100755 patches/inadyn-1.99.13/autogen.sh
 create mode 100644 patches/inadyn-1.99.13/series

diff --git a/patches/inadyn-1.99.13/0001-ChangeLog_Issue-82.patch b/patches/inadyn-1.99.13/0001-ChangeLog_Issue-82.patch
new file mode 100644
index 0000000..3acefd2
--- /dev/null
+++ b/patches/inadyn-1.99.13/0001-ChangeLog_Issue-82.patch
@@ -0,0 +1,17 @@
+From: Oliver Graute <oliver.graute@neuhaus.de>
+Date: Thu, 01 Oct 2014 17:00:22 +0200
+Subject: [PATCH] makerule patch for cross compile
+
+
+diff -rupN BM/Makefile.am BN/Makefile.am
+--- BM/Makefile.am	2015-04-27 16:42:12.774690084 +0200
++++ BN/Makefile.am	2015-04-27 16:40:22.431277983 +0200
+@@ -1,7 +1,7 @@
+ ## Inadyn - A small and simple DDNS client                -*-Makefile-*-
+ 
+ SUBDIRS         = src include man
+-doc_DATA	= AUTHORS COPYING NEWS CHANGELOG README
++doc_DATA	= README AUTHORS COPYING NEWS ChangeLog
+ EXTRA_DIST	= autogen.sh
+ DISTCLEANFILES	= *~ DEADJOE semantic.cache *.gdb *.elf core core.* *.d
+ 
diff --git a/patches/inadyn-1.99.13/autogen.sh b/patches/inadyn-1.99.13/autogen.sh
new file mode 100755
index 0000000..8c93f67
--- /dev/null
+++ b/patches/inadyn-1.99.13/autogen.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+# Use v1.11 for backwards compat with Ubuntu 12.04 LTS
+export ACLOCAL=aclocal-1.11
+export AUTOMAKE=automake-1.11
+
+autoreconf -vi
diff --git a/patches/inadyn-1.99.13/series b/patches/inadyn-1.99.13/series
new file mode 100644
index 0000000..71a082a
--- /dev/null
+++ b/patches/inadyn-1.99.13/series
@@ -0,0 +1 @@
+0001-ChangeLog_Issue-82.patch
diff --git a/rules/inadyn.in b/rules/inadyn.in
index 9514fce..9e6b0af 100644
--- a/rules/inadyn.in
+++ b/rules/inadyn.in
@@ -1,5 +1,5 @@
 ## SECTION=networking
-config INADYN
+menuconfig INADYN
 	tristate
 	prompt "inadyn"
 	help
@@ -7,3 +7,12 @@ config INADYN
 	  To configure this tool use your own projectroot/etc/inadyn.conf file.
 	  You can use the generic one coming with ptxdist as a template.
 
+if INADYN
+
+config INADYN_OPENSSL
+	bool
+	prompt "Enable openssl support"
+	help
+	  Enable openssl support for inadyn
+
+endif
diff --git a/rules/inadyn.make b/rules/inadyn.make
index df83fca..93c3fd3 100644
--- a/rules/inadyn.make
+++ b/rules/inadyn.make
@@ -18,20 +18,27 @@ PACKAGES-$(PTXCONF_INADYN) += inadyn
 #
 # Paths and names
 #
-INADYN_VERSION	:= 1.96.2
-INADYN_MD5	:= fecb4c970811cb0c8b8d2ffcd7792879
+INADYN_VERSION	:= 1.99.13
+INADYN_MD5	:= 38f07f98fce75b48ea13d47620176311
 INADYN		:= inadyn-$(INADYN_VERSION)
-INADYN_SUFFIX	:= tar.bz2
-INADYN_URL	:= http://www.pengutronix.de/software/ptxdist/temporary-src/$(INADYN).$(INADYN_SUFFIX)
+INADYN_SUFFIX	:= tar.xz
+INADYN_URL		:= https://github.com/troglobit/inadyn/releases/download/$(INADYN_VERSION)/inadyn-$(INADYN_VERSION).$(INADYN_SUFFIX)
 INADYN_SOURCE	:= $(SRCDIR)/$(INADYN).$(INADYN_SUFFIX)
 INADYN_DIR	:= $(BUILDDIR)/$(INADYN)
 
 # ----------------------------------------------------------------------------
-# Compile
+# Prepare
 # ----------------------------------------------------------------------------
 
-INADYN_MAKE_ENV	:= $(CROSS_ENV)
-INADYN_MAKE_OPT	:= TARGET_ARCH=linux
+#
+# autoconf
+#
+INADYN_CONF_TOOL	:= autoconf
+INADYN_CONF_OPT := \
+	$(CROSS_AUTOCONF_USR) \
+ifdef PTXCONF_INADYN_OPENSSL
+	INADYN_CONF_OPT += --enable-openssl
+
 
 # ----------------------------------------------------------------------------
 # Install
@@ -39,7 +46,7 @@ INADYN_MAKE_OPT	:= TARGET_ARCH=linux
 
 $(STATEDIR)/inadyn.install:
 	@$(call targetinfo)
-	install -D -m755 $(INADYN_DIR)/bin/linux/inadyn \
+	install -D -m755 $(INADYN_DIR)/src/inadyn \
 		$(INADYN_PKGDIR)/sbin/inadyn
 	@$(call touch)
 
-- 
1.7.9.5


-- 
ptxdist mailing list
ptxdist@pengutronix.de