net-misc/openssh: remove unused patches

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/13687
Signed-off-by: Patrick McLean <chutzpah@gentoo.org>

diff --git a/net-misc/openssh/files/openssh-8.0_p1-X509-12.0-tests.patch b/net-misc/openssh/files/openssh-8.0_p1-X509-12.0-tests.patch
deleted file mode 100644 (file)
index 9766b15..0000000
--- a/net-misc/openssh/files/openssh-8.0_p1-X509-12.0-tests.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur openssh-7.9p1.orig/openbsd-compat/regress/Makefile.in openssh-7.9p1/openbsd-compat/regress/Makefile.in
---- openssh-7.9p1.orig/openbsd-compat/regress/Makefile.in      2018-10-16 17:01:20.000000000 -0700
-+++ openssh-7.9p1/openbsd-compat/regress/Makefile.in   2018-12-19 11:03:14.421028691 -0800
-@@ -7,7 +7,7 @@
- CC=@CC@
- LD=@LD@
- CFLAGS=@CFLAGS@
--CPPFLAGS=-I. -I.. -I$(srcdir) -I$(srcdir)/.. @CPPFLAGS@ @DEFS@
-+CPPFLAGS=-I. -I.. -I$(srcdir) -I../.. @CPPFLAGS@ @DEFS@
- EXEEXT=@EXEEXT@
- LIBCOMPAT=../libopenbsd-compat.a
- LIBS=@LIBS@

diff --git a/net-misc/openssh/files/openssh-8.0_p1-X509-dont-make-piddir-12.0.patch b/net-misc/openssh/files/openssh-8.0_p1-X509-dont-make-piddir-12.0.patch
deleted file mode 100644 (file)
index aac98fe..0000000
--- a/net-misc/openssh/files/openssh-8.0_p1-X509-dont-make-piddir-12.0.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/openssh-8.0p1+x509-12.0.diff     2019-04-18 14:53:26.850768799 -0700
-+++ b/openssh-8.0p1+x509-12.0.diff     2019-04-18 14:56:48.870364519 -0700
-@@ -33578,12 +33578,11 @@
-  
-  install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf host-key check-config
-  install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf
--@@ -334,6 +352,8 @@
-+@@ -334,6 +352,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-8.0_p1-X509-dont-make-piddir-12.1.patch b/net-misc/openssh/files/openssh-8.0_p1-X509-dont-make-piddir-12.1.patch
deleted file mode 100644 (file)
index 9bb081a..0000000
--- a/net-misc/openssh/files/openssh-8.0_p1-X509-dont-make-piddir-12.1.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/openssh-8.0p1+x509-12.1.diff     2019-04-29 14:11:55.210175168 -0700
-+++ b/openssh-8.0p1+x509-12.1.diff     2019-04-29 14:12:55.603761971 -0700
-@@ -34176,12 +34176,11 @@
-
-  install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf host-key check-config
-  install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf
--@@ -334,6 +352,8 @@
-+@@ -334,6 +352,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-8.0_p1-X509-glue-12.0.patch b/net-misc/openssh/files/openssh-8.0_p1-X509-glue-12.0.patch
deleted file mode 100644 (file)
index 1667e13..0000000
--- a/net-misc/openssh/files/openssh-8.0_p1-X509-glue-12.0.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/openssh-8.0p1+x509-12.0.diff     2019-04-18 14:53:02.804935946 -0700
-+++ b/openssh-8.0p1+x509-12.0.diff     2019-04-18 14:53:26.850768799 -0700
-@@ -75925,16 +75925,6 @@
- +     return mbtowc(NULL, s, n);
- +}
- +#endif
--diff -ruN openssh-8.0p1/version.h openssh-8.0p1+x509-12.0/version.h
----- openssh-8.0p1/version.h   2019-04-18 01:52:57.000000000 +0300
--+++ openssh-8.0p1+x509-12.0/version.h 2019-04-18 19:07:00.000000000 +0300
--@@ -2,5 +2,4 @@
-- 
-- #define SSH_VERSION  "OpenSSH_8.0"
-- 
---#define SSH_PORTABLE "p1"
---#define SSH_RELEASE  SSH_VERSION SSH_PORTABLE
--+#define SSH_RELEASE  PACKAGE_STRING ", " SSH_VERSION "p1"
- diff -ruN openssh-8.0p1/version.m4 openssh-8.0p1+x509-12.0/version.m4
- --- openssh-8.0p1/version.m4  1970-01-01 02:00:00.000000000 +0200
- +++ openssh-8.0p1+x509-12.0/version.m4        2019-04-18 19:07:00.000000000 +0300

diff --git a/net-misc/openssh/files/openssh-8.0_p1-X509-glue-12.1.patch b/net-misc/openssh/files/openssh-8.0_p1-X509-glue-12.1.patch
deleted file mode 100644 (file)
index d6b6c5a..0000000
--- a/net-misc/openssh/files/openssh-8.0_p1-X509-glue-12.1.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/openssh-8.0p1+x509-12.1.diff     2019-06-17 10:42:03.233392491 -0700
-+++ b/openssh-8.0p1+x509-12.1.diff     2019-06-17 10:42:24.696248976 -0700
-@@ -78536,16 +78536,6 @@
- +     return mbtowc(NULL, s, n);
- +}
- +#endif
--diff -ruN openssh-8.0p1/version.h openssh-8.0p1+x509-12.1/version.h
----- openssh-8.0p1/version.h   2019-04-18 01:52:57.000000000 +0300
--+++ openssh-8.0p1+x509-12.1/version.h 2019-06-16 15:07:00.000000000 +0300
--@@ -2,5 +2,4 @@
-- 
-- #define SSH_VERSION  "OpenSSH_8.0"
-- 
---#define SSH_PORTABLE "p1"
---#define SSH_RELEASE  SSH_VERSION SSH_PORTABLE
--+#define SSH_RELEASE  PACKAGE_STRING ", " SSH_VERSION "p1"
- diff -ruN openssh-8.0p1/version.m4 openssh-8.0p1+x509-12.1/version.m4
- --- openssh-8.0p1/version.m4  1970-01-01 02:00:00.000000000 +0200
- +++ openssh-8.0p1+x509-12.1/version.m4        2019-06-16 15:07:00.000000000 +0300