diff options
| -rw-r--r-- | net-misc/openssh/Manifest | 1 | ||||
| -rw-r--r-- | net-misc/openssh/files/openssh-8.3_p1-X509-glue-12.5.patch | 33 | ||||
| -rw-r--r-- | net-misc/openssh/openssh-8.3_p1-r1.ebuild (renamed from net-misc/openssh/openssh-8.3_p1.ebuild) | 8 |
3 files changed, 38 insertions, 4 deletions
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest index cdd391e5ba29..a30874e42c11 100644 --- a/net-misc/openssh/Manifest +++ b/net-misc/openssh/Manifest @@ -6,6 +6,7 @@ DIST openssh-8.2p1+x509-12.4.2.diff.gz 805574 BLAKE2B 4df31b634308ce074d820df249 DIST openssh-8.2p1+x509-12.4.3.diff.gz 806905 BLAKE2B 8e0f0f3eeb2aafd9fc9e6eca80c0b51ffedbed9dfc46ff73bb1becd28f6ac013407d03107b59da05d9d56edbf283eef20891086867b79efd8aab81c3e9a4a32f SHA512 51117d7e4df2ff78c4fdfd08c2bb8f1739b1db064df65bab3872e1a956c277a4736c511794aa399061058fea666a76ee07bb50d83a0d077b7fa572d02c030b91 DIST openssh-8.2p1-sctp-1.2.patch.xz 7668 BLAKE2B 717487cffd235a5dfa2d9d3f2c1983f410d400b0d23f71a9b74406ac3d2f448d76381a3b7a3244942bff4e6bdc3bc78d148b9949c78dc297d99c7330179f8176 SHA512 a5fbd827e62e91b762062a29c7bc3bf569a202bdc8c91da7d77566ff8bb958b5b9fb6f8d45df586e0d7ac07a83de6e82996e9c5cdd6b3bf43336c420d3099305 DIST openssh-8.2p1.tar.gz 1701197 BLAKE2B 8b95cdebc87e8d14f655ed13c12b91b122adf47161071aa81d0763f81b12fe4bc3d409c260783d995307d4e4ed2d16080fd74b15e4dc6dcc5648d7e66720c3ed SHA512 c4db64e52a3a4c410de9de49f9cb104dd493b10250af3599b92457dd986277b3fd99a6f51cec94892fd1be5bd0369c5757262ea7805f0de464b245c3d34c120a +DIST openssh-8.3p1+x509-12.5.diff.gz 798126 BLAKE2B 4258a7590d0ee185c46e449b20c2a9cc5cfc86bf53e1debd85649ecfad8da41801d74001a234412facb17b2fd3c0efeebdac243ba4ba3ed93c4e0e3174f33cd9 SHA512 741dd7a31c38b1d5c7e3897cff75f47be9fc08f84fce26bb0e62df26a06b5e552af76b00e54db98295d10877344f0541acafc66f24be559de8d503eff7dfa822 DIST openssh-8.3p1-sctp-1.2.patch.xz 7668 BLAKE2B abbc65253d842c09a04811bdbafc175c5226996cdd190812b47ce9646853cd5c1b21d733e719b481cce9c7f4dc00894b6d6be732e311850963df23b9dc55a0e6 SHA512 4e0cc1707663f902dfbf331a431325da78759cc757a4aaae33e0c7f64f21830ec805168d8ae4d47a65a20c235fa534679e288f922df2b24655b7d1ee9a3bf014 DIST openssh-8.3p1.tar.gz 1706358 BLAKE2B 0b53d92caa4a0f4cb40eee671ac889753d320b7c8e44df159a81dd8163c3663f07fa648f5dc506fb27d31893acf9701b997598c50bf204acf54172d72825a4d8 SHA512 b5232f7c85bf59ae2ff9d17b030117012e257e3b8c0d5ac60bb139a85b1fbf298b40f2e04203a2e13ca7273053ed668b9dedd54d3a67a7cb8e8e58c0228c5f40 DIST openssh-8_1_P1-hpn-AES-CTR-14.20.diff 29935 BLAKE2B 79101c43601e41306c957481c0680a63357d93bededdf12a32229d50acd9c1f46a386cbb91282e9e7d7bb26a9f276f5a675fd2de7662b7cbd073322b172d3bca SHA512 94f011b7e654630e968a378375aa54fa1fde087b4426d0f2225813262e6667a1073814d6a83e9005f97b371c536e462e614bfe726b092ffed8229791592ca221 diff --git a/net-misc/openssh/files/openssh-8.3_p1-X509-glue-12.5.patch b/net-misc/openssh/files/openssh-8.3_p1-X509-glue-12.5.patch new file mode 100644 index 000000000000..d0de761fb80b --- /dev/null +++ b/net-misc/openssh/files/openssh-8.3_p1-X509-glue-12.5.patch @@ -0,0 +1,33 @@ +--- a/openssh-8.3p1+x509-12.5.diff 2020-05-31 11:50:58.817094112 -0700 ++++ b/openssh-8.3p1+x509-12.5.diff 2020-05-31 12:29:49.165030176 -0700 +@@ -35457,12 +35457,11 @@ + + install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf host-key check-config + install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf +-@@ -382,6 +361,8 @@ ++@@ -382,6 +361,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) +@@ -96530,16 +96529,6 @@ + +int asnmprintf(char **, size_t, int *, const char *, ...) + __attribute__((format(printf, 4, 5))); + void msetlocale(void); +-diff -ruN openssh-8.3p1/version.h openssh-8.3p1+x509-12.5/version.h +---- openssh-8.3p1/version.h 2020-05-27 03:38:00.000000000 +0300 +-+++ openssh-8.3p1+x509-12.5/version.h 2020-05-31 18:07:00.000000000 +0300 +-@@ -2,5 +2,4 @@ +- +- #define SSH_VERSION "OpenSSH_8.3" +- +--#define SSH_PORTABLE "p1" +--#define SSH_RELEASE SSH_VERSION SSH_PORTABLE +-+#define SSH_RELEASE PACKAGE_STRING ", " SSH_VERSION "p1" + diff -ruN openssh-8.3p1/version.m4 openssh-8.3p1+x509-12.5/version.m4 + --- openssh-8.3p1/version.m4 1970-01-01 02:00:00.000000000 +0200 + +++ openssh-8.3p1+x509-12.5/version.m4 2020-05-31 18:07:00.000000000 +0300 diff --git a/net-misc/openssh/openssh-8.3_p1.ebuild b/net-misc/openssh/openssh-8.3_p1-r1.ebuild index 8238b501a1ae..b164a15e79d1 100644 --- a/net-misc/openssh/openssh-8.3_p1.ebuild +++ b/net-misc/openssh/openssh-8.3_p1-r1.ebuild @@ -21,7 +21,7 @@ HPN_PATCHES=( ) SCTP_VER="1.2" SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz" -#X509_VER="12.4.3" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz" +X509_VER="12.5" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz" DESCRIPTION="Port of OpenBSD's free SSH release" HOMEPAGE="https://www.openssh.com/" @@ -147,7 +147,6 @@ src_prepare() { popd &>/dev/null || die eapply "${WORKDIR}"/${X509_PATCH%.*} - eapply "${FILESDIR}"/${P}-X509-${X509_VER}-tests.patch # We need to patch package version or any X.509 sshd will reject our ssh client # with "userauth_pubkey: could not parse key: string is too large [preauth]" @@ -190,7 +189,8 @@ src_prepare() { # einfo "Will disable MT AES cipher due to incompatbility caused by X509 patch set" # # X509 and AES-CTR-MT don't get along, let's just drop it # rm openssh-${HPN_PV//./_}-hpn-AES-CTR-${HPN_VER}.diff || die - eapply "${FILESDIR}"/${P}-hpn-${HPN_VER}-X509-glue.patch + + eapply "${FILESDIR}"/${PN}-8.2_p1-hpn-${HPN_VER}-X509-glue.patch fi use sctp && eapply "${FILESDIR}"/${PN}-8.2_p1-hpn-${HPN_VER}-sctp-glue.patch popd &>/dev/null || die @@ -305,7 +305,7 @@ src_configure() { $(use_with pam) $(use_with pie) $(use_with selinux) - $(use_with security-key security-key-builtin) + $(usex X509 '' "$(use_with security-key security-key-builtin)") $(use_with ssl openssl) $(use_with ssl md5-passwords) $(use_with ssl ssl-engine) |