CVS commit: src/share/man/man4
Module Name:src Committed By: martti Date: Tue Feb 23 07:02:23 UTC 2010 Modified Files: src/share/man/man4: agr.4 Log Message: Note that the physical interfaces must not have any (IPv4 or IPv6) address before attaching them to agr. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/share/man/man4/agr.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/agr.4 diff -u src/share/man/man4/agr.4:1.7 src/share/man/man4/agr.4:1.8 --- src/share/man/man4/agr.4:1.7 Mon Jun 8 07:59:38 2009 +++ src/share/man/man4/agr.4 Tue Feb 23 07:02:23 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: agr.4,v 1.7 2009/06/08 07:59:38 wiz Exp $ +.\" $NetBSD: agr.4,v 1.8 2010/02/23 07:02:23 martti Exp $ .\" .\" Copyright (c)2005, 2007 YAMAMOTO Takashi, .\" All rights reserved. @@ -25,7 +25,7 @@ .\" SUCH DAMAGE. .\" .\" -.Dd June 7, 2009 +.Dd February 23, 2010 .Dt AGR 4 .Os .\" @@ -77,13 +77,21 @@ and .Sy re1 to it. -(In other words, aggregate +In other words, aggregate .Sy re0 and .Sy re1 so that they can be used as a single interface, -.Sy agr0 ) +.Sy agr0 . +The physical interfaces which are attached to the +.Nm +interface must not have any IP addresses, neither IPv4 nor IPv6. .Bd -literal -offset indent + ifconfig re0 inet xxx.xxx.xxx.xxx delete + ifconfig re0 inet6 fe80::::: delete + ifconfig re1 inet xxx.xxx.xxx.xxx delete + ifconfig re1 inet6 fe80::::: delete + ifconfig agr0 create ifconfig agr0 agrport re0 ifconfig agr0 agrport re1
CVS commit: src/sys/rump/net/rumptest
Module Name:src
Committed By: martti
Date: Wed Jan 27 13:30:45 UTC 2010
Modified Files:
src/sys/rump/net/rumptest: rumptest_net.c
Log Message:
Use tabs instead of 8 spaces.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/rump/net/rumptest/rumptest_net.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/net/rumptest/rumptest_net.c
diff -u src/sys/rump/net/rumptest/rumptest_net.c:1.17 src/sys/rump/net/rumptest/rumptest_net.c:1.18
--- src/sys/rump/net/rumptest/rumptest_net.c:1.17 Tue Jan 26 17:52:21 2010
+++ src/sys/rump/net/rumptest/rumptest_net.c Wed Jan 27 13:30:45 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rumptest_net.c,v 1.17 2010/01/26 17:52:21 pooka Exp $ */
+/* $NetBSD: rumptest_net.c,v 1.18 2010/01/27 13:30:45 martti Exp $ */
/*
* Copyright (c) 2008 Antti Kantee. All Rights Reserved.
@@ -92,7 +92,7 @@
static void
configure_interface(void)
{
-struct sockaddr_in *sin;
+ struct sockaddr_in *sin;
struct sockaddr_in sinstore;
struct ifaliasreq ia;
ssize_t len;
@@ -149,37 +149,37 @@
err(1, "routing socket");
/* create routing message */
-memset(&m_rtmsg, 0, sizeof(m_rtmsg));
-rtm.rtm_type = RTM_ADD;
-rtm.rtm_flags = RTF_UP | RTF_GATEWAY | RTF_STATIC;
-rtm.rtm_version = RTM_VERSION;
-rtm.rtm_seq = 2;
-rtm.rtm_addrs = RTA_DST | RTA_GATEWAY | RTA_NETMASK;
+ memset(&m_rtmsg, 0, sizeof(m_rtmsg));
+ rtm.rtm_type = RTM_ADD;
+ rtm.rtm_flags = RTF_UP | RTF_GATEWAY | RTF_STATIC;
+ rtm.rtm_version = RTM_VERSION;
+ rtm.rtm_seq = 2;
+ rtm.rtm_addrs = RTA_DST | RTA_GATEWAY | RTA_NETMASK;
/* dst */
-memset(&sinstore, 0, sizeof(sinstore));
-sinstore.sin_family = AF_INET;
-sinstore.sin_len = sizeof(sinstore);
-memcpy(bp, &sinstore, sizeof(sinstore));
-bp += sizeof(sinstore);
+ memset(&sinstore, 0, sizeof(sinstore));
+ sinstore.sin_family = AF_INET;
+ sinstore.sin_len = sizeof(sinstore);
+ memcpy(bp, &sinstore, sizeof(sinstore));
+ bp += sizeof(sinstore);
/* gw */
-memset(&sinstore, 0, sizeof(sinstore));
-sinstore.sin_family = AF_INET;
-sinstore.sin_len = sizeof(sinstore);
-sinstore.sin_addr.s_addr = inet_addr(MYGW);
-memcpy(bp, &sinstore, sizeof(sinstore));
-bp += sizeof(sinstore);
+ memset(&sinstore, 0, sizeof(sinstore));
+ sinstore.sin_family = AF_INET;
+ sinstore.sin_len = sizeof(sinstore);
+ sinstore.sin_addr.s_addr = inet_addr(MYGW);
+ memcpy(bp, &sinstore, sizeof(sinstore));
+ bp += sizeof(sinstore);
/* netmask */
-memset(&sinstore, 0, sizeof(sinstore));
-sinstore.sin_family = AF_INET;
-sinstore.sin_len = sizeof(sinstore);
-memcpy(bp, &sinstore, sizeof(sinstore));
-bp += sizeof(sinstore);
+ memset(&sinstore, 0, sizeof(sinstore));
+ sinstore.sin_family = AF_INET;
+ sinstore.sin_len = sizeof(sinstore);
+ memcpy(bp, &sinstore, sizeof(sinstore));
+ bp += sizeof(sinstore);
-len = bp - (uint8_t *)&m_rtmsg;
-rtm.rtm_msglen = len;
+ len = bp - (uint8_t *)&m_rtmsg;
+ rtm.rtm_msglen = len;
/* stuff that to the routing socket and wait for happy days */
if (rump_sys_write(s, &m_rtmsg, len) != len)
CVS commit: src/dist/pf
Module Name:src Committed By: martti Date: Wed Dec 2 15:21:37 UTC 2009 Modified Files: src/dist/pf: pf2netbsd Log Message: Removed obsolete files. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/dist/pf/pf2netbsd Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/dist/pf/pf2netbsd diff -u src/dist/pf/pf2netbsd:1.1 src/dist/pf/pf2netbsd:1.2 --- src/dist/pf/pf2netbsd:1.1 Tue Dec 1 06:27:57 2009 +++ src/dist/pf/pf2netbsd Wed Dec 2 15:21:37 2009 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: pf2netbsd,v 1.1 2009/12/01 06:27:57 martti Exp $ +# $NetBSD: pf2netbsd,v 1.2 2009/12/02 15:21:37 martti Exp $ # # Copyright (c) 2009 The NetBSD Foundation, Inc. # All rights reserved. @@ -93,16 +93,6 @@ share/man/man4/pfsync.4 share/man/man5/pf.conf.5 share/man/man5/pf.os.5 -share/pf/ackpri -share/pf/faq-example1 -share/pf/faq-example2 -share/pf/faq-example3 -share/pf/Makefile -share/pf/queue1 -share/pf/queue2 -share/pf/queue3 -share/pf/queue4 -share/pf/spamd usr.sbin/authpf/authpf.8 usr.sbin/authpf/authpf.c usr.sbin/authpf/Makefile
CVS commit: src/dist/pf
Module Name:src
Committed By: martti
Date: Wed Dec 2 15:07:09 UTC 2009
Added Files:
src/dist/pf: README.NetBSD
Log Message:
Initial version.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/dist/pf/README.NetBSD
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/dist/pf/README.NetBSD
diff -u /dev/null src/dist/pf/README.NetBSD:1.1
--- /dev/null Wed Dec 2 15:07:09 2009
+++ src/dist/pf/README.NetBSD Wed Dec 2 15:07:09 2009
@@ -0,0 +1,301 @@
+#
+# $NetBSD: README.NetBSD,v 1.1 2009/12/02 15:07:09 martti Exp $
+#
+# Author: Martti Kuparinen
+#
+# This file contains copy-pastable commands to import a new PF release
+# into the NetBSD repository. Before importing the code into the official
+# NetBSD repository, you'll import the code into your own local test
+# repository, resolve the conflicts and make sure everything works as expected.
+#
+# Steps in this document:
+# 1) Get the PF dist files and a copy of the CVS repository
+# 2) Create a local test repository for the test imports
+# 3) Import the new PF release into the test repository
+# 4) Resolve conflicts and make other adjustments
+# 5) Save the required modifications
+# 6) Re-create a local test repository for the final test import
+# 7) Import the new PF release into the test repository
+# 8) Apply the fixes
+# 9) Compile everything and make sure the new version really works
+# 10) Update your /usr/src (cd /usr/src && cvs update -dPA)
+# 11) Import the new PF release into the NetBSD repository
+# 12) Apply the fixes
+# 13) Update your /usr/src one more time (cd /usr/src && cvs update -dPA)
+# 14) Compile and install everything
+# 15) Update src/doc/3RDPARTY and src/doc/CHANGES
+# 16) Send an announcement to current-users
+#
+
+###
+###
+# COMMON SETTINGS FOR EVERYTHING BELOW
+###
+###
+
+export NETBSDUSERNAME="fixthis"
+export VERSION="4.6"
+export VERTAG="`echo ${VERSION} | sed 's+\.+_+g'`"
+export VEROLD="v4_2"
+export VERNEW="v4_6"
+export ORIG="${HOME}/netbsd/orig"
+export WORK="${HOME}/netbsd/work"
+export FIXES="${HOME}/netbsd/fixes/${VERSION}"
+export RSYNC_RSH="ssh -4"
+export RSYNC="rsync -avzr --delete"
+
+###
+###
+# Fetch the official PF sources
+###
+###
+
+mkdir -p ${ORIG}/openbsd-${VERSION}
+cd ${ORIG}/openbsd-${VERSION}
+if [ ! -f src.tar.gz ]; then
+ ftp ftp://ftp.df.lth.se/pub/OpenBSD/${VERSION}/src.tar.gz
+fi
+if [ ! -f sys.tar.gz ]; then
+ ftp ftp://ftp.df.lth.se/pub/OpenBSD/${VERSION}/sys.tar.gz
+fi
+
+###
+###
+# GET COPY OF THE CVS REPOSITORY FOR LOCAL TEST IMPORTS
+###
+###
+
+RSYNC_RSH="ssh -4"
+RSYNC="rsync -avzr --delete -e ssh"
+S="${netbsduserna...@cvs.netbsd.org::cvsroot"
+D="${ORIG}/cvsroot"
+
+if [ "${NETBSDUSERNAME}" = "fixthis" ]; then
+ echo "You MUST use your real NetBSD user name..."
+ sleep 86400
+fi
+${RSYNC} ${S}/src/ ${D}/src
+${RSYNC} --exclude 'commitlog*' --exclude 'history*' ${S}/CVSROOT/ ${D}/CVSROOT
+
+###
+###
+# TEST IMPORT 1
+###
+###
+
+# Get a new repository
+mkdir -p ${WORK}
+${RSYNC} ${ORIG}/cvsroot ${WORK}
+rm -f ${WORK}/cvsroot/CVSROOT/commitinfo*
+rm -f ${WORK}/cvsroot/CVSROOT/loginfo*
+touch ${WORK}/cvsroot/CVSROOT/commitinfo
+touch ${WORK}/cvsroot/CVSROOT/loginfo
+chmod 644 ${WORK}/cvsroot/CVSROOT/config
+sed 's+/cvslock+/tmp/cvslock+' < ${WORK}/cvsroot/CVSROOT/config \
+ > ${WORK}/cvsroot/CVSROOT/config.1
+grep -v -e tag= -e AdminGroup= -e AdminOptions= \
+ < ${WORK}/cvsroot/CVSROOT/config.1 > ${WORK}/cvsroot/CVSROOT
CVS commit: src
Module Name:src Committed By: martti Date: Tue Dec 1 07:03:20 UTC 2009 Update of /cvsroot/src In directory ivanova.netbsd.org:/tmp/cvs-serv16304 Log Message: Import PF from OpenBSD 4.2 Status: Vendor Tag: OPENBSD Release Tags: v4_2 C src/dist/pf/usr.sbin/ftp-proxy/Makefile C src/dist/pf/usr.sbin/ftp-proxy/ftp-proxy.8 C src/dist/pf/usr.sbin/ftp-proxy/filter.c C src/dist/pf/usr.sbin/ftp-proxy/filter.h C src/dist/pf/usr.sbin/ftp-proxy/ftp-proxy.c C src/dist/pf/usr.sbin/authpf/Makefile C src/dist/pf/usr.sbin/authpf/authpf.8 C src/dist/pf/usr.sbin/authpf/authpf.c C src/dist/pf/usr.sbin/authpf/pathnames.h C src/dist/pf/share/pf/Makefile C src/dist/pf/share/pf/ackpri C src/dist/pf/share/pf/faq-example1 C src/dist/pf/share/pf/faq-example2 C src/dist/pf/share/pf/faq-example3 C src/dist/pf/share/pf/queue1 C src/dist/pf/share/pf/queue2 C src/dist/pf/share/pf/queue3 C src/dist/pf/share/pf/queue4 C src/dist/pf/share/pf/spamd C src/dist/pf/share/man/man5/pf.conf.5 C src/dist/pf/share/man/man5/pf.os.5 C src/dist/pf/share/man/man4/pf.4 C src/dist/pf/share/man/man4/pflog.4 C src/dist/pf/share/man/man4/pfsync.4 C src/dist/pf/sbin/pflogd/Makefile C src/dist/pf/sbin/pflogd/pflogd.8 C src/dist/pf/sbin/pflogd/pflogd.c C src/dist/pf/sbin/pflogd/pflogd.h C src/dist/pf/sbin/pflogd/privsep.c C src/dist/pf/sbin/pflogd/privsep_fdpass.c C src/dist/pf/sbin/pfctl/Makefile C src/dist/pf/sbin/pfctl/pfctl.8 C src/dist/pf/sbin/pfctl/parse.y C src/dist/pf/sbin/pfctl/pfctl_altq.c C src/dist/pf/sbin/pfctl/pfctl.c C src/dist/pf/sbin/pfctl/pfctl.h C src/dist/pf/sbin/pfctl/pfctl_optimize.c C src/dist/pf/sbin/pfctl/pfctl_osfp.c C src/dist/pf/sbin/pfctl/pfctl_parser.c C src/dist/pf/sbin/pfctl/pfctl_parser.h C src/dist/pf/sbin/pfctl/pfctl_qstats.c C src/dist/pf/sbin/pfctl/pfctl_radix.c C src/dist/pf/sbin/pfctl/pfctl_table.c C src/dist/pf/sbin/pfctl/pf_print_state.c C src/dist/pf/libexec/tftp-proxy/Makefile C src/dist/pf/libexec/tftp-proxy/tftp-proxy.8 C src/dist/pf/libexec/tftp-proxy/filter.c C src/dist/pf/libexec/tftp-proxy/filter.h C src/dist/pf/libexec/tftp-proxy/tftp-proxy.c C src/dist/pf/etc/pf.os C src/dist/pf/etc/pf.conf C src/sys/dist/pf/netinet/tcp_rndiss.h C src/sys/dist/pf/netinet/tcp_rndiss.c C src/sys/dist/pf/net/if_pflog.c C src/sys/dist/pf/net/if_pflog.h C src/sys/dist/pf/net/if_pfsync.c C src/sys/dist/pf/net/if_pfsync.h C src/sys/dist/pf/net/pf.c C src/sys/dist/pf/net/pf_if.c C src/sys/dist/pf/net/pf_ioctl.c C src/sys/dist/pf/net/pf_norm.c C src/sys/dist/pf/net/pf_osfp.c C src/sys/dist/pf/net/pf_ruleset.c C src/sys/dist/pf/net/pf_table.c C src/sys/dist/pf/net/pfvar.h C src/sys/dist/pf/net/pf_mtag.c C src/sys/dist/pf/net/pf_mtag.h C src/sys/dist/pf/net/if_compat.h C src/sys/dist/pf/net/if_compat.c 69 conflicts created by this import. Use the following command to help the merge: cvs checkout -jOPENBSD:yesterday -jOPENBSD src
CVS commit: src/dist/pf
Module Name:src
Committed By: martti
Date: Tue Dec 1 06:27:57 UTC 2009
Added Files:
src/dist/pf: pf2netbsd
Log Message:
Initial version.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/dist/pf/pf2netbsd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/dist/pf/pf2netbsd
diff -u /dev/null src/dist/pf/pf2netbsd:1.1
--- /dev/null Tue Dec 1 06:27:57 2009
+++ src/dist/pf/pf2netbsd Tue Dec 1 06:27:57 2009
@@ -0,0 +1,273 @@
+#!/bin/sh
+#
+# $NetBSD: pf2netbsd,v 1.1 2009/12/01 06:27:57 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
+share/pf/ackpri
+share/pf/faq-example1
+share/pf/faq-example2
+share/pf/faq-example3
+share/pf/Makefile
+share/pf/queue1
+share/pf/queue2
+share/pf/queue3
+share/pf/queue4
+share/pf/spamd
+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.s
CVS commit: src/doc
Module Name:src Committed By: martti Date: Wed Nov 11 09:11:26 UTC 2009 Modified Files: src/doc: 3RDPARTY Log Message: I'm no longer going to work on IPF as I'm now using PF on all my hosts (because NAT works much better for me in PF)... To generate a diff of this commit: cvs rdiff -u -r1.730 -r1.731 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.730 src/doc/3RDPARTY:1.731 --- src/doc/3RDPARTY:1.730 Thu Oct 29 00:58:06 2009 +++ src/doc/3RDPARTY Wed Nov 11 09:11:26 2009 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.730 2009/10/29 00:58:06 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.731 2009/11/11 09:11:26 martti Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -445,7 +445,7 @@ Archive Site: http://coombs.anu.edu.au/~avalon/ Home Page: http://coombs.anu.edu.au/~avalon/ Mailing List: ipfil...@postbox.anu.edu.au -Responsible: darrenr, mike, martti +Responsible: darrenr, mike License: BSD-based, see src/dist/ipf/IPFILTER.LICENSE Notes: ipf2netbsd should be used on a virgin ipfilter source tree.
CVS commit: src
Module Name:src
Committed By: martti
Date: Wed Aug 19 09:35:01 UTC 2009
Modified Files:
src/dist/ipf: README.NetBSD
src/doc: 3RDPARTY
Log Message:
IPF 4.1.33
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/dist/ipf/README.NetBSD
cvs rdiff -u -r1.714 -r1.715 src/doc/3RDPARTY
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/dist/ipf/README.NetBSD
diff -u src/dist/ipf/README.NetBSD:1.2 src/dist/ipf/README.NetBSD:1.3
--- src/dist/ipf/README.NetBSD:1.2 Mon Oct 20 12:09:15 2008
+++ src/dist/ipf/README.NetBSD Wed Aug 19 09:35:01 2009
@@ -1,5 +1,5 @@
#
-# $NetBSD: README.NetBSD,v 1.2 2008/10/20 12:09:15 martti Exp $
+# $NetBSD: README.NetBSD,v 1.3 2009/08/19 09:35:01 martti Exp $
#
# Author: Martti Kuparinen
#
@@ -34,9 +34,9 @@
###
export NETBSDUSERNAME="fixthis"
-export VERSION="4.1.31"
-export VEROLD="v4-1-29"
-export VERNEW="v4-1-31"
+export VERSION="4.1.34"
+export VEROLD="v4-1-33"
+export VERNEW="v4-1-34"
export VERTAG="`echo ${VERSION} | sed 's+\.+_+g'`"
export ORIG="${HOME}/netbsd/orig"
export WORK="${HOME}/netbsd/work"
Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.714 src/doc/3RDPARTY:1.715
--- src/doc/3RDPARTY:1.714 Tue Aug 18 20:47:18 2009
+++ src/doc/3RDPARTY Wed Aug 19 09:35:01 2009
@@ -1,4 +1,4 @@
-# $NetBSD: 3RDPARTY,v 1.714 2009/08/18 20:47:18 jmcneill Exp $
+# $NetBSD: 3RDPARTY,v 1.715 2009/08/19 09:35:01 martti Exp $
#
# This file contains a list of the software that has been integrated into
# NetBSD where we are not the primary maintainer.
@@ -443,8 +443,8 @@
Notes:
Package: ipf
-Version: 4.1.29
-Current Vers: 4.1.31
+Version: 4.1.33
+Current Vers: 4.1.33
Maintainer: Darren Reed
Archive Site: http://coombs.anu.edu.au/~avalon/
Home Page: http://coombs.anu.edu.au/~avalon/
