From owner-svn-src-head@freebsd.org Sun Aug 25 17:13:02 2019 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 41891E3DE7; Sun, 25 Aug 2019 17:13:02 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46GhXt11cDz48t5; Sun, 25 Aug 2019 17:13:02 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EF91E20C1C; Sun, 25 Aug 2019 17:13:01 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x7PHD1h8044463; Sun, 25 Aug 2019 17:13:01 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x7PHD1sp044459; Sun, 25 Aug 2019 17:13:01 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201908251713.x7PHD1sp044459@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Sun, 25 Aug 2019 17:13:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r351480 - in head: . sys/conf sys/libkern sys/modules/zlib sys/sys X-SVN-Group: head X-SVN-Commit-Author: delphij X-SVN-Commit-Paths: in head: . sys/conf sys/libkern sys/modules/zlib sys/sys X-SVN-Commit-Revision: 351480 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Aug 2019 17:13:02 -0000 Author: delphij Date: Sun Aug 25 17:13:00 2019 New Revision: 351480 URL: https://svnweb.freebsd.org/changeset/base/351480 Log: Remove zlib 1.0.4 from kernel. PR: 229763 Reviewed by: emaste, Yoshihiro Ota Differential Revision: https://reviews.freebsd.org/D21375 Deleted: head/sys/libkern/zlib.c head/sys/sys/zlib.h head/sys/sys/zutil.h Modified: head/ObsoleteFiles.inc head/sys/conf/files head/sys/modules/zlib/Makefile head/sys/sys/param.h Modified: head/ObsoleteFiles.inc ============================================================================== --- head/ObsoleteFiles.inc Sun Aug 25 13:36:20 2019 (r351479) +++ head/ObsoleteFiles.inc Sun Aug 25 17:13:00 2019 (r351480) @@ -38,6 +38,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20190825: zlib 1.0.4 removed from kernel +OLD_FILES+=/usr/include/sys/zlib.h +OLD_FILES+=/usr/include/sys/zutil.h # 20190817: pft_ping.py and sniffer.py moved to /usr/tests/sys/netpfil/common OLD_FILES+=usr/tests/sys/netpfil/pf/sniffer.py OLD_FILES+=usr/tests/sys/netpfil/pf/pft_ping.py Modified: head/sys/conf/files ============================================================================== --- head/sys/conf/files Sun Aug 25 13:36:20 2019 (r351479) +++ head/sys/conf/files Sun Aug 25 17:13:00 2019 (r351480) @@ -3999,8 +3999,6 @@ libkern/strtoul.c standard libkern/strtouq.c standard libkern/strvalid.c standard libkern/timingsafe_bcmp.c standard -libkern/zlib.c optional crypto | geom_uzip | ipsec | \ - ipsec_support | mxge | netgraph_deflate | ddb_ctf | gzio contrib/zlib/adler32.c optional crypto | geom_uzip | ipsec | \ ipsec_support | mxge | ddb_ctf | gzio | zfs | zlib contrib/zlib/compress.c optional crypto | geom_uzip | ipsec | \ Modified: head/sys/modules/zlib/Makefile ============================================================================== --- head/sys/modules/zlib/Makefile Sun Aug 25 13:36:20 2019 (r351479) +++ head/sys/modules/zlib/Makefile Sun Aug 25 17:13:00 2019 (r351480) @@ -5,9 +5,6 @@ .PATH: ${SRCTOP}/sys/contrib/zlib KMOD= zlib -# legacy zlib - 1.0.4 -SRCS= zlib.c -# newer zlib - 1.2.11 SRCS+= zcalloc.c SRCS+= zlib_mod.c SRCS+= adler32.c Modified: head/sys/sys/param.h ============================================================================== --- head/sys/sys/param.h Sun Aug 25 13:36:20 2019 (r351479) +++ head/sys/sys/param.h Sun Aug 25 17:13:00 2019 (r351480) @@ -60,7 +60,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1300040 /* Master, propagated to newvers */ +#define __FreeBSD_version 1300041 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,