DL-Mirrors/termux-packages
0
0
Fork 1
mirror of https://github.com/termux-pacman/termux-packages.git synced 2026-01-05 18:33:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

bump(main/openssh): 9.9p1 (#21517)

Browse Source 
regenerate `sshd.c.patch` and set a maintainer
This commit is contained in:
termux-pacman-bot
2024-09-20 07:09:35 +00:00
parent 52e1a098f4
commit aa25200060
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/openssh/build.sh
View File

@@ -1,11 +1,10 @@
TERMUX_PKG_HOMEPAGE=https://www.openssh.com/
TERMUX_PKG_DESCRIPTION="Secure shell for logging into a remote machine"
TERMUX_PKG_LICENSE="BSD"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION="9.8p1"
TERMUX_PKG_REVISION=4
TERMUX_PKG_MAINTAINER="Joshua Kahn @TomJo2000"
TERMUX_PKG_VERSION="9.9p1"
TERMUX_PKG_SRCURL=https://github.com/openssh/openssh-portable/archive/refs/tags/V_$(sed 's/\./_/g; s/p/_P/g' <<< $TERMUX_PKG_VERSION).tar.gz
TERMUX_PKG_SHA256=d8f6802914e4c344dc74599c29915651554bb318102d71cb4063e1f4a0d8286f
TERMUX_PKG_SHA256=e8858153f188754d0bbf109477690eba226132879b6840cf08b51afb38151040
TERMUX_PKG_AUTO_UPDATE=true
TERMUX_PKG_DEPENDS="krb5, ldns, libandroid-support, libedit, openssh-sftp-server, openssl, termux-auth, zlib"
TERMUX_PKG_CONFLICTS="dropbear"

23
packages/openssh/sshd.c.patch
View File

@@ -1,7 +1,8 @@
diff -uNr openssh-portable-V_9_8_P1/sshd.c openssh-portable-V_9_8_P1.mod/sshd.c
--- openssh-portable-V_9_8_P1/sshd.c 2024-07-01 12:36:28.000000000 +0800
+++ openssh-portable-V_9_8_P1.mod/sshd.c 2024-07-01 18:02:23.167637504 +0800
@@ -1208,7 +1208,8 @@
diff --git a/sshd.c b/sshd.c
index df76dc78c..c6041cfae 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1215,7 +1215,8 @@ main(int ac, char **av)
saved_argc = ac;
rexec_argc = ac;
saved_argv = xcalloc(ac + 1, sizeof(*saved_argv));
@@ -11,7 +12,7 @@ diff -uNr openssh-portable-V_9_8_P1/sshd.c openssh-portable-V_9_8_P1.mod/sshd.c
saved_argv[i] = xstrdup(av[i]);
saved_argv[i] = NULL;
@@ -1217,10 +1217,10 @@
@@ -1224,10 +1225,10 @@ main(int ac, char **av)
compat_init_setproctitle(ac, av);
av = saved_argv;
#endif
@@ -24,19 +25,19 @@ diff -uNr openssh-portable-V_9_8_P1/sshd.c openssh-portable-V_9_8_P1.mod/sshd.c
/* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */
sanitise_stdfd();
@@ -1341,9 +1341,10 @@
@@ -1348,9 +1349,10 @@ main(int ac, char **av)
break;
}
}
+#ifndef __ANDROID__
if (!test_flag && !do_dump_cfg && !path_absolute(av[0]))
if (!test_flag && !inetd_flag && !do_dump_cfg && !path_absolute(av[0]))
fatal("sshd requires execution with an absolute path");
-
+#endif
closefrom(STDERR_FILENO + 1);
/* Reserve fds we'll need later for reexec things */
@@ -1602,12 +1602,13 @@
@@ -1609,12 +1611,13 @@ main(int ac, char **av)
/* Ensure privsep directory is correctly configured. */
need_chroot = ((getuid() == 0 || geteuid() == 0) ||
options.kerberos_authentication);
@@ -51,7 +52,7 @@ diff -uNr openssh-portable-V_9_8_P1/sshd.c openssh-portable-V_9_8_P1.mod/sshd.c
if (need_chroot) {
if ((stat(_PATH_PRIVSEP_CHROOT_DIR, &sb) == -1) ||
(S_ISDIR(sb.st_mode) == 0))
@@ -1638,9 +1640,10 @@
@@ -1645,9 +1648,10 @@ main(int ac, char **av)
* to create a file, and we can't control the code in every
* module which might be used).
*/
@@ -63,7 +64,7 @@ diff -uNr openssh-portable-V_9_8_P1/sshd.c openssh-portable-V_9_8_P1.mod/sshd.c
/* Prepare arguments for sshd-session */
if (rexec_argc < 0)
fatal("rexec_argc %d < 0", rexec_argc);
@@ -1679,7 +1682,7 @@
@@ -1686,7 +1690,7 @@ main(int ac, char **av)
already_daemon = daemonized();
if (!(debug_flag || inetd_flag || no_daemon_flag || already_daemon)) {
@@ -72,7 +73,7 @@ diff -uNr openssh-portable-V_9_8_P1/sshd.c openssh-portable-V_9_8_P1.mod/sshd.c
fatal("daemon() failed: %.200s", strerror(errno));
disconnect_controlling_tty();
@@ -1691,9 +1694,10 @@
@@ -1698,9 +1702,10 @@ main(int ac, char **av)
* Chdir to the root directory so that the current disk can be
* unmounted if desired.
*/