head	1.3;
access;
symbols
	netbsd-11-0-RC4:1.3
	netbsd-11-0-RC3:1.3
	netbsd-11-0-RC2:1.3
	netbsd-11-0-RC1:1.3
	perseant-exfatfs-base-20250801:1.3
	netbsd-11:1.3.0.10
	netbsd-11-base:1.3
	netbsd-10-1-RELEASE:1.3
	perseant-exfatfs-base-20240630:1.3
	perseant-exfatfs:1.3.0.8
	perseant-exfatfs-base:1.3
	netbsd-8-3-RELEASE:1.2
	netbsd-9-4-RELEASE:1.2
	netbsd-10-0-RELEASE:1.3
	netbsd-10-0-RC6:1.3
	netbsd-10-0-RC5:1.3
	netbsd-10-0-RC4:1.3
	netbsd-10-0-RC3:1.3
	netbsd-10-0-RC2:1.3
	netbsd-10-0-RC1:1.3
	netbsd-10:1.3.0.6
	netbsd-10-base:1.3
	netbsd-9-3-RELEASE:1.2
	cjep_sun2x-base1:1.3
	cjep_sun2x:1.3.0.4
	cjep_sun2x-base:1.3
	cjep_staticlib_x-base1:1.3
	netbsd-9-2-RELEASE:1.2
	cjep_staticlib_x:1.3.0.2
	cjep_staticlib_x-base:1.3
	netbsd-9-1-RELEASE:1.2
	phil-wifi-20200421:1.2
	phil-wifi-20200411:1.2
	is-mlppp:1.2.0.20
	is-mlppp-base:1.2
	phil-wifi-20200406:1.2
	netbsd-8-2-RELEASE:1.2
	netbsd-9-0-RELEASE:1.2
	netbsd-9-0-RC2:1.2
	netbsd-9-0-RC1:1.2
	phil-wifi-20191119:1.2
	netbsd-9:1.2.0.18
	netbsd-9-base:1.2
	phil-wifi-20190609:1.2
	netbsd-8-1-RELEASE:1.2
	netbsd-8-1-RC1:1.2
	pgoyette-compat-merge-20190127:1.2
	pgoyette-compat-20190127:1.2
	pgoyette-compat-20190118:1.2
	pgoyette-compat-1226:1.2
	pgoyette-compat-1126:1.2
	pgoyette-compat-1020:1.2
	pgoyette-compat-0930:1.2
	pgoyette-compat-0906:1.2
	netbsd-7-2-RELEASE:1.1.6.1
	pgoyette-compat-0728:1.2
	netbsd-8-0-RELEASE:1.2
	phil-wifi:1.2.0.16
	phil-wifi-base:1.2
	pgoyette-compat-0625:1.2
	netbsd-8-0-RC2:1.2
	pgoyette-compat-0521:1.2
	pgoyette-compat-0502:1.2
	pgoyette-compat-0422:1.2
	netbsd-8-0-RC1:1.2
	pgoyette-compat-0415:1.2
	pgoyette-compat-0407:1.2
	pgoyette-compat-0330:1.2
	pgoyette-compat-0322:1.2
	pgoyette-compat-0315:1.2
	netbsd-7-1-2-RELEASE:1.1.6.1
	pgoyette-compat:1.2.0.14
	pgoyette-compat-base:1.2
	netbsd-7-1-1-RELEASE:1.1.6.1
	matt-nb8-mediatek:1.2.0.12
	matt-nb8-mediatek-base:1.2
	perseant-stdc-iso10646:1.2.0.10
	perseant-stdc-iso10646-base:1.2
	netbsd-8:1.2.0.8
	netbsd-8-base:1.2
	prg-localcount2-base3:1.2
	prg-localcount2-base2:1.2
	prg-localcount2-base1:1.2
	prg-localcount2:1.2.0.6
	prg-localcount2-base:1.2
	pgoyette-localcount-20170426:1.2
	bouyer-socketcan-base1:1.2
	pgoyette-localcount-20170320:1.2
	netbsd-7-1:1.1.6.1.0.6
	netbsd-7-1-RELEASE:1.1.6.1
	netbsd-7-1-RC2:1.1.6.1
	netbsd-7-nhusb-base-20170116:1.1.6.1
	bouyer-socketcan:1.2.0.4
	bouyer-socketcan-base:1.2
	pgoyette-localcount-20170107:1.2
	netbsd-7-1-RC1:1.1.6.1
	pgoyette-localcount-20161104:1.2
	netbsd-7-0-2-RELEASE:1.1.6.1
	localcount-20160914:1.2
	netbsd-7-nhusb:1.1.6.1.0.4
	netbsd-7-nhusb-base:1.1.6.1
	pgoyette-localcount-20160806:1.2
	pgoyette-localcount-20160726:1.2
	pgoyette-localcount:1.2.0.2
	pgoyette-localcount-base:1.2
	netbsd-7-0-1-RELEASE:1.1.6.1
	netbsd-7-0:1.1.6.1.0.2
	netbsd-7-0-RELEASE:1.1.6.1
	netbsd-7-0-RC3:1.1.6.1
	netbsd-7-0-RC2:1.1.6.1
	netbsd-7-0-RC1:1.1.6.1
	tls-maxphys-base:1.1
	tls-maxphys:1.1.0.8
	netbsd-7:1.1.0.6
	netbsd-7-base:1.1
	yamt-pagecache:1.1.0.4
	yamt-pagecache-base9:1.1
	tls-earlyentropy:1.1.0.2
	tls-earlyentropy-base:1.1
	riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.1
	riastradh-drm2-base3:1.1;
