haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-03-19 01:46:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

openssh: bump version

Browse Source
This commit is contained in:
Jérôme Duval
2025-10-25 14:37:18 +02:00
parent 4c3c91f178
commit 88513770bf
2 changed files with 52 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net-misc/openssh/openssh-10.0p1.recipe → net-misc/openssh/openssh-10.2p1.recipe
View File

@@ -16,9 +16,9 @@ ssh-keyscan, ssh-keygen and sftp-server."
HOMEPAGE="http://www.openssh.com/"
COPYRIGHT="2005-2020 Tatu Ylonen et al."
LICENSE="OpenSSH"
REVISION="2"
REVISION="1"
SOURCE_URI="https://cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-$portVersion.tar.gz"
CHECKSUM_SHA256="021a2e709a0edf4250b1256bd5a9e500411a90dddabea830ed59cef90eb9d85c"
CHECKSUM_SHA256="ccc42c0419937959263fa1dbd16dafc18c56b984c03562d2937ce56a60f798b2"
PATCHES="openssh-$portVersion.patchset"
ADDITIONAL_FILES="
sshd_keymaker.sh

100
net-misc/openssh/patches/openssh-10.0p1.patchset → net-misc/openssh/patches/openssh-10.2p1.patchset
View File

@@ -1,4 +1,4 @@
From 3e582cb958455372b6ebc0a54303dde47c7c5eb7 Mon Sep 17 00:00:00 2001
From ba7fb8a06eff736bcc9b5a36454e0edf42e89a88 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Thu, 16 Jul 2020 17:57:38 +0200
Subject: applying patch sshd_config.patch
@@ -18,43 +18,43 @@ index 0f4a3a7..c986fcf 100644
#AuthorizedPrincipalsFile none
--
2.48.1
2.51.0
From e47c43c7e9b972668706eb78dd582052ec6b4c04 Mon Sep 17 00:00:00 2001
From deef054e056d7874f9fde05eb4e47fd3a0932f7c Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Thu, 16 Jul 2020 17:57:38 +0200
Subject: applying patch pathnames.patch
diff --git a/pathnames.h b/pathnames.h
index 1158bec..75819c1 100644
index 0dcc495..9d6a6d7 100644
--- a/pathnames.h
+++ b/pathnames.h
@@ -65,7 +65,7 @@
@@ -63,7 +63,7 @@
* The directory in user's home directory in which the files reside. The
* directory should be world-readable (though not all files are).
*/
-#define _PATH_SSH_USER_DIR ".ssh"
+#define _PATH_SSH_USER_DIR "config/settings/ssh"
/*
* Per-user file containing host keys of known hosts. This file need not be
--
2.48.1
2.51.0
From 13d1f8a64f336947c7d24c02e63c539ba9036ca1 Mon Sep 17 00:00:00 2001
From 39d8afb122b7eafc3d5e70580b00253fc182c139 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Thu, 16 Jul 2020 17:57:38 +0200
Subject: applying patch ssh-copy-id.patch
diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id
index dcf5798..b698ccf 100644
index afb9bec..5363579 100644
--- a/contrib/ssh-copy-id
+++ b/contrib/ssh-copy-id
@@ -62,7 +62,7 @@ then
@@ -64,7 +64,7 @@ then
fi
# shellcheck disable=SC2010
@@ -63,7 +63,7 @@ index dcf5798..b698ccf 100644
SSH="ssh -a -x"
TARGET_PATH=".ssh/authorized_keys"
umask 0177
@@ -341,7 +341,7 @@ installkeys_via_sftp() {
@@ -346,7 +346,7 @@ installkeys_via_sftp() {
# create a scratch dir for any temporary files needed
@@ -73,10 +73,10 @@ index dcf5798..b698ccf 100644
then
chmod 0700 "$SCRATCH_DIR"
--
2.48.1
2.51.0
From 432bc00970255e6af4a111b478b624b19aaa1f55 Mon Sep 17 00:00:00 2001
From 021ae3ea7cde6c95b639cec1218bc3a8e2e3385c Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Thu, 16 Jul 2020 17:57:38 +0200
Subject: applying patch sha2-gcc2-build-fix.patch
@@ -129,10 +129,10 @@ index 4f2ad8f..8946d87 100644
memcpy(digest, context->state.st64, SHA384_DIGEST_LENGTH);
#endif
--
2.48.1
2.51.0
From 0e2d55e3a410ca47d3d65583561344f42a84e313 Mon Sep 17 00:00:00 2001
From 86967acb237fd681ce0bbca94c9686a3c5e81057 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Thu, 16 Jul 2020 18:08:27 +0200
Subject: Fix configuration path in manpages
@@ -164,7 +164,7 @@ index dbdb45a..95750b1 100644
.Nm
to use, just use
diff --git a/ssh-add.0 b/ssh-add.0
index af99011..8d4e44e 100644
index a6b655d..19f7332 100644
--- a/ssh-add.0
+++ b/ssh-add.0
@@ -13,11 +13,12 @@ SYNOPSIS
@@ -196,7 +196,7 @@ index af99011..8d4e44e 100644
/etc/ssh/ssh_known_hosts2.
-h destination_constraint
@@ -180,11 +181,11 @@ ENVIRONMENT
@@ -186,11 +187,11 @@ ENVIRONMENT
the built-in USB HID support.
FILES
@@ -214,7 +214,7 @@ index af99011..8d4e44e 100644
authenticator-hosted Ed25519 or RSA authentication identity of
the user.
diff --git a/ssh-add.1 b/ssh-add.1
index c31de4d..67772eb 100644
index babe780..4edd2dd 100644
--- a/ssh-add.1
+++ b/ssh-add.1
@@ -64,10 +64,10 @@
@@ -243,7 +243,7 @@ index c31de4d..67772eb 100644
.Pa /etc/ssh/ssh_known_hosts ,
and
.Pa /etc/ssh/ssh_known_hosts2 .
@@ -313,11 +313,11 @@ the built-in USB HID support.
@@ -320,11 +320,11 @@ the built-in USB HID support.
.El
.Sh FILES
.Bl -tag -width Ds -compact
@@ -261,7 +261,7 @@ index c31de4d..67772eb 100644
authenticator-hosted Ed25519 or RSA authentication identity of the user.
.El
diff --git a/ssh-keygen.0 b/ssh-keygen.0
index 799f323..b8eae04 100644
index 9ae8d3e..cc489f9 100644
--- a/ssh-keygen.0
+++ b/ssh-keygen.0
@@ -56,10 +56,11 @@ DESCRIPTION
@@ -280,7 +280,7 @@ index 799f323..b8eae04 100644
Normally this program generates the key and asks for a file in which to
store the private key. The public key is stored in a file with the same
@@ -623,7 +624,8 @@ CERTIFICATES
@@ -619,7 +620,8 @@ CERTIFICATES
no-pty Disable PTY allocation (permitted by default).
no-user-rc
@@ -290,7 +290,7 @@ index 799f323..b8eae04 100644
no-x11-forwarding
Disable X11 forwarding (permitted by default).
@@ -638,7 +640,7 @@ CERTIFICATES
@@ -634,7 +636,7 @@ CERTIFICATES
Allows PTY allocation.
permit-user-rc
@@ -299,7 +299,7 @@ index 799f323..b8eae04 100644
permit-X11-forwarding
Allows X11 forwarding.
@@ -862,11 +864,11 @@ ENVIRONMENT
@@ -858,11 +860,11 @@ ENVIRONMENT
the built-in USB HID support.
FILES
@@ -316,7 +316,7 @@ index 799f323..b8eae04 100644
Contains the ECDSA, authenticator-hosted ECDSA, Ed25519,
authenticator-hosted Ed25519 or RSA authentication identity of
the user. This file should not be readable by anyone but the
@@ -877,17 +879,17 @@ FILES
@@ -873,17 +875,17 @@ FILES
the private key. ssh(1) will read this file when a login attempt
is made.
@@ -343,7 +343,7 @@ index 799f323..b8eae04 100644
/etc/moduli
Contains Diffie-Hellman groups used for DH-GEX. The file format
diff --git a/ssh-keygen.1 b/ssh-keygen.1
index 00246a8..f053212 100644
index 7ceb1db..205242e 100644
--- a/ssh-keygen.1
+++ b/ssh-keygen.1
@@ -205,12 +205,12 @@ section for details.
@@ -364,7 +364,7 @@ index 00246a8..f053212 100644
Additionally, the system administrator may use this to generate host keys,
as seen in
.Pa /etc/rc .
@@ -996,7 +996,7 @@ Disable PTY allocation (permitted by default).
@@ -993,7 +993,7 @@ Disable PTY allocation (permitted by default).
.Pp
.It Ic no-user-rc
Disable execution of
@@ -373,7 +373,7 @@ index 00246a8..f053212 100644
by
.Xr sshd 8
(permitted by default).
@@ -1017,7 +1017,7 @@ Allows PTY allocation.
@@ -1014,7 +1014,7 @@ Allows PTY allocation.
.Pp
.It Ic permit-user-rc
Allows execution of
@@ -382,7 +382,7 @@ index 00246a8..f053212 100644
by
.Xr sshd 8 .
.Pp
@@ -1284,11 +1284,11 @@ the built-in USB HID support.
@@ -1281,11 +1281,11 @@ the built-in USB HID support.
.El
.Sh FILES
.Bl -tag -width Ds -compact
@@ -399,7 +399,7 @@ index 00246a8..f053212 100644
Contains the ECDSA, authenticator-hosted ECDSA, Ed25519,
authenticator-hosted Ed25519 or RSA authentication identity of the user.
This file should not be readable by anyone but the user.
@@ -1301,15 +1301,15 @@ but it is offered as the default file for the private key.
@@ -1298,15 +1298,15 @@ but it is offered as the default file for the private key.
.Xr ssh 1
will read this file when a login attempt is made.
.Pp
@@ -422,7 +422,7 @@ index 00246a8..f053212 100644
where the user wishes to log in using public key authentication.
There is no need to keep the contents of this file secret.
diff --git a/ssh.0 b/ssh.0
index 7c8cf82..42a5dbb 100644
index 5cc410b..fd55ad5 100644
--- a/ssh.0
+++ b/ssh.0
@@ -113,7 +113,7 @@ DESCRIPTION
@@ -603,7 +603,7 @@ index 7c8cf82..42a5dbb 100644
just before the user's shell (or command) is started. See the
sshd(8) manual page for more information.
diff --git a/sshd.0 b/sshd.0
index 23e28be..921c088 100644
index eddbeec..e460a80 100644
--- a/sshd.0
+++ b/sshd.0
@@ -196,13 +196,13 @@ LOGIN PROCESS
@@ -738,7 +738,7 @@ index 23e28be..921c088 100644
writable only by root, and should be world-readable.
diff --git a/sshd.8 b/sshd.8
index 08ebf53..922f9ac 100644
index 7fbca77..365504a 100644
--- a/sshd.8
+++ b/sshd.8
@@ -364,7 +364,7 @@ Changes to run with normal user privileges.
@@ -887,7 +887,7 @@ index 08ebf53..922f9ac 100644
machine-specific login-time initializations globally.
This file should be writable only by root, and should be world-readable.
diff --git a/sshd_config.5 b/sshd_config.5
index c077173..da23840 100644
index 6ae606f..143aeb0 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -365,7 +365,7 @@ Note that
@@ -917,7 +917,7 @@ index c077173..da23840 100644
during
.Cm HostbasedAuthentication
and use only the system-wide known hosts file
@@ -1542,11 +1542,11 @@ Independent of this setting, the permissions of the selected
@@ -1541,11 +1541,11 @@ Independent of this setting, the permissions of the selected
device must allow access to the user.
.It Cm PermitUserEnvironment
Specifies whether
@@ -931,7 +931,7 @@ index c077173..da23840 100644
are processed by
.Xr sshd 8 .
Valid options are
@@ -1562,7 +1562,7 @@ restrictions in some configurations using mechanisms such as
@@ -1561,7 +1561,7 @@ restrictions in some configurations using mechanisms such as
.Ev LD_PRELOAD .
.It Cm PermitUserRC
Specifies whether any
@@ -940,7 +940,7 @@ index c077173..da23840 100644
file is executed.
The default is
.Cm yes .
@@ -2019,7 +2019,7 @@ very same IP address.
@@ -2018,7 +2018,7 @@ very same IP address.
If this option is set to
.Cm no
(the default) then only addresses and not host names may be used in
@@ -950,20 +950,20 @@ index c077173..da23840 100644
and
.Nm
--
2.48.1
2.51.0
From 2391cabaa5b2c0ec7934c7067f70a9aa816ad1cd Mon Sep 17 00:00:00 2001
From e37e9dc10e74962f38b386c2e0a8de5a329d045e Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Sun, 27 Dec 2020 21:38:07 -0600
Subject: mux.c: use rename instead of unsupported hard link
diff --git a/mux.c b/mux.c
index 415024f..1fc6fc7 100644
index 37bcb91..fcb42c7 100644
--- a/mux.c
+++ b/mux.c
@@ -1324,9 +1324,9 @@ muxserver_listen(struct ssh *ssh)
@@ -1317,9 +1317,9 @@ muxserver_listen(struct ssh *ssh)
}
/* Now atomically "move" the mux socket into position */
@@ -975,7 +975,7 @@ index 415024f..1fc6fc7 100644
options.control_path, orig_control_path,
strerror(errno));
}
@@ -1335,7 +1335,6 @@ muxserver_listen(struct ssh *ssh)
@@ -1328,7 +1328,6 @@ muxserver_listen(struct ssh *ssh)
unlink(options.control_path);
goto disable_mux_master;
}
@@ -984,10 +984,10 @@ index 415024f..1fc6fc7 100644
options.control_path = orig_control_path;
--
2.48.1
2.51.0
From ef42308ce8685eaae30977ba8fe5408250c87a29 Mon Sep 17 00:00:00 2001
From 45b562494c070513ae7da8eee46121c9ba77b991 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Tue, 8 Jun 2021 14:25:15 +0200
Subject: gcc2 patch sntrup761.c
@@ -1014,10 +1014,10 @@ index 123d013..722b63b 100644
while (i + p <= n - q) {
for (j = i;j < i + p;++j) {
--
2.48.1
2.51.0
From 24d6f3d3da6fbc79d0bcb00986ca6025d24bb305 Mon Sep 17 00:00:00 2001
From e60fcf2f2f5e457f1df0cf75a509a808df043e4e Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Wed, 20 Oct 2021 16:57:50 +0300
Subject: Use a link to take a backup while replacing the known_hosts file
@@ -1025,10 +1025,10 @@ Subject: Use a link to take a backup while replacing the known_hosts file
Based on https://github.com/termux/termux-packages/commit/e696010d8907854dd194311ce8a02da0ca77a121
diff --git a/hostfile.c b/hostfile.c
index c5669c7..7fa07ba 100644
index 4cec57d..6034db3 100644
--- a/hostfile.c
+++ b/hostfile.c
@@ -700,7 +700,11 @@ hostfile_replace_entries(const char *filename, const char *host, const char *ip,
@@ -728,7 +728,11 @@ hostfile_replace_entries(const char *filename, const char *host, const char *ip,
r = SSH_ERR_SYSTEM_ERROR;
goto fail;
}
@@ -1041,10 +1041,10 @@ index c5669c7..7fa07ba 100644
error_f("link %.100s to %.100s: %s", filename,
back, strerror(errno));
diff --git a/ssh-keygen.c b/ssh-keygen.c
index 89c3ed2..0b6649e 100644
index 3c582a8..3f2a0ce 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1413,7 +1413,11 @@ do_known_hosts(struct passwd *pw, const char *name, int find_host,
@@ -1329,7 +1329,11 @@ do_known_hosts(struct passwd *pw, const char *name, int find_host,
/* Backup existing file */
if (unlink(old) == -1 && errno != ENOENT)
fatal("unlink %.100s: %s", old, strerror(errno));
@@ -1057,5 +1057,5 @@ index 89c3ed2..0b6649e 100644
strerror(errno));
/* Move new one into place */
--
2.48.1
2.51.0