head	1.32;
access;
symbols
	RELENG_7_4_0_RELEASE:1.31.12.1
	RELENG_7_4:1.31.0.12
	RELENG_7_4_BP:1.31
	RELENG_7_3_0_RELEASE:1.31.10.1
	RELENG_7_3:1.31.0.10
	RELENG_7_3_BP:1.31
	RELENG_7_2_0_RELEASE:1.31.8.1
	RELENG_7_2:1.31.0.8
	RELENG_7_2_BP:1.31
	RELENG_7_1_0_RELEASE:1.31.6.1
	RELENG_6_4_0_RELEASE:1.29.2.1.4.1
	RELENG_7_1:1.31.0.6
	RELENG_7_1_BP:1.31
	RELENG_6_4:1.29.2.1.0.4
	RELENG_6_4_BP:1.29.2.1
	RELENG_7_0_0_RELEASE:1.31
	RELENG_6_3_0_RELEASE:1.29.2.1
	RELENG_7_0:1.31.0.4
	RELENG_7_0_BP:1.31
	RELENG_6_3:1.29.2.1.0.2
	RELENG_6_3_BP:1.29.2.1
	RELENG_7:1.31.0.2
	RELENG_7_BP:1.31
	RELENG_6_2_0_RELEASE:1.29
	RELENG_6_2:1.29.0.8
	RELENG_6_2_BP:1.29
	RELENG_5_5_0_RELEASE:1.28
	RELENG_5_5:1.28.0.8
	RELENG_5_5_BP:1.28
	RELENG_6_1_0_RELEASE:1.29
	RELENG_6_1:1.29.0.6
	RELENG_6_1_BP:1.29
	RELENG_6_0_0_RELEASE:1.29
	RELENG_6_0:1.29.0.4
	RELENG_6_0_BP:1.29
	RELENG_6:1.29.0.2
	RELENG_6_BP:1.29
	RELENG_5_4_0_RELEASE:1.28
	RELENG_5_4:1.28.0.6
	RELENG_5_4_BP:1.28
	RELENG_4_11_0_RELEASE:1.19.2.3
	RELENG_4_11:1.19.2.3.0.2
	RELENG_4_11_BP:1.19.2.3
	RELENG_5_3_0_RELEASE:1.28
	RELENG_5_3:1.28.0.4
	RELENG_5_3_BP:1.28
	RELENG_5:1.28.0.2
	RELENG_5_BP:1.28
	RELENG_4_10_0_RELEASE:1.19.2.2
	RELENG_4_10:1.19.2.2.0.14
	RELENG_4_10_BP:1.19.2.2
	RELENG_5_2_1_RELEASE:1.27
	RELENG_5_2_0_RELEASE:1.27
	RELENG_5_2:1.27.0.2
	RELENG_5_2_BP:1.27
	RELENG_4_9_0_RELEASE:1.19.2.2
	RELENG_4_9:1.19.2.2.0.12
	RELENG_4_9_BP:1.19.2.2
	RELENG_5_1_0_RELEASE:1.25
	RELENG_5_1:1.25.0.2
	RELENG_5_1_BP:1.25
	RELENG_4_8_0_RELEASE:1.19.2.2
	RELENG_4_8:1.19.2.2.0.10
	RELENG_4_8_BP:1.19.2.2
	RELENG_5_0_0_RELEASE:1.23
	RELENG_5_0:1.23.0.2
	RELENG_5_0_BP:1.23
	RELENG_4_7_0_RELEASE:1.19.2.2
	RELENG_4_7:1.19.2.2.0.8
	RELENG_4_7_BP:1.19.2.2
	RELENG_4_6_2_RELEASE:1.19.2.2
	RELENG_4_6_1_RELEASE:1.19.2.2
	RELENG_4_6_0_RELEASE:1.19.2.2
	RELENG_4_6:1.19.2.2.0.6
	RELENG_4_6_BP:1.19.2.2
	RELENG_4_5_0_RELEASE:1.19.2.2
	RELENG_4_5:1.19.2.2.0.4
	RELENG_4_5_BP:1.19.2.2
	RELENG_4_4_0_RELEASE:1.19.2.2
	RELENG_4_4:1.19.2.2.0.2
	RELENG_4_4_BP:1.19.2.2
	RELENG_4_3_0_RELEASE:1.19
	RELENG_4_3:1.19.0.4
	RELENG_4_3_BP:1.19
	RELENG_4_2_0_RELEASE:1.19
	RELENG_4_1_1_RELEASE:1.19
	PRE_SMPNG:1.19
	RELENG_4_1_0_RELEASE:1.19
	RELENG_3_5_0_RELEASE:1.12.2.2
	RELENG_4_0_0_RELEASE:1.19
	RELENG_4:1.19.0.2
	RELENG_4_BP:1.19
	RELENG_3_4_0_RELEASE:1.12.2.2
	RELENG_3_3_0_RELEASE:1.12.2.2
	RELENG_3_2_PAO:1.12.2.1.0.2
	RELENG_3_2_PAO_BP:1.12.2.1
	RELENG_3_2_0_RELEASE:1.12.2.1
	RELENG_3_1_0_RELEASE:1.12
	RELENG_3:1.12.0.2
	RELENG_3_BP:1.12
	RELENG_2_2_8_RELEASE:1.4.2.2
	RELENG_3_0_0_RELEASE:1.12
	RELENG_2_2_7_RELEASE:1.4.2.2
	RELENG_2_2_6_RELEASE:1.4
	RELENG_2_2_5_RELEASE:1.4
	ppp_2_3_1:1.1.2.2
	ppp_2_3_0:1.1.2.2
	MACKERRAS:1.1.2
	RELENG_2_2_2_RELEASE:1.4
	RELENG_2_2_1_RELEASE:1.4
	RELENG_2_2_0_RELEASE:1.4
	RELENG_2_1_7_RELEASE:1.1.6.1
	RELENG_2_1_6_1_RELEASE:1.1.6.1
	RELENG_2_1_6_RELEASE:1.1.6.1
	RELENG_2_2:1.4.0.2
	RELENG_2_2_BP:1.4
	RELENG_2_1_5_RELEASE:1.1.6.1
	RELENG_2_1_0_RELEASE:1.1
	ppp_2_2:1.1.2.1
	MACKERAS:1.1.2
	RELENG_2_1_0:1.1.0.6
	RELENG_2_1_0_BP:1.1
	RELENG_2_0_5_RELEASE:1.1
	RELENG_2_0_5:1.1.0.4
	RELENG_2_0_5_BP:1.1
	RELENG_2_0_5_ALPHA:1.1
	RELEASE_2_0:1.1
	BETA_2_0:1.1
	ALPHA_2_0:1.1.0.2;
