From 47b1c9e6a4e5351a671ea2c4a1aa9c0547d0d550 Mon Sep 17 00:00:00 2001
From: Petr Lautrbach <plautrba@redhat.com>
Date: Oct 08 2013 15:04:51 +0000
Subject: Revert "adjust openssh-6.2p1-vendor.patch after previous commit"


This reverts commit 4936e20991547cb9768c765c61669240ee7dbc3d.

---

diff --git a/openssh-6.2p1-vendor.patch b/openssh-6.2p1-vendor.patch
index 68d30dc..ddccd2c 100644
--- a/openssh-6.2p1-vendor.patch
+++ b/openssh-6.2p1-vendor.patch
@@ -1,21 +1,20 @@
-diff -up openssh-6.2p2/configure.ac.vendor openssh-6.2p2/configure.ac
---- openssh-6.2p2/configure.ac.vendor	2013-09-10 18:09:06.463326695 +0200
-+++ openssh-6.2p2/configure.ac	2013-09-10 18:10:46.302864218 +0200
-@@ -4427,6 +4427,13 @@ AC_ARG_ENABLE(hmac-suffix,
-   [AC_DEFINE(HMAC_SUFFIX, NULL)]
+diff -up openssh-6.2p1/configure.ac.vendor openssh-6.2p1/configure.ac
+--- openssh-6.2p1/configure.ac.vendor	2013-03-25 19:34:01.277495179 +0100
++++ openssh-6.2p1/configure.ac	2013-03-25 19:34:01.377495818 +0100
+@@ -4420,6 +4420,12 @@ AC_ARG_WITH([lastlog],
+ 		fi
+ 	]
  )
- 
 +AC_ARG_ENABLE(vendor-patchlevel,
 +  [  --enable-vendor-patchlevel=TAG  specify a vendor patch level],
 +  [AC_DEFINE_UNQUOTED(SSH_VENDOR_PATCHLEVEL,[SSH_RELEASE "-" "$enableval"],[Define to your vendor patch level, if it has been modified from the upstream source release.])
 +   SSH_VENDOR_PATCHLEVEL="$enableval"],
 +  [AC_DEFINE(SSH_VENDOR_PATCHLEVEL,SSH_RELEASE,[Define to your vendor patch level, if it has been modified from the upstream source release.])
 +   SSH_VENDOR_PATCHLEVEL=none])
-+
+ 
  dnl lastlog, [uw]tmpx? detection
  dnl  NOTE: set the paths in the platform section to avoid the
- dnl   need for command-line parameters
-@@ -4687,6 +4694,7 @@ echo "           Translate v4 in v6 hack
+@@ -4681,6 +4687,7 @@ echo "           Translate v4 in v6 hack
  echo "                  BSD Auth support: $BSD_AUTH_MSG"
  echo "              Random number source: $RAND_MSG"
  echo "             Privsep sandbox style: $SANDBOX_STYLE"
@@ -147,7 +146,7 @@ diff -up openssh-6.2p1/sshd.c.vendor openssh-6.2p1/sshd.c
  	    *options.version_addendum == '\0' ? "" : " ",
  	    options.version_addendum, newline);
  
-@@ -1676,7 +1676,8 @@ main(int ac, char **av)
+@@ -1675,7 +1675,8 @@ main(int ac, char **av)
  		exit(1);
  	}