head	1.34;
access;
symbols
	RELENG_8_4:1.34.0.2
	RELENG_8_3_0_RELEASE:1.33.36.1.8.1
	RELENG_8_3:1.33.36.1.0.8
	RELENG_8_3_BP:1.33.36.1
	RELENG_7_4_0_RELEASE:1.33.40.1
	RELENG_8_2_0_RELEASE:1.33.36.1.6.1
	RELENG_7_4:1.33.0.40
	RELENG_7_4_BP:1.33
	RELENG_8_2:1.33.36.1.0.6
	RELENG_8_2_BP:1.33.36.1
	RELENG_8_1_0_RELEASE:1.33.36.1.4.1
	RELENG_8_1:1.33.36.1.0.4
	RELENG_8_1_BP:1.33.36.1
	RELENG_7_3_0_RELEASE:1.33.38.1
	RELENG_7_3:1.33.0.38
	RELENG_7_3_BP:1.33
	RELENG_8_0_0_RELEASE:1.33.36.1.2.1
	RELENG_8_0:1.33.36.1.0.2
	RELENG_8_0_BP:1.33.36.1
	RELENG_8:1.33.0.36
	RELENG_8_BP:1.33
	RELENG_7_2_0_RELEASE:1.33.34.1
	RELENG_7_2:1.33.0.34
	RELENG_7_2_BP:1.33
	RELENG_7_1_0_RELEASE:1.33.32.1
	RELENG_6_4_0_RELEASE:1.33.30.1
	RELENG_7_1:1.33.0.32
	RELENG_7_1_BP:1.33
	RELENG_6_4:1.33.0.30
	RELENG_6_4_BP:1.33
	RELENG_7_0_0_RELEASE:1.33
	RELENG_6_3_0_RELEASE:1.33
	RELENG_7_0:1.33.0.28
	RELENG_7_0_BP:1.33
	RELENG_6_3:1.33.0.26
	RELENG_6_3_BP:1.33
	RELENG_7:1.33.0.24
	RELENG_7_BP:1.33
	RELENG_6_2_0_RELEASE:1.33
	RELENG_6_2:1.33.0.22
	RELENG_6_2_BP:1.33
	RELENG_5_5_0_RELEASE:1.33
	RELENG_5_5:1.33.0.20
	RELENG_5_5_BP:1.33
	RELENG_6_1_0_RELEASE:1.33
	RELENG_6_1:1.33.0.18
	RELENG_6_1_BP:1.33
	RELENG_6_0_0_RELEASE:1.33
	RELENG_6_0:1.33.0.16
	RELENG_6_0_BP:1.33
	RELENG_6:1.33.0.14
	RELENG_6_BP:1.33
	RELENG_5_4_0_RELEASE:1.33
	RELENG_5_4:1.33.0.12
	RELENG_5_4_BP:1.33
	RELENG_4_11_0_RELEASE:1.27.2.4
	RELENG_4_11:1.27.2.4.0.10
	RELENG_4_11_BP:1.27.2.4
	RELENG_5_3_0_RELEASE:1.33
	RELENG_5_3:1.33.0.10
	RELENG_5_3_BP:1.33
	RELENG_5:1.33.0.8
	RELENG_5_BP:1.33
	RELENG_4_10_0_RELEASE:1.27.2.4
	RELENG_4_10:1.27.2.4.0.8
	RELENG_4_10_BP:1.27.2.4
	RELENG_5_2_1_RELEASE:1.33
	RELENG_5_2_0_RELEASE:1.33
	RELENG_5_2:1.33.0.6
	RELENG_5_2_BP:1.33
	RELENG_4_9_0_RELEASE:1.27.2.4
	RELENG_4_9:1.27.2.4.0.6
	RELENG_4_9_BP:1.27.2.4
	RELENG_5_1_0_RELEASE:1.33
	RELENG_5_1:1.33.0.4
	RELENG_5_1_BP:1.33
	RELENG_4_8_0_RELEASE:1.27.2.4
	RELENG_4_8:1.27.2.4.0.4
	RELENG_4_8_BP:1.27.2.4
	RELENG_5_0_0_RELEASE:1.33
	RELENG_5_0:1.33.0.2
	RELENG_5_0_BP:1.33
	RELENG_4_7_0_RELEASE:1.27.2.4
	RELENG_4_7:1.27.2.4.0.2
	RELENG_4_7_BP:1.27.2.4
	RELENG_4_6_2_RELEASE:1.27.2.3
	RELENG_4_6_1_RELEASE:1.27.2.3
	RELENG_4_6_0_RELEASE:1.27.2.3
	RELENG_4_6:1.27.2.3.0.2
	RELENG_4_6_BP:1.27.2.3
	RELENG_4_5_0_RELEASE:1.27.2.2
	RELENG_4_5:1.27.2.2.0.4
	RELENG_4_5_BP:1.27.2.2
	RELENG_4_4_0_RELEASE:1.27.2.2
	RELENG_4_4:1.27.2.2.0.2
	RELENG_4_4_BP:1.27.2.2
	RELENG_4_3_0_RELEASE:1.27.2.1
	RELENG_4_3:1.27.2.1.0.2
	RELENG_4_3_BP:1.27.2.1
	RELENG_4_2_0_RELEASE:1.27
	RELENG_4_1_1_RELEASE:1.27
	PRE_SMPNG:1.27
	RELENG_4_1_0_RELEASE:1.27
	RELENG_3_5_0_RELEASE:1.24
	RELENG_4_0_0_RELEASE:1.27
	RELENG_4:1.27.0.2
	RELENG_4_BP:1.27
	RELENG_3_4_0_RELEASE:1.24
	RELENG_3_3_0_RELEASE:1.24
	RELENG_3_2_PAO:1.24.0.4
	RELENG_3_2_PAO_BP:1.24
	RELENG_3_2_0_RELEASE:1.24
	RELENG_3_1_0_RELEASE:1.24
	RELENG_3:1.24.0.2
	RELENG_3_BP:1.24
	RELENG_2_2_8_RELEASE:1.20.2.3
	RELENG_3_0_0_RELEASE:1.24
	RELENG_2_2_7_RELEASE:1.20.2.3
	RELENG_2_2_6_RELEASE:1.20.2.3
	RELENG_2_2_5_RELEASE:1.20.2.1
	RELENG_2_2_2_RELEASE:1.20.2.1
	RELENG_2_2_1_RELEASE:1.20.2.1
	RELENG_2_2_0_RELEASE:1.20.2.1
	RELENG_2_1_7_RELEASE:1.11.4.3
	RELENG_2_1_6_1_RELEASE:1.11.4.3
	RELENG_2_1_6_RELEASE:1.11.4.3
	RELENG_2_2:1.20.0.2
	RELENG_2_2_BP:1.20
	RELENG_2_1_5_RELEASE:1.11.4.3
	RELENG_2_1_0_RELEASE:1.11
	RELENG_2_1_0:1.11.0.4
	RELENG_2_1_0_BP:1.11
	RELENG_2_0_5_RELEASE:1.11
	RELENG_2_0_5:1.11.0.2
	RELENG_2_0_5_BP:1.11
	RELENG_2_0_5_ALPHA:1.10
	RELEASE_2_0:1.10
	BETA_2_0:1.10
	ALPHA_2_0:1.10.0.2
	MOVED_NEWCVS:1.10
	FINAL_1_1_5:1.10
	ALPHA_1_1_5:1.10
	FINAL_1_1:1.6.2.1
	GAMMA_1_1:1.6.2.1
	BETA_1_1:1.6.0.2
	BP_BETA_1_1:1.6
	FINAL_1_0:1.6
	EPSILON_1_0:1.6
	GAMMA_1_0:1.6
	BETA_1_0:1.6
	ALPHA_1_0:1.3
	man_1_1:1.1.1.1
	man:1.1.1;
