head	1.34;
access;
symbols
	RELENG_8_4:1.34.0.2
	RELENG_9_1_0_RELEASE:1.33.16.1.4.2
	RELENG_9_1:1.33.16.1.0.4
	RELENG_9_1_BP:1.33.16.1
	RELENG_8_3_0_RELEASE:1.33.10.1.8.1
	RELENG_8_3:1.33.10.1.0.8
	RELENG_8_3_BP:1.33.10.1
	RELENG_9_0_0_RELEASE:1.33.16.1.2.1
	RELENG_9_0:1.33.16.1.0.2
	RELENG_9_0_BP:1.33.16.1
	RELENG_9:1.33.0.16
	RELENG_9_BP:1.33
	RELENG_7_4_0_RELEASE:1.33.14.1
	RELENG_8_2_0_RELEASE:1.33.10.1.6.1
	RELENG_7_4:1.33.0.14
	RELENG_7_4_BP:1.33
	RELENG_8_2:1.33.10.1.0.6
	RELENG_8_2_BP:1.33.10.1
	RELENG_8_1_0_RELEASE:1.33.10.1.4.1
	RELENG_8_1:1.33.10.1.0.4
	RELENG_8_1_BP:1.33.10.1
	RELENG_7_3_0_RELEASE:1.33.12.1
	RELENG_7_3:1.33.0.12
	RELENG_7_3_BP:1.33
	RELENG_8_0_0_RELEASE:1.33.10.1.2.1
	RELENG_8_0:1.33.10.1.0.2
	RELENG_8_0_BP:1.33.10.1
	RELENG_8:1.33.0.10
	RELENG_8_BP:1.33
	RELENG_7_2_0_RELEASE:1.33.8.1
	RELENG_7_2:1.33.0.8
	RELENG_7_2_BP:1.33
	RELENG_7_1_0_RELEASE:1.33.6.1
	RELENG_6_4_0_RELEASE:1.30.2.1.10.1
	RELENG_7_1:1.33.0.6
	RELENG_7_1_BP:1.33
	RELENG_6_4:1.30.2.1.0.10
	RELENG_6_4_BP:1.30.2.1
	RELENG_7_0_0_RELEASE:1.33
	RELENG_6_3_0_RELEASE:1.30.2.1
	RELENG_7_0:1.33.0.4
	RELENG_7_0_BP:1.33
	RELENG_6_3:1.30.2.1.0.8
	RELENG_6_3_BP:1.30.2.1
	RELENG_7:1.33.0.2
	RELENG_7_BP:1.33
	RELENG_6_2_0_RELEASE:1.30.2.1
	RELENG_6_2:1.30.2.1.0.6
	RELENG_6_2_BP:1.30.2.1
	RELENG_5_5_0_RELEASE:1.28.2.1
	RELENG_5_5:1.28.2.1.0.4
	RELENG_5_5_BP:1.28.2.1
	RELENG_6_1_0_RELEASE:1.30.2.1
	RELENG_6_1:1.30.2.1.0.4
	RELENG_6_1_BP:1.30.2.1
	RELENG_6_0_0_RELEASE:1.30.2.1
	RELENG_6_0:1.30.2.1.0.2
	RELENG_6_0_BP:1.30.2.1
	RELENG_6:1.30.0.2
	RELENG_6_BP:1.30
	RELENG_5_4_0_RELEASE:1.28.2.1
	RELENG_5_4:1.28.2.1.0.2
	RELENG_5_4_BP:1.28.2.1
	RELENG_4_11_0_RELEASE:1.13.2.7
	RELENG_4_11:1.13.2.7.0.4
	RELENG_4_11_BP:1.13.2.7
	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.13.2.7
	RELENG_4_10:1.13.2.7.0.2
	RELENG_4_10_BP:1.13.2.7
	RELENG_5_2_1_RELEASE:1.23
	RELENG_5_2_0_RELEASE:1.23
	RELENG_5_2:1.23.0.2
	RELENG_5_2_BP:1.23
	RELENG_4_9_0_RELEASE:1.13.2.6
	RELENG_4_9:1.13.2.6.0.2
	RELENG_4_9_BP:1.13.2.6
	RELENG_5_1_0_RELEASE:1.20
	RELENG_5_1:1.20.0.2
	RELENG_5_1_BP:1.20
	RELENG_4_8_0_RELEASE:1.13.2.5
	RELENG_4_8:1.13.2.5.0.4
	RELENG_4_8_BP:1.13.2.5
	RELENG_5_0_0_RELEASE:1.19
	RELENG_5_0:1.19.0.2
	RELENG_5_0_BP:1.19
	RELENG_4_7_0_RELEASE:1.13.2.5
	RELENG_4_7:1.13.2.5.0.2
	RELENG_4_7_BP:1.13.2.5
	RELENG_4_6_2_RELEASE:1.13.2.4
	RELENG_4_6_1_RELEASE:1.13.2.4
	RELENG_4_6_0_RELEASE:1.13.2.4
	RELENG_4_6:1.13.2.4.0.6
	RELENG_4_6_BP:1.13.2.4
	RELENG_4_5_0_RELEASE:1.13.2.4
	RELENG_4_5:1.13.2.4.0.4
	RELENG_4_5_BP:1.13.2.4
	RELENG_4_4_0_RELEASE:1.13.2.4
	RELENG_4_4:1.13.2.4.0.2
	RELENG_4_4_BP:1.13.2.4
	RELENG_4_3_0_RELEASE:1.13.2.3
	RELENG_4_3:1.13.2.3.0.2
	RELENG_4_3_BP:1.13.2.3
	RELENG_4_2_0_RELEASE:1.13.2.3
	RELENG_4_1_1_RELEASE:1.13.2.3
	PRE_SMPNG:1.16
	RELENG_4_1_0_RELEASE:1.13.2.1
	RELENG_3_5_0_RELEASE:1.9.2.3
	RELENG_4_0_0_RELEASE:1.13
	RELENG_4:1.13.0.2
	RELENG_4_BP:1.13
	RELENG_3_4_0_RELEASE:1.9.2.3
	RELENG_3_3_0_RELEASE:1.9.2.3
	RELENG_3_2_PAO:1.9.2.1.0.2
	RELENG_3_2_PAO_BP:1.9.2.1
	RELENG_3_2_0_RELEASE:1.9.2.1
	RELENG_3_1_0_RELEASE:1.9
	RELENG_3:1.9.0.2
	RELENG_3_BP:1.9
	RELENG_2_2_8_RELEASE:1.1.1.1.2.2
	RELENG_3_0_0_RELEASE:1.9
	RELENG_2_2_7_RELEASE:1.1.1.1.2.2
	RELENG_2_2_6_RELEASE:1.1.1.1.2.2
	RELENG_2_2_5_RELEASE:1.1.1.1.2.2
	RELENG_2_2:1.1.1.1.0.2
	alias_2_1:1.1.1.1
	CMOTT:1.1.1;
