diff options
| author | antoine <antoine@FreeBSD.org> | 2014-10-19 12:11:25 +0000 |
|---|---|---|
| committer | antoine <antoine@FreeBSD.org> | 2014-10-19 12:11:25 +0000 |
| commit | 3da91303cf78e789faa8697b9fc4e57cbb23c284 (patch) | |
| tree | b9a84cfd30fd306bd1d6e14b312b3b0029861323 | |
| parent | 84b9f624de63d416772a2801a480e6fd615fca18 (diff) | |
| download | FreeBSD-src-3da91303cf78e789faa8697b9fc4e57cbb23c284.zip FreeBSD-src-3da91303cf78e789faa8697b9fc4e57cbb23c284.tar.gz | |
Restore ABI compatibility with 10.0-RELEASE, so that stable/10 users can use
official freebsd packages
| -rw-r--r-- | ObsoleteFiles.inc | 4 | ||||
| -rw-r--r-- | contrib/opie/opie.h | 8 | ||||
| -rw-r--r-- | lib/libopie/Makefile | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index e7279c7..bd6547d 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -43,8 +43,8 @@ OLD_FILES+=usr/share/openssl/man/man3/CMS_sign_add1_signer.3.gz # 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 diff --git a/contrib/opie/opie.h b/contrib/opie/opie.h index 69ba005..be508c7 100644 --- a/contrib/opie/opie.h +++ b/contrib/opie/opie.h @@ -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) diff --git a/lib/libopie/Makefile b/lib/libopie/Makefile index e47e16d..647bfee 100644 --- a/lib/libopie/Makefile +++ b/lib/libopie/Makefile @@ -4,7 +4,7 @@ # OPIE_DIST?= ${.CURDIR}/../../contrib/opie DIST_DIR= ${OPIE_DIST}/${.CURDIR:T} -SHLIB_MAJOR= 8 +SHLIB_MAJOR= 7 KEYFILE?= \"/etc/opiekeys\" |
