Hello community,
here is the log from the commit of package tree for openSUSE:Factory
checked in at Mon Dec 21 14:27:22 CET 2009.
--------
--- tree/tree.changes 2009-07-09 12:32:01.000000000 +0200
+++ /mounts/work_src_done/STABLE/tree/tree.changes 2009-12-07 17:43:18.000000000 +0100
@@ -0,0 +1,14 @@
+-------------------------------------------------------------------
+Mon Dec 7 16:31:37 UTC 2009 - chris@computersalat.de
+
+- New upstream version 1.5.3
+- cleanup spec
+ * removed ^#----
+- reworked dontstrip patch
+
+-------------------------------------------------------------------
+Tue Jul 7 09:33:19 CEST 2009 - chris@computersalat.de
+
+- added Changes, Author
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
tree-1.5.2.2.tar.bz2
tree-dontstrip.diff
New:
----
tree-1.5.3-dontstrip.patch
tree-1.5.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ tree.spec ++++++
--- /var/tmp/diff_new_pack.2BIY8k/_old 2009-12-21 14:26:38.000000000 +0100
+++ /var/tmp/diff_new_pack.2BIY8k/_new 2009-12-21 14:26:38.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package tree (Version 1.5.2.2)
+# spec file for package tree (Version 1.5.3)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,39 +19,41 @@
Name: tree
-License: GPL v2 or later
-Group: Productivity/File utilities
-Url: http://mama.indstate.edu/users/ice/tree/
Summary: File listing as a tree
-Version: 1.5.2.2
+Version: 1.5.3
Release: 1
-Source0: %name-%version.tar.bz2
+License: GPLv2+
+Group: Productivity/File utilities
+Url: http://mama.indstate.edu/users/ice/tree/
+Source0: %{name}-%{version}.tar.bz2
+Patch0: %{name}-1.5.3-dontstrip.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Patch1: tree-dontstrip.diff
%description
A tree-like directory listing program with dircolors support
+ Authors: Steve Baker
+
%prep
-%setup -n %name-%version
-%patch1 -p1
+%setup -n %{name}-%{version}
+%patch0 -p1
%build
-make CFLAGS="$RPM_OPT_FLAGS"
+%{__make} CFLAGS="$RPM_OPT_FLAGS"
%install
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-install -m 644 man/tree.1 $RPM_BUILD_ROOT%{_mandir}/man1
-install -m 755 tree $RPM_BUILD_ROOT%{_bindir}
+%{__mkdir_p} $RPM_BUILD_ROOT%{_bindir}
+%{__mkdir_p} $RPM_BUILD_ROOT%{_mandir}/man1
+%{__install} -m 644 man/%{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1
+%{__install} -m 755 %{name} $RPM_BUILD_ROOT%{_bindir}
%clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
-%{_bindir}/tree
-%{_mandir}/man1/tree.1*
-%doc README LICENSE
+%doc CHANGES LICENSE README
+%{_bindir}/%{name}
+%{_mandir}/man1/%{name}.1.gz
%changelog
++++++ tree-1.5.3-dontstrip.patch ++++++
diff -ruN tree-1.5.3-orig/Makefile tree-1.5.3/Makefile
--- tree-1.5.3-orig/Makefile 2009-10-19 18:56:28.000000000 +0000
+++ tree-1.5.3/Makefile 2009-12-07 16:28:15.106304694 +0000
@@ -86,7 +86,7 @@
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)
++++++ tree-1.5.2.2.tar.bz2 -> tree-1.5.3.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tree-1.5.2.2/CHANGES new/tree-1.5.3/CHANGES
--- old/tree-1.5.2.2/CHANGES 2009-01-22 16:01:05.000000000 +0100
+++ new/tree-1.5.3/CHANGES 2009-10-19 21:19:16.000000000 +0200
@@ -1,3 +1,15 @@
+Version 1.5.3
+ - Properly quote directories for the system command when tree is relaunched
+ using the -R option.
+ - Fixed possible indentation problem if dirs[*] is not properly zeroed
+ (Martin Nagy).
+ - Use strcoll() instead of strcmp() to sort files based on locale if set.
+ - Change "const static" to "static const" to remove some compiler warnings
+ for Solaris (Kamaraju Kusumanchi).
+ - Actually use TREE_CHARSET if it's defined.
+ - Automatically select UTF-8 charset if TREE_CHARSET is not set, and the
+ locale is set to *UTF-8 (overridden with --charset option.)
+
Version 1.5.2.2
- Set locale before checking MB_CUR_MAX.
- Added HP-NonStop platform support (Craig McDaniel )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tree-1.5.2.2/Makefile new/tree-1.5.3/Makefile
--- old/tree-1.5.2.2/Makefile 2009-01-22 16:03:11.000000000 +0100
+++ new/tree-1.5.3/Makefile 2009-10-19 20:56:28.000000000 +0200
@@ -10,7 +10,7 @@
CC=gcc
-VERSION=1.5.2.2
+VERSION=1.5.3
TREE_DEST=tree
BINDIR=${prefix}/bin
MAN=tree.1
@@ -19,9 +19,9 @@
# Uncomment options below for your particular OS:
# Linux defaults:
-#CFLAGS=-ggdb -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
-CFLAGS=-O2 -Wall -fomit-frame-pointer -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
-LDFLAGS=-s
+CFLAGS=-ggdb -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+#CFLAGS=-O2 -Wall -fomit-frame-pointer -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+#LDFLAGS=-s
# Uncomment for FreeBSD:
#CFLAGS=-O2 -Wall -fomit-frame-pointer
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tree-1.5.2.2/README new/tree-1.5.3/README
--- old/tree-1.5.2.2/README 2008-11-21 16:33:07.000000000 +0100
+++ new/tree-1.5.3/README 2009-10-19 22:01:49.000000000 +0200
@@ -115,6 +115,16 @@
Christian Grigis
- Noted that setlocale() should come before MB_CUR_MAX check.
+Kamaraju Kusumanchi
+ - Submitted patch to remove compiler warnings for Solaris.
+
+Martin Nagy
+ - Provided patch which fixes issue where indent may output more than it
+ should when dirs[*] is not properly cleared before use.
+
+William C. Lathan III
+ - Showed that tree was not properly quoting arguments to recursively called
+ tree instances when using -R.
And many others whom I've failed to keep track of. I should have started
this list years ago.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tree-1.5.2.2/man/tree.1 new/tree-1.5.3/man/tree.1
--- old/tree-1.5.2.2/man/tree.1 2008-06-04 17:35:31.000000000 +0200
+++ new/tree-1.5.3/man/tree.1 2009-11-16 19:06:42.000000000 +0100
@@ -1,5 +1,5 @@
.\" $Copyright: $
-.\" Copyright (c) 1996 - 2007 by Steve Baker
+.\" Copyright (c) 1996 - 2009 by Steve Baker
.\" All Rights reserved
.\"
.\" This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@
.\" Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
.\"
...
-.TH TREE 1 "\*(V)" "Tree 1.5.2"
+.TH TREE 1 "\*(V)" "Tree 1.5.3"
.SH NAME
tree \- list contents of directories in a tree-like format.
.SH SYNOPSIS
@@ -255,7 +255,7 @@
The -h option rounds to the nearest whole number unlike the ls implementation
of -h which rounds up always. The IEC standard names for powers of 2
-cooresponding to metric powers of 10 (KiBi, et al.) are gay.
+cooresponding to metric powers of 10 (KiBi, et al.) are silly.
Pruning files and directories with the -I, -P and --filelimit options will
lead to incorrect file/directory count reports.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tree-1.5.2.2/tree.c new/tree-1.5.3/tree.c
--- old/tree-1.5.2.2/tree.c 2009-01-22 16:02:51.000000000 +0100
+++ new/tree-1.5.3/tree.c 2009-11-24 18:30:03.000000000 +0100
@@ -62,8 +62,8 @@
#include
#include
-static char *version ="$Version: $ tree v1.5.2.2 (c) 1996 - 2009 by Steve Baker, Thomas Moore, Francesc Rocher, Kyosuke Tokoro $";
-static char *hversion="\t\t\t tree v1.5.2.2 %s 1996 - 2009 by Steve Baker and Thomas Moore <br>\n"
+static char *version ="$Version: $ tree v1.5.3 (c) 1996 - 2009 by Steve Baker, Thomas Moore, Francesc Rocher, Kyosuke Tokoro $";
+static char *hversion="\t\t\t tree v1.5.3 %s 1996 - 2009 by Steve Baker and Thomas Moore <br>\n"
"\t\t\t HTML output hacked and copyleft %s 1998 by Francesc Rocher <br>\n"
"\t\t\t Charsets / OS/2 support %s 2001 by Kyosuke Tokoro\n";
@@ -159,7 +159,7 @@
int findino(ino_t, dev_t);
void *xmalloc(size_t), *xrealloc(void *, size_t);
void listdir(char *, int *, int *, u_long, dev_t), usage(int);
-void parse_dir_colors(), printit(char *), free_dir(struct _info **), indent();
+void parse_dir_colors(), printit(char *), free_dir(struct _info **), indent(int maxlevel);
void saveino(ino_t, dev_t);
char **split(char *, char *, int *);
char *gidtoname(int), *uidtoname(int), *do_date(time_t);
@@ -211,10 +211,17 @@
inodeflag = devflag = FALSE;
flimit = 0;
dirs = xmalloc(sizeof(int) * (maxdirs=4096));
+ memset(dirs, 0, sizeof(int) * maxdirs);
dirs[0] = 0;
Level = -1;
setlocale(LC_CTYPE, "");
+ setlocale(LC_COLLATE, "");
+
+ charset = getcharset();
+ if (charset == NULL && patmatch(setlocale(LC_CTYPE,NULL), "*[Uu][Tt][Ff]-8") == 1) {
+ charset = "UTF-8";
+ }
/* Until I get rid of this hack, make it linux/cygwin/HP nonstop only: */
#if defined (LINUX) || defined (CYGWIN) || defined (__TANDEM)
@@ -299,7 +306,7 @@
ansilines = TRUE;
break;
case 'S':
- charset="IBM437";
+ charset = "IBM437";
break;
case 'D':
Dflag = TRUE;
@@ -404,13 +411,13 @@
if (!strncmp("--charset",argv[i],9)){
j = 9;
if (*(argv[i]+j) == '=') {
- if (*(charset=(argv[i]+10))) {
+ if (*(charset = (argv[i]+10))) {
j = strlen(argv[i])-1;
break;
}
}
if (argv[n] != NULL) {
- charset=argv[n++];
+ charset = argv[n++];
j = strlen(argv[i])-1;
} else {
initlinedraw(1);
@@ -661,12 +668,15 @@
return;
}
qsort(dir,n,sizeof(struct _info *),cmpfunc);
- if (lev >= maxdirs-1) dirs = xrealloc(dirs,sizeof(int) * (maxdirs += 1024));
+ if (lev >= maxdirs-1) {
+ dirs = xrealloc(dirs,sizeof(int) * (maxdirs += 1024));
+ memset(dirs+(maxdirs-1024), 0, sizeof(int) * 1024);
+ }
dirs[lev] = 1;
if (!*(dir+1)) dirs[lev] = 2;
fprintf(outfile,"\n");
while(*dir) {
- if (!noindent) indent();
+ if (!noindent) indent(lev);
path[0] = 0;
#ifdef __USE_FILE_OFFSET64
@@ -731,7 +741,7 @@
fprintf(stderr,"Entering directory %s\n",path);
hcmd = xmalloc(sizeof(char) * (49 + strlen(host) + strlen(d) + strlen((*dir)->name)) + 10 + (2*strlen(path)));
- sprintf(hcmd,"tree -n -H %s%s/%s -L %d -R -o %s/00Tree.html %s\n", host,d+1,(*dir)->name,Level+1,path,path);
+ sprintf(hcmd,"tree -n -H \"%s%s/%s\" -L %d -R -o \"%s/00Tree.html\" \"%s\"\n", host,d+1,(*dir)->name,Level+1,path,path);
system(hcmd);
free(hdir);
free(hcmd);
@@ -857,7 +867,7 @@
while((ent = (struct dirent *)readdir(d))) {
if (!strcmp("..",ent->d_name) || !strcmp(".",ent->d_name)) continue;
- if (!Hflag && !strcmp(ent->d_name,"00Tree.html")) continue;
+ if (Hflag && !strcmp(ent->d_name,"00Tree.html")) continue;
if (!aflag && ent->d_name[0] == '.') continue;
if (strlen(dir)+strlen(ent->d_name)+2 > pathsize) path = xrealloc(path,pathsize=(strlen(dir)+strlen(ent->d_name)+4096));
@@ -928,7 +938,7 @@
/* Sorting functions */
int alnumsort(struct _info **a, struct _info **b)
{
- return strcmp((*a)->name,(*b)->name);
+ return strcoll((*a)->name,(*b)->name);
}
int versort(struct _info **a, struct _info **b)
@@ -938,18 +948,18 @@
int reversealnumsort(struct _info **a, struct _info **b)
{
- return strcmp((*b)->name,(*a)->name);
+ return strcoll((*b)->name,(*a)->name);
}
int timesort(struct _info **a, struct _info **b)
{
- if ((*a)->mtime == (*b)->mtime) return strcmp((*a)->name,(*b)->name);
+ if ((*a)->mtime == (*b)->mtime) return strcoll((*a)->name,(*b)->name);
return (*a)->mtime < (*b)->mtime;
}
int dirsfirstsort(struct _info **a, struct _info **b)
{
- if ((*a)->isdir == (*b)->isdir) return strcmp((*a)->name,(*b)->name);
+ if ((*a)->isdir == (*b)->isdir) return strcoll((*a)->name,(*b)->name);
else return (*a)->isdir ? -1 : 1;
}
@@ -1077,13 +1087,13 @@
* They cried out for ANSI-lines (not really), but here they are, as an option
* for the xterm and console capable among you, as a run-time option.
*/
-void indent()
+void indent(int maxlevel)
{
int i;
if (ansilines) {
if (dirs[0]) fprintf(outfile,"\033(0");
- for(i=0;dirs[i];i++) {
+ for(i=0; dirs[i] && i <= maxlevel; i++) {
if (dirs[i+1]) {
if (dirs[i] == 1) fprintf(outfile,"\170 ");
else printf(" ");
@@ -1095,7 +1105,7 @@
if (dirs[0]) fprintf(outfile,"\033(B");
} else {
if (Hflag) fprintf(outfile,"<br>\t\t\t\t ");
- for(i=0;dirs[i];i++) {
+ for(i=0; dirs[i] && i <= maxlevel; i++) {
fprintf(outfile,"%s ",
dirs[i+1] ? (dirs[i]==1 ? linedraw->vert : (Hflag? " " : " ") )
: (dirs[i]==1 ? linedraw->vert_left:linedraw->corner));
@@ -1122,7 +1132,7 @@
#endif
{
#ifdef __EMX__
- const static u_short ifmt[]={
+ static const u_short ifmt[]={
FILE_ARCHIVED, FILE_DIRECTORY, FILE_SYSTEM,FILE_HIDDEN, FILE_READONLY
};
const u_short*p;
@@ -1677,66 +1687,66 @@
void initlinedraw(int flag)
{
- const static char*latin1_3[]={
+ static const char*latin1_3[]={
"ISO-8859-1", "ISO-8859-1:1987", "ISO_8859-1", "latin1", "l1", "IBM819",
"CP819", "csISOLatin1", "ISO-8859-3", "ISO_8859-3:1988", "ISO_8859-3",
"latin3", "ls", "csISOLatin3", NULL
};
- const static char*iso8859_789[]={
+ static const char*iso8859_789[]={
"ISO-8859-7", "ISO_8859-7:1987", "ISO_8859-7", "ELOT_928", "ECMA-118",
"greek", "greek8", "csISOLatinGreek", "ISO-8859-8", "ISO_8859-8:1988",
"iso-ir-138", "ISO_8859-8", "hebrew", "csISOLatinHebrew", "ISO-8859-9",
"ISO_8859-9:1989", "iso-ir-148", "ISO_8859-9", "latin5", "l5",
"csISOLatin5", NULL
};
- const static char*shift_jis[]={
+ static const char*shift_jis[]={
"Shift_JIS", "MS_Kanji", "csShiftJIS", NULL
};
- const static char*euc_jp[]={
+ static const char*euc_jp[]={
"EUC-JP", "Extended_UNIX_Code_Packed_Format_for_Japanese",
"csEUCPkdFmtJapanese", NULL
};
- const static char*euc_kr[]={
+ static const char*euc_kr[]={
"EUC-KR", "csEUCKR", NULL
};
- const static char*iso2022jp[]={
+ static const char*iso2022jp[]={
"ISO-2022-JP", "csISO2022JP", "ISO-2022-JP-2", "csISO2022JP2", NULL
};
- const static char*ibm_pc[]={
+ static const char*ibm_pc[]={
"IBM437", "cp437", "437", "csPC8CodePage437", "IBM852", "cp852", "852",
"csPCp852", "IBM863", "cp863", "863", "csIBM863", "IBM855", "cp855",
"855", "csIBM855", "IBM865", "cp865", "865", "csIBM865", "IBM866",
"cp866", "866", "csIBM866", NULL
};
- const static char*ibm_ps2[]={
+ static const char*ibm_ps2[]={
"IBM850", "cp850", "850", "csPC850Multilingual", "IBM00858", "CCSID00858",
"CP00858", "PC-Multilingual-850+euro", NULL
};
- const static char*ibm_gr[]={
+ static const char*ibm_gr[]={
"IBM869", "cp869", "869", "cp-gr", "csIBM869", NULL
};
- const static char*gb[]={
+ static const char*gb[]={
"GB2312", "csGB2312", NULL
};
- const static char*utf8[]={
+ static const char*utf8[]={
"UTF-8", "utf8", NULL
};
- const static char*big5[]={
+ static const char*big5[]={
"Big5", "csBig5", NULL
};
- const static char*viscii[]={
+ static const char*viscii[]={
"VISCII", "csVISCII", NULL
};
- const static char*koi8ru[]={
+ static const char*koi8ru[]={
"KOI8-R", "csKOI8R", "KOI8-U", NULL
};
- const static char*windows[]={
+ static const char*windows[]={
"ISO-8859-1-Windows-3.1-Latin-1", "csWindows31Latin1",
"ISO-8859-2-Windows-Latin-2", "csWindows31Latin2", "windows-1250",
"windows-1251", "windows-1253", "windows-1254", "windows-1255",
"windows-1256", "windows-1256", "windows-1257", NULL
};
- const static struct linedraw cstable[]={
+ static const struct linedraw cstable[]={
{ latin1_3, "| ", "|--", "·--", "©" },
{ iso8859_789, "| ", "|--", "·--", "(c)" },
{ shift_jis, "\204\240 ", "\204\245", "\204\244", "(c)" },
@@ -1748,7 +1758,7 @@
{ ibm_gr, "\263 ", "\303\304\304", "\300\304\304", "\270" },
{ gb, "\251\246 ", "\251\300", "\251\270", "(c)" },
{ utf8, "\342\224\202\302\240\302\240",
- "\342\224\234\342\224\200", "\342\224\224\342\224\200", "\302\251" },
+ "\342\224\234\342\224\200\342\224\200", "\342\224\224\342\224\200\342\224\200", "\302\251" },
{ big5, "\242x ", "\242u", "\242|", "(c)" },
{ viscii, "| ", "|--", "`--", "\371" },
{ koi8ru, "\201 ", "\206\200\200", "\204\200\200", "\277" },
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org