summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2002-05-11 18:02:19 +0000
committerwiz <wiz@pkgsrc.org>2002-05-11 18:02:19 +0000
commit398761b6d5fa9090325b306007ac4f6b311cebaa (patch)
tree27bf84f2e9a20d5b345159593e773d1a67b589d0
parent4e687431bf888671b97dd0c4b15f49a15dda51d8 (diff)
downloadpkgsrc-398761b6d5fa9090325b306007ac4f6b311cebaa.tar.gz
Fix segfault if --color is given an invalid option.
Patch from pkg/16759.
-rw-r--r--misc/linuxls/distinfo3
-rw-r--r--misc/linuxls/patches/patch-ab13
2 files changed, 15 insertions, 1 deletions
diff --git a/misc/linuxls/distinfo b/misc/linuxls/distinfo
index 6868ed90762..1345b62237d 100644
--- a/misc/linuxls/distinfo
+++ b/misc/linuxls/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.2 2001/04/20 13:52:15 agc Exp $
+$NetBSD: distinfo,v 1.3 2002/05/11 18:02:19 wiz Exp $
SHA1 (fileutils-3.12.tar.gz) = cb5e7d61eec75c58a0978257183e090b495d9c52
Size (fileutils-3.12.tar.gz) = 333928 bytes
SHA1 (color-ls-3.12.0.2.patch.gz) = 37d30c5852e67781103730b291bdadc5c6c0e16d
Size (color-ls-3.12.0.2.patch.gz) = 20884 bytes
SHA1 (patch-aa) = bd2b88265b91c033f62da17c3cced3cf117b5318
+SHA1 (patch-ab) = 3d3f6bacccaf9a68359ad2fa125a88da7329f591
diff --git a/misc/linuxls/patches/patch-ab b/misc/linuxls/patches/patch-ab
new file mode 100644
index 00000000000..870f7eed088
--- /dev/null
+++ b/misc/linuxls/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2002/05/11 18:02:19 wiz Exp $
+
+--- src/ls.c.orig Sat May 11 19:56:50 2002
++++ src/ls.c
+@@ -600,7 +600,7 @@
+ {
+ /* Note: "no" is a prefix of "none" so we don't include it */
+ /* force and none are for compatibility with another color-ls version */
+- "yes", "force", "none", "tty", "if-tty"
++ "yes", "force", "none", "tty", "if-tty", NULL
+ };
+
+ static enum color_type const color_types[] =