locks; strict;
comment	@# @;


1.34
date	2011.04.21.07.14.10;	author gordon;	state dead;
branches
	1.34.2.1;
next	1.33;

1.33
date	2002.01.15.14.11.05;	author ru;	state Exp;
branches
	1.33.14.1
	1.33.24.1
	1.33.30.1
	1.33.32.1
	1.33.34.1
	1.33.36.1
	1.33.38.1
	1.33.40.1;
next	1.32;

1.32
date	2002.01.11.15.11.59;	author ru;	state Exp;
branches;
next	1.31;

1.31
date	2001.09.12.10.04.41;	author ru;	state Exp;
branches;
next	1.30;

1.30
date	2001.09.06.11.54.28;	author ru;	state Exp;
branches;
next	1.29;

1.29
date	2001.03.27.14.59.02;	author ru;	state Exp;
branches;
next	1.28;

1.28
date	2000.12.22.19.05.13;	author ru;	state Exp;
branches;
next	1.27;

1.27
date	99.08.27.23.36.12;	author peter;	state Exp;
branches
	1.27.2.1;
next	1.26;

1.26
date	99.07.31.20.32.31;	author hoek;	state Exp;
branches;
next	1.25;

1.25
date	99.07.05.02.46.20;	author hoek;	state Exp;
branches;
next	1.24;

