head	1.4;
access;
symbols
	netbsd-11-0-RC5:1.4
	netbsd-11-0-RC4:1.4
	netbsd-11-0-RC3:1.4
	netbsd-11-0-RC2:1.4
	netbsd-11-0-RC1:1.4
	perseant-exfatfs-base-20250801:1.4
	netbsd-11:1.4.0.2
	netbsd-11-base:1.4
	netbsd-10-1-RELEASE:1.2
	perseant-exfatfs-base-20240630:1.2
	perseant-exfatfs:1.2.0.28
	perseant-exfatfs-base:1.2
	netbsd-8-3-RELEASE:1.2
	netbsd-9-4-RELEASE:1.2
	netbsd-10-0-RELEASE:1.2
	netbsd-10-0-RC6:1.2
	netbsd-10-0-RC5:1.2
	netbsd-10-0-RC4:1.2
	netbsd-10-0-RC3:1.2
	netbsd-10-0-RC2:1.2
	netbsd-10-0-RC1:1.2
	netbsd-10:1.2.0.26
	netbsd-10-base:1.2
	netbsd-9-3-RELEASE:1.2
	cjep_sun2x-base1:1.2
	cjep_sun2x:1.2.0.24
	cjep_sun2x-base:1.2
	cjep_staticlib_x-base1:1.2
	netbsd-9-2-RELEASE:1.2
	cjep_staticlib_x:1.2.0.22
	cjep_staticlib_x-base:1.2
	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
	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
	pgoyette-compat:1.2.0.14
	pgoyette-compat-base:1.2
	netbsd-7-1-1-RELEASE:1.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.0.18
	netbsd-7-1-RELEASE:1.1
	netbsd-7-1-RC2:1.1
	netbsd-7-nhusb-base-20170116:1.1
	bouyer-socketcan:1.2.0.4
	bouyer-socketcan-base:1.2
	pgoyette-localcount-20170107:1.2
	netbsd-7-1-RC1:1.1
	pgoyette-localcount-20161104:1.2
	netbsd-7-0-2-RELEASE:1.1
	localcount-20160914:1.2
	netbsd-7-nhusb:1.1.0.16
	netbsd-7-nhusb-base:1.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
	netbsd-7-0:1.1.0.14
	netbsd-7-0-RELEASE:1.1
	netbsd-7-0-RC3:1.1
	netbsd-7-0-RC2:1.1
	netbsd-7-0-RC1:1.1
	netbsd-7:1.1.0.12
	netbsd-7-base:1.1
	yamt-pagecache:1.1.0.10
	yamt-pagecache-base9:1.1
	tls-earlyentropy:1.1.0.8
	tls-earlyentropy-base:1.1
	riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.1
	riastradh-drm2-base3:1.1
	riastradh-drm2-base2:1.1
	riastradh-drm2-base1:1.1
	riastradh-drm2:1.1.0.6
	riastradh-drm2-base:1.1
	tls-maxphys-base:1.1
	tls-maxphys:1.1.0.4
	khorben-n900:1.1.0.2;
locks; strict;
comment	@# @;


1.4
date	2024.09.08.10.01.59;	author rillig;	state Exp;
branches;
next	1.3;
commitid	1cXQwWXoK5ugiZoF;

1.3
date	2024.09.02.15.33.36;	author christos;	state Exp;
branches;
next	1.2;
commitid	E8uUNSAMEffWjfoF;

1.2
date	2014.11.19.19.33.30;	author christos;	state Exp;
branches
	1.2.28.1;
next	1.1;
commitid	To06ZAuiSguVyPYx;

1.1
date	2013.04.06.17.29.53;	author christos;	state Exp;
branches
	1.1.4.1
	1.1.10.1;
next	;

1.2.28.1
date	2025.08.02.05.21.55;	author perseant;	state Exp;
branches;
next	;
commitid	23j6GFaDws3O875G;

1.1.4.1
date	2013.04.06.17.29.53;	author tls;	state dead;
branches;
next	1.1.4.2;
commitid	OnlO1cBgtQRcIHUw;

1.1.4.2
date	2013.06.23.06.28.19;	author tls;	state Exp;
branches;
next	;
commitid	OnlO1cBgtQRcIHUw;

1.1.10.1
date	2013.04.06.17.29.53;	author yamt;	state dead;
branches;
next	1.1.10.2;
commitid	DXuT4XSXzdOq8yBx;

1.1.10.2
date	2014.05.22.15.48.19;	author yamt;	state Exp;
branches;
next	;
commitid	DXuT4XSXzdOq8yBx;


desc
@@