locks; strict;
comment	@# @;


1.32
date	2009.04.05.22.08.18;	author ed;	state dead;
branches;
next	1.31;

1.31
date	2006.11.12.17.36.58;	author ume;	state Exp;
branches
	1.31.2.1
	1.31.6.1
	1.31.8.1
	1.31.10.1
	1.31.12.1;
next	1.30;

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

1.29
date	2004.12.21.10.16.04;	author ru;	state Exp;
branches
	1.29.2.1;
next	1.28;

1.28
date	2004.08.06.07.27.07;	author cperciva;	state Exp;
branches;
next	1.27;

1.27
date	2003.10.29.19.24.03;	author peter;	state Exp;
branches;
next	1.26;

1.26
date	2003.07.24.18.30.25;	author markm;	state Exp;
branches;
next	1.25;

1.25
date	2003.05.19.15.52.01;	author des;	state Exp;
branches;
next	1.24;

1.24
date	2003.04.04.17.49.17;	author obrien;	state Exp;
branches;
next	1.23;

1.23
date	2001.07.24.02.37.48;	author kris;	state Exp;
branches;
next	1.22;

1.22
date	2001.07.20.06.20.14;	author obrien;	state Exp;
branches;
next	1.21;

1.21
date	2001.03.26.14.41.25;	author ru;	state Exp;
branches;
next	1.20;

1.20
date	2001.03.20.18.16.59;	author ru;	state Exp;
branches;
next	1.19;

1.19
date	2000.03.11.22.34.10;	author kris;	state Exp;
branches
	1.19.2.1;
next	1.18;

1.18
date	2000.03.09.06.29.05;	author kris;	state Exp;
branches;
next	1.17;

1.17
date	2000.02.29.11.45.48;	author markm;	state Exp;
branches;
next	1.16;

1.16
date	2000.02.24.21.10.27;	author markm;	state Exp;
branches;
next	1.15;

1.15
date	99.08.28.01.18.59;	author peter;	state Exp;
branches;
next	1.14;

1.14
date	99.07.15.21.47.52;	author abial;	state Exp;
branches;
next	1.13;

