| 1 |
commit: 06fadf406d567c15a99affc5b27adc4a7e6846c2 |
| 2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Tue Mar 5 16:51:24 2019 +0000 |
| 4 |
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Mar 11 04:46:08 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06fadf40 |
| 7 |
|
| 8 |
net-misc/openssh: remove unused patches |
| 9 |
|
| 10 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
| 11 |
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org> |
| 12 |
|
| 13 |
.../openssh-7.9_p1-X509-dont-make-piddir.patch | 16 ------------- |
| 14 |
.../openssh/files/openssh-7.9_p1-X509-glue.patch | 28 ---------------------- |
| 15 |
.../files/openssh-7.9_p1-libressl-2.8.patch | 16 ------------- |
| 16 |
3 files changed, 60 deletions(-) |
| 17 |
|
| 18 |
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 |
| 19 |
deleted file mode 100644 |
| 20 |
index c30ca278544..00000000000 |
| 21 |
--- a/net-misc/openssh/files/openssh-7.9_p1-X509-dont-make-piddir.patch |
| 22 |
+++ /dev/null |
| 23 |
@@ -1,16 +0,0 @@ |
| 24 |
---- a/openssh-7.9p1+x509-11.5.diff 2018-12-07 17:24:03.211328918 -0800 |
| 25 |
-+++ b/openssh-7.9p1+x509-11.5.diff 2018-12-07 17:24:13.399262277 -0800 |
| 26 |
-@@ -40681,12 +40681,11 @@ |
| 27 |
- |
| 28 |
- install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf host-key check-config |
| 29 |
- install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf |
| 30 |
--@@ -333,6 +351,8 @@ |
| 31 |
-+@@ -333,6 +351,7 @@ |
| 32 |
- $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5 |
| 33 |
- $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8 |
| 34 |
- $(MKDIR_P) $(DESTDIR)$(libexecdir) |
| 35 |
- + $(MKDIR_P) $(DESTDIR)$(sshcadir) |
| 36 |
--+ $(MKDIR_P) $(DESTDIR)$(piddir) |
| 37 |
- $(MKDIR_P) -m 0755 $(DESTDIR)$(PRIVSEP_PATH) |
| 38 |
- $(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT) |
| 39 |
- $(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp$(EXEEXT) |
| 40 |
|
| 41 |
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 |
| 42 |
deleted file mode 100644 |
| 43 |
index 1f1ec4a4d77..00000000000 |
| 44 |
--- a/net-misc/openssh/files/openssh-7.9_p1-X509-glue.patch |
| 45 |
+++ /dev/null |
| 46 |
@@ -1,28 +0,0 @@ |
| 47 |
---- a/openssh-7.9p1+x509-11.5.diff 2018-10-23 16:21:22.580154353 -0700 |
| 48 |
-+++ b/openssh-7.9p1+x509-11.5.diff 2018-10-23 16:22:39.600652048 -0700 |
| 49 |
-@@ -44045,7 +44045,7 @@ |
| 50 |
- ENGINE_register_all_complete(); |
| 51 |
- +#endif |
| 52 |
- |
| 53 |
---#if OPENSSL_VERSION_NUMBER < 0x10001000L |
| 54 |
-+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) |
| 55 |
- + /* OPENSSL_config will load buildin engines and engines |
| 56 |
- + * specified in configuration file, i.e. method call |
| 57 |
- + * ENGINE_load_builtin_engines. Latter is only for |
| 58 |
-@@ -77691,16 +77691,6 @@ |
| 59 |
- setlocale(LC_CTYPE, "POSIX.UTF-8") != NULL)) |
| 60 |
- return; |
| 61 |
- setlocale(LC_CTYPE, "C"); |
| 62 |
--diff -ruN openssh-7.9p1/version.h openssh-7.9p1+x509-11.5/version.h |
| 63 |
----- openssh-7.9p1/version.h 2018-10-17 03:01:20.000000000 +0300 |
| 64 |
--+++ openssh-7.9p1+x509-11.5/version.h 2018-10-19 19:07:00.000000000 +0300 |
| 65 |
--@@ -2,5 +2,4 @@ |
| 66 |
-- |
| 67 |
-- #define SSH_VERSION "OpenSSH_7.9" |
| 68 |
-- |
| 69 |
---#define SSH_PORTABLE "p1" |
| 70 |
---#define SSH_RELEASE SSH_VERSION SSH_PORTABLE |
| 71 |
--+#define SSH_RELEASE PACKAGE_STRING ", " SSH_VERSION "p1" |
| 72 |
- diff -ruN openssh-7.9p1/version.m4 openssh-7.9p1+x509-11.5/version.m4 |
| 73 |
- --- openssh-7.9p1/version.m4 1970-01-01 02:00:00.000000000 +0200 |
| 74 |
- +++ openssh-7.9p1+x509-11.5/version.m4 2018-10-19 18:13:58.000000000 +0300 |
| 75 |
|
| 76 |
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 |
| 77 |
deleted file mode 100644 |
| 78 |
index 58f3ce2922e..00000000000 |
| 79 |
--- a/net-misc/openssh/files/openssh-7.9_p1-libressl-2.8.patch |
| 80 |
+++ /dev/null |
| 81 |
@@ -1,16 +0,0 @@ |
| 82 |
---- openssh-7.9p1.orig/evp-compat.h 2018-12-07 17:07:37.929762570 -0800 |
| 83 |
-+++ openssh-7.9p1/evp-compat.h 2018-12-07 17:08:03.923592845 -0800 |
| 84 |
-@@ -100,11 +100,13 @@ |
| 85 |
- } |
| 86 |
- |
| 87 |
- |
| 88 |
-+#if LIBRESSL_VERSION_NUMBER < 0x20800000L |
| 89 |
- static inline int |
| 90 |
- EVP_CIPHER_CTX_encrypting(const EVP_CIPHER_CTX *ctx) |
| 91 |
- { |
| 92 |
- return(ctx->encrypt); |
| 93 |
- } |
| 94 |
-+#endif /* LIBRESSL_VERSION_NUMBER < 0x20800000L */ |
| 95 |
- |
| 96 |
- |
| 97 |
- static inline void* |
Archives