Browse Source

openssh: update to 7.6p1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@11234 ec354946-7b23-47d6-9f5a-488ba84defc7
iwamoto 5 years ago
parent
commit
1a45e56ede
1 changed files with 18 additions and 12 deletions
  1. 18 12
      o/openssh/openssh-vl.spec

+ 18 - 12
o/openssh/openssh-vl.spec

@@ -1,5 +1,5 @@
-%define ver 7.2p2
-%define rel 2%{_dist_release}
+%define ver 7.6p1
+%define rel 1%{_dist_release}
 
 # SELinux
 %define WITH_SELINUX 0
@@ -66,17 +66,17 @@ URL: http://www.openssh.com/portable.html
 
 Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
 
-Patch0: openssh-6.4p1-vine.patch
-Patch4: openssh-7.0p1-vendor.patch
-Patch12: openssh-selinux.patch
-Patch20: openssh-3.9p1-gssapimitm.patch
-Patch21: openssh-3.9p1-safe-stop.patch
-Patch24: openssh-5.7p1-fromto-remote.patch
+Patch0: openssh-7.6p1-vine.patch
+Patch4: openssh-7.6p1-vendor.patch
+# Patch12: openssh-selinux.patch
+# Patch20: openssh-3.9p1-gssapimitm.patch
+Patch21: openssh-7.6p1-safe-stop.patch
+Patch24: openssh-7.6p1-fromto-remote.patch
 Patch26: openssh-5.2p1-pam-no-stack.patch
 # Patch27: openssh-5.1p1-log-in-chroot.patch
-Patch30: openssh-5.6p1-exit-deadlock.patch
+# Patch30: openssh-5.6p1-exit-deadlock.patch
 # Patch31: openssh-3.9p1-skip-used.patch
-Patch35: openssh-5.1p1-askpass-progress.patch
+Patch35: openssh-7.4p1-askpass-progress.patch
 
 # Vine Source
 Source100: sshd.init.vine
@@ -242,14 +242,14 @@ OpenSSH は OpenBSD による最後のフリーのバージョンの再実装で
 
 %if %{WITH_SELINUX}
 #SELinux
-%patch12 -p1 -b .selinux
+#%patch12 -p1 -b .selinux
 %endif
 
 %patch21 -p1 -b .safe-stop
 %patch24 -p1 -b .fromto-remote
 %patch26 -p1 -b .stack
 # %patch27 -p1 -b .log-chroot
-%patch30 -p1 -b .exit-deadlock
+# %patch30 -p1 -b .exit-deadlock
 %patch35 -p1 -b .progress
 
 autoreconf
@@ -478,6 +478,12 @@ fi
 
 
 %changelog
+* Wed Nov 15 2017 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 7.6p1-1
+- new upstream release.
+- update patch0,4,21,24
+- update patch35 from fc26
+- drop patch12,20,30
+
 * Fri Aug  5 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.2p2-2
 - disabled rsa1 hostkey generation.