locks; strict;
comment	@# @;


1.34
date	2012.11.17.01.49.20;	author svnexp;	state Exp;
branches
	1.34.2.1;
next	1.33;

1.33
date	2006.09.27.12.30.27;	author ru;	state Exp;
branches
	1.33.2.1
	1.33.6.1
	1.33.8.1
	1.33.10.1
	1.33.12.1
	1.33.14.1
	1.33.16.1;
next	1.32;

1.32
date	2006.09.26.23.26.49;	author piso;	state Exp;
branches;
next	1.31;

1.31
date	2005.07.22.17.18.59;	author kensmith;	state Exp;
branches;
next	1.30;

1.30
date	2005.05.04.12.49.44;	author glebius;	state Exp;
branches
	1.30.2.1;
next	1.29;

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

1.28
date	2004.07.06.12.15.24;	author des;	state Exp;
branches
	1.28.2.1;
next	1.27;

1.27
date	2004.07.06.08.44.41;	author des;	state Exp;
branches;
next	1.26;

1.26
date	2004.07.05.11.10.57;	author des;	state Exp;
branches;
next	1.25;

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

1.24
date	2004.01.17.10.52.20;	author phk;	state Exp;
branches;
next	1.23;

1.23
date	2003.09.23.07.41.53;	author marcus;	state Exp;
branches;
next	1.22;

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

1.21
date	2003.08.17.08.28.43;	author gordon;	state Exp;
branches;
next	1.20;

1.20
date	2003.04.20.18.38.59;	author obrien;	state Exp;
branches;
next	1.19;

1.19
date	2002.09.28.00.25.28;	author peter;	state Exp;
branches;
next	1.18;

1.18
date	2001.03.27.17.26.46;	author ru;	state Exp;
branches;
next	1.17;

1.17
date	2000.09.15.15.37.16;	author ru;	state Exp;
branches;
next	1.16;

1.16
date	2000.07.26.23.15.46;	author archie;	state Exp;
branches;
next	1.15;

1.15
date	2000.06.20.13.07.49;	author ru;	state Exp;
branches;
next	1.14;

1.14
date	2000.06.20.11.41.48;	author ru;	state Exp;
branches;
next	1.13;

1.13
date	2000.01.14.07.57.13;	author rgrimes;	state Exp;
branches
	1.13.2.1;
next	1.12;

1.12
date	99.08.27.23.58.00;	author peter;	state Exp;
branches;
next	1.11;

