From owner-svn-src-all@FreeBSD.ORG Thu Oct 16 15:44:48 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E69F5F8C; Thu, 16 Oct 2014 15:44:48 +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 B8517850; Thu, 16 Oct 2014 15:44:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9GFimRC095380; Thu, 16 Oct 2014 15:44:48 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9GFimTO095374; Thu, 16 Oct 2014 15:44:48 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201410161544.s9GFimTO095374@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 16 Oct 2014 15:44:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r273169 - in releng/10.1: . contrib/opie lib/libopie X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Oct 2014 15:44:49 -0000 Author: gjb Date: Thu Oct 16 15:44:47 2014 New Revision: 273169 URL: https://svnweb.freebsd.org/changeset/base/273169 Log: Revert r270120 (partial), r270122: Restore ABI compatibility with 10.0-RELEASE. Requested by: many Reviewed by: delphij, ache Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: releng/10.1/ObsoleteFiles.inc releng/10.1/contrib/opie/opie.h releng/10.1/lib/libopie/Makefile Modified: releng/10.1/ObsoleteFiles.inc ============================================================================== --- releng/10.1/ObsoleteFiles.inc Thu Oct 16 15:36:04 2014 (r273168) +++ releng/10.1/ObsoleteFiles.inc Thu Oct 16 15:44:47 2014 (r273169) @@ -41,8 +41,8 @@ # 20140917: hv_kvpd rc.d script removed in favor of devd configuration OLD_FILES+=etc/rc.d/hv_kvpd # 20140814: libopie version bump -OLD_LIBS+=usr/lib/libopie.so.7 -OLD_LIBS+=usr/lib32/libopie.so.7 +OLD_LIBS+=usr/lib/libopie.so.8 +OLD_LIBS+=usr/lib32/libopie.so.8 # 20140811: otp-sha renamed to otp-sha1 OLD_FILES+=usr/bin/otp-sha OLD_FILES+=usr/share/man/man1/otp-sha.1.gz Modified: releng/10.1/contrib/opie/opie.h ============================================================================== --- releng/10.1/contrib/opie/opie.h Thu Oct 16 15:36:04 2014 (r273168) +++ releng/10.1/contrib/opie/opie.h Thu Oct 16 15:44:47 2014 (r273169) @@ -69,11 +69,11 @@ struct opie { /* Maximum length of a seed */ #define OPIE_SEED_MAX 16 -/* Max length of hash algorithm name (md4/md5/sha1) */ -#define OPIE_HASHNAME_MAX 4 +/* Max length of hash algorithm name (md4/md5) */ +#define OPIE_HASHNAME_MAX 3 -/* Maximum length of a challenge (otp-md? 9999 seed ext) */ -#define OPIE_CHALLENGE_MAX (4+OPIE_HASHNAME_MAX+1+4+1+OPIE_SEED_MAX+1+3) +/* Maximum length of a challenge (otp-md? 9999 seed) */ +#define OPIE_CHALLENGE_MAX (4+OPIE_HASHNAME_MAX+1+4+1+OPIE_SEED_MAX) /* Maximum length of a response that we allow */ #define OPIE_RESPONSE_MAX (9+1+19+1+9+OPIE_SEED_MAX+1+19+1+19+1+19) Modified: releng/10.1/lib/libopie/Makefile ============================================================================== --- releng/10.1/lib/libopie/Makefile Thu Oct 16 15:36:04 2014 (r273168) +++ releng/10.1/lib/libopie/Makefile Thu Oct 16 15:44:47 2014 (r273169) @@ -4,7 +4,7 @@ # OPIE_DIST?= ${.CURDIR}/../../contrib/opie DIST_DIR= ${OPIE_DIST}/${.CURDIR:T} -SHLIB_MAJOR= 8 +SHLIB_MAJOR= 7 KEYFILE?= \"/etc/opiekeys\"