From 06fadf406d567c15a99affc5b27adc4a7e6846c2 Mon Sep 17 00:00:00 2001 From: Michael Mair-Keimberger Date: Tue, 5 Mar 2019 17:51:24 +0100 Subject: net-misc/openssh: remove unused patches Signed-off-by: Michael Mair-Keimberger Signed-off-by: Aaron Bauman --- .../openssh-7.9_p1-X509-dont-make-piddir.patch | 16 ------------- .../openssh/files/openssh-7.9_p1-X509-glue.patch | 28 ---------------------- .../files/openssh-7.9_p1-libressl-2.8.patch | 16 ------------- 3 files changed, 60 deletions(-) delete mode 100644 net-misc/openssh/files/openssh-7.9_p1-X509-dont-make-piddir.patch delete mode 100644 net-misc/openssh/files/openssh-7.9_p1-X509-glue.patch delete mode 100644 net-misc/openssh/files/openssh-7.9_p1-libressl-2.8.patch diff --git a/net-misc/openssh/files/openssh-7.9_p1-X509-dont-make-piddir.patch b/net-misc/openssh/files/openssh-7.9_p1-X509-dont-make-piddir.patch deleted file mode 100644 index c30ca2785448..000000000000 --- a/net-misc/openssh/files/openssh-7.9_p1-X509-dont-make-piddir.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/openssh-7.9p1+x509-11.5.diff 2018-12-07 17:24:03.211328918 -0800 -+++ b/openssh-7.9p1+x509-11.5.diff 2018-12-07 17:24:13.399262277 -0800 -@@ -40681,12 +40681,11 @@ - - install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf host-key check-config - install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf --@@ -333,6 +351,8 @@ -+@@ -333,6 +351,7 @@ - $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5 - $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8 - $(MKDIR_P) $(DESTDIR)$(libexecdir) - + $(MKDIR_P) $(DESTDIR)$(sshcadir) --+ $(MKDIR_P) $(DESTDIR)$(piddir) - $(MKDIR_P) -m 0755 $(DESTDIR)$(PRIVSEP_PATH) - $(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT) - $(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp$(EXEEXT) diff --git a/net-misc/openssh/files/openssh-7.9_p1-X509-glue.patch b/net-misc/openssh/files/openssh-7.9_p1-X509-glue.patch deleted file mode 100644 index 1f1ec4a4d773..000000000000 --- a/net-misc/openssh/files/openssh-7.9_p1-X509-glue.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/openssh-7.9p1+x509-11.5.diff 2018-10-23 16:21:22.580154353 -0700 -+++ b/openssh-7.9p1+x509-11.5.diff 2018-10-23 16:22:39.600652048 -0700 -@@ -44045,7 +44045,7 @@ - ENGINE_register_all_complete(); - +#endif - ---#if OPENSSL_VERSION_NUMBER < 0x10001000L -+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - + /* OPENSSL_config will load buildin engines and engines - + * specified in configuration file, i.e. method call - + * ENGINE_load_builtin_engines. Latter is only for -@@ -77691,16 +77691,6 @@ - setlocale(LC_CTYPE, "POSIX.UTF-8") != NULL)) - return; - setlocale(LC_CTYPE, "C"); --diff -ruN openssh-7.9p1/version.h openssh-7.9p1+x509-11.5/version.h ----- openssh-7.9p1/version.h 2018-10-17 03:01:20.000000000 +0300 --+++ openssh-7.9p1+x509-11.5/version.h 2018-10-19 19:07:00.000000000 +0300 --@@ -2,5 +2,4 @@ -- -- #define SSH_VERSION "OpenSSH_7.9" -- ---#define SSH_PORTABLE "p1" ---#define SSH_RELEASE SSH_VERSION SSH_PORTABLE --+#define SSH_RELEASE PACKAGE_STRING ", " SSH_VERSION "p1" - diff -ruN openssh-7.9p1/version.m4 openssh-7.9p1+x509-11.5/version.m4 - --- openssh-7.9p1/version.m4 1970-01-01 02:00:00.000000000 +0200 - +++ openssh-7.9p1+x509-11.5/version.m4 2018-10-19 18:13:58.000000000 +0300 diff --git a/net-misc/openssh/files/openssh-7.9_p1-libressl-2.8.patch b/net-misc/openssh/files/openssh-7.9_p1-libressl-2.8.patch deleted file mode 100644 index 58f3ce2922ec..000000000000 --- a/net-misc/openssh/files/openssh-7.9_p1-libressl-2.8.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- openssh-7.9p1.orig/evp-compat.h 2018-12-07 17:07:37.929762570 -0800 -+++ openssh-7.9p1/evp-compat.h 2018-12-07 17:08:03.923592845 -0800 -@@ -100,11 +100,13 @@ - } - - -+#if LIBRESSL_VERSION_NUMBER < 0x20800000L - static inline int - EVP_CIPHER_CTX_encrypting(const EVP_CIPHER_CTX *ctx) - { - return(ctx->encrypt); - } -+#endif /* LIBRESSL_VERSION_NUMBER < 0x20800000L */ - - - static inline void* -- cgit v1.2.3-65-gdbad