[PATCH] tree: Update to 1.7.0

[PATCH] tree: Update to 1.7.0

[Alexander Marx]

[-- Attachment #1: Type: text/plain, Size: 6224 bytes --]

    Allow user/group names up to 32 characters before clipping.
    Made -i compress XML and JSON output as much as possible by eliminating extraneous 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 names (Alexandre Wendling <alexandrerw(a)celepar.pr.gov.br>)
    Added JSON support courtesy of Florian Sesser <fs(a)it-agenten.com>.
    Fixed formatting error with HTML output when -L 1 specified. (Sascha Zorn <sascha.zorn(a)gmail.com>)
    Added file size sorting (Philipp M?ller <philippausmuensing(a)googlemail.com>)
    Added '--sort[=]<name>' option, ala ls.
    Fixed OS X makefile problems (Ryan Hollis <theryanhollis(a)gmail.com>)
    Fixed possible memory overflow in read_dir (path/lbuf not equal in size to pathsize/lbufsize.) (Han Hui <hanhui03(a)163.com>)
    Fix S_ISDOOR/S_IFDOOR spelling mistake for Solaris. (Tim Mooney <Tim.Mooney(a)ndsu.edu>)
    Make tree more reliably detect UTF-8 locales. (Mantas Mikulnas <grawity(a)gmail.com> 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 <oneingray(a)gmail.com>)

Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org>
---
 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 <f> Print and format time according to the format <f>.\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 = p = dtotal = ftotal = 0;
-   aflag = dflag = fflag = lflag = pflag = sflag = Fflag = uflag = gflag = FALSE;
-   Dflag = qflag = Nflag = Qflag = Rflag = hflag = Hflag = siflag = cflag = FALSE;
--  noindent = force_color = nocolor = xdev = noreport = nolinks = FALSE;
-+  noindent = force_color = xdev = noreport = nolinks = FALSE;
-+  nocolor = TRUE;
-   dirsfirst = nosort = inodeflag = devflag = Xflag = FALSE;
-   duflag = pruneflag = FALSE;
-   flimit = 0;
diff --git a/tree/patches/tree-no-strip.patch b/tree/patches/tree-no-strip.patch
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=tree.o unix.o html.o xml.o hash.o c
- # Linux defaults:
- #CFLAGS=-ggdb -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
- CFLAGS=-O4 -Wall  -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
--LDFLAGS=-s
-+LDFLAGS=
- 
- # Uncomment for FreeBSD:
- #CFLAGS=-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)
- 
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 +0100
-+++ 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)
- 
- 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 @@
 ###############################################################################
 
 name       = tree
-version    = 1.6.0
+version    = 1.7.0
 release    = 1
 
 groups     = Applications/File
-- 
2.6.3