1.11
date	99.05.23.13.52.05;	author brian;	state Exp;
branches;
next	1.10;

1.10
date	99.02.27.02.16.01;	author brian;	state Exp;
branches;
next	1.9;

1.9
date	98.08.31.12.14.30;	author brian;	state Exp;
branches
	1.9.2.1;
next	1.8;

1.8
date	98.08.30.23.52.27;	author brian;	state Exp;
branches;
next	1.7;

1.7
date	98.06.24.06.57.58;	author brian;	state Exp;
branches;
next	1.6;

1.6
date	98.05.24.03.03.09;	author amurai;	state Exp;
branches;
next	1.5;

1.5
date	98.01.09.21.13.33;	author eivind;	state Exp;
branches;
next	1.4;

1.4
date	97.09.06.11.11.33;	author brian;	state Exp;
branches;
next	1.3;

1.3
date	97.08.11.22.05.03;	author brian;	state Exp;
branches;
next	1.2;

1.2
date	97.08.03.18.19.48;	author brian;	state Exp;
branches;
next	1.1;

1.1
date	97.05.23.04.41.31;	author brian;	state Exp;
branches
	1.1.1.1;
next	;

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

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

1.33.2.1
date	2012.11.17.08.01.45;	author svnexp;	state Exp;
branches;
next	;

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

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

1.33.10.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.33.10.1.2.1
	1.33.10.1.4.1
	1.33.10.1.6.1
	1.33.10.1.8.1;
next	1.33.10.2;

1.33.10.2
date	2012.11.17.10.36.01;	author svnexp;	state Exp;
branches;
next	;

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

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

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

1.33.10.1.8.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.33.10.1.8.2;

1.33.10.1.8.2
date	2012.11.17.08.24.41;	author svnexp;	state Exp;
branches;
next	;

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

1.33.14.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.33.14.2;

1.33.14.2
date	2012.11.17.08.16.40;	author svnexp;	state Exp;
branches;
next	;

1.33.16.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.33.16.1.2.1
	1.33.16.1.4.1;
next	1.33.16.2;

1.33.16.2
date	2012.11.17.11.36.15;	author svnexp;	state Exp;
branches;
next	;

1.33.16.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.33.16.1.2.2;

1.33.16.1.2.2
date	2012.11.17.08.36.16;	author svnexp;	state Exp;
branches;
next	;

1.33.16.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.33.16.1.4.2;

1.33.16.1.4.2
date	2012.11.17.08.47.06;	author svnexp;	state Exp;
branches;
next	;

1.30.2.1
date	2005.07.22.17.29.02;	author kensmith;	state Exp;
branches
	1.30.2.1.10.1;
next	1.30.2.2;

1.30.2.2
date	2012.11.17.07.39.31;	author svnexp;	state Exp;
branches;
next	;

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

1.28.2.1
date	2005.02.13.07.23.11;	author obrien;	state Exp;
branches;
next	;

1.13.2.1
date	2000.06.27.16.29.31;	author ru;	state Exp;
branches;
next	1.13.2.2;

1.13.2.2
date	2000.08.18.20.00.00;	author jhb;	state Exp;
branches;
next	1.13.2.3;

1.13.2.3
date	2000.09.20.04.40.57;	author jkh;	state Exp;
branches;
next	1.13.2.4;

1.13.2.4
date	2001.04.25.10.04.03;	author ru;	state Exp;
branches;
next	1.13.2.5;

1.13.2.5
date	2002.07.24.03.21.24;	author luigi;	state Exp;
branches;
next	1.13.2.6;

1.13.2.6
date	2003.06.27.08.37.22;	author ru;	state Exp;
branches;
next	1.13.2.7;

1.13.2.7
date	2003.11.01.03.50.02;	author marcus;	state Exp;
branches;
next	1.13.2.8;

1.13.2.8
date	2012.11.17.07.23.19;	author svnexp;	state Exp;
branches;
next	;

1.9.2.1
date	99.03.24.17.12.00;	author brian;	state Exp;
branches;
next	1.9.2.2;

1.9.2.2
date	99.05.23.13.52.33;	author brian;	state Exp;
branches;
next	1.9.2.3;

1.9.2.3
date	99.08.29.14.55.16;	author peter;	state Exp;
branches;
next	;

1.1.1.1
date	97.05.23.04.41.31;	author brian;	state Exp;
branches
	1.1.1.1.2.1;
next	;

1.1.1.1.2.1
date	97.08.14.01.43.36;	author brian;	state Exp;
branches;
next	1.1.1.1.2.2;

1.1.1.1.2.2
date	97.09.06.11.18.59;	author brian;	state Exp;
branches;
next	;


desc
@@


1.34
log
@Switching exporter and resync
@
text
@# $FreeBSD: head/lib/libalias/Makefile 162701 2006-09-27 12:30:27Z ru $

