svn commit: r312373 - in stable/11: lib/libstand lib/libz lib/libz/contrib lib/libz/doc lib/libz/test usr.bin/minigzip

Wed Jan 18 08:11:20 UTC 2017

Author: delphij
Date: Wed Jan 18 08:11:18 2017
New Revision: 312373
URL: https://svnweb.freebsd.org/changeset/base/312373

Log:
  MFC r311275: Restructure libz.

Added:
     - copied from r311275, head/contrib/zlib/
Directory Properties:
  stable/11/contrib/zlib/   (props changed)
Deleted:
  stable/11/lib/libz/ChangeLog
  stable/11/lib/libz/FAQ
  stable/11/lib/libz/README
  stable/11/lib/libz/adler32.c
  stable/11/lib/libz/compress.c
  stable/11/lib/libz/contrib/
  stable/11/lib/libz/crc32.c
  stable/11/lib/libz/crc32.h
  stable/11/lib/libz/deflate.c
  stable/11/lib/libz/deflate.h
  stable/11/lib/libz/doc/
  stable/11/lib/libz/gzclose.c
  stable/11/lib/libz/gzguts.h
  stable/11/lib/libz/gzlib.c
  stable/11/lib/libz/gzread.c
  stable/11/lib/libz/gzwrite.c
  stable/11/lib/libz/infback.c
  stable/11/lib/libz/inffast.c
  stable/11/lib/libz/inffast.h
  stable/11/lib/libz/inffixed.h
  stable/11/lib/libz/inflate.c
  stable/11/lib/libz/inflate.h
  stable/11/lib/libz/inftrees.c
  stable/11/lib/libz/inftrees.h
  stable/11/lib/libz/test/
  stable/11/lib/libz/trees.c
  stable/11/lib/libz/trees.h
  stable/11/lib/libz/uncompr.c
  stable/11/lib/libz/zconf.h
  stable/11/lib/libz/zlib.3
  stable/11/lib/libz/zlib.h
  stable/11/lib/libz/zutil.c
  stable/11/lib/libz/zutil.h
Modified:
  stable/11/lib/libstand/Makefile
  stable/11/lib/libz/FREEBSD-upgrade
  stable/11/lib/libz/Makefile
  stable/11/usr.bin/minigzip/Makefile
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/lib/libstand/Makefile
==============================================================================

--- stable/11/lib/libstand/Makefile	Wed Jan 18 05:36:09 2017	(r312372)
+++ stable/11/lib/libstand/Makefile	Wed Jan 18 08:11:18 2017	(r312373)
@@ -109,9 +109,9 @@ libstand_bzlib_private.h: bzlib_private.
 	sed -e 's|<stdlib.h>|"stand.h"|' \
 		${.ALLSRC} > ${.TARGET}
 
-# decompression functionality from libz
-.PATH: ${LIBSTAND_SRC}/../libz
-CFLAGS+=-DHAVE_MEMCPY -I${LIBSTAND_SRC}/../libz
+# decompression functionality from zlib
+.PATH: ${LIBSTAND_SRC}/../../contrib/zlib
+CFLAGS+=-DHAVE_MEMCPY -I${LIBSTAND_SRC}/../../contrib/zlib
 SRCS+=	adler32.c crc32.c libstand_zutil.h libstand_gzguts.h
 
 .for file in infback.c inffast.c inflate.c inftrees.c zutil.c

Modified: stable/11/lib/libz/FREEBSD-upgrade
==============================================================================
--- stable/11/lib/libz/FREEBSD-upgrade	Wed Jan 18 05:36:09 2017	(r312372)
+++ stable/11/lib/libz/FREEBSD-upgrade	Wed Jan 18 08:11:18 2017	(r312373)
@@ -1,44 +1,16 @@
 $FreeBSD$
 