1.24
date	98.03.07.09.45.56;	author bde;	state Exp;
branches;
next	1.23;

1.23
date	97.11.30.20.08.14;	author steve;	state Exp;
branches;
next	1.22;

1.22
date	97.04.10.16.13.17;	author bde;	state Exp;
branches;
next	1.21;

1.21
date	96.12.19.10.45.16;	author ache;	state Exp;
branches;
next	1.20;

1.20
date	96.09.05.17.14.11;	author bde;	state Exp;
branches
	1.20.2.1;
next	1.19;

1.19
date	96.07.09.15.37.24;	author ache;	state Exp;
branches;
next	1.18;

1.18
date	96.06.24.04.23.03;	author jkh;	state Exp;
branches;
next	1.17;

1.17
date	96.06.22.21.10.18;	author ache;	state Exp;
branches;
next	1.16;

1.16
date	96.06.21.18.49.35;	author ache;	state Exp;
branches;
next	1.15;

1.15
date	96.05.22.15.53.38;	author pst;	state Exp;
branches;
next	1.14;

1.14
date	96.02.25.20.24.52;	author bde;	state Exp;
branches;
next	1.13;

1.13
date	96.02.06.23.47.44;	author wosch;	state Exp;
branches;
next	1.12;

1.12
date	96.01.24.00.22.27;	author wosch;	state Exp;
branches;
next	1.11;

1.11
date	95.05.30.05.01.58;	author rgrimes;	state Exp;
branches
	1.11.4.1;
next	1.10;

1.10
date	94.03.19.22.25.17;	author jkh;	state Exp;
branches;
next	1.9;

1.9
date	94.03.18.11.55.53;	author jkh;	state Exp;
branches;
next	1.8;

1.8
date	94.03.16.13.05.31;	author jkh;	state Exp;
branches;
next	1.7;

1.7
date	94.03.05.13.48.35;	author jkh;	state Exp;
branches;
next	1.6;

1.6
date	93.07.27.03.28.32;	author alm;	state Exp;
branches
	1.6.2.1;
next	1.5;

1.5
date	93.07.27.02.54.44;	author alm;	state Exp;
branches;
next	1.4;

1.4
date	93.07.21.17.18.01;	author jkh;	state Exp;
branches;
next	1.3;

1.3
date	93.07.16.17.51.03;	author rgrimes;	state Exp;
branches;
next	1.2;

1.2
date	93.07.08.21.57.40;	author jkh;	state Exp;
branches
	1.2.2.1;
next	1.1;

1.1
date	93.07.07.23.06.59;	author jkh;	state Exp;
branches
	1.1.1.1;
next	;

1.34.2.1
date	2011.04.21.07.14.10;	author svnexp;	state dead;
branches;
next	1.34.2.2;

1.34.2.2
date	2013.03.28.13.02.52;	author svnexp;	state Exp;
branches;
next	;

1.33.14.1
date	2012.11.17.07.39.22;	author svnexp;	state Exp;
branches;
next	;

1.33.24.1
date	2012.11.17.08.01.36;	author svnexp;	state Exp;
branches;
next	;

1.33.30.1
date	2008.10.02.02.57.24;	author kensmith;	state Exp;
branches;
next	;

1.33.32.1
date	2008.11.25.02.59.29;	author kensmith;	state Exp;
branches;
next	;

1.33.34.1
date	2009.04.15.03.14.26;	author kensmith;	state Exp;
branches;
next	;

1.33.36.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.33.36.1.2.1
	1.33.36.1.4.1
	1.33.36.1.6.1
	1.33.36.1.8.1;
next	1.33.36.2;

1.33.36.2
date	2012.11.17.10.35.59;	author svnexp;	state Exp;
branches;
next	;

1.33.36.1.2.1
date	2009.10.25.01.10.29;	author kensmith;	state Exp;
branches;
next	;

1.33.36.1.4.1
date	2010.06.14.02.09.06;	author kensmith;	state Exp;
branches;
next	;

1.33.36.1.6.1
date	2010.12.21.17.09.25;	author kensmith;	state Exp;
branches;
next	;

1.33.36.1.8.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.33.36.1.8.2;

1.33.36.1.8.2
date	2012.11.17.08.24.40;	author svnexp;	state Exp;
branches;
next	;

1.33.38.1
date	2010.02.10.00.26.20;	author kensmith;	state Exp;
branches;
next	;

1.33.40.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.33.40.2;

