svn commit: r351480 - in head: . sys/conf sys/libkern sys/modules/zlib sys/sys
Xin LI
delphij at FreeBSD.org
Sun Aug 25 17:13:02 UTC 2019
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 <ota j email ne jp>
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,
More information about the svn-src-all
mailing list