SUBDIR=	libalias modules

.include <bsd.subdir.mk>
@


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


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 5
# $FreeBSD: releng/8.4/lib/libalias/Makefile 162701 2006-09-27 12:30:27Z ru $

SUBDIR=	libalias modules

.include <bsd.subdir.mk>
@


1.33
log
@- Removed a copyright from makefile.
- Added ${.CURDIR} to .include "...".
- Whitespace fixes.

OK'ed by:	piso
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.33.2.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/7/lib/libalias/Makefile 162701 2006-09-27 12:30:27Z ru $
@


1.33.16.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.33.16.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/9/lib/libalias/Makefile 162701 2006-09-27 12:30:27Z ru $
@


1.33.16.1.4.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.33.16.1.4.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/lib/libalias/Makefile 162701 2006-09-27 12:30:27Z ru $
@


1.33.16.1.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.33.16.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/lib/libalias/Makefile 162701 2006-09-27 12:30:27Z ru $
@


1.33.14.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.14.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/7.4/lib/libalias/Makefile 162701 2006-09-27 12:30:27Z ru $
@


1.33.12.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.10.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.10.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/lib/libalias/Makefile 162701 2006-09-27 12:30:27Z ru $
@


1.33.10.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.10.1.8.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/8.3/lib/libalias/Makefile 162701 2006-09-27 12:30:27Z ru $
@


1.33.10.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.10.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.10.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.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.33.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.32
log
@Summer of Code 2005: improve libalias - part 1 of 2

With the first part of my previous Summer of Code work, we get:

-made libalias modular:

 -support for 'particular' protocols (like ftp/irc/etcetc) is no more
  hardcoded inside libalias, but it's available through external
  modules loadable at runtime

 -modules are available both in kernel (/boot/kernel/alias_*.ko) and
  user land (/lib/libalias_*)

 -protocols/applications modularized are: cuseeme, ftp, irc, nbt, pptp,
  skinny and smedia

-added logging support for kernel side

-cleanup

After a buildworld, do a 'mergemaster -i' to install the file libalias.conf
in /etc or manually copy it.

During startup (and after every HUP signal) user land applications running
the new libalias will try to read a file in /etc called libalias.conf:
that file contains the list of modules to load.

User land applications affected by this commit are ppp and natd:
if libalias.conf is present in /etc you won't notice any difference.

The only kernel land bit affected by this commit is ng_nat:
if you are using ng_nat, and it doesn't correctly handle
ftp/irc/etcetc sessions anymore, remember to kldload
the correspondent module (i.e. kldload alias_ftp).

General information and details about the inner working are available
in the libalias man page under the section 'MODULAR ARCHITECTURE
(AND ipfw(4) SUPPORT)'.

NOTA BENE: this commit affects _ONLY_ libalias, ipfw in-kernel nat
support will be part of the next libalias-related commit.

Approved by: glebius
Reviewed by: glebius, ru
@
text
@a0 24
# Copyright 2006 Paolo Pisati <piso@@FreeBSD.org>
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the distribution.
#
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
d3 1
a3 1
SUBDIR=        libalias modules
@


1.31
log
@Bump the shared library version number of all libraries that have not
been bumped since RELENG_5.

Reviewed by:	ru
Approved by:	re (not needed for commit check but in principle...)
@
text
@d1 24
d27 1
a27 1
.PATH:	${.CURDIR}/../../sys/netinet/libalias
d29 1
a29 12
LIB=	alias
SHLIBDIR?= /lib
SHLIB_MAJOR=	5
MAN=	libalias.3
SRCS=	alias.c alias_cuseeme.c alias_db.c alias_ftp.c alias_irc.c \
	alias_nbt.c alias_pptp.c alias_proxy.c alias_skinny.c alias_smedia.c \
	alias_util.c alias_old.c
INCS=	alias.h
WARNS?=	6
NO_WERROR=

.include <bsd.lib.mk>
@


1.30
log
@Build userland libalias using src/sys/netinet/libalias.

Reviewed by:	ru
Repocopy by:	peter
@
text
@d7 1
a7 1
SHLIB_MAJOR=	4
@


1.30.2.1
log
@Insta-MFC of the shared library version bump.  All shared libraries
whose version has not already been bumped since RELENG_5 are being
bumped.

Revisions of files being MFC-ed:

