Date: Thu, 16 Oct 2014 15:44:48 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> 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 Message-ID: <201410161544.s9GFimTO095374@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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\"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410161544.s9GFimTO095374>