1.13
date	99.04.29.17.56.22;	author jdp;	state Exp;
branches;
next	1.12;

1.12
date	98.10.11.19.40.38;	author jdp;	state Exp;
branches
	1.12.2.1;
next	1.11;

1.11
date	98.09.19.22.42.11;	author obrien;	state Exp;
branches;
next	1.10;

1.10
date	97.10.10.11.59.02;	author peter;	state Exp;
branches;
next	1.9;

1.9
date	97.08.22.15.57.37;	author peter;	state Exp;
branches;
next	1.8;

1.8
date	97.08.22.15.50.09;	author peter;	state Exp;
branches;
next	1.7;

1.7
date	97.08.19.17.52.30;	author peter;	state Exp;
branches;
next	1.6;

1.6
date	97.02.22.16.11.30;	author peter;	state Exp;
branches;
next	1.5;

1.5
date	97.01.14.07.15.58;	author jkh;	state Exp;
branches;
next	1.4;

1.4
date	96.09.04.22.43.20;	author bde;	state Exp;
branches
	1.4.2.1;
next	1.3;

1.3
date	96.03.01.19.29.34;	author phk;	state Exp;
branches;
next	1.2;

1.2
date	95.10.31.21.20.42;	author peter;	state Exp;
branches;
next	1.1;

1.1
date	94.09.25.02.31.49;	author wollman;	state Exp;
branches
	1.1.2.1
	1.1.6.1;
next	;

1.31.2.1
date	2012.11.17.08.09.04;	author svnexp;	state Exp;
branches;
next	;

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

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

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

1.31.12.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.31.12.2;

1.31.12.2
date	2012.11.17.08.17.50;	author svnexp;	state Exp;
branches;
next	;

1.29.2.1
date	2006.11.19.07.27.42;	author ume;	state Exp;
branches
	1.29.2.1.4.1;
next	1.29.2.2;

1.29.2.2
date	2012.11.17.07.46.36;	author svnexp;	state Exp;
branches;
next	;

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

1.19.2.1
date	2001.04.25.12.10.34;	author ru;	state Exp;
branches;
next	1.19.2.2;

1.19.2.2
date	2001.08.19.03.32.43;	author kris;	state Exp;
branches;
next	1.19.2.3;

1.19.2.3
date	2004.12.13.13.50.02;	author marius;	state Exp;
branches;
next	1.19.2.4;

1.19.2.4
date	2012.11.17.07.28.36;	author svnexp;	state Exp;
branches;
next	;

1.12.2.1
date	99.05.07.04.29.04;	author jdp;	state Exp;
branches;
next	1.12.2.2;

1.12.2.2
date	99.08.29.15.46.53;	author peter;	state Exp;
branches;
next	;

1.4.2.1
date	98.06.23.21.41.21;	author peter;	state Exp;
branches;
next	1.4.2.2;

1.4.2.2
date	98.06.26.14.45.17;	author dt;	state Exp;
branches;
next	1.4.2.3;

1.4.2.3
date	99.09.05.11.41.03;	author peter;	state Exp;
branches;
next	;

1.1.2.1
date	95.10.31.21.10.49;	author peter;	state Exp;
branches;
next	1.1.2.2;

1.1.2.2
date	97.08.19.14.29.30;	author peter;	state Exp;
branches;
next	;

1.1.6.1
date	96.03.01.19.34.43;	author phk;	state Exp;
branches;
next	1.1.6.2;

1.1.6.2
date	99.09.05.11.44.43;	author peter;	state Exp;
branches;
next	;


desc
@@


1.32
log
@SVN rev 190751 on 2009-04-05 22:08:18Z by ed

Remove if_ppp(4) and if_sl(4).

Not only did these two drivers depend on IFF_NEEDSGIANT, they were
broken 7 months ago during the MPSAFE TTY import. if_ppp(4) has been
replaced by ppp(8). There is no replacement for if_sl(4).

If we see regressions in for example the ports tree, we should just use
__FreeBSD_version 800045 to check whether if_ppp(4) and if_sl(4) are
present. Version 800045 is used to denote the import of MPSAFE TTY.

Discussed with: rwatson, but also rwatson's IFF_NEEDSGIANT emails on the
                lists.
@
text
@# $FreeBSD: src/usr.sbin/pppd/Makefile,v 1.31 2006/11/12 17:36:58 ume Exp $

.include <bsd.own.mk>

# I once used this extensively, but no longer have a modem.  Feel free
# to ask me questions about it, but I disclaim ownership now.  -Peter

