[commit] BSDanywhere - r246 - trunk
bsdan...@startek.ch
Date: Wed Dec 3 14:14:37 2008
New Revision: 246
Log:
sync
Modified:
trunk/build.sh
trunk/etc_rc.local.tpl
trunk/etc_rc.tpl
trunk/etc_sysctl.conf.tpl
trunk/etc_welcome.tpl
trunk/home_live_.e_e_applications_bar_default_.order.tpl
trunk/home_live_.e_e_applications_menu_favorite.menu.tpl
trunk/home_live_.xinitrc.tpl
Modified: trunk/build.sh
==============================================================================
--- trunk/build.sh (original)
+++ trunk/build.sh Wed Dec 3 14:14:37 2008
@@ -37,20 +37,19 @@
#
export BASE=/specify/base/path
-export RELEASE=4.3
-export ARCH=i386
+export ARCH=$(uname -m)
+export RELEASE=$(uname -r)
export R=$(echo $RELEASE | awk -F. '{print $1$2 }')
export IMAGE_ROOT=$BASE/image
export CACHE_ROOT=$BASE/cache
-export MASTER_SITES=http://mirror.startek.ch
-export PKG_PATH=http://mirror.switch.ch/ftp/pub/OpenBSD/$RELEASE/packages/$ARCH/:$MASTER_SITES/OpenBSD/packages/$RELEASE/$ARCH/
+export MIRROR1=http://mirror.switch.ch/ftp/pub/OpenBSD
+export MIRROR2=http://mirror.startek.ch
+export PKG_PATH=$MIRROR1/$RELEASE/packages/$ARCH/:$MIRROR2/OpenBSD/packages/$RELEASE/$ARCH/
export CWD=$(pwd)
export THIS_OS=$(uname)
-export THIS_ARCH=$(uname -m)
-export THIS_RELEASE=$(uname -r)
export MIN_SPACE_REQ='1600000'
#
@@ -82,22 +81,6 @@
return 1
fi
- echo -n 'This arch: '
- if [ "$THIS_ARCH" = "$ARCH" ]; then
- echo "$ARCH (ok)"
- else
- echo "$THIS_ARCH (NOT ok)"
- return 1
- fi
-
- echo -n 'This release: '
- if [ "$THIS_RELEASE" = "$RELEASE" ]; then
- echo "$RELEASE (ok)"
- else
- echo "$THIS_RELEASE (NOT ok)"
- return 1
- fi
-
echo -n "$BASE "
if [ -d "$BASE" ]; then
echo 'exists (ok)'
@@ -160,8 +143,10 @@
for i in bsd bsd.mp
do
test -r $CACHE_ROOT/$i || \
- ftp -o $CACHE_ROOT/$i $MASTER_SITES/BSDanywhere/$RELEASE/$ARCH/$i
+ ftp -o $CACHE_ROOT/$i $MIRROR2/BSDanywhere/$RELEASE/$ARCH/$i
+ echo -n "Installing $i ... "
cp -p $CACHE_ROOT/$i $IMAGE_ROOT/
+ echo done
done
}
@@ -170,8 +155,10 @@
for i in cdbr cdboot
do
test -r $CACHE_ROOT/$i || \
- ftp -o $CACHE_ROOT/$i $MASTER_SITES/OpenBSD/stable/$RELEASE-stable/$ARCH/$i
+ ftp -o $CACHE_ROOT/$i $MIRROR1/$RELEASE/$ARCH/$i
+ echo -n "Installing $i ... "
cp -p $CACHE_ROOT/$i $IMAGE_ROOT/
+ echo done
done
}
@@ -180,7 +167,7 @@
for i in base game man misc etc xbase xetc xfont xserv xshare
do
test -r $CACHE_ROOT/$i$R.tgz || \
- ftp -o $CACHE_ROOT/$i$R.tgz $MASTER_SITES/OpenBSD/stable/$RELEASE-stable/$ARCH/$i$R.tgz
+ ftp -o $CACHE_ROOT/$i$R.tgz $MIRROR1/$RELEASE/$ARCH/$i$R.tgz
echo -n "Installing $i ... "
tar -C $IMAGE_ROOT -xzphf $CACHE_ROOT/$i$R.tgz
echo done
@@ -240,7 +227,7 @@
# Download and install packages.
echo
- pkg_add -x iperf nmap tightvnc-viewer rsync pftop trafshow pwgen hexedit hping mozilla-firefox-2.0.0.14 mozilla-thunderbird gqview bzip2 epdfview ipcalc isearch BitchX imapfilter gimp abiword privoxy tor arping e-20071211p3 audacious mutt-1.5.17p0-sasl-sidebar-compressed screen-4.0.3p1 smartmontools rsnapshot darkstat aescrypt aiccu amap angst httptunnel hydra iodine minicom nano nbtscan nepim netfwd netpipe ngrep galculator mboxgrep nemesis newsfetch queso radiusniff scanssh smtpscan ssldump stress stunnel
+ pkg_add -x iperf nmap tightvnc-viewer rsync pftop trafshow pwgen hexedit hping firefox3 mozilla-thunderbird gqview bzip2 epdfview-0.1.6p5 ipcalc BitchX imapfilter privoxy tor arping e-20071211p3 screen-4.0.3p1 smartmontools aescrypt aiccu amap angst httptunnel udptunnel hydra iodine minicom nano nbtscan nepim netfwd netpipe ngrep galculator mboxgrep nemesis newsfetch queso radiusniff scanssh smtpscan ssldump stress stunnel dnstop-20080502 dnstracer
# Leave the chroot environment.
exit
Modified: trunk/etc_rc.local.tpl
==============================================================================
--- trunk/etc_rc.local.tpl (original)
+++ trunk/etc_rc.local.tpl Wed Dec 3 14:14:37 2008
@@ -122,7 +122,7 @@
fi
done
- echo -n "Synchronize the time using ntpd? (Y/n) "
+ echo -n "Synchronize time with default servers? (Y/n) "
read ntp
if [ -z "$ntp" ] || [ "$ntp" = "y" ] || [ "$ntp" = "Y" ] || [ "$ntp" = "yes" ] || [ "$ntp" = "Yes" ]
then
Modified: trunk/etc_rc.tpl
==============================================================================
--- trunk/etc_rc.tpl (original)
+++ trunk/etc_rc.tpl Wed Dec 3 14:14:37 2008
@@ -1,4 +1,4 @@
-# $OpenBSD: rc,v 1.312 2008/02/27 20:27:38 djm Exp $
+# $OpenBSD: rc,v 1.318 2008/07/09 20:23:47 djm Exp $
# System startup script run by init on autoboot
# or after single-user.
@@ -116,6 +116,34 @@
fi
}
+fill_baddynamic()
+{
+ local _service="$1"
+ local _sysctl="net.inet.${_service}.baddynamic"
+ local _name _port _srv _junk _ban
+ local _i=0
+ grep "/${_service}" /etc/services | {
+ IFS=" /"
+ while read _name _port _srv _junk; do
+ [ "x${_srv}" = "x${_service}" ] || continue;
+ if [ "x${_ban}" = "x" ]; then
+ _ban="+${_port}"
+ else
+ _ban="${_ban},+${_port}"
+ fi
+ # Flush before argv gets too long
+ if [ $((++_i)) -gt 128 ]; then
+ sysctl ${_sysctl}=${_ban} >/dev/null
+ _ban=""
+ _i=0
+ fi
+ done;
+ if [ "x${_ban}" != "x" ]; then
+ sysctl ${_sysctl}=${_ban} >/dev/null
+ fi
+ }
+}
+
# End subroutines
stty status '^T'
@@ -211,7 +239,7 @@
umount -a >/dev/null 2>&1
mount -a -t nonfs,vnd >/dev/null 2>&1
mount -uw / >/dev/null 2>&1 # root on nfs requires this, others aren't hurt
-# XXX (root now writeable)
+#rm -f /fastboot # XXX (root now writeable)
# BSDanywhere specific: Set timemark for syncsys.
touch /etc/timemark
@@ -274,6 +302,10 @@
pfctl -e
fi
+# Fill net.inet.(tcp|udp).baddynamic lists from /etc/services
+fill_baddynamic udp
+fill_baddynamic tcp
+
sysctl_conf
# set hostname, turn on network
@@ -418,6 +450,7 @@
echo -n ' nfsd'; nfsd ${nfsd_flags}
if [ X"${lockd}" = X"YES" ]; then
echo -n ' rpc.lockd'; rpc.lockd
+ echo -n ' rpc.statd'; rpc.statd
fi
fi
@@ -436,8 +469,8 @@
echo -n ' timed'; timed $timed_flags
fi
-if [ X"${nmeaattach_flags}" != X"NO" -a -n "${nmeaattach_flags}" ]; then
- echo -n ' nmeaattach'; nmeaattach ${nmeaattach_flags}
+if [ X"${ldattach_flags}" != X"NO" -a -n "${ldattach_flags}" ]; then
+ echo -n ' ldattach'; ldattach ${ldattach_flags}
fi
if [ X"${ntpd_flags}" != X"NO" ]; then
@@ -552,7 +585,7 @@
fi
if [ -x /usr/libexec/vi.recover ]; then
- echo 'preserving editor files'; /usr/libexec/vi.recover
+ echo 'preserving editor files.'; /usr/libexec/vi.recover
fi
if [ ! -f /etc/ssh/ssh_host_dsa_key ]; then
@@ -599,10 +632,6 @@
echo -n ' snmpd'; /usr/sbin/snmpd $snmpd_flags
fi
-if [ X"${routed_flags}" != X"NO" ]; then
- echo -n ' routed'; routed $routed_flags
-fi
-
if [ X"${ripd_flags}" != X"NO" ]; then
echo -n ' ripd'; /usr/sbin/ripd $ripd_flags
fi
@@ -637,10 +666,7 @@
if [ X"${dhcpd_flags}" != X"NO" -a -f /etc/dhcpd.conf ]; then
touch /var/db/dhcpd.leases
- if [ -f /etc/dhcpd.interfaces ]; then
- dhcpd_ifs=`stripcom /etc/dhcpd.interfaces`
- fi
- echo -n ' dhcpd'; /usr/sbin/dhcpd ${dhcpd_flags} ${dhcpd_ifs}
+ echo -n ' dhcpd'; /usr/sbin/dhcpd ${dhcpd_flags}
fi
if [ X"${dhcrelay_flags}" != X"NO" ]; then
Modified: trunk/etc_sysctl.conf.tpl
==============================================================================
--- trunk/etc_sysctl.conf.tpl (original)
+++ trunk/etc_sysctl.conf.tpl Wed Dec 3 14:14:37 2008
@@ -1,46 +1,36 @@
-# $OpenBSD: sysctl.conf,v 1.46 2008/01/05 18:38:37 mbalmer Exp $
+# $OpenBSD: sysctl.conf,v 1.46 2008/01/05 18:38:37 mbalmer Exp $
#
# This file contains a list of sysctl options the user wants set at
# boot time. See sysctl(3) and sysctl(8) for more information on
# the many available variables.
#
-#net.inet.ip.forwarding=1 # 1=Permit forwarding (routing) of IPv4 packets
-#net.inet.ip.mforwarding=1 # 1=Permit forwarding (routing) of IPv4 multicast packets
-#net.inet.ip.multipath=1 # 1=Enable IP multipath routing
-#net.inet6.ip6.forwarding=1 # 1=Permit forwarding (routing) of IPv6 packets
-#net.inet6.ip6.mforwarding=1 # 1=Permit forwarding (routing) of IPv6 multicast packets
-#net.inet6.ip6.multipath=1 # 1=Enable IPv6 multipath routing
-net.inet6.ip6.accept_rtadv=1 # 1=Permit IPv6 autoconf (forwarding must be 0)
-#net.inet.tcp.rfc1323=0 # 0=Disable TCP RFC1323 extensions (for if tcp is slow)
-#net.inet.tcp.rfc3390=0 # 0=Disable RFC3390 for TCP window increasing
-#net.inet.esp.enable=0 # 0=Disable the ESP IPsec protocol
-#net.inet.ah.enable=0 # 0=Disable the AH IPsec protocol
-#net.inet.esp.udpencap=0 # 0=Disable ESP-in-UDP encapsulation
-#net.inet.ipcomp.enable=1 # 1=Enable the IPCOMP protocol
-#net.inet.etherip.allow=1 # 1=Enable the Ethernet-over-IP protocol
-#net.inet.tcp.ecn=1 # 1=Enable the TCP ECN extension
-#net.inet.carp.preempt=1 # 1=Enable carp(4) preemption
-#net.inet.carp.log=1 # 1=Enable logging of carp(4) packets
-#ddb.panic=0 # 0=Do not drop into ddb on a kernel panic
-#ddb.console=1 # 1=Permit entry of ddb from the console
-#fs.posix.setuid=0 # 0=Traditional BSD chown() semantics
-#vm.swapencrypt.enable=0 # 0=Do not encrypt pages that go to swap
-#vfs.nfs.iothreads=4 # Number of nfsio kernel threads
-#net.inet.ip.mtudisc=0 # 0=Disable tcp mtu discovery
-#kern.usercrypto=0 # 0=Disable userland use of /dev/crypto
-#kern.splassert=2 # 2=Enable with verbose error messages
-#kern.nosuidcoredump=2 # 2=Put suid coredumps in /var/crash
-#kern.watchdog.period=32 # >0=Enable hardware watchdog(4) timer if available
-#kern.watchdog.auto=0 # 0=Disable automatic watchdog(4) retriggering
-machdep.allowaperture=2 # See xf86(4)
-#machdep.apmwarn=10 # battery % when apm status messages enabled
-#machdep.apmhalt=1 # 1=powerdown hack, try if halt -p doesn't work
-#machdep.kbdreset=1 # permit console CTRL-ALT-DEL to do a nice halt
-#machdep.userldt=1 # allow userland programs to play with ldt,
- # required by some ports
-#kern.emul.aout=1 # enable running dynamic OpenBSD a.out bins
-#kern.emul.bsdos=1 # enable running BSD/OS binaries
-#kern.emul.freebsd=1 # enable running FreeBSD binaries
-#kern.emul.ibcs2=1 # enable running iBCS2 binaries
-#kern.emul.linux=1 # enable running Linux binaries
-#kern.emul.svr4=1 # enable running SVR4 binaries
+#net.inet.ip.forwarding=1 # 1=Permit forwarding (routing) of IPv4 packets
+#net.inet.ip.mforwarding=1 # 1=Permit forwarding (routing) of IPv4 multicast packets
+#net.inet.ip.multipath=1 # 1=Enable IP multipath routing
+#net.inet6.ip6.forwarding=1 # 1=Permit forwarding (routing) of IPv6 packets
+#net.inet6.ip6.mforwarding=1 # 1=Permit forwarding (routing) of IPv6 multicast packets
+#net.inet6.ip6.multipath=1 # 1=Enable IPv6 multipath routing
+net.inet6.ip6.accept_rtadv=1 # 1=Permit IPv6 autoconf (forwarding must be 0)
+#net.inet.tcp.rfc1323=0 # 0=Disable TCP RFC1323 extensions (for if tcp is slow)
+#net.inet.tcp.rfc3390=0 # 0=Disable RFC3390 for TCP window increasing
+#net.inet.esp.enable=0 # 0=Disable the ESP IPsec protocol
+#net.inet.ah.enable=0 # 0=Disable the AH IPsec protocol
+#net.inet.esp.udpencap=0 # 0=Disable ESP-in-UDP encapsulation
+#net.inet.ipcomp.enable=1 # 1=Enable the IPCOMP protocol
+#net.inet.etherip.allow=1 # 1=Enable the Ethernet-over-IP protocol
+#net.inet.tcp.ecn=1 # 1=Enable the TCP ECN extension
+#net.inet.carp.preempt=1 # 1=Enable carp(4) preemption
+#net.inet.carp.log=1 # 1=Enable logging of carp(4) packets
+#ddb.panic=0 # 0=Do not drop into ddb on a kernel panic
+#ddb.console=1 # 1=Permit entry of ddb from the console
+#fs.posix.setuid=0 # 0=Traditional BSD chown() semantics
+#vm.swapencrypt.enable=0 # 0=Do not encrypt pages that go to swap
+#vfs.nfs.iothreads=4 # Number of nfsio kernel threads
+#net.inet.ip.mtudisc=0 # 0=Disable tcp mtu discovery
+#kern.usercrypto=0 # 0=Disable userland use of /dev/crypto
+#kern.splassert=2 # 2=Enable with verbose error messages
+#kern.nosuidcoredump=2 # 2=Put suid coredumps in /var/crash
+#kern.watchdog.period=32 # >0=Enable hardware watchdog(4) timer if available
+#kern.watchdog.auto=0 # 0=Disable automatic watchdog(4) retriggering
+machdep.allowaperture=2 # See xf86(4)
+machdep.kbdreset=1 # permit console CTRL-ALT-DEL to do a nice halt
Modified: trunk/etc_welcome.tpl
==============================================================================
--- trunk/etc_welcome.tpl (original)
+++ trunk/etc_welcome.tpl Wed Dec 3 14:14:37 2008
@@ -1,5 +1,5 @@
-Welcome to BSDanywhere 4.3 - enlightenment at your fingertips!
+Welcome to BSDanywhere 4.4 - enlightenment at your fingertips!
You may now log in using either 'live' or 'root' as a user name. Both
accounts have no default password set. If you'd like to set one, use the
Modified: trunk/home_live_.e_e_applications_bar_default_.order.tpl
==============================================================================
--- trunk/home_live_.e_e_applications_bar_default_.order.tpl (original)
+++ trunk/home_live_.e_e_applications_bar_default_.order.tpl Wed Dec 3 14:14:37 2008
@@ -1,5 +1,3 @@
xterm.desktop
firefox.desktop
thunderbird.desktop
-gimp.desktop
-abiword.desktop
Modified: trunk/home_live_.e_e_applications_menu_favorite.menu.tpl
==============================================================================
--- trunk/home_live_.e_e_applications_menu_favorite.menu.tpl (original)
+++ trunk/home_live_.e_e_applications_menu_favorite.menu.tpl Wed Dec 3 14:14:37 2008
@@ -6,8 +6,6 @@
<Include>
<Filename>xterm.desktop</Filename>
<Filename>firefox.desktop</Filename>
- <Filename>gimp.desktop</Filename>
- <Filename>abiword.desktop</Filename>
<Filename>thunderbird.desktop</Filename>
</Include>
</Menu>
Modified: trunk/home_live_.xinitrc.tpl
==============================================================================
--- trunk/home_live_.xinitrc.tpl (original)
+++ trunk/home_live_.xinitrc.tpl Wed Dec 3 14:14:37 2008
@@ -1,4 +1,3 @@
#!/bin/sh
-. /etc/X11/.xinitrc
xset r on
exec enlightenment_start