1.33.40.2
date	2012.11.17.08.16.39;	author svnexp;	state Exp;
branches;
next	;

1.27.2.1
date	2001.01.11.11.27.03;	author ru;	state Exp;
branches;
next	1.27.2.2;

1.27.2.2
date	2001.04.25.12.03.53;	author ru;	state Exp;
branches;
next	1.27.2.3;

1.27.2.3
date	2002.02.01.09.00.02;	author ru;	state Exp;
branches;
next	1.27.2.4;

1.27.2.4
date	2002.07.17.13.25.17;	author ru;	state Exp;
branches;
next	1.27.2.5;

1.27.2.5
date	2012.11.17.07.23.07;	author svnexp;	state Exp;
branches;
next	;

1.20.2.1
date	96.12.23.12.30.24;	author joerg;	state Exp;
branches;
next	1.20.2.2;

1.20.2.2
date	97.11.30.20.17.01;	author steve;	state Exp;
branches;
next	1.20.2.3;

1.20.2.3
date	98.02.15.16.05.26;	author jkh;	state Exp;
branches;
next	;

1.11.4.1
date	96.05.22.15.54.52;	author pst;	state Exp;
branches;
next	1.11.4.2;

1.11.4.2
date	96.05.29.22.36.33;	author jkh;	state Exp;
branches;
next	1.11.4.3;

1.11.4.3
date	96.06.05.02.41.14;	author jkh;	state Exp;
branches;
next	;

1.6.2.1
date	94.04.18.03.28.08;	author rgrimes;	state Exp;
branches;
next	;

1.2.2.1
date	93.07.15.07.21.43;	author rgrimes;	state Exp;
branches;
next	;

1.1.1.1
date	93.07.07.23.07.00;	author jkh;	state Exp;
branches;
next	;


desc
@@


1.34
log
@SVN rev 220910 on 2011-04-21 07:14:10Z by gordon

Remove GNU man implemenation now that the BSD version has cooked for a while.
@
text
@# $FreeBSD: src/gnu/usr.bin/man/man/Makefile,v 1.33 2002/01/15 14:11:05 ru Exp $
#

MAN_LIBZ=YES

PROG=	man
SRCS=	man.c manpath.c glob.c

CFLAGS+= -I${LIBDESTDIR}
DPADD=	${LIBMAN}
LDADD=	${LIBMAN}

.if defined(MAN_LIBZ) && !empty(MAN_LIBZ)
DPADD+=	${LIBZ}
LDADD+=	-lz
CFLAGS+=-DHAVE_LIBZ=1
.endif

CFLAGS+= -I${.CURDIR}/../lib -DSTDC_HEADERS -DPOSIX -DHAS_TROFF
CFLAGS+= -DDO_COMPRESS -DCATMODE=0644
CLEANFILES+=	man.1

.PATH:	${.CURDIR}/../manpath

man.1: ${.CURDIR}/man.man
	@@${ECHO} echo Making ${.TARGET:T} from ${.ALLSRC:T}; \
	sed -e 's,%libdir%,${libdir},' -e 's,%bindir%,${bindir},' \
	    -e 's,%pager%,${pager},' -e 's,%troff%,${troff},' \
	    -e 's,%manpath_config_file%,${manpath_config_file},' \
	    -e 's,%compress%,${compress},' \
	${.ALLSRC} > ${.TARGET}

.include <bsd.prog.mk>
@


1.34.2.1
log
@file Makefile was added on branch RELENG_8_4 on 2013-03-28 13:02:52 +0000
@
text
@d1 33
@


1.34.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 33
# $FreeBSD: releng/8.4/gnu/usr.bin/man/man/Makefile 89390 2002-01-15 14:11:05Z ru $
#

MAN_LIBZ=YES

PROG=	man
SRCS=	man.c manpath.c glob.c

CFLAGS+= -I${LIBDESTDIR}
DPADD=	${LIBMAN}
LDADD=	${LIBMAN}

.if defined(MAN_LIBZ) && !empty(MAN_LIBZ)
DPADD+=	${LIBZ}
LDADD+=	-lz
CFLAGS+=-DHAVE_LIBZ=1
.endif

CFLAGS+= -I${.CURDIR}/../lib -DSTDC_HEADERS -DPOSIX -DHAS_TROFF
CFLAGS+= -DDO_COMPRESS -DCATMODE=0644
CLEANFILES+=	man.1

.PATH:	${.CURDIR}/../manpath

