Attachment 76570 Details for Bug 110348 – file.diff

[patch] file.diff

file.diff (text/plain), 1.69 KB, created by Murilo Opsfelder Araújo on 2007-03-15 18:10:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Murilo Opsfelder Araújo

Created: 2007-03-15 18:10:04 UTC

Size: 1.69 KB

patch

obsolete

>Index: bin/ls/Makefile
>===================================================================
>RCS file: /home/ncvs/src/bin/ls/Makefile,v
>retrieving revision 1.26
>diff -u -r1.26 Makefile
>--- bin/ls/Makefile	25 May 2004 14:53:47 -0000	1.26
>+++ bin/ls/Makefile	15 Mar 2007 17:45:14 -0000
>@@ -6,6 +6,10 @@
> DPADD=	${LIBUTIL}
> LDADD=	-lutil
> 
>+.if defined(NO_LSAUTODOT)
>+CFLAGS+= -DNO_LSAUTODOT
>+.endif
>+
> .if !defined(RELEASE_CRUNCH)
> CFLAGS+= -DCOLORLS
> DPADD+=	${LIBTERMCAP}
>Index: bin/ls/ls.c
>===================================================================
>RCS file: /home/ncvs/src/bin/ls/ls.c,v
>retrieving revision 1.85
>diff -u -r1.85 ls.c
>--- bin/ls/ls.c	24 Mar 2006 17:09:03 -0000	1.85
>+++ bin/ls/ls.c	15 Mar 2007 17:45:17 -0000
>@@ -338,8 +338,10 @@
> 	argv += optind;
> 
> 	/* Root is -A automatically unless -I. */
>+#ifndef NO_LSAUTODOT
> 	if (!f_listdot && getuid() == (uid_t)0 && !f_noautodot)
> 		f_listdot = 1;
>+#endif
> 
> 	/* Enabling of colours is conditional on the environment. */
> 	if (getenv("CLICOLOR") &&
>Index: share/examples/etc/make.conf
>===================================================================
>RCS file: /home/ncvs/src/share/examples/etc/make.conf,v
>retrieving revision 1.279
>diff -u -r1.279 make.conf
>--- share/examples/etc/make.conf	17 Jan 2007 12:43:06 -0000	1.279
>+++ share/examples/etc/make.conf	15 Mar 2007 17:45:18 -0000
>@@ -106,6 +106,7 @@
> #NO_MODULES=		# do not build modules with the kernel
> #NO_SHARE=		# do not go into the share subdir
> #NO_SHARED= 		# build /bin and /sbin statically linked (bad idea)
>+#NO_LSAUTODOT=		# do not automatically enable -A for root on /bin/ls
> #
> # Variables that control how ppp(8) is built.
> #PPP_NO_NAT= 		# do not build with NAT support (see make.conf(5))

Actions: View | Diff

Attachments on bug 110348: 76570