locks; strict;
comment	@# @;


1.3
date	2021.01.09.16.41.09;	author christos;	state Exp;
branches;
next	1.2;
commitid	O9HM9CXDeUjLv4DC;

1.2
date	2014.10.25.19.06.33;	author christos;	state Exp;
branches;
next	1.1;
commitid	5QrOmjF6iK3tdCVx;

1.1
date	2013.11.28.22.33.42;	author christos;	state Exp;
branches
	1.1.4.1
	1.1.6.1
	1.1.8.1;
next	;
commitid	lWgZRmdu2KoZZ5fx;

1.1.4.1
date	2013.11.28.22.33.42;	author yamt;	state dead;
branches;
next	1.1.4.2;
commitid	K94L62dsYauo9yBx;

1.1.4.2
date	2014.05.22.15.51.08;	author yamt;	state Exp;
branches;
next	;
commitid	K94L62dsYauo9yBx;

1.1.6.1
date	2014.12.17.19.25.39;	author martin;	state Exp;
branches;
next	;
commitid	XGSG7sfiwOwZBq2y;

1.1.8.1
date	2013.11.28.22.33.42;	author tls;	state dead;
branches;
next	1.1.8.2;
commitid	jTnpym9Qu0o4R1Nx;

1.1.8.2
date	2014.08.19.23.52.11;	author tls;	state Exp;
branches;
next	;
commitid	jTnpym9Qu0o4R1Nx;


desc
@@


1.3
log
@remove more
@
text
@#!/bin/sh
#
# NetBSD: ppp2netbsd,v 1.4 2008/04/30 13:10:47 martin Exp 
#
#  Copyright (c) 2005 The NetBSD Foundation.
#  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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
#

# Execute this at the top of the ppp distribution
# then import it.
#
# cvs import src/external/bsd/ppp/dist MACKERRAS PPP2_4_X

# Stuff we don't need
UNUSED_DIRS="common contrib etc.ppp include linux modules solaris scripts"
UNUSED_DIRS="${UNUSED_DIRS} .git" 
UNUSED_FILES="Changes-2.3 README.linux README.pppoe README.sol2 configure"
UNUSED_FILES="${UNUSED_FILES} pppd/md[45].* pppd/sha1.* pppd/srp-entry.*"
UNUSED_FILES="${UNUSED_FILES} pppd/sys-linux.c pppd/sys-solaris.c"
UNUSED_FILES="${UNUSED_FILES} pppdump/zlib.* pppdump/ppp-comp.h"

# Stuff we don't want
GPL_DIRS="pppd/plugins/pppoatm pppd/plugins/radius pppd/plugins/rp-pppoe"
GPL_FILES="pppd/tdb.* pppd/spinlock.* pppd/plugins/passprompt.c
    pppd/plugins/winbind.c"

if [ -z "$1" ]
then
	echo "Usage: $0 <dir>" 1>&2
	exit 1
fi
cd $1
echo -n "Removing unwanted stuf... "
for obj in ${UNUSED_DIRS} ${GPL_DIRS} ${UNUSED_FILES} ${GPL_FILES}; do
	rm -Rf ${obj}
	echo -n "${obj} "
done
echo; echo

# Remove Makefiles
echo -n "Removing Makefiles... "
find . -type f -name 'Makefile*' | while read m; do
	rm -f ${m}
	echo -n "${m} "
done
echo; echo

echo -n "Removing .gitignore... "
find . -type f -name '.gitignore' | while read m; do
	rm -f ${m}
	echo -n "${m} "
done
echo -n "Removing .github... "
find . -type f -name '.github' | while read m; do
	rm -fr ${m}
	echo -n "${m} "
done
echo; echo
cleantags .
@


1.2
log
@merge conflicts
@
text
@d74 5
@


1.1
log
@Merge local changes, add build glue.
@
text
@d41 1
a41 2
UNUSED_FILES="${UNUSED_FILES} pppdump/zlib.* pppdump/ppp-comp.h .gitignore"
UNUSED_FILES="${UNUSED_FILES} pppdump/.gitignore pppdump/bsd-comp.c"
d69 6
@


1.1.6.1
log
@Pullup the import of pppd 2.4.7, requested by christos in #331:

* Fixed a potential security issue in parsing option files
  (CVE-2014-3158).
* There is a new "stop-bits" option, which takes an argument of
  1 or 2, indicating the number of stop bits to use for async
  serial ports.
