diff options
| author |   Michael Mair-Keimberger <mmk@levelnine.at> | 2021-04-24 17:51:11 +0200 |
|---|---|---|
| committer |   Conrad Kostecki <conikost@gentoo.org> | 2021-04-25 14:59:33 +0200 |
| commit | 43e109f8b606b23588f7f5e53bfcbe62d9362a18 (patch) | |
| tree | 614b52fc188bc5f8acd34f736679c1ffc7e80a57 /net-misc/openssh/files | |
| parent | net-misc/gnome-remote-desktop: remove unused patch(es) (diff) | |
| download | gentoo-43e109f8b606b23588f7f5e53bfcbe62d9362a18.tar.gz gentoo-43e109f8b606b23588f7f5e53bfcbe62d9362a18.tar.bz2 gentoo-43e109f8b606b23588f7f5e53bfcbe62d9362a18.zip | |
net-misc/openssh: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/20527
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk@levelnine.at>
Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
Diffstat (limited to 'net-misc/openssh/files')
| -rw-r--r-- | net-misc/openssh/files/openssh-8.6_p1-X509-glue-13.0.1.patch | 73 |
1 files changed, 0 insertions, 73 deletions
diff --git a/net-misc/openssh/files/openssh-8.6_p1-X509-glue-13.0.1.patch b/net-misc/openssh/files/openssh-8.6_p1-X509-glue-13.0.1.patch deleted file mode 100644 index f9da7bbc3453..000000000000 --- a/net-misc/openssh/files/openssh-8.6_p1-X509-glue-13.0.1.patch +++ /dev/null @@ -1,73 +0,0 @@ -diff --exclude '*.un~' -ubr a/openssh-8.5p1+x509-13.0.1.diff b/openssh-8.5p1+x509-13.0.1.diff ---- a/openssh-8.5p1+x509-13.0.1.diff 2021-04-19 14:21:08.076526576 -0700 -+++ b/openssh-8.5p1+x509-13.0.1.diff 2021-04-19 14:21:23.160563489 -0700 -@@ -46675,12 +46675,11 @@ - - install-files: - $(MKDIR_P) $(DESTDIR)$(bindir) --@@ -380,6 +364,8 @@ -+@@ -380,6 +364,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) -@@ -63967,7 +63966,7 @@ - - echo "putty interop tests not enabled" - - exit 0 - -fi --+$REGRESS_INTEROP_PUTTY || { echo "putty interop tests are not enabled" >&1; exit 1; } -++$REGRESS_INTEROP_PUTTY || { echo "putty interop tests are not enabled" >&1; exit 0; } - - for c in aes 3des aes128-ctr aes192-ctr aes256-ctr chacha20 ; do - verbose "$tid: cipher $c" -@@ -63982,7 +63981,7 @@ - - echo "putty interop tests not enabled" - - exit 0 - -fi --+$REGRESS_INTEROP_PUTTY || { echo "putty interop tests are not enabled" >&1; exit 1; } -++$REGRESS_INTEROP_PUTTY || { echo "putty interop tests are not enabled" >&1; exit 0; } - - for k in dh-gex-sha1 dh-group1-sha1 dh-group14-sha1 ecdh ; do - verbose "$tid: kex $k" -@@ -63997,7 +63996,7 @@ - - echo "putty interop tests not enabled" - - exit 0 - -fi --+$REGRESS_INTEROP_PUTTY || { echo "putty interop tests are not enabled" >&1; exit 1; } -++$REGRESS_INTEROP_PUTTY || { echo "putty interop tests are not enabled" >&1; exit 0; } - - if [ "`${SSH} -Q compression`" = "none" ]; then - comp="0" -@@ -64129,9 +64128,9 @@ - - +# cross-project configuration - +if test "$sshd_type" = "pkix" ; then --+ unset_arg='' -++ unset_arg= - +else --+ unset_arg=none -++ unset_arg= - +fi - + - cat > $OBJ/sshd_config.i << _EOF -@@ -122247,16 +122246,6 @@ - +int asnmprintf(char **, size_t, int *, const char *, ...) - __attribute__((format(printf, 4, 5))); - void msetlocale(void); --diff -ruN openssh-8.5p1/version.h openssh-8.5p1+x509-13.0.1/version.h ----- openssh-8.5p1/version.h 2021-03-02 12:31:47.000000000 +0200 --+++ openssh-8.5p1+x509-13.0.1/version.h 2021-03-15 20:07:00.000000000 +0200 --@@ -2,5 +2,4 @@ -- -- #define SSH_VERSION "OpenSSH_8.5" -- ---#define SSH_PORTABLE "p1" ---#define SSH_RELEASE SSH_VERSION SSH_PORTABLE --+#define SSH_RELEASE PACKAGE_STRING ", " SSH_VERSION "p1" - diff -ruN openssh-8.5p1/version.m4 openssh-8.5p1+x509-13.0.1/version.m4 - --- openssh-8.5p1/version.m4 1970-01-01 02:00:00.000000000 +0200 - +++ openssh-8.5p1+x509-13.0.1/version.m4 2021-03-15 20:07:00.000000000 +0200 |