update misc/fileutils to 4.1; thanks Heikki Korpela <heko@iki.fi>

This commit is contained in:
lebel 2001-07-21 14:56:26 +00:00
parent 4c5b6c2977
commit f1f233df94
8 changed files with 68 additions and 37 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.6 2001/04/15 20:20:55 lebel Exp $
# $OpenBSD: Makefile,v 1.7 2001/07/21 14:56:26 lebel Exp $
COMMENT= "GNU versions of common file management utilities"
COMMENT-ls= "colorized GNU 'ls'"
V= 4.0
V= 4.1
DISTNAME= fileutils-$V
CATEGORIES= misc
NEED_VERSION= 1.361

View File

@ -1,3 +1,3 @@
MD5 (fileutils-4.0.tar.gz) = 082ab37b7f37c00e768b04e37bc736be
RMD160 (fileutils-4.0.tar.gz) = 2045fecb6e97079d18f001d665441e8ba201d4cd
SHA1 (fileutils-4.0.tar.gz) = 7fe286ff074e37dc573d5f8a23512d6693a66385
MD5 (fileutils-4.1.tar.gz) = 2fa04ceee87e962ddf72f32a2d6b906d
RMD160 (fileutils-4.1.tar.gz) = 580a61714862b15fdbe6d4b3927cb74615b31496
SHA1 (fileutils-4.1.tar.gz) = d74e82f6edae7c40b3d075c5a30dc27c79f937ff

View File

@ -0,0 +1,20 @@
--- src/Makefile.in.orig Sun Apr 29 14:40:37 2001
+++ src/Makefile.in Sat Jul 21 17:04:36 2001
@@ -338,7 +338,7 @@
$(mkinstalldirs) $(DESTDIR)$(bindir)
@list='$(bin_PROGRAMS)'; for p in $$list; do \
if test -f $$p; then \
- f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+ f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform)s/$$/$(EXEEXT)/'`; \
echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f"; \
$(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f; \
else :; fi; \
@@ -347,7 +347,7 @@
uninstall-binPROGRAMS:
@$(NORMAL_UNINSTALL)
@list='$(bin_PROGRAMS)'; for p in $$list; do \
- f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+ f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform)s/$$/$(EXEEXT)/'`; \
echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
rm -f $(DESTDIR)$(bindir)/$$f; \
done

View File

@ -1,19 +1,18 @@
$OpenBSD: patch-src_dircolors_c,v 1.1 2001/03/15 18:17:54 wilfried Exp $
--- src/dircolors.c.orig Sat Sep 19 13:09:23 1998
+++ src/dircolors.c Thu Mar 15 08:11:07 2001
@@ -68,13 +68,15 @@ static const char *const slack_codes[] =
--- src/dircolors.c.orig Mon Aug 7 19:46:16 2000
+++ src/dircolors.c Fri Jul 20 20:56:09 2001
@@ -69,13 +69,15 @@
"NORMAL", "NORM", "FILE", "DIR", "LNK", "LINK",
"SYMLINK", "ORPHAN", "MISSING", "FIFO", "PIPE", "SOCK", "BLK", "BLOCK",
"CHR", "CHAR", "EXEC", "LEFT", "LEFTCODE", "RIGHT", "RIGHTCODE", "END",
- "ENDCODE", NULL
+ "ENDCODE", "SUID", "SETUID", "SGID", "SETGID", "WRO", "WRITEOTHERS",
"CHR", "CHAR", "DOOR", "EXEC", "LEFT", "LEFTCODE", "RIGHT", "RIGHTCODE",
- "END", "ENDCODE", NULL
+ "END", "ENDCODE", "SUID", "SETUID", "SGID", "SETGID", "WRO", "WRITEOTHERS",
+ "WT", "WROT", "WRITEOTHERSSTICKY", NULL
};
static const char *const ls_codes[] =
{
"no", "no", "fi", "di", "ln", "ln", "ln", "or", "mi", "pi", "pi",
"so", "bd", "bd", "cd", "cd", "ex", "lc", "lc", "rc", "rc", "ec", "ec"
"so", "bd", "bd", "cd", "cd", "do", "ex", "lc", "lc", "rc", "rc", "ec", "ec"
+ "su", "su", "sg", "sg", "wo", "wo", "wo", "wt", "wt", "wt", NULL
};