man.1: ${.CURDIR}/man.man
	@@${ECHO} echo Making ${.TARGET:T} from ${.ALLSRC:T}; \
	sed -e 's,%libdir%,${libdir},' -e 's,%bindir%,${bindir},' \
	    -e 's,%pager%,${pager},' -e 's,%troff%,${troff},' \
	    -e 's,%manpath_config_file%,${manpath_config_file},' \
	    -e 's,%compress%,${compress},' \
	${.ALLSRC} > ${.TARGET}

.include <bsd.prog.mk>
@


1.33
log
@Do not install man(1) setuid ``man''.

The catpaging and setuidness features of man(1) combined make
it vulnerable to a number of security attacks.  Specifically,
it was possible to overwrite system catpages with arbitrarily
contents by either setting up a symlink to a directory holding
system catpages, or by writing custom -mdoc or -man groff(1)
macro packages and setting up GROFF_TMAC_PATH in environment
to point to them.  (See PR below for details).

This means man(1) can no longer create system catpages on a
regular user's behalf.  (It is still able to if the user has
write permissions to the directory holding catpages, e.g.,
user's own manpages, or if the running user is ``root''.)

To create and install catpages during ``make world'', please
set MANBUILDCAT=YES in /etc/make.conf.  To rebuild catpages
on a weekly basis, please set weekly_catman_enable="YES" in
/etc/periodic.conf.

PR:		bin/32791
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.33.24.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/7/gnu/usr.bin/man/man/Makefile 89390 2002-01-15 14:11:05Z ru $
@


1.33.14.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/6/gnu/usr.bin/man/man/Makefile 89390 2002-01-15 14:11:05Z ru $
@


1.33.40.1
log
@SVN rev 216618 on 2010-12-21 17:10:29Z by kensmith

Copy stable/7 to releng/7.4 in preparation for FreeBSD-7.4 release.

Approved by:	re (implicit)
@
text
@@


1.33.40.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/7.4/gnu/usr.bin/man/man/Makefile 89390 2002-01-15 14:11:05Z ru $
@


1.33.38.1
log
@SVN rev 203736 on 2010-02-10 00:26:20Z by kensmith

Copy stable/7 to releng/7.3 as part of the 7.3-RELEASE process.

Approved by:	re (implicit)
@
text
@@


1.33.36.1
log
@SVN rev 196045 on 2009-08-03 08:13:06Z by kensmith

Copy head to stable/8 as part of 8.0 Release cycle.

Approved by:	re (Implicit)
@
text
@@


1.33.36.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242909
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242909 | dim | 2012-11-12 07:47:19 +0000 (Mon, 12 Nov 2012) | 20 lines
## SVN ##
## SVN ## MFC r242625:
## SVN ##
## SVN ## Remove duplicate const specifiers in many drivers (I hope I got all of
## SVN ## them, please let me know if not).  Most of these are of the form:
## SVN ##
## SVN ## static const struct bzzt_type {
## SVN ##       [...list of members...]
## SVN ## } const bzzt_devs[] = {
## SVN ##       [...list of initializers...]
## SVN ## };
## SVN ##
## SVN ## The second const is unnecessary, as arrays cannot be modified anyway,
## SVN ## and if the elements are const, the whole thing is const automatically
## SVN ## (e.g. it is placed in .rodata).
## SVN ##
## SVN ## I have verified this does not change the binary output of a full kernel
## SVN ## build (except for build timestamps embedded in the object files).
## SVN ##
## SVN ## Reviewed by:	yongari, marius
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/8/gnu/usr.bin/man/man/Makefile 89390 2002-01-15 14:11:05Z ru $
@


1.33.36.1.8.1
log
@SVN rev 232438 on 2012-03-03 06:15:13Z by kensmith

Copy stable/8 to releng/8.3 as part of 8.3-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.33.36.1.8.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/8.3/gnu/usr.bin/man/man/Makefile 89390 2002-01-15 14:11:05Z ru $
@


1.33.36.1.6.1
log
@SVN rev 216617 on 2010-12-21 17:09:25Z by kensmith

Copy stable/8 to releng/8.2 in preparation for FreeBSD-8.2 release.

Approved by:	re (implicit)
@
text
@@


1.33.36.1.4.1
log
@SVN rev 209145 on 2010-06-14 02:09:06Z by kensmith

Copy stable/8 to releng/8.1 in preparation for 8.1-RC1.

Approved by:	re (implicit)
@
text
@@


1.33.36.1.2.1
log
@SVN rev 198460 on 2009-10-25 01:10:29Z by kensmith

Copy stable/8 to releng/8.0 as part of 8.0-RELEASE release procedure.

