aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin LI <delphij@FreeBSD.org>2022-08-14 04:11:50 +0000
committerXin LI <delphij@FreeBSD.org>2022-08-14 04:11:50 +0000
commit278d080bad9fc4f229d919f0306b063f7fa84d83 (patch)
tree979c502975cc845dede6deb180b3a60d53412e4e
parent271171e0d97b88ba2a7c3bf750c9672b484c1c13 (diff)
downloadsrc-278d080bad9F.tar.gz
src-278d080bad9F.zip
Remove minigzip from the base system.
The minigzip(1) was initially introduced as a minimal replacement of GNU gzip(1). We have replaced the GNU gzip(1) with the zlib based, GPL-free implementation, and minigzip(1) is not being used anywhere in the base system, so just remove it. Relnotes: yes Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D35979
-rw-r--r--ObsoleteFiles.inc4
-rw-r--r--usr.bin/Makefile1
-rw-r--r--usr.bin/minigzip/Makefile12
-rw-r--r--usr.bin/minigzip/Makefile.depend18
-rw-r--r--usr.bin/minigzip/minigzip.191
5 files changed, 4 insertions, 122 deletions
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 37ec8ddf8546..6060d1b42629 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -52,6 +52,10 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20220813: minigzip(1) removed in favor of gzip(1)
+OLD_FILES+=usr/bin/minigzip
+OLD_FILES+=usr/share/man/man1/minigzip.1.gz
+
# 20220811: new iconv encoder trait added
OLD_LIBS+=usr/lib/i18n/libBIG5.so.4
OLD_LIBS+=usr/lib/i18n/libDECHanyu.so.4
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index 64bc857416ef..b6d4ed632b6c 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -91,7 +91,6 @@ SUBDIR= alias \
m4 \
mandoc \
mesg \
- minigzip \
ministat \
mkdep \
mkfifo \
diff --git a/usr.bin/minigzip/Makefile b/usr.bin/minigzip/Makefile
deleted file mode 100644
index 9a0098eed547..000000000000
--- a/usr.bin/minigzip/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $FreeBSD$
-
-SRCDIR= ${SRCTOP}/sys/contrib/zlib/test
-.PATH: ${SRCDIR}
-
-PROG= minigzip
-
-WARNS?= 5
-CFLAGS+=-DUSE_MMAP
-LIBADD= z
-
-.include <bsd.prog.mk>
diff --git a/usr.bin/minigzip/Makefile.depend b/usr.bin/minigzip/Makefile.depend
deleted file mode 100644
index 9a8221bf3321..000000000000
--- a/usr.bin/minigzip/Makefile.depend
+++ /dev/null
@@ -1,18 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
- gnu/lib/csu \
- include \
- include/xlocale \
- lib/${CSU_DIR} \
- lib/libc \
- lib/libcompiler_rt \
- lib/libz \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/usr.bin/minigzip/minigzip.1 b/usr.bin/minigzip/minigzip.1
deleted file mode 100644
index d73cd838257b..000000000000
--- a/usr.bin/minigzip/minigzip.1
+++ /dev/null
@@ -1,91 +0,0 @@
-.\" Copyright (c) 1997
-.\" Michael Smith
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\" notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\" notice, this list of conditions and the following disclaimer in the
-.\" documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\" $FreeBSD$
-.\"
-.Dd August 1, 2022
-.Dt MINIGZIP 1
-.Os
-.Sh NAME
-.Nm minigzip
-.Nd minimal implementation of the 'gzip' compression tool
-.Sh SYNOPSIS
-.Nm
-.Op Fl cd
-.Op Ar
-.Sh DESCRIPTION
-The
-.Nm
-utility is a minimal implementation of the
-.Xr gzip 1
-utility.
-It supports
-compression and decompression of individual files, as well as
-streaming compression and decompression via standard input and
-output.
-.Pp
-The default operation is compression, decompression can be
-selected by supplying the
-.Fl d
-flag on the command line.
-.Pp
-If any
-.Ar file
-arguments are supplied, the operation is performed on each file
-separately.
-Compression replaces the original file with one having a
-.Pa .gz
-suffix.
-Decompression will remove a
-.Pa .gz
-suffix if one is present.
-.Pp
-If no
-.Ar file
-arguments are supplied,
-.Nm
-reads from standard input and writes the results of the operation
-to standard output.
-.Pp
-If the
-.Fl c
-option is specified,
-.Nm
-writes the results to standard output and keep the original files
-unchanged.
-.Sh DEPRECATION NOTICE
-.Nm
-is deprecated and will be removed from future versions of the
-.Fx
-base system.
-Users should use
-.Xr gzip 1
-instead.
-.Sh SEE ALSO
-.Xr gzip 1
-.Sh AUTHORS
-The
-.Nm
-utility was written by
-.An Jean-loup Gailly .