From 99029fadeeb4c2fef43892a1a4a20ad9e78890e2 Mon Sep 17 00:00:00 2001 From: delphij Date: Wed, 8 May 2019 08:43:15 +0000 Subject: [PATCH] Move contrib/zlib to sys/contrib/zlib so that we can use it in kernel. This is a prerequisite of unifying kernel zlib instances. Submitted by: Yoshihiro Ota MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D20191 --- lib/libz/FREEBSD-upgrade | 2 +- lib/libz/Makefile | 2 +- stand/libsa/Makefile | 4 ++-- {contrib => sys/contrib}/zlib/ChangeLog | 0 {contrib => sys/contrib}/zlib/FAQ | 0 {contrib => sys/contrib}/zlib/README | 0 {contrib => sys/contrib}/zlib/adler32.c | 0 {contrib => sys/contrib}/zlib/compress.c | 0 {contrib => sys/contrib}/zlib/contrib/README.contrib | 0 {contrib => sys/contrib}/zlib/contrib/asm686/README.686 | 0 {contrib => sys/contrib}/zlib/contrib/asm686/match.S | 0 {contrib => sys/contrib}/zlib/contrib/gcc_gvmat64/gvmat64.S | 0 {contrib => sys/contrib}/zlib/crc32.c | 0 {contrib => sys/contrib}/zlib/crc32.h | 0 {contrib => sys/contrib}/zlib/deflate.c | 0 {contrib => sys/contrib}/zlib/deflate.h | 0 {contrib => sys/contrib}/zlib/doc/algorithm.txt | 0 {contrib => sys/contrib}/zlib/doc/rfc1950.txt | 0 {contrib => sys/contrib}/zlib/doc/rfc1951.txt | 0 {contrib => sys/contrib}/zlib/doc/rfc1952.txt | 0 {contrib => sys/contrib}/zlib/doc/txtvsbin.txt | 0 {contrib => sys/contrib}/zlib/gzclose.c | 0 {contrib => sys/contrib}/zlib/gzguts.h | 0 {contrib => sys/contrib}/zlib/gzlib.c | 0 {contrib => sys/contrib}/zlib/gzread.c | 0 {contrib => sys/contrib}/zlib/gzwrite.c | 0 {contrib => sys/contrib}/zlib/infback.c | 0 {contrib => sys/contrib}/zlib/inffast.c | 0 {contrib => sys/contrib}/zlib/inffast.h | 0 {contrib => sys/contrib}/zlib/inffixed.h | 0 {contrib => sys/contrib}/zlib/inflate.c | 0 {contrib => sys/contrib}/zlib/inflate.h | 0 {contrib => sys/contrib}/zlib/inftrees.c | 0 {contrib => sys/contrib}/zlib/inftrees.h | 0 {contrib => sys/contrib}/zlib/test/example.c | 0 {contrib => sys/contrib}/zlib/test/infcover.c | 0 {contrib => sys/contrib}/zlib/test/minigzip.c | 0 {contrib => sys/contrib}/zlib/trees.c | 0 {contrib => sys/contrib}/zlib/trees.h | 0 {contrib => sys/contrib}/zlib/uncompr.c | 0 {contrib => sys/contrib}/zlib/zconf.h | 0 {contrib => sys/contrib}/zlib/zconf.h.in | 0 {contrib => sys/contrib}/zlib/zlib.3 | 0 {contrib => sys/contrib}/zlib/zlib.h | 0 {contrib => sys/contrib}/zlib/zlib.map | 0 {contrib => sys/contrib}/zlib/zlib.pc.in | 0 {contrib => sys/contrib}/zlib/zutil.c | 0 {contrib => sys/contrib}/zlib/zutil.h | 0 usr.bin/minigzip/Makefile | 2 +- 49 files changed, 5 insertions(+), 5 deletions(-) rename {contrib => sys/contrib}/zlib/ChangeLog (100%) rename {contrib => sys/contrib}/zlib/FAQ (100%) rename {contrib => sys/contrib}/zlib/README (100%) rename {contrib => sys/contrib}/zlib/adler32.c (100%) rename {contrib => sys/contrib}/zlib/compress.c (100%) rename {contrib => sys/contrib}/zlib/contrib/README.contrib (100%) rename {contrib => sys/contrib}/zlib/contrib/asm686/README.686 (100%) rename {contrib => sys/contrib}/zlib/contrib/asm686/match.S (100%) rename {contrib => sys/contrib}/zlib/contrib/gcc_gvmat64/gvmat64.S (100%) rename {contrib => sys/contrib}/zlib/crc32.c (100%) rename {contrib => sys/contrib}/zlib/crc32.h (100%) rename {contrib => sys/contrib}/zlib/deflate.c (100%) rename {contrib => sys/contrib}/zlib/deflate.h (100%) rename {contrib => sys/contrib}/zlib/doc/algorithm.txt (100%) rename {contrib => sys/contrib}/zlib/doc/rfc1950.txt (100%) rename {contrib => sys/contrib}/zlib/doc/rfc1951.txt (100%) rename {contrib => sys/contrib}/zlib/doc/rfc1952.txt (100%) rename {contrib => sys/contrib}/zlib/doc/txtvsbin.txt (100%) rename {contrib => sys/contrib}/zlib/gzclose.c (100%) rename {contrib => sys/contrib}/zlib/gzguts.h (100%) rename {contrib => sys/contrib}/zlib/gzlib.c (100%) rename {contrib => sys/contrib}/zlib/gzread.c (100%) rename {contrib => sys/contrib}/zlib/gzwrite.c (100%) rename {contrib => sys/contrib}/zlib/infback.c (100%) rename {contrib => sys/contrib}/zlib/inffast.c (100%) rename {contrib => sys/contrib}/zlib/inffast.h (100%) rename {contrib => sys/contrib}/zlib/inffixed.h (100%) rename {contrib => sys/contrib}/zlib/inflate.c (100%) rename {contrib => sys/contrib}/zlib/inflate.h (100%) rename {contrib => sys/contrib}/zlib/inftrees.c (100%) rename {contrib => sys/contrib}/zlib/inftrees.h (100%) rename {contrib => sys/contrib}/zlib/test/example.c (100%) rename {contrib => sys/contrib}/zlib/test/infcover.c (100%) rename {contrib => sys/contrib}/zlib/test/minigzip.c (100%) rename {contrib => sys/contrib}/zlib/trees.c (100%) rename {contrib => sys/contrib}/zlib/trees.h (100%) rename {contrib => sys/contrib}/zlib/uncompr.c (100%) rename {contrib => sys/contrib}/zlib/zconf.h (100%) rename {contrib => sys/contrib}/zlib/zconf.h.in (100%) rename {contrib => sys/contrib}/zlib/zlib.3 (100%) rename {contrib => sys/contrib}/zlib/zlib.h (100%) rename {contrib => sys/contrib}/zlib/zlib.map (100%) rename {contrib => sys/contrib}/zlib/zlib.pc.in (100%) rename {contrib => sys/contrib}/zlib/zutil.c (100%) rename {contrib => sys/contrib}/zlib/zutil.h (100%) diff --git a/lib/libz/FREEBSD-upgrade b/lib/libz/FREEBSD-upgrade index e5bb54d1fbfc..203ae5c220c2 100644 --- a/lib/libz/FREEBSD-upgrade +++ b/lib/libz/FREEBSD-upgrade @@ -8,7 +8,7 @@ benefit other consumers. To Update: 1) Unpack vendor sources into a clean directory. 2) Import onto the vendor area. - 3) Merge the vendor tree to contrib/zlib, which contains a stripped down + 3) Merge the vendor tree to sys/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. diff --git a/lib/libz/Makefile b/lib/libz/Makefile index 96c46c67265b..9d415a8b976c 100644 --- a/lib/libz/Makefile +++ b/lib/libz/Makefile @@ -9,7 +9,7 @@ SHLIB_MAJOR= 6 MAN= zlib.3 zopen.3 MLINKS+= zopen.3 zdopen.3 -ZLIBSRC= ${SRCTOP}/contrib/zlib +ZLIBSRC= ${SRCTOP}/sys/contrib/zlib .PATH: ${ZLIBSRC} diff --git a/stand/libsa/Makefile b/stand/libsa/Makefile index 0038075c4710..b09b23c79d93 100644 --- a/stand/libsa/Makefile +++ b/stand/libsa/Makefile @@ -99,8 +99,8 @@ CFLAGS+= -DBZ_NO_STDIO -DBZ_NO_COMPRESS SRCS+=bzlib.c crctable.c decompress.c huffman.c randtable.c # decompression functionality from zlib -.PATH: ${SRCTOP}/contrib/zlib -CFLAGS+=-DHAVE_MEMCPY -I${SRCTOP}/contrib/zlib +.PATH: ${SRCTOP}/sys/contrib/zlib +CFLAGS+=-DHAVE_MEMCPY -I${SRCTOP}/sys/contrib/zlib SRCS+= adler32.c crc32.c SRCS+= infback.c inffast.c inflate.c inftrees.c zutil.c diff --git a/contrib/zlib/ChangeLog b/sys/contrib/zlib/ChangeLog similarity index 100% rename from contrib/zlib/ChangeLog rename to sys/contrib/zlib/ChangeLog diff --git a/contrib/zlib/FAQ b/sys/contrib/zlib/FAQ similarity index 100% rename from contrib/zlib/FAQ rename to sys/contrib/zlib/FAQ diff --git a/contrib/zlib/README b/sys/contrib/zlib/README similarity index 100% rename from contrib/zlib/README rename to sys/contrib/zlib/README diff --git a/contrib/zlib/adler32.c b/sys/contrib/zlib/adler32.c similarity index 100% rename from contrib/zlib/adler32.c rename to sys/contrib/zlib/adler32.c diff --git a/contrib/zlib/compress.c b/sys/contrib/zlib/compress.c similarity index 100% rename from contrib/zlib/compress.c rename to sys/contrib/zlib/compress.c diff --git a/contrib/zlib/contrib/README.contrib b/sys/contrib/zlib/contrib/README.contrib similarity index 100% rename from contrib/zlib/contrib/README.contrib rename to sys/contrib/zlib/contrib/README.contrib diff --git a/contrib/zlib/contrib/asm686/README.686 b/sys/contrib/zlib/contrib/asm686/README.686 similarity index 100% rename from contrib/zlib/contrib/asm686/README.686 rename to sys/contrib/zlib/contrib/asm686/README.686 diff --git a/contrib/zlib/contrib/asm686/match.S b/sys/contrib/zlib/contrib/asm686/match.S similarity index 100% rename from contrib/zlib/contrib/asm686/match.S rename to sys/contrib/zlib/contrib/asm686/match.S diff --git a/contrib/zlib/contrib/gcc_gvmat64/gvmat64.S b/sys/contrib/zlib/contrib/gcc_gvmat64/gvmat64.S similarity index 100% rename from contrib/zlib/contrib/gcc_gvmat64/gvmat64.S rename to sys/contrib/zlib/contrib/gcc_gvmat64/gvmat64.S diff --git a/contrib/zlib/crc32.c b/sys/contrib/zlib/crc32.c similarity index 100% rename from contrib/zlib/crc32.c rename to sys/contrib/zlib/crc32.c diff --git a/contrib/zlib/crc32.h b/sys/contrib/zlib/crc32.h similarity index 100% rename from contrib/zlib/crc32.h rename to sys/contrib/zlib/crc32.h diff --git a/contrib/zlib/deflate.c b/sys/contrib/zlib/deflate.c similarity index 100% rename from contrib/zlib/deflate.c rename to sys/contrib/zlib/deflate.c diff --git a/contrib/zlib/deflate.h b/sys/contrib/zlib/deflate.h similarity index 100% rename from contrib/zlib/deflate.h rename to sys/contrib/zlib/deflate.h diff --git a/contrib/zlib/doc/algorithm.txt b/sys/contrib/zlib/doc/algorithm.txt similarity index 100% rename from contrib/zlib/doc/algorithm.txt rename to sys/contrib/zlib/doc/algorithm.txt diff --git a/contrib/zlib/doc/rfc1950.txt b/sys/contrib/zlib/doc/rfc1950.txt similarity index 100% rename from contrib/zlib/doc/rfc1950.txt rename to sys/contrib/zlib/doc/rfc1950.txt diff --git a/contrib/zlib/doc/rfc1951.txt b/sys/contrib/zlib/doc/rfc1951.txt similarity index 100% rename from contrib/zlib/doc/rfc1951.txt rename to sys/contrib/zlib/doc/rfc1951.txt diff --git a/contrib/zlib/doc/rfc1952.txt b/sys/contrib/zlib/doc/rfc1952.txt similarity index 100% rename from contrib/zlib/doc/rfc1952.txt rename to sys/contrib/zlib/doc/rfc1952.txt diff --git a/contrib/zlib/doc/txtvsbin.txt b/sys/contrib/zlib/doc/txtvsbin.txt similarity index 100% rename from contrib/zlib/doc/txtvsbin.txt rename to sys/contrib/zlib/doc/txtvsbin.txt diff --git a/contrib/zlib/gzclose.c b/sys/contrib/zlib/gzclose.c similarity index 100% rename from contrib/zlib/gzclose.c rename to sys/contrib/zlib/gzclose.c diff --git a/contrib/zlib/gzguts.h b/sys/contrib/zlib/gzguts.h similarity index 100% rename from contrib/zlib/gzguts.h rename to sys/contrib/zlib/gzguts.h diff --git a/contrib/zlib/gzlib.c b/sys/contrib/zlib/gzlib.c similarity index 100% rename from contrib/zlib/gzlib.c rename to sys/contrib/zlib/gzlib.c diff --git a/contrib/zlib/gzread.c b/sys/contrib/zlib/gzread.c similarity index 100% rename from contrib/zlib/gzread.c rename to sys/contrib/zlib/gzread.c diff --git a/contrib/zlib/gzwrite.c b/sys/contrib/zlib/gzwrite.c similarity index 100% rename from contrib/zlib/gzwrite.c rename to sys/contrib/zlib/gzwrite.c diff --git a/contrib/zlib/infback.c b/sys/contrib/zlib/infback.c similarity index 100% rename from contrib/zlib/infback.c rename to sys/contrib/zlib/infback.c diff --git a/contrib/zlib/inffast.c b/sys/contrib/zlib/inffast.c similarity index 100% rename from contrib/zlib/inffast.c rename to sys/contrib/zlib/inffast.c diff --git a/contrib/zlib/inffast.h b/sys/contrib/zlib/inffast.h similarity index 100% rename from contrib/zlib/inffast.h rename to sys/contrib/zlib/inffast.h diff --git a/contrib/zlib/inffixed.h b/sys/contrib/zlib/inffixed.h similarity index 100% rename from contrib/zlib/inffixed.h rename to sys/contrib/zlib/inffixed.h diff --git a/contrib/zlib/inflate.c b/sys/contrib/zlib/inflate.c similarity index 100% rename from contrib/zlib/inflate.c rename to sys/contrib/zlib/inflate.c diff --git a/contrib/zlib/inflate.h b/sys/contrib/zlib/inflate.h similarity index 100% rename from contrib/zlib/inflate.h rename to sys/contrib/zlib/inflate.h diff --git a/contrib/zlib/inftrees.c b/sys/contrib/zlib/inftrees.c similarity index 100% rename from contrib/zlib/inftrees.c rename to sys/contrib/zlib/inftrees.c diff --git a/contrib/zlib/inftrees.h b/sys/contrib/zlib/inftrees.h similarity index 100% rename from contrib/zlib/inftrees.h rename to sys/contrib/zlib/inftrees.h diff --git a/contrib/zlib/test/example.c b/sys/contrib/zlib/test/example.c similarity index 100% rename from contrib/zlib/test/example.c rename to sys/contrib/zlib/test/example.c diff --git a/contrib/zlib/test/infcover.c b/sys/contrib/zlib/test/infcover.c similarity index 100% rename from contrib/zlib/test/infcover.c rename to sys/contrib/zlib/test/infcover.c diff --git a/contrib/zlib/test/minigzip.c b/sys/contrib/zlib/test/minigzip.c similarity index 100% rename from contrib/zlib/test/minigzip.c rename to sys/contrib/zlib/test/minigzip.c diff --git a/contrib/zlib/trees.c b/sys/contrib/zlib/trees.c similarity index 100% rename from contrib/zlib/trees.c rename to sys/contrib/zlib/trees.c diff --git a/contrib/zlib/trees.h b/sys/contrib/zlib/trees.h similarity index 100% rename from contrib/zlib/trees.h rename to sys/contrib/zlib/trees.h diff --git a/contrib/zlib/uncompr.c b/sys/contrib/zlib/uncompr.c similarity index 100% rename from contrib/zlib/uncompr.c rename to sys/contrib/zlib/uncompr.c diff --git a/contrib/zlib/zconf.h b/sys/contrib/zlib/zconf.h similarity index 100% rename from contrib/zlib/zconf.h rename to sys/contrib/zlib/zconf.h diff --git a/contrib/zlib/zconf.h.in b/sys/contrib/zlib/zconf.h.in similarity index 100% rename from contrib/zlib/zconf.h.in rename to sys/contrib/zlib/zconf.h.in diff --git a/contrib/zlib/zlib.3 b/sys/contrib/zlib/zlib.3 similarity index 100% rename from contrib/zlib/zlib.3 rename to sys/contrib/zlib/zlib.3 diff --git a/contrib/zlib/zlib.h b/sys/contrib/zlib/zlib.h similarity index 100% rename from contrib/zlib/zlib.h rename to sys/contrib/zlib/zlib.h diff --git a/contrib/zlib/zlib.map b/sys/contrib/zlib/zlib.map similarity index 100% rename from contrib/zlib/zlib.map rename to sys/contrib/zlib/zlib.map diff --git a/contrib/zlib/zlib.pc.in b/sys/contrib/zlib/zlib.pc.in similarity index 100% rename from contrib/zlib/zlib.pc.in rename to sys/contrib/zlib/zlib.pc.in diff --git a/contrib/zlib/zutil.c b/sys/contrib/zlib/zutil.c similarity index 100% rename from contrib/zlib/zutil.c rename to sys/contrib/zlib/zutil.c diff --git a/contrib/zlib/zutil.h b/sys/contrib/zlib/zutil.h similarity index 100% rename from contrib/zlib/zutil.h rename to sys/contrib/zlib/zutil.h diff --git a/usr.bin/minigzip/Makefile b/usr.bin/minigzip/Makefile index 2385f7655351..9a0098eed547 100644 --- a/usr.bin/minigzip/Makefile +++ b/usr.bin/minigzip/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -SRCDIR= ${SRCTOP}/contrib/zlib/test +SRCDIR= ${SRCTOP}/sys/contrib/zlib/test .PATH: ${SRCDIR} PROG= minigzip