commit 597ec3605fbcdef37ec928bdff7923ab9211b01d
Author: Adam Osuchowski <[email protected]>
Date: Mon Jul 1 11:23:44 2024 +0200
- up to 9.8p1
openssh-chroot.patch | 38 ++++++++++++++++++--------------------
openssh-ldap.patch | 30 +++++++++++++++---------------
openssh.spec | 6 +++---
3 files changed, 36 insertions(+), 38 deletions(-)
---
diff --git a/openssh.spec b/openssh.spec
index 883378a..a49c46a 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -36,13 +36,13 @@ Summary(pt_BR.UTF-8): Implementação livre do SSH
Summary(ru.UTF-8): OpenSSH - свободная реализация протокола Secure Shell
(SSH)
Summary(uk.UTF-8): OpenSSH - вільна реалізація протоколу Secure Shell (SSH)
Name: openssh
-Version: 9.7p1
-Release: 5
+Version: 9.8p1
+Release: 1
Epoch: 2
License: BSD
Group: Applications/Networking
Source0:
https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/%{name}-%{version}.tar.gz
-# Source0-md5: 1100f170ca1bc669038ca3743e074094
+# Source0-md5: bc04ff77796758c0b37bd0bc9314cd3f
Source1:
http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
# Source1-md5: 66943d481cc422512b537bcc2c7400d1
Source2: %{name}d.init
diff --git a/openssh-chroot.patch b/openssh-chroot.patch
index da45bb8..e2c01a0 100644
--- a/openssh-chroot.patch
+++ b/openssh-chroot.patch
@@ -1,38 +1,36 @@
-diff -urNp -x '*.orig' openssh-8.8p1.org/servconf.c openssh-8.8p1/servconf.c
---- openssh-8.8p1.org/servconf.c 2021-09-26 16:03:19.000000000 +0200
-+++ openssh-8.8p1/servconf.c 2021-12-09 20:13:16.486586503 +0100
-@@ -92,7 +92,9 @@ initialize_server_options(ServerOptions
-
- /* Portable-specific options */
+diff -ruNp openssh-9.8p1.orig/servconf.c openssh-9.8p1/servconf.c
+--- openssh-9.8p1.orig/servconf.c 2024-07-01 06:36:28.000000000 +0200
++++ openssh-9.8p1/servconf.c 2024-07-01 11:17:17.929993456 +0200
+@@ -94,6 +94,8 @@ initialize_server_options(ServerOptions
options->use_pam = -1;
--
-+
+ options->pam_service_name = NULL;
+
+ options->use_chroot = -1;
-+
++
/* Standard Options */
options->num_ports = 0;
options->ports_from_cmdline = 0;
-@@ -279,6 +281,9 @@ fill_default_server_options(ServerOption
- if (options->use_pam == -1)
- options->use_pam = 0;
+@@ -299,6 +301,9 @@ fill_default_server_options(ServerOption
+ if (options->pam_service_name == NULL)
+ options->pam_service_name = xstrdup(SSHD_PAM_SERVICE);
+ if (options->use_chroot == -1)
+ options->use_chroot = 0;
-+
++
/* Standard Options */
if (options->num_host_key_files == 0) {
/* fill default hostkeys for protocols */
-@@ -486,6 +491,7 @@ typedef enum {
+@@ -538,6 +543,7 @@ typedef enum {
sBadOption, /* == unknown option */
/* Portable-specific options */
- sUsePAM,
+ sUsePAM, sPAMServiceName,
+ sUseChroot,
/* Standard Options */
sPort, sHostKeyFile, sLoginGraceTime,
sPermitRootLogin, sLogFacility, sLogLevel, sLogVerbose,
-@@ -538,6 +544,11 @@ static struct {
- #else
+@@ -595,6 +601,11 @@ static struct {
{ "usepam", sUnsupported, SSHCFG_GLOBAL },
+ { "pamservicename", sUnsupported, SSHCFG_ALL },
#endif
+#ifdef CHROOT
+ { "usechroot", sUseChroot, SSHCFG_GLOBAL },
@@ -42,9 +40,9 @@ diff -urNp -x '*.orig' openssh-8.8p1.org/servconf.c
openssh-8.8p1/servconf.c
{ "pamauthenticationviakbdint", sDeprecated, SSHCFG_GLOBAL },
/* Standard Options */
{ "port", sPort, SSHCFG_GLOBAL },
-@@ -1332,6 +1343,10 @@ process_server_config_line_depth(ServerO
- intptr = &options->use_pam;
- goto parse_flag;
+@@ -1338,6 +1349,10 @@ process_server_config_line_depth(ServerO
+ *charptr = xstrdup(arg);
+ break;
+ case sUseChroot:
+ intptr = &options->use_chroot;
diff --git a/openssh-ldap.patch b/openssh-ldap.patch
index 79f4dff..a689d38 100644
--- a/openssh-ldap.patch
+++ b/openssh-ldap.patch
@@ -110,19 +110,19 @@ diff -urNp -x '*.orig' openssh-8.4p1.org/HOWTO.ldap-keys
openssh-8.4p1/HOWTO.lda
+5) Author
+ Jan F. Chadima <[email protected]>
+
-diff -urNp -x '*.orig' openssh-8.4p1.org/Makefile.in openssh-8.4p1/Makefile.in
---- openssh-8.4p1.org/Makefile.in 2020-09-27 09:25:01.000000000 +0200
-+++ openssh-8.4p1/Makefile.in 2021-03-01 11:29:31.280956671 +0100
-@@ -23,6 +23,8 @@ SSH_PROGRAM=@bindir@/ssh
+diff -ruN openssh-9.8p1.orig/Makefile.in openssh-9.8p1/Makefile.in
+--- openssh-9.8p1.orig/Makefile.in 2024-07-01 06:36:28.000000000 +0200
++++ openssh-9.8p1/Makefile.in 2024-07-01 11:10:26.787664770 +0200
+@@ -24,6 +24,8 @@
ASKPASS_PROGRAM=$(libexecdir)/ssh-askpass
SFTP_SERVER=$(libexecdir)/sftp-server
SSH_KEYSIGN=$(libexecdir)/ssh-keysign
+SSH_LDAP_HELPER=$(libexecdir)/ssh-ldap-helper
+SSH_LDAP_WRAPPER=$(libexecdir)/ssh-ldap-wrapper
+ SSHD_SESSION=$(libexecdir)/sshd-session
SSH_PKCS11_HELPER=$(libexecdir)/ssh-pkcs11-helper
SSH_SK_HELPER=$(libexecdir)/ssh-sk-helper
- PRIVSEP_PATH=@PRIVSEP_PATH@
-@@ -63,10 +65,11 @@ LDFLAGS_NOPIE=-L. -Lopenbsd-compat/ @LDF
+@@ -68,10 +70,11 @@
EXEEXT=@EXEEXT@
MANFMT=@MANFMT@
MKDIR_P=@MKDIR_P@
@@ -130,12 +130,12 @@ diff -urNp -x '*.orig' openssh-8.4p1.org/Makefile.in
openssh-8.4p1/Makefile.in
.SUFFIXES: .lo
--TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT)
ssh-keyscan${EXEEXT} ssh-keysign${EXEEXT} ssh-pkcs11-helper$(EXEEXT)
ssh-agent$(EXEEXT) scp$(EXEEXT) sftp-server$(EXEEXT) sftp$(EXEEXT)
ssh-sk-helper$(EXEEXT)
-+TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT)
ssh-keyscan${EXEEXT} ssh-keysign${EXEEXT} ssh-pkcs11-helper$(EXEEXT)
ssh-agent$(EXEEXT) scp$(EXEEXT) sftp-server$(EXEEXT) sftp$(EXEEXT)
ssh-sk-helper$(EXEEXT) ssh-ldap-helper$(EXEEXT)
+-TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) sshd-session$(EXEEXT) ssh-add$(EXEEXT)
ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-keysign${EXEEXT}
ssh-pkcs11-helper$(EXEEXT) ssh-agent$(EXEEXT) scp$(EXEEXT) sftp-server$(EXEEXT)
sftp$(EXEEXT) ssh-sk-helper$(EXEEXT)
++TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) sshd-session$(EXEEXT) ssh-add$(EXEEXT)
ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-keysign${EXEEXT}
ssh-pkcs11-helper$(EXEEXT) ssh-agent$(EXEEXT) scp$(EXEEXT) sftp-server$(EXEEXT)
sftp$(EXEEXT) ssh-sk-helper$(EXEEXT) ssh-ldap-helper$(EXEEXT)
XMSS_OBJS=\
ssh-xmss.o \
-@@ -150,8 +153,8 @@ SFTPSERVER_OBJS=sftp-common.o sftp-serve
+@@ -163,8 +166,8 @@
SFTP_OBJS= sftp.o sftp-usergroup.o progressmeter.o $(SFTP_CLIENT_OBJS)
@@ -146,7 +146,7 @@ diff -urNp -x '*.orig' openssh-8.4p1.org/Makefile.in
openssh-8.4p1/Makefile.in
MANTYPE = @MANTYPE@
CONFIGFILES=sshd_config.out ssh_config.out moduli.out
-@@ -230,6 +233,9 @@ ssh-pkcs11-helper$(EXEEXT): $(LIBCOMPAT)
+@@ -241,6 +244,9 @@
ssh-sk-helper$(EXEEXT): $(LIBCOMPAT) libssh.a $(SKHELPER_OBJS)
$(LD) -o $@ $(SKHELPER_OBJS) $(LDFLAGS) -lssh -lopenbsd-compat -lssh
-lopenbsd-compat $(LIBS) $(LIBFIDO2) $(CHANNELLIBS)
@@ -156,7 +156,7 @@ diff -urNp -x '*.orig' openssh-8.4p1.org/Makefile.in
openssh-8.4p1/Makefile.in
ssh-keyscan$(EXEEXT): $(LIBCOMPAT) libssh.a $(SSHKEYSCAN_OBJS)
$(LD) -o $@ $(SSHKEYSCAN_OBJS) $(LDFLAGS) -lssh -lopenbsd-compat -lssh
$(LIBS) $(CHANNELLIBS)
-@@ -395,6 +401,10 @@ install-files:
+@@ -414,6 +420,10 @@
$(INSTALL) -m 4711 $(STRIP_OPT) ssh-keysign$(EXEEXT)
$(DESTDIR)$(SSH_KEYSIGN)$(EXEEXT)
$(INSTALL) -m 0755 $(STRIP_OPT) ssh-pkcs11-helper$(EXEEXT)
$(DESTDIR)$(SSH_PKCS11_HELPER)$(EXEEXT)
$(INSTALL) -m 0755 $(STRIP_OPT) ssh-sk-helper$(EXEEXT)
$(DESTDIR)$(SSH_SK_HELPER)$(EXEEXT)
@@ -167,7 +167,7 @@ diff -urNp -x '*.orig' openssh-8.4p1.org/Makefile.in
openssh-8.4p1/Makefile.in
$(INSTALL) -m 0755 $(STRIP_OPT) sftp$(EXEEXT)
$(DESTDIR)$(bindir)/sftp$(EXEEXT)
$(INSTALL) -m 0755 $(STRIP_OPT) sftp-server$(EXEEXT)
$(DESTDIR)$(SFTP_SERVER)$(EXEEXT)
$(INSTALL) -m 644 ssh.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1
-@@ -412,6 +422,10 @@ install-files:
+@@ -431,6 +441,10 @@
$(INSTALL) -m 644 ssh-keysign.8.out
$(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8
$(INSTALL) -m 644 ssh-pkcs11-helper.8.out
$(DESTDIR)$(mandir)/$(mansubdir)8/ssh-pkcs11-helper.8
$(INSTALL) -m 644 ssh-sk-helper.8.out
$(DESTDIR)$(mandir)/$(mansubdir)8/ssh-sk-helper.8
@@ -178,7 +178,7 @@ diff -urNp -x '*.orig' openssh-8.4p1.org/Makefile.in
openssh-8.4p1/Makefile.in
install-sysconf:
$(MKDIR_P) $(DESTDIR)$(sysconfdir)
-@@ -435,6 +449,13 @@ install-sysconf:
+@@ -454,6 +468,13 @@
else \
echo "$(DESTDIR)$(sysconfdir)/moduli already exists, install
will not overwrite"; \
fi
@@ -192,7 +192,7 @@ diff -urNp -x '*.orig' openssh-8.4p1.org/Makefile.in
openssh-8.4p1/Makefile.in
host-key: ssh-keygen$(EXEEXT)
@if [ -z "$(DESTDIR)" ] ; then \
-@@ -473,6 +494,8 @@ uninstall:
+@@ -492,6 +513,8 @@
-rm -f $(DESTDIR)$(SSH_KEYSIGN)$(EXEEXT)
-rm -f $(DESTDIR)$(SSH_PKCS11_HELPER)$(EXEEXT)
-rm -f $(DESTDIR)$(SSH_SK_HELPER)$(EXEEXT)
@@ -201,7 +201,7 @@ diff -urNp -x '*.orig' openssh-8.4p1.org/Makefile.in
openssh-8.4p1/Makefile.in
-rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1
-rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1
-rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1
-@@ -485,6 +508,7 @@ uninstall:
+@@ -504,6 +527,7 @@
-rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8
-rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-pkcs11-helper.8
-rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-sk-helper.8
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/openssh.git/commitdiff/597ec3605fbcdef37ec928bdff7923ab9211b01d
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
