svn commit: r206517 - in user/imp/tbemd: etc etc/defaults etc/rc.d
games/fortune games/fortune/datfiles games/pom gnu/usr.bin
gnu/usr.bin/cpio gnu/usr.bin/diff gnu/usr.bin/dtc
gnu/usr.bin/gdb gnu/u...
Warner Losh
imp at FreeBSD.org
Mon Apr 12 23:05:34 UTC 2010
Author: imp
Date: Mon Apr 12 23:05:32 2010
New Revision: 206517
URL: http://svn.freebsd.org/changeset/base/206517
Log:
merge from head: 3 of many
Added:
user/imp/tbemd/etc/rc.d/ubthidhci
- copied unchanged from r206514, head/etc/rc.d/ubthidhci
Deleted:
user/imp/tbemd/gnu/usr.bin/cpio/
user/imp/tbemd/include/regexp.h
Modified:
user/imp/tbemd/etc/Makefile
user/imp/tbemd/etc/defaults/periodic.conf
user/imp/tbemd/etc/defaults/rc.conf
user/imp/tbemd/etc/inetd.conf
user/imp/tbemd/etc/network.subr
user/imp/tbemd/etc/rc.d/ip6addrctl
user/imp/tbemd/etc/rc.d/jail
user/imp/tbemd/etc/rc.d/netif
user/imp/tbemd/etc/rc.d/netoptions
user/imp/tbemd/etc/rc.d/tmp
user/imp/tbemd/etc/rc.firewall
user/imp/tbemd/etc/rc.subr
user/imp/tbemd/etc/termcap.small
user/imp/tbemd/games/fortune/Notes
user/imp/tbemd/games/fortune/datfiles/fortunes
user/imp/tbemd/games/fortune/datfiles/fortunes-o.real
user/imp/tbemd/games/fortune/datfiles/fortunes.sp.ok
user/imp/tbemd/games/fortune/datfiles/limerick
user/imp/tbemd/games/fortune/datfiles/startrek
user/imp/tbemd/games/fortune/datfiles/zippy
user/imp/tbemd/games/pom/pom.6
user/imp/tbemd/gnu/usr.bin/Makefile
user/imp/tbemd/gnu/usr.bin/diff/context.c.diff
user/imp/tbemd/gnu/usr.bin/diff/diff.c.diff
user/imp/tbemd/gnu/usr.bin/dtc/Makefile
user/imp/tbemd/gnu/usr.bin/gdb/Makefile.inc
user/imp/tbemd/gnu/usr.bin/gdb/arch/arm/nm-fbsd.h
user/imp/tbemd/gnu/usr.bin/gdb/kgdb/trgt_ia64.c
user/imp/tbemd/include/Makefile
user/imp/tbemd/include/dlfcn.h
user/imp/tbemd/include/inttypes.h
user/imp/tbemd/include/netdb.h
user/imp/tbemd/include/nsswitch.h
Modified: user/imp/tbemd/etc/Makefile
==============================================================================
--- user/imp/tbemd/etc/Makefile Mon Apr 12 23:04:38 2010 (r206516)
+++ user/imp/tbemd/etc/Makefile Mon Apr 12 23:05:32 2010 (r206517)
@@ -18,7 +18,7 @@ BIN1= auth.conf \
rc rc.bsdextended rc.firewall rc.initdiskless \
rc.sendmail rc.shutdown \
rc.subr remote rpc services shells \
- sysctl.conf syslog.conf
+ sysctl.conf syslog.conf termcap.small
.if exists(${.CURDIR}/etc.${MACHINE}/ttys)
BIN1+= etc.${MACHINE}/ttys
@@ -161,6 +161,9 @@ distribution:
${BIN2} ${DESTDIR}/etc; \
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \
master.passwd nsmb.conf opieaccess ${DESTDIR}/etc;
+.if ${MK_AT} == "no"
+ sed -i "" -e 's;.*/usr/libexec/atrun;#&;' ${DESTDIR}/etc/crontab
+.endif
.if ${MK_TCSH} == "no"
sed -i "" -e 's;/bin/csh;/bin/sh;' ${DESTDIR}/etc/master.passwd
.endif
Modified: user/imp/tbemd/etc/defaults/periodic.conf
==============================================================================
--- user/imp/tbemd/etc/defaults/periodic.conf Mon Apr 12 23:04:38 2010 (r206516)
+++ user/imp/tbemd/etc/defaults/periodic.conf Mon Apr 12 23:05:32 2010 (r206517)
@@ -46,7 +46,7 @@ daily_clean_tmps_enable="NO" # Delete
daily_clean_tmps_dirs="/tmp" # Delete under here
daily_clean_tmps_days="3" # If not accessed for
daily_clean_tmps_ignore=".X*-lock .X11-unix .ICE-unix .font-unix .XIM-unix"
-daily_clean_tmps_ignore="$daily_clean_tmps_ignore quota.user quota.group"
+daily_clean_tmps_ignore="$daily_clean_tmps_ignore quota.user quota.group .snap"
# Don't delete these
daily_clean_tmps_verbose="YES" # Mention files deleted
Modified: user/imp/tbemd/etc/defaults/rc.conf
==============================================================================
--- user/imp/tbemd/etc/defaults/rc.conf Mon Apr 12 23:04:38 2010 (r206516)
+++ user/imp/tbemd/etc/defaults/rc.conf Mon Apr 12 23:05:32 2010 (r206517)
@@ -210,6 +210,7 @@ cloned_interfaces="" # List of cloned n
ifconfig_lo0="inet 127.0.0.1" # default loopback device configuration.
#ifconfig_lo0_alias0="inet 127.0.0.254 netmask 0xffffffff" # Sample alias entry.
#ifconfig_ed0_ipx="ipx 0x00010010" # Sample IPX address family entry.
+#ifconfig_ed0_ipv6="RTADV" # Sample IPv6 entry for RA/rtsol(8)
#ifconfig_ed0_ipv6="inet6 2001:db8:1::1 prefixlen 64" # Sample IPv6 addr entry
#ifconfig_ed0_alias0="inet6 2001:db8:2::1 prefixlen 64" # Sample IPv6 alias
#ifconfig_fxp0_name="net0" # Change interface name from fxp0 to net0.
@@ -435,12 +436,18 @@ rfcomm_pppd_server_two_channel="3" # Ove
#rfcomm_pppd_server_two_register_sp="NO" # Override SP and DUN register
#rfcomm_pppd_server_two_register_dun="NO" # for 'two'
+#ubthidhci_enable="YES" # Switch an USB BT controller present on
+#ubthidhci_busnum="3" # bus 3 and addr 2 from HID mode to HCI mode.
+#ubthidhci_addr="2" # Check usbconfig list to find the correct
+ # numbers for your system.
+
### Miscellaneous network options: ###
icmp_bmcastecho="NO" # respond to broadcast ping packets
### IPv6 options: ###
-ipv6_network_interfaces="none" # List of IPv6 network interfaces
- # (or "auto" or "none").
+ipv6_network_interfaces="AUTO" # List of IPv6 network interfaces
+ipv6_prefer="YES" # Use IPv6 when both IPv4 and IPv6 can be used
+ipv6_privacy="NO" # Use privacy addresses with RTADV (RFC 4193)
ipv6_defaultrouter="NO" # Set to IPv6 default gateway (or NO).
#ipv6_defaultrouter="2002:c058:6301::" # Use this for 6to4 (RFC 3068)
ipv6_static_routes="" # Set to static route list (or leave empty).
@@ -499,7 +506,6 @@ ipv6_ipfilter_rules="/etc/ipf6.rules" #
# for examples
ip6addrctl_enable="YES" # Set to YES to enable default address selection
ip6addrctl_verbose="NO" # Set to YES to enable verbose configuration messages
-ipv6_prefer="NO" # Use IPv6 when both IPv4 and IPv6 can be used
##############################################################
### System console options #################################
@@ -637,6 +643,7 @@ mixer_enable="YES" # Run the sound mixer
### Jail Configuration #######################################
##############################################################
jail_enable="NO" # Set to NO to disable starting of any jails
+jail_parallel_start="NO" # Start jails in the background
jail_list="" # Space separated list of names of jails
jail_set_hostname_allow="YES" # Allow root user in a jail to change its hostname
jail_socket_unixiproute_only="YES" # Route only TCP/IP within a jail
Modified: user/imp/tbemd/etc/inetd.conf
==============================================================================
--- user/imp/tbemd/etc/inetd.conf Mon Apr 12 23:04:38 2010 (r206516)
+++ user/imp/tbemd/etc/inetd.conf Mon Apr 12 23:05:32 2010 (r206517)
@@ -16,8 +16,8 @@
#shell stream tcp6 nowait root /usr/libexec/rshd rshd
#login stream tcp nowait root /usr/libexec/rlogind rlogind
#login stream tcp6 nowait root /usr/libexec/rlogind rlogind
-#finger stream tcp nowait/3/10 nobody /usr/libexec/fingerd fingerd -s
-#finger stream tcp6 nowait/3/10 nobody /usr/libexec/fingerd fingerd -s
+#finger stream tcp nowait/3/10 nobody /usr/libexec/fingerd fingerd -k -s
+#finger stream tcp6 nowait/3/10 nobody /usr/libexec/fingerd fingerd -k -s
#
# run comsat as root to be able to print partial mailbox contents w/ biff,
# or use the safer tty:tty to just print that new mail has been received.
Modified: user/imp/tbemd/etc/network.subr
==============================================================================
--- user/imp/tbemd/etc/network.subr Mon Apr 12 23:04:38 2010 (r206516)
+++ user/imp/tbemd/etc/network.subr Mon Apr 12 23:05:32 2010 (r206517)
@@ -96,44 +96,32 @@ ifconfig_up()
# inet6 specific
if afexists inet6; then
if ipv6if $1; then
- if checkyesno ipv6_gateway_enable; then
- _ipv6_opts="-accept_rtadv"
- fi
- else
- if checkyesno ipv6_prefer; then
- _ipv6_opts="-ifdisabled"
- else
- _ipv6_opts="ifdisabled"
+ # Implicitly handles ipv6_gateway_enable
+ _ipv6_opts='-ifdisabled -accept_rtadv'
+
+ if ipv6_autoconfif $1; then
+ _ipv6_opts='-ifdisabled accept_rtadv'
fi
- # backward compatibility: $ipv6_enable
- case $ipv6_enable in
- [Yy][Ee][Ss])
- _ipv6_opts="${_ipv6_opts} accept_rtadv"
- ;;
- esac
- fi
+ ifconfig $1 inet6 $_ipv6_opts
- if [ -n "${_ipv6_opts}" ]; then
- ifconfig $1 inet6 ${_ipv6_opts}
- fi
+ # ifconfig_IF_ipv6
+ ifconfig_args=`ifconfig_getargs $1 ipv6`
- # ifconfig_IF_ipv6
- ifconfig_args=`ifconfig_getargs $1 ipv6`
- if [ -n "${ifconfig_args}" ]; then
- ifconfig $1 inet6 -ifdisabled
- ifconfig $1 ${ifconfig_args}
- _cfg=0
- fi
+ if [ -n "$ifconfig_args" ]; then
+ ifconfig $1 $ifconfig_args
+ _cfg=0
+ fi
+ else
+ # Remove in FreeBSD 10.x
+ # Explicit test is necessary here to avoid nonexistence error
+ case "$ipv6_enable" in
+ [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
+ warn "Interface $1 will NOT be configured for IPv6"
+ ;;
+ esac
- # backward compatiblity: $ipv6_ifconfig_IF
- ifconfig_args=`get_if_var $1 ipv6_ifconfig_IF`
- if [ -n "${ifconfig_args}" ]; then
- warn "\$ipv6_ifconfig_$1 is obsolete." \
- " Use ifconfig_$1_ipv6 instead."
- ifconfig $1 inet6 -ifdisabled
- ifconfig $1 inet6 ${ifconfig_args}
- _cfg=0
+ ifconfig $1 inet6 ifdisabled
fi
fi
@@ -194,7 +182,7 @@ ifconfig_down()
# $default if given.
get_if_var()
{
- local _if _punct _var _default prefix suffix
+ local _if _punct _punct_c _var _default prefix suffix
if [ $# -ne 2 -a $# -ne 3 ]; then
err 3 'USAGE: get_if_var name var [default]'
@@ -219,7 +207,7 @@ get_if_var()
# outside this file.
_ifconfig_getargs()
{
- local _ifn _af
+ local _ifn _af value
_ifn=$1
_af=${2+_$2}
@@ -227,7 +215,18 @@ _ifconfig_getargs()
return 1
fi
- get_if_var $_ifn ifconfig_IF$_af "$ifconfig_DEFAULT"
+ value=`get_if_var $_ifn ifconfig_IF$_af "$ifconfig_DEFAULT"`
+
+ # Remove in FreeBSD 10.x
+ if [ "$_af" = _ipv6 -a -z "$value" ]; then
+ value=`get_if_var $_ifn ipv6_ifconfig_IF "$ifconfig_DEFAULT"`
+ if [ -n "$value" ]; then
+ warn "\$ipv6_ifconfig_$1 is obsolete." \
+ " Use ifconfig_$1_ipv6 instead."
+ fi
+ fi
+
+ echo $value
}
# ifconfig_getargs if [af]
@@ -249,6 +248,8 @@ ifconfig_getargs()
[Nn][Oo][Ss][Yy][Nn][Cc][Dd][Hh][Cc][Pp]) ;;
[Ss][Yy][Nn][Cc][Dd][Hh][Cc][Pp]) ;;
[Ww][Pp][Aa]) ;;
+ [Rr][Tt][Aa][Dd][Vv]) ;;
+ [Nn][Oo][Rr][Tt][Aa][Dd][Vv]) ;;
*)
_args="$_args $_arg"
;;
@@ -372,77 +373,45 @@ afexists()
esac
}
-# noafif if
-# Returns 0 if the interface has no af configuration and 1 otherwise.
-noafif()
-{
- local _if
- _if=$1
-
- case $_if in
- pflog[0-9]*|\
- pfsync[0-9]*|\
- an[0-9]*|\
- ath[0-9]*|\
- ipw[0-9]*|\
- iwi[0-9]*|\
- iwn[0-9]*|\
- ral[0-9]*|\
- wi[0-9]*|\
- wl[0-9]*|\
- wpi[0-9]*)
- return 0
- ;;
- esac
-
- return 1
-}
-
# ipv6if if
# Returns 0 if the interface should be configured for IPv6 and
# 1 otherwise.
ipv6if()
{
- local _if _tmpargs i
- _if=$1
-
if ! afexists inet6; then
return 1
fi
# lo0 is always IPv6-enabled
- case $_if in
+ case $1 in
lo0)
return 0
;;
esac
- # True if $ifconfig_IF_ipv6 is defined.
- _tmpargs=`_ifconfig_getargs $_if ipv6`
- if [ -n "${_tmpargs}" ]; then
- return 0
- fi
-
- # backward compatibility: True if $ipv6_ifconfig_IF is defined.
- _tmpargs=`get_if_var $_if ipv6_ifconfig_IF`
- if [ -n "${_tmpargs}" ]; then
- return 0
- fi
+ local _if _tmpargs i
+ _if=$1
- case "${ipv6_network_interfaces}" in
- [Aa][Uu][Tt][Oo])
- return 0
- ;;
+ case "$ipv6_network_interfaces" in
''|[Nn][Oo][Nn][Ee])
return 1
;;
+ $_if|"$_if "*|*" $_if"|*" $_if "*|[Aa][Uu][Tt][Oo])
+ # True if $ifconfig_IF_ipv6 is defined.
+ _tmpargs=`_ifconfig_getargs $_if ipv6`
+ ;;
esac
- for i in ${ipv6_network_interfaces}; do
- if [ "$i" = "$_if" ]; then
- return 0
- fi
- done
+ if [ -n "$_tmpargs" ]; then
+ # Remove in FreeBSD 10.x
+ # Explicit test is necessary here to avoid nonexistence error
+ case "$ipv6_enable" in
+ [Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0)
+ ;;
+ *) return 0
+ ;;
+ esac
+ fi
return 1
}
@@ -452,15 +421,24 @@ ipv6if()
# Stateless Address Configuration, 1 otherwise.
ipv6_autoconfif()
{
+ case $1 in
+ lo0|\
+ stf[0-9]*|\
+ faith[0-9]*|\
+ lp[0-9]*|\
+ sl[0-9]*|\
+ pflog[0-9]*|\
+ pfsync[0-9]*)
+ return 1
+ ;;
+ esac
+
local _if _tmpargs _arg
_if=$1
if ! ipv6if $_if; then
return 1
fi
- if noafif $_if; then
- return 1
- fi
if checkyesno ipv6_gateway_enable; then
return 1
fi
@@ -468,45 +446,24 @@ ipv6_autoconfif()
if [ -n "${_tmpargs}" ]; then
return 1
fi
+ if ! is_wired_interface $_if; then
+ case $_if in
+ wlan[0-9]*) ;; # Allow test to continue
+ *) return 1
+ ;;
+ esac
+ fi
- case $_if in
- lo0|\
- stf[0-9]*|\
- faith[0-9]*|\
- lp[0-9]*|\
- sl[0-9]*|\
- pflog[0-9]*|\
- pfsync[0-9]*)
+ _tmpargs=`_ifconfig_getargs $_if ipv6`
+ case "$_tmpargs" in
+ *inet6\ *|*[Nn][Oo][Rr][Tt][Aa][Dd][Vv]*|*-accept_rtadv*)
return 1
;;
- esac
-
- # backward compatibility: $ipv6_enable
- case $ipv6_enable in
- [Yy][Ee][Ss])
+ *[Rr][Tt][Aa][Dd][Vv]*|*accept_rtadv*)
return 0
;;
esac
- _tmpargs=`_ifconfig_getargs $_if ipv6`
- for _arg in $_tmpargs; do
- case $_arg in
- accept_rtadv)
- return 0
- ;;
- esac
- done
-
- # backward compatibility: $ipv6_ifconfig_IF
- _tmpargs=`get_if_var $_if ipv6_ifconfig_IF`
- for _arg in $_tmpargs; do
- case $_arg in
- accept_rtadv)
- return 0
- ;;
- esac
- done
-
return 1
}
Modified: user/imp/tbemd/etc/rc.d/ip6addrctl
==============================================================================
--- user/imp/tbemd/etc/rc.d/ip6addrctl Mon Apr 12 23:04:38 2010 (r206516)
+++ user/imp/tbemd/etc/rc.d/ip6addrctl Mon Apr 12 23:05:32 2010 (r206517)
@@ -20,8 +20,6 @@ status_cmd="ip6addrctl"
prefer_ipv6_cmd="ip6addrctl_prefer_ipv6"
prefer_ipv4_cmd="ip6addrctl_prefer_ipv4"
-set_rcvar_obsolete ipv6_enable ipv6_prefer
-
ip6addrctl_prefer_ipv6()
{
afexists inet6 || return 0
Modified: user/imp/tbemd/etc/rc.d/jail
==============================================================================
--- user/imp/tbemd/etc/rc.d/jail Mon Apr 12 23:04:38 2010 (r206516)
+++ user/imp/tbemd/etc/rc.d/jail Mon Apr 12 23:05:32 2010 (r206517)
@@ -18,6 +18,8 @@
name="jail"
rcvar=`set_rcvar`
+
+start_precmd="jail_prestart"
start_cmd="jail_start"
stop_cmd="jail_stop"
@@ -545,6 +547,13 @@ jail_ips()
done
}
+jail_prestart()
+{
+ if checkyesno jail_parallel_start; then
+ command_args='&'
+ fi
+}
+
jail_start()
{
echo -n 'Configuring jails:'
@@ -636,7 +645,8 @@ jail_start()
done
eval ${_setfib} jail ${_flags} -i ${_rootdir} ${_hostname} \
- \"${_addrl}\" ${_exec_start} > ${_tmp_jail} 2>&1
+ \"${_addrl}\" ${_exec_start} > ${_tmp_jail} 2>&1 \
+ </dev/null
if [ "$?" -eq 0 ] ; then
_jail_id=$(head -1 ${_tmp_jail})
@@ -728,4 +738,5 @@ fi
if [ -n "$*" ]; then
jail_list="$*"
fi
-run_rc_command "${cmd}" &
+
+run_rc_command "${cmd}"
Modified: user/imp/tbemd/etc/rc.d/netif
==============================================================================
--- user/imp/tbemd/etc/rc.d/netif Mon Apr 12 23:04:38 2010 (r206516)
+++ user/imp/tbemd/etc/rc.d/netif Mon Apr 12 23:05:32 2010 (r206517)
@@ -34,6 +34,7 @@
. /etc/network.subr
name="network"
+start_precmd="network_prestart"
start_cmd="network_start"
stop_cmd="network_stop"
cloneup_cmd="clone_up"
@@ -41,7 +42,13 @@ clonedown_cmd="clone_down"
extra_commands="cloneup clonedown"
cmdifn=
-set_rcvar_obsolete ipv6_enable ipv6_prefer
+network_prestart()
+{
+ if [ -n "$ipv6_enable" ]; then
+ warn 'The ipv6_enable option is deprecated.'
+ warn 'See rc.conf(5) for information on disabling IPv6.'
+ fi
+}
network_start()
{
Modified: user/imp/tbemd/etc/rc.d/netoptions
==============================================================================
--- user/imp/tbemd/etc/rc.d/netoptions Mon Apr 12 23:04:38 2010 (r206516)
+++ user/imp/tbemd/etc/rc.d/netoptions Mon Apr 12 23:05:32 2010 (r206517)
@@ -99,6 +99,13 @@ netoptions_inet6()
else
${SYSCTL_W} net.inet6.ip6.v6only=1 >/dev/null
fi
+
+ if checkyesno ipv6_privacy; then
+ netoptions_init
+ echo -n " IPv6 Privacy Addresses"
+ ${SYSCTL_W} net.inet6.ip6.use_tempaddr=1 >/dev/null
+ ${SYSCTL_W} net.inet6.ip6.prefer_tempaddr=1 >/dev/null
+ fi
}
load_rc_config $name
Modified: user/imp/tbemd/etc/rc.d/tmp
==============================================================================
--- user/imp/tbemd/etc/rc.d/tmp Mon Apr 12 23:04:38 2010 (r206516)
+++ user/imp/tbemd/etc/rc.d/tmp Mon Apr 12 23:05:32 2010 (r206517)
@@ -51,8 +51,8 @@ case "${tmpmfs}" in
[Nn][Oo])
;;
*)
- if /bin/mkdir -p /tmp/.diskless 2> /dev/null; then
- rmdir /tmp/.diskless
+ if _tmpdir=$(mktemp -d -q /tmp/.diskless.XXXXXX); then
+ rmdir ${_tmpdir}
else
if [ -h /tmp ]; then
echo "*** /tmp is a symlink to a non-writable area!"
Copied: user/imp/tbemd/etc/rc.d/ubthidhci (from r206514, head/etc/rc.d/ubthidhci)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/imp/tbemd/etc/rc.d/ubthidhci Mon Apr 12 23:05:32 2010 (r206517, copy of r206514, head/etc/rc.d/ubthidhci)
@@ -0,0 +1,40 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: ubthidhci
+# REQUIRE: DAEMON
+# BEFORE: bluetooth
+# KEYWORD: nojail shutdown
+
+. /etc/rc.subr
+
+name="ubthidhci"
+command="/usr/sbin/usbconfig"
+rcvar=`set_rcvar`
+start_precmd="ubthidhci_prestart"
+
+ubthidhci_prestart()
+{
+
+ if [ -z ${ubthidhci_busnum} ]; then
+ warn ubthidhci_busnum is not set
+ return 1
+ fi
+ if [ -z ${ubthidhci_addr} ]; then
+ warn ubthidhci_addr is not set
+ return 1
+ fi
+}
+
+load_rc_config $name
+#
+# We discard the output because:
+# 1) we don't want it to show up during boot; and
+# 2) the request usually returns an error, but that doesn't mean it failed
+#
+# NB: 0x40 is UT_VENDOR
+command_args="-u ${ubthidhci_busnum} -a ${ubthidhci_addr} do_request 0x40 0 0 0 0 > /dev/null 2>&1"
+
+run_rc_command "$1"
Modified: user/imp/tbemd/etc/rc.firewall
==============================================================================
--- user/imp/tbemd/etc/rc.firewall Mon Apr 12 23:04:38 2010 (r206516)
+++ user/imp/tbemd/etc/rc.firewall Mon Apr 12 23:05:32 2010 (r206517)
@@ -424,24 +424,21 @@ case ${firewall_type} in
# Configuration:
# firewall_myservices: List of TCP ports on which this host
# offers services.
- # firewall_allowservices: List of IPs which has access to
+ # firewall_allowservices: List of IPv4 and/or IPv6 addresses
+ # that have access to
# $firewall_myservices.
- # firewall_trusted: List of IPv4s which has full access
- # to this host. Be very carefull
- # when setting this. This option can
- # seriously degrade the level of
- # protection provided by the firewall.
+ # firewall_trusted: List of IPv4 and/or IPv6 addresses
+ # that have full access to this host.
+ # Be very careful when setting this.
+ # This option can seriously degrade
+ # the level of protection provided by
+ # the firewall.
# firewall_logdeny: Boolean (YES/NO) specifying if the
# default denied packets should be
# logged (in /var/log/security).
# firewall_nologports: List of TCP/UDP ports for which
# denied incomming packets are not
# logged.
- # firewall_trusted_ipv6: List of IPv6s which has full access
- # to this host. Be very carefull
- # when setting this. This option can
- # seriously degrade the level of
- # protection provided by the firewall.
# Allow packets for which a state has been built.
${fwcmd} add check-state
Modified: user/imp/tbemd/etc/rc.subr
==============================================================================
--- user/imp/tbemd/etc/rc.subr Mon Apr 12 23:04:38 2010 (r206516)
+++ user/imp/tbemd/etc/rc.subr Mon Apr 12 23:05:32 2010 (r206517)
@@ -355,6 +355,8 @@ _find_processes()
#
wait_for_pids()
{
+ local _list _prefix _nlist _j
+
_list="$@"
if [ -z "$_list" ]; then
return
@@ -365,6 +367,7 @@ wait_for_pids()
for _j in $_list; do
if kill -0 $_j 2>/dev/null; then
_nlist="${_nlist}${_nlist:+ }$_j"
+ [ -n "$_prefix" ] && sleep 1
fi
done
if [ -z "$_nlist" ]; then
@@ -373,7 +376,7 @@ wait_for_pids()
_list=$_nlist
echo -n ${_prefix:-"Waiting for PIDS: "}$_list
_prefix=", "
- pwait $_list 2>/dev/null || sleep 2
+ pwait $_list 2>/dev/null
done
if [ -n "$_prefix" ]; then
echo "."
Modified: user/imp/tbemd/etc/termcap.small
==============================================================================
--- user/imp/tbemd/etc/termcap.small Mon Apr 12 23:04:38 2010 (r206516)
+++ user/imp/tbemd/etc/termcap.small Mon Apr 12 23:05:32 2010 (r206517)
@@ -203,93 +203,46 @@ cons60l7|cons60-iso8859-7:\
:li#60:tc=cons25l7:
cons60l7-m|cons60-iso8859-7-mono:\
:li#60:tc=cons25l7-m:
-#
-dosansi|ANSI.SYS standard crt:\
- :am:bs:ce=\E[K:cl=\E[2J:cm=\E[%i%d;%dH:co#80:\
- :do=\E[B:li#25:mi:nd=\E[C:\
- :se=\E[m:so=\E[7m:up=\E[A:us=\E[4m:ue=\E[m:\
- :md=\E[1m:mr=\E[7m:mb=\E[5m:me=\E[m:\
- :kh=\EG:kb=^h:ku=\EH:kd=\EP:kl=\EK:kr=\EM:\
- :k1=\E;:k2=\E<:k3=\E=:k4=\E>:k5=\E?:\
- :k6=\E@:k7=\EA:k8=\EB:k9=\EC:k0=\ED:
-# The following is a version of the ibm-pc entry distributed with PC/IX,
-# (Interactive Systems' System 3 for the Big Blue), modified by Richard
-# McIntosh at UCB/CSM. The :pt: and :uc: have been removed from the original,
-# (the former is untrue, and the latter failed under UCB/man); standout and
-# underline modes have been added. Note: this entry describes the "native"
-# capabilities of the PC monochrome display, without ANY emulation; most
-# communications packages (but NOT PC/IX connect) do some kind of emulation.
-pc|ibmpc|ibm pc PC/IX:\
- :li#24:co#80:am:bs:bw:eo:\
- :cd=\E[J:ce=\E[K:cl=\Ec:cm=\E[%i%2;%2H:do=\E[B:ho=\E[;H:\
- :nd=\E[C:up=\E[A:so=\E[7m:se=\E[0m:us=\E[4m:ue=\E[0m:
-pc3|ibmpc3|IBM PC 386BSD Console:\
- :Co#8:\
- :DO=\E[%dB:\
- :F1=\E[W:\
- :F2=\E[X:\
- :K1=\E[H:\
- :K2=\E[I:\
- :K3=\E[E:\
- :K4=\E[F:\
- :K5=\E[G:\
- :LE=\E[%dD:\
- :RI=\E[%dC:\
- :AB=\E[1;%dx:\
- :AF=\E[2;%dx:\
- :UP=\E[%dA:\
- :ac=l\332m\300k\277j\331u\264t\303v\301w\302q\304x\263n\305`^Da\260f\370g\361~\371.^Y-^Xh\261i^U0\333y\363z\362:\
- :am:\
- :bl=^G:\
- :bs:\
- :cb=\E[1K:\
- :cd=\E[J:\
- :ce=\E[K:\
- :cl=\E[H\E[J:\
- :cm=\E[%i%d;%dH:\
- :co#80:\
- :cr=^M:\
- :do=\E[B:\
- :ho=\E[H:\
- :is=\E[m:\
- :it#8:\
- :k;=\E[V:\
- :k1=\E[M:\
- :k2=\E[N:\
- :k3=\E[O:\
- :k4=\E[P:\
- :k5=\E[Q:\
- :k6=\E[R:\
- :k7=\E[S:\
- :k8=\E[T:\
- :k9=\E[U:\
- :kD=\177:\
- :@7=\E[F:\
- :kN=\E[G:\
- :kP=\E[I:\
- :kb=\177:\
- :kd=\E[B:\
- :kh=\E[H:\
- :kl=\E[D:\
- :kr=\E[C:\
- :ku=\E[A:\
- :le=^H:\
- :li#25:\
- :ms:\
- :nd=\E[C:\
- :op=\E[x:\
- :pa#64:\
- :rs=\E[m:\
- :se=\E[m:\
- :sf=\E[S:\
- :so=\E[7;1r\E[7m:\
- :sr=\E[T:\
- :ta=^I:\
- :te=\E[m:\
- :ti=\E[m:\
- :up=\E[A:\
- :ut:
+SC|screen|VT 100/ANSI X3.64 virtual terminal:\
+ :am:xn:ms:mi:G0:km:\
+ :DO=\E[%dB:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:bs:bt=\E[Z:\
+ :cb=\E[1K:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:ct=\E[3g:\
+ :do=^J:nd=\E[C:pt:rc=\E8:rs=\Ec:sc=\E7:st=\EH:up=\EM:\
+ :le=^H:bl=^G:cr=^M:it#8:ho=\E[H:nw=\EE:ta=^I:is=\E)0:\
+ :li#24:co#80:us=\E[4m:ue=\E[24m:so=\E[3m:se=\E[23m:\
+ :mb=\E[5m:md=\E[1m:mr=\E[7m:me=\E[m:sr=\EM:al=\E[L:\
+ :AL=\E[%dL:dl=\E[M:DL=\E[%dM:cs=\E[%i%d;%dr:dc=\E[P:\
+ :DC=\E[%dP:im=\E[4h:ei=\E[4l:IC=\E[%d@:\
+ :ks=\E[?1h\E=:ke=\E[?1l\E>:vb=\Eg:\
+ :ku=\EOA:kd=\EOB:kr=\EOC:kl=\EOD:kb=^H:\
+ :k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k5=\E[15~:k6=\E[17~:\
+ :k7=\E[18~:k8=\E[19~:k9=\E[20~:k;=\E[21~:F1=\E[23~:F2=\E[24~:\
+ :F3=\E[25~:F4=\E[26~:F5=\E[28~:F6=\E[29~:\
+ :F7=\E[31~:F8=\E[32~:F9=\E[33~:FA=\E[34~:\
+ :kh=\E[1~:kI=\E[2~:kD=\E[3~:@7=\E[4~:kP=\E[5~:\
+ :kN=\E[6~:eA=\E(B\E)0:as=^N:ae=^O:ti=\E[?1049h:te=\E[?1049l:\
+ :vi=\E[?25l:ve=\E[34h\E[?25h:vs=\E[34l:\
+ :Co#8:pa#64:AF=\E[3%dm:AB=\E[4%dm:op=\E[39;49m:AX:\
+ :ac=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~..--++,,hhII00:
+
+vt100|dec-vt100|vt100-am|vt100am|dec vt100:\
+ :do=2\E[B:co#80:li#24:cl=50\E[H\E[J:sf=2*\ED:\
+ :le=^H:bs:am:cm=5\E[%i%d;%dH:nd=2\E[C:up=2\E[A:\
+ :ce=3\E[K:cd=50\E[J:so=2\E[7m:se=2\E[m:us=2\E[4m:ue=2\E[m:\
+ :md=2\E[1m:mr=2\E[7m:mb=2\E[5m:me=2\E[m:\
+ :is=\E>\E[?1;3;4;5l\E[?7;8h\E[1;24r\E[24;1H:\
+ :if=/usr/share/tabset/vt100:nw=2\EE:ho=\E[H:\
+ :as=2\E(0:ae=2\E(B:\
+ :ac=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||:\
+ :rs=\E>\E[?1;3;4;5l\E[?7;8h:ks=\E[?1h\E=:ke=\E[?1l\E>:\
+ :ku=\EOA:kd=\EOB:kr=\EOC:kl=\EOD:kb=\177:\
+ :k0=\EOy:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k5=\EOt:\
+ :k6=\EOu:k7=\EOv:k8=\EOl:k9=\EOw:k;=\EOx:@8=\EOM:\
+ :K1=\EOq:K2=\EOr:K3=\EOs:K4=\EOp:K5=\EOn:pt:sr=2*\EM:xn:\
+ :sc=2\E7:rc=2\E8:cs=5\E[%i%d;%dr:UP=2\E[%dA:DO=2\E[%dB:RI=2\E[%dC:\
+ :LE=2\E[%dD:ct=2\E[3g:st=2\EH:ta=^I:ms:bl=^G:cr=^M:eo:it#8:\
+ :RA=\E[?7l:SA=\E[?7h:po=\E[5i:pf=\E[4i:
# $XTermId: termcap,v 1.78 2009/11/09 00:24:26 tom Exp $
#
@@ -325,3 +278,38 @@ xterm|X11 terminal emulator:\
xterm-clear:\
:te=\E[?1049l:ti=\E[?1049h:\
:tc=xterm-new:
+#
+# This should work for the commonly used "color xterm" variations (XFree86
+# xterm, color_xterm, nxterm, rxvt). Note that it does not set 'bce', so for
+# XFree86 and rxvt, some applications that use colors will be less efficient,
+# and in a few special cases (with "smart" optimization) the wrong color will
+# be painted in spots.
+xterm-color|generic "ANSI" color xterm:\
+ :Co#8:NC@:pa#64:\
+ :AB=\E[4%dm:AF=\E[3%dm:ac=:op=\E[m:tc=xterm-r6:
+#
+# Compatible with the X11R6.3 xterm
+xterm-r6|xterm-old|X11R6 xterm:\
+ :am:bs:km:mi:ms:pt:xn:\
+ :co#80:kn#20:li#24:\
+ :*6=\E[4~:@0=\E[1~:@7=\E[4~:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:\
+ :DO=\E[%dB:F1=\E[23~:F2=\E[24~:F3=\E[25~:F4=\E[26~:\
+ :F5=\E[28~:F6=\E[29~:F7=\E[31~:F8=\E[32~:F9=\E[33~:\
+ :FA=\E[34~:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:ae=^O:al=\E[L:\
+ :as=^N:bl=^G:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:\
+ :cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:eA=\E)0:ei=\E[4l:\
+ :ho=\E[H:im=\E[4h:\
+ :is=\E[m\E[?7h\E[4l\E>\E7\E[r\E[?1;3;4;6l\E8:\
+ :k1=\E[11~:k2=\E[12~:k3=\E[13~:k4=\E[14~:k5=\E[15~:\
+ :k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:k;=\E[21~:\
+ :kD=\E[3~:kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=^H:kd=\EOB:\
+ :ke=\E[?1l\E>:kh=\E[1~:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:\
+ :ku=\EOA:md=\E[1m:me=\E[m:ml=\El:mr=\E[7m:mu=\Em:nd=\E[C:\
+ :rc=\E8:rs=\E[m\E[?7h\E[4l\E>\E7\E[r\E[?1;3;4;6l\E8:\
+ :sc=\E7:se=\E[m:sf=^J:so=\E[7m:sr=\EM:\
+ :ue=\E[m:up=\E[A:us=\E[4m:
+#
+# Add the capability to "clear the screen" after exiting vi, more/less, etc.
+xterm-r6-clear:\
+ :te=\E[2J\E[?47l\E8:ti=\E7\E[?47h:ue=\E[m:\
+ :tc=xterm-r6:
Modified: user/imp/tbemd/games/fortune/Notes
==============================================================================
--- user/imp/tbemd/games/fortune/Notes Mon Apr 12 23:04:38 2010 (r206516)
+++ user/imp/tbemd/games/fortune/Notes Mon Apr 12 23:05:32 2010 (r206517)
@@ -19,13 +19,13 @@ Warning:
/usr/share/games/fortune. A fortune file has two parts: the source file
(which contains the fortunes themselves) and the data file which describes
the fortunes. The data file always has the same name as the fortune file
-with the string ".dat" concatenated, i.e. "fort" is the standard fortune
-database, and "fort.dat" is the data file which describes it. See
+with the string ".dat" concatenated, i.e. "fortunes" is the standard fortune
+database, and "fortunes.dat" is the data file which describes it. See
strfile(8) for more information on creating the data files.
Fortunes are split into potentially offensive and not potentially
offensive parts. The offensive version of a file has the same name as the
-non-offensive version with "-o" concatenated, i.e. "fort" is the standard
-fortune database, and "fort-o" is the standard offensive database. The
+non-offensive version with "-o" concatenated, i.e. "fortunes" is the standard
+fortune database, and "fortunes-o" is the standard offensive database. The
fortune program automatically assumes that any file with a name ending in
"-o" is potentially offensive, and should therefore only be displayed if
explicitly requested, either with the -o option or by specifying a file name
@@ -42,10 +42,10 @@ MUST be in the potentially offensive dat
explicit language (see George Carlin's recent updated list) MUST be in the
potentially offensive database. Political and religious opinions are often
sequestered in the potentially offensive section as well. Anything which
-assumes as a world view blatantly racist, mysogynist (sexist), or homophobic
+assumes as a world view blatantly racist, misogynist (sexist), or homophobic
ideas should not be in either, since they are not really funny unless *you*
-are racist, mysogynist, or homophobic.
- The point of this is that people have should have a reasonable
+are racist, misogynist, or homophobic.
+ The point of this is that people should have a reasonable
expectation that, should they just run "fortune", they will not be offended.
We know that some people take offense at anything, but normal people do have
opinions, too, and have a right not to have their sensibilities offended by
@@ -53,7 +53,7 @@ a program which is supposed to be entert
-o" or "fortune -a" are saying, in effect, that they are willing to have
their sensibilities tweaked. However, they should not have their personal
worth seriously (i.e., not in jest) assaulted. Jokes which depend for their
-humor on racist, mysogynist, or homophobic stereotypes *do* seriously
+humor on racist, misogynist, or homophobic stereotypes *do* seriously
assault individual personal worth, and in a general entertainment medium
we should be able to get by without it.
Modified: user/imp/tbemd/games/fortune/datfiles/fortunes
==============================================================================
--- user/imp/tbemd/games/fortune/datfiles/fortunes Mon Apr 12 23:04:38 2010 (r206516)
+++ user/imp/tbemd/games/fortune/datfiles/fortunes Mon Apr 12 23:05:32 2010 (r206517)
@@ -368,8 +368,10 @@ OR'd together, outta sight!
Double bucky, I'd like a whole word of
Double bucky, I'm happy I heard of
Double bucky, I'd like a whole word of you!
-
- -- (C) 1978 by Guy L. Steele, Jr.
+ -- Guy L. Steele, Jr., (C) 1978
+ (to Nicholas Wirth, who suggested that an extra bit
+ be added to terminal codes on 36-bit machines for use
+ by screen editors.)
%
Hard Copies and Chmod
@@ -834,7 +836,7 @@ would like on it. "Here lies an honest
lawyer.
"Sorry, but I can't do that," replied the stonecutter. "In this
state, it's against the law to bury two people in the same grave. However,
-I could put ``here lies an honest lawyer'', if that would be okay."
+I could put `here lies an honest lawyer', if that would be okay."
"But that won't let people know who it is" protested the lawyer.
"Certainly will," retorted the stonecutter. "people will read it
and exclaim, "That's Strange!"
@@ -1146,7 +1148,7 @@ strings of pearls. The spirit and inten
throughout. There should be neither too little nor too much, neither needless
loops nor useless variables, neither lack of structure nor overwhelming
rigidity.
- A program should follow the 'Law of Least Astonishment'. What is this
+ A program should follow the "Law of Least Astonishment." What is this
law? It is simply that the program should always respond to the user in the
way that astonishes him least.
A program, no matter how complex, should act as a single unit. The
@@ -1161,7 +1163,7 @@ program.
conference and then returned to report to his manager, saying: "What sort
of programmers work for other companies? They behaved badly and were
unconcerned with appearances. Their hair was long and unkempt and their
-clothes were wrinkled and old. They crashed out hospitality suites and they
+clothes were wrinkled and old. They crashed our hospitality suites and they
made rude noises during my presentation."
The manager said: "I should have never sent you to the conference.
Those programmers live beyond the physical world. They consider life absurd,
@@ -1466,7 +1468,7 @@ generalizable.
The general tendency is to over-design the second system, using all
the ideas and frills that were cautiously sidetracked on the first one.
The result, as Ovid says, is a "big pile".
- -- Frederick Brooks, "The Mythical Man Month"
+ -- Frederick Brooks, Jr., "The Mythical Man-Month"
%
An eighty-year-old woman is rocking away the afternoon on her
porch when she sees an old, tarnished lamp sitting near the steps. She
@@ -1513,7 +1515,7 @@ over canoe frames, for my people need tr
and we offer you a chance to kill yourself with our ceremonial knife."
The Englishman accepts the knife and yells, "God Save the Queen",
while plunging the knife into his heart.
- The Frenchman removes the knife from the fallen body, and yells,
+ The Frenchman removes the knife from the fallen body, and yells,
"Vive la France", while plunging the knife into his heart.
The American removes the knife from the fallen body, and yells,
while stabbing himself all over his body, "Here's your lousy canoe!"
@@ -1562,7 +1564,7 @@ a postcard?"
"The curious incident of the stable dog in the nighttime."
"But the dog did nothing in the nighttime."
"That was the curious incident."
- -- A. Conan Doyle, "Silver Blaze"
+ -- Sir Arthur Conan Doyle, "Silver Blaze"
%
Approaching the gates of the monastery, Hakuin found Ken the Zen
preaching to a group of disciples.
@@ -1609,8 +1611,8 @@ Los Angeles fainted from hyperoxygenatio
under the exhaust of a bus until he revived.
%
Before he became a hermit, Zarathud was a young Priest, and
- took great delight in making fools of his opponents in front of
-his followers.
+took great delight in making fools of his opponents in front of his
+followers.
One day Zarathud took his students to a pleasant pasture and
there he confronted The Sacred Chao while She was contentedly grazing.
"Tell me, you dumb beast," demanded the Priest in his
@@ -1626,7 +1628,7 @@ Chinese ideogram for NO-THING.)
and finds himself no wiser than before," Bokonon tells us. "He is full
of murderous resentment of people who are ignorant without having come
by their ignorance the hard way."
- -- Kurt Vonnegut, "Cat's Cradle"
+ -- Kurt Vonnegut, Jr., "Cat's Cradle"
%
Bubba, Jim Bob, and Leroy were fishing out on the lake last November,
and, when Bubba tipped his head back to empty the Jim Beam, he fell out of the
@@ -1694,7 +1696,7 @@ way I ought to go from here?"
the Cat.
"I don't care much where--" said Alice.
"Then it doesn't matter which way you go," said the Cat.
- -- Lewis Carroll
+ -- Lewis Carroll, "Alice's Adventures in Wonderland" (1865)
%
Concerning the war in Vietnam, Senator George Aiken of Vermont noted
in January, 1966, "I'm not very keen for doves or hawks. I think we need more
@@ -1877,7 +1879,7 @@ how to be excellent: "In Search of Excel
So the Cleaning Personnel Don't Steal It", etc.
-- Dave Barry, "In Search of Excellence"
%
- Exxon's 'Universe of Energy' tends to the peculiar rather than the
+ Exxon's "Universe of Energy" tends to the peculiar rather than the
humorous ... After [an incomprehensible film montage about wind and sun and
rain and strip mines and] two or three minutes of mechanical confusion, the
seats locomote through a short tunnel filled with clock-work dinosaurs.
@@ -1923,9 +1925,9 @@ of events, there lurks a singular, sinis
"MINE! HA-HA!"
%
"Found it," the Mouse replied rather crossly:
-"of course you know what 'it' means."
+"of course you know what `it' means."
- "I know what 'it' means well enough, when I find a thing,"
+ "I know what `it' means well enough, when I find a thing,"
said the Duck: "it's generally a frog or a worm.
The question is, what did the archbishop find?"
@@ -1937,15 +1939,15 @@ such as a "pride of lions" or a "gaggle
One of the professors noticed a group of prostitutes down the block,
and posed the question, "What name would be given to that group?" The four
fell into silence for a moment, as they pondered the possibilities...
- At last, one spoke: "How about 'a Jam of Tarts'?" The others nodded
+ At last, one spoke: "How about `a Jam of Tarts'?" The others nodded
in acknowledgment as they continued to consider the problem. A second
-professor spoke: "I'd suggest 'an Essay of Trollops.'" Again, the others
-nodded. A third spoke: "I propose 'a Flourish of Strumpets.'"
+professor spoke: "I'd suggest `an Essay of Trollops.'" Again, the others
+nodded. A third spoke: "I propose `a Flourish of Strumpets.'"
They continued their walk in silence, until the first professor
remarked to the remaining professor, who was the most senior and learned of
the four, "You haven't suggested a name for our ladies. What are your
thoughts?"
- Replied the fourth professor, "'An Anthology of Prose.'"
+ Replied the fourth professor, "`An Anthology of Prose.'"
%
Fred noticed his roommate had a black eye upon returning from a dance.
"What happened?"
@@ -1958,12 +1960,11 @@ and sarcastic?"
"Of course not," said a sympathetic friend.
"Well," retorted Frank, "neither would Jennifer."
%
- "Gee, Mudhead, everyone at More Science High has an
+ "Gee, Mudhead, everyone at Morse Science High has an
extracurricular activity except you."
"Well, gee, doesn't Louise count?"
"Only to ten, Mudhead."
-
- -- Firesign Theater
+ -- The Firesign Theatre
%
"Gentlemen of the jury," said the defense attorney, now beginning
to warm to his summation, "the real question here before you is, shall this
@@ -2261,7 +2262,7 @@ each other up:
the floor.) S-word. Excuse me. Look, Bob, I'm going to
have to get back to you.
Bob: Fine.
- -- Dave Barry
+ -- Dave Barry, "$#$%#^%!^%&@%@!"
%
"I don't know what you mean by `glory,'" Alice said
Humpty Dumpty smiled contemptuously. "Of course you don't --
@@ -2276,7 +2277,9 @@ less."
so many different things."
"The question is," said Humpty Dumpty, "which is to be master--
that's all."
- -- Lewis Carroll, "Through the Looking Glass"
+ -- Lewis Carroll,
+ "Through the Looking-Glass,
+ and What Alice Found There" (1871)
%
I for one cannot protest the recent M.T.A. fare hike and the
accompanying promises that this would in no way improve service. For
@@ -2328,7 +2331,7 @@ operation - namely, to remove those irri
"And then he will be sane?"
"Then he will be perfectly sane, and a quite admirable citizen."
"Thank heaven for science!" said old Yacob.
- -- H.G. Wells, "The Country of the Blind"
+ -- H. G. Wells, "The Country of the Blind"
%
"I keep seeing spots in front of my eyes."
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-user
mailing list