> Path						Revision
> src/gnu/lib/libdialog/Makefile		1.43
> src/gnu/lib/libg2c/Makefile			1.16
> src/gnu/lib/libobjc/Makefile			1.27
> src/gnu/lib/libreadline/Makefile.inc		1.12
> src/gnu/lib/libregex/Makefile			1.32
> src/gnu/lib/libstdc++/Makefile		1.56
> src/kerberos5/lib/Makefile.inc		1.7
> src/lib/Makefile.inc				1.3
> src/lib/libalias/Makefile			1.31
> src/lib/libarchive/Makefile			1.37
> src/lib/libbegemot/Makefile			1.3
> src/lib/libbluetooth/Makefile			1.2
> src/lib/libbsnmp/Makefile.inc			1.6
> src/lib/libbz2/Makefile			1.6
> src/lib/libc_r/Makefile			1.42
> src/lib/libcrypt/Makefile			1.36
> src/lib/libdevstat/Makefile			1.15
> src/lib/libdevstat/devstat.h			1.11
> src/lib/libedit/Makefile			1.29
> src/lib/libexpat/Makefile			1.5
> src/lib/libfetch/Makefile			1.45
> src/lib/libftpio/Makefile			1.14
> src/lib/libgpib/Makefile			1.2
> src/lib/libipsec/Makefile			1.17
> src/lib/libkiconv/Makefile			1.3
> src/lib/libmagic/Makefile			1.7
> src/lib/libmp/Makefile			1.10
> src/lib/libncp/Makefile			1.6
> src/lib/libncurses/Makefile			1.79
> src/lib/libnetgraph/Makefile			1.11
> src/lib/libngatm/Makefile			1.6
> src/lib/libopie/Makefile			1.21
> src/lib/libpam/Makefile.inc			1.17
> src/lib/libpthread/Makefile			1.54
> src/lib/libradius/Makefile			1.12
> src/lib/libsdp/Makefile			1.4
> src/lib/libsmb/Makefile			1.8
> src/lib/libtacplus/Makefile			1.7
> src/lib/libthr/Makefile			1.14
> src/lib/libthread_db/Makefile			1.6
> src/lib/libugidfw/Makefile			1.7
> src/lib/libusbhid/Makefile			1.10
> src/lib/libutil/Makefile			1.57
> src/lib/libvgl/Makefile			1.11
> src/lib/libwrap/Makefile			1.17
> src/lib/libypclnt/Makefile			1.13
> src/lib/msun/Makefile				1.72
> src/secure/lib/libcrypto/Makefile		1.74
> src/secure/lib/libssh/Makefile		1.35
> src/secure/lib/libssl/Makefile		1.22
> src/usr.sbin/bsnmpd/modules/Makefile.inc	1.10

Reviewed by:	ru
Approved by:	re (scottl)
@
text
@d7 1
a7 1
SHLIB_MAJOR=	5
@


1.30.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/6/lib/libalias/Makefile 148300 2005-07-22 17:29:10Z kensmith $
@


1.30.2.1.10.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.29
log
@For variables that are only checked with defined(), don't provide
any fake value.
@
text
@d3 2
@


1.28
log
@Push WARNS back up to 6, but define NO_WERROR; I want the warts out in the
open where people can see them and hopefully fix them.
@
text
@d12 1
a12 1
NO_WERROR=	true
@


1.28.2.1
log
@MFC: For variables that are only checked with defined(), don't provide
     any fake value.
@
text
@d12 1
a12 1
NO_WERROR=
@


1.27
log
@Temporarily lower WARNS to 3 while I figure out the alignment issues on
alpha.
@
text
@d11 2
a12 1
WARNS?=	3
@


1.26
log
@Make libalias WARNS?=6-clean.  This mostly involves renaming variables
named link, foo_link or link_foo to lnk, foo_lnk or lnk_foo, fixing
signed / unsigned comparisons, and shoving unused function arguments
under the carpet.

I was hoping WARNS?=6 might reveal more serious problems, and perhaps
the source of the -O2 breakage, but found no smoking gun.
@
text
@d11 1
a11 1
WARNS?=	6
@


1.25
log
@Raise WARNS level to 2.
@
text
@d11 1
a11 1
WARNS?=	2
@


1.24
log
@Mostly mechanical rework of libalias:

Makes it possible to have multiple packet aliasing instances in a
single process by moving all static and global variables into an
instance structure called "struct libalias".

Redefine a new API based on s/PacketAlias/LibAlias/g

Add new "instance" argument to all functions in the new API.

Implement old API in terms of the new API.
@
text
@d11 1
@


1.23
log
@Add Cisco Skinny Station protocol support to libalias, natd, and ppp.
Skinny is the protocol used by Cisco IP phones to talk to Cisco Call
Managers.  With this code, one can use a Cisco IP phone behind a FreeBSD
NAT gateway.

Currently, having the Call Manager behind the NAT gateway is not supported.
More information on enabling Skinny support in libalias, natd, and ppp
can be found in those applications' manpages.

PR:		55843
Reviewed by:	ru
Approved by:	ru
MFC after:	30 days
@
text
@d9 1
a9 1
	alias_util.c