1.4
log
@normalize wording in import helpers
@
text
@#! /bin/sh
#
#	$NetBSD: libpcap2netbsd,v 1.3 2024/09/02 15:33:36 christos Exp $
#
# Copyright (c) 2011 The NetBSD Foundation, Inc.
# 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.
#
# libpcap2netbsd:  convert a libpcap source tree into a
# netbsd libpcap source tree, under src/dist.
#
# Rough instructions for importing new libpcap release:
#
#	$ cd /some/where/temporary
#	$ tar xpfz /new/libpcap/release/tar/file
#	$ sh /usr/src/external/bsd/libpcap/libpcap2netbsd libpcap-x.y.z
#	$ cd libpcap-x.y.z
#	$ cvs -d cvs.netbsd.org:/cvsroot import -m "Import libpcap-x.y.z" src/external/bsd/libpcap/dist TCPDUMP libpcap-x_y_z
#	- check makefiles to see if any extra sources have been added.
#	- run configure to generate config.h and check it against the existing
#         one in include
#	- update distrib/sets if necessary.
#	- compare net/dlt.h and pcap/dlt.h and merge changes in net/dlt.h

if [ $# -ne 1 ]; then echo "libpcap2netbsd src"; exit 1; fi

r=$1
case "$r" in
	/*)
		;;
	*)
		r=`/bin/pwd`/$r
		;;
esac

cd $r

### Remove the $'s around RCS tags
cleantags $r

### Clean up any CVS directories that might be around.
echo "cleaning up CVS residue."
find $r -type d -name "CVS" -print | xargs rm -r
echo done

### Fixing file and directory permissions.
echo "Fixing file/directory permissions."
(
	find $r -type f -print | xargs chmod u+rw,go+r
	find $r -type d -print | xargs chmod u+rwx,go+rx
)
echo done

exit 0
@


1.3
log
@merge conflicts between libpcap-1.10.4 and libpcap-1.10.5
@
text
@d3 1
a3 1
#	$NetBSD: libpcap2netbsd,v 1.2 2014/11/19 19:33:30 christos Exp $
d29 2
a30 2
# libpcap2netbsd:  convert an libpcap source tree into a
# netbsd libpcap source tree, under src/dist,
@


1.2
log
@merge changes
@
text
@d3 1
a3 1
#	$NetBSD: libpcap2netbsd,v 1.1 2013/04/06 17:29:53 christos Exp $
d40 2
d43 1
@


1.2.28.1
log
@Sync with HEAD
@
text
@d3 1
a3 1
#	$NetBSD: libpcap2netbsd,v 1.4 2024/09/08 10:01:59 rillig Exp $
d29 2
a30 2
# libpcap2netbsd:  convert a libpcap source tree into a
# netbsd libpcap source tree, under src/dist.
a39 2
#	- run configure to generate config.h and check it against the existing
#         one in include
a40 1
#	- compare net/dlt.h and pcap/dlt.h and merge changes in net/dlt.h
@


1.1
log
@new libpcap
@
text
@d3 1
a3 1
#	$NetBSD: libpcap2netbsd,v 1.2 2013/04/06 02:20:24 christos Exp $
d37 1
a37 1
#	$ cd libpcap-YYYYMMDD
a57 27
### Add our NetBSD RCS Id
find $r -type f -name '*.[chly]' -print | while read c; do
	sed 1q < $c | grep -q '\$NetBSD' || (
echo "/*	\$NetBSD\$	*/" >/tmp/libpcap3n$$
echo "" >>/tmp/libpcap3n$$
cat $c  >> /tmp/libpcap3n$$
mv /tmp/libpcap3n$$ $c && echo added NetBSD RCS tag to $c
	)
done

find $r -type f -name '*.[0-9]' -print | while read m; do
	sed 1q < $m | grep -q '\$NetBSD' || (
echo ".\\\"	\$NetBSD\$" >/tmp/libpcap2m$$
echo ".\\\"" >>/tmp/libpcap2m$$
cat $m >> /tmp/libpcap2m$$
mv /tmp/libpcap2m$$ $m && echo added NetBSD RCS tag to $m
	)
done

find $r -type f -name '*.texi' -print | while read t; do
        sed "2 s/^/@@c \$NetBSD\$\\
/" < $t > /tmp/libpcap4t$$
	mv /tmp/libpcap4t$$ $t && echo added NetBSD RCS tag to $t
done

echo done

@


1.1.10.1
log
@file libpcap2netbsd was added on branch yamt-pagecache on 2014-05-22 15:48:19 +0000
@
text
@d1 98
@


1.1.10.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 98
#! /bin/sh
#
#	$NetBSD$
#
# Copyright (c) 2011 The NetBSD Foundation, Inc.
# 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.
#
# libpcap2netbsd:  convert an libpcap source tree into a
# netbsd libpcap source tree, under src/dist,
#
# Rough instructions for importing new libpcap release:
#
#	$ cd /some/where/temporary
#	$ tar xpfz /new/libpcap/release/tar/file
#	$ sh /usr/src/external/bsd/libpcap/libpcap2netbsd libpcap-x.y.z
#	$ cd libpcap-YYYYMMDD
#	$ cvs -d cvs.netbsd.org:/cvsroot import -m "Import libpcap-x.y.z" src/external/bsd/libpcap/dist TCPDUMP libpcap-x_y_z
#	- check makefiles to see if any extra sources have been added.
#	- update distrib/sets if necessary.

