openssh: remove bbappend

The ptest patch is apparently not relevant anymore. Although the original
commit doesn't specify what the errors were, I ported the patch to
openssh_7.1p2 and ran the ptests with and without the patch. The output
was identical regardless. There were some errors, but unrelated to the
patch changes. So I'm dropping the patch for now.

Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>
Signed-off-by: Nora Björklund <nora.bjorklund@enea.com>

2 files changed, 0 insertions, 60 deletions

diff --git a/recipes-connectivity/openssh/openssh/openssh-ptest-fix-sshconnect.patch b/recipes-connectivity/openssh/openssh/openssh-ptest-fix-sshconnect.patch
deleted file mode 100644
index 0913701..0000000
--- a/recipes-connectivity/openssh/openssh/openssh-ptest-fix-sshconnect.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Fixed openssh ptest
-
-ptests for openssh, apart from a lot of .sh scripts, also
-require 2 executables to be cross-compiled for the target
-and deployed there, that will be called from the test
-scripts.
-
-Those 2 files were not built when cross-compiling
-(Makefile target all:), so I added them to the build,
-under the target all_test.
-
-This new make target is intended to be run from
-do_compile_ptest(), that builds everything needed for
-performing the ptests.
-
-Because both these 2 executables required for ptest
-are linked with libssh (LDFLAGS += -lssh), I also
-added it as dependency for each of them.
-
-Upstream-status: Inappropriate
-
-Signed-off-by: Liviu Gheorghisan <liviu.gheorghisan@enea.com>
----
---- a/Makefile.in       2014-12-10 16:19:37.513373454 +0100
-+++ b/Makefile.in       2014-12-10 16:25:23.262764227 +0100
-@@ -130,6 +130,8 @@ FIXALGORITHMSCMD= $(SHELL) $(srcdir)/fix
- 
- all: $(CONFIGFILES) $(MANPAGES) $(TARGETS)
- 
-+all_test: regress/modpipe$(EXEEXT) regress/setuid-allowed$(EXEEXT)
-+
- $(LIBSSH_OBJS): Makefile.in config.h
- $(SSHOBJS): Makefile.in config.h
- $(SSHDOBJS): Makefile.in config.h
-@@ -394,18 +396,18 @@ uninstall:
-        -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-pkcs11-helper.8
-        -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
- 
--regress/modpipe$(EXEEXT): $(srcdir)/regress/modpipe.c
-+regress/modpipe$(EXEEXT): libssh.a
-        [ -d `pwd`/regress ]  ||  mkdir -p `pwd`/regress
-        [ -f `pwd`/regress/Makefile ]  || \
-            ln -s `cd $(srcdir) && pwd`/regress/Makefile `pwd`/regress/Makefile
--       $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $? \
-+       $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $(srcdir)/regress/modpipe.c \
-        $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS)
- 
--regress/setuid-allowed$(EXEEXT): $(srcdir)/regress/setuid-allowed.c
-+regress/setuid-allowed$(EXEEXT): libssh.a
-        [ -d `pwd`/regress ]  ||  mkdir -p `pwd`/regress
-        [ -f `pwd`/regress/Makefile ]  || \
-            ln -s `cd $(srcdir) && pwd`/regress/Makefile `pwd`/regress/Makefile
--       $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $? \
-+       $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $(srcdir)/regress/setuid-allowed.c \
-        $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS)
- 
- tests interop-tests:   $(TARGETS) regress/modpipe$(EXEEXT) regress/setuid-allowed$(EXEEXT)
diff --git a/recipes-connectivity/openssh/openssh_6.6p1.bbappend b/recipes-connectivity/openssh/openssh_6.6p1.bbappend
deleted file mode 100644
index 2e8ca80..0000000
--- a/recipes-connectivity/openssh/openssh_6.6p1.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI += " file://openssh-ptest-fix-sshconnect.patch \