From owner-svn-src-all@FreeBSD.ORG  Wed Jan 19 07:44:47 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7B1701065675;
	Wed, 19 Jan 2011 07:44:47 +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 69DD48FC14;
	Wed, 19 Jan 2011 07:44:47 +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 p0J7ilY1067521;
	Wed, 19 Jan 2011 07:44:47 GMT (envelope-from simon@svn.freebsd.org)
Received: (from simon@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0J7il5g067518;
	Wed, 19 Jan 2011 07:44:47 GMT (envelope-from simon@svn.freebsd.org)
Message-Id: <201101190744.p0J7il5g067518@svn.freebsd.org>
From: "Simon L. Nielsen" <simon@FreeBSD.org>
Date: Wed, 19 Jan 2011 07:44:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-releng@freebsd.org
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r217574 - in releng/7.4/secure/lib: libcrypto libssl
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 19 Jan 2011 07:44:47 -0000

Author: simon
Date: Wed Jan 19 07:44:47 2011
New Revision: 217574
URL: http://svn.freebsd.org/changeset/base/217574

Log:
  MFS7 r217562:
  
   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.
  
  Approved by:	re (kensmith)

Modified:
  releng/7.4/secure/lib/libcrypto/Makefile
  releng/7.4/secure/lib/libssl/Makefile
Directory Properties:
  releng/7.4/secure/lib/libcrypto/   (props changed)
  releng/7.4/secure/lib/libssl/   (props changed)

Modified: releng/7.4/secure/lib/libcrypto/Makefile
==============================================================================
--- releng/7.4/secure/lib/libcrypto/Makefile	Wed Jan 19 07:06:28 2011	(r217573)
+++ releng/7.4/secure/lib/libcrypto/Makefile	Wed Jan 19 07:44:47 2011	(r217574)
@@ -6,7 +6,9 @@ SUBDIR=		engines
 .include <bsd.own.mk>
 
 LIB=		crypto
-SHLIB_MAJOR=	6
+SHLIB_MAJOR=	5
+
+SYMLINKS=	lib${LIB}.so.5 ${SHLIBDIR}/lib${LIB}.so.6
 
 NO_LINT=
 

Modified: releng/7.4/secure/lib/libssl/Makefile
==============================================================================
--- releng/7.4/secure/lib/libssl/Makefile	Wed Jan 19 07:06:28 2011	(r217573)
+++ releng/7.4/secure/lib/libssl/Makefile	Wed Jan 19 07:44:47 2011	(r217574)
@@ -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=