PROG=	pppd
MAN=	pppd.8
SRCS=	main.c magic.c fsm.c lcp.c ipcp.c ipxcp.c upap.c chap.c ccp.c \
	demand.c auth.c options.c sys-bsd.c
BINMODE=4550
BINOWN=	root
BINGRP=	dialer

CFLAGS+= -DHAVE_PATHS_H

DPADD=	${LIBCRYPT} ${LIBUTIL} ${LIBMD}
LDADD=	-lcrypt -lutil -lmd

# Support SPX/IPX - not quite ready
#CFLAGS+= -DIPX_CHANGE
#SRCS+=	ipxcp.c

# Callback Control Protocol
CFLAGS+= -DCBCP_SUPPORT
SRCS+=	cbcp.c

# Filter support
CFLAGS+= -DPPP_FILTER
DPADD+=	${LIBPCAP}
LDADD+=	-lpcap

# MS-CHAP support.  Requires the DES library.
.if ${MK_OPENSSL} != "no" && !defined(RELEASE_CRUNCH)
CFLAGS+= -DCHAPMS
SRCS+=	chap_ms.c
LDADD+=	-lcrypto
DPADD+=	${LIBCRYPTO}
.endif

.if ${MK_INET6_SUPPORT} != "no"
CFLAGS+=-DINET6
SRCS+=	eui64.c ipv6cp.c
.endif

.if defined(RELEASE_CRUNCH)
# We must create these objects because crunchgen will link them,
# and we don't want any unused symbols to spoil the final link.
SRCS+= chap_ms.c
chap_ms.o:
	>null_${.PREFIX}.c
	cc -c -o ${.TARGET} null_${.PREFIX}.c
.endif

.include <bsd.prog.mk>
@


1.31
log
@Teach an IPV6CP to pppd(8).
The eui64.[ch] and ipv6cp.[ch] were taken from ppp-2.3.11.
However, our stock pppd(8) doesn't provide option_t nor some
utility functions.  So, I made some hacks to adjust to our
stock pppd(8).
The sys_bsd.c part was taken from NetBSD with some
modifications to adjust to our stock pppd(8).

MFC after:	1 week
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.31.2.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/7/usr.sbin/pppd/Makefile 164222 2006-11-12 17:36:58Z ume $
@


1.31.12.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.31.12.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/7.4/usr.sbin/pppd/Makefile 164222 2006-11-12 17:36:58Z ume $
@


1.31.10.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.31.8.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.31.6.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.30
log
@Reimplementation of world/kernel build options.  For details, see:

http://lists.freebsd.org/pipermail/freebsd-current/2006-March/061725.html

The src.conf(5) manpage is to follow in a few days.

Brought to you by:	imp, jhb, kris, phk, ru (all bugs are mine)
@
text
@d42 5
@


