[BACK]Return to pf2netbsd CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / dist / pf

File: [cvs.NetBSD.org] / src / dist / pf / pf2netbsd (download)

Revision 1.2, Wed Dec 2 15:21:37 2009 UTC (12 years, 5 months ago) by martti
Branch: MAIN
CVS Tags: yamt-pagecache-tag8, yamt-pagecache-base9, yamt-pagecache-base8, yamt-pagecache-base7, yamt-pagecache-base6, yamt-pagecache-base5, yamt-pagecache-base4, yamt-pagecache-base3, yamt-pagecache-base2, yamt-pagecache-base, yamt-pagecache, tls-maxphys-base, tls-maxphys, tls-earlyentropy-base, tls-earlyentropy, riastradh-xf86-video-intel-2-7-1-pre-2-21-15, riastradh-drm2-base3, riastradh-drm2-base2, riastradh-drm2-base1, riastradh-drm2-base, riastradh-drm2, prg-localcount2-base3, prg-localcount2-base2, prg-localcount2-base1, prg-localcount2-base, prg-localcount2, phil-wifi-base, phil-wifi-20200421, phil-wifi-20200411, phil-wifi-20200406, phil-wifi-20191119, phil-wifi-20190609, phil-wifi, pgoyette-localcount-base, pgoyette-localcount-20170426, pgoyette-localcount-20170320, pgoyette-localcount-20170107, pgoyette-localcount-20161104, pgoyette-localcount-20160806, pgoyette-localcount-20160726, pgoyette-localcount, pgoyette-compat-merge-20190127, pgoyette-compat-base, pgoyette-compat-20190127, pgoyette-compat-20190118, pgoyette-compat-1226, pgoyette-compat-1126, pgoyette-compat-1020, pgoyette-compat-0930, pgoyette-compat-0906, pgoyette-compat-0728, pgoyette-compat-0625, pgoyette-compat-0521, pgoyette-compat-0502, pgoyette-compat-0422, pgoyette-compat-0415, pgoyette-compat-0407, pgoyette-compat-0330, pgoyette-compat-0322, pgoyette-compat-0315, pgoyette-compat, perseant-stdc-iso10646-base, perseant-stdc-iso10646, netbsd-9-base, netbsd-9-2-RELEASE, netbsd-9-1-RELEASE, netbsd-9-0-RELEASE, netbsd-9-0-RC2, netbsd-9-0-RC1, netbsd-9, netbsd-8-base, netbsd-8-2-RELEASE, netbsd-8-1-RELEASE, netbsd-8-1-RC1, netbsd-8-0-RELEASE, netbsd-8-0-RC2, netbsd-8-0-RC1, netbsd-8, netbsd-7-nhusb-base-20170116, netbsd-7-nhusb-base, netbsd-7-nhusb, netbsd-7-base, netbsd-7-2-RELEASE, netbsd-7-1-RELEASE, netbsd-7-1-RC2, netbsd-7-1-RC1, netbsd-7-1-2-RELEASE, netbsd-7-1-1-RELEASE, netbsd-7-1, netbsd-7-0-RELEASE, netbsd-7-0-RC3, netbsd-7-0-RC2, netbsd-7-0-RC1, netbsd-7-0-2-RELEASE, netbsd-7-0-1-RELEASE, netbsd-7-0, netbsd-7, netbsd-6-base, netbsd-6-1-RELEASE, netbsd-6-1-RC4, netbsd-6-1-RC3, netbsd-6-1-RC2, netbsd-6-1-RC1, netbsd-6-1-5-RELEASE, netbsd-6-1-4-RELEASE, netbsd-6-1-3-RELEASE, netbsd-6-1-2-RELEASE, netbsd-6-1-1-RELEASE, netbsd-6-1, netbsd-6-0-RELEASE, netbsd-6-0-RC2, netbsd-6-0-RC1, netbsd-6-0-6-RELEASE, netbsd-6-0-5-RELEASE, netbsd-6-0-4-RELEASE, netbsd-6-0-3-RELEASE, netbsd-6-0-2-RELEASE, netbsd-6-0-1-RELEASE, netbsd-6-0, netbsd-6, matt-premerge-20091211, matt-nb8-mediatek-base, matt-nb8-mediatek, matt-nb6-plus-nbase, matt-nb6-plus-base, matt-nb6-plus, matt-mips64-premerge-20101231, localcount-20160914, khorben-n900, is-mlppp-base, is-mlppp, cjep_sun2x-base1, cjep_sun2x-base, cjep_sun2x, cjep_staticlib_x-base1, cjep_staticlib_x-base, cjep_staticlib_x, cherry-xenmp-base, cherry-xenmp, bouyer-socketcan-base1, bouyer-socketcan-base, bouyer-socketcan, bouyer-quota2-nbase, bouyer-quota2-base, bouyer-quota2, agc-symver-base, agc-symver, HEAD
Changes since 1.1: +1 -11 lines