if [ $# -ne 1 ]; then echo "libpcap2netbsd src"; exit 1; fi

r=$1
case "$r" in
	/*)
		;;
	*)
		r=`/bin/pwd`/$r
		;;
esac

cd $r

### Remove the $'s around RCS tags
cleantags $r

### Add our NetBSD RCS Id
find $r -type f -name '*.[chly]' -print | while read c; do
	sed 1q < $c | grep -q '\$NetBSD' || (
echo "/*	\$NetBSD\$	*/" >/tmp/libpcap3n$$
echo "" >>/tmp/libpcap3n$$
cat $c  >> /tmp/libpcap3n$$
mv /tmp/libpcap3n$$ $c && echo added NetBSD RCS tag to $c
	)
done

find $r -type f -name '*.[0-9]' -print | while read m; do
	sed 1q < $m | grep -q '\$NetBSD' || (
echo ".\\\"	\$NetBSD\$" >/tmp/libpcap2m$$
echo ".\\\"" >>/tmp/libpcap2m$$
cat $m >> /tmp/libpcap2m$$
mv /tmp/libpcap2m$$ $m && echo added NetBSD RCS tag to $m
	)
done

find $r -type f -name '*.texi' -print | while read t; do
        sed "2 s/^/@@c \$NetBSD\$\\
/" < $t > /tmp/libpcap4t$$
	mv /tmp/libpcap4t$$ $t && echo added NetBSD RCS tag to $t
done

echo done

### Clean up any CVS directories that might be around.
echo "cleaning up CVS residue."
find $r -type d -name "CVS" -print | xargs rm -r
echo done

### Fixing file and directory permissions.
echo "Fixing file/directory permissions."
(
	find $r -type f -print | xargs chmod u+rw,go+r
	find $r -type d -print | xargs chmod u+rwx,go+rx
)
echo done

exit 0
@


1.1.4.1
log
@file libpcap2netbsd was added on branch tls-maxphys on 2013-06-23 06:28:19 +0000
@
text
@d1 98
@


1.1.4.2
log
@resync from head
@
text
@a0 98
#! /bin/sh
#
#	$NetBSD$
#
# Copyright (c) 2011 The NetBSD Foundation, Inc.
# 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.
#
# libpcap2netbsd:  convert an libpcap source tree into a
# netbsd libpcap source tree, under src/dist,
#
# Rough instructions for importing new libpcap release:
#
#	$ cd /some/where/temporary
#	$ tar xpfz /new/libpcap/release/tar/file
#	$ sh /usr/src/external/bsd/libpcap/libpcap2netbsd libpcap-x.y.z
#	$ cd libpcap-YYYYMMDD
#	$ cvs -d cvs.netbsd.org:/cvsroot import -m "Import libpcap-x.y.z" src/external/bsd/libpcap/dist TCPDUMP libpcap-x_y_z
#	- check makefiles to see if any extra sources have been added.
#	- update distrib/sets if necessary.

if [ $# -ne 1 ]; then echo "libpcap2netbsd src"; exit 1; fi

r=$1
case "$r" in
	/*)
		;;
	*)
		r=`/bin/pwd`/$r
		;;
esac

cd $r

### Remove the $'s around RCS tags
cleantags $r

### Add our NetBSD RCS Id
find $r -type f -name '*.[chly]' -print | while read c; do
	sed 1q < $c | grep -q '\$NetBSD' || (
echo "/*	\$NetBSD\$	*/" >/tmp/libpcap3n$$
echo "" >>/tmp/libpcap3n$$
cat $c  >> /tmp/libpcap3n$$
mv /tmp/libpcap3n$$ $c && echo added NetBSD RCS tag to $c
	)
done

find $r -type f -name '*.[0-9]' -print | while read m; do
	sed 1q < $m | grep -q '\$NetBSD' || (
echo ".\\\"	\$NetBSD\$" >/tmp/libpcap2m$$
echo ".\\\"" >>/tmp/libpcap2m$$
cat $m >> /tmp/libpcap2m$$
mv /tmp/libpcap2m$$ $m && echo added NetBSD RCS tag to $m
	)
done

find $r -type f -name '*.texi' -print | while read t; do
        sed "2 s/^/@@c \$NetBSD\$\\
/" < $t > /tmp/libpcap4t$$
	mv /tmp/libpcap4t$$ $t && echo added NetBSD RCS tag to $t
done

echo done

### Clean up any CVS directories that might be around.
echo "cleaning up CVS residue."
find $r -type d -name "CVS" -print | xargs rm -r
echo done

### Fixing file and directory permissions.
echo "Fixing file/directory permissions."
(
	find $r -type f -print | xargs chmod u+rw,go+r
	find $r -type d -print | xargs chmod u+rwx,go+rx
)
echo done

exit 0
@