1.29
log
@NOCRYPT -> NO_CRYPT
@
text
@d3 2
d35 1
a35 1
.if !defined(NO_CRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
@


1.29.2.1
log
@MFC: Teach an IPV6CP to pppd(8).
The eui64.[ch] and ipv6cp.[ch] were taken from ppp-2.3.11.
However, our stock pppd(8) doesn't provide option_t nor some
utility functions.  So, I made some hacks to adjust to our
stock pppd(8).
The sys_bsd.c part was taken from NetBSD with some
modifications to adjust to our stock pppd(8).

	usr.sbin/pppd/Makefile:		1.31
	usr.sbin/pppd/eui64.c:		1.2
	usr.sbin/pppd/eui64.h:		1.1
	usr.sbin/pppd/ipv6cp.c:		1.2
	usr.sbin/pppd/ipv6cp.h:		1.2
	usr.sbin/pppd/main.c:		1.22
	usr.sbin/pppd/options.c:	1.25
	usr.sbin/pppd/pathnames.h:	1.11
	usr.sbin/pppd/pppd.8:		1.27
	usr.sbin/pppd/pppd.h:		1.14
	usr.sbin/pppd/sys-bsd.c:	1.21
@
text
@a39 5
.if !defined(NO_INET6)
CFLAGS+=-DINET6
SRCS+=	eui64.c ipv6cp.c
.endif

@


1.29.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/6/usr.sbin/pppd/Makefile 164401 2006-11-19 07:27:42Z ume $
@


1.29.2.1.4.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.28
log
@Join the 21st century: Cryptography is no longer an optional component
of releases.  The -DNOCRYPT build option still exists for anyone who
really wants to build non-cryptographic binaries, but the "crypto"
release distribution is now part of "base", and anyone installing from a
release will get cryptographic binaries.

Approved by:	re (scottl), markm
Discussed on:	freebsd-current, in late April 2004
@
text
@d33 1
a33 1
.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
@


1.27
log
@Disclaim ownership of pppd/chat.  It is vendor code, but has been badly
neglected here.
@
text
@a33 1
DISTRIBUTION=crypto
@


1.26
log
@Don't check for the existance of src/crypto/ for building items that
may contain crypto. The days of ITAR paranoia are over, and the simple
macro tests that remain are sufficient.
@
text
@d3 2
a4 2
# as per handbook policies section
MAINTAINER=	peter@@freebsd.org
@


1.25
log
@Retire the useless NOSECURE knob.

Approved by:	re (scottl)
@
text
@d33 1
a33 1
.if exists(${.CURDIR}/../../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
@


1.24
log
@style.Makefile(5)
@
text
@d33 1
a33 1
.if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
@


1.23
log
@Install this mode 4550 owned by group dialer; there is unsafe code
in the signal handlers which may pose a risk when executable by untrusted
users.

Submitted by:	Przemyslaw Frasunek <venglin@@freebsd.lublin.pl>
MFC After:	3 days
@
text
@d1 1
a1 1
# $FreeBSD: src/usr.sbin/pppd/Makefile,v 1.22 2001/07/20 06:20:14 obrien Exp $
d16 1
a17 1
DPADD=	${LIBCRYPT} ${LIBUTIL} ${LIBMD}
d29 1
a30 1
DPADD+=	${LIBPCAP}
@


1.22
log
@Perform a major cleanup of the usr.sbin Makefiles.
These are not perfectly in agreement with each other style-wise, but they
are orders of orders of magnitude more consistent style-wise than before.
@
text
@d1 1
a1 1
# $FreeBSD: src/usr.sbin/pppd/Makefile,v 1.21 2001/03/26 14:41:25 ru Exp $
d10 3
a12 1
BINMODE= 4555
@


1.21
log
@- Backout botched attempt to introduce MANSECT feature.
- MAN[1-9] -> MAN.
@
text
@d1 1
a1 1
# $FreeBSD: src/usr.sbin/pppd/Makefile,v 1.20 2001/03/20 18:16:59 ru Exp $
d3 2
a4 1
CFLAGS+= -DHAVE_PATHS_H
d7 1
d10 1
a10 2
MAN=	pppd.8
BINMODE=4555
d12 1
a12 2
# as per handbook policies section
MAINTAINER=	peter@@freebsd.org
d18 1
a18 1
#CFLAGS+=-DIPX_CHANGE
d22 1
a22 1
CFLAGS+=-DCBCP_SUPPORT
d26 1
a26 1
CFLAGS+=-DPPP_FILTER
d33 1
a33 1
CFLAGS+=-DCHAPMS
@


1.20
log
@Set the default manual section for usr.sbin/ to 8.
@
text
@d1 1
a1 1
# $FreeBSD: src/usr.sbin/pppd/Makefile,v 1.19 2000/03/11 22:34:10 kris Exp $
d8 1
@


1.19
log
@Remove the last vestiges of libRSAglue now that it's an empty stub.
This should fix the buildworld problems some people were seeing.

Approved by:	jkh
@
text
@d1 1
a1 1
# $FreeBSD: src/usr.sbin/pppd/Makefile,v 1.18 2000/03/09 06:29:05 kris Exp $
a7 1
MAN8=	pppd.8
@


1.19.2.1
log
@MFC: MAN[1-9] -> MAN.
@
text
@d1 1
a1 1
# $FreeBSD: src/usr.sbin/pppd/Makefile,v 1.19 2000/03/11 22:34:10 kris Exp $
d8 1
a8 1
MAN=	pppd.8
@


1.19.2.2
log
@MFC: Install this mode 4550 and root:dialer, instead of 4555.

Approved by:	re
@
text
@d1 1
a1 1
# $FreeBSD: src/usr.sbin/pppd/Makefile,v 1.19.2.1 2001/04/25 12:10:34 ru Exp $
d9 1
a9 3
BINMODE=4550
BINOWN=	root
BINGRP=	dialer
@


1.19.2.3
log
@MFC:
Makefile.inc1 1.361
bin/ed/Makefile 1.22
lib/Makefile 1.157
lib/libcrypt/Makefile 1.31
lib/libfetch/Makefile 1.41
lib/libpam/modules/modules.inc 1.17
libexec/Makefile 1.61
share/examples/etc/make.conf 1.215
share/man/man5/make.conf.5 1.73
usr.bin/Makefile 1.239
usr.bin/fetch/Makefile 1.14
usr.sbin/pkg_install/Makefile 1.14
usr.sbin/pkg_install/add/Makefile 1.17
usr.sbin/pkg_install/info/Makefile 1.17
usr.sbin/pkg_install/version/Makefile 1.12
usr.sbin/ppp/Makefile 1.95, 1.96
usr.sbin/pppd/Makefile 1.25
usr.sbin/sendmail/Makefile 1.40
usr.sbin/tcpdump/tcpdump/Makefile 1.36

Retire the useless NOSECURE knob.

The motivation for this MFC is that MAKE_KERBEROS4 and MAKE_KERBEROS5
are meant to be buildable by various makefiles when NOSECURE is set but
this was broken because Kerberos depends on e.g. des(3) from OpenSSL
which wasn't built when NOSECURE was defined. Fixing the NOSECURE knob
however would have meant to make it do the same as the NOCRYPT knob.
If you had been using the NOSECURE build knob please now use the NOCRYPT
knob instead.

Discussed with:	ru (some months ago)
Reviewed by:	ru (some months ago)
Approved by:	markm (telnet and secure bits, some months ago), kensmith (re)
@
text
@d1 1
a1 1
# $FreeBSD$
d33 1
a33 1
.if exists(${.CURDIR}/../../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
@


1.19.2.4
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/4/usr.sbin/pppd/Makefile 138803 2004-12-13 13:50:02Z marius $
@


1.18
log
@Buildworld fixes for NO_OPENSSH and NO_OPENSSL

Approved by:	jkh
@
text
@d1 1
a1 1
# $FreeBSD: src/usr.sbin/pppd/Makefile,v 1.17 2000/02/29 11:45:48 markm Exp $
a36 4
.if defined(RSAREF) && ${RSAREF} == YES
LDADD+=	-lRSAglue
DPADD+= ${LIBRSAGLUE}
.endif
@


1.17
log
@Update DISTRIBUTION for new crypto world order.
@
text
@d1 1
a1 1
# $FreeBSD: src/usr.sbin/pppd/Makefile,v 1.16 2000/02/24 21:10:27 markm Exp $
d31 1
a31 1
.if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT) && !defined(NOSECURE) && !defined(RELEASE_CRUNCH)
@


1.16
log
@Use libcrypto instead of libdes.
@
text
@d1 1
a1 1
# $FreeBSD: src/usr.sbin/pppd/Makefile,v 1.15 1999/08/28 01:18:59 peter Exp $
d32 1
a32 1
DISTRIBUTION=des
@


1.15
log
@$Id$ -> $FreeBSD$
@
text
@d1 1
a1 1
# $FreeBSD$
d35 6
a40 2
LDADD+=	-ldes
DPADD+=	${LIBDES}
@


1.14
log
@Add a knob to avoid DES code when making crunched binary. This isn't a beauty
incarnated, it just matches other deficiencies related to crunchgen
and friends... and we already have similar code in ppp/Makefile.

RELEASE_CRUNCH should be axed, but for now let's be consistent.

Submitted by:	Patrick Powell <papowell@@astart.com>
@
text
@d1 1
a1 1
#	$Id: Makefile,v 1.13 1999/04/29 17:56:22 jdp Exp $
@


1.13
log
@pppd/Makefile:
  Enable MS-CHAP support.

release/Makefile:
  Build a separate NOCRYPT version of pppd, to keep This Great
  Nation's top-secret cryptographic tools out of the filthy hands
  of those evil furriners.
@
text
@d1 1
a1 1
#	$Id: Makefile,v 1.12 1998/10/11 19:40:38 jdp Exp $
d31 1
a31 1
.if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT) && !defined(NOSECURE)
d37 9
@


1.12
log
@Fix the MS-CHAP support.  The code was passing a bit count to
MD4Update(), but our version in libmd expects a byte count.

This code is not currently compiled or linked into pppd, so I'm
reasonably sure I didn't break anything. :-)  I added the necessary
statements to the Makefile, but left them commented out because we
are in feature freeze.  When the code is enabled, we must be careful
to build it only if the DES library is available.
@
text
@d1 1
a1 1
#	$Id: Makefile,v 1.11 1998/09/19 22:42:11 obrien Exp $
d31 7
a37 4
#CFLAGS+=-DCHAPMS
#SRCS+=	chap_ms.c
#LDADD+=	-ldes
#DPADD+=	${LIBDES}
@


1.12.2.1
log
@MFC: Enable MS-CHAP support.

pppd/Makefile:    1.12  -> 1.13
release/Makefile: 1.479 -> 1.480
@
text
@d1 1
a1 1
#	$Id: Makefile,v 1.13 1999/04/29 17:56:22 jdp Exp $
d31 4
a34 7
.if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT) && !defined(NOSECURE)
DISTRIBUTION=des
CFLAGS+=-DCHAPMS
SRCS+=	chap_ms.c
LDADD+=	-ldes
DPADD+=	${LIBDES}
.endif
@


