From owner-svn-src-stable@FreeBSD.ORG  Mon Aug 18 02:42:24 2014
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 0828A1A6;
 Mon, 18 Aug 2014 02:42:24 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id E758D3EB6;
 Mon, 18 Aug 2014 02:42:23 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7I2gNIw087097;
 Mon, 18 Aug 2014 02:42:23 GMT (envelope-from ache@FreeBSD.org)
Received: (from ache@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7I2gNaq087095;
 Mon, 18 Aug 2014 02:42:23 GMT (envelope-from ache@FreeBSD.org)
Message-Id: <201408180242.s7I2gNaq087095@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ache set sender to ache@FreeBSD.org
 using -f
From: "Andrey A. Chernov" <ache@FreeBSD.org>
Date: Mon, 18 Aug 2014 02:42:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r270122 - in stable/10: . lib/libopie
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 18 Aug 2014 02:42:24 -0000

Author: ache
Date: Mon Aug 18 02:42:23 2014
New Revision: 270122
URL: http://svnweb.freebsd.org/changeset/base/270122

Log:
  Direct commit to stable/10 reflecting r269961 because the rest can't be
  merged.
  
  Bump version because challenge buffer size changed.

Modified:
  stable/10/ObsoleteFiles.inc
  stable/10/lib/libopie/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/ObsoleteFiles.inc
==============================================================================
--- stable/10/ObsoleteFiles.inc	Mon Aug 18 02:32:48 2014	(r270121)
+++ stable/10/ObsoleteFiles.inc	Mon Aug 18 02:42:23 2014	(r270122)
@@ -38,6 +38,9 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20140814: libopie version bump
+OLD_LIBS+=usr/lib/libopie.so.7
+OLD_LIBS+=usr/lib32/libopie.so.7
 # 20140811: otp-sha renamed to otp-sha1
 OLD_FILES+=usr/bin/otp-sha
 OLD_FILES+=usr/share/man/man1/otp-sha.1.gz

Modified: stable/10/lib/libopie/Makefile
==============================================================================
--- stable/10/lib/libopie/Makefile	Mon Aug 18 02:32:48 2014	(r270121)
+++ stable/10/lib/libopie/Makefile	Mon Aug 18 02:42:23 2014	(r270122)
@@ -4,7 +4,7 @@
 #
 OPIE_DIST?=	${.CURDIR}/../../contrib/opie
 DIST_DIR=	${OPIE_DIST}/${.CURDIR:T}
-SHLIB_MAJOR=    7
+SHLIB_MAJOR=    8
 
 KEYFILE?=	\"/etc/opiekeys\"