From owner-svn-src-stable-7@FreeBSD.ORG Tue Jan 18 22:19:55 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B6F64106566C; Tue, 18 Jan 2011 22:19:55 +0000 (UTC) (envelope-from simon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A53A08FC0A; Tue, 18 Jan 2011 22:19:55 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0IMJthm054000; Tue, 18 Jan 2011 22:19:55 GMT (envelope-from simon@svn.freebsd.org) Received: (from simon@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0IMJt9D053996; Tue, 18 Jan 2011 22:19:55 GMT (envelope-from simon@svn.freebsd.org) Message-Id: <201101182219.p0IMJt9D053996@svn.freebsd.org> From: "Simon L. Nielsen" Date: Tue, 18 Jan 2011 22:19:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r217562 - in stable/7/secure/lib: libcrypto libssl X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Jan 2011 22:19:55 -0000 Author: simon Date: Tue Jan 18 22:19:55 2011 New Revision: 217562 URL: http://svn.freebsd.org/changeset/base/217562 Log: Decrease the libcrypto and libssl shared object version numbers from 6 to 5. They were accidentally bumped in r215997 (on 2010-11-28) with the merge of OpenSSL 0.9.8p, but unfortunately this was not caught until now. Also add compat links for libcrypto.so.6 / libssl.so.6 (pointing to their .5 counterparts) in case any users have compiled any third party during the time stable/7 (and releng/7.4) were broken. This is deemed the last poor of bad options. Had the number bump not been reverted binary packages for stable/7 would not have worked on the still supported 7.3 and 7.1 releases. Discussed with: re, portmgr Approved by: re (kensmith - in principle) Pointyhat to: simon Modified: stable/7/secure/lib/libcrypto/Makefile stable/7/secure/lib/libssl/Makefile Modified: stable/7/secure/lib/libcrypto/Makefile ============================================================================== --- stable/7/secure/lib/libcrypto/Makefile Tue Jan 18 21:57:02 2011 (r217561) +++ stable/7/secure/lib/libcrypto/Makefile Tue Jan 18 22:19:55 2011 (r217562) @@ -6,7 +6,9 @@ SUBDIR= engines .include LIB= crypto -SHLIB_MAJOR= 6 +SHLIB_MAJOR= 5 + +SYMLINKS= lib${LIB}.so.5 ${SHLIBDIR}/lib${LIB}.so.6 NO_LINT= Modified: stable/7/secure/lib/libssl/Makefile ============================================================================== --- stable/7/secure/lib/libssl/Makefile Tue Jan 18 21:57:02 2011 (r217561) +++ stable/7/secure/lib/libssl/Makefile Tue Jan 18 22:19:55 2011 (r217562) @@ -1,7 +1,9 @@ # $FreeBSD$ LIB= ssl -SHLIB_MAJOR= 6 +SHLIB_MAJOR= 5 + +SYMLINKS= lib${LIB}.so.5 ${SHLIBDIR}/lib${LIB}.so.6 NO_LINT=