1.12.2.2
log
@$Id$ -> $FreeBSD$
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.11
log
@Remove useless `BINOWN=root' now that it is the default.
@
text
@d1 1
a1 1
#	$Id: Makefile,v 1.10 1997/10/10 11:59:02 peter Exp $
d29 6
@


1.10
log
@Give PPP_FILTER a whirl.
@
text
@d1 1
a1 1
#	$Id: Makefile,v 1.9 1997/08/22 15:57:37 peter Exp $
a9 1
BINOWN=	root
@


1.9
log
@Oops, that'll teach me to edit the makefile after testing...  Remove
duplicate cbcp.c in SRCS... :->
@
text
@d1 1
a1 1
#	$Id: Makefile,v 1.8 1997/08/22 15:50:09 peter Exp $
d15 3
d26 4
a29 2
LDADD=	-lcrypt -lutil -lmd
DPADD=	${LIBCRYPT} ${LIBUTIL} ${LIBMD}
@


1.8
log
@Turn on client callback support (CBCP), it seems to be complete.
@
text
@d1 1
a1 1
#	$Id$
d7 1
a7 1
	demand.c auth.c options.c cbcp.c sys-bsd.c
@


1.7
log
@*gulp*  First pass at merging in ppp-2.3.0's pppd.  (this has
dial-on-demand, packet filtering, idle timeouts, etc).  The IPX support
is pretty much there but more work needs to be done in sys-bsd.c for
the interface ioctls (Linux has a very different way of configuring IPX
interfaces).

Along the way some things have temporarily been lost due to very messy
conflicts.  I will recover them shortly when I can think clearer.
The main one is the local:remote address override in pap-secrets and
chap-secrets.  Some other home-grown features (dns1,dns2) have been
implemented differently.  Microsoft's chap client auth hacks have been
implemented.  There are bound to be more rough edges...  The changes for
connect-max-retries doesn't fit well with the dial-on-demand code.
@
text
@d7 1
a7 1
	demand.c auth.c options.c sys-bsd.c
d12 4
d18 4
@


1.6
log
@Revert $FreeBSD$ to $Id$
@
text
@d6 2
a7 2
SRCS=	main.c magic.c fsm.c lcp.c ipcp.c upap.c chap.c ccp.c \
	auth.c options.c sys-bsd.c
a8 2
# The next line is for NetBSD-current systems.
MAN=	pppd.cat8
d11 3
@


1.5
log
@Make the long-awaited change from $Id$ to $FreeBSD$

This will make a number of things easier in the future, as well as (finally!)
avoiding the Id-smashing problem which has plagued developers for so long.

Boy, I'm glad we're not using sup anymore.  This update would have been
insane otherwise.
@
text
@d1 1
a1 1
#	$FreeBSD$
@


1.4
log
@Removed bogus unused `-I..' and unnecessary override of BINDIR.  Didn't
clean up.
@
text
@d1 1
a1 1
#	$Id: Makefile,v 1.3 1996/03/01 19:29:34 phk Exp $
@