-ZLib 1.2.2
-
-Original distribution from http://www.gzip.org/zlib/
-
-Vendor files removed from distribution before import:
-	 INDEX		 configure	 qnx/
-	 Makefile	 contrib/	 win32/
-	 Makefile.in	 msdos/		 zconf.in.h
-	 amiga/		 old/
-	 as400/		 projects/
-
-Vendor files imported:
-	 ChangeLog	 example.c	 minigzip.c
-	 FAQ		 gzio.c		 trees.c
-	 README		 infback.c	 trees.h
-	 adler32.c	 inffast.c	 uncompr.c
-	 algorithm.txt	 inffast.h	 zconf.h
-	 compress.c	 inffixed.h	 zlib.3
-	 crc32.c	 inflate.c	 zlib.h
-	 crc32.h	 inflate.h	 zutil.c
-	 deflate.c	 inftrees.c	 zutil.h
-	 deflate.h	 inftrees.h
-
-As of April, 2005, only the following three vendor files
-had non-trivial local changes:
-	 gzio.c   minigzip.c  zconf.h
-
-Added files (not from vendor):
-	 Makefile	 zopen.c	 FREEBSD-upgrade
+Original distribution from http://zlib.net/.  Currently, only trivial
+changes were made to support build of libstand and to suppress certain
+compiler warnings, we upstream our local changes whenever they would
+benefit other consumers.
 
 To Update:
   1) Unpack vendor sources into a clean directory.
-  2) Delete unnecessary files.
-  3) Import onto the vendor branch.  The 1.2.2 import was done like this:
-   cvs -d <CVSROOT> import -ko -m "ZLib 1.2.2" src/lib/libz ZLIB v1_2_2
-  4) In a clean directory, check out a fresh copy of HEAD,
-	 merging in vendor changes since the last import.
-   cvs -d <CVSROOT> co -jZLIB:yesterday -jZLIB src/lib/libz
-  5) Resolve any conflicts and commit them.
-  6) Update this file with any changes to the file list or update procedure.
+  2) Import onto the vendor area.
+  3) Merge the vendor tree to contrib/zlib, which contains a stripped down
+     version of upstream source, resolve any conflicts.
+  4) Double check zconf.h, zlib.pc, and Symbol.map to make sure that we
+     have the required changes.  Test universe and commit them.
 
-kientzle at FreeBSD.org
+delphij at FreeBSD.org

Modified: stable/11/lib/libz/Makefile
==============================================================================
--- stable/11/lib/libz/Makefile	Wed Jan 18 05:36:09 2017	(r312372)
+++ stable/11/lib/libz/Makefile	Wed Jan 18 08:11:18 2017	(r312373)
@@ -8,6 +8,10 @@ SHLIBDIR?=	/lib
 SHLIB_MAJOR=	6
 MAN=		zlib.3 zopen.3
 
+ZLIBSRC=	${SRCTOP}/contrib/zlib
+
+.PATH:		${ZLIBSRC}
+
 #CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
 #CFLAGS=-g -DDEBUG
 #CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
@@ -37,14 +41,14 @@ SRCS+=		zopen.c
 SRCS+=		zutil.c
 
 #.if ${MACHINE_ARCH} == "i386" && ${MACHINE_CPU:M*i686*}
-#.PATH:		${.CURDIR}/contrib/asm686
+#.PATH:		${ZLIBSRC}/contrib/asm686
 #SRCS+=		match.S
 #CFLAGS+=	-DASMV -DNO_UNDERLINE
 #ACFLAGS+=	-Wa,--noexecstack
 #.endif
 
 #.if ${MACHINE_ARCH} == "amd64"
-#.PATH:		${.CURDIR}/contrib/gcc_gvmat64
+#.PATH:		${ZLIBSRC}/contrib/gcc_gvmat64
 #SRCS+=		gvmat64.S
 #CFLAGS+=	-DASMV -DNO_UNDERLINE
 #ACFLAGS+=	-Wa,--noexecstack
@@ -56,7 +60,7 @@ CFLAGS+=	-DSYMBOL_VERSIONING
 
 INCS=		zconf.h zlib.h
 
-.PATH:		${.CURDIR}/test
+.PATH:		${ZLIBSRC}/test
 
 minigzip:	all minigzip.o
 	$(CC) -o minigzip minigzip.o -L. -lz

Modified: stable/11/usr.bin/minigzip/Makefile
==============================================================================
--- stable/11/usr.bin/minigzip/Makefile	Wed Jan 18 05:36:09 2017	(r312372)
+++ stable/11/usr.bin/minigzip/Makefile	Wed Jan 18 08:11:18 2017	(r312373)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-SRCDIR=	${.CURDIR}/../../lib/libz/test
+SRCDIR=	${.CURDIR}/../../contrib/zlib/test
 .PATH:	${SRCDIR}
 
 PROG=	minigzip