@


1.22
log
@style.Makefile(5)
@
text
@d8 1
a8 1
	alias_nbt.c alias_pptp.c alias_proxy.c alias_smedia.c \
@


1.21
log
@Stage 3 of dynamic root support. Make all the libraries needed to run
binaries in /bin and /sbin installed in /lib. Only the versioned files
reside in /lib, the .so symlink continues to live /usr/lib so the
toolchain doesn't need to be modified.
@
text
@d4 1
a4 1
SHLIBDIR?=	/lib
@


1.20
log
@style.Makefile(5)
@
text
@d4 1
@


1.19
log
@Zap now-unused SHLIB_MINOR
@
text
@d3 1
a3 1
LIB=		alias
d5 5
a9 6
CFLAGS+=	-Wall -Wmissing-prototypes
SRCS=		alias.c alias_cuseeme.c alias_db.c alias_ftp.c alias_irc.c \
		alias_nbt.c alias_pptp.c alias_proxy.c alias_smedia.c \
		alias_util.c
INCS=		alias.h
MAN=		libalias.3
@


1.18
log
@MAN[1-9] -> MAN.
@
text
@d1 1
a1 1
# $FreeBSD: src/lib/libalias/Makefile,v 1.17 2000/09/15 15:37:16 ru Exp $
a4 1
SHLIB_MINOR=	0
@


1.17
log
@Add -Wmissing-prototypes.
@
text
@d1 1
a1 1
# $FreeBSD: src/lib/libalias/Makefile,v 1.16 2000/07/26 23:15:46 archie Exp $
d11 1
a11 1
MAN3=		libalias.3
@


1.16
log
@Add address translation support for RTSP/RTP used by RealPlayer and
Quicktime streaming media applications.

Add a BUGS section to the man page.

Submitted by:	Erik Salander <erik@@whistle.com>
@
text
@d1 1
a1 1
# $FreeBSD: src/lib/libalias/Makefile,v 1.15 2000/06/20 13:07:49 ru Exp $
d6 1
a6 1
CFLAGS+=	-Wall -I${.CURDIR}
d11 1
a11 1
MAN3=		libalias.3 
@


1.15
log
@- Removed PacketAliasPptp() API function.
- SHLIB_MAJOR++.
@
text
@d1 1
a1 1
# $FreeBSD: src/lib/libalias/Makefile,v 1.14 2000/06/20 11:41:48 ru Exp $
d8 2
a9 1
		alias_nbt.c alias_pptp.c alias_proxy.c alias_util.c
@


1.14
log
@Added true support for PPTP aliasing.  Some nice features include:

- Multiple PPTP clients behind NAT to the same or different servers.

- Single PPTP server behind NAT -- you just need to redirect TCP
  port 1723 to a local machine.  Multiple servers behind NAT is
  possible but would require a simple API change.

- No API changes!

For more information on how this works see comments at the start of
the alias_pptp.c.

PacketAliasPptp() is no longer necessary and will be removed soon.

Submitted by:	Erik Salander <erik@@whistle.com>
Reviewed by:	ru
Rewritten by:	ru
Reviewed by:	Erik Salander <erik@@whistle.com>
@
text
@d1 1
a1 1
# $FreeBSD: src/lib/libalias/Makefile,v 1.13 2000/01/14 07:57:13 rgrimes Exp $
d4 1
a4 1
SHLIB_MAJOR=	3
@


1.13
log
@Replace beforeinstall target with new variables used by .mk system.

Reviewed by:	marcel, and make world
@
text
@d1 1
a1 1
# $FreeBSD: src/lib/libalias/Makefile,v 1.12 1999/08/27 23:58:00 peter Exp $
d8 1
a8 1
		alias_nbt.c alias_proxy.c alias_util.c
@


1.13.2.1
log
@MFC:
- Added support for FTP EPRT (RFC 2428) command.
- Added support for passive mode FTP servers behind NAT.
- Added security checks for FTP aliasing.
- Load Sharing using IP Network Address Translation (RFC 2391).
- Real PPTP support.
@
text
@d1 1
a1 1
# $FreeBSD: src/lib/libalias/Makefile,v 1.13 2000/01/14 07:57:13 rgrimes Exp $
d4 1
a4 1
SHLIB_MAJOR=	4
d8 1
a8 1
		alias_nbt.c alias_pptp.c alias_proxy.c alias_util.c
@


1.13.2.2
log
@MFC:
- Add address translation support for RTSP/RTP used by RealPlayer and
  Quicktime streaming media applications.