Removed obsolete files.

#!/bin/sh
#
#   $NetBSD: pf2netbsd,v 1.2 2009/12/02 15:21:37 martti Exp $
#
# Copyright (c) 2009 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.
#

usage()
{
    cat << EOF

Usage: `basename $0` [options] srcdir dstdir

where

-h      This help
-v      Be verbose

Example:

`basename $0` /tmp/openbsd-4.2 /tmp/netbsd-4.2

EOF
    exit 1
}

verbose()
{
    ${VERBOSE} && echo $*
    eval $*
}

mklist()
{
    # $1 = filename

    if [ -z "$1" ]; then
        echo "ERROR: Not enough arguments for mklist!"
        exit 1
    fi
    cat > $1 << EOF
etc/pf.conf
etc/pf.os
libexec/tftp-proxy/filter.c
libexec/tftp-proxy/filter.h
libexec/tftp-proxy/Makefile
libexec/tftp-proxy/tftp-proxy.8
libexec/tftp-proxy/tftp-proxy.c
sbin/pfctl/Makefile
sbin/pfctl/parse.y
sbin/pfctl/pfctl.8
sbin/pfctl/pfctl_altq.c
sbin/pfctl/pfctl.c
sbin/pfctl/pfctl.h
sbin/pfctl/pfctl_optimize.c
sbin/pfctl/pfctl_osfp.c
sbin/pfctl/pfctl_parser.c
sbin/pfctl/pfctl_parser.h
sbin/pfctl/pfctl_qstats.c
sbin/pfctl/pfctl_radix.c
sbin/pfctl/pfctl_table.c
sbin/pfctl/pf_print_state.c
sbin/pflogd/Makefile
sbin/pflogd/pflogd.8
sbin/pflogd/pflogd.c
sbin/pflogd/pflogd.h
sbin/pflogd/privsep.c
sbin/pflogd/privsep_fdpass.c
share/man/man4/pf.4
share/man/man4/pflog.4
share/man/man4/pfsync.4
share/man/man5/pf.conf.5
share/man/man5/pf.os.5
usr.sbin/authpf/authpf.8
usr.sbin/authpf/authpf.c
usr.sbin/authpf/Makefile
usr.sbin/authpf/pathnames.h
usr.sbin/ftp-proxy/filter.c
usr.sbin/ftp-proxy/filter.h
usr.sbin/ftp-proxy/ftp-proxy.8
usr.sbin/ftp-proxy/ftp-proxy.c
usr.sbin/ftp-proxy/Makefile
sys/net/if.c
sys/net/if.h
sys/net/if_pflog.c
sys/net/if_pflog.h
sys/net/if_pfsync.c
sys/net/if_pfsync.h
sys/net/pf.c
sys/net/pf_if.c
sys/net/pf_ioctl.c
sys/net/pf_norm.c
sys/net/pf_osfp.c
sys/net/pf_ruleset.c
sys/net/pf_table.c
sys/net/pfvar.h
sys/netinet/tcp_subr.c
sys/netinet/tcp_var.h
EOF
}

