diff options
author | Patrick McLean <chutzpah@gentoo.org> | 2021-10-25 16:38:02 -0700 |
---|---|---|
committer | Patrick McLean <chutzpah@gentoo.org> | 2021-10-25 16:38:02 -0700 |
commit | e63d106c6300869b5926856c1e50097ffdb8c7b9 (patch) | |
tree | 6bd8f3f6d685aee089b5138a8daf9b3fc1319a36 /net-misc/openssh/files | |
parent | dev-python/tomli: Bump to 1.2.2 (diff) | |
download | gentoo-e63d106c6300869b5926856c1e50097ffdb8c7b9.tar.gz gentoo-e63d106c6300869b5926856c1e50097ffdb8c7b9.tar.bz2 gentoo-e63d106c6300869b5926856c1e50097ffdb8c7b9.zip |
net-misc/openssh-8.8_p1-r1: Revbump, enable X509 USE flag
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Patrick McLean <chutzpah@gentoo.org>
Diffstat (limited to 'net-misc/openssh/files')
-rw-r--r-- | net-misc/openssh/files/openssh-8.8_p1-X509-glue-13.2.3.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/net-misc/openssh/files/openssh-8.8_p1-X509-glue-13.2.3.patch b/net-misc/openssh/files/openssh-8.8_p1-X509-glue-13.2.3.patch new file mode 100644 index 000000000000..74f8a842e6b2 --- /dev/null +++ b/net-misc/openssh/files/openssh-8.8_p1-X509-glue-13.2.3.patch @@ -0,0 +1,43 @@ +diff -ur '--exclude=.*.un~' a/openssh-8.8p1+x509-13.2.3.diff b/openssh-8.8p1+x509-13.2.3.diff +--- a/openssh-8.8p1+x509-13.2.3.diff 2021-10-25 10:23:20.264186260 -0700 ++++ b/openssh-8.8p1+x509-13.2.3.diff 2021-10-25 10:24:35.924443287 -0700 +@@ -51859,12 +51859,11 @@ + + install-files: + $(MKDIR_P) $(DESTDIR)$(bindir) +-@@ -391,6 +372,8 @@ ++@@ -391,6 +372,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) +@@ -71985,7 +71984,7 @@ + +if test "$sshd_type" = "pkix" ; then + + unset_arg='' + +else +-+ unset_arg=none +++ unset_arg= + +fi + + + cat > $OBJ/sshd_config.i << _EOF +@@ -132360,16 +132359,6 @@ + +int asnmprintf(char **, size_t, int *, const char *, ...) + __attribute__((format(printf, 4, 5))); + void msetlocale(void); +-diff -ruN openssh-8.8p1/version.h openssh-8.8p1+x509-13.2.3/version.h +---- openssh-8.8p1/version.h 2021-09-26 17:03:19.000000000 +0300 +-+++ openssh-8.8p1+x509-13.2.3/version.h 2021-10-23 16:27:00.000000000 +0300 +-@@ -2,5 +2,4 @@ +- +- #define SSH_VERSION "OpenSSH_8.8" +- +--#define SSH_PORTABLE "p1" +--#define SSH_RELEASE SSH_VERSION SSH_PORTABLE +-+#define SSH_RELEASE PACKAGE_STRING ", " SSH_VERSION "p1" + diff -ruN openssh-8.8p1/version.m4 openssh-8.8p1+x509-13.2.3/version.m4 + --- openssh-8.8p1/version.m4 1970-01-01 02:00:00.000000000 +0200 + +++ openssh-8.8p1+x509-13.2.3/version.m4 2021-10-23 16:27:00.000000000 +0300 |