From owner-svn-src-all@freebsd.org Mon May 27 15:34:31 2019 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EC24915A39DF for ; Mon, 27 May 2019 15:34:30 +0000 (UTC) (envelope-from ota@j.email.ne.jp) Received: from mail02.asahi-net.or.jp (mail02.asahi-net.or.jp [202.224.55.14]) by mx1.freebsd.org (Postfix) with ESMTP id DA3517225F for ; Mon, 27 May 2019 15:34:27 +0000 (UTC) (envelope-from ota@j.email.ne.jp) Received: from vmware.advok.com (cpe-static-fununlimited-rtr.cmts.lcp.ptd.net [70.15.240.89]) (Authenticated sender: NR2Y-OOT) by mail02.asahi-net.or.jp (Postfix) with ESMTPSA id 4F0A43E137 for ; Tue, 28 May 2019 00:32:50 +0900 (JST) Date: Mon, 27 May 2019 11:27:44 -0400 From: Yoshihiro Ota To: svn-src-all@freebsd.org Subject: Re: svn commit: r348261 - in stable/11: contrib/zlib lib/libz stand/libsa usr.bin/minigzip Message-Id: <20190527112744.dc48486ffab7a82828f13973@j.email.ne.jp> In-Reply-To: <201905250158.x4P1w0L6077023@repo.freebsd.org> References: <201905250158.x4P1w0L6077023@repo.freebsd.org> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.32; i386-portbld-freebsd12.0) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: DA3517225F X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; spf=pass (mx1.freebsd.org: domain of ota@j.email.ne.jp designates 202.224.55.14 as permitted sender) smtp.mailfrom=ota@j.email.ne.jp X-Spamd-Result: default: False [-2.25 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_IN_DNSWL_LOW(-0.10)[14.55.224.202.list.dnswl.org : 127.0.5.1]; FROM_HAS_DN(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:202.224.55.0/24]; MV_CASE(0.50)[]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-all@freebsd.org]; TO_DN_NONE(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; NEURAL_HAM_LONG(-0.91)[-0.911,0]; DMARC_NA(0.00)[email.ne.jp]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MX_GOOD(-0.01)[sbmx.asahi-net.or.jp]; NEURAL_HAM_SHORT(-0.65)[-0.652,0]; NEURAL_HAM_MEDIUM(-0.95)[-0.955,0]; IP_SCORE(0.08)[asn: 4685(0.43), country: JP(-0.05)]; RCVD_NO_TLS_LAST(0.10)[]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:4685, ipnet:202.224.32.0/19, country:JP]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_COUNT_TWO(0.00)[2] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 May 2019 15:34:31 -0000 Hi Xin, I didn't think we would have time for this to hit 11.3 release. Next important one is the crc32 one. Unless we do this split, we will need a special aid to work-around zlib/zlib.h compile error and also zib/crc32.c won't compile at all. Regards, Hiro On Sat, 25 May 2019 01:58:00 +0000 (UTC) Xin LI wrote: > Author: delphij > Date: Sat May 25 01:58:00 2019 > New Revision: 348261 > URL: https://svnweb.freebsd.org/changeset/base/348261 > > Log: > MFC r347244: > > 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 > Approved by: re (kib) > > Added: > - copied from r347244, head/sys/contrib/zlib/ > Directory Properties: > stable/11/sys/contrib/zlib/ (props changed) > Deleted: > stable/11/contrib/zlib/ > Modified: > stable/11/lib/libz/FREEBSD-upgrade > stable/11/lib/libz/Makefile > stable/11/stand/libsa/Makefile > stable/11/usr.bin/minigzip/Makefile > Directory Properties: > stable/11/ (props changed) > > Modified: stable/11/lib/libz/FREEBSD-upgrade > ============================================================================== > --- stable/11/lib/libz/FREEBSD-upgrade Sat May 25 00:22:07 2019 (r348260) > +++ stable/11/lib/libz/FREEBSD-upgrade Sat May 25 01:58:00 2019 (r348261) > @@ -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. > > Modified: stable/11/lib/libz/Makefile > ============================================================================== > --- stable/11/lib/libz/Makefile Sat May 25 00:22:07 2019 (r348260) > +++ stable/11/lib/libz/Makefile Sat May 25 01:58:00 2019 (r348261) > @@ -8,7 +8,7 @@ SHLIBDIR?= /lib > SHLIB_MAJOR= 6 > MAN= zlib.3 zopen.3 > > -ZLIBSRC= ${SRCTOP}/contrib/zlib > +ZLIBSRC= ${SRCTOP}/sys/contrib/zlib > > .PATH: ${ZLIBSRC} > > > Modified: stable/11/stand/libsa/Makefile > ============================================================================== > --- stable/11/stand/libsa/Makefile Sat May 25 00:22:07 2019 (r348260) > +++ stable/11/stand/libsa/Makefile Sat May 25 01:58:00 2019 (r348261) > @@ -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 > > > Modified: stable/11/usr.bin/minigzip/Makefile > ============================================================================== > --- stable/11/usr.bin/minigzip/Makefile Sat May 25 00:22:07 2019 (r348260) > +++ stable/11/usr.bin/minigzip/Makefile Sat May 25 01:58:00 2019 (r348261) > @@ -1,6 +1,6 @@ > # $FreeBSD$ > > -SRCDIR= ${SRCTOP}/contrib/zlib/test > +SRCDIR= ${SRCTOP}/sys/contrib/zlib/test > .PATH: ${SRCDIR} > > PROG= minigzip > _______________________________________________ > svn-src-all@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-src-all > To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"