- Add a BUGS section to the man page.
@
text
@d1 1
a1 1
# $FreeBSD: src/lib/libalias/Makefile,v 1.13.2.1 2000/06/27 16:29:31 ru Exp $
d8 1
a8 2
		alias_nbt.c alias_pptp.c alias_proxy.c alias_smedia.c \
		alias_util.c
@


1.13.2.3
log
@MFC: use strtok, eliminate warnings.
@
text
@d1 1
a1 1
# $FreeBSD: src/lib/libalias/Makefile,v 1.13.2.2 2000/08/18 20:00:00 jhb Exp $
d6 1
a6 1
CFLAGS+=	-Wall -Wmissing-prototypes
d11 1
a11 1
MAN3=		libalias.3
@


1.13.2.4
log
@MFC: MAN[1-9] -> MAN.
@
text
@d1 1
a1 1
# $FreeBSD: src/lib/libalias/Makefile,v 1.13.2.3 2000/09/20 04:40:57 jkh Exp $
d11 1
a11 1
MAN=		libalias.3
@


1.13.2.5
log
@Bring ipfw2 into the -stable tree. This will give more people a
chance to test it, and hopefully accelerate the transition from the
old to the new ipfw code.

NOTE: THIS COMMIT WILL NOT CHANGE THE FIREWALL YOU USE,
NOR A SINGLE BIT IN YOUR KERNEL AND BINARIES.
YOU WILL KEEP USING YOUR OLD "ipfw" UNLESS YOU:

  + add "options IPFW2" (undocumented) to your kernel config file;

  + compile and install sbin/ipfw and lib/libalias with
        make -DIPFW2

in other words, you must really want it.

On the other hand, i believe you do really want to use this new
code. In addition to being twice as fast in processing individual
rules, you can use more powerful match patterns such as

        ... ip from 1.2.3.0/24{50,6,27,158} to ...
        ... ip from { 1.2.3.4/26 or 5.6.7.8/22 } to ...
        ... ip from any 5-7,9-66,1020-3000,4000-5000 to ...

i.e. match sparse sets of IP addresses in constant time; use "or"
connectives between match patterns; have multiple port ranges; etc.
which I believe will dramatically reduce your ruleset size.

As an additional bonus, "keep-state" rules will now send keepalives
when the rule is about to expire, so you will not have your remote
login sessions die while you are idle.

The syntax is backward compatible with the old ipfw.
A manual page documenting the extensions has yet to be completed.
@
text
@d1 1
a1 1
# $FreeBSD$
a6 3
.if defined(IPFW2)
CFLAGS+=	-DIPFW2
.endif
@


1.13.2.6
log
@MFC: Whitespace and other non-functional changes for diff reduction.
@
text
@d3 1
a3 1
LIB=	alias
d5 2
a6 4
MAN=	libalias.3
SRCS=	alias.c alias_cuseeme.c alias_db.c alias_ftp.c alias_irc.c \
	alias_nbt.c alias_pptp.c alias_proxy.c alias_smedia.c \
	alias_util.c
d8 1
a8 1
CFLAGS+=-DIPFW2
d10 5
a14 1
INCS=	alias.h
@


1.13.2.7
log
@MFC: Add Cisco Skinny Station Protocol translation support to libalias
and supporting applications (ppp and natd).

Approved by:	ru
@
text
@d7 1
a7 1
	alias_nbt.c alias_pptp.c alias_proxy.c alias_skinny.c alias_smedia.c \
@


1.13.2.8
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/4/lib/libalias/Makefile 121841 2003-11-01 03:50:03Z marcus $
@


1.12
log
@$Id$ -> $FreeBSD$
@
text
@d1 1
a1 1
# $FreeBSD$
d9 1
a10 4

beforeinstall:
	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/alias.h \
	    ${DESTDIR}/usr/include
@


1.11
log
@brucify
Mentioned by: sprice@@hiwaay.net
@
text
@d1 1
a1 1
#	$Id: Makefile,v 1.10 1999/02/27 02:16:01 brian Exp $
@


1.10
log
@Version 3.0: January 1, 1999
    - Transparent proxying support added.
    - PPTP redirecting support added based on patches
      contributed by Dru Nelson <dnelson@@redwoodsoft.com>.

Submitted by: Charles Mott <cmott@@srv.net>
@
text
@d1 1
a1 1
#	$Id: Makefile,v 1.9 1998/08/31 12:14:30 brian Exp $
d13 1
a13 1
		${DESTDIR}/usr/include
@


1.9
log
@Remove OpenBSD build support - let the Makefile vary per
OS rather than making it a mess and potentially screwing
up cross builds.
Suggested by: bde

Add Id keyword.
@
text
@d1 1
a1 1
#	$Id$
d4 2
a5 2
SHLIB_MAJOR=	2
SHLIB_MINOR=	5
d8 1
a8 1
		alias_nbt.c alias_old.c alias_util.c