Approved by:	re (implicit)
@
text
@@


1.33.34.1
log
@SVN rev 191087 on 2009-04-15 03:14:26Z by kensmith

Create releng/7.2 from stable/7 in preparation for 7.2-RELEASE.

Approved by:	re (implicit)
@
text
@@


1.33.32.1
log
@SVN rev 185281 on 2008-11-25 02:59:29Z by kensmith

Create releng/7.1 in preparation for moving into RC phase of 7.1 release
cycle.

Approved by:	re (implicit)
@
text
@@


1.33.30.1
log
@SVN rev 183531 on 2008-10-02 02:57:24Z by kensmith

Create releng/6.4 from stable/6 in preparation for 6.4-RC1.

Approved by:	re (implicit)
@
text
@@


1.32
log
@Now that we have the original BSD man(1)'s ${MACHINE} feature
back (as of man.c,v 1.45), change the meaning of the -m option
from poorly documented and badly coded "alternate system" to a
much more useful "different architecture for the same system".

PR:		docs/31261
@
text
@a7 3
BINOWN= man
BINMODE=4555
INSTALLFLAGS=	-fschg
d20 1
a20 1
CFLAGS+= -DDO_COMPRESS -DSETUID -DCATMODE=0644
@


1.31
log
@Fixed some of style bugs.
@
text
@d1 1
a1 1
# $FreeBSD: src/gnu/usr.bin/man/man/Makefile,v 1.30 2001/09/06 11:54:28 ru Exp $
d23 1
a23 1
CFLAGS+= -DDO_COMPRESS -DALT_SYSTEMS -DSETUID -DCATMODE=0644
@


1.30
log
@SECURITY.

Avoid using setre[ug]id() calls.
Removed the setgid stuff we don't need.
@
text
@d1 1
a1 1
# $FreeBSD: src/gnu/usr.bin/man/man/Makefile,v 1.29 2001/03/27 14:59:02 ru Exp $
d10 1
a10 1
INSTALLFLAGS+= -fschg
@


1.29
log
@MAN[1-9] -> MAN.
@
text
@d1 1
a1 1
# $FreeBSD: src/gnu/usr.bin/man/man/Makefile,v 1.28 2000/12/22 19:05:13 ru Exp $
d23 1
a23 1
CFLAGS+= -DDO_COMPRESS -DALT_SYSTEMS -DSETREUID -DCATMODE=0644
@


1.28
log
@Teach man(1) how to look inside compressed manuals
for preprocessor directives.  Avoid use of cat(1).

PR:		bin/23585
@
text
@d1 1
a1 1
# $FreeBSD: src/gnu/usr.bin/man/man/Makefile,v 1.27 1999/08/27 23:36:12 peter Exp $
d24 1
a24 1
CLEANFILES+=	${MAN1}
d28 1
a28 3
.include <bsd.prog.mk>

${MAN1}: ${.CURDIR}/man.man
d34 3
a36 1
	${.CURDIR}/man.man > ${MAN1}
@


1.27
log
@$Id$ -> $FreeBSD$
@
text
@d1 1
a1 1
# $FreeBSD$
d4 2
a7 1
MAN1=   man.1
d16 6
a24 1
MANDEPEND+=	${MAN1}
d28 2
a36 2

.include <bsd.prog.mk>
@


1.27.2.1
log
@MFC: Teach man(1) how to look inside compressed manuals
     for preprocessor directives.  Avoid use of cat(1).
@
text
@d1 1
a1 1
# $FreeBSD: src/gnu/usr.bin/man/man/Makefile,v 1.27 1999/08/27 23:36:12 peter Exp $
a3 2
MAN_LIBZ=YES

d6 1
a14 6
.if defined(MAN_LIBZ) && !empty(MAN_LIBZ)
DPADD+=	${LIBZ}
LDADD+=	-lz
CFLAGS+=-DHAVE_LIBZ=1
.endif

d18 1
a21 2
.include <bsd.prog.mk>

d29 2
@


1.27.2.2
log
@MFC: MAN[1-9] -> MAN.
@
text
@d1 1
a1 1
# $FreeBSD: src/gnu/usr.bin/man/man/Makefile,v 1.27.2.1 2001/01/11 11:27:03 ru Exp $
d24 1
a24 1
CLEANFILES+=	man.1
d28 3
a30 1
man.1: ${.CURDIR}/man.man
d36 1
a36 3
	${.ALLSRC} > ${.TARGET}

.include <bsd.prog.mk>
@