1.4.2.1
log
@Update pppd from 2.2.0 -> 2.3.5.

NOTE:  There were a lot of hacks done to pppd along the way that were
never submitted back to the pppd folks and many required extensive
reworking to get them to fit into 2.3.x.  If you've made hacks in the
past that are important, please re-check them to make sure they still work.

OK'ed by: jkh
@
text
@d1 1
a1 1
#	$Id: Makefile,v 1.10 1997/10/10 11:59:02 peter Exp $
d6 2
a7 2
SRCS=	main.c magic.c fsm.c lcp.c ipcp.c ipxcp.c upap.c chap.c ccp.c \
	demand.c auth.c options.c sys-bsd.c
d9 4
a12 5
#BINMODE=4555
#BINOWN=	root

# as per handbook policies section
MAINTAINER=	peter@@freebsd.org
a15 13

# Support SPX/IPX - not quite ready
#CFLAGS+=-DIPX_CHANGE
#SRCS+=	ipxcp.c

# Callback Control Protocol
#CFLAGS+=-DCBCP_SUPPORT
#SRCS+=	cbcp.c

# Filter support
#CFLAGS+=-DPPP_FILTER
#LDADD+=	-lpcap
#DPADD+=	${LIBPCAP}
@


1.4.2.2
log
@Make it setuid root again, as it always has been.

