From owner-svn-src-user@FreeBSD.ORG  Mon Mar 22 20:24:00 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D99D61065670;
	Mon, 22 Mar 2010 20:24:00 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id AFC9D8FC15;
	Mon, 22 Mar 2010 20:24:00 +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 o2MKO0e7030254;
	Mon, 22 Mar 2010 20:24:00 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2MKO0pq030250;
	Mon, 22 Mar 2010 20:24:00 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201003222024.o2MKO0pq030250@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Mon, 22 Mar 2010 20:24:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r205466 - user/delphij/libz
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 22 Mar 2010 20:24:00 -0000

Author: delphij
Date: Mon Mar 22 20:24:00 2010
New Revision: 205466
URL: http://svn.freebsd.org/changeset/base/205466

Log:
  Versioned symbols for libz.

Added:
  user/delphij/libz/Symbol.map
  user/delphij/libz/Versions.def
Modified:
  user/delphij/libz/Makefile

Modified: user/delphij/libz/Makefile
==============================================================================
--- user/delphij/libz/Makefile	Mon Mar 22 20:21:22 2010	(r205465)
+++ user/delphij/libz/Makefile	Mon Mar 22 20:24:00 2010	(r205466)
@@ -47,6 +47,10 @@ SRCS+=		gvmat64.S
 CFLAGS+=	-DASMV -DNO_UNDERLINE
 .endif
 
+VERSION_DEF=	${.CURDIR}/Versions.def
+SYMBOL_MAPS=	${.CURDIR}/Symbol.map
+CFLAGS+=	-DSYMBOL_VERSIONING
+
 INCS=		zconf.h zlib.h
 
 minigzip:	all minigzip.o

Added: user/delphij/libz/Symbol.map
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/delphij/libz/Symbol.map	Mon Mar 22 20:24:00 2010	(r205466)
@@ -0,0 +1,96 @@
+/*
+ * $FreeBSD$
+ */
+
+ZLIB_1.2.4.0 {
+	adler32;
+	adler32_combine64;
+	compress;
+	compress2;
+	compressBound;
+	crc32;
+	crc32_combine64;
+	deflate;
+	deflateBound;
+	deflateCopy;
+	deflateEnd;
+	deflateInit2_;
+	deflateInit_;
+	deflateParams;
+	deflatePrime;
+	deflateReset;
+	deflateSetDictionary;
+	deflateSetHeader;
+	deflateTune;
+	get_crc_table;
+	gzbuffer;
+	gzclearerr;
+	gzclose;
+	gzclose_r;
+	gzclose_w;
+	gzdirect;
+	gzdopen;
+	gzeof;
+	gzerror;
+	gzflush;
+	gzgetc;
+	gzgets;
+	gzoffset64;
+	gzopen64;
+	gzprintf;
+	gzputc;
+	gzputs;
+	gzread;
+	gzrewind;
+	gzseek64;
+	gzsetparams;
+	gztell64;
+	gzungetc;
+	gzwrite;
+	inflate;
+	inflateBack;
+	inflateBackEnd;
+	inflateBackInit_;
+	inflateCopy;
+	inflateEnd;
+	inflateGetHeader;
+	inflateInit2_;
+	inflateInit_;
+	inflateMark;
+	inflatePrime;
+	inflateReset;
+	inflateReset2;
+	inflateSetDictionary;
+	inflateSync;
+	inflateSyncPoint;
+	inflateUndermine;
+	uncompress;
+	zError;
+	zlibCompileFlags;
+	zlibVersion;
+};
+
+FBSD_1.2 {
+	zopen;
+};
+
+ZLIBprivate_1.0 {
+	_tr_align;
+	_tr_flush_block;
+	_tr_init;
+	_tr_stored_block;
+	_tr_tally;
+	adler32_combine;
+	crc32_combine;
+	gz_error;
+	gzoffset;
+	gzopen;
+	gzseek;
+	gztell;
+	inflate_fast;
+	inflate_table;
+	longest_match;
+	match_init;
+	zcalloc;
+	zcfree;
+};

Added: user/delphij/libz/Versions.def
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/delphij/libz/Versions.def	Mon Mar 22 20:24:00 2010	(r205466)
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+ZLIB_1.2.4.0 {
+};
+
+FBSD_1.2 {
+} ZLIB_1.2.4.0;
+
+ZLIBprivate_1.0 {
+} ZLIB_1.2.4.0;
+