Browse Source

openssh: update to 7.1p1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9938 ec354946-7b23-47d6-9f5a-488ba84defc7
daisuke 8 years ago
parent
commit
d35856dbec
1 changed files with 16 additions and 9 deletions
  1. 16 9
      o/openssh/openssh-vl.spec

+ 16 - 9
o/openssh/openssh-vl.spec

@@ -1,4 +1,4 @@
-%define ver 6.6p1
+%define ver 7.1p1
 %define rel 1%{_dist_release}
 
 # SELinux
@@ -67,7 +67,7 @@ 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-6.2p1-vendor.patch
+Patch4: openssh-7.0p1-vendor.patch
 Patch12: openssh-selinux.patch
 Patch20: openssh-3.9p1-gssapimitm.patch
 Patch21: openssh-3.9p1-safe-stop.patch
@@ -79,11 +79,8 @@ Patch30: openssh-5.6p1-exit-deadlock.patch
 Patch35: openssh-5.1p1-askpass-progress.patch
 
 # Vine Source
-Source100: sshd.init
-Source110: sshd.sysconfig
-
-# Vine Patch
-Patch100: openssh-norootlogin.patch
+Source100: sshd.init.vine
+Source110: sshd.sysconfig.vine
 
 License: BSD
 Group: Applications/Internet
@@ -93,7 +90,11 @@ Obsoletes: ssh
 
 BuildRequires: perl, openssl-devel, tcp_wrappers
 BuildRequires: util-linux
+%if "%{_dist_release}" >= "vl7"
 BuildRequires: libdb-devel
+%else
+BuildRequires: db4-devel
+%endif
 BuildRequires: pam-devel
 BuildRequires: zlib-devel
 %if ! %{no_gnome_askpass}
@@ -251,8 +252,6 @@ OpenSSH は OpenBSD による最後のフリーのバージョンの再実装で
 %patch30 -p1 -b .exit-deadlock
 %patch35 -p1 -b .progress
 
-%patch100 -p1 -b .norootlogin
-
 autoreconf
 
 
@@ -479,6 +478,14 @@ fi
 
 
 %changelog
+* Mon Dec 28 2015 Daisuke SUZUKI <daisuke@vinelinux.org> 7.1p1-1
+- update to 7.1p1
+- remove patch100 to use default value "prohibit-password" for PermitRootLogin
+
+* Tue Oct 14 2014 Daisuke SUZUKI <daisuke@vinelinux.org> 6.7p1-1
+- update to 6.7p1
+- fix sshd.init
+
 * Thu Aug 07 2014 Daisuke SUZUKI <daisuke@vinelinux.org> 6.6p1-1
 - update to 6.6p1
 - remove BR: sharutils