| 1 |
commit: 591c528cc536c3e28daaf6356084d356c5e82eec |
| 2 |
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> |
| 3 |
AuthorDate: Sun Oct 30 07:55:44 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 30 09:27:00 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=591c528c |
| 7 |
|
| 8 |
net-misc/openssh: remove unused patch |
| 9 |
|
| 10 |
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> |
| 11 |
Closes: https://github.com/gentoo/gentoo/pull/28031 |
| 12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 13 |
|
| 14 |
.../files/openssh-9.0_p1-X509-glue-13.3.2.patch | 54 ---------------------- |
| 15 |
1 file changed, 54 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-misc/openssh/files/openssh-9.0_p1-X509-glue-13.3.2.patch b/net-misc/openssh/files/openssh-9.0_p1-X509-glue-13.3.2.patch |
| 18 |
deleted file mode 100644 |
| 19 |
index 3d702eb35be8..000000000000 |
| 20 |
--- a/net-misc/openssh/files/openssh-9.0_p1-X509-glue-13.3.2.patch |
| 21 |
+++ /dev/null |
| 22 |
@@ -1,54 +0,0 @@ |
| 23 |
-diff -ur '--exclude=.*.un~' a/openssh-9.0p1+x509-13.3.2.diff b/openssh-9.0p1+x509-13.3.2.diff |
| 24 |
---- a/openssh-9.0p1+x509-13.3.2.diff 2022-04-11 10:32:02.364576985 -0700 |
| 25 |
-+++ b/openssh-9.0p1+x509-13.3.2.diff 2022-04-11 10:38:29.267348410 -0700 |
| 26 |
-@@ -47526,8 +47526,8 @@ |
| 27 |
- gss_create_empty_oid_set(&status, &oidset); |
| 28 |
- gss_add_oid_set_member(&status, ctx->oid, &oidset); |
| 29 |
- |
| 30 |
--- if (gethostname(lname, MAXHOSTNAMELEN)) { |
| 31 |
--+ if (gethostname(lname, MAXHOSTNAMELEN) == -1) { |
| 32 |
-+- if (gethostname(lname, HOST_NAME_MAX)) { |
| 33 |
-++ if (gethostname(lname, HOST_NAME_MAX) == -1) { |
| 34 |
- gss_release_oid_set(&status, &oidset); |
| 35 |
- return (-1); |
| 36 |
- } |
| 37 |
-@@ -55662,12 +55662,11 @@ |
| 38 |
- |
| 39 |
- install-files: |
| 40 |
- $(MKDIR_P) $(DESTDIR)$(bindir) |
| 41 |
--@@ -395,6 +372,8 @@ |
| 42 |
-+@@ -395,6 +372,7 @@ |
| 43 |
- $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5 |
| 44 |
- $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8 |
| 45 |
- $(MKDIR_P) $(DESTDIR)$(libexecdir) |
| 46 |
- + $(MKDIR_P) $(DESTDIR)$(sshcadir) |
| 47 |
--+ $(MKDIR_P) $(DESTDIR)$(piddir) |
| 48 |
- $(MKDIR_P) -m 0755 $(DESTDIR)$(PRIVSEP_PATH) |
| 49 |
- $(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT) |
| 50 |
- $(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp$(EXEEXT) |
| 51 |
-@@ -76764,7 +76763,7 @@ |
| 52 |
- +if test "$sshd_type" = "pkix" ; then |
| 53 |
- + unset_arg='' |
| 54 |
- +else |
| 55 |
--+ unset_arg=none |
| 56 |
-++ unset_arg='' |
| 57 |
- +fi |
| 58 |
- + |
| 59 |
- cat > $OBJ/sshd_config.i << _EOF |
| 60 |
-@@ -141144,16 +141143,6 @@ |
| 61 |
- +int asnmprintf(char **, size_t, int *, const char *, ...) |
| 62 |
- __attribute__((format(printf, 4, 5))); |
| 63 |
- void msetlocale(void); |
| 64 |
--diff -ruN openssh-9.0p1/version.h openssh-9.0p1+x509-13.3.2/version.h |
| 65 |
----- openssh-9.0p1/version.h 2022-04-06 03:47:48.000000000 +0300 |
| 66 |
--+++ openssh-9.0p1+x509-13.3.2/version.h 2022-04-11 09:07:00.000000000 +0300 |
| 67 |
--@@ -2,5 +2,4 @@ |
| 68 |
-- |
| 69 |
-- #define SSH_VERSION "OpenSSH_9.0" |
| 70 |
-- |
| 71 |
---#define SSH_PORTABLE "p1" |
| 72 |
---#define SSH_RELEASE SSH_VERSION SSH_PORTABLE |
| 73 |
--+#define SSH_RELEASE PACKAGE_STRING ", " SSH_VERSION "p1" |
| 74 |
- diff -ruN openssh-9.0p1/version.m4 openssh-9.0p1+x509-13.3.2/version.m4 |
| 75 |
- --- openssh-9.0p1/version.m4 1970-01-01 02:00:00.000000000 +0200 |
| 76 |
- +++ openssh-9.0p1+x509-13.3.2/version.m4 2022-04-11 09:07:00.000000000 +0300 |
Archives