From f9d89401b579a8d34ac9f06929b4b455524bde79 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Jun 27 2011 15:22:01 +0000 Subject: 1.6.0 (bug #716879). --- diff --git a/.gitignore b/.gitignore index f6159fa..39e0aaf 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ tree-1.5.2.tgz tree-1.5.2.1.tgz tree-1.5.2.2.tgz tree-1.5.3.tgz +/tree-1.6.0.tgz diff --git a/sources b/sources index 673a59a..2d9adf4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c07ce9065667a23f27aca4de8ecccb10 tree-1.5.3.tgz +04e967a3f4108d50cde3b4b0e89e970a tree-1.6.0.tgz diff --git a/tree-1.2-carrot.patch b/tree-1.2-carrot.patch deleted file mode 100644 index 99bb6ed..0000000 --- a/tree-1.2-carrot.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up tree-1.5.2.1/man/tree.1.carrot tree-1.5.2.1/man/tree.1 ---- tree-1.5.2.1/man/tree.1.carrot 2008-06-04 16:35:31.000000000 +0100 -+++ tree-1.5.2.1/man/tree.1 2008-09-02 15:05:28.000000000 +0100 -@@ -149,7 +149,7 @@ caret notation. - .PP - .TP - .B -N --Print non-printable characters as is instead of the default carrot notation. -+Print non-printable characters as is instead of the default caret notation. - .PP - .TP - .B -v diff --git a/tree-1.2-no-strip.patch b/tree-1.2-no-strip.patch deleted file mode 100644 index 960807a..0000000 --- a/tree-1.2-no-strip.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up tree-1.5.3/Makefile.no-strip tree-1.5.3/Makefile ---- tree-1.5.3/Makefile.no-strip 2009-10-19 19:56:28.000000000 +0100 -+++ tree-1.5.3/Makefile 2009-11-27 17:10:56.209696177 +0000 -@@ -86,7 +86,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 man/$(MAN) $(MANDIR)/$(MAN) - diff --git a/tree-coverity-resource-leak.patch b/tree-coverity-resource-leak.patch deleted file mode 100644 index 5444844..0000000 --- a/tree-coverity-resource-leak.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up tree-1.5.3/tree.c.coverity-resource-leak tree-1.5.3/tree.c ---- tree-1.5.3/tree.c.coverity-resource-leak 2011-05-20 16:10:43.802104336 +0100 -+++ tree-1.5.3/tree.c 2011-05-20 16:11:36.922059759 +0100 -@@ -642,6 +642,7 @@ void listdir(char *d, int *dt, int *ft, - - if ((Level >= 0) && (lev > Level)) { - if (!Hflag) fprintf(outfile,"\n"); -+ free(path); - return; - } - diff --git a/tree-no-color-by-default.patch b/tree-no-color-by-default.patch index 48b6092..374add4 100644 --- a/tree-no-color-by-default.patch +++ b/tree-no-color-by-default.patch @@ -1,28 +1,13 @@ -diff -up tree-1.5.3/man/tree.1.no-color-by-default tree-1.5.3/man/tree.1 ---- tree-1.5.3/man/tree.1.no-color-by-default 2009-11-27 17:11:45.079696363 +0000 -+++ tree-1.5.3/man/tree.1 2009-11-27 17:11:45.097697476 +0000 -@@ -25,8 +25,8 @@ tree \- list contents of directories in - .br - .SH DESCRIPTION - \fITree\fP is a recursive directory listing program that produces a depth --indented listing of files, which is colorized ala \fIdircolors\fP if the \fBLS_COLORS\fP --environment variable is set and output is to tty. With no arguments, -+indented listing of files. Color is supported ala \fIdircolors\fP if the \fBLS_COLORS\fP -+environment variable is set, output is to a tty, and the \fB-C\fP flag is used. With no arguments, - \fItree\fP lists the files in the current directory. When directory - arguments are given, \fItree\fP lists all the files and/or directories found - in the given directories each in turn. Upon completion of listing all -diff -up tree-1.5.3/tree.c.no-color-by-default tree-1.5.3/tree.c ---- tree-1.5.3/tree.c.no-color-by-default 2009-11-24 17:30:03.000000000 +0000 -+++ tree-1.5.3/tree.c 2009-11-27 17:12:17.751822020 +0000 -@@ -207,8 +207,9 @@ int main(int argc, char **argv) +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 = Hflag = Rflag = hflag = 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; - inodeflag = devflag = FALSE; + nocolor = TRUE; + dirsfirst = nosort = inodeflag = devflag = Xflag = FALSE; + duflag = pruneflag = FALSE; flimit = 0; - dirs = xmalloc(sizeof(int) * (maxdirs=4096)); - memset(dirs, 0, sizeof(int) * maxdirs); diff --git a/tree-no-strip.patch b/tree-no-strip.patch new file mode 100644 index 0000000..0ae63ce --- /dev/null +++ b/tree-no-strip.patch @@ -0,0 +1,12 @@ +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-06-27 16:10:48.812529754 +0100 +@@ -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-preserve-timestamps.patch b/tree-preserve-timestamps.patch index cfb85db..2e432a5 100644 --- a/tree-preserve-timestamps.patch +++ b/tree-preserve-timestamps.patch @@ -1,15 +1,15 @@ -diff -up tree-1.5.1.1/Makefile.preserve-timestamps tree-1.5.1.1/Makefile ---- tree-1.5.1.1/Makefile.preserve-timestamps 2008-04-25 12:30:41.000000000 +0100 -+++ tree-1.5.1.1/Makefile 2008-04-25 12:31:14.000000000 +0100 -@@ -62,9 +62,9 @@ install: +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 man/$(MAN) $(MANDIR)/$(MAN) -+ install -p man/$(MAN) $(MANDIR)/$(MAN) +- install doc/$(MAN) $(MANDIR)/$(MAN) ++ install -p doc/$(MAN) $(MANDIR)/$(MAN) distclean: if [ -f tree.o ]; then rm *.o; fi diff --git a/tree.spec b/tree.spec index 92d2c5b..cf511f3 100644 --- a/tree.spec +++ b/tree.spec @@ -1,16 +1,14 @@ Summary: File system tree viewer Name: tree -Version: 1.5.3 -Release: 4%{?dist} +Version: 1.6.0 +Release: 1%{?dist} Group: Applications/File License: GPLv2+ Url: http://mama.indstate.edu/users/ice/tree/ Source: ftp://mama.indstate.edu/linux/tree/tree-%{version}.tgz -Patch1: tree-1.2-carrot.patch -Patch2: tree-1.2-no-strip.patch +Patch2: tree-no-strip.patch Patch3: tree-preserve-timestamps.patch Patch4: tree-no-color-by-default.patch -Patch5: tree-coverity-resource-leak.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -20,9 +18,6 @@ utility. %prep %setup -q -# Fixed spelling mistake in man page. -%patch1 -p1 -b .carrot - # Don't strip binary in the Makefile -- let rpmbuild do it. %patch2 -p1 -b .no-strip @@ -32,9 +27,6 @@ utility. # Disable color output by default. %patch4 -p1 -b .no-color-by-default -# Fixed memory leak spotted by coverity (bug #704570). -%patch5 -p1 -b .coverity-resource-leak - %build make CFLAGS="$RPM_OPT_FLAGS" "CPPFLAGS=$(getconf LFS_CFLAGS)" %{?_smp_mflags} @@ -58,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT %doc README LICENSE %changelog +* Mon Jun 27 2011 Tim Waugh 1.6.0-1 +- 1.6.0 (bug #716879). + * Fri May 20 2011 Tim Waugh 1.5.3-4 - Fixed memory leak spotted by coverity (bug #704570).