Date: Sun, 19 Oct 2014 12:11:26 +0000 (UTC) From: Antoine Brodin <antoine@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r273277 - in stable/10: . contrib/opie lib/libopie Message-ID: <201410191211.s9JCBQ0E083161@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: antoine Date: Sun Oct 19 12:11:25 2014 New Revision: 273277 URL: https://svnweb.freebsd.org/changeset/base/273277 Log: Restore ABI compatibility with 10.0-RELEASE, so that stable/10 users can use official freebsd packages Modified: stable/10/ObsoleteFiles.inc stable/10/contrib/opie/opie.h stable/10/lib/libopie/Makefile Modified: stable/10/ObsoleteFiles.inc ============================================================================== --- stable/10/ObsoleteFiles.inc Sun Oct 19 11:59:15 2014 (r273276) +++ stable/10/ObsoleteFiles.inc Sun Oct 19 12:11:25 2014 (r273277) @@ -43,8 +43,8 @@ OLD_FILES+=usr/share/openssl/man/man3/CM # 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: stable/10/contrib/opie/opie.h ============================================================================== --- stable/10/contrib/opie/opie.h Sun Oct 19 11:59:15 2014 (r273276) +++ stable/10/contrib/opie/opie.h Sun Oct 19 12:11:25 2014 (r273277) @@ -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: stable/10/lib/libopie/Makefile ============================================================================== --- stable/10/lib/libopie/Makefile Sun Oct 19 11:59:15 2014 (r273276) +++ stable/10/lib/libopie/Makefile Sun Oct 19 12:11:25 2014 (r273277) @@ -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?201410191211.s9JCBQ0E083161>