Up to 9.0p1.

diff --git a/branch.sh b/branch.sh
index bf689405422f5c5263361902b78060486da00290..e25b4b05d57d35137396048ec596f272460e8f4d 100755 (executable)
--- a/branch.sh
+++ b/branch.sh
@@ -5,8 +5,8 @@
 set -e
 url=https://github.com/openssh/openssh-portable.git
 package=openssh
-tag=V_8_9_P1
-branch=V_8_9
+tag=V_9_0_P1
+branch=V_9_0
 out=$package-git.patch
 repo=$package.git
 

diff --git a/openssh-sigpipe.patch b/openssh-sigpipe.patch
index 6d6b8fcecf66f77877678c1eafdf47776d0d1026..c4378f43fa38facd8f9bb48f189edffd43d49934 100644 (file)
--- a/openssh-sigpipe.patch
+++ b/openssh-sigpipe.patch
@@ -78,12 +78,12 @@ diff -urNp -x '*.orig' openssh-8.4p1.org/ssh.c openssh-8.4p1/ssh.c
  "           [-b bind_address] [-c cipher_spec] [-D [bind_address:]port]\n"
  "           [-E log_file] [-e escape_char] [-F configfile] [-I pkcs11]\n"
  "           [-i identity_file] [-J [user@]host[:port]] [-L address]\n"
-@@ -722,7 +725,7 @@ main(int ac, char **av)
+@@ -699,7 +699,7 @@ main(int ac, char **av)
  
   again:
        while ((opt = getopt(ac, av, "1246ab:c:e:fgi:kl:m:no:p:qstvx"
--          "AB:CD:E:F:GI:J:KL:MNO:PQ:R:S:TVw:W:XYy")) != -1) {
-+          "AB:CD:E:F:GI:J:KL:MNO:PQ:R:S:TVw:W:XYyZ")) != -1) {
+-          "AB:CD:E:F:GI:J:KL:MNO:PQ:R:S:TVw:W:XYy")) != -1) { /* HUZdhjruz */
++          "AB:CD:E:F:GI:J:KL:MNO:PQ:R:S:TVw:W:XYyZ")) != -1) { /* HUZdhjruz */
                switch (opt) {
                case '1':
                        fatal("SSH protocol v.1 is no longer supported");

diff --git a/openssh.spec b/openssh.spec
index c996c1f16c95c52f2fbd8c0f43c128acee9e2e2b..827ab5a390b8f951284d7b2ece0a3961d079364f 100644 (file)
--- 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:       8.9p1
-Release:       5
+Version:       9.0p1
+Release:       1
 Epoch:         2
 License:       BSD
 Group:         Applications/Networking
 Source0:       https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/%{name}-%{version}.tar.gz
-# Source0-md5: f33910174f0af52491277211e2b105bb
+# Source0-md5: 5ed8252a0ee379c0f7c9e0d25d32424d
 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
@@ -55,8 +55,8 @@ Source9:      sshd.service
 Source10:      sshd-keygen
 Source11:      sshd.socket
 Source12:      sshd@.service
-Patch100:      %{name}-git.patch
-# Patch100-md5:        4adbc2d6841aa2832d4df8e70e38c666
+#Patch100:     %{name}-git.patch
+## Patch100-md5:       d41d8cd98f00b204e9800998ecf8427e
 Patch0:                %{name}-no-pty-tests.patch
 Patch1:                %{name}-tests-reuseport.patch
 Patch2:                %{name}-pam_misc.patch
@@ -542,7 +542,7 @@ openldap-a.
 
 %prep
 %setup -q
-%patch100 -p1
+#%patch100 -p1
 
 %patch0 -p1
 %patch1 -p1