openbsd2netbsd()
{
    # $1 = srcdir
    # $2 = dstdir

    if [ -z "$2" ]; then
        echo "ERROR: Not enough arguments for openbsd2netbsd!"
        exit 1
    fi
    if [ -d $2/dist/pf ]; then
        echo "ERROR: $2 already exists!"
        exit 1
    fi
    if [ -d "$1/src" ]; then
        echo "ERROR: Use $1/src as the srcdir!"
        exit 1
    fi

    cd $1 || exit 1

    # Copy from OpenBSD
    verbose "mklist /tmp/pf.$$"
    verbose "mkdir -p $2"
    verbose "tar -c -T /tmp/pf.$$ -f- | tar -x -f- -C $2"

    # Some files have different name/location in NetBSD
    verbose cd $2
    verbose mkdir -p dist/pf sys/dist/pf

    verbose cd $2/sys/net
    verbose mv if.c if_compat.c
    verbose mv if.h if_compat.h
    verbose cp pf.c pf_mtag.c
    verbose cp pfvar.h pf_mtag.h

    verbose cd $2/sys/netinet
    verbose mv tcp_subr.c tcp_rndiss.c
    verbose mv tcp_var.h tcp_rndiss.h

    verbose cd $2
    verbose mv etc libexec sbin share usr.sbin dist/pf/

    verbose cd $2/sys
    verbose mv net netinet dist/pf/

    # Remove references to the OpenBSD CVS
    find $2 -name CVS | xargs rm -rf

#   # Remove the $'s around various CVS keywords
#   find $2 -type f | \
#   while read f
#   do
#       sed -e 's/\$\(Id.*\) \$/\1/'        \
#           -e 's/\$\(Date.*\) \$/\1/'      \
#           -e 's/\$\(Header.*\) \$/\1/'    \
#           ${f} > ${f}.fixed
#       mv ${f}.fixed ${f}
#       echo "Deactivated CVS keywords from ${f}"
#   done

    # Add the NetBSD keyword
    find $2 -type f -name '*.[chly]' | \
    grep -v -e if_compat -e tcp_rndiss | \
    while read f
    do
        sed 1q < ${f} | grep -q '\$NetBSD' || (
        cat > /tmp/pf2n.$$ <<  EOF
/*	\$NetBSD\$	*/
EOF
        cat ${f} >> /tmp/pf2n.$$
        mv /tmp/pf2n.$$ ${f}
        )
    done
    find $2 -type f -name '*.[0-9]' | \
    while read f
    do
        sed 1q < ${f} | grep -q '\$NetBSD' || (
        cat > /tmp/pf2n.$$ <<  EOF
.\"	\$NetBSD\$
EOF
        cat ${f} >> /tmp/pf2n.$$
        mv /tmp/pf2n.$$ ${f}
        )
    done
    find $2 -type f -name 'faq*' -o -name 'queue*' \
      -o -name 'ackpri' -o -name 'spamd' | \
    while read f
    do
        sed 1q < ${f} | grep -q '\$NetBSD' || (
        cat > /tmp/pf2n.$$ <<  EOF
# \$NetBSD\$
EOF
        cat ${f} >> /tmp/pf2n.$$
        mv /tmp/pf2n.$$ ${f}
        )
    done
    find $2 -type f -name 'Makefile' | \
    while read f
    do
        sed 1q < ${f} | grep -q '\$NetBSD' || (
        cat > /tmp/pf2n.$$ <<  EOF
#	\$NetBSD\$
EOF
        cat ${f} >> /tmp/pf2n.$$
        mv /tmp/pf2n.$$ ${f}
        )
    done
}

##
## MAIN
##
VERBOSE=false

ARGV=`getopt hv ${*}`
[ ${?} != 0 ] && exit 1
set -- ${ARGV}
for i
do
    case "${i}" in
    -h)
        usage
        shift
        ;;
    -v)
        VERBOSE=true
        shift
        ;;
    --)
        shift
        ;;
    esac
done
[ $# -ne 2 ] && usage

openbsd2netbsd $1 $2
rm -f /tmp/pf.$$
echo ""
echo "The sources-to-be-imported are now in $2"
echo ""