update: openssh

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@7056 ec354946-7b23-47d6-9f5a-488ba84defc7

o/openssh/openssh-vl.spec

@@ -1,4 +1,4 @@
-%define ver 6.0p1
+%define ver 6.1p1
 %define rel 1%{_dist_release}
 
 # SELinux
@@ -67,16 +67,16 @@ URL: http://www.openssh.com/portable.html
 Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
 
 Patch0: openssh-5.5p1-vine.patch
-Patch4: openssh-5.9p1-vendor.patch
+Patch4: openssh-6.1p1-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
 Patch26: openssh-5.2p1-pam-no-stack.patch
-#Patch27: openssh-5.1p1-log-in-chroot.patch
-Patch30: openssh-4.0p1-exit-deadlock.patch
+# Patch27: openssh-5.1p1-log-in-chroot.patch
+Patch30: openssh-5.6p1-exit-deadlock.patch
 # Patch31: openssh-3.9p1-skip-used.patch
-Patch35: openssh-4.2p1-askpass-progress.patch
+Patch35: openssh-5.1p1-askpass-progress.patch
 
 # Vine Source
 Source100: sshd.init
@@ -247,7 +247,7 @@ OpenSSH は OpenBSD による最後のフリーのバージョンの再実装で
 %patch21 -p1 -b .safe-stop
 %patch24 -p1 -b .fromto-remote
 %patch26 -p1 -b .stack
-#%patch27 -p1 -b .log-chroot
+# %patch27 -p1 -b .log-chroot
 %patch30 -p1 -b .exit-deadlock
 %patch35 -p1 -b .progress
 
@@ -281,6 +281,7 @@ LDFLAGS="$LDFLAGS -pie"; export LDFLAGS
         --with-privsep-path=%{_var}/empty/sshd \
         --enable-vendor-patchlevel="VL-%{version}-%{release}" \
 	--with-libedit \
+	--with-xauth=/usr/bin/xauth \
 %if %{scard}
 	--with-smartcard \
 %endif
@@ -478,6 +479,11 @@ fi
 
 
 %changelog
+* Fri Nov  2 2012 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 6.1p1-1
+- new upstream release
+- add -with-xauth option in configure
+- patch4, 30, 35 are updated from fc18
+
 * Mon May 07 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 6.0p1-1
 - new upstream release 
 
@@ -758,3 +764,4 @@ fi
 * Wed Oct 27 1999 Damien Miller <djm@ibs.com.au>
 - Initial RPMification, based on Jan "Yenya" Kasprzak's <kas@fi.muni.cz> spec.
 
+