PR:		7070
@
text
@d1 1
a1 1
#	$Id: Makefile,v 1.4.2.1 1998/06/23 21:41:21 peter Exp $
d9 2
a10 2
BINMODE=4555
BINOWN=	root
@


1.4.2.3
log
@$Id$ -> $FreeBSD$
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.3
log
@Use libmd.
Add support for negotiating (more like "informing peer") about DNS.
Various cleanup of warnings.
@
text
@d1 1
a1 1
#	$Id: Makefile,v 1.2 1995/10/31 21:20:42 peter Exp $
d3 1
a3 2
BINDIR?= /usr/sbin
CFLAGS+= -I.. -DHAVE_PATHS_H
@


1.2
log
@Bring pppd from ppp-2.2 onto the mainline..
(more work needs to be done here, I'm trying to beat the supscan)
@
text
@d1 1
a1 1
#	$Id: Makefile.bsd,v 1.7 1995/04/27 00:19:50 paulus Exp $
d7 1
a7 1
SRCS=	main.c magic.c fsm.c lcp.c ipcp.c upap.c chap.c md5.c ccp.c \
d15 2
a16 2
LDADD=	-lcrypt -lutil
DPADD=	${LIBCRYPT} ${LIBUTIL}
@


1.1
log
@Most of the ``modified'' files really aren't.  This is my (simple)
port of pppd.
@
text
@d1 4
a4 2
#	From: Id: Makefile.bsd,v 1.4 1994/04/20 00:07:50 paulus Exp
#	$Id$
d7 2
a8 2
SRCS=	main.c magic.c fsm.c lcp.c ipcp.c upap.c chap.c md5.c \
	auth.c options.c lock.c sys-bsd.c
d10 2
@


1.1.6.1
log
@Use libmd.
Add support for negotiating (more like "informing peer") about DNS.
Pull in a lot of cosmetic changes from -current to narrow the gap.
@
text
@d2 1
a2 1
#	$Id: Makefile,v 1.1 1994/09/25 02:31:49 wollman Exp $
d5 1
a5 1
SRCS=	main.c magic.c fsm.c lcp.c ipcp.c upap.c chap.c \
d11 2
a12 2
LDADD=	-lcrypt -lutil -lmd
DPADD=	${LIBCRYPT} ${LIBUTIL} ${LIBMD}
@


1.1.6.2
log
@$Id$ -> $FreeBSD$
@
text
@d2 1
a2 1
# $FreeBSD$
@


1.1.2.1
log
@Import pppd onto the vendor branch from the ppp-2.2 package..
@
text
@d1 2
a2 4
#	$Id: Makefile.bsd,v 1.7 1995/04/27 00:19:50 paulus Exp $

BINDIR?= /usr/sbin
CFLAGS+= -I.. -DHAVE_PATHS_H
d5 3
a7 5
SRCS=	main.c magic.c fsm.c lcp.c ipcp.c upap.c chap.c md5.c ccp.c \
	auth.c options.c sys-bsd.c
MAN8=	pppd.0
# The next line is for NetBSD-current systems.
MAN=	pppd.cat8
@


1.1.2.2
log
@Import pppd-2.3.0 - this should not make much difference until it's merged
onto the mainline, although some new files will appear.
@
text
@d1 1
a1 1
#	$Id: Makefile.bsd,v 1.13 1996/10/08 04:33:33 paulus Exp $
d4 1
a4 4
# -D_BITYPES is for FreeBSD, which doesn't define anything to
# tell us that u_int32_t gets defined if <sys/types.h> is included.
# Remove for older *BSD systems for which this isn't true.
CFLAGS+= -g -I.. -DHAVE_PATHS_H -D_BITYPES
d8 3
a10 1
	demand.c auth.c options.c sys-bsd.c
a11 1
MAN8=	pppd.8
@