1.27.2.3
log
@MFC: -m option now does architecture lookups (same as ${MACHINE}).
@
text
@d1 1
a1 1
# $FreeBSD$
d23 1
a23 1
CFLAGS+= -DDO_COMPRESS -DSETREUID -DCATMODE=0644
@


1.27.2.4
log
@MFC: Fixed style of INSTALLFLAGS assignments.
@
text
@d10 1
a10 1
INSTALLFLAGS=	-fschg
@


1.27.2.5
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/4/gnu/usr.bin/man/man/Makefile 100238 2002-07-17 13:25:20Z ru $
@


1.26
log
@Remove explicit testing of the NOFSCHG variable.  Its functionality (in this
file) is now superceeded by INSTALLFLAGS_EDIT in bsd.{prog,kmod,lib}.mk.
@
text
@d1 1
a1 1
#	$Id: Makefile,v 1.25 1999/07/05 02:46:20 hoek Exp $
@


1.25
log
@Respect the NOFSCHG variable.  Add an $Id$ while I'm here, for whatever
reason Makefiles need $Id$.
@
text
@d1 1
a1 1
#	$Id$
a8 1
.if !defined(NOFSCHG)
a9 1
.endif
@


1.24
log
@Use `foo/bar.a' instead of `-Lfoo -lbar' for linking to static internal
libraries so that `ld -f' in can create correct dependencies for
yet-to-be-built libraries.

Get the default BINDIR correctly (by including ../Makefile.inc recursively.
@
text
@d1 3
d9 1
d11 1
@


1.23
log
@Remove manpath.[ch] here and use the ones in ../manpath instead.
@
text
@a7 5
.if exists(${.OBJDIR}/../lib)
LIBDESTDIR=	${.OBJDIR}/../lib
.else
LIBDESTDIR=	${.CURDIR}/../lib
.endif
d9 2
a10 2
DPADD=	${LIBDESTDIR}/libman.a
LDADD=	-L${LIBDESTDIR} -lman
@


1.22
log
@Fixed bogus existence test related to searching for a nearby obj
directory.  man.1 is always in the current (= object) directory,
so don't search for it.
@
text
@d22 2
@


1.21
log
@Even more buffer overflow fixes
Change CATMODE to 0644, because group man not used
Add immutable sbit to man binary, so if user even got man uid,
he can't replace man binary with fake one

Should go to 2.2

Submitted by: Marc Slemko <marcs@@znep.com> with small editing by me
@
text
@d3 1
a15 6

.if exists(${.OBJDIR})
MAN1=   ${.OBJDIR}/man.1
.else
MAN1=   ${.CURDIR}/man.1
.endif
@


1.20
log
@Fixed DPADD.
@
text
@d5 1
d23 1
a23 1
CFLAGS+= -DDO_COMPRESS -DALT_SYSTEMS -DSETREUID -DCATMODE=0664
@


1.20.2.1
log
@YAMFC (security enhancements)
@
text
@a4 1
INSTALLFLAGS+= -fschg
d22 1
a22 1
CFLAGS+= -DDO_COMPRESS -DALT_SYSTEMS -DSETREUID -DCATMODE=0644
@


1.20.2.2
log
@MFC: Use the manpath.[ch] files from the manpath directory.
@
text
@a26 2
.PATH:	${.CURDIR}/../manpath

@


1.20.2.3
log
@MFC: spelling corrections, deobfuscation.
@
text
@a2 1
MAN1=   man.1
d15 6
@


1.19
log
@Restore my backed out changes (writting cats) because they was
not reviewed by pst in claimed period (1 week) and over 3 weeks passed.
CONSTRUCTIVE complaints welcome!
@
text
@d7 1
a7 2
LDADD=  -L${.OBJDIR}/../lib -lman
CFLAGS+= -I${.OBJDIR}/../lib
d9 1
a9 1
LDADD=  -L${.CURDIR}/../lib/ -lman
d11 3
a20 1
DPADD+=  ${MAN1}
@


1.18
log
@Bring in my changes for removing the pestilent obj links (unless you
really want them) from /usr/src.  This is the final version of the
patches, incorporating the feedback I've received from -current.
@
text
@d3 2
@


1.17
log
@Back out security changes until pst review them
@
text
@d4 3
a6 3
.if exists(${.CURDIR}/../lib/obj)
LDADD=  -L${.CURDIR}/../lib/obj -lman
CFLAGS+= -I${.CURDIR}/../lib/obj
d11 2
a12 2
.if exists(${.CURDIR}/obj)
MAN1=   ${.CURDIR}/obj/man.1
@


1.16
log
@Close security holes and restore suid bit
Restore writting cat's functionality
@
text
@a2 2
BINOWN= man
BINMODE=4555
@


1.15
log
@Remove setuid bit, it's not necessary.
@
text
@d3 2
@


1.14
log
@Use ${ECHO} instead of `echo' so that `make -s' is fairly quiet.
@
text
@a2 2
BINMODE=4555
BINOWN=	man
@