* Various bug fixes.
@
text
@d41 2
a42 1
UNUSED_FILES="${UNUSED_FILES} pppdump/zlib.* pppdump/ppp-comp.h"
a69 6
echo -n "Removing .gitignore... "
find . -type f -name '.gitignore' | while read m; do
	rm -f ${m}
	echo -n "${m} "
done
echo; echo
@


1.1.8.1
log
@file ppp2netbsd was added on branch tls-maxphys on 2014-08-19 23:52:11 +0000
@
text
@d1 70
@


1.1.8.2
log
@Rebase to HEAD as of a few days ago.
@
text
@a0 70
#!/bin/sh
#
# NetBSD: ppp2netbsd,v 1.4 2008/04/30 13:10:47 martin Exp 
#
#  Copyright (c) 2005 The NetBSD Foundation.
#  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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
#

# Execute this at the top of the ppp distribution
# then import it.
#
# cvs import src/external/bsd/ppp/dist MACKERRAS PPP2_4_X

# Stuff we don't need
UNUSED_DIRS="common contrib etc.ppp include linux modules solaris scripts"
UNUSED_DIRS="${UNUSED_DIRS} .git" 
UNUSED_FILES="Changes-2.3 README.linux README.pppoe README.sol2 configure"
UNUSED_FILES="${UNUSED_FILES} pppd/md[45].* pppd/sha1.* pppd/srp-entry.*"
UNUSED_FILES="${UNUSED_FILES} pppd/sys-linux.c pppd/sys-solaris.c"
UNUSED_FILES="${UNUSED_FILES} pppdump/zlib.* pppdump/ppp-comp.h .gitignore"
UNUSED_FILES="${UNUSED_FILES} pppdump/.gitignore pppdump/bsd-comp.c"

# Stuff we don't want
GPL_DIRS="pppd/plugins/pppoatm pppd/plugins/radius pppd/plugins/rp-pppoe"
GPL_FILES="pppd/tdb.* pppd/spinlock.* pppd/plugins/passprompt.c
    pppd/plugins/winbind.c"

if [ -z "$1" ]
then
	echo "Usage: $0 <dir>" 1>&2
	exit 1
fi
cd $1
echo -n "Removing unwanted stuf... "
for obj in ${UNUSED_DIRS} ${GPL_DIRS} ${UNUSED_FILES} ${GPL_FILES}; do
	rm -Rf ${obj}
	echo -n "${obj} "
done
echo; echo

# Remove Makefiles
echo -n "Removing Makefiles... "
find . -type f -name 'Makefile*' | while read m; do
	rm -f ${m}
	echo -n "${m} "
done
echo; echo

cleantags .
@


1.1.4.1
log
@file ppp2netbsd was added on branch yamt-pagecache on 2014-05-22 15:51:08 +0000
@
text
@d1 70
@


1.1.4.2
log
@sync with head.

for a reference, the tree before this commit was tagged
as yamt-pagecache-tag8.

this commit was splitted into small chunks to avoid
a limitation of cvs.  ("Protocol error: too many arguments")
@
text
@a0 70
#!/bin/sh
#
# NetBSD: ppp2netbsd,v 1.4 2008/04/30 13:10:47 martin Exp 
#
#  Copyright (c) 2005 The NetBSD Foundation.
#  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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
#

# Execute this at the top of the ppp distribution
# then import it.
#
# cvs import src/external/bsd/ppp/dist MACKERRAS PPP2_4_X

# Stuff we don't need
UNUSED_DIRS="common contrib etc.ppp include linux modules solaris scripts"
UNUSED_DIRS="${UNUSED_DIRS} .git" 
UNUSED_FILES="Changes-2.3 README.linux README.pppoe README.sol2 configure"
UNUSED_FILES="${UNUSED_FILES} pppd/md[45].* pppd/sha1.* pppd/srp-entry.*"
UNUSED_FILES="${UNUSED_FILES} pppd/sys-linux.c pppd/sys-solaris.c"
UNUSED_FILES="${UNUSED_FILES} pppdump/zlib.* pppdump/ppp-comp.h .gitignore"
UNUSED_FILES="${UNUSED_FILES} pppdump/.gitignore pppdump/bsd-comp.c"

# Stuff we don't want
GPL_DIRS="pppd/plugins/pppoatm pppd/plugins/radius pppd/plugins/rp-pppoe"
GPL_FILES="pppd/tdb.* pppd/spinlock.* pppd/plugins/passprompt.c
    pppd/plugins/winbind.c"

if [ -z "$1" ]
then
	echo "Usage: $0 <dir>" 1>&2
	exit 1
fi
cd $1
echo -n "Removing unwanted stuf... "
for obj in ${UNUSED_DIRS} ${GPL_DIRS} ${UNUSED_FILES} ${GPL_FILES}; do
	rm -Rf ${obj}
	echo -n "${obj} "
done
echo; echo

# Remove Makefiles
echo -n "Removing Makefiles... "
find . -type f -name 'Makefile*' | while read m; do
	rm -f ${m}
	echo -n "${m} "
done
echo; echo

cleantags .
@