@


1.9.2.1
log
@MFC: Upgrade to libalias version 3
@
text
@d1 1
a1 1
#	$Id: Makefile,v 1.10 1999/02/27 02:16:01 brian Exp $
d4 2
a5 2
SHLIB_MAJOR=	3
SHLIB_MINOR=	0
d8 1
a8 1
		alias_nbt.c alias_proxy.c alias_util.c
@


1.9.2.2
log
@MFC: brucify
@
text
@d1 1
a1 1
#	$Id: Makefile,v 1.9.2.1 1999/03/24 17:12:00 brian Exp $
d13 1
a13 1
	    ${DESTDIR}/usr/include
@


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


1.8
log
@Add OpenBSD build support
@
text
@d1 1
a1 4
LIB=	alias
CFLAGS+=-Wall -I${.CURDIR}
SRCS=	alias.c alias_cuseeme.c alias_db.c alias_ftp.c alias_irc.c \
	alias_nbt.c alias_old.c alias_util.c
d3 1
a3 5
OPSYS!=	uname -s
.if (${OPSYS} == "OpenBSD")
MAN=		libalias.3 
CFLAGS+=	-DNO_FW_PUNCH
.else
d6 3
a13 1
.endif
@


1.7
log
@Add CUSEEME support.  This has *not* been tested, nor
could I find anyone to test it, so please report any
problems to me.
@
text
@a1 2
SHLIB_MAJOR= 2
SHLIB_MINOR= 5
d6 8
a13 1
MAN3=libalias.3 
d18 1
@


1.6
log
@Primary verison of NetBIOS over TCP/IP. Now you can connect Windows
DOMAIN as DOMAIN user through NAT function. See also RFC1002 for
futher detail of SMB structure.

Submitted by:	Atsushi Murai <amurai@@spec.co.jp>
@
text
@d5 2
a6 2
SRCS=	alias.c alias_db.c alias_ftp.c alias_irc.c alias_util.c alias_old.c \
		alias_nbt.c
@


1.5
log
@Teach libalias to work with IPFW firewalls (controlled by a flag).

Obtained from: Yes development tree (+ 10 lines of patches from
	Charles Mott, original libalias author)
@
text
@d5 3
a7 1
SRCS=	alias.c alias_db.c alias_ftp.c alias_irc.c alias_util.c alias_old.c
@


1.4
log
@Upgrade to 2.4 (Fix -PKT_ALIAS_UNREGISTERED_ONLY)
Submitted by:	Charles Mott <cmott@@srv.net>

Add __libalias_version so that ppp can derive the
correct library name for dlopen()
@
text
@d3 1
a3 1
SHLIB_MINOR= 4
@


1.3
log
@Fix file descriptor leak.

Submitted by:	Charles Mott <cmott@@srv.net>
Identified by:	Gordon Burditt
@
text
@d3 1
a3 1
SHLIB_MINOR= 3
@


1.2
log
@Update to version 2.2.  Only the PacketAlias*()
functions should now be used.  The old 2.1 stuff is
there for backwards compatability.
Submitted by:	Charles Mott <cmott@@snake.srv.net>
@
text
@d3 1
a3 1
SHLIB_MINOR= 2
@


1.1
log
@Initial revision
@
text
@d3 1
a3 1
SHLIB_MINOR= 1
d5 2
a6 1
SRCS=	alias.c alias_db.c alias_ftp.c alias_irc.c alias_util.c
@


1.1.1.1
log
@Create the alias library.  This is currently only used by
ppp (or will be shortly).  Natd can now be updated to use
this library rather than carrying its own version of the code.

Submitted by:	Charles Mott <cmott@@srv.net>
@
text
@@


1.1.1.1.2.1
log
@YAMFC: o Update to version 2.2.  Only the PacketAlias*()
         functions should now be used.  The old 2.1 stuff is
         there for backwards compatability.
         Submitted by:	Charles Mott <cmott@@snake.srv.net>
       o Fix file descriptor leak (going to version 2.3).
         Submitted by:	Charles Mott <cmott@@srv.net>
         Identified by:	Gordon Burditt
@
text
@d3 1
a3 1
SHLIB_MINOR= 3
d5 1
a5 2
SRCS=	alias.c alias_db.c alias_ftp.c alias_irc.c alias_util.c alias_old.c
MAN3=libalias.3 
@


1.1.1.1.2.2
log
@MFC: Upgrade to 2.4 (Fix -PKT_ALIAS_UNREGISTERED_ONLY)
     Submitted by:	Charles Mott <cmott@@srv.net>

     Add __libalias_version so that ppp can derive the
     correct library name for dlopen()
@
text
@d3 1
a3 1
SHLIB_MINOR= 4
@