View File

@ -1,28 +1,27 @@
$OpenBSD: patch-src_ls_c,v 1.1 2001/03/15 18:17:54 wilfried Exp $
--- src/ls.c.orig Sat Sep 19 13:09:23 1998
+++ src/ls.c Thu Mar 15 08:11:07 2001
@@ -368,13 +368,13 @@ enum color_type
--- src/ls.c.orig Sun Apr 29 12:42:47 2001
+++ src/ls.c Fri Jul 20 21:01:39 2001
@@ -510,13 +510,13 @@
enum indicator_no
{
C_LEFT, C_RIGHT, C_END, C_NORM, C_FILE, C_DIR, C_LINK, C_FIFO, C_SOCK,
- C_BLK, C_CHR, C_MISSING, C_ORPHAN, C_EXEC
+ C_BLK, C_CHR, C_MISSING, C_ORPHAN, C_EXEC, C_UID, C_GID, C_WRO, C_WT
- C_BLK, C_CHR, C_MISSING, C_ORPHAN, C_EXEC, C_DOOR
+ C_BLK, C_CHR, C_MISSING, C_ORPHAN, C_EXEC, C_DOOR, C_UID, C_GID, C_WRO, C_WT
};
static const char *const indicator_name[]=
{
"lc", "rc", "ec", "no", "fi", "di", "ln", "pi", "so",
- "bd", "cd", "mi", "or", "ex", NULL
+ "bd", "cd", "mi", "or", "ex", "su", "sg", "wo", "wt", NULL
- "bd", "cd", "mi", "or", "ex", "do", NULL
+ "bd", "cd", "mi", "or", "ex", "do", "su", "sg", "wo", "wt", NULL
};
struct col_ext_type
@@ -399,7 +399,11 @@ static struct bin_str color_indicator[]
{ LEN_STR_PAIR ("01;33") }, /* cd: Char device: bright yellow */
struct color_ext_type
@@ -542,7 +542,11 @@
{ 0, NULL }, /* mi: Missing file: undefined */
{ 0, NULL }, /* or: Orphanned symlink: undefined */
- { LEN_STR_PAIR ("01;32") } /* ex: Executable: bright green */
+ { LEN_STR_PAIR ("01;32") }, /* ex: Executable: bright green */
{ LEN_STR_PAIR ("01;32") }, /* ex: Executable: bright green */
- { LEN_STR_PAIR ("01;35") } /* do: Door: bright magenta */
+ { LEN_STR_PAIR ("01;35") }, /* do: Door: bright magenta */
+ { LEN_STR_PAIR ("37;41") }, /* su: setuid: white on red */
+ { LEN_STR_PAIR ("30;43") }, /* sg: setgid: black on yellow */
+ { LEN_STR_PAIR ("37;44") }, /* wo: writeable-other:white on blue */
@ -30,7 +29,7 @@ $OpenBSD: patch-src_ls_c,v 1.1 2001/03/15 18:17:54 wilfried Exp $
};
/* FIXME: comment */
@@ -2477,7 +2481,14 @@ print_color_indicator (const char *name,
@@ -2883,7 +2887,14 @@
else
{
if (S_ISDIR (mode))
@ -43,12 +42,12 @@ $OpenBSD: patch-src_ls_c,v 1.1 2001/03/15 18:17:54 wilfried Exp $
+ else
+ type = C_DIR;
+ }
#ifdef S_ISLNK
else if (S_ISLNK (mode))
@@ -2505,7 +2516,13 @@ print_color_indicator (const char *name,
type = C_CHR;
#endif
type = ((!linkok && color_indicator[C_ORPHAN].string)
? C_ORPHAN : C_LINK);
@@ -2898,7 +2909,13 @@
else if (S_ISDOOR (mode))
type = C_DOOR;
- if (type == C_FILE && (mode & S_IXUGO) != 0)
+ if ((type == C_FILE) && ((mode & S_ISUID) != 0))

View File

@ -1,6 +1,5 @@
$OpenBSD: patch-src_ls_h,v 1.1 2001/03/15 18:17:55 wilfried Exp $
--- src/ls.h.orig Sun Jan 4 23:35:28 1998
+++ src/ls.h Thu Mar 15 08:11:07 2001
--- src/ls.h.orig Mon Feb 15 17:27:12 1999
+++ src/ls.h Fri Jul 20 21:03:51 2001
@@ -7,4 +7,7 @@
/* This is for the `vdir' program. */
#define LS_LONG_FORMAT 3

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.3 2001/04/15 20:20:55 lebel Exp $
@comment $OpenBSD: PLIST,v 1.4 2001/07/21 14:56:26 lebel Exp $
@pkgcfl gnuls-*
@unexec install-info --delete --info-dir=%D/info %D/info/fileutils.info
bin/gchgrp
@ -19,6 +19,7 @@ bin/gmknod
bin/gmv
bin/grm
bin/grmdir
bin/gshred
bin/gsync
bin/gtouch
bin/gvdir
@ -41,21 +42,28 @@ man/man1/gmknod.1
man/man1/gmv.1
man/man1/grm.1
man/man1/grmdir.1
man/man1/gshred.1
man/man1/gsync.1
man/man1/gtouch.1
man/man1/gvdir.1
share/locale/cs/LC_MESSAGES/fileutils.mo
share/locale/da/LC_MESSAGES/fileutils.mo
share/locale/de/LC_MESSAGES/fileutils.mo
share/locale/el/LC_MESSAGES/fileutils.mo
share/locale/es/LC_MESSAGES/fileutils.mo
share/locale/fr/LC_MESSAGES/fileutils.mo
share/locale/gl/LC_MESSAGES/fileutils.mo
share/locale/it/LC_MESSAGES/fileutils.mo
share/locale/ja/LC_MESSAGES/fileutils.mo
share/locale/ko/LC_MESSAGES/fileutils.mo
share/locale/nl/LC_MESSAGES/fileutils.mo
share/locale/no/LC_MESSAGES/fileutils.mo
share/locale/pl/LC_MESSAGES/fileutils.mo
share/locale/pt/LC_MESSAGES/fileutils.mo
share/locale/pt_BR/LC_MESSAGES/fileutils.mo
share/locale/ru/LC_MESSAGES/fileutils.mo
share/locale/sk/LC_MESSAGES/fileutils.mo
share/locale/sl/LC_MESSAGES/fileutils.mo
share/locale/sv/LC_MESSAGES/fileutils.mo
share/locale/zh/LC_MESSAGES/fileutils.mo
@exec install-info --info-dir=%D/info %D/info/fileutils.info

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-ls,v 1.2 2001/03/16 16:30:01 espie Exp $
@comment $OpenBSD: PLIST-ls,v 1.3 2001/07/21 14:56:26 lebel Exp $
@pkgcfl fileutils-[0-9]*
bin/gdir
bin/gdircolors
@ -9,16 +9,22 @@ man/man1/gdircolors.1
man/man1/gls.1
man/man1/gvdir.1
share/locale/cs/LC_MESSAGES/fileutils.mo
share/locale/da/LC_MESSAGES/fileutils.mo
share/locale/de/LC_MESSAGES/fileutils.mo
share/locale/el/LC_MESSAGES/fileutils.mo
share/locale/es/LC_MESSAGES/fileutils.mo
share/locale/fr/LC_MESSAGES/fileutils.mo
share/locale/gl/LC_MESSAGES/fileutils.mo
share/locale/it/LC_MESSAGES/fileutils.mo
share/locale/ja/LC_MESSAGES/fileutils.mo
share/locale/ko/LC_MESSAGES/fileutils.mo
share/locale/nl/LC_MESSAGES/fileutils.mo
share/locale/no/LC_MESSAGES/fileutils.mo
share/locale/pl/LC_MESSAGES/fileutils.mo
share/locale/pt/LC_MESSAGES/fileutils.mo
share/locale/pt_BR/LC_MESSAGES/fileutils.mo
share/locale/ru/LC_MESSAGES/fileutils.mo
share/locale/sk/LC_MESSAGES/fileutils.mo
share/locale/sl/LC_MESSAGES/fileutils.mo
share/locale/sv/LC_MESSAGES/fileutils.mo
share/locale/zh/LC_MESSAGES/fileutils.mo