From 1422f63b03c5fcfa4beafb23448364b542e8bc7b Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <holger@moiji-mobile.com>
Date: Sun, 12 Jul 2015 11:49:17 +0200
Subject: [PATCH] autossh: Add a small ssh spawner/link tester

---
 recipes-apps/autossh/autossh_1.4e.bb          | 18 +++++++++++++
 .../files/020_use_destdir_makefile.diff       | 25 +++++++++++++++++++
 .../autossh/files/022_pass_ldflags.diff       | 17 +++++++++++++
 recipes-apps/tasks/task-sysmocom-feed.bb      |  2 +-
 4 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 recipes-apps/autossh/autossh_1.4e.bb
 create mode 100644 recipes-apps/autossh/files/020_use_destdir_makefile.diff
 create mode 100644 recipes-apps/autossh/files/022_pass_ldflags.diff

diff --git a/recipes-apps/autossh/autossh_1.4e.bb b/recipes-apps/autossh/autossh_1.4e.bb
new file mode 100644
index 0000000..d761afc
--- /dev/null
+++ b/recipes-apps/autossh/autossh_1.4e.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "autossh"
+LICENSE = "MIT"
+
+
+LIC_FILES_CHKSUM = "file://autossh.c;endline=22;md5=b2b08187a92c97723e1d882a9fe657ac"
+SRC_URI = "http://www.harding.motd.ca/autossh/autossh-${PV}.tgz \
+	file://020_use_destdir_makefile.diff \
+	file://022_pass_ldflags.diff"
+
+SRC_URI[md5sum] = "f86684b96e99d22b2e9d35dc63b0aa29"
+SRC_URI[sha256sum] = "9e8e10a59d7619176f4b986e256f776097a364d1be012781ea52e08d04679156"
+
+inherit autotools
+
+
+PACKAGES += "${PN}-examples"
+
+FILES_${PN}-examples = "${datadir}/examples/*"
diff --git a/recipes-apps/autossh/files/020_use_destdir_makefile.diff b/recipes-apps/autossh/files/020_use_destdir_makefile.diff
new file mode 100644
index 0000000..9485b6d
--- /dev/null
+++ b/recipes-apps/autossh/files/020_use_destdir_makefile.diff
@@ -0,0 +1,25 @@
+Support for $DESTDIR in the Makefile.
+
+From debian
+
+Index: autossh-1.4e/Makefile.in
+===================================================================
+--- autossh-1.4e.orig/Makefile.in	2015-02-10 05:41:58.000000000 +0100
++++ autossh-1.4e/Makefile.in	2015-07-12 11:44:41.979659656 +0200
+@@ -6,11 +6,11 @@
+ 
+ SSH=		@path_ssh@
+ 
+-prefix=		@prefix@
+-exec_prefix=	@exec_prefix@
+-bindir=		@bindir@
+-datadir=	@datadir@
+-mandir=		@mandir@
++prefix=		${DESTDIR}@prefix@
++exec_prefix=	${DESTDIR}@exec_prefix@
++bindir=		${DESTDIR}@bindir@
++datadir=	${DESTDIR}@datadir@
++mandir=		${DESTDIR}@mandir@
+ 
+ SRCDIR=		@srcdir@
+ VPATH=		@srcdir@
diff --git a/recipes-apps/autossh/files/022_pass_ldflags.diff b/recipes-apps/autossh/files/022_pass_ldflags.diff
new file mode 100644
index 0000000..722a20a
--- /dev/null
+++ b/recipes-apps/autossh/files/022_pass_ldflags.diff
@@ -0,0 +1,17 @@
+Description: Properly pass LDFLAGS. Fixes lintian warning hardening-no-relro
+Author: Axel Beckert <abe@debian.org>
+
+Index: autossh/Makefile.in
+===================================================================
+--- autossh.orig/Makefile.in	2013-05-16 14:51:47.000000000 +0200
++++ autossh/Makefile.in	2013-05-16 14:53:19.000000000 +0200
+@@ -31,7 +31,7 @@
+ 
+ 
+ $(TARGET):	$(OFILES)
+-		$(CC) $(CPPFLAGS) -o $(TARGET) $(OFILES) $(LIBS)
++		$(CC) $(CPPFLAGS) $(LDFLAGS) -o $(TARGET) $(OFILES) $(LIBS)
+ 
+ clean:
+ 		- /bin/rm -f *.o *.a *.core *~
+
diff --git a/recipes-apps/tasks/task-sysmocom-feed.bb b/recipes-apps/tasks/task-sysmocom-feed.bb
index 135d08b..d2fb9fd 100644
--- a/recipes-apps/tasks/task-sysmocom-feed.bb
+++ b/recipes-apps/tasks/task-sysmocom-feed.bb
@@ -14,5 +14,5 @@ RDEPENDS_${PN} = "\
 	python-pyserial python-pexpect bridge-utils \
 	pciutils nfacct logrotate dnsmasq ifupdown \
 	logrotate python-jsonrpclib python-enum iputils \
-	packagegroup-sysmobts-sob rtl8169-eeprom \
+	packagegroup-sysmobts-sob rtl8169-eeprom autossh \
 	perl libdbd-sqlite-perl libdbi-perl libjson-perl"