Browse Source

openssh: update to 5.5p1


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

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

@@ -1,4 +1,4 @@
-%define ver 5.2p1
+%define ver 5.5p1
 %define rel 1%{_dist_release}
 
 # SELinux
@@ -69,15 +69,13 @@ Release: %{rel}
 URL: http://www.openssh.com/portable.html
 Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
 Source1: http://www.pobox.com/~jmknoble/software/x11-ssh-askpass/x11-ssh-askpass-%{aversion}.tar.gz
-Patch0: openssh-5.2p1-vine.patch
-Patch2: openssh-3.8.1p1-skip-initial.patch
-Patch3: openssh-3.8.1p1-krb5-config.patch
+Patch0: openssh-5.5p1-vine.patch
+Patch2: openssh-5.3p1-skip-initial.patch
 Patch4: openssh-5.2p1-vendor.patch
 Patch5: openssh-3.9p1-noinitlog.patch
 Patch12: openssh-selinux.patch
 Patch20: openssh-3.9p1-gssapimitm.patch
 Patch21: openssh-3.9p1-safe-stop.patch
-Patch22: openssh-3.9p1-askpass-keep-above.patch
 Patch24: openssh-4.3p1-fromto-remote.patch
 Patch26: openssh-5.2p1-pam-no-stack.patch
 Patch27: openssh-5.1p1-log-in-chroot.patch
@@ -86,7 +84,6 @@ Patch30: openssh-4.0p1-exit-deadlock.patch
 Patch35: openssh-4.2p1-askpass-progress.patch
 # Vine Patch
 Patch100: openssh-norootlogin.patch
-#Patch110: openssh-3.4p1-mmap-fallback.diff
 Patch120: openssh-4.7p1-sshd.init.patch
 
 License: BSD
@@ -110,6 +107,7 @@ BuildRequires: gtk2-devel
 
 Vendor: Project Vine
 Distribution: Vine Linux
+Packager: daisuke
 
 %package clients
 Summary: OpenSSH clients.
@@ -278,7 +276,6 @@ OpenSSH のためのアドオン
 %endif
 %patch0 -p1 -b .vine
 %patch2 -p1 -b .skip-initial
-%patch3 -p1 -b .krb5-config
 %patch4 -p1 -b .vendor
 %patch5 -p1 -b .noinitlog
 
@@ -287,14 +284,11 @@ OpenSSH のためのアドオン
 %patch12 -p1 -b .selinux
 %endif
 
-#%patch20 -p0 -b .gssapimitm
 %patch21 -p1 -b .safe-stop
-%patch22 -p1 -b .keep-above
 %patch24 -p1 -b .fromto-remote
 %patch26 -p1 -b .stack
 %patch27 -p1 -b .log-chroot
 %patch30 -p1 -b .exit-deadlock
-# %patch31 -p1 -b .skip-used
 %patch35 -p1 -b .progress
 
 %patch100 -p1 -b .norootlogin
@@ -545,6 +539,11 @@ fi
 %{_mandir}/man1/ssh-copy-id.1*
 
 %changelog
+* Thu Apr 22 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 5.5p1-1
+- new upstream release
+- update patch0,2
+- drop patch3,22
+
 * Tue Feb 24 2009 Daisuke SUZUKI <daisuke@linux.or.jp> 5.2p1-1
 - new upstream release