From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alexander Marx To: development@lists.ipfire.org Subject: [PATCH] tree: Update to 1.7.0 Date: Mon, 05 Sep 2016 08:27:36 +0000 Message-ID: <1473064056-21460-1-git-send-email-alexander.marx@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6618916730113927578==" List-Id: --===============6618916730113927578== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Allow user/group names up to 32 characters before clipping. Made -i compress XML and JSON output as much as possible by eliminating e= xtraneous whitespace. Added --caseinsensitive (renamed --ignore-case ala grep) flag so patterns= match without regard to case, courtesy of Jason A Donenfeld. Added --matchdirs option courtesy of Brian Mattern & Jason A. Donenfeld <= Jason(a)zx2c4.com>. Fixed possible buffer overflow on large uid/gids w/o user names/group nam= es (Alexandre Wendling ) Added JSON support courtesy of Florian Sesser . Fixed formatting error with HTML output when -L 1 specified. (Sascha Zorn= ) Added file size sorting (Philipp M?ller ) Added '--sort[=3D]' option, ala ls. Fixed OS X makefile problems (Ryan Hollis ) Fixed possible memory overflow in read_dir (path/lbuf not equal in size t= o pathsize/lbufsize.) (Han Hui ) Fix S_ISDOOR/S_IFDOOR spelling mistake for Solaris. (Tim Mooney ) Make tree more reliably detect UTF-8 locales. (Mantas Mikulnas and others.) Return non-zero exit status on option errors, print usage to stdout when = not an error, add the posix '--' option terminator, Change -S description to mean CP437 (console) output codes, not ASCII. (= Ivan Shmakov ) Signed-off-by: Alexander Marx --- tree/patches/tree-args.patch | 12 ------------ tree/patches/tree-no-color-by-default.patch | 13 ------------- tree/patches/tree-no-strip.patch | 21 --------------------- tree/patches/tree-preserve-timestamps.patch | 15 --------------- tree/tree.nm | 2 +- 5 files changed, 1 insertion(+), 62 deletions(-) delete mode 100644 tree/patches/tree-args.patch delete mode 100644 tree/patches/tree-no-color-by-default.patch delete mode 100644 tree/patches/tree-no-strip.patch delete mode 100644 tree/patches/tree-preserve-timestamps.patch diff --git a/tree/patches/tree-args.patch b/tree/patches/tree-args.patch deleted file mode 100644 index 5fa5dd2..0000000 --- a/tree/patches/tree-args.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up tree-1.6.0/tree.c.args tree-1.6.0/tree.c ---- tree-1.6.0/tree.c.args 2013-04-11 11:53:47.676572649 +0100 -+++ tree-1.6.0/tree.c 2013-04-11 11:56:10.962350448 +0100 -@@ -536,6 +536,8 @@ void usage(int n) - " --filelimit # Do not descend dirs with more than # files in them.\n" - " --timefmt Print and format time according to the format .\n" - " -o filename Output to file instead of stdout.\n" -+ " --du Print directory sizes.\n" -+ " --prune Prune empty directories from the output.\n" - " -------- File options ---------\n" - " -q Print non-printable characters as '?'.\n" - " -N Print non-printable characters as is.\n" diff --git a/tree/patches/tree-no-color-by-default.patch b/tree/patches/tree-= no-color-by-default.patch deleted file mode 100644 index 374add4..0000000 --- a/tree/patches/tree-no-color-by-default.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up tree-1.6.0/tree.c.no-color-by-default tree-1.6.0/tree.c ---- tree-1.6.0/tree.c.no-color-by-default 2011-06-27 16:14:14.190548385 +0100 -+++ tree-1.6.0/tree.c 2011-06-27 16:14:27.257295243 +0100 -@@ -79,7 +79,8 @@ int main(int argc, char **argv) - q =3D p =3D dtotal =3D ftotal =3D 0; - aflag =3D dflag =3D fflag =3D lflag =3D pflag =3D sflag =3D Fflag =3D ufl= ag =3D gflag =3D FALSE; - Dflag =3D qflag =3D Nflag =3D Qflag =3D Rflag =3D hflag =3D Hflag =3D sif= lag =3D cflag =3D FALSE; -- noindent =3D force_color =3D nocolor =3D xdev =3D noreport =3D nolinks = =3D FALSE; -+ noindent =3D force_color =3D xdev =3D noreport =3D nolinks =3D FALSE; -+ nocolor =3D TRUE; - dirsfirst =3D nosort =3D inodeflag =3D devflag =3D Xflag =3D FALSE; - duflag =3D pruneflag =3D FALSE; - flimit =3D 0; diff --git a/tree/patches/tree-no-strip.patch b/tree/patches/tree-no-strip.pa= tch deleted file mode 100644 index 5f46ada..0000000 --- a/tree/patches/tree-no-strip.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up tree-1.6.0/Makefile.no-strip tree-1.6.0/Makefile ---- tree-1.6.0/Makefile.no-strip 2011-06-24 15:25:27.000000000 +0100 -+++ tree-1.6.0/Makefile 2011-07-04 11:11:17.662036666 +0100 -@@ -32,7 +32,7 @@ OBJS=3Dtree.o unix.o html.o xml.o hash.o c - # Linux defaults: - #CFLAGS=3D-ggdb -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=3D64 - CFLAGS=3D-O4 -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=3D64 --LDFLAGS=3D-s -+LDFLAGS=3D -=20 - # Uncomment for FreeBSD: - #CFLAGS=3D-O2 -Wall -fomit-frame-pointer -@@ -97,7 +97,7 @@ install: tree - install -d $(BINDIR) - install -d $(MANDIR) - if [ -e $(TREE_DEST) ]; then \ -- install -s $(TREE_DEST) $(BINDIR)/$(TREE_DEST); \ -+ install $(TREE_DEST) $(BINDIR)/$(TREE_DEST); \ - fi - install doc/$(MAN) $(MANDIR)/$(MAN) -=20 diff --git a/tree/patches/tree-preserve-timestamps.patch b/tree/patches/tree-= preserve-timestamps.patch deleted file mode 100644 index 2e432a5..0000000 --- a/tree/patches/tree-preserve-timestamps.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up tree-1.6.0/Makefile.preserve-timestamps tree-1.6.0/Makefile ---- tree-1.6.0/Makefile.preserve-timestamps 2011-06-27 16:11:26.000000000 +0= 100 -+++ tree-1.6.0/Makefile 2011-06-27 16:12:36.394443602 +0100 -@@ -97,9 +97,9 @@ install: tree - install -d $(BINDIR) - install -d $(MANDIR) - if [ -e $(TREE_DEST) ]; then \ -- install $(TREE_DEST) $(BINDIR)/$(TREE_DEST); \ -+ install -p $(TREE_DEST) $(BINDIR)/$(TREE_DEST); \ - fi -- install doc/$(MAN) $(MANDIR)/$(MAN) -+ install -p doc/$(MAN) $(MANDIR)/$(MAN) -=20 - distclean: - if [ -f tree.o ]; then rm *.o; fi diff --git a/tree/tree.nm b/tree/tree.nm index 710ef4c..5f5583e 100644 --- a/tree/tree.nm +++ b/tree/tree.nm @@ -4,7 +4,7 @@ ############################################################################= ### =20 name =3D tree -version =3D 1.6.0 +version =3D 1.7.0 release =3D 1 =20 groups =3D Applications/File --=20 2.6.3 --===============6618916730113927578==--