1.13
log
@making <page>.1 from <page>.man
@
text
@d26 1
a26 1
	@@echo Making ${.TARGET:T} from ${.ALLSRC:T}; \
@


1.12
log
@man.1 depend on man.man
@
text
@d26 1
@


1.11
log
@Remove trailing whitespace.
@
text
@d23 1
@


1.11.4.1
log
@Remove seuid bit, it's not necessary.
@
text
@d3 2
@


1.11.4.2
log
@Merge from HEAD, except:

	Clients that used gnumalloc still do, despite the merge.  We're not
	bringing phkmalloc over.

	Thread stuff left out.

	PCCARD support left out.
@
text
@a20 1
MANDEPEND+=	${MAN1}
a22 1
	@@${ECHO} echo Making ${.TARGET:T} from ${.ALLSRC:T}; \
@


1.11.4.3
log
@This 3rd mega-commit should hopefully bring us back to where we were.
I can get it to `make world' succesfully, anyway!
@
text
@d21 1
d24 1
@


1.10
log
@Make man the default owner, don't bother with sgid.
@
text
@d20 1
a20 1
CFLAGS+= -I${.CURDIR}/../lib -DSTDC_HEADERS -DPOSIX -DHAS_TROFF 
@


1.9
log
@Change group id to man
@
text
@d3 2
a4 2
BINMODE=2555
BINGRP=	man
@


1.8
log
@Make man sgid bin, not sgid AND suid.  There is no reason to make man suid
bin since all you need to do is make the cat dirs group owned and writable
by bin - much less dangerous.
@
text
@d4 1
@


1.7
log
@New manpage compression support.  Only one macro controls compression
now, DO_COMPRESS.  This controls whether or not catpages are compressed or
not (on by default, since little else uses the catpages and those few things
that do can always configure in a `zmore' in place of more or something, and
saving space is more important, IMHO).

Uncompression support is now on by default since that's the only way to support
mixed-mode environments.  If you don't like it, just don't compress your man
pages and it won't be used! :-).  Supports gzip.  You can also compress
the man pages themselves (or gzip them) now and it will work.
@
text
@d3 1
a3 1
BINMODE=6555
@


1.6
log
@changed BINMODE= 6555 and CATMODE= 0664
@
text
@d20 1
a20 1
CFLAGS+= -DDO_UNCOMPRESS -DALT_SYSTEMS -DSETREUID -DCATMODE=0664
d27 1
@


1.6.2.1
log
@Make man suid man, this is from the main branch, but I only grabbed this
fix to plug the security hole in the man page system.
@
text
@d3 1
a3 2
BINMODE=4555
BINOWN=	man
@


1.5
log
@Added setreuid() calls so that shell escapes work.
The effective ID's need to be set to the real ID's before invoking
a shell for security reasons.
@
text
@d3 1
a3 1
BINMODE=2555
d20 1
a20 1
CFLAGS+= -DDO_UNCOMPRESS -DALT_SYSTEMS -DSETREUID -DCATMODE=664
@


1.4
log
@Changes to allow man to work with or without obj dirs.
@
text
@d19 2
a20 1
CFLAGS+= -I${.CURDIR}/../lib -DSTDC_HEADERS -DPOSIX -DHAS_TROFF -DDO_UNCOMPRESS -DALT_SYSTEMS
@


1.3
log
@Added BINMODE=2555 so that it can write the man pages into /usr/share/man/catx.
This means the man dirs must be owned by group BIN.  I have set up the
distribution building tools to be that way.
@
text
@a2 1
MAN1=	man.1
d7 1
d12 7
d20 1
d22 1
a22 1
man.1: man.man
d26 1
a26 1
	man.man > man.1
@


1.2
log
@Changed Makefile to use Nate's selective obj/noobj build scheme.
@
text
@d4 1
@


1.2.2.1
log
@Added BINMODE=2555 so that man pages can be nroffed into the cat dirs
as a cache area
@
text
@a3 1
BINMODE=2555
@


1.1
log
@Initial revision
@
text
@d4 6
a9 1
LDADD+=	-L${.CURDIR}/../lib -lman
@


1.1.1.1
log
@Newer